diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1c8bf5dbcaf..3e35794956a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,5 +7,6 @@
"*Test.py"
],
"python.testing.pytestEnabled": false,
- "python.testing.unittestEnabled": true
+ "python.testing.unittestEnabled": true,
+ "python.analysis.typeCheckingMode": "off"
}
\ No newline at end of file
diff --git a/docs/batchCodeTable.html b/docs/batchCodeTable.html
index 94eafa5e55c..21da7dc6328 100644
--- a/docs/batchCodeTable.html
+++ b/docs/batchCodeTable.html
@@ -1,33 +1,26 @@
-
-
-
- Batch Codes of Coronavirus 2019 Vaccines
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Fork me on GitHub
- Batch Codes of Coronavirus 2019 Vaccines
-
-
+Fork me on GitHub
+
Batch Codes of Coronavirus 2019 Vaccines
+
+
+
+
+
+Check out your batch code (Last updated: February 10, 2023)
-
-
- Check out your batch code (Last updated: February 10, 2023)
-
-
-
-
- |
- Batch |
- Adverse Reaction Reports |
- Deaths |
- Disabilities |
- Life Threatening Illnesses |
- Company |
- Countries |
- Severe reports |
- Lethality |
-
-
-
- Data Source:
- Vaccine Adverse Event Reporting System
+
+
+
+ |
+Batch |
+Adverse Reaction Reports |
+Deaths |
+Disabilities |
+Life Threatening Illnesses |
+Company |
+Countries |
+Severe reports |
+Lethality |
+
+
+
+Data Source:
+Vaccine Adverse Event Reporting System
(VAERS)
-
-
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
diff --git a/docs/data/histograms/Afghanistan/2612.json b/docs/data/histograms/Afghanistan/2612.json
index 36b25334e70..a5d486ffc20 100644
--- a/docs/data/histograms/Afghanistan/2612.json
+++ b/docs/data/histograms/Afghanistan/2612.json
@@ -1 +1 @@
-{"batchcode": "2612", "histograms": [{"batchcodes": ["2612"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "2612", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["2612"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Afghanistan/PAA156571.json b/docs/data/histograms/Afghanistan/PAA156571.json
index c921f7ea5b0..1c2ea1a7bfe 100644
--- a/docs/data/histograms/Afghanistan/PAA156571.json
+++ b/docs/data/histograms/Afghanistan/PAA156571.json
@@ -1 +1 @@
-{"batchcode": "PAA156571", "histograms": [{"batchcodes": ["PAA156571"], "histogram": {"Cerebral thrombosis": 1, "Product administered at inappropriate site": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA156571", "histograms": [{"histogram": {"Cerebral thrombosis": 1, "Product administered at inappropriate site": 1}, "batchcodes": ["PAA156571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/016B21A.json b/docs/data/histograms/Albania/016B21A.json
index 889f76fd9a0..013b8ede498 100644
--- a/docs/data/histograms/Albania/016B21A.json
+++ b/docs/data/histograms/Albania/016B21A.json
@@ -1 +1 @@
-{"batchcode": "016B21A", "histograms": [{"batchcodes": ["016B21A"], "histogram": {"Dysphagia": 1, "Sensation of foreign body": 1}}]}
\ No newline at end of file
+{"batchcode": "016B21A", "histograms": [{"histogram": {"Dysphagia": 1, "Sensation of foreign body": 1}, "batchcodes": ["016B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/031A21A.json b/docs/data/histograms/Albania/031A21A.json
index 7304ffa876f..b98d86ba152 100644
--- a/docs/data/histograms/Albania/031A21A.json
+++ b/docs/data/histograms/Albania/031A21A.json
@@ -1 +1 @@
-{"batchcode": "031A21A", "histograms": [{"batchcodes": ["031A21A"], "histogram": {"Syringe issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "031A21A", "histograms": [{"histogram": {"Syringe issue": 1, "Underdose": 1}, "batchcodes": ["031A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/045L21A.json b/docs/data/histograms/Albania/045L21A.json
index 1e635f1279e..15a43fc4d14 100644
--- a/docs/data/histograms/Albania/045L21A.json
+++ b/docs/data/histograms/Albania/045L21A.json
@@ -1 +1 @@
-{"batchcode": "045L21A", "histograms": [{"batchcodes": ["045L21A"], "histogram": {"No adverse event": 2, "Unevaluable event": 1}}]}
\ No newline at end of file
+{"batchcode": "045L21A", "histograms": [{"histogram": {"No adverse event": 2, "Unevaluable event": 1}, "batchcodes": ["045L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/EP6955.json b/docs/data/histograms/Albania/EP6955.json
index 4ca6abfe4fd..50ce3258153 100644
--- a/docs/data/histograms/Albania/EP6955.json
+++ b/docs/data/histograms/Albania/EP6955.json
@@ -1 +1 @@
-{"batchcode": "EP6955", "histograms": [{"batchcodes": ["EP6955", "ER8735"], "histogram": {"Hypomenorrhoea": 1, "Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6955", "histograms": [{"histogram": {"Hypomenorrhoea": 1, "Menstruation irregular": 1}, "batchcodes": ["EP6955", "ER8735"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/ER7449.json b/docs/data/histograms/Albania/ER7449.json
index 811e08ec057..38dc4fa0057 100644
--- a/docs/data/histograms/Albania/ER7449.json
+++ b/docs/data/histograms/Albania/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Thrombotic thrombocytopenic purpura": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Thrombotic thrombocytopenic purpura": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/ER8735.json b/docs/data/histograms/Albania/ER8735.json
index 57486c3a96d..5bf03d0492d 100644
--- a/docs/data/histograms/Albania/ER8735.json
+++ b/docs/data/histograms/Albania/ER8735.json
@@ -1 +1 @@
-{"batchcode": "ER8735", "histograms": [{"batchcodes": ["EP6955", "ER8735"], "histogram": {"Hypomenorrhoea": 1, "Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8735", "histograms": [{"histogram": {"Hypomenorrhoea": 1, "Menstruation irregular": 1}, "batchcodes": ["EP6955", "ER8735"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/FF8871.json b/docs/data/histograms/Albania/FF8871.json
index 6e479666dd7..f390784afc8 100644
--- a/docs/data/histograms/Albania/FF8871.json
+++ b/docs/data/histograms/Albania/FF8871.json
@@ -1 +1 @@
-{"batchcode": "FF8871", "histograms": [{"batchcodes": ["FF8871"], "histogram": {"Neuropathy peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8871", "histograms": [{"histogram": {"Neuropathy peripheral": 1}, "batchcodes": ["FF8871"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Albania/FG6270.json b/docs/data/histograms/Albania/FG6270.json
index ba9a39c5e8c..604754ecf73 100644
--- a/docs/data/histograms/Albania/FG6270.json
+++ b/docs/data/histograms/Albania/FG6270.json
@@ -1 +1 @@
-{"batchcode": "FG6270", "histograms": [{"batchcodes": ["FG6270"], "histogram": {"Ear discomfort": 1, "Ear pain": 1, "Lymphadenopathy": 1, "Tinnitus": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FG6270", "histograms": [{"histogram": {"Ear discomfort": 1, "Ear pain": 1, "Lymphadenopathy": 1, "Tinnitus": 1, "Vertigo": 1}, "batchcodes": ["FG6270"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Algeria/UNK.json b/docs/data/histograms/Algeria/UNK.json
index e0f3dfc8425..0430589b093 100644
--- a/docs/data/histograms/Algeria/UNK.json
+++ b/docs/data/histograms/Algeria/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK"], "histogram": {"Epilepsy": 1, "Monoplegia": 1, "Pain": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"Epilepsy": 1, "Monoplegia": 1, "Pain": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/American Samoa/EN5318.json b/docs/data/histograms/American Samoa/EN5318.json
index 540e35e00a5..01cbdc04fd2 100644
--- a/docs/data/histograms/American Samoa/EN5318.json
+++ b/docs/data/histograms/American Samoa/EN5318.json
@@ -1 +1 @@
-{"batchcode": "EN5318", "histograms": [{"batchcodes": ["EN5318"], "histogram": {"Chills": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EN5318", "histograms": [{"histogram": {"Chills": 1, "Pain": 1}, "batchcodes": ["EN5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/American Samoa/FH8020.json b/docs/data/histograms/American Samoa/FH8020.json
index c2bc004ca9d..6911047daaa 100644
--- a/docs/data/histograms/American Samoa/FH8020.json
+++ b/docs/data/histograms/American Samoa/FH8020.json
@@ -1 +1 @@
-{"batchcode": "FH8020", "histograms": [{"batchcodes": ["FH8020"], "histogram": {"Blindness unilateral": 1, "Bone pain": 1, "Breast cancer stage IV": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8020", "histograms": [{"histogram": {"Blindness unilateral": 1, "Bone pain": 1, "Breast cancer stage IV": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FH8020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/0.json b/docs/data/histograms/Argentina/0.json
index cdad8af8add..cd2573bc78f 100644
--- a/docs/data/histograms/Argentina/0.json
+++ b/docs/data/histograms/Argentina/0.json
@@ -1 +1 @@
-{"batchcode": "0", "histograms": [{"batchcodes": ["0"], "histogram": {"Acute respiratory distress syndrome": 1, "Gestational hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "0", "histograms": [{"histogram": {"Acute respiratory distress syndrome": 1, "Gestational hypertension": 1}, "batchcodes": ["0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/000342A.json b/docs/data/histograms/Argentina/000342A.json
index 7b351aef9e8..ffbef8fc08f 100644
--- a/docs/data/histograms/Argentina/000342A.json
+++ b/docs/data/histograms/Argentina/000342A.json
@@ -1 +1 @@
-{"batchcode": "000342A", "histograms": [{"batchcodes": ["000342A"], "histogram": {"Rash": 2, "Conjunctivitis": 1, "Diarrhoea": 1, "Epilepsy": 1, "Erythema": 1, "Febrile convulsion": 1, "Hypersensitivity": 1, "Nausea": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Somnolence": 1, "Vaccination complication": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000342A", "histograms": [{"histogram": {"Rash": 2, "Conjunctivitis": 1, "Diarrhoea": 1, "Epilepsy": 1, "Erythema": 1, "Febrile convulsion": 1, "Hypersensitivity": 1, "Nausea": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Somnolence": 1, "Vaccination complication": 1, "Vomiting": 1}, "batchcodes": ["000342A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/00342A.json b/docs/data/histograms/Argentina/00342A.json
index 5ccd35c9a0d..48f78f7a0ee 100644
--- a/docs/data/histograms/Argentina/00342A.json
+++ b/docs/data/histograms/Argentina/00342A.json
@@ -1 +1 @@
-{"batchcode": "00342A", "histograms": [{"batchcodes": ["00342A"], "histogram": {"Acute disseminated encephalomyelitis": 1, "Confusional state": 1}}]}
\ No newline at end of file
+{"batchcode": "00342A", "histograms": [{"histogram": {"Acute disseminated encephalomyelitis": 1, "Confusional state": 1}, "batchcodes": ["00342A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/004M21A.json b/docs/data/histograms/Argentina/004M21A.json
index 8c2d455e474..fa3ca93cbe0 100644
--- a/docs/data/histograms/Argentina/004M21A.json
+++ b/docs/data/histograms/Argentina/004M21A.json
@@ -1 +1 @@
-{"batchcode": "004M21A", "histograms": [{"batchcodes": ["004M21A"], "histogram": {"Expired product administered": 5, "No adverse event": 5}}]}
\ No newline at end of file
+{"batchcode": "004M21A", "histograms": [{"histogram": {"Expired product administered": 5, "No adverse event": 5}, "batchcodes": ["004M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/006C21A.json b/docs/data/histograms/Argentina/006C21A.json
index d1b49f7399f..5c0897d6739 100644
--- a/docs/data/histograms/Argentina/006C21A.json
+++ b/docs/data/histograms/Argentina/006C21A.json
@@ -1 +1 @@
-{"batchcode": "006C21A", "histograms": [{"batchcodes": ["006C21A"], "histogram": {"No adverse event": 12, "Product storage error": 9, "Expired product administered": 6}}]}
\ No newline at end of file
+{"batchcode": "006C21A", "histograms": [{"histogram": {"No adverse event": 12, "Product storage error": 9, "Expired product administered": 6}, "batchcodes": ["006C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/007D22A.json b/docs/data/histograms/Argentina/007D22A.json
index 8f969f55d6a..7fab9284a89 100644
--- a/docs/data/histograms/Argentina/007D22A.json
+++ b/docs/data/histograms/Argentina/007D22A.json
@@ -1 +1 @@
-{"batchcode": "007D22A", "histograms": [{"batchcodes": ["007D22A"], "histogram": {"Anaphylactic reaction": 1, "Oedema peripheral": 1, "Rash": 1, "Tachycardia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "007D22A", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Oedema peripheral": 1, "Rash": 1, "Tachycardia": 1, "Vision blurred": 1}, "batchcodes": ["007D22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/007J21-2A.json b/docs/data/histograms/Argentina/007J21-2A.json
index 993e21485c8..3f83540bf8f 100644
--- a/docs/data/histograms/Argentina/007J21-2A.json
+++ b/docs/data/histograms/Argentina/007J21-2A.json
@@ -1 +1 @@
-{"batchcode": "007J21-2A", "histograms": [{"batchcodes": ["007J21-2A"], "histogram": {"Expired product administered": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "007J21-2A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1}, "batchcodes": ["007J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/013M20A.json b/docs/data/histograms/Argentina/013M20A.json
index 7ada3f025fa..4cef5240764 100644
--- a/docs/data/histograms/Argentina/013M20A.json
+++ b/docs/data/histograms/Argentina/013M20A.json
@@ -1 +1 @@
-{"batchcode": "013M20A", "histograms": [{"batchcodes": ["013M20A", "0411L20A"], "histogram": {"Chills": 1, "Ear pruritus": 1, "Ear swelling": 1, "Feeling hot": 1, "Lip swelling": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Syncope": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A", "histograms": [{"histogram": {"Chills": 1, "Ear pruritus": 1, "Ear swelling": 1, "Feeling hot": 1, "Lip swelling": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Syncope": 1, "Urticaria": 1}, "batchcodes": ["013M20A", "0411L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/015M20A.json b/docs/data/histograms/Argentina/015M20A.json
index b629c7ded94..7768e93fdb2 100644
--- a/docs/data/histograms/Argentina/015M20A.json
+++ b/docs/data/histograms/Argentina/015M20A.json
@@ -1 +1 @@
-{"batchcode": "015M20A", "histograms": [{"batchcodes": ["015M20A"], "histogram": {"Chills": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20A", "histograms": [{"histogram": {"Chills": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["015M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/022D1A.json b/docs/data/histograms/Argentina/022D1A.json
index fdf71dea35c..6645720ffc5 100644
--- a/docs/data/histograms/Argentina/022D1A.json
+++ b/docs/data/histograms/Argentina/022D1A.json
@@ -1 +1 @@
-{"batchcode": "022D1A", "histograms": [{"batchcodes": ["022D1A"], "histogram": {"Immunisation reaction": 1, "Ischaemic stroke": 1}}]}
\ No newline at end of file
+{"batchcode": "022D1A", "histograms": [{"histogram": {"Immunisation reaction": 1, "Ischaemic stroke": 1}, "batchcodes": ["022D1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/022D21A.json b/docs/data/histograms/Argentina/022D21A.json
index 7c80afca6bc..90de99a2326 100644
--- a/docs/data/histograms/Argentina/022D21A.json
+++ b/docs/data/histograms/Argentina/022D21A.json
@@ -1 +1 @@
-{"batchcode": "022D21A", "histograms": [{"batchcodes": ["022D21A"], "histogram": {"SARS-CoV-2 test": 26, "Immunisation reaction": 15, "Pyrexia": 9, "Headache": 7, "Pain": 7, "Swelling": 4, "Vaccination complication": 4, "Irritability": 3, "Acute myocardial infarction": 2, "Erythema": 2, "Hypertensive crisis": 2, "Immune thrombocytopenia": 2, "Induration": 2, "Multiple sclerosis": 2, "Seizure": 2, "Syncope": 2, "Anaemia": 1, "Anaphylactic reaction": 1, "Arrhythmia": 1, "Asthmatic crisis": 1, "Cardiac contusion": 1, "Cardiac failure": 1, "Cellulitis": 1, "Confusional state": 1, "Death": 1, "Diarrhoea": 1, "Embolism": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Hypersensitivity": 1, "Hypertension": 1, "Ischaemic stroke": 1, "Local reaction": 1, "Myalgia": 1, "Ophthalmic herpes zoster": 1, "Paraesthesia": 1, "Pericarditis": 1, "Photophobia": 1, "Pneumonia": 1, "SARS-CoV-1 test negative": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Severe acute respiratory syndrome": 1, "Supraventricular tachycardia": 1, "Thrombocytopenic purpura": 1}}]}
\ No newline at end of file
+{"batchcode": "022D21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 26, "Immunisation reaction": 15, "Pyrexia": 9, "Headache": 7, "Pain": 7, "Swelling": 4, "Vaccination complication": 4, "Irritability": 3, "Acute myocardial infarction": 2, "Erythema": 2, "Hypertensive crisis": 2, "Immune thrombocytopenia": 2, "Induration": 2, "Multiple sclerosis": 2, "Seizure": 2, "Syncope": 2, "Anaemia": 1, "Anaphylactic reaction": 1, "Arrhythmia": 1, "Asthmatic crisis": 1, "Cardiac contusion": 1, "Cardiac failure": 1, "Cellulitis": 1, "Confusional state": 1, "Death": 1, "Diarrhoea": 1, "Embolism": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Hypersensitivity": 1, "Hypertension": 1, "Ischaemic stroke": 1, "Local reaction": 1, "Myalgia": 1, "Ophthalmic herpes zoster": 1, "Paraesthesia": 1, "Pericarditis": 1, "Photophobia": 1, "Pneumonia": 1, "SARS-CoV-1 test negative": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Severe acute respiratory syndrome": 1, "Supraventricular tachycardia": 1, "Thrombocytopenic purpura": 1}, "batchcodes": ["022D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/02402IA.json b/docs/data/histograms/Argentina/02402IA.json
index 86d4447a3de..c59761b0205 100644
--- a/docs/data/histograms/Argentina/02402IA.json
+++ b/docs/data/histograms/Argentina/02402IA.json
@@ -1 +1 @@
-{"batchcode": "02402IA", "histograms": [{"batchcodes": ["02402IA"], "histogram": {"Pancytopenia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "02402IA", "histograms": [{"histogram": {"Pancytopenia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["02402IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/024D/21A.json b/docs/data/histograms/Argentina/024D/21A.json
index 852a58df07b..4925ca341c5 100644
--- a/docs/data/histograms/Argentina/024D/21A.json
+++ b/docs/data/histograms/Argentina/024D/21A.json
@@ -1 +1 @@
-{"batchcode": "024D/21A", "histograms": [{"batchcodes": ["024D/21A"], "histogram": {"Deep vein thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "024D/21A", "histograms": [{"histogram": {"Deep vein thrombosis": 1}, "batchcodes": ["024D/21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/024D21A.json b/docs/data/histograms/Argentina/024D21A.json
index a1b69759299..dc7393dae29 100644
--- a/docs/data/histograms/Argentina/024D21A.json
+++ b/docs/data/histograms/Argentina/024D21A.json
@@ -1 +1 @@
-{"batchcode": "024D21A", "histograms": [{"batchcodes": ["024D21A"], "histogram": {"Headache": 8, "Immunisation reaction": 8, "SARS-CoV-2 test": 7, "Pain": 6, "Pyrexia": 5, "Seizure": 4, "Swelling": 4, "Syncope": 4, "Confusional state": 2, "Hypersensitivity": 2, "Hypotonia": 2, "Abdominal pain": 1, "Acute cardiac event": 1, "Arthralgia": 1, "Arthritis bacterial": 1, "Asthenia": 1, "Cerebellar syndrome": 1, "Diarrhoea": 1, "Disability": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dysaesthesia": 1, "Erythema": 1, "Erythema multiforme": 1, "Hypertension": 1, "Hypoacusis": 1, "Induration": 1, "Insomnia": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Paraesthesia": 1, "Pneumonia": 1, "Presyncope": 1, "Pulmonary endarterectomy": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "024D21A", "histograms": [{"histogram": {"Headache": 8, "Immunisation reaction": 8, "SARS-CoV-2 test": 7, "Pain": 6, "Pyrexia": 5, "Seizure": 4, "Swelling": 4, "Syncope": 4, "Confusional state": 2, "Hypersensitivity": 2, "Hypotonia": 2, "Abdominal pain": 1, "Acute cardiac event": 1, "Arthralgia": 1, "Arthritis bacterial": 1, "Asthenia": 1, "Cerebellar syndrome": 1, "Diarrhoea": 1, "Disability": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dysaesthesia": 1, "Erythema": 1, "Erythema multiforme": 1, "Hypertension": 1, "Hypoacusis": 1, "Induration": 1, "Insomnia": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Paraesthesia": 1, "Pneumonia": 1, "Presyncope": 1, "Pulmonary endarterectomy": 1, "Thrombocytopenia": 1}, "batchcodes": ["024D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/024D21D.json b/docs/data/histograms/Argentina/024D21D.json
index 21976bbe424..f3729d59859 100644
--- a/docs/data/histograms/Argentina/024D21D.json
+++ b/docs/data/histograms/Argentina/024D21D.json
@@ -1 +1 @@
-{"batchcode": "024D21D", "histograms": [{"batchcodes": ["024D21D"], "histogram": {"Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "024D21D", "histograms": [{"histogram": {"Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["024D21D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/024D21R.json b/docs/data/histograms/Argentina/024D21R.json
index a506759874a..37fbb26ef67 100644
--- a/docs/data/histograms/Argentina/024D21R.json
+++ b/docs/data/histograms/Argentina/024D21R.json
@@ -1 +1 @@
-{"batchcode": "024D21R", "histograms": [{"batchcodes": ["024D21R"], "histogram": {"Cellulitis": 1, "Erythema": 1, "Immunisation reaction": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "024D21R", "histograms": [{"histogram": {"Cellulitis": 1, "Erythema": 1, "Immunisation reaction": 1, "Pyrexia": 1}, "batchcodes": ["024D21R"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/026D21A.json b/docs/data/histograms/Argentina/026D21A.json
index dcd0cf6575a..63a3bc7970d 100644
--- a/docs/data/histograms/Argentina/026D21A.json
+++ b/docs/data/histograms/Argentina/026D21A.json
@@ -1 +1 @@
-{"batchcode": "026D21A", "histograms": [{"batchcodes": ["026D21A"], "histogram": {"Extra dose administered": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "026D21A", "histograms": [{"histogram": {"Extra dose administered": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1}, "batchcodes": ["026D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/026E22A.json b/docs/data/histograms/Argentina/026E22A.json
index 513c67905a1..2fdda7b53f6 100644
--- a/docs/data/histograms/Argentina/026E22A.json
+++ b/docs/data/histograms/Argentina/026E22A.json
@@ -1 +1 @@
-{"batchcode": "026E22A", "histograms": [{"batchcodes": ["026E22A"], "histogram": {"Febrile convulsion": 2}}]}
\ No newline at end of file
+{"batchcode": "026E22A", "histograms": [{"histogram": {"Febrile convulsion": 2}, "batchcodes": ["026E22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/030M20A.json b/docs/data/histograms/Argentina/030M20A.json
index 1ee54c38b55..15ea89cd80f 100644
--- a/docs/data/histograms/Argentina/030M20A.json
+++ b/docs/data/histograms/Argentina/030M20A.json
@@ -1 +1 @@
-{"batchcode": "030M20A", "histograms": [{"batchcodes": ["030M20A"], "histogram": {"Genital herpes": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20A", "histograms": [{"histogram": {"Genital herpes": 1}, "batchcodes": ["030M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/039D21A.json b/docs/data/histograms/Argentina/039D21A.json
index 57384294940..0143e94a4ca 100644
--- a/docs/data/histograms/Argentina/039D21A.json
+++ b/docs/data/histograms/Argentina/039D21A.json
@@ -1 +1 @@
-{"batchcode": "039D21A", "histograms": [{"batchcodes": ["039D21A"], "histogram": {"Axillary pain": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Lymphadenopathy": 1, "Mammogram abnormal": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "039D21A", "histograms": [{"histogram": {"Axillary pain": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Lymphadenopathy": 1, "Mammogram abnormal": 1, "Paraesthesia": 1}, "batchcodes": ["039D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/040C21A.json b/docs/data/histograms/Argentina/040C21A.json
index 78f2bbb545a..39995d00983 100644
--- a/docs/data/histograms/Argentina/040C21A.json
+++ b/docs/data/histograms/Argentina/040C21A.json
@@ -1 +1 @@
-{"batchcode": "040C21A", "histograms": [{"batchcodes": ["040C21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Pain in extremity": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "040C21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Pain in extremity": 1, "Product storage error": 1}, "batchcodes": ["040C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/040D21A.json b/docs/data/histograms/Argentina/040D21A.json
index 3b5fbef29d7..e7c567252d9 100644
--- a/docs/data/histograms/Argentina/040D21A.json
+++ b/docs/data/histograms/Argentina/040D21A.json
@@ -1 +1 @@
-{"batchcode": "040D21A", "histograms": [{"batchcodes": ["040D21A"], "histogram": {"Interchange of vaccine products": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "040D21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["040D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/0411L20A.json b/docs/data/histograms/Argentina/0411L20A.json
index 649c9da3e88..16bab40d545 100644
--- a/docs/data/histograms/Argentina/0411L20A.json
+++ b/docs/data/histograms/Argentina/0411L20A.json
@@ -1 +1 @@
-{"batchcode": "0411L20A", "histograms": [{"batchcodes": ["013M20A", "0411L20A"], "histogram": {"Chills": 1, "Ear pruritus": 1, "Ear swelling": 1, "Feeling hot": 1, "Lip swelling": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Syncope": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0411L20A", "histograms": [{"histogram": {"Chills": 1, "Ear pruritus": 1, "Ear swelling": 1, "Feeling hot": 1, "Lip swelling": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Syncope": 1, "Urticaria": 1}, "batchcodes": ["013M20A", "0411L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/042L20A.json b/docs/data/histograms/Argentina/042L20A.json
index 05d5b63762f..a9b512ee567 100644
--- a/docs/data/histograms/Argentina/042L20A.json
+++ b/docs/data/histograms/Argentina/042L20A.json
@@ -1 +1 @@
-{"batchcode": "042L20A", "histograms": [{"batchcodes": ["042L20A"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site rash": 1, "Injection site streaking": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "042L20A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site rash": 1, "Injection site streaking": 1, "Injection site warmth": 1}, "batchcodes": ["042L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/045C22A.json b/docs/data/histograms/Argentina/045C22A.json
index d521763139f..f13e13489ea 100644
--- a/docs/data/histograms/Argentina/045C22A.json
+++ b/docs/data/histograms/Argentina/045C22A.json
@@ -1 +1 @@
-{"batchcode": "045C22A", "histograms": [{"batchcodes": ["045C22A"], "histogram": {"Pain": 2, "Pyrexia": 2, "Swelling": 2, "Anaphylactic reaction": 1, "Encephalitis": 1, "Headache": 1, "Induration": 1, "Inflammation": 1, "Medication error": 1, "Rash": 1, "Seizure": 1, "Supraventricular tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "045C22A", "histograms": [{"histogram": {"Pain": 2, "Pyrexia": 2, "Swelling": 2, "Anaphylactic reaction": 1, "Encephalitis": 1, "Headache": 1, "Induration": 1, "Inflammation": 1, "Medication error": 1, "Rash": 1, "Seizure": 1, "Supraventricular tachycardia": 1, "Vomiting": 1}, "batchcodes": ["045C22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/053M21.json b/docs/data/histograms/Argentina/053M21.json
index 51418437054..dde7139489a 100644
--- a/docs/data/histograms/Argentina/053M21.json
+++ b/docs/data/histograms/Argentina/053M21.json
@@ -1 +1 @@
-{"batchcode": "053M21", "histograms": [{"batchcodes": ["053M21"], "histogram": {"Optic neuritis": 1}}]}
\ No newline at end of file
+{"batchcode": "053M21", "histograms": [{"histogram": {"Optic neuritis": 1}, "batchcodes": ["053M21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/053M21A.json b/docs/data/histograms/Argentina/053M21A.json
index 6ef6ca3cbdf..c7339a5fdba 100644
--- a/docs/data/histograms/Argentina/053M21A.json
+++ b/docs/data/histograms/Argentina/053M21A.json
@@ -1 +1 @@
-{"batchcode": "053M21A", "histograms": [{"batchcodes": ["053M21A"], "histogram": {"Cerebrovascular accident": 5, "Pain": 4, "Seizure": 3, "Vaccination complication": 3, "Acute myocardial infarction": 2, "Coagulopathy": 2, "Confusional state": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Induration": 2, "Irritability": 2, "Pyrexia": 2, "Anxiety": 1, "Arrhythmia": 1, "Blood pressure measurement": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Chest pain": 1, "Coronary artery disease": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Foetal death": 1, "Gastroschisis": 1, "Headache": 1, "Hypotonia": 1, "Immunisation reaction": 1, "Inflammation": 1, "Leukaemia": 1, "Medication error": 1, "Microangiopathy": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pulmonary thrombosis": 1, "Swelling": 1, "Syncope": 1, "Troponin T": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "053M21A", "histograms": [{"histogram": {"Cerebrovascular accident": 5, "Pain": 4, "Seizure": 3, "Vaccination complication": 3, "Acute myocardial infarction": 2, "Coagulopathy": 2, "Confusional state": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Induration": 2, "Irritability": 2, "Pyrexia": 2, "Anxiety": 1, "Arrhythmia": 1, "Blood pressure measurement": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Chest pain": 1, "Coronary artery disease": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Foetal death": 1, "Gastroschisis": 1, "Headache": 1, "Hypotonia": 1, "Immunisation reaction": 1, "Inflammation": 1, "Leukaemia": 1, "Medication error": 1, "Microangiopathy": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pulmonary thrombosis": 1, "Swelling": 1, "Syncope": 1, "Troponin T": 1, "Vasculitis": 1}, "batchcodes": ["053M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/068B22A.json b/docs/data/histograms/Argentina/068B22A.json
index edbfcc791f6..0e070085378 100644
--- a/docs/data/histograms/Argentina/068B22A.json
+++ b/docs/data/histograms/Argentina/068B22A.json
@@ -1 +1 @@
-{"batchcode": "068B22A", "histograms": [{"batchcodes": ["068B22A"], "histogram": {"Erythema": 2, "Erythema multiforme": 2, "Cellulitis": 1, "Cerebrovascular accident": 1, "Death": 1, "Deep vein thrombosis": 1, "Hypersensitivity": 1, "Medication error": 1, "Pneumonia": 1, "Polyarthritis": 1, "Pruritus": 1, "Sudden death": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "068B22A", "histograms": [{"histogram": {"Erythema": 2, "Erythema multiforme": 2, "Cellulitis": 1, "Cerebrovascular accident": 1, "Death": 1, "Deep vein thrombosis": 1, "Hypersensitivity": 1, "Medication error": 1, "Pneumonia": 1, "Polyarthritis": 1, "Pruritus": 1, "Sudden death": 1, "Vaccination complication": 1}, "batchcodes": ["068B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/068B22R.json b/docs/data/histograms/Argentina/068B22R.json
index 72a4d212c2e..8ca03928926 100644
--- a/docs/data/histograms/Argentina/068B22R.json
+++ b/docs/data/histograms/Argentina/068B22R.json
@@ -1 +1 @@
-{"batchcode": "068B22R", "histograms": [{"batchcodes": ["068B22R"], "histogram": {"Lymphadenopathy": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "068B22R", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Pain": 1}, "batchcodes": ["068B22R"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/068B23A.json b/docs/data/histograms/Argentina/068B23A.json
index 9deef27fbdc..0506d93d6f5 100644
--- a/docs/data/histograms/Argentina/068B23A.json
+++ b/docs/data/histograms/Argentina/068B23A.json
@@ -1 +1 @@
-{"batchcode": "068B23A", "histograms": [{"batchcodes": ["068B23A"], "histogram": {"Acute myocardial infarction": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Oxygen saturation": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "068B23A", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Oxygen saturation": 1, "Vaccination complication": 1}, "batchcodes": ["068B23A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/078C21.json b/docs/data/histograms/Argentina/078C21.json
index 75176a92620..11f1125f983 100644
--- a/docs/data/histograms/Argentina/078C21.json
+++ b/docs/data/histograms/Argentina/078C21.json
@@ -1 +1 @@
-{"batchcode": "078C21", "histograms": [{"batchcodes": ["078C21"], "histogram": {"SARS-CoV-2 test": 8, "Cardiac failure congestive": 3, "Acute cardiac event": 2, "Acute myocardial infarction": 2, "Ischaemic stroke": 1}}]}
\ No newline at end of file
+{"batchcode": "078C21", "histograms": [{"histogram": {"SARS-CoV-2 test": 8, "Cardiac failure congestive": 3, "Acute cardiac event": 2, "Acute myocardial infarction": 2, "Ischaemic stroke": 1}, "batchcodes": ["078C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/078C217.json b/docs/data/histograms/Argentina/078C217.json
index 5ebf407ab23..b3eeb517414 100644
--- a/docs/data/histograms/Argentina/078C217.json
+++ b/docs/data/histograms/Argentina/078C217.json
@@ -1 +1 @@
-{"batchcode": "078C217", "histograms": [{"batchcodes": ["078C217"], "histogram": {"Cellulitis": 1, "SARS-CoV-2 test": 1, "Skin plaque": 1}}]}
\ No newline at end of file
+{"batchcode": "078C217", "histograms": [{"histogram": {"Cellulitis": 1, "SARS-CoV-2 test": 1, "Skin plaque": 1}, "batchcodes": ["078C217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/078C21A.json b/docs/data/histograms/Argentina/078C21A.json
index 9594bad96d1..bed78863ac9 100644
--- a/docs/data/histograms/Argentina/078C21A.json
+++ b/docs/data/histograms/Argentina/078C21A.json
@@ -1 +1 @@
-{"batchcode": "078C21A", "histograms": [{"batchcodes": ["078C21A"], "histogram": {"SARS-CoV-2 test": 7, "Pain": 4, "Pyrexia": 4, "Immunisation reaction": 2, "Acute cardiac event": 1, "Acute coronary syndrome": 1, "Arthralgia": 1, "Asthmatic crisis": 1, "Cardiac failure congestive": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Headache": 1, "Hypersensitivity": 1, "Hypertension": 1, "Myalgia": 1, "Myocarditis": 1, "Optic ischaemic neuropathy": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "078C21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 7, "Pain": 4, "Pyrexia": 4, "Immunisation reaction": 2, "Acute cardiac event": 1, "Acute coronary syndrome": 1, "Arthralgia": 1, "Asthmatic crisis": 1, "Cardiac failure congestive": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Headache": 1, "Hypersensitivity": 1, "Hypertension": 1, "Myalgia": 1, "Myocarditis": 1, "Optic ischaemic neuropathy": 1, "Vaccination complication": 1}, "batchcodes": ["078C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/078R21A.json b/docs/data/histograms/Argentina/078R21A.json
index 1b3084f70f4..4932aa939f9 100644
--- a/docs/data/histograms/Argentina/078R21A.json
+++ b/docs/data/histograms/Argentina/078R21A.json
@@ -1 +1 @@
-{"batchcode": "078R21A", "histograms": [{"batchcodes": ["078R21A"], "histogram": {"Erythema": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "078R21A", "histograms": [{"histogram": {"Erythema": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["078R21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/0800C21A.json b/docs/data/histograms/Argentina/0800C21A.json
index 330c4007930..29da68e16a0 100644
--- a/docs/data/histograms/Argentina/0800C21A.json
+++ b/docs/data/histograms/Argentina/0800C21A.json
@@ -1 +1 @@
-{"batchcode": "0800C21A", "histograms": [{"batchcodes": ["0800C21A"], "histogram": {"Confusional state": 1, "SARS-CoV-2 test": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "0800C21A", "histograms": [{"histogram": {"Confusional state": 1, "SARS-CoV-2 test": 1, "Seizure": 1}, "batchcodes": ["0800C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/080C/21A.json b/docs/data/histograms/Argentina/080C/21A.json
index af7987ed468..13be2954e28 100644
--- a/docs/data/histograms/Argentina/080C/21A.json
+++ b/docs/data/histograms/Argentina/080C/21A.json
@@ -1 +1 @@
-{"batchcode": "080C/21A", "histograms": [{"batchcodes": ["080C/21A"], "histogram": {"SARS-CoV-2 test": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "080C/21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Seizure": 1}, "batchcodes": ["080C/21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/080C21.json b/docs/data/histograms/Argentina/080C21.json
index 29a3c46b7d2..d914fb9204d 100644
--- a/docs/data/histograms/Argentina/080C21.json
+++ b/docs/data/histograms/Argentina/080C21.json
@@ -1 +1 @@
-{"batchcode": "080C21", "histograms": [{"batchcodes": ["080C21"], "histogram": {"Cerebral infarction": 1, "Cerebrovascular accident": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "080C21", "histograms": [{"histogram": {"Cerebral infarction": 1, "Cerebrovascular accident": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["080C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/080C214.json b/docs/data/histograms/Argentina/080C214.json
index 85f359746a8..0d19fb2d82f 100644
--- a/docs/data/histograms/Argentina/080C214.json
+++ b/docs/data/histograms/Argentina/080C214.json
@@ -1 +1 @@
-{"batchcode": "080C214", "histograms": [{"batchcodes": ["080C214"], "histogram": {"Anxiety": 1, "Asphyxia": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Dizziness": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "080C214", "histograms": [{"histogram": {"Anxiety": 1, "Asphyxia": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Dizziness": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["080C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/080C217.json b/docs/data/histograms/Argentina/080C217.json
index ce3d087fb2b..d0731719533 100644
--- a/docs/data/histograms/Argentina/080C217.json
+++ b/docs/data/histograms/Argentina/080C217.json
@@ -1 +1 @@
-{"batchcode": "080C217", "histograms": [{"batchcodes": ["080C217"], "histogram": {"Erythema": 1, "Local reaction": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "080C217", "histograms": [{"histogram": {"Erythema": 1, "Local reaction": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Swelling": 1}, "batchcodes": ["080C217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/080C21A.json b/docs/data/histograms/Argentina/080C21A.json
index 2c0f6630803..ade8a005093 100644
--- a/docs/data/histograms/Argentina/080C21A.json
+++ b/docs/data/histograms/Argentina/080C21A.json
@@ -1 +1 @@
-{"batchcode": "080C21A", "histograms": [{"batchcodes": ["080C21A"], "histogram": {"SARS-CoV-2 test": 35, "Immunisation reaction": 11, "Pyrexia": 10, "Headache": 8, "Pain": 8, "Intussusception": 7, "Vaccination complication": 5, "Acute myocardial infarction": 4, "Hypersensitivity": 4, "Rash": 4, "Chills": 3, "Diarrhoea": 3, "Seizure": 3, "Swelling": 3, "Acute coronary syndrome": 2, "Arthralgia": 2, "Cerebrovascular accident": 2, "Discomfort": 2, "Erythema": 2, "Hypertensive crisis": 2, "Myalgia": 2, "Nausea": 2, "SARS-CoV-2 test positive": 2, "Syncope": 2, "Vomiting": 2, "Acute cardiac event": 1, "Acute kidney injury": 1, "Aortic thrombosis": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Blood glucose": 1, "COVID-19": 1, "Cardiac failure": 1, "Cardiovascular disorder": 1, "Cerebral infarction": 1, "Coagulopathy": 1, "Deafness": 1, "Death": 1, "Deep vein thrombosis": 1, "Embolism": 1, "Facial paralysis": 1, "Fatigue": 1, "Febrile convulsion": 1, "Gastrointestinal disorder": 1, "Haemorrhage": 1, "Hypertensive urgency": 1, "Hypotension": 1, "Inflammation": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Leukopenia": 1, "Pathology test": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "Skin reaction": 1, "Splenic thrombosis": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "080C21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 35, "Immunisation reaction": 11, "Pyrexia": 10, "Headache": 8, "Pain": 8, "Intussusception": 7, "Vaccination complication": 5, "Acute myocardial infarction": 4, "Hypersensitivity": 4, "Rash": 4, "Chills": 3, "Diarrhoea": 3, "Seizure": 3, "Swelling": 3, "Acute coronary syndrome": 2, "Arthralgia": 2, "Cerebrovascular accident": 2, "Discomfort": 2, "Erythema": 2, "Hypertensive crisis": 2, "Myalgia": 2, "Nausea": 2, "SARS-CoV-2 test positive": 2, "Syncope": 2, "Vomiting": 2, "Acute cardiac event": 1, "Acute kidney injury": 1, "Aortic thrombosis": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Blood glucose": 1, "COVID-19": 1, "Cardiac failure": 1, "Cardiovascular disorder": 1, "Cerebral infarction": 1, "Coagulopathy": 1, "Deafness": 1, "Death": 1, "Deep vein thrombosis": 1, "Embolism": 1, "Facial paralysis": 1, "Fatigue": 1, "Febrile convulsion": 1, "Gastrointestinal disorder": 1, "Haemorrhage": 1, "Hypertensive urgency": 1, "Hypotension": 1, "Inflammation": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Leukopenia": 1, "Pathology test": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "Skin reaction": 1, "Splenic thrombosis": 1, "Thrombocytopenia": 1}, "batchcodes": ["080C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/080C2IA.json b/docs/data/histograms/Argentina/080C2IA.json
index 47435cf9e61..1ac82c27ba3 100644
--- a/docs/data/histograms/Argentina/080C2IA.json
+++ b/docs/data/histograms/Argentina/080C2IA.json
@@ -1 +1 @@
-{"batchcode": "080C2IA", "histograms": [{"batchcodes": ["080C2IA"], "histogram": {"Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "080C2IA", "histograms": [{"histogram": {"Thrombocytopenia": 1}, "batchcodes": ["080C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/080L2VA.json b/docs/data/histograms/Argentina/080L2VA.json
index 07a49c487ea..a7e6a0cea0c 100644
--- a/docs/data/histograms/Argentina/080L2VA.json
+++ b/docs/data/histograms/Argentina/080L2VA.json
@@ -1 +1 @@
-{"batchcode": "080L2VA", "histograms": [{"batchcodes": ["080L2VA"], "histogram": {"SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "080L2VA", "histograms": [{"histogram": {"SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vaccination complication": 1}, "batchcodes": ["080L2VA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/085M21A.json b/docs/data/histograms/Argentina/085M21A.json
index 19a5d9212ea..174a012c8fd 100644
--- a/docs/data/histograms/Argentina/085M21A.json
+++ b/docs/data/histograms/Argentina/085M21A.json
@@ -1 +1 @@
-{"batchcode": "085M21A", "histograms": [{"batchcodes": ["085M21A"], "histogram": {"Vaccination complication": 7, "Cerebrovascular accident": 3, "Acute myocardial infarction": 2, "Pain": 2, "Acute pulmonary oedema": 1, "Arrhythmia": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Facial paralysis": 1, "Foetal growth restriction": 1, "Headache": 1, "Hypertensive crisis": 1, "Influenza like illness": 1, "Laboratory test": 1, "Myalgia": 1, "Pyrexia": 1, "Thrombocytopenia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "085M21A", "histograms": [{"histogram": {"Vaccination complication": 7, "Cerebrovascular accident": 3, "Acute myocardial infarction": 2, "Pain": 2, "Acute pulmonary oedema": 1, "Arrhythmia": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Facial paralysis": 1, "Foetal growth restriction": 1, "Headache": 1, "Hypertensive crisis": 1, "Influenza like illness": 1, "Laboratory test": 1, "Myalgia": 1, "Pyrexia": 1, "Thrombocytopenia": 1, "Vaccination site pain": 1}, "batchcodes": ["085M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/085MZIA.json b/docs/data/histograms/Argentina/085MZIA.json
index 4eaacab0c81..d30bb9c9092 100644
--- a/docs/data/histograms/Argentina/085MZIA.json
+++ b/docs/data/histograms/Argentina/085MZIA.json
@@ -1 +1 @@
-{"batchcode": "085MZIA", "histograms": [{"batchcodes": ["085MZIA"], "histogram": {"Abdominal pain": 1, "Hypotonia": 1, "Pain": 1, "Pneumonia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "085MZIA", "histograms": [{"histogram": {"Abdominal pain": 1, "Hypotonia": 1, "Pain": 1, "Pneumonia": 1, "Syncope": 1}, "batchcodes": ["085MZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/087M21A.json b/docs/data/histograms/Argentina/087M21A.json
index 3a6ad285a63..0b4f071bf2d 100644
--- a/docs/data/histograms/Argentina/087M21A.json
+++ b/docs/data/histograms/Argentina/087M21A.json
@@ -1 +1 @@
-{"batchcode": "087M21A", "histograms": [{"batchcodes": ["087M21A"], "histogram": {"Hypersensitivity": 3, "Pain": 2, "Pyrexia": 2, "Swelling": 2, "Acute pulmonary oedema": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Confusional state": 1, "Erythema": 1, "Headache": 1, "Inflammation": 1, "Myocardial ischaemia": 1, "Oxygen saturation": 1, "Respiratory distress": 1, "Seizure": 1, "Stridor": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "087M21A", "histograms": [{"histogram": {"Hypersensitivity": 3, "Pain": 2, "Pyrexia": 2, "Swelling": 2, "Acute pulmonary oedema": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Confusional state": 1, "Erythema": 1, "Headache": 1, "Inflammation": 1, "Myocardial ischaemia": 1, "Oxygen saturation": 1, "Respiratory distress": 1, "Seizure": 1, "Stridor": 1, "Vaccination complication": 1}, "batchcodes": ["087M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/087M8IA.json b/docs/data/histograms/Argentina/087M8IA.json
index db7283d9abe..ba66fffc998 100644
--- a/docs/data/histograms/Argentina/087M8IA.json
+++ b/docs/data/histograms/Argentina/087M8IA.json
@@ -1 +1 @@
-{"batchcode": "087M8IA", "histograms": [{"batchcodes": ["087M8IA"], "histogram": {"Heart rate": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "087M8IA", "histograms": [{"histogram": {"Heart rate": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["087M8IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/08C21A.json b/docs/data/histograms/Argentina/08C21A.json
index d908974e337..180888ec5cb 100644
--- a/docs/data/histograms/Argentina/08C21A.json
+++ b/docs/data/histograms/Argentina/08C21A.json
@@ -1 +1 @@
-{"batchcode": "08C21A", "histograms": [{"batchcodes": ["08C21A"], "histogram": {"Hypersensitivity": 1, "Immunisation reaction": 1, "Rash": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "08C21A", "histograms": [{"histogram": {"Hypersensitivity": 1, "Immunisation reaction": 1, "Rash": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["08C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/1808978.json b/docs/data/histograms/Argentina/1808978.json
index 90d38ec68dc..a85f967ad1f 100644
--- a/docs/data/histograms/Argentina/1808978.json
+++ b/docs/data/histograms/Argentina/1808978.json
@@ -1 +1 @@
-{"batchcode": "1808978", "histograms": [{"batchcodes": ["1808978"], "histogram": {"Malaise": 2, "Cold sweat": 1, "Headache": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Migraine": 1, "Pallor": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "1808978", "histograms": [{"histogram": {"Malaise": 2, "Cold sweat": 1, "Headache": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Migraine": 1, "Pallor": 1, "Paraesthesia": 1}, "batchcodes": ["1808978"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/1820095.json b/docs/data/histograms/Argentina/1820095.json
index 1f1f5e7df3c..438ade8459e 100644
--- a/docs/data/histograms/Argentina/1820095.json
+++ b/docs/data/histograms/Argentina/1820095.json
@@ -1 +1 @@
-{"batchcode": "1820095", "histograms": [{"batchcodes": ["1820095"], "histogram": {"Expired product administered": 2, "Product storage error": 2, "Anticoagulant therapy": 1, "Arthralgia": 1, "Chills": 1, "Erythema": 1, "Flushing": 1, "Gait disturbance": 1, "Headache": 1, "Impaired driving ability": 1, "Joint swelling": 1, "Loss of consciousness": 1, "Myalgia": 1, "Pain": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "Road traffic accident": 1, "Thrombosis": 1, "Ultrasound Doppler abnormal": 1, "Vision blurred": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1820095", "histograms": [{"histogram": {"Expired product administered": 2, "Product storage error": 2, "Anticoagulant therapy": 1, "Arthralgia": 1, "Chills": 1, "Erythema": 1, "Flushing": 1, "Gait disturbance": 1, "Headache": 1, "Impaired driving ability": 1, "Joint swelling": 1, "Loss of consciousness": 1, "Myalgia": 1, "Pain": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "Road traffic accident": 1, "Thrombosis": 1, "Ultrasound Doppler abnormal": 1, "Vision blurred": 1, "X-ray": 1}, "batchcodes": ["1820095"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/201A21A.json b/docs/data/histograms/Argentina/201A21A.json
index 8a4f2ee6a76..a56689ab171 100644
--- a/docs/data/histograms/Argentina/201A21A.json
+++ b/docs/data/histograms/Argentina/201A21A.json
@@ -1 +1 @@
-{"batchcode": "201A21A", "histograms": [{"batchcodes": ["201A21A"], "histogram": {"Blood immunoglobulin G normal": 1, "Circadian rhythm sleep disorder": 1, "Confusional state": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysstasia": 1, "Fatigue": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Polymerase chain reaction": 1, "Somnolence": 1, "Speech disorder": 1, "Vaccination failure": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "201A21A", "histograms": [{"histogram": {"Blood immunoglobulin G normal": 1, "Circadian rhythm sleep disorder": 1, "Confusional state": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysstasia": 1, "Fatigue": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Polymerase chain reaction": 1, "Somnolence": 1, "Speech disorder": 1, "Vaccination failure": 1, "Vision blurred": 1}, "batchcodes": ["201A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/20210681432.json b/docs/data/histograms/Argentina/20210681432.json
index 5e583059994..918884f23ca 100644
--- a/docs/data/histograms/Argentina/20210681432.json
+++ b/docs/data/histograms/Argentina/20210681432.json
@@ -1 +1 @@
-{"batchcode": "20210681432", "histograms": [{"batchcodes": ["20210681432"], "histogram": {"Facial paralysis": 1, "Immunisation reaction": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "20210681432", "histograms": [{"histogram": {"Facial paralysis": 1, "Immunisation reaction": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["20210681432"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/202107B1876.json b/docs/data/histograms/Argentina/202107B1876.json
index 9d0b112bddb..3e8a24a64e4 100644
--- a/docs/data/histograms/Argentina/202107B1876.json
+++ b/docs/data/histograms/Argentina/202107B1876.json
@@ -1 +1 @@
-{"batchcode": "202107B1876", "histograms": [{"batchcodes": ["202107B1876"], "histogram": {"Cerebrovascular accident": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "202107B1876", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["202107B1876"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/203A21A.json b/docs/data/histograms/Argentina/203A21A.json
index 92579556f86..9a425e4272a 100644
--- a/docs/data/histograms/Argentina/203A21A.json
+++ b/docs/data/histograms/Argentina/203A21A.json
@@ -1 +1 @@
-{"batchcode": "203A21A", "histograms": [{"batchcodes": ["203A21A"], "histogram": {"No adverse event": 2, "Underdose": 2, "Interchange of vaccine products": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "203A21A", "histograms": [{"histogram": {"No adverse event": 2, "Underdose": 2, "Interchange of vaccine products": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["203A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/205A21A.json b/docs/data/histograms/Argentina/205A21A.json
index 0915e6c491c..72ae7a1ce7c 100644
--- a/docs/data/histograms/Argentina/205A21A.json
+++ b/docs/data/histograms/Argentina/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"Abdominal pain upper": 1, "COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/211A21A.json b/docs/data/histograms/Argentina/211A21A.json
index ad385ab2093..96cdf4f87e3 100644
--- a/docs/data/histograms/Argentina/211A21A.json
+++ b/docs/data/histograms/Argentina/211A21A.json
@@ -1 +1 @@
-{"batchcode": "211A21A", "histograms": [{"batchcodes": ["211A21A"], "histogram": {"Pain in extremity": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "211A21A", "histograms": [{"histogram": {"Pain in extremity": 1, "Syncope": 1}, "batchcodes": ["211A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/211D21A.json b/docs/data/histograms/Argentina/211D21A.json
index 376c8938211..357436d3131 100644
--- a/docs/data/histograms/Argentina/211D21A.json
+++ b/docs/data/histograms/Argentina/211D21A.json
@@ -1 +1 @@
-{"batchcode": "211D21A", "histograms": [{"batchcodes": ["211D21A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "211D21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["211D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/220211.json b/docs/data/histograms/Argentina/220211.json
index a932d5e83b0..f5fd0535886 100644
--- a/docs/data/histograms/Argentina/220211.json
+++ b/docs/data/histograms/Argentina/220211.json
@@ -1 +1 @@
-{"batchcode": "220211", "histograms": [{"batchcodes": ["220211"], "histogram": {"Platelet count": 1, "Thrombocytopenia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "220211", "histograms": [{"histogram": {"Platelet count": 1, "Thrombocytopenia": 1, "Vaccination complication": 1}, "batchcodes": ["220211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/241214.json b/docs/data/histograms/Argentina/241214.json
index 048923f1b47..447f791ab32 100644
--- a/docs/data/histograms/Argentina/241214.json
+++ b/docs/data/histograms/Argentina/241214.json
@@ -1 +1 @@
-{"batchcode": "241214", "histograms": [{"batchcodes": ["241214"], "histogram": {"Immunisation reaction": 1, "Paraparesis": 1}}]}
\ No newline at end of file
+{"batchcode": "241214", "histograms": [{"histogram": {"Immunisation reaction": 1, "Paraparesis": 1}, "batchcodes": ["241214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/24D21A.json b/docs/data/histograms/Argentina/24D21A.json
index c60038de0a3..40616d30115 100644
--- a/docs/data/histograms/Argentina/24D21A.json
+++ b/docs/data/histograms/Argentina/24D21A.json
@@ -1 +1 @@
-{"batchcode": "24D21A", "histograms": [{"batchcodes": ["24D21A"], "histogram": {"Immunisation reaction": 1, "SARS-CoV-2 test": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "24D21A", "histograms": [{"histogram": {"Immunisation reaction": 1, "SARS-CoV-2 test": 1, "Seizure": 1}, "batchcodes": ["24D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/30145BA.json b/docs/data/histograms/Argentina/30145BA.json
index aff481e7dab..b9dbdb826c6 100644
--- a/docs/data/histograms/Argentina/30145BA.json
+++ b/docs/data/histograms/Argentina/30145BA.json
@@ -1 +1 @@
-{"batchcode": "30145BA", "histograms": [{"batchcodes": ["30145BA"], "histogram": {"Polymerase chain reaction": 1, "Vitiligo": 1}}]}
\ No newline at end of file
+{"batchcode": "30145BA", "histograms": [{"histogram": {"Polymerase chain reaction": 1, "Vitiligo": 1}, "batchcodes": ["30145BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/30155BA.json b/docs/data/histograms/Argentina/30155BA.json
index 12cecbd5403..f627bf591f0 100644
--- a/docs/data/histograms/Argentina/30155BA.json
+++ b/docs/data/histograms/Argentina/30155BA.json
@@ -1 +1 @@
-{"batchcode": "30155BA", "histograms": [{"batchcodes": ["30155BA"], "histogram": {"Cardiac discomfort": 1, "Chest pain": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Impaired work ability": 1}}]}
\ No newline at end of file
+{"batchcode": "30155BA", "histograms": [{"histogram": {"Cardiac discomfort": 1, "Chest pain": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Impaired work ability": 1}, "batchcodes": ["30155BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/40915.json b/docs/data/histograms/Argentina/40915.json
index 197f6e66293..a4ee388d92d 100644
--- a/docs/data/histograms/Argentina/40915.json
+++ b/docs/data/histograms/Argentina/40915.json
@@ -1 +1 @@
-{"batchcode": "40915", "histograms": [{"batchcodes": ["40915"], "histogram": {"Myalgia": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "40915", "histograms": [{"histogram": {"Myalgia": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Swelling": 1}, "batchcodes": ["40915"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/421A.json b/docs/data/histograms/Argentina/421A.json
index cf5f8484438..8147f0def73 100644
--- a/docs/data/histograms/Argentina/421A.json
+++ b/docs/data/histograms/Argentina/421A.json
@@ -1 +1 @@
-{"batchcode": "421A", "histograms": [{"batchcodes": ["421A"], "histogram": {"Febrile convulsion": 1, "Pain": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "421A", "histograms": [{"histogram": {"Febrile convulsion": 1, "Pain": 1, "Swelling": 1}, "batchcodes": ["421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/45C22A.json b/docs/data/histograms/Argentina/45C22A.json
index ef68a7e169a..c645d9c1ead 100644
--- a/docs/data/histograms/Argentina/45C22A.json
+++ b/docs/data/histograms/Argentina/45C22A.json
@@ -1 +1 @@
-{"batchcode": "45C22A", "histograms": [{"batchcodes": ["45C22A"], "histogram": {"Haemolytic anaemia": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Jaundice": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "45C22A", "histograms": [{"histogram": {"Haemolytic anaemia": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Jaundice": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["45C22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/8002117.json b/docs/data/histograms/Argentina/8002117.json
index 96272ebb4ea..1dfe88ca26c 100644
--- a/docs/data/histograms/Argentina/8002117.json
+++ b/docs/data/histograms/Argentina/8002117.json
@@ -1 +1 @@
-{"batchcode": "8002117", "histograms": [{"batchcodes": ["8002117"], "histogram": {"Angioedema": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "8002117", "histograms": [{"histogram": {"Angioedema": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["8002117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/939909.json b/docs/data/histograms/Argentina/939909.json
index b646a5e4c72..e764e28ac24 100644
--- a/docs/data/histograms/Argentina/939909.json
+++ b/docs/data/histograms/Argentina/939909.json
@@ -1 +1 @@
-{"batchcode": "939909", "histograms": [{"batchcodes": ["939909"], "histogram": {"Cardiac flutter": 1, "Dyspepsia": 1, "Electrocardiogram": 1, "Headache": 1, "Hypertension": 1, "Pyrexia": 1, "Ventricular extrasystoles": 1}}]}
\ No newline at end of file
+{"batchcode": "939909", "histograms": [{"histogram": {"Cardiac flutter": 1, "Dyspepsia": 1, "Electrocardiogram": 1, "Headache": 1, "Hypertension": 1, "Pyrexia": 1, "Ventricular extrasystoles": 1}, "batchcodes": ["939909"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/940885.json b/docs/data/histograms/Argentina/940885.json
index 17681875c07..5e1fb48ca91 100644
--- a/docs/data/histograms/Argentina/940885.json
+++ b/docs/data/histograms/Argentina/940885.json
@@ -1 +1 @@
-{"batchcode": "940885", "histograms": [{"batchcodes": ["940885"], "histogram": {"SARS-CoV-2 test": 4, "Headache": 3, "Vaccination complication": 3, "SARS-CoV-2 antibody test": 2, "Seizure": 2, "Syncope": 2, "Abdominal pain lower": 1, "Acute cardiac event": 1, "Acute disseminated encephalomyelitis": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Crying": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Immunisation reaction": 1, "Irritability": 1, "Pain in extremity": 1, "Presyncope": 1, "Rash": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "940885", "histograms": [{"histogram": {"SARS-CoV-2 test": 4, "Headache": 3, "Vaccination complication": 3, "SARS-CoV-2 antibody test": 2, "Seizure": 2, "Syncope": 2, "Abdominal pain lower": 1, "Acute cardiac event": 1, "Acute disseminated encephalomyelitis": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Crying": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Immunisation reaction": 1, "Irritability": 1, "Pain in extremity": 1, "Presyncope": 1, "Rash": 1, "Thrombocytopenia": 1}, "batchcodes": ["940885"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/940915.json b/docs/data/histograms/Argentina/940915.json
index 8039d8d7087..ce9ace7874e 100644
--- a/docs/data/histograms/Argentina/940915.json
+++ b/docs/data/histograms/Argentina/940915.json
@@ -1 +1 @@
-{"batchcode": "940915", "histograms": [{"batchcodes": ["940915"], "histogram": {"SARS-CoV-2 test": 13, "Myalgia": 6, "SARS-CoV-2 antibody test": 6, "Vaccination complication": 5, "Deep vein thrombosis": 2, "Pre-eclampsia": 2, "Pyrexia": 2, "Seizure": 2, "Acute cardiac event": 1, "Acute respiratory distress syndrome": 1, "COVID-19": 1, "Cardiovascular disorder": 1, "Cerebellar stroke": 1, "Cerebrovascular accident": 1, "Dizziness": 1, "Encephalitis": 1, "Erythema": 1, "Gestational hypertension": 1, "Guillain-Barre syndrome": 1, "HIV test": 1, "Haematuria": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Immunisation reaction": 1, "Influenza like illness": 1, "Oedema": 1, "Pain": 1, "Premature baby": 1, "Premature labour": 1, "Rectal haemorrhage": 1, "Rotator cuff syndrome": 1, "Severe acute respiratory syndrome": 1, "Thrombosis": 1, "Toxoplasma serology": 1, "Treponema test": 1, "Vascular injury": 1}}]}
\ No newline at end of file
+{"batchcode": "940915", "histograms": [{"histogram": {"SARS-CoV-2 test": 13, "Myalgia": 6, "SARS-CoV-2 antibody test": 6, "Vaccination complication": 5, "Deep vein thrombosis": 2, "Pre-eclampsia": 2, "Pyrexia": 2, "Seizure": 2, "Acute cardiac event": 1, "Acute respiratory distress syndrome": 1, "COVID-19": 1, "Cardiovascular disorder": 1, "Cerebellar stroke": 1, "Cerebrovascular accident": 1, "Dizziness": 1, "Encephalitis": 1, "Erythema": 1, "Gestational hypertension": 1, "Guillain-Barre syndrome": 1, "HIV test": 1, "Haematuria": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Immunisation reaction": 1, "Influenza like illness": 1, "Oedema": 1, "Pain": 1, "Premature baby": 1, "Premature labour": 1, "Rectal haemorrhage": 1, "Rotator cuff syndrome": 1, "Severe acute respiratory syndrome": 1, "Thrombosis": 1, "Toxoplasma serology": 1, "Treponema test": 1, "Vascular injury": 1}, "batchcodes": ["940915"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/940920.json b/docs/data/histograms/Argentina/940920.json
index 925919a6536..188578c9f2d 100644
--- a/docs/data/histograms/Argentina/940920.json
+++ b/docs/data/histograms/Argentina/940920.json
@@ -1 +1 @@
-{"batchcode": "940920", "histograms": [{"batchcodes": ["940920"], "histogram": {"SARS-CoV-2 test": 11, "Myalgia": 8, "Vaccination complication": 6, "Pain": 5, "Pyrexia": 4, "Deep vein thrombosis": 3, "Erythema": 3, "Headache": 3, "Induration": 3, "SARS-CoV-2 antibody test": 3, "Swelling": 3, "Hypersensitivity": 2, "Hypertensive crisis": 2, "Thrombotic thrombocytopenic purpura": 2, "Abortion spontaneous": 1, "Acute disseminated encephalomyelitis": 1, "Angina pectoris": 1, "Angiogram": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cardiovascular disorder": 1, "Coagulopathy": 1, "Computerised tomogram head": 1, "Congenital anomaly": 1, "Constipation": 1, "Contusion": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Erysipelas": 1, "Febrile convulsion": 1, "Gestational diabetes": 1, "HELLP syndrome": 1, "Heart rate": 1, "Hepatic enzyme": 1, "Interstitial lung disease": 1, "Pain assessment": 1, "Petechiae": 1, "Platelet count": 1, "Polymyalgia rheumatica": 1, "Pre-eclampsia": 1, "Rash": 1, "Syncope": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Underweight": 1}}]}
\ No newline at end of file
+{"batchcode": "940920", "histograms": [{"histogram": {"SARS-CoV-2 test": 11, "Myalgia": 8, "Vaccination complication": 6, "Pain": 5, "Pyrexia": 4, "Deep vein thrombosis": 3, "Erythema": 3, "Headache": 3, "Induration": 3, "SARS-CoV-2 antibody test": 3, "Swelling": 3, "Hypersensitivity": 2, "Hypertensive crisis": 2, "Thrombotic thrombocytopenic purpura": 2, "Abortion spontaneous": 1, "Acute disseminated encephalomyelitis": 1, "Angina pectoris": 1, "Angiogram": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cardiovascular disorder": 1, "Coagulopathy": 1, "Computerised tomogram head": 1, "Congenital anomaly": 1, "Constipation": 1, "Contusion": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Erysipelas": 1, "Febrile convulsion": 1, "Gestational diabetes": 1, "HELLP syndrome": 1, "Heart rate": 1, "Hepatic enzyme": 1, "Interstitial lung disease": 1, "Pain assessment": 1, "Petechiae": 1, "Platelet count": 1, "Polymyalgia rheumatica": 1, "Pre-eclampsia": 1, "Rash": 1, "Syncope": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Underweight": 1}, "batchcodes": ["940920"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/A24D21A.json b/docs/data/histograms/Argentina/A24D21A.json
index 4da9462c979..a9a6894b746 100644
--- a/docs/data/histograms/Argentina/A24D21A.json
+++ b/docs/data/histograms/Argentina/A24D21A.json
@@ -1 +1 @@
-{"batchcode": "A24D21A", "histograms": [{"batchcodes": ["A24D21A"], "histogram": {"Erythema multiforme": 1, "Pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "A24D21A", "histograms": [{"histogram": {"Erythema multiforme": 1, "Pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["A24D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/AR9236B.json b/docs/data/histograms/Argentina/AR9236B.json
index b13e2439c87..da8b84fa594 100644
--- a/docs/data/histograms/Argentina/AR9236B.json
+++ b/docs/data/histograms/Argentina/AR9236B.json
@@ -1 +1 @@
-{"batchcode": "AR9236B", "histograms": [{"batchcodes": ["AR9236B"], "histogram": {"Arthralgia": 1, "Blood test abnormal": 1, "Erythema": 1, "Gait inability": 1, "Hyperaesthesia": 1, "Inflammatory marker increased": 1, "Joint swelling": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Serum sickness": 1, "Urine analysis": 1, "Urticaria": 1, "Viral test negative": 1}}]}
\ No newline at end of file
+{"batchcode": "AR9236B", "histograms": [{"histogram": {"Arthralgia": 1, "Blood test abnormal": 1, "Erythema": 1, "Gait inability": 1, "Hyperaesthesia": 1, "Inflammatory marker increased": 1, "Joint swelling": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Serum sickness": 1, "Urine analysis": 1, "Urticaria": 1, "Viral test negative": 1}, "batchcodes": ["AR9236B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/CO5D22A.json b/docs/data/histograms/Argentina/CO5D22A.json
index 107baed379c..2fb63da6097 100644
--- a/docs/data/histograms/Argentina/CO5D22A.json
+++ b/docs/data/histograms/Argentina/CO5D22A.json
@@ -1 +1 @@
-{"batchcode": "CO5D22A", "histograms": [{"batchcodes": ["CO5D22A"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "CO5D22A", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["CO5D22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/D78C21A.json b/docs/data/histograms/Argentina/D78C21A.json
index b3a1fb1931e..e54ad42cf95 100644
--- a/docs/data/histograms/Argentina/D78C21A.json
+++ b/docs/data/histograms/Argentina/D78C21A.json
@@ -1 +1 @@
-{"batchcode": "D78C21A", "histograms": [{"batchcodes": ["D78C21A"], "histogram": {"Coagulopathy": 1, "Embolism": 1, "Erythema": 1, "Haemorrhage": 1, "Pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "D78C21A", "histograms": [{"histogram": {"Coagulopathy": 1, "Embolism": 1, "Erythema": 1, "Haemorrhage": 1, "Pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["D78C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/D80C21A.json b/docs/data/histograms/Argentina/D80C21A.json
index 7b374515b27..b1b01c8af8c 100644
--- a/docs/data/histograms/Argentina/D80C21A.json
+++ b/docs/data/histograms/Argentina/D80C21A.json
@@ -1 +1 @@
-{"batchcode": "D80C21A", "histograms": [{"batchcodes": ["D80C21A"], "histogram": {"Immunisation reaction": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "D80C21A", "histograms": [{"histogram": {"Immunisation reaction": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Transient ischaemic attack": 1}, "batchcodes": ["D80C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EC2971.json b/docs/data/histograms/Argentina/EC2971.json
index ec940784a4b..d6da5b39519 100644
--- a/docs/data/histograms/Argentina/EC2971.json
+++ b/docs/data/histograms/Argentina/EC2971.json
@@ -1 +1 @@
-{"batchcode": "EC2971", "histograms": [{"batchcodes": ["EC2971"], "histogram": {"Chest pain": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EC2971", "histograms": [{"histogram": {"Chest pain": 1, "Pain": 1}, "batchcodes": ["EC2971"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EH9899.json b/docs/data/histograms/Argentina/EH9899.json
index f18f62c2458..9ec612ba7f6 100644
--- a/docs/data/histograms/Argentina/EH9899.json
+++ b/docs/data/histograms/Argentina/EH9899.json
@@ -1 +1 @@
-{"batchcode": "EH9899", "histograms": [{"batchcodes": ["EH9899"], "histogram": {"Headache": 14, "Pain": 11, "Chills": 10, "SARS-CoV-2 test negative": 10, "Fatigue": 8, "Nausea": 6, "Pyrexia": 5, "SARS-CoV-2 test": 5, "Cough": 4, "Injection site pain": 4, "Myalgia": 4, "Rhinorrhoea": 4, "Body temperature increased": 3, "Dizziness": 3, "Nasal congestion": 3, "Vomiting": 3, "Oropharyngeal pain": 2, "SARS-CoV-2 antibody test negative": 2, "Sinus congestion": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Diarrhoea": 1, "Drainage": 1, "Dyspnoea": 1, "Feeling hot": 1, "Flushing": 1, "Injection site erythema": 1, "Lymph node pain": 1, "Malaise": 1, "Migraine": 1, "Sluggishness": 1, "Tinnitus": 1, "Vertigo": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EH9899", "histograms": [{"histogram": {"Headache": 14, "Pain": 11, "Chills": 10, "SARS-CoV-2 test negative": 10, "Fatigue": 8, "Nausea": 6, "Pyrexia": 5, "SARS-CoV-2 test": 5, "Cough": 4, "Injection site pain": 4, "Myalgia": 4, "Rhinorrhoea": 4, "Body temperature increased": 3, "Dizziness": 3, "Nasal congestion": 3, "Vomiting": 3, "Oropharyngeal pain": 2, "SARS-CoV-2 antibody test negative": 2, "Sinus congestion": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Diarrhoea": 1, "Drainage": 1, "Dyspnoea": 1, "Feeling hot": 1, "Flushing": 1, "Injection site erythema": 1, "Lymph node pain": 1, "Malaise": 1, "Migraine": 1, "Sluggishness": 1, "Tinnitus": 1, "Vertigo": 1, "Wheezing": 1}, "batchcodes": ["EH9899"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EL1284.json b/docs/data/histograms/Argentina/EL1284.json
index 587e143afd9..652fef61cd9 100644
--- a/docs/data/histograms/Argentina/EL1284.json
+++ b/docs/data/histograms/Argentina/EL1284.json
@@ -1 +1 @@
-{"batchcode": "EL1284", "histograms": [{"batchcodes": ["EL1284"], "histogram": {"Chills": 8, "Headache": 8, "Myalgia": 4, "Nausea": 4, "Pyrexia": 4, "Dizziness": 3, "Pain": 3, "Fatigue": 2, "Arthralgia": 1, "Asthenia": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Feeling abnormal": 1, "Full blood count": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Metabolic function test": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Prothrombin time": 1, "Pruritus": 1, "Respiratory rate increased": 1, "Retching": 1, "SARS-CoV-2 test negative": 1, "Somnolence": 1, "Transient ischaemic attack": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1284", "histograms": [{"histogram": {"Chills": 8, "Headache": 8, "Myalgia": 4, "Nausea": 4, "Pyrexia": 4, "Dizziness": 3, "Pain": 3, "Fatigue": 2, "Arthralgia": 1, "Asthenia": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Feeling abnormal": 1, "Full blood count": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Metabolic function test": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Prothrombin time": 1, "Pruritus": 1, "Respiratory rate increased": 1, "Retching": 1, "SARS-CoV-2 test negative": 1, "Somnolence": 1, "Transient ischaemic attack": 1, "Urticaria": 1}, "batchcodes": ["EL1284"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EN1926.json b/docs/data/histograms/Argentina/EN1926.json
index 1a3fe74ce2c..51474501377 100644
--- a/docs/data/histograms/Argentina/EN1926.json
+++ b/docs/data/histograms/Argentina/EN1926.json
@@ -1 +1 @@
-{"batchcode": "EN1926", "histograms": [{"batchcodes": ["EN1926"], "histogram": {"Dermatitis allergic": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1926", "histograms": [{"histogram": {"Dermatitis allergic": 1}, "batchcodes": ["EN1926"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EN6203.json b/docs/data/histograms/Argentina/EN6203.json
index 7fcd417ff93..90a45dbb1c9 100644
--- a/docs/data/histograms/Argentina/EN6203.json
+++ b/docs/data/histograms/Argentina/EN6203.json
@@ -1 +1 @@
-{"batchcode": "EN6203", "histograms": [{"batchcodes": ["EN6203"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cognitive disorder": 1, "Confusional state": 1, "Dizziness": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Memory impairment": 1, "Motor dysfunction": 1, "Nausea": 1, "Pyrexia": 1, "Thunderclap headache": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6203", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cognitive disorder": 1, "Confusional state": 1, "Dizziness": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Memory impairment": 1, "Motor dysfunction": 1, "Nausea": 1, "Pyrexia": 1, "Thunderclap headache": 1, "Vertigo": 1}, "batchcodes": ["EN6203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EN6204.json b/docs/data/histograms/Argentina/EN6204.json
index e07c2fadd3e..5d2f787c43c 100644
--- a/docs/data/histograms/Argentina/EN6204.json
+++ b/docs/data/histograms/Argentina/EN6204.json
@@ -1 +1 @@
-{"batchcode": "EN6204", "histograms": [{"batchcodes": ["EN6204"], "histogram": {"Anxiety": 1, "Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6204", "histograms": [{"histogram": {"Anxiety": 1, "Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Pallor": 1}, "batchcodes": ["EN6204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/ER2613.json b/docs/data/histograms/Argentina/ER2613.json
index 8d948d01f97..caeec3f8bba 100644
--- a/docs/data/histograms/Argentina/ER2613.json
+++ b/docs/data/histograms/Argentina/ER2613.json
@@ -1 +1 @@
-{"batchcode": "ER2613", "histograms": [{"batchcodes": ["ER2613"], "histogram": {"Paraesthesia oral": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2613", "histograms": [{"histogram": {"Paraesthesia oral": 1}, "batchcodes": ["ER2613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/ER8731.json b/docs/data/histograms/Argentina/ER8731.json
index 8268640f3a2..d00de13e07c 100644
--- a/docs/data/histograms/Argentina/ER8731.json
+++ b/docs/data/histograms/Argentina/ER8731.json
@@ -1 +1 @@
-{"batchcode": "ER8731", "histograms": [{"batchcodes": ["ER8731"], "histogram": {"Blood pressure increased": 1, "Erythema": 1, "Flushing": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8731", "histograms": [{"histogram": {"Blood pressure increased": 1, "Erythema": 1, "Flushing": 1, "Headache": 1}, "batchcodes": ["ER8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EW0167.json b/docs/data/histograms/Argentina/EW0167.json
index 2ebbf8032f7..3f3d580306d 100644
--- a/docs/data/histograms/Argentina/EW0167.json
+++ b/docs/data/histograms/Argentina/EW0167.json
@@ -1 +1 @@
-{"batchcode": "EW0167", "histograms": [{"batchcodes": ["EW0167"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Rash": 1, "Rash papular": 1, "Rash pruritic": 1, "Rash vesicular": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0167", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Rash": 1, "Rash papular": 1, "Rash pruritic": 1, "Rash vesicular": 1}, "batchcodes": ["EW0167"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EW0171.json b/docs/data/histograms/Argentina/EW0171.json
index 350c65ef475..d55f1d8a9fa 100644
--- a/docs/data/histograms/Argentina/EW0171.json
+++ b/docs/data/histograms/Argentina/EW0171.json
@@ -1 +1 @@
-{"batchcode": "EW0171", "histograms": [{"batchcodes": ["EW0171"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0171", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Polymerase chain reaction": 1}, "batchcodes": ["EW0171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EW0175.json b/docs/data/histograms/Argentina/EW0175.json
index fd871f12f7b..5810f47cdca 100644
--- a/docs/data/histograms/Argentina/EW0175.json
+++ b/docs/data/histograms/Argentina/EW0175.json
@@ -1 +1 @@
-{"batchcode": "EW0175", "histograms": [{"batchcodes": ["EW0175"], "histogram": {"Product preparation issue": 3, "Fall": 1, "Incorrect dose administered": 1, "No adverse event": 1, "Peripheral swelling": 1, "Postictal state": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Unresponsive to stimuli": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0175", "histograms": [{"histogram": {"Product preparation issue": 3, "Fall": 1, "Incorrect dose administered": 1, "No adverse event": 1, "Peripheral swelling": 1, "Postictal state": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Unresponsive to stimuli": 1, "Vomiting": 1}, "batchcodes": ["EW0175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EW0217.json b/docs/data/histograms/Argentina/EW0217.json
index 42c0ed92f82..9e03d38a0dc 100644
--- a/docs/data/histograms/Argentina/EW0217.json
+++ b/docs/data/histograms/Argentina/EW0217.json
@@ -1 +1 @@
-{"batchcode": "EW0217", "histograms": [{"batchcodes": ["EW0217"], "histogram": {"Ischaemic stroke": 1, "Polymerase chain reaction": 1, "Serology test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0217", "histograms": [{"histogram": {"Ischaemic stroke": 1, "Polymerase chain reaction": 1, "Serology test": 1}, "batchcodes": ["EW0217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/EW1075.json b/docs/data/histograms/Argentina/EW1075.json
index 5279f36afef..c1d71e1dd6c 100644
--- a/docs/data/histograms/Argentina/EW1075.json
+++ b/docs/data/histograms/Argentina/EW1075.json
@@ -1 +1 @@
-{"batchcode": "EW1075", "histograms": [{"batchcodes": ["EW1075"], "histogram": {"Abdominal pain": 1, "Atonic urinary bladder": 1, "Renal pain": 1, "Urinary incontinence": 1}}]}
\ No newline at end of file
+{"batchcode": "EW1075", "histograms": [{"histogram": {"Abdominal pain": 1, "Atonic urinary bladder": 1, "Renal pain": 1, "Urinary incontinence": 1}, "batchcodes": ["EW1075"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FA6780.json b/docs/data/histograms/Argentina/FA6780.json
index 580682d9eeb..2ed3643b5f5 100644
--- a/docs/data/histograms/Argentina/FA6780.json
+++ b/docs/data/histograms/Argentina/FA6780.json
@@ -1 +1 @@
-{"batchcode": "FA6780", "histograms": [{"batchcodes": ["FA6780"], "histogram": {"Incontinence": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Parkinson's disease": 1, "Speech disorder": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FA6780", "histograms": [{"histogram": {"Incontinence": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Parkinson's disease": 1, "Speech disorder": 1, "Tremor": 1}, "batchcodes": ["FA6780"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FC3180.json b/docs/data/histograms/Argentina/FC3180.json
index 7905e70d0ce..2ffd14e125d 100644
--- a/docs/data/histograms/Argentina/FC3180.json
+++ b/docs/data/histograms/Argentina/FC3180.json
@@ -1 +1 @@
-{"batchcode": "FC3180", "histograms": [{"batchcodes": ["FC3180"], "histogram": {"Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3180", "histograms": [{"histogram": {"Vaginal haemorrhage": 1}, "batchcodes": ["FC3180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FD8448.json b/docs/data/histograms/Argentina/FD8448.json
index 731c2217080..f7930c7460c 100644
--- a/docs/data/histograms/Argentina/FD8448.json
+++ b/docs/data/histograms/Argentina/FD8448.json
@@ -1 +1 @@
-{"batchcode": "FD8448", "histograms": [{"batchcodes": ["FD8448"], "histogram": {"Diarrhoea": 1, "Interchange of vaccine products": 1, "Rash pruritic": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8448", "histograms": [{"histogram": {"Diarrhoea": 1, "Interchange of vaccine products": 1, "Rash pruritic": 1, "Urticaria": 1}, "batchcodes": ["FD8448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FF2587.json b/docs/data/histograms/Argentina/FF2587.json
index 2945a081394..0fea426fed9 100644
--- a/docs/data/histograms/Argentina/FF2587.json
+++ b/docs/data/histograms/Argentina/FF2587.json
@@ -1 +1 @@
-{"batchcode": "FF2587", "histograms": [{"batchcodes": ["FF2587"], "histogram": {"Body temperature": 1, "Dizziness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2587", "histograms": [{"histogram": {"Body temperature": 1, "Dizziness": 1, "Pyrexia": 1}, "batchcodes": ["FF2587"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FF25901.json b/docs/data/histograms/Argentina/FF25901.json
index 5a544678914..0484e0c4394 100644
--- a/docs/data/histograms/Argentina/FF25901.json
+++ b/docs/data/histograms/Argentina/FF25901.json
@@ -1 +1 @@
-{"batchcode": "FF25901", "histograms": [{"batchcodes": ["FF25901"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FF25901", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["FF25901"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FF2593.json b/docs/data/histograms/Argentina/FF2593.json
index 6166e913a73..9e8c4cb6beb 100644
--- a/docs/data/histograms/Argentina/FF2593.json
+++ b/docs/data/histograms/Argentina/FF2593.json
@@ -1 +1 @@
-{"batchcode": "FF2593", "histograms": [{"batchcodes": ["FF2593"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2593", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FF2593"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FH1672.json b/docs/data/histograms/Argentina/FH1672.json
index efb98cb85c5..ca32bbdae9f 100644
--- a/docs/data/histograms/Argentina/FH1672.json
+++ b/docs/data/histograms/Argentina/FH1672.json
@@ -1 +1 @@
-{"batchcode": "FH1672", "histograms": [{"batchcodes": ["FH1672"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Feeling hot": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Off label use": 1, "Pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FH1672", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Feeling hot": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Off label use": 1, "Pain": 1, "Vaccination site pain": 1}, "batchcodes": ["FH1672"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FJ 4188.json b/docs/data/histograms/Argentina/FJ 4188.json
index 9b37e992b5c..5df787d501e 100644
--- a/docs/data/histograms/Argentina/FJ 4188.json
+++ b/docs/data/histograms/Argentina/FJ 4188.json
@@ -1 +1 @@
-{"batchcode": "FJ 4188", "histograms": [{"batchcodes": ["FJ 4188"], "histogram": {"Chest X-ray": 1, "Hypokinesia": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1, "Tooth extraction": 1, "Vaccination site discomfort": 1, "Vaccination site papule": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ 4188", "histograms": [{"histogram": {"Chest X-ray": 1, "Hypokinesia": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1, "Tooth extraction": 1, "Vaccination site discomfort": 1, "Vaccination site papule": 1}, "batchcodes": ["FJ 4188"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FJ1926.json b/docs/data/histograms/Argentina/FJ1926.json
index 6e5abcf2733..a19d25e16ad 100644
--- a/docs/data/histograms/Argentina/FJ1926.json
+++ b/docs/data/histograms/Argentina/FJ1926.json
@@ -1 +1 @@
-{"batchcode": "FJ1926", "histograms": [{"batchcodes": ["FJ1926"], "histogram": {"Blepharitis": 2, "Conjunctivitis allergic": 2, "Eye irritation": 2, "Eye pain": 2, "Optic neuritis": 2, "Vision blurred": 2, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Dry eye": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1926", "histograms": [{"histogram": {"Blepharitis": 2, "Conjunctivitis allergic": 2, "Eye irritation": 2, "Eye pain": 2, "Optic neuritis": 2, "Vision blurred": 2, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Dry eye": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FJ1926"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FJ1966.json b/docs/data/histograms/Argentina/FJ1966.json
index aac92bfe0cb..b615cfa6941 100644
--- a/docs/data/histograms/Argentina/FJ1966.json
+++ b/docs/data/histograms/Argentina/FJ1966.json
@@ -1 +1 @@
-{"batchcode": "FJ1966", "histograms": [{"batchcodes": ["FJ1966"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Cough": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Muscular weakness": 1, "Myalgia": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1966", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Cough": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Muscular weakness": 1, "Myalgia": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["FJ1966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FJ4188.json b/docs/data/histograms/Argentina/FJ4188.json
index 7722262656d..2ece8176e92 100644
--- a/docs/data/histograms/Argentina/FJ4188.json
+++ b/docs/data/histograms/Argentina/FJ4188.json
@@ -1 +1 @@
-{"batchcode": "FJ4188", "histograms": [{"batchcodes": ["FJ4188"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Haematuria": 1, "IgA nephropathy": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Proteinuria": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ4188", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Haematuria": 1, "IgA nephropathy": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Proteinuria": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FJ4188"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FJ5682.json b/docs/data/histograms/Argentina/FJ5682.json
index b032f422267..8d5a41c50e7 100644
--- a/docs/data/histograms/Argentina/FJ5682.json
+++ b/docs/data/histograms/Argentina/FJ5682.json
@@ -1 +1 @@
-{"batchcode": "FJ5682", "histograms": [{"batchcodes": ["FJ5682"], "histogram": {"Dyspnoea": 1, "Tonsillar disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5682", "histograms": [{"histogram": {"Dyspnoea": 1, "Tonsillar disorder": 1}, "batchcodes": ["FJ5682"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FJ8198.json b/docs/data/histograms/Argentina/FJ8198.json
index f35e30c01f6..892efb3f155 100644
--- a/docs/data/histograms/Argentina/FJ8198.json
+++ b/docs/data/histograms/Argentina/FJ8198.json
@@ -1 +1 @@
-{"batchcode": "FJ8198", "histograms": [{"batchcodes": ["FJ8198"], "histogram": {"Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Peripheral swelling": 2, "Burning sensation": 1, "Erythema": 1, "Eye irritation": 1, "Head injury": 1, "Headache": 1, "Hot flush": 1, "Loss of consciousness": 1, "Mass": 1, "Oral discomfort": 1, "Pain in extremity": 1, "Pruritus": 1, "Syncope": 1, "Ultrasound scan vagina": 1, "Uterine haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8198", "histograms": [{"histogram": {"Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Peripheral swelling": 2, "Burning sensation": 1, "Erythema": 1, "Eye irritation": 1, "Head injury": 1, "Headache": 1, "Hot flush": 1, "Loss of consciousness": 1, "Mass": 1, "Oral discomfort": 1, "Pain in extremity": 1, "Pruritus": 1, "Syncope": 1, "Ultrasound scan vagina": 1, "Uterine haemorrhage": 1}, "batchcodes": ["FJ8198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FJI966.json b/docs/data/histograms/Argentina/FJI966.json
index 85411a9400c..7c40e5da792 100644
--- a/docs/data/histograms/Argentina/FJI966.json
+++ b/docs/data/histograms/Argentina/FJI966.json
@@ -1 +1 @@
-{"batchcode": "FJI966", "histograms": [{"batchcodes": ["FJI966"], "histogram": {"Deafness unilateral": 1}}]}
\ No newline at end of file
+{"batchcode": "FJI966", "histograms": [{"histogram": {"Deafness unilateral": 1}, "batchcodes": ["FJI966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FK5127.json b/docs/data/histograms/Argentina/FK5127.json
index d0aa67d0a94..16678e80a63 100644
--- a/docs/data/histograms/Argentina/FK5127.json
+++ b/docs/data/histograms/Argentina/FK5127.json
@@ -1 +1 @@
-{"batchcode": "FK5127", "histograms": [{"batchcodes": ["FK5127"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "FK5127", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}, "batchcodes": ["FK5127"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FK8888.json b/docs/data/histograms/Argentina/FK8888.json
index f03c0b43662..977bb62be08 100644
--- a/docs/data/histograms/Argentina/FK8888.json
+++ b/docs/data/histograms/Argentina/FK8888.json
@@ -1 +1 @@
-{"batchcode": "FK8888", "histograms": [{"batchcodes": ["FK8888"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8888", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FK8888"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FK8892.json b/docs/data/histograms/Argentina/FK8892.json
index bfcc59f2a75..ccc0f80c1f2 100644
--- a/docs/data/histograms/Argentina/FK8892.json
+++ b/docs/data/histograms/Argentina/FK8892.json
@@ -1 +1 @@
-{"batchcode": "FK8892", "histograms": [{"batchcodes": ["FK8892"], "histogram": {"Axillary pain": 1, "Biopsy lymph gland": 1, "Breast disorder": 1, "Breast pain": 1, "COVID-19": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram pelvis": 1, "Computerised tomogram thorax": 1, "Drug ineffective": 1, "Headache": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Oedema peripheral": 1, "Off label use": 1, "Pain in extremity": 1, "Protein total": 1, "Protein total decreased": 1, "SARS-CoV-2 test": 1, "Ultrasound breast": 1, "Vaccination site pain": 1, "Vascular compression": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8892", "histograms": [{"histogram": {"Axillary pain": 1, "Biopsy lymph gland": 1, "Breast disorder": 1, "Breast pain": 1, "COVID-19": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram pelvis": 1, "Computerised tomogram thorax": 1, "Drug ineffective": 1, "Headache": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Oedema peripheral": 1, "Off label use": 1, "Pain in extremity": 1, "Protein total": 1, "Protein total decreased": 1, "SARS-CoV-2 test": 1, "Ultrasound breast": 1, "Vaccination site pain": 1, "Vascular compression": 1}, "batchcodes": ["FK8892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FK9895.json b/docs/data/histograms/Argentina/FK9895.json
index 5d328956d1e..8fe575b5301 100644
--- a/docs/data/histograms/Argentina/FK9895.json
+++ b/docs/data/histograms/Argentina/FK9895.json
@@ -1 +1 @@
-{"batchcode": "FK9895", "histograms": [{"batchcodes": ["FK9895"], "histogram": {"Cold sweat": 1, "Feeling cold": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9895", "histograms": [{"histogram": {"Cold sweat": 1, "Feeling cold": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Pallor": 1}, "batchcodes": ["FK9895"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FL00007.json b/docs/data/histograms/Argentina/FL00007.json
index fa01aabdb44..4c03bb4ce9d 100644
--- a/docs/data/histograms/Argentina/FL00007.json
+++ b/docs/data/histograms/Argentina/FL00007.json
@@ -1 +1 @@
-{"batchcode": "FL00007", "histograms": [{"batchcodes": ["FL00007"], "histogram": {"Product preparation issue": 7, "Product preparation error": 2}}]}
\ No newline at end of file
+{"batchcode": "FL00007", "histograms": [{"histogram": {"Product preparation issue": 7, "Product preparation error": 2}, "batchcodes": ["FL00007"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FL7309.json b/docs/data/histograms/Argentina/FL7309.json
index fcf633bf106..2bc112c3c11 100644
--- a/docs/data/histograms/Argentina/FL7309.json
+++ b/docs/data/histograms/Argentina/FL7309.json
@@ -1 +1 @@
-{"batchcode": "FL7309", "histograms": [{"batchcodes": ["FL7309"], "histogram": {"Audiogram": 1, "Dizziness": 1, "Ear discomfort": 1, "Frequent bowel movements": 1, "Gait disturbance": 1, "Headache": 1, "Interchange of vaccine products": 1, "Magnetic resonance imaging": 1, "Off label use": 1, "Rash": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Vertigo positional": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FL7309", "histograms": [{"histogram": {"Audiogram": 1, "Dizziness": 1, "Ear discomfort": 1, "Frequent bowel movements": 1, "Gait disturbance": 1, "Headache": 1, "Interchange of vaccine products": 1, "Magnetic resonance imaging": 1, "Off label use": 1, "Rash": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Vertigo positional": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["FL7309"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FL8094.json b/docs/data/histograms/Argentina/FL8094.json
index 9a79d8571ac..bce4291fa2a 100644
--- a/docs/data/histograms/Argentina/FL8094.json
+++ b/docs/data/histograms/Argentina/FL8094.json
@@ -1 +1 @@
-{"batchcode": "FL8094", "histograms": [{"batchcodes": ["FL8094"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8094", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["FL8094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FM0698.json b/docs/data/histograms/Argentina/FM0698.json
index fd809a12cac..54d7e91599f 100644
--- a/docs/data/histograms/Argentina/FM0698.json
+++ b/docs/data/histograms/Argentina/FM0698.json
@@ -1 +1 @@
-{"batchcode": "FM0698", "histograms": [{"batchcodes": ["FM0698"], "histogram": {"Headache": 1, "Lip swelling": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FM0698", "histograms": [{"histogram": {"Headache": 1, "Lip swelling": 1, "Paraesthesia": 1}, "batchcodes": ["FM0698"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FN0087.json b/docs/data/histograms/Argentina/FN0087.json
index 4c62f723d6e..997d1a4cabc 100644
--- a/docs/data/histograms/Argentina/FN0087.json
+++ b/docs/data/histograms/Argentina/FN0087.json
@@ -1 +1 @@
-{"batchcode": "FN0087", "histograms": [{"batchcodes": ["FN0087"], "histogram": {"Interchange of vaccine products": 5, "Off label use": 5, "Investigation": 3, "Biopsy": 2, "Drug ineffective": 2, "Feeling hot": 2, "Premature menopause": 2, "Suspected COVID-19": 2, "Urticaria chronic": 2, "Abnormal uterine bleeding": 1, "Abortion spontaneous": 1, "Allergy test": 1, "Allergy test positive": 1, "Amenorrhoea": 1, "Anti factor V antibody": 1, "Body temperature": 1, "Burning sensation": 1, "Chest X-ray": 1, "Human chorionic gonadotropin": 1, "Hyperpyrexia": 1, "Immunisation": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Menstruation delayed": 1, "Pain": 1, "Physical examination": 1, "Prenatal screening test": 1, "Pruritus": 1, "Rash": 1, "Respiratory disorder": 1, "Retained products of conception": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Serology test": 1, "Skin burning sensation": 1, "Sleep disorder": 1, "Stress": 1, "Thrombosis": 1, "Ultrasound scan vagina": 1, "Urticaria": 1, "Uterine haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FN0087", "histograms": [{"histogram": {"Interchange of vaccine products": 5, "Off label use": 5, "Investigation": 3, "Biopsy": 2, "Drug ineffective": 2, "Feeling hot": 2, "Premature menopause": 2, "Suspected COVID-19": 2, "Urticaria chronic": 2, "Abnormal uterine bleeding": 1, "Abortion spontaneous": 1, "Allergy test": 1, "Allergy test positive": 1, "Amenorrhoea": 1, "Anti factor V antibody": 1, "Body temperature": 1, "Burning sensation": 1, "Chest X-ray": 1, "Human chorionic gonadotropin": 1, "Hyperpyrexia": 1, "Immunisation": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Menstruation delayed": 1, "Pain": 1, "Physical examination": 1, "Prenatal screening test": 1, "Pruritus": 1, "Rash": 1, "Respiratory disorder": 1, "Retained products of conception": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Serology test": 1, "Skin burning sensation": 1, "Sleep disorder": 1, "Stress": 1, "Thrombosis": 1, "Ultrasound scan vagina": 1, "Urticaria": 1, "Uterine haemorrhage": 1}, "batchcodes": ["FN0087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FN1455.json b/docs/data/histograms/Argentina/FN1455.json
index 350995f8c91..945e9efbc8f 100644
--- a/docs/data/histograms/Argentina/FN1455.json
+++ b/docs/data/histograms/Argentina/FN1455.json
@@ -1 +1 @@
-{"batchcode": "FN1455", "histograms": [{"batchcodes": ["FN1455"], "histogram": {"Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "FN1455", "histograms": [{"histogram": {"Lymphadenopathy": 1}, "batchcodes": ["FN1455"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FN1672.json b/docs/data/histograms/Argentina/FN1672.json
index ba74108431c..bf123ad0b70 100644
--- a/docs/data/histograms/Argentina/FN1672.json
+++ b/docs/data/histograms/Argentina/FN1672.json
@@ -1 +1 @@
-{"batchcode": "FN1672", "histograms": [{"batchcodes": ["FN1672"], "histogram": {"Off label use": 3, "Immunisation": 2, "Interchange of vaccine products": 2, "Pyrexia": 2, "Acoustic stimulation tests": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Body temperature": 1, "Body temperature increased": 1, "Dysgeusia": 1, "Dysstasia": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Influenza": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Nausea": 1, "Otosclerosis": 1, "Pain": 1, "Paraesthesia": 1, "Somnolence": 1, "Stress": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN1672", "histograms": [{"histogram": {"Off label use": 3, "Immunisation": 2, "Interchange of vaccine products": 2, "Pyrexia": 2, "Acoustic stimulation tests": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Body temperature": 1, "Body temperature increased": 1, "Dysgeusia": 1, "Dysstasia": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Influenza": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Nausea": 1, "Otosclerosis": 1, "Pain": 1, "Paraesthesia": 1, "Somnolence": 1, "Stress": 1, "Vomiting": 1}, "batchcodes": ["FN1672"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FN29008.json b/docs/data/histograms/Argentina/FN29008.json
index 85ac3b5b898..632d4782bdc 100644
--- a/docs/data/histograms/Argentina/FN29008.json
+++ b/docs/data/histograms/Argentina/FN29008.json
@@ -1 +1 @@
-{"batchcode": "FN29008", "histograms": [{"batchcodes": ["FN29008"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FN29008", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["FN29008"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FN2908.json b/docs/data/histograms/Argentina/FN2908.json
index 7fd1fbe0a18..4af0a42fe5c 100644
--- a/docs/data/histograms/Argentina/FN2908.json
+++ b/docs/data/histograms/Argentina/FN2908.json
@@ -1 +1 @@
-{"batchcode": "FN2908", "histograms": [{"batchcodes": ["FN2908"], "histogram": {"Extra dose administered": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2908", "histograms": [{"histogram": {"Extra dose administered": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["FN2908"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FN3815.json b/docs/data/histograms/Argentina/FN3815.json
index 1ef4d213f07..cbb4b2dedd5 100644
--- a/docs/data/histograms/Argentina/FN3815.json
+++ b/docs/data/histograms/Argentina/FN3815.json
@@ -1 +1 @@
-{"batchcode": "FN3815", "histograms": [{"batchcodes": ["FN3815"], "histogram": {"Blood immunoglobulin E": 1, "Dermatitis": 1, "Discomfort": 1, "Emotional distress": 1, "Erythema": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Pain": 1, "Pruritus": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin test": 1, "Sleep disorder": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FN3815", "histograms": [{"histogram": {"Blood immunoglobulin E": 1, "Dermatitis": 1, "Discomfort": 1, "Emotional distress": 1, "Erythema": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Pain": 1, "Pruritus": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin test": 1, "Sleep disorder": 1, "Urticaria": 1}, "batchcodes": ["FN3815"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FNO087.json b/docs/data/histograms/Argentina/FNO087.json
index 245a4b86762..55505a65ed2 100644
--- a/docs/data/histograms/Argentina/FNO087.json
+++ b/docs/data/histograms/Argentina/FNO087.json
@@ -1 +1 @@
-{"batchcode": "FNO087", "histograms": [{"batchcodes": ["FNO087"], "histogram": {"Heavy menstrual bleeding": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FNO087", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["FNO087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FP0665.json b/docs/data/histograms/Argentina/FP0665.json
index 03bda5da382..710dacc5fbe 100644
--- a/docs/data/histograms/Argentina/FP0665.json
+++ b/docs/data/histograms/Argentina/FP0665.json
@@ -1 +1 @@
-{"batchcode": "FP0665", "histograms": [{"batchcodes": ["FP0665"], "histogram": {"Catheter placement": 1, "Erythema": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FP0665", "histograms": [{"histogram": {"Catheter placement": 1, "Erythema": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["FP0665"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/FT0366.json b/docs/data/histograms/Argentina/FT0366.json
index c41230e58dd..68501aeff8b 100644
--- a/docs/data/histograms/Argentina/FT0366.json
+++ b/docs/data/histograms/Argentina/FT0366.json
@@ -1 +1 @@
-{"batchcode": "FT0366", "histograms": [{"batchcodes": ["FT0366"], "histogram": {"Angiogram": 1, "Body temperature": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Localised oedema": 1, "Lymphadenopathy": 1, "Off label use": 1, "Pain in extremity": 1, "Pulmonary thrombosis": 1, "Pyrexia": 1, "Tendonitis": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "FT0366", "histograms": [{"histogram": {"Angiogram": 1, "Body temperature": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Localised oedema": 1, "Lymphadenopathy": 1, "Off label use": 1, "Pain in extremity": 1, "Pulmonary thrombosis": 1, "Pyrexia": 1, "Tendonitis": 1, "Ultrasound Doppler": 1}, "batchcodes": ["FT0366"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/GJ2524.json b/docs/data/histograms/Argentina/GJ2524.json
index de2621bb37c..74a29731d4e 100644
--- a/docs/data/histograms/Argentina/GJ2524.json
+++ b/docs/data/histograms/Argentina/GJ2524.json
@@ -1 +1 @@
-{"batchcode": "GJ2524", "histograms": [{"batchcodes": ["GJ2524"], "histogram": {"Disorientation": 1, "Hypersensitivity": 1, "Pharyngeal swelling": 1, "Speech disorder": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ2524", "histograms": [{"histogram": {"Disorientation": 1, "Hypersensitivity": 1, "Pharyngeal swelling": 1, "Speech disorder": 1, "Throat irritation": 1}, "batchcodes": ["GJ2524"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/GK1657.json b/docs/data/histograms/Argentina/GK1657.json
index 09d9ae6cd84..abccfac8437 100644
--- a/docs/data/histograms/Argentina/GK1657.json
+++ b/docs/data/histograms/Argentina/GK1657.json
@@ -1 +1 @@
-{"batchcode": "GK1657", "histograms": [{"batchcodes": ["GK1657"], "histogram": {"Incorrect product formulation administered": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "GK1657", "histograms": [{"histogram": {"Incorrect product formulation administered": 1, "No adverse event": 1}, "batchcodes": ["GK1657"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/I-750421.json b/docs/data/histograms/Argentina/I-750421.json
index 72ae3e32beb..2bb3b9339c4 100644
--- a/docs/data/histograms/Argentina/I-750421.json
+++ b/docs/data/histograms/Argentina/I-750421.json
@@ -1 +1 @@
-{"batchcode": "I-750421", "histograms": [{"batchcodes": ["I-750421"], "histogram": {"Cerebrovascular accident": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "I-750421", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Vaccination complication": 1}, "batchcodes": ["I-750421"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/II-740621.json b/docs/data/histograms/Argentina/II-740621.json
index d3ba95fb456..f2ad550ab94 100644
--- a/docs/data/histograms/Argentina/II-740621.json
+++ b/docs/data/histograms/Argentina/II-740621.json
@@ -1 +1 @@
-{"batchcode": "II-740621", "histograms": [{"batchcodes": ["II-740621"], "histogram": {"Erythema multiforme": 1, "Fatigue": 1, "Immunisation": 1, "Off label use": 1, "Skin lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "II-740621", "histograms": [{"histogram": {"Erythema multiforme": 1, "Fatigue": 1, "Immunisation": 1, "Off label use": 1, "Skin lesion": 1}, "batchcodes": ["II-740621"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/NK0084.json b/docs/data/histograms/Argentina/NK0084.json
index ea221370cb7..be1ce169a67 100644
--- a/docs/data/histograms/Argentina/NK0084.json
+++ b/docs/data/histograms/Argentina/NK0084.json
@@ -1 +1 @@
-{"batchcode": "NK0084", "histograms": [{"batchcodes": ["NK0084"], "histogram": {"Cardiovascular disorder": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "NK0084", "histograms": [{"histogram": {"Cardiovascular disorder": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["NK0084"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/O22D21A.json b/docs/data/histograms/Argentina/O22D21A.json
index 38b39491390..d6d8d9b4614 100644
--- a/docs/data/histograms/Argentina/O22D21A.json
+++ b/docs/data/histograms/Argentina/O22D21A.json
@@ -1 +1 @@
-{"batchcode": "O22D21A", "histograms": [{"batchcodes": ["O22D21A"], "histogram": {"SARS-CoV-2 test": 2, "Anxiety": 1, "Confusional state": 1, "Headache": 1, "Hypotonia": 1, "Meningitis aseptic": 1, "Pain": 1, "Seizure": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "O22D21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "Anxiety": 1, "Confusional state": 1, "Headache": 1, "Hypotonia": 1, "Meningitis aseptic": 1, "Pain": 1, "Seizure": 1, "Vaccination complication": 1}, "batchcodes": ["O22D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/O24D217.json b/docs/data/histograms/Argentina/O24D217.json
index d7d15ebfea3..b235af96b53 100644
--- a/docs/data/histograms/Argentina/O24D217.json
+++ b/docs/data/histograms/Argentina/O24D217.json
@@ -1 +1 @@
-{"batchcode": "O24D217", "histograms": [{"batchcodes": ["O24D217"], "histogram": {"Anaphylactic reaction": 1, "Pain": 1, "Rash": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "O24D217", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Pain": 1, "Rash": 1, "Swelling": 1}, "batchcodes": ["O24D217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/O85M21A.json b/docs/data/histograms/Argentina/O85M21A.json
index ebc04edc7ef..a6c2a291ed2 100644
--- a/docs/data/histograms/Argentina/O85M21A.json
+++ b/docs/data/histograms/Argentina/O85M21A.json
@@ -1 +1 @@
-{"batchcode": "O85M21A", "histograms": [{"batchcodes": ["O85M21A"], "histogram": {"Cerebrovascular accident": 1, "Dyslipidaemia": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "O85M21A", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Dyslipidaemia": 1, "Thrombosis": 1}, "batchcodes": ["O85M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Argentina/OS3M21A.json b/docs/data/histograms/Argentina/OS3M21A.json
index e9d8e227c41..209f565c372 100644
--- a/docs/data/histograms/Argentina/OS3M21A.json
+++ b/docs/data/histograms/Argentina/OS3M21A.json
@@ -1 +1 @@
-{"batchcode": "OS3M21A", "histograms": [{"batchcodes": ["OS3M21A"], "histogram": {"Febrile convulsion": 1, "Hypotonia": 1, "Myalgia": 1, "Pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "OS3M21A", "histograms": [{"histogram": {"Febrile convulsion": 1, "Hypotonia": 1, "Myalgia": 1, "Pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["OS3M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/000002A.json b/docs/data/histograms/Australia/000002A.json
index 3e012d7e6b3..930a910e46e 100644
--- a/docs/data/histograms/Australia/000002A.json
+++ b/docs/data/histograms/Australia/000002A.json
@@ -1 +1 @@
-{"batchcode": "000002A", "histograms": [{"batchcodes": ["000002A"], "histogram": {"Blood test": 2, "Dizziness": 2, "Headache": 2, "Hypoaesthesia": 2, "Neuralgia": 2, "Pain": 2, "Pharyngeal swelling": 2, "Thrombosis": 2, "Chest pain": 1, "Dyspnoea": 1, "Gait inability": 1, "Palpitations": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "000002A", "histograms": [{"histogram": {"Blood test": 2, "Dizziness": 2, "Headache": 2, "Hypoaesthesia": 2, "Neuralgia": 2, "Pain": 2, "Pharyngeal swelling": 2, "Thrombosis": 2, "Chest pain": 1, "Dyspnoea": 1, "Gait inability": 1, "Palpitations": 1, "Presyncope": 1}, "batchcodes": ["000002A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/00002A.json b/docs/data/histograms/Australia/00002A.json
index 10b152c276e..04cda92cec3 100644
--- a/docs/data/histograms/Australia/00002A.json
+++ b/docs/data/histograms/Australia/00002A.json
@@ -1 +1 @@
-{"batchcode": "00002A", "histograms": [{"batchcodes": ["00002A"], "histogram": {"Asthenia": 1, "Autonomic nervous system imbalance": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac function test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Flushing": 1, "Heart rate": 1, "Muscle twitching": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pruritus": 1, "Respiratory rate": 1, "Tachycardia": 1, "Temperature regulation disorder": 1, "Tinnitus": 1, "Troponin": 1, "Troponin T": 1}}]}
\ No newline at end of file
+{"batchcode": "00002A", "histograms": [{"histogram": {"Asthenia": 1, "Autonomic nervous system imbalance": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac function test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Flushing": 1, "Heart rate": 1, "Muscle twitching": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pruritus": 1, "Respiratory rate": 1, "Tachycardia": 1, "Temperature regulation disorder": 1, "Tinnitus": 1, "Troponin": 1, "Troponin T": 1}, "batchcodes": ["00002A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/000031A.json b/docs/data/histograms/Australia/000031A.json
index 3554c609e37..a8d4f14300a 100644
--- a/docs/data/histograms/Australia/000031A.json
+++ b/docs/data/histograms/Australia/000031A.json
@@ -1 +1 @@
-{"batchcode": "000031A", "histograms": [{"batchcodes": ["000031A"], "histogram": {"Arthralgia": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Confusional state": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Lethargy": 1, "Myalgia": 1, "Pericarditis": 1, "Pyrexia": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "000031A", "histograms": [{"histogram": {"Arthralgia": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Confusional state": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Lethargy": 1, "Myalgia": 1, "Pericarditis": 1, "Pyrexia": 1, "Troponin": 1}, "batchcodes": ["000031A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/1F1056A.json b/docs/data/histograms/Australia/1F1056A.json
index a32b9f7a265..b7a9f50b321 100644
--- a/docs/data/histograms/Australia/1F1056A.json
+++ b/docs/data/histograms/Australia/1F1056A.json
@@ -1 +1 @@
-{"batchcode": "1F1056A", "histograms": [{"batchcodes": ["1F1056A"], "histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1056A", "histograms": [{"histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["1F1056A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/1F1057A.json b/docs/data/histograms/Australia/1F1057A.json
index 06bb5e2c3e3..98898ed560a 100644
--- a/docs/data/histograms/Australia/1F1057A.json
+++ b/docs/data/histograms/Australia/1F1057A.json
@@ -1 +1 @@
-{"batchcode": "1F1057A", "histograms": [{"batchcodes": ["1F1057A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1057A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Polymerase chain reaction": 1}, "batchcodes": ["1F1057A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/210957.json b/docs/data/histograms/Australia/210957.json
index 54e5ce08ed0..1cc96b88acc 100644
--- a/docs/data/histograms/Australia/210957.json
+++ b/docs/data/histograms/Australia/210957.json
@@ -1 +1 @@
-{"batchcode": "210957", "histograms": [{"batchcodes": ["210957"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "210957", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["210957"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/3006325.json b/docs/data/histograms/Australia/3006325.json
index 448a2ba6444..373e6fc6632 100644
--- a/docs/data/histograms/Australia/3006325.json
+++ b/docs/data/histograms/Australia/3006325.json
@@ -1 +1 @@
-{"batchcode": "3006325", "histograms": [{"batchcodes": ["3006325"], "histogram": {"Angioedema": 1, "Erythema": 1, "Lip swelling": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "3006325", "histograms": [{"histogram": {"Angioedema": 1, "Erythema": 1, "Lip swelling": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Swelling face": 1}, "batchcodes": ["3006325"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/EJ8516.json b/docs/data/histograms/Australia/EJ8516.json
index 189bf60c5b8..67da039a06d 100644
--- a/docs/data/histograms/Australia/EJ8516.json
+++ b/docs/data/histograms/Australia/EJ8516.json
@@ -1 +1 @@
-{"batchcode": "EJ8516", "histograms": [{"batchcodes": ["EJ8516"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ8516", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["EJ8516"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/EP2163 SERIAL 1.json b/docs/data/histograms/Australia/EP2163 SERIAL 1.json
index fff553949ac..e5483992ace 100644
--- a/docs/data/histograms/Australia/EP2163 SERIAL 1.json
+++ b/docs/data/histograms/Australia/EP2163 SERIAL 1.json
@@ -1 +1 @@
-{"batchcode": "EP2163 SERIAL 1", "histograms": [{"batchcodes": ["EP2163 SERIAL 1"], "histogram": {"Death": 1, "Investigation": 1}}]}
\ No newline at end of file
+{"batchcode": "EP2163 SERIAL 1", "histograms": [{"histogram": {"Death": 1, "Investigation": 1}, "batchcodes": ["EP2163 SERIAL 1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/ER7449.json b/docs/data/histograms/Australia/ER7449.json
index e21070cdb05..f172d1f3fba 100644
--- a/docs/data/histograms/Australia/ER7449.json
+++ b/docs/data/histograms/Australia/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Allergy to vaccine": 1, "Body temperature increased": 1, "Dyspnoea": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Allergy to vaccine": 1, "Body temperature increased": 1, "Dyspnoea": 1, "Urticaria": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/EX2405.json b/docs/data/histograms/Australia/EX2405.json
index 5485f5f0405..fecfdbc4915 100644
--- a/docs/data/histograms/Australia/EX2405.json
+++ b/docs/data/histograms/Australia/EX2405.json
@@ -1 +1 @@
-{"batchcode": "EX2405", "histograms": [{"batchcodes": ["EX2405"], "histogram": {"Chills": 1, "Derealisation": 1, "Dizziness": 1, "Ear discomfort": 1, "Eye infection": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoacusis": 1, "Insomnia": 1, "Nausea": 1, "Neck pain": 1, "Pyrexia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "EX2405", "histograms": [{"histogram": {"Chills": 1, "Derealisation": 1, "Dizziness": 1, "Ear discomfort": 1, "Eye infection": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoacusis": 1, "Insomnia": 1, "Nausea": 1, "Neck pain": 1, "Pyrexia": 1, "Tinnitus": 1}, "batchcodes": ["EX2405"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/EX6564.json b/docs/data/histograms/Australia/EX6564.json
index b0f1752480c..70cf97c3703 100644
--- a/docs/data/histograms/Australia/EX6564.json
+++ b/docs/data/histograms/Australia/EX6564.json
@@ -1 +1 @@
-{"batchcode": "EX6564", "histograms": [{"batchcodes": ["EX6564"], "histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "EX6564", "histograms": [{"histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["EX6564"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FA4598.json b/docs/data/histograms/Australia/FA4598.json
index 12d683a62ea..592b0a22969 100644
--- a/docs/data/histograms/Australia/FA4598.json
+++ b/docs/data/histograms/Australia/FA4598.json
@@ -1 +1 @@
-{"batchcode": "FA4598", "histograms": [{"batchcodes": ["FA4598"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FA4598", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FA4598"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FA7338.json b/docs/data/histograms/Australia/FA7338.json
index 76a31d2e4a1..7911ea6028e 100644
--- a/docs/data/histograms/Australia/FA7338.json
+++ b/docs/data/histograms/Australia/FA7338.json
@@ -1 +1 @@
-{"batchcode": "FA7338", "histograms": [{"batchcodes": ["FA7338"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Heart rate": 1, "Hypoaesthesia oral": 1, "Muscle tightness": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Throat tightness": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7338", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Heart rate": 1, "Hypoaesthesia oral": 1, "Muscle tightness": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Throat tightness": 1, "Vaccination failure": 1}, "batchcodes": ["FA7338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FA7812.json b/docs/data/histograms/Australia/FA7812.json
index df44eac7890..986d95851d3 100644
--- a/docs/data/histograms/Australia/FA7812.json
+++ b/docs/data/histograms/Australia/FA7812.json
@@ -1 +1 @@
-{"batchcode": "FA7812", "histograms": [{"batchcodes": ["FA7812"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "FA7812", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}, "batchcodes": ["FA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FA7912.json b/docs/data/histograms/Australia/FA7912.json
index 45eec6ca3b5..b43efa0a7c9 100644
--- a/docs/data/histograms/Australia/FA7912.json
+++ b/docs/data/histograms/Australia/FA7912.json
@@ -1 +1 @@
-{"batchcode": "FA7912", "histograms": [{"batchcodes": ["FA7912"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7912", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FA7912"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FC3558.json b/docs/data/histograms/Australia/FC3558.json
index 656be563f3c..ea6d9649a96 100644
--- a/docs/data/histograms/Australia/FC3558.json
+++ b/docs/data/histograms/Australia/FC3558.json
@@ -1 +1 @@
-{"batchcode": "FC3558", "histograms": [{"batchcodes": ["FC3558"], "histogram": {"SARS-CoV-2 test": 3, "COVID-19": 2, "Vaccination failure": 2, "Autonomic nervous system imbalance": 1, "Loss of bladder sensation": 1, "Muscle twitching": 1, "Neurological symptom": 1, "Paraesthesia": 1, "Small fibre neuropathy": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3558", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "COVID-19": 2, "Vaccination failure": 2, "Autonomic nervous system imbalance": 1, "Loss of bladder sensation": 1, "Muscle twitching": 1, "Neurological symptom": 1, "Paraesthesia": 1, "Small fibre neuropathy": 1}, "batchcodes": ["FC3558"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FE3430.json b/docs/data/histograms/Australia/FE3430.json
index 7a030863450..cb7b9ededbd 100644
--- a/docs/data/histograms/Australia/FE3430.json
+++ b/docs/data/histograms/Australia/FE3430.json
@@ -1 +1 @@
-{"batchcode": "FE3430", "histograms": [{"batchcodes": ["FE3430"], "histogram": {"Dyspnoea": 2, "Activated partial thromboplastin time": 1, "Adjusted calcium": 1, "Adjusted calcium increased": 1, "Alanine aminotransferase": 1, "Anion gap": 1, "Anion gap increased": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Back pain": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Bilirubin conjugated increased": 1, "Blood albumin": 1, "Blood albumin increased": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood calcium increased": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood methaemoglobin": 1, "Blood osmolarity": 1, "Blood pH": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood uric acid": 1, "Body surface area": 1, "C-reactive protein": 1, "Calcium ionised": 1, "Carboxyhaemoglobin": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Eosinophil count": 1, "Fibrin D dimer": 1, "Fraction of inspired oxygen": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haematocrit increased": 1, "Haemoglobin": 1, "Heart rate": 1, "Human chorionic gonadotropin": 1, "Human chorionic gonadotropin decreased": 1, "International normalised ratio": 1, "Investigation": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "PO2": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Platelet count": 1, "Pleural effusion": 1, "Presyncope": 1, "Protein total": 1, "Protein total increased": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary thrombosis": 1, "Pulmonary valve incompetence": 1, "Red blood cell count": 1, "Red blood cell count increased": 1, "Red blood cell sedimentation rate": 1, "Sinus rhythm": 1, "Tricuspid valve incompetence": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3430", "histograms": [{"histogram": {"Dyspnoea": 2, "Activated partial thromboplastin time": 1, "Adjusted calcium": 1, "Adjusted calcium increased": 1, "Alanine aminotransferase": 1, "Anion gap": 1, "Anion gap increased": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Back pain": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Bilirubin conjugated increased": 1, "Blood albumin": 1, "Blood albumin increased": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood calcium increased": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood methaemoglobin": 1, "Blood osmolarity": 1, "Blood pH": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood uric acid": 1, "Body surface area": 1, "C-reactive protein": 1, "Calcium ionised": 1, "Carboxyhaemoglobin": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Eosinophil count": 1, "Fibrin D dimer": 1, "Fraction of inspired oxygen": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haematocrit increased": 1, "Haemoglobin": 1, "Heart rate": 1, "Human chorionic gonadotropin": 1, "Human chorionic gonadotropin decreased": 1, "International normalised ratio": 1, "Investigation": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "PO2": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Platelet count": 1, "Pleural effusion": 1, "Presyncope": 1, "Protein total": 1, "Protein total increased": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary thrombosis": 1, "Pulmonary valve incompetence": 1, "Red blood cell count": 1, "Red blood cell count increased": 1, "Red blood cell sedimentation rate": 1, "Sinus rhythm": 1, "Tricuspid valve incompetence": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "White blood cell count": 1}, "batchcodes": ["FE3430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FE3712.json b/docs/data/histograms/Australia/FE3712.json
index 24bc5849294..38eb2718eee 100644
--- a/docs/data/histograms/Australia/FE3712.json
+++ b/docs/data/histograms/Australia/FE3712.json
@@ -1 +1 @@
-{"batchcode": "FE3712", "histograms": [{"batchcodes": ["FE3712"], "histogram": {"Blood test": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Gait inability": 1, "Malaise": 1, "Pleural effusion": 1, "Scan": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3712", "histograms": [{"histogram": {"Blood test": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Gait inability": 1, "Malaise": 1, "Pleural effusion": 1, "Scan": 1, "Thrombosis": 1}, "batchcodes": ["FE3712"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FE8163.json b/docs/data/histograms/Australia/FE8163.json
index e59ceeb97c7..49deb14856f 100644
--- a/docs/data/histograms/Australia/FE8163.json
+++ b/docs/data/histograms/Australia/FE8163.json
@@ -1 +1 @@
-{"batchcode": "FE8163", "histograms": [{"batchcodes": ["FE8163"], "histogram": {"COVID-19": 1, "Disturbance in attention": 1, "Dizziness": 1, "Drug ineffective": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Myalgia": 1, "Nerve conduction studies": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "VIth nerve paralysis": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8163", "histograms": [{"histogram": {"COVID-19": 1, "Disturbance in attention": 1, "Dizziness": 1, "Drug ineffective": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Myalgia": 1, "Nerve conduction studies": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "VIth nerve paralysis": 1, "Visual impairment": 1}, "batchcodes": ["FE8163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FF3438.json b/docs/data/histograms/Australia/FF3438.json
index ee6354e7b5d..6d6a93c21da 100644
--- a/docs/data/histograms/Australia/FF3438.json
+++ b/docs/data/histograms/Australia/FF3438.json
@@ -1 +1 @@
-{"batchcode": "FF3438", "histograms": [{"batchcodes": ["FF3438"], "histogram": {"Colitis microscopic": 1}}]}
\ No newline at end of file
+{"batchcode": "FF3438", "histograms": [{"histogram": {"Colitis microscopic": 1}, "batchcodes": ["FF3438"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FF4206.json b/docs/data/histograms/Australia/FF4206.json
index 19eb72df724..2baf77149a2 100644
--- a/docs/data/histograms/Australia/FF4206.json
+++ b/docs/data/histograms/Australia/FF4206.json
@@ -1 +1 @@
-{"batchcode": "FF4206", "histograms": [{"batchcodes": ["FF4206"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Gynaecomastia": 1, "Headache": 1, "Heart rate": 1, "Joint range of motion decreased": 1, "Lethargy": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sinus tachycardia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4206", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Gynaecomastia": 1, "Headache": 1, "Heart rate": 1, "Joint range of motion decreased": 1, "Lethargy": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sinus tachycardia": 1, "Swelling": 1}, "batchcodes": ["FF4206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FF4222-013.json b/docs/data/histograms/Australia/FF4222-013.json
index a7202b8f5f5..e221eab1854 100644
--- a/docs/data/histograms/Australia/FF4222-013.json
+++ b/docs/data/histograms/Australia/FF4222-013.json
@@ -1 +1 @@
-{"batchcode": "FF4222-013", "histograms": [{"batchcodes": ["FF4222-013"], "histogram": {"Headache": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4222-013", "histograms": [{"histogram": {"Headache": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["FF4222-013"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FF4222.json b/docs/data/histograms/Australia/FF4222.json
index 8dfb30842da..f7cf47182ed 100644
--- a/docs/data/histograms/Australia/FF4222.json
+++ b/docs/data/histograms/Australia/FF4222.json
@@ -1 +1 @@
-{"batchcode": "FF4222", "histograms": [{"batchcodes": ["FF4222"], "histogram": {"Allergic cough": 1, "Blood iron": 1, "Blood test": 1, "Body temperature": 1, "Discomfort": 1, "Fatigue": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Parosmia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4222", "histograms": [{"histogram": {"Allergic cough": 1, "Blood iron": 1, "Blood test": 1, "Body temperature": 1, "Discomfort": 1, "Fatigue": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Parosmia": 1, "Pyrexia": 1}, "batchcodes": ["FF4222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FG1657.json b/docs/data/histograms/Australia/FG1657.json
index 99fdb924011..eb9be5474ea 100644
--- a/docs/data/histograms/Australia/FG1657.json
+++ b/docs/data/histograms/Australia/FG1657.json
@@ -1 +1 @@
-{"batchcode": "FG1657", "histograms": [{"batchcodes": ["FG1657"], "histogram": {"Angina pectoris": 1, "Mastitis": 1, "Off label use": 1, "Product use issue": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FG1657", "histograms": [{"histogram": {"Angina pectoris": 1, "Mastitis": 1, "Off label use": 1, "Product use issue": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FG1657"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FG3712.json b/docs/data/histograms/Australia/FG3712.json
index 266d41d0e99..c9550ad430c 100644
--- a/docs/data/histograms/Australia/FG3712.json
+++ b/docs/data/histograms/Australia/FG3712.json
@@ -1 +1 @@
-{"batchcode": "FG3712", "histograms": [{"batchcodes": ["FG3712"], "histogram": {"Angina pectoris": 1, "Pain": 1, "Productive cough": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3712", "histograms": [{"histogram": {"Angina pectoris": 1, "Pain": 1, "Productive cough": 1}, "batchcodes": ["FG3712"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FG7372.json b/docs/data/histograms/Australia/FG7372.json
index d03062e4309..4fe5ebe9b45 100644
--- a/docs/data/histograms/Australia/FG7372.json
+++ b/docs/data/histograms/Australia/FG7372.json
@@ -1 +1 @@
-{"batchcode": "FG7372", "histograms": [{"batchcodes": ["FG7372"], "histogram": {"Balance disorder": 1, "Deafness": 1, "Ear discomfort": 1, "Gait disturbance": 1, "Head discomfort": 1, "Migraine": 1, "Tinnitus": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7372", "histograms": [{"histogram": {"Balance disorder": 1, "Deafness": 1, "Ear discomfort": 1, "Gait disturbance": 1, "Head discomfort": 1, "Migraine": 1, "Tinnitus": 1, "Vertigo": 1}, "batchcodes": ["FG7372"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FH3219.json b/docs/data/histograms/Australia/FH3219.json
index 193d175c5ca..70efe6333b9 100644
--- a/docs/data/histograms/Australia/FH3219.json
+++ b/docs/data/histograms/Australia/FH3219.json
@@ -1 +1 @@
-{"batchcode": "FH3219", "histograms": [{"batchcodes": ["FH3219"], "histogram": {"Tinnitus": 2, "Anxiety": 1, "Chest pain": 1, "Costochondritis": 1, "Deafness unilateral": 1, "Dizziness": 1, "Eye irritation": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Headache": 1, "Hot flush": 1, "Hypertension": 1, "Nasal congestion": 1, "Nausea": 1, "Neuralgia": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Postural orthostatic tachycardia syndrome": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Ultrasound scan": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3219", "histograms": [{"histogram": {"Tinnitus": 2, "Anxiety": 1, "Chest pain": 1, "Costochondritis": 1, "Deafness unilateral": 1, "Dizziness": 1, "Eye irritation": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Headache": 1, "Hot flush": 1, "Hypertension": 1, "Nasal congestion": 1, "Nausea": 1, "Neuralgia": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Postural orthostatic tachycardia syndrome": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Ultrasound scan": 1, "Urticaria": 1}, "batchcodes": ["FH3219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FH3221.json b/docs/data/histograms/Australia/FH3221.json
index ec93430892a..e8069b5dc02 100644
--- a/docs/data/histograms/Australia/FH3221.json
+++ b/docs/data/histograms/Australia/FH3221.json
@@ -1 +1 @@
-{"batchcode": "FH3221", "histograms": [{"batchcodes": ["FH3221"], "histogram": {"SARS-CoV-2 test": 2, "Blood test": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Condition aggravated": 1, "Connective tissue disorder": 1, "Costochondritis": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Pericarditis": 1, "Postural orthostatic tachycardia syndrome": 1, "Vaccination failure": 1, "Viral infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3221", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "Blood test": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Condition aggravated": 1, "Connective tissue disorder": 1, "Costochondritis": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Pericarditis": 1, "Postural orthostatic tachycardia syndrome": 1, "Vaccination failure": 1, "Viral infection": 1}, "batchcodes": ["FH3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FJ5973.json b/docs/data/histograms/Australia/FJ5973.json
index 2432c2ef8c0..f0c344f6b9f 100644
--- a/docs/data/histograms/Australia/FJ5973.json
+++ b/docs/data/histograms/Australia/FJ5973.json
@@ -1 +1 @@
-{"batchcode": "FJ5973", "histograms": [{"batchcodes": ["FJ5973"], "histogram": {"Confusional state": 1, "Dizziness": 1, "Eye movement disorder": 1, "Gait inability": 1, "Hallucination": 1, "Hypoaesthesia": 1, "Malaise": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5973", "histograms": [{"histogram": {"Confusional state": 1, "Dizziness": 1, "Eye movement disorder": 1, "Gait inability": 1, "Hallucination": 1, "Hypoaesthesia": 1, "Malaise": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["FJ5973"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FK6268.json b/docs/data/histograms/Australia/FK6268.json
index 9a2fd8367be..90132e66393 100644
--- a/docs/data/histograms/Australia/FK6268.json
+++ b/docs/data/histograms/Australia/FK6268.json
@@ -1 +1 @@
-{"batchcode": "FK6268", "histograms": [{"batchcodes": ["FK6268"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6268", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FK6268"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FL350.json b/docs/data/histograms/Australia/FL350.json
index 015c7d777ff..1727e7a9f20 100644
--- a/docs/data/histograms/Australia/FL350.json
+++ b/docs/data/histograms/Australia/FL350.json
@@ -1 +1 @@
-{"batchcode": "FL350", "histograms": [{"batchcodes": ["FL350"], "histogram": {"Chest discomfort": 1, "Chills": 1, "Disorientation": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Intermenstrual bleeding": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Polymenorrhoea": 1, "Pyrexia": 1, "Small fibre neuropathy": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FL350", "histograms": [{"histogram": {"Chest discomfort": 1, "Chills": 1, "Disorientation": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Intermenstrual bleeding": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Polymenorrhoea": 1, "Pyrexia": 1, "Small fibre neuropathy": 1, "Syncope": 1}, "batchcodes": ["FL350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FL3560.json b/docs/data/histograms/Australia/FL3560.json
index 0d0797d1bb4..51a60bf0079 100644
--- a/docs/data/histograms/Australia/FL3560.json
+++ b/docs/data/histograms/Australia/FL3560.json
@@ -1 +1 @@
-{"batchcode": "FL3560", "histograms": [{"batchcodes": ["FL3560"], "histogram": {"Angiogram": 1, "Blood test": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Hyperhidrosis": 1, "Malaise": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3560", "histograms": [{"histogram": {"Angiogram": 1, "Blood test": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Hyperhidrosis": 1, "Malaise": 1, "Pyrexia": 1}, "batchcodes": ["FL3560"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FL5333.json b/docs/data/histograms/Australia/FL5333.json
index dc752f04782..d95a95c4050 100644
--- a/docs/data/histograms/Australia/FL5333.json
+++ b/docs/data/histograms/Australia/FL5333.json
@@ -1 +1 @@
-{"batchcode": "FL5333", "histograms": [{"batchcodes": ["FL5333"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5333", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FL5333"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FL7649.json b/docs/data/histograms/Australia/FL7649.json
index 9bc27f8b721..c2b81de7de7 100644
--- a/docs/data/histograms/Australia/FL7649.json
+++ b/docs/data/histograms/Australia/FL7649.json
@@ -1 +1 @@
-{"batchcode": "FL7649", "histograms": [{"batchcodes": ["FL7649"], "histogram": {"SARS-CoV-2 test": 3, "COVID-19": 2, "Arthralgia": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking": 1, "Choking sensation": 1, "Cystoscopy": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Gait inability": 1, "Haematoma": 1, "Haematuria": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Micturition disorder": 1, "Nephrolithiasis": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Photophobia": 1, "Poor quality product administered": 1, "Rash": 1, "Swelling": 1, "Testicular pain": 1, "Throat tightness": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FL7649", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "COVID-19": 2, "Arthralgia": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking": 1, "Choking sensation": 1, "Cystoscopy": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Gait inability": 1, "Haematoma": 1, "Haematuria": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Micturition disorder": 1, "Nephrolithiasis": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Photophobia": 1, "Poor quality product administered": 1, "Rash": 1, "Swelling": 1, "Testicular pain": 1, "Throat tightness": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FL7649"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FN0565.json b/docs/data/histograms/Australia/FN0565.json
index 32df875dda0..db5bb5217f6 100644
--- a/docs/data/histograms/Australia/FN0565.json
+++ b/docs/data/histograms/Australia/FN0565.json
@@ -1 +1 @@
-{"batchcode": "FN0565", "histograms": [{"batchcodes": ["FN0565"], "histogram": {"Drug ineffective": 2, "COVID-19": 1, "Immunisation": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FN0565", "histograms": [{"histogram": {"Drug ineffective": 2, "COVID-19": 1, "Immunisation": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1}, "batchcodes": ["FN0565"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FP1430.json b/docs/data/histograms/Australia/FP1430.json
index 16270325ab9..9caf8671391 100644
--- a/docs/data/histograms/Australia/FP1430.json
+++ b/docs/data/histograms/Australia/FP1430.json
@@ -1 +1 @@
-{"batchcode": "FP1430", "histograms": [{"batchcodes": ["FP1430"], "histogram": {"Activated partial thromboplastin time": 1, "Activated partial thromboplastin time prolonged": 1, "Adenotonsillectomy": 1, "Alanine aminotransferase": 1, "Amplified musculoskeletal pain syndrome": 1, "Anxiety": 1, "Arthralgia": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19": 1, "Chest X-ray": 1, "Chest pain": 1, "Complex regional pain syndrome": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Eosinophilia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hyperaesthesia": 1, "Insomnia": 1, "International normalised ratio": 1, "Investigation": 1, "Left ventricular hypertrophy": 1, "Lethargy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Nausea": 1, "Neutrophil count": 1, "Palpitations": 1, "Physical examination": 1, "Platelet count": 1, "Polyarthritis": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Syncope": 1, "Thrombocytopenia": 1, "Troponin": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FP1430", "histograms": [{"histogram": {"Activated partial thromboplastin time": 1, "Activated partial thromboplastin time prolonged": 1, "Adenotonsillectomy": 1, "Alanine aminotransferase": 1, "Amplified musculoskeletal pain syndrome": 1, "Anxiety": 1, "Arthralgia": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19": 1, "Chest X-ray": 1, "Chest pain": 1, "Complex regional pain syndrome": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Eosinophilia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hyperaesthesia": 1, "Insomnia": 1, "International normalised ratio": 1, "Investigation": 1, "Left ventricular hypertrophy": 1, "Lethargy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Nausea": 1, "Neutrophil count": 1, "Palpitations": 1, "Physical examination": 1, "Platelet count": 1, "Polyarthritis": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Syncope": 1, "Thrombocytopenia": 1, "Troponin": 1, "White blood cell count": 1}, "batchcodes": ["FP1430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/FP8290.json b/docs/data/histograms/Australia/FP8290.json
index fdd9541d0fa..426f986f503 100644
--- a/docs/data/histograms/Australia/FP8290.json
+++ b/docs/data/histograms/Australia/FP8290.json
@@ -1 +1 @@
-{"batchcode": "FP8290", "histograms": [{"batchcodes": ["FP8290"], "histogram": {"Abdominal pain": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Cough": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hyperhidrosis": 1, "Investigation": 1, "Moaning": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Respiratory rate": 1, "Respiratory rate decreased": 1, "Slow response to stimuli": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8290", "histograms": [{"histogram": {"Abdominal pain": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Cough": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hyperhidrosis": 1, "Investigation": 1, "Moaning": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Respiratory rate": 1, "Respiratory rate decreased": 1, "Slow response to stimuli": 1, "Weight": 1}, "batchcodes": ["FP8290"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/NO BATCH NUMBER.json b/docs/data/histograms/Australia/NO BATCH NUMBER.json
index 4490f0d1d43..b8eb9b008c0 100644
--- a/docs/data/histograms/Australia/NO BATCH NUMBER.json
+++ b/docs/data/histograms/Australia/NO BATCH NUMBER.json
@@ -1 +1 @@
-{"batchcode": "NO BATCH NUMBER", "histograms": [{"batchcodes": ["NO BATCH NUMBER"], "histogram": {"Fibrin D dimer": 8, "Platelet count": 8, "Deep vein thrombosis": 5, "Fibrin D dimer increased": 5, "Headache": 5, "Computerised tomogram": 4, "Thrombocytopenia": 4, "Blood fibrinogen": 3, "Cerebrovascular accident": 3, "Chest pain": 3, "Computerised tomogram head": 3, "Dyspnoea": 3, "Pain in extremity": 3, "Product administered to patient of inappropriate age": 3, "Pulmonary embolism": 3, "Pyrexia": 3, "Thrombosis with thrombocytopenia syndrome": 3, "Ultrasound scan": 3, "Arthralgia": 2, "Back pain": 2, "Bell's palsy": 2, "Biliary dilatation": 2, "C-reactive protein": 2, "Cardiac arrest": 2, "Chest X-ray": 2, "Computerised tomogram thorax": 2, "Dyspnoea exertional": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Fall": 2, "Feeling abnormal": 2, "Giant cell arteritis": 2, "Immunology test": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Nerve conduction studies": 2, "Positron emission tomogram": 2, "Pulmonary hypertension": 2, "Red blood cell sedimentation rate": 2, "Abdominal pain upper": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Acute pulmonary oedema": 1, "Ageusia": 1, "Alopecia": 1, "Angina pectoris": 1, "Angiogram pulmonary": 1, "Anti-platelet factor 4 antibody test": 1, "Antiphospholipid antibodies": 1, "Aortic aneurysm": 1, "Asthenia": 1, "Atrial flutter": 1, "Autoantibody test": 1, "Balance disorder": 1, "Basilar artery thrombosis": 1, "Basophil degranulation test": 1, "Bile duct stone": 1, "Biopsy artery": 1, "Biopsy bone marrow": 1, "Blindness unilateral": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Body temperature": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Cardiolipin antibody": 1, "Cavernous sinus thrombosis": 1, "Cerebral amyloid angiopathy": 1, "Cerebral haemorrhage": 1, "Cerebral ischaemia": 1, "Chest discomfort": 1, "Chronic spontaneous urticaria": 1, "Contusion": 1, "Cough": 1, "Cytomegalovirus test": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diplopia": 1, "Disorientation": 1, "Diverticulum intestinal": 1, "Dizziness": 1, "Dizziness postural": 1, "Dry eye": 1, "Ear pain": 1, "Electrocardiogram ST-T segment abnormal": 1, "Electrocardiogram T wave inversion": 1, "Exophthalmos": 1, "Extra dose administered": 1, "Facial paralysis": 1, "Febrile neutropenia": 1, "Fibrin D dimer normal": 1, "Flow cytometry": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "HIV antibody": 1, "Haematological malignancy": 1, "Haemoglobin": 1, "Hallucination": 1, "Heart rate": 1, "Hemianopia": 1, "Hepatitis A antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Ischaemic stroke": 1, "Jaundice": 1, "Lethargy": 1, "Liver function test": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Lumbar puncture": 1, "Malaise": 1, "Mental impairment": 1, "Migraine": 1, "Miller Fisher syndrome": 1, "Mood altered": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myeloproliferative neoplasm": 1, "Nausea": 1, "Nephrotic syndrome": 1, "Neurologic neglect syndrome": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Palpitations": 1, "Paraesthesia": 1, "Pathology test": 1, "Pericardial effusion": 1, "Peripheral ischaemia": 1, "Platelet count abnormal": 1, "Platelet disorder": 1, "Platelet function test": 1, "Pneumonia": 1, "Pollakiuria": 1, "Productive cough": 1, "Pulmonary haemorrhage": 1, "Pulmonary infarction": 1, "QRS axis abnormal": 1, "Red blood cell sedimentation rate increased": 1, "Renal function test": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory tract infection": 1, "Retinal artery occlusion": 1, "Reynold's syndrome": 1, "Right ventricular dysfunction": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Skin test": 1, "Somnolence": 1, "Sputum increased": 1, "Superficial vein thrombosis": 1, "Swollen tongue": 1, "Syncope": 1, "Throat tightness": 1, "Thrombocytosis": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Transverse sinus thrombosis": 1, "Troponin": 1, "Troponin I": 1, "Troponin increased": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Vaccination error": 1, "Varicose vein": 1, "Venogram": 1, "Vision blurred": 1, "Vomiting": 1, "Weight decreased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "NO BATCH NUMBER", "histograms": [{"histogram": {"Fibrin D dimer": 8, "Platelet count": 8, "Deep vein thrombosis": 5, "Fibrin D dimer increased": 5, "Headache": 5, "Computerised tomogram": 4, "Thrombocytopenia": 4, "Blood fibrinogen": 3, "Cerebrovascular accident": 3, "Chest pain": 3, "Computerised tomogram head": 3, "Dyspnoea": 3, "Pain in extremity": 3, "Product administered to patient of inappropriate age": 3, "Pulmonary embolism": 3, "Pyrexia": 3, "Thrombosis with thrombocytopenia syndrome": 3, "Ultrasound scan": 3, "Arthralgia": 2, "Back pain": 2, "Bell's palsy": 2, "Biliary dilatation": 2, "C-reactive protein": 2, "Cardiac arrest": 2, "Chest X-ray": 2, "Computerised tomogram thorax": 2, "Dyspnoea exertional": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Fall": 2, "Feeling abnormal": 2, "Giant cell arteritis": 2, "Immunology test": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Nerve conduction studies": 2, "Positron emission tomogram": 2, "Pulmonary hypertension": 2, "Red blood cell sedimentation rate": 2, "Abdominal pain upper": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Acute pulmonary oedema": 1, "Ageusia": 1, "Alopecia": 1, "Angina pectoris": 1, "Angiogram pulmonary": 1, "Anti-platelet factor 4 antibody test": 1, "Antiphospholipid antibodies": 1, "Aortic aneurysm": 1, "Asthenia": 1, "Atrial flutter": 1, "Autoantibody test": 1, "Balance disorder": 1, "Basilar artery thrombosis": 1, "Basophil degranulation test": 1, "Bile duct stone": 1, "Biopsy artery": 1, "Biopsy bone marrow": 1, "Blindness unilateral": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Body temperature": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Cardiolipin antibody": 1, "Cavernous sinus thrombosis": 1, "Cerebral amyloid angiopathy": 1, "Cerebral haemorrhage": 1, "Cerebral ischaemia": 1, "Chest discomfort": 1, "Chronic spontaneous urticaria": 1, "Contusion": 1, "Cough": 1, "Cytomegalovirus test": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diplopia": 1, "Disorientation": 1, "Diverticulum intestinal": 1, "Dizziness": 1, "Dizziness postural": 1, "Dry eye": 1, "Ear pain": 1, "Electrocardiogram ST-T segment abnormal": 1, "Electrocardiogram T wave inversion": 1, "Exophthalmos": 1, "Extra dose administered": 1, "Facial paralysis": 1, "Febrile neutropenia": 1, "Fibrin D dimer normal": 1, "Flow cytometry": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "HIV antibody": 1, "Haematological malignancy": 1, "Haemoglobin": 1, "Hallucination": 1, "Heart rate": 1, "Hemianopia": 1, "Hepatitis A antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Ischaemic stroke": 1, "Jaundice": 1, "Lethargy": 1, "Liver function test": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Lumbar puncture": 1, "Malaise": 1, "Mental impairment": 1, "Migraine": 1, "Miller Fisher syndrome": 1, "Mood altered": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myeloproliferative neoplasm": 1, "Nausea": 1, "Nephrotic syndrome": 1, "Neurologic neglect syndrome": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Palpitations": 1, "Paraesthesia": 1, "Pathology test": 1, "Pericardial effusion": 1, "Peripheral ischaemia": 1, "Platelet count abnormal": 1, "Platelet disorder": 1, "Platelet function test": 1, "Pneumonia": 1, "Pollakiuria": 1, "Productive cough": 1, "Pulmonary haemorrhage": 1, "Pulmonary infarction": 1, "QRS axis abnormal": 1, "Red blood cell sedimentation rate increased": 1, "Renal function test": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory tract infection": 1, "Retinal artery occlusion": 1, "Reynold's syndrome": 1, "Right ventricular dysfunction": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Skin test": 1, "Somnolence": 1, "Sputum increased": 1, "Superficial vein thrombosis": 1, "Swollen tongue": 1, "Syncope": 1, "Throat tightness": 1, "Thrombocytosis": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Transverse sinus thrombosis": 1, "Troponin": 1, "Troponin I": 1, "Troponin increased": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Vaccination error": 1, "Varicose vein": 1, "Venogram": 1, "Vision blurred": 1, "Vomiting": 1, "Weight decreased": 1, "White blood cell count": 1}, "batchcodes": ["NO BATCH NUMBER"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/PCA0074.json b/docs/data/histograms/Australia/PCA0074.json
index 30420bea27a..cde31c8718d 100644
--- a/docs/data/histograms/Australia/PCA0074.json
+++ b/docs/data/histograms/Australia/PCA0074.json
@@ -1 +1 @@
-{"batchcode": "PCA0074", "histograms": [{"batchcodes": ["PCA0074"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0074", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["PCA0074"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/PCB0009.json b/docs/data/histograms/Australia/PCB0009.json
index e99366261b5..1cde32b9829 100644
--- a/docs/data/histograms/Australia/PCB0009.json
+++ b/docs/data/histograms/Australia/PCB0009.json
@@ -1 +1 @@
-{"batchcode": "PCB0009", "histograms": [{"batchcodes": ["PCB0009"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0009", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["PCB0009"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/PCB0020.json b/docs/data/histograms/Australia/PCB0020.json
index 0b0f83e2db7..8e0130a336a 100644
--- a/docs/data/histograms/Australia/PCB0020.json
+++ b/docs/data/histograms/Australia/PCB0020.json
@@ -1 +1 @@
-{"batchcode": "PCB0020", "histograms": [{"batchcodes": ["PCB0020"], "histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0020", "histograms": [{"histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["PCB0020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/UKNOWN.json b/docs/data/histograms/Australia/UKNOWN.json
index 536d004780f..4f177221b08 100644
--- a/docs/data/histograms/Australia/UKNOWN.json
+++ b/docs/data/histograms/Australia/UKNOWN.json
@@ -1 +1 @@
-{"batchcode": "UKNOWN", "histograms": [{"batchcodes": ["UKNOWN"], "histogram": {"Cataract": 1}}]}
\ No newline at end of file
+{"batchcode": "UKNOWN", "histograms": [{"histogram": {"Cataract": 1}, "batchcodes": ["UKNOWN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/UNK.json b/docs/data/histograms/Australia/UNK.json
index 1686cc9d93b..95182ac4c9f 100644
--- a/docs/data/histograms/Australia/UNK.json
+++ b/docs/data/histograms/Australia/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK"], "histogram": {"Cardiac valve disease": 1, "Hospitalisation": 1, "Immune thrombocytopenia": 1, "Influenza": 1, "Lung disorder": 1, "Nasopharyngitis": 1, "Petechiae": 1, "Platelet count": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"Cardiac valve disease": 1, "Hospitalisation": 1, "Immune thrombocytopenia": 1, "Influenza": 1, "Lung disorder": 1, "Nasopharyngitis": 1, "Petechiae": 1, "Platelet count": 1, "Vaccination failure": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Australia/UNSURE.json b/docs/data/histograms/Australia/UNSURE.json
index 06c00efaaa1..15532a5b237 100644
--- a/docs/data/histograms/Australia/UNSURE.json
+++ b/docs/data/histograms/Australia/UNSURE.json
@@ -1 +1 @@
-{"batchcode": "UNSURE", "histograms": [{"batchcodes": ["UNSURE"], "histogram": {"Adnexa uteri pain": 1, "Ovarian cyst": 1, "Ultrasound ovary": 1}}]}
\ No newline at end of file
+{"batchcode": "UNSURE", "histograms": [{"histogram": {"Adnexa uteri pain": 1, "Ovarian cyst": 1, "Ultrasound ovary": 1}, "batchcodes": ["UNSURE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Austria/3001943.json b/docs/data/histograms/Austria/3001943.json
index 282dff76f86..b32888b48a3 100644
--- a/docs/data/histograms/Austria/3001943.json
+++ b/docs/data/histograms/Austria/3001943.json
@@ -1 +1 @@
-{"batchcode": "3001943", "histograms": [{"batchcodes": ["3001943"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "3001943", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["3001943"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Bahrain/FH6387.json b/docs/data/histograms/Bahrain/FH6387.json
index 23dc00204c2..4018d127397 100644
--- a/docs/data/histograms/Bahrain/FH6387.json
+++ b/docs/data/histograms/Bahrain/FH6387.json
@@ -1 +1 @@
-{"batchcode": "FH6387", "histograms": [{"batchcodes": ["FH6387"], "histogram": {"Blood pressure measurement": 1, "Haemoglobin": 1, "Headache": 1, "Hypersensitivity": 1, "Immunisation": 1, "Off label use": 1, "Pain": 1, "Palpitations": 1, "Presyncope": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FH6387", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Haemoglobin": 1, "Headache": 1, "Hypersensitivity": 1, "Immunisation": 1, "Off label use": 1, "Pain": 1, "Palpitations": 1, "Presyncope": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["FH6387"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Barbados/042B21A.json b/docs/data/histograms/Barbados/042B21A.json
index 55ef29189d9..0b4c720e474 100644
--- a/docs/data/histograms/Barbados/042B21A.json
+++ b/docs/data/histograms/Barbados/042B21A.json
@@ -1 +1 @@
-{"batchcode": "042B21A", "histograms": [{"batchcodes": ["042B21A"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "042B21A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["042B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Barbados/25A20L.json b/docs/data/histograms/Barbados/25A20L.json
index 85f9febf176..1e06a38342d 100644
--- a/docs/data/histograms/Barbados/25A20L.json
+++ b/docs/data/histograms/Barbados/25A20L.json
@@ -1 +1 @@
-{"batchcode": "25A20L", "histograms": [{"batchcodes": ["25A20L"], "histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "25A20L", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site warmth": 1}, "batchcodes": ["25A20L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Barbados/FD 7220.json b/docs/data/histograms/Barbados/FD 7220.json
index e044143650d..90786fc70f6 100644
--- a/docs/data/histograms/Barbados/FD 7220.json
+++ b/docs/data/histograms/Barbados/FD 7220.json
@@ -1 +1 @@
-{"batchcode": "FD 7220", "histograms": [{"batchcodes": ["FD 7220"], "histogram": {"Abdominal discomfort": 1, "Chest pain": 1, "Diarrhoea": 1, "Dysphagia": 1, "Dyspnoea": 1, "Heart rate increased": 1, "Insomnia": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Near death experience": 1, "Pain in extremity": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "Stomatitis": 1, "Thrombosis": 1, "Vein disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FD 7220", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Chest pain": 1, "Diarrhoea": 1, "Dysphagia": 1, "Dyspnoea": 1, "Heart rate increased": 1, "Insomnia": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Near death experience": 1, "Pain in extremity": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "Stomatitis": 1, "Thrombosis": 1, "Vein disorder": 1, "Vomiting": 1}, "batchcodes": ["FD 7220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Bermuda/EN1185.json b/docs/data/histograms/Bermuda/EN1185.json
index 476b90858b6..96191b77e5f 100644
--- a/docs/data/histograms/Bermuda/EN1185.json
+++ b/docs/data/histograms/Bermuda/EN1185.json
@@ -1 +1 @@
-{"batchcode": "EN1185", "histograms": [{"batchcodes": ["EN1185"], "histogram": {"Dyspnoea": 1, "Echocardiogram": 1, "Erythema": 1, "Pain": 1, "Peripheral swelling": 1, "Sudden visual loss": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1185", "histograms": [{"histogram": {"Dyspnoea": 1, "Echocardiogram": 1, "Erythema": 1, "Pain": 1, "Peripheral swelling": 1, "Sudden visual loss": 1}, "batchcodes": ["EN1185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Bolivia, Plurinational State of/206C21A.json b/docs/data/histograms/Bolivia, Plurinational State of/206C21A.json
index 943a2c49f95..515128a6b60 100644
--- a/docs/data/histograms/Bolivia, Plurinational State of/206C21A.json
+++ b/docs/data/histograms/Bolivia, Plurinational State of/206C21A.json
@@ -1 +1 @@
-{"batchcode": "206C21A", "histograms": [{"batchcodes": ["206C21A"], "histogram": {"Blood lactate dehydrogenase": 1, "COVID-19": 1, "Fibrin D dimer": 1, "Platelet count": 1, "Platelet count increased": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "206C21A", "histograms": [{"histogram": {"Blood lactate dehydrogenase": 1, "COVID-19": 1, "Fibrin D dimer": 1, "Platelet count": 1, "Platelet count increased": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1, "Vaccination failure": 1}, "batchcodes": ["206C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Bosnia and Herzegovina/038A21A.json b/docs/data/histograms/Bosnia and Herzegovina/038A21A.json
index 6e5f0167523..9f4682f8102 100644
--- a/docs/data/histograms/Bosnia and Herzegovina/038A21A.json
+++ b/docs/data/histograms/Bosnia and Herzegovina/038A21A.json
@@ -1 +1 @@
-{"batchcode": "038A21A", "histograms": [{"batchcodes": ["038A21A"], "histogram": {"Pain in extremity": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "038A21A", "histograms": [{"histogram": {"Pain in extremity": 1, "Product dose omission issue": 1}, "batchcodes": ["038A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Bosnia and Herzegovina/ER7934.json b/docs/data/histograms/Bosnia and Herzegovina/ER7934.json
index a146d5b371f..98441c21923 100644
--- a/docs/data/histograms/Bosnia and Herzegovina/ER7934.json
+++ b/docs/data/histograms/Bosnia and Herzegovina/ER7934.json
@@ -1 +1 @@
-{"batchcode": "ER7934", "histograms": [{"batchcodes": ["ER7934"], "histogram": {"Dyspnoea exertional": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7934", "histograms": [{"histogram": {"Dyspnoea exertional": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1}, "batchcodes": ["ER7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Bosnia and Herzegovina/FH0161.json b/docs/data/histograms/Bosnia and Herzegovina/FH0161.json
index 297f7861aea..59f5dccd3d0 100644
--- a/docs/data/histograms/Bosnia and Herzegovina/FH0161.json
+++ b/docs/data/histograms/Bosnia and Herzegovina/FH0161.json
@@ -1 +1 @@
-{"batchcode": "FH0161", "histograms": [{"batchcodes": ["FH0161"], "histogram": {"Anxiety": 1, "Arrhythmia": 1, "Chest pain": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FH0161", "histograms": [{"histogram": {"Anxiety": 1, "Arrhythmia": 1, "Chest pain": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1}, "batchcodes": ["FH0161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/043A21A.json b/docs/data/histograms/Brazil/043A21A.json
index a17776856ef..f88a6397382 100644
--- a/docs/data/histograms/Brazil/043A21A.json
+++ b/docs/data/histograms/Brazil/043A21A.json
@@ -1 +1 @@
-{"batchcode": "043A21A", "histograms": [{"batchcodes": ["043A21A"], "histogram": {"COVID-19": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1, "Sneezing": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "043A21A", "histograms": [{"histogram": {"COVID-19": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1, "Sneezing": 1, "Vaccination failure": 1}, "batchcodes": ["043A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/047AZ1A.json b/docs/data/histograms/Brazil/047AZ1A.json
index c59e2e4bff9..3aa6371491e 100644
--- a/docs/data/histograms/Brazil/047AZ1A.json
+++ b/docs/data/histograms/Brazil/047AZ1A.json
@@ -1 +1 @@
-{"batchcode": "047AZ1A", "histograms": [{"batchcodes": ["047AZ1A"], "histogram": {"Abdominal discomfort": 1, "Back pain": 1, "Blood test": 1, "Chills": 1, "Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "047AZ1A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Back pain": 1, "Blood test": 1, "Chills": 1, "Diarrhoea": 1}, "batchcodes": ["047AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/07209.json b/docs/data/histograms/Brazil/07209.json
index f6a00fffd70..12afddb0018 100644
--- a/docs/data/histograms/Brazil/07209.json
+++ b/docs/data/histograms/Brazil/07209.json
@@ -1 +1 @@
-{"batchcode": "07209", "histograms": [{"batchcodes": ["07209"], "histogram": {"Bradyphrenia": 1, "Computerised tomogram": 1, "Daydreaming": 1, "Dizziness": 1, "Drug ineffective": 1, "Paralysis": 1, "Photophobia": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "07209", "histograms": [{"histogram": {"Bradyphrenia": 1, "Computerised tomogram": 1, "Daydreaming": 1, "Dizziness": 1, "Drug ineffective": 1, "Paralysis": 1, "Photophobia": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["07209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/07BX03.json b/docs/data/histograms/Brazil/07BX03.json
index 1651885a893..03f63fe19b5 100644
--- a/docs/data/histograms/Brazil/07BX03.json
+++ b/docs/data/histograms/Brazil/07BX03.json
@@ -1 +1 @@
-{"batchcode": "07BX03", "histograms": [{"batchcodes": ["07BX03"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "07BX03", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Polymerase chain reaction": 1}, "batchcodes": ["07BX03"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/109541.json b/docs/data/histograms/Brazil/109541.json
index cda66655c44..5cb2da59e73 100644
--- a/docs/data/histograms/Brazil/109541.json
+++ b/docs/data/histograms/Brazil/109541.json
@@ -1 +1 @@
-{"batchcode": "109541", "histograms": [{"batchcodes": ["109541"], "histogram": {"Chest pain": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Nausea": 1, "Off label use": 1, "Paraesthesia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "109541", "histograms": [{"histogram": {"Chest pain": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Nausea": 1, "Off label use": 1, "Paraesthesia": 1, "Pyrexia": 1}, "batchcodes": ["109541"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/165969.json b/docs/data/histograms/Brazil/165969.json
index f9073118663..dca5726392d 100644
--- a/docs/data/histograms/Brazil/165969.json
+++ b/docs/data/histograms/Brazil/165969.json
@@ -1 +1 @@
-{"batchcode": "165969", "histograms": [{"batchcodes": ["165969"], "histogram": {"Chronic spontaneous urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "165969", "histograms": [{"histogram": {"Chronic spontaneous urticaria": 1}, "batchcodes": ["165969"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/1821287.json b/docs/data/histograms/Brazil/1821287.json
index 2dc0f1c9320..cfbedd36ff9 100644
--- a/docs/data/histograms/Brazil/1821287.json
+++ b/docs/data/histograms/Brazil/1821287.json
@@ -1 +1 @@
-{"batchcode": "1821287", "histograms": [{"batchcodes": ["1821287"], "histogram": {"Anaphylactic reaction": 1, "Arthralgia": 1, "Burning sensation": 1, "Erectile dysfunction": 1, "Gait disturbance": 1, "Joint swelling": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "Therapy partial responder": 1}}]}
\ No newline at end of file
+{"batchcode": "1821287", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Arthralgia": 1, "Burning sensation": 1, "Erectile dysfunction": 1, "Gait disturbance": 1, "Joint swelling": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "Therapy partial responder": 1}, "batchcodes": ["1821287"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/1821288.json b/docs/data/histograms/Brazil/1821288.json
index 5798d29d2fe..510632f9f4d 100644
--- a/docs/data/histograms/Brazil/1821288.json
+++ b/docs/data/histograms/Brazil/1821288.json
@@ -1 +1 @@
-{"batchcode": "1821288", "histograms": [{"batchcodes": ["1821288"], "histogram": {"Pain": 5, "Pyrexia": 4, "Asthenia": 2, "Blood pressure measurement": 2, "Body temperature": 2, "COVID-19": 2, "Chills": 2, "Fatigue": 2, "Guillain-Barre syndrome": 2, "Hyperhidrosis": 2, "Oxygen saturation": 2, "Pain in extremity": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Tremor": 2, "Vaccination failure": 2, "Anaphylactic reaction": 1, "Antibody test": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood test": 1, "Computerised tomogram": 1, "Cough": 1, "Dizziness": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Electroneuromyography": 1, "Erythema multiforme": 1, "Full blood count": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Injection site pain": 1, "Intestinal obstruction": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Mumps": 1, "Musculoskeletal pain": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Nausea": 1, "Neuralgia": 1, "Peripheral swelling": 1, "Posture abnormal": 1, "Scleroderma": 1, "Suspected COVID-19": 1, "Therapeutic response unexpected": 1, "Therapy non-responder": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Urine analysis": 1, "Uterine haemorrhage": 1, "Uterine pain": 1, "Viral test": 1, "Vomiting": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "1821288", "histograms": [{"histogram": {"Pain": 5, "Pyrexia": 4, "Asthenia": 2, "Blood pressure measurement": 2, "Body temperature": 2, "COVID-19": 2, "Chills": 2, "Fatigue": 2, "Guillain-Barre syndrome": 2, "Hyperhidrosis": 2, "Oxygen saturation": 2, "Pain in extremity": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Tremor": 2, "Vaccination failure": 2, "Anaphylactic reaction": 1, "Antibody test": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood test": 1, "Computerised tomogram": 1, "Cough": 1, "Dizziness": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Electroneuromyography": 1, "Erythema multiforme": 1, "Full blood count": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Injection site pain": 1, "Intestinal obstruction": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Mumps": 1, "Musculoskeletal pain": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Nausea": 1, "Neuralgia": 1, "Peripheral swelling": 1, "Posture abnormal": 1, "Scleroderma": 1, "Suspected COVID-19": 1, "Therapeutic response unexpected": 1, "Therapy non-responder": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Urine analysis": 1, "Uterine haemorrhage": 1, "Uterine pain": 1, "Viral test": 1, "Vomiting": 1, "White blood cell count increased": 1}, "batchcodes": ["1821288"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/1855836.json b/docs/data/histograms/Brazil/1855836.json
index e1d8108f5e8..ca49c3a9341 100644
--- a/docs/data/histograms/Brazil/1855836.json
+++ b/docs/data/histograms/Brazil/1855836.json
@@ -1 +1 @@
-{"batchcode": "1855836", "histograms": [{"batchcodes": ["1855836"], "histogram": {"Inappropriate schedule of product administration": 3, "Off label use": 3, "Allergic cough": 1, "Antibody test": 1, "Arrhythmia": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Body temperature": 1, "Cerebrovascular disorder": 1, "Chills": 1, "Computerised tomogram": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disorientation": 1, "Fatigue": 1, "Fear": 1, "Hallucination": 1, "Headache": 1, "Labyrinthitis": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Neurological examination": 1, "Pyrexia": 1, "Respiratory rate decreased": 1, "Rhinitis": 1, "Schizophreniform disorder": 1, "Sensory loss": 1, "Sinusitis": 1, "Slow speech": 1, "Tremor": 1, "Urticaria": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1855836", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 3, "Off label use": 3, "Allergic cough": 1, "Antibody test": 1, "Arrhythmia": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Body temperature": 1, "Cerebrovascular disorder": 1, "Chills": 1, "Computerised tomogram": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disorientation": 1, "Fatigue": 1, "Fear": 1, "Hallucination": 1, "Headache": 1, "Labyrinthitis": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Neurological examination": 1, "Pyrexia": 1, "Respiratory rate decreased": 1, "Rhinitis": 1, "Schizophreniform disorder": 1, "Sensory loss": 1, "Sinusitis": 1, "Slow speech": 1, "Tremor": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["1855836"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/1875739.json b/docs/data/histograms/Brazil/1875739.json
index ad56af140ce..09a242a4bc7 100644
--- a/docs/data/histograms/Brazil/1875739.json
+++ b/docs/data/histograms/Brazil/1875739.json
@@ -1 +1 @@
-{"batchcode": "1875739", "histograms": [{"batchcodes": ["1875739"], "histogram": {"Application site pain": 1, "Asthenopia": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Fall": 1, "Head injury": 1, "Joint stiffness": 1, "Loss of consciousness": 1, "Off label use": 1, "Pain": 1, "Skin discolouration": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "1875739", "histograms": [{"histogram": {"Application site pain": 1, "Asthenopia": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Fall": 1, "Head injury": 1, "Joint stiffness": 1, "Loss of consciousness": 1, "Off label use": 1, "Pain": 1, "Skin discolouration": 1, "Tremor": 1}, "batchcodes": ["1875739"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/1875740.json b/docs/data/histograms/Brazil/1875740.json
index 5037a3ad109..9777756c40e 100644
--- a/docs/data/histograms/Brazil/1875740.json
+++ b/docs/data/histograms/Brazil/1875740.json
@@ -1 +1 @@
-{"batchcode": "1875740", "histograms": [{"batchcodes": ["1875740"], "histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Drug-induced liver injury": 1, "Dysgeusia": 1, "Dysphagia": 1, "Hemiparesis": 1, "Influenza": 1, "Mastication disorder": 1, "Off label use": 1, "Petechiae": 1, "Sinusitis": 1, "Tonsillitis": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "1875740", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Drug-induced liver injury": 1, "Dysgeusia": 1, "Dysphagia": 1, "Hemiparesis": 1, "Influenza": 1, "Mastication disorder": 1, "Off label use": 1, "Petechiae": 1, "Sinusitis": 1, "Tonsillitis": 1, "Urticaria": 1}, "batchcodes": ["1875740"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/1875741.json b/docs/data/histograms/Brazil/1875741.json
index 5f9b1defe32..dc07e51bfc7 100644
--- a/docs/data/histograms/Brazil/1875741.json
+++ b/docs/data/histograms/Brazil/1875741.json
@@ -1 +1 @@
-{"batchcode": "1875741", "histograms": [{"batchcodes": ["1875741"], "histogram": {"Eye haemorrhage": 1, "Haemorrhoids": 1, "Off label use": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "1875741", "histograms": [{"histogram": {"Eye haemorrhage": 1, "Haemorrhoids": 1, "Off label use": 1, "Skin discolouration": 1}, "batchcodes": ["1875741"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/1F1062A.json b/docs/data/histograms/Brazil/1F1062A.json
index 09209131da7..db5fe6f93dd 100644
--- a/docs/data/histograms/Brazil/1F1062A.json
+++ b/docs/data/histograms/Brazil/1F1062A.json
@@ -1 +1 @@
-{"batchcode": "1F1062A", "histograms": [{"batchcodes": ["1F1062A"], "histogram": {"SARS-CoV-2 test": 2, "Anosmia": 1, "Arthralgia": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Headache": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1, "Secretion discharge": 1, "Sinusitis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1062A", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "Anosmia": 1, "Arthralgia": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Headache": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1, "Secretion discharge": 1, "Sinusitis": 1, "Vomiting": 1}, "batchcodes": ["1F1062A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/201F21A.json b/docs/data/histograms/Brazil/201F21A.json
index e4168398145..dd4ab233180 100644
--- a/docs/data/histograms/Brazil/201F21A.json
+++ b/docs/data/histograms/Brazil/201F21A.json
@@ -1 +1 @@
-{"batchcode": "201F21A", "histograms": [{"batchcodes": ["201F21A"], "histogram": {"Inappropriate schedule of product administration": 3, "Off label use": 3, "Asthenia": 1, "Bedridden": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Confusional state": 1, "Delirium": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersensitivity": 1, "Lethargy": 1, "Mental impairment": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Paralysis": 1, "Pyrexia": 1, "Skin burning sensation": 1, "Syncope": 1, "Vaccination site mass": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "201F21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 3, "Off label use": 3, "Asthenia": 1, "Bedridden": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Confusional state": 1, "Delirium": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersensitivity": 1, "Lethargy": 1, "Mental impairment": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Paralysis": 1, "Pyrexia": 1, "Skin burning sensation": 1, "Syncope": 1, "Vaccination site mass": 1, "Vomiting": 1}, "batchcodes": ["201F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/203721A.json b/docs/data/histograms/Brazil/203721A.json
index c09ec6b0ec9..be572e08518 100644
--- a/docs/data/histograms/Brazil/203721A.json
+++ b/docs/data/histograms/Brazil/203721A.json
@@ -1 +1 @@
-{"batchcode": "203721A", "histograms": [{"batchcodes": ["203721A"], "histogram": {"Adverse event": 1, "Off label use": 1, "Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "203721A", "histograms": [{"histogram": {"Adverse event": 1, "Off label use": 1, "Pneumonia": 1}, "batchcodes": ["203721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/203G21A.json b/docs/data/histograms/Brazil/203G21A.json
index a4e40a06833..49ca9e532e5 100644
--- a/docs/data/histograms/Brazil/203G21A.json
+++ b/docs/data/histograms/Brazil/203G21A.json
@@ -1 +1 @@
-{"batchcode": "203G21A", "histograms": [{"batchcodes": ["203G21A"], "histogram": {"Inappropriate schedule of product administration": 2, "Off label use": 2, "Blood test": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Haemorrhage": 1, "Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "203G21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Off label use": 2, "Blood test": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Haemorrhage": 1, "Myocardial infarction": 1}, "batchcodes": ["203G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/203H21A.json b/docs/data/histograms/Brazil/203H21A.json
index df8bcc3a796..dc6c04f7e1c 100644
--- a/docs/data/histograms/Brazil/203H21A.json
+++ b/docs/data/histograms/Brazil/203H21A.json
@@ -1 +1 @@
-{"batchcode": "203H21A", "histograms": [{"batchcodes": ["203H21A"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Pain": 1, "Somnolence": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "203H21A", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Pain": 1, "Somnolence": 1, "Syncope": 1}, "batchcodes": ["203H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/203H2IA.json b/docs/data/histograms/Brazil/203H2IA.json
index af07082af93..d2471361c45 100644
--- a/docs/data/histograms/Brazil/203H2IA.json
+++ b/docs/data/histograms/Brazil/203H2IA.json
@@ -1 +1 @@
-{"batchcode": "203H2IA", "histograms": [{"batchcodes": ["203H2IA"], "histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Pulmonary embolism": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "203H2IA", "histograms": [{"histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Pulmonary embolism": 1, "Thrombosis": 1}, "batchcodes": ["203H2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/20432A.json b/docs/data/histograms/Brazil/20432A.json
index b88ce149e2a..c54dab92cb2 100644
--- a/docs/data/histograms/Brazil/20432A.json
+++ b/docs/data/histograms/Brazil/20432A.json
@@ -1 +1 @@
-{"batchcode": "20432A", "histograms": [{"batchcodes": ["20432A"], "histogram": {"Body temperature": 1, "Breast pain": 1, "Breast swelling": 1, "Chills": 1, "Dyspareunia": 1, "Hot flush": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Seizure": 1, "Sensory loss": 1, "Urinary tract infection": 1, "Vaginal haemorrhage": 1, "Varicose vein": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "20432A", "histograms": [{"histogram": {"Body temperature": 1, "Breast pain": 1, "Breast swelling": 1, "Chills": 1, "Dyspareunia": 1, "Hot flush": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Seizure": 1, "Sensory loss": 1, "Urinary tract infection": 1, "Vaginal haemorrhage": 1, "Varicose vein": 1, "Visual impairment": 1}, "batchcodes": ["20432A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/204421A.json b/docs/data/histograms/Brazil/204421A.json
index c349ecb090c..f468a632de5 100644
--- a/docs/data/histograms/Brazil/204421A.json
+++ b/docs/data/histograms/Brazil/204421A.json
@@ -1 +1 @@
-{"batchcode": "204421A", "histograms": [{"batchcodes": ["204421A"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pulmonary pain": 1}}]}
\ No newline at end of file
+{"batchcode": "204421A", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pulmonary pain": 1}, "batchcodes": ["204421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/204B21A.json b/docs/data/histograms/Brazil/204B21A.json
index aba4b77b0cc..2d705bdec3e 100644
--- a/docs/data/histograms/Brazil/204B21A.json
+++ b/docs/data/histograms/Brazil/204B21A.json
@@ -1 +1 @@
-{"batchcode": "204B21A", "histograms": [{"batchcodes": ["204B21A"], "histogram": {"Pyrexia": 4, "Asthenia": 3, "Guillain-Barre syndrome": 3, "Headache": 3, "Malaise": 3, "Amaurosis fugax": 2, "Back pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Magnetic resonance imaging": 2, "Pain": 2, "Angiogram": 1, "Anxiety": 1, "Aphasia": 1, "Arachnoiditis": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Carotid artery occlusion": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Computerised tomogram": 1, "Demyelination": 1, "Depression": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hallucination": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Immune system disorder": 1, "Immunoglobulins": 1, "Laboratory test": 1, "Meniere's disease": 1, "Muscle spasms": 1, "Nervousness": 1, "Oedema": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Platelet count": 1, "Pneumonia": 1, "Presyncope": 1, "Purulence": 1, "Rash": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Spinal pain": 1, "Syncope": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tremor": 1, "Vertigo": 1, "Vital signs measurement": 1, "Vomiting": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "204B21A", "histograms": [{"histogram": {"Pyrexia": 4, "Asthenia": 3, "Guillain-Barre syndrome": 3, "Headache": 3, "Malaise": 3, "Amaurosis fugax": 2, "Back pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Magnetic resonance imaging": 2, "Pain": 2, "Angiogram": 1, "Anxiety": 1, "Aphasia": 1, "Arachnoiditis": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Carotid artery occlusion": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Computerised tomogram": 1, "Demyelination": 1, "Depression": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hallucination": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Immune system disorder": 1, "Immunoglobulins": 1, "Laboratory test": 1, "Meniere's disease": 1, "Muscle spasms": 1, "Nervousness": 1, "Oedema": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Platelet count": 1, "Pneumonia": 1, "Presyncope": 1, "Purulence": 1, "Rash": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Spinal pain": 1, "Syncope": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tremor": 1, "Vertigo": 1, "Vital signs measurement": 1, "Vomiting": 1, "Wound": 1}, "batchcodes": ["204B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/204G21A.json b/docs/data/histograms/Brazil/204G21A.json
index 6b692abe2ef..956b6263e0b 100644
--- a/docs/data/histograms/Brazil/204G21A.json
+++ b/docs/data/histograms/Brazil/204G21A.json
@@ -1 +1 @@
-{"batchcode": "204G21A", "histograms": [{"batchcodes": ["204G21A"], "histogram": {"Inappropriate schedule of product administration": 2, "Off label use": 2, "Blood test": 1, "Computerised tomogram": 1, "Guillain-Barre syndrome": 1, "Paraesthesia": 1, "Pyrexia": 1, "Sensory loss": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "204G21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Off label use": 2, "Blood test": 1, "Computerised tomogram": 1, "Guillain-Barre syndrome": 1, "Paraesthesia": 1, "Pyrexia": 1, "Sensory loss": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["204G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/205H21A.json b/docs/data/histograms/Brazil/205H21A.json
index 711e78b8824..c574fadee53 100644
--- a/docs/data/histograms/Brazil/205H21A.json
+++ b/docs/data/histograms/Brazil/205H21A.json
@@ -1 +1 @@
-{"batchcode": "205H21A", "histograms": [{"batchcodes": ["205H21A"], "histogram": {"Off label use": 2, "Thrombosis": 2, "Inappropriate schedule of product administration": 1, "Pain": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "205H21A", "histograms": [{"histogram": {"Off label use": 2, "Thrombosis": 2, "Inappropriate schedule of product administration": 1, "Pain": 1, "Ultrasound scan": 1}, "batchcodes": ["205H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/205J21A.json b/docs/data/histograms/Brazil/205J21A.json
index c78c792e332..0fb466273cc 100644
--- a/docs/data/histograms/Brazil/205J21A.json
+++ b/docs/data/histograms/Brazil/205J21A.json
@@ -1 +1 @@
-{"batchcode": "205J21A", "histograms": [{"batchcodes": ["205J21A"], "histogram": {"COVID-19 immunisation": 1, "Headache": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "205J21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Headache": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["205J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/207H21A.json b/docs/data/histograms/Brazil/207H21A.json
index 9aff4fe8212..f3d924d1416 100644
--- a/docs/data/histograms/Brazil/207H21A.json
+++ b/docs/data/histograms/Brazil/207H21A.json
@@ -1 +1 @@
-{"batchcode": "207H21A", "histograms": [{"batchcodes": ["207H21A"], "histogram": {"Pyrexia": 4, "Nausea": 3, "Body temperature": 2, "Headache": 2, "Off label use": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "COVID-19 immunisation": 1, "Chills": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate irregular": 1, "Herpes virus test": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Muscle spasms": 1, "Myocardial ischaemia": 1, "Pain": 1, "Pain in extremity": 1, "Paralysis": 1, "Product administered to patient of inappropriate age": 1, "Renal failure": 1, "Treponema test": 1, "Vertigo": 1, "Vulvovaginal injury": 1}}]}
\ No newline at end of file
+{"batchcode": "207H21A", "histograms": [{"histogram": {"Pyrexia": 4, "Nausea": 3, "Body temperature": 2, "Headache": 2, "Off label use": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "COVID-19 immunisation": 1, "Chills": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate irregular": 1, "Herpes virus test": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Muscle spasms": 1, "Myocardial ischaemia": 1, "Pain": 1, "Pain in extremity": 1, "Paralysis": 1, "Product administered to patient of inappropriate age": 1, "Renal failure": 1, "Treponema test": 1, "Vertigo": 1, "Vulvovaginal injury": 1}, "batchcodes": ["207H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/207M1A.json b/docs/data/histograms/Brazil/207M1A.json
index 1318af3287f..0dc5562128d 100644
--- a/docs/data/histograms/Brazil/207M1A.json
+++ b/docs/data/histograms/Brazil/207M1A.json
@@ -1 +1 @@
-{"batchcode": "207M1A", "histograms": [{"batchcodes": ["207M1A"], "histogram": {"Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "207M1A", "histograms": [{"histogram": {"Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Thrombosis": 1}, "batchcodes": ["207M1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/208F21A.json b/docs/data/histograms/Brazil/208F21A.json
index 4dd9e860532..dd09fc5b57b 100644
--- a/docs/data/histograms/Brazil/208F21A.json
+++ b/docs/data/histograms/Brazil/208F21A.json
@@ -1 +1 @@
-{"batchcode": "208F21A", "histograms": [{"batchcodes": ["208F21A"], "histogram": {"Asthenia": 2, "Feeling of body temperature change": 2, "Off label use": 2, "Chills": 1, "Confusional state": 1, "Disorientation": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Injection site paraesthesia": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Myalgia": 1, "Panic attack": 1, "Paraesthesia": 1, "Pyrexia": 1, "Somnolence": 1, "Speech disorder": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "208F21A", "histograms": [{"histogram": {"Asthenia": 2, "Feeling of body temperature change": 2, "Off label use": 2, "Chills": 1, "Confusional state": 1, "Disorientation": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Injection site paraesthesia": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Myalgia": 1, "Panic attack": 1, "Paraesthesia": 1, "Pyrexia": 1, "Somnolence": 1, "Speech disorder": 1, "Syncope": 1}, "batchcodes": ["208F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/209A21A.json b/docs/data/histograms/Brazil/209A21A.json
index d59ed66e048..b4191d7a621 100644
--- a/docs/data/histograms/Brazil/209A21A.json
+++ b/docs/data/histograms/Brazil/209A21A.json
@@ -1 +1 @@
-{"batchcode": "209A21A", "histograms": [{"batchcodes": ["209A21A"], "histogram": {"Abdominal pain": 1, "Body temperature": 1, "Chills": 1, "Pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Portal vein thrombosis": 1, "Pyrexia": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "209A21A", "histograms": [{"histogram": {"Abdominal pain": 1, "Body temperature": 1, "Chills": 1, "Pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Portal vein thrombosis": 1, "Pyrexia": 1, "Ultrasound scan": 1}, "batchcodes": ["209A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/20W2IA.json b/docs/data/histograms/Brazil/20W2IA.json
index 5dbc1687ac8..91d5275b480 100644
--- a/docs/data/histograms/Brazil/20W2IA.json
+++ b/docs/data/histograms/Brazil/20W2IA.json
@@ -1 +1 @@
-{"batchcode": "20W2IA", "histograms": [{"batchcodes": ["20W2IA"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Eye pain": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Malaise": 1, "Nausea": 1, "Off label use": 1, "Pruritus": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "20W2IA", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Eye pain": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Malaise": 1, "Nausea": 1, "Off label use": 1, "Pruritus": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["20W2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/210058.json b/docs/data/histograms/Brazil/210058.json
index f64919ad83e..b1ddb35d3b1 100644
--- a/docs/data/histograms/Brazil/210058.json
+++ b/docs/data/histograms/Brazil/210058.json
@@ -1 +1 @@
-{"batchcode": "210058", "histograms": [{"batchcodes": ["210058"], "histogram": {"C-reactive protein": 1, "Feeling hot": 1, "Illness": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "210058", "histograms": [{"histogram": {"C-reactive protein": 1, "Feeling hot": 1, "Illness": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["210058"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/210074.json b/docs/data/histograms/Brazil/210074.json
index e56b8e7b847..c98adb155df 100644
--- a/docs/data/histograms/Brazil/210074.json
+++ b/docs/data/histograms/Brazil/210074.json
@@ -1 +1 @@
-{"batchcode": "210074", "histograms": [{"batchcodes": ["210074"], "histogram": {"Arrhythmia": 1, "Back pain": 1, "COVID-19": 1, "Colonoscopy": 1, "Diverticulitis": 1, "Inguinal hernia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "210074", "histograms": [{"histogram": {"Arrhythmia": 1, "Back pain": 1, "COVID-19": 1, "Colonoscopy": 1, "Diverticulitis": 1, "Inguinal hernia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["210074"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/210197.json b/docs/data/histograms/Brazil/210197.json
index d8a978403f1..33bc137ab35 100644
--- a/docs/data/histograms/Brazil/210197.json
+++ b/docs/data/histograms/Brazil/210197.json
@@ -1 +1 @@
-{"batchcode": "210197", "histograms": [{"batchcodes": ["210197"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Paralysis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "210197", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Paralysis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["210197"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/210212.json b/docs/data/histograms/Brazil/210212.json
index 794d45c3f5b..d92884dc9f7 100644
--- a/docs/data/histograms/Brazil/210212.json
+++ b/docs/data/histograms/Brazil/210212.json
@@ -1 +1 @@
-{"batchcode": "210212", "histograms": [{"batchcodes": ["210212"], "histogram": {"Foetal malformation": 1, "Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "210212", "histograms": [{"histogram": {"Foetal malformation": 1, "Maternal exposure during pregnancy": 1}, "batchcodes": ["210212"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/210281.json b/docs/data/histograms/Brazil/210281.json
index 3893ea3650c..aa5642bf1dc 100644
--- a/docs/data/histograms/Brazil/210281.json
+++ b/docs/data/histograms/Brazil/210281.json
@@ -1 +1 @@
-{"batchcode": "210281", "histograms": [{"batchcodes": ["210281"], "histogram": {"Acute febrile neutrophilic dermatosis": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Angiogram": 1, "Aspartate aminotransferase": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Bilirubin urine": 1, "Biopsy": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood calcium": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood magnesium": 1, "Blood parathyroid hormone": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood testosterone": 1, "Blood testosterone free": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest pain": 1, "Complement factor": 1, "Complement factor C3": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Dehydration": 1, "Eosinophil count": 1, "Erythema nodosum": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Glucose urine": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hepatitis B virus test": 1, "Laboratory test": 1, "Lipase": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Nausea": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Oestradiol": 1, "Pain in extremity": 1, "Papule": 1, "Peripheral swelling": 1, "Phonophobia": 1, "Physical examination": 1, "Platelet count": 1, "Polyuria": 1, "Procalcitonin": 1, "Protein urine": 1, "Pustule": 1, "Pyrexia": 1, "Rash macular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Skin lesion": 1, "Smear test": 1, "Streptococcus test": 1, "Thyroxine free": 1, "Transferrin saturation": 1, "Treponema test": 1, "Tuberculin test": 1, "Upper respiratory tract infection": 1, "Urinary sediment present": 1, "Urine analysis": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "210281", "histograms": [{"histogram": {"Acute febrile neutrophilic dermatosis": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Angiogram": 1, "Aspartate aminotransferase": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Bilirubin urine": 1, "Biopsy": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood calcium": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood magnesium": 1, "Blood parathyroid hormone": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood testosterone": 1, "Blood testosterone free": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest pain": 1, "Complement factor": 1, "Complement factor C3": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Dehydration": 1, "Eosinophil count": 1, "Erythema nodosum": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Glucose urine": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hepatitis B virus test": 1, "Laboratory test": 1, "Lipase": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Nausea": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Oestradiol": 1, "Pain in extremity": 1, "Papule": 1, "Peripheral swelling": 1, "Phonophobia": 1, "Physical examination": 1, "Platelet count": 1, "Polyuria": 1, "Procalcitonin": 1, "Protein urine": 1, "Pustule": 1, "Pyrexia": 1, "Rash macular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Skin lesion": 1, "Smear test": 1, "Streptococcus test": 1, "Thyroxine free": 1, "Transferrin saturation": 1, "Treponema test": 1, "Tuberculin test": 1, "Upper respiratory tract infection": 1, "Urinary sediment present": 1, "Urine analysis": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["210281"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/210A21A.json b/docs/data/histograms/Brazil/210A21A.json
index 4d3a5c3d01e..5567ab0874e 100644
--- a/docs/data/histograms/Brazil/210A21A.json
+++ b/docs/data/histograms/Brazil/210A21A.json
@@ -1 +1 @@
-{"batchcode": "210A21A", "histograms": [{"batchcodes": ["210A21A", "FJ4187"], "histogram": {"Influenza A virus test": 1, "Influenza B virus test": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["210A21A"], "histogram": {"Headache": 7, "Computerised tomogram": 5, "Dizziness": 5, "Nausea": 5, "SARS-CoV-2 test": 5, "Asthenia": 4, "Tremor": 4, "Blood pressure measurement": 3, "Magnetic resonance imaging": 3, "Pain": 3, "Pyrexia": 3, "Vaccination failure": 3, "Blood test": 2, "Body temperature": 2, "Diarrhoea": 2, "Electroneuromyography": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Hypertension": 2, "Malaise": 2, "Movement disorder": 2, "Myalgia": 2, "Neuropathy peripheral": 2, "Pain in extremity": 2, "Paralysis": 2, "SARS-CoV-2 antibody test": 2, "Sinusitis": 2, "Suspected COVID-19": 2, "Syncope": 2, "Therapy non-responder": 2, "Vision blurred": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Abdominal rigidity": 1, "Amnesia": 1, "Angiogram": 1, "Anxiety": 1, "Arthralgia": 1, "Balance disorder": 1, "Biopsy": 1, "Biopsy lymph gland": 1, "Biopsy skin": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "COVID-19": 1, "CSF test": 1, "Central nervous system infection": 1, "Cerebral thrombosis": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Contusion": 1, "Coordination abnormal": 1, "Cough": 1, "Culture urine": 1, "Cytomegalovirus test": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Erythema": 1, "Escherichia urinary tract infection": 1, "Eye pain": 1, "Facial paresis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Full blood count": 1, "Gait inability": 1, "HIV infection": 1, "Heart rate abnormal": 1, "Hepatic steatosis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Hypotension": 1, "Ill-defined disorder": 1, "Illness": 1, "Impaired reasoning": 1, "Infection": 1, "Influenza like illness": 1, "Insomnia": 1, "Ischaemic stroke": 1, "Loss of personal independence in daily activities": 1, "Lymphadenitis": 1, "Lymphoid tissue hyperplasia": 1, "Mammogram": 1, "Mastication disorder": 1, "Muscle atrophy": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Mycobacterium tuberculosis complex test": 1, "Neurological symptom": 1, "Oedema peripheral": 1, "Osteonecrosis": 1, "Palpitations": 1, "Paraesthesia": 1, "Physical breast examination": 1, "Physical examination": 1, "Plasmacytosis": 1, "Pneumonia": 1, "Prostate examination": 1, "Prostatic specific antigen": 1, "Prostatitis": 1, "Pupil fixed": 1, "Seizure": 1, "Sensory disturbance": 1, "Shock": 1, "Skin discolouration": 1, "Skin laceration": 1, "Spinal pain": 1, "Ultrasound breast": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Visual impairment": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "210A21A", "histograms": [{"histogram": {"Influenza A virus test": 1, "Influenza B virus test": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["210A21A", "FJ4187"]}, {"histogram": {"Headache": 7, "Computerised tomogram": 5, "Dizziness": 5, "Nausea": 5, "SARS-CoV-2 test": 5, "Asthenia": 4, "Tremor": 4, "Blood pressure measurement": 3, "Magnetic resonance imaging": 3, "Pain": 3, "Pyrexia": 3, "Vaccination failure": 3, "Blood test": 2, "Body temperature": 2, "Diarrhoea": 2, "Electroneuromyography": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Hypertension": 2, "Malaise": 2, "Movement disorder": 2, "Myalgia": 2, "Neuropathy peripheral": 2, "Pain in extremity": 2, "Paralysis": 2, "SARS-CoV-2 antibody test": 2, "Sinusitis": 2, "Suspected COVID-19": 2, "Syncope": 2, "Therapy non-responder": 2, "Vision blurred": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Abdominal rigidity": 1, "Amnesia": 1, "Angiogram": 1, "Anxiety": 1, "Arthralgia": 1, "Balance disorder": 1, "Biopsy": 1, "Biopsy lymph gland": 1, "Biopsy skin": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "COVID-19": 1, "CSF test": 1, "Central nervous system infection": 1, "Cerebral thrombosis": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Contusion": 1, "Coordination abnormal": 1, "Cough": 1, "Culture urine": 1, "Cytomegalovirus test": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Erythema": 1, "Escherichia urinary tract infection": 1, "Eye pain": 1, "Facial paresis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Full blood count": 1, "Gait inability": 1, "HIV infection": 1, "Heart rate abnormal": 1, "Hepatic steatosis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Hypotension": 1, "Ill-defined disorder": 1, "Illness": 1, "Impaired reasoning": 1, "Infection": 1, "Influenza like illness": 1, "Insomnia": 1, "Ischaemic stroke": 1, "Loss of personal independence in daily activities": 1, "Lymphadenitis": 1, "Lymphoid tissue hyperplasia": 1, "Mammogram": 1, "Mastication disorder": 1, "Muscle atrophy": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Mycobacterium tuberculosis complex test": 1, "Neurological symptom": 1, "Oedema peripheral": 1, "Osteonecrosis": 1, "Palpitations": 1, "Paraesthesia": 1, "Physical breast examination": 1, "Physical examination": 1, "Plasmacytosis": 1, "Pneumonia": 1, "Prostate examination": 1, "Prostatic specific antigen": 1, "Prostatitis": 1, "Pupil fixed": 1, "Seizure": 1, "Sensory disturbance": 1, "Shock": 1, "Skin discolouration": 1, "Skin laceration": 1, "Spinal pain": 1, "Ultrasound breast": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Visual impairment": 1, "X-ray": 1}, "batchcodes": ["210A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/210F21A.json b/docs/data/histograms/Brazil/210F21A.json
index d97eff79a7e..82ac52e0fe8 100644
--- a/docs/data/histograms/Brazil/210F21A.json
+++ b/docs/data/histograms/Brazil/210F21A.json
@@ -1 +1 @@
-{"batchcode": "210F21A", "histograms": [{"batchcodes": ["210F21A"], "histogram": {"Chills": 4, "Inappropriate schedule of product administration": 4, "Off label use": 4, "Headache": 3, "Pyrexia": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Blood test": 2, "Body temperature": 2, "Hyperhidrosis": 2, "Impaired work ability": 2, "Pain": 2, "Pain in extremity": 2, "Thrombosis": 2, "Application site haemorrhage": 1, "Arthralgia": 1, "Back pain": 1, "Bedridden": 1, "Blood pressure decreased": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Delirium": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Exercise electrocardiogram": 1, "Fear": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Heart rate": 1, "Heart rate increased": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Laryngeal oedema": 1, "Malaise": 1, "Mouth swelling": 1, "Musculoskeletal stiffness": 1, "Pallor": 1, "Peripheral swelling": 1, "Swelling face": 1, "Tremor": 1, "Ultrasound Doppler": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "210F21A", "histograms": [{"histogram": {"Chills": 4, "Inappropriate schedule of product administration": 4, "Off label use": 4, "Headache": 3, "Pyrexia": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Blood test": 2, "Body temperature": 2, "Hyperhidrosis": 2, "Impaired work ability": 2, "Pain": 2, "Pain in extremity": 2, "Thrombosis": 2, "Application site haemorrhage": 1, "Arthralgia": 1, "Back pain": 1, "Bedridden": 1, "Blood pressure decreased": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Delirium": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Exercise electrocardiogram": 1, "Fear": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Heart rate": 1, "Heart rate increased": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Laryngeal oedema": 1, "Malaise": 1, "Mouth swelling": 1, "Musculoskeletal stiffness": 1, "Pallor": 1, "Peripheral swelling": 1, "Swelling face": 1, "Tremor": 1, "Ultrasound Doppler": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["210F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/211A21A.json b/docs/data/histograms/Brazil/211A21A.json
index 571157d590c..533684c4f0f 100644
--- a/docs/data/histograms/Brazil/211A21A.json
+++ b/docs/data/histograms/Brazil/211A21A.json
@@ -1 +1 @@
-{"batchcode": "211A21A", "histograms": [{"batchcodes": ["211A21A"], "histogram": {"Burning sensation": 1, "Eyelid ptosis": 1, "Insomnia": 1, "Nasopharyngitis": 1, "Nervous system disorder": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Syncope": 1, "Therapy non-responder": 1}}]}
\ No newline at end of file
+{"batchcode": "211A21A", "histograms": [{"histogram": {"Burning sensation": 1, "Eyelid ptosis": 1, "Insomnia": 1, "Nasopharyngitis": 1, "Nervous system disorder": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Syncope": 1, "Therapy non-responder": 1}, "batchcodes": ["211A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/211J21A.json b/docs/data/histograms/Brazil/211J21A.json
index 11d7b2e4e02..0414475b7fb 100644
--- a/docs/data/histograms/Brazil/211J21A.json
+++ b/docs/data/histograms/Brazil/211J21A.json
@@ -1 +1 @@
-{"batchcode": "211J21A", "histograms": [{"batchcodes": ["211J21A"], "histogram": {"Headache": 2, "Malaise": 2, "COVID-19 immunisation": 1, "Neck pain": 1, "Off label use": 1, "Pain": 1, "Photophobia": 1, "Pyrexia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "211J21A", "histograms": [{"histogram": {"Headache": 2, "Malaise": 2, "COVID-19 immunisation": 1, "Neck pain": 1, "Off label use": 1, "Pain": 1, "Photophobia": 1, "Pyrexia": 1, "Urticaria": 1}, "batchcodes": ["211J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/212A21A.json b/docs/data/histograms/Brazil/212A21A.json
index d7485dfacfc..2707a738914 100644
--- a/docs/data/histograms/Brazil/212A21A.json
+++ b/docs/data/histograms/Brazil/212A21A.json
@@ -1 +1 @@
-{"batchcode": "212A21A", "histograms": [{"batchcodes": ["212A21A"], "histogram": {"Blood creatinine abnormal": 1, "Blood test": 1, "Bruxism": 1, "Cerebral disorder": 1, "Computerised tomogram": 1, "DNA antibody": 1, "Dyskinesia": 1, "Epilepsy": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial spasm": 1, "Headache": 1, "Impaired driving ability": 1, "Investigation abnormal": 1, "Laboratory test": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Myalgia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "212A21A", "histograms": [{"histogram": {"Blood creatinine abnormal": 1, "Blood test": 1, "Bruxism": 1, "Cerebral disorder": 1, "Computerised tomogram": 1, "DNA antibody": 1, "Dyskinesia": 1, "Epilepsy": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial spasm": 1, "Headache": 1, "Impaired driving ability": 1, "Investigation abnormal": 1, "Laboratory test": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Myalgia": 1, "Paraesthesia": 1}, "batchcodes": ["212A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/212J21A.json b/docs/data/histograms/Brazil/212J21A.json
index e9063aa788d..1486eff0e9d 100644
--- a/docs/data/histograms/Brazil/212J21A.json
+++ b/docs/data/histograms/Brazil/212J21A.json
@@ -1 +1 @@
-{"batchcode": "212J21A", "histograms": [{"batchcodes": ["212J21A"], "histogram": {"Decreased immune responsiveness": 1, "Depression": 1, "Drug ineffective": 1, "Fatigue": 1, "Pain": 1, "Pain in extremity": 1, "Violence-related symptom": 1}}]}
\ No newline at end of file
+{"batchcode": "212J21A", "histograms": [{"histogram": {"Decreased immune responsiveness": 1, "Depression": 1, "Drug ineffective": 1, "Fatigue": 1, "Pain": 1, "Pain in extremity": 1, "Violence-related symptom": 1}, "batchcodes": ["212J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/216UCD219W.json b/docs/data/histograms/Brazil/216UCD219W.json
index 6103e9c66e9..36c1c950c78 100644
--- a/docs/data/histograms/Brazil/216UCD219W.json
+++ b/docs/data/histograms/Brazil/216UCD219W.json
@@ -1 +1 @@
-{"batchcode": "216UCD219W", "histograms": [{"batchcodes": ["216UCD219W"], "histogram": {"Biopsy lymph gland": 1, "Blood test": 1, "Enteritis infectious": 1, "Full blood count": 1, "Headache": 1, "Imaging procedure": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Pyrexia": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "216UCD219W", "histograms": [{"histogram": {"Biopsy lymph gland": 1, "Blood test": 1, "Enteritis infectious": 1, "Full blood count": 1, "Headache": 1, "Imaging procedure": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Pyrexia": 1, "X-ray": 1}, "batchcodes": ["216UCD219W"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/21OA21A.json b/docs/data/histograms/Brazil/21OA21A.json
index 115f9a5e06a..20510c71fe1 100644
--- a/docs/data/histograms/Brazil/21OA21A.json
+++ b/docs/data/histograms/Brazil/21OA21A.json
@@ -1 +1 @@
-{"batchcode": "21OA21A", "histograms": [{"batchcodes": ["21OA21A"], "histogram": {"Erythema": 1, "Hypersensitivity": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "21OA21A", "histograms": [{"histogram": {"Erythema": 1, "Hypersensitivity": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["21OA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/2639572 FG3529.json b/docs/data/histograms/Brazil/2639572 FG3529.json
index cf996537f78..e54e89476ed 100644
--- a/docs/data/histograms/Brazil/2639572 FG3529.json
+++ b/docs/data/histograms/Brazil/2639572 FG3529.json
@@ -1 +1 @@
-{"batchcode": "2639572 FG3529", "histograms": [{"batchcodes": ["2639572 FG3529"], "histogram": {"Acoustic stimulation tests": 1, "Crying": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "2639572 FG3529", "histograms": [{"histogram": {"Acoustic stimulation tests": 1, "Crying": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Tinnitus": 1}, "batchcodes": ["2639572 FG3529"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/2752336.json b/docs/data/histograms/Brazil/2752336.json
index c204d325428..25766e4decc 100644
--- a/docs/data/histograms/Brazil/2752336.json
+++ b/docs/data/histograms/Brazil/2752336.json
@@ -1 +1 @@
-{"batchcode": "2752336", "histograms": [{"batchcodes": ["2752336"], "histogram": {"Foetal cardiac arrest": 1, "Maternal exposure during pregnancy": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "2752336", "histograms": [{"histogram": {"Foetal cardiac arrest": 1, "Maternal exposure during pregnancy": 1, "Ultrasound scan": 1}, "batchcodes": ["2752336"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/2785315.json b/docs/data/histograms/Brazil/2785315.json
index 45d11dbc7ad..3374a0f8102 100644
--- a/docs/data/histograms/Brazil/2785315.json
+++ b/docs/data/histograms/Brazil/2785315.json
@@ -1 +1 @@
-{"batchcode": "2785315", "histograms": [{"batchcodes": ["2785315"], "histogram": {"Atrioventricular block second degree": 1, "Congestive cardiomyopathy": 1, "Electrocardiogram": 1, "Fatigue": 1, "Infection": 1, "Low cardiac output syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "2785315", "histograms": [{"histogram": {"Atrioventricular block second degree": 1, "Congestive cardiomyopathy": 1, "Electrocardiogram": 1, "Fatigue": 1, "Infection": 1, "Low cardiac output syndrome": 1}, "batchcodes": ["2785315"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/282308D.json b/docs/data/histograms/Brazil/282308D.json
index 056641cb32d..d829ac8aea6 100644
--- a/docs/data/histograms/Brazil/282308D.json
+++ b/docs/data/histograms/Brazil/282308D.json
@@ -1 +1 @@
-{"batchcode": "282308D", "histograms": [{"batchcodes": ["282308D"], "histogram": {"Asthenia": 1, "Dyspepsia": 1, "Inappropriate schedule of product administration": 1, "Oral pain": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "282308D", "histograms": [{"histogram": {"Asthenia": 1, "Dyspepsia": 1, "Inappropriate schedule of product administration": 1, "Oral pain": 1, "Throat irritation": 1}, "batchcodes": ["282308D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/28230BD.json b/docs/data/histograms/Brazil/28230BD.json
index 7b4864aada1..6ddce898aec 100644
--- a/docs/data/histograms/Brazil/28230BD.json
+++ b/docs/data/histograms/Brazil/28230BD.json
@@ -1 +1 @@
-{"batchcode": "28230BD", "histograms": [{"batchcodes": ["28230BD"], "histogram": {"Inappropriate schedule of product administration": 2, "Abscess": 1, "Body temperature": 1, "Chest pain": 1, "Furuncle": 1, "Haemorrhagic stroke": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "28230BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Abscess": 1, "Body temperature": 1, "Chest pain": 1, "Furuncle": 1, "Haemorrhagic stroke": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["28230BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/282318D.json b/docs/data/histograms/Brazil/282318D.json
index 071b2c8eb20..ed43bd4d634 100644
--- a/docs/data/histograms/Brazil/282318D.json
+++ b/docs/data/histograms/Brazil/282318D.json
@@ -1 +1 @@
-{"batchcode": "282318D", "histograms": [{"batchcodes": ["282318D"], "histogram": {"Arthralgia": 1, "Bell's palsy": 1, "Chest pain": 1, "Dizziness": 1, "Ear pain": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Groin pain": 1, "Insomnia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Peripheral venous disease": 1, "Ultrasound Doppler": 1, "Varicose vein ruptured": 1, "Vascular pain": 1}}]}
\ No newline at end of file
+{"batchcode": "282318D", "histograms": [{"histogram": {"Arthralgia": 1, "Bell's palsy": 1, "Chest pain": 1, "Dizziness": 1, "Ear pain": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Groin pain": 1, "Insomnia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Peripheral venous disease": 1, "Ultrasound Doppler": 1, "Varicose vein ruptured": 1, "Vascular pain": 1}, "batchcodes": ["282318D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/28231BD.json b/docs/data/histograms/Brazil/28231BD.json
index 64a4fbb3825..4313451a6ce 100644
--- a/docs/data/histograms/Brazil/28231BD.json
+++ b/docs/data/histograms/Brazil/28231BD.json
@@ -1 +1 @@
-{"batchcode": "28231BD", "histograms": [{"batchcodes": ["28231BD"], "histogram": {"Inappropriate schedule of product administration": 3, "Erythema": 2, "Hypersensitivity": 2, "Pain in extremity": 2, "Wheezing": 2, "Blister": 1, "Blood glucose": 1, "Blood test": 1, "Chest X-ray": 1, "Cough": 1, "Dyspnoea": 1, "Eating disorder": 1, "Eye oedema": 1, "Face and mouth X-ray": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Heart rate": 1, "Herpes simplex": 1, "Hyperpyrexia": 1, "Hypoglycaemia": 1, "Laryngeal oedema": 1, "Mouth swelling": 1, "Nasoendoscopy": 1, "Pain": 1, "Paralysis": 1, "Peripheral swelling": 1, "Poor peripheral circulation": 1, "Productive cough": 1, "Rash pruritic": 1, "Rhinitis allergic": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Tachycardia": 1, "Throat irritation": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "28231BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 3, "Erythema": 2, "Hypersensitivity": 2, "Pain in extremity": 2, "Wheezing": 2, "Blister": 1, "Blood glucose": 1, "Blood test": 1, "Chest X-ray": 1, "Cough": 1, "Dyspnoea": 1, "Eating disorder": 1, "Eye oedema": 1, "Face and mouth X-ray": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Heart rate": 1, "Herpes simplex": 1, "Hyperpyrexia": 1, "Hypoglycaemia": 1, "Laryngeal oedema": 1, "Mouth swelling": 1, "Nasoendoscopy": 1, "Pain": 1, "Paralysis": 1, "Peripheral swelling": 1, "Poor peripheral circulation": 1, "Productive cough": 1, "Rash pruritic": 1, "Rhinitis allergic": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Tachycardia": 1, "Throat irritation": 1, "Visual impairment": 1}, "batchcodes": ["28231BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/2823513D.json b/docs/data/histograms/Brazil/2823513D.json
index c6b31362fcf..b410f8578f8 100644
--- a/docs/data/histograms/Brazil/2823513D.json
+++ b/docs/data/histograms/Brazil/2823513D.json
@@ -1 +1 @@
-{"batchcode": "2823513D", "histograms": [{"batchcodes": ["2823513D"], "histogram": {"Abdominal pain": 1, "Blood pressure decreased": 1, "Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "2823513D", "histograms": [{"histogram": {"Abdominal pain": 1, "Blood pressure decreased": 1, "Syncope": 1, "Tremor": 1}, "batchcodes": ["2823513D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/282358D.json b/docs/data/histograms/Brazil/282358D.json
index fb827d0b99d..4215761881b 100644
--- a/docs/data/histograms/Brazil/282358D.json
+++ b/docs/data/histograms/Brazil/282358D.json
@@ -1 +1 @@
-{"batchcode": "282358D", "histograms": [{"batchcodes": ["282358D"], "histogram": {"Arrhythmia": 1, "Bell's palsy": 1, "Hydrocephalus": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "282358D", "histograms": [{"histogram": {"Arrhythmia": 1, "Bell's palsy": 1, "Hydrocephalus": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["282358D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/28235BD.json b/docs/data/histograms/Brazil/28235BD.json
index 228ad46ebfc..1088e746424 100644
--- a/docs/data/histograms/Brazil/28235BD.json
+++ b/docs/data/histograms/Brazil/28235BD.json
@@ -1 +1 @@
-{"batchcode": "28235BD", "histograms": [{"batchcodes": ["28235BD"], "histogram": {"Inappropriate schedule of product administration": 4, "Lymphadenopathy": 2, "SARS-CoV-2 test": 2, "Anaemia": 1, "Arrhythmia supraventricular": 1, "Basophil count": 1, "Bleeding time": 1, "Blood 25-hydroxycholecalciferol decreased": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin M": 1, "Blood insulin": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Blood thromboplastin": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "COVID-19": 1, "Cerebral thrombosis": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Disease recurrence": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrophoresis": 1, "Eosinophil count": 1, "Eye disorder": 1, "Gamma-glutamyltransferase": 1, "HIV infection": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Headache": 1, "Hepatic steatosis": 1, "Hepatitis B core antibody negative": 1, "Hepatitis B surface antigen": 1, "Hepatitis C RNA": 1, "High density lipoprotein": 1, "Hypersensitivity": 1, "Investigation": 1, "Iron deficiency": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Plateletcrit decreased": 1, "Prothrombin time": 1, "Red blood cell abnormality": 1, "Red cell distribution width increased": 1, "Reticulocyte count": 1, "Serum ferritin": 1, "Serum ferritin decreased": 1, "Skin lesion": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Syncope": 1, "Thrombocytopenia": 1, "Transaminases": 1, "Vaccination site pain": 1, "Ventricular arrhythmia": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin D": 1, "White blood cell disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "28235BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 4, "Lymphadenopathy": 2, "SARS-CoV-2 test": 2, "Anaemia": 1, "Arrhythmia supraventricular": 1, "Basophil count": 1, "Bleeding time": 1, "Blood 25-hydroxycholecalciferol decreased": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin M": 1, "Blood insulin": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Blood thromboplastin": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "COVID-19": 1, "Cerebral thrombosis": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Disease recurrence": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrophoresis": 1, "Eosinophil count": 1, "Eye disorder": 1, "Gamma-glutamyltransferase": 1, "HIV infection": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Headache": 1, "Hepatic steatosis": 1, "Hepatitis B core antibody negative": 1, "Hepatitis B surface antigen": 1, "Hepatitis C RNA": 1, "High density lipoprotein": 1, "Hypersensitivity": 1, "Investigation": 1, "Iron deficiency": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Plateletcrit decreased": 1, "Prothrombin time": 1, "Red blood cell abnormality": 1, "Red cell distribution width increased": 1, "Reticulocyte count": 1, "Serum ferritin": 1, "Serum ferritin decreased": 1, "Skin lesion": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Syncope": 1, "Thrombocytopenia": 1, "Transaminases": 1, "Vaccination site pain": 1, "Ventricular arrhythmia": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin D": 1, "White blood cell disorder": 1}, "batchcodes": ["28235BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/29235BD.json b/docs/data/histograms/Brazil/29235BD.json
index 5bba2eb82a0..6655669a134 100644
--- a/docs/data/histograms/Brazil/29235BD.json
+++ b/docs/data/histograms/Brazil/29235BD.json
@@ -1 +1 @@
-{"batchcode": "29235BD", "histograms": [{"batchcodes": ["29235BD"], "histogram": {"Coma scale": 1, "Coma scale abnormal": 1, "Depression": 1, "Headache": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Tonic convulsion": 1}}]}
\ No newline at end of file
+{"batchcode": "29235BD", "histograms": [{"histogram": {"Coma scale": 1, "Coma scale abnormal": 1, "Depression": 1, "Headache": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Tonic convulsion": 1}, "batchcodes": ["29235BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/31025BD.json b/docs/data/histograms/Brazil/31025BD.json
index f93580625bd..1b9296850e4 100644
--- a/docs/data/histograms/Brazil/31025BD.json
+++ b/docs/data/histograms/Brazil/31025BD.json
@@ -1 +1 @@
-{"batchcode": "31025BD", "histograms": [{"batchcodes": ["31025BD"], "histogram": {"Inappropriate schedule of product administration": 2, "Lymphadenopathy": 2, "Pain in extremity": 2, "Arthralgia": 1, "Axillary pain": 1, "Burning sensation": 1, "Echocardiogram": 1, "Haemangioma of liver": 1, "Headache": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Lymphadenitis": 1, "Muscle swelling": 1, "Myalgia": 1, "Neck pain": 1, "Off label use": 1, "Pain": 1, "Palpitations": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "31025BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Lymphadenopathy": 2, "Pain in extremity": 2, "Arthralgia": 1, "Axillary pain": 1, "Burning sensation": 1, "Echocardiogram": 1, "Haemangioma of liver": 1, "Headache": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Lymphadenitis": 1, "Muscle swelling": 1, "Myalgia": 1, "Neck pain": 1, "Off label use": 1, "Pain": 1, "Palpitations": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urticaria": 1}, "batchcodes": ["31025BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/31045 BF.json b/docs/data/histograms/Brazil/31045 BF.json
index de7acb8d13d..701997a6018 100644
--- a/docs/data/histograms/Brazil/31045 BF.json
+++ b/docs/data/histograms/Brazil/31045 BF.json
@@ -1 +1 @@
-{"batchcode": "31045 BF", "histograms": [{"batchcodes": ["31045 BF"], "histogram": {"Interchange of vaccine products": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "31045 BF", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Off label use": 1}, "batchcodes": ["31045 BF"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/31045BD.json b/docs/data/histograms/Brazil/31045BD.json
index a24acf19b2f..887461ef72e 100644
--- a/docs/data/histograms/Brazil/31045BD.json
+++ b/docs/data/histograms/Brazil/31045BD.json
@@ -1 +1 @@
-{"batchcode": "31045BD", "histograms": [{"batchcodes": ["31045BD"], "histogram": {"Inappropriate schedule of product administration": 2, "Off label use": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Anaemia": 1, "Blindness": 1, "Breast pain": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Haematochezia": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Laboratory test": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Mouth ulceration": 1, "Optic nerve injury": 1, "Optic neuritis": 1, "Papilloedema": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Postmenopausal haemorrhage": 1, "Pruritus": 1, "Systemic lupus erythematosus": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "31045BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Off label use": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Anaemia": 1, "Blindness": 1, "Breast pain": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Haematochezia": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Laboratory test": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Mouth ulceration": 1, "Optic nerve injury": 1, "Optic neuritis": 1, "Papilloedema": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Postmenopausal haemorrhage": 1, "Pruritus": 1, "Systemic lupus erythematosus": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "Vaccination site pain": 1}, "batchcodes": ["31045BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/3106580.json b/docs/data/histograms/Brazil/3106580.json
index 3adc356b542..0b41018fd87 100644
--- a/docs/data/histograms/Brazil/3106580.json
+++ b/docs/data/histograms/Brazil/3106580.json
@@ -1 +1 @@
-{"batchcode": "3106580", "histograms": [{"batchcodes": ["3106580"], "histogram": {"Facial paralysis": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "3106580", "histograms": [{"histogram": {"Facial paralysis": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["3106580"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/31065BD.json b/docs/data/histograms/Brazil/31065BD.json
index d8cd99d8bca..e9f053e0963 100644
--- a/docs/data/histograms/Brazil/31065BD.json
+++ b/docs/data/histograms/Brazil/31065BD.json
@@ -1 +1 @@
-{"batchcode": "31065BD", "histograms": [{"batchcodes": ["31065BD"], "histogram": {"Inappropriate schedule of product administration": 3, "Antibody test": 1, "Antibody test abnormal": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Bone disorder": 1, "Bone scan": 1, "COVID-19": 1, "Chest pain": 1, "Computerised tomogram": 1, "Decreased activity": 1, "Diverticulitis": 1, "Drug ineffective": 1, "Electrocardiogram ambulatory": 1, "Electroneuromyography": 1, "Fall": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging spinal": 1, "Monoparesis": 1, "Nephrolithiasis": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Ventricular extrasystoles": 1}}]}
\ No newline at end of file
+{"batchcode": "31065BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 3, "Antibody test": 1, "Antibody test abnormal": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Bone disorder": 1, "Bone scan": 1, "COVID-19": 1, "Chest pain": 1, "Computerised tomogram": 1, "Decreased activity": 1, "Diverticulitis": 1, "Drug ineffective": 1, "Electrocardiogram ambulatory": 1, "Electroneuromyography": 1, "Fall": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging spinal": 1, "Monoparesis": 1, "Nephrolithiasis": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Ventricular extrasystoles": 1}, "batchcodes": ["31065BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/3106SBD.json b/docs/data/histograms/Brazil/3106SBD.json
index 144c71928fa..bb642b77eab 100644
--- a/docs/data/histograms/Brazil/3106SBD.json
+++ b/docs/data/histograms/Brazil/3106SBD.json
@@ -1 +1 @@
-{"batchcode": "3106SBD", "histograms": [{"batchcodes": ["3106SBD"], "histogram": {"Body temperature": 1, "Chills": 1, "Dry mouth": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "3106SBD", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dry mouth": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Suspected COVID-19": 1}, "batchcodes": ["3106SBD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/32010BD.json b/docs/data/histograms/Brazil/32010BD.json
index 5adaa4b31bc..de231856a3d 100644
--- a/docs/data/histograms/Brazil/32010BD.json
+++ b/docs/data/histograms/Brazil/32010BD.json
@@ -1 +1 @@
-{"batchcode": "32010BD", "histograms": [{"batchcodes": ["32010BD"], "histogram": {"Inappropriate schedule of product administration": 2, "Interchange of vaccine products": 2, "Off label use": 2, "SARS-CoV-2 test": 2, "Back pain": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "COVID-19": 1, "Chest pain": 1, "Drug ineffective": 1, "Headache": 1, "Hypertension": 1, "Immunisation": 1, "Myelitis": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "32010BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Interchange of vaccine products": 2, "Off label use": 2, "SARS-CoV-2 test": 2, "Back pain": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "COVID-19": 1, "Chest pain": 1, "Drug ineffective": 1, "Headache": 1, "Hypertension": 1, "Immunisation": 1, "Myelitis": 1, "Pulmonary embolism": 1}, "batchcodes": ["32010BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/320168D.json b/docs/data/histograms/Brazil/320168D.json
index 81df351b269..0b264670205 100644
--- a/docs/data/histograms/Brazil/320168D.json
+++ b/docs/data/histograms/Brazil/320168D.json
@@ -1 +1 @@
-{"batchcode": "320168D", "histograms": [{"batchcodes": ["320168D"], "histogram": {"Alopecia": 1, "Arthralgia": 1, "Coagulopathy": 1, "Feeling abnormal": 1, "Menstruation irregular": 1, "Nodule": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "320168D", "histograms": [{"histogram": {"Alopecia": 1, "Arthralgia": 1, "Coagulopathy": 1, "Feeling abnormal": 1, "Menstruation irregular": 1, "Nodule": 1, "Tinnitus": 1}, "batchcodes": ["320168D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/32016BD.json b/docs/data/histograms/Brazil/32016BD.json
index 295a33e5a3e..24e4bc1f277 100644
--- a/docs/data/histograms/Brazil/32016BD.json
+++ b/docs/data/histograms/Brazil/32016BD.json
@@ -1 +1 @@
-{"batchcode": "32016BD", "histograms": [{"batchcodes": ["32016BD"], "histogram": {"Inappropriate schedule of product administration": 2, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Furuncle": 1, "Nodule": 1, "Palpitations": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "32016BD", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Furuncle": 1, "Nodule": 1, "Palpitations": 1, "Seizure": 1}, "batchcodes": ["32016BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/3201BD.json b/docs/data/histograms/Brazil/3201BD.json
index 1090ff845e5..8757222821d 100644
--- a/docs/data/histograms/Brazil/3201BD.json
+++ b/docs/data/histograms/Brazil/3201BD.json
@@ -1 +1 @@
-{"batchcode": "3201BD", "histograms": [{"batchcodes": ["3201BD"], "histogram": {"Condition aggravated": 1, "Neck mass": 1, "Neck pain": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3201BD", "histograms": [{"histogram": {"Condition aggravated": 1, "Neck mass": 1, "Neck pain": 1, "Pain": 1}, "batchcodes": ["3201BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/3203.json b/docs/data/histograms/Brazil/3203.json
index 265c5601afc..1c8683b9ef9 100644
--- a/docs/data/histograms/Brazil/3203.json
+++ b/docs/data/histograms/Brazil/3203.json
@@ -1 +1 @@
-{"batchcode": "3203", "histograms": [{"batchcodes": ["3203"], "histogram": {"Back pain": 1, "Bone pain": 1, "Chest pain": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3203", "histograms": [{"histogram": {"Back pain": 1, "Bone pain": 1, "Chest pain": 1, "Pain": 1}, "batchcodes": ["3203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/4206H21A.json b/docs/data/histograms/Brazil/4206H21A.json
index 74323828b2b..85bfb650f6a 100644
--- a/docs/data/histograms/Brazil/4206H21A.json
+++ b/docs/data/histograms/Brazil/4206H21A.json
@@ -1 +1 @@
-{"batchcode": "4206H21A", "histograms": [{"batchcodes": ["4206H21A"], "histogram": {"Arrhythmia": 1, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Chromaturia": 1, "Diarrhoea": 1, "Dry mouth": 1, "Gait disturbance": 1, "Hallucination": 1, "Nasal congestion": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Renal pain": 1, "Speech disorder": 1, "Swelling face": 1, "Throat irritation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "4206H21A", "histograms": [{"histogram": {"Arrhythmia": 1, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Chromaturia": 1, "Diarrhoea": 1, "Dry mouth": 1, "Gait disturbance": 1, "Hallucination": 1, "Nasal congestion": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Renal pain": 1, "Speech disorder": 1, "Swelling face": 1, "Throat irritation": 1, "Vaccination site pain": 1}, "batchcodes": ["4206H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/4423.json b/docs/data/histograms/Brazil/4423.json
index 5e202c3f712..62ce8aefee4 100644
--- a/docs/data/histograms/Brazil/4423.json
+++ b/docs/data/histograms/Brazil/4423.json
@@ -1 +1 @@
-{"batchcode": "4423", "histograms": [{"batchcodes": ["4423"], "histogram": {"Angina pectoris": 1, "Anti-platelet factor 4 antibody test": 1, "Chest X-ray": 1, "Electrocardiogram": 1, "Eye swelling": 1, "Heart rate increased": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "4423", "histograms": [{"histogram": {"Angina pectoris": 1, "Anti-platelet factor 4 antibody test": 1, "Chest X-ray": 1, "Electrocardiogram": 1, "Eye swelling": 1, "Heart rate increased": 1, "Swelling face": 1}, "batchcodes": ["4423"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/9094.json b/docs/data/histograms/Brazil/9094.json
index befef00d28e..8a5196e33d0 100644
--- a/docs/data/histograms/Brazil/9094.json
+++ b/docs/data/histograms/Brazil/9094.json
@@ -1 +1 @@
-{"batchcode": "9094", "histograms": [{"batchcodes": ["9094"], "histogram": {"Herpes zoster": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "9094", "histograms": [{"histogram": {"Herpes zoster": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/9800247.json b/docs/data/histograms/Brazil/9800247.json
index 147040f2e94..39b9a34e26a 100644
--- a/docs/data/histograms/Brazil/9800247.json
+++ b/docs/data/histograms/Brazil/9800247.json
@@ -1 +1 @@
-{"batchcode": "9800247", "histograms": [{"batchcodes": ["9800247"], "histogram": {"Exposure via breast milk": 1, "Intestinal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "9800247", "histograms": [{"histogram": {"Exposure via breast milk": 1, "Intestinal haemorrhage": 1}, "batchcodes": ["9800247"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/CM3555.json b/docs/data/histograms/Brazil/CM3555.json
index 71c81fc008d..e8ab6b6bb3b 100644
--- a/docs/data/histograms/Brazil/CM3555.json
+++ b/docs/data/histograms/Brazil/CM3555.json
@@ -1 +1 @@
-{"batchcode": "CM3555", "histograms": [{"batchcodes": ["CM3555"], "histogram": {"Blood pressure increased": 1, "Body temperature": 1, "Chest pain": 1, "Fear of death": 1, "Impatience": 1, "Investigation": 1, "Near death experience": 1, "Neck pain": 1, "Pain": 1, "Paraesthesia": 1, "Pyrexia": 1, "Thinking abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "CM3555", "histograms": [{"histogram": {"Blood pressure increased": 1, "Body temperature": 1, "Chest pain": 1, "Fear of death": 1, "Impatience": 1, "Investigation": 1, "Near death experience": 1, "Neck pain": 1, "Pain": 1, "Paraesthesia": 1, "Pyrexia": 1, "Thinking abnormal": 1}, "batchcodes": ["CM3555"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/CWO199.json b/docs/data/histograms/Brazil/CWO199.json
index 16933059d09..392519d05ad 100644
--- a/docs/data/histograms/Brazil/CWO199.json
+++ b/docs/data/histograms/Brazil/CWO199.json
@@ -1 +1 @@
-{"batchcode": "CWO199", "histograms": [{"batchcodes": ["CWO199"], "histogram": {"Chest pain": 1, "Pericarditis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "CWO199", "histograms": [{"histogram": {"Chest pain": 1, "Pericarditis": 1, "Pyrexia": 1}, "batchcodes": ["CWO199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/E4057S.json b/docs/data/histograms/Brazil/E4057S.json
index 06f45cffdbd..3b3b2fc83c8 100644
--- a/docs/data/histograms/Brazil/E4057S.json
+++ b/docs/data/histograms/Brazil/E4057S.json
@@ -1 +1 @@
-{"batchcode": "E4057S", "histograms": [{"batchcodes": ["E4057S"], "histogram": {"Arrhythmia": 1, "Blood pressure fluctuation": 1, "Chest pain": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Suffocation feeling": 1}}]}
\ No newline at end of file
+{"batchcode": "E4057S", "histograms": [{"histogram": {"Arrhythmia": 1, "Blood pressure fluctuation": 1, "Chest pain": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Suffocation feeling": 1}, "batchcodes": ["E4057S"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/ED7209.json b/docs/data/histograms/Brazil/ED7209.json
index d96a8df4d8c..09927216d9e 100644
--- a/docs/data/histograms/Brazil/ED7209.json
+++ b/docs/data/histograms/Brazil/ED7209.json
@@ -1 +1 @@
-{"batchcode": "ED7209", "histograms": [{"batchcodes": ["ED7209"], "histogram": {"Arrhythmia": 1, "Discomfort": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Ocular discomfort": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ED7209", "histograms": [{"histogram": {"Arrhythmia": 1, "Discomfort": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Ocular discomfort": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}, "batchcodes": ["ED7209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EL2405.json b/docs/data/histograms/Brazil/EL2405.json
index 78cd69dc3e0..02a06ad8049 100644
--- a/docs/data/histograms/Brazil/EL2405.json
+++ b/docs/data/histograms/Brazil/EL2405.json
@@ -1 +1 @@
-{"batchcode": "EL2405", "histograms": [{"batchcodes": ["EL2405"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "EL2405", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1}, "batchcodes": ["EL2405"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EM3355.json b/docs/data/histograms/Brazil/EM3355.json
index dbd41783ec0..bbce080a194 100644
--- a/docs/data/histograms/Brazil/EM3355.json
+++ b/docs/data/histograms/Brazil/EM3355.json
@@ -1 +1 @@
-{"batchcode": "EM3355", "histograms": [{"batchcodes": ["EM3355"], "histogram": {"Depression": 1, "Facial paralysis": 1, "Loss of personal independence in daily activities": 1}}]}
\ No newline at end of file
+{"batchcode": "EM3355", "histograms": [{"histogram": {"Depression": 1, "Facial paralysis": 1, "Loss of personal independence in daily activities": 1}, "batchcodes": ["EM3355"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EP7533.json b/docs/data/histograms/Brazil/EP7533.json
index fbb52501b99..02e339d0ebd 100644
--- a/docs/data/histograms/Brazil/EP7533.json
+++ b/docs/data/histograms/Brazil/EP7533.json
@@ -1 +1 @@
-{"batchcode": "EP7533", "histograms": [{"batchcodes": ["EP7533"], "histogram": {"COVID-19 pneumonia": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Feeling cold": 1, "Hyperhidrosis": 1, "Hypophagia": 1, "Loss of consciousness": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EP7533", "histograms": [{"histogram": {"COVID-19 pneumonia": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Feeling cold": 1, "Hyperhidrosis": 1, "Hypophagia": 1, "Loss of consciousness": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["EP7533"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/ER7449.json b/docs/data/histograms/Brazil/ER7449.json
index 0ce5d26b141..0924f5ca56f 100644
--- a/docs/data/histograms/Brazil/ER7449.json
+++ b/docs/data/histograms/Brazil/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Angiopathy": 1, "Inappropriate affect": 1, "Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Angiopathy": 1, "Inappropriate affect": 1, "Muscle spasms": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EW0182.json b/docs/data/histograms/Brazil/EW0182.json
index 3dd3719fceb..c8cf3bd96d2 100644
--- a/docs/data/histograms/Brazil/EW0182.json
+++ b/docs/data/histograms/Brazil/EW0182.json
@@ -1 +1 @@
-{"batchcode": "EW0182", "histograms": [{"batchcodes": ["EW0182"], "histogram": {"Amnesia": 1, "Asthenia": 1, "Blood glucose": 1, "Diabetes mellitus inadequate control": 1, "Disturbance in attention": 1, "Malaise": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0182", "histograms": [{"histogram": {"Amnesia": 1, "Asthenia": 1, "Blood glucose": 1, "Diabetes mellitus inadequate control": 1, "Disturbance in attention": 1, "Malaise": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EW0195.json b/docs/data/histograms/Brazil/EW0195.json
index 554fefe5296..9c303973b75 100644
--- a/docs/data/histograms/Brazil/EW0195.json
+++ b/docs/data/histograms/Brazil/EW0195.json
@@ -1 +1 @@
-{"batchcode": "EW0195", "histograms": [{"batchcodes": ["EW0195"], "histogram": {"COVID-19": 7, "Drug ineffective": 7, "SARS-CoV-2 test": 6, "Dyspnoea": 4, "Headache": 4, "Tremor": 4, "Chills": 3, "Cough": 3, "Diarrhoea": 3, "Dizziness": 3, "Fatigue": 3, "Investigation": 3, "Maternal exposure during pregnancy": 3, "Pain": 3, "Pain in extremity": 3, "Arthralgia": 2, "Blood test": 2, "Decreased appetite": 2, "Discomfort": 2, "Feeling abnormal": 2, "Hypersensitivity": 2, "Malaise": 2, "Pruritus": 2, "Pyrexia": 2, "SARS-CoV-2 antibody test": 2, "Ultrasound scan": 2, "Ultrasound scan vagina": 2, "Vaccination site pain": 2, "Visual impairment": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal sensation in eye": 1, "Abortion": 1, "Ageusia": 1, "Allergic oedema": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Amniotic fluid volume decreased": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arrhythmia": 1, "Asthenia": 1, "Audiogram": 1, "Back pain": 1, "Biopsy": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Burning sensation": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Clostridium test": 1, "Clostridium test positive": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Deafness": 1, "Death": 1, "Decreased immune responsiveness": 1, "Depressed level of consciousness": 1, "Dysphagia": 1, "Dysphonia": 1, "Erythema": 1, "Face oedema": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Foetal cardiac arrest": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Heart rate": 1, "Herpes virus infection": 1, "Herpes zoster": 1, "Hot flush": 1, "Hydrops foetalis": 1, "Hyperaesthesia": 1, "Hypoglycaemia neonatal": 1, "Hypotension": 1, "Hypothermia": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Intestinal obstruction": 1, "Ischaemic stroke": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Lymphoma": 1, "Myalgia": 1, "Necrotising scleritis": 1, "Ocular hyperaemia": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Pain assessment": 1, "Peripheral coldness": 1, "Petechiae": 1, "Platelet count": 1, "Platelet factor 4": 1, "Pollakiuria": 1, "Polyarthritis": 1, "Prenatal screening test": 1, "Purpura": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal cancer": 1, "Retinal detachment": 1, "SARS-CoV-2 test positive": 1, "Shock": 1, "Skin discolouration": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Ultrasound breast": 1, "Varicella": 1, "Viral test": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0195", "histograms": [{"histogram": {"COVID-19": 7, "Drug ineffective": 7, "SARS-CoV-2 test": 6, "Dyspnoea": 4, "Headache": 4, "Tremor": 4, "Chills": 3, "Cough": 3, "Diarrhoea": 3, "Dizziness": 3, "Fatigue": 3, "Investigation": 3, "Maternal exposure during pregnancy": 3, "Pain": 3, "Pain in extremity": 3, "Arthralgia": 2, "Blood test": 2, "Decreased appetite": 2, "Discomfort": 2, "Feeling abnormal": 2, "Hypersensitivity": 2, "Malaise": 2, "Pruritus": 2, "Pyrexia": 2, "SARS-CoV-2 antibody test": 2, "Ultrasound scan": 2, "Ultrasound scan vagina": 2, "Vaccination site pain": 2, "Visual impairment": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal sensation in eye": 1, "Abortion": 1, "Ageusia": 1, "Allergic oedema": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Amniotic fluid volume decreased": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arrhythmia": 1, "Asthenia": 1, "Audiogram": 1, "Back pain": 1, "Biopsy": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Burning sensation": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Clostridium test": 1, "Clostridium test positive": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Deafness": 1, "Death": 1, "Decreased immune responsiveness": 1, "Depressed level of consciousness": 1, "Dysphagia": 1, "Dysphonia": 1, "Erythema": 1, "Face oedema": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Foetal cardiac arrest": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Heart rate": 1, "Herpes virus infection": 1, "Herpes zoster": 1, "Hot flush": 1, "Hydrops foetalis": 1, "Hyperaesthesia": 1, "Hypoglycaemia neonatal": 1, "Hypotension": 1, "Hypothermia": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Intestinal obstruction": 1, "Ischaemic stroke": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Lymphoma": 1, "Myalgia": 1, "Necrotising scleritis": 1, "Ocular hyperaemia": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Pain assessment": 1, "Peripheral coldness": 1, "Petechiae": 1, "Platelet count": 1, "Platelet factor 4": 1, "Pollakiuria": 1, "Polyarthritis": 1, "Prenatal screening test": 1, "Purpura": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal cancer": 1, "Retinal detachment": 1, "SARS-CoV-2 test positive": 1, "Shock": 1, "Skin discolouration": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Ultrasound breast": 1, "Varicella": 1, "Viral test": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["EW0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EW0198.json b/docs/data/histograms/Brazil/EW0198.json
index ac6c4967c1e..36c71b73d64 100644
--- a/docs/data/histograms/Brazil/EW0198.json
+++ b/docs/data/histograms/Brazil/EW0198.json
@@ -1 +1 @@
-{"batchcode": "EW0198", "histograms": [{"batchcodes": ["EW0198"], "histogram": {"Asthenia": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pain": 1, "Pain in extremity": 1, "Pallor": 1, "Paralysis": 1, "Seizure": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0198", "histograms": [{"histogram": {"Asthenia": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pain": 1, "Pain in extremity": 1, "Pallor": 1, "Paralysis": 1, "Seizure": 1, "Vaccination site rash": 1}, "batchcodes": ["EW0198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EW0199.json b/docs/data/histograms/Brazil/EW0199.json
index 7f7e7817fd8..91e8058600f 100644
--- a/docs/data/histograms/Brazil/EW0199.json
+++ b/docs/data/histograms/Brazil/EW0199.json
@@ -1 +1 @@
-{"batchcode": "EW0199", "histograms": [{"batchcodes": ["EW0199"], "histogram": {"Infarction": 2, "Thrombosis": 2, "Ageusia": 1, "Anosmia": 1, "Back pain": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Condition aggravated": 1, "Depression": 1, "Diverticulitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "Hypoaesthesia": 1, "Infection": 1, "Insomnia": 1, "Muscle atrophy": 1, "Pain": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "Skin discolouration": 1, "Somnolence": 1, "Tongue disorder": 1, "Urticaria": 1, "Vaccination site pain": 1, "Walking disability": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0199", "histograms": [{"histogram": {"Infarction": 2, "Thrombosis": 2, "Ageusia": 1, "Anosmia": 1, "Back pain": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Condition aggravated": 1, "Depression": 1, "Diverticulitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "Hypoaesthesia": 1, "Infection": 1, "Insomnia": 1, "Muscle atrophy": 1, "Pain": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "Skin discolouration": 1, "Somnolence": 1, "Tongue disorder": 1, "Urticaria": 1, "Vaccination site pain": 1, "Walking disability": 1}, "batchcodes": ["EW0199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EW019C.json b/docs/data/histograms/Brazil/EW019C.json
index d33608a8e19..f7095633548 100644
--- a/docs/data/histograms/Brazil/EW019C.json
+++ b/docs/data/histograms/Brazil/EW019C.json
@@ -1 +1 @@
-{"batchcode": "EW019C", "histograms": [{"batchcodes": ["EW019C"], "histogram": {"Blood cholesterol": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW019C", "histograms": [{"histogram": {"Blood cholesterol": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1}, "batchcodes": ["EW019C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EW195.json b/docs/data/histograms/Brazil/EW195.json
index cd84a74cf98..0fe5c35e507 100644
--- a/docs/data/histograms/Brazil/EW195.json
+++ b/docs/data/histograms/Brazil/EW195.json
@@ -1 +1 @@
-{"batchcode": "EW195", "histograms": [{"batchcodes": ["EW195"], "histogram": {"Anxiety": 1, "Arrhythmia": 1, "Diarrhoea": 1, "Dizziness": 1, "Headache": 1, "Heart rate irregular": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Tachycardia": 1, "Tremor": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW195", "histograms": [{"histogram": {"Anxiety": 1, "Arrhythmia": 1, "Diarrhoea": 1, "Dizziness": 1, "Headache": 1, "Heart rate irregular": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Tachycardia": 1, "Tremor": 1, "Vomiting": 1}, "batchcodes": ["EW195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EWO195.json b/docs/data/histograms/Brazil/EWO195.json
index 0b25dc8abe8..74d54dca583 100644
--- a/docs/data/histograms/Brazil/EWO195.json
+++ b/docs/data/histograms/Brazil/EWO195.json
@@ -1 +1 @@
-{"batchcode": "EWO195", "histograms": [{"batchcodes": ["EWO195"], "histogram": {"Antibody test": 1, "Antiphospholipid syndrome": 1, "Breast discomfort": 1, "Breast pain": 1, "C-reactive protein": 1, "Diarrhoea": 1, "Dysgeusia": 1, "Echocardiogram": 1, "Full blood count": 1, "Pain in extremity": 1, "Platelet count decreased": 1, "Skin discolouration": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO195", "histograms": [{"histogram": {"Antibody test": 1, "Antiphospholipid syndrome": 1, "Breast discomfort": 1, "Breast pain": 1, "C-reactive protein": 1, "Diarrhoea": 1, "Dysgeusia": 1, "Echocardiogram": 1, "Full blood count": 1, "Pain in extremity": 1, "Platelet count decreased": 1, "Skin discolouration": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["EWO195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EX0574.json b/docs/data/histograms/Brazil/EX0574.json
index 991adb84705..b56abea2b02 100644
--- a/docs/data/histograms/Brazil/EX0574.json
+++ b/docs/data/histograms/Brazil/EX0574.json
@@ -1 +1 @@
-{"batchcode": "EX0574", "histograms": [{"batchcodes": ["EX0574"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Eye pain": 1, "Fall": 1, "Hyperaemia": 1, "Motor dysfunction": 1, "Nasal obstruction": 1, "Neurological examination": 1, "Pain": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Peripheral coldness": 1, "Pruritus": 1, "Tachycardia": 1, "Upper airway obstruction": 1}}]}
\ No newline at end of file
+{"batchcode": "EX0574", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Eye pain": 1, "Fall": 1, "Hyperaemia": 1, "Motor dysfunction": 1, "Nasal obstruction": 1, "Neurological examination": 1, "Pain": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Peripheral coldness": 1, "Pruritus": 1, "Tachycardia": 1, "Upper airway obstruction": 1}, "batchcodes": ["EX0574"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EX2405.json b/docs/data/histograms/Brazil/EX2405.json
index 214e16716e7..aa496e52b28 100644
--- a/docs/data/histograms/Brazil/EX2405.json
+++ b/docs/data/histograms/Brazil/EX2405.json
@@ -1 +1 @@
-{"batchcode": "EX2405", "histograms": [{"batchcodes": ["EX2405"], "histogram": {"Pain": 5, "Chills": 4, "Malaise": 4, "SARS-CoV-2 test": 4, "Blood test": 3, "Pyrexia": 3, "Vaccination site pain": 3, "Arrhythmia": 2, "COVID-19": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Fatigue": 2, "Head discomfort": 2, "Headache": 2, "Hypersensitivity": 2, "Inflammation": 2, "Joint range of motion decreased": 2, "Laryngeal oedema": 2, "Pain in extremity": 2, "Pharyngeal swelling": 2, "Syncope": 2, "Throat tightness": 2, "Ultrasound scan": 2, "Aneurysm": 1, "Angiogram": 1, "Anosmia": 1, "Arthralgia": 1, "Asthma": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Bursitis": 1, "Cardio-respiratory arrest": 1, "Cell death": 1, "Chest pain": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Cough": 1, "Dermatitis": 1, "Dizziness": 1, "Erythema": 1, "Extramedullary haemopoiesis": 1, "Extremity contracture": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gait inability": 1, "Haemorrhage": 1, "Heart rate": 1, "Histology": 1, "Human chorionic gonadotropin": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Infarction": 1, "Lung disorder": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "Middle insomnia": 1, "Musculoskeletal disorder": 1, "Myalgia": 1, "Nausea": 1, "Neutralising antibodies": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pharyngeal hypoaesthesia": 1, "Pigmentation disorder": 1, "Placental disorder": 1, "Premature baby": 1, "Psoriatic arthropathy": 1, "Rash macular": 1, "Rheumatic disorder": 1, "SARS-CoV-2 antibody test": 1, "Scoliosis": 1, "Seizure": 1, "Sensitivity to weather change": 1, "Sinus tachycardia": 1, "Sleep disorder due to a general medical condition": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Throat irritation": 1, "Tonsillar disorder": 1, "Trigger finger": 1, "Ultrasound abdomen": 1, "Ultrasound scan vagina": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site mass": 1, "Visceral oedema": 1, "Vitamin B12": 1, "Vitamin B12 decreased": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EX2405", "histograms": [{"histogram": {"Pain": 5, "Chills": 4, "Malaise": 4, "SARS-CoV-2 test": 4, "Blood test": 3, "Pyrexia": 3, "Vaccination site pain": 3, "Arrhythmia": 2, "COVID-19": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Fatigue": 2, "Head discomfort": 2, "Headache": 2, "Hypersensitivity": 2, "Inflammation": 2, "Joint range of motion decreased": 2, "Laryngeal oedema": 2, "Pain in extremity": 2, "Pharyngeal swelling": 2, "Syncope": 2, "Throat tightness": 2, "Ultrasound scan": 2, "Aneurysm": 1, "Angiogram": 1, "Anosmia": 1, "Arthralgia": 1, "Asthma": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Bursitis": 1, "Cardio-respiratory arrest": 1, "Cell death": 1, "Chest pain": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Cough": 1, "Dermatitis": 1, "Dizziness": 1, "Erythema": 1, "Extramedullary haemopoiesis": 1, "Extremity contracture": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gait inability": 1, "Haemorrhage": 1, "Heart rate": 1, "Histology": 1, "Human chorionic gonadotropin": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Infarction": 1, "Lung disorder": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "Middle insomnia": 1, "Musculoskeletal disorder": 1, "Myalgia": 1, "Nausea": 1, "Neutralising antibodies": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pharyngeal hypoaesthesia": 1, "Pigmentation disorder": 1, "Placental disorder": 1, "Premature baby": 1, "Psoriatic arthropathy": 1, "Rash macular": 1, "Rheumatic disorder": 1, "SARS-CoV-2 antibody test": 1, "Scoliosis": 1, "Seizure": 1, "Sensitivity to weather change": 1, "Sinus tachycardia": 1, "Sleep disorder due to a general medical condition": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Throat irritation": 1, "Tonsillar disorder": 1, "Trigger finger": 1, "Ultrasound abdomen": 1, "Ultrasound scan vagina": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site mass": 1, "Visceral oedema": 1, "Vitamin B12": 1, "Vitamin B12 decreased": 1, "Vomiting": 1}, "batchcodes": ["EX2405"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY 0574.json b/docs/data/histograms/Brazil/EY 0574.json
index 46f1691a694..e5e0f9987c8 100644
--- a/docs/data/histograms/Brazil/EY 0574.json
+++ b/docs/data/histograms/Brazil/EY 0574.json
@@ -1 +1 @@
-{"batchcode": "EY 0574", "histograms": [{"batchcodes": ["EY 0574"], "histogram": {"Chills": 1, "Ear infection": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "EY 0574", "histograms": [{"histogram": {"Chills": 1, "Ear infection": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Urinary tract infection": 1}, "batchcodes": ["EY 0574"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY0571.json b/docs/data/histograms/Brazil/EY0571.json
index 7f0712dcacd..c7d3f2c5592 100644
--- a/docs/data/histograms/Brazil/EY0571.json
+++ b/docs/data/histograms/Brazil/EY0571.json
@@ -1 +1 @@
-{"batchcode": "EY0571", "histograms": [{"batchcodes": ["EY0571"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Nausea": 1, "Paraesthesia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0571", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Nausea": 1, "Paraesthesia": 1, "Seizure": 1}, "batchcodes": ["EY0571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY0574.json b/docs/data/histograms/Brazil/EY0574.json
index c6e7236adc2..eb79924477c 100644
--- a/docs/data/histograms/Brazil/EY0574.json
+++ b/docs/data/histograms/Brazil/EY0574.json
@@ -1 +1 @@
-{"batchcode": "EY0574", "histograms": [{"batchcodes": ["EY0574"], "histogram": {"Investigation": 2, "Maternal exposure during pregnancy": 2, "Alopecia": 1, "Anxiety": 1, "Arrhythmia": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bursitis": 1, "Chest pain": 1, "Dermatitis bullous": 1, "Dyspnoea": 1, "Ear swelling": 1, "Eye swelling": 1, "Fatigue": 1, "Foetal cardiac arrest": 1, "Foetal placental thrombosis": 1, "Full blood count": 1, "Head discomfort": 1, "Headache": 1, "Herpes zoster": 1, "Hyperglycaemia": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Malaise": 1, "Monoplegia": 1, "Musculoskeletal stiffness": 1, "Noninfective sialoadenitis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pulmonary embolism": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Speech disorder": 1, "Stillbirth": 1, "Swelling face": 1, "Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0574", "histograms": [{"histogram": {"Investigation": 2, "Maternal exposure during pregnancy": 2, "Alopecia": 1, "Anxiety": 1, "Arrhythmia": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bursitis": 1, "Chest pain": 1, "Dermatitis bullous": 1, "Dyspnoea": 1, "Ear swelling": 1, "Eye swelling": 1, "Fatigue": 1, "Foetal cardiac arrest": 1, "Foetal placental thrombosis": 1, "Full blood count": 1, "Head discomfort": 1, "Headache": 1, "Herpes zoster": 1, "Hyperglycaemia": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Malaise": 1, "Monoplegia": 1, "Musculoskeletal stiffness": 1, "Noninfective sialoadenitis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pulmonary embolism": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Speech disorder": 1, "Stillbirth": 1, "Swelling face": 1, "Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["EY0574"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY0575.json b/docs/data/histograms/Brazil/EY0575.json
index 6c7e6791567..f525a53f9f7 100644
--- a/docs/data/histograms/Brazil/EY0575.json
+++ b/docs/data/histograms/Brazil/EY0575.json
@@ -1 +1 @@
-{"batchcode": "EY0575", "histograms": [{"batchcodes": ["EY0575"], "histogram": {"SARS-CoV-2 test": 3, "Dizziness": 2, "Headache": 2, "Pain": 2, "Tachycardia": 2, "Tremor": 2, "Abortion missed": 1, "Antineutrophil cytoplasmic antibody": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac failure acute": 1, "Chorioretinal atrophy": 1, "Cough": 1, "Diarrhoea": 1, "Discomfort": 1, "Disorientation": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Exercise tolerance decreased": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Heart rate increased": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypotension": 1, "Joint range of motion decreased": 1, "Loss of consciousness": 1, "Malaise": 1, "Mental impairment": 1, "Ocular discomfort": 1, "Ocular vascular disorder": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Pneumonitis": 1, "Proteinuria": 1, "Renal pain": 1, "Respiratory failure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin discolouration": 1, "Somnolence": 1, "Speech disorder": 1, "Spinal pain": 1, "Tinnitus": 1, "Ultrasound Doppler": 1, "Vaccination site discomfort": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0575", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "Dizziness": 2, "Headache": 2, "Pain": 2, "Tachycardia": 2, "Tremor": 2, "Abortion missed": 1, "Antineutrophil cytoplasmic antibody": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac failure acute": 1, "Chorioretinal atrophy": 1, "Cough": 1, "Diarrhoea": 1, "Discomfort": 1, "Disorientation": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Exercise tolerance decreased": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Heart rate increased": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypotension": 1, "Joint range of motion decreased": 1, "Loss of consciousness": 1, "Malaise": 1, "Mental impairment": 1, "Ocular discomfort": 1, "Ocular vascular disorder": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Pneumonitis": 1, "Proteinuria": 1, "Renal pain": 1, "Respiratory failure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin discolouration": 1, "Somnolence": 1, "Speech disorder": 1, "Spinal pain": 1, "Tinnitus": 1, "Ultrasound Doppler": 1, "Vaccination site discomfort": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["EY0575"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY0579.json b/docs/data/histograms/Brazil/EY0579.json
index a9228d428a7..610f844be5c 100644
--- a/docs/data/histograms/Brazil/EY0579.json
+++ b/docs/data/histograms/Brazil/EY0579.json
@@ -1 +1 @@
-{"batchcode": "EY0579", "histograms": [{"batchcodes": ["EY0579"], "histogram": {"Angioedema": 1, "Arrhythmia": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Dermatitis allergic": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Eyelid ptosis": 1, "Heart rate": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Nausea": 1, "Pyrexia": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Skin lesion": 1, "Tachycardia": 1, "Thrombosis": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0579", "histograms": [{"histogram": {"Angioedema": 1, "Arrhythmia": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Dermatitis allergic": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Eyelid ptosis": 1, "Heart rate": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Nausea": 1, "Pyrexia": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Skin lesion": 1, "Tachycardia": 1, "Thrombosis": 1, "Vaccination site pain": 1}, "batchcodes": ["EY0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY0584.json b/docs/data/histograms/Brazil/EY0584.json
index 894d324d998..536333c2cca 100644
--- a/docs/data/histograms/Brazil/EY0584.json
+++ b/docs/data/histograms/Brazil/EY0584.json
@@ -1 +1 @@
-{"batchcode": "EY0584", "histograms": [{"batchcodes": ["EY0584"], "histogram": {"Amnesia": 1, "Anaphylactic reaction": 1, "Blood test": 1, "Burning sensation": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Loss of consciousness": 1, "Seizure": 1, "Sluggishness": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0584", "histograms": [{"histogram": {"Amnesia": 1, "Anaphylactic reaction": 1, "Blood test": 1, "Burning sensation": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Loss of consciousness": 1, "Seizure": 1, "Sluggishness": 1, "Tremor": 1}, "batchcodes": ["EY0584"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY0586.json b/docs/data/histograms/Brazil/EY0586.json
index ed8bf46ac2c..6536a1623f2 100644
--- a/docs/data/histograms/Brazil/EY0586.json
+++ b/docs/data/histograms/Brazil/EY0586.json
@@ -1 +1 @@
-{"batchcode": "EY0586", "histograms": [{"batchcodes": ["EY0586"], "histogram": {"SARS-CoV-2 test": 3, "Urticaria": 3, "Blood test": 2, "Dizziness": 2, "Paraesthesia": 2, "Pruritus": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Adenomyosis": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Blindness": 1, "Blister": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Dysmenorrhoea": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Escherichia infection": 1, "Eyelid oedema": 1, "Fall": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Haemangioma": 1, "Head discomfort": 1, "Headache": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Investigation": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Menstruation delayed": 1, "Ovulation pain": 1, "Pericardial effusion": 1, "Rash": 1, "Somnolence": 1, "Syncope": 1, "Tachycardia": 1, "Ultrasound scan": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0586", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "Urticaria": 3, "Blood test": 2, "Dizziness": 2, "Paraesthesia": 2, "Pruritus": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Adenomyosis": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Blindness": 1, "Blister": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Dysmenorrhoea": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Escherichia infection": 1, "Eyelid oedema": 1, "Fall": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Haemangioma": 1, "Head discomfort": 1, "Headache": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Investigation": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Menstruation delayed": 1, "Ovulation pain": 1, "Pericardial effusion": 1, "Rash": 1, "Somnolence": 1, "Syncope": 1, "Tachycardia": 1, "Ultrasound scan": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["EY0586"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EY086.json b/docs/data/histograms/Brazil/EY086.json
index e6bc691e197..06820be2ad0 100644
--- a/docs/data/histograms/Brazil/EY086.json
+++ b/docs/data/histograms/Brazil/EY086.json
@@ -1 +1 @@
-{"batchcode": "EY086", "histograms": [{"batchcodes": ["EY086"], "histogram": {"Hypersensitivity": 1, "Oedema": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EY086", "histograms": [{"histogram": {"Hypersensitivity": 1, "Oedema": 1, "Swelling": 1}, "batchcodes": ["EY086"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EYO579.json b/docs/data/histograms/Brazil/EYO579.json
index 18b81a27876..59c012ed41c 100644
--- a/docs/data/histograms/Brazil/EYO579.json
+++ b/docs/data/histograms/Brazil/EYO579.json
@@ -1 +1 @@
-{"batchcode": "EYO579", "histograms": [{"batchcodes": ["EYO579"], "histogram": {"Postmenopausal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO579", "histograms": [{"histogram": {"Postmenopausal haemorrhage": 1}, "batchcodes": ["EYO579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EYO586.json b/docs/data/histograms/Brazil/EYO586.json
index f2da76d0e94..bd84a88001c 100644
--- a/docs/data/histograms/Brazil/EYO586.json
+++ b/docs/data/histograms/Brazil/EYO586.json
@@ -1 +1 @@
-{"batchcode": "EYO586", "histograms": [{"batchcodes": ["EYO586"], "histogram": {"Chest pain": 1, "Confusional state": 1, "Dyspnoea": 1, "Pharyngeal swelling": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO586", "histograms": [{"histogram": {"Chest pain": 1, "Confusional state": 1, "Dyspnoea": 1, "Pharyngeal swelling": 1, "Tachycardia": 1}, "batchcodes": ["EYO586"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/EYO5E6.json b/docs/data/histograms/Brazil/EYO5E6.json
index 658ef86f629..3bf83b05708 100644
--- a/docs/data/histograms/Brazil/EYO5E6.json
+++ b/docs/data/histograms/Brazil/EYO5E6.json
@@ -1 +1 @@
-{"batchcode": "EYO5E6", "histograms": [{"batchcodes": ["EYO5E6"], "histogram": {"Myocardial infarction": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO5E6", "histograms": [{"histogram": {"Myocardial infarction": 1, "Palpitations": 1}, "batchcodes": ["EYO5E6"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F03530.json b/docs/data/histograms/Brazil/F03530.json
index 0cfeb090502..c7dd61a248e 100644
--- a/docs/data/histograms/Brazil/F03530.json
+++ b/docs/data/histograms/Brazil/F03530.json
@@ -1 +1 @@
-{"batchcode": "F03530", "histograms": [{"batchcodes": ["F03530"], "histogram": {"Blood test": 1, "Dysarthria": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Mobility decreased": 1, "Thrombosis": 1, "Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "F03530", "histograms": [{"histogram": {"Blood test": 1, "Dysarthria": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Mobility decreased": 1, "Thrombosis": 1, "Transient ischaemic attack": 1}, "batchcodes": ["F03530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F070221.json b/docs/data/histograms/Brazil/F070221.json
index d0ac2e820a1..d5c83f6c3af 100644
--- a/docs/data/histograms/Brazil/F070221.json
+++ b/docs/data/histograms/Brazil/F070221.json
@@ -1 +1 @@
-{"batchcode": "F070221", "histograms": [{"batchcodes": ["F070221"], "histogram": {"Body temperature decreased": 1, "Chills": 1, "Eye swelling": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "F070221", "histograms": [{"histogram": {"Body temperature decreased": 1, "Chills": 1, "Eye swelling": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Swelling face": 1}, "batchcodes": ["F070221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F07207.json b/docs/data/histograms/Brazil/F07207.json
index 5299431c1b5..8905a1cec4f 100644
--- a/docs/data/histograms/Brazil/F07207.json
+++ b/docs/data/histograms/Brazil/F07207.json
@@ -1 +1 @@
-{"batchcode": "F07207", "histograms": [{"batchcodes": ["F07207"], "histogram": {"Blood disorder": 1, "Inappropriate schedule of product administration": 1, "Vein disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "F07207", "histograms": [{"histogram": {"Blood disorder": 1, "Inappropriate schedule of product administration": 1, "Vein disorder": 1}, "batchcodes": ["F07207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F07209.json b/docs/data/histograms/Brazil/F07209.json
index f45f0c32b1b..d8d9cf274ef 100644
--- a/docs/data/histograms/Brazil/F07209.json
+++ b/docs/data/histograms/Brazil/F07209.json
@@ -1 +1 @@
-{"batchcode": "F07209", "histograms": [{"batchcodes": ["F07209"], "histogram": {"Acute myocardial infarction": 1, "Back pain": 1, "Chest pain": 1, "Herpes zoster": 1, "Magnetic resonance imaging heart": 1}}]}
\ No newline at end of file
+{"batchcode": "F07209", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Back pain": 1, "Chest pain": 1, "Herpes zoster": 1, "Magnetic resonance imaging heart": 1}, "batchcodes": ["F07209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F07221.json b/docs/data/histograms/Brazil/F07221.json
index 0a1f2073de7..5113ba34ddd 100644
--- a/docs/data/histograms/Brazil/F07221.json
+++ b/docs/data/histograms/Brazil/F07221.json
@@ -1 +1 @@
-{"batchcode": "F07221", "histograms": [{"batchcodes": ["F07221"], "histogram": {"Cognitive disorder": 1, "Dementia Alzheimer's type": 1, "Inappropriate schedule of product administration": 1, "Memory impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "F07221", "histograms": [{"histogram": {"Cognitive disorder": 1, "Dementia Alzheimer's type": 1, "Inappropriate schedule of product administration": 1, "Memory impairment": 1}, "batchcodes": ["F07221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F07222.json b/docs/data/histograms/Brazil/F07222.json
index 2648fa36369..6b407f4bf88 100644
--- a/docs/data/histograms/Brazil/F07222.json
+++ b/docs/data/histograms/Brazil/F07222.json
@@ -1 +1 @@
-{"batchcode": "F07222", "histograms": [{"batchcodes": ["F07222"], "histogram": {"Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Chills": 1, "Dizziness": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Nausea": 1, "Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "F07222", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Chills": 1, "Dizziness": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Nausea": 1, "Syncope": 1, "Tremor": 1}, "batchcodes": ["F07222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F118026.json b/docs/data/histograms/Brazil/F118026.json
index 38a26f8fc23..1725c20f857 100644
--- a/docs/data/histograms/Brazil/F118026.json
+++ b/docs/data/histograms/Brazil/F118026.json
@@ -1 +1 @@
-{"batchcode": "F118026", "histograms": [{"batchcodes": ["F118026"], "histogram": {"Arthralgia": 1, "Erythema": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Migraine": 1, "Mouth swelling": 1, "Myalgia": 1, "Off label use": 1, "Oral mucosal erythema": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "F118026", "histograms": [{"histogram": {"Arthralgia": 1, "Erythema": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Migraine": 1, "Mouth swelling": 1, "Myalgia": 1, "Off label use": 1, "Oral mucosal erythema": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1, "Vaccination site erythema": 1}, "batchcodes": ["F118026"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F87219.json b/docs/data/histograms/Brazil/F87219.json
index bf1602b99b1..78d4a21b767 100644
--- a/docs/data/histograms/Brazil/F87219.json
+++ b/docs/data/histograms/Brazil/F87219.json
@@ -1 +1 @@
-{"batchcode": "F87219", "histograms": [{"batchcodes": ["F87219"], "histogram": {"Arrhythmia": 1, "Electrocardiogram ambulatory": 1, "Fatigue": 1, "Headache": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "F87219", "histograms": [{"histogram": {"Arrhythmia": 1, "Electrocardiogram ambulatory": 1, "Fatigue": 1, "Headache": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Nausea": 1}, "batchcodes": ["F87219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/F93531.json b/docs/data/histograms/Brazil/F93531.json
index 2da906df4e0..93da91e2a6e 100644
--- a/docs/data/histograms/Brazil/F93531.json
+++ b/docs/data/histograms/Brazil/F93531.json
@@ -1 +1 @@
-{"batchcode": "F93531", "histograms": [{"batchcodes": ["F93531"], "histogram": {"Asthenia": 1, "Chills": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pain": 1, "Suicidal ideation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "F93531", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pain": 1, "Suicidal ideation": 1, "Vaccination site pain": 1}, "batchcodes": ["F93531"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA 90 95.json b/docs/data/histograms/Brazil/FA 90 95.json
index cfb661867a0..e14a8a9128b 100644
--- a/docs/data/histograms/Brazil/FA 90 95.json
+++ b/docs/data/histograms/Brazil/FA 90 95.json
@@ -1 +1 @@
-{"batchcode": "FA 90 95", "histograms": [{"batchcodes": ["FA 90 95"], "histogram": {"Dry skin": 1, "Epistaxis": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Skin fissures": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 90 95", "histograms": [{"histogram": {"Dry skin": 1, "Epistaxis": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Skin fissures": 1, "Swelling face": 1}, "batchcodes": ["FA 90 95"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA 9094.json b/docs/data/histograms/Brazil/FA 9094.json
index 609d35c0ae3..35992f1a452 100644
--- a/docs/data/histograms/Brazil/FA 9094.json
+++ b/docs/data/histograms/Brazil/FA 9094.json
@@ -1 +1 @@
-{"batchcode": "FA 9094", "histograms": [{"batchcodes": ["FA 9094"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 9094", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["FA 9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA 9096.json b/docs/data/histograms/Brazil/FA 9096.json
index 6e66a772cfa..5850753ad09 100644
--- a/docs/data/histograms/Brazil/FA 9096.json
+++ b/docs/data/histograms/Brazil/FA 9096.json
@@ -1 +1 @@
-{"batchcode": "FA 9096", "histograms": [{"batchcodes": ["FA 9096"], "histogram": {"SARS-CoV-2 test": 2, "Body temperature": 1, "Computerised tomogram": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Haemorrhoids": 1, "Haemorrhoids thrombosed": 1, "Hypersensitivity": 1, "Lung disorder": 1, "Pulmonary pain": 1, "Pyrexia": 1, "Traumatic lung injury": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 9096", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "Body temperature": 1, "Computerised tomogram": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Haemorrhoids": 1, "Haemorrhoids thrombosed": 1, "Hypersensitivity": 1, "Lung disorder": 1, "Pulmonary pain": 1, "Pyrexia": 1, "Traumatic lung injury": 1}, "batchcodes": ["FA 9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA7219.json b/docs/data/histograms/Brazil/FA7219.json
index 170dbd53f86..e492c90211d 100644
--- a/docs/data/histograms/Brazil/FA7219.json
+++ b/docs/data/histograms/Brazil/FA7219.json
@@ -1 +1 @@
-{"batchcode": "FA7219", "histograms": [{"batchcodes": ["FA7219"], "histogram": {"Back pain": 1, "Inappropriate schedule of product administration": 1, "Myalgia intercostal": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7219", "histograms": [{"histogram": {"Back pain": 1, "Inappropriate schedule of product administration": 1, "Myalgia intercostal": 1, "Vaccination site pain": 1}, "batchcodes": ["FA7219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA7448.json b/docs/data/histograms/Brazil/FA7448.json
index 44f5b81d95f..c7473716581 100644
--- a/docs/data/histograms/Brazil/FA7448.json
+++ b/docs/data/histograms/Brazil/FA7448.json
@@ -1 +1 @@
-{"batchcode": "FA7448", "histograms": [{"batchcodes": ["FA7448"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7448", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["FA7448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA7478.json b/docs/data/histograms/Brazil/FA7478.json
index 2145090c2bb..7390d157beb 100644
--- a/docs/data/histograms/Brazil/FA7478.json
+++ b/docs/data/histograms/Brazil/FA7478.json
@@ -1 +1 @@
-{"batchcode": "FA7478", "histograms": [{"batchcodes": ["FA7478"], "histogram": {"Pain": 5, "SARS-CoV-2 test": 5, "Dyspnoea": 4, "Malaise": 3, "Pain in extremity": 3, "Pyrexia": 3, "Blood pressure measurement": 2, "COVID-19": 2, "Chest pain": 2, "Chills": 2, "Diarrhoea": 2, "Fatigue": 2, "Feeling abnormal": 2, "Heart rate": 2, "Heart rate irregular": 2, "Muscle spasms": 2, "Nausea": 2, "Paraesthesia": 2, "Abdominal pain upper": 1, "Allergy to vaccine": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Angiogram": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Asthmatic crisis": 1, "Audiogram": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Breast mass": 1, "Cardiomyopathy": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Disorientation": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Mouth swelling": 1, "Myocarditis": 1, "Nodule": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Peripheral embolism": 1, "Pharyngeal swelling": 1, "Plantar fasciitis": 1, "Platelet count": 1, "Platelet count decreased": 1, "Postmenopausal haemorrhage": 1, "Pulmonary embolism": 1, "Renal disorder": 1, "Retching": 1, "Sleep disorder": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Syphilis": 1, "Throat tightness": 1, "Thrombosis": 1, "Tinnitus": 1, "Tremor": 1, "Treponema test": 1, "Trigger finger": 1, "Type 1 diabetes mellitus": 1, "Ultrasound scan": 1, "Vaccination site discomfort": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7478", "histograms": [{"histogram": {"Pain": 5, "SARS-CoV-2 test": 5, "Dyspnoea": 4, "Malaise": 3, "Pain in extremity": 3, "Pyrexia": 3, "Blood pressure measurement": 2, "COVID-19": 2, "Chest pain": 2, "Chills": 2, "Diarrhoea": 2, "Fatigue": 2, "Feeling abnormal": 2, "Heart rate": 2, "Heart rate irregular": 2, "Muscle spasms": 2, "Nausea": 2, "Paraesthesia": 2, "Abdominal pain upper": 1, "Allergy to vaccine": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Angiogram": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Asthmatic crisis": 1, "Audiogram": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Breast mass": 1, "Cardiomyopathy": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Disorientation": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Mouth swelling": 1, "Myocarditis": 1, "Nodule": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Peripheral embolism": 1, "Pharyngeal swelling": 1, "Plantar fasciitis": 1, "Platelet count": 1, "Platelet count decreased": 1, "Postmenopausal haemorrhage": 1, "Pulmonary embolism": 1, "Renal disorder": 1, "Retching": 1, "Sleep disorder": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Syphilis": 1, "Throat tightness": 1, "Thrombosis": 1, "Tinnitus": 1, "Tremor": 1, "Treponema test": 1, "Trigger finger": 1, "Type 1 diabetes mellitus": 1, "Ultrasound scan": 1, "Vaccination site discomfort": 1, "Vomiting": 1}, "batchcodes": ["FA7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA9090.json b/docs/data/histograms/Brazil/FA9090.json
index 9f8a23518f6..0d16339cc2b 100644
--- a/docs/data/histograms/Brazil/FA9090.json
+++ b/docs/data/histograms/Brazil/FA9090.json
@@ -1 +1 @@
-{"batchcode": "FA9090", "histograms": [{"batchcodes": ["FA9090"], "histogram": {"Dizziness": 3, "Dyspnoea": 3, "Investigation": 3, "Thrombosis": 3, "Blood test": 2, "Chills": 2, "Electrocardiogram": 2, "Feeling hot": 2, "Heart rate": 2, "Heart rate increased": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Lymphadenopathy": 2, "Nasopharyngitis": 2, "Paraesthesia": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Angina pectoris": 1, "Angiogram": 1, "Axillary pain": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Chest pain": 1, "Cough": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Erythema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Influenza like illness": 1, "Insomnia": 1, "Jugular vein distension": 1, "Lacrimation increased": 1, "Magnetic resonance imaging": 1, "Maternal exposure timing unspecified": 1, "Muscle swelling": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Pharyngeal erythema": 1, "Pruritus": 1, "Seizure": 1, "Serology test": 1, "Sinus arrhythmia": 1, "Sneezing": 1, "Suspected counterfeit product": 1, "Swelling": 1, "Tachycardia": 1, "Throat tightness": 1, "Tonsillar hypertrophy": 1, "Transient ischaemic attack": 1, "Tricuspid valve incompetence": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Vaccination site hypoaesthesia": 1, "Vascular pain": 1, "Vasodilatation": 1, "Ventricular extrasystoles": 1, "Vision blurred": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9090", "histograms": [{"histogram": {"Dizziness": 3, "Dyspnoea": 3, "Investigation": 3, "Thrombosis": 3, "Blood test": 2, "Chills": 2, "Electrocardiogram": 2, "Feeling hot": 2, "Heart rate": 2, "Heart rate increased": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Lymphadenopathy": 2, "Nasopharyngitis": 2, "Paraesthesia": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Angina pectoris": 1, "Angiogram": 1, "Axillary pain": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Chest pain": 1, "Cough": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Erythema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Influenza like illness": 1, "Insomnia": 1, "Jugular vein distension": 1, "Lacrimation increased": 1, "Magnetic resonance imaging": 1, "Maternal exposure timing unspecified": 1, "Muscle swelling": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Pharyngeal erythema": 1, "Pruritus": 1, "Seizure": 1, "Serology test": 1, "Sinus arrhythmia": 1, "Sneezing": 1, "Suspected counterfeit product": 1, "Swelling": 1, "Tachycardia": 1, "Throat tightness": 1, "Tonsillar hypertrophy": 1, "Transient ischaemic attack": 1, "Tricuspid valve incompetence": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Vaccination site hypoaesthesia": 1, "Vascular pain": 1, "Vasodilatation": 1, "Ventricular extrasystoles": 1, "Vision blurred": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["FA9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA9094.json b/docs/data/histograms/Brazil/FA9094.json
index 03f61b5921f..033c3a4aa00 100644
--- a/docs/data/histograms/Brazil/FA9094.json
+++ b/docs/data/histograms/Brazil/FA9094.json
@@ -1 +1 @@
-{"batchcode": "FA9094", "histograms": [{"batchcodes": ["FA9094"], "histogram": {"Pain in extremity": 2, "Peripheral swelling": 2, "Pruritus": 2, "Back pain": 1, "Blood cholesterol abnormal": 1, "Blood pressure increased": 1, "Blood test": 1, "Crying": 1, "Diarrhoea": 1, "Distractibility": 1, "Erythema": 1, "Eye movement disorder": 1, "Feeding disorder": 1, "Headache": 1, "Lip disorder": 1, "Lymphadenopathy": 1, "Mastitis": 1, "Maternal exposure during pregnancy": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Nausea": 1, "Neck pain": 1, "Oedema peripheral": 1, "Petechiae": 1, "Platelet disorder": 1, "Pyrexia": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Skin plaque": 1, "Swelling face": 1, "Thrombosis": 1, "Tongue discomfort": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9094", "histograms": [{"histogram": {"Pain in extremity": 2, "Peripheral swelling": 2, "Pruritus": 2, "Back pain": 1, "Blood cholesterol abnormal": 1, "Blood pressure increased": 1, "Blood test": 1, "Crying": 1, "Diarrhoea": 1, "Distractibility": 1, "Erythema": 1, "Eye movement disorder": 1, "Feeding disorder": 1, "Headache": 1, "Lip disorder": 1, "Lymphadenopathy": 1, "Mastitis": 1, "Maternal exposure during pregnancy": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Nausea": 1, "Neck pain": 1, "Oedema peripheral": 1, "Petechiae": 1, "Platelet disorder": 1, "Pyrexia": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Skin plaque": 1, "Swelling face": 1, "Thrombosis": 1, "Tongue discomfort": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cell count decreased": 1}, "batchcodes": ["FA9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA9095.json b/docs/data/histograms/Brazil/FA9095.json
index ed642b9ceec..fa492ff15a7 100644
--- a/docs/data/histograms/Brazil/FA9095.json
+++ b/docs/data/histograms/Brazil/FA9095.json
@@ -1 +1 @@
-{"batchcode": "FA9095", "histograms": [{"batchcodes": ["FA9095"], "histogram": {"Pain in extremity": 5, "Headache": 4, "Pyrexia": 4, "Urticaria": 4, "Arthralgia": 3, "Diarrhoea": 3, "Facial paralysis": 3, "Investigation": 3, "Muscular weakness": 3, "Pruritus": 3, "Syncope": 3, "Tinnitus": 3, "Audiogram": 2, "Body temperature": 2, "Dizziness": 2, "Drug ineffective": 2, "Ear discomfort": 2, "Fatigue": 2, "Feeling abnormal": 2, "Heart rate irregular": 2, "Hypoaesthesia": 2, "Lymphadenopathy": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Myalgia": 2, "Myocarditis": 2, "Nausea": 2, "Pain": 2, "Pallor": 2, "Paraesthesia": 2, "Suspected COVID-19": 2, "Swelling face": 2, "Tremor": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Allergic reaction to excipient": 1, "Alopecia": 1, "Anxiety": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Back pain": 1, "Bacterial test": 1, "Basophil count": 1, "Basophil count increased": 1, "Blindness": 1, "Blood cholesterol": 1, "Blood creatine": 1, "Blood culture": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Brain stem auditory evoked response": 1, "Breast enlargement": 1, "Breast swelling": 1, "Burning sensation": 1, "Cellulitis": 1, "Chills": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Deafness": 1, "Diplegia": 1, "Dysmorphism": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electrocochleogram": 1, "Eosinophil count": 1, "Erythema": 1, "Eye pain": 1, "Facial pain": 1, "Folliculitis": 1, "Furuncle": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head discomfort": 1, "Head titubation": 1, "Heart rate": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Hypothermia": 1, "Infarction": 1, "Infected skin ulcer": 1, "Inflammation": 1, "Insomnia": 1, "Irritable bowel syndrome": 1, "Joint range of motion decreased": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lymphadenitis": 1, "Lymphangitis": 1, "Lymphocyte count": 1, "Lymphocyte count increased": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Migraine": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Monoplegia": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Non-high-density lipoprotein cholesterol increased": 1, "Oedema": 1, "Oedema peripheral": 1, "Oral disorder": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Platelet count": 1, "Polyneuropathy": 1, "Poor quality sleep": 1, "Post-acute COVID-19 syndrome": 1, "Protein urine": 1, "Pustule": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Retching": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Sinoatrial block": 1, "Skin ulcer": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Swollen tongue": 1, "Tachycardia": 1, "Thrombosis": 1, "Tilt table test": 1, "Tongue dry": 1, "Tricuspid valve incompetence": 1, "Urinary sediment present": 1, "Urinary tract imaging": 1, "Urinary tract pain": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Uveitis": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin C": 1, "Vitamin D": 1, "Vomiting": 1, "Walking disability": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cells urine": 1, "X-ray abnormal": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9095", "histograms": [{"histogram": {"Pain in extremity": 5, "Headache": 4, "Pyrexia": 4, "Urticaria": 4, "Arthralgia": 3, "Diarrhoea": 3, "Facial paralysis": 3, "Investigation": 3, "Muscular weakness": 3, "Pruritus": 3, "Syncope": 3, "Tinnitus": 3, "Audiogram": 2, "Body temperature": 2, "Dizziness": 2, "Drug ineffective": 2, "Ear discomfort": 2, "Fatigue": 2, "Feeling abnormal": 2, "Heart rate irregular": 2, "Hypoaesthesia": 2, "Lymphadenopathy": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Myalgia": 2, "Myocarditis": 2, "Nausea": 2, "Pain": 2, "Pallor": 2, "Paraesthesia": 2, "Suspected COVID-19": 2, "Swelling face": 2, "Tremor": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Allergic reaction to excipient": 1, "Alopecia": 1, "Anxiety": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Back pain": 1, "Bacterial test": 1, "Basophil count": 1, "Basophil count increased": 1, "Blindness": 1, "Blood cholesterol": 1, "Blood creatine": 1, "Blood culture": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Brain stem auditory evoked response": 1, "Breast enlargement": 1, "Breast swelling": 1, "Burning sensation": 1, "Cellulitis": 1, "Chills": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Deafness": 1, "Diplegia": 1, "Dysmorphism": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electrocochleogram": 1, "Eosinophil count": 1, "Erythema": 1, "Eye pain": 1, "Facial pain": 1, "Folliculitis": 1, "Furuncle": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head discomfort": 1, "Head titubation": 1, "Heart rate": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Hypothermia": 1, "Infarction": 1, "Infected skin ulcer": 1, "Inflammation": 1, "Insomnia": 1, "Irritable bowel syndrome": 1, "Joint range of motion decreased": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lymphadenitis": 1, "Lymphangitis": 1, "Lymphocyte count": 1, "Lymphocyte count increased": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Migraine": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Monoplegia": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Non-high-density lipoprotein cholesterol increased": 1, "Oedema": 1, "Oedema peripheral": 1, "Oral disorder": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Platelet count": 1, "Polyneuropathy": 1, "Poor quality sleep": 1, "Post-acute COVID-19 syndrome": 1, "Protein urine": 1, "Pustule": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Retching": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Sinoatrial block": 1, "Skin ulcer": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Swollen tongue": 1, "Tachycardia": 1, "Thrombosis": 1, "Tilt table test": 1, "Tongue dry": 1, "Tricuspid valve incompetence": 1, "Urinary sediment present": 1, "Urinary tract imaging": 1, "Urinary tract pain": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Uveitis": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin C": 1, "Vitamin D": 1, "Vomiting": 1, "Walking disability": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cells urine": 1, "X-ray abnormal": 1, "pH urine": 1}, "batchcodes": ["FA9095"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FA9096.json b/docs/data/histograms/Brazil/FA9096.json
index 8955794ff69..c7fd28aea09 100644
--- a/docs/data/histograms/Brazil/FA9096.json
+++ b/docs/data/histograms/Brazil/FA9096.json
@@ -1 +1 @@
-{"batchcode": "FA9096", "histograms": [{"batchcodes": ["FA9096"], "histogram": {"Headache": 3, "COVID-19": 2, "Drug ineffective": 2, "Nausea": 2, "Pain in extremity": 2, "SARS-CoV-2 test": 2, "Arrhythmia": 1, "Audiogram": 1, "Blood pressure increased": 1, "Blood test": 1, "Crying": 1, "Deformity": 1, "Dyspnoea": 1, "Erythema": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fatigue": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Investigation": 1, "Limb mass": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Mouth swelling": 1, "Myalgia": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Sinusitis": 1, "Stress": 1, "Swelling": 1, "Swelling face": 1, "Tinnitus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9096", "histograms": [{"histogram": {"Headache": 3, "COVID-19": 2, "Drug ineffective": 2, "Nausea": 2, "Pain in extremity": 2, "SARS-CoV-2 test": 2, "Arrhythmia": 1, "Audiogram": 1, "Blood pressure increased": 1, "Blood test": 1, "Crying": 1, "Deformity": 1, "Dyspnoea": 1, "Erythema": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fatigue": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Investigation": 1, "Limb mass": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Mouth swelling": 1, "Myalgia": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Sinusitis": 1, "Stress": 1, "Swelling": 1, "Swelling face": 1, "Tinnitus": 1, "Urticaria": 1}, "batchcodes": ["FA9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FB7208.json b/docs/data/histograms/Brazil/FB7208.json
index a1775c2e060..954c7a0d10b 100644
--- a/docs/data/histograms/Brazil/FB7208.json
+++ b/docs/data/histograms/Brazil/FB7208.json
@@ -1 +1 @@
-{"batchcode": "FB7208", "histograms": [{"batchcodes": ["FB7208"], "histogram": {"Arrhythmia": 1, "Emotional disorder": 1, "Fatigue": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FB7208", "histograms": [{"histogram": {"Arrhythmia": 1, "Emotional disorder": 1, "Fatigue": 1, "Urinary tract infection": 1}, "batchcodes": ["FB7208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FB7221.json b/docs/data/histograms/Brazil/FB7221.json
index 0a415fabffe..0dbd3eb9056 100644
--- a/docs/data/histograms/Brazil/FB7221.json
+++ b/docs/data/histograms/Brazil/FB7221.json
@@ -1 +1 @@
-{"batchcode": "FB7221", "histograms": [{"batchcodes": ["FB7221"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Mood altered": 1, "Pain": 1, "Poor quality sleep": 1, "Pyrexia": 1, "Sluggishness": 1, "Thirst": 1, "Vaccination site joint movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FB7221", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Mood altered": 1, "Pain": 1, "Poor quality sleep": 1, "Pyrexia": 1, "Sluggishness": 1, "Thirst": 1, "Vaccination site joint movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["FB7221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FC 2495.json b/docs/data/histograms/Brazil/FC 2495.json
index a160c18c5d3..ac02844197c 100644
--- a/docs/data/histograms/Brazil/FC 2495.json
+++ b/docs/data/histograms/Brazil/FC 2495.json
@@ -1 +1 @@
-{"batchcode": "FC 2495", "histograms": [{"batchcodes": ["FC 2495"], "histogram": {"Arrhythmia": 1, "Blood pressure increased": 1, "Headache": 1, "Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "FC 2495", "histograms": [{"histogram": {"Arrhythmia": 1, "Blood pressure increased": 1, "Headache": 1, "Hypertension": 1}, "batchcodes": ["FC 2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FC 9090.json b/docs/data/histograms/Brazil/FC 9090.json
index 108c733dbad..f65e0aacedd 100644
--- a/docs/data/histograms/Brazil/FC 9090.json
+++ b/docs/data/histograms/Brazil/FC 9090.json
@@ -1 +1 @@
-{"batchcode": "FC 9090", "histograms": [{"batchcodes": ["FC 9090"], "histogram": {"Blister": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Limb discomfort": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Pyrexia": 1, "Swelling": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "FC 9090", "histograms": [{"histogram": {"Blister": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Limb discomfort": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Pyrexia": 1, "Swelling": 1, "Throat tightness": 1}, "batchcodes": ["FC 9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FC2083.json b/docs/data/histograms/Brazil/FC2083.json
index 7bc5ccefeee..2b24f94f930 100644
--- a/docs/data/histograms/Brazil/FC2083.json
+++ b/docs/data/histograms/Brazil/FC2083.json
@@ -1 +1 @@
-{"batchcode": "FC2083", "histograms": [{"batchcodes": ["FC2083"], "histogram": {"Allergy test": 1, "Blood test": 1, "Pruritus": 1, "Rash macular": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2083", "histograms": [{"histogram": {"Allergy test": 1, "Blood test": 1, "Pruritus": 1, "Rash macular": 1, "Urticaria": 1}, "batchcodes": ["FC2083"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FC2336.json b/docs/data/histograms/Brazil/FC2336.json
index ecf60418563..2a95fdc84ec 100644
--- a/docs/data/histograms/Brazil/FC2336.json
+++ b/docs/data/histograms/Brazil/FC2336.json
@@ -1 +1 @@
-{"batchcode": "FC2336", "histograms": [{"batchcodes": ["FC2336"], "histogram": {"Alanine aminotransferase": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Electrocardiogram ambulatory": 1, "Extrasystoles": 1, "Hepatic enzyme abnormal": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2336", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Electrocardiogram ambulatory": 1, "Extrasystoles": 1, "Hepatic enzyme abnormal": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FC2336"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FC2495.json b/docs/data/histograms/Brazil/FC2495.json
index 98010bad3a5..1db1b4de261 100644
--- a/docs/data/histograms/Brazil/FC2495.json
+++ b/docs/data/histograms/Brazil/FC2495.json
@@ -1 +1 @@
-{"batchcode": "FC2495", "histograms": [{"batchcodes": ["FC2495"], "histogram": {"Headache": 4, "Arthralgia": 3, "Chills": 3, "Erythema": 3, "Pyrexia": 3, "Somnolence": 3, "Asthenia": 2, "Dyspnoea": 2, "Gait disturbance": 2, "Myalgia": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Ultrasound Doppler": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Angina pectoris": 1, "Angiogram": 1, "Asthmatic crisis": 1, "Back pain": 1, "Blood test": 1, "Chest pain": 1, "Cognitive disorder": 1, "Computerised tomogram neck": 1, "Deep vein thrombosis": 1, "Eating disorder": 1, "Eye irritation": 1, "Fatigue": 1, "Feeling hot": 1, "Groin pain": 1, "Hallucination": 1, "Herpes simplex": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Ischaemic stroke": 1, "Lethargy": 1, "Lymph node abscess": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Muscle rigidity": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Obstructive airways disorder": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Parosmia": 1, "Peripheral swelling": 1, "Photosensitivity reaction": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Respiratory fatigue": 1, "Salivary hypersecretion": 1, "Swelling face": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2495", "histograms": [{"histogram": {"Headache": 4, "Arthralgia": 3, "Chills": 3, "Erythema": 3, "Pyrexia": 3, "Somnolence": 3, "Asthenia": 2, "Dyspnoea": 2, "Gait disturbance": 2, "Myalgia": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Ultrasound Doppler": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Angina pectoris": 1, "Angiogram": 1, "Asthmatic crisis": 1, "Back pain": 1, "Blood test": 1, "Chest pain": 1, "Cognitive disorder": 1, "Computerised tomogram neck": 1, "Deep vein thrombosis": 1, "Eating disorder": 1, "Eye irritation": 1, "Fatigue": 1, "Feeling hot": 1, "Groin pain": 1, "Hallucination": 1, "Herpes simplex": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Ischaemic stroke": 1, "Lethargy": 1, "Lymph node abscess": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Muscle rigidity": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Obstructive airways disorder": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Parosmia": 1, "Peripheral swelling": 1, "Photosensitivity reaction": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Respiratory fatigue": 1, "Salivary hypersecretion": 1, "Swelling face": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Wound": 1}, "batchcodes": ["FC2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FC3182.json b/docs/data/histograms/Brazil/FC3182.json
index 3247a49a4b3..cd3f3b11ad8 100644
--- a/docs/data/histograms/Brazil/FC3182.json
+++ b/docs/data/histograms/Brazil/FC3182.json
@@ -1 +1 @@
-{"batchcode": "FC3182", "histograms": [{"batchcodes": ["FC3182"], "histogram": {"Magnetic resonance imaging head": 1, "Meningioma": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3182", "histograms": [{"histogram": {"Magnetic resonance imaging head": 1, "Meningioma": 1, "Vaccination site pain": 1}, "batchcodes": ["FC3182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD 722.json b/docs/data/histograms/Brazil/FD 722.json
index 3d0e7298ae0..b38c1a85ac7 100644
--- a/docs/data/histograms/Brazil/FD 722.json
+++ b/docs/data/histograms/Brazil/FD 722.json
@@ -1 +1 @@
-{"batchcode": "FD 722", "histograms": [{"batchcodes": ["FD 722"], "histogram": {"Necrosis": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FD 722", "histograms": [{"histogram": {"Necrosis": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}, "batchcodes": ["FD 722"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7205.json b/docs/data/histograms/Brazil/FD7205.json
index 3bec528abcf..020a7e41310 100644
--- a/docs/data/histograms/Brazil/FD7205.json
+++ b/docs/data/histograms/Brazil/FD7205.json
@@ -1 +1 @@
-{"batchcode": "FD7205", "histograms": [{"batchcodes": ["FD7205"], "histogram": {"Blindness unilateral": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7205", "histograms": [{"histogram": {"Blindness unilateral": 1, "Visual impairment": 1}, "batchcodes": ["FD7205"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7207.json b/docs/data/histograms/Brazil/FD7207.json
index c6280e9a55f..afbb0536dc1 100644
--- a/docs/data/histograms/Brazil/FD7207.json
+++ b/docs/data/histograms/Brazil/FD7207.json
@@ -1 +1 @@
-{"batchcode": "FD7207", "histograms": [{"batchcodes": ["FD7207"], "histogram": {"Pain in extremity": 4, "SARS-CoV-2 test": 3, "Arthralgia": 2, "COVID-19": 2, "Chills": 2, "Drug ineffective": 2, "Fatigue": 2, "Headache": 2, "Pain": 2, "Pyrexia": 2, "Ageusia": 1, "Angina pectoris": 1, "Anosmia": 1, "Anxiety": 1, "Axillary pain": 1, "Back pain": 1, "Body temperature": 1, "Chest pain": 1, "Disorientation": 1, "Eye swelling": 1, "Hypersensitivity": 1, "Influenza": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Mobility decreased": 1, "Musculoskeletal chest pain": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Nausea": 1, "Nodule": 1, "Ophthalmic herpes zoster": 1, "Palpitations": 1, "Peripheral swelling": 1, "Physical examination": 1, "Respiration abnormal": 1, "SARS-CoV-2 antibody test": 1, "Somnolence": 1, "Swelling": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7207", "histograms": [{"histogram": {"Pain in extremity": 4, "SARS-CoV-2 test": 3, "Arthralgia": 2, "COVID-19": 2, "Chills": 2, "Drug ineffective": 2, "Fatigue": 2, "Headache": 2, "Pain": 2, "Pyrexia": 2, "Ageusia": 1, "Angina pectoris": 1, "Anosmia": 1, "Anxiety": 1, "Axillary pain": 1, "Back pain": 1, "Body temperature": 1, "Chest pain": 1, "Disorientation": 1, "Eye swelling": 1, "Hypersensitivity": 1, "Influenza": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Mobility decreased": 1, "Musculoskeletal chest pain": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Nausea": 1, "Nodule": 1, "Ophthalmic herpes zoster": 1, "Palpitations": 1, "Peripheral swelling": 1, "Physical examination": 1, "Respiration abnormal": 1, "SARS-CoV-2 antibody test": 1, "Somnolence": 1, "Swelling": 1, "Thrombocytopenia": 1}, "batchcodes": ["FD7207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7208.json b/docs/data/histograms/Brazil/FD7208.json
index f2195e99809..3fc0f504367 100644
--- a/docs/data/histograms/Brazil/FD7208.json
+++ b/docs/data/histograms/Brazil/FD7208.json
@@ -1 +1 @@
-{"batchcode": "FD7208", "histograms": [{"batchcodes": ["FD7208"], "histogram": {"Chest pain": 4, "Dizziness": 3, "Headache": 3, "SARS-CoV-2 test": 3, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pain in extremity": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Alopecia": 1, "Basophil count": 1, "Blood test": 1, "Body temperature": 1, "Breast pain": 1, "Cardiopulmonary exercise test": 1, "Catheterisation cardiac": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Epstein-Barr virus antibody": 1, "Face oedema": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haemoglobin": 1, "Herpes simplex test": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Insomnia": 1, "International normalised ratio": 1, "Lip swelling": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Neutrophil count": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Platelet count": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary mass": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Skin exfoliation": 1, "Tremor": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7208", "histograms": [{"histogram": {"Chest pain": 4, "Dizziness": 3, "Headache": 3, "SARS-CoV-2 test": 3, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pain in extremity": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Alopecia": 1, "Basophil count": 1, "Blood test": 1, "Body temperature": 1, "Breast pain": 1, "Cardiopulmonary exercise test": 1, "Catheterisation cardiac": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Epstein-Barr virus antibody": 1, "Face oedema": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haemoglobin": 1, "Herpes simplex test": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Insomnia": 1, "International normalised ratio": 1, "Lip swelling": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Neutrophil count": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Platelet count": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary mass": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Skin exfoliation": 1, "Tremor": 1, "White blood cell count": 1}, "batchcodes": ["FD7208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7209.json b/docs/data/histograms/Brazil/FD7209.json
index 4a9c0b342a8..3a7a67a1e2c 100644
--- a/docs/data/histograms/Brazil/FD7209.json
+++ b/docs/data/histograms/Brazil/FD7209.json
@@ -1 +1 @@
-{"batchcode": "FD7209", "histograms": [{"batchcodes": ["FD7209"], "histogram": {"Dyspnoea": 5, "Pain in extremity": 4, "Palpitations": 4, "Blood test": 3, "Chest pain": 3, "Dizziness": 3, "Headache": 3, "Inappropriate schedule of product administration": 3, "Myocarditis": 3, "Paraesthesia": 3, "SARS-CoV-2 test": 3, "Abdominal distension": 2, "Arrhythmia": 2, "Echocardiogram": 2, "Nausea": 2, "Pain": 2, "Peripheral swelling": 2, "Peroneal nerve palsy": 2, "Thrombosis": 2, "Abdominal pain upper": 1, "Back pain": 1, "Blood pressure measurement": 1, "Cardiovascular examination": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Computerised tomogram coronary artery": 1, "Deafness unilateral": 1, "Deformity": 1, "Depressed mood": 1, "Depression": 1, "Discomfort": 1, "Diverticulitis": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroneuromyography": 1, "Epididymitis": 1, "Extrasystoles": 1, "Fall": 1, "Feeling abnormal": 1, "Furuncle": 1, "Haemorrhagic stroke": 1, "Heart rate abnormal": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Infection": 1, "Intestinal ischaemia": 1, "Investigation": 1, "Laryngeal oedema": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Muscle strength abnormal": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Respiratory disorder": 1, "Retching": 1, "Sensory loss": 1, "Tachycardia": 1, "Testicular pain": 1, "Troponin": 1, "Troponin increased": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7209", "histograms": [{"histogram": {"Dyspnoea": 5, "Pain in extremity": 4, "Palpitations": 4, "Blood test": 3, "Chest pain": 3, "Dizziness": 3, "Headache": 3, "Inappropriate schedule of product administration": 3, "Myocarditis": 3, "Paraesthesia": 3, "SARS-CoV-2 test": 3, "Abdominal distension": 2, "Arrhythmia": 2, "Echocardiogram": 2, "Nausea": 2, "Pain": 2, "Peripheral swelling": 2, "Peroneal nerve palsy": 2, "Thrombosis": 2, "Abdominal pain upper": 1, "Back pain": 1, "Blood pressure measurement": 1, "Cardiovascular examination": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Computerised tomogram coronary artery": 1, "Deafness unilateral": 1, "Deformity": 1, "Depressed mood": 1, "Depression": 1, "Discomfort": 1, "Diverticulitis": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroneuromyography": 1, "Epididymitis": 1, "Extrasystoles": 1, "Fall": 1, "Feeling abnormal": 1, "Furuncle": 1, "Haemorrhagic stroke": 1, "Heart rate abnormal": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Infection": 1, "Intestinal ischaemia": 1, "Investigation": 1, "Laryngeal oedema": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Muscle strength abnormal": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Respiratory disorder": 1, "Retching": 1, "Sensory loss": 1, "Tachycardia": 1, "Testicular pain": 1, "Troponin": 1, "Troponin increased": 1, "Visual acuity reduced": 1}, "batchcodes": ["FD7209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7210.json b/docs/data/histograms/Brazil/FD7210.json
index ed49aaa99cb..e12b8fb78d4 100644
--- a/docs/data/histograms/Brazil/FD7210.json
+++ b/docs/data/histograms/Brazil/FD7210.json
@@ -1 +1 @@
-{"batchcode": "FD7210", "histograms": [{"batchcodes": ["FD7210"], "histogram": {"Blood test": 3, "Computerised tomogram": 3, "Headache": 3, "Inappropriate schedule of product administration": 3, "Investigation": 3, "Muscular weakness": 3, "Pain in extremity": 3, "Abdominal pain upper": 2, "Blood pressure measurement": 2, "Dizziness": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Myalgia": 2, "Nausea": 2, "Visual impairment": 2, "Amenorrhoea": 1, "Anxiety": 1, "Asthenia": 1, "Axillary mass": 1, "Axillary pain": 1, "Band neutrophil count": 1, "Basophil count": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood uric acid": 1, "Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Deafness unilateral": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dry throat": 1, "Ear pain": 1, "Electrocardiogram": 1, "Erythroblast count": 1, "Eye pain": 1, "Fall": 1, "Feeling abnormal": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Immune system disorder": 1, "Jaundice neonatal": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Metamyelocyte percentage": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle contracture": 1, "Muscle strain": 1, "Myelocyte percentage": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Neutrophil count increased": 1, "Pain": 1, "Palpitations": 1, "Platelet count": 1, "Pyrexia": 1, "Red cell distribution width": 1, "Red cell distribution width decreased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sleep disorder": 1, "Swelling": 1, "Symptom recurrence": 1, "Throat irritation": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Viral infection": 1, "Vision blurred": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7210", "histograms": [{"histogram": {"Blood test": 3, "Computerised tomogram": 3, "Headache": 3, "Inappropriate schedule of product administration": 3, "Investigation": 3, "Muscular weakness": 3, "Pain in extremity": 3, "Abdominal pain upper": 2, "Blood pressure measurement": 2, "Dizziness": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Myalgia": 2, "Nausea": 2, "Visual impairment": 2, "Amenorrhoea": 1, "Anxiety": 1, "Asthenia": 1, "Axillary mass": 1, "Axillary pain": 1, "Band neutrophil count": 1, "Basophil count": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood uric acid": 1, "Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Deafness unilateral": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dry throat": 1, "Ear pain": 1, "Electrocardiogram": 1, "Erythroblast count": 1, "Eye pain": 1, "Fall": 1, "Feeling abnormal": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Immune system disorder": 1, "Jaundice neonatal": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Metamyelocyte percentage": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle contracture": 1, "Muscle strain": 1, "Myelocyte percentage": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Neutrophil count increased": 1, "Pain": 1, "Palpitations": 1, "Platelet count": 1, "Pyrexia": 1, "Red cell distribution width": 1, "Red cell distribution width decreased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sleep disorder": 1, "Swelling": 1, "Symptom recurrence": 1, "Throat irritation": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Viral infection": 1, "Vision blurred": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["FD7210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7219.json b/docs/data/histograms/Brazil/FD7219.json
index d8e9c99bb78..845e1ddef2a 100644
--- a/docs/data/histograms/Brazil/FD7219.json
+++ b/docs/data/histograms/Brazil/FD7219.json
@@ -1 +1 @@
-{"batchcode": "FD7219", "histograms": [{"batchcodes": ["FD7219"], "histogram": {"Inappropriate schedule of product administration": 6, "Headache": 4, "Fatigue": 3, "Nausea": 3, "Pyrexia": 3, "Chills": 2, "Cough": 2, "Dizziness": 2, "Investigation": 2, "Lymphadenopathy": 2, "Maternal exposure during pregnancy": 2, "Oropharyngeal pain": 2, "Pain": 2, "Rhinorrhoea": 2, "Syncope": 2, "Amniotic fluid volume decreased": 1, "Aphonia": 1, "Arthralgia": 1, "Asthenia": 1, "Bell's palsy": 1, "Biopsy": 1, "Blood test": 1, "Body height": 1, "Breast pain": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Furuncle": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hypersensitivity": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Lymphoma": 1, "Mucosal dryness": 1, "Nasal congestion": 1, "Nasal pruritus": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Prenatal screening test": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Sleep deficit": 1, "Sluggishness": 1, "Swelling face": 1, "Throat irritation": 1, "Ultrasound breast": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Weight": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7219", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 6, "Headache": 4, "Fatigue": 3, "Nausea": 3, "Pyrexia": 3, "Chills": 2, "Cough": 2, "Dizziness": 2, "Investigation": 2, "Lymphadenopathy": 2, "Maternal exposure during pregnancy": 2, "Oropharyngeal pain": 2, "Pain": 2, "Rhinorrhoea": 2, "Syncope": 2, "Amniotic fluid volume decreased": 1, "Aphonia": 1, "Arthralgia": 1, "Asthenia": 1, "Bell's palsy": 1, "Biopsy": 1, "Blood test": 1, "Body height": 1, "Breast pain": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Furuncle": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hypersensitivity": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Lymphoma": 1, "Mucosal dryness": 1, "Nasal congestion": 1, "Nasal pruritus": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Prenatal screening test": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Sleep deficit": 1, "Sluggishness": 1, "Swelling face": 1, "Throat irritation": 1, "Ultrasound breast": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Weight": 1, "Yellow skin": 1}, "batchcodes": ["FD7219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7221.json b/docs/data/histograms/Brazil/FD7221.json
index a2dc39e294b..3952be6eb65 100644
--- a/docs/data/histograms/Brazil/FD7221.json
+++ b/docs/data/histograms/Brazil/FD7221.json
@@ -1 +1 @@
-{"batchcode": "FD7221", "histograms": [{"batchcodes": ["FD7221"], "histogram": {"Inappropriate schedule of product administration": 4, "SARS-CoV-2 test": 3, "Swelling": 3, "Syncope": 3, "Vaccination site pain": 3, "COVID-19": 2, "Headache": 2, "Lymphadenopathy": 2, "Monoparesis": 2, "Nausea": 2, "Pain": 2, "Polymerase chain reaction": 2, "Pruritus": 2, "Pyrexia": 2, "Ultrasound scan": 2, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Alopecia": 1, "Aptyalism": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bone disorder": 1, "Breast mass": 1, "Bronchoscopy": 1, "Burning sensation": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chronic spontaneous urticaria": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dehydration": 1, "Dementia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Dizziness": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyspnoea": 1, "Eating disorder": 1, "Erythema": 1, "Eye irritation": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling abnormal": 1, "Haemorrhage": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hot flush": 1, "Hypotension": 1, "Infection reactivation": 1, "Insomnia": 1, "Investigation": 1, "Ischaemic stroke": 1, "Lung opacity": 1, "Lymphadenitis": 1, "Mouth swelling": 1, "Nodule": 1, "Ophthalmic herpes zoster": 1, "Pain in extremity": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Premature ageing": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash pruritic": 1, "Retching": 1, "Seizure": 1, "Skin discolouration": 1, "Skin injury": 1, "Somnolence": 1, "Swelling face": 1, "Thirst": 1, "Throat tightness": 1, "Thrombosis": 1, "Vaccination site swelling": 1, "Viral test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7221", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 4, "SARS-CoV-2 test": 3, "Swelling": 3, "Syncope": 3, "Vaccination site pain": 3, "COVID-19": 2, "Headache": 2, "Lymphadenopathy": 2, "Monoparesis": 2, "Nausea": 2, "Pain": 2, "Polymerase chain reaction": 2, "Pruritus": 2, "Pyrexia": 2, "Ultrasound scan": 2, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Alopecia": 1, "Aptyalism": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bone disorder": 1, "Breast mass": 1, "Bronchoscopy": 1, "Burning sensation": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chronic spontaneous urticaria": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dehydration": 1, "Dementia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Dizziness": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyspnoea": 1, "Eating disorder": 1, "Erythema": 1, "Eye irritation": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling abnormal": 1, "Haemorrhage": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hot flush": 1, "Hypotension": 1, "Infection reactivation": 1, "Insomnia": 1, "Investigation": 1, "Ischaemic stroke": 1, "Lung opacity": 1, "Lymphadenitis": 1, "Mouth swelling": 1, "Nodule": 1, "Ophthalmic herpes zoster": 1, "Pain in extremity": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Premature ageing": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash pruritic": 1, "Retching": 1, "Seizure": 1, "Skin discolouration": 1, "Skin injury": 1, "Somnolence": 1, "Swelling face": 1, "Thirst": 1, "Throat tightness": 1, "Thrombosis": 1, "Vaccination site swelling": 1, "Viral test": 1, "Vomiting": 1}, "batchcodes": ["FD7221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7222.json b/docs/data/histograms/Brazil/FD7222.json
index 02c6a7fe3fc..f23ad746064 100644
--- a/docs/data/histograms/Brazil/FD7222.json
+++ b/docs/data/histograms/Brazil/FD7222.json
@@ -1 +1 @@
-{"batchcode": "FD7222", "histograms": [{"batchcodes": ["FD7222"], "histogram": {"Inappropriate schedule of product administration": 7, "Headache": 4, "Pain in extremity": 4, "Pruritus": 4, "Diarrhoea": 3, "Hypersensitivity": 3, "Pain": 3, "Pyrexia": 3, "Abdominal pain": 2, "Erythema": 2, "Eye irritation": 2, "Investigation": 2, "Myalgia": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Swelling face": 2, "Vaccination site pain": 2, "Abdominal distension": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Blood urine present": 1, "Bone pain": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Drug ineffective": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Eye pain": 1, "Face oedema": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Generalised oedema": 1, "Herpes zoster": 1, "Hypertension": 1, "Inflammation": 1, "Influenza like illness": 1, "Insomnia": 1, "Laryngeal oedema": 1, "Lymphadenopathy": 1, "Malaise": 1, "Menstruation irregular": 1, "Movement disorder": 1, "Muscle spasms": 1, "Nausea": 1, "Obstructive airways disorder": 1, "Ocular icterus": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Peripheral swelling": 1, "Photophobia": 1, "Pleural effusion": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sensory disturbance": 1, "Suspected COVID-19": 1, "Throat tightness": 1, "Thrombosis": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Varicella": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1, "Weight increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7222", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 7, "Headache": 4, "Pain in extremity": 4, "Pruritus": 4, "Diarrhoea": 3, "Hypersensitivity": 3, "Pain": 3, "Pyrexia": 3, "Abdominal pain": 2, "Erythema": 2, "Eye irritation": 2, "Investigation": 2, "Myalgia": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Swelling face": 2, "Vaccination site pain": 2, "Abdominal distension": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Blood urine present": 1, "Bone pain": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Drug ineffective": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Eye pain": 1, "Face oedema": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Generalised oedema": 1, "Herpes zoster": 1, "Hypertension": 1, "Inflammation": 1, "Influenza like illness": 1, "Insomnia": 1, "Laryngeal oedema": 1, "Lymphadenopathy": 1, "Malaise": 1, "Menstruation irregular": 1, "Movement disorder": 1, "Muscle spasms": 1, "Nausea": 1, "Obstructive airways disorder": 1, "Ocular icterus": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Peripheral swelling": 1, "Photophobia": 1, "Pleural effusion": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sensory disturbance": 1, "Suspected COVID-19": 1, "Throat tightness": 1, "Thrombosis": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Varicella": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1, "Weight increased": 1}, "batchcodes": ["FD7222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7271.json b/docs/data/histograms/Brazil/FD7271.json
index a44b04422f8..497190cb211 100644
--- a/docs/data/histograms/Brazil/FD7271.json
+++ b/docs/data/histograms/Brazil/FD7271.json
@@ -1 +1 @@
-{"batchcode": "FD7271", "histograms": [{"batchcodes": ["FD7271"], "histogram": {"Angiogram": 1, "Intermenstrual bleeding": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1, "Vaccination site abscess": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7271", "histograms": [{"histogram": {"Angiogram": 1, "Intermenstrual bleeding": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1, "Vaccination site abscess": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["FD7271"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FD7278.json b/docs/data/histograms/Brazil/FD7278.json
index c8379913366..d00b7dfc5bc 100644
--- a/docs/data/histograms/Brazil/FD7278.json
+++ b/docs/data/histograms/Brazil/FD7278.json
@@ -1 +1 @@
-{"batchcode": "FD7278", "histograms": [{"batchcodes": ["FD7278"], "histogram": {"Temporomandibular joint syndrome": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7278", "histograms": [{"histogram": {"Temporomandibular joint syndrome": 1, "Tinnitus": 1}, "batchcodes": ["FD7278"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FE 2083.json b/docs/data/histograms/Brazil/FE 2083.json
index 487cb85456b..418236b15ca 100644
--- a/docs/data/histograms/Brazil/FE 2083.json
+++ b/docs/data/histograms/Brazil/FE 2083.json
@@ -1 +1 @@
-{"batchcode": "FE 2083", "histograms": [{"batchcodes": ["FE 2083"], "histogram": {"Eating disorder": 1, "Facial paralysis": 1, "Hypoaesthesia oral": 1, "Mastication disorder": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 2083", "histograms": [{"histogram": {"Eating disorder": 1, "Facial paralysis": 1, "Hypoaesthesia oral": 1, "Mastication disorder": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FE 2083"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FE2083.json b/docs/data/histograms/Brazil/FE2083.json
index 4f37b58eff7..19dc4a384ef 100644
--- a/docs/data/histograms/Brazil/FE2083.json
+++ b/docs/data/histograms/Brazil/FE2083.json
@@ -1 +1 @@
-{"batchcode": "FE2083", "histograms": [{"batchcodes": ["FE2083"], "histogram": {"Arrhythmia": 2, "Blood pressure increased": 2, "Dyspnoea": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Bedridden": 1, "Blister": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood pressure measurement": 1, "Breast enlargement": 1, "COVID-19": 1, "Cerebral ischaemia": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Drug ineffective": 1, "Dysentery": 1, "Ear pain": 1, "Exposure via breast milk": 1, "Fatigue": 1, "Gingival blister": 1, "Head discomfort": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Infantile vomiting": 1, "Loss of consciousness": 1, "Lung opacity": 1, "Malaise": 1, "Menstrual disorder": 1, "Mouth swelling": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Pain": 1, "Palpitations": 1, "Paralysis": 1, "Pharyngeal swelling": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sneezing": 1, "Speech disorder": 1, "Swelling face": 1, "Syncope": 1, "Taste disorder": 1, "Throat tightness": 1, "Thrombophlebitis superficial": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FE2083", "histograms": [{"histogram": {"Arrhythmia": 2, "Blood pressure increased": 2, "Dyspnoea": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Bedridden": 1, "Blister": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood pressure measurement": 1, "Breast enlargement": 1, "COVID-19": 1, "Cerebral ischaemia": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Drug ineffective": 1, "Dysentery": 1, "Ear pain": 1, "Exposure via breast milk": 1, "Fatigue": 1, "Gingival blister": 1, "Head discomfort": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Infantile vomiting": 1, "Loss of consciousness": 1, "Lung opacity": 1, "Malaise": 1, "Menstrual disorder": 1, "Mouth swelling": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Pain": 1, "Palpitations": 1, "Paralysis": 1, "Pharyngeal swelling": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sneezing": 1, "Speech disorder": 1, "Swelling face": 1, "Syncope": 1, "Taste disorder": 1, "Throat tightness": 1, "Thrombophlebitis superficial": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "Vertigo": 1}, "batchcodes": ["FE2083"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FE3591.json b/docs/data/histograms/Brazil/FE3591.json
index 4801012ccf2..3f5e177f95b 100644
--- a/docs/data/histograms/Brazil/FE3591.json
+++ b/docs/data/histograms/Brazil/FE3591.json
@@ -1 +1 @@
-{"batchcode": "FE3591", "histograms": [{"batchcodes": ["FE3591"], "histogram": {"Headache": 3, "Paraesthesia": 3, "Asthenia": 2, "Blood test": 2, "Dyspnoea": 2, "Guillain-Barre syndrome": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pyrexia": 2, "Swelling": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Asthma": 1, "Back pain": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Death": 1, "Dehydration": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Disorientation": 1, "Dizziness": 1, "Dysstasia": 1, "Ear pain": 1, "Endoscopy": 1, "Eye pain": 1, "Eyelid function disorder": 1, "Facial pain": 1, "Facial paralysis": 1, "Fatigue": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Heart rate increased": 1, "Impaired gastric emptying": 1, "Insomnia": 1, "Lumbar puncture": 1, "Macule": 1, "Malaise": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Pharyngitis": 1, "Plantar fasciitis": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Salivary hypersecretion": 1, "Syncope": 1, "Trigger finger": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3591", "histograms": [{"histogram": {"Headache": 3, "Paraesthesia": 3, "Asthenia": 2, "Blood test": 2, "Dyspnoea": 2, "Guillain-Barre syndrome": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pyrexia": 2, "Swelling": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Asthma": 1, "Back pain": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Death": 1, "Dehydration": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Disorientation": 1, "Dizziness": 1, "Dysstasia": 1, "Ear pain": 1, "Endoscopy": 1, "Eye pain": 1, "Eyelid function disorder": 1, "Facial pain": 1, "Facial paralysis": 1, "Fatigue": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Heart rate increased": 1, "Impaired gastric emptying": 1, "Insomnia": 1, "Lumbar puncture": 1, "Macule": 1, "Malaise": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Pharyngitis": 1, "Plantar fasciitis": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Salivary hypersecretion": 1, "Syncope": 1, "Trigger finger": 1}, "batchcodes": ["FE3591"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FE5108.json b/docs/data/histograms/Brazil/FE5108.json
index 67a6b79ab78..eea09790276 100644
--- a/docs/data/histograms/Brazil/FE5108.json
+++ b/docs/data/histograms/Brazil/FE5108.json
@@ -1 +1 @@
-{"batchcode": "FE5108", "histograms": [{"batchcodes": ["FE5108"], "histogram": {"Axillary pain": 1, "Headache": 1, "Pain in extremity": 1, "Pruritus": 1, "Vaccination site joint movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FE5108", "histograms": [{"histogram": {"Axillary pain": 1, "Headache": 1, "Pain in extremity": 1, "Pruritus": 1, "Vaccination site joint movement impairment": 1}, "batchcodes": ["FE5108"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF2591.json b/docs/data/histograms/Brazil/FF2591.json
index a0cfc9eea4f..03d88dbf555 100644
--- a/docs/data/histograms/Brazil/FF2591.json
+++ b/docs/data/histograms/Brazil/FF2591.json
@@ -1 +1 @@
-{"batchcode": "FF2591", "histograms": [{"batchcodes": ["FF2591"], "histogram": {"Chills": 1, "Cold sweat": 1, "Daydreaming": 1, "Dyspnoea": 1, "Erythema": 1, "Fear": 1, "Hallucination": 1, "Hypersensitivity": 1, "Hypervigilance": 1, "Lip swelling": 1, "Malaise": 1, "Neck mass": 1, "Neck pain": 1, "Negative thoughts": 1, "Nightmare": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Rash macular": 1, "Restlessness": 1, "Skin burning sensation": 1, "Swelling face": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2591", "histograms": [{"histogram": {"Chills": 1, "Cold sweat": 1, "Daydreaming": 1, "Dyspnoea": 1, "Erythema": 1, "Fear": 1, "Hallucination": 1, "Hypersensitivity": 1, "Hypervigilance": 1, "Lip swelling": 1, "Malaise": 1, "Neck mass": 1, "Neck pain": 1, "Negative thoughts": 1, "Nightmare": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Rash macular": 1, "Restlessness": 1, "Skin burning sensation": 1, "Swelling face": 1, "Vaccination site pruritus": 1}, "batchcodes": ["FF2591"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF2592.json b/docs/data/histograms/Brazil/FF2592.json
index 95d243800ac..2e6e9db87d8 100644
--- a/docs/data/histograms/Brazil/FF2592.json
+++ b/docs/data/histograms/Brazil/FF2592.json
@@ -1 +1 @@
-{"batchcode": "FF2592", "histograms": [{"batchcodes": ["FF2592"], "histogram": {"Immunisation": 5, "Interchange of vaccine products": 5, "Off label use": 5, "Vaccination site pain": 4, "Pain": 3, "Pruritus": 3, "Urticaria": 3, "Arthralgia": 2, "Drug ineffective": 2, "Anxiety": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Eczema": 1, "Erythema": 1, "Expired product administered": 1, "Eye swelling": 1, "Fatigue": 1, "Flatulence": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Impaired work ability": 1, "Inflammatory pain": 1, "Leukaemia": 1, "Myocarditis": 1, "Myopathy": 1, "Nausea": 1, "Pain in extremity": 1, "Pericarditis": 1, "Periorbital oedema": 1, "Peripheral swelling": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Suspected COVID-19": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2592", "histograms": [{"histogram": {"Immunisation": 5, "Interchange of vaccine products": 5, "Off label use": 5, "Vaccination site pain": 4, "Pain": 3, "Pruritus": 3, "Urticaria": 3, "Arthralgia": 2, "Drug ineffective": 2, "Anxiety": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Eczema": 1, "Erythema": 1, "Expired product administered": 1, "Eye swelling": 1, "Fatigue": 1, "Flatulence": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Impaired work ability": 1, "Inflammatory pain": 1, "Leukaemia": 1, "Myocarditis": 1, "Myopathy": 1, "Nausea": 1, "Pain in extremity": 1, "Pericarditis": 1, "Periorbital oedema": 1, "Peripheral swelling": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Suspected COVID-19": 1, "Swelling": 1}, "batchcodes": ["FF2592"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF5107.json b/docs/data/histograms/Brazil/FF5107.json
index 89724b60567..2fcf346f821 100644
--- a/docs/data/histograms/Brazil/FF5107.json
+++ b/docs/data/histograms/Brazil/FF5107.json
@@ -1 +1 @@
-{"batchcode": "FF5107", "histograms": [{"batchcodes": ["FF5107"], "histogram": {"Inappropriate schedule of product administration": 2, "Candida infection": 1, "Cardiac failure congestive": 1, "Chest pain": 1, "Coronary artery insufficiency": 1, "Echocardiogram": 1, "Eructation": 1, "Furuncle": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Sinus rhythm": 1, "Systolic dysfunction": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5107", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Candida infection": 1, "Cardiac failure congestive": 1, "Chest pain": 1, "Coronary artery insufficiency": 1, "Echocardiogram": 1, "Eructation": 1, "Furuncle": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Sinus rhythm": 1, "Systolic dysfunction": 1}, "batchcodes": ["FF5107"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF5108.json b/docs/data/histograms/Brazil/FF5108.json
index dde453e6263..c2144050691 100644
--- a/docs/data/histograms/Brazil/FF5108.json
+++ b/docs/data/histograms/Brazil/FF5108.json
@@ -1 +1 @@
-{"batchcode": "FF5108", "histograms": [{"batchcodes": ["FF5108"], "histogram": {"Interchange of vaccine products": 9, "Off label use": 7, "Drug ineffective": 4, "Headache": 4, "Immunisation": 4, "Inappropriate schedule of product administration": 3, "Pain": 3, "Pain in extremity": 3, "Blindness": 2, "COVID-19": 2, "Insomnia": 2, "Muscle contractions involuntary": 2, "Nausea": 2, "SARS-CoV-2 test": 2, "Specialist consultation": 2, "Suspected COVID-19": 2, "Thrombosis": 2, "Tinnitus": 2, "Amyotrophic lateral sclerosis": 1, "Angina pectoris": 1, "Apathy": 1, "Aphonia": 1, "Asthenia": 1, "Blood blister": 1, "Cataract": 1, "Chest pain": 1, "Chills": 1, "Coagulopathy": 1, "Computerised tomogram normal": 1, "Condition aggravated": 1, "Contusion": 1, "Cough": 1, "Deafness": 1, "Decreased appetite": 1, "Dehydration": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Electromyogram": 1, "Epistaxis": 1, "Fatigue": 1, "Feeling hot": 1, "Haemorrhage": 1, "Influenza virus test": 1, "Investigation": 1, "Irritability": 1, "Laboratory test": 1, "Laryngospasm": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myositis": 1, "Neck pain": 1, "Nerve compression": 1, "Nervousness": 1, "Neuralgia": 1, "Product administered at inappropriate site": 1, "Pruritus": 1, "Pyrexia": 1, "Rash vesicular": 1, "Rhinitis": 1, "Sensorimotor disorder": 1, "Skin odour abnormal": 1, "Somnolence": 1, "Speech disorder": 1, "Spinal column injury": 1, "Spinal pain": 1, "Swelling": 1, "Tachycardia": 1, "Temporomandibular joint syndrome": 1, "Tendon pain": 1, "Throat irritation": 1, "Thyroid hormones test": 1, "Tremor": 1, "Ultrasound Doppler": 1, "Urine output": 1, "Uterine haemorrhage": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5108", "histograms": [{"histogram": {"Interchange of vaccine products": 9, "Off label use": 7, "Drug ineffective": 4, "Headache": 4, "Immunisation": 4, "Inappropriate schedule of product administration": 3, "Pain": 3, "Pain in extremity": 3, "Blindness": 2, "COVID-19": 2, "Insomnia": 2, "Muscle contractions involuntary": 2, "Nausea": 2, "SARS-CoV-2 test": 2, "Specialist consultation": 2, "Suspected COVID-19": 2, "Thrombosis": 2, "Tinnitus": 2, "Amyotrophic lateral sclerosis": 1, "Angina pectoris": 1, "Apathy": 1, "Aphonia": 1, "Asthenia": 1, "Blood blister": 1, "Cataract": 1, "Chest pain": 1, "Chills": 1, "Coagulopathy": 1, "Computerised tomogram normal": 1, "Condition aggravated": 1, "Contusion": 1, "Cough": 1, "Deafness": 1, "Decreased appetite": 1, "Dehydration": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Electromyogram": 1, "Epistaxis": 1, "Fatigue": 1, "Feeling hot": 1, "Haemorrhage": 1, "Influenza virus test": 1, "Investigation": 1, "Irritability": 1, "Laboratory test": 1, "Laryngospasm": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myositis": 1, "Neck pain": 1, "Nerve compression": 1, "Nervousness": 1, "Neuralgia": 1, "Product administered at inappropriate site": 1, "Pruritus": 1, "Pyrexia": 1, "Rash vesicular": 1, "Rhinitis": 1, "Sensorimotor disorder": 1, "Skin odour abnormal": 1, "Somnolence": 1, "Speech disorder": 1, "Spinal column injury": 1, "Spinal pain": 1, "Swelling": 1, "Tachycardia": 1, "Temporomandibular joint syndrome": 1, "Tendon pain": 1, "Throat irritation": 1, "Thyroid hormones test": 1, "Tremor": 1, "Ultrasound Doppler": 1, "Urine output": 1, "Uterine haemorrhage": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["FF5108"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF5110.json b/docs/data/histograms/Brazil/FF5110.json
index afe0497679b..acdfc480e1e 100644
--- a/docs/data/histograms/Brazil/FF5110.json
+++ b/docs/data/histograms/Brazil/FF5110.json
@@ -1 +1 @@
-{"batchcode": "FF5110", "histograms": [{"batchcodes": ["FF5110"], "histogram": {"Inappropriate schedule of product administration": 5, "SARS-CoV-2 test": 3, "Body temperature": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Pyrexia": 2, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Antinuclear antibody": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "COVID-19": 1, "CSF test": 1, "Central nervous system lesion": 1, "Chills": 1, "Depression": 1, "Diarrhoea haemorrhagic": 1, "Drug ineffective": 1, "Electrophoresis protein": 1, "Feeling of despair": 1, "Gamma-glutamyltransferase": 1, "HIV test": 1, "Haemoglobin": 1, "Headache": 1, "Helplessness": 1, "Hepatitis B": 1, "Hepatitis C": 1, "High density lipoprotein": 1, "Hypoaesthesia": 1, "Illness": 1, "Increased upper airway secretion": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mental disorder": 1, "Migraine": 1, "Nausea": 1, "Neurological examination": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Postmenopausal haemorrhage": 1, "Red blood cell sedimentation rate": 1, "Relapsing-remitting multiple sclerosis": 1, "Respiratory arrest": 1, "Rheumatoid factor": 1, "Self esteem decreased": 1, "Syncope": 1, "Testicular haemorrhage": 1, "Thyroxine free": 1, "Treponema test": 1, "Tri-iodothyronine": 1, "Ultrasound Doppler": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5110", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 5, "SARS-CoV-2 test": 3, "Body temperature": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Pyrexia": 2, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Antinuclear antibody": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "COVID-19": 1, "CSF test": 1, "Central nervous system lesion": 1, "Chills": 1, "Depression": 1, "Diarrhoea haemorrhagic": 1, "Drug ineffective": 1, "Electrophoresis protein": 1, "Feeling of despair": 1, "Gamma-glutamyltransferase": 1, "HIV test": 1, "Haemoglobin": 1, "Headache": 1, "Helplessness": 1, "Hepatitis B": 1, "Hepatitis C": 1, "High density lipoprotein": 1, "Hypoaesthesia": 1, "Illness": 1, "Increased upper airway secretion": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mental disorder": 1, "Migraine": 1, "Nausea": 1, "Neurological examination": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Postmenopausal haemorrhage": 1, "Red blood cell sedimentation rate": 1, "Relapsing-remitting multiple sclerosis": 1, "Respiratory arrest": 1, "Rheumatoid factor": 1, "Self esteem decreased": 1, "Syncope": 1, "Testicular haemorrhage": 1, "Thyroxine free": 1, "Treponema test": 1, "Tri-iodothyronine": 1, "Ultrasound Doppler": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["FF5110"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF8840.json b/docs/data/histograms/Brazil/FF8840.json
index f7e803d81d0..3b705d1af43 100644
--- a/docs/data/histograms/Brazil/FF8840.json
+++ b/docs/data/histograms/Brazil/FF8840.json
@@ -1 +1 @@
-{"batchcode": "FF8840", "histograms": [{"batchcodes": ["FF8840"], "histogram": {"Bell's palsy": 1, "Chest pain": 1, "Erythema": 1, "Eye oedema": 1, "Face oedema": 1, "Fatigue": 1, "Headache": 1, "Memory impairment": 1, "Myocardial infarction": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Somnolence": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8840", "histograms": [{"histogram": {"Bell's palsy": 1, "Chest pain": 1, "Erythema": 1, "Eye oedema": 1, "Face oedema": 1, "Fatigue": 1, "Headache": 1, "Memory impairment": 1, "Myocardial infarction": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Somnolence": 1, "Swelling": 1}, "batchcodes": ["FF8840"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF8842.json b/docs/data/histograms/Brazil/FF8842.json
index 3a681b1eb09..67eedfff0d3 100644
--- a/docs/data/histograms/Brazil/FF8842.json
+++ b/docs/data/histograms/Brazil/FF8842.json
@@ -1 +1 @@
-{"batchcode": "FF8842", "histograms": [{"batchcodes": ["FF8842"], "histogram": {"Asthenia": 2, "Feeling abnormal": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Allergy test": 1, "Angina pectoris": 1, "Anxiety": 1, "Arrhythmia": 1, "Biopsy": 1, "Blood pressure abnormal": 1, "Depression": 1, "Dermatitis allergic": 1, "Dry skin": 1, "Emotional distress": 1, "Erectile dysfunction": 1, "Erythema": 1, "Fatigue": 1, "Feeling of despair": 1, "Gait disturbance": 1, "Headache": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Intracranial pressure increased": 1, "Investigation": 1, "Lethargy": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Muscular weakness": 1, "Off label use": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Premature ejaculation": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sexual dysfunction": 1, "Skin disorder": 1, "Skin mass": 1, "Tension": 1, "Vitamin D": 1, "Vitamin D decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8842", "histograms": [{"histogram": {"Asthenia": 2, "Feeling abnormal": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Allergy test": 1, "Angina pectoris": 1, "Anxiety": 1, "Arrhythmia": 1, "Biopsy": 1, "Blood pressure abnormal": 1, "Depression": 1, "Dermatitis allergic": 1, "Dry skin": 1, "Emotional distress": 1, "Erectile dysfunction": 1, "Erythema": 1, "Fatigue": 1, "Feeling of despair": 1, "Gait disturbance": 1, "Headache": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Intracranial pressure increased": 1, "Investigation": 1, "Lethargy": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Muscular weakness": 1, "Off label use": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Premature ejaculation": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sexual dysfunction": 1, "Skin disorder": 1, "Skin mass": 1, "Tension": 1, "Vitamin D": 1, "Vitamin D decreased": 1}, "batchcodes": ["FF8842"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF8844.json b/docs/data/histograms/Brazil/FF8844.json
index ae020fd2fa8..d1be7505c15 100644
--- a/docs/data/histograms/Brazil/FF8844.json
+++ b/docs/data/histograms/Brazil/FF8844.json
@@ -1 +1 @@
-{"batchcode": "FF8844", "histograms": [{"batchcodes": ["FF8844"], "histogram": {"SARS-CoV-2 test": 5, "Headache": 4, "Interchange of vaccine products": 4, "Off label use": 4, "Chest pain": 3, "Fatigue": 3, "Inappropriate schedule of product administration": 3, "Pyrexia": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Drug ineffective": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Pain": 2, "Pain in extremity": 2, "Pericarditis": 2, "Somnolence": 2, "Stomatitis": 2, "Tonsillitis": 2, "Ultrasound scan": 2, "Urine analysis": 2, "Abdominal discomfort": 1, "Ageusia": 1, "Alcohol test": 1, "Alopecia": 1, "Anosmia": 1, "Aphthous ulcer": 1, "Audiogram": 1, "Bacterial diarrhoea": 1, "Blood pressure increased": 1, "Blood test": 1, "Blood urine present": 1, "Bronchospasm": 1, "C-reactive protein": 1, "CSF test": 1, "Central nervous system lesion": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Cough": 1, "Cyanosis": 1, "Deafness": 1, "Decreased appetite": 1, "Decreased immune responsiveness": 1, "Depressed level of consciousness": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dilatation ventricular": 1, "Discomfort": 1, "Dyshidrotic eczema": 1, "Dyspnoea": 1, "Eating disorder": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Electroencephalogram abnormal": 1, "Encephalitis": 1, "Encephalopathy": 1, "Erythema": 1, "Fall": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypothermia": 1, "Imaging procedure": 1, "Immune thrombocytopenia": 1, "Infection": 1, "Inflammation": 1, "Investigation": 1, "Irritability": 1, "Joint swelling": 1, "Limb discomfort": 1, "Liver function test": 1, "Localised infection": 1, "Lumbar puncture": 1, "Maternal exposure timing unspecified": 1, "Myelitis": 1, "Myocarditis": 1, "Neurological symptom": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Panniculitis": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Postpartum haemorrhage": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Seizure": 1, "Skin plaque": 1, "Stool analysis": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Tinnitus": 1, "Toxicologic test": 1, "Urinary tract infection": 1, "Urticaria": 1, "Uterine haematoma": 1, "Vaccination site haematoma": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual impairment": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8844", "histograms": [{"histogram": {"SARS-CoV-2 test": 5, "Headache": 4, "Interchange of vaccine products": 4, "Off label use": 4, "Chest pain": 3, "Fatigue": 3, "Inappropriate schedule of product administration": 3, "Pyrexia": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Drug ineffective": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Pain": 2, "Pain in extremity": 2, "Pericarditis": 2, "Somnolence": 2, "Stomatitis": 2, "Tonsillitis": 2, "Ultrasound scan": 2, "Urine analysis": 2, "Abdominal discomfort": 1, "Ageusia": 1, "Alcohol test": 1, "Alopecia": 1, "Anosmia": 1, "Aphthous ulcer": 1, "Audiogram": 1, "Bacterial diarrhoea": 1, "Blood pressure increased": 1, "Blood test": 1, "Blood urine present": 1, "Bronchospasm": 1, "C-reactive protein": 1, "CSF test": 1, "Central nervous system lesion": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Cough": 1, "Cyanosis": 1, "Deafness": 1, "Decreased appetite": 1, "Decreased immune responsiveness": 1, "Depressed level of consciousness": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dilatation ventricular": 1, "Discomfort": 1, "Dyshidrotic eczema": 1, "Dyspnoea": 1, "Eating disorder": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Electroencephalogram abnormal": 1, "Encephalitis": 1, "Encephalopathy": 1, "Erythema": 1, "Fall": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypothermia": 1, "Imaging procedure": 1, "Immune thrombocytopenia": 1, "Infection": 1, "Inflammation": 1, "Investigation": 1, "Irritability": 1, "Joint swelling": 1, "Limb discomfort": 1, "Liver function test": 1, "Localised infection": 1, "Lumbar puncture": 1, "Maternal exposure timing unspecified": 1, "Myelitis": 1, "Myocarditis": 1, "Neurological symptom": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Panniculitis": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Postpartum haemorrhage": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Seizure": 1, "Skin plaque": 1, "Stool analysis": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Tinnitus": 1, "Toxicologic test": 1, "Urinary tract infection": 1, "Urticaria": 1, "Uterine haematoma": 1, "Vaccination site haematoma": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual impairment": 1, "X-ray": 1}, "batchcodes": ["FF8844"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF8845.json b/docs/data/histograms/Brazil/FF8845.json
index 084d69a58a2..8726573ca13 100644
--- a/docs/data/histograms/Brazil/FF8845.json
+++ b/docs/data/histograms/Brazil/FF8845.json
@@ -1 +1 @@
-{"batchcode": "FF8845", "histograms": [{"batchcodes": ["FF8845"], "histogram": {"Inappropriate schedule of product administration": 7, "Investigation": 4, "SARS-CoV-2 test": 4, "Headache": 3, "Off label use": 3, "Pain": 3, "Paraesthesia": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Chills": 2, "Computerised tomogram": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Fatigue": 2, "Heart rate": 2, "Interchange of vaccine products": 2, "Nausea": 2, "Pain in extremity": 2, "Platelet count": 2, "Pyrexia": 2, "Acute respiratory distress syndrome": 1, "Angiogram": 1, "Anorectal disorder": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthritis": 1, "Asthenia": 1, "Back pain": 1, "Band neutrophil count": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood potassium increased": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Body temperature": 1, "Body temperature fluctuation": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "Breast swelling": 1, "Breath sounds": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Crying": 1, "Deafness": 1, "Dermatitis allergic": 1, "Dizziness": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Embolism venous": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gastritis": 1, "Haematemesis": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypothermia": 1, "Immunisation": 1, "Impaired healing": 1, "Laboratory test": 1, "Lipase": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Monocyte count": 1, "Muscle spasms": 1, "Myalgia": 1, "Myelocyte count": 1, "Myocarditis": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Paralysis": 1, "Peripheral artery thrombosis": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Pruritus": 1, "Purpura": 1, "Rash": 1, "Rash papular": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Sigmoidoscopy": 1, "Tachycardia": 1, "Thrombocytopenic purpura": 1, "Tinnitus": 1, "Ultrasound Doppler": 1, "Ventricular arrhythmia": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8845", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 7, "Investigation": 4, "SARS-CoV-2 test": 4, "Headache": 3, "Off label use": 3, "Pain": 3, "Paraesthesia": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Chills": 2, "Computerised tomogram": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Fatigue": 2, "Heart rate": 2, "Interchange of vaccine products": 2, "Nausea": 2, "Pain in extremity": 2, "Platelet count": 2, "Pyrexia": 2, "Acute respiratory distress syndrome": 1, "Angiogram": 1, "Anorectal disorder": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthritis": 1, "Asthenia": 1, "Back pain": 1, "Band neutrophil count": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood potassium increased": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Body temperature": 1, "Body temperature fluctuation": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "Breast swelling": 1, "Breath sounds": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Crying": 1, "Deafness": 1, "Dermatitis allergic": 1, "Dizziness": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Embolism venous": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gastritis": 1, "Haematemesis": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypothermia": 1, "Immunisation": 1, "Impaired healing": 1, "Laboratory test": 1, "Lipase": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Monocyte count": 1, "Muscle spasms": 1, "Myalgia": 1, "Myelocyte count": 1, "Myocarditis": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Paralysis": 1, "Peripheral artery thrombosis": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Pruritus": 1, "Purpura": 1, "Rash": 1, "Rash papular": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Sigmoidoscopy": 1, "Tachycardia": 1, "Thrombocytopenic purpura": 1, "Tinnitus": 1, "Ultrasound Doppler": 1, "Ventricular arrhythmia": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["FF8845"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF8846.json b/docs/data/histograms/Brazil/FF8846.json
index ee98f0a5408..d09e1cdff20 100644
--- a/docs/data/histograms/Brazil/FF8846.json
+++ b/docs/data/histograms/Brazil/FF8846.json
@@ -1 +1 @@
-{"batchcode": "FF8846", "histograms": [{"batchcodes": ["FF8846"], "histogram": {"Inappropriate schedule of product administration": 5, "Fatigue": 3, "Pyrexia": 3, "Arthralgia": 2, "Blood test": 2, "Dyspnoea": 2, "Headache": 2, "Nausea": 2, "Off label use": 2, "Pericarditis": 2, "SARS-CoV-2 test": 2, "Urticaria": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Allergy test": 1, "Alopecia": 1, "Angioedema": 1, "Apathy": 1, "Arrhythmia": 1, "Autoimmune thyroiditis": 1, "Bradycardia": 1, "Chromaturia": 1, "Circumstance or information capable of leading to medication error": 1, "Discouragement": 1, "Eating disorder": 1, "Endoscopy": 1, "Erythema": 1, "Eye pain": 1, "Feeling of despair": 1, "Full blood count": 1, "Gastritis erosive": 1, "Helicobacter infection": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pruritus": 1, "Skin lesion": 1, "Tachycardia": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vitamin D": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8846", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 5, "Fatigue": 3, "Pyrexia": 3, "Arthralgia": 2, "Blood test": 2, "Dyspnoea": 2, "Headache": 2, "Nausea": 2, "Off label use": 2, "Pericarditis": 2, "SARS-CoV-2 test": 2, "Urticaria": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Allergy test": 1, "Alopecia": 1, "Angioedema": 1, "Apathy": 1, "Arrhythmia": 1, "Autoimmune thyroiditis": 1, "Bradycardia": 1, "Chromaturia": 1, "Circumstance or information capable of leading to medication error": 1, "Discouragement": 1, "Eating disorder": 1, "Endoscopy": 1, "Erythema": 1, "Eye pain": 1, "Feeling of despair": 1, "Full blood count": 1, "Gastritis erosive": 1, "Helicobacter infection": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pruritus": 1, "Skin lesion": 1, "Tachycardia": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vitamin D": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["FF8846"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FF8848.json b/docs/data/histograms/Brazil/FF8848.json
index 352a84b0df6..29a0cc7ca90 100644
--- a/docs/data/histograms/Brazil/FF8848.json
+++ b/docs/data/histograms/Brazil/FF8848.json
@@ -1 +1 @@
-{"batchcode": "FF8848", "histograms": [{"batchcodes": ["FF8848"], "histogram": {"Off label use": 5, "Immunisation": 4, "Interchange of vaccine products": 4, "Headache": 3, "Blood pressure measurement": 2, "Inappropriate schedule of product administration": 2, "Investigation": 2, "Pain in extremity": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Alopecia": 1, "Apathy": 1, "Bell's palsy": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Cataract": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Diplopia": 1, "Drug ineffective": 1, "Ear pain": 1, "Echocardiogram": 1, "Erythema": 1, "Eyelid disorder": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Flatulence": 1, "Hordeolum": 1, "Hunger": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Influenza": 1, "Influenza like illness": 1, "Insomnia": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Malaise": 1, "Myasthenia gravis": 1, "Near death experience": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sinusitis": 1, "Specialist consultation": 1, "Thrombosis": 1, "Visual field defect": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8848", "histograms": [{"histogram": {"Off label use": 5, "Immunisation": 4, "Interchange of vaccine products": 4, "Headache": 3, "Blood pressure measurement": 2, "Inappropriate schedule of product administration": 2, "Investigation": 2, "Pain in extremity": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Alopecia": 1, "Apathy": 1, "Bell's palsy": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Cataract": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Diplopia": 1, "Drug ineffective": 1, "Ear pain": 1, "Echocardiogram": 1, "Erythema": 1, "Eyelid disorder": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Flatulence": 1, "Hordeolum": 1, "Hunger": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Influenza": 1, "Influenza like illness": 1, "Insomnia": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Malaise": 1, "Myasthenia gravis": 1, "Near death experience": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sinusitis": 1, "Specialist consultation": 1, "Thrombosis": 1, "Visual field defect": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["FF8848"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG 3533.json b/docs/data/histograms/Brazil/FG 3533.json
index 00e0c1e9b48..c36f924406f 100644
--- a/docs/data/histograms/Brazil/FG 3533.json
+++ b/docs/data/histograms/Brazil/FG 3533.json
@@ -1 +1 @@
-{"batchcode": "FG 3533", "histograms": [{"batchcodes": ["FG 3533"], "histogram": {"Dry skin": 1, "Erythema": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Pruritus": 1, "Rash macular": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FG 3533", "histograms": [{"histogram": {"Dry skin": 1, "Erythema": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Pruritus": 1, "Rash macular": 1, "Swelling": 1}, "batchcodes": ["FG 3533"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3520.json b/docs/data/histograms/Brazil/FG3520.json
index b8b6d196fa7..17838c8986a 100644
--- a/docs/data/histograms/Brazil/FG3520.json
+++ b/docs/data/histograms/Brazil/FG3520.json
@@ -1 +1 @@
-{"batchcode": "FG3520", "histograms": [{"batchcodes": ["FG3520"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3520", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FG3520"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3524.json b/docs/data/histograms/Brazil/FG3524.json
index c693c31c145..579ecf99bcc 100644
--- a/docs/data/histograms/Brazil/FG3524.json
+++ b/docs/data/histograms/Brazil/FG3524.json
@@ -1 +1 @@
-{"batchcode": "FG3524", "histograms": [{"batchcodes": ["FG3524"], "histogram": {"Inappropriate schedule of product administration": 3, "Axillary mass": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Blood test": 1, "Breast mass": 1, "Breast pain": 1, "Cyanosis": 1, "Disease recurrence": 1, "Epididymitis": 1, "Headache": 1, "Hypertensive crisis": 1, "Meningeal disorder": 1, "Orchitis": 1, "Pain": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3524", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 3, "Axillary mass": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Blood test": 1, "Breast mass": 1, "Breast pain": 1, "Cyanosis": 1, "Disease recurrence": 1, "Epididymitis": 1, "Headache": 1, "Hypertensive crisis": 1, "Meningeal disorder": 1, "Orchitis": 1, "Pain": 1, "Swelling": 1}, "batchcodes": ["FG3524"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3525.json b/docs/data/histograms/Brazil/FG3525.json
index b81db098eee..0e08509d59a 100644
--- a/docs/data/histograms/Brazil/FG3525.json
+++ b/docs/data/histograms/Brazil/FG3525.json
@@ -1 +1 @@
-{"batchcode": "FG3525", "histograms": [{"batchcodes": ["FG3525"], "histogram": {"Amaurosis": 1, "Blindness": 1, "Cerebral venous thrombosis": 1, "Computerised tomogram head": 1, "Fluorescence angiogram abnormal": 1, "Idiopathic intracranial hypertension": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging head": 1, "Ophthalmological examination": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3525", "histograms": [{"histogram": {"Amaurosis": 1, "Blindness": 1, "Cerebral venous thrombosis": 1, "Computerised tomogram head": 1, "Fluorescence angiogram abnormal": 1, "Idiopathic intracranial hypertension": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging head": 1, "Ophthalmological examination": 1}, "batchcodes": ["FG3525"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3528.json b/docs/data/histograms/Brazil/FG3528.json
index bb25118f3f2..f7bea4d90e7 100644
--- a/docs/data/histograms/Brazil/FG3528.json
+++ b/docs/data/histograms/Brazil/FG3528.json
@@ -1 +1 @@
-{"batchcode": "FG3528", "histograms": [{"batchcodes": ["FG3528"], "histogram": {"Inappropriate schedule of product administration": 3, "SARS-CoV-2 test": 2, "Anti-aquaporin-4 antibody": 1, "Asthenia": 1, "Asthmatic crisis": 1, "Autoantibody test": 1, "Back pain": 1, "Blood pressure abnormal": 1, "Cough": 1, "Depression": 1, "Dizziness": 1, "Dysuria": 1, "Furuncle": 1, "Headache": 1, "Increased upper airway secretion": 1, "Influenza": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myelitis transverse": 1, "Myelopathy": 1, "Nasal congestion": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraplegia": 1, "Pulmonary embolism": 1, "Sinusitis": 1, "Tremor": 1, "Vasculitis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3528", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 3, "SARS-CoV-2 test": 2, "Anti-aquaporin-4 antibody": 1, "Asthenia": 1, "Asthmatic crisis": 1, "Autoantibody test": 1, "Back pain": 1, "Blood pressure abnormal": 1, "Cough": 1, "Depression": 1, "Dizziness": 1, "Dysuria": 1, "Furuncle": 1, "Headache": 1, "Increased upper airway secretion": 1, "Influenza": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myelitis transverse": 1, "Myelopathy": 1, "Nasal congestion": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraplegia": 1, "Pulmonary embolism": 1, "Sinusitis": 1, "Tremor": 1, "Vasculitis": 1, "Vomiting": 1}, "batchcodes": ["FG3528"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3529.json b/docs/data/histograms/Brazil/FG3529.json
index 22a796ce410..af9eddcbcbf 100644
--- a/docs/data/histograms/Brazil/FG3529.json
+++ b/docs/data/histograms/Brazil/FG3529.json
@@ -1 +1 @@
-{"batchcode": "FG3529", "histograms": [{"batchcodes": ["FG3529"], "histogram": {"Interchange of vaccine products": 3, "Off label use": 3, "Inappropriate schedule of product administration": 2, "Vaccination site pain": 2, "Axillary pain": 1, "Back pain": 1, "Blood test": 1, "Blood test abnormal": 1, "Breast swelling": 1, "Dermatitis atopic": 1, "Dizziness": 1, "Ear pain": 1, "Herpes virus infection": 1, "Immunisation": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pharyngeal inflammation": 1, "Pruritus": 1, "Swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3529", "histograms": [{"histogram": {"Interchange of vaccine products": 3, "Off label use": 3, "Inappropriate schedule of product administration": 2, "Vaccination site pain": 2, "Axillary pain": 1, "Back pain": 1, "Blood test": 1, "Blood test abnormal": 1, "Breast swelling": 1, "Dermatitis atopic": 1, "Dizziness": 1, "Ear pain": 1, "Herpes virus infection": 1, "Immunisation": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pharyngeal inflammation": 1, "Pruritus": 1, "Swelling": 1, "Swelling face": 1}, "batchcodes": ["FG3529"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3530.json b/docs/data/histograms/Brazil/FG3530.json
index 72d5ce696c9..bea9fbf1d3b 100644
--- a/docs/data/histograms/Brazil/FG3530.json
+++ b/docs/data/histograms/Brazil/FG3530.json
@@ -1 +1 @@
-{"batchcode": "FG3530", "histograms": [{"batchcodes": ["FG3530"], "histogram": {"Interchange of vaccine products": 9, "Off label use": 9, "Inappropriate schedule of product administration": 7, "Headache": 5, "Immunisation": 5, "Investigation": 4, "SARS-CoV-2 test": 4, "Blood pressure measurement": 3, "Tinnitus": 3, "Condition aggravated": 2, "Dizziness": 2, "Malaise": 2, "Nausea": 2, "Pallor": 2, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Alopecia": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Audiogram": 1, "Biopsy": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Breast cancer": 1, "COVID-19": 1, "Cardio-respiratory arrest": 1, "Cardiogenic shock": 1, "Cerebrovascular accident": 1, "Chromaturia": 1, "Crohn's disease": 1, "Culture throat": 1, "Dermatitis": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling of despair": 1, "Fibrin D dimer": 1, "Hallucination": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Infection": 1, "Insomnia": 1, "Joint swelling": 1, "Laboratory test": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Mouth injury": 1, "Musculoskeletal stiffness": 1, "Neck mass": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Oligomenorrhoea": 1, "Pain": 1, "Pain assessment": 1, "Pneumothorax spontaneous": 1, "Polyarthritis": 1, "Poor quality product administered": 1, "Product colour issue": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Quadriparesis": 1, "Retinal vein occlusion": 1, "Rheumatoid arthritis": 1, "Sensory loss": 1, "Sepsis": 1, "Thrombosis": 1, "Ultrasound scan vagina": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1, "Wheezing": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3530", "histograms": [{"histogram": {"Interchange of vaccine products": 9, "Off label use": 9, "Inappropriate schedule of product administration": 7, "Headache": 5, "Immunisation": 5, "Investigation": 4, "SARS-CoV-2 test": 4, "Blood pressure measurement": 3, "Tinnitus": 3, "Condition aggravated": 2, "Dizziness": 2, "Malaise": 2, "Nausea": 2, "Pallor": 2, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Alopecia": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Audiogram": 1, "Biopsy": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Breast cancer": 1, "COVID-19": 1, "Cardio-respiratory arrest": 1, "Cardiogenic shock": 1, "Cerebrovascular accident": 1, "Chromaturia": 1, "Crohn's disease": 1, "Culture throat": 1, "Dermatitis": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling of despair": 1, "Fibrin D dimer": 1, "Hallucination": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Infection": 1, "Insomnia": 1, "Joint swelling": 1, "Laboratory test": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Mouth injury": 1, "Musculoskeletal stiffness": 1, "Neck mass": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Oligomenorrhoea": 1, "Pain": 1, "Pain assessment": 1, "Pneumothorax spontaneous": 1, "Polyarthritis": 1, "Poor quality product administered": 1, "Product colour issue": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Quadriparesis": 1, "Retinal vein occlusion": 1, "Rheumatoid arthritis": 1, "Sensory loss": 1, "Sepsis": 1, "Thrombosis": 1, "Ultrasound scan vagina": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1, "Wheezing": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["FG3530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3531.json b/docs/data/histograms/Brazil/FG3531.json
index 4d879f6b2e9..ce0fad01e26 100644
--- a/docs/data/histograms/Brazil/FG3531.json
+++ b/docs/data/histograms/Brazil/FG3531.json
@@ -1 +1 @@
-{"batchcode": "FG3531", "histograms": [{"batchcodes": ["FG3531"], "histogram": {"Interchange of vaccine products": 4, "Off label use": 4, "Immunisation": 3, "Nausea": 3, "Pain in extremity": 3, "Chills": 2, "Fatigue": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Malaise": 2, "Pyrexia": 2, "Anaemia": 1, "Angioedema": 1, "Arthralgia": 1, "Basophil count": 1, "Bleeding time": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin M": 1, "Blood insulin": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood thromboplastin": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood urine present": 1, "Burning sensation": 1, "Chest pain": 1, "Chromaturia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysuria": 1, "Electrocardiogram": 1, "Electrophoresis": 1, "Eosinophil count": 1, "Eye pain": 1, "Fall": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "HIV test": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemoglobin": 1, "Head injury": 1, "Hepatic steatosis": 1, "Hepatitis B core antibody negative": 1, "Hepatitis B surface antigen": 1, "Hepatitis C RNA": 1, "High density lipoprotein": 1, "Investigation": 1, "Iron deficiency": 1, "Liver disorder": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Mean platelet volume": 1, "Mean platelet volume increased": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Musculoskeletal chest pain": 1, "Neck pain": 1, "Neuralgia": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Non-high-density lipoprotein cholesterol": 1, "Paraesthesia": 1, "Pericarditis": 1, "Platelet count": 1, "Platelet count decreased": 1, "Plateletcrit decreased": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red cell distribution width increased": 1, "Reticulocyte count": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Serum ferritin decreased": 1, "Syncope": 1, "Thrombocytopenia": 1, "Transaminases": 1, "Troponin": 1, "Troponin abnormal": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin D": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3531", "histograms": [{"histogram": {"Interchange of vaccine products": 4, "Off label use": 4, "Immunisation": 3, "Nausea": 3, "Pain in extremity": 3, "Chills": 2, "Fatigue": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Malaise": 2, "Pyrexia": 2, "Anaemia": 1, "Angioedema": 1, "Arthralgia": 1, "Basophil count": 1, "Bleeding time": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin M": 1, "Blood insulin": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood thromboplastin": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood urine present": 1, "Burning sensation": 1, "Chest pain": 1, "Chromaturia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysuria": 1, "Electrocardiogram": 1, "Electrophoresis": 1, "Eosinophil count": 1, "Eye pain": 1, "Fall": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "HIV test": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemoglobin": 1, "Head injury": 1, "Hepatic steatosis": 1, "Hepatitis B core antibody negative": 1, "Hepatitis B surface antigen": 1, "Hepatitis C RNA": 1, "High density lipoprotein": 1, "Investigation": 1, "Iron deficiency": 1, "Liver disorder": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Mean platelet volume": 1, "Mean platelet volume increased": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Musculoskeletal chest pain": 1, "Neck pain": 1, "Neuralgia": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Non-high-density lipoprotein cholesterol": 1, "Paraesthesia": 1, "Pericarditis": 1, "Platelet count": 1, "Platelet count decreased": 1, "Plateletcrit decreased": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red cell distribution width increased": 1, "Reticulocyte count": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Serum ferritin decreased": 1, "Syncope": 1, "Thrombocytopenia": 1, "Transaminases": 1, "Troponin": 1, "Troponin abnormal": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin D": 1, "White blood cell count": 1}, "batchcodes": ["FG3531"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3533.json b/docs/data/histograms/Brazil/FG3533.json
index 703af25cb80..63f95ac3453 100644
--- a/docs/data/histograms/Brazil/FG3533.json
+++ b/docs/data/histograms/Brazil/FG3533.json
@@ -1 +1 @@
-{"batchcode": "FG3533", "histograms": [{"batchcodes": ["FG3533"], "histogram": {"Inappropriate schedule of product administration": 5, "Immunisation": 2, "Interchange of vaccine products": 2, "Investigation": 2, "Off label use": 2, "Paraesthesia": 2, "Pruritus": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Acute myocardial infarction": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alopecia": 1, "Angioedema": 1, "Anosmia": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Bacterial test": 1, "Balanitis candida": 1, "Basophil count": 1, "Blood cholesterol": 1, "Blood creatine": 1, "Blood glucose": 1, "Blood ketone body": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Condition aggravated": 1, "Cough": 1, "Critical illness": 1, "Discomfort": 1, "Drug ineffective": 1, "Drug intolerance": 1, "Dysphonia": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Eye pruritus": 1, "Facial paralysis": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head discomfort": 1, "Head titubation": 1, "High density lipoprotein": 1, "Hyperaemia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Immunodeficiency": 1, "Impaired driving ability": 1, "Insomnia": 1, "Lethargy": 1, "Limb injury": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mental status changes": 1, "Mobility decreased": 1, "Monocyte count": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Paresis": 1, "Platelet count": 1, "Protein urine": 1, "Quality of life decreased": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Skin irritation": 1, "Swelling": 1, "Swollen tongue": 1, "Syncope": 1, "Tachycardia": 1, "Tonsillitis": 1, "Urinary sediment present": 1, "Urobilinogen urine": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin C": 1, "Vitamin D": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3533", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 5, "Immunisation": 2, "Interchange of vaccine products": 2, "Investigation": 2, "Off label use": 2, "Paraesthesia": 2, "Pruritus": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Acute myocardial infarction": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alopecia": 1, "Angioedema": 1, "Anosmia": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Bacterial test": 1, "Balanitis candida": 1, "Basophil count": 1, "Blood cholesterol": 1, "Blood creatine": 1, "Blood glucose": 1, "Blood ketone body": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Condition aggravated": 1, "Cough": 1, "Critical illness": 1, "Discomfort": 1, "Drug ineffective": 1, "Drug intolerance": 1, "Dysphonia": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Eye pruritus": 1, "Facial paralysis": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head discomfort": 1, "Head titubation": 1, "High density lipoprotein": 1, "Hyperaemia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Immunodeficiency": 1, "Impaired driving ability": 1, "Insomnia": 1, "Lethargy": 1, "Limb injury": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mental status changes": 1, "Mobility decreased": 1, "Monocyte count": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Paresis": 1, "Platelet count": 1, "Protein urine": 1, "Quality of life decreased": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Skin irritation": 1, "Swelling": 1, "Swollen tongue": 1, "Syncope": 1, "Tachycardia": 1, "Tonsillitis": 1, "Urinary sediment present": 1, "Urobilinogen urine": 1, "Very low density lipoprotein": 1, "Vitamin B12": 1, "Vitamin C": 1, "Vitamin D": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH urine": 1}, "batchcodes": ["FG3533"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3535.json b/docs/data/histograms/Brazil/FG3535.json
index d70bef09dfb..a21ee82b049 100644
--- a/docs/data/histograms/Brazil/FG3535.json
+++ b/docs/data/histograms/Brazil/FG3535.json
@@ -1 +1 @@
-{"batchcode": "FG3535", "histograms": [{"batchcodes": ["FG3535"], "histogram": {"Immunisation": 3, "Condition aggravated": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Pain": 2, "Pyrexia": 2, "Alopecia": 1, "Asthenia": 1, "Bedridden": 1, "Chills": 1, "Depression": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Feeling of despair": 1, "Inflammation": 1, "Investigation": 1, "Lung disorder": 1, "Malaise": 1, "Mastitis bacterial": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Suicidal ideation": 1, "Swelling face": 1, "Tachycardia": 1, "Transient ischaemic attack": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3535", "histograms": [{"histogram": {"Immunisation": 3, "Condition aggravated": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Pain": 2, "Pyrexia": 2, "Alopecia": 1, "Asthenia": 1, "Bedridden": 1, "Chills": 1, "Depression": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Feeling of despair": 1, "Inflammation": 1, "Investigation": 1, "Lung disorder": 1, "Malaise": 1, "Mastitis bacterial": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Suicidal ideation": 1, "Swelling face": 1, "Tachycardia": 1, "Transient ischaemic attack": 1, "Urticaria": 1}, "batchcodes": ["FG3535"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3539.json b/docs/data/histograms/Brazil/FG3539.json
index ed25e293e45..d77d17e6f47 100644
--- a/docs/data/histograms/Brazil/FG3539.json
+++ b/docs/data/histograms/Brazil/FG3539.json
@@ -1 +1 @@
-{"batchcode": "FG3539", "histograms": [{"batchcodes": ["FG3539"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3539", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["FG3539"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FG3933.json b/docs/data/histograms/Brazil/FG3933.json
index 24fdd45267c..862940c7c19 100644
--- a/docs/data/histograms/Brazil/FG3933.json
+++ b/docs/data/histograms/Brazil/FG3933.json
@@ -1 +1 @@
-{"batchcode": "FG3933", "histograms": [{"batchcodes": ["FG3933"], "histogram": {"Inappropriate schedule of product administration": 1, "Nephrotic syndrome": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3933", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Nephrotic syndrome": 1, "Polymerase chain reaction": 1}, "batchcodes": ["FG3933"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH 8025.json b/docs/data/histograms/Brazil/FH 8025.json
index 97bba6d08e4..8eb9dded7a0 100644
--- a/docs/data/histograms/Brazil/FH 8025.json
+++ b/docs/data/histograms/Brazil/FH 8025.json
@@ -1 +1 @@
-{"batchcode": "FH 8025", "histograms": [{"batchcodes": ["FH 8025"], "histogram": {"Body temperature": 1, "Chest pain": 1, "Exertional headache": 1, "Inappropriate schedule of product administration": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FH 8025", "histograms": [{"histogram": {"Body temperature": 1, "Chest pain": 1, "Exertional headache": 1, "Inappropriate schedule of product administration": 1, "Pyrexia": 1}, "batchcodes": ["FH 8025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH2965.json b/docs/data/histograms/Brazil/FH2965.json
index 110fd073bb6..845d69ca4d3 100644
--- a/docs/data/histograms/Brazil/FH2965.json
+++ b/docs/data/histograms/Brazil/FH2965.json
@@ -1 +1 @@
-{"batchcode": "FH2965", "histograms": [{"batchcodes": ["FH2965"], "histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Malaise": 1, "Pain": 1, "Pollakiuria": 1, "Pulmonary oedema": 1, "Renal disorder": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Swelling": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FH2965", "histograms": [{"histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Malaise": 1, "Pain": 1, "Pollakiuria": 1, "Pulmonary oedema": 1, "Renal disorder": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Swelling": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["FH2965"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH4750.json b/docs/data/histograms/Brazil/FH4750.json
index 3a04615ea21..8d155a8b320 100644
--- a/docs/data/histograms/Brazil/FH4750.json
+++ b/docs/data/histograms/Brazil/FH4750.json
@@ -1 +1 @@
-{"batchcode": "FH4750", "histograms": [{"batchcodes": ["FH4750"], "histogram": {"Arrhythmia": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "FH4750", "histograms": [{"histogram": {"Arrhythmia": 1, "Dizziness": 1}, "batchcodes": ["FH4750"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH4751.json b/docs/data/histograms/Brazil/FH4751.json
index ccafdb2b604..1aa1bfe00d2 100644
--- a/docs/data/histograms/Brazil/FH4751.json
+++ b/docs/data/histograms/Brazil/FH4751.json
@@ -1 +1 @@
-{"batchcode": "FH4751", "histograms": [{"batchcodes": ["FH4751"], "histogram": {"Condition aggravated": 1, "Dysphagia": 1, "Guillain-Barre syndrome": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Mastication disorder": 1, "Muscle atrophy": 1, "Off label use": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FH4751", "histograms": [{"histogram": {"Condition aggravated": 1, "Dysphagia": 1, "Guillain-Barre syndrome": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Mastication disorder": 1, "Muscle atrophy": 1, "Off label use": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Weight decreased": 1}, "batchcodes": ["FH4751"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH8023.json b/docs/data/histograms/Brazil/FH8023.json
index 11471713b99..b8e6620dc54 100644
--- a/docs/data/histograms/Brazil/FH8023.json
+++ b/docs/data/histograms/Brazil/FH8023.json
@@ -1 +1 @@
-{"batchcode": "FH8023", "histograms": [{"batchcodes": ["FH8023"], "histogram": {"Headache": 2, "Inappropriate schedule of product administration": 2, "Off label use": 2, "Pain": 2, "Ageusia": 1, "Allergic reaction to excipient": 1, "Arthralgia": 1, "Asthenia": 1, "Bedridden": 1, "Blood immunoglobulin G": 1, "Blood test": 1, "COVID-19": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Full blood count": 1, "Fungal infection": 1, "Interchange of vaccine products": 1, "Lung disorder": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Polymerase chain reaction": 1, "Product use issue": 1, "Pruritus": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test": 1, "Secretion discharge": 1, "Skin reaction": 1, "Thrombosis": 1, "Toxicity to various agents": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8023", "histograms": [{"histogram": {"Headache": 2, "Inappropriate schedule of product administration": 2, "Off label use": 2, "Pain": 2, "Ageusia": 1, "Allergic reaction to excipient": 1, "Arthralgia": 1, "Asthenia": 1, "Bedridden": 1, "Blood immunoglobulin G": 1, "Blood test": 1, "COVID-19": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Full blood count": 1, "Fungal infection": 1, "Interchange of vaccine products": 1, "Lung disorder": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Polymerase chain reaction": 1, "Product use issue": 1, "Pruritus": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test": 1, "Secretion discharge": 1, "Skin reaction": 1, "Thrombosis": 1, "Toxicity to various agents": 1, "White blood cell count decreased": 1}, "batchcodes": ["FH8023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH8025.json b/docs/data/histograms/Brazil/FH8025.json
index addb3b24fbc..c896c1ed16b 100644
--- a/docs/data/histograms/Brazil/FH8025.json
+++ b/docs/data/histograms/Brazil/FH8025.json
@@ -1 +1 @@
-{"batchcode": "FH8025", "histograms": [{"batchcodes": ["FH8025"], "histogram": {"SARS-CoV-2 test": 3, "Hypersensitivity": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pyrexia": 2, "Alopecia": 1, "Autoimmune disorder": 1, "Bedridden": 1, "Biopsy": 1, "COVID-19": 1, "Condition aggravated": 1, "Cough": 1, "Drug ineffective": 1, "Influenza": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint warmth": 1, "Myalgia": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Parapsoriasis": 1, "Pharyngeal abscess": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "Somnolence": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8025", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "Hypersensitivity": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pyrexia": 2, "Alopecia": 1, "Autoimmune disorder": 1, "Bedridden": 1, "Biopsy": 1, "COVID-19": 1, "Condition aggravated": 1, "Cough": 1, "Drug ineffective": 1, "Influenza": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint warmth": 1, "Myalgia": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Parapsoriasis": 1, "Pharyngeal abscess": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "Somnolence": 1, "Vaccination site pain": 1}, "batchcodes": ["FH8025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH8026.json b/docs/data/histograms/Brazil/FH8026.json
index 93c9169a469..ca1c7a7584c 100644
--- a/docs/data/histograms/Brazil/FH8026.json
+++ b/docs/data/histograms/Brazil/FH8026.json
@@ -1 +1 @@
-{"batchcode": "FH8026", "histograms": [{"batchcodes": ["FH8026"], "histogram": {"Interchange of vaccine products": 3, "Off label use": 3, "Biopsy": 2, "Immunisation": 2, "SARS-CoV-2 test": 2, "Abdominal distension": 1, "Alopecia": 1, "Autoimmune thyroiditis": 1, "Blister": 1, "Cardiolipin antibody": 1, "Chikungunya virus infection": 1, "Cytomegalovirus test": 1, "Dengue fever": 1, "Disease recurrence": 1, "Dyspnoea": 1, "Electroneuromyography": 1, "Fatigue": 1, "Flavivirus test": 1, "Guillain-Barre syndrome": 1, "Herpes simplex": 1, "Herpes zoster": 1, "Humerus fracture": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Lumbar puncture abnormal": 1, "Menstruation irregular": 1, "Oedema peripheral": 1, "Pruritus": 1, "Rash macular": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8026", "histograms": [{"histogram": {"Interchange of vaccine products": 3, "Off label use": 3, "Biopsy": 2, "Immunisation": 2, "SARS-CoV-2 test": 2, "Abdominal distension": 1, "Alopecia": 1, "Autoimmune thyroiditis": 1, "Blister": 1, "Cardiolipin antibody": 1, "Chikungunya virus infection": 1, "Cytomegalovirus test": 1, "Dengue fever": 1, "Disease recurrence": 1, "Dyspnoea": 1, "Electroneuromyography": 1, "Fatigue": 1, "Flavivirus test": 1, "Guillain-Barre syndrome": 1, "Herpes simplex": 1, "Herpes zoster": 1, "Humerus fracture": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Lumbar puncture abnormal": 1, "Menstruation irregular": 1, "Oedema peripheral": 1, "Pruritus": 1, "Rash macular": 1, "Seizure": 1}, "batchcodes": ["FH8026"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FH9026.json b/docs/data/histograms/Brazil/FH9026.json
index 83ad3579b1f..210d43adcb3 100644
--- a/docs/data/histograms/Brazil/FH9026.json
+++ b/docs/data/histograms/Brazil/FH9026.json
@@ -1 +1 @@
-{"batchcode": "FH9026", "histograms": [{"batchcodes": ["FH9026"], "histogram": {"Allergy to vaccine": 1, "Anxiety": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FH9026", "histograms": [{"histogram": {"Allergy to vaccine": 1, "Anxiety": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Rash": 1}, "batchcodes": ["FH9026"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FJ2592.json b/docs/data/histograms/Brazil/FJ2592.json
index 516ed18c9e5..8d859164cf6 100644
--- a/docs/data/histograms/Brazil/FJ2592.json
+++ b/docs/data/histograms/Brazil/FJ2592.json
@@ -1 +1 @@
-{"batchcode": "FJ2592", "histograms": [{"batchcodes": ["FJ2592"], "histogram": {"Alopecia": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ2592", "histograms": [{"histogram": {"Alopecia": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["FJ2592"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FJ2594.json b/docs/data/histograms/Brazil/FJ2594.json
index 2171091f44c..b74b84e2d1d 100644
--- a/docs/data/histograms/Brazil/FJ2594.json
+++ b/docs/data/histograms/Brazil/FJ2594.json
@@ -1 +1 @@
-{"batchcode": "FJ2594", "histograms": [{"batchcodes": ["FJ2594"], "histogram": {"Inappropriate schedule of product administration": 2, "Abscess": 1, "Blood glucose": 1, "Furuncle": 1, "Glucose urine": 1, "Investigation": 1, "Type 1 diabetes mellitus": 1, "Urine ketone body present": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ2594", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Abscess": 1, "Blood glucose": 1, "Furuncle": 1, "Glucose urine": 1, "Investigation": 1, "Type 1 diabetes mellitus": 1, "Urine ketone body present": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["FJ2594"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FJ4184.json b/docs/data/histograms/Brazil/FJ4184.json
index aad04e7675d..db1663b2715 100644
--- a/docs/data/histograms/Brazil/FJ4184.json
+++ b/docs/data/histograms/Brazil/FJ4184.json
@@ -1 +1 @@
-{"batchcode": "FJ4184", "histograms": [{"batchcodes": ["FJ4184"], "histogram": {"Interchange of vaccine products": 2, "Off label use": 2, "Bell's palsy": 1, "Fall": 1, "Immunisation": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ4184", "histograms": [{"histogram": {"Interchange of vaccine products": 2, "Off label use": 2, "Bell's palsy": 1, "Fall": 1, "Immunisation": 1}, "batchcodes": ["FJ4184"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FJ4187.json b/docs/data/histograms/Brazil/FJ4187.json
index 4bbc0408725..7823d9d1f76 100644
--- a/docs/data/histograms/Brazil/FJ4187.json
+++ b/docs/data/histograms/Brazil/FJ4187.json
@@ -1 +1 @@
-{"batchcode": "FJ4187", "histograms": [{"batchcodes": ["210A21A", "FJ4187"], "histogram": {"Influenza A virus test": 1, "Influenza B virus test": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["FJ4187"], "histogram": {"Headache": 5, "Interchange of vaccine products": 4, "Off label use": 4, "Pyrexia": 4, "Arthralgia": 3, "Immunisation": 3, "Pain": 3, "Blood test": 2, "Drug ineffective": 2, "Electrocardiogram": 2, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Insomnia": 2, "Investigation": 2, "Limb discomfort": 2, "Loss of personal independence in daily activities": 2, "Malaise": 2, "Oropharyngeal pain": 2, "Vaccination site pain": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Angina pectoris": 1, "Anxiety": 1, "Apnoea": 1, "Back pain": 1, "Bedridden": 1, "Bladder pain": 1, "Body temperature": 1, "Bone pain": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Depressed mood": 1, "Dermatitis allergic": 1, "Dry throat": 1, "Dyspnoea": 1, "Ear pain": 1, "Erysipelas": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Furuncle": 1, "Haematuria": 1, "Histamine level": 1, "Histamine level increased": 1, "Hypertension": 1, "Illness": 1, "Immune system disorder": 1, "Inflammation": 1, "Joint swelling": 1, "Localised oedema": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging neck": 1, "Magnetic resonance imaging spinal": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Nausea": 1, "Nervous system disorder": 1, "Neuropathic muscular atrophy": 1, "Oral candidiasis": 1, "Pain in extremity": 1, "Pharyngitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Skin infection": 1, "Skin lesion": 1, "Somnolence": 1, "Suffocation feeling": 1, "Suspected COVID-19": 1, "Sweating fever": 1, "Swelling": 1, "Swelling face": 1, "Ultrasound Doppler": 1, "Urinary tract infection": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1, "Vascular test": 1, "Vulvovaginal candidiasis": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ4187", "histograms": [{"histogram": {"Influenza A virus test": 1, "Influenza B virus test": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["210A21A", "FJ4187"]}, {"histogram": {"Headache": 5, "Interchange of vaccine products": 4, "Off label use": 4, "Pyrexia": 4, "Arthralgia": 3, "Immunisation": 3, "Pain": 3, "Blood test": 2, "Drug ineffective": 2, "Electrocardiogram": 2, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Insomnia": 2, "Investigation": 2, "Limb discomfort": 2, "Loss of personal independence in daily activities": 2, "Malaise": 2, "Oropharyngeal pain": 2, "Vaccination site pain": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Angina pectoris": 1, "Anxiety": 1, "Apnoea": 1, "Back pain": 1, "Bedridden": 1, "Bladder pain": 1, "Body temperature": 1, "Bone pain": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Depressed mood": 1, "Dermatitis allergic": 1, "Dry throat": 1, "Dyspnoea": 1, "Ear pain": 1, "Erysipelas": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Furuncle": 1, "Haematuria": 1, "Histamine level": 1, "Histamine level increased": 1, "Hypertension": 1, "Illness": 1, "Immune system disorder": 1, "Inflammation": 1, "Joint swelling": 1, "Localised oedema": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging neck": 1, "Magnetic resonance imaging spinal": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Nausea": 1, "Nervous system disorder": 1, "Neuropathic muscular atrophy": 1, "Oral candidiasis": 1, "Pain in extremity": 1, "Pharyngitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Skin infection": 1, "Skin lesion": 1, "Somnolence": 1, "Suffocation feeling": 1, "Suspected COVID-19": 1, "Sweating fever": 1, "Swelling": 1, "Swelling face": 1, "Ultrasound Doppler": 1, "Urinary tract infection": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1, "Vascular test": 1, "Vulvovaginal candidiasis": 1}, "batchcodes": ["FJ4187"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FJ8766.json b/docs/data/histograms/Brazil/FJ8766.json
index ff688af1b62..a0d144e40b6 100644
--- a/docs/data/histograms/Brazil/FJ8766.json
+++ b/docs/data/histograms/Brazil/FJ8766.json
@@ -1 +1 @@
-{"batchcode": "FJ8766", "histograms": [{"batchcodes": ["FJ8766"], "histogram": {"Angiogram": 1, "Cerebrovascular stenosis": 1, "Condition aggravated": 1, "Investigation": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8766", "histograms": [{"histogram": {"Angiogram": 1, "Cerebrovascular stenosis": 1, "Condition aggravated": 1, "Investigation": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FJ8766"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FK0596.json b/docs/data/histograms/Brazil/FK0596.json
index fd912859192..c4df4adda1f 100644
--- a/docs/data/histograms/Brazil/FK0596.json
+++ b/docs/data/histograms/Brazil/FK0596.json
@@ -1 +1 @@
-{"batchcode": "FK0596", "histograms": [{"batchcodes": ["FK0596"], "histogram": {"Autoimmune disorder": 1, "Blood follicle stimulating hormone": 1, "Blood luteinising hormone": 1, "COVID-19": 1, "Drug ineffective": 1, "Dry skin": 1, "Emotional disorder": 1, "Feeling hot": 1, "Hair texture abnormal": 1, "Hormone level abnormal": 1, "Hot flush": 1, "Insomnia": 1, "Investigation": 1, "Malaise": 1, "Menstrual disorder": 1, "Middle insomnia": 1, "Oestradiol": 1, "Premature menopause": 1, "Progesterone": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0596", "histograms": [{"histogram": {"Autoimmune disorder": 1, "Blood follicle stimulating hormone": 1, "Blood luteinising hormone": 1, "COVID-19": 1, "Drug ineffective": 1, "Dry skin": 1, "Emotional disorder": 1, "Feeling hot": 1, "Hair texture abnormal": 1, "Hormone level abnormal": 1, "Hot flush": 1, "Insomnia": 1, "Investigation": 1, "Malaise": 1, "Menstrual disorder": 1, "Middle insomnia": 1, "Oestradiol": 1, "Premature menopause": 1, "Progesterone": 1}, "batchcodes": ["FK0596"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FK8911.json b/docs/data/histograms/Brazil/FK8911.json
index b831db1dabe..ab811766012 100644
--- a/docs/data/histograms/Brazil/FK8911.json
+++ b/docs/data/histograms/Brazil/FK8911.json
@@ -1 +1 @@
-{"batchcode": "FK8911", "histograms": [{"batchcodes": ["FK8911"], "histogram": {"Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Arthralgia": 1, "Back pain": 1, "Breast swelling": 1, "COVID-19": 1, "Cellulitis": 1, "Drug ineffective": 1, "Extensive swelling of vaccinated limb": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscle spasms": 1, "Neck pain": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8911", "histograms": [{"histogram": {"Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Arthralgia": 1, "Back pain": 1, "Breast swelling": 1, "COVID-19": 1, "Cellulitis": 1, "Drug ineffective": 1, "Extensive swelling of vaccinated limb": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscle spasms": 1, "Neck pain": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["FK8911"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FK8917.json b/docs/data/histograms/Brazil/FK8917.json
index a985790c845..89887822407 100644
--- a/docs/data/histograms/Brazil/FK8917.json
+++ b/docs/data/histograms/Brazil/FK8917.json
@@ -1 +1 @@
-{"batchcode": "FK8917", "histograms": [{"batchcodes": ["FK8917"], "histogram": {"Dyspnoea": 5, "Off label use": 4, "Back pain": 3, "Immunisation": 3, "Interchange of vaccine products": 3, "Asthenia": 2, "Chest pain": 2, "Cystitis": 2, "Dizziness": 2, "Neck pain": 2, "Pain": 2, "Paraesthesia": 2, "Pruritus": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Acne": 1, "Acute myocardial infarction": 1, "Ageusia": 1, "Anxiety": 1, "Arthralgia": 1, "Auscultation": 1, "Bell's palsy": 1, "Blood test": 1, "Body temperature": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Cough": 1, "Ear pain": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram": 1, "Fatigue": 1, "Head discomfort": 1, "Headache": 1, "Heart rate increased": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Investigation": 1, "Labyrinthitis": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Myalgia": 1, "Myocarditis": 1, "Pain in extremity": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Petechiae": 1, "Phlebitis": 1, "Polymerase chain reaction": 1, "Rash": 1, "Swelling": 1, "Thrombosis": 1, "Ultrasound Doppler": 1, "Urinary tract pain": 1, "Urticaria": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8917", "histograms": [{"histogram": {"Dyspnoea": 5, "Off label use": 4, "Back pain": 3, "Immunisation": 3, "Interchange of vaccine products": 3, "Asthenia": 2, "Chest pain": 2, "Cystitis": 2, "Dizziness": 2, "Neck pain": 2, "Pain": 2, "Paraesthesia": 2, "Pruritus": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Acne": 1, "Acute myocardial infarction": 1, "Ageusia": 1, "Anxiety": 1, "Arthralgia": 1, "Auscultation": 1, "Bell's palsy": 1, "Blood test": 1, "Body temperature": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Cough": 1, "Ear pain": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram": 1, "Fatigue": 1, "Head discomfort": 1, "Headache": 1, "Heart rate increased": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Investigation": 1, "Labyrinthitis": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Myalgia": 1, "Myocarditis": 1, "Pain in extremity": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Petechiae": 1, "Phlebitis": 1, "Polymerase chain reaction": 1, "Rash": 1, "Swelling": 1, "Thrombosis": 1, "Ultrasound Doppler": 1, "Urinary tract pain": 1, "Urticaria": 1, "X-ray": 1}, "batchcodes": ["FK8917"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FK9412.json b/docs/data/histograms/Brazil/FK9412.json
index 40a268fc5ac..872699003f6 100644
--- a/docs/data/histograms/Brazil/FK9412.json
+++ b/docs/data/histograms/Brazil/FK9412.json
@@ -1 +1 @@
-{"batchcode": "FK9412", "histograms": [{"batchcodes": ["FK9412"], "histogram": {"Headache": 3, "Interchange of vaccine products": 3, "Malaise": 3, "Dizziness": 2, "Hyperhidrosis": 2, "Immunisation": 2, "Off label use": 2, "Pain": 2, "Presyncope": 2, "Pyrexia": 2, "Abdominal distension": 1, "Autoimmune disorder": 1, "Axillary pain": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Deafness unilateral": 1, "Disturbance in attention": 1, "Dysgeusia": 1, "Dysmenorrhoea": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Eye pain": 1, "Hallucination": 1, "Head discomfort": 1, "Hypoglycaemia": 1, "Illness": 1, "Illusion": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Intraocular pressure increased": 1, "Labyrinthitis": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck pain": 1, "Osteonecrosis": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Product use issue": 1, "Reading disorder": 1, "Renal pain": 1, "Somnolence": 1, "Still's disease": 1, "Tachycardia": 1, "Tinnitus": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9412", "histograms": [{"histogram": {"Headache": 3, "Interchange of vaccine products": 3, "Malaise": 3, "Dizziness": 2, "Hyperhidrosis": 2, "Immunisation": 2, "Off label use": 2, "Pain": 2, "Presyncope": 2, "Pyrexia": 2, "Abdominal distension": 1, "Autoimmune disorder": 1, "Axillary pain": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Deafness unilateral": 1, "Disturbance in attention": 1, "Dysgeusia": 1, "Dysmenorrhoea": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Eye pain": 1, "Hallucination": 1, "Head discomfort": 1, "Hypoglycaemia": 1, "Illness": 1, "Illusion": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Intraocular pressure increased": 1, "Labyrinthitis": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck pain": 1, "Osteonecrosis": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Product use issue": 1, "Reading disorder": 1, "Renal pain": 1, "Somnolence": 1, "Still's disease": 1, "Tachycardia": 1, "Tinnitus": 1, "Visual impairment": 1}, "batchcodes": ["FK9412"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL1940.json b/docs/data/histograms/Brazil/FL1940.json
index cd74d8a8f80..c9dd6f4a58f 100644
--- a/docs/data/histograms/Brazil/FL1940.json
+++ b/docs/data/histograms/Brazil/FL1940.json
@@ -1 +1 @@
-{"batchcode": "FL1940", "histograms": [{"batchcodes": ["FL1940"], "histogram": {"Malaise": 1, "Myocardial infarction": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1940", "histograms": [{"histogram": {"Malaise": 1, "Myocardial infarction": 1, "Pericarditis": 1}, "batchcodes": ["FL1940"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL2534.json b/docs/data/histograms/Brazil/FL2534.json
index a8700021656..7ef82ff02ee 100644
--- a/docs/data/histograms/Brazil/FL2534.json
+++ b/docs/data/histograms/Brazil/FL2534.json
@@ -1 +1 @@
-{"batchcode": "FL2534", "histograms": [{"batchcodes": ["FL2534"], "histogram": {"Autoimmune disorder": 1, "Central nervous system lesion": 1, "Depressed mood": 1, "Dizziness": 1, "Gait disturbance": 1, "Headache": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FL2534", "histograms": [{"histogram": {"Autoimmune disorder": 1, "Central nervous system lesion": 1, "Depressed mood": 1, "Dizziness": 1, "Gait disturbance": 1, "Headache": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Palpitations": 1}, "batchcodes": ["FL2534"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL3196.json b/docs/data/histograms/Brazil/FL3196.json
index 34b3864f1d5..10743b82c76 100644
--- a/docs/data/histograms/Brazil/FL3196.json
+++ b/docs/data/histograms/Brazil/FL3196.json
@@ -1 +1 @@
-{"batchcode": "FL3196", "histograms": [{"batchcodes": ["FL3196"], "histogram": {"Arthralgia": 1, "Axillary pain": 1, "Blood test": 1, "Cough": 1, "Electrocardiogram": 1, "Headache": 1, "Lymphadenopathy": 1, "Oropharyngeal pain": 1, "Rhinitis": 1, "Sluggishness": 1, "Somnolence": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3196", "histograms": [{"histogram": {"Arthralgia": 1, "Axillary pain": 1, "Blood test": 1, "Cough": 1, "Electrocardiogram": 1, "Headache": 1, "Lymphadenopathy": 1, "Oropharyngeal pain": 1, "Rhinitis": 1, "Sluggishness": 1, "Somnolence": 1, "Vaccination site pain": 1}, "batchcodes": ["FL3196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL3203.json b/docs/data/histograms/Brazil/FL3203.json
index 585e4bf88c9..04df431ecc4 100644
--- a/docs/data/histograms/Brazil/FL3203.json
+++ b/docs/data/histograms/Brazil/FL3203.json
@@ -1 +1 @@
-{"batchcode": "FL3203", "histograms": [{"batchcodes": ["FL3203"], "histogram": {"Abdominal rigidity": 1, "Anxiety": 1, "Bedridden": 1, "Burning sensation": 1, "COVID-19": 1, "Drug ineffective": 1, "Electric shock sensation": 1, "Erythema": 1, "Extrasystoles": 1, "Feeling abnormal": 1, "Immunisation": 1, "Lethargy": 1, "Menstruation delayed": 1, "Nausea": 1, "Panic disorder": 1, "Paraesthesia": 1, "Poisoning": 1, "Retching": 1, "Schizophrenia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3203", "histograms": [{"histogram": {"Abdominal rigidity": 1, "Anxiety": 1, "Bedridden": 1, "Burning sensation": 1, "COVID-19": 1, "Drug ineffective": 1, "Electric shock sensation": 1, "Erythema": 1, "Extrasystoles": 1, "Feeling abnormal": 1, "Immunisation": 1, "Lethargy": 1, "Menstruation delayed": 1, "Nausea": 1, "Panic disorder": 1, "Paraesthesia": 1, "Poisoning": 1, "Retching": 1, "Schizophrenia": 1, "Vomiting": 1}, "batchcodes": ["FL3203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL3207.json b/docs/data/histograms/Brazil/FL3207.json
index 29980500f35..e2ea347df34 100644
--- a/docs/data/histograms/Brazil/FL3207.json
+++ b/docs/data/histograms/Brazil/FL3207.json
@@ -1 +1 @@
-{"batchcode": "FL3207", "histograms": [{"batchcodes": ["FL3207"], "histogram": {"Interchange of vaccine products": 4, "Off label use": 4, "Headache": 3, "COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2, "Alopecia": 1, "Antibody test": 1, "Asthenia": 1, "Astigmatism": 1, "Back pain": 1, "Body temperature": 1, "Cough": 1, "Dehydration": 1, "Ear pain": 1, "Eye pain": 1, "Feeling cold": 1, "Fundoscopy": 1, "Herpes zoster": 1, "Investigation": 1, "Magnetic resonance imaging spinal": 1, "Mental impairment": 1, "Myopia": 1, "Nasal congestion": 1, "Ophthalmological examination": 1, "Pain": 1, "Polymerase chain reaction": 1, "Product use issue": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pustular": 1, "Rhinorrhoea": 1, "Sinus pain": 1, "Sinusitis": 1, "Sneezing": 1, "Swelling face": 1, "Throat irritation": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3207", "histograms": [{"histogram": {"Interchange of vaccine products": 4, "Off label use": 4, "Headache": 3, "COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2, "Alopecia": 1, "Antibody test": 1, "Asthenia": 1, "Astigmatism": 1, "Back pain": 1, "Body temperature": 1, "Cough": 1, "Dehydration": 1, "Ear pain": 1, "Eye pain": 1, "Feeling cold": 1, "Fundoscopy": 1, "Herpes zoster": 1, "Investigation": 1, "Magnetic resonance imaging spinal": 1, "Mental impairment": 1, "Myopia": 1, "Nasal congestion": 1, "Ophthalmological examination": 1, "Pain": 1, "Polymerase chain reaction": 1, "Product use issue": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pustular": 1, "Rhinorrhoea": 1, "Sinus pain": 1, "Sinusitis": 1, "Sneezing": 1, "Swelling face": 1, "Throat irritation": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["FL3207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL3211.json b/docs/data/histograms/Brazil/FL3211.json
index ab8536f2a20..68fd92fb8f3 100644
--- a/docs/data/histograms/Brazil/FL3211.json
+++ b/docs/data/histograms/Brazil/FL3211.json
@@ -1 +1 @@
-{"batchcode": "FL3211", "histograms": [{"batchcodes": ["FL3211"], "histogram": {"Back pain": 1, "Guillain-Barre syndrome": 1, "Interchange of vaccine products": 1, "Muscular weakness": 1, "Off label use": 1, "Product use issue": 1, "Sensory loss": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3211", "histograms": [{"histogram": {"Back pain": 1, "Guillain-Barre syndrome": 1, "Interchange of vaccine products": 1, "Muscular weakness": 1, "Off label use": 1, "Product use issue": 1, "Sensory loss": 1}, "batchcodes": ["FL3211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL4222.json b/docs/data/histograms/Brazil/FL4222.json
index 453b673cddc..e4a730d51be 100644
--- a/docs/data/histograms/Brazil/FL4222.json
+++ b/docs/data/histograms/Brazil/FL4222.json
@@ -1 +1 @@
-{"batchcode": "FL4222", "histograms": [{"batchcodes": ["FL4222"], "histogram": {"Off label use": 4, "Interchange of vaccine products": 3, "Arthralgia": 2, "Immunisation": 2, "Magnetic resonance imaging": 2, "Pain in extremity": 2, "Angiopathy": 1, "Anti-aquaporin-4 antibody": 1, "Antiacetylcholine receptor antibody": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Condition aggravated": 1, "Diplopia": 1, "Dizziness": 1, "Dysuria": 1, "Electroneuromyography": 1, "Eye movement disorder": 1, "Fear of disease": 1, "Fluid retention": 1, "Gait disturbance": 1, "Headache": 1, "Hypertension": 1, "Illness": 1, "Immune system disorder": 1, "Insomnia": 1, "Investigation": 1, "Joint lock": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nerve root injury": 1, "Nystagmus": 1, "Ocular discomfort": 1, "Oedema": 1, "Ophthalmoplegia": 1, "Optic neuritis": 1, "Peripheral swelling": 1, "Pupillary disorder": 1, "Pyrexia": 1, "Sluggishness": 1, "Strabismus": 1, "Tendon pain": 1, "Urinary tract infection bacterial": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Varicose vein": 1, "Vein disorder": 1, "Visual impairment": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FL4222", "histograms": [{"histogram": {"Off label use": 4, "Interchange of vaccine products": 3, "Arthralgia": 2, "Immunisation": 2, "Magnetic resonance imaging": 2, "Pain in extremity": 2, "Angiopathy": 1, "Anti-aquaporin-4 antibody": 1, "Antiacetylcholine receptor antibody": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Condition aggravated": 1, "Diplopia": 1, "Dizziness": 1, "Dysuria": 1, "Electroneuromyography": 1, "Eye movement disorder": 1, "Fear of disease": 1, "Fluid retention": 1, "Gait disturbance": 1, "Headache": 1, "Hypertension": 1, "Illness": 1, "Immune system disorder": 1, "Insomnia": 1, "Investigation": 1, "Joint lock": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nerve root injury": 1, "Nystagmus": 1, "Ocular discomfort": 1, "Oedema": 1, "Ophthalmoplegia": 1, "Optic neuritis": 1, "Peripheral swelling": 1, "Pupillary disorder": 1, "Pyrexia": 1, "Sluggishness": 1, "Strabismus": 1, "Tendon pain": 1, "Urinary tract infection bacterial": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Varicose vein": 1, "Vein disorder": 1, "Visual impairment": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "X-ray": 1}, "batchcodes": ["FL4222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL5729.json b/docs/data/histograms/Brazil/FL5729.json
index b61b2089cfe..b6660a1955b 100644
--- a/docs/data/histograms/Brazil/FL5729.json
+++ b/docs/data/histograms/Brazil/FL5729.json
@@ -1 +1 @@
-{"batchcode": "FL5729", "histograms": [{"batchcodes": ["FL5729"], "histogram": {"Asthenia": 1, "Gait inability": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5729", "histograms": [{"histogram": {"Asthenia": 1, "Gait inability": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FL5729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL7476.json b/docs/data/histograms/Brazil/FL7476.json
index 17d436ec1b6..9232ccc6272 100644
--- a/docs/data/histograms/Brazil/FL7476.json
+++ b/docs/data/histograms/Brazil/FL7476.json
@@ -1 +1 @@
-{"batchcode": "FL7476", "histograms": [{"batchcodes": ["FL7476"], "histogram": {"Facial paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FL7476", "histograms": [{"histogram": {"Facial paralysis": 1}, "batchcodes": ["FL7476"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FL8196.json b/docs/data/histograms/Brazil/FL8196.json
index fa447f2ff28..34395dfc5e3 100644
--- a/docs/data/histograms/Brazil/FL8196.json
+++ b/docs/data/histograms/Brazil/FL8196.json
@@ -1 +1 @@
-{"batchcode": "FL8196", "histograms": [{"batchcodes": ["FL8196"], "histogram": {"Asthenia": 1, "Balance disorder": 1, "Dizziness": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Mental impairment": 1, "Movement disorder": 1, "Presyncope": 1, "Reflexes abnormal": 1, "Sluggishness": 1, "Speech disorder": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8196", "histograms": [{"histogram": {"Asthenia": 1, "Balance disorder": 1, "Dizziness": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Mental impairment": 1, "Movement disorder": 1, "Presyncope": 1, "Reflexes abnormal": 1, "Sluggishness": 1, "Speech disorder": 1, "Vision blurred": 1}, "batchcodes": ["FL8196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM 3809.json b/docs/data/histograms/Brazil/FM 3809.json
index 350f624c310..8e76df0e526 100644
--- a/docs/data/histograms/Brazil/FM 3809.json
+++ b/docs/data/histograms/Brazil/FM 3809.json
@@ -1 +1 @@
-{"batchcode": "FM 3809", "histograms": [{"batchcodes": ["FM 3809"], "histogram": {"Abdominal pain": 1, "Confusional state": 1, "Dizziness": 1, "Feeling cold": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Immunisation": 1, "Insomnia": 1, "Muscle contractions involuntary": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1, "Syncope": 1, "Tremor": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FM 3809", "histograms": [{"histogram": {"Abdominal pain": 1, "Confusional state": 1, "Dizziness": 1, "Feeling cold": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Immunisation": 1, "Insomnia": 1, "Muscle contractions involuntary": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1, "Syncope": 1, "Tremor": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["FM 3809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2948.json b/docs/data/histograms/Brazil/FM2948.json
index c216ebf71b5..fd0fe11f62d 100644
--- a/docs/data/histograms/Brazil/FM2948.json
+++ b/docs/data/histograms/Brazil/FM2948.json
@@ -1 +1 @@
-{"batchcode": "FM2948", "histograms": [{"batchcodes": ["FM2948"], "histogram": {"Interchange of vaccine products": 2, "Off label use": 2, "Pain": 2, "Blood urine present": 1, "Breast abscess": 1, "Contusion": 1, "Cough": 1, "Granuloma annulare": 1, "Headache": 1, "Injury": 1, "Malaise": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2948", "histograms": [{"histogram": {"Interchange of vaccine products": 2, "Off label use": 2, "Pain": 2, "Blood urine present": 1, "Breast abscess": 1, "Contusion": 1, "Cough": 1, "Granuloma annulare": 1, "Headache": 1, "Injury": 1, "Malaise": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Syncope": 1}, "batchcodes": ["FM2948"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM295.json b/docs/data/histograms/Brazil/FM295.json
index 19b410442d6..b4256ab88d7 100644
--- a/docs/data/histograms/Brazil/FM295.json
+++ b/docs/data/histograms/Brazil/FM295.json
@@ -1 +1 @@
-{"batchcode": "FM295", "histograms": [{"batchcodes": ["FM295"], "histogram": {"Bell's palsy": 1, "Corneal reflex decreased": 1, "Face injury": 1, "Hypoaesthesia oral": 1, "Loss of personal independence in daily activities": 1, "Speech disorder": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FM295", "histograms": [{"histogram": {"Bell's palsy": 1, "Corneal reflex decreased": 1, "Face injury": 1, "Hypoaesthesia oral": 1, "Loss of personal independence in daily activities": 1, "Speech disorder": 1, "Tremor": 1}, "batchcodes": ["FM295"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2951.json b/docs/data/histograms/Brazil/FM2951.json
index c434270fd96..0d74181a910 100644
--- a/docs/data/histograms/Brazil/FM2951.json
+++ b/docs/data/histograms/Brazil/FM2951.json
@@ -1 +1 @@
-{"batchcode": "FM2951", "histograms": [{"batchcodes": ["FM2951"], "histogram": {"Headache": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "Off label use": 2, "Vision blurred": 2, "Abdominal pain": 1, "Back pain": 1, "Bedridden": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Facial pain": 1, "Fatigue": 1, "Furuncle": 1, "Head discomfort": 1, "Histamine level increased": 1, "Hypersensitivity": 1, "Illness": 1, "Immunisation": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Investigation": 1, "Malaise": 1, "Musculoskeletal discomfort": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Rash erythematous": 1, "Spinal pain": 1, "Thirst": 1, "Tinnitus": 1, "Vascular rupture": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2951", "histograms": [{"histogram": {"Headache": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "Off label use": 2, "Vision blurred": 2, "Abdominal pain": 1, "Back pain": 1, "Bedridden": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Facial pain": 1, "Fatigue": 1, "Furuncle": 1, "Head discomfort": 1, "Histamine level increased": 1, "Hypersensitivity": 1, "Illness": 1, "Immunisation": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Investigation": 1, "Malaise": 1, "Musculoskeletal discomfort": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Rash erythematous": 1, "Spinal pain": 1, "Thirst": 1, "Tinnitus": 1, "Vascular rupture": 1}, "batchcodes": ["FM2951"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2952.json b/docs/data/histograms/Brazil/FM2952.json
index a3d52c9252f..17b9cdb6251 100644
--- a/docs/data/histograms/Brazil/FM2952.json
+++ b/docs/data/histograms/Brazil/FM2952.json
@@ -1 +1 @@
-{"batchcode": "FM2952", "histograms": [{"batchcodes": ["FM2952"], "histogram": {"Headache": 2, "Alopecia": 1, "Anxiety": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Influenza like illness": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Paralysis": 1, "Seizure": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2952", "histograms": [{"histogram": {"Headache": 2, "Alopecia": 1, "Anxiety": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Influenza like illness": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Paralysis": 1, "Seizure": 1, "Suspected COVID-19": 1}, "batchcodes": ["FM2952"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2953.json b/docs/data/histograms/Brazil/FM2953.json
index fa7d37cbd50..84ddc5d8930 100644
--- a/docs/data/histograms/Brazil/FM2953.json
+++ b/docs/data/histograms/Brazil/FM2953.json
@@ -1 +1 @@
-{"batchcode": "FM2953", "histograms": [{"batchcodes": ["FM2953"], "histogram": {"Alopecia areata": 1, "Loss of personal independence in daily activities": 1, "Pain": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2953", "histograms": [{"histogram": {"Alopecia areata": 1, "Loss of personal independence in daily activities": 1, "Pain": 1, "Seizure": 1}, "batchcodes": ["FM2953"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2954.json b/docs/data/histograms/Brazil/FM2954.json
index e069af413ae..30d0bfd9bd7 100644
--- a/docs/data/histograms/Brazil/FM2954.json
+++ b/docs/data/histograms/Brazil/FM2954.json
@@ -1 +1 @@
-{"batchcode": "FM2954", "histograms": [{"batchcodes": ["FM2954"], "histogram": {"Blood test": 1, "Body temperature": 1, "Imaging procedure": 1, "Neck mass": 1, "Nodule": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Ultrasound scan": 1, "Vaccination site nodule": 1, "Vaccination site pain": 1, "Varicose vein ruptured": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2954", "histograms": [{"histogram": {"Blood test": 1, "Body temperature": 1, "Imaging procedure": 1, "Neck mass": 1, "Nodule": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Ultrasound scan": 1, "Vaccination site nodule": 1, "Vaccination site pain": 1, "Varicose vein ruptured": 1}, "batchcodes": ["FM2954"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2958.json b/docs/data/histograms/Brazil/FM2958.json
index 1a98e4d620a..7daee32094a 100644
--- a/docs/data/histograms/Brazil/FM2958.json
+++ b/docs/data/histograms/Brazil/FM2958.json
@@ -1 +1 @@
-{"batchcode": "FM2958", "histograms": [{"batchcodes": ["FM2958"], "histogram": {"Abdominal pain upper": 1, "Amnesia": 1, "Angiocardiogram": 1, "Blindness": 1, "Blood pressure measurement": 1, "Body height": 1, "Body mass index": 1, "Body surface area": 1, "Body temperature": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac imaging procedure": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive heart disease": 1, "Illness": 1, "Impaired quality of life": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lung infiltration": 1, "Malaise": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pallor": 1, "Renal colic": 1, "Renal disorder": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Ultrasound kidney": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2958", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Amnesia": 1, "Angiocardiogram": 1, "Blindness": 1, "Blood pressure measurement": 1, "Body height": 1, "Body mass index": 1, "Body surface area": 1, "Body temperature": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac imaging procedure": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive heart disease": 1, "Illness": 1, "Impaired quality of life": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lung infiltration": 1, "Malaise": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pallor": 1, "Renal colic": 1, "Renal disorder": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Ultrasound kidney": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1}, "batchcodes": ["FM2958"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2965.json b/docs/data/histograms/Brazil/FM2965.json
index a884b923b7b..1cb5cee76d8 100644
--- a/docs/data/histograms/Brazil/FM2965.json
+++ b/docs/data/histograms/Brazil/FM2965.json
@@ -1 +1 @@
-{"batchcode": "FM2965", "histograms": [{"batchcodes": ["FM2965"], "histogram": {"Headache": 2, "Abdominal pain upper": 1, "Eye irritation": 1, "Malaise": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "Rhinorrhoea": 1, "Viral test": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2965", "histograms": [{"histogram": {"Headache": 2, "Abdominal pain upper": 1, "Eye irritation": 1, "Malaise": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "Rhinorrhoea": 1, "Viral test": 1}, "batchcodes": ["FM2965"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM2967.json b/docs/data/histograms/Brazil/FM2967.json
index 60efaae4e1c..e513378bd9b 100644
--- a/docs/data/histograms/Brazil/FM2967.json
+++ b/docs/data/histograms/Brazil/FM2967.json
@@ -1 +1 @@
-{"batchcode": "FM2967", "histograms": [{"batchcodes": ["FM2967"], "histogram": {"Pain": 2, "Areflexia": 1, "Audiogram": 1, "Blood uric acid": 1, "Blood uric acid abnormal": 1, "Burning sensation": 1, "Computerised tomogram head": 1, "Computerised tomogram head abnormal": 1, "Deafness": 1, "Deafness neurosensory": 1, "Ear discomfort": 1, "Ear disorder": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Liver disorder": 1, "Lymphadenopathy": 1, "Metamorphopsia": 1, "Off label use": 1, "Platelet count": 1, "Platelet count decreased": 1, "Spleen disorder": 1, "Splenomegaly": 1, "Tinnitus": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2967", "histograms": [{"histogram": {"Pain": 2, "Areflexia": 1, "Audiogram": 1, "Blood uric acid": 1, "Blood uric acid abnormal": 1, "Burning sensation": 1, "Computerised tomogram head": 1, "Computerised tomogram head abnormal": 1, "Deafness": 1, "Deafness neurosensory": 1, "Ear discomfort": 1, "Ear disorder": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Liver disorder": 1, "Lymphadenopathy": 1, "Metamorphopsia": 1, "Off label use": 1, "Platelet count": 1, "Platelet count decreased": 1, "Spleen disorder": 1, "Splenomegaly": 1, "Tinnitus": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["FM2967"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM3355.json b/docs/data/histograms/Brazil/FM3355.json
index a17c8b72f90..7a0f27677e6 100644
--- a/docs/data/histograms/Brazil/FM3355.json
+++ b/docs/data/histograms/Brazil/FM3355.json
@@ -1 +1 @@
-{"batchcode": "FM3355", "histograms": [{"batchcodes": ["FM3355"], "histogram": {"Interchange of vaccine products": 7, "SARS-CoV-2 test": 7, "Off label use": 6, "COVID-19": 5, "Drug ineffective": 5, "Pain": 3, "Pyrexia": 3, "Abdominal pain upper": 2, "Headache": 2, "Immunisation": 2, "Investigation": 2, "Malaise": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Acne": 1, "Acute myocardial infarction": 1, "Anaemia": 1, "Angiopathy": 1, "Anosmia": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Bedridden": 1, "Bilirubin conjugated": 1, "Blister": 1, "Blood bilirubin unconjugated": 1, "Blood bilirubin unconjugated increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Coagulopathy": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Constipation": 1, "Decreased appetite": 1, "Depressed mood": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Foetal distress syndrome": 1, "Foetal growth restriction": 1, "Gait disturbance": 1, "Gastric lavage": 1, "General physical health deterioration": 1, "Haematocrit": 1, "Haemodialysis": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Hypertension": 1, "Illness": 1, "Inappropriate affect": 1, "Iridocyclitis": 1, "Jaundice neonatal": 1, "Joint stiffness": 1, "Joint swelling": 1, "Left ventricular hypertrophy": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Oedema peripheral": 1, "Oligohydramnios": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Ovarian cyst": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pleural effusion": 1, "Premature baby": 1, "Productive cough": 1, "Pulmonary oedema": 1, "Rash macular": 1, "Renal failure": 1, "Respiration abnormal": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Skin discolouration": 1, "Skin disorder": 1, "Sleep disorder": 1, "Sneezing": 1, "Specialist consultation": 1, "Syncope": 1, "Thrombosis": 1, "Thyroid mass": 1, "Toxicity to various agents": 1, "Transaminases": 1, "Ultrasound Doppler": 1, "Urine output decreased": 1, "Uterine enlargement": 1, "Venous thrombosis limb": 1, "Wound complication": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3355", "histograms": [{"histogram": {"Interchange of vaccine products": 7, "SARS-CoV-2 test": 7, "Off label use": 6, "COVID-19": 5, "Drug ineffective": 5, "Pain": 3, "Pyrexia": 3, "Abdominal pain upper": 2, "Headache": 2, "Immunisation": 2, "Investigation": 2, "Malaise": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Acne": 1, "Acute myocardial infarction": 1, "Anaemia": 1, "Angiopathy": 1, "Anosmia": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Bedridden": 1, "Bilirubin conjugated": 1, "Blister": 1, "Blood bilirubin unconjugated": 1, "Blood bilirubin unconjugated increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Coagulopathy": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Constipation": 1, "Decreased appetite": 1, "Depressed mood": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Foetal distress syndrome": 1, "Foetal growth restriction": 1, "Gait disturbance": 1, "Gastric lavage": 1, "General physical health deterioration": 1, "Haematocrit": 1, "Haemodialysis": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Hypertension": 1, "Illness": 1, "Inappropriate affect": 1, "Iridocyclitis": 1, "Jaundice neonatal": 1, "Joint stiffness": 1, "Joint swelling": 1, "Left ventricular hypertrophy": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Oedema peripheral": 1, "Oligohydramnios": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Ovarian cyst": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pleural effusion": 1, "Premature baby": 1, "Productive cough": 1, "Pulmonary oedema": 1, "Rash macular": 1, "Renal failure": 1, "Respiration abnormal": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Skin discolouration": 1, "Skin disorder": 1, "Sleep disorder": 1, "Sneezing": 1, "Specialist consultation": 1, "Syncope": 1, "Thrombosis": 1, "Thyroid mass": 1, "Toxicity to various agents": 1, "Transaminases": 1, "Ultrasound Doppler": 1, "Urine output decreased": 1, "Uterine enlargement": 1, "Venous thrombosis limb": 1, "Wound complication": 1}, "batchcodes": ["FM3355"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM3457.json b/docs/data/histograms/Brazil/FM3457.json
index 79ee7c22a7e..323e425e014 100644
--- a/docs/data/histograms/Brazil/FM3457.json
+++ b/docs/data/histograms/Brazil/FM3457.json
@@ -1 +1 @@
-{"batchcode": "FM3457", "histograms": [{"batchcodes": ["FM3457"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Off label use": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3457", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Off label use": 1, "Urticaria": 1}, "batchcodes": ["FM3457"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM3802.json b/docs/data/histograms/Brazil/FM3802.json
index 42659293c7e..6217c3649a4 100644
--- a/docs/data/histograms/Brazil/FM3802.json
+++ b/docs/data/histograms/Brazil/FM3802.json
@@ -1 +1 @@
-{"batchcode": "FM3802", "histograms": [{"batchcodes": ["FM3802"], "histogram": {"Chills": 2, "Headache": 2, "Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Pain": 2, "Pyrexia": 2, "Asthma": 1, "Chest pain": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Investigation": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3802", "histograms": [{"histogram": {"Chills": 2, "Headache": 2, "Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Pain": 2, "Pyrexia": 2, "Asthma": 1, "Chest pain": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Investigation": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Vomiting": 1}, "batchcodes": ["FM3802"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM3809.json b/docs/data/histograms/Brazil/FM3809.json
index fdcd99daee3..71320c35b77 100644
--- a/docs/data/histograms/Brazil/FM3809.json
+++ b/docs/data/histograms/Brazil/FM3809.json
@@ -1 +1 @@
-{"batchcode": "FM3809", "histograms": [{"batchcodes": ["FM3809"], "histogram": {"Arrhythmia": 1, "Bell's palsy": 1, "Facial paralysis": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Interchange of vaccine products": 1, "Neuralgic amyotrophy": 1, "Neuropathic muscular atrophy": 1, "Off label use": 1, "Pain in extremity": 1, "Palpitations": 1, "Winged scapula": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3809", "histograms": [{"histogram": {"Arrhythmia": 1, "Bell's palsy": 1, "Facial paralysis": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Interchange of vaccine products": 1, "Neuralgic amyotrophy": 1, "Neuropathic muscular atrophy": 1, "Off label use": 1, "Pain in extremity": 1, "Palpitations": 1, "Winged scapula": 1}, "batchcodes": ["FM3809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM3834.json b/docs/data/histograms/Brazil/FM3834.json
index b35149a51b4..409402f4fa6 100644
--- a/docs/data/histograms/Brazil/FM3834.json
+++ b/docs/data/histograms/Brazil/FM3834.json
@@ -1 +1 @@
-{"batchcode": "FM3834", "histograms": [{"batchcodes": ["FM3834"], "histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3834", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Tinnitus": 1}, "batchcodes": ["FM3834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM3884.json b/docs/data/histograms/Brazil/FM3884.json
index 8acf8f1de9c..a2aaf552081 100644
--- a/docs/data/histograms/Brazil/FM3884.json
+++ b/docs/data/histograms/Brazil/FM3884.json
@@ -1 +1 @@
-{"batchcode": "FM3884", "histograms": [{"batchcodes": ["FM3884"], "histogram": {"Immunisation": 4, "Interchange of vaccine products": 4, "Off label use": 4, "Headache": 2, "Pain in extremity": 2, "Pyrexia": 2, "Abdominal pain": 1, "Arrhythmia": 1, "Asthenia": 1, "Axillary mass": 1, "Back pain": 1, "Blepharitis": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Burning sensation": 1, "Chills": 1, "Computerised tomogram head": 1, "Dyspnoea": 1, "Ear swelling": 1, "Erythema": 1, "Fatigue": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Malaise": 1, "Mouth swelling": 1, "Nausea": 1, "Neck pain": 1, "Pain": 1, "Peripheral coldness": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Skin plaque": 1, "Spinal pain": 1, "Swelling": 1, "Syncope": 1, "Urine analysis": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3884", "histograms": [{"histogram": {"Immunisation": 4, "Interchange of vaccine products": 4, "Off label use": 4, "Headache": 2, "Pain in extremity": 2, "Pyrexia": 2, "Abdominal pain": 1, "Arrhythmia": 1, "Asthenia": 1, "Axillary mass": 1, "Back pain": 1, "Blepharitis": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Burning sensation": 1, "Chills": 1, "Computerised tomogram head": 1, "Dyspnoea": 1, "Ear swelling": 1, "Erythema": 1, "Fatigue": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Malaise": 1, "Mouth swelling": 1, "Nausea": 1, "Neck pain": 1, "Pain": 1, "Peripheral coldness": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Skin plaque": 1, "Spinal pain": 1, "Swelling": 1, "Syncope": 1, "Urine analysis": 1, "Vaccination site pain": 1}, "batchcodes": ["FM3884"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM7374.json b/docs/data/histograms/Brazil/FM7374.json
index 3ca1fd289cf..224a45c28ba 100644
--- a/docs/data/histograms/Brazil/FM7374.json
+++ b/docs/data/histograms/Brazil/FM7374.json
@@ -1 +1 @@
-{"batchcode": "FM7374", "histograms": [{"batchcodes": ["FM7374"], "histogram": {"Asthenia": 1, "Back pain": 1, "Chest pain": 1, "Hyperhidrosis": 1, "Interchange of vaccine products": 1, "Myocardial infarction": 1, "Off label use": 1, "Pallor": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7374", "histograms": [{"histogram": {"Asthenia": 1, "Back pain": 1, "Chest pain": 1, "Hyperhidrosis": 1, "Interchange of vaccine products": 1, "Myocardial infarction": 1, "Off label use": 1, "Pallor": 1, "Syncope": 1}, "batchcodes": ["FM7374"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM7380.json b/docs/data/histograms/Brazil/FM7380.json
index 758c17c0e35..680e7c3d39a 100644
--- a/docs/data/histograms/Brazil/FM7380.json
+++ b/docs/data/histograms/Brazil/FM7380.json
@@ -1 +1 @@
-{"batchcode": "FM7380", "histograms": [{"batchcodes": ["FM7380"], "histogram": {"Furuncle": 2, "Anxiety": 1, "Drug hypersensitivity": 1, "Genital abscess": 1, "Hordeolum": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Pruritus": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7380", "histograms": [{"histogram": {"Furuncle": 2, "Anxiety": 1, "Drug hypersensitivity": 1, "Genital abscess": 1, "Hordeolum": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Pruritus": 1, "Pyrexia": 1}, "batchcodes": ["FM7380"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FM8023.json b/docs/data/histograms/Brazil/FM8023.json
index 777a1a3132a..bf2179f699a 100644
--- a/docs/data/histograms/Brazil/FM8023.json
+++ b/docs/data/histograms/Brazil/FM8023.json
@@ -1 +1 @@
-{"batchcode": "FM8023", "histograms": [{"batchcodes": ["FM8023"], "histogram": {"Blister": 1, "Inappropriate schedule of product administration": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "FM8023", "histograms": [{"histogram": {"Blister": 1, "Inappropriate schedule of product administration": 1, "Skin discolouration": 1}, "batchcodes": ["FM8023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FN2726.json b/docs/data/histograms/Brazil/FN2726.json
index 04e932721a6..e7357884abc 100644
--- a/docs/data/histograms/Brazil/FN2726.json
+++ b/docs/data/histograms/Brazil/FN2726.json
@@ -1 +1 @@
-{"batchcode": "FN2726", "histograms": [{"batchcodes": ["FN2726"], "histogram": {"Blood pressure measurement": 1, "COVID-19": 1, "Drug ineffective": 1, "Investigation": 1, "SARS-CoV-2 test": 1, "Spirometry": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2726", "histograms": [{"histogram": {"Blood pressure measurement": 1, "COVID-19": 1, "Drug ineffective": 1, "Investigation": 1, "SARS-CoV-2 test": 1, "Spirometry": 1, "Urine analysis": 1}, "batchcodes": ["FN2726"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FN3543.json b/docs/data/histograms/Brazil/FN3543.json
index 2e461f4d842..081a51f99cc 100644
--- a/docs/data/histograms/Brazil/FN3543.json
+++ b/docs/data/histograms/Brazil/FN3543.json
@@ -1 +1 @@
-{"batchcode": "FN3543", "histograms": [{"batchcodes": ["FN3543"], "histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Joint range of motion decreased": 1, "Lymphadenopathy": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FN3543", "histograms": [{"histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Joint range of motion decreased": 1, "Lymphadenopathy": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FN3543"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FN4073.json b/docs/data/histograms/Brazil/FN4073.json
index 3dfd131e1bb..cd6034a65c6 100644
--- a/docs/data/histograms/Brazil/FN4073.json
+++ b/docs/data/histograms/Brazil/FN4073.json
@@ -1 +1 @@
-{"batchcode": "FN4073", "histograms": [{"batchcodes": ["FN4073"], "histogram": {"Blood glucose": 1, "Body temperature": 1, "Coma scale": 1, "Drug ineffective": 1, "Epilepsy": 1, "Fall": 1, "Fatigue": 1, "Gait inability": 1, "Head injury": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Nocturia": 1, "Oxygen saturation": 1, "Poor quality sleep": 1, "Seizure": 1, "Sleep study": 1, "Somnambulism": 1, "Somnolence": 1, "Specialist consultation": 1, "Suspected COVID-19": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4073", "histograms": [{"histogram": {"Blood glucose": 1, "Body temperature": 1, "Coma scale": 1, "Drug ineffective": 1, "Epilepsy": 1, "Fall": 1, "Fatigue": 1, "Gait inability": 1, "Head injury": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Nocturia": 1, "Oxygen saturation": 1, "Poor quality sleep": 1, "Seizure": 1, "Sleep study": 1, "Somnambulism": 1, "Somnolence": 1, "Specialist consultation": 1, "Suspected COVID-19": 1, "Vital signs measurement": 1}, "batchcodes": ["FN4073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FN9509.json b/docs/data/histograms/Brazil/FN9509.json
index 1dc1b9c898a..0e2a24da11d 100644
--- a/docs/data/histograms/Brazil/FN9509.json
+++ b/docs/data/histograms/Brazil/FN9509.json
@@ -1 +1 @@
-{"batchcode": "FN9509", "histograms": [{"batchcodes": ["FN9509"], "histogram": {"Immunisation": 2, "Off label use": 2, "Arthralgia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Interchange of vaccine products": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN9509", "histograms": [{"histogram": {"Immunisation": 2, "Off label use": 2, "Arthralgia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Interchange of vaccine products": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FN9509"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FN9606.json b/docs/data/histograms/Brazil/FN9606.json
index 39895d36daa..6e4611766d1 100644
--- a/docs/data/histograms/Brazil/FN9606.json
+++ b/docs/data/histograms/Brazil/FN9606.json
@@ -1 +1 @@
-{"batchcode": "FN9606", "histograms": [{"batchcodes": ["FN9606"], "histogram": {"Ear pain": 1, "Electrocardiogram ambulatory": 1, "Extrasystoles": 1, "Immunisation": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Off label use": 1, "Pruritus": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FN9606", "histograms": [{"histogram": {"Ear pain": 1, "Electrocardiogram ambulatory": 1, "Extrasystoles": 1, "Immunisation": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Off label use": 1, "Pruritus": 1, "Tachycardia": 1}, "batchcodes": ["FN9606"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FN9607.json b/docs/data/histograms/Brazil/FN9607.json
index 1d60b604b96..0eb50aefcae 100644
--- a/docs/data/histograms/Brazil/FN9607.json
+++ b/docs/data/histograms/Brazil/FN9607.json
@@ -1 +1 @@
-{"batchcode": "FN9607", "histograms": [{"batchcodes": ["FN9607"], "histogram": {"Erythema": 1, "Hypersensitivity": 1, "Immunisation": 1, "Off label use": 1, "Pruritus": 1, "Rash macular": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "FN9607", "histograms": [{"histogram": {"Erythema": 1, "Hypersensitivity": 1, "Immunisation": 1, "Off label use": 1, "Pruritus": 1, "Rash macular": 1, "Throat tightness": 1}, "batchcodes": ["FN9607"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FO7207.json b/docs/data/histograms/Brazil/FO7207.json
index 788ebab848c..9aeb823b988 100644
--- a/docs/data/histograms/Brazil/FO7207.json
+++ b/docs/data/histograms/Brazil/FO7207.json
@@ -1 +1 @@
-{"batchcode": "FO7207", "histograms": [{"batchcodes": ["FO7207"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dry mouth": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FO7207", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dry mouth": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["FO7207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FO7219.json b/docs/data/histograms/Brazil/FO7219.json
index d222de8188e..630047fdb3c 100644
--- a/docs/data/histograms/Brazil/FO7219.json
+++ b/docs/data/histograms/Brazil/FO7219.json
@@ -1 +1 @@
-{"batchcode": "FO7219", "histograms": [{"batchcodes": ["FO7219"], "histogram": {"Back pain": 1, "Blood pressure measurement": 1, "Blood test": 1, "Chest pain": 1, "Contusion": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FO7219", "histograms": [{"histogram": {"Back pain": 1, "Blood pressure measurement": 1, "Blood test": 1, "Chest pain": 1, "Contusion": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}, "batchcodes": ["FO7219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FO7222.json b/docs/data/histograms/Brazil/FO7222.json
index 4bccae8a030..9b9783881cd 100644
--- a/docs/data/histograms/Brazil/FO7222.json
+++ b/docs/data/histograms/Brazil/FO7222.json
@@ -1 +1 @@
-{"batchcode": "FO7222", "histograms": [{"batchcodes": ["FO7222"], "histogram": {"Body temperature": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FO7222", "histograms": [{"histogram": {"Body temperature": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["FO7222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FOF221.json b/docs/data/histograms/Brazil/FOF221.json
index e006788c86a..e93204b89df 100644
--- a/docs/data/histograms/Brazil/FOF221.json
+++ b/docs/data/histograms/Brazil/FOF221.json
@@ -1 +1 @@
-{"batchcode": "FOF221", "histograms": [{"batchcodes": ["FOF221"], "histogram": {"Angiogram": 1, "Diplopia": 1, "Extraocular muscle disorder": 1, "Headache": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Myopia": 1, "Ophthalmological examination": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FOF221", "histograms": [{"histogram": {"Angiogram": 1, "Diplopia": 1, "Extraocular muscle disorder": 1, "Headache": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Myopia": 1, "Ophthalmological examination": 1, "Vision blurred": 1}, "batchcodes": ["FOF221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FP1176.json b/docs/data/histograms/Brazil/FP1176.json
index c7036bb38bb..d1228a0b6d9 100644
--- a/docs/data/histograms/Brazil/FP1176.json
+++ b/docs/data/histograms/Brazil/FP1176.json
@@ -1 +1 @@
-{"batchcode": "FP1176", "histograms": [{"batchcodes": ["FP1176"], "histogram": {"Haematochezia": 2, "Atrial fibrillation": 1, "Body temperature": 1, "Cardiac arrest": 1, "Cyanosis": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Haematemesis": 1, "Loss of consciousness": 1, "Malaise": 1, "Moaning": 1, "Palpitations": 1, "Pyrexia": 1, "Swelling face": 1, "Urinary incontinence": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Wolff-Parkinson-White syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "FP1176", "histograms": [{"histogram": {"Haematochezia": 2, "Atrial fibrillation": 1, "Body temperature": 1, "Cardiac arrest": 1, "Cyanosis": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Haematemesis": 1, "Loss of consciousness": 1, "Malaise": 1, "Moaning": 1, "Palpitations": 1, "Pyrexia": 1, "Swelling face": 1, "Urinary incontinence": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Wolff-Parkinson-White syndrome": 1}, "batchcodes": ["FP1176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FP7082.json b/docs/data/histograms/Brazil/FP7082.json
index e0d50d2007e..485ff9873c4 100644
--- a/docs/data/histograms/Brazil/FP7082.json
+++ b/docs/data/histograms/Brazil/FP7082.json
@@ -1 +1 @@
-{"batchcode": "FP7082", "histograms": [{"batchcodes": ["FP7082"], "histogram": {"Off label use": 4, "Immunisation": 3, "Investigation": 3, "Herpes zoster": 2, "Amnesia": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Biopsy": 1, "Bronchitis": 1, "Clavicle fracture": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Cough": 1, "Disorientation": 1, "Dyspnoea": 1, "Hypokinesia": 1, "Infection": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Parapsoriasis": 1, "Pneumonia": 1, "Pruritus": 1, "Pulmonary thrombosis": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Time perception altered": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FP7082", "histograms": [{"histogram": {"Off label use": 4, "Immunisation": 3, "Investigation": 3, "Herpes zoster": 2, "Amnesia": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Biopsy": 1, "Bronchitis": 1, "Clavicle fracture": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Cough": 1, "Disorientation": 1, "Dyspnoea": 1, "Hypokinesia": 1, "Infection": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Parapsoriasis": 1, "Pneumonia": 1, "Pruritus": 1, "Pulmonary thrombosis": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Time perception altered": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["FP7082"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FP7498.json b/docs/data/histograms/Brazil/FP7498.json
index 27b74d8b59b..2e1826accee 100644
--- a/docs/data/histograms/Brazil/FP7498.json
+++ b/docs/data/histograms/Brazil/FP7498.json
@@ -1 +1 @@
-{"batchcode": "FP7498", "histograms": [{"batchcodes": ["FP7498"], "histogram": {"Immunisation": 1, "Lymphadenopathy": 1, "Off label use": 1, "Pain in extremity": 1, "Rash pruritic": 1, "Skin reaction": 1, "Vaccination site eczema": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site vesicles": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "FP7498", "histograms": [{"histogram": {"Immunisation": 1, "Lymphadenopathy": 1, "Off label use": 1, "Pain in extremity": 1, "Rash pruritic": 1, "Skin reaction": 1, "Vaccination site eczema": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site vesicles": 1, "Vaccination site warmth": 1}, "batchcodes": ["FP7498"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FP8073.json b/docs/data/histograms/Brazil/FP8073.json
index 8ad0f87d36f..44e0608e38f 100644
--- a/docs/data/histograms/Brazil/FP8073.json
+++ b/docs/data/histograms/Brazil/FP8073.json
@@ -1 +1 @@
-{"batchcode": "FP8073", "histograms": [{"batchcodes": ["FP8073"], "histogram": {"Immunisation": 2, "Off label use": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Blood test": 1, "Cold sweat": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neck pain": 1, "Product label issue": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8073", "histograms": [{"histogram": {"Immunisation": 2, "Off label use": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Blood test": 1, "Cold sweat": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neck pain": 1, "Product label issue": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vomiting": 1}, "batchcodes": ["FP8073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FP8290.json b/docs/data/histograms/Brazil/FP8290.json
index e26ec6b1af3..e408fae0a3e 100644
--- a/docs/data/histograms/Brazil/FP8290.json
+++ b/docs/data/histograms/Brazil/FP8290.json
@@ -1 +1 @@
-{"batchcode": "FP8290", "histograms": [{"batchcodes": ["FP8290"], "histogram": {"Nausea": 2, "Urticaria": 2, "Asthenia": 1, "Blister": 1, "Body temperature": 1, "Body temperature decreased": 1, "Brain death": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Erythema": 1, "Eye pruritus": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Immune thrombocytopenia": 1, "Malaise": 1, "Nasal pruritus": 1, "Ocular hyperaemia": 1, "Pain": 1, "Purpura": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8290", "histograms": [{"histogram": {"Nausea": 2, "Urticaria": 2, "Asthenia": 1, "Blister": 1, "Body temperature": 1, "Body temperature decreased": 1, "Brain death": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Erythema": 1, "Eye pruritus": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Immune thrombocytopenia": 1, "Malaise": 1, "Nasal pruritus": 1, "Ocular hyperaemia": 1, "Pain": 1, "Purpura": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["FP8290"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FP8544.json b/docs/data/histograms/Brazil/FP8544.json
index 922d13272ef..2b2d79ecff1 100644
--- a/docs/data/histograms/Brazil/FP8544.json
+++ b/docs/data/histograms/Brazil/FP8544.json
@@ -1 +1 @@
-{"batchcode": "FP8544", "histograms": [{"batchcodes": ["FP8544"], "histogram": {"Lymphadenopathy": 1, "Overdose": 1, "Vaccination site pain": 1, "Vaccine coadministration": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8544", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Overdose": 1, "Vaccination site pain": 1, "Vaccine coadministration": 1}, "batchcodes": ["FP8544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FPS/07.json b/docs/data/histograms/Brazil/FPS/07.json
index baac0d0d98d..7eb8c82e973 100644
--- a/docs/data/histograms/Brazil/FPS/07.json
+++ b/docs/data/histograms/Brazil/FPS/07.json
@@ -1 +1 @@
-{"batchcode": "FPS/07", "histograms": [{"batchcodes": ["FPS/07"], "histogram": {"Blood test": 1, "Chest pain": 1, "Coagulopathy": 1, "Pain": 1, "Pain in extremity": 1, "Sneezing": 1, "Thrombosis": 1, "Walking disability": 1}}]}
\ No newline at end of file
+{"batchcode": "FPS/07", "histograms": [{"histogram": {"Blood test": 1, "Chest pain": 1, "Coagulopathy": 1, "Pain": 1, "Pain in extremity": 1, "Sneezing": 1, "Thrombosis": 1, "Walking disability": 1}, "batchcodes": ["FPS/07"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FR8026.json b/docs/data/histograms/Brazil/FR8026.json
index cd13df4fecf..aff1b1529fd 100644
--- a/docs/data/histograms/Brazil/FR8026.json
+++ b/docs/data/histograms/Brazil/FR8026.json
@@ -1 +1 @@
-{"batchcode": "FR8026", "histograms": [{"batchcodes": ["FR8026"], "histogram": {"Chest pain": 1, "Electrocardiogram": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "Troponin increased": 1, "Ventricular hypokinesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FR8026", "histograms": [{"histogram": {"Chest pain": 1, "Electrocardiogram": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "Troponin increased": 1, "Ventricular hypokinesia": 1}, "batchcodes": ["FR8026"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FR8392.json b/docs/data/histograms/Brazil/FR8392.json
index ec7d2bc2ca9..22f1da56227 100644
--- a/docs/data/histograms/Brazil/FR8392.json
+++ b/docs/data/histograms/Brazil/FR8392.json
@@ -1 +1 @@
-{"batchcode": "FR8392", "histograms": [{"batchcodes": ["FR8392"], "histogram": {"Pyrexia": 2, "Body temperature": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Pain": 1, "Skin discolouration": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FR8392", "histograms": [{"histogram": {"Pyrexia": 2, "Body temperature": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Pain": 1, "Skin discolouration": 1, "Vomiting": 1}, "batchcodes": ["FR8392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FR9412.json b/docs/data/histograms/Brazil/FR9412.json
index 4c7b02f6208..784ae0c6395 100644
--- a/docs/data/histograms/Brazil/FR9412.json
+++ b/docs/data/histograms/Brazil/FR9412.json
@@ -1 +1 @@
-{"batchcode": "FR9412", "histograms": [{"batchcodes": ["FR9412"], "histogram": {"Headache": 1, "Malaise": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Skin discolouration": 1, "Skin reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FR9412", "histograms": [{"histogram": {"Headache": 1, "Malaise": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Skin discolouration": 1, "Skin reaction": 1}, "batchcodes": ["FR9412"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FS4184.json b/docs/data/histograms/Brazil/FS4184.json
index 0ab215242df..02c19c4a085 100644
--- a/docs/data/histograms/Brazil/FS4184.json
+++ b/docs/data/histograms/Brazil/FS4184.json
@@ -1 +1 @@
-{"batchcode": "FS4184", "histograms": [{"batchcodes": ["FS4184"], "histogram": {"Cardiac failure": 1, "Fatigue": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FS4184", "histograms": [{"histogram": {"Cardiac failure": 1, "Fatigue": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Off label use": 1}, "batchcodes": ["FS4184"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FT5177.json b/docs/data/histograms/Brazil/FT5177.json
index 3e039edeb71..51511e748e6 100644
--- a/docs/data/histograms/Brazil/FT5177.json
+++ b/docs/data/histograms/Brazil/FT5177.json
@@ -1 +1 @@
-{"batchcode": "FT5177", "histograms": [{"batchcodes": ["FT5177"], "histogram": {"Immunisation": 2, "Off label use": 2, "Pain": 2, "Pruritus": 2, "Blister": 1, "Body temperature": 1, "Condition aggravated": 1, "Erythema": 1, "Flushing": 1, "Headache": 1, "Hypersensitivity": 1, "Inflammation": 1, "Influenza like illness": 1, "Loss of personal independence in daily activities": 1, "Mass": 1, "Oedema": 1, "Pyrexia": 1, "Secretion discharge": 1, "Skin lesion": 1, "Skin warm": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FT5177", "histograms": [{"histogram": {"Immunisation": 2, "Off label use": 2, "Pain": 2, "Pruritus": 2, "Blister": 1, "Body temperature": 1, "Condition aggravated": 1, "Erythema": 1, "Flushing": 1, "Headache": 1, "Hypersensitivity": 1, "Inflammation": 1, "Influenza like illness": 1, "Loss of personal independence in daily activities": 1, "Mass": 1, "Oedema": 1, "Pyrexia": 1, "Secretion discharge": 1, "Skin lesion": 1, "Skin warm": 1, "Wrong product administered": 1}, "batchcodes": ["FT5177"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FT7280.json b/docs/data/histograms/Brazil/FT7280.json
index 37ebf44df79..337700e5d15 100644
--- a/docs/data/histograms/Brazil/FT7280.json
+++ b/docs/data/histograms/Brazil/FT7280.json
@@ -1 +1 @@
-{"batchcode": "FT7280", "histograms": [{"batchcodes": ["FT7280"], "histogram": {"Immunisation": 2, "Off label use": 2, "Ageusia": 1, "Anosmia": 1, "Bone pain": 1, "Bone swelling": 1, "Fear": 1, "Skin discolouration": 1, "Synovial cyst": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FT7280", "histograms": [{"histogram": {"Immunisation": 2, "Off label use": 2, "Ageusia": 1, "Anosmia": 1, "Bone pain": 1, "Bone swelling": 1, "Fear": 1, "Skin discolouration": 1, "Synovial cyst": 1, "Thrombosis": 1}, "batchcodes": ["FT7280"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FW0199.json b/docs/data/histograms/Brazil/FW0199.json
index cc29dadbb8b..875316a1dfd 100644
--- a/docs/data/histograms/Brazil/FW0199.json
+++ b/docs/data/histograms/Brazil/FW0199.json
@@ -1 +1 @@
-{"batchcode": "FW0199", "histograms": [{"batchcodes": ["FW0199"], "histogram": {"Activated partial thromboplastin time": 1, "Band neutrophil count": 1, "Basophil count": 1, "Blast cells": 1, "Blood count": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Deep vein thrombosis": 1, "Dysstasia": 1, "Eosinophil count": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Lymphocyte count": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Metamyelocyte count": 1, "Monocyte count": 1, "Myelocyte count": 1, "Neutrophil count": 1, "Pain in extremity": 1, "Platelet count": 1, "Promyelocyte count": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Thrombin time": 1, "Ultrasound Doppler": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FW0199", "histograms": [{"histogram": {"Activated partial thromboplastin time": 1, "Band neutrophil count": 1, "Basophil count": 1, "Blast cells": 1, "Blood count": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Deep vein thrombosis": 1, "Dysstasia": 1, "Eosinophil count": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Lymphocyte count": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Metamyelocyte count": 1, "Monocyte count": 1, "Myelocyte count": 1, "Neutrophil count": 1, "Pain in extremity": 1, "Platelet count": 1, "Promyelocyte count": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Thrombin time": 1, "Ultrasound Doppler": 1, "White blood cell count": 1}, "batchcodes": ["FW0199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FW2899.json b/docs/data/histograms/Brazil/FW2899.json
index 6366e068bc4..7ec036db049 100644
--- a/docs/data/histograms/Brazil/FW2899.json
+++ b/docs/data/histograms/Brazil/FW2899.json
@@ -1 +1 @@
-{"batchcode": "FW2899", "histograms": [{"batchcodes": ["FW2899"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FW2899", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FW2899"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FW4423.json b/docs/data/histograms/Brazil/FW4423.json
index 7b844855710..806a5b259c6 100644
--- a/docs/data/histograms/Brazil/FW4423.json
+++ b/docs/data/histograms/Brazil/FW4423.json
@@ -1 +1 @@
-{"batchcode": "FW4423", "histograms": [{"batchcodes": ["FW4423"], "histogram": {"Decreased appetite": 1, "Fatigue": 1, "Investigation": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FW4423", "histograms": [{"histogram": {"Decreased appetite": 1, "Fatigue": 1, "Investigation": 1, "Pyrexia": 1}, "batchcodes": ["FW4423"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/FW6014.json b/docs/data/histograms/Brazil/FW6014.json
index 47a25549bb4..170a9a11053 100644
--- a/docs/data/histograms/Brazil/FW6014.json
+++ b/docs/data/histograms/Brazil/FW6014.json
@@ -1 +1 @@
-{"batchcode": "FW6014", "histograms": [{"batchcodes": ["FW6014"], "histogram": {"Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Haemorrhage": 1, "Malaise": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FW6014", "histograms": [{"histogram": {"Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Haemorrhage": 1, "Malaise": 1, "Wrong product administered": 1}, "batchcodes": ["FW6014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/GC9016.json b/docs/data/histograms/Brazil/GC9016.json
index e77975d3bc8..22c2cf02039 100644
--- a/docs/data/histograms/Brazil/GC9016.json
+++ b/docs/data/histograms/Brazil/GC9016.json
@@ -1 +1 @@
-{"batchcode": "GC9016", "histograms": [{"batchcodes": ["GC9016"], "histogram": {"Diarrhoea": 1, "Rash macular": 1, "Stool analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "GC9016", "histograms": [{"histogram": {"Diarrhoea": 1, "Rash macular": 1, "Stool analysis": 1}, "batchcodes": ["GC9016"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/L-FP8290.json b/docs/data/histograms/Brazil/L-FP8290.json
index 10079d34bbd..3f3893001a2 100644
--- a/docs/data/histograms/Brazil/L-FP8290.json
+++ b/docs/data/histograms/Brazil/L-FP8290.json
@@ -1 +1 @@
-{"batchcode": "L-FP8290", "histograms": [{"batchcodes": ["L-FP8290"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "L-FP8290", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Syncope": 1}, "batchcodes": ["L-FP8290"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/L211521A.json b/docs/data/histograms/Brazil/L211521A.json
index d14e691d506..65272a5a1c8 100644
--- a/docs/data/histograms/Brazil/L211521A.json
+++ b/docs/data/histograms/Brazil/L211521A.json
@@ -1 +1 @@
-{"batchcode": "L211521A", "histograms": [{"batchcodes": ["L211521A"], "histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "L211521A", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["L211521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/LFD7208.json b/docs/data/histograms/Brazil/LFD7208.json
index b9680ded213..f015e171865 100644
--- a/docs/data/histograms/Brazil/LFD7208.json
+++ b/docs/data/histograms/Brazil/LFD7208.json
@@ -1 +1 @@
-{"batchcode": "LFD7208", "histograms": [{"batchcodes": ["LFD7208"], "histogram": {"Cerebral thrombosis": 1, "Muscle rigidity": 1, "Peripheral swelling": 1, "SARS-CoV-2 test negative": 1, "Specialist consultation": 1, "Vascular purpura": 1, "Venous thrombosis limb": 1}}]}
\ No newline at end of file
+{"batchcode": "LFD7208", "histograms": [{"histogram": {"Cerebral thrombosis": 1, "Muscle rigidity": 1, "Peripheral swelling": 1, "SARS-CoV-2 test negative": 1, "Specialist consultation": 1, "Vascular purpura": 1, "Venous thrombosis limb": 1}, "batchcodes": ["LFD7208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/LFF5107.json b/docs/data/histograms/Brazil/LFF5107.json
index 1035ae75e61..4e477db479e 100644
--- a/docs/data/histograms/Brazil/LFF5107.json
+++ b/docs/data/histograms/Brazil/LFF5107.json
@@ -1 +1 @@
-{"batchcode": "LFF5107", "histograms": [{"batchcodes": ["LFF5107"], "histogram": {"Chronic gastritis": 1, "Investigation": 1, "Lactose intolerance": 1, "Memory impairment": 1, "Paraesthesia": 1, "Red blood cell abnormality": 1, "Red blood cell count": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "LFF5107", "histograms": [{"histogram": {"Chronic gastritis": 1, "Investigation": 1, "Lactose intolerance": 1, "Memory impairment": 1, "Paraesthesia": 1, "Red blood cell abnormality": 1, "Red blood cell count": 1, "Visual impairment": 1}, "batchcodes": ["LFF5107"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/LFM3809.json b/docs/data/histograms/Brazil/LFM3809.json
index 9bb31cfc7f2..cd06b93f450 100644
--- a/docs/data/histograms/Brazil/LFM3809.json
+++ b/docs/data/histograms/Brazil/LFM3809.json
@@ -1 +1 @@
-{"batchcode": "LFM3809", "histograms": [{"batchcodes": ["LFM3809"], "histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Feeling abnormal": 1, "Investigation": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "LFM3809", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Feeling abnormal": 1, "Investigation": 1, "Malaise": 1}, "batchcodes": ["LFM3809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/PA9091.json b/docs/data/histograms/Brazil/PA9091.json
index 9fb5c4a9906..55a970b56b2 100644
--- a/docs/data/histograms/Brazil/PA9091.json
+++ b/docs/data/histograms/Brazil/PA9091.json
@@ -1 +1 @@
-{"batchcode": "PA9091", "histograms": [{"batchcodes": ["PA9091"], "histogram": {"Guillain-Barre syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "PA9091", "histograms": [{"histogram": {"Guillain-Barre syndrome": 1}, "batchcodes": ["PA9091"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/PAA173696.json b/docs/data/histograms/Brazil/PAA173696.json
index 2c8dadc5933..68326c103e1 100644
--- a/docs/data/histograms/Brazil/PAA173696.json
+++ b/docs/data/histograms/Brazil/PAA173696.json
@@ -1 +1 @@
-{"batchcode": "PAA173696", "histograms": [{"batchcodes": ["PAA173696"], "histogram": {"Angiopathy": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA173696", "histograms": [{"histogram": {"Angiopathy": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["PAA173696"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/PCA0084.json b/docs/data/histograms/Brazil/PCA0084.json
index 9f286d17d58..ff35d2ef2ff 100644
--- a/docs/data/histograms/Brazil/PCA0084.json
+++ b/docs/data/histograms/Brazil/PCA0084.json
@@ -1 +1 @@
-{"batchcode": "PCA0084", "histograms": [{"batchcodes": ["PCA0084"], "histogram": {"Immune system disorder": 1, "Immunisation": 1, "Neoplasm malignant": 1, "Off label use": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0084", "histograms": [{"histogram": {"Immune system disorder": 1, "Immunisation": 1, "Neoplasm malignant": 1, "Off label use": 1, "Pericarditis": 1}, "batchcodes": ["PCA0084"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/PE3591.json b/docs/data/histograms/Brazil/PE3591.json
index e46e16126fa..feee9384563 100644
--- a/docs/data/histograms/Brazil/PE3591.json
+++ b/docs/data/histograms/Brazil/PE3591.json
@@ -1 +1 @@
-{"batchcode": "PE3591", "histograms": [{"batchcodes": ["PE3591"], "histogram": {"Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Body temperature": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Insomnia": 1, "Investigation": 1, "Mouth swelling": 1, "Pyrexia": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "PE3591", "histograms": [{"histogram": {"Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Body temperature": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Insomnia": 1, "Investigation": 1, "Mouth swelling": 1, "Pyrexia": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["PE3591"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/SS8846.json b/docs/data/histograms/Brazil/SS8846.json
index 5a78a1b238b..fc81c04500f 100644
--- a/docs/data/histograms/Brazil/SS8846.json
+++ b/docs/data/histograms/Brazil/SS8846.json
@@ -1 +1 @@
-{"batchcode": "SS8846", "histograms": [{"batchcodes": ["SS8846"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Near death experience": 1, "Tinnitus": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "SS8846", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Near death experience": 1, "Tinnitus": 1, "Vision blurred": 1}, "batchcodes": ["SS8846"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/UNK.json b/docs/data/histograms/Brazil/UNK.json
index 2e4c1674c09..2093db0c0c8 100644
--- a/docs/data/histograms/Brazil/UNK.json
+++ b/docs/data/histograms/Brazil/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK"], "histogram": {"COVID-19": 2, "Chills": 2, "Circumstance or information capable of leading to medication error": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pyrexia": 2, "Amnesia": 1, "Asthenia": 1, "Bone pain": 1, "Coma": 1, "Computerised tomogram": 1, "Coronavirus infection": 1, "Coronavirus test negative": 1, "Coronavirus test positive": 1, "Cough": 1, "Diarrhoea": 1, "Hypokinesia": 1, "Influenza": 1, "Lung disorder": 1, "Malaise": 1, "Muscle atrophy": 1, "Nasal inflammation": 1, "Nasal operation": 1, "Nasopharyngitis": 1, "Overdose": 1, "Pain in extremity": 1, "Pneumonia": 1, "Product dose omission issue": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Speech disorder": 1, "Systemic lupus erythematosus": 1, "Vomiting": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"COVID-19": 2, "Chills": 2, "Circumstance or information capable of leading to medication error": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Pain": 2, "Pyrexia": 2, "Amnesia": 1, "Asthenia": 1, "Bone pain": 1, "Coma": 1, "Computerised tomogram": 1, "Coronavirus infection": 1, "Coronavirus test negative": 1, "Coronavirus test positive": 1, "Cough": 1, "Diarrhoea": 1, "Hypokinesia": 1, "Influenza": 1, "Lung disorder": 1, "Malaise": 1, "Muscle atrophy": 1, "Nasal inflammation": 1, "Nasal operation": 1, "Nasopharyngitis": 1, "Overdose": 1, "Pain in extremity": 1, "Pneumonia": 1, "Product dose omission issue": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Speech disorder": 1, "Systemic lupus erythematosus": 1, "Vomiting": 1, "Weight decreased": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/UNKONWN.json b/docs/data/histograms/Brazil/UNKONWN.json
index 0de1676bf01..9cc7c275060 100644
--- a/docs/data/histograms/Brazil/UNKONWN.json
+++ b/docs/data/histograms/Brazil/UNKONWN.json
@@ -1 +1 @@
-{"batchcode": "UNKONWN", "histograms": [{"batchcodes": ["UNKONWN"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "UNKONWN", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["UNKONWN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/UNKOWN.json b/docs/data/histograms/Brazil/UNKOWN.json
index f54b85b3eee..8c4bd0df137 100644
--- a/docs/data/histograms/Brazil/UNKOWN.json
+++ b/docs/data/histograms/Brazil/UNKOWN.json
@@ -1 +1 @@
-{"batchcode": "UNKOWN", "histograms": [{"batchcodes": ["UNKOWN"], "histogram": {"Adverse event": 1, "Biopsy": 1, "Dermatomyositis": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Systemic lupus erythematosus": 1}}]}
\ No newline at end of file
+{"batchcode": "UNKOWN", "histograms": [{"histogram": {"Adverse event": 1, "Biopsy": 1, "Dermatomyositis": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Systemic lupus erythematosus": 1}, "batchcodes": ["UNKOWN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brazil/XE393.json b/docs/data/histograms/Brazil/XE393.json
index 009800a32df..85a20ea5064 100644
--- a/docs/data/histograms/Brazil/XE393.json
+++ b/docs/data/histograms/Brazil/XE393.json
@@ -1 +1 @@
-{"batchcode": "XE393", "histograms": [{"batchcodes": ["XE393"], "histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "XE393", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["XE393"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/3003184.json b/docs/data/histograms/Brunei Darussalam/3003184.json
index 8e099e74d39..a1a50c7be32 100644
--- a/docs/data/histograms/Brunei Darussalam/3003184.json
+++ b/docs/data/histograms/Brunei Darussalam/3003184.json
@@ -1 +1 @@
-{"batchcode": "3003184", "histograms": [{"batchcodes": ["3003184"], "histogram": {"Cellulitis": 4, "Chest pain": 4, "Vaccination site cellulitis": 4, "Bell's palsy": 3, "Dizziness": 3, "Dyspnoea": 2, "Facial paresis": 2, "Ischaemic stroke": 2, "Myocardial infarction": 2, "Thrombocytopenia": 2, "Vaccination site swelling": 2, "Abscess": 1, "Acute myocardial infarction": 1, "Cardiac arrest": 1, "Cerebral haemorrhage": 1, "Fatigue": 1, "Headache": 1, "Hemiparesis": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Injection site erythema": 1, "Lagophthalmos": 1, "Leukopenia": 1, "Muscular weakness": 1, "Palpitations": 1, "Product storage error": 1, "Pyrexia": 1, "Supraventricular tachycardia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3003184", "histograms": [{"histogram": {"Cellulitis": 4, "Chest pain": 4, "Vaccination site cellulitis": 4, "Bell's palsy": 3, "Dizziness": 3, "Dyspnoea": 2, "Facial paresis": 2, "Ischaemic stroke": 2, "Myocardial infarction": 2, "Thrombocytopenia": 2, "Vaccination site swelling": 2, "Abscess": 1, "Acute myocardial infarction": 1, "Cardiac arrest": 1, "Cerebral haemorrhage": 1, "Fatigue": 1, "Headache": 1, "Hemiparesis": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Injection site erythema": 1, "Lagophthalmos": 1, "Leukopenia": 1, "Muscular weakness": 1, "Palpitations": 1, "Product storage error": 1, "Pyrexia": 1, "Supraventricular tachycardia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["3003184"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/3004668.json b/docs/data/histograms/Brunei Darussalam/3004668.json
index 20989496882..13e4dd61e90 100644
--- a/docs/data/histograms/Brunei Darussalam/3004668.json
+++ b/docs/data/histograms/Brunei Darussalam/3004668.json
@@ -1 +1 @@
-{"batchcode": "3004668", "histograms": [{"batchcodes": ["3004668"], "histogram": {"Myocardial infarction": 4, "Cellulitis": 3, "Dyspnoea": 3, "Abortion threatened": 2, "Chest discomfort": 2, "Chest pain": 2, "Cough": 2, "Haemorrhagic stroke": 2, "Influenza": 2, "Pruritus": 2, "Urticaria": 2, "Vaginal haemorrhage": 2, "Arthralgia": 1, "Asthma": 1, "Dizziness": 1, "Erythema multiforme": 1, "Eye swelling": 1, "Headache": 1, "Hypoaesthesia": 1, "Joint swelling": 1, "Lethargy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Multiple organ dysfunction syndrome": 1, "Myocarditis": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Presyncope": 1, "Product physical issue": 1, "Product storage error": 1, "Product use issue": 1, "Rash": 1, "Rheumatoid arthritis": 1, "Sepsis": 1, "Septic shock": 1, "Swelling face": 1, "Throat irritation": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "3004668", "histograms": [{"histogram": {"Myocardial infarction": 4, "Cellulitis": 3, "Dyspnoea": 3, "Abortion threatened": 2, "Chest discomfort": 2, "Chest pain": 2, "Cough": 2, "Haemorrhagic stroke": 2, "Influenza": 2, "Pruritus": 2, "Urticaria": 2, "Vaginal haemorrhage": 2, "Arthralgia": 1, "Asthma": 1, "Dizziness": 1, "Erythema multiforme": 1, "Eye swelling": 1, "Headache": 1, "Hypoaesthesia": 1, "Joint swelling": 1, "Lethargy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Multiple organ dysfunction syndrome": 1, "Myocarditis": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Presyncope": 1, "Product physical issue": 1, "Product storage error": 1, "Product use issue": 1, "Rash": 1, "Rheumatoid arthritis": 1, "Sepsis": 1, "Septic shock": 1, "Swelling face": 1, "Throat irritation": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["3004668"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/3004729.json b/docs/data/histograms/Brunei Darussalam/3004729.json
index 9d174dc69a1..8c1e283cb44 100644
--- a/docs/data/histograms/Brunei Darussalam/3004729.json
+++ b/docs/data/histograms/Brunei Darussalam/3004729.json
@@ -1 +1 @@
-{"batchcode": "3004729", "histograms": [{"batchcodes": ["3004729"], "histogram": {"Angioedema": 1, "Myalgia": 1, "Pyrexia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3004729", "histograms": [{"histogram": {"Angioedema": 1, "Myalgia": 1, "Pyrexia": 1, "Urticaria": 1}, "batchcodes": ["3004729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/3004736.json b/docs/data/histograms/Brunei Darussalam/3004736.json
index cea446ce526..38e0e0223e9 100644
--- a/docs/data/histograms/Brunei Darussalam/3004736.json
+++ b/docs/data/histograms/Brunei Darussalam/3004736.json
@@ -1 +1 @@
-{"batchcode": "3004736", "histograms": [{"batchcodes": ["3004736"], "histogram": {"Pyrexia": 9, "Dyspnoea": 8, "Asthenia": 5, "Bell's palsy": 5, "Sepsis": 5, "Vomiting": 5, "Abdominal pain": 4, "Chest pain": 4, "Decreased appetite": 4, "Abortion spontaneous": 3, "Acute myocardial infarction": 3, "Cough": 3, "Death": 3, "Haemorrhagic stroke": 3, "Headache": 3, "Lower respiratory tract infection": 3, "Malaise": 3, "Acute kidney injury": 2, "Back pain": 2, "Blood pressure increased": 2, "Cellulitis": 2, "Chills": 2, "Diarrhoea": 2, "Hemiparesis": 2, "Musculoskeletal stiffness": 2, "Nausea": 2, "Palpitations": 2, "Pneumonia": 2, "Seizure": 2, "Abdominal distension": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Brain herniation": 1, "Bronchitis": 1, "Cardiac failure": 1, "Colitis": 1, "Device related sepsis": 1, "Disease progression": 1, "Dizziness": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysstasia": 1, "Epigastric discomfort": 1, "Essential hypertension": 1, "Facial discomfort": 1, "Faeces discoloured": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Gastrointestinal stoma output increased": 1, "Glucocorticoid deficiency": 1, "Haematemesis": 1, "Hallucination": 1, "Hemiplegic migraine": 1, "Hepatic function abnormal": 1, "Hyperthyroidism": 1, "Hypervolaemia": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "Illness": 1, "Infection": 1, "Influenza": 1, "Injection site cellulitis": 1, "Insomnia": 1, "Irritability": 1, "Left ventricular dysfunction": 1, "Lethargy": 1, "Liver function test abnormal": 1, "Loss of consciousness": 1, "Lymphoproliferative disorder": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocarditis": 1, "Nasal congestion": 1, "Neoplasm malignant": 1, "Night sweats": 1, "Occipital neuralgia": 1, "Pallor": 1, "Pancytopenia": 1, "Paraesthesia": 1, "Poor quality sleep": 1, "Pruritus": 1, "Pulmonary oedema": 1, "Rash": 1, "Rectal haemorrhage": 1, "Speech disorder": 1, "Streptococcal bacteraemia": 1, "Stress cardiomyopathy": 1, "Subdural haemorrhage": 1, "Syncope": 1, "Upper gastrointestinal haemorrhage": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Vaccination site cellulitis": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "3004736", "histograms": [{"histogram": {"Pyrexia": 9, "Dyspnoea": 8, "Asthenia": 5, "Bell's palsy": 5, "Sepsis": 5, "Vomiting": 5, "Abdominal pain": 4, "Chest pain": 4, "Decreased appetite": 4, "Abortion spontaneous": 3, "Acute myocardial infarction": 3, "Cough": 3, "Death": 3, "Haemorrhagic stroke": 3, "Headache": 3, "Lower respiratory tract infection": 3, "Malaise": 3, "Acute kidney injury": 2, "Back pain": 2, "Blood pressure increased": 2, "Cellulitis": 2, "Chills": 2, "Diarrhoea": 2, "Hemiparesis": 2, "Musculoskeletal stiffness": 2, "Nausea": 2, "Palpitations": 2, "Pneumonia": 2, "Seizure": 2, "Abdominal distension": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Brain herniation": 1, "Bronchitis": 1, "Cardiac failure": 1, "Colitis": 1, "Device related sepsis": 1, "Disease progression": 1, "Dizziness": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysstasia": 1, "Epigastric discomfort": 1, "Essential hypertension": 1, "Facial discomfort": 1, "Faeces discoloured": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Gastrointestinal stoma output increased": 1, "Glucocorticoid deficiency": 1, "Haematemesis": 1, "Hallucination": 1, "Hemiplegic migraine": 1, "Hepatic function abnormal": 1, "Hyperthyroidism": 1, "Hypervolaemia": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "Illness": 1, "Infection": 1, "Influenza": 1, "Injection site cellulitis": 1, "Insomnia": 1, "Irritability": 1, "Left ventricular dysfunction": 1, "Lethargy": 1, "Liver function test abnormal": 1, "Loss of consciousness": 1, "Lymphoproliferative disorder": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocarditis": 1, "Nasal congestion": 1, "Neoplasm malignant": 1, "Night sweats": 1, "Occipital neuralgia": 1, "Pallor": 1, "Pancytopenia": 1, "Paraesthesia": 1, "Poor quality sleep": 1, "Pruritus": 1, "Pulmonary oedema": 1, "Rash": 1, "Rectal haemorrhage": 1, "Speech disorder": 1, "Streptococcal bacteraemia": 1, "Stress cardiomyopathy": 1, "Subdural haemorrhage": 1, "Syncope": 1, "Upper gastrointestinal haemorrhage": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Vaccination site cellulitis": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["3004736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/3005237.json b/docs/data/histograms/Brunei Darussalam/3005237.json
index 614600eeb2e..2102ba53b62 100644
--- a/docs/data/histograms/Brunei Darussalam/3005237.json
+++ b/docs/data/histograms/Brunei Darussalam/3005237.json
@@ -1 +1 @@
-{"batchcode": "3005237", "histograms": [{"batchcodes": ["3005237"], "histogram": {"Dysarthria": 3, "Cough": 2, "Facial paralysis": 2, "Hemiparesis": 2, "Ischaemic stroke": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vaginal haemorrhage": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abortion spontaneous": 1, "Acute coronary syndrome": 1, "Anaemia": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cholangitis acute": 1, "Coital bleeding": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Haematemesis": 1, "Haemorrhagic stroke": 1, "Hypoaesthesia": 1, "Joint swelling": 1, "Liver function test abnormal": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Palpitations": 1, "Peptic ulcer": 1, "Peripheral swelling": 1, "Polyarthritis": 1, "Sepsis": 1, "Swelling": 1, "Syncope": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "3005237", "histograms": [{"histogram": {"Dysarthria": 3, "Cough": 2, "Facial paralysis": 2, "Hemiparesis": 2, "Ischaemic stroke": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vaginal haemorrhage": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abortion spontaneous": 1, "Acute coronary syndrome": 1, "Anaemia": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cholangitis acute": 1, "Coital bleeding": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Haematemesis": 1, "Haemorrhagic stroke": 1, "Hypoaesthesia": 1, "Joint swelling": 1, "Liver function test abnormal": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Palpitations": 1, "Peptic ulcer": 1, "Peripheral swelling": 1, "Polyarthritis": 1, "Sepsis": 1, "Swelling": 1, "Syncope": 1, "Tenderness": 1}, "batchcodes": ["3005237"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/3005784.json b/docs/data/histograms/Brunei Darussalam/3005784.json
index 6760a527d00..f4e9f154137 100644
--- a/docs/data/histograms/Brunei Darussalam/3005784.json
+++ b/docs/data/histograms/Brunei Darussalam/3005784.json
@@ -1 +1 @@
-{"batchcode": "3005784", "histograms": [{"batchcodes": ["3005784"], "histogram": {"Abdominal pain": 1, "Abortion spontaneous": 1, "Back pain": 1, "Cardiac arrest": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "3005784", "histograms": [{"histogram": {"Abdominal pain": 1, "Abortion spontaneous": 1, "Back pain": 1, "Cardiac arrest": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["3005784"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/3005793.json b/docs/data/histograms/Brunei Darussalam/3005793.json
index 49ad1fa9f6a..acb96cefebd 100644
--- a/docs/data/histograms/Brunei Darussalam/3005793.json
+++ b/docs/data/histograms/Brunei Darussalam/3005793.json
@@ -1 +1 @@
-{"batchcode": "3005793", "histograms": [{"batchcodes": ["3005793"], "histogram": {"Cellulitis": 1, "Chromaturia": 1, "Eructation": 1, "Gastritis": 1, "Haematuria": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "3005793", "histograms": [{"histogram": {"Cellulitis": 1, "Chromaturia": 1, "Eructation": 1, "Gastritis": 1, "Haematuria": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["3005793"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/EN6203.json b/docs/data/histograms/Brunei Darussalam/EN6203.json
index 1a3d294ab45..7d63245374e 100644
--- a/docs/data/histograms/Brunei Darussalam/EN6203.json
+++ b/docs/data/histograms/Brunei Darussalam/EN6203.json
@@ -1 +1 @@
-{"batchcode": "EN6203", "histograms": [{"batchcodes": ["EN6203"], "histogram": {"Chills": 1, "Fatigue": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6203", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["EN6203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Brunei Darussalam/FK6268.json b/docs/data/histograms/Brunei Darussalam/FK6268.json
index eb1f1b74f61..10b51805c58 100644
--- a/docs/data/histograms/Brunei Darussalam/FK6268.json
+++ b/docs/data/histograms/Brunei Darussalam/FK6268.json
@@ -1 +1 @@
-{"batchcode": "FK6268", "histograms": [{"batchcodes": ["FK6268"], "histogram": {"SARS-CoV-2 test": 3, "Syncope": 3, "Decreased appetite": 2, "Eye movement disorder": 2, "Pyrexia": 2, "Asthenia": 1, "Bell's palsy": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Cardiac arrest": 1, "Death": 1, "Dizziness": 1, "Drooling": 1, "Dyskinesia": 1, "Epistaxis": 1, "Foaming at mouth": 1, "Headache": 1, "Irritability": 1, "Multiple organ dysfunction syndrome": 1, "Nausea": 1, "Nosocomial infection": 1, "Pain": 1, "Petit mal epilepsy": 1, "Pneumonia aspiration": 1, "Procedural pneumothorax": 1, "Seizure": 1, "Selective eating disorder": 1, "Troponin": 1, "Troponin increased": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6268", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "Syncope": 3, "Decreased appetite": 2, "Eye movement disorder": 2, "Pyrexia": 2, "Asthenia": 1, "Bell's palsy": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Cardiac arrest": 1, "Death": 1, "Dizziness": 1, "Drooling": 1, "Dyskinesia": 1, "Epistaxis": 1, "Foaming at mouth": 1, "Headache": 1, "Irritability": 1, "Multiple organ dysfunction syndrome": 1, "Nausea": 1, "Nosocomial infection": 1, "Pain": 1, "Petit mal epilepsy": 1, "Pneumonia aspiration": 1, "Procedural pneumothorax": 1, "Seizure": 1, "Selective eating disorder": 1, "Troponin": 1, "Troponin increased": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["FK6268"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Burundi/EL0142.json b/docs/data/histograms/Burundi/EL0142.json
index b18a45b0770..9712e9096c7 100644
--- a/docs/data/histograms/Burundi/EL0142.json
+++ b/docs/data/histograms/Burundi/EL0142.json
@@ -1 +1 @@
-{"batchcode": "EL0142", "histograms": [{"batchcodes": ["EL0142", "EM9809"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0142", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["EL0142", "EM9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Burundi/EM9809.json b/docs/data/histograms/Burundi/EM9809.json
index 00526058680..6f5797416ae 100644
--- a/docs/data/histograms/Burundi/EM9809.json
+++ b/docs/data/histograms/Burundi/EM9809.json
@@ -1 +1 @@
-{"batchcode": "EM9809", "histograms": [{"batchcodes": ["EL0142", "EM9809"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9809", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["EL0142", "EM9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/022C21A.json b/docs/data/histograms/Cabo Verde/022C21A.json
index cce3ab512dd..355565f8814 100644
--- a/docs/data/histograms/Cabo Verde/022C21A.json
+++ b/docs/data/histograms/Cabo Verde/022C21A.json
@@ -1 +1 @@
-{"batchcode": "022C21A", "histograms": [{"batchcodes": ["022C21A"], "histogram": {"Cold sweat": 1}}]}
\ No newline at end of file
+{"batchcode": "022C21A", "histograms": [{"histogram": {"Cold sweat": 1}, "batchcodes": ["022C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/039A21A.json b/docs/data/histograms/Cabo Verde/039A21A.json
index a96e586863b..045c8f70bb6 100644
--- a/docs/data/histograms/Cabo Verde/039A21A.json
+++ b/docs/data/histograms/Cabo Verde/039A21A.json
@@ -1 +1 @@
-{"batchcode": "039A21A", "histograms": [{"batchcodes": ["039A21A"], "histogram": {"Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site warmth": 1, "Lethargy": 1}}]}
\ No newline at end of file
+{"batchcode": "039A21A", "histograms": [{"histogram": {"Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site warmth": 1, "Lethargy": 1}, "batchcodes": ["039A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/1808978.json b/docs/data/histograms/Cabo Verde/1808978.json
index 7a05c814723..fc65d6f6709 100644
--- a/docs/data/histograms/Cabo Verde/1808978.json
+++ b/docs/data/histograms/Cabo Verde/1808978.json
@@ -1 +1 @@
-{"batchcode": "1808978", "histograms": [{"batchcodes": ["1808978"], "histogram": {"Anxiety": 1, "Cardiac discomfort": 1, "Energy increased": 1, "Feeling jittery": 1, "Headache": 1, "Lymphadenopathy": 1, "Psychomotor hyperactivity": 1, "Restlessness": 1}}]}
\ No newline at end of file
+{"batchcode": "1808978", "histograms": [{"histogram": {"Anxiety": 1, "Cardiac discomfort": 1, "Energy increased": 1, "Feeling jittery": 1, "Headache": 1, "Lymphadenopathy": 1, "Psychomotor hyperactivity": 1, "Restlessness": 1}, "batchcodes": ["1808978"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/CVS549.json b/docs/data/histograms/Cabo Verde/CVS549.json
index 99a48a47ad8..f244b7b4e6a 100644
--- a/docs/data/histograms/Cabo Verde/CVS549.json
+++ b/docs/data/histograms/Cabo Verde/CVS549.json
@@ -1 +1 @@
-{"batchcode": "CVS549", "histograms": [{"batchcodes": ["CVS549"], "histogram": {"Feeling abnormal": 1, "Hypersomnia": 1, "Ocular hyperaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "CVS549", "histograms": [{"histogram": {"Feeling abnormal": 1, "Hypersomnia": 1, "Ocular hyperaemia": 1}, "batchcodes": ["CVS549"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/ER8734.json b/docs/data/histograms/Cabo Verde/ER8734.json
index ea05ad4929e..44342d4ad8a 100644
--- a/docs/data/histograms/Cabo Verde/ER8734.json
+++ b/docs/data/histograms/Cabo Verde/ER8734.json
@@ -1 +1 @@
-{"batchcode": "ER8734", "histograms": [{"batchcodes": ["ER8734"], "histogram": {"Bell's palsy": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8734", "histograms": [{"histogram": {"Bell's palsy": 1}, "batchcodes": ["ER8734"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/ER8736.json b/docs/data/histograms/Cabo Verde/ER8736.json
index 2ec340e7e6e..e87b98682f2 100644
--- a/docs/data/histograms/Cabo Verde/ER8736.json
+++ b/docs/data/histograms/Cabo Verde/ER8736.json
@@ -1 +1 @@
-{"batchcode": "ER8736", "histograms": [{"batchcodes": ["ER8736"], "histogram": {"Bradykinesia": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Dysarthria": 1, "Fatigue": 1, "Gait disturbance": 1, "Grip strength decreased": 1, "Motor dysfunction": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8736", "histograms": [{"histogram": {"Bradykinesia": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Dysarthria": 1, "Fatigue": 1, "Gait disturbance": 1, "Grip strength decreased": 1, "Motor dysfunction": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Thrombosis": 1}, "batchcodes": ["ER8736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/ER8737.json b/docs/data/histograms/Cabo Verde/ER8737.json
index 2a563e9b950..39874f6b5e8 100644
--- a/docs/data/histograms/Cabo Verde/ER8737.json
+++ b/docs/data/histograms/Cabo Verde/ER8737.json
@@ -1 +1 @@
-{"batchcode": "ER8737", "histograms": [{"batchcodes": ["ER8737"], "histogram": {"Product administered to patient of inappropriate age": 1, "Rectal haemorrhage": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8737", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1, "Rectal haemorrhage": 1, "Thrombosis": 1}, "batchcodes": ["ER8737"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cabo Verde/EW0176.json b/docs/data/histograms/Cabo Verde/EW0176.json
index 636fe09bf7a..76ff4fb9f41 100644
--- a/docs/data/histograms/Cabo Verde/EW0176.json
+++ b/docs/data/histograms/Cabo Verde/EW0176.json
@@ -1 +1 @@
-{"batchcode": "EW0176", "histograms": [{"batchcodes": ["EW0176"], "histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0176", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Urticaria": 1}, "batchcodes": ["EW0176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/#53036-1041.json b/docs/data/histograms/Canada/#53036-1041.json
index 3fcf9e6bf90..37662f78cf4 100644
--- a/docs/data/histograms/Canada/#53036-1041.json
+++ b/docs/data/histograms/Canada/#53036-1041.json
@@ -1 +1 @@
-{"batchcode": "#53036-1041", "histograms": [{"batchcodes": ["#53036-1041"], "histogram": {"Deafness": 1}}]}
\ No newline at end of file
+{"batchcode": "#53036-1041", "histograms": [{"histogram": {"Deafness": 1}, "batchcodes": ["#53036-1041"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/003B21A.json b/docs/data/histograms/Canada/003B21A.json
index f3de566fa4c..e349241a2d4 100644
--- a/docs/data/histograms/Canada/003B21A.json
+++ b/docs/data/histograms/Canada/003B21A.json
@@ -1 +1 @@
-{"batchcode": "003B21A", "histograms": [{"batchcodes": ["003B21A"], "histogram": {"Dizziness": 2, "Anxiety": 1, "Hyperhidrosis": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "003B21A", "histograms": [{"histogram": {"Dizziness": 2, "Anxiety": 1, "Hyperhidrosis": 1, "Syncope": 1}, "batchcodes": ["003B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/003V21A.json b/docs/data/histograms/Canada/003V21A.json
index d7696e1353f..3159239ac1f 100644
--- a/docs/data/histograms/Canada/003V21A.json
+++ b/docs/data/histograms/Canada/003V21A.json
@@ -1 +1 @@
-{"batchcode": "003V21A", "histograms": [{"batchcodes": ["003V21A"], "histogram": {"Nausea": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "003V21A", "histograms": [{"histogram": {"Nausea": 1, "Vital signs measurement": 1}, "batchcodes": ["003V21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/007C21A.json b/docs/data/histograms/Canada/007C21A.json
index 75b34d07f5b..b951b7a26fc 100644
--- a/docs/data/histograms/Canada/007C21A.json
+++ b/docs/data/histograms/Canada/007C21A.json
@@ -1 +1 @@
-{"batchcode": "007C21A", "histograms": [{"batchcodes": ["007C21A"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "007C21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["007C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/0099WPDD00JHFTR.json b/docs/data/histograms/Canada/0099WPDD00JHFTR.json
index 08a4f636aac..1dd82b37de4 100644
--- a/docs/data/histograms/Canada/0099WPDD00JHFTR.json
+++ b/docs/data/histograms/Canada/0099WPDD00JHFTR.json
@@ -1 +1 @@
-{"batchcode": "0099WPDD00JHFTR", "histograms": [{"batchcodes": ["0099WPDD00JHFTR"], "histogram": {"Cellulitis": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Pallor": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0099WPDD00JHFTR", "histograms": [{"histogram": {"Cellulitis": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Pallor": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0099WPDD00JHFTR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/009L21A.json b/docs/data/histograms/Canada/009L21A.json
index e47ba7f511a..1707a8c42b5 100644
--- a/docs/data/histograms/Canada/009L21A.json
+++ b/docs/data/histograms/Canada/009L21A.json
@@ -1 +1 @@
-{"batchcode": "009L21A", "histograms": [{"batchcodes": ["009L21A"], "histogram": {"Angina pectoris": 1, "COVID-19 immunisation": 1, "Chest discomfort": 1, "Chest pain": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Interchange of vaccine products": 1, "Lethargy": 1, "Musculoskeletal chest pain": 1, "Nausea": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "009L21A", "histograms": [{"histogram": {"Angina pectoris": 1, "COVID-19 immunisation": 1, "Chest discomfort": 1, "Chest pain": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Interchange of vaccine products": 1, "Lethargy": 1, "Musculoskeletal chest pain": 1, "Nausea": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}, "batchcodes": ["009L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/00V21A.json b/docs/data/histograms/Canada/00V21A.json
index ac13fb45857..4e7549696fb 100644
--- a/docs/data/histograms/Canada/00V21A.json
+++ b/docs/data/histograms/Canada/00V21A.json
@@ -1 +1 @@
-{"batchcode": "00V21A", "histograms": [{"batchcodes": ["00V21A"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "00V21A", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["00V21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/011F21A.json b/docs/data/histograms/Canada/011F21A.json
index 64a5e281783..0c7cbb5d297 100644
--- a/docs/data/histograms/Canada/011F21A.json
+++ b/docs/data/histograms/Canada/011F21A.json
@@ -1 +1 @@
-{"batchcode": "011F21A", "histograms": [{"batchcodes": ["011F21A"], "histogram": {"Dizziness": 2, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "011F21A", "histograms": [{"histogram": {"Dizziness": 2, "Tremor": 1}, "batchcodes": ["011F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/011J20A.json b/docs/data/histograms/Canada/011J20A.json
index ec26987fbd0..b32ab40d919 100644
--- a/docs/data/histograms/Canada/011J20A.json
+++ b/docs/data/histograms/Canada/011J20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A", "histograms": [{"batchcodes": ["011J20A"], "histogram": {"Erythema": 1, "Flushing": 1, "Paraesthesia oral": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A", "histograms": [{"histogram": {"Erythema": 1, "Flushing": 1, "Paraesthesia oral": 1, "Vaccination site erythema": 1}, "batchcodes": ["011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/013M20A.json b/docs/data/histograms/Canada/013M20A.json
index 7a2b798e4cf..d4f5ec101b6 100644
--- a/docs/data/histograms/Canada/013M20A.json
+++ b/docs/data/histograms/Canada/013M20A.json
@@ -1 +1 @@
-{"batchcode": "013M20A", "histograms": [{"batchcodes": ["013M20A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["013M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/014F21A.json b/docs/data/histograms/Canada/014F21A.json
index 96589bfa7e2..6e23d380985 100644
--- a/docs/data/histograms/Canada/014F21A.json
+++ b/docs/data/histograms/Canada/014F21A.json
@@ -1 +1 @@
-{"batchcode": "014F21A", "histograms": [{"batchcodes": ["014F21A"], "histogram": {"Product preparation issue": 2, "Gait disturbance": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Nervousness": 1}}]}
\ No newline at end of file
+{"batchcode": "014F21A", "histograms": [{"histogram": {"Product preparation issue": 2, "Gait disturbance": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Nervousness": 1}, "batchcodes": ["014F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/016B21A.json b/docs/data/histograms/Canada/016B21A.json
index 815b5c7db6d..90fca857e6b 100644
--- a/docs/data/histograms/Canada/016B21A.json
+++ b/docs/data/histograms/Canada/016B21A.json
@@ -1 +1 @@
-{"batchcode": "016B21A", "histograms": [{"batchcodes": ["016B21A"], "histogram": {"Dizziness": 2, "Hot flush": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "No adverse event": 1, "Pallor": 1, "Palpitations": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "016B21A", "histograms": [{"histogram": {"Dizziness": 2, "Hot flush": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "No adverse event": 1, "Pallor": 1, "Palpitations": 1, "Visual impairment": 1}, "batchcodes": ["016B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/016E21A.json b/docs/data/histograms/Canada/016E21A.json
index c5d3bbfba6f..59120684441 100644
--- a/docs/data/histograms/Canada/016E21A.json
+++ b/docs/data/histograms/Canada/016E21A.json
@@ -1 +1 @@
-{"batchcode": "016E21A", "histograms": [{"batchcodes": ["016E21A"], "histogram": {"Myocarditis": 18, "Chest pain": 7, "Chest discomfort": 3, "Chills": 3, "Dyspnoea": 3, "Headache": 3, "Nausea": 3, "Pain": 3, "Pleuritic pain": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Back pain": 2, "Dizziness": 2, "Hyperhidrosis": 2, "Pericardial effusion": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Anaemia": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Cardiac failure": 1, "Concussion": 1, "Cough": 1, "Cyanosis": 1, "Decreased appetite": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Dyspepsia": 1, "Facial pain": 1, "Fall": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Illness": 1, "Left ventricular dysfunction": 1, "Lethargy": 1, "Malaise": 1, "Migraine": 1, "Myopericarditis": 1, "Myositis": 1, "Neck pain": 1, "Pallor": 1, "Paraesthesia": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Pulmonary oedema": 1, "Supraventricular tachycardia": 1, "Syncope": 1, "Tachycardia": 1, "Tachypnoea": 1, "Tremor": 1, "Vaginal haemorrhage": 1, "Ventricular tachycardia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "016E21A", "histograms": [{"histogram": {"Myocarditis": 18, "Chest pain": 7, "Chest discomfort": 3, "Chills": 3, "Dyspnoea": 3, "Headache": 3, "Nausea": 3, "Pain": 3, "Pleuritic pain": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Back pain": 2, "Dizziness": 2, "Hyperhidrosis": 2, "Pericardial effusion": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Anaemia": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Cardiac failure": 1, "Concussion": 1, "Cough": 1, "Cyanosis": 1, "Decreased appetite": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Dyspepsia": 1, "Facial pain": 1, "Fall": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Illness": 1, "Left ventricular dysfunction": 1, "Lethargy": 1, "Malaise": 1, "Migraine": 1, "Myopericarditis": 1, "Myositis": 1, "Neck pain": 1, "Pallor": 1, "Paraesthesia": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Pulmonary oedema": 1, "Supraventricular tachycardia": 1, "Syncope": 1, "Tachycardia": 1, "Tachypnoea": 1, "Tremor": 1, "Vaginal haemorrhage": 1, "Ventricular tachycardia": 1, "Vision blurred": 1}, "batchcodes": ["016E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/018F22A.json b/docs/data/histograms/Canada/018F22A.json
index 18808481b7e..9a21ba93979 100644
--- a/docs/data/histograms/Canada/018F22A.json
+++ b/docs/data/histograms/Canada/018F22A.json
@@ -1 +1 @@
-{"batchcode": "018F22A", "histograms": [{"batchcodes": ["018F22A"], "histogram": {"Cerebrovascular accident": 1}}]}
\ No newline at end of file
+{"batchcode": "018F22A", "histograms": [{"histogram": {"Cerebrovascular accident": 1}, "batchcodes": ["018F22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/019J21A.json b/docs/data/histograms/Canada/019J21A.json
index bb1cfc1ff24..825cda0b7ff 100644
--- a/docs/data/histograms/Canada/019J21A.json
+++ b/docs/data/histograms/Canada/019J21A.json
@@ -1 +1 @@
-{"batchcode": "019J21A", "histograms": [{"batchcodes": ["019J21A"], "histogram": {"Chest pain": 3, "Fatigue": 3, "Pericarditis": 3, "Chills": 2, "Abdominal pain upper": 1, "Abnormal uterine bleeding": 1, "Acute myocardial infarction": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Blood iron": 1, "Cardiac function test": 1, "Chest discomfort": 1, "Discomfort": 1, "Dyspepsia": 1, "Electrocardiogram": 1, "Eye pain": 1, "Eye swelling": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Haemoglobin": 1, "Headache": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Myopericarditis": 1, "Neck pain": 1, "Ocular discomfort": 1, "Pain in extremity": 1, "Palpitations": 1, "Pericardial effusion": 1, "Periorbital swelling": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suicidal ideation": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "019J21A", "histograms": [{"histogram": {"Chest pain": 3, "Fatigue": 3, "Pericarditis": 3, "Chills": 2, "Abdominal pain upper": 1, "Abnormal uterine bleeding": 1, "Acute myocardial infarction": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Blood iron": 1, "Cardiac function test": 1, "Chest discomfort": 1, "Discomfort": 1, "Dyspepsia": 1, "Electrocardiogram": 1, "Eye pain": 1, "Eye swelling": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Haemoglobin": 1, "Headache": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Myopericarditis": 1, "Neck pain": 1, "Ocular discomfort": 1, "Pain in extremity": 1, "Palpitations": 1, "Pericardial effusion": 1, "Periorbital swelling": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suicidal ideation": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["019J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/020321A.json b/docs/data/histograms/Canada/020321A.json
index 0b40617424c..9b7ea85ac14 100644
--- a/docs/data/histograms/Canada/020321A.json
+++ b/docs/data/histograms/Canada/020321A.json
@@ -1 +1 @@
-{"batchcode": "020321A", "histograms": [{"batchcodes": ["020321A"], "histogram": {"Dizziness": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "020321A", "histograms": [{"histogram": {"Dizziness": 1, "Nausea": 1}, "batchcodes": ["020321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/020B21A.json b/docs/data/histograms/Canada/020B21A.json
index 1c457f74289..1e0912c73b2 100644
--- a/docs/data/histograms/Canada/020B21A.json
+++ b/docs/data/histograms/Canada/020B21A.json
@@ -1 +1 @@
-{"batchcode": "020B21A", "histograms": [{"batchcodes": ["020B21A"], "histogram": {"Dizziness": 1, "Exposure via skin contact": 1, "Hyperhidrosis": 1, "Nausea": 1, "Syringe issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "020B21A", "histograms": [{"histogram": {"Dizziness": 1, "Exposure via skin contact": 1, "Hyperhidrosis": 1, "Nausea": 1, "Syringe issue": 1, "Underdose": 1}, "batchcodes": ["020B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/020E21A.json b/docs/data/histograms/Canada/020E21A.json
index 50f057624c8..5e0f740dec1 100644
--- a/docs/data/histograms/Canada/020E21A.json
+++ b/docs/data/histograms/Canada/020E21A.json
@@ -1 +1 @@
-{"batchcode": "020E21A", "histograms": [{"batchcodes": ["020E21A", "EP6017"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["020E21A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "020E21A", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["020E21A", "EP6017"]}, {"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["020E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/020J21A.json b/docs/data/histograms/Canada/020J21A.json
index 34222c79344..18674550366 100644
--- a/docs/data/histograms/Canada/020J21A.json
+++ b/docs/data/histograms/Canada/020J21A.json
@@ -1 +1 @@
-{"batchcode": "020J21A", "histograms": [{"batchcodes": ["020J21A"], "histogram": {"Myopericarditis": 3, "Chills": 2, "Abdominal pain upper": 1, "Aortic valve incompetence": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Fibrosis": 1, "Hypokinesia": 1, "Hypoperfusion": 1, "Left ventricular dysfunction": 1, "Left ventricular hypertrophy": 1, "Malaise": 1, "Mitral valve incompetence": 1, "Myocardial oedema": 1, "Myocarditis": 1, "Pain": 1, "Renal failure": 1, "Right ventricular dilatation": 1, "SARS-CoV-2 test": 1, "Tricuspid valve incompetence": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "020J21A", "histograms": [{"histogram": {"Myopericarditis": 3, "Chills": 2, "Abdominal pain upper": 1, "Aortic valve incompetence": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Fibrosis": 1, "Hypokinesia": 1, "Hypoperfusion": 1, "Left ventricular dysfunction": 1, "Left ventricular hypertrophy": 1, "Malaise": 1, "Mitral valve incompetence": 1, "Myocardial oedema": 1, "Myocarditis": 1, "Pain": 1, "Renal failure": 1, "Right ventricular dilatation": 1, "SARS-CoV-2 test": 1, "Tricuspid valve incompetence": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Vomiting": 1}, "batchcodes": ["020J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/023M20A.json b/docs/data/histograms/Canada/023M20A.json
index 0d71de4465e..162165fe213 100644
--- a/docs/data/histograms/Canada/023M20A.json
+++ b/docs/data/histograms/Canada/023M20A.json
@@ -1 +1 @@
-{"batchcode": "023M20A", "histograms": [{"batchcodes": ["023M20A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["023M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/02509210.json b/docs/data/histograms/Canada/02509210.json
index 282da1eabbf..4917d4fa72b 100644
--- a/docs/data/histograms/Canada/02509210.json
+++ b/docs/data/histograms/Canada/02509210.json
@@ -1 +1 @@
-{"batchcode": "02509210", "histograms": [{"batchcodes": ["02509210"], "histogram": {"Facial paralysis": 1, "Formication": 1, "Freezing phenomenon": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Joint swelling": 1, "Muscle twitching": 1, "Nervousness": 1, "Paraesthesia": 1, "Swollen tongue": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "02509210", "histograms": [{"histogram": {"Facial paralysis": 1, "Formication": 1, "Freezing phenomenon": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Joint swelling": 1, "Muscle twitching": 1, "Nervousness": 1, "Paraesthesia": 1, "Swollen tongue": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["02509210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/026B21A.json b/docs/data/histograms/Canada/026B21A.json
index 40c46b27831..ba53acd50f6 100644
--- a/docs/data/histograms/Canada/026B21A.json
+++ b/docs/data/histograms/Canada/026B21A.json
@@ -1 +1 @@
-{"batchcode": "026B21A", "histograms": [{"batchcodes": ["026B21A"], "histogram": {"Dizziness": 7, "Hyperhidrosis": 6, "Nausea": 4, "Pallor": 4, "Fall": 2, "Headache": 2, "Adverse event": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Erythema": 1, "Face injury": 1, "Feeling hot": 1, "Flushing": 1, "Heart rate decreased": 1, "Hypoglycaemia": 1, "Immediate post-injection reaction": 1, "Loss of consciousness": 1, "Paraesthesia": 1, "Seizure": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026B21A", "histograms": [{"histogram": {"Dizziness": 7, "Hyperhidrosis": 6, "Nausea": 4, "Pallor": 4, "Fall": 2, "Headache": 2, "Adverse event": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Erythema": 1, "Face injury": 1, "Feeling hot": 1, "Flushing": 1, "Heart rate decreased": 1, "Hypoglycaemia": 1, "Immediate post-injection reaction": 1, "Loss of consciousness": 1, "Paraesthesia": 1, "Seizure": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["026B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/026H21A.json b/docs/data/histograms/Canada/026H21A.json
index 6bc8d27b330..5eddcef8257 100644
--- a/docs/data/histograms/Canada/026H21A.json
+++ b/docs/data/histograms/Canada/026H21A.json
@@ -1 +1 @@
-{"batchcode": "026H21A", "histograms": [{"batchcodes": ["026H21A"], "histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "026H21A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["026H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/032L20A.json b/docs/data/histograms/Canada/032L20A.json
index ee4a4ae86f0..a61b912e31e 100644
--- a/docs/data/histograms/Canada/032L20A.json
+++ b/docs/data/histograms/Canada/032L20A.json
@@ -1 +1 @@
-{"batchcode": "032L20A", "histograms": [{"batchcodes": ["032L20A"], "histogram": {"Constipation": 1, "Defaecation urgency": 1, "Diarrhoea": 1, "Influenza like illness": 1, "Mucous stools": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20A", "histograms": [{"histogram": {"Constipation": 1, "Defaecation urgency": 1, "Diarrhoea": 1, "Influenza like illness": 1, "Mucous stools": 1}, "batchcodes": ["032L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/034C21A.json b/docs/data/histograms/Canada/034C21A.json
index e4ee8d93be3..7408ae2f42e 100644
--- a/docs/data/histograms/Canada/034C21A.json
+++ b/docs/data/histograms/Canada/034C21A.json
@@ -1 +1 @@
-{"batchcode": "034C21A", "histograms": [{"batchcodes": ["034C21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "034C21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1}, "batchcodes": ["034C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/038B21A.json b/docs/data/histograms/Canada/038B21A.json
index be1eaf14f76..e10a04e2f08 100644
--- a/docs/data/histograms/Canada/038B21A.json
+++ b/docs/data/histograms/Canada/038B21A.json
@@ -1 +1 @@
-{"batchcode": "038B21A", "histograms": [{"batchcodes": ["038B21A"], "histogram": {"Dizziness": 2, "Malaise": 2, "Vital signs measurement": 2, "Hyperhidrosis": 1, "Nausea": 1, "Panic attack": 1, "Sensation of foreign body": 1}}]}
\ No newline at end of file
+{"batchcode": "038B21A", "histograms": [{"histogram": {"Dizziness": 2, "Malaise": 2, "Vital signs measurement": 2, "Hyperhidrosis": 1, "Nausea": 1, "Panic attack": 1, "Sensation of foreign body": 1}, "batchcodes": ["038B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/042A21A.json b/docs/data/histograms/Canada/042A21A.json
index 350bb3d3857..a0318e955d5 100644
--- a/docs/data/histograms/Canada/042A21A.json
+++ b/docs/data/histograms/Canada/042A21A.json
@@ -1 +1 @@
-{"batchcode": "042A21A", "histograms": [{"batchcodes": ["042A21A"], "histogram": {"Dizziness": 6, "Hyperhidrosis": 5, "Vision blurred": 2, "Vomiting": 2, "Anxiety": 1, "Cold sweat": 1, "Consciousness fluctuating": 1, "Cyanosis": 1, "Feeling hot": 1, "Insomnia": 1, "Nausea": 1, "Pallor": 1, "Slow response to stimuli": 1, "Tinnitus": 1, "Visual impairment": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "042A21A", "histograms": [{"histogram": {"Dizziness": 6, "Hyperhidrosis": 5, "Vision blurred": 2, "Vomiting": 2, "Anxiety": 1, "Cold sweat": 1, "Consciousness fluctuating": 1, "Cyanosis": 1, "Feeling hot": 1, "Insomnia": 1, "Nausea": 1, "Pallor": 1, "Slow response to stimuli": 1, "Tinnitus": 1, "Visual impairment": 1, "Vital signs measurement": 1}, "batchcodes": ["042A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/042D21A.json b/docs/data/histograms/Canada/042D21A.json
index b4c160dde5e..7b805f86c1b 100644
--- a/docs/data/histograms/Canada/042D21A.json
+++ b/docs/data/histograms/Canada/042D21A.json
@@ -1 +1 @@
-{"batchcode": "042D21A", "histograms": [{"batchcodes": ["042D21A", "MT0055"], "histogram": {"Fatigue": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Prolonged labour": 1}}, {"batchcodes": ["042D21A", "PFIZER ER1742"], "histogram": {"Cellulitis": 1, "Chest discomfort": 1, "Dizziness": 1, "Interchange of vaccine products": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Skin warm": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}, {"batchcodes": ["042D21A"], "histogram": {"Myocarditis": 32, "Chest pain": 30, "Dyspnoea": 20, "SARS-CoV-2 test": 20, "Pericarditis": 13, "Chest discomfort": 11, "Pyrexia": 11, "Fatigue": 10, "Chills": 8, "Myalgia": 8, "Pain": 5, "Vaccination site pain": 5, "Dizziness": 4, "Headache": 4, "Pleuritic pain": 4, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Malaise": 3, "Nausea": 3, "Palpitations": 3, "Sinus tachycardia": 3, "Vomiting": 3, "Back pain": 2, "Cough": 2, "Discomfort": 2, "Feeling abnormal": 2, "Heart rate increased": 2, "Inappropriate schedule of product administration": 2, "Interchange of vaccine products": 2, "Pain in jaw": 2, "Pericardial effusion": 2, "Seizure": 2, "Tachycardia": 2, "Vaccination site swelling": 2, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthma": 1, "Balance disorder": 1, "Blood pressure measurement": 1, "Bundle branch block": 1, "Bundle branch block right": 1, "COVID-19": 1, "Cardiac aneurysm": 1, "Cardiac flutter": 1, "Cold sweat": 1, "Coma": 1, "Decreased activity": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Electric shock sensation": 1, "Electroencephalogram": 1, "Epstein-Barr viraemia": 1, "Erythema": 1, "Fear": 1, "Feeling cold": 1, "Flank pain": 1, "Heart rate": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Infectious mononucleosis": 1, "Joint stiffness": 1, "Lethargy": 1, "Limb injury": 1, "Loss of personal independence in daily activities": 1, "Mitral valve incompetence": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myoclonus": 1, "Neck pain": 1, "Odynophagia": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Painful respiration": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Rash": 1, "Sinus bradycardia": 1, "Streptococcal infection": 1, "Tension headache": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Tremor": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination error": 1, "Vaccination site erythema": 1, "Vaccination site joint pain": 1, "Vaccination site warmth": 1, "Vision blurred": 1, "Weight decreased": 1, "Wound complication": 1, "Wound infection": 1}}]}
\ No newline at end of file
+{"batchcode": "042D21A", "histograms": [{"histogram": {"Fatigue": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Prolonged labour": 1}, "batchcodes": ["042D21A", "MT0055"]}, {"histogram": {"Cellulitis": 1, "Chest discomfort": 1, "Dizziness": 1, "Interchange of vaccine products": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Skin warm": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["042D21A", "PFIZER ER1742"]}, {"histogram": {"Myocarditis": 32, "Chest pain": 30, "Dyspnoea": 20, "SARS-CoV-2 test": 20, "Pericarditis": 13, "Chest discomfort": 11, "Pyrexia": 11, "Fatigue": 10, "Chills": 8, "Myalgia": 8, "Pain": 5, "Vaccination site pain": 5, "Dizziness": 4, "Headache": 4, "Pleuritic pain": 4, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Malaise": 3, "Nausea": 3, "Palpitations": 3, "Sinus tachycardia": 3, "Vomiting": 3, "Back pain": 2, "Cough": 2, "Discomfort": 2, "Feeling abnormal": 2, "Heart rate increased": 2, "Inappropriate schedule of product administration": 2, "Interchange of vaccine products": 2, "Pain in jaw": 2, "Pericardial effusion": 2, "Seizure": 2, "Tachycardia": 2, "Vaccination site swelling": 2, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthma": 1, "Balance disorder": 1, "Blood pressure measurement": 1, "Bundle branch block": 1, "Bundle branch block right": 1, "COVID-19": 1, "Cardiac aneurysm": 1, "Cardiac flutter": 1, "Cold sweat": 1, "Coma": 1, "Decreased activity": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Electric shock sensation": 1, "Electroencephalogram": 1, "Epstein-Barr viraemia": 1, "Erythema": 1, "Fear": 1, "Feeling cold": 1, "Flank pain": 1, "Heart rate": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Infectious mononucleosis": 1, "Joint stiffness": 1, "Lethargy": 1, "Limb injury": 1, "Loss of personal independence in daily activities": 1, "Mitral valve incompetence": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myoclonus": 1, "Neck pain": 1, "Odynophagia": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Painful respiration": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Rash": 1, "Sinus bradycardia": 1, "Streptococcal infection": 1, "Tension headache": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Tremor": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination error": 1, "Vaccination site erythema": 1, "Vaccination site joint pain": 1, "Vaccination site warmth": 1, "Vision blurred": 1, "Weight decreased": 1, "Wound complication": 1, "Wound infection": 1}, "batchcodes": ["042D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/043021A.json b/docs/data/histograms/Canada/043021A.json
index bc59d2de3f6..9bcab1b0880 100644
--- a/docs/data/histograms/Canada/043021A.json
+++ b/docs/data/histograms/Canada/043021A.json
@@ -1 +1 @@
-{"batchcode": "043021A", "histograms": [{"batchcodes": ["043021A", "EN1198", "FF25595"], "histogram": {"Acne": 1, "Fall": 1, "Feeling abnormal": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Platelet factor 4": 1, "Screaming": 1, "Skin infection": 1, "Skin papilloma": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "043021A", "histograms": [{"histogram": {"Acne": 1, "Fall": 1, "Feeling abnormal": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Platelet factor 4": 1, "Screaming": 1, "Skin infection": 1, "Skin papilloma": 1, "Sleep disorder": 1}, "batchcodes": ["043021A", "EN1198", "FF25595"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/043D21A.json b/docs/data/histograms/Canada/043D21A.json
index d7d9099feca..d38f037825e 100644
--- a/docs/data/histograms/Canada/043D21A.json
+++ b/docs/data/histograms/Canada/043D21A.json
@@ -1 +1 @@
-{"batchcode": "043D21A", "histograms": [{"batchcodes": ["043D21A"], "histogram": {"Myocarditis": 23, "Chest pain": 16, "Dyspnoea": 6, "Pericarditis": 6, "Chest discomfort": 3, "Chills": 3, "Headache": 3, "Pyrexia": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Cough": 2, "Dizziness": 2, "Fatigue": 2, "Feeling hot": 2, "Heart rate": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Inappropriate schedule of product administration": 2, "Lymphadenopathy": 2, "Malaise": 2, "Mobility decreased": 2, "Nausea": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Abdominal pain": 1, "Acne": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Aphasia": 1, "Arrhythmia": 1, "Asthenia": 1, "Atelectasis": 1, "Blood test": 1, "Body temperature": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cerebral palsy": 1, "Confusional state": 1, "Contusion": 1, "Coronary artery disease": 1, "Dermatitis": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling cold": 1, "Gait disturbance": 1, "Heart rate decreased": 1, "Hot flush": 1, "Hypertension": 1, "Hypertensive emergency": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypophagia": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "Left ventricular dysfunction": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Muscle strain": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Nervousness": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Pelvic pain": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sinus tachycardia": 1, "Stillbirth": 1, "Swelling face": 1, "Tachycardia": 1, "Tongue discomfort": 1, "Urticaria": 1, "Vaccination site discomfort": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "043D21A", "histograms": [{"histogram": {"Myocarditis": 23, "Chest pain": 16, "Dyspnoea": 6, "Pericarditis": 6, "Chest discomfort": 3, "Chills": 3, "Headache": 3, "Pyrexia": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Cough": 2, "Dizziness": 2, "Fatigue": 2, "Feeling hot": 2, "Heart rate": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Inappropriate schedule of product administration": 2, "Lymphadenopathy": 2, "Malaise": 2, "Mobility decreased": 2, "Nausea": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Abdominal pain": 1, "Acne": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Aphasia": 1, "Arrhythmia": 1, "Asthenia": 1, "Atelectasis": 1, "Blood test": 1, "Body temperature": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cerebral palsy": 1, "Confusional state": 1, "Contusion": 1, "Coronary artery disease": 1, "Dermatitis": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling cold": 1, "Gait disturbance": 1, "Heart rate decreased": 1, "Hot flush": 1, "Hypertension": 1, "Hypertensive emergency": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypophagia": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "Left ventricular dysfunction": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Muscle strain": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Nervousness": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Pelvic pain": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sinus tachycardia": 1, "Stillbirth": 1, "Swelling face": 1, "Tachycardia": 1, "Tongue discomfort": 1, "Urticaria": 1, "Vaccination site discomfort": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["043D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/044A21A.json b/docs/data/histograms/Canada/044A21A.json
index 25a9a543af8..d144fbc0267 100644
--- a/docs/data/histograms/Canada/044A21A.json
+++ b/docs/data/histograms/Canada/044A21A.json
@@ -1 +1 @@
-{"batchcode": "044A21A", "histograms": [{"batchcodes": ["044A21A"], "histogram": {"Dizziness": 1, "Immediate post-injection reaction": 1, "Nausea": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "044A21A", "histograms": [{"histogram": {"Dizziness": 1, "Immediate post-injection reaction": 1, "Nausea": 1, "Skin warm": 1}, "batchcodes": ["044A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/044D21A.json b/docs/data/histograms/Canada/044D21A.json
index 2bd07d70c90..11308a8c638 100644
--- a/docs/data/histograms/Canada/044D21A.json
+++ b/docs/data/histograms/Canada/044D21A.json
@@ -1 +1 @@
-{"batchcode": "044D21A", "histograms": [{"batchcodes": ["044D21A", "EW0193", "FA9099"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Nephrolithiasis": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["044D21A", "FA9099"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["044D21A"], "histogram": {"Myocarditis": 37, "Chest pain": 24, "SARS-CoV-2 test": 19, "Dyspnoea": 16, "Pyrexia": 15, "Chest discomfort": 12, "Chills": 11, "Pericarditis": 10, "Hyperhidrosis": 7, "Nausea": 7, "Fatigue": 6, "Headache": 6, "Vomiting": 5, "Arthralgia": 4, "Cough": 4, "Myalgia": 4, "Pain": 4, "Dizziness": 3, "Influenza like illness": 3, "Pain in extremity": 3, "Palpitations": 3, "Asthenia": 2, "Diarrhoea": 2, "Malaise": 2, "Migraine": 2, "Myocardial injury": 2, "Paraesthesia": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Asthma": 1, "Back pain": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Cellulitis": 1, "Depressed mood": 1, "Diabetic cardiomyopathy": 1, "Discomfort": 1, "Disorientation": 1, "Dyspepsia": 1, "Effusion": 1, "Erythema": 1, "Feeding disorder": 1, "Hyperaemia": 1, "Hyperglycaemia": 1, "Hypertension": 1, "Ischaemia": 1, "Left ventricular dysfunction": 1, "Lethargy": 1, "Lyme disease": 1, "Mitral valve incompetence": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Myopericarditis": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Presyncope": 1, "Productive cough": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Sinus bradycardia": 1, "Sinus tachycardia": 1, "Tachycardia": 1, "Tricuspid valve incompetence": 1, "Ventricular enlargement": 1, "Ventricular failure": 1, "Ventricular fibrillation": 1}}]}
\ No newline at end of file
+{"batchcode": "044D21A", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Nephrolithiasis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["044D21A", "EW0193", "FA9099"]}, {"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["044D21A", "FA9099"]}, {"histogram": {"Myocarditis": 37, "Chest pain": 24, "SARS-CoV-2 test": 19, "Dyspnoea": 16, "Pyrexia": 15, "Chest discomfort": 12, "Chills": 11, "Pericarditis": 10, "Hyperhidrosis": 7, "Nausea": 7, "Fatigue": 6, "Headache": 6, "Vomiting": 5, "Arthralgia": 4, "Cough": 4, "Myalgia": 4, "Pain": 4, "Dizziness": 3, "Influenza like illness": 3, "Pain in extremity": 3, "Palpitations": 3, "Asthenia": 2, "Diarrhoea": 2, "Malaise": 2, "Migraine": 2, "Myocardial injury": 2, "Paraesthesia": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Asthma": 1, "Back pain": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Cellulitis": 1, "Depressed mood": 1, "Diabetic cardiomyopathy": 1, "Discomfort": 1, "Disorientation": 1, "Dyspepsia": 1, "Effusion": 1, "Erythema": 1, "Feeding disorder": 1, "Hyperaemia": 1, "Hyperglycaemia": 1, "Hypertension": 1, "Ischaemia": 1, "Left ventricular dysfunction": 1, "Lethargy": 1, "Lyme disease": 1, "Mitral valve incompetence": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Myopericarditis": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Presyncope": 1, "Productive cough": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Sinus bradycardia": 1, "Sinus tachycardia": 1, "Tachycardia": 1, "Tricuspid valve incompetence": 1, "Ventricular enlargement": 1, "Ventricular failure": 1, "Ventricular fibrillation": 1}, "batchcodes": ["044D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/045D21.json b/docs/data/histograms/Canada/045D21.json
index a6db60dcde2..f56f9526985 100644
--- a/docs/data/histograms/Canada/045D21.json
+++ b/docs/data/histograms/Canada/045D21.json
@@ -1 +1 @@
-{"batchcode": "045D21", "histograms": [{"batchcodes": ["045D21"], "histogram": {"Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "045D21", "histograms": [{"histogram": {"Pericarditis": 1}, "batchcodes": ["045D21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/045D21A.json b/docs/data/histograms/Canada/045D21A.json
index 50291c97bdf..b473d3aa37f 100644
--- a/docs/data/histograms/Canada/045D21A.json
+++ b/docs/data/histograms/Canada/045D21A.json
@@ -1 +1 @@
-{"batchcode": "045D21A", "histograms": [{"batchcodes": ["045D21A", "EW0199"], "histogram": {"Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}}, {"batchcodes": ["045D21A"], "histogram": {"Myocarditis": 29, "Chest pain": 20, "Dyspnoea": 9, "Chills": 4, "Myalgia": 4, "Nausea": 4, "Pleuritic pain": 4, "Pyrexia": 4, "Arthralgia": 3, "Chest discomfort": 3, "Dizziness": 3, "Fatigue": 3, "Headache": 3, "Myopericarditis": 3, "Pain": 3, "Cold sweat": 2, "Cough": 2, "Hyperhidrosis": 2, "Migraine": 2, "Pain in extremity": 2, "Pericarditis": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abnormal loss of weight": 1, "Angina pectoris": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Biopsy": 1, "Blood creatine phosphokinase": 1, "Condition aggravated": 1, "Dry eye": 1, "Dry mouth": 1, "Electrocardiogram PR interval": 1, "Electrocardiogram ST segment": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Granuloma": 1, "Heart rate": 1, "Illness": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Paraesthesia": 1, "Rash": 1, "Sinus arrhythmia": 1, "Sinus bradycardia": 1, "Sleep apnoea syndrome": 1, "Stress": 1, "Suicidal ideation": 1, "Tachycardia": 1, "Tendonitis": 1, "Tricuspid valve incompetence": 1, "Troponin": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "045D21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}, "batchcodes": ["045D21A", "EW0199"]}, {"histogram": {"Myocarditis": 29, "Chest pain": 20, "Dyspnoea": 9, "Chills": 4, "Myalgia": 4, "Nausea": 4, "Pleuritic pain": 4, "Pyrexia": 4, "Arthralgia": 3, "Chest discomfort": 3, "Dizziness": 3, "Fatigue": 3, "Headache": 3, "Myopericarditis": 3, "Pain": 3, "Cold sweat": 2, "Cough": 2, "Hyperhidrosis": 2, "Migraine": 2, "Pain in extremity": 2, "Pericarditis": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abnormal loss of weight": 1, "Angina pectoris": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Biopsy": 1, "Blood creatine phosphokinase": 1, "Condition aggravated": 1, "Dry eye": 1, "Dry mouth": 1, "Electrocardiogram PR interval": 1, "Electrocardiogram ST segment": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Granuloma": 1, "Heart rate": 1, "Illness": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Paraesthesia": 1, "Rash": 1, "Sinus arrhythmia": 1, "Sinus bradycardia": 1, "Sleep apnoea syndrome": 1, "Stress": 1, "Suicidal ideation": 1, "Tachycardia": 1, "Tendonitis": 1, "Tricuspid valve incompetence": 1, "Troponin": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vomiting": 1}, "batchcodes": ["045D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/046AZ1A.json b/docs/data/histograms/Canada/046AZ1A.json
index 7df71e3f0d6..0893c0b364b 100644
--- a/docs/data/histograms/Canada/046AZ1A.json
+++ b/docs/data/histograms/Canada/046AZ1A.json
@@ -1 +1 @@
-{"batchcode": "046AZ1A", "histograms": [{"batchcodes": ["046AZ1A"], "histogram": {"Death": 1, "Dyspnoea": 1, "Epistaxis": 1, "Mouth haemorrhage": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "046AZ1A", "histograms": [{"histogram": {"Death": 1, "Dyspnoea": 1, "Epistaxis": 1, "Mouth haemorrhage": 1, "Pyrexia": 1}, "batchcodes": ["046AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/047B21A.json b/docs/data/histograms/Canada/047B21A.json
index 79b87bee6b9..80ce9715d8c 100644
--- a/docs/data/histograms/Canada/047B21A.json
+++ b/docs/data/histograms/Canada/047B21A.json
@@ -1 +1 @@
-{"batchcode": "047B21A", "histograms": [{"batchcodes": ["047B21A"], "histogram": {"Dizziness": 1, "Hyperhidrosis": 1, "Pallor": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "047B21A", "histograms": [{"histogram": {"Dizziness": 1, "Hyperhidrosis": 1, "Pallor": 1, "Underdose": 1}, "batchcodes": ["047B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/048A21A.json b/docs/data/histograms/Canada/048A21A.json
index 11791ca274c..e8d5d6e61c4 100644
--- a/docs/data/histograms/Canada/048A21A.json
+++ b/docs/data/histograms/Canada/048A21A.json
@@ -1 +1 @@
-{"batchcode": "048A21A", "histograms": [{"batchcodes": ["048A21A"], "histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Nausea": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "048A21A", "histograms": [{"histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Nausea": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash pruritic": 1}, "batchcodes": ["048A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/04D21A.json b/docs/data/histograms/Canada/04D21A.json
index c2a746e8cba..6502d7e9cf7 100644
--- a/docs/data/histograms/Canada/04D21A.json
+++ b/docs/data/histograms/Canada/04D21A.json
@@ -1 +1 @@
-{"batchcode": "04D21A", "histograms": [{"batchcodes": ["04D21A"], "histogram": {"Chest discomfort": 1, "Chills": 1, "Hypotension": 1, "Insomnia": 1, "Myocarditis": 1, "Palpitations": 1, "Pyrexia": 1, "Sinus bradycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "04D21A", "histograms": [{"histogram": {"Chest discomfort": 1, "Chills": 1, "Hypotension": 1, "Insomnia": 1, "Myocarditis": 1, "Palpitations": 1, "Pyrexia": 1, "Sinus bradycardia": 1, "Vomiting": 1}, "batchcodes": ["04D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/052C21A.json b/docs/data/histograms/Canada/052C21A.json
index c3a2cf67310..62f2ea27151 100644
--- a/docs/data/histograms/Canada/052C21A.json
+++ b/docs/data/histograms/Canada/052C21A.json
@@ -1 +1 @@
-{"batchcode": "052C21A", "histograms": [{"batchcodes": ["052C21A", "EW0199"], "histogram": {"Interchange of vaccine products": 1, "Pericarditis": 1, "Wrong product administered": 1}}, {"batchcodes": ["052C21A"], "histogram": {"Myocarditis": 19, "Chest pain": 13, "Dyspnoea": 7, "Chest discomfort": 6, "Pericarditis": 6, "Pyrexia": 6, "SARS-CoV-2 test": 6, "Fatigue": 4, "Headache": 4, "Myalgia": 3, "Pain in extremity": 3, "Chills": 2, "Nausea": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal pain": 1, "Allergy to vaccine": 1, "Arthralgia": 1, "Body temperature": 1, "Cold sweat": 1, "Cough": 1, "Diarrhoea": 1, "Dysstasia": 1, "Erythema": 1, "Feeling hot": 1, "Flatulence": 1, "Hypersomnia": 1, "Hypokinesia": 1, "Illness": 1, "Influenza like illness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Migraine": 1, "Muscular weakness": 1, "Myocardial injury": 1, "Myopericarditis": 1, "Neck pain": 1, "Obstructive airways disorder": 1, "Pain in jaw": 1, "Pleuritic pain": 1, "Presyncope": 1, "Syncope": 1, "Vaccination site movement impairment": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "052C21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Pericarditis": 1, "Wrong product administered": 1}, "batchcodes": ["052C21A", "EW0199"]}, {"histogram": {"Myocarditis": 19, "Chest pain": 13, "Dyspnoea": 7, "Chest discomfort": 6, "Pericarditis": 6, "Pyrexia": 6, "SARS-CoV-2 test": 6, "Fatigue": 4, "Headache": 4, "Myalgia": 3, "Pain in extremity": 3, "Chills": 2, "Nausea": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal pain": 1, "Allergy to vaccine": 1, "Arthralgia": 1, "Body temperature": 1, "Cold sweat": 1, "Cough": 1, "Diarrhoea": 1, "Dysstasia": 1, "Erythema": 1, "Feeling hot": 1, "Flatulence": 1, "Hypersomnia": 1, "Hypokinesia": 1, "Illness": 1, "Influenza like illness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Migraine": 1, "Muscular weakness": 1, "Myocardial injury": 1, "Myopericarditis": 1, "Neck pain": 1, "Obstructive airways disorder": 1, "Pain in jaw": 1, "Pleuritic pain": 1, "Presyncope": 1, "Syncope": 1, "Vaccination site movement impairment": 1, "Wheezing": 1}, "batchcodes": ["052C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/052C2A1.json b/docs/data/histograms/Canada/052C2A1.json
index 89c05129bec..b6154075b51 100644
--- a/docs/data/histograms/Canada/052C2A1.json
+++ b/docs/data/histograms/Canada/052C2A1.json
@@ -1 +1 @@
-{"batchcode": "052C2A1", "histograms": [{"batchcodes": ["052C2A1"], "histogram": {"Myocarditis": 4, "Chest pain": 3, "Chills": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Atelectasis": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Hypotension": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nasopharyngitis": 1, "Palpitations": 1, "Pericarditis": 1, "Pleuritic pain": 1, "Pulmonary calcification": 1, "SARS-CoV-2 test negative": 1, "Tachycardia": 1, "Ventricular dysfunction": 1}}]}
\ No newline at end of file
+{"batchcode": "052C2A1", "histograms": [{"histogram": {"Myocarditis": 4, "Chest pain": 3, "Chills": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Atelectasis": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Hypotension": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nasopharyngitis": 1, "Palpitations": 1, "Pericarditis": 1, "Pleuritic pain": 1, "Pulmonary calcification": 1, "SARS-CoV-2 test negative": 1, "Tachycardia": 1, "Ventricular dysfunction": 1}, "batchcodes": ["052C2A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/053E21A.json b/docs/data/histograms/Canada/053E21A.json
index d0cd5590d65..c6a97946178 100644
--- a/docs/data/histograms/Canada/053E21A.json
+++ b/docs/data/histograms/Canada/053E21A.json
@@ -1 +1 @@
-{"batchcode": "053E21A", "histograms": [{"batchcodes": ["053E21A"], "histogram": {"Product administration error": 1}}]}
\ No newline at end of file
+{"batchcode": "053E21A", "histograms": [{"histogram": {"Product administration error": 1}, "batchcodes": ["053E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/055K21A.json b/docs/data/histograms/Canada/055K21A.json
index 3f2c8dcc87c..e2a15d16b69 100644
--- a/docs/data/histograms/Canada/055K21A.json
+++ b/docs/data/histograms/Canada/055K21A.json
@@ -1 +1 @@
-{"batchcode": "055K21A", "histograms": [{"batchcodes": ["055K21A"], "histogram": {"Angiogram": 1, "Basophil count": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Coagulopathy": 1, "Eosinophil count": 1, "Erythroblast count": 1, "Fibrin D dimer": 1, "Haematocrit": 1, "Haemoglobin": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Monocyte count": 1, "Neutrophil count": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Red blood cell count": 1, "Stridor": 1, "Thrombosis": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "055K21A", "histograms": [{"histogram": {"Angiogram": 1, "Basophil count": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Coagulopathy": 1, "Eosinophil count": 1, "Erythroblast count": 1, "Fibrin D dimer": 1, "Haematocrit": 1, "Haemoglobin": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Monocyte count": 1, "Neutrophil count": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Red blood cell count": 1, "Stridor": 1, "Thrombosis": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["055K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/063H21A.json b/docs/data/histograms/Canada/063H21A.json
index 6b361e69712..696579d8fca 100644
--- a/docs/data/histograms/Canada/063H21A.json
+++ b/docs/data/histograms/Canada/063H21A.json
@@ -1 +1 @@
-{"batchcode": "063H21A", "histograms": [{"batchcodes": ["063H21A", "FF2595"], "histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1}}, {"batchcodes": ["063H21A"], "histogram": {"Atrial flutter": 1, "Bundle branch block left": 1, "Hypertension": 1, "Muscular weakness": 1, "Myocardial injury": 1, "Myocarditis": 1, "Myopericarditis": 1, "Pleural effusion": 1}}]}
\ No newline at end of file
+{"batchcode": "063H21A", "histograms": [{"histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1}, "batchcodes": ["063H21A", "FF2595"]}, {"histogram": {"Atrial flutter": 1, "Bundle branch block left": 1, "Hypertension": 1, "Muscular weakness": 1, "Myocardial injury": 1, "Myocarditis": 1, "Myopericarditis": 1, "Pleural effusion": 1}, "batchcodes": ["063H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/070H21A.json b/docs/data/histograms/Canada/070H21A.json
index 3c43c454bab..5463e3067b1 100644
--- a/docs/data/histograms/Canada/070H21A.json
+++ b/docs/data/histograms/Canada/070H21A.json
@@ -1 +1 @@
-{"batchcode": "070H21A", "histograms": [{"batchcodes": ["070H21A"], "histogram": {"Expired product administered": 2}}]}
\ No newline at end of file
+{"batchcode": "070H21A", "histograms": [{"histogram": {"Expired product administered": 2}, "batchcodes": ["070H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/079J21B.json b/docs/data/histograms/Canada/079J21B.json
index 5e6e0db6d87..432fe58c0fc 100644
--- a/docs/data/histograms/Canada/079J21B.json
+++ b/docs/data/histograms/Canada/079J21B.json
@@ -1 +1 @@
-{"batchcode": "079J21B", "histograms": [{"batchcodes": ["079J21B", "EP6775"], "histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Drug ineffective": 1, "Fatigue": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sneezing": 1}}, {"batchcodes": ["079J21B"], "histogram": {"Myocarditis": 2, "Pericarditis": 2, "Acute kidney injury": 1, "Atrial flutter": 1, "Chest pain": 1, "Deafness": 1, "Dyspnoea": 1, "Myopericarditis": 1, "Nausea": 1, "Pancytopenia": 1, "Pleural effusion": 1, "Pleuropericarditis": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "079J21B", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Drug ineffective": 1, "Fatigue": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sneezing": 1}, "batchcodes": ["079J21B", "EP6775"]}, {"histogram": {"Myocarditis": 2, "Pericarditis": 2, "Acute kidney injury": 1, "Atrial flutter": 1, "Chest pain": 1, "Deafness": 1, "Dyspnoea": 1, "Myopericarditis": 1, "Nausea": 1, "Pancytopenia": 1, "Pleural effusion": 1, "Pleuropericarditis": 1, "Tinnitus": 1}, "batchcodes": ["079J21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/085D21A.json b/docs/data/histograms/Canada/085D21A.json
index 705d97dbd62..986a7d14cae 100644
--- a/docs/data/histograms/Canada/085D21A.json
+++ b/docs/data/histograms/Canada/085D21A.json
@@ -1 +1 @@
-{"batchcode": "085D21A", "histograms": [{"batchcodes": ["085D21A"], "histogram": {"Myocarditis": 2, "Pyrexia": 2, "Acute myocardial infarction": 1, "Angiogram": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cardiac function test": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Gastrointestinal haemorrhage": 1, "Hyperhidrosis": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myopericarditis": 1, "Nausea": 1, "Product dose omission issue": 1, "Rash": 1, "Tachycardia": 1, "Ventilation/perfusion scan": 1}}]}
\ No newline at end of file
+{"batchcode": "085D21A", "histograms": [{"histogram": {"Myocarditis": 2, "Pyrexia": 2, "Acute myocardial infarction": 1, "Angiogram": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cardiac function test": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Gastrointestinal haemorrhage": 1, "Hyperhidrosis": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myopericarditis": 1, "Nausea": 1, "Product dose omission issue": 1, "Rash": 1, "Tachycardia": 1, "Ventilation/perfusion scan": 1}, "batchcodes": ["085D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/092B21A.json b/docs/data/histograms/Canada/092B21A.json
index c46affa8c29..e983df9d288 100644
--- a/docs/data/histograms/Canada/092B21A.json
+++ b/docs/data/histograms/Canada/092B21A.json
@@ -1 +1 @@
-{"batchcode": "092B21A", "histograms": [{"batchcodes": ["092B21A"], "histogram": {"Anxiety": 2, "Chest discomfort": 2, "Crying": 2, "Dizziness": 2, "Fear of death": 2, "Feeling abnormal": 2, "Gastric ulcer": 2, "Headache": 2, "Insomnia": 2, "Muscular weakness": 2, "Nausea": 2, "Screaming": 2, "Tremor": 2, "Abdominal pain": 1, "Burning sensation": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Malaise": 1, "Palpitations": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "092B21A", "histograms": [{"histogram": {"Anxiety": 2, "Chest discomfort": 2, "Crying": 2, "Dizziness": 2, "Fear of death": 2, "Feeling abnormal": 2, "Gastric ulcer": 2, "Headache": 2, "Insomnia": 2, "Muscular weakness": 2, "Nausea": 2, "Screaming": 2, "Tremor": 2, "Abdominal pain": 1, "Burning sensation": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Malaise": 1, "Palpitations": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["092B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/092D1A.json b/docs/data/histograms/Canada/092D1A.json
index ea6a88777aa..e3d14f5064a 100644
--- a/docs/data/histograms/Canada/092D1A.json
+++ b/docs/data/histograms/Canada/092D1A.json
@@ -1 +1 @@
-{"batchcode": "092D1A", "histograms": [{"batchcodes": ["092D1A"], "histogram": {"Cold sweat": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "092D1A", "histograms": [{"histogram": {"Cold sweat": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["092D1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/092D21A.json b/docs/data/histograms/Canada/092D21A.json
index 3d7e6372bc1..32de32fb64f 100644
--- a/docs/data/histograms/Canada/092D21A.json
+++ b/docs/data/histograms/Canada/092D21A.json
@@ -1 +1 @@
-{"batchcode": "092D21A", "histograms": [{"batchcodes": ["092D21A"], "histogram": {"Myocarditis": 28, "Chest pain": 20, "SARS-CoV-2 test": 13, "Pyrexia": 9, "Chest discomfort": 8, "Dyspnoea": 8, "Pericarditis": 8, "Chills": 7, "Headache": 6, "Hyperhidrosis": 6, "Fatigue": 5, "Myalgia": 4, "Malaise": 3, "Nausea": 3, "Pain": 3, "Pain in extremity": 3, "Palpitations": 3, "Pericardial effusion": 3, "Vaccination site pain": 3, "Burning sensation": 2, "Dizziness": 2, "Feeling cold": 2, "Influenza like illness": 2, "Myopericarditis": 2, "Pleuritic pain": 2, "Tremor": 2, "Vaccination site swelling": 2, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Bedridden": 1, "Body temperature": 1, "Bradycardia": 1, "Bronchitis": 1, "Chest X-ray": 1, "Cough": 1, "Disorientation": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Muscle spasms": 1, "Oropharyngeal pain": 1, "Pneumonia": 1, "Presyncope": 1, "Sinus bradycardia": 1, "Sinus tachycardia": 1, "Skin warm": 1, "Speech disorder": 1, "Supraventricular tachycardia": 1, "Swelling face": 1, "Syncope": 1, "Vaccination site erythema": 1, "Ventricular tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "092D21A", "histograms": [{"histogram": {"Myocarditis": 28, "Chest pain": 20, "SARS-CoV-2 test": 13, "Pyrexia": 9, "Chest discomfort": 8, "Dyspnoea": 8, "Pericarditis": 8, "Chills": 7, "Headache": 6, "Hyperhidrosis": 6, "Fatigue": 5, "Myalgia": 4, "Malaise": 3, "Nausea": 3, "Pain": 3, "Pain in extremity": 3, "Palpitations": 3, "Pericardial effusion": 3, "Vaccination site pain": 3, "Burning sensation": 2, "Dizziness": 2, "Feeling cold": 2, "Influenza like illness": 2, "Myopericarditis": 2, "Pleuritic pain": 2, "Tremor": 2, "Vaccination site swelling": 2, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Bedridden": 1, "Body temperature": 1, "Bradycardia": 1, "Bronchitis": 1, "Chest X-ray": 1, "Cough": 1, "Disorientation": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Muscle spasms": 1, "Oropharyngeal pain": 1, "Pneumonia": 1, "Presyncope": 1, "Sinus bradycardia": 1, "Sinus tachycardia": 1, "Skin warm": 1, "Speech disorder": 1, "Supraventricular tachycardia": 1, "Swelling face": 1, "Syncope": 1, "Vaccination site erythema": 1, "Ventricular tachycardia": 1, "Vomiting": 1}, "batchcodes": ["092D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/093D21A.json b/docs/data/histograms/Canada/093D21A.json
index 321ca96edb4..447bad913b5 100644
--- a/docs/data/histograms/Canada/093D21A.json
+++ b/docs/data/histograms/Canada/093D21A.json
@@ -1 +1 @@
-{"batchcode": "093D21A", "histograms": [{"batchcodes": ["093D21A"], "histogram": {"Myocarditis": 18, "Chest pain": 13, "Pyrexia": 7, "Dyspnoea": 5, "Pericarditis": 5, "Headache": 4, "Chest discomfort": 3, "Fatigue": 3, "Nausea": 3, "Arthralgia": 2, "Chills": 2, "Cough": 2, "Diarrhoea": 2, "Dizziness": 2, "Myalgia": 2, "Pain": 2, "SARS-CoV-2 test": 2, "Vision blurred": 2, "Abdominal pain": 1, "Asthma": 1, "Blood pressure measurement": 1, "Cardiac failure": 1, "Cellulitis": 1, "Coronary artery disease": 1, "Dry eye": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Erythema": 1, "Expired product administered": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Joint stiffness": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Microangiopathy": 1, "Myopericarditis": 1, "Oesophageal pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Sinus arrhythmia": 1, "Somnolence": 1, "Stress cardiomyopathy": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Vaccination site paraesthesia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "093D21A", "histograms": [{"histogram": {"Myocarditis": 18, "Chest pain": 13, "Pyrexia": 7, "Dyspnoea": 5, "Pericarditis": 5, "Headache": 4, "Chest discomfort": 3, "Fatigue": 3, "Nausea": 3, "Arthralgia": 2, "Chills": 2, "Cough": 2, "Diarrhoea": 2, "Dizziness": 2, "Myalgia": 2, "Pain": 2, "SARS-CoV-2 test": 2, "Vision blurred": 2, "Abdominal pain": 1, "Asthma": 1, "Blood pressure measurement": 1, "Cardiac failure": 1, "Cellulitis": 1, "Coronary artery disease": 1, "Dry eye": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Erythema": 1, "Expired product administered": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Joint stiffness": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Microangiopathy": 1, "Myopericarditis": 1, "Oesophageal pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Sinus arrhythmia": 1, "Somnolence": 1, "Stress cardiomyopathy": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Vaccination site paraesthesia": 1, "Vomiting": 1}, "batchcodes": ["093D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/093DZIA 093D2.json b/docs/data/histograms/Canada/093DZIA 093D2.json
index bf448a6cf35..9ab322a70ce 100644
--- a/docs/data/histograms/Canada/093DZIA 093D2.json
+++ b/docs/data/histograms/Canada/093DZIA 093D2.json
@@ -1 +1 @@
-{"batchcode": "093DZIA \u0096 093D2", "histograms": [{"batchcodes": ["093DZIA \u0096 093D2"], "histogram": {"Back pain": 1, "Blepharospasm": 1, "Burning sensation": 1, "COVID-19": 1, "Central nervous system inflammation": 1, "Chest X-ray": 1, "Chest pain": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hypersensitivity": 1, "Intentional dose omission": 1, "Lymphadenopathy": 1, "Menstruation irregular": 1, "Nausea": 1, "Neck pain": 1, "Neurological eyelid disorder": 1, "Neurological symptom": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Retinal migraine": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "093DZIA \u0096 093D2", "histograms": [{"histogram": {"Back pain": 1, "Blepharospasm": 1, "Burning sensation": 1, "COVID-19": 1, "Central nervous system inflammation": 1, "Chest X-ray": 1, "Chest pain": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hypersensitivity": 1, "Intentional dose omission": 1, "Lymphadenopathy": 1, "Menstruation irregular": 1, "Nausea": 1, "Neck pain": 1, "Neurological eyelid disorder": 1, "Neurological symptom": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Retinal migraine": 1, "Visual impairment": 1}, "batchcodes": ["093DZIA \u0096 093D2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/1052818.json b/docs/data/histograms/Canada/1052818.json
index 3521f8df853..d8f1b1c66a7 100644
--- a/docs/data/histograms/Canada/1052818.json
+++ b/docs/data/histograms/Canada/1052818.json
@@ -1 +1 @@
-{"batchcode": "1052818", "histograms": [{"batchcodes": ["1052818"], "histogram": {"Back pain": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspepsia": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "1052818", "histograms": [{"histogram": {"Back pain": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspepsia": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}, "batchcodes": ["1052818"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/1229736 DIN1000.json b/docs/data/histograms/Canada/1229736 DIN1000.json
index 07435935e96..1b3cac26ce3 100644
--- a/docs/data/histograms/Canada/1229736 DIN1000.json
+++ b/docs/data/histograms/Canada/1229736 DIN1000.json
@@ -1 +1 @@
-{"batchcode": "1229736 DIN1000", "histograms": [{"batchcodes": ["1229736 DIN1000"], "histogram": {"Blindness": 1, "Migraine": 1}}]}
\ No newline at end of file
+{"batchcode": "1229736 DIN1000", "histograms": [{"histogram": {"Blindness": 1, "Migraine": 1}, "batchcodes": ["1229736 DIN1000"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/18 TO 49 YEARS.json b/docs/data/histograms/Canada/18 TO 49 YEARS.json
index e9084f4387d..d6150b3f661 100644
--- a/docs/data/histograms/Canada/18 TO 49 YEARS.json
+++ b/docs/data/histograms/Canada/18 TO 49 YEARS.json
@@ -1 +1 @@
-{"batchcode": "18 TO 49 YEARS", "histograms": [{"batchcodes": ["18 TO 49 YEARS"], "histogram": {"Myocarditis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "18 TO 49 YEARS", "histograms": [{"histogram": {"Myocarditis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["18 TO 49 YEARS"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/1805020.json b/docs/data/histograms/Canada/1805020.json
index 02467dd0f42..ba777586095 100644
--- a/docs/data/histograms/Canada/1805020.json
+++ b/docs/data/histograms/Canada/1805020.json
@@ -1 +1 @@
-{"batchcode": "1805020", "histograms": [{"batchcodes": ["1805020"], "histogram": {"Blood glucose": 1, "Dizziness": 1, "Electrocardiogram": 1, "Exposure via skin contact": 1, "Hyperhidrosis": 1, "Needle issue": 1, "Pallor": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "1805020", "histograms": [{"histogram": {"Blood glucose": 1, "Dizziness": 1, "Electrocardiogram": 1, "Exposure via skin contact": 1, "Hyperhidrosis": 1, "Needle issue": 1, "Pallor": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["1805020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/1808609.json b/docs/data/histograms/Canada/1808609.json
index 949ab91b993..45f9906c8e6 100644
--- a/docs/data/histograms/Canada/1808609.json
+++ b/docs/data/histograms/Canada/1808609.json
@@ -1 +1 @@
-{"batchcode": "1808609", "histograms": [{"batchcodes": ["1808609"], "histogram": {"Autoscopy": 1, "Cold sweat": 1, "Dizziness": 1, "Euphoric mood": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Neck pain": 1, "Pain in extremity": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "1808609", "histograms": [{"histogram": {"Autoscopy": 1, "Cold sweat": 1, "Dizziness": 1, "Euphoric mood": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Neck pain": 1, "Pain in extremity": 1, "Skin warm": 1}, "batchcodes": ["1808609"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/1822809.json b/docs/data/histograms/Canada/1822809.json
index 68ebffb5dc3..c4ec00f8618 100644
--- a/docs/data/histograms/Canada/1822809.json
+++ b/docs/data/histograms/Canada/1822809.json
@@ -1 +1 @@
-{"batchcode": "1822809", "histograms": [{"batchcodes": ["1822809"], "histogram": {"Anxiety": 1, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Interchange of vaccine products": 1, "Vision blurred": 1, "Vitreous floaters": 1}}]}
\ No newline at end of file
+{"batchcode": "1822809", "histograms": [{"histogram": {"Anxiety": 1, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Interchange of vaccine products": 1, "Vision blurred": 1, "Vitreous floaters": 1}, "batchcodes": ["1822809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/195518-06399.json b/docs/data/histograms/Canada/195518-06399.json
index c9b6964ce2b..81d45176b31 100644
--- a/docs/data/histograms/Canada/195518-06399.json
+++ b/docs/data/histograms/Canada/195518-06399.json
@@ -1 +1 @@
-{"batchcode": "195518-06399", "histograms": [{"batchcodes": ["195518-06399"], "histogram": {"Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dysphonia": 1, "Erythema": 1, "Feeling hot": 1, "Flushing": 1, "Hypoaesthesia oral": 1, "Lip swelling": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Rash macular": 1, "Throat tightness": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "195518-06399", "histograms": [{"histogram": {"Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dysphonia": 1, "Erythema": 1, "Feeling hot": 1, "Flushing": 1, "Hypoaesthesia oral": 1, "Lip swelling": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Rash macular": 1, "Throat tightness": 1, "Urticaria": 1}, "batchcodes": ["195518-06399"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/2011D21A.json b/docs/data/histograms/Canada/2011D21A.json
index 3403e75d6a6..d77bbb770f3 100644
--- a/docs/data/histograms/Canada/2011D21A.json
+++ b/docs/data/histograms/Canada/2011D21A.json
@@ -1 +1 @@
-{"batchcode": "2011D21A", "histograms": [{"batchcodes": ["2011D21A"], "histogram": {"Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "2011D21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["2011D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/201A21A.json b/docs/data/histograms/Canada/201A21A.json
index 8ad32e4e2a2..931e261ae08 100644
--- a/docs/data/histograms/Canada/201A21A.json
+++ b/docs/data/histograms/Canada/201A21A.json
@@ -1 +1 @@
-{"batchcode": "201A21A", "histograms": [{"batchcodes": ["201A21A"], "histogram": {"Dizziness": 2, "Cold sweat": 1, "Head injury": 1, "Immediate post-injection reaction": 1, "Loss of consciousness": 1, "Nausea": 1, "Panic attack": 1, "Skin laceration": 1, "Tension": 1}}]}
\ No newline at end of file
+{"batchcode": "201A21A", "histograms": [{"histogram": {"Dizziness": 2, "Cold sweat": 1, "Head injury": 1, "Immediate post-injection reaction": 1, "Loss of consciousness": 1, "Nausea": 1, "Panic attack": 1, "Skin laceration": 1, "Tension": 1}, "batchcodes": ["201A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/204B21A.json b/docs/data/histograms/Canada/204B21A.json
index 178919041c9..782bb0cf7e3 100644
--- a/docs/data/histograms/Canada/204B21A.json
+++ b/docs/data/histograms/Canada/204B21A.json
@@ -1 +1 @@
-{"batchcode": "204B21A", "histograms": [{"batchcodes": ["204B21A"], "histogram": {"Abdominal pain": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Injection site pain": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Skin disorder": 1, "Sleep disorder": 1, "Vertigo": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "204B21A", "histograms": [{"histogram": {"Abdominal pain": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Injection site pain": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Skin disorder": 1, "Sleep disorder": 1, "Vertigo": 1, "Vision blurred": 1}, "batchcodes": ["204B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/211A21A.json b/docs/data/histograms/Canada/211A21A.json
index e2be30d1c58..42c7968c9bd 100644
--- a/docs/data/histograms/Canada/211A21A.json
+++ b/docs/data/histograms/Canada/211A21A.json
@@ -1 +1 @@
-{"batchcode": "211A21A", "histograms": [{"batchcodes": ["211A21A"], "histogram": {"Blood pressure increased": 1, "Condition aggravated": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "211A21A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Condition aggravated": 1, "Tinnitus": 1}, "batchcodes": ["211A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/211D21A.json b/docs/data/histograms/Canada/211D21A.json
index aeea07b06d3..2f73a190880 100644
--- a/docs/data/histograms/Canada/211D21A.json
+++ b/docs/data/histograms/Canada/211D21A.json
@@ -1 +1 @@
-{"batchcode": "211D21A", "histograms": [{"batchcodes": ["211D21A"], "histogram": {"Dizziness": 1, "Hyperhidrosis": 1}}]}
\ No newline at end of file
+{"batchcode": "211D21A", "histograms": [{"histogram": {"Dizziness": 1, "Hyperhidrosis": 1}, "batchcodes": ["211D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/300042460.json b/docs/data/histograms/Canada/300042460.json
index a84d124b29b..c6833dbdbe0 100644
--- a/docs/data/histograms/Canada/300042460.json
+++ b/docs/data/histograms/Canada/300042460.json
@@ -1 +1 @@
-{"batchcode": "300042460", "histograms": [{"batchcodes": ["300042460"], "histogram": {"Poor quality product administered": 12, "Out of specification product use": 2, "Asthenopia": 1, "Dizziness": 1, "Extraocular muscle paresis": 1, "Headache": 1, "Hypoaesthesia": 1, "Incorrect dose administered": 1, "Nausea": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "300042460", "histograms": [{"histogram": {"Poor quality product administered": 12, "Out of specification product use": 2, "Asthenopia": 1, "Dizziness": 1, "Extraocular muscle paresis": 1, "Headache": 1, "Hypoaesthesia": 1, "Incorrect dose administered": 1, "Nausea": 1, "Paraesthesia": 1}, "batchcodes": ["300042460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/300042689.json b/docs/data/histograms/Canada/300042689.json
index aab9d9adb1d..148980108ae 100644
--- a/docs/data/histograms/Canada/300042689.json
+++ b/docs/data/histograms/Canada/300042689.json
@@ -1 +1 @@
-{"batchcode": "300042689", "histograms": [{"batchcodes": ["300042689"], "histogram": {"Dermatitis bullous": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "300042689", "histograms": [{"histogram": {"Dermatitis bullous": 1, "Pruritus": 1}, "batchcodes": ["300042689"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/300042698.json b/docs/data/histograms/Canada/300042698.json
index 247c275d9ac..c45d922a91f 100644
--- a/docs/data/histograms/Canada/300042698.json
+++ b/docs/data/histograms/Canada/300042698.json
@@ -1 +1 @@
-{"batchcode": "300042698", "histograms": [{"batchcodes": ["300042698"], "histogram": {"Fatigue": 2, "Headache": 2, "Product administered to patient of inappropriate age": 2, "Aura": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Migraine": 1, "Musculoskeletal discomfort": 1, "Night sweats": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "300042698", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Product administered to patient of inappropriate age": 2, "Aura": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Migraine": 1, "Musculoskeletal discomfort": 1, "Night sweats": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["300042698"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/300042722.json b/docs/data/histograms/Canada/300042722.json
index 8d8fda62384..92f2358b89b 100644
--- a/docs/data/histograms/Canada/300042722.json
+++ b/docs/data/histograms/Canada/300042722.json
@@ -1 +1 @@
-{"batchcode": "300042722", "histograms": [{"batchcodes": ["300042722"], "histogram": {"Pericarditis": 2, "Cellulitis": 1, "Chills": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Muscle twitching": 1, "Myocarditis": 1, "Neck pain": 1, "Pruritus": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "300042722", "histograms": [{"histogram": {"Pericarditis": 2, "Cellulitis": 1, "Chills": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Muscle twitching": 1, "Myocarditis": 1, "Neck pain": 1, "Pruritus": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}, "batchcodes": ["300042722"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3000489.json b/docs/data/histograms/Canada/3000489.json
index 77e65703af5..3abd82be451 100644
--- a/docs/data/histograms/Canada/3000489.json
+++ b/docs/data/histograms/Canada/3000489.json
@@ -1 +1 @@
-{"batchcode": "3000489", "histograms": [{"batchcodes": ["3000489"], "histogram": {"Accidental overdose": 2, "Chills": 1, "Dizziness": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3000489", "histograms": [{"histogram": {"Accidental overdose": 2, "Chills": 1, "Dizziness": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Vomiting": 1}, "batchcodes": ["3000489"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001176 OR 6001.json b/docs/data/histograms/Canada/3001176 OR 6001.json
index 71ce33595b4..254a0a2c833 100644
--- a/docs/data/histograms/Canada/3001176 OR 6001.json
+++ b/docs/data/histograms/Canada/3001176 OR 6001.json
@@ -1 +1 @@
-{"batchcode": "3001176 OR 6001", "histograms": [{"batchcodes": ["3001176 OR 6001"], "histogram": {"Angioedema": 1, "Erythema": 1, "Pruritus": 1, "Urticaria": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "3001176 OR 6001", "histograms": [{"histogram": {"Angioedema": 1, "Erythema": 1, "Pruritus": 1, "Urticaria": 1, "Vaccination site reaction": 1}, "batchcodes": ["3001176 OR 6001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001176.json b/docs/data/histograms/Canada/3001176.json
index df9fe0ad18c..95b666dcaf4 100644
--- a/docs/data/histograms/Canada/3001176.json
+++ b/docs/data/histograms/Canada/3001176.json
@@ -1 +1 @@
-{"batchcode": "3001176", "histograms": [{"batchcodes": ["3001176"], "histogram": {"Acute myocardial infarction": 2, "Inappropriate schedule of product administration": 2, "Joint swelling": 2, "Movement disorder": 2, "Myocarditis": 2, "Peripheral swelling": 2, "Rheumatoid arthritis": 2, "Acne": 1, "Atrial fibrillation": 1, "Cerebral microembolism": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Cough": 1, "Hypoaesthesia": 1, "Immune system disorder": 1, "Myopericarditis": 1, "Paraesthesia": 1, "Pericarditis": 1, "Psoriasis": 1, "Thrombosis": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "3001176", "histograms": [{"histogram": {"Acute myocardial infarction": 2, "Inappropriate schedule of product administration": 2, "Joint swelling": 2, "Movement disorder": 2, "Myocarditis": 2, "Peripheral swelling": 2, "Rheumatoid arthritis": 2, "Acne": 1, "Atrial fibrillation": 1, "Cerebral microembolism": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Cough": 1, "Hypoaesthesia": 1, "Immune system disorder": 1, "Myopericarditis": 1, "Paraesthesia": 1, "Pericarditis": 1, "Psoriasis": 1, "Thrombosis": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["3001176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001414.json b/docs/data/histograms/Canada/3001414.json
index d5f96d5c5fe..90858ac341e 100644
--- a/docs/data/histograms/Canada/3001414.json
+++ b/docs/data/histograms/Canada/3001414.json
@@ -1 +1 @@
-{"batchcode": "3001414", "histograms": [{"batchcodes": ["3001414"], "histogram": {"Blood test": 1, "Chest pain": 1, "Dermatitis bullous": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Latent tuberculosis": 1, "Odynophagia": 1, "Pericarditis": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "3001414", "histograms": [{"histogram": {"Blood test": 1, "Chest pain": 1, "Dermatitis bullous": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Latent tuberculosis": 1, "Odynophagia": 1, "Pericarditis": 1, "Vaccination site reaction": 1}, "batchcodes": ["3001414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001530.json b/docs/data/histograms/Canada/3001530.json
index 4864c82f3e5..aa93556852f 100644
--- a/docs/data/histograms/Canada/3001530.json
+++ b/docs/data/histograms/Canada/3001530.json
@@ -1 +1 @@
-{"batchcode": "3001530", "histograms": [{"batchcodes": ["3001530"], "histogram": {"Inappropriate schedule of product administration": 3, "Abdominal pain upper": 1, "Ageusia": 1, "Asthenia": 1, "Body temperature": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest pain": 1, "Cogan's syndrome": 1, "Coordination abnormal": 1, "Corneal laceration": 1, "Dehydration": 1, "Dizziness": 1, "Dry eye": 1, "Fall": 1, "Fatigue": 1, "Gait disturbance": 1, "Gallbladder rupture": 1, "Hypoaesthesia": 1, "Infection": 1, "Insomnia": 1, "Liver abscess": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Sepsis": 1, "Somnolence": 1, "Speech disorder": 1, "Thrombosis": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "3001530", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 3, "Abdominal pain upper": 1, "Ageusia": 1, "Asthenia": 1, "Body temperature": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest pain": 1, "Cogan's syndrome": 1, "Coordination abnormal": 1, "Corneal laceration": 1, "Dehydration": 1, "Dizziness": 1, "Dry eye": 1, "Fall": 1, "Fatigue": 1, "Gait disturbance": 1, "Gallbladder rupture": 1, "Hypoaesthesia": 1, "Infection": 1, "Insomnia": 1, "Liver abscess": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Sepsis": 1, "Somnolence": 1, "Speech disorder": 1, "Thrombosis": 1, "Vaccination site rash": 1}, "batchcodes": ["3001530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001652.json b/docs/data/histograms/Canada/3001652.json
index 8095b782a5c..6b309ddefac 100644
--- a/docs/data/histograms/Canada/3001652.json
+++ b/docs/data/histograms/Canada/3001652.json
@@ -1 +1 @@
-{"batchcode": "3001652", "histograms": [{"batchcodes": ["3001652"], "histogram": {"Fatigue": 4, "Inappropriate schedule of product administration": 3, "Anaphylactic reaction": 2, "Asthenia": 2, "Blood test": 2, "Chest pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Myocarditis": 2, "Pain in extremity": 2, "Pericarditis": 2, "Pyrexia": 2, "Abdominal pain upper": 1, "Amenorrhoea": 1, "Angina pectoris": 1, "Angiogram": 1, "Atrial flutter": 1, "Body temperature": 1, "Bundle branch block left": 1, "Cardiomyopathy": 1, "Chest discomfort": 1, "Condition aggravated": 1, "Contusion": 1, "Deafness": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dry mouth": 1, "Dysstasia": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Haemoptysis": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hepatic pain": 1, "Hot flush": 1, "Hyperventilation": 1, "Hypotension": 1, "Impaired work ability": 1, "Limb injury": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Pneumonia": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Productive cough": 1, "Pruritus": 1, "SARS-CoV-2 antibody test": 1, "Sinus tachycardia": 1, "Skin reaction": 1, "Somnolence": 1, "Swelling": 1, "Thirst": 1, "Tongue dry": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vascular headache": 1, "Viral pericarditis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3001652", "histograms": [{"histogram": {"Fatigue": 4, "Inappropriate schedule of product administration": 3, "Anaphylactic reaction": 2, "Asthenia": 2, "Blood test": 2, "Chest pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Myocarditis": 2, "Pain in extremity": 2, "Pericarditis": 2, "Pyrexia": 2, "Abdominal pain upper": 1, "Amenorrhoea": 1, "Angina pectoris": 1, "Angiogram": 1, "Atrial flutter": 1, "Body temperature": 1, "Bundle branch block left": 1, "Cardiomyopathy": 1, "Chest discomfort": 1, "Condition aggravated": 1, "Contusion": 1, "Deafness": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dry mouth": 1, "Dysstasia": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Haemoptysis": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hepatic pain": 1, "Hot flush": 1, "Hyperventilation": 1, "Hypotension": 1, "Impaired work ability": 1, "Limb injury": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Pneumonia": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Productive cough": 1, "Pruritus": 1, "SARS-CoV-2 antibody test": 1, "Sinus tachycardia": 1, "Skin reaction": 1, "Somnolence": 1, "Swelling": 1, "Thirst": 1, "Tongue dry": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vascular headache": 1, "Viral pericarditis": 1, "Vomiting": 1}, "batchcodes": ["3001652"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/30016527.json b/docs/data/histograms/Canada/30016527.json
index fa8c69b21aa..598f3966e98 100644
--- a/docs/data/histograms/Canada/30016527.json
+++ b/docs/data/histograms/Canada/30016527.json
@@ -1 +1 @@
-{"batchcode": "30016527", "histograms": [{"batchcodes": ["30016527"], "histogram": {"Anaphylactic reaction": 1, "Dyspnoea": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "30016527", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Dyspnoea": 1, "Swelling": 1}, "batchcodes": ["30016527"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001654.json b/docs/data/histograms/Canada/3001654.json
index 391544a947c..57e0023c65c 100644
--- a/docs/data/histograms/Canada/3001654.json
+++ b/docs/data/histograms/Canada/3001654.json
@@ -1 +1 @@
-{"batchcode": "3001654", "histograms": [{"batchcodes": ["3001654"], "histogram": {"Vaccination site erythema": 2, "Abdominal pain": 1, "Blepharitis": 1, "Blister": 1, "Body temperature": 1, "Bone pain": 1, "Chest discomfort": 1, "Diarrhoea haemorrhagic": 1, "Fatigue": 1, "Frequent bowel movements": 1, "Haemorrhage": 1, "Headache": 1, "Herpes zoster": 1, "Inflammation": 1, "Myalgia": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain": 1, "Pericarditis": 1, "Pyrexia": 1, "Swelling face": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "3001654", "histograms": [{"histogram": {"Vaccination site erythema": 2, "Abdominal pain": 1, "Blepharitis": 1, "Blister": 1, "Body temperature": 1, "Bone pain": 1, "Chest discomfort": 1, "Diarrhoea haemorrhagic": 1, "Fatigue": 1, "Frequent bowel movements": 1, "Haemorrhage": 1, "Headache": 1, "Herpes zoster": 1, "Inflammation": 1, "Myalgia": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain": 1, "Pericarditis": 1, "Pyrexia": 1, "Swelling face": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["3001654"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001657.json b/docs/data/histograms/Canada/3001657.json
index a1ec5b1a94d..1bd20dc3945 100644
--- a/docs/data/histograms/Canada/3001657.json
+++ b/docs/data/histograms/Canada/3001657.json
@@ -1 +1 @@
-{"batchcode": "3001657", "histograms": [{"batchcodes": ["3001657"], "histogram": {"Dyspnoea": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Nausea": 2, "Platelet count decreased": 2, "Pyrexia": 2, "Asthenia": 1, "Body temperature": 1, "Breast discomfort": 1, "COVID-19": 1, "Cardiac flutter": 1, "Cardiac function test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Fatigue": 1, "Illness": 1, "Intentional dose omission": 1, "Lip swelling": 1, "Malaise": 1, "Muscle tightness": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nasal oedema": 1, "Pain in extremity": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Product dose omission issue": 1, "Retching": 1, "Tremor": 1, "Vaccination complication": 1, "Vitreous detachment": 1, "Vomiting": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "3001657", "histograms": [{"histogram": {"Dyspnoea": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Nausea": 2, "Platelet count decreased": 2, "Pyrexia": 2, "Asthenia": 1, "Body temperature": 1, "Breast discomfort": 1, "COVID-19": 1, "Cardiac flutter": 1, "Cardiac function test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Fatigue": 1, "Illness": 1, "Intentional dose omission": 1, "Lip swelling": 1, "Malaise": 1, "Muscle tightness": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nasal oedema": 1, "Pain in extremity": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Product dose omission issue": 1, "Retching": 1, "Tremor": 1, "Vaccination complication": 1, "Vitreous detachment": 1, "Vomiting": 1, "Wrong product administered": 1}, "batchcodes": ["3001657"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001658.json b/docs/data/histograms/Canada/3001658.json
index b07e577f25f..4c4af516cc0 100644
--- a/docs/data/histograms/Canada/3001658.json
+++ b/docs/data/histograms/Canada/3001658.json
@@ -1 +1 @@
-{"batchcode": "3001658", "histograms": [{"batchcodes": ["3001658"], "histogram": {"Chest pain": 10, "Dyspnoea": 7, "Myocarditis": 7, "SARS-CoV-2 test": 5, "Chest discomfort": 4, "Nausea": 4, "Pericarditis": 4, "Pyrexia": 4, "Arthralgia": 3, "Headache": 3, "Oropharyngeal pain": 3, "Pain in extremity": 3, "Abdominal pain upper": 2, "Acute kidney injury": 2, "Cough": 2, "Fatigue": 2, "Feeling abnormal": 2, "Feeling hot": 2, "Flushing": 2, "Hypersensitivity": 2, "Inappropriate schedule of product administration": 2, "Palpitations": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Allergy to vaccine": 1, "Arthritis": 1, "Biopsy skin": 1, "Blood cholesterol": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bone pain": 1, "Breast discomfort": 1, "Cardiac failure": 1, "Cardiac function test": 1, "Cardiac stress test": 1, "Chills": 1, "Coagulopathy": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eye pruritus": 1, "Eye swelling": 1, "Gastrointestinal disorder": 1, "Generalised anxiety disorder": 1, "Haematochezia": 1, "Hepatomegaly": 1, "Herpes zoster": 1, "Human chorionic gonadotropin": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypophagia": 1, "Hypoxia": 1, "Illness": 1, "Immunisation": 1, "Impetigo": 1, "Influenza like illness": 1, "Insomnia": 1, "Kidney infection": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Lethargy": 1, "Major depression": 1, "Migraine": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myopericarditis": 1, "Nasal congestion": 1, "Near death experience": 1, "Oedema peripheral": 1, "Oliguria": 1, "Oral pain": 1, "Pain": 1, "Pneumonia": 1, "Pollakiuria": 1, "Pregnancy test": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1, "Sepsis": 1, "Suicidal ideation": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Tachycardia": 1, "Tension headache": 1, "Throat tightness": 1, "Thrombophlebitis superficial": 1, "Urinary tract infection": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3001658", "histograms": [{"histogram": {"Chest pain": 10, "Dyspnoea": 7, "Myocarditis": 7, "SARS-CoV-2 test": 5, "Chest discomfort": 4, "Nausea": 4, "Pericarditis": 4, "Pyrexia": 4, "Arthralgia": 3, "Headache": 3, "Oropharyngeal pain": 3, "Pain in extremity": 3, "Abdominal pain upper": 2, "Acute kidney injury": 2, "Cough": 2, "Fatigue": 2, "Feeling abnormal": 2, "Feeling hot": 2, "Flushing": 2, "Hypersensitivity": 2, "Inappropriate schedule of product administration": 2, "Palpitations": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Allergy to vaccine": 1, "Arthritis": 1, "Biopsy skin": 1, "Blood cholesterol": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bone pain": 1, "Breast discomfort": 1, "Cardiac failure": 1, "Cardiac function test": 1, "Cardiac stress test": 1, "Chills": 1, "Coagulopathy": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eye pruritus": 1, "Eye swelling": 1, "Gastrointestinal disorder": 1, "Generalised anxiety disorder": 1, "Haematochezia": 1, "Hepatomegaly": 1, "Herpes zoster": 1, "Human chorionic gonadotropin": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypophagia": 1, "Hypoxia": 1, "Illness": 1, "Immunisation": 1, "Impetigo": 1, "Influenza like illness": 1, "Insomnia": 1, "Kidney infection": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Lethargy": 1, "Major depression": 1, "Migraine": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myopericarditis": 1, "Nasal congestion": 1, "Near death experience": 1, "Oedema peripheral": 1, "Oliguria": 1, "Oral pain": 1, "Pain": 1, "Pneumonia": 1, "Pollakiuria": 1, "Pregnancy test": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1, "Sepsis": 1, "Suicidal ideation": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Tachycardia": 1, "Tension headache": 1, "Throat tightness": 1, "Thrombophlebitis superficial": 1, "Urinary tract infection": 1, "Vomiting": 1}, "batchcodes": ["3001658"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3001945.json b/docs/data/histograms/Canada/3001945.json
index d82dcacdfef..058042378a9 100644
--- a/docs/data/histograms/Canada/3001945.json
+++ b/docs/data/histograms/Canada/3001945.json
@@ -1 +1 @@
-{"batchcode": "3001945", "histograms": [{"batchcodes": ["3001945"], "histogram": {"Acute myocardial infarction": 1, "Chest discomfort": 1, "Chest pain": 1, "Hypotension": 1, "Myocarditis": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "3001945", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Chest discomfort": 1, "Chest pain": 1, "Hypotension": 1, "Myocarditis": 1, "Paraesthesia": 1}, "batchcodes": ["3001945"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3002179.json b/docs/data/histograms/Canada/3002179.json
index 24bce7b3cc5..694f34abf34 100644
--- a/docs/data/histograms/Canada/3002179.json
+++ b/docs/data/histograms/Canada/3002179.json
@@ -1 +1 @@
-{"batchcode": "3002179", "histograms": [{"batchcodes": ["3002179"], "histogram": {"Pain in extremity": 4, "Fatigue": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Chest discomfort": 2, "Deep vein thrombosis": 2, "Erythema": 2, "Feeling abnormal": 2, "Hyperhidrosis": 2, "Magnetic resonance imaging": 2, "Mobility decreased": 2, "Nausea": 2, "Pericarditis": 2, "Peripheral swelling": 2, "Tremor": 2, "Ultrasound Doppler": 2, "Altered state of consciousness": 1, "Arthralgia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Cardiac failure": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cognitive disorder": 1, "Computerised tomogram": 1, "Confusional state": 1, "Conversion disorder": 1, "Cyanosis": 1, "Deafness unilateral": 1, "Diplopia": 1, "Disorientation": 1, "Dizziness": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Emotional disorder": 1, "Fall": 1, "Flushing": 1, "Food allergy": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Head injury": 1, "Headache": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Irregular breathing": 1, "Lethargy": 1, "Limb discomfort": 1, "Mastication disorder": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oral pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pupillary disorder": 1, "Pupils unequal": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sluggishness": 1, "Stress": 1, "Superficial vein thrombosis": 1, "Tachycardia": 1, "Temperature intolerance": 1, "Tenderness": 1, "Thrombophlebitis": 1, "Tooth fracture": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vaccination site scab": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3002179", "histograms": [{"histogram": {"Pain in extremity": 4, "Fatigue": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Chest discomfort": 2, "Deep vein thrombosis": 2, "Erythema": 2, "Feeling abnormal": 2, "Hyperhidrosis": 2, "Magnetic resonance imaging": 2, "Mobility decreased": 2, "Nausea": 2, "Pericarditis": 2, "Peripheral swelling": 2, "Tremor": 2, "Ultrasound Doppler": 2, "Altered state of consciousness": 1, "Arthralgia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Cardiac failure": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cognitive disorder": 1, "Computerised tomogram": 1, "Confusional state": 1, "Conversion disorder": 1, "Cyanosis": 1, "Deafness unilateral": 1, "Diplopia": 1, "Disorientation": 1, "Dizziness": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Emotional disorder": 1, "Fall": 1, "Flushing": 1, "Food allergy": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Head injury": 1, "Headache": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Irregular breathing": 1, "Lethargy": 1, "Limb discomfort": 1, "Mastication disorder": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oral pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pupillary disorder": 1, "Pupils unequal": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sluggishness": 1, "Stress": 1, "Superficial vein thrombosis": 1, "Tachycardia": 1, "Temperature intolerance": 1, "Tenderness": 1, "Thrombophlebitis": 1, "Tooth fracture": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vaccination site scab": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["3002179"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3002182.json b/docs/data/histograms/Canada/3002182.json
index d97f349c463..bdd8a8d6f15 100644
--- a/docs/data/histograms/Canada/3002182.json
+++ b/docs/data/histograms/Canada/3002182.json
@@ -1 +1 @@
-{"batchcode": "3002182", "histograms": [{"batchcodes": ["3002182"], "histogram": {"Chest pain": 9, "Myocarditis": 8, "Fatigue": 5, "Dyspnoea": 4, "Pericarditis": 4, "Pyrexia": 4, "SARS-CoV-2 test": 4, "Chest discomfort": 3, "Pain": 3, "Arthralgia": 2, "Chills": 2, "Myalgia": 2, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Cardiac flutter": 1, "Dizziness": 1, "Dyskinesia": 1, "Extrasystoles": 1, "Headache": 1, "Malaise": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Myopericarditis": 1, "Pain in extremity": 1, "Pericardial effusion": 1, "Pleuritic pain": 1, "Sinus tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3002182", "histograms": [{"histogram": {"Chest pain": 9, "Myocarditis": 8, "Fatigue": 5, "Dyspnoea": 4, "Pericarditis": 4, "Pyrexia": 4, "SARS-CoV-2 test": 4, "Chest discomfort": 3, "Pain": 3, "Arthralgia": 2, "Chills": 2, "Myalgia": 2, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Cardiac flutter": 1, "Dizziness": 1, "Dyskinesia": 1, "Extrasystoles": 1, "Headache": 1, "Malaise": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Myopericarditis": 1, "Pain in extremity": 1, "Pericardial effusion": 1, "Pleuritic pain": 1, "Sinus tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["3002182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3002187.json b/docs/data/histograms/Canada/3002187.json
index 2a2ead9028e..062151654bd 100644
--- a/docs/data/histograms/Canada/3002187.json
+++ b/docs/data/histograms/Canada/3002187.json
@@ -1 +1 @@
-{"batchcode": "3002187", "histograms": [{"batchcodes": ["3002187"], "histogram": {"Chest pain": 7, "Dyspnoea": 5, "Myocarditis": 5, "Pericarditis": 4, "SARS-CoV-2 test": 4, "Dizziness": 3, "Fatigue": 3, "Headache": 3, "Nausea": 3, "Arthralgia": 2, "Chest discomfort": 2, "Insomnia": 2, "Pain in extremity": 2, "Abdominal pain upper": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Bedridden": 1, "Blindness": 1, "Blood test": 1, "Cardiac flutter": 1, "Chest X-ray": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Depression": 1, "Diplopia": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Exercise tolerance decreased": 1, "Feeling abnormal": 1, "Heart rate": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Liver injury": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Memory impairment": 1, "Migraine": 1, "Muscle twitching": 1, "Myalgia": 1, "Myopericarditis": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Photophobia": 1, "Pleural effusion": 1, "Postural orthostatic tachycardia syndrome": 1, "Product dose omission issue": 1, "Serositis": 1, "Stress at work": 1, "Suffocation feeling": 1, "Thrombocytopenia": 1, "Troponin": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3002187", "histograms": [{"histogram": {"Chest pain": 7, "Dyspnoea": 5, "Myocarditis": 5, "Pericarditis": 4, "SARS-CoV-2 test": 4, "Dizziness": 3, "Fatigue": 3, "Headache": 3, "Nausea": 3, "Arthralgia": 2, "Chest discomfort": 2, "Insomnia": 2, "Pain in extremity": 2, "Abdominal pain upper": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Bedridden": 1, "Blindness": 1, "Blood test": 1, "Cardiac flutter": 1, "Chest X-ray": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Depression": 1, "Diplopia": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Exercise tolerance decreased": 1, "Feeling abnormal": 1, "Heart rate": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Liver injury": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Memory impairment": 1, "Migraine": 1, "Muscle twitching": 1, "Myalgia": 1, "Myopericarditis": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Photophobia": 1, "Pleural effusion": 1, "Postural orthostatic tachycardia syndrome": 1, "Product dose omission issue": 1, "Serositis": 1, "Stress at work": 1, "Suffocation feeling": 1, "Thrombocytopenia": 1, "Troponin": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["3002187"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3002331.json b/docs/data/histograms/Canada/3002331.json
index fa1ef46553a..3431d3d916b 100644
--- a/docs/data/histograms/Canada/3002331.json
+++ b/docs/data/histograms/Canada/3002331.json
@@ -1 +1 @@
-{"batchcode": "3002331", "histograms": [{"batchcodes": ["3002331"], "histogram": {"Dizziness": 3, "Myocarditis": 3, "Feeling cold": 2, "Headache": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Muscle spasms": 2, "Myalgia": 2, "Pain": 2, "Palpitations": 2, "Paraesthesia": 2, "Pericarditis": 2, "Seizure": 2, "Angina pectoris": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Bone pain": 1, "Breast pain": 1, "Burning sensation": 1, "Central nervous system inflammation": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram head": 1, "Diarrhoea": 1, "Disorientation": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Fall": 1, "Illness": 1, "Infection": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Mastitis": 1, "Mental disorder": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Nausea": 1, "Neck pain": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Panic attack": 1, "Paralysis": 1, "Paranoia": 1, "Pericardial effusion": 1, "Product contamination": 1, "Pyrexia": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Scar": 1, "Sensory disturbance": 1, "Somnolence": 1, "Tremor": 1, "Vaccination complication": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3002331", "histograms": [{"histogram": {"Dizziness": 3, "Myocarditis": 3, "Feeling cold": 2, "Headache": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Muscle spasms": 2, "Myalgia": 2, "Pain": 2, "Palpitations": 2, "Paraesthesia": 2, "Pericarditis": 2, "Seizure": 2, "Angina pectoris": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Bone pain": 1, "Breast pain": 1, "Burning sensation": 1, "Central nervous system inflammation": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram head": 1, "Diarrhoea": 1, "Disorientation": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Fall": 1, "Illness": 1, "Infection": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Mastitis": 1, "Mental disorder": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Nausea": 1, "Neck pain": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Panic attack": 1, "Paralysis": 1, "Paranoia": 1, "Pericardial effusion": 1, "Product contamination": 1, "Pyrexia": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Scar": 1, "Sensory disturbance": 1, "Somnolence": 1, "Tremor": 1, "Vaccination complication": 1, "Vomiting": 1}, "batchcodes": ["3002331"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3002538.json b/docs/data/histograms/Canada/3002538.json
index b9cf8964bbc..b98d8c23eb1 100644
--- a/docs/data/histograms/Canada/3002538.json
+++ b/docs/data/histograms/Canada/3002538.json
@@ -1 +1 @@
-{"batchcode": "3002538", "histograms": [{"batchcodes": ["3002538"], "histogram": {"Myocarditis": 5, "Chest pain": 4, "Chest discomfort": 2, "Pericarditis": 2, "Angioedema": 1, "Arteriosclerosis": 1, "Bell's palsy": 1, "Cardiac arrest": 1, "Chronic spontaneous urticaria": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Herpes zoster": 1, "Impaired driving ability": 1, "Mental impairment": 1, "Opiates": 1, "Overdose": 1, "Product dose omission issue": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "3002538", "histograms": [{"histogram": {"Myocarditis": 5, "Chest pain": 4, "Chest discomfort": 2, "Pericarditis": 2, "Angioedema": 1, "Arteriosclerosis": 1, "Bell's palsy": 1, "Cardiac arrest": 1, "Chronic spontaneous urticaria": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Herpes zoster": 1, "Impaired driving ability": 1, "Mental impairment": 1, "Opiates": 1, "Overdose": 1, "Product dose omission issue": 1, "Thrombocytopenia": 1}, "batchcodes": ["3002538"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3002914.json b/docs/data/histograms/Canada/3002914.json
index 3579819d82c..ec297671935 100644
--- a/docs/data/histograms/Canada/3002914.json
+++ b/docs/data/histograms/Canada/3002914.json
@@ -1 +1 @@
-{"batchcode": "3002914", "histograms": [{"batchcodes": ["3002914"], "histogram": {"Myocarditis": 5, "Chest pain": 4, "Pericarditis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Asthenia": 1, "Cerebrovascular accident": 1, "Chills": 1, "Diarrhoea": 1, "Discomfort": 1, "Feeling abnormal": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Influenza like illness": 1, "Malaise": 1, "Myocardial infarction": 1, "Nausea": 1, "Pain": 1, "Product dose omission issue": 1, "Vaccination site pain": 1, "Venous thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "3002914", "histograms": [{"histogram": {"Myocarditis": 5, "Chest pain": 4, "Pericarditis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Asthenia": 1, "Cerebrovascular accident": 1, "Chills": 1, "Diarrhoea": 1, "Discomfort": 1, "Feeling abnormal": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Influenza like illness": 1, "Malaise": 1, "Myocardial infarction": 1, "Nausea": 1, "Pain": 1, "Product dose omission issue": 1, "Vaccination site pain": 1, "Venous thrombosis": 1}, "batchcodes": ["3002914"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3003184.json b/docs/data/histograms/Canada/3003184.json
index 6d0c5c69820..0fb3844ea9f 100644
--- a/docs/data/histograms/Canada/3003184.json
+++ b/docs/data/histograms/Canada/3003184.json
@@ -1 +1 @@
-{"batchcode": "3003184", "histograms": [{"batchcodes": ["3003184"], "histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "3003184", "histograms": [{"histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["3003184"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/30042460.json b/docs/data/histograms/Canada/30042460.json
index 8a9963926f7..3c79930214c 100644
--- a/docs/data/histograms/Canada/30042460.json
+++ b/docs/data/histograms/Canada/30042460.json
@@ -1 +1 @@
-{"batchcode": "30042460", "histograms": [{"batchcodes": ["30042460"], "histogram": {"Exposure during pregnancy": 1, "Inappropriate schedule of product administration": 1, "Pregnancy test": 1, "Progesterone": 1}}]}
\ No newline at end of file
+{"batchcode": "30042460", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "Inappropriate schedule of product administration": 1, "Pregnancy test": 1, "Progesterone": 1}, "batchcodes": ["30042460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/300V654.json b/docs/data/histograms/Canada/300V654.json
index 84d9755cc3d..29da3e80a63 100644
--- a/docs/data/histograms/Canada/300V654.json
+++ b/docs/data/histograms/Canada/300V654.json
@@ -1 +1 @@
-{"batchcode": "300V654", "histograms": [{"batchcodes": ["300V654"], "histogram": {"Colon cancer": 1, "Condition aggravated": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rheumatoid arthritis": 1}}]}
\ No newline at end of file
+{"batchcode": "300V654", "histograms": [{"histogram": {"Colon cancer": 1, "Condition aggravated": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rheumatoid arthritis": 1}, "batchcodes": ["300V654"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/30145BA.json b/docs/data/histograms/Canada/30145BA.json
index 605de3126b1..99bd5c42ed2 100644
--- a/docs/data/histograms/Canada/30145BA.json
+++ b/docs/data/histograms/Canada/30145BA.json
@@ -1 +1 @@
-{"batchcode": "30145BA", "histograms": [{"batchcodes": ["30145BA"], "histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Nausea": 1, "Panic attack": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "30145BA", "histograms": [{"histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Nausea": 1, "Panic attack": 1, "Syncope": 1}, "batchcodes": ["30145BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/30155BA.json b/docs/data/histograms/Canada/30155BA.json
index ec2e18aed76..cc524d0f6bf 100644
--- a/docs/data/histograms/Canada/30155BA.json
+++ b/docs/data/histograms/Canada/30155BA.json
@@ -1 +1 @@
-{"batchcode": "30155BA", "histograms": [{"batchcodes": ["30155BA"], "histogram": {"Chest discomfort": 1, "Feeling hot": 1, "Nervousness": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "30155BA", "histograms": [{"histogram": {"Chest discomfort": 1, "Feeling hot": 1, "Nervousness": 1, "Underdose": 1}, "batchcodes": ["30155BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/320308A.json b/docs/data/histograms/Canada/320308A.json
index d0b006b31de..e6c5c252bff 100644
--- a/docs/data/histograms/Canada/320308A.json
+++ b/docs/data/histograms/Canada/320308A.json
@@ -1 +1 @@
-{"batchcode": "320308A", "histograms": [{"batchcodes": ["320308A"], "histogram": {"Asthenia": 1, "Loss of consciousness": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "320308A", "histograms": [{"histogram": {"Asthenia": 1, "Loss of consciousness": 1, "Nausea": 1}, "batchcodes": ["320308A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/35035BD.json b/docs/data/histograms/Canada/35035BD.json
index 875d1859553..f22f945784e 100644
--- a/docs/data/histograms/Canada/35035BD.json
+++ b/docs/data/histograms/Canada/35035BD.json
@@ -1 +1 @@
-{"batchcode": "35035BD", "histograms": [{"batchcodes": ["35035BD"], "histogram": {"SARS-CoV-2 test": 4, "COVID-19": 3, "Chest pain": 3, "Drug ineffective": 3, "Dyspnoea": 3, "Headache": 2, "Investigation": 2, "Myocarditis": 2, "Chills": 1, "Dizziness": 1, "Electrocardiogram ambulatory": 1, "Full blood count": 1, "Heavy menstrual bleeding": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Myopericarditis": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Pyrexia": 1, "Syncope": 1, "Ultrasound scan": 1, "Vaccination site nerve damage": 1}}]}
\ No newline at end of file
+{"batchcode": "35035BD", "histograms": [{"histogram": {"SARS-CoV-2 test": 4, "COVID-19": 3, "Chest pain": 3, "Drug ineffective": 3, "Dyspnoea": 3, "Headache": 2, "Investigation": 2, "Myocarditis": 2, "Chills": 1, "Dizziness": 1, "Electrocardiogram ambulatory": 1, "Full blood count": 1, "Heavy menstrual bleeding": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Myopericarditis": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Pyrexia": 1, "Syncope": 1, "Ultrasound scan": 1, "Vaccination site nerve damage": 1}, "batchcodes": ["35035BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/3E+006.json b/docs/data/histograms/Canada/3E+006.json
index e5d12d8e4d9..f47da1bec48 100644
--- a/docs/data/histograms/Canada/3E+006.json
+++ b/docs/data/histograms/Canada/3E+006.json
@@ -1 +1 @@
-{"batchcode": "3E+006", "histograms": [{"batchcodes": ["3E+006"], "histogram": {"Myocarditis": 1, "Pericarditis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "3E+006", "histograms": [{"histogram": {"Myocarditis": 1, "Pericarditis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["3E+006"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/52C21A.json b/docs/data/histograms/Canada/52C21A.json
index 7605d8eaf52..440da633ecb 100644
--- a/docs/data/histograms/Canada/52C21A.json
+++ b/docs/data/histograms/Canada/52C21A.json
@@ -1 +1 @@
-{"batchcode": "52C21A", "histograms": [{"batchcodes": ["52C21A"], "histogram": {"Burning sensation": 1, "Skin swelling": 1, "Tenderness": 1, "Vaccination site joint warmth": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "52C21A", "histograms": [{"histogram": {"Burning sensation": 1, "Skin swelling": 1, "Tenderness": 1, "Vaccination site joint warmth": 1, "Vaccination site swelling": 1}, "batchcodes": ["52C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/781220.json b/docs/data/histograms/Canada/781220.json
index 290d8ae7442..18dad086208 100644
--- a/docs/data/histograms/Canada/781220.json
+++ b/docs/data/histograms/Canada/781220.json
@@ -1 +1 @@
-{"batchcode": "781220", "histograms": [{"batchcodes": ["781220"], "histogram": {"Heavy menstrual bleeding": 1}}]}
\ No newline at end of file
+{"batchcode": "781220", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1}, "batchcodes": ["781220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/890479.json b/docs/data/histograms/Canada/890479.json
index 6b1fec382bc..18fe3febe15 100644
--- a/docs/data/histograms/Canada/890479.json
+++ b/docs/data/histograms/Canada/890479.json
@@ -1 +1 @@
-{"batchcode": "890479", "histograms": [{"batchcodes": ["890479"], "histogram": {"Headache": 1, "Immunisation": 1, "Muscular weakness": 1, "Myalgia": 1, "Palpitations": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "890479", "histograms": [{"histogram": {"Headache": 1, "Immunisation": 1, "Muscular weakness": 1, "Myalgia": 1, "Palpitations": 1, "Vertigo": 1}, "batchcodes": ["890479"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ABZ5320.json b/docs/data/histograms/Canada/ABZ5320.json
index ee1f7f5ad58..fabe2b078c8 100644
--- a/docs/data/histograms/Canada/ABZ5320.json
+++ b/docs/data/histograms/Canada/ABZ5320.json
@@ -1 +1 @@
-{"batchcode": "ABZ5320", "histograms": [{"batchcodes": ["ABZ5320"], "histogram": {"Breast enlargement": 1, "Heavy menstrual bleeding": 1, "Polymenorrhoea": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "ABZ5320", "histograms": [{"histogram": {"Breast enlargement": 1, "Heavy menstrual bleeding": 1, "Polymenorrhoea": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["ABZ5320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/AS1414B.json b/docs/data/histograms/Canada/AS1414B.json
index b4cc6fae153..064e4e0086b 100644
--- a/docs/data/histograms/Canada/AS1414B.json
+++ b/docs/data/histograms/Canada/AS1414B.json
@@ -1 +1 @@
-{"batchcode": "AS1414B", "histograms": [{"batchcodes": ["AS1414B"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "AS1414B", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["AS1414B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/AW0152.json b/docs/data/histograms/Canada/AW0152.json
index b829352415e..eecd3fd027b 100644
--- a/docs/data/histograms/Canada/AW0152.json
+++ b/docs/data/histograms/Canada/AW0152.json
@@ -1 +1 @@
-{"batchcode": "AW0152", "histograms": [{"batchcodes": ["AW0152"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Immunisation": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "AW0152", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Immunisation": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["AW0152"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/BNT162B2.json b/docs/data/histograms/Canada/BNT162B2.json
index a360e43062f..165a19147dd 100644
--- a/docs/data/histograms/Canada/BNT162B2.json
+++ b/docs/data/histograms/Canada/BNT162B2.json
@@ -1 +1 @@
-{"batchcode": "BNT162B2", "histograms": [{"batchcodes": ["BNT162B2"], "histogram": {"Bell's palsy": 1}}]}
\ No newline at end of file
+{"batchcode": "BNT162B2", "histograms": [{"histogram": {"Bell's palsy": 1}, "batchcodes": ["BNT162B2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/C1E4E4.json b/docs/data/histograms/Canada/C1E4E4.json
index 294be228f78..bb58399e8c9 100644
--- a/docs/data/histograms/Canada/C1E4E4.json
+++ b/docs/data/histograms/Canada/C1E4E4.json
@@ -1 +1 @@
-{"batchcode": "C1E4E4", "histograms": [{"batchcodes": ["C1E4E4"], "histogram": {"Angioedema": 1, "Condition aggravated": 1, "Eye swelling": 1, "Pain": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "C1E4E4", "histograms": [{"histogram": {"Angioedema": 1, "Condition aggravated": 1, "Eye swelling": 1, "Pain": 1, "Urticaria": 1}, "batchcodes": ["C1E4E4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/E L0203 CC02.json b/docs/data/histograms/Canada/E L0203 CC02.json
index 73a9d9d636e..3c8a1e5e4b6 100644
--- a/docs/data/histograms/Canada/E L0203 CC02.json
+++ b/docs/data/histograms/Canada/E L0203 CC02.json
@@ -1 +1 @@
-{"batchcode": "E L0203 CC02", "histograms": [{"batchcodes": ["E L0203 CC02"], "histogram": {"Foetal exposure during pregnancy": 1, "Ventricular septal defect": 1}}]}
\ No newline at end of file
+{"batchcode": "E L0203 CC02", "histograms": [{"histogram": {"Foetal exposure during pregnancy": 1, "Ventricular septal defect": 1}, "batchcodes": ["E L0203 CC02"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/E44825.json b/docs/data/histograms/Canada/E44825.json
index a035d64d070..9f810681964 100644
--- a/docs/data/histograms/Canada/E44825.json
+++ b/docs/data/histograms/Canada/E44825.json
@@ -1 +1 @@
-{"batchcode": "E44825", "histograms": [{"batchcodes": ["E44825"], "histogram": {"Blood pressure measurement": 1, "Blood pressure orthostatic abnormal": 1, "Confusional state": 1, "Dizziness": 1, "Heart rate": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hypotension": 1, "Palpitations": 1, "Postural orthostatic tachycardia syndrome": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "E44825", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood pressure orthostatic abnormal": 1, "Confusional state": 1, "Dizziness": 1, "Heart rate": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hypotension": 1, "Palpitations": 1, "Postural orthostatic tachycardia syndrome": 1, "Syncope": 1}, "batchcodes": ["E44825"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EDW0193.json b/docs/data/histograms/Canada/EDW0193.json
index 7ac364f9fda..ba0449b157b 100644
--- a/docs/data/histograms/Canada/EDW0193.json
+++ b/docs/data/histograms/Canada/EDW0193.json
@@ -1 +1 @@
-{"batchcode": "EDW0193", "histograms": [{"batchcodes": ["EDW0193"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EDW0193", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["EDW0193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EE0193.json b/docs/data/histograms/Canada/EE0193.json
index 4452454f959..159471293be 100644
--- a/docs/data/histograms/Canada/EE0193.json
+++ b/docs/data/histograms/Canada/EE0193.json
@@ -1 +1 @@
-{"batchcode": "EE0193", "histograms": [{"batchcodes": ["EE0193"], "histogram": {"Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Phlebitis": 1, "SARS-CoV-2 test": 1, "Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "EE0193", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Phlebitis": 1, "SARS-CoV-2 test": 1, "Transient ischaemic attack": 1}, "batchcodes": ["EE0193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EE0216.json b/docs/data/histograms/Canada/EE0216.json
index c5813b17037..86375b5c4e4 100644
--- a/docs/data/histograms/Canada/EE0216.json
+++ b/docs/data/histograms/Canada/EE0216.json
@@ -1 +1 @@
-{"batchcode": "EE0216", "histograms": [{"batchcodes": ["EE0216"], "histogram": {"Heavy menstrual bleeding": 1, "Menometrorrhagia": 1, "Polymenorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "EE0216", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1, "Menometrorrhagia": 1, "Polymenorrhoea": 1}, "batchcodes": ["EE0216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EGW0193.json b/docs/data/histograms/Canada/EGW0193.json
index 01f320a22bc..342e1c8f4aa 100644
--- a/docs/data/histograms/Canada/EGW0193.json
+++ b/docs/data/histograms/Canada/EGW0193.json
@@ -1 +1 @@
-{"batchcode": "EGW0193", "histograms": [{"batchcodes": ["EGW0193"], "histogram": {"Abdominal discomfort": 1, "Arthralgia": 1, "Arthritis": 1, "Body height": 1, "Bowel movement irregularity": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness": 1, "Fear": 1, "Gastric disorder": 1, "Illness": 1, "Investigation": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Swelling": 1, "Tremor": 1, "Ultrasound scan": 1, "Vertigo": 1, "Weight": 1, "Weight increased": 1}}]}
\ No newline at end of file
+{"batchcode": "EGW0193", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Arthralgia": 1, "Arthritis": 1, "Body height": 1, "Bowel movement irregularity": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness": 1, "Fear": 1, "Gastric disorder": 1, "Illness": 1, "Investigation": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Swelling": 1, "Tremor": 1, "Ultrasound scan": 1, "Vertigo": 1, "Weight": 1, "Weight increased": 1}, "batchcodes": ["EGW0193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EI9269.json b/docs/data/histograms/Canada/EI9269.json
index b50e5e05bd8..367bc714d37 100644
--- a/docs/data/histograms/Canada/EI9269.json
+++ b/docs/data/histograms/Canada/EI9269.json
@@ -1 +1 @@
-{"batchcode": "EI9269", "histograms": [{"batchcodes": ["EI9269"], "histogram": {"Blindness unilateral": 1, "Retinal artery occlusion": 1}}]}
\ No newline at end of file
+{"batchcode": "EI9269", "histograms": [{"histogram": {"Blindness unilateral": 1, "Retinal artery occlusion": 1}, "batchcodes": ["EI9269"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EJ1685.json b/docs/data/histograms/Canada/EJ1685.json
index d14f6e956a8..95a91ba918f 100644
--- a/docs/data/histograms/Canada/EJ1685.json
+++ b/docs/data/histograms/Canada/EJ1685.json
@@ -1 +1 @@
-{"batchcode": "EJ1685", "histograms": [{"batchcodes": ["EJ1685"], "histogram": {"Joint swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ1685", "histograms": [{"histogram": {"Joint swelling": 1}, "batchcodes": ["EJ1685"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EJ1686.json b/docs/data/histograms/Canada/EJ1686.json
index 9cbba8bb463..c5af251ac3c 100644
--- a/docs/data/histograms/Canada/EJ1686.json
+++ b/docs/data/histograms/Canada/EJ1686.json
@@ -1 +1 @@
-{"batchcode": "EJ1686", "histograms": [{"batchcodes": ["EJ1686"], "histogram": {"Exposure during pregnancy": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Arthritis": 1, "Cholelithiasis": 1, "Cholestasis": 1, "Computerised tomogram": 1, "Diverticulitis": 1, "Eating disorder": 1, "Erythema": 1, "Gait disturbance": 1, "Gestational diabetes": 1, "Glucose tolerance test": 1, "HIV test": 1, "Head circumference": 1, "Hepatitis B": 1, "Hyperaesthesia teeth": 1, "Hypoglycaemia neonatal": 1, "Impaired driving ability": 1, "Insomnia": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Measles": 1, "Mumps": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rubella": 1, "Ultrasound foetal": 1, "Vertigo": 1, "Weight decrease neonatal": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ1686", "histograms": [{"histogram": {"Exposure during pregnancy": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Arthritis": 1, "Cholelithiasis": 1, "Cholestasis": 1, "Computerised tomogram": 1, "Diverticulitis": 1, "Eating disorder": 1, "Erythema": 1, "Gait disturbance": 1, "Gestational diabetes": 1, "Glucose tolerance test": 1, "HIV test": 1, "Head circumference": 1, "Hepatitis B": 1, "Hyperaesthesia teeth": 1, "Hypoglycaemia neonatal": 1, "Impaired driving ability": 1, "Insomnia": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Measles": 1, "Mumps": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rubella": 1, "Ultrasound foetal": 1, "Vertigo": 1, "Weight decrease neonatal": 1}, "batchcodes": ["EJ1686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EJL686.json b/docs/data/histograms/Canada/EJL686.json
index 11d19cd44de..2a7ee969742 100644
--- a/docs/data/histograms/Canada/EJL686.json
+++ b/docs/data/histograms/Canada/EJL686.json
@@ -1 +1 @@
-{"batchcode": "EJL686", "histograms": [{"batchcodes": ["EJL686"], "histogram": {"Facial paralysis": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "EJL686", "histograms": [{"histogram": {"Facial paralysis": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["EJL686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EK4175.json b/docs/data/histograms/Canada/EK4175.json
index a97320af792..70521eb7c05 100644
--- a/docs/data/histograms/Canada/EK4175.json
+++ b/docs/data/histograms/Canada/EK4175.json
@@ -1 +1 @@
-{"batchcode": "EK4175", "histograms": [{"batchcodes": ["EK4175"], "histogram": {"Pulmonary embolism": 1, "Pulmonary infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4175", "histograms": [{"histogram": {"Pulmonary embolism": 1, "Pulmonary infarction": 1}, "batchcodes": ["EK4175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EK4241.json b/docs/data/histograms/Canada/EK4241.json
index 07af8df72b3..d5b60bd9802 100644
--- a/docs/data/histograms/Canada/EK4241.json
+++ b/docs/data/histograms/Canada/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"SARS-CoV-2 test": 9, "Dyspnoea": 4, "Blood test": 3, "Heart rate": 3, "Myalgia": 3, "Arthralgia": 2, "COVID-19": 2, "Chest pain": 2, "Cough": 2, "Electrocardiogram": 2, "Electrocardiogram ambulatory": 2, "Fatigue": 2, "Headache": 2, "Heart rate irregular": 2, "Hypoaesthesia": 2, "Pain": 2, "Palpitations": 2, "Pyrexia": 2, "Tachycardia": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Anxiety": 1, "Asthenia": 1, "Body height": 1, "Body temperature": 1, "COVID-19 pneumonia": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Ectopic pregnancy": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Face oedema": 1, "Facial paresis": 1, "Glucose tolerance test": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lumbar puncture": 1, "Meningitis aseptic": 1, "Multiple sclerosis": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Nausea": 1, "Neurological examination": 1, "Off label use": 1, "Pain in extremity": 1, "Pneumonia": 1, "Product use issue": 1, "Rubella antibody test": 1, "Streptococcal urinary tract infection": 1, "Swollen tongue": 1, "Tinnitus": 1, "Ultrasound abdomen": 1, "Vaccination failure": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Weight": 1, "X-ray": 1, "X-ray limb": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"SARS-CoV-2 test": 9, "Dyspnoea": 4, "Blood test": 3, "Heart rate": 3, "Myalgia": 3, "Arthralgia": 2, "COVID-19": 2, "Chest pain": 2, "Cough": 2, "Electrocardiogram": 2, "Electrocardiogram ambulatory": 2, "Fatigue": 2, "Headache": 2, "Heart rate irregular": 2, "Hypoaesthesia": 2, "Pain": 2, "Palpitations": 2, "Pyrexia": 2, "Tachycardia": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Anxiety": 1, "Asthenia": 1, "Body height": 1, "Body temperature": 1, "COVID-19 pneumonia": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Ectopic pregnancy": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Face oedema": 1, "Facial paresis": 1, "Glucose tolerance test": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lumbar puncture": 1, "Meningitis aseptic": 1, "Multiple sclerosis": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Nausea": 1, "Neurological examination": 1, "Off label use": 1, "Pain in extremity": 1, "Pneumonia": 1, "Product use issue": 1, "Rubella antibody test": 1, "Streptococcal urinary tract infection": 1, "Swollen tongue": 1, "Tinnitus": 1, "Ultrasound abdomen": 1, "Vaccination failure": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Weight": 1, "X-ray": 1, "X-ray limb": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EK4245.json b/docs/data/histograms/Canada/EK4245.json
index c9862aee9b5..721954dbd0c 100644
--- a/docs/data/histograms/Canada/EK4245.json
+++ b/docs/data/histograms/Canada/EK4245.json
@@ -1 +1 @@
-{"batchcode": "EK4245", "histograms": [{"batchcodes": ["EK4245"], "histogram": {"SARS-CoV-2 test": 4, "Alanine aminotransferase": 2, "Arthralgia": 2, "Basophil count": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood test": 2, "Eosinophil count": 2, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Serum ferritin": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Alanine aminotransferase increased": 1, "Alopecia": 1, "Anaemia megaloblastic": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Appendicitis": 1, "Blood alkaline phosphatase": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood magnesium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "C-reactive protein": 1, "Chest pain": 1, "Chills": 1, "Coagulation time prolonged": 1, "Depression": 1, "Diarrhoea": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dizziness": 1, "Drug exposure before pregnancy": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Extra dose administered": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibromyalgia": 1, "Flatulence": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "IVth nerve paralysis": 1, "Impaired gastric emptying": 1, "Infectious mononucleosis": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Lethargy": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lymph node pain": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Nervousness": 1, "Neutralising antibodies": 1, "Non-high-density lipoprotein cholesterol": 1, "Nucleated red cells": 1, "Ophthalmic herpes zoster": 1, "Platelet count": 1, "Pregnancy on contraceptive": 1, "Productive cough": 1, "Red blood cell count": 1, "Red cell distribution width increased": 1, "Rheumatoid factor": 1, "Serum ferritin increased": 1, "Sleep apnoea syndrome": 1, "Somnolence": 1, "Specialist consultation": 1, "Throat tightness": 1, "Vitamin B12": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4245", "histograms": [{"histogram": {"SARS-CoV-2 test": 4, "Alanine aminotransferase": 2, "Arthralgia": 2, "Basophil count": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood test": 2, "Eosinophil count": 2, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Serum ferritin": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Alanine aminotransferase increased": 1, "Alopecia": 1, "Anaemia megaloblastic": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Appendicitis": 1, "Blood alkaline phosphatase": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood magnesium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "C-reactive protein": 1, "Chest pain": 1, "Chills": 1, "Coagulation time prolonged": 1, "Depression": 1, "Diarrhoea": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dizziness": 1, "Drug exposure before pregnancy": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Extra dose administered": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibromyalgia": 1, "Flatulence": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "IVth nerve paralysis": 1, "Impaired gastric emptying": 1, "Infectious mononucleosis": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Lethargy": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lymph node pain": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Nervousness": 1, "Neutralising antibodies": 1, "Non-high-density lipoprotein cholesterol": 1, "Nucleated red cells": 1, "Ophthalmic herpes zoster": 1, "Platelet count": 1, "Pregnancy on contraceptive": 1, "Productive cough": 1, "Red blood cell count": 1, "Red cell distribution width increased": 1, "Rheumatoid factor": 1, "Serum ferritin increased": 1, "Sleep apnoea syndrome": 1, "Somnolence": 1, "Specialist consultation": 1, "Throat tightness": 1, "Vitamin B12": 1, "White blood cell count": 1}, "batchcodes": ["EK4245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EK5730.json b/docs/data/histograms/Canada/EK5730.json
index 92a87567640..aa0e7955a66 100644
--- a/docs/data/histograms/Canada/EK5730.json
+++ b/docs/data/histograms/Canada/EK5730.json
@@ -1 +1 @@
-{"batchcode": "EK5730", "histograms": [{"batchcodes": ["EK5730"], "histogram": {"Body height": 1, "Body temperature": 1, "Body temperature increased": 1, "Diarrhoea": 1, "Headache": 1, "Leukoplakia": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Rash": 1, "Sinus pain": 1, "Swelling": 1, "Vaccination site pain": 1, "Vulval disorder": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "EK5730", "histograms": [{"histogram": {"Body height": 1, "Body temperature": 1, "Body temperature increased": 1, "Diarrhoea": 1, "Headache": 1, "Leukoplakia": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Rash": 1, "Sinus pain": 1, "Swelling": 1, "Vaccination site pain": 1, "Vulval disorder": 1, "Weight": 1}, "batchcodes": ["EK5730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EK9231.json b/docs/data/histograms/Canada/EK9231.json
index 9b8980bac8c..ac4a417e0db 100644
--- a/docs/data/histograms/Canada/EK9231.json
+++ b/docs/data/histograms/Canada/EK9231.json
@@ -1 +1 @@
-{"batchcode": "EK9231", "histograms": [{"batchcodes": ["EK9231"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EK9231", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1}, "batchcodes": ["EK9231"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL 1406.json b/docs/data/histograms/Canada/EL 1406.json
index 55ba599e9e8..4fbf0ec62ef 100644
--- a/docs/data/histograms/Canada/EL 1406.json
+++ b/docs/data/histograms/Canada/EL 1406.json
@@ -1 +1 @@
-{"batchcode": "EL 1406", "histograms": [{"batchcodes": ["EL 1406"], "histogram": {"Uveitis": 1, "Vitreous detachment": 1}}]}
\ No newline at end of file
+{"batchcode": "EL 1406", "histograms": [{"histogram": {"Uveitis": 1, "Vitreous detachment": 1}, "batchcodes": ["EL 1406"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL0203.json b/docs/data/histograms/Canada/EL0203.json
index 465cc573a8a..57864372b8b 100644
--- a/docs/data/histograms/Canada/EL0203.json
+++ b/docs/data/histograms/Canada/EL0203.json
@@ -1 +1 @@
-{"batchcode": "EL0203", "histograms": [{"batchcodes": ["EL0203"], "histogram": {"Dyspnoea": 8, "SARS-CoV-2 test": 8, "Fatigue": 5, "Pericarditis": 5, "Chest pain": 4, "Investigation": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Blood test": 3, "Chills": 3, "Dizziness": 3, "Foetal growth restriction": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Thrombocytopenia": 3, "Abortion spontaneous": 2, "Asthenia": 2, "Chest discomfort": 2, "Cough": 2, "Electrocardiogram": 2, "Exposure during pregnancy": 2, "Headache": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Maternal exposure during pregnancy": 2, "Myalgia": 2, "Oxygen saturation": 2, "Pain": 2, "Paraesthesia": 2, "Peripheral swelling": 2, "Rash": 2, "Skin exfoliation": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Acute kidney injury": 1, "Agitation": 1, "Akathisia": 1, "Amenorrhoea": 1, "Anxiety": 1, "Aphthous ulcer": 1, "Arthralgia": 1, "Balance disorder": 1, "Biopsy skin": 1, "Bladder disorder": 1, "Bladder spasm": 1, "Blood glucose": 1, "Blood urine present": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac flutter": 1, "Chapped lips": 1, "Computerised tomogram head": 1, "Connective tissue disorder": 1, "Cytomegalovirus test": 1, "Decreased appetite": 1, "Diabetic ketoacidosis": 1, "Discomfort": 1, "Drug ineffective": 1, "Dysphagia": 1, "Electric shock sensation": 1, "Epstein-Barr virus test": 1, "Eye swelling": 1, "Feeling drunk": 1, "Feeling of body temperature change": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Micturition urgency": 1, "Migraine": 1, "Mouth ulceration": 1, "Muscle enzyme": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Myositis": 1, "Neurological symptom": 1, "Oesophageal disorder": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Parvovirus B19 test": 1, "Pericardial effusion": 1, "Petechiae": 1, "Pleural effusion": 1, "Puerperal pyrexia": 1, "Purpura": 1, "Rash maculo-papular": 1, "Respiratory rate": 1, "Restlessness": 1, "Rubella antibody test": 1, "Stevens-Johnson syndrome": 1, "Tachycardia": 1, "Thrombosis": 1, "Type 1 diabetes mellitus": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vasodilatation": 1, "Vertigo": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0203", "histograms": [{"histogram": {"Dyspnoea": 8, "SARS-CoV-2 test": 8, "Fatigue": 5, "Pericarditis": 5, "Chest pain": 4, "Investigation": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Blood test": 3, "Chills": 3, "Dizziness": 3, "Foetal growth restriction": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Thrombocytopenia": 3, "Abortion spontaneous": 2, "Asthenia": 2, "Chest discomfort": 2, "Cough": 2, "Electrocardiogram": 2, "Exposure during pregnancy": 2, "Headache": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Maternal exposure during pregnancy": 2, "Myalgia": 2, "Oxygen saturation": 2, "Pain": 2, "Paraesthesia": 2, "Peripheral swelling": 2, "Rash": 2, "Skin exfoliation": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Acute kidney injury": 1, "Agitation": 1, "Akathisia": 1, "Amenorrhoea": 1, "Anxiety": 1, "Aphthous ulcer": 1, "Arthralgia": 1, "Balance disorder": 1, "Biopsy skin": 1, "Bladder disorder": 1, "Bladder spasm": 1, "Blood glucose": 1, "Blood urine present": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac flutter": 1, "Chapped lips": 1, "Computerised tomogram head": 1, "Connective tissue disorder": 1, "Cytomegalovirus test": 1, "Decreased appetite": 1, "Diabetic ketoacidosis": 1, "Discomfort": 1, "Drug ineffective": 1, "Dysphagia": 1, "Electric shock sensation": 1, "Epstein-Barr virus test": 1, "Eye swelling": 1, "Feeling drunk": 1, "Feeling of body temperature change": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Micturition urgency": 1, "Migraine": 1, "Mouth ulceration": 1, "Muscle enzyme": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Myositis": 1, "Neurological symptom": 1, "Oesophageal disorder": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Parvovirus B19 test": 1, "Pericardial effusion": 1, "Petechiae": 1, "Pleural effusion": 1, "Puerperal pyrexia": 1, "Purpura": 1, "Rash maculo-papular": 1, "Respiratory rate": 1, "Restlessness": 1, "Rubella antibody test": 1, "Stevens-Johnson syndrome": 1, "Tachycardia": 1, "Thrombosis": 1, "Type 1 diabetes mellitus": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vasodilatation": 1, "Vertigo": 1, "Wheezing": 1}, "batchcodes": ["EL0203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL023 6C02.json b/docs/data/histograms/Canada/EL023 6C02.json
index bb5c7575a2b..4d912015173 100644
--- a/docs/data/histograms/Canada/EL023 6C02.json
+++ b/docs/data/histograms/Canada/EL023 6C02.json
@@ -1 +1 @@
-{"batchcode": "EL023 6C02", "histograms": [{"batchcodes": ["EL023 6C02"], "histogram": {"Abortion spontaneous": 1, "Amniocentesis": 1, "Echocardiogram": 1, "Inappropriate schedule of product administration": 1, "Maternal exposure during pregnancy": 1, "Prenatal screening test": 1, "Serology test": 1, "Ultrasound antenatal screen": 1, "Ultrasound foetal": 1}}]}
\ No newline at end of file
+{"batchcode": "EL023 6C02", "histograms": [{"histogram": {"Abortion spontaneous": 1, "Amniocentesis": 1, "Echocardiogram": 1, "Inappropriate schedule of product administration": 1, "Maternal exposure during pregnancy": 1, "Prenatal screening test": 1, "Serology test": 1, "Ultrasound antenatal screen": 1, "Ultrasound foetal": 1}, "batchcodes": ["EL023 6C02"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL1283.json b/docs/data/histograms/Canada/EL1283.json
index 75db6be2013..091d6dc7e10 100644
--- a/docs/data/histograms/Canada/EL1283.json
+++ b/docs/data/histograms/Canada/EL1283.json
@@ -1 +1 @@
-{"batchcode": "EL1283", "histograms": [{"batchcodes": ["EL1283"], "histogram": {"Keratitis": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1283", "histograms": [{"histogram": {"Keratitis": 1}, "batchcodes": ["EL1283"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL1404.json b/docs/data/histograms/Canada/EL1404.json
index 02d6e2af2c8..dcf016517fd 100644
--- a/docs/data/histograms/Canada/EL1404.json
+++ b/docs/data/histograms/Canada/EL1404.json
@@ -1 +1 @@
-{"batchcode": "EL1404", "histograms": [{"batchcodes": ["EL1404"], "histogram": {"Arthralgia": 4, "SARS-CoV-2 test": 4, "Nausea": 3, "Fatigue": 2, "Gait disturbance": 2, "Headache": 2, "Pain": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-cyclic citrullinated peptide antibody positive": 1, "Arthritis": 1, "Back pain": 1, "Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dysmenorrhoea": 1, "Dyspnoea": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Inflammation": 1, "Insomnia": 1, "Joint swelling": 1, "Laryngitis": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocarditis": 1, "Oesophagitis": 1, "Osteoarthritis": 1, "Periarthritis": 1, "Pericarditis": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Skin reaction": 1, "Tendonitis": 1, "Tinnitus": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1404", "histograms": [{"histogram": {"Arthralgia": 4, "SARS-CoV-2 test": 4, "Nausea": 3, "Fatigue": 2, "Gait disturbance": 2, "Headache": 2, "Pain": 2, "Pain in extremity": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-cyclic citrullinated peptide antibody positive": 1, "Arthritis": 1, "Back pain": 1, "Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dysmenorrhoea": 1, "Dyspnoea": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Inflammation": 1, "Insomnia": 1, "Joint swelling": 1, "Laryngitis": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocarditis": 1, "Oesophagitis": 1, "Osteoarthritis": 1, "Periarthritis": 1, "Pericarditis": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Skin reaction": 1, "Tendonitis": 1, "Tinnitus": 1, "Vomiting": 1}, "batchcodes": ["EL1404"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL1406.json b/docs/data/histograms/Canada/EL1406.json
index 8fe61432517..444f7c8cc0c 100644
--- a/docs/data/histograms/Canada/EL1406.json
+++ b/docs/data/histograms/Canada/EL1406.json
@@ -1 +1 @@
-{"batchcode": "EL1406", "histograms": [{"batchcodes": ["EL1406"], "histogram": {"Fatigue": 3, "Headache": 3, "Chills": 2, "Diarrhoea": 2, "Pruritus": 2, "Rhinorrhoea": 2, "Sneezing": 2, "Back pain": 1, "Blood pressure measurement": 1, "Brain stem auditory evoked response": 1, "COVID-19": 1, "Cough": 1, "Deafness unilateral": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Erythema": 1, "Eye irritation": 1, "Eyelid function disorder": 1, "Facial paralysis": 1, "Feeling hot": 1, "Hypertension": 1, "Hypotension": 1, "Lacrimation increased": 1, "Lethargy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Menstruation delayed": 1, "Mucosal disorder": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Neck pain": 1, "Neuralgia": 1, "Oligomenorrhoea": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in jaw": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Reflexes abnormal": 1, "SARS-CoV-2 test": 1, "Spinal myelogram": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Syncope": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombosis": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1406", "histograms": [{"histogram": {"Fatigue": 3, "Headache": 3, "Chills": 2, "Diarrhoea": 2, "Pruritus": 2, "Rhinorrhoea": 2, "Sneezing": 2, "Back pain": 1, "Blood pressure measurement": 1, "Brain stem auditory evoked response": 1, "COVID-19": 1, "Cough": 1, "Deafness unilateral": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Erythema": 1, "Eye irritation": 1, "Eyelid function disorder": 1, "Facial paralysis": 1, "Feeling hot": 1, "Hypertension": 1, "Hypotension": 1, "Lacrimation increased": 1, "Lethargy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Menstruation delayed": 1, "Mucosal disorder": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Neck pain": 1, "Neuralgia": 1, "Oligomenorrhoea": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in jaw": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Reflexes abnormal": 1, "SARS-CoV-2 test": 1, "Spinal myelogram": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Syncope": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombosis": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual impairment": 1}, "batchcodes": ["EL1406"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL3302.json b/docs/data/histograms/Canada/EL3302.json
index f260779d0f1..74be8515713 100644
--- a/docs/data/histograms/Canada/EL3302.json
+++ b/docs/data/histograms/Canada/EL3302.json
@@ -1 +1 @@
-{"batchcode": "EL3302", "histograms": [{"batchcodes": ["EL3302"], "histogram": {"Headache": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3302", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1}, "batchcodes": ["EL3302"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL9262.json b/docs/data/histograms/Canada/EL9262.json
index cd7ba45f74f..db1589c15d3 100644
--- a/docs/data/histograms/Canada/EL9262.json
+++ b/docs/data/histograms/Canada/EL9262.json
@@ -1 +1 @@
-{"batchcode": "EL9262", "histograms": [{"batchcodes": ["EL9262"], "histogram": {"Blood test": 1, "Insomnia": 1, "Paranoia": 1, "Personality change": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9262", "histograms": [{"histogram": {"Blood test": 1, "Insomnia": 1, "Paranoia": 1, "Personality change": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EL9262"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EL9267.json b/docs/data/histograms/Canada/EL9267.json
index a5c5f816ccb..41a0d88f7a1 100644
--- a/docs/data/histograms/Canada/EL9267.json
+++ b/docs/data/histograms/Canada/EL9267.json
@@ -1 +1 @@
-{"batchcode": "EL9267", "histograms": [{"batchcodes": ["EL9267"], "histogram": {"Hypoaesthesia": 1, "Hypoaesthesia eye": 1, "Hypoaesthesia oral": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9267", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Hypoaesthesia eye": 1, "Hypoaesthesia oral": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EL9267"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EN1194.json b/docs/data/histograms/Canada/EN1194.json
index d78e506bbec..1692d386dfd 100644
--- a/docs/data/histograms/Canada/EN1194.json
+++ b/docs/data/histograms/Canada/EN1194.json
@@ -1 +1 @@
-{"batchcode": "EN1194", "histograms": [{"batchcodes": ["EN1194"], "histogram": {"SARS-CoV-2 test": 5, "COVID-19": 4, "Drug ineffective": 2, "Vaccination failure": 2, "Arthritis": 1, "Asthma": 1, "Dizziness": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Off label use": 1, "Pain in extremity": 1, "Syncope": 1, "Trigger finger": 1, "Unresponsive to stimuli": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1194", "histograms": [{"histogram": {"SARS-CoV-2 test": 5, "COVID-19": 4, "Drug ineffective": 2, "Vaccination failure": 2, "Arthritis": 1, "Asthma": 1, "Dizziness": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Off label use": 1, "Pain in extremity": 1, "Syncope": 1, "Trigger finger": 1, "Unresponsive to stimuli": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["EN1194"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EN1196.json b/docs/data/histograms/Canada/EN1196.json
index e75a867e546..154e1633258 100644
--- a/docs/data/histograms/Canada/EN1196.json
+++ b/docs/data/histograms/Canada/EN1196.json
@@ -1 +1 @@
-{"batchcode": "EN1196", "histograms": [{"batchcodes": ["EN1196"], "histogram": {"SARS-CoV-2 test": 12, "COVID-19": 11, "Vaccination failure": 7, "Drug ineffective": 5, "Nausea": 4, "Blood test": 3, "Fatigue": 3, "Paraesthesia": 3, "Pericarditis": 3, "Asthma": 2, "Blood albumin": 2, "Blood pressure measurement": 2, "Burning sensation": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Dizziness": 2, "Dyspnoea": 2, "Headache": 2, "Investigation": 2, "Low density lipoprotein": 2, "Myalgia": 2, "Myocarditis": 2, "Nasal congestion": 2, "Pain in extremity": 2, "Palpitations": 2, "SARS-CoV-2 test positive": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal pain upper": 1, "Abnormal loss of weight": 1, "Acute myocardial infarction": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Blindness": 1, "Blood albumin decreased": 1, "Blood iron": 1, "Blood pressure increased": 1, "Blood urine present": 1, "Brain natriuretic peptide": 1, "Cardiac flutter": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram": 1, "Contrast media allergy": 1, "Cough": 1, "Culture urine": 1, "Disease recurrence": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemoglobin urine": 1, "Head discomfort": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Herpes simplex": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Insomnia": 1, "Joint swelling": 1, "Kidney infection": 1, "Laboratory test": 1, "Leukocyturia": 1, "Localised oedema": 1, "Loss of consciousness": 1, "Low density lipoprotein increased": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging breast": 1, "Malaise": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nephrotic syndrome": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polymenorrhoea": 1, "Polymyalgia rheumatica": 1, "Protein urine": 1, "Proteinuria": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "Red blood cell sedimentation rate": 1, "Renal pain": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 antibody test": 1, "Scrotal oedema": 1, "Seizure": 1, "Skin burning sensation": 1, "Speech disorder": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Ultrasound scan": 1, "Urine analysis abnormal": 1, "Urticaria": 1, "Vertigo": 1, "Visual impairment": 1, "White blood cell count": 1, "Xanthelasma": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1196", "histograms": [{"histogram": {"SARS-CoV-2 test": 12, "COVID-19": 11, "Vaccination failure": 7, "Drug ineffective": 5, "Nausea": 4, "Blood test": 3, "Fatigue": 3, "Paraesthesia": 3, "Pericarditis": 3, "Asthma": 2, "Blood albumin": 2, "Blood pressure measurement": 2, "Burning sensation": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Dizziness": 2, "Dyspnoea": 2, "Headache": 2, "Investigation": 2, "Low density lipoprotein": 2, "Myalgia": 2, "Myocarditis": 2, "Nasal congestion": 2, "Pain in extremity": 2, "Palpitations": 2, "SARS-CoV-2 test positive": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal pain upper": 1, "Abnormal loss of weight": 1, "Acute myocardial infarction": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Blindness": 1, "Blood albumin decreased": 1, "Blood iron": 1, "Blood pressure increased": 1, "Blood urine present": 1, "Brain natriuretic peptide": 1, "Cardiac flutter": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram": 1, "Contrast media allergy": 1, "Cough": 1, "Culture urine": 1, "Disease recurrence": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemoglobin urine": 1, "Head discomfort": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Herpes simplex": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Insomnia": 1, "Joint swelling": 1, "Kidney infection": 1, "Laboratory test": 1, "Leukocyturia": 1, "Localised oedema": 1, "Loss of consciousness": 1, "Low density lipoprotein increased": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging breast": 1, "Malaise": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nephrotic syndrome": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polymenorrhoea": 1, "Polymyalgia rheumatica": 1, "Protein urine": 1, "Proteinuria": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "Red blood cell sedimentation rate": 1, "Renal pain": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 antibody test": 1, "Scrotal oedema": 1, "Seizure": 1, "Skin burning sensation": 1, "Speech disorder": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Ultrasound scan": 1, "Urine analysis abnormal": 1, "Urticaria": 1, "Vertigo": 1, "Visual impairment": 1, "White blood cell count": 1, "Xanthelasma": 1}, "batchcodes": ["EN1196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EN1198.json b/docs/data/histograms/Canada/EN1198.json
index 20220a8b38d..d55348820e7 100644
--- a/docs/data/histograms/Canada/EN1198.json
+++ b/docs/data/histograms/Canada/EN1198.json
@@ -1 +1 @@
-{"batchcode": "EN1198", "histograms": [{"batchcodes": ["043021A", "EN1198", "FF25595"], "histogram": {"Acne": 1, "Fall": 1, "Feeling abnormal": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Platelet factor 4": 1, "Screaming": 1, "Skin infection": 1, "Skin papilloma": 1, "Sleep disorder": 1}}, {"batchcodes": ["EN1198"], "histogram": {"SARS-CoV-2 test": 4, "COVID-19": 2, "Drug ineffective": 2, "Headache": 2, "Syncope": 2, "Ageusia": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac flutter": 1, "Cerebrovascular accident": 1, "Constipation": 1, "Depressed level of consciousness": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysuria": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Haemorrhage urinary tract": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypotension": 1, "Impaired gastric emptying": 1, "Left ventricular dysfunction": 1, "Myocarditis": 1, "Pain": 1, "Palpitations": 1, "Rash": 1, "Suspected COVID-19": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vertigo": 1, "Volvulus": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1198", "histograms": [{"histogram": {"Acne": 1, "Fall": 1, "Feeling abnormal": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Platelet factor 4": 1, "Screaming": 1, "Skin infection": 1, "Skin papilloma": 1, "Sleep disorder": 1}, "batchcodes": ["043021A", "EN1198", "FF25595"]}, {"histogram": {"SARS-CoV-2 test": 4, "COVID-19": 2, "Drug ineffective": 2, "Headache": 2, "Syncope": 2, "Ageusia": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac flutter": 1, "Cerebrovascular accident": 1, "Constipation": 1, "Depressed level of consciousness": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysuria": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Haemorrhage urinary tract": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypotension": 1, "Impaired gastric emptying": 1, "Left ventricular dysfunction": 1, "Myocarditis": 1, "Pain": 1, "Palpitations": 1, "Rash": 1, "Suspected COVID-19": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vertigo": 1, "Volvulus": 1}, "batchcodes": ["EN1198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EN3344.json b/docs/data/histograms/Canada/EN3344.json
index 0a570d511bd..2d5f3e22538 100644
--- a/docs/data/histograms/Canada/EN3344.json
+++ b/docs/data/histograms/Canada/EN3344.json
@@ -1 +1 @@
-{"batchcode": "EN3344", "histograms": [{"batchcodes": ["EN3344"], "histogram": {"Hypoaesthesia oral": 1, "Pain assessment": 1, "Vaccination site discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "EN3344", "histograms": [{"histogram": {"Hypoaesthesia oral": 1, "Pain assessment": 1, "Vaccination site discomfort": 1}, "batchcodes": ["EN3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EN6202.json b/docs/data/histograms/Canada/EN6202.json
index 10b2f6255c7..ce6ef17e0c5 100644
--- a/docs/data/histograms/Canada/EN6202.json
+++ b/docs/data/histograms/Canada/EN6202.json
@@ -1 +1 @@
-{"batchcode": "EN6202", "histograms": [{"batchcodes": ["EN6202"], "histogram": {"Atrial fibrillation": 1, "Chest pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6202", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Chest pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EN6202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EP6017.json b/docs/data/histograms/Canada/EP6017.json
index e08f144123b..e1259512e7f 100644
--- a/docs/data/histograms/Canada/EP6017.json
+++ b/docs/data/histograms/Canada/EP6017.json
@@ -1 +1 @@
-{"batchcode": "EP6017", "histograms": [{"batchcodes": ["020E21A", "EP6017"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["EP6017"], "histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Nasal congestion": 3, "Blister": 2, "Drug ineffective": 2, "Oropharyngeal pain": 2, "Pain": 2, "Pericarditis": 2, "Pyrexia": 2, "Vaccination failure": 2, "Abdominal pain upper": 1, "Anaphylactic reaction": 1, "Arteriosclerosis": 1, "Arteriosclerosis coronary artery": 1, "Bell's palsy": 1, "Chest pain": 1, "Chills": 1, "Cholelithiasis": 1, "Cough": 1, "Decreased appetite": 1, "Eye irritation": 1, "Eye pain": 1, "Fall": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Granuloma": 1, "Headache": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Investigation": 1, "Liver injury": 1, "Myocarditis": 1, "Myopericarditis": 1, "Ocular hyperaemia": 1, "Ophthalmic herpes zoster": 1, "Peripheral swelling": 1, "Photosensitivity reaction": 1, "Pleuritic pain": 1, "Scar": 1, "Sinus rhythm": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6017", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["020E21A", "EP6017"]}, {"histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Nasal congestion": 3, "Blister": 2, "Drug ineffective": 2, "Oropharyngeal pain": 2, "Pain": 2, "Pericarditis": 2, "Pyrexia": 2, "Vaccination failure": 2, "Abdominal pain upper": 1, "Anaphylactic reaction": 1, "Arteriosclerosis": 1, "Arteriosclerosis coronary artery": 1, "Bell's palsy": 1, "Chest pain": 1, "Chills": 1, "Cholelithiasis": 1, "Cough": 1, "Decreased appetite": 1, "Eye irritation": 1, "Eye pain": 1, "Fall": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Granuloma": 1, "Headache": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Investigation": 1, "Liver injury": 1, "Myocarditis": 1, "Myopericarditis": 1, "Ocular hyperaemia": 1, "Ophthalmic herpes zoster": 1, "Peripheral swelling": 1, "Photosensitivity reaction": 1, "Pleuritic pain": 1, "Scar": 1, "Sinus rhythm": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["EP6017"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EP6775.json b/docs/data/histograms/Canada/EP6775.json
index 4ee1e19bc47..6b4cc80d0a3 100644
--- a/docs/data/histograms/Canada/EP6775.json
+++ b/docs/data/histograms/Canada/EP6775.json
@@ -1 +1 @@
-{"batchcode": "EP6775", "histograms": [{"batchcodes": ["079J21B", "EP6775"], "histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Drug ineffective": 1, "Fatigue": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sneezing": 1}}, {"batchcodes": ["EP6775"], "histogram": {"Dizziness": 5, "Pyrexia": 5, "Fatigue": 4, "Myocarditis": 4, "SARS-CoV-2 test": 4, "Headache": 3, "Heart rate": 3, "Malaise": 3, "Pain in extremity": 3, "Syncope": 3, "Weight decreased": 3, "Blood pressure measurement": 2, "Blood test": 2, "COVID-19": 2, "Computerised tomogram": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Investigation": 2, "Lymphadenopathy": 2, "Muscle spasms": 2, "Nausea": 2, "Pericarditis": 2, "Polymerase chain reaction": 2, "Rhinorrhoea": 2, "Tinnitus": 2, "Urticaria": 2, "Vaccination failure": 2, "Anaphylactic shock": 1, "Arthralgia": 1, "Asthma": 1, "Blood count": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Colonoscopy": 1, "Contusion": 1, "Coordination abnormal": 1, "Depressed level of consciousness": 1, "Disease recurrence": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear infection": 1, "Exposure via breast milk": 1, "Feeling hot": 1, "Gait disturbance": 1, "Haematochezia": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Hepatic pain": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypopnoea": 1, "Illness": 1, "Injection site pain": 1, "Insomnia": 1, "International normalised ratio": 1, "Laboratory test": 1, "Laryngitis": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Pregnancy test": 1, "Premenstrual pain": 1, "Presyncope": 1, "Pulse volume decreased": 1, "Pulse waveform": 1, "Respiratory rate": 1, "Rheumatoid arthritis": 1, "Splenitis": 1, "Splenomegaly": 1, "Tachycardia": 1, "Tongue oedema": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination site infection": 1, "Vaccination site urticaria": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6775", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Drug ineffective": 1, "Fatigue": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sneezing": 1}, "batchcodes": ["079J21B", "EP6775"]}, {"histogram": {"Dizziness": 5, "Pyrexia": 5, "Fatigue": 4, "Myocarditis": 4, "SARS-CoV-2 test": 4, "Headache": 3, "Heart rate": 3, "Malaise": 3, "Pain in extremity": 3, "Syncope": 3, "Weight decreased": 3, "Blood pressure measurement": 2, "Blood test": 2, "COVID-19": 2, "Computerised tomogram": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Investigation": 2, "Lymphadenopathy": 2, "Muscle spasms": 2, "Nausea": 2, "Pericarditis": 2, "Polymerase chain reaction": 2, "Rhinorrhoea": 2, "Tinnitus": 2, "Urticaria": 2, "Vaccination failure": 2, "Anaphylactic shock": 1, "Arthralgia": 1, "Asthma": 1, "Blood count": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Colonoscopy": 1, "Contusion": 1, "Coordination abnormal": 1, "Depressed level of consciousness": 1, "Disease recurrence": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear infection": 1, "Exposure via breast milk": 1, "Feeling hot": 1, "Gait disturbance": 1, "Haematochezia": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Hepatic pain": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypopnoea": 1, "Illness": 1, "Injection site pain": 1, "Insomnia": 1, "International normalised ratio": 1, "Laboratory test": 1, "Laryngitis": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Pregnancy test": 1, "Premenstrual pain": 1, "Presyncope": 1, "Pulse volume decreased": 1, "Pulse waveform": 1, "Respiratory rate": 1, "Rheumatoid arthritis": 1, "Splenitis": 1, "Splenomegaly": 1, "Tachycardia": 1, "Tongue oedema": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination site infection": 1, "Vaccination site urticaria": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Weight": 1}, "batchcodes": ["EP6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER 1742.json b/docs/data/histograms/Canada/ER 1742.json
index b3f6b828084..bb7d0d9a521 100644
--- a/docs/data/histograms/Canada/ER 1742.json
+++ b/docs/data/histograms/Canada/ER 1742.json
@@ -1 +1 @@
-{"batchcode": "ER 1742", "histograms": [{"batchcodes": ["ER 1742"], "histogram": {"Anaphylactic reaction": 1, "Blood test": 1, "Chest pain": 1, "Computerised tomogram": 1, "Ear discomfort": 1, "Erythema": 1, "Pulmonary embolism": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "ER 1742", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Blood test": 1, "Chest pain": 1, "Computerised tomogram": 1, "Ear discomfort": 1, "Erythema": 1, "Pulmonary embolism": 1, "X-ray": 1}, "batchcodes": ["ER 1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER0866.json b/docs/data/histograms/Canada/ER0866.json
index 2b6fc107a4a..d185d628d11 100644
--- a/docs/data/histograms/Canada/ER0866.json
+++ b/docs/data/histograms/Canada/ER0866.json
@@ -1 +1 @@
-{"batchcode": "ER0866", "histograms": [{"batchcodes": ["ER0866"], "histogram": {"Blood pressure measurement": 1, "Cerebrovascular accident": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1, "Hypertension": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "ER0866", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Cerebrovascular accident": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1, "Hypertension": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["ER0866"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER1742.json b/docs/data/histograms/Canada/ER1742.json
index 9e8b0d2dbb0..f861a5fda54 100644
--- a/docs/data/histograms/Canada/ER1742.json
+++ b/docs/data/histograms/Canada/ER1742.json
@@ -1 +1 @@
-{"batchcode": "ER1742", "histograms": [{"batchcodes": ["ER1742"], "histogram": {"Headache": 14, "Fatigue": 13, "SARS-CoV-2 test": 13, "Arthralgia": 8, "Blood test": 8, "Dizziness": 8, "Chest pain": 7, "Nausea": 7, "Pericarditis": 7, "Blood pressure measurement": 6, "Dyspnoea": 6, "Pain in extremity": 6, "Pyrexia": 6, "Asthenia": 5, "Chest discomfort": 5, "Feeling abnormal": 5, "Hypoaesthesia": 5, "Palpitations": 5, "Chills": 4, "Computerised tomogram": 4, "Heart rate increased": 4, "Herpes zoster": 4, "Investigation": 4, "Loss of consciousness": 4, "Lymphadenopathy": 4, "Myalgia": 4, "Myocarditis": 4, "Pain in jaw": 4, "Pruritus": 4, "Rash": 4, "Chest X-ray": 3, "Condition aggravated": 3, "Diarrhoea": 3, "Electrocardiogram": 3, "Haemoglobin": 3, "Heavy menstrual bleeding": 3, "Neck pain": 3, "Pain": 3, "Paraesthesia": 3, "Peripheral swelling": 3, "Syncope": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Urticaria": 3, "Vaccination site pain": 3, "Anaphylactic reaction": 2, "Antinuclear antibody": 2, "Anxiety": 2, "Back pain": 2, "Bell's palsy": 2, "Blister": 2, "Blood pressure decreased": 2, "Blood thyroid stimulating hormone": 2, "Blood urine": 2, "Body height": 2, "Body temperature": 2, "Breast pain": 2, "Cardiac flutter": 2, "Cerebrovascular accident": 2, "Disease recurrence": 2, "Disturbance in attention": 2, "Dry mouth": 2, "Electric shock sensation": 2, "Erythema": 2, "Haematocrit": 2, "Haemoglobin decreased": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Inappropriate schedule of product administration": 2, "Insomnia": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Malaise": 2, "Mean cell haemoglobin": 2, "Mean cell volume": 2, "Migraine": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Night sweats": 2, "Physical examination": 2, "Platelet count": 2, "Pleuritic pain": 2, "Polymerase chain reaction": 2, "Red blood cell sedimentation rate": 2, "Seizure": 2, "Somnolence": 2, "Swelling face": 2, "Tremor": 2, "Urine analysis": 2, "Vaginal haemorrhage": 2, "Vertigo": 2, "Viral test": 2, "Vision blurred": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Allergy test": 1, "Alopecia": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Anion gap": 1, "Antibody test": 1, "Antimitochondrial antibody": 1, "Arthritis": 1, "Autoimmune disorder": 1, "Balance disorder": 1, "Basophil count": 1, "Bedridden": 1, "Beta globulin": 1, "Bilirubin urine": 1, "Biopsy": 1, "Blood albumin": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin M": 1, "Blood potassium": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone decreased": 1, "Blood urea": 1, "Body mass index": 1, "Bone pain": 1, "Breast inflammation": 1, "Breast mass": 1, "Burning sensation": 1, "Bursitis": 1, "C-reactive protein": 1, "COVID-19": 1, "Carbon dioxide": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chromaturia": 1, "Chronic obstructive pulmonary disease": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Confusional state": 1, "Cough": 1, "Creatinine renal clearance": 1, "Cyanosis": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Dehydration": 1, "Diplopia": 1, "Drug ineffective": 1, "Dry eye": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Ear swelling": 1, "Electroencephalogram": 1, "Eosinophil count": 1, "Erectile dysfunction": 1, "Extraocular muscle paresis": 1, "Eye haemorrhage": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Full blood count": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Gout": 1, "Haematochezia": 1, "Haematocrit decreased": 1, "Haemoglobin increased": 1, "Haemorrhage urinary tract": 1, "Hallucination": 1, "Head discomfort": 1, "Heart rate abnormal": 1, "Hepatitis B surface antibody": 1, "Hepatitis C antibody": 1, "Herpes zoster oticus": 1, "Hypertension": 1, "Immune system disorder": 1, "Immunoglobulins": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Infection": 1, "Inflammatory pain": 1, "International normalised ratio": 1, "Intraocular pressure increased": 1, "Intraocular pressure test": 1, "Joint dislocation": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Light chain analysis": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphatic disorder": 1, "Lymphocyte count": 1, "Madarosis": 1, "Mammogram": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume decreased": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Myopericarditis": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Oscillopsia": 1, "Paralysis": 1, "Pericardial effusion": 1, "Pericardial rub": 1, "Peripheral coldness": 1, "Platelet count decreased": 1, "Polymyalgia rheumatica": 1, "Presyncope": 1, "Productive cough": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin level": 1, "Pulmonary physical examination": 1, "Pulmonary thrombosis": 1, "Rash pruritic": 1, "Raynaud's phenomenon": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Respiratory distress": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test positive": 1, "Scar": 1, "Sinus disorder": 1, "Sleep disorder": 1, "Smear test": 1, "Specific gravity urine": 1, "Swollen tongue": 1, "Tachycardia": 1, "Tachypnoea": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Throat irritation": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Traumatic lung injury": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound Doppler": 1, "Ultrasound breast": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "ER1742", "histograms": [{"histogram": {"Headache": 14, "Fatigue": 13, "SARS-CoV-2 test": 13, "Arthralgia": 8, "Blood test": 8, "Dizziness": 8, "Chest pain": 7, "Nausea": 7, "Pericarditis": 7, "Blood pressure measurement": 6, "Dyspnoea": 6, "Pain in extremity": 6, "Pyrexia": 6, "Asthenia": 5, "Chest discomfort": 5, "Feeling abnormal": 5, "Hypoaesthesia": 5, "Palpitations": 5, "Chills": 4, "Computerised tomogram": 4, "Heart rate increased": 4, "Herpes zoster": 4, "Investigation": 4, "Loss of consciousness": 4, "Lymphadenopathy": 4, "Myalgia": 4, "Myocarditis": 4, "Pain in jaw": 4, "Pruritus": 4, "Rash": 4, "Chest X-ray": 3, "Condition aggravated": 3, "Diarrhoea": 3, "Electrocardiogram": 3, "Haemoglobin": 3, "Heavy menstrual bleeding": 3, "Neck pain": 3, "Pain": 3, "Paraesthesia": 3, "Peripheral swelling": 3, "Syncope": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Urticaria": 3, "Vaccination site pain": 3, "Anaphylactic reaction": 2, "Antinuclear antibody": 2, "Anxiety": 2, "Back pain": 2, "Bell's palsy": 2, "Blister": 2, "Blood pressure decreased": 2, "Blood thyroid stimulating hormone": 2, "Blood urine": 2, "Body height": 2, "Body temperature": 2, "Breast pain": 2, "Cardiac flutter": 2, "Cerebrovascular accident": 2, "Disease recurrence": 2, "Disturbance in attention": 2, "Dry mouth": 2, "Electric shock sensation": 2, "Erythema": 2, "Haematocrit": 2, "Haemoglobin decreased": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Inappropriate schedule of product administration": 2, "Insomnia": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Malaise": 2, "Mean cell haemoglobin": 2, "Mean cell volume": 2, "Migraine": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Night sweats": 2, "Physical examination": 2, "Platelet count": 2, "Pleuritic pain": 2, "Polymerase chain reaction": 2, "Red blood cell sedimentation rate": 2, "Seizure": 2, "Somnolence": 2, "Swelling face": 2, "Tremor": 2, "Urine analysis": 2, "Vaginal haemorrhage": 2, "Vertigo": 2, "Viral test": 2, "Vision blurred": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Allergy test": 1, "Alopecia": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Anion gap": 1, "Antibody test": 1, "Antimitochondrial antibody": 1, "Arthritis": 1, "Autoimmune disorder": 1, "Balance disorder": 1, "Basophil count": 1, "Bedridden": 1, "Beta globulin": 1, "Bilirubin urine": 1, "Biopsy": 1, "Blood albumin": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin M": 1, "Blood potassium": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone decreased": 1, "Blood urea": 1, "Body mass index": 1, "Bone pain": 1, "Breast inflammation": 1, "Breast mass": 1, "Burning sensation": 1, "Bursitis": 1, "C-reactive protein": 1, "COVID-19": 1, "Carbon dioxide": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chromaturia": 1, "Chronic obstructive pulmonary disease": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Confusional state": 1, "Cough": 1, "Creatinine renal clearance": 1, "Cyanosis": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Dehydration": 1, "Diplopia": 1, "Drug ineffective": 1, "Dry eye": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Ear swelling": 1, "Electroencephalogram": 1, "Eosinophil count": 1, "Erectile dysfunction": 1, "Extraocular muscle paresis": 1, "Eye haemorrhage": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Full blood count": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Gout": 1, "Haematochezia": 1, "Haematocrit decreased": 1, "Haemoglobin increased": 1, "Haemorrhage urinary tract": 1, "Hallucination": 1, "Head discomfort": 1, "Heart rate abnormal": 1, "Hepatitis B surface antibody": 1, "Hepatitis C antibody": 1, "Herpes zoster oticus": 1, "Hypertension": 1, "Immune system disorder": 1, "Immunoglobulins": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Infection": 1, "Inflammatory pain": 1, "International normalised ratio": 1, "Intraocular pressure increased": 1, "Intraocular pressure test": 1, "Joint dislocation": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Light chain analysis": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphatic disorder": 1, "Lymphocyte count": 1, "Madarosis": 1, "Mammogram": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume decreased": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Myopericarditis": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Oscillopsia": 1, "Paralysis": 1, "Pericardial effusion": 1, "Pericardial rub": 1, "Peripheral coldness": 1, "Platelet count decreased": 1, "Polymyalgia rheumatica": 1, "Presyncope": 1, "Productive cough": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin level": 1, "Pulmonary physical examination": 1, "Pulmonary thrombosis": 1, "Rash pruritic": 1, "Raynaud's phenomenon": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Respiratory distress": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test positive": 1, "Scar": 1, "Sinus disorder": 1, "Sleep disorder": 1, "Smear test": 1, "Specific gravity urine": 1, "Swollen tongue": 1, "Tachycardia": 1, "Tachypnoea": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Throat irritation": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Traumatic lung injury": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound Doppler": 1, "Ultrasound breast": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH urine": 1}, "batchcodes": ["ER1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER2613.json b/docs/data/histograms/Canada/ER2613.json
index e2d79794931..231cdbe7685 100644
--- a/docs/data/histograms/Canada/ER2613.json
+++ b/docs/data/histograms/Canada/ER2613.json
@@ -1 +1 @@
-{"batchcode": "ER2613", "histograms": [{"batchcodes": ["ER2613"], "histogram": {"Dizziness": 2, "Injection site bruising": 2, "Dyspnoea": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Injection site paraesthesia": 1, "Injection site swelling": 1, "Palpitations": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2613", "histograms": [{"histogram": {"Dizziness": 2, "Injection site bruising": 2, "Dyspnoea": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Injection site paraesthesia": 1, "Injection site swelling": 1, "Palpitations": 1, "Vaccination complication": 1}, "batchcodes": ["ER2613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER8729.json b/docs/data/histograms/Canada/ER8729.json
index a75021ae3c8..91091b57ba4 100644
--- a/docs/data/histograms/Canada/ER8729.json
+++ b/docs/data/histograms/Canada/ER8729.json
@@ -1 +1 @@
-{"batchcode": "ER8729", "histograms": [{"batchcodes": ["ER8729"], "histogram": {"Blood pressure measurement": 1, "Chest discomfort": 1, "Dizziness": 1, "Feeling hot": 1, "Heart rate": 1, "Pallor": 1, "Vision blurred": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8729", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Chest discomfort": 1, "Dizziness": 1, "Feeling hot": 1, "Heart rate": 1, "Pallor": 1, "Vision blurred": 1, "Vital signs measurement": 1}, "batchcodes": ["ER8729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER8730.json b/docs/data/histograms/Canada/ER8730.json
index 4ce27bc7894..8d3caf886cd 100644
--- a/docs/data/histograms/Canada/ER8730.json
+++ b/docs/data/histograms/Canada/ER8730.json
@@ -1 +1 @@
-{"batchcode": "ER8730", "histograms": [{"batchcodes": ["ER8730"], "histogram": {"Dizziness": 3, "Hyperhidrosis": 2, "Chest discomfort": 1, "Dysphagia": 1, "Dyspnoea": 1, "Hypopnoea": 1, "Loss of consciousness": 1, "Pallor": 1, "Palpitations": 1, "Rash": 1, "Snoring": 1, "Tachypnoea": 1, "Throat irritation": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria": 1, "Visual impairment": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8730", "histograms": [{"histogram": {"Dizziness": 3, "Hyperhidrosis": 2, "Chest discomfort": 1, "Dysphagia": 1, "Dyspnoea": 1, "Hypopnoea": 1, "Loss of consciousness": 1, "Pallor": 1, "Palpitations": 1, "Rash": 1, "Snoring": 1, "Tachypnoea": 1, "Throat irritation": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria": 1, "Visual impairment": 1, "Vital signs measurement": 1}, "batchcodes": ["ER8730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER8732.json b/docs/data/histograms/Canada/ER8732.json
index 876aa2bdd48..c0502c0e018 100644
--- a/docs/data/histograms/Canada/ER8732.json
+++ b/docs/data/histograms/Canada/ER8732.json
@@ -1 +1 @@
-{"batchcode": "ER8732", "histograms": [{"batchcodes": ["ER8732"], "histogram": {"Dizziness": 4, "Pallor": 3, "Blood pressure decreased": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8732", "histograms": [{"histogram": {"Dizziness": 4, "Pallor": 3, "Blood pressure decreased": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["ER8732"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER8734.json b/docs/data/histograms/Canada/ER8734.json
index 84b6e402c24..f01d8a8b682 100644
--- a/docs/data/histograms/Canada/ER8734.json
+++ b/docs/data/histograms/Canada/ER8734.json
@@ -1 +1 @@
-{"batchcode": "ER8734", "histograms": [{"batchcodes": ["ER8734"], "histogram": {"Dizziness": 4, "Hyperhidrosis": 2, "Cold sweat": 1, "Feeling cold": 1, "Feeling hot": 1, "Immediate post-injection reaction": 1, "Loss of consciousness": 1, "Malaise": 1, "Pallor": 1, "Skin warm": 1, "Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8734", "histograms": [{"histogram": {"Dizziness": 4, "Hyperhidrosis": 2, "Cold sweat": 1, "Feeling cold": 1, "Feeling hot": 1, "Immediate post-injection reaction": 1, "Loss of consciousness": 1, "Malaise": 1, "Pallor": 1, "Skin warm": 1, "Syncope": 1, "Tremor": 1}, "batchcodes": ["ER8734"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/ER8737.json b/docs/data/histograms/Canada/ER8737.json
index a4150b2621a..7d34a701ac5 100644
--- a/docs/data/histograms/Canada/ER8737.json
+++ b/docs/data/histograms/Canada/ER8737.json
@@ -1 +1 @@
-{"batchcode": "ER8737", "histograms": [{"batchcodes": ["ER8737"], "histogram": {"Syncope": 2, "Dizziness": 1, "Loss of consciousness": 1, "Muscle twitching": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8737", "histograms": [{"histogram": {"Syncope": 2, "Dizziness": 1, "Loss of consciousness": 1, "Muscle twitching": 1}, "batchcodes": ["ER8737"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EV0579.json b/docs/data/histograms/Canada/EV0579.json
index 166d7a90e5c..5180e5175ea 100644
--- a/docs/data/histograms/Canada/EV0579.json
+++ b/docs/data/histograms/Canada/EV0579.json
@@ -1 +1 @@
-{"batchcode": "EV0579", "histograms": [{"batchcodes": ["EV0579"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EV0579", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["EV0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW 0193.json b/docs/data/histograms/Canada/EW 0193.json
index ed6e9523c60..30f251e57e6 100644
--- a/docs/data/histograms/Canada/EW 0193.json
+++ b/docs/data/histograms/Canada/EW 0193.json
@@ -1 +1 @@
-{"batchcode": "EW 0193", "histograms": [{"batchcodes": ["EW 0193"], "histogram": {"Back pain": 1, "Breast pain": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Neck pain": 1, "Neurogenic shock": 1, "Pain in extremity": 1, "Photophobia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW 0193", "histograms": [{"histogram": {"Back pain": 1, "Breast pain": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Neck pain": 1, "Neurogenic shock": 1, "Pain in extremity": 1, "Photophobia": 1, "Vaccination site pain": 1}, "batchcodes": ["EW 0193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW 3344.json b/docs/data/histograms/Canada/EW 3344.json
index ceec4a0c81f..cc864c098f0 100644
--- a/docs/data/histograms/Canada/EW 3344.json
+++ b/docs/data/histograms/Canada/EW 3344.json
@@ -1 +1 @@
-{"batchcode": "EW 3344", "histograms": [{"batchcodes": ["EW 3344"], "histogram": {"Hypoaesthesia": 2, "Paraesthesia": 2, "Acoustic stimulation tests": 1, "Audiogram": 1, "Blood test": 1, "Burning sensation": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Deafness": 1, "Nasopharyngitis": 1, "Neurological examination": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1, "Trigeminal nerve disorder": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "EW 3344", "histograms": [{"histogram": {"Hypoaesthesia": 2, "Paraesthesia": 2, "Acoustic stimulation tests": 1, "Audiogram": 1, "Blood test": 1, "Burning sensation": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Deafness": 1, "Nasopharyngitis": 1, "Neurological examination": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1, "Trigeminal nerve disorder": 1, "Ultrasound Doppler": 1}, "batchcodes": ["EW 3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0126.json b/docs/data/histograms/Canada/EW0126.json
index 43a4fc9aa21..db3d5524283 100644
--- a/docs/data/histograms/Canada/EW0126.json
+++ b/docs/data/histograms/Canada/EW0126.json
@@ -1 +1 @@
-{"batchcode": "EW0126", "histograms": [{"batchcodes": ["EW0126"], "histogram": {"Diarrhoea": 1, "Headache": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0126", "histograms": [{"histogram": {"Diarrhoea": 1, "Headache": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["EW0126"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0151.json b/docs/data/histograms/Canada/EW0151.json
index e1bd77773d8..90dbb4418f9 100644
--- a/docs/data/histograms/Canada/EW0151.json
+++ b/docs/data/histograms/Canada/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Dizziness": 1, "Hyperhidrosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Dizziness": 1, "Hyperhidrosis": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0158.json b/docs/data/histograms/Canada/EW0158.json
index ca7831ac9f7..d9c2610939e 100644
--- a/docs/data/histograms/Canada/EW0158.json
+++ b/docs/data/histograms/Canada/EW0158.json
@@ -1 +1 @@
-{"batchcode": "EW0158", "histograms": [{"batchcodes": ["EW0158"], "histogram": {"Dizziness": 3, "Hyperhidrosis": 3, "Feeling cold": 2, "Feeling hot": 2, "Nausea": 2, "Pallor": 2, "Vision blurred": 2, "Anxiety": 1, "Asthenia": 1, "Cold sweat": 1, "Erythema": 1, "Eye movement disorder": 1, "Hypoaesthesia": 1, "Immediate post-injection reaction": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Mouth haemorrhage": 1, "Ocular hyperaemia": 1, "Paraesthesia": 1, "Procedural anxiety": 1, "Pruritus": 1, "Vital signs measurement": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0158", "histograms": [{"histogram": {"Dizziness": 3, "Hyperhidrosis": 3, "Feeling cold": 2, "Feeling hot": 2, "Nausea": 2, "Pallor": 2, "Vision blurred": 2, "Anxiety": 1, "Asthenia": 1, "Cold sweat": 1, "Erythema": 1, "Eye movement disorder": 1, "Hypoaesthesia": 1, "Immediate post-injection reaction": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Mouth haemorrhage": 1, "Ocular hyperaemia": 1, "Paraesthesia": 1, "Procedural anxiety": 1, "Pruritus": 1, "Vital signs measurement": 1, "Wheezing": 1}, "batchcodes": ["EW0158"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0161.json b/docs/data/histograms/Canada/EW0161.json
index 440d31a4edf..b73dd355673 100644
--- a/docs/data/histograms/Canada/EW0161.json
+++ b/docs/data/histograms/Canada/EW0161.json
@@ -1 +1 @@
-{"batchcode": "EW0161", "histograms": [{"batchcodes": ["EW0161"], "histogram": {"Immediate post-injection reaction": 2, "Dizziness": 1, "Fall": 1, "Head injury": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Loss of consciousness": 1, "Nausea": 1, "Pallor": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0161", "histograms": [{"histogram": {"Immediate post-injection reaction": 2, "Dizziness": 1, "Fall": 1, "Head injury": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Loss of consciousness": 1, "Nausea": 1, "Pallor": 1, "Pruritus": 1}, "batchcodes": ["EW0161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0162.json b/docs/data/histograms/Canada/EW0162.json
index 3d96a8bb38d..54d63f92799 100644
--- a/docs/data/histograms/Canada/EW0162.json
+++ b/docs/data/histograms/Canada/EW0162.json
@@ -1 +1 @@
-{"batchcode": "EW0162", "histograms": [{"batchcodes": ["EW0162"], "histogram": {"Cold sweat": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0162", "histograms": [{"histogram": {"Cold sweat": 1, "Dizziness": 1}, "batchcodes": ["EW0162"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0164.json b/docs/data/histograms/Canada/EW0164.json
index b1e3c16ad4e..a0f20fd6d58 100644
--- a/docs/data/histograms/Canada/EW0164.json
+++ b/docs/data/histograms/Canada/EW0164.json
@@ -1 +1 @@
-{"batchcode": "EW0164", "histograms": [{"batchcodes": ["EW0164"], "histogram": {"Bradyphrenia": 1, "Dizziness": 1, "Fatigue": 1, "Migraine": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0164", "histograms": [{"histogram": {"Bradyphrenia": 1, "Dizziness": 1, "Fatigue": 1, "Migraine": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1}, "batchcodes": ["EW0164"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0168.json b/docs/data/histograms/Canada/EW0168.json
index 35a358a7b00..cf3b9e5d087 100644
--- a/docs/data/histograms/Canada/EW0168.json
+++ b/docs/data/histograms/Canada/EW0168.json
@@ -1 +1 @@
-{"batchcode": "EW0168", "histograms": [{"batchcodes": ["EW0168"], "histogram": {"Blood glucose normal": 1, "Dry skin": 1, "Hyperhidrosis": 1, "Skin warm": 1, "Urinary incontinence": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0168", "histograms": [{"histogram": {"Blood glucose normal": 1, "Dry skin": 1, "Hyperhidrosis": 1, "Skin warm": 1, "Urinary incontinence": 1}, "batchcodes": ["EW0168"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0169.json b/docs/data/histograms/Canada/EW0169.json
index 52029d1fbfa..b20cc630132 100644
--- a/docs/data/histograms/Canada/EW0169.json
+++ b/docs/data/histograms/Canada/EW0169.json
@@ -1 +1 @@
-{"batchcode": "EW0169", "histograms": [{"batchcodes": ["EW0169"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0169", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["EW0169"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0176.json b/docs/data/histograms/Canada/EW0176.json
index d269cdc1a7d..3eb7b648277 100644
--- a/docs/data/histograms/Canada/EW0176.json
+++ b/docs/data/histograms/Canada/EW0176.json
@@ -1 +1 @@
-{"batchcode": "EW0176", "histograms": [{"batchcodes": ["EW0176"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0176", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EW0176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0186.json b/docs/data/histograms/Canada/EW0186.json
index cc15ed26b12..278b85a76a5 100644
--- a/docs/data/histograms/Canada/EW0186.json
+++ b/docs/data/histograms/Canada/EW0186.json
@@ -1 +1 @@
-{"batchcode": "EW0186", "histograms": [{"batchcodes": ["EW0186"], "histogram": {"Hyperhidrosis": 2, "Pallor": 2, "Dizziness": 1, "Hypoaesthesia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0186", "histograms": [{"histogram": {"Hyperhidrosis": 2, "Pallor": 2, "Dizziness": 1, "Hypoaesthesia": 1, "Swelling": 1}, "batchcodes": ["EW0186"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0187.json b/docs/data/histograms/Canada/EW0187.json
index a96ebe86997..30ec059e1d4 100644
--- a/docs/data/histograms/Canada/EW0187.json
+++ b/docs/data/histograms/Canada/EW0187.json
@@ -1 +1 @@
-{"batchcode": "EW0187", "histograms": [{"batchcodes": ["EW0187"], "histogram": {"Dizziness": 2, "Nausea": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0187", "histograms": [{"histogram": {"Dizziness": 2, "Nausea": 1, "Vital signs measurement": 1}, "batchcodes": ["EW0187"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0193.json b/docs/data/histograms/Canada/EW0193.json
index 87c4b25b78b..9c2772c406d 100644
--- a/docs/data/histograms/Canada/EW0193.json
+++ b/docs/data/histograms/Canada/EW0193.json
@@ -1 +1 @@
-{"batchcode": "EW0193", "histograms": [{"batchcodes": ["044D21A", "EW0193", "FA9099"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Nephrolithiasis": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["EW0193"], "histogram": {"SARS-CoV-2 test": 17, "Chest pain": 13, "Myocarditis": 12, "Pericarditis": 12, "Fatigue": 11, "Headache": 9, "Arthralgia": 7, "Inappropriate schedule of product administration": 7, "Diarrhoea": 6, "Dyspnoea": 6, "Pain in extremity": 6, "Chest discomfort": 5, "COVID-19": 4, "Chills": 4, "Drug ineffective": 4, "Hypoaesthesia": 4, "Paraesthesia": 4, "Tinnitus": 4, "Blood test": 3, "Dizziness": 3, "Gait disturbance": 3, "Heavy menstrual bleeding": 3, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Lymphadenopathy": 3, "Menstruation irregular": 3, "Migraine": 3, "Musculoskeletal stiffness": 3, "Nausea": 3, "Palpitations": 3, "Postmenopausal haemorrhage": 3, "Pruritus": 3, "Pyrexia": 3, "Sensitive skin": 3, "Swelling face": 3, "Abdominal pain": 2, "Abortion spontaneous": 2, "Anaphylactic reaction": 2, "Autoimmune disorder": 2, "Blood pressure measurement": 2, "Blood thyroid stimulating hormone": 2, "Burning sensation": 2, "C-reactive protein": 2, "Deafness": 2, "Deafness unilateral": 2, "Dysmenorrhoea": 2, "Eye pain": 2, "Flushing": 2, "Gait inability": 2, "Heart rate increased": 2, "Hypotension": 2, "Interchange of vaccine products": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Myopericarditis": 2, "Pain": 2, "Platelet count": 2, "Shock": 2, "Sleep disorder": 2, "Suicidal ideation": 2, "Swollen tongue": 2, "Thrombosis": 2, "Tremor": 2, "Urticaria": 2, "Vomiting": 2, "X-ray": 2, "Abdominal pain upper": 1, "Abnormal sensation in eye": 1, "Abortion missed": 1, "Acute kidney injury": 1, "Angioedema": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Appendicitis": 1, "Arthritis": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blood creatinine": 1, "Blood thyroid stimulating hormone increased": 1, "Blood uric acid": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Cold-stimulus headache": 1, "Colitis": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Confusional state": 1, "Crohn's disease": 1, "Depression": 1, "Dermatitis": 1, "Diarrhoea haemorrhagic": 1, "Diplopia": 1, "Dry skin": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Erythema": 1, "Eye swelling": 1, "Feeling abnormal": 1, "Fibromyalgia": 1, "Frequent bowel movements": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Hand deformity": 1, "Head injury": 1, "Heart rate": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperacusis": 1, "Immunodeficiency": 1, "Impaired quality of life": 1, "Influenza like illness": 1, "Intermenstrual bleeding": 1, "International normalised ratio": 1, "Investigation": 1, "Irritable bowel syndrome": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Lethargy": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphopenia": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mechanical urticaria": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle atrophy": 1, "Muscle fatigue": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Myelitis transverse": 1, "Nasal congestion": 1, "Neck injury": 1, "Neck pain": 1, "Neuralgia": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Ovarian cyst ruptured": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain of skin": 1, "Painful respiration": 1, "Peripheral swelling": 1, "Photosensitivity reaction": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Polyarthritis": 1, "Polymenorrhoea": 1, "Post herpetic neuralgia": 1, "Pregnancy test": 1, "Product administered to patient of inappropriate age": 1, "Prostate cancer": 1, "Prostatitis": 1, "Pulmonary pain": 1, "Rash": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Scar": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Skin exfoliation": 1, "Skin warm": 1, "Spinal X-ray": 1, "Staring": 1, "Stress cardiomyopathy": 1, "Swelling": 1, "Swollen joint count": 1, "Syncope": 1, "Tenosynovitis": 1, "Tonic convulsion": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vasodilatation": 1, "Venous pressure jugular": 1, "Vertigo": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Vitreous floaters": 1, "Wheelchair user": 1, "Wheezing": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0193", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Nephrolithiasis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["044D21A", "EW0193", "FA9099"]}, {"histogram": {"SARS-CoV-2 test": 17, "Chest pain": 13, "Myocarditis": 12, "Pericarditis": 12, "Fatigue": 11, "Headache": 9, "Arthralgia": 7, "Inappropriate schedule of product administration": 7, "Diarrhoea": 6, "Dyspnoea": 6, "Pain in extremity": 6, "Chest discomfort": 5, "COVID-19": 4, "Chills": 4, "Drug ineffective": 4, "Hypoaesthesia": 4, "Paraesthesia": 4, "Tinnitus": 4, "Blood test": 3, "Dizziness": 3, "Gait disturbance": 3, "Heavy menstrual bleeding": 3, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Lymphadenopathy": 3, "Menstruation irregular": 3, "Migraine": 3, "Musculoskeletal stiffness": 3, "Nausea": 3, "Palpitations": 3, "Postmenopausal haemorrhage": 3, "Pruritus": 3, "Pyrexia": 3, "Sensitive skin": 3, "Swelling face": 3, "Abdominal pain": 2, "Abortion spontaneous": 2, "Anaphylactic reaction": 2, "Autoimmune disorder": 2, "Blood pressure measurement": 2, "Blood thyroid stimulating hormone": 2, "Burning sensation": 2, "C-reactive protein": 2, "Deafness": 2, "Deafness unilateral": 2, "Dysmenorrhoea": 2, "Eye pain": 2, "Flushing": 2, "Gait inability": 2, "Heart rate increased": 2, "Hypotension": 2, "Interchange of vaccine products": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Myopericarditis": 2, "Pain": 2, "Platelet count": 2, "Shock": 2, "Sleep disorder": 2, "Suicidal ideation": 2, "Swollen tongue": 2, "Thrombosis": 2, "Tremor": 2, "Urticaria": 2, "Vomiting": 2, "X-ray": 2, "Abdominal pain upper": 1, "Abnormal sensation in eye": 1, "Abortion missed": 1, "Acute kidney injury": 1, "Angioedema": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Appendicitis": 1, "Arthritis": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blood creatinine": 1, "Blood thyroid stimulating hormone increased": 1, "Blood uric acid": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Cold-stimulus headache": 1, "Colitis": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Confusional state": 1, "Crohn's disease": 1, "Depression": 1, "Dermatitis": 1, "Diarrhoea haemorrhagic": 1, "Diplopia": 1, "Dry skin": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Erythema": 1, "Eye swelling": 1, "Feeling abnormal": 1, "Fibromyalgia": 1, "Frequent bowel movements": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Hand deformity": 1, "Head injury": 1, "Heart rate": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperacusis": 1, "Immunodeficiency": 1, "Impaired quality of life": 1, "Influenza like illness": 1, "Intermenstrual bleeding": 1, "International normalised ratio": 1, "Investigation": 1, "Irritable bowel syndrome": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Lethargy": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphopenia": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mechanical urticaria": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle atrophy": 1, "Muscle fatigue": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Myelitis transverse": 1, "Nasal congestion": 1, "Neck injury": 1, "Neck pain": 1, "Neuralgia": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Ovarian cyst ruptured": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain of skin": 1, "Painful respiration": 1, "Peripheral swelling": 1, "Photosensitivity reaction": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Polyarthritis": 1, "Polymenorrhoea": 1, "Post herpetic neuralgia": 1, "Pregnancy test": 1, "Product administered to patient of inappropriate age": 1, "Prostate cancer": 1, "Prostatitis": 1, "Pulmonary pain": 1, "Rash": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Scar": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Skin exfoliation": 1, "Skin warm": 1, "Spinal X-ray": 1, "Staring": 1, "Stress cardiomyopathy": 1, "Swelling": 1, "Swollen joint count": 1, "Syncope": 1, "Tenosynovitis": 1, "Tonic convulsion": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vasodilatation": 1, "Venous pressure jugular": 1, "Vertigo": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Vitreous floaters": 1, "Wheelchair user": 1, "Wheezing": 1, "White blood cell count": 1}, "batchcodes": ["EW0193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0195.json b/docs/data/histograms/Canada/EW0195.json
index d95048c262f..d9dadf7455f 100644
--- a/docs/data/histograms/Canada/EW0195.json
+++ b/docs/data/histograms/Canada/EW0195.json
@@ -1 +1 @@
-{"batchcode": "EW0195", "histograms": [{"batchcodes": ["EW0195"], "histogram": {"Deafness unilateral": 1, "Ear pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0195", "histograms": [{"histogram": {"Deafness unilateral": 1, "Ear pain": 1}, "batchcodes": ["EW0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0196.json b/docs/data/histograms/Canada/EW0196.json
index 43434265970..f1b3414c25d 100644
--- a/docs/data/histograms/Canada/EW0196.json
+++ b/docs/data/histograms/Canada/EW0196.json
@@ -1 +1 @@
-{"batchcode": "EW0196", "histograms": [{"batchcodes": ["EW0196"], "histogram": {"Cold sweat": 1, "Dizziness": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0196", "histograms": [{"histogram": {"Cold sweat": 1, "Dizziness": 1, "Pallor": 1}, "batchcodes": ["EW0196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0199.json b/docs/data/histograms/Canada/EW0199.json
index cf08fe2979a..8835527079c 100644
--- a/docs/data/histograms/Canada/EW0199.json
+++ b/docs/data/histograms/Canada/EW0199.json
@@ -1 +1 @@
-{"batchcode": "EW0199", "histograms": [{"batchcodes": ["045D21A", "EW0199"], "histogram": {"Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}}, {"batchcodes": ["052C21A", "EW0199"], "histogram": {"Interchange of vaccine products": 1, "Pericarditis": 1, "Wrong product administered": 1}}, {"batchcodes": ["EW0199"], "histogram": {"Chest pain": 25, "Pericarditis": 18, "Dyspnoea": 14, "Fatigue": 14, "Myocarditis": 14, "SARS-CoV-2 test": 14, "Chest discomfort": 11, "Headache": 10, "Nausea": 9, "Pain in extremity": 9, "Palpitations": 9, "Dizziness": 8, "Malaise": 7, "Arthralgia": 6, "Blood test": 6, "Chills": 6, "Electrocardiogram": 5, "Pyrexia": 5, "Feeling abnormal": 4, "Heart rate": 4, "Investigation": 4, "Myopericarditis": 4, "Pain": 4, "Pericardial effusion": 4, "Pruritus": 4, "Abdominal pain upper": 3, "Asthenia": 3, "Blood pressure measurement": 3, "Burning sensation": 3, "COVID-19": 3, "Diarrhoea": 3, "Drug ineffective": 3, "Hypoaesthesia": 3, "Inappropriate schedule of product administration": 3, "Migraine": 3, "Off label use": 3, "Presyncope": 3, "Rash": 3, "Ultrasound scan": 3, "Abdominal pain": 2, "Appendicitis": 2, "Arrhythmia": 2, "Back pain": 2, "Bell's palsy": 2, "Biopsy": 2, "Blister": 2, "Cardiac stress test": 2, "Condition aggravated": 2, "Discomfort": 2, "Dysmenorrhoea": 2, "Echocardiogram": 2, "Erythema": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Insomnia": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Maternal exposure during pregnancy": 2, "Motion sickness": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Musculoskeletal stiffness": 2, "Myalgia": 2, "Neck pain": 2, "Oropharyngeal pain": 2, "Physical examination": 2, "Product use issue": 2, "Syncope": 2, "Tachycardia": 2, "Thrombosis": 2, "Tinnitus": 2, "Vision blurred": 2, "Vomiting": 2, "X-ray": 2, "Abulia": 1, "Acne": 1, "Ageusia": 1, "Anaemia postoperative": 1, "Angina pectoris": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antisynthetase syndrome": 1, "Anxiety": 1, "Aphonia": 1, "Arnold-Chiari malformation": 1, "Axillary mass": 1, "Balance disorder": 1, "Blepharitis": 1, "Blindness transient": 1, "Blood creatine": 1, "Blood creatine increased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Bursitis": 1, "Cardiac discomfort": 1, "Cardiac failure congestive": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Chest X-ray": 1, "Cold sweat": 1, "Colitis": 1, "Concussion": 1, "Contusion": 1, "Costochondritis": 1, "Cough": 1, "Crying": 1, "Deafness neurosensory": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dermatitis exfoliative": 1, "Dizziness postural": 1, "Dry skin": 1, "Dysarthria": 1, "Dyspepsia": 1, "Ear pain": 1, "Electroencephalogram": 1, "Eructation": 1, "Exposure via breast milk": 1, "Eye movement disorder": 1, "Facial spasm": 1, "Fall": 1, "Feeling drunk": 1, "Fluid retention": 1, "Generalised tonic-clonic seizure": 1, "Haematochezia": 1, "Haematoma": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hilar lymphadenopathy": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired work ability": 1, "Infection": 1, "Inferior vena cava dilatation": 1, "Inflammation": 1, "Influenza like illness": 1, "Intraductal proliferative breast lesion": 1, "Joint stiffness": 1, "Left ventricular hypertrophy": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Low birth weight baby": 1, "Lymphadenopathy": 1, "Lymphadenopathy mediastinal": 1, "Menstruation irregular": 1, "Mental impairment": 1, "Muscle tightness": 1, "Myopathy": 1, "Neonatal respiratory distress": 1, "Nephrolithiasis": 1, "Nervousness": 1, "Night sweats": 1, "Nodule": 1, "Nucleic acid test": 1, "Ophthalmic migraine": 1, "Orthopnoea": 1, "Paraesthesia": 1, "Pelvic haemorrhage": 1, "Pemphigoid": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Photosensitivity reaction": 1, "Platelet count": 1, "Pleuritic pain": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Postmenopausal haemorrhage": 1, "Premature baby": 1, "Productive cough": 1, "Proteinuria": 1, "Pulmonary oedema": 1, "Purulent discharge": 1, "Rales": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash maculo-papular": 1, "Rash pruritic": 1, "Renal impairment": 1, "Retinal vein occlusion": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 RNA": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sinus bradycardia": 1, "Sinus headache": 1, "Sinus tachycardia": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin fissures": 1, "Skin haemorrhage": 1, "Skin laceration": 1, "Skin test": 1, "Sleep disorder": 1, "Somnolence": 1, "Spinal X-ray": 1, "Stomatitis": 1, "Sudden hearing loss": 1, "Swelling": 1, "Swollen tongue": 1, "Tachypnoea": 1, "Tendonitis": 1, "Throat tightness": 1, "Toothache": 1, "Trigeminal neuralgia": 1, "Urinary tract infection": 1, "Urine abnormality": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vein disorder": 1, "Viral myocarditis": 1, "Weight": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0199", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}, "batchcodes": ["045D21A", "EW0199"]}, {"histogram": {"Interchange of vaccine products": 1, "Pericarditis": 1, "Wrong product administered": 1}, "batchcodes": ["052C21A", "EW0199"]}, {"histogram": {"Chest pain": 25, "Pericarditis": 18, "Dyspnoea": 14, "Fatigue": 14, "Myocarditis": 14, "SARS-CoV-2 test": 14, "Chest discomfort": 11, "Headache": 10, "Nausea": 9, "Pain in extremity": 9, "Palpitations": 9, "Dizziness": 8, "Malaise": 7, "Arthralgia": 6, "Blood test": 6, "Chills": 6, "Electrocardiogram": 5, "Pyrexia": 5, "Feeling abnormal": 4, "Heart rate": 4, "Investigation": 4, "Myopericarditis": 4, "Pain": 4, "Pericardial effusion": 4, "Pruritus": 4, "Abdominal pain upper": 3, "Asthenia": 3, "Blood pressure measurement": 3, "Burning sensation": 3, "COVID-19": 3, "Diarrhoea": 3, "Drug ineffective": 3, "Hypoaesthesia": 3, "Inappropriate schedule of product administration": 3, "Migraine": 3, "Off label use": 3, "Presyncope": 3, "Rash": 3, "Ultrasound scan": 3, "Abdominal pain": 2, "Appendicitis": 2, "Arrhythmia": 2, "Back pain": 2, "Bell's palsy": 2, "Biopsy": 2, "Blister": 2, "Cardiac stress test": 2, "Condition aggravated": 2, "Discomfort": 2, "Dysmenorrhoea": 2, "Echocardiogram": 2, "Erythema": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Insomnia": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Maternal exposure during pregnancy": 2, "Motion sickness": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Musculoskeletal stiffness": 2, "Myalgia": 2, "Neck pain": 2, "Oropharyngeal pain": 2, "Physical examination": 2, "Product use issue": 2, "Syncope": 2, "Tachycardia": 2, "Thrombosis": 2, "Tinnitus": 2, "Vision blurred": 2, "Vomiting": 2, "X-ray": 2, "Abulia": 1, "Acne": 1, "Ageusia": 1, "Anaemia postoperative": 1, "Angina pectoris": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antisynthetase syndrome": 1, "Anxiety": 1, "Aphonia": 1, "Arnold-Chiari malformation": 1, "Axillary mass": 1, "Balance disorder": 1, "Blepharitis": 1, "Blindness transient": 1, "Blood creatine": 1, "Blood creatine increased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Bursitis": 1, "Cardiac discomfort": 1, "Cardiac failure congestive": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Chest X-ray": 1, "Cold sweat": 1, "Colitis": 1, "Concussion": 1, "Contusion": 1, "Costochondritis": 1, "Cough": 1, "Crying": 1, "Deafness neurosensory": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dermatitis exfoliative": 1, "Dizziness postural": 1, "Dry skin": 1, "Dysarthria": 1, "Dyspepsia": 1, "Ear pain": 1, "Electroencephalogram": 1, "Eructation": 1, "Exposure via breast milk": 1, "Eye movement disorder": 1, "Facial spasm": 1, "Fall": 1, "Feeling drunk": 1, "Fluid retention": 1, "Generalised tonic-clonic seizure": 1, "Haematochezia": 1, "Haematoma": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hilar lymphadenopathy": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired work ability": 1, "Infection": 1, "Inferior vena cava dilatation": 1, "Inflammation": 1, "Influenza like illness": 1, "Intraductal proliferative breast lesion": 1, "Joint stiffness": 1, "Left ventricular hypertrophy": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Low birth weight baby": 1, "Lymphadenopathy": 1, "Lymphadenopathy mediastinal": 1, "Menstruation irregular": 1, "Mental impairment": 1, "Muscle tightness": 1, "Myopathy": 1, "Neonatal respiratory distress": 1, "Nephrolithiasis": 1, "Nervousness": 1, "Night sweats": 1, "Nodule": 1, "Nucleic acid test": 1, "Ophthalmic migraine": 1, "Orthopnoea": 1, "Paraesthesia": 1, "Pelvic haemorrhage": 1, "Pemphigoid": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Photosensitivity reaction": 1, "Platelet count": 1, "Pleuritic pain": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Postmenopausal haemorrhage": 1, "Premature baby": 1, "Productive cough": 1, "Proteinuria": 1, "Pulmonary oedema": 1, "Purulent discharge": 1, "Rales": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash maculo-papular": 1, "Rash pruritic": 1, "Renal impairment": 1, "Retinal vein occlusion": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 RNA": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sinus bradycardia": 1, "Sinus headache": 1, "Sinus tachycardia": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin fissures": 1, "Skin haemorrhage": 1, "Skin laceration": 1, "Skin test": 1, "Sleep disorder": 1, "Somnolence": 1, "Spinal X-ray": 1, "Stomatitis": 1, "Sudden hearing loss": 1, "Swelling": 1, "Swollen tongue": 1, "Tachypnoea": 1, "Tendonitis": 1, "Throat tightness": 1, "Toothache": 1, "Trigeminal neuralgia": 1, "Urinary tract infection": 1, "Urine abnormality": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vein disorder": 1, "Viral myocarditis": 1, "Weight": 1, "Yawning": 1}, "batchcodes": ["EW0199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0216.json b/docs/data/histograms/Canada/EW0216.json
index c26bf50c6f8..ae0353f6f41 100644
--- a/docs/data/histograms/Canada/EW0216.json
+++ b/docs/data/histograms/Canada/EW0216.json
@@ -1 +1 @@
-{"batchcode": "EW0216", "histograms": [{"batchcodes": ["EW0216", "NJ0338"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}, {"batchcodes": ["EW0216"], "histogram": {"Chest pain": 17, "Dyspnoea": 16, "Myocarditis": 14, "Fatigue": 13, "Pericarditis": 13, "SARS-CoV-2 test": 11, "Pyrexia": 9, "Chest discomfort": 8, "Headache": 8, "Pain in extremity": 8, "Pain": 7, "Arthralgia": 6, "Insomnia": 6, "Angina pectoris": 5, "Chills": 5, "Dizziness": 5, "Heavy menstrual bleeding": 5, "Hypoaesthesia": 5, "Palpitations": 5, "Asthenia": 4, "Blood test": 4, "Malaise": 4, "Nausea": 4, "Back pain": 3, "Feeling abnormal": 3, "Hyperhidrosis": 3, "Investigation": 3, "Myalgia": 3, "Myopericarditis": 3, "Neck pain": 3, "Pericardial effusion": 3, "Pruritus": 3, "Tinnitus": 3, "Vomiting": 3, "Abdominal pain": 2, "Diarrhoea": 2, "Feeling hot": 2, "Flushing": 2, "Haemorrhage": 2, "Hepatitis": 2, "Hypersensitivity": 2, "Hypokinesia": 2, "Inappropriate schedule of product administration": 2, "Limb discomfort": 2, "Loss of consciousness": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Migraine": 2, "Paraesthesia": 2, "Rash": 2, "Sinus tachycardia": 2, "Speech disorder": 2, "Stomatitis": 2, "Swelling": 2, "Swelling face": 2, "Thrombosis": 2, "Tongue geographic": 2, "Urticaria": 2, "Vaccination site pain": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Acoustic stimulation tests": 1, "Agitation": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aphasia": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Body temperature": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac discomfort": 1, "Computerised tomogram": 1, "Confusional state": 1, "Cough": 1, "Crying": 1, "Cyanosis": 1, "Decreased appetite": 1, "Depressed mood": 1, "Depression": 1, "Disease progression": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear, nose and throat examination": 1, "Eating disorder": 1, "Electrocardiogram": 1, "Emotional disorder": 1, "Epistaxis": 1, "Exposure via breast milk": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Faeces soft": 1, "Feeding disorder": 1, "Fungal infection": 1, "Gait disturbance": 1, "Gastrooesophageal reflux disease": 1, "Gingival bleeding": 1, "Groin infection": 1, "Hallucination": 1, "Head discomfort": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hot flush": 1, "Hypercoagulation": 1, "Hypopnoea": 1, "Immobile": 1, "Injected limb mobility decreased": 1, "Injection site swelling": 1, "Intervertebral disc protrusion": 1, "Laboratory test": 1, "Lethargy": 1, "Lichen planus": 1, "Localised infection": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Monoplegia": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Nasal pruritus": 1, "Noninfective gingivitis": 1, "Odynophagia": 1, "Oedema": 1, "Oligomenorrhoea": 1, "Optic neuropathy": 1, "Orthopnoea": 1, "Ovarian disorder": 1, "Overdose": 1, "Painful respiration": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pelvic pain": 1, "Pericardial rub": 1, "Pharyngeal swelling": 1, "Platelet factor 4": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Product administered to patient of inappropriate age": 1, "Product use issue": 1, "Respiratory distress": 1, "Retinal tear": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "Right atrial enlargement": 1, "SARS-CoV-2 test negative": 1, "Scan": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin burning sensation": 1, "Skin lesion": 1, "Smear cervix": 1, "Somnolence": 1, "Splenitis": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Thyroid function test": 1, "Tongue discolouration": 1, "Tongue disorder": 1, "Tongue dry": 1, "Tremor": 1, "Urticaria chronic": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Vision blurred": 1, "Visual impairment": 1, "Vitamin B12 decreased": 1, "Vitreous floaters": 1, "Vulvovaginal mycotic infection": 1, "Vulvovaginal pain": 1, "Vulvovaginal pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0216", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["EW0216", "NJ0338"]}, {"histogram": {"Chest pain": 17, "Dyspnoea": 16, "Myocarditis": 14, "Fatigue": 13, "Pericarditis": 13, "SARS-CoV-2 test": 11, "Pyrexia": 9, "Chest discomfort": 8, "Headache": 8, "Pain in extremity": 8, "Pain": 7, "Arthralgia": 6, "Insomnia": 6, "Angina pectoris": 5, "Chills": 5, "Dizziness": 5, "Heavy menstrual bleeding": 5, "Hypoaesthesia": 5, "Palpitations": 5, "Asthenia": 4, "Blood test": 4, "Malaise": 4, "Nausea": 4, "Back pain": 3, "Feeling abnormal": 3, "Hyperhidrosis": 3, "Investigation": 3, "Myalgia": 3, "Myopericarditis": 3, "Neck pain": 3, "Pericardial effusion": 3, "Pruritus": 3, "Tinnitus": 3, "Vomiting": 3, "Abdominal pain": 2, "Diarrhoea": 2, "Feeling hot": 2, "Flushing": 2, "Haemorrhage": 2, "Hepatitis": 2, "Hypersensitivity": 2, "Hypokinesia": 2, "Inappropriate schedule of product administration": 2, "Limb discomfort": 2, "Loss of consciousness": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Migraine": 2, "Paraesthesia": 2, "Rash": 2, "Sinus tachycardia": 2, "Speech disorder": 2, "Stomatitis": 2, "Swelling": 2, "Swelling face": 2, "Thrombosis": 2, "Tongue geographic": 2, "Urticaria": 2, "Vaccination site pain": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Acoustic stimulation tests": 1, "Agitation": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aphasia": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Body temperature": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac discomfort": 1, "Computerised tomogram": 1, "Confusional state": 1, "Cough": 1, "Crying": 1, "Cyanosis": 1, "Decreased appetite": 1, "Depressed mood": 1, "Depression": 1, "Disease progression": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear, nose and throat examination": 1, "Eating disorder": 1, "Electrocardiogram": 1, "Emotional disorder": 1, "Epistaxis": 1, "Exposure via breast milk": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Faeces soft": 1, "Feeding disorder": 1, "Fungal infection": 1, "Gait disturbance": 1, "Gastrooesophageal reflux disease": 1, "Gingival bleeding": 1, "Groin infection": 1, "Hallucination": 1, "Head discomfort": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hot flush": 1, "Hypercoagulation": 1, "Hypopnoea": 1, "Immobile": 1, "Injected limb mobility decreased": 1, "Injection site swelling": 1, "Intervertebral disc protrusion": 1, "Laboratory test": 1, "Lethargy": 1, "Lichen planus": 1, "Localised infection": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Monoplegia": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Nasal pruritus": 1, "Noninfective gingivitis": 1, "Odynophagia": 1, "Oedema": 1, "Oligomenorrhoea": 1, "Optic neuropathy": 1, "Orthopnoea": 1, "Ovarian disorder": 1, "Overdose": 1, "Painful respiration": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pelvic pain": 1, "Pericardial rub": 1, "Pharyngeal swelling": 1, "Platelet factor 4": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Product administered to patient of inappropriate age": 1, "Product use issue": 1, "Respiratory distress": 1, "Retinal tear": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "Right atrial enlargement": 1, "SARS-CoV-2 test negative": 1, "Scan": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin burning sensation": 1, "Skin lesion": 1, "Smear cervix": 1, "Somnolence": 1, "Splenitis": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Thyroid function test": 1, "Tongue discolouration": 1, "Tongue disorder": 1, "Tongue dry": 1, "Tremor": 1, "Urticaria chronic": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Vision blurred": 1, "Visual impairment": 1, "Vitamin B12 decreased": 1, "Vitreous floaters": 1, "Vulvovaginal mycotic infection": 1, "Vulvovaginal pain": 1, "Vulvovaginal pruritus": 1}, "batchcodes": ["EW0216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0221 OR EWO22.json b/docs/data/histograms/Canada/EW0221 OR EWO22.json
index 2cd0f70a1ad..dd3b2bc5cd3 100644
--- a/docs/data/histograms/Canada/EW0221 OR EWO22.json
+++ b/docs/data/histograms/Canada/EW0221 OR EWO22.json
@@ -1 +1 @@
-{"batchcode": "EW0221 OR EWO22", "histograms": [{"batchcodes": ["EW0221 OR EWO22"], "histogram": {"Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1, "Synovial cyst": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0221 OR EWO22", "histograms": [{"histogram": {"Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1, "Synovial cyst": 1}, "batchcodes": ["EW0221 OR EWO22"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0221-CC09.json b/docs/data/histograms/Canada/EW0221-CC09.json
index e6d5ef97c79..ba12c819aa6 100644
--- a/docs/data/histograms/Canada/EW0221-CC09.json
+++ b/docs/data/histograms/Canada/EW0221-CC09.json
@@ -1 +1 @@
-{"batchcode": "EW0221-CC09", "histograms": [{"batchcodes": ["EW0221-CC09"], "histogram": {"Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0221-CC09", "histograms": [{"histogram": {"Vaginal haemorrhage": 1}, "batchcodes": ["EW0221-CC09"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0221.json b/docs/data/histograms/Canada/EW0221.json
index 8e52aa9ffca..5ea10b5c9fb 100644
--- a/docs/data/histograms/Canada/EW0221.json
+++ b/docs/data/histograms/Canada/EW0221.json
@@ -1 +1 @@
-{"batchcode": "EW0221", "histograms": [{"batchcodes": ["EW0221"], "histogram": {"Chest pain": 37, "Myocarditis": 29, "Pericarditis": 24, "Inappropriate schedule of product administration": 23, "Dyspnoea": 20, "Chest discomfort": 16, "Headache": 13, "SARS-CoV-2 test": 13, "Fatigue": 10, "Arthralgia": 9, "Hypoaesthesia": 9, "Palpitations": 9, "Dizziness": 7, "Myopericarditis": 7, "Nausea": 7, "Investigation": 6, "Pyrexia": 6, "Back pain": 5, "Chills": 5, "Pain": 5, "Abdominal pain": 4, "Blood test": 4, "Computerised tomogram": 4, "Diarrhoea": 4, "Hyperhidrosis": 4, "Neck pain": 4, "Pericardial effusion": 4, "Tachycardia": 4, "Asthenia": 3, "Burning sensation": 3, "Gait disturbance": 3, "Insomnia": 3, "Loss of personal independence in daily activities": 3, "Magnetic resonance imaging": 3, "Myalgia": 3, "Neuralgia": 3, "Off label use": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Syncope": 3, "Visual impairment": 3, "Angina pectoris": 2, "Angioedema": 2, "Arthritis": 2, "Balance disorder": 2, "Bell's palsy": 2, "Biopsy": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Cardiac tamponade": 2, "Confusional state": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Heart rate": 2, "Heart rate increased": 2, "Herpes zoster": 2, "Hypertension": 2, "Hypoaesthesia oral": 2, "Inflammation": 2, "Interchange of vaccine products": 2, "Menstrual disorder": 2, "Muscle twitching": 2, "Muscular weakness": 2, "Musculoskeletal chest pain": 2, "Peripheral swelling": 2, "Platelet count": 2, "Pleural effusion": 2, "Polymerase chain reaction": 2, "Rash": 2, "Speech disorder": 2, "Supraventricular tachycardia": 2, "Swelling": 2, "Swelling face": 2, "Swollen tongue": 2, "Urine analysis": 2, "Vaccination site pain": 2, "White blood cell count": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Acute coronary syndrome": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Aortic valve incompetence": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Atrioventricular block second degree": 1, "Autoantibody test": 1, "Axillary pain": 1, "Basedow's disease": 1, "Basophil count": 1, "Basophil percentage": 1, "Biopsy skin": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood parathyroid hormone": 1, "Blood parathyroid hormone increased": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urine present": 1, "Body temperature": 1, "Bone pain": 1, "Bradycardia": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chromaturia": 1, "Condition aggravated": 1, "Coordination abnormal": 1, "Cough": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Electrocardiogram ST segment elevation": 1, "Electromyogram": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Eosinophil percentage": 1, "Erectile dysfunction": 1, "Erythroblast count": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Feeling cold": 1, "Feeling hot": 1, "Flatulence": 1, "Foetal death": 1, "Full blood count": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gingival bleeding": 1, "Gingival pain": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Gynaecological examination": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemorrhagic stroke": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatomegaly": 1, "High density lipoprotein": 1, "Hyperthyroidism": 1, "Illness": 1, "Influenza like illness": 1, "Infrequent bowel movements": 1, "Joint stiffness": 1, "Keratitis": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count increased": 1, "Lymphocyte percentage": 1, "Mastication disorder": 1, "Mastitis": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mean platelet volume increased": 1, "Menstruation irregular": 1, "Migraine": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple sclerosis relapse": 1, "Muscle contracture": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Nervousness": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Neutrophil percentage decreased": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Oedema peripheral": 1, "Ophthalmic herpes zoster": 1, "Oral blood blister": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pemphigus": 1, "Pericardial fibrosis": 1, "Peripheral venous disease": 1, "Platelet anisocytosis": 1, "Pleuritic pain": 1, "Pleuropericarditis": 1, "Postmenopausal haemorrhage": 1, "Postural orthostatic tachycardia syndrome": 1, "Premature baby": 1, "Product use issue": 1, "Protein total": 1, "Pruritus": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pustule": 1, "Rash macular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red cell distribution width": 1, "Rhinorrhoea": 1, "Right ventricular failure": 1, "Rosacea": 1, "SARS-CoV-2 test negative": 1, "Sarcoidosis": 1, "Sensory disturbance": 1, "Sinus bradycardia": 1, "Skin exfoliation": 1, "Specific gravity urine": 1, "Splenomegaly": 1, "Stiff tongue": 1, "Thinking abnormal": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Total cholesterol/HDL ratio": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaginal haemorrhage": 1, "Ventricular dysfunction": 1, "Vertigo": 1, "Viral infection": 1, "Viral pericarditis": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Vitamin B12": 1, "Vomiting": 1, "Weight increased": 1, "White blood cell count increased": 1, "X-ray": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0221", "histograms": [{"histogram": {"Chest pain": 37, "Myocarditis": 29, "Pericarditis": 24, "Inappropriate schedule of product administration": 23, "Dyspnoea": 20, "Chest discomfort": 16, "Headache": 13, "SARS-CoV-2 test": 13, "Fatigue": 10, "Arthralgia": 9, "Hypoaesthesia": 9, "Palpitations": 9, "Dizziness": 7, "Myopericarditis": 7, "Nausea": 7, "Investigation": 6, "Pyrexia": 6, "Back pain": 5, "Chills": 5, "Pain": 5, "Abdominal pain": 4, "Blood test": 4, "Computerised tomogram": 4, "Diarrhoea": 4, "Hyperhidrosis": 4, "Neck pain": 4, "Pericardial effusion": 4, "Tachycardia": 4, "Asthenia": 3, "Burning sensation": 3, "Gait disturbance": 3, "Insomnia": 3, "Loss of personal independence in daily activities": 3, "Magnetic resonance imaging": 3, "Myalgia": 3, "Neuralgia": 3, "Off label use": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Syncope": 3, "Visual impairment": 3, "Angina pectoris": 2, "Angioedema": 2, "Arthritis": 2, "Balance disorder": 2, "Bell's palsy": 2, "Biopsy": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Cardiac tamponade": 2, "Confusional state": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Heart rate": 2, "Heart rate increased": 2, "Herpes zoster": 2, "Hypertension": 2, "Hypoaesthesia oral": 2, "Inflammation": 2, "Interchange of vaccine products": 2, "Menstrual disorder": 2, "Muscle twitching": 2, "Muscular weakness": 2, "Musculoskeletal chest pain": 2, "Peripheral swelling": 2, "Platelet count": 2, "Pleural effusion": 2, "Polymerase chain reaction": 2, "Rash": 2, "Speech disorder": 2, "Supraventricular tachycardia": 2, "Swelling": 2, "Swelling face": 2, "Swollen tongue": 2, "Urine analysis": 2, "Vaccination site pain": 2, "White blood cell count": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Acute coronary syndrome": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Aortic valve incompetence": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Atrioventricular block second degree": 1, "Autoantibody test": 1, "Axillary pain": 1, "Basedow's disease": 1, "Basophil count": 1, "Basophil percentage": 1, "Biopsy skin": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood parathyroid hormone": 1, "Blood parathyroid hormone increased": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urine present": 1, "Body temperature": 1, "Bone pain": 1, "Bradycardia": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chromaturia": 1, "Condition aggravated": 1, "Coordination abnormal": 1, "Cough": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Electrocardiogram ST segment elevation": 1, "Electromyogram": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Eosinophil percentage": 1, "Erectile dysfunction": 1, "Erythroblast count": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Feeling cold": 1, "Feeling hot": 1, "Flatulence": 1, "Foetal death": 1, "Full blood count": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gingival bleeding": 1, "Gingival pain": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Gynaecological examination": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemorrhagic stroke": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatomegaly": 1, "High density lipoprotein": 1, "Hyperthyroidism": 1, "Illness": 1, "Influenza like illness": 1, "Infrequent bowel movements": 1, "Joint stiffness": 1, "Keratitis": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count increased": 1, "Lymphocyte percentage": 1, "Mastication disorder": 1, "Mastitis": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mean platelet volume increased": 1, "Menstruation irregular": 1, "Migraine": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple sclerosis relapse": 1, "Muscle contracture": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Nervousness": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Neutrophil percentage decreased": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Oedema peripheral": 1, "Ophthalmic herpes zoster": 1, "Oral blood blister": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pemphigus": 1, "Pericardial fibrosis": 1, "Peripheral venous disease": 1, "Platelet anisocytosis": 1, "Pleuritic pain": 1, "Pleuropericarditis": 1, "Postmenopausal haemorrhage": 1, "Postural orthostatic tachycardia syndrome": 1, "Premature baby": 1, "Product use issue": 1, "Protein total": 1, "Pruritus": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pustule": 1, "Rash macular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red cell distribution width": 1, "Rhinorrhoea": 1, "Right ventricular failure": 1, "Rosacea": 1, "SARS-CoV-2 test negative": 1, "Sarcoidosis": 1, "Sensory disturbance": 1, "Sinus bradycardia": 1, "Skin exfoliation": 1, "Specific gravity urine": 1, "Splenomegaly": 1, "Stiff tongue": 1, "Thinking abnormal": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Total cholesterol/HDL ratio": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaginal haemorrhage": 1, "Ventricular dysfunction": 1, "Vertigo": 1, "Viral infection": 1, "Viral pericarditis": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Vitamin B12": 1, "Vomiting": 1, "Weight increased": 1, "White blood cell count increased": 1, "X-ray": 1, "pH urine": 1}, "batchcodes": ["EW0221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW0585.json b/docs/data/histograms/Canada/EW0585.json
index 5cc7b2f6a79..c2612b82368 100644
--- a/docs/data/histograms/Canada/EW0585.json
+++ b/docs/data/histograms/Canada/EW0585.json
@@ -1 +1 @@
-{"batchcode": "EW0585", "histograms": [{"batchcodes": ["EW0585"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Heart rate irregular": 1, "Investigation": 1, "Painful respiration": 1, "Respiration abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0585", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Heart rate irregular": 1, "Investigation": 1, "Painful respiration": 1, "Respiration abnormal": 1}, "batchcodes": ["EW0585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW216.json b/docs/data/histograms/Canada/EW216.json
index 436d26690bc..c4a7375ffb5 100644
--- a/docs/data/histograms/Canada/EW216.json
+++ b/docs/data/histograms/Canada/EW216.json
@@ -1 +1 @@
-{"batchcode": "EW216", "histograms": [{"batchcodes": ["EW216"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW216", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1}, "batchcodes": ["EW216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW2244.json b/docs/data/histograms/Canada/EW2244.json
index f5ef441f1ea..5c54934c2b6 100644
--- a/docs/data/histograms/Canada/EW2244.json
+++ b/docs/data/histograms/Canada/EW2244.json
@@ -1 +1 @@
-{"batchcode": "EW2244", "histograms": [{"batchcodes": ["EW2244"], "histogram": {"Blood glucagon": 1, "Insulin tolerance test abnormal": 1, "Renal impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2244", "histograms": [{"histogram": {"Blood glucagon": 1, "Insulin tolerance test abnormal": 1, "Renal impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["EW2244"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW3244.json b/docs/data/histograms/Canada/EW3244.json
index 1b4497b89a1..a518d0e6be3 100644
--- a/docs/data/histograms/Canada/EW3244.json
+++ b/docs/data/histograms/Canada/EW3244.json
@@ -1 +1 @@
-{"batchcode": "EW3244", "histograms": [{"batchcodes": ["EW3244"], "histogram": {"Pericarditis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW3244", "histograms": [{"histogram": {"Pericarditis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW3244"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW3343.json b/docs/data/histograms/Canada/EW3343.json
index a7f4f247bfe..6d952251b45 100644
--- a/docs/data/histograms/Canada/EW3343.json
+++ b/docs/data/histograms/Canada/EW3343.json
@@ -1 +1 @@
-{"batchcode": "EW3343", "histograms": [{"batchcodes": ["EW3343"], "histogram": {"Heavy menstrual bleeding": 1, "Menstrual disorder": 1, "Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "EW3343", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1, "Menstrual disorder": 1, "Menstruation irregular": 1}, "batchcodes": ["EW3343"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EW3344.json b/docs/data/histograms/Canada/EW3344.json
index 9797c899ea6..ff396e06526 100644
--- a/docs/data/histograms/Canada/EW3344.json
+++ b/docs/data/histograms/Canada/EW3344.json
@@ -1 +1 @@
-{"batchcode": "EW3344", "histograms": [{"batchcodes": ["EW3344"], "histogram": {"SARS-CoV-2 test": 8, "Blood test": 7, "Chest pain": 7, "Headache": 7, "Nausea": 7, "Fatigue": 6, "Diarrhoea": 5, "Dyspnoea": 5, "Hypoaesthesia": 5, "Investigation": 5, "Pain in extremity": 5, "Pericarditis": 5, "Dizziness": 4, "Electrocardiogram": 4, "Feeling abnormal": 4, "Myalgia": 4, "Arthralgia": 3, "Paraesthesia": 3, "Pruritus": 3, "Pyrexia": 3, "Tinnitus": 3, "Vomiting": 3, "Weight decreased": 3, "Back pain": 2, "Blood cholesterol": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Deafness unilateral": 2, "Feeling hot": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Hyperhidrosis": 2, "Hypertension": 2, "Insomnia": 2, "Menstrual disorder": 2, "Muscular weakness": 2, "Myocarditis": 2, "Neuropathy peripheral": 2, "Palpitations": 2, "Renal impairment": 2, "Syncope": 2, "Ultrasound scan": 2, "Urticaria": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Amyotrophic lateral sclerosis": 1, "Arthritis": 1, "Asthenia": 1, "Audiogram": 1, "Autoimmune disorder": 1, "Balance disorder": 1, "Basophil count": 1, "Bell's palsy": 1, "Biopsy": 1, "Blindness": 1, "Blindness transient": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blue toe syndrome": 1, "Body height": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac function test": 1, "Cardiac stress test": 1, "Cerebral artery occlusion": 1, "Change of bowel habit": 1, "Chills": 1, "Computerised tomogram head": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Cough": 1, "Culture": 1, "Decreased appetite": 1, "Dehydration": 1, "Diastolic dysfunction": 1, "Disease recurrence": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry skin": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear infection bacterial": 1, "Ear pain": 1, "Echocardiogram": 1, "Electromyogram": 1, "Eosinophil count": 1, "Euphoric mood": 1, "Fear": 1, "Frequent bowel movements": 1, "Fungal test positive": 1, "Gastric haemorrhage": 1, "Gestational diabetes": 1, "Glycosylated haemoglobin": 1, "HIV antibody": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head injury": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hepatitis B antibody": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hyperthyroidism": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Impaired driving ability": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Influenza like illness": 1, "Interstitial lung disease": 1, "Laboratory test": 1, "Left ventricular dysfunction": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Migraine": 1, "Migraine with aura": 1, "Miosis": 1, "Monocyte count": 1, "Multiple sclerosis": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Musculoskeletal chest pain": 1, "Mycobacterium test": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neutrophil count": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain": 1, "Pain assessment": 1, "Paraesthesia oral": 1, "Parvovirus B19 test": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Photophobia": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Prenatal screening test": 1, "Product supply issue": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Red blood cell analysis": 1, "Red blood cell count": 1, "Renal pain": 1, "Rubella antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "Scan brain": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Spinal pain": 1, "Swelling": 1, "Swelling face": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Tremor": 1, "Treponema test": 1, "Ultrasound Doppler": 1, "Ultrasound antenatal screen": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1, "Vasculitis": 1, "Venous thrombosis": 1, "Ventricular remodelling": 1, "Vertigo": 1, "Viral myocarditis": 1, "Visual field defect": 1, "Visual field tests": 1, "Visual impairment": 1, "Weight": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EW3344", "histograms": [{"histogram": {"SARS-CoV-2 test": 8, "Blood test": 7, "Chest pain": 7, "Headache": 7, "Nausea": 7, "Fatigue": 6, "Diarrhoea": 5, "Dyspnoea": 5, "Hypoaesthesia": 5, "Investigation": 5, "Pain in extremity": 5, "Pericarditis": 5, "Dizziness": 4, "Electrocardiogram": 4, "Feeling abnormal": 4, "Myalgia": 4, "Arthralgia": 3, "Paraesthesia": 3, "Pruritus": 3, "Pyrexia": 3, "Tinnitus": 3, "Vomiting": 3, "Weight decreased": 3, "Back pain": 2, "Blood cholesterol": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Deafness unilateral": 2, "Feeling hot": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Hyperhidrosis": 2, "Hypertension": 2, "Insomnia": 2, "Menstrual disorder": 2, "Muscular weakness": 2, "Myocarditis": 2, "Neuropathy peripheral": 2, "Palpitations": 2, "Renal impairment": 2, "Syncope": 2, "Ultrasound scan": 2, "Urticaria": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Amyotrophic lateral sclerosis": 1, "Arthritis": 1, "Asthenia": 1, "Audiogram": 1, "Autoimmune disorder": 1, "Balance disorder": 1, "Basophil count": 1, "Bell's palsy": 1, "Biopsy": 1, "Blindness": 1, "Blindness transient": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blue toe syndrome": 1, "Body height": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac function test": 1, "Cardiac stress test": 1, "Cerebral artery occlusion": 1, "Change of bowel habit": 1, "Chills": 1, "Computerised tomogram head": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Cough": 1, "Culture": 1, "Decreased appetite": 1, "Dehydration": 1, "Diastolic dysfunction": 1, "Disease recurrence": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry skin": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear infection bacterial": 1, "Ear pain": 1, "Echocardiogram": 1, "Electromyogram": 1, "Eosinophil count": 1, "Euphoric mood": 1, "Fear": 1, "Frequent bowel movements": 1, "Fungal test positive": 1, "Gastric haemorrhage": 1, "Gestational diabetes": 1, "Glycosylated haemoglobin": 1, "HIV antibody": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head injury": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hepatitis B antibody": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hyperthyroidism": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Impaired driving ability": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Influenza like illness": 1, "Interstitial lung disease": 1, "Laboratory test": 1, "Left ventricular dysfunction": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Migraine": 1, "Migraine with aura": 1, "Miosis": 1, "Monocyte count": 1, "Multiple sclerosis": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Musculoskeletal chest pain": 1, "Mycobacterium test": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neutrophil count": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain": 1, "Pain assessment": 1, "Paraesthesia oral": 1, "Parvovirus B19 test": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Photophobia": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Prenatal screening test": 1, "Product supply issue": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Red blood cell analysis": 1, "Red blood cell count": 1, "Renal pain": 1, "Rubella antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "Scan brain": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Spinal pain": 1, "Swelling": 1, "Swelling face": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Tremor": 1, "Treponema test": 1, "Ultrasound Doppler": 1, "Ultrasound antenatal screen": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1, "Vasculitis": 1, "Venous thrombosis": 1, "Ventricular remodelling": 1, "Vertigo": 1, "Viral myocarditis": 1, "Visual field defect": 1, "Visual field tests": 1, "Visual impairment": 1, "Weight": 1, "White blood cell count": 1}, "batchcodes": ["EW3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EWO193.json b/docs/data/histograms/Canada/EWO193.json
index 5ccde27e66b..0d0dbead2dd 100644
--- a/docs/data/histograms/Canada/EWO193.json
+++ b/docs/data/histograms/Canada/EWO193.json
@@ -1 +1 @@
-{"batchcode": "EWO193", "histograms": [{"batchcodes": ["EWO193"], "histogram": {"Dyskinesia": 1, "Headache": 1, "Loss of consciousness": 1, "Malaise": 1, "Movement disorder": 1, "Pyrexia": 1, "Somnolence": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO193", "histograms": [{"histogram": {"Dyskinesia": 1, "Headache": 1, "Loss of consciousness": 1, "Malaise": 1, "Movement disorder": 1, "Pyrexia": 1, "Somnolence": 1, "Vomiting": 1}, "batchcodes": ["EWO193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EWO199.json b/docs/data/histograms/Canada/EWO199.json
index 90a1b6eebfc..210c4cb3636 100644
--- a/docs/data/histograms/Canada/EWO199.json
+++ b/docs/data/histograms/Canada/EWO199.json
@@ -1 +1 @@
-{"batchcode": "EWO199", "histograms": [{"batchcodes": ["EWO199"], "histogram": {"Chest discomfort": 1, "Discomfort": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Muscle tightness": 1, "Nerve compression": 1, "Neuropathy peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO199", "histograms": [{"histogram": {"Chest discomfort": 1, "Discomfort": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Muscle tightness": 1, "Nerve compression": 1, "Neuropathy peripheral": 1}, "batchcodes": ["EWO199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EWO216.json b/docs/data/histograms/Canada/EWO216.json
index ce536a95470..7448c237c1d 100644
--- a/docs/data/histograms/Canada/EWO216.json
+++ b/docs/data/histograms/Canada/EWO216.json
@@ -1 +1 @@
-{"batchcode": "EWO216", "histograms": [{"batchcodes": ["EWO216"], "histogram": {"Back pain": 1, "Lymphadenopathy": 1, "Meningitis bacterial": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO216", "histograms": [{"histogram": {"Back pain": 1, "Lymphadenopathy": 1, "Meningitis bacterial": 1, "Pain in extremity": 1}, "batchcodes": ["EWO216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EX 0438.json b/docs/data/histograms/Canada/EX 0438.json
index 06464996a9c..951ac649560 100644
--- a/docs/data/histograms/Canada/EX 0438.json
+++ b/docs/data/histograms/Canada/EX 0438.json
@@ -1 +1 @@
-{"batchcode": "EX 0438", "histograms": [{"batchcodes": ["EX 0438"], "histogram": {"Peripheral swelling": 2, "Autoimmune disorder": 1, "Dysphagia": 1, "Ear swelling": 1, "Erythema": 1, "Feeling hot": 1, "Full blood count": 1, "Investigation": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Thrombosis": 1, "Ultrasound scan": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EX 0438", "histograms": [{"histogram": {"Peripheral swelling": 2, "Autoimmune disorder": 1, "Dysphagia": 1, "Ear swelling": 1, "Erythema": 1, "Feeling hot": 1, "Full blood count": 1, "Investigation": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Thrombosis": 1, "Ultrasound scan": 1, "X-ray": 1}, "batchcodes": ["EX 0438"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EX 2294.json b/docs/data/histograms/Canada/EX 2294.json
index 70cb6a98791..ff6d17355ca 100644
--- a/docs/data/histograms/Canada/EX 2294.json
+++ b/docs/data/histograms/Canada/EX 2294.json
@@ -1 +1 @@
-{"batchcode": "EX 2294", "histograms": [{"batchcodes": ["EX 2294"], "histogram": {"Anaphylactic reaction": 1, "Dysphagia": 1, "Dyspnoea": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Panic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "EX 2294", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Dysphagia": 1, "Dyspnoea": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Panic attack": 1}, "batchcodes": ["EX 2294"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EX0004.json b/docs/data/histograms/Canada/EX0004.json
index 0a7737fd3cf..06e608b4ce2 100644
--- a/docs/data/histograms/Canada/EX0004.json
+++ b/docs/data/histograms/Canada/EX0004.json
@@ -1 +1 @@
-{"batchcode": "EX0004", "histograms": [{"batchcodes": ["EX0004"], "histogram": {"Vision blurred": 1, "Vitreous floaters": 1}}]}
\ No newline at end of file
+{"batchcode": "EX0004", "histograms": [{"histogram": {"Vision blurred": 1, "Vitreous floaters": 1}, "batchcodes": ["EX0004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EX0438.json b/docs/data/histograms/Canada/EX0438.json
index 2f298b2e3dd..aa396ef5645 100644
--- a/docs/data/histograms/Canada/EX0438.json
+++ b/docs/data/histograms/Canada/EX0438.json
@@ -1 +1 @@
-{"batchcode": "EX0438", "histograms": [{"batchcodes": ["EX0438"], "histogram": {"Fatigue": 14, "SARS-CoV-2 test": 10, "Dizziness": 8, "Headache": 8, "Pain in extremity": 7, "Arthralgia": 6, "Blood test": 6, "Chest pain": 6, "Investigation": 6, "Pericarditis": 6, "Feeling abnormal": 5, "Nausea": 5, "Paraesthesia": 5, "Vaccination site pain": 5, "COVID-19": 4, "Chest discomfort": 4, "Dyspnoea": 4, "Inappropriate schedule of product administration": 4, "Myalgia": 4, "Palpitations": 4, "Pyrexia": 4, "Rash": 4, "Tinnitus": 4, "Anxiety": 3, "Asthenia": 3, "Blood cholesterol": 3, "Blood creatinine": 3, "Blood potassium": 3, "Blood pressure measurement": 3, "Blood sodium": 3, "Drug ineffective": 3, "Eye pain": 3, "Gait disturbance": 3, "Glomerular filtration rate": 3, "Heart rate": 3, "Hypoaesthesia": 3, "Malaise": 3, "Oxygen saturation": 3, "Platelet count": 3, "Tremor": 3, "Ultrasound scan": 3, "Urticaria": 3, "Alanine aminotransferase": 2, "Anaphylactic reaction": 2, "Arrhythmia": 2, "Back pain": 2, "Balance disorder": 2, "Basophil count": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood glucose": 2, "Blood magnesium": 2, "Blood thyroid stimulating hormone": 2, "Chills": 2, "Cough": 2, "Disturbance in attention": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Eosinophil count": 2, "Erythema": 2, "Feeling hot": 2, "Gait inability": 2, "Gamma-glutamyltransferase": 2, "Haematocrit": 2, "Haemoglobin": 2, "Heart rate increased": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Inflammation": 2, "Insomnia": 2, "Lymphadenopathy": 2, "Lymphocyte count": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monocyte count": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Myocarditis": 2, "Myopericarditis": 2, "Neck pain": 2, "Neutrophil count": 2, "Pain": 2, "Pericardial effusion": 2, "Platelet factor 4": 2, "Pruritus": 2, "Red blood cell count": 2, "Serum ferritin": 2, "Swelling": 2, "Syncope": 2, "Thrombosis": 2, "Ultrasound Doppler": 2, "Vaginal haemorrhage": 2, "Vision blurred": 2, "Vitamin B12": 2, "White blood cell count": 2, "X-ray": 2, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Abortion spontaneous": 1, "Adnexa uteri pain": 1, "Ageusia": 1, "Alopecia": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Amenorrhoea": 1, "Angioedema": 1, "Angiogram": 1, "Anion gap": 1, "Anosmia": 1, "Anti-thyroid antibody": 1, "Antibody test": 1, "Aphasia": 1, "Asthma": 1, "Atelectasis": 1, "Atrial fibrillation": 1, "Bedridden": 1, "Bell's palsy": 1, "Beta 2 globulin": 1, "Biopsy thyroid gland": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood corticotrophin": 1, "Blood cortisol": 1, "Blood follicle stimulating hormone increased": 1, "Blood glucose increased": 1, "Blood phosphorus": 1, "Blood triglycerides": 1, "Blood urea": 1, "Body temperature": 1, "Bradycardia": 1, "Burning sensation": 1, "Carbon dioxide": 1, "Cardiac flutter": 1, "Catatonia": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Choking": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Diverticulitis": 1, "Dry eye": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear congestion": 1, "Ear pain": 1, "Ecchymosis": 1, "Eczema": 1, "Fall": 1, "Full blood count": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate increased": 1, "Glossitis": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Head discomfort": 1, "Helicobacter infection": 1, "Hepatosplenomegaly": 1, "Herpes ophthalmic": 1, "Herpes simplex": 1, "Hiccups": 1, "High density lipoprotein": 1, "Hyperacusis": 1, "Hypersensitivity": 1, "Hypocalcaemia": 1, "Immature granulocyte count": 1, "Immunoglobulins": 1, "Incorrect product administration duration": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "International normalised ratio": 1, "Irritability": 1, "Joint dislocation": 1, "Lipoma": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nervous system disorder": 1, "Night sweats": 1, "Paralysis": 1, "Parkinsonism": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Post herpetic neuralgia": 1, "Postmenopausal haemorrhage": 1, "Presyncope": 1, "Psoriasis": 1, "Rash morbilliform": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "Rosacea": 1, "Seizure": 1, "Serology test": 1, "Skin disorder": 1, "Sluggishness": 1, "Sudden hearing loss": 1, "Superior sagittal sinus thrombosis": 1, "Swollen tongue": 1, "Tachycardia": 1, "Tendon disorder": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Throat tightness": 1, "Thrombophlebitis": 1, "Thyroid function test": 1, "Thyroxine free": 1, "Ultrasound thyroid": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site ulcer": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Vestibular disorder": 1, "Vestibular neuronitis": 1, "Vomiting": 1, "Walking disability": 1, "X-ray limb": 1}}]}
\ No newline at end of file
+{"batchcode": "EX0438", "histograms": [{"histogram": {"Fatigue": 14, "SARS-CoV-2 test": 10, "Dizziness": 8, "Headache": 8, "Pain in extremity": 7, "Arthralgia": 6, "Blood test": 6, "Chest pain": 6, "Investigation": 6, "Pericarditis": 6, "Feeling abnormal": 5, "Nausea": 5, "Paraesthesia": 5, "Vaccination site pain": 5, "COVID-19": 4, "Chest discomfort": 4, "Dyspnoea": 4, "Inappropriate schedule of product administration": 4, "Myalgia": 4, "Palpitations": 4, "Pyrexia": 4, "Rash": 4, "Tinnitus": 4, "Anxiety": 3, "Asthenia": 3, "Blood cholesterol": 3, "Blood creatinine": 3, "Blood potassium": 3, "Blood pressure measurement": 3, "Blood sodium": 3, "Drug ineffective": 3, "Eye pain": 3, "Gait disturbance": 3, "Glomerular filtration rate": 3, "Heart rate": 3, "Hypoaesthesia": 3, "Malaise": 3, "Oxygen saturation": 3, "Platelet count": 3, "Tremor": 3, "Ultrasound scan": 3, "Urticaria": 3, "Alanine aminotransferase": 2, "Anaphylactic reaction": 2, "Arrhythmia": 2, "Back pain": 2, "Balance disorder": 2, "Basophil count": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood glucose": 2, "Blood magnesium": 2, "Blood thyroid stimulating hormone": 2, "Chills": 2, "Cough": 2, "Disturbance in attention": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Eosinophil count": 2, "Erythema": 2, "Feeling hot": 2, "Gait inability": 2, "Gamma-glutamyltransferase": 2, "Haematocrit": 2, "Haemoglobin": 2, "Heart rate increased": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Inflammation": 2, "Insomnia": 2, "Lymphadenopathy": 2, "Lymphocyte count": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monocyte count": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Myocarditis": 2, "Myopericarditis": 2, "Neck pain": 2, "Neutrophil count": 2, "Pain": 2, "Pericardial effusion": 2, "Platelet factor 4": 2, "Pruritus": 2, "Red blood cell count": 2, "Serum ferritin": 2, "Swelling": 2, "Syncope": 2, "Thrombosis": 2, "Ultrasound Doppler": 2, "Vaginal haemorrhage": 2, "Vision blurred": 2, "Vitamin B12": 2, "White blood cell count": 2, "X-ray": 2, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Abortion spontaneous": 1, "Adnexa uteri pain": 1, "Ageusia": 1, "Alopecia": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Amenorrhoea": 1, "Angioedema": 1, "Angiogram": 1, "Anion gap": 1, "Anosmia": 1, "Anti-thyroid antibody": 1, "Antibody test": 1, "Aphasia": 1, "Asthma": 1, "Atelectasis": 1, "Atrial fibrillation": 1, "Bedridden": 1, "Bell's palsy": 1, "Beta 2 globulin": 1, "Biopsy thyroid gland": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood corticotrophin": 1, "Blood cortisol": 1, "Blood follicle stimulating hormone increased": 1, "Blood glucose increased": 1, "Blood phosphorus": 1, "Blood triglycerides": 1, "Blood urea": 1, "Body temperature": 1, "Bradycardia": 1, "Burning sensation": 1, "Carbon dioxide": 1, "Cardiac flutter": 1, "Catatonia": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Choking": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Diverticulitis": 1, "Dry eye": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear congestion": 1, "Ear pain": 1, "Ecchymosis": 1, "Eczema": 1, "Fall": 1, "Full blood count": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate increased": 1, "Glossitis": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Head discomfort": 1, "Helicobacter infection": 1, "Hepatosplenomegaly": 1, "Herpes ophthalmic": 1, "Herpes simplex": 1, "Hiccups": 1, "High density lipoprotein": 1, "Hyperacusis": 1, "Hypersensitivity": 1, "Hypocalcaemia": 1, "Immature granulocyte count": 1, "Immunoglobulins": 1, "Incorrect product administration duration": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "International normalised ratio": 1, "Irritability": 1, "Joint dislocation": 1, "Lipoma": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nervous system disorder": 1, "Night sweats": 1, "Paralysis": 1, "Parkinsonism": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Post herpetic neuralgia": 1, "Postmenopausal haemorrhage": 1, "Presyncope": 1, "Psoriasis": 1, "Rash morbilliform": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "Rosacea": 1, "Seizure": 1, "Serology test": 1, "Skin disorder": 1, "Sluggishness": 1, "Sudden hearing loss": 1, "Superior sagittal sinus thrombosis": 1, "Swollen tongue": 1, "Tachycardia": 1, "Tendon disorder": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Throat tightness": 1, "Thrombophlebitis": 1, "Thyroid function test": 1, "Thyroxine free": 1, "Ultrasound thyroid": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site ulcer": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Vestibular disorder": 1, "Vestibular neuronitis": 1, "Vomiting": 1, "Walking disability": 1, "X-ray limb": 1}, "batchcodes": ["EX0438"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EX0904.json b/docs/data/histograms/Canada/EX0904.json
index 36ad7ceb747..3c4b4ed2d94 100644
--- a/docs/data/histograms/Canada/EX0904.json
+++ b/docs/data/histograms/Canada/EX0904.json
@@ -1 +1 @@
-{"batchcode": "EX0904", "histograms": [{"batchcodes": ["EX0904"], "histogram": {"Hypoaesthesia": 8, "Arthralgia": 5, "SARS-CoV-2 test": 5, "Chills": 4, "Computerised tomogram": 4, "Fatigue": 4, "Headache": 4, "Insomnia": 4, "Myocarditis": 4, "Paraesthesia": 4, "Chest discomfort": 3, "Dizziness": 3, "Dyspnoea": 3, "Inflammation": 3, "Lethargy": 3, "Loss of consciousness": 3, "Lymphadenopathy": 3, "Myalgia": 3, "Pain in extremity": 3, "Polymyalgia rheumatica": 3, "Pruritus": 3, "Pyrexia": 3, "Asthenia": 2, "Back pain": 2, "Blood test": 2, "Body temperature": 2, "Chest pain": 2, "Condition aggravated": 2, "Dehydration": 2, "Feeling abnormal": 2, "Flushing": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Nausea": 2, "Pain": 2, "Peripheral swelling": 2, "Spinal pain": 2, "Vaccination site pain": 2, "Visual impairment": 2, "Alopecia": 1, "Aphasia": 1, "Arrhythmia": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blindness": 1, "Blister": 1, "Blood cholesterol": 1, "Blood glucose decreased": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blue toe syndrome": 1, "Brain oedema": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac failure": 1, "Cerebral thrombosis": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Choking sensation": 1, "Circadian rhythm sleep disorder": 1, "Cognitive disorder": 1, "Communication disorder": 1, "Contusion": 1, "Cough": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Defaecation urgency": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Fluid retention": 1, "Frequent bowel movements": 1, "Gait disturbance": 1, "Gastrointestinal disorder": 1, "Gout": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Hepatic enzyme abnormal": 1, "Herpes zoster": 1, "Hormone level abnormal": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoperfusion": 1, "Hypotension": 1, "Hypothyroidism": 1, "Illness": 1, "Immune thrombocytopenia": 1, "Inappropriate affect": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint dislocation": 1, "Joint swelling": 1, "Left ventricular dilatation": 1, "Left ventricular dysfunction": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Mental impairment": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Myopericarditis": 1, "Neck pain": 1, "Nervousness": 1, "Neuralgia": 1, "Nightmare": 1, "Nodule": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral herpes": 1, "Pain in jaw": 1, "Pain of skin": 1, "Palpitations": 1, "Panic reaction": 1, "Parkinson's disease": 1, "Peripheral coldness": 1, "Peripheral vascular disorder": 1, "Pharyngeal hypoaesthesia": 1, "Polycystic ovaries": 1, "Postmenopausal haemorrhage": 1, "Psychomotor hyperactivity": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Rheumatoid arthritis": 1, "Right ventricular dilatation": 1, "SAPHO syndrome": 1, "SARS-CoV-2 test negative": 1, "Scan": 1, "Sciatica": 1, "Sensitive skin": 1, "Skin burning sensation": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Somnolence": 1, "Swelling face": 1, "Syncope": 1, "Thrombosis": 1, "Tricuspid valve incompetence": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Ventricular tachycardia": 1, "Vestibular disorder": 1, "Visual field defect": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EX0904", "histograms": [{"histogram": {"Hypoaesthesia": 8, "Arthralgia": 5, "SARS-CoV-2 test": 5, "Chills": 4, "Computerised tomogram": 4, "Fatigue": 4, "Headache": 4, "Insomnia": 4, "Myocarditis": 4, "Paraesthesia": 4, "Chest discomfort": 3, "Dizziness": 3, "Dyspnoea": 3, "Inflammation": 3, "Lethargy": 3, "Loss of consciousness": 3, "Lymphadenopathy": 3, "Myalgia": 3, "Pain in extremity": 3, "Polymyalgia rheumatica": 3, "Pruritus": 3, "Pyrexia": 3, "Asthenia": 2, "Back pain": 2, "Blood test": 2, "Body temperature": 2, "Chest pain": 2, "Condition aggravated": 2, "Dehydration": 2, "Feeling abnormal": 2, "Flushing": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Nausea": 2, "Pain": 2, "Peripheral swelling": 2, "Spinal pain": 2, "Vaccination site pain": 2, "Visual impairment": 2, "Alopecia": 1, "Aphasia": 1, "Arrhythmia": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blindness": 1, "Blister": 1, "Blood cholesterol": 1, "Blood glucose decreased": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blue toe syndrome": 1, "Brain oedema": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac failure": 1, "Cerebral thrombosis": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Choking sensation": 1, "Circadian rhythm sleep disorder": 1, "Cognitive disorder": 1, "Communication disorder": 1, "Contusion": 1, "Cough": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Defaecation urgency": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Fluid retention": 1, "Frequent bowel movements": 1, "Gait disturbance": 1, "Gastrointestinal disorder": 1, "Gout": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Hepatic enzyme abnormal": 1, "Herpes zoster": 1, "Hormone level abnormal": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoperfusion": 1, "Hypotension": 1, "Hypothyroidism": 1, "Illness": 1, "Immune thrombocytopenia": 1, "Inappropriate affect": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint dislocation": 1, "Joint swelling": 1, "Left ventricular dilatation": 1, "Left ventricular dysfunction": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Mental impairment": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Myopericarditis": 1, "Neck pain": 1, "Nervousness": 1, "Neuralgia": 1, "Nightmare": 1, "Nodule": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral herpes": 1, "Pain in jaw": 1, "Pain of skin": 1, "Palpitations": 1, "Panic reaction": 1, "Parkinson's disease": 1, "Peripheral coldness": 1, "Peripheral vascular disorder": 1, "Pharyngeal hypoaesthesia": 1, "Polycystic ovaries": 1, "Postmenopausal haemorrhage": 1, "Psychomotor hyperactivity": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Rheumatoid arthritis": 1, "Right ventricular dilatation": 1, "SAPHO syndrome": 1, "SARS-CoV-2 test negative": 1, "Scan": 1, "Sciatica": 1, "Sensitive skin": 1, "Skin burning sensation": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Somnolence": 1, "Swelling face": 1, "Syncope": 1, "Thrombosis": 1, "Tricuspid valve incompetence": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Ventricular tachycardia": 1, "Vestibular disorder": 1, "Visual field defect": 1, "X-ray": 1}, "batchcodes": ["EX0904"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EX2294.json b/docs/data/histograms/Canada/EX2294.json
index 51da6faf589..a81faddd14d 100644
--- a/docs/data/histograms/Canada/EX2294.json
+++ b/docs/data/histograms/Canada/EX2294.json
@@ -1 +1 @@
-{"batchcode": "EX2294", "histograms": [{"batchcodes": ["EX2294"], "histogram": {"SARS-CoV-2 test": 5, "Dyspnoea": 4, "Blood test": 3, "Fatigue": 3, "Headache": 3, "Pain in extremity": 3, "Pericarditis": 3, "Bell's palsy": 2, "Blood pressure measurement": 2, "Electrocardiogram": 2, "Gait disturbance": 2, "Inappropriate schedule of product administration": 2, "Maternal exposure during pregnancy": 2, "Myalgia": 2, "Myocardial infarction": 2, "Pruritus": 2, "Arthralgia": 1, "Blood pressure increased": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Clavicle fracture": 1, "Computerised tomogram head": 1, "Cough": 1, "Deep vein thrombosis": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dystonia": 1, "Erythema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Glucose tolerance test": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Impaired quality of life": 1, "Joint swelling": 1, "Leukoplakia oral": 1, "Lichen planus": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Myocarditis": 1, "Myopericarditis": 1, "Nausea": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Oral lichen planus": 1, "Oxygen saturation": 1, "Pain": 1, "Pericardial effusion": 1, "Postmenopausal haemorrhage": 1, "Pyrexia": 1, "Rash": 1, "Rubella antibody test": 1, "Seizure": 1, "Shoulder dystocia": 1, "Skin burning sensation": 1, "Streptococcal urinary tract infection": 1, "Swelling": 1, "Tremor": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urticaria chronic": 1, "Uterine injury": 1, "Uveitis": 1, "Vestibular neuronitis": 1, "Visual impairment": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EX2294", "histograms": [{"histogram": {"SARS-CoV-2 test": 5, "Dyspnoea": 4, "Blood test": 3, "Fatigue": 3, "Headache": 3, "Pain in extremity": 3, "Pericarditis": 3, "Bell's palsy": 2, "Blood pressure measurement": 2, "Electrocardiogram": 2, "Gait disturbance": 2, "Inappropriate schedule of product administration": 2, "Maternal exposure during pregnancy": 2, "Myalgia": 2, "Myocardial infarction": 2, "Pruritus": 2, "Arthralgia": 1, "Blood pressure increased": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Clavicle fracture": 1, "Computerised tomogram head": 1, "Cough": 1, "Deep vein thrombosis": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dystonia": 1, "Erythema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Glucose tolerance test": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Impaired quality of life": 1, "Joint swelling": 1, "Leukoplakia oral": 1, "Lichen planus": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Myocarditis": 1, "Myopericarditis": 1, "Nausea": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Oral lichen planus": 1, "Oxygen saturation": 1, "Pain": 1, "Pericardial effusion": 1, "Postmenopausal haemorrhage": 1, "Pyrexia": 1, "Rash": 1, "Rubella antibody test": 1, "Seizure": 1, "Shoulder dystocia": 1, "Skin burning sensation": 1, "Streptococcal urinary tract infection": 1, "Swelling": 1, "Tremor": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urticaria chronic": 1, "Uterine injury": 1, "Uveitis": 1, "Vestibular neuronitis": 1, "Visual impairment": 1, "X-ray": 1}, "batchcodes": ["EX2294"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EXO438.json b/docs/data/histograms/Canada/EXO438.json
index efc61e69e9a..bf675059df1 100644
--- a/docs/data/histograms/Canada/EXO438.json
+++ b/docs/data/histograms/Canada/EXO438.json
@@ -1 +1 @@
-{"batchcode": "EXO438", "histograms": [{"batchcodes": ["EXO438"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Deafness": 1, "Eye swelling": 1, "Headache": 1, "Immunisation": 1, "Palpitations": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swollen tongue": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "EXO438", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Deafness": 1, "Eye swelling": 1, "Headache": 1, "Immunisation": 1, "Palpitations": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swollen tongue": 1, "Tinnitus": 1}, "batchcodes": ["EXO438"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EXO904.json b/docs/data/histograms/Canada/EXO904.json
index a46076405b0..1e75247e9a2 100644
--- a/docs/data/histograms/Canada/EXO904.json
+++ b/docs/data/histograms/Canada/EXO904.json
@@ -1 +1 @@
-{"batchcode": "EXO904", "histograms": [{"batchcodes": ["EXO904"], "histogram": {"Cerebral disorder": 1, "Feeling abnormal": 1, "Memory impairment": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EXO904", "histograms": [{"histogram": {"Cerebral disorder": 1, "Feeling abnormal": 1, "Memory impairment": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EXO904"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EY0578..json b/docs/data/histograms/Canada/EY0578..json
index bbcead8ac5f..9ec3e53f0cc 100644
--- a/docs/data/histograms/Canada/EY0578..json
+++ b/docs/data/histograms/Canada/EY0578..json
@@ -1 +1 @@
-{"batchcode": "EY0578.", "histograms": [{"batchcodes": ["EY0578."], "histogram": {"Atelectasis": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Investigation": 1, "Lymphadenopathy": 1, "Scan bone marrow": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0578.", "histograms": [{"histogram": {"Atelectasis": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Investigation": 1, "Lymphadenopathy": 1, "Scan bone marrow": 1, "Ultrasound scan": 1}, "batchcodes": ["EY0578."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EY0578.json b/docs/data/histograms/Canada/EY0578.json
index ba6d5ec80c8..3fb31211b16 100644
--- a/docs/data/histograms/Canada/EY0578.json
+++ b/docs/data/histograms/Canada/EY0578.json
@@ -1 +1 @@
-{"batchcode": "EY0578", "histograms": [{"batchcodes": ["EY0578"], "histogram": {"Inappropriate schedule of product administration": 24, "Pericarditis": 24, "Chest pain": 20, "SARS-CoV-2 test": 16, "Dyspnoea": 13, "Myocarditis": 11, "Nausea": 10, "Pain": 9, "Headache": 7, "Arthralgia": 6, "Fatigue": 6, "Pain in extremity": 6, "Dizziness": 5, "Asthenia": 4, "Chest discomfort": 4, "Cough": 4, "Electrocardiogram": 4, "Gait disturbance": 4, "Magnetic resonance imaging": 4, "Myalgia": 4, "Neck pain": 4, "Off label use": 4, "Pyrexia": 4, "Back pain": 3, "Blood test": 3, "COVID-19": 3, "Chills": 3, "Computerised tomogram": 3, "Diarrhoea": 3, "Drug ineffective": 3, "Insomnia": 3, "Malaise": 3, "Periarthritis": 3, "Pericardial effusion": 3, "Pruritus": 3, "Ultrasound scan": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Anxiety": 2, "Arthritis": 2, "Asthma": 2, "Atrial fibrillation": 2, "Blood pressure measurement": 2, "Discomfort": 2, "Dyspepsia": 2, "Dyspnoea exertional": 2, "Guillain-Barre syndrome": 2, "Hypersensitivity": 2, "Hypertension": 2, "Interchange of vaccine products": 2, "Migraine": 2, "Mobility decreased": 2, "Mouth ulceration": 2, "Muscle spasms": 2, "Myopericarditis": 2, "Palpitations": 2, "Paraesthesia": 2, "Photophobia": 2, "Renal impairment": 2, "Seizure": 2, "Syncope": 2, "Tremor": 2, "Vaccination site pain": 2, "Abdomen scan": 1, "Abdominal pain": 1, "Abortion spontaneous": 1, "Alopecia totalis": 1, "Amenorrhoea": 1, "Amyotrophic lateral sclerosis": 1, "Angioedema": 1, "Appendicitis": 1, "Basophil count": 1, "Behcet's syndrome": 1, "Bell's palsy": 1, "Biopsy": 1, "Blindness transient": 1, "Blood creatinine": 1, "Blood glucagon": 1, "Blood glucagon decreased": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Bradycardia": 1, "Breast pain": 1, "Bursa disorder": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Carditis": 1, "Carpal tunnel syndrome": 1, "Central pain syndrome": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctivitis bacterial": 1, "Culture urine": 1, "Death": 1, "Decreased appetite": 1, "Dry eye": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Eosinophil count": 1, "Epilepsy": 1, "Erythema": 1, "Eye infection viral": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Gait inability": 1, "General physical health deterioration": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hormone level abnormal": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Hypotension": 1, "Immature granulocyte count": 1, "Impaired quality of life": 1, "Inflammation": 1, "Internal haemorrhage": 1, "Intestinal ulcer": 1, "Investigation": 1, "Joint dislocation": 1, "Keloid scar": 1, "Keratitis": 1, "Lethargy": 1, "Ligament rupture": 1, "Limb injury": 1, "Lipohypertrophy": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Menstruation delayed": 1, "Monocyte count": 1, "Mood altered": 1, "Morbid thoughts": 1, "Muscle disorder": 1, "Muscle rupture": 1, "Musculoskeletal stiffness": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nucleated red cells": 1, "Oligomenorrhoea": 1, "Oropharyngeal pain": 1, "Ovarian cyst ruptured": 1, "Pain assessment": 1, "Peripheral motor neuropathy": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Polymenorrhoea": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Pregnancy test": 1, "Quality of life decreased": 1, "Radial nerve injury": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Respiratory disorder": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "Sinus tachycardia": 1, "Skin burning sensation": 1, "Stress": 1, "Superficial vein thrombosis": 1, "Swelling face": 1, "Tendon pain": 1, "Thrombosis": 1, "Thyroxine": 1, "Troponin": 1, "Urticaria": 1, "Vaccination site urticaria": 1, "Vertigo positional": 1, "Visual impairment": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0578", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 24, "Pericarditis": 24, "Chest pain": 20, "SARS-CoV-2 test": 16, "Dyspnoea": 13, "Myocarditis": 11, "Nausea": 10, "Pain": 9, "Headache": 7, "Arthralgia": 6, "Fatigue": 6, "Pain in extremity": 6, "Dizziness": 5, "Asthenia": 4, "Chest discomfort": 4, "Cough": 4, "Electrocardiogram": 4, "Gait disturbance": 4, "Magnetic resonance imaging": 4, "Myalgia": 4, "Neck pain": 4, "Off label use": 4, "Pyrexia": 4, "Back pain": 3, "Blood test": 3, "COVID-19": 3, "Chills": 3, "Computerised tomogram": 3, "Diarrhoea": 3, "Drug ineffective": 3, "Insomnia": 3, "Malaise": 3, "Periarthritis": 3, "Pericardial effusion": 3, "Pruritus": 3, "Ultrasound scan": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Anxiety": 2, "Arthritis": 2, "Asthma": 2, "Atrial fibrillation": 2, "Blood pressure measurement": 2, "Discomfort": 2, "Dyspepsia": 2, "Dyspnoea exertional": 2, "Guillain-Barre syndrome": 2, "Hypersensitivity": 2, "Hypertension": 2, "Interchange of vaccine products": 2, "Migraine": 2, "Mobility decreased": 2, "Mouth ulceration": 2, "Muscle spasms": 2, "Myopericarditis": 2, "Palpitations": 2, "Paraesthesia": 2, "Photophobia": 2, "Renal impairment": 2, "Seizure": 2, "Syncope": 2, "Tremor": 2, "Vaccination site pain": 2, "Abdomen scan": 1, "Abdominal pain": 1, "Abortion spontaneous": 1, "Alopecia totalis": 1, "Amenorrhoea": 1, "Amyotrophic lateral sclerosis": 1, "Angioedema": 1, "Appendicitis": 1, "Basophil count": 1, "Behcet's syndrome": 1, "Bell's palsy": 1, "Biopsy": 1, "Blindness transient": 1, "Blood creatinine": 1, "Blood glucagon": 1, "Blood glucagon decreased": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Bradycardia": 1, "Breast pain": 1, "Bursa disorder": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Carditis": 1, "Carpal tunnel syndrome": 1, "Central pain syndrome": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctivitis bacterial": 1, "Culture urine": 1, "Death": 1, "Decreased appetite": 1, "Dry eye": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Eosinophil count": 1, "Epilepsy": 1, "Erythema": 1, "Eye infection viral": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Gait inability": 1, "General physical health deterioration": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hormone level abnormal": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Hypotension": 1, "Immature granulocyte count": 1, "Impaired quality of life": 1, "Inflammation": 1, "Internal haemorrhage": 1, "Intestinal ulcer": 1, "Investigation": 1, "Joint dislocation": 1, "Keloid scar": 1, "Keratitis": 1, "Lethargy": 1, "Ligament rupture": 1, "Limb injury": 1, "Lipohypertrophy": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Menstruation delayed": 1, "Monocyte count": 1, "Mood altered": 1, "Morbid thoughts": 1, "Muscle disorder": 1, "Muscle rupture": 1, "Musculoskeletal stiffness": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nucleated red cells": 1, "Oligomenorrhoea": 1, "Oropharyngeal pain": 1, "Ovarian cyst ruptured": 1, "Pain assessment": 1, "Peripheral motor neuropathy": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Polymenorrhoea": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Pregnancy test": 1, "Quality of life decreased": 1, "Radial nerve injury": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Respiratory disorder": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "Sinus tachycardia": 1, "Skin burning sensation": 1, "Stress": 1, "Superficial vein thrombosis": 1, "Swelling face": 1, "Tendon pain": 1, "Thrombosis": 1, "Thyroxine": 1, "Troponin": 1, "Urticaria": 1, "Vaccination site urticaria": 1, "Vertigo positional": 1, "Visual impairment": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["EY0578"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EY0579.json b/docs/data/histograms/Canada/EY0579.json
index 0982100d19c..5512cd94cb6 100644
--- a/docs/data/histograms/Canada/EY0579.json
+++ b/docs/data/histograms/Canada/EY0579.json
@@ -1 +1 @@
-{"batchcode": "EY0579", "histograms": [{"batchcodes": ["EY0579"], "histogram": {"Inappropriate schedule of product administration": 13, "Chest pain": 7, "Pericarditis": 7, "Blood test": 6, "Pain in extremity": 6, "Dyspnoea": 5, "SARS-CoV-2 test": 5, "Blood pressure measurement": 4, "Fatigue": 4, "Heart rate increased": 4, "Investigation": 4, "Myocarditis": 4, "Palpitations": 4, "Dizziness": 3, "Electrocardiogram": 3, "Heart rate": 3, "Limb discomfort": 3, "Magnetic resonance imaging": 3, "Off label use": 3, "Pyrexia": 3, "Chest discomfort": 2, "Decreased appetite": 2, "Feeling abnormal": 2, "Heavy menstrual bleeding": 2, "High density lipoprotein": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Low density lipoprotein": 2, "Lymphocyte count": 2, "Migraine": 2, "Nausea": 2, "Pain": 2, "Pain assessment": 2, "Paraesthesia": 2, "Thrombosis": 2, "Tinnitus": 2, "Tremor": 2, "Treponema test": 2, "Ultrasound scan": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Alanine aminotransferase": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Back pain": 1, "Balance disorder": 1, "Basophil count": 1, "Biopsy endometrium": 1, "Birth weight normal": 1, "Blindness": 1, "Blindness unilateral": 1, "Blood albumin": 1, "Blood albumin increased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urine present": 1, "Breast cyst": 1, "C-reactive protein": 1, "COVID-19": 1, "Carotid artery dissection": 1, "Central nervous system lesion": 1, "Cerebrovascular accident": 1, "Complement factor C4": 1, "Complement factor C4 decreased": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Discomfort": 1, "Disease recurrence": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry skin": 1, "Dysaesthesia": 1, "Dysuria": 1, "Electromyogram": 1, "Emotional disorder": 1, "Endoscopy": 1, "Endoscopy gastrointestinal": 1, "Eosinophil count": 1, "Eructation": 1, "Erythema multiforme": 1, "Exposure during pregnancy": 1, "Eyelid skin dryness": 1, "Fasting": 1, "Feeding disorder": 1, "Flank pain": 1, "Full blood count": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal motility disorder": 1, "Gestational diabetes": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Granulocyte count": 1, "Guillain-Barre syndrome": 1, "HIV antibody": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoglobin urine": 1, "Haemoglobin urine present": 1, "Hallucination": 1, "Head circumference normal": 1, "Headache": 1, "Heart rate irregular": 1, "Hepatitis B": 1, "Hormone level abnormal": 1, "Hyperhidrosis": 1, "Hyperreflexia": 1, "Hypersomnia": 1, "International normalised ratio": 1, "Intervertebral disc degeneration": 1, "Jaundice neonatal": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Kidney infection": 1, "Length at birth": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging spinal": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Menopausal disorder": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Monocyte count": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Myelomalacia": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Nerve conduction studies abnormal": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Non-high-density lipoprotein cholesterol": 1, "Painful respiration": 1, "Parkinson's disease": 1, "Percussion test": 1, "Pericarditis infective": 1, "Peripheral coldness": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Pleuritic pain": 1, "Polymenorrhoea": 1, "Poor quality sleep": 1, "Postmenopausal haemorrhage": 1, "Protein urine": 1, "Protein urine present": 1, "Pruritus": 1, "Psoriasis": 1, "Pulmonary function test": 1, "Rash morbilliform": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red blood cells urine positive": 1, "Red cell distribution width": 1, "Reflex test": 1, "Renal pain": 1, "Rheumatological examination": 1, "Romberg test": 1, "Rubella": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "Skin test": 1, "Sleep deficit": 1, "Sleep study": 1, "Smear cervix": 1, "Somnolence": 1, "Type 1 diabetes mellitus": 1, "Urine abnormality": 1, "Varicella": 1, "Visual field tests": 1, "Vitamin B12": 1, "Vitreous floaters": 1, "Vomiting": 1, "Weight increased": 1, "White blood cell count": 1, "White blood cells urine": 1, "White blood cells urine positive": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0579", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 13, "Chest pain": 7, "Pericarditis": 7, "Blood test": 6, "Pain in extremity": 6, "Dyspnoea": 5, "SARS-CoV-2 test": 5, "Blood pressure measurement": 4, "Fatigue": 4, "Heart rate increased": 4, "Investigation": 4, "Myocarditis": 4, "Palpitations": 4, "Dizziness": 3, "Electrocardiogram": 3, "Heart rate": 3, "Limb discomfort": 3, "Magnetic resonance imaging": 3, "Off label use": 3, "Pyrexia": 3, "Chest discomfort": 2, "Decreased appetite": 2, "Feeling abnormal": 2, "Heavy menstrual bleeding": 2, "High density lipoprotein": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Low density lipoprotein": 2, "Lymphocyte count": 2, "Migraine": 2, "Nausea": 2, "Pain": 2, "Pain assessment": 2, "Paraesthesia": 2, "Thrombosis": 2, "Tinnitus": 2, "Tremor": 2, "Treponema test": 2, "Ultrasound scan": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Alanine aminotransferase": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Back pain": 1, "Balance disorder": 1, "Basophil count": 1, "Biopsy endometrium": 1, "Birth weight normal": 1, "Blindness": 1, "Blindness unilateral": 1, "Blood albumin": 1, "Blood albumin increased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urine present": 1, "Breast cyst": 1, "C-reactive protein": 1, "COVID-19": 1, "Carotid artery dissection": 1, "Central nervous system lesion": 1, "Cerebrovascular accident": 1, "Complement factor C4": 1, "Complement factor C4 decreased": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Discomfort": 1, "Disease recurrence": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry skin": 1, "Dysaesthesia": 1, "Dysuria": 1, "Electromyogram": 1, "Emotional disorder": 1, "Endoscopy": 1, "Endoscopy gastrointestinal": 1, "Eosinophil count": 1, "Eructation": 1, "Erythema multiforme": 1, "Exposure during pregnancy": 1, "Eyelid skin dryness": 1, "Fasting": 1, "Feeding disorder": 1, "Flank pain": 1, "Full blood count": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal motility disorder": 1, "Gestational diabetes": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Granulocyte count": 1, "Guillain-Barre syndrome": 1, "HIV antibody": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoglobin urine": 1, "Haemoglobin urine present": 1, "Hallucination": 1, "Head circumference normal": 1, "Headache": 1, "Heart rate irregular": 1, "Hepatitis B": 1, "Hormone level abnormal": 1, "Hyperhidrosis": 1, "Hyperreflexia": 1, "Hypersomnia": 1, "International normalised ratio": 1, "Intervertebral disc degeneration": 1, "Jaundice neonatal": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Kidney infection": 1, "Length at birth": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging spinal": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Menopausal disorder": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Monocyte count": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Myelomalacia": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Nerve conduction studies abnormal": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Non-high-density lipoprotein cholesterol": 1, "Painful respiration": 1, "Parkinson's disease": 1, "Percussion test": 1, "Pericarditis infective": 1, "Peripheral coldness": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Pleuritic pain": 1, "Polymenorrhoea": 1, "Poor quality sleep": 1, "Postmenopausal haemorrhage": 1, "Protein urine": 1, "Protein urine present": 1, "Pruritus": 1, "Psoriasis": 1, "Pulmonary function test": 1, "Rash morbilliform": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red blood cells urine positive": 1, "Red cell distribution width": 1, "Reflex test": 1, "Renal pain": 1, "Rheumatological examination": 1, "Romberg test": 1, "Rubella": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "Skin test": 1, "Sleep deficit": 1, "Sleep study": 1, "Smear cervix": 1, "Somnolence": 1, "Type 1 diabetes mellitus": 1, "Urine abnormality": 1, "Varicella": 1, "Visual field tests": 1, "Vitamin B12": 1, "Vitreous floaters": 1, "Vomiting": 1, "Weight increased": 1, "White blood cell count": 1, "White blood cells urine": 1, "White blood cells urine positive": 1, "X-ray": 1}, "batchcodes": ["EY0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EY0583.json b/docs/data/histograms/Canada/EY0583.json
index bda0baeb4b0..5de989b691b 100644
--- a/docs/data/histograms/Canada/EY0583.json
+++ b/docs/data/histograms/Canada/EY0583.json
@@ -1 +1 @@
-{"batchcode": "EY0583", "histograms": [{"batchcodes": ["EY0583"], "histogram": {"Inappropriate schedule of product administration": 4, "Chest pain": 3, "Pain": 3, "Asthenia": 2, "Back pain": 2, "Pain in extremity": 2, "Pericarditis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Allergy to vaccine": 1, "Antibody test": 1, "Appetite disorder": 1, "Autoimmune thyroiditis": 1, "Biopsy bone marrow": 1, "Body temperature": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Demyelinating polyneuropathy": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling hot": 1, "Flank pain": 1, "Gluten sensitivity": 1, "Hallucination": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypotonia": 1, "Immobile": 1, "Influenza": 1, "Investigation": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myelodysplastic syndrome": 1, "Nausea": 1, "Neck pain": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Oral pain": 1, "Pain in jaw": 1, "Paraesthesia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Polymerase chain reaction": 1, "Product use issue": 1, "Pruritus": 1, "Stress cardiomyopathy": 1, "Swelling face": 1, "Thrombosis": 1, "Vitiligo": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0583", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 4, "Chest pain": 3, "Pain": 3, "Asthenia": 2, "Back pain": 2, "Pain in extremity": 2, "Pericarditis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Allergy to vaccine": 1, "Antibody test": 1, "Appetite disorder": 1, "Autoimmune thyroiditis": 1, "Biopsy bone marrow": 1, "Body temperature": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Demyelinating polyneuropathy": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling hot": 1, "Flank pain": 1, "Gluten sensitivity": 1, "Hallucination": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypotonia": 1, "Immobile": 1, "Influenza": 1, "Investigation": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myelodysplastic syndrome": 1, "Nausea": 1, "Neck pain": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Oral pain": 1, "Pain in jaw": 1, "Paraesthesia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Polymerase chain reaction": 1, "Product use issue": 1, "Pruritus": 1, "Stress cardiomyopathy": 1, "Swelling face": 1, "Thrombosis": 1, "Vitiligo": 1}, "batchcodes": ["EY0583"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EY0585.json b/docs/data/histograms/Canada/EY0585.json
index e250c572d65..b72c97e42b5 100644
--- a/docs/data/histograms/Canada/EY0585.json
+++ b/docs/data/histograms/Canada/EY0585.json
@@ -1 +1 @@
-{"batchcode": "EY0585", "histograms": [{"batchcodes": ["EY0585"], "histogram": {"Inappropriate schedule of product administration": 10, "Myocarditis": 9, "Chest pain": 8, "SARS-CoV-2 test": 6, "Fatigue": 4, "Headache": 4, "Pain": 4, "Pericarditis": 4, "Blood test": 3, "Chest discomfort": 3, "Dyspnoea": 3, "Pain in extremity": 3, "Abdominal pain upper": 2, "Investigation": 2, "Musculoskeletal stiffness": 2, "Pleuritic pain": 2, "Pyrexia": 2, "Syncope": 2, "Arthralgia": 1, "Bell's palsy": 1, "Blindness": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "COVID-19": 1, "Cataract congenital": 1, "Chest X-ray": 1, "Chills": 1, "Contusion": 1, "Costochondritis": 1, "Deafness": 1, "Decreased appetite": 1, "Depression": 1, "Disturbance in attention": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysmenorrhoea": 1, "Erythema": 1, "Eye pain": 1, "Gait disturbance": 1, "Haemorrhage": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Inflammation": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Joint dislocation": 1, "Joint swelling": 1, "Livedo reticularis": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Menstrual disorder": 1, "Microphthalmos": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Nausea": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Onychalgia": 1, "Pain assessment": 1, "Palpitations": 1, "Pericardial effusion": 1, "Peroneal nerve palsy": 1, "Persistent foetal circulation": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Psoriasis": 1, "Pulmonary pain": 1, "Rash": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Specialist consultation": 1, "Swelling": 1, "Thrombosis": 1, "Ultrasound abdomen": 1, "Urticaria": 1, "Vertigo": 1, "Visual acuity tests": 1, "Vomiting": 1, "Walking disability": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0585", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 10, "Myocarditis": 9, "Chest pain": 8, "SARS-CoV-2 test": 6, "Fatigue": 4, "Headache": 4, "Pain": 4, "Pericarditis": 4, "Blood test": 3, "Chest discomfort": 3, "Dyspnoea": 3, "Pain in extremity": 3, "Abdominal pain upper": 2, "Investigation": 2, "Musculoskeletal stiffness": 2, "Pleuritic pain": 2, "Pyrexia": 2, "Syncope": 2, "Arthralgia": 1, "Bell's palsy": 1, "Blindness": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "COVID-19": 1, "Cataract congenital": 1, "Chest X-ray": 1, "Chills": 1, "Contusion": 1, "Costochondritis": 1, "Deafness": 1, "Decreased appetite": 1, "Depression": 1, "Disturbance in attention": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysmenorrhoea": 1, "Erythema": 1, "Eye pain": 1, "Gait disturbance": 1, "Haemorrhage": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Inflammation": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Joint dislocation": 1, "Joint swelling": 1, "Livedo reticularis": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Menstrual disorder": 1, "Microphthalmos": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Nausea": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Onychalgia": 1, "Pain assessment": 1, "Palpitations": 1, "Pericardial effusion": 1, "Peroneal nerve palsy": 1, "Persistent foetal circulation": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Psoriasis": 1, "Pulmonary pain": 1, "Rash": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Specialist consultation": 1, "Swelling": 1, "Thrombosis": 1, "Ultrasound abdomen": 1, "Urticaria": 1, "Vertigo": 1, "Visual acuity tests": 1, "Vomiting": 1, "Walking disability": 1}, "batchcodes": ["EY0585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EY0586.json b/docs/data/histograms/Canada/EY0586.json
index f47874dfb2e..ed8377063f0 100644
--- a/docs/data/histograms/Canada/EY0586.json
+++ b/docs/data/histograms/Canada/EY0586.json
@@ -1 +1 @@
-{"batchcode": "EY0586", "histograms": [{"batchcodes": ["EY0586"], "histogram": {"Inappropriate schedule of product administration": 5, "SARS-CoV-2 test": 3, "COVID-19": 2, "Chest pain": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Haemoglobin": 2, "Pericarditis": 2, "Bell's palsy": 1, "Blood chloride": 1, "Blood chloride decreased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Electrocardiogram": 1, "Exercise tolerance decreased": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Haemoglobin decreased": 1, "Heart rate": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Insomnia": 1, "Investigation": 1, "Migraine": 1, "Muscular weakness": 1, "Nausea": 1, "Palpitations": 1, "Postmenopausal haemorrhage": 1, "Pulmonary embolism": 1, "Rash": 1, "Somnolence": 1, "Syncope": 1, "Therapeutic response unexpected": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0586", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 5, "SARS-CoV-2 test": 3, "COVID-19": 2, "Chest pain": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Haemoglobin": 2, "Pericarditis": 2, "Bell's palsy": 1, "Blood chloride": 1, "Blood chloride decreased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Electrocardiogram": 1, "Exercise tolerance decreased": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Haemoglobin decreased": 1, "Heart rate": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Insomnia": 1, "Investigation": 1, "Migraine": 1, "Muscular weakness": 1, "Nausea": 1, "Palpitations": 1, "Postmenopausal haemorrhage": 1, "Pulmonary embolism": 1, "Rash": 1, "Somnolence": 1, "Syncope": 1, "Therapeutic response unexpected": 1}, "batchcodes": ["EY0586"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EY4825.json b/docs/data/histograms/Canada/EY4825.json
index a37e0ee87c5..d903f48c1d9 100644
--- a/docs/data/histograms/Canada/EY4825.json
+++ b/docs/data/histograms/Canada/EY4825.json
@@ -1 +1 @@
-{"batchcode": "EY4825", "histograms": [{"batchcodes": ["EY4825"], "histogram": {"SARS-CoV-2 test": 9, "Fatigue": 7, "Headache": 7, "Pericarditis": 6, "Inappropriate schedule of product administration": 5, "Blood test": 4, "Chest pain": 4, "Dyspnoea": 4, "Myocarditis": 4, "Pain in extremity": 4, "Paraesthesia": 4, "Pyrexia": 4, "Computerised tomogram": 3, "Pericardial effusion": 3, "Alopecia": 2, "Arthralgia": 2, "Asthenia": 2, "COVID-19": 2, "Cardiac flutter": 2, "Chest discomfort": 2, "Drug ineffective": 2, "Electromyogram": 2, "Gait disturbance": 2, "Hypoaesthesia": 2, "Investigation": 2, "Malaise": 2, "Myalgia": 2, "Pain": 2, "Vertigo": 2, "Vomiting": 2, "Weight": 2, "Weight decreased": 2, "Amnesia": 1, "Angioedema": 1, "Antibody test": 1, "Anxiety": 1, "Atelectasis": 1, "Balance disorder": 1, "Bell's palsy": 1, "Biopsy muscle": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Body height": 1, "Body temperature fluctuation": 1, "Bronchial secretion retention": 1, "Bronchitis bacterial": 1, "Burning sensation": 1, "Butterfly rash": 1, "Candida infection": 1, "Cardiovascular evaluation": 1, "Chills": 1, "Cognitive disorder": 1, "Cough": 1, "Cyanosis": 1, "Dandruff": 1, "Depressed level of consciousness": 1, "Depression": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Eating disorder": 1, "Echocardiogram": 1, "Exercise tolerance decreased": 1, "Eye pain": 1, "Feeling abnormal": 1, "Feeling drunk": 1, "Fibromyalgia": 1, "Fungal infection": 1, "Haemarthrosis": 1, "Haemorrhage": 1, "Haemorrhage in pregnancy": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hepatic steatosis": 1, "Herpes virus infection": 1, "Hypereosinophilic syndrome": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypoacusis": 1, "Immune-mediated myositis": 1, "Infection": 1, "Influenza": 1, "Intermenstrual bleeding": 1, "Irritable bowel syndrome": 1, "Laboratory test": 1, "Lethargy": 1, "Livedo reticularis": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Maternal exposure before pregnancy": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental fatigue": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myopericarditis": 1, "Nausea": 1, "Nerve injury": 1, "Neuralgia": 1, "Neurological examination": 1, "Ophthalmological examination": 1, "Oversensing": 1, "Palpitations": 1, "Panic attack": 1, "Panic reaction": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Presyncope": 1, "Pruritus": 1, "Rash papular": 1, "Rash pruritic": 1, "Restlessness": 1, "Rubella antibody test": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Somnolence": 1, "Specialist consultation": 1, "Spinal pain": 1, "Tachycardia": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound pelvis": 1, "Vascular test": 1, "Vestibular migraine": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4825", "histograms": [{"histogram": {"SARS-CoV-2 test": 9, "Fatigue": 7, "Headache": 7, "Pericarditis": 6, "Inappropriate schedule of product administration": 5, "Blood test": 4, "Chest pain": 4, "Dyspnoea": 4, "Myocarditis": 4, "Pain in extremity": 4, "Paraesthesia": 4, "Pyrexia": 4, "Computerised tomogram": 3, "Pericardial effusion": 3, "Alopecia": 2, "Arthralgia": 2, "Asthenia": 2, "COVID-19": 2, "Cardiac flutter": 2, "Chest discomfort": 2, "Drug ineffective": 2, "Electromyogram": 2, "Gait disturbance": 2, "Hypoaesthesia": 2, "Investigation": 2, "Malaise": 2, "Myalgia": 2, "Pain": 2, "Vertigo": 2, "Vomiting": 2, "Weight": 2, "Weight decreased": 2, "Amnesia": 1, "Angioedema": 1, "Antibody test": 1, "Anxiety": 1, "Atelectasis": 1, "Balance disorder": 1, "Bell's palsy": 1, "Biopsy muscle": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Body height": 1, "Body temperature fluctuation": 1, "Bronchial secretion retention": 1, "Bronchitis bacterial": 1, "Burning sensation": 1, "Butterfly rash": 1, "Candida infection": 1, "Cardiovascular evaluation": 1, "Chills": 1, "Cognitive disorder": 1, "Cough": 1, "Cyanosis": 1, "Dandruff": 1, "Depressed level of consciousness": 1, "Depression": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Eating disorder": 1, "Echocardiogram": 1, "Exercise tolerance decreased": 1, "Eye pain": 1, "Feeling abnormal": 1, "Feeling drunk": 1, "Fibromyalgia": 1, "Fungal infection": 1, "Haemarthrosis": 1, "Haemorrhage": 1, "Haemorrhage in pregnancy": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hepatic steatosis": 1, "Herpes virus infection": 1, "Hypereosinophilic syndrome": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypoacusis": 1, "Immune-mediated myositis": 1, "Infection": 1, "Influenza": 1, "Intermenstrual bleeding": 1, "Irritable bowel syndrome": 1, "Laboratory test": 1, "Lethargy": 1, "Livedo reticularis": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Maternal exposure before pregnancy": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental fatigue": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myopericarditis": 1, "Nausea": 1, "Nerve injury": 1, "Neuralgia": 1, "Neurological examination": 1, "Ophthalmological examination": 1, "Oversensing": 1, "Palpitations": 1, "Panic attack": 1, "Panic reaction": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Presyncope": 1, "Pruritus": 1, "Rash papular": 1, "Rash pruritic": 1, "Restlessness": 1, "Rubella antibody test": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Somnolence": 1, "Specialist consultation": 1, "Spinal pain": 1, "Tachycardia": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound pelvis": 1, "Vascular test": 1, "Vestibular migraine": 1, "X-ray": 1}, "batchcodes": ["EY4825"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EYO578.json b/docs/data/histograms/Canada/EYO578.json
index 63e745f9140..295d8f26e7f 100644
--- a/docs/data/histograms/Canada/EYO578.json
+++ b/docs/data/histograms/Canada/EYO578.json
@@ -1 +1 @@
-{"batchcode": "EYO578", "histograms": [{"batchcodes": ["EYO578"], "histogram": {"Abdominal discomfort": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature decreased": 1, "Contusion": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Herpes zoster": 1, "Immune system disorder": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Morbid thoughts": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO578", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature decreased": 1, "Contusion": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Herpes zoster": 1, "Immune system disorder": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Morbid thoughts": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["EYO578"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EYO5780-3.json b/docs/data/histograms/Canada/EYO5780-3.json
index 64318a734a4..f5662500c3f 100644
--- a/docs/data/histograms/Canada/EYO5780-3.json
+++ b/docs/data/histograms/Canada/EYO5780-3.json
@@ -1 +1 @@
-{"batchcode": "EYO5780-3", "histograms": [{"batchcodes": ["EYO5780-3"], "histogram": {"Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO5780-3", "histograms": [{"histogram": {"Thrombosis": 1}, "batchcodes": ["EYO5780-3"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/EYU578.json b/docs/data/histograms/Canada/EYU578.json
index 503e0bb08fe..a6c6b676f78 100644
--- a/docs/data/histograms/Canada/EYU578.json
+++ b/docs/data/histograms/Canada/EYU578.json
@@ -1 +1 @@
-{"batchcode": "EYU578", "histograms": [{"batchcodes": ["EYU578"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Inappropriate schedule of product administration": 1, "Musculoskeletal stiffness": 1}}]}
\ No newline at end of file
+{"batchcode": "EYU578", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Inappropriate schedule of product administration": 1, "Musculoskeletal stiffness": 1}, "batchcodes": ["EYU578"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/F(P OR R)A9094.json b/docs/data/histograms/Canada/F(P OR R)A9094.json
index 1b4e4e09b46..d9ffeefd184 100644
--- a/docs/data/histograms/Canada/F(P OR R)A9094.json
+++ b/docs/data/histograms/Canada/F(P OR R)A9094.json
@@ -1 +1 @@
-{"batchcode": "F(P OR R)A9094", "histograms": [{"batchcodes": ["F(P OR R)A9094"], "histogram": {"Blood test": 1, "Computerised tomogram": 1, "Immune thrombocytopenia": 1, "Platelet count": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "F(P OR R)A9094", "histograms": [{"histogram": {"Blood test": 1, "Computerised tomogram": 1, "Immune thrombocytopenia": 1, "Platelet count": 1, "Syncope": 1}, "batchcodes": ["F(P OR R)A9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/F07204.json b/docs/data/histograms/Canada/F07204.json
index ffc9c90e5e7..47699cf1625 100644
--- a/docs/data/histograms/Canada/F07204.json
+++ b/docs/data/histograms/Canada/F07204.json
@@ -1 +1 @@
-{"batchcode": "F07204", "histograms": [{"batchcodes": ["F07204"], "histogram": {"Back pain": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Muscular weakness": 1, "Ocular hyperaemia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "F07204", "histograms": [{"histogram": {"Back pain": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Muscular weakness": 1, "Ocular hyperaemia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["F07204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/F072204.json b/docs/data/histograms/Canada/F072204.json
index 9adc6228c45..dc7af5514b0 100644
--- a/docs/data/histograms/Canada/F072204.json
+++ b/docs/data/histograms/Canada/F072204.json
@@ -1 +1 @@
-{"batchcode": "F072204", "histograms": [{"batchcodes": ["F072204"], "histogram": {"Cardiovascular examination": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Dry throat": 1, "Dyspnoea": 1, "Fatigue": 1, "Full blood count": 1, "Magnetic resonance imaging": 1, "Muscle spasms": 1, "Myocardial ischaemia": 1, "Night sweats": 1, "Tongue dry": 1, "Tremor": 1, "Treponema test": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "F072204", "histograms": [{"histogram": {"Cardiovascular examination": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Dry throat": 1, "Dyspnoea": 1, "Fatigue": 1, "Full blood count": 1, "Magnetic resonance imaging": 1, "Muscle spasms": 1, "Myocardial ischaemia": 1, "Night sweats": 1, "Tongue dry": 1, "Tremor": 1, "Treponema test": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["F072204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/F2595.json b/docs/data/histograms/Canada/F2595.json
index 26b4b856245..d248bcbbc73 100644
--- a/docs/data/histograms/Canada/F2595.json
+++ b/docs/data/histograms/Canada/F2595.json
@@ -1 +1 @@
-{"batchcode": "F2595", "histograms": [{"batchcodes": ["F2595"], "histogram": {"Angina pectoris": 1, "Chest discomfort": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Illness": 1, "Lung disorder": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "F2595", "histograms": [{"histogram": {"Angina pectoris": 1, "Chest discomfort": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Illness": 1, "Lung disorder": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["F2595"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/F48721.json b/docs/data/histograms/Canada/F48721.json
index ba514b357eb..4be970b75ed 100644
--- a/docs/data/histograms/Canada/F48721.json
+++ b/docs/data/histograms/Canada/F48721.json
@@ -1 +1 @@
-{"batchcode": "F48721", "histograms": [{"batchcodes": ["F48721"], "histogram": {"Back pain": 1, "Dysmenorrhoea": 1, "Heavy menstrual bleeding": 1}}]}
\ No newline at end of file
+{"batchcode": "F48721", "histograms": [{"histogram": {"Back pain": 1, "Dysmenorrhoea": 1, "Heavy menstrual bleeding": 1}, "batchcodes": ["F48721"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/F7208.json b/docs/data/histograms/Canada/F7208.json
index 578ef8dba03..4a35652510a 100644
--- a/docs/data/histograms/Canada/F7208.json
+++ b/docs/data/histograms/Canada/F7208.json
@@ -1 +1 @@
-{"batchcode": "F7208", "histograms": [{"batchcodes": ["F7208"], "histogram": {"Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "F7208", "histograms": [{"histogram": {"Pericarditis": 1}, "batchcodes": ["F7208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA 8721.json b/docs/data/histograms/Canada/FA 8721.json
index 79245d9e783..a617d2e8fef 100644
--- a/docs/data/histograms/Canada/FA 8721.json
+++ b/docs/data/histograms/Canada/FA 8721.json
@@ -1 +1 @@
-{"batchcode": "FA 8721", "histograms": [{"batchcodes": ["FA 8721"], "histogram": {"Angiogram": 1, "Blood test": 1, "Computerised tomogram": 1, "Eye inflammation": 1, "Eye injury": 1, "Eye swelling": 1, "Headache": 1, "Magnetic resonance imaging": 1, "Seasonal allergy": 1, "Vasodilatation": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 8721", "histograms": [{"histogram": {"Angiogram": 1, "Blood test": 1, "Computerised tomogram": 1, "Eye inflammation": 1, "Eye injury": 1, "Eye swelling": 1, "Headache": 1, "Magnetic resonance imaging": 1, "Seasonal allergy": 1, "Vasodilatation": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["FA 8721"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA 9094.json b/docs/data/histograms/Canada/FA 9094.json
index e6496e67770..4ac42e75749 100644
--- a/docs/data/histograms/Canada/FA 9094.json
+++ b/docs/data/histograms/Canada/FA 9094.json
@@ -1 +1 @@
-{"batchcode": "FA 9094", "histograms": [{"batchcodes": ["FA 9094"], "histogram": {"Polymerase chain reaction": 2, "Abdominal distension": 1, "Abdominal pain": 1, "COVID-19": 1, "Crohn's disease": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Flatulence": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 9094", "histograms": [{"histogram": {"Polymerase chain reaction": 2, "Abdominal distension": 1, "Abdominal pain": 1, "COVID-19": 1, "Crohn's disease": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Flatulence": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["FA 9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA 9099.json b/docs/data/histograms/Canada/FA 9099.json
index f5add41809d..2795e1d7a5e 100644
--- a/docs/data/histograms/Canada/FA 9099.json
+++ b/docs/data/histograms/Canada/FA 9099.json
@@ -1 +1 @@
-{"batchcode": "FA 9099", "histograms": [{"batchcodes": ["FA 9099"], "histogram": {"Inappropriate schedule of product administration": 2, "Facial paralysis": 1, "Headache": 1, "Off label use": 1, "Rash macular": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 9099", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Facial paralysis": 1, "Headache": 1, "Off label use": 1, "Rash macular": 1}, "batchcodes": ["FA 9099"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA7201.json b/docs/data/histograms/Canada/FA7201.json
index 9ddf1d01bc4..5c4bbba5d40 100644
--- a/docs/data/histograms/Canada/FA7201.json
+++ b/docs/data/histograms/Canada/FA7201.json
@@ -1 +1 @@
-{"batchcode": "FA7201", "histograms": [{"batchcodes": ["FA7201"], "histogram": {"Chest pain": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7201", "histograms": [{"histogram": {"Chest pain": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FA7201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA8721.json b/docs/data/histograms/Canada/FA8721.json
index 6538ace8bde..5836e2a4e58 100644
--- a/docs/data/histograms/Canada/FA8721.json
+++ b/docs/data/histograms/Canada/FA8721.json
@@ -1 +1 @@
-{"batchcode": "FA8721", "histograms": [{"batchcodes": ["FA8721"], "histogram": {"Chest pain": 23, "Fatigue": 22, "Myocarditis": 22, "Dyspnoea": 18, "SARS-CoV-2 test": 18, "Pericarditis": 16, "Headache": 13, "Nausea": 13, "Dizziness": 11, "Pain": 11, "Arthralgia": 10, "Chest discomfort": 9, "Palpitations": 9, "Blood test": 8, "Paraesthesia": 8, "Pain in extremity": 7, "Pyrexia": 7, "Burning sensation": 6, "Inappropriate schedule of product administration": 6, "Back pain": 5, "Hypoaesthesia": 5, "Vaccination site pain": 5, "Vertigo": 5, "X-ray": 5, "Loss of personal independence in daily activities": 4, "Maternal exposure during pregnancy": 4, "Myalgia": 4, "Ultrasound scan": 4, "Vomiting": 4, "White blood cell count": 4, "Asthenia": 3, "Blood pressure measurement": 3, "Breast pain": 3, "Chills": 3, "Computerised tomogram": 3, "Diarrhoea": 3, "Dyspnoea exertional": 3, "Dysstasia": 3, "Feeling abnormal": 3, "Head discomfort": 3, "Heart rate increased": 3, "Heavy menstrual bleeding": 3, "Hyperhidrosis": 3, "Hypertension": 3, "Investigation": 3, "Limb discomfort": 3, "Lymphadenopathy": 3, "Magnetic resonance imaging": 3, "Myopericarditis": 3, "Neck pain": 3, "Neutrophil count": 3, "Off label use": 3, "Pericardial effusion": 3, "Platelet count": 3, "Syncope": 3, "Thrombosis": 3, "Tinnitus": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Alopecia": 2, "Blood glucose": 2, "Blood pressure diastolic": 2, "COVID-19": 2, "Cardiac flutter": 2, "Cough": 2, "Crying": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Dysmenorrhoea": 2, "Electric shock sensation": 2, "Erythema": 2, "Feeling hot": 2, "Full blood count": 2, "Gait disturbance": 2, "Gait inability": 2, "Hypoglycaemia": 2, "Hypokinesia": 2, "Hypopnoea": 2, "Impaired quality of life": 2, "Insomnia": 2, "Lymph node pain": 2, "Menstrual disorder": 2, "Monocyte count": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Myocardial infarction": 2, "Oropharyngeal pain": 2, "Painful respiration": 2, "Peripheral swelling": 2, "Pleuritic pain": 2, "Rash": 2, "Sinus tachycardia": 2, "Sleep disorder": 2, "Tachycardia": 2, "Visual impairment": 2, "Weight": 2, "Weight decreased": 2, "White blood cell count decreased": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Anger": 1, "Anion gap": 1, "Anti-platelet antibody": 1, "Antibody test": 1, "Anxiety": 1, "Apgar score": 1, "Aplastic anaemia": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Balance disorder": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood urea": 1, "Breast inflammation": 1, "Bronchitis": 1, "Calculus urinary": 1, "Carbon dioxide": 1, "Cardiac disorder": 1, "Cardiac tamponade": 1, "Cardiomegaly": 1, "Cognitive disorder": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram pelvis": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Confusional state": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Diastolic hypertension": 1, "Disease progression": 1, "Disease recurrence": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dupuytren's contracture": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ecchymosis": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electromyogram": 1, "Eosinophil count": 1, "Extrasystoles": 1, "Face oedema": 1, "Facial pain": 1, "Fall": 1, "Feeding disorder": 1, "Flushing": 1, "Gastrointestinal inflammation": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Head circumference": 1, "Heart rate abnormal": 1, "Hemiparesis": 1, "Human chorionic gonadotropin normal": 1, "Hyperventilation": 1, "Hypoglycaemia neonatal": 1, "Hypothermia neonatal": 1, "Immature granulocyte count": 1, "Infantile apnoea": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Ischaemic stroke": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Kidney infection": 1, "Left ventricular dilatation": 1, "Left ventricular dysfunction": 1, "Length at birth": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymphocyte count": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Meconium aspiration syndrome": 1, "Meconium in amniotic fluid": 1, "Menstruation irregular": 1, "Migraine": 1, "Miosis": 1, "Mitral valve incompetence": 1, "Monocyte count increased": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Myocardial oedema": 1, "Neonatal respiratory distress": 1, "Nephrolithiasis": 1, "Nervousness": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neutropenia": 1, "Neutrophil count decreased": 1, "Night sweats": 1, "Nucleated red cells": 1, "Otitis externa": 1, "Pain of skin": 1, "Pallor": 1, "Pancytopenia": 1, "Panic reaction": 1, "Paralysis": 1, "Petechiae": 1, "Pharyngitis": 1, "Physical examination": 1, "Platelet disorder": 1, "Poor quality sleep": 1, "Post-acute COVID-19 syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Premenstrual syndrome": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product use issue": 1, "Prolonged pregnancy": 1, "Pruritus": 1, "Purpura": 1, "Rash macular": 1, "Red blood cell analysis normal": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Rubella antibody test": 1, "Scoliosis": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sinus bradycardia": 1, "Sitting disability": 1, "Skin exfoliation": 1, "Spinal osteoarthritis": 1, "Splenomegaly": 1, "Spondylitis": 1, "Sputum abnormal": 1, "Stool analysis": 1, "Streptococcal urinary tract infection": 1, "Suicidal ideation": 1, "Swelling": 1, "Swollen tongue": 1, "Systemic lupus erythematosus": 1, "Tremor": 1, "Trisomy 21": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "Ultrasound breast": 1, "Urticaria": 1, "Uterine leiomyoma": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Walking disability": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FA8721", "histograms": [{"histogram": {"Chest pain": 23, "Fatigue": 22, "Myocarditis": 22, "Dyspnoea": 18, "SARS-CoV-2 test": 18, "Pericarditis": 16, "Headache": 13, "Nausea": 13, "Dizziness": 11, "Pain": 11, "Arthralgia": 10, "Chest discomfort": 9, "Palpitations": 9, "Blood test": 8, "Paraesthesia": 8, "Pain in extremity": 7, "Pyrexia": 7, "Burning sensation": 6, "Inappropriate schedule of product administration": 6, "Back pain": 5, "Hypoaesthesia": 5, "Vaccination site pain": 5, "Vertigo": 5, "X-ray": 5, "Loss of personal independence in daily activities": 4, "Maternal exposure during pregnancy": 4, "Myalgia": 4, "Ultrasound scan": 4, "Vomiting": 4, "White blood cell count": 4, "Asthenia": 3, "Blood pressure measurement": 3, "Breast pain": 3, "Chills": 3, "Computerised tomogram": 3, "Diarrhoea": 3, "Dyspnoea exertional": 3, "Dysstasia": 3, "Feeling abnormal": 3, "Head discomfort": 3, "Heart rate increased": 3, "Heavy menstrual bleeding": 3, "Hyperhidrosis": 3, "Hypertension": 3, "Investigation": 3, "Limb discomfort": 3, "Lymphadenopathy": 3, "Magnetic resonance imaging": 3, "Myopericarditis": 3, "Neck pain": 3, "Neutrophil count": 3, "Off label use": 3, "Pericardial effusion": 3, "Platelet count": 3, "Syncope": 3, "Thrombosis": 3, "Tinnitus": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Alopecia": 2, "Blood glucose": 2, "Blood pressure diastolic": 2, "COVID-19": 2, "Cardiac flutter": 2, "Cough": 2, "Crying": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Dysmenorrhoea": 2, "Electric shock sensation": 2, "Erythema": 2, "Feeling hot": 2, "Full blood count": 2, "Gait disturbance": 2, "Gait inability": 2, "Hypoglycaemia": 2, "Hypokinesia": 2, "Hypopnoea": 2, "Impaired quality of life": 2, "Insomnia": 2, "Lymph node pain": 2, "Menstrual disorder": 2, "Monocyte count": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Myocardial infarction": 2, "Oropharyngeal pain": 2, "Painful respiration": 2, "Peripheral swelling": 2, "Pleuritic pain": 2, "Rash": 2, "Sinus tachycardia": 2, "Sleep disorder": 2, "Tachycardia": 2, "Visual impairment": 2, "Weight": 2, "Weight decreased": 2, "White blood cell count decreased": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Anger": 1, "Anion gap": 1, "Anti-platelet antibody": 1, "Antibody test": 1, "Anxiety": 1, "Apgar score": 1, "Aplastic anaemia": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Balance disorder": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood urea": 1, "Breast inflammation": 1, "Bronchitis": 1, "Calculus urinary": 1, "Carbon dioxide": 1, "Cardiac disorder": 1, "Cardiac tamponade": 1, "Cardiomegaly": 1, "Cognitive disorder": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram pelvis": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Confusional state": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Diastolic hypertension": 1, "Disease progression": 1, "Disease recurrence": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dupuytren's contracture": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ecchymosis": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electromyogram": 1, "Eosinophil count": 1, "Extrasystoles": 1, "Face oedema": 1, "Facial pain": 1, "Fall": 1, "Feeding disorder": 1, "Flushing": 1, "Gastrointestinal inflammation": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Head circumference": 1, "Heart rate abnormal": 1, "Hemiparesis": 1, "Human chorionic gonadotropin normal": 1, "Hyperventilation": 1, "Hypoglycaemia neonatal": 1, "Hypothermia neonatal": 1, "Immature granulocyte count": 1, "Infantile apnoea": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Ischaemic stroke": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Kidney infection": 1, "Left ventricular dilatation": 1, "Left ventricular dysfunction": 1, "Length at birth": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymphocyte count": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Meconium aspiration syndrome": 1, "Meconium in amniotic fluid": 1, "Menstruation irregular": 1, "Migraine": 1, "Miosis": 1, "Mitral valve incompetence": 1, "Monocyte count increased": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Myocardial oedema": 1, "Neonatal respiratory distress": 1, "Nephrolithiasis": 1, "Nervousness": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neutropenia": 1, "Neutrophil count decreased": 1, "Night sweats": 1, "Nucleated red cells": 1, "Otitis externa": 1, "Pain of skin": 1, "Pallor": 1, "Pancytopenia": 1, "Panic reaction": 1, "Paralysis": 1, "Petechiae": 1, "Pharyngitis": 1, "Physical examination": 1, "Platelet disorder": 1, "Poor quality sleep": 1, "Post-acute COVID-19 syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Premenstrual syndrome": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product use issue": 1, "Prolonged pregnancy": 1, "Pruritus": 1, "Purpura": 1, "Rash macular": 1, "Red blood cell analysis normal": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Rubella antibody test": 1, "Scoliosis": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sinus bradycardia": 1, "Sitting disability": 1, "Skin exfoliation": 1, "Spinal osteoarthritis": 1, "Splenomegaly": 1, "Spondylitis": 1, "Sputum abnormal": 1, "Stool analysis": 1, "Streptococcal urinary tract infection": 1, "Suicidal ideation": 1, "Swelling": 1, "Swollen tongue": 1, "Systemic lupus erythematosus": 1, "Tremor": 1, "Trisomy 21": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "Ultrasound breast": 1, "Urticaria": 1, "Uterine leiomyoma": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Walking disability": 1, "White blood cell count increased": 1}, "batchcodes": ["FA8721"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9089.json b/docs/data/histograms/Canada/FA9089.json
index 7bf18357c2d..821078af96b 100644
--- a/docs/data/histograms/Canada/FA9089.json
+++ b/docs/data/histograms/Canada/FA9089.json
@@ -1 +1 @@
-{"batchcode": "FA9089", "histograms": [{"batchcodes": ["FA9089"], "histogram": {"Aphonia": 1, "Balance disorder": 1, "Chest pain": 1, "Cough": 1, "Deafness bilateral": 1, "Dyspnoea": 1, "Fatigue": 1, "Head discomfort": 1, "Incorrect dose administered": 1, "Insomnia": 1, "Myalgia": 1, "Overdose": 1, "Paranasal sinus discomfort": 1, "Pharyngeal swelling": 1, "SARS-CoV-2 test": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9089", "histograms": [{"histogram": {"Aphonia": 1, "Balance disorder": 1, "Chest pain": 1, "Cough": 1, "Deafness bilateral": 1, "Dyspnoea": 1, "Fatigue": 1, "Head discomfort": 1, "Incorrect dose administered": 1, "Insomnia": 1, "Myalgia": 1, "Overdose": 1, "Paranasal sinus discomfort": 1, "Pharyngeal swelling": 1, "SARS-CoV-2 test": 1, "Vertigo": 1}, "batchcodes": ["FA9089"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9090.json b/docs/data/histograms/Canada/FA9090.json
index 5927a14deb7..8053509ccad 100644
--- a/docs/data/histograms/Canada/FA9090.json
+++ b/docs/data/histograms/Canada/FA9090.json
@@ -1 +1 @@
-{"batchcode": "FA9090", "histograms": [{"batchcodes": ["FA9090"], "histogram": {"Alopecia areata": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9090", "histograms": [{"histogram": {"Alopecia areata": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1}, "batchcodes": ["FA9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9091.json b/docs/data/histograms/Canada/FA9091.json
index 951a64ada6c..0e26cbe431f 100644
--- a/docs/data/histograms/Canada/FA9091.json
+++ b/docs/data/histograms/Canada/FA9091.json
@@ -1 +1 @@
-{"batchcode": "FA9091", "histograms": [{"batchcodes": ["FA9091"], "histogram": {"Chest pain": 46, "Inappropriate schedule of product administration": 39, "Pericarditis": 38, "Fatigue": 30, "Myocarditis": 29, "SARS-CoV-2 test": 27, "Dyspnoea": 24, "Headache": 20, "Pyrexia": 18, "Blood test": 14, "Chest discomfort": 11, "Arthralgia": 10, "Pain": 10, "Dizziness": 9, "Drug ineffective": 9, "Pain in extremity": 9, "COVID-19": 8, "Chills": 8, "Nausea": 7, "Oropharyngeal pain": 7, "Peripheral swelling": 7, "Vaccination site pain": 7, "Electrocardiogram": 6, "Myalgia": 6, "Palpitations": 6, "Asthenia": 5, "Lymphadenopathy": 5, "Muscle spasms": 5, "Pleuritic pain": 5, "Pruritus": 5, "Ultrasound scan": 5, "Vomiting": 5, "Blood pressure measurement": 4, "Cough": 4, "Insomnia": 4, "Malaise": 4, "Paraesthesia": 4, "Swelling face": 4, "Tachycardia": 4, "X-ray": 4, "Anaphylactic reaction": 3, "Atrial fibrillation": 3, "Back pain": 3, "Burning sensation": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Discomfort": 3, "Dysmenorrhoea": 3, "Feeling abnormal": 3, "Heavy menstrual bleeding": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Loss of personal independence in daily activities": 3, "Myopericarditis": 3, "Pericardial effusion": 3, "Rash": 3, "Urticaria": 3, "Vertigo": 3, "Allergy test": 2, "Alopecia": 2, "Angina pectoris": 2, "Atelectasis": 2, "Bell's palsy": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "Cold sweat": 2, "Condition aggravated": 2, "Confusional state": 2, "Dysgeusia": 2, "Dysphonia": 2, "Echocardiogram": 2, "Epistaxis": 2, "Erythema": 2, "Gait disturbance": 2, "Hypersomnia": 2, "Hypotension": 2, "Impaired work ability": 2, "Influenza like illness": 2, "Investigation": 2, "Joint swelling": 2, "Magnetic resonance imaging": 2, "Menstruation delayed": 2, "Menstruation irregular": 2, "Migraine": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Product administered to patient of inappropriate age": 2, "Rash erythematous": 2, "SARS-CoV-2 antibody test": 2, "Sinus bradycardia": 2, "Thrombosis": 2, "Vaccination site haemorrhage": 2, "Weight": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Antibody test": 1, "Arthritis": 1, "Autoimmune thyroiditis": 1, "Axillary mass": 1, "Biopsy": 1, "Blindness unilateral": 1, "Blood pressure fluctuation": 1, "Blood test abnormal": 1, "Body height": 1, "Body temperature": 1, "Body temperature decreased": 1, "Bradycardia": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest scan": 1, "Chromaturia": 1, "Coronary artery stenosis": 1, "Deafness": 1, "Dermatitis": 1, "Diabetes mellitus": 1, "Diffuse alopecia": 1, "Diplopia": 1, "Drooling": 1, "Dry eye": 1, "Dry skin": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Ear, nose and throat examination": 1, "Echocardiogram normal": 1, "Eczema": 1, "Electric shock sensation": 1, "Electrocardiogram ST segment elevation": 1, "Electroencephalogram": 1, "Emotional disorder": 1, "Erection increased": 1, "Exposure during pregnancy": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Fall": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Flushing": 1, "Food allergy": 1, "Formication": 1, "Gingival bleeding": 1, "Haematoma": 1, "Haemorrhage": 1, "Hallucination": 1, "Head discomfort": 1, "Hemiparesis": 1, "Herpes zoster": 1, "Hormone level abnormal": 1, "Hyperacusis": 1, "Hypertension": 1, "Illness": 1, "Increased appetite": 1, "Irritability": 1, "Leukocytosis": 1, "Libido decreased": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of control of legs": 1, "Lung disorder": 1, "Lymphopenia": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mental fatigue": 1, "Mental impairment": 1, "Middle insomnia": 1, "Monocytosis": 1, "Monoplegia": 1, "Mouth swelling": 1, "Movement disorder": 1, "Muscle tension dysphonia": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myasthenia gravis": 1, "Nasal congestion": 1, "Neck mass": 1, "Neck pain": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Odynophagia": 1, "Orthopnoea": 1, "Painful respiration": 1, "Pericardial rub": 1, "Peripheral coldness": 1, "Pleural effusion": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Presyncope": 1, "Prolonged labour": 1, "Psoriasis": 1, "Pulmonary congestion": 1, "Pulmonary sarcoidosis": 1, "Rash pruritic": 1, "Rectal haemorrhage": 1, "Retinal tear": 1, "Right ventricular diastolic collapse": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Scan": 1, "Scrotal disorder": 1, "Skin exfoliation": 1, "Skin lesion": 1, "Sleep disorder": 1, "Somnolence": 1, "Stool analysis": 1, "Stress": 1, "Sudden hearing loss": 1, "Suicidal ideation": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swollen tongue": 1, "Syncope": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Urine analysis": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Ventricular extrasystoles": 1, "Viral pericarditis": 1, "Vision blurred": 1, "Vocal cord disorder": 1, "Vocal cord paralysis": 1, "Water loading test": 1, "Weight decreased": 1, "X-ray treatment": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9091", "histograms": [{"histogram": {"Chest pain": 46, "Inappropriate schedule of product administration": 39, "Pericarditis": 38, "Fatigue": 30, "Myocarditis": 29, "SARS-CoV-2 test": 27, "Dyspnoea": 24, "Headache": 20, "Pyrexia": 18, "Blood test": 14, "Chest discomfort": 11, "Arthralgia": 10, "Pain": 10, "Dizziness": 9, "Drug ineffective": 9, "Pain in extremity": 9, "COVID-19": 8, "Chills": 8, "Nausea": 7, "Oropharyngeal pain": 7, "Peripheral swelling": 7, "Vaccination site pain": 7, "Electrocardiogram": 6, "Myalgia": 6, "Palpitations": 6, "Asthenia": 5, "Lymphadenopathy": 5, "Muscle spasms": 5, "Pleuritic pain": 5, "Pruritus": 5, "Ultrasound scan": 5, "Vomiting": 5, "Blood pressure measurement": 4, "Cough": 4, "Insomnia": 4, "Malaise": 4, "Paraesthesia": 4, "Swelling face": 4, "Tachycardia": 4, "X-ray": 4, "Anaphylactic reaction": 3, "Atrial fibrillation": 3, "Back pain": 3, "Burning sensation": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Discomfort": 3, "Dysmenorrhoea": 3, "Feeling abnormal": 3, "Heavy menstrual bleeding": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Loss of personal independence in daily activities": 3, "Myopericarditis": 3, "Pericardial effusion": 3, "Rash": 3, "Urticaria": 3, "Vertigo": 3, "Allergy test": 2, "Alopecia": 2, "Angina pectoris": 2, "Atelectasis": 2, "Bell's palsy": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "Cold sweat": 2, "Condition aggravated": 2, "Confusional state": 2, "Dysgeusia": 2, "Dysphonia": 2, "Echocardiogram": 2, "Epistaxis": 2, "Erythema": 2, "Gait disturbance": 2, "Hypersomnia": 2, "Hypotension": 2, "Impaired work ability": 2, "Influenza like illness": 2, "Investigation": 2, "Joint swelling": 2, "Magnetic resonance imaging": 2, "Menstruation delayed": 2, "Menstruation irregular": 2, "Migraine": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Product administered to patient of inappropriate age": 2, "Rash erythematous": 2, "SARS-CoV-2 antibody test": 2, "Sinus bradycardia": 2, "Thrombosis": 2, "Vaccination site haemorrhage": 2, "Weight": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Antibody test": 1, "Arthritis": 1, "Autoimmune thyroiditis": 1, "Axillary mass": 1, "Biopsy": 1, "Blindness unilateral": 1, "Blood pressure fluctuation": 1, "Blood test abnormal": 1, "Body height": 1, "Body temperature": 1, "Body temperature decreased": 1, "Bradycardia": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest scan": 1, "Chromaturia": 1, "Coronary artery stenosis": 1, "Deafness": 1, "Dermatitis": 1, "Diabetes mellitus": 1, "Diffuse alopecia": 1, "Diplopia": 1, "Drooling": 1, "Dry eye": 1, "Dry skin": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Ear, nose and throat examination": 1, "Echocardiogram normal": 1, "Eczema": 1, "Electric shock sensation": 1, "Electrocardiogram ST segment elevation": 1, "Electroencephalogram": 1, "Emotional disorder": 1, "Erection increased": 1, "Exposure during pregnancy": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Fall": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Flushing": 1, "Food allergy": 1, "Formication": 1, "Gingival bleeding": 1, "Haematoma": 1, "Haemorrhage": 1, "Hallucination": 1, "Head discomfort": 1, "Hemiparesis": 1, "Herpes zoster": 1, "Hormone level abnormal": 1, "Hyperacusis": 1, "Hypertension": 1, "Illness": 1, "Increased appetite": 1, "Irritability": 1, "Leukocytosis": 1, "Libido decreased": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of control of legs": 1, "Lung disorder": 1, "Lymphopenia": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mental fatigue": 1, "Mental impairment": 1, "Middle insomnia": 1, "Monocytosis": 1, "Monoplegia": 1, "Mouth swelling": 1, "Movement disorder": 1, "Muscle tension dysphonia": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myasthenia gravis": 1, "Nasal congestion": 1, "Neck mass": 1, "Neck pain": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Odynophagia": 1, "Orthopnoea": 1, "Painful respiration": 1, "Pericardial rub": 1, "Peripheral coldness": 1, "Pleural effusion": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Presyncope": 1, "Prolonged labour": 1, "Psoriasis": 1, "Pulmonary congestion": 1, "Pulmonary sarcoidosis": 1, "Rash pruritic": 1, "Rectal haemorrhage": 1, "Retinal tear": 1, "Right ventricular diastolic collapse": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Scan": 1, "Scrotal disorder": 1, "Skin exfoliation": 1, "Skin lesion": 1, "Sleep disorder": 1, "Somnolence": 1, "Stool analysis": 1, "Stress": 1, "Sudden hearing loss": 1, "Suicidal ideation": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swollen tongue": 1, "Syncope": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Urine analysis": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Ventricular extrasystoles": 1, "Viral pericarditis": 1, "Vision blurred": 1, "Vocal cord disorder": 1, "Vocal cord paralysis": 1, "Water loading test": 1, "Weight decreased": 1, "X-ray treatment": 1}, "batchcodes": ["FA9091"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9093.json b/docs/data/histograms/Canada/FA9093.json
index 980af15a12f..40353952cee 100644
--- a/docs/data/histograms/Canada/FA9093.json
+++ b/docs/data/histograms/Canada/FA9093.json
@@ -1 +1 @@
-{"batchcode": "FA9093", "histograms": [{"batchcodes": ["FA9093"], "histogram": {"Inappropriate schedule of product administration": 19, "Myocarditis": 16, "Chest pain": 13, "Dyspnoea": 8, "Blood test": 7, "Chest discomfort": 7, "SARS-CoV-2 test": 7, "Pericarditis": 6, "Arthralgia": 5, "Hypoaesthesia": 5, "Pyrexia": 5, "Vomiting": 5, "Dizziness": 4, "Fatigue": 4, "Feeling abnormal": 4, "Pain": 4, "Pain in extremity": 4, "Rash": 4, "Burning sensation": 3, "Chills": 3, "Computerised tomogram": 3, "Drug ineffective": 3, "Headache": 3, "Myalgia": 3, "Nausea": 3, "Palpitations": 3, "Pericardial effusion": 3, "Polymerase chain reaction": 3, "Asthenia": 2, "Biopsy": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Deafness unilateral": 2, "Eye swelling": 2, "Feeling cold": 2, "Gait disturbance": 2, "Heavy menstrual bleeding": 2, "Lip swelling": 2, "Malaise": 2, "Mental impairment": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Pleuritic pain": 2, "Rash pruritic": 2, "Skin burning sensation": 2, "Sluggishness": 2, "Swelling face": 2, "Syncope": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vaccination site rash": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Acute myocardial infarction": 1, "Allergy test": 1, "Angina pectoris": 1, "Angiogram": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blindness": 1, "Blood pressure increased": 1, "Breast haemorrhage": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardiac tamponade": 1, "Cellulitis": 1, "Cheilitis": 1, "Choking sensation": 1, "Coeliac artery compression syndrome": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Coronary artery dissection": 1, "Cough": 1, "Deafness": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dyschromatopsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear pain": 1, "Early repolarisation syndrome": 1, "Eczema": 1, "Erythema": 1, "Feeling hot": 1, "Fibromuscular dysplasia": 1, "Foetal growth abnormality": 1, "Guillain-Barre syndrome": 1, "Hepatic pain": 1, "Hip fracture": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Increased upper airway secretion": 1, "Influenza like illness": 1, "Intraocular pressure test": 1, "Investigation": 1, "Joint noise": 1, "Labyrinthitis": 1, "Lip dry": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menometrorrhagia": 1, "Menstruation delayed": 1, "Menstruation irregular": 1, "Migraine": 1, "Migraine with aura": 1, "Mitral valve incompetence": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle tightness": 1, "Myopericarditis": 1, "Neck pain": 1, "Ophthalmic herpes zoster": 1, "Oral discomfort": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain of skin": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Platelet count": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Pregnancy test": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Respiration abnormal": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "Shock": 1, "Sinus tachycardia": 1, "Sleep disorder": 1, "Stomatitis": 1, "Stress": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Throat irritation": 1, "Thrombosis": 1, "Tinnitus": 1, "Trigeminal neuralgia": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9093", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 19, "Myocarditis": 16, "Chest pain": 13, "Dyspnoea": 8, "Blood test": 7, "Chest discomfort": 7, "SARS-CoV-2 test": 7, "Pericarditis": 6, "Arthralgia": 5, "Hypoaesthesia": 5, "Pyrexia": 5, "Vomiting": 5, "Dizziness": 4, "Fatigue": 4, "Feeling abnormal": 4, "Pain": 4, "Pain in extremity": 4, "Rash": 4, "Burning sensation": 3, "Chills": 3, "Computerised tomogram": 3, "Drug ineffective": 3, "Headache": 3, "Myalgia": 3, "Nausea": 3, "Palpitations": 3, "Pericardial effusion": 3, "Polymerase chain reaction": 3, "Asthenia": 2, "Biopsy": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Deafness unilateral": 2, "Eye swelling": 2, "Feeling cold": 2, "Gait disturbance": 2, "Heavy menstrual bleeding": 2, "Lip swelling": 2, "Malaise": 2, "Mental impairment": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Pleuritic pain": 2, "Rash pruritic": 2, "Skin burning sensation": 2, "Sluggishness": 2, "Swelling face": 2, "Syncope": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vaccination site rash": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Acute myocardial infarction": 1, "Allergy test": 1, "Angina pectoris": 1, "Angiogram": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blindness": 1, "Blood pressure increased": 1, "Breast haemorrhage": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardiac tamponade": 1, "Cellulitis": 1, "Cheilitis": 1, "Choking sensation": 1, "Coeliac artery compression syndrome": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Coronary artery dissection": 1, "Cough": 1, "Deafness": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dyschromatopsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear pain": 1, "Early repolarisation syndrome": 1, "Eczema": 1, "Erythema": 1, "Feeling hot": 1, "Fibromuscular dysplasia": 1, "Foetal growth abnormality": 1, "Guillain-Barre syndrome": 1, "Hepatic pain": 1, "Hip fracture": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Increased upper airway secretion": 1, "Influenza like illness": 1, "Intraocular pressure test": 1, "Investigation": 1, "Joint noise": 1, "Labyrinthitis": 1, "Lip dry": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menometrorrhagia": 1, "Menstruation delayed": 1, "Menstruation irregular": 1, "Migraine": 1, "Migraine with aura": 1, "Mitral valve incompetence": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle tightness": 1, "Myopericarditis": 1, "Neck pain": 1, "Ophthalmic herpes zoster": 1, "Oral discomfort": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain of skin": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Platelet count": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Pregnancy test": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Respiration abnormal": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "Shock": 1, "Sinus tachycardia": 1, "Sleep disorder": 1, "Stomatitis": 1, "Stress": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Throat irritation": 1, "Thrombosis": 1, "Tinnitus": 1, "Trigeminal neuralgia": 1, "Vaccination site pruritus": 1}, "batchcodes": ["FA9093"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9094.json b/docs/data/histograms/Canada/FA9094.json
index 79eb4e93714..f5f03719ca3 100644
--- a/docs/data/histograms/Canada/FA9094.json
+++ b/docs/data/histograms/Canada/FA9094.json
@@ -1 +1 @@
-{"batchcode": "FA9094", "histograms": [{"batchcodes": ["FA9094"], "histogram": {"Chest pain": 24, "Inappropriate schedule of product administration": 18, "Pericarditis": 18, "Dyspnoea": 15, "Myocarditis": 15, "Headache": 13, "Fatigue": 12, "SARS-CoV-2 test": 12, "Pyrexia": 9, "Blood test": 6, "Malaise": 6, "Myopericarditis": 6, "Nausea": 6, "Pain": 6, "Palpitations": 6, "Chest discomfort": 5, "Chills": 5, "Dizziness": 5, "Asthenia": 4, "Blood pressure measurement": 4, "Heavy menstrual bleeding": 4, "Pericardial effusion": 4, "Tachycardia": 4, "Vomiting": 4, "Computerised tomogram": 3, "Cough": 3, "Electrocardiogram": 3, "Heart rate": 3, "Hyperhidrosis": 3, "Investigation": 3, "Lethargy": 3, "Loss of personal independence in daily activities": 3, "Off label use": 3, "Abdominal pain": 2, "Abdominal pain upper": 2, "Antibody test": 2, "Arthralgia": 2, "Back pain": 2, "Bell's palsy": 2, "COVID-19": 2, "Discomfort": 2, "Drug ineffective": 2, "Dysmenorrhoea": 2, "Echocardiogram": 2, "Eye pain": 2, "Haemoglobin": 2, "Hypotension": 2, "Insomnia": 2, "Magnetic resonance imaging": 2, "Myalgia": 2, "Neck pain": 2, "Platelet count": 2, "Pruritus": 2, "Rash": 2, "Tinnitus": 2, "White blood cell count": 2, "Anaphylactic shock": 1, "Anion gap": 1, "Appendicitis": 1, "Atrial fibrillation": 1, "Basophil count": 1, "Blister": 1, "Blood chloride": 1, "Blood creatine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urine present": 1, "Body height": 1, "Body surface area": 1, "Body temperature": 1, "Bone pain": 1, "Bundle branch block right": 1, "Bursitis": 1, "Carbon dioxide": 1, "Cardiac arrest": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Cerebral thrombosis": 1, "Colonoscopy": 1, "Condition aggravated": 1, "Confusional state": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Diplopia": 1, "Disease recurrence": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Ear pain": 1, "Eating disorder": 1, "Eosinophil count": 1, "Erythema": 1, "Eyelid pain": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Granulocyte count": 1, "Haematocrit": 1, "Haemoglobin decreased": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "Immunodeficiency": 1, "Injection site nerve damage": 1, "Joint swelling": 1, "Lower respiratory tract infection": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Mantle cell lymphoma": 1, "Maternal exposure before pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Menstruation irregular": 1, "Migraine": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Musculoskeletal discomfort": 1, "Myopathy": 1, "Neutrophil count normal": 1, "Night sweats": 1, "Nightmare": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Pallor": 1, "Panic attack": 1, "Paraesthesia": 1, "Photophobia": 1, "Platelet count decreased": 1, "Platelet count increased": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Product use issue": 1, "Pulmonary embolism": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Seizure": 1, "Sinus arrhythmia": 1, "Smear cervix": 1, "Tachypnoea": 1, "Thrombotic thrombocytopenic purpura": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urticaria": 1, "Uterine haemorrhage": 1, "Ventricular fibrillation": 1, "Weight": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9094", "histograms": [{"histogram": {"Chest pain": 24, "Inappropriate schedule of product administration": 18, "Pericarditis": 18, "Dyspnoea": 15, "Myocarditis": 15, "Headache": 13, "Fatigue": 12, "SARS-CoV-2 test": 12, "Pyrexia": 9, "Blood test": 6, "Malaise": 6, "Myopericarditis": 6, "Nausea": 6, "Pain": 6, "Palpitations": 6, "Chest discomfort": 5, "Chills": 5, "Dizziness": 5, "Asthenia": 4, "Blood pressure measurement": 4, "Heavy menstrual bleeding": 4, "Pericardial effusion": 4, "Tachycardia": 4, "Vomiting": 4, "Computerised tomogram": 3, "Cough": 3, "Electrocardiogram": 3, "Heart rate": 3, "Hyperhidrosis": 3, "Investigation": 3, "Lethargy": 3, "Loss of personal independence in daily activities": 3, "Off label use": 3, "Abdominal pain": 2, "Abdominal pain upper": 2, "Antibody test": 2, "Arthralgia": 2, "Back pain": 2, "Bell's palsy": 2, "COVID-19": 2, "Discomfort": 2, "Drug ineffective": 2, "Dysmenorrhoea": 2, "Echocardiogram": 2, "Eye pain": 2, "Haemoglobin": 2, "Hypotension": 2, "Insomnia": 2, "Magnetic resonance imaging": 2, "Myalgia": 2, "Neck pain": 2, "Platelet count": 2, "Pruritus": 2, "Rash": 2, "Tinnitus": 2, "White blood cell count": 2, "Anaphylactic shock": 1, "Anion gap": 1, "Appendicitis": 1, "Atrial fibrillation": 1, "Basophil count": 1, "Blister": 1, "Blood chloride": 1, "Blood creatine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urine present": 1, "Body height": 1, "Body surface area": 1, "Body temperature": 1, "Bone pain": 1, "Bundle branch block right": 1, "Bursitis": 1, "Carbon dioxide": 1, "Cardiac arrest": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Cerebral thrombosis": 1, "Colonoscopy": 1, "Condition aggravated": 1, "Confusional state": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Diplopia": 1, "Disease recurrence": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Ear pain": 1, "Eating disorder": 1, "Eosinophil count": 1, "Erythema": 1, "Eyelid pain": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Granulocyte count": 1, "Haematocrit": 1, "Haemoglobin decreased": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "Immunodeficiency": 1, "Injection site nerve damage": 1, "Joint swelling": 1, "Lower respiratory tract infection": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Mantle cell lymphoma": 1, "Maternal exposure before pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Menstruation irregular": 1, "Migraine": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Musculoskeletal discomfort": 1, "Myopathy": 1, "Neutrophil count normal": 1, "Night sweats": 1, "Nightmare": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Pallor": 1, "Panic attack": 1, "Paraesthesia": 1, "Photophobia": 1, "Platelet count decreased": 1, "Platelet count increased": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Product use issue": 1, "Pulmonary embolism": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Seizure": 1, "Sinus arrhythmia": 1, "Smear cervix": 1, "Tachypnoea": 1, "Thrombotic thrombocytopenic purpura": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urticaria": 1, "Uterine haemorrhage": 1, "Ventricular fibrillation": 1, "Weight": 1, "X-ray": 1}, "batchcodes": ["FA9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9095.json b/docs/data/histograms/Canada/FA9095.json
index 1132788fda9..0dc13dca884 100644
--- a/docs/data/histograms/Canada/FA9095.json
+++ b/docs/data/histograms/Canada/FA9095.json
@@ -1 +1 @@
-{"batchcode": "FA9095", "histograms": [{"batchcodes": ["FA9095"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9095", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["FA9095"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9099-CC02.json b/docs/data/histograms/Canada/FA9099-CC02.json
index 7e4241b5c52..fce0f943697 100644
--- a/docs/data/histograms/Canada/FA9099-CC02.json
+++ b/docs/data/histograms/Canada/FA9099-CC02.json
@@ -1 +1 @@
-{"batchcode": "FA9099-CC02", "histograms": [{"batchcodes": ["FA9099-CC02"], "histogram": {"Inappropriate schedule of product administration": 1, "Inflammation": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9099-CC02", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Inflammation": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["FA9099-CC02"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9099.json b/docs/data/histograms/Canada/FA9099.json
index b8abba9fc86..22cffb3c5ed 100644
--- a/docs/data/histograms/Canada/FA9099.json
+++ b/docs/data/histograms/Canada/FA9099.json
@@ -1 +1 @@
-{"batchcode": "FA9099", "histograms": [{"batchcodes": ["044D21A", "EW0193", "FA9099"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Nephrolithiasis": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["044D21A", "FA9099"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["FA9099"], "histogram": {"Chest pain": 55, "Myocarditis": 52, "SARS-CoV-2 test": 40, "Inappropriate schedule of product administration": 39, "Dyspnoea": 38, "Pericarditis": 32, "Pyrexia": 21, "Chest discomfort": 18, "Fatigue": 17, "Pain": 13, "COVID-19": 11, "Nausea": 11, "Palpitations": 11, "Chills": 10, "Drug ineffective": 10, "Headache": 10, "Myopericarditis": 10, "Blood test": 9, "Hypoaesthesia": 9, "Myalgia": 9, "Pain in extremity": 9, "Arthralgia": 8, "Tachycardia": 8, "Hyperhidrosis": 7, "Paraesthesia": 7, "Asthenia": 6, "Cough": 6, "Pleuritic pain": 6, "Vomiting": 6, "Back pain": 5, "Blood pressure measurement": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Diarrhoea": 4, "Heavy menstrual bleeding": 4, "Inflammation": 4, "Insomnia": 4, "Malaise": 4, "Muscular weakness": 4, "Neck pain": 4, "Off label use": 4, "Oropharyngeal pain": 4, "Ultrasound scan": 4, "Abdominal pain": 3, "Abdominal pain upper": 3, "Appendicitis": 3, "Cold sweat": 3, "Dizziness": 3, "Feeling abnormal": 3, "Influenza like illness": 3, "Loss of consciousness": 3, "Loss of personal independence in daily activities": 3, "Menstruation irregular": 3, "Migraine": 3, "Musculoskeletal discomfort": 3, "Musculoskeletal stiffness": 3, "Panic attack": 3, "Photophobia": 3, "Postmenopausal haemorrhage": 3, "Pruritus": 3, "Rash": 3, "SARS-CoV-2 antibody test": 3, "Tinnitus": 3, "Tremor": 3, "Vaccination site pain": 3, "X-ray": 3, "Anxiety": 2, "Arrhythmia": 2, "Blood cholesterol": 2, "Blood follicle stimulating hormone": 2, "Blood glucose": 2, "Body temperature": 2, "Bone pain": 2, "Bradycardia": 2, "Bronchitis": 2, "Burning sensation": 2, "Cardiac stress test": 2, "Colonoscopy": 2, "Condition aggravated": 2, "Discomfort": 2, "Dysmenorrhoea": 2, "Dyspepsia": 2, "Dysphagia": 2, "Dyspnoea exertional": 2, "Electric shock sensation": 2, "Electrocardiogram ST segment elevation": 2, "Erythema": 2, "Gynaecological examination": 2, "Head discomfort": 2, "Herpes zoster": 2, "Hyperventilation": 2, "Hypoacusis": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Motor dysfunction": 2, "Muscle tightness": 2, "Myocardial injury": 2, "Nerve injury": 2, "Peripheral swelling": 2, "Platelet factor 4": 2, "Pleural effusion": 2, "Polymerase chain reaction": 2, "Sensory loss": 2, "Specialist consultation": 2, "Swelling": 2, "Temperature intolerance": 2, "Vision blurred": 2, "Weight decreased": 2, "White blood cell count": 2, "Acoustic stimulation tests": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Amenorrhoea": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Anti-platelet antibody": 1, "Aortic dissection": 1, "Aptyalism": 1, "Atrial enlargement": 1, "Atypical pneumonia": 1, "Audiogram": 1, "Auditory disorder": 1, "Autoimmune disorder": 1, "Blood cholesterol increased": 1, "Blood glucose increased": 1, "Body height": 1, "C-reactive protein normal": 1, "Candida infection": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac tamponade": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Costochondritis": 1, "Dandruff": 1, "Deafness": 1, "Dementia Alzheimer's type": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysphonia": 1, "Dyspnoea at rest": 1, "Ear discomfort": 1, "Ear pain": 1, "Ear, nose and throat examination": 1, "Exfoliative rash": 1, "Exposure during pregnancy": 1, "Fibromyalgia": 1, "Flushing": 1, "Foetal death": 1, "Fungal infection": 1, "Gait disturbance": 1, "Gingival blister": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Heart rate": 1, "Hepatic enzyme increased": 1, "Herpes pharyngitis": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypervolaemia": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Hypothyroidism": 1, "Impaired work ability": 1, "Inappropriate antidiuretic hormone secretion": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Joint swelling": 1, "Lethargy": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Menstrual discomfort": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Mobility decreased": 1, "Movement disorder": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle spasms": 1, "Myelopathy": 1, "Nasal congestion": 1, "Nephrolithiasis": 1, "Noninfective encephalitis": 1, "Oligomenorrhoea": 1, "Ophthalmic migraine": 1, "Ophthalmological examination": 1, "Optic nerve disorder": 1, "Oral disorder": 1, "Oral herpes": 1, "Oral pain": 1, "Ovulation pain": 1, "Pain assessment": 1, "Pericardial effusion": 1, "Photosensitivity reaction": 1, "Physical examination": 1, "Pleuropericarditis": 1, "Polyarthritis": 1, "Polymenorrhoea": 1, "Premature labour": 1, "Proctitis": 1, "Prostatic operation": 1, "Pulmonary embolism": 1, "Rales": 1, "Rash erythematous": 1, "Rectal cancer": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "Retinal injury": 1, "Retinal vein occlusion": 1, "SARS-CoV-2 test positive": 1, "Sedation complication": 1, "Seizure": 1, "Sinus arrhythmia": 1, "Sinus bradycardia": 1, "Sinus tachycardia": 1, "Skin test": 1, "Sleep disorder": 1, "Sluggishness": 1, "Somnolence": 1, "Stool analysis": 1, "Streptococcal urinary tract infection": 1, "Swelling face": 1, "Systemic candida": 1, "Temporomandibular joint syndrome": 1, "Thirst": 1, "Thoracic spinal cord paralysis": 1, "Throat irritation": 1, "Thyroid cyst": 1, "Thyroiditis": 1, "Tonsillitis": 1, "Tooth infection": 1, "Ultrasound abdomen": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site injury": 1, "Vasodilatation": 1, "Vein disorder": 1, "Visual impairment": 1, "Vulvovaginal mycotic infection": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9099", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Nephrolithiasis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["044D21A", "EW0193", "FA9099"]}, {"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["044D21A", "FA9099"]}, {"histogram": {"Chest pain": 55, "Myocarditis": 52, "SARS-CoV-2 test": 40, "Inappropriate schedule of product administration": 39, "Dyspnoea": 38, "Pericarditis": 32, "Pyrexia": 21, "Chest discomfort": 18, "Fatigue": 17, "Pain": 13, "COVID-19": 11, "Nausea": 11, "Palpitations": 11, "Chills": 10, "Drug ineffective": 10, "Headache": 10, "Myopericarditis": 10, "Blood test": 9, "Hypoaesthesia": 9, "Myalgia": 9, "Pain in extremity": 9, "Arthralgia": 8, "Tachycardia": 8, "Hyperhidrosis": 7, "Paraesthesia": 7, "Asthenia": 6, "Cough": 6, "Pleuritic pain": 6, "Vomiting": 6, "Back pain": 5, "Blood pressure measurement": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Diarrhoea": 4, "Heavy menstrual bleeding": 4, "Inflammation": 4, "Insomnia": 4, "Malaise": 4, "Muscular weakness": 4, "Neck pain": 4, "Off label use": 4, "Oropharyngeal pain": 4, "Ultrasound scan": 4, "Abdominal pain": 3, "Abdominal pain upper": 3, "Appendicitis": 3, "Cold sweat": 3, "Dizziness": 3, "Feeling abnormal": 3, "Influenza like illness": 3, "Loss of consciousness": 3, "Loss of personal independence in daily activities": 3, "Menstruation irregular": 3, "Migraine": 3, "Musculoskeletal discomfort": 3, "Musculoskeletal stiffness": 3, "Panic attack": 3, "Photophobia": 3, "Postmenopausal haemorrhage": 3, "Pruritus": 3, "Rash": 3, "SARS-CoV-2 antibody test": 3, "Tinnitus": 3, "Tremor": 3, "Vaccination site pain": 3, "X-ray": 3, "Anxiety": 2, "Arrhythmia": 2, "Blood cholesterol": 2, "Blood follicle stimulating hormone": 2, "Blood glucose": 2, "Body temperature": 2, "Bone pain": 2, "Bradycardia": 2, "Bronchitis": 2, "Burning sensation": 2, "Cardiac stress test": 2, "Colonoscopy": 2, "Condition aggravated": 2, "Discomfort": 2, "Dysmenorrhoea": 2, "Dyspepsia": 2, "Dysphagia": 2, "Dyspnoea exertional": 2, "Electric shock sensation": 2, "Electrocardiogram ST segment elevation": 2, "Erythema": 2, "Gynaecological examination": 2, "Head discomfort": 2, "Herpes zoster": 2, "Hyperventilation": 2, "Hypoacusis": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Motor dysfunction": 2, "Muscle tightness": 2, "Myocardial injury": 2, "Nerve injury": 2, "Peripheral swelling": 2, "Platelet factor 4": 2, "Pleural effusion": 2, "Polymerase chain reaction": 2, "Sensory loss": 2, "Specialist consultation": 2, "Swelling": 2, "Temperature intolerance": 2, "Vision blurred": 2, "Weight decreased": 2, "White blood cell count": 2, "Acoustic stimulation tests": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Amenorrhoea": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Anti-platelet antibody": 1, "Aortic dissection": 1, "Aptyalism": 1, "Atrial enlargement": 1, "Atypical pneumonia": 1, "Audiogram": 1, "Auditory disorder": 1, "Autoimmune disorder": 1, "Blood cholesterol increased": 1, "Blood glucose increased": 1, "Body height": 1, "C-reactive protein normal": 1, "Candida infection": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac tamponade": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Costochondritis": 1, "Dandruff": 1, "Deafness": 1, "Dementia Alzheimer's type": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysphonia": 1, "Dyspnoea at rest": 1, "Ear discomfort": 1, "Ear pain": 1, "Ear, nose and throat examination": 1, "Exfoliative rash": 1, "Exposure during pregnancy": 1, "Fibromyalgia": 1, "Flushing": 1, "Foetal death": 1, "Fungal infection": 1, "Gait disturbance": 1, "Gingival blister": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Heart rate": 1, "Hepatic enzyme increased": 1, "Herpes pharyngitis": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypervolaemia": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Hypothyroidism": 1, "Impaired work ability": 1, "Inappropriate antidiuretic hormone secretion": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Joint swelling": 1, "Lethargy": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Menstrual discomfort": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Mobility decreased": 1, "Movement disorder": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle spasms": 1, "Myelopathy": 1, "Nasal congestion": 1, "Nephrolithiasis": 1, "Noninfective encephalitis": 1, "Oligomenorrhoea": 1, "Ophthalmic migraine": 1, "Ophthalmological examination": 1, "Optic nerve disorder": 1, "Oral disorder": 1, "Oral herpes": 1, "Oral pain": 1, "Ovulation pain": 1, "Pain assessment": 1, "Pericardial effusion": 1, "Photosensitivity reaction": 1, "Physical examination": 1, "Pleuropericarditis": 1, "Polyarthritis": 1, "Polymenorrhoea": 1, "Premature labour": 1, "Proctitis": 1, "Prostatic operation": 1, "Pulmonary embolism": 1, "Rales": 1, "Rash erythematous": 1, "Rectal cancer": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "Retinal injury": 1, "Retinal vein occlusion": 1, "SARS-CoV-2 test positive": 1, "Sedation complication": 1, "Seizure": 1, "Sinus arrhythmia": 1, "Sinus bradycardia": 1, "Sinus tachycardia": 1, "Skin test": 1, "Sleep disorder": 1, "Sluggishness": 1, "Somnolence": 1, "Stool analysis": 1, "Streptococcal urinary tract infection": 1, "Swelling face": 1, "Systemic candida": 1, "Temporomandibular joint syndrome": 1, "Thirst": 1, "Thoracic spinal cord paralysis": 1, "Throat irritation": 1, "Thyroid cyst": 1, "Thyroiditis": 1, "Tonsillitis": 1, "Tooth infection": 1, "Ultrasound abdomen": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site injury": 1, "Vasodilatation": 1, "Vein disorder": 1, "Visual impairment": 1, "Vulvovaginal mycotic infection": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1}, "batchcodes": ["FA9099"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FA9O91.json b/docs/data/histograms/Canada/FA9O91.json
index 2d0ee42a526..1472d8542ef 100644
--- a/docs/data/histograms/Canada/FA9O91.json
+++ b/docs/data/histograms/Canada/FA9O91.json
@@ -1 +1 @@
-{"batchcode": "FA9O91", "histograms": [{"batchcodes": ["FA9O91"], "histogram": {"Cardiac arrest": 1, "Cardiac failure": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9O91", "histograms": [{"histogram": {"Cardiac arrest": 1, "Cardiac failure": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1}, "batchcodes": ["FA9O91"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD 0810.json b/docs/data/histograms/Canada/FD 0810.json
index b0e07cc33c1..fb962e3f83e 100644
--- a/docs/data/histograms/Canada/FD 0810.json
+++ b/docs/data/histograms/Canada/FD 0810.json
@@ -1 +1 @@
-{"batchcode": "FD 0810", "histograms": [{"batchcodes": ["FD 0810"], "histogram": {"Carotid artery dissection": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "FD 0810", "histograms": [{"histogram": {"Carotid artery dissection": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["FD 0810"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD0180.json b/docs/data/histograms/Canada/FD0180.json
index 8920a4b900c..59021374c3a 100644
--- a/docs/data/histograms/Canada/FD0180.json
+++ b/docs/data/histograms/Canada/FD0180.json
@@ -1 +1 @@
-{"batchcode": "FD0180", "histograms": [{"batchcodes": ["FD0180"], "histogram": {"Blood test": 1, "Chest X-ray": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Muscular weakness": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pericarditis": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0180", "histograms": [{"histogram": {"Blood test": 1, "Chest X-ray": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Muscular weakness": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pericarditis": 1, "Rash": 1}, "batchcodes": ["FD0180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD0801.json b/docs/data/histograms/Canada/FD0801.json
index aa539596300..6cfbc2f1afb 100644
--- a/docs/data/histograms/Canada/FD0801.json
+++ b/docs/data/histograms/Canada/FD0801.json
@@ -1 +1 @@
-{"batchcode": "FD0801", "histograms": [{"batchcodes": ["FD0801"], "histogram": {"Dysmenorrhoea": 1, "Heavy menstrual bleeding": 1, "Hypomenorrhoea": 1, "Inappropriate schedule of product administration": 1, "Muscle spasms": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0801", "histograms": [{"histogram": {"Dysmenorrhoea": 1, "Heavy menstrual bleeding": 1, "Hypomenorrhoea": 1, "Inappropriate schedule of product administration": 1, "Muscle spasms": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["FD0801"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD0810.json b/docs/data/histograms/Canada/FD0810.json
index d31e446683e..1ac1e9d70ab 100644
--- a/docs/data/histograms/Canada/FD0810.json
+++ b/docs/data/histograms/Canada/FD0810.json
@@ -1 +1 @@
-{"batchcode": "FD0810", "histograms": [{"batchcodes": ["FD0810"], "histogram": {"Chest pain": 31, "Dyspnoea": 22, "Fatigue": 21, "SARS-CoV-2 test": 19, "Headache": 17, "Inappropriate schedule of product administration": 17, "Pericarditis": 16, "Myocarditis": 15, "Pyrexia": 15, "Myopericarditis": 14, "Palpitations": 14, "Dizziness": 13, "Pain in extremity": 12, "Pain": 11, "Vaccination site pain": 8, "Angina pectoris": 6, "Chest discomfort": 6, "Drug ineffective": 6, "Hypoaesthesia": 6, "Tachycardia": 6, "Arthralgia": 5, "COVID-19": 5, "Chills": 5, "Heavy menstrual bleeding": 5, "Loss of consciousness": 5, "Asthenia": 4, "Blood test": 4, "Cough": 4, "Electrocardiogram": 4, "Heart rate": 4, "Malaise": 4, "Paraesthesia": 4, "Tinnitus": 4, "X-ray": 4, "Angiogram": 3, "Burning sensation": 3, "Diarrhoea": 3, "Dysmenorrhoea": 3, "Fall": 3, "Feeling abnormal": 3, "Head discomfort": 3, "Heart rate irregular": 3, "Hyperhidrosis": 3, "Immunisation": 3, "Investigation": 3, "Lymphadenopathy": 3, "Menstruation irregular": 3, "Myalgia": 3, "Nausea": 3, "Off label use": 3, "Oropharyngeal pain": 3, "Polymerase chain reaction": 3, "Postmenopausal haemorrhage": 3, "Swelling": 3, "Syncope": 3, "Ultrasound scan": 3, "Vision blurred": 3, "Visual impairment": 3, "Abdominal pain": 2, "Acoustic stimulation tests": 2, "Blood pressure decreased": 2, "Blood pressure measurement": 2, "Cardiac failure congestive": 2, "Cardiac flutter": 2, "Cardiac stress test": 2, "Cardiogenic shock": 2, "Colonoscopy": 2, "Constipation": 2, "Deafness": 2, "Diverticulitis": 2, "Echocardiogram": 2, "Erythema": 2, "Feeling hot": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Inflammation": 2, "Influenza like illness": 2, "Insomnia": 2, "Laboratory test": 2, "Left ventricular dysfunction": 2, "Magnetic resonance imaging": 2, "Migraine": 2, "Neck pain": 2, "Neuralgia": 2, "Pain in jaw": 2, "Pericardial effusion": 2, "Pleuritic pain": 2, "Product administered at inappropriate site": 2, "Sciatica": 2, "Suspected COVID-19": 2, "Vomiting": 2, "Abnormal uterine bleeding": 1, "Acne": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Acute pulmonary oedema": 1, "Affective disorder": 1, "Aggression": 1, "Amnesia": 1, "Anisocoria": 1, "Antibody test": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arthritis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Back pain": 1, "Balance test": 1, "Bell's palsy": 1, "Blindness transient": 1, "Blood pressure diastolic increased": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Body temperature": 1, "Bradycardia": 1, "Bursitis": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Confusional state": 1, "Coronary artery disease": 1, "Cystitis": 1, "Deafness neurosensory": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dissociation": 1, "Diverticulum": 1, "Dizziness postural": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Dysuria": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Endometrial disorder": 1, "Exercise tolerance decreased": 1, "Eye irritation": 1, "Feeling cold": 1, "Fine motor skill dysfunction": 1, "Gait inability": 1, "Generalised oedema": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhage urinary tract": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hypersomnia": 1, "Hypomenorrhoea": 1, "Hypothermia": 1, "Illness": 1, "Impaired quality of life": 1, "Influenza": 1, "Injection site movement impairment": 1, "Inner ear inflammation": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Ischaemic hepatitis": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Lethargy": 1, "Limb discomfort": 1, "Liver disorder": 1, "Loss of personal independence in daily activities": 1, "Lung assist device therapy": 1, "Lung consolidation": 1, "Lymph node pain": 1, "Memory impairment": 1, "Mental fatigue": 1, "Mitral valve incompetence": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Nasal discomfort": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Optic neuritis": 1, "Painful respiration": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pollakiuria": 1, "Pruritus": 1, "Pulmonary thrombosis": 1, "Rash": 1, "Raynaud's phenomenon": 1, "Renal impairment": 1, "Renal tubular necrosis": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Scleroderma": 1, "Sinus tachycardia": 1, "Skin odour abnormal": 1, "Smear cervix": 1, "Spondylitis": 1, "Sputum discoloured": 1, "Supraventricular tachycardia": 1, "Tachypnoea": 1, "Taste disorder": 1, "Throat irritation": 1, "Thrombosis": 1, "Tongue biting": 1, "Tracheostomy tube removal": 1, "Tremor": 1, "Urinary tract infection": 1, "Urine output decreased": 1, "Vaccination failure": 1, "Vaccination site inflammation": 1, "Vaccination site joint pain": 1, "Vaccination site movement impairment": 1, "Vaginal infection": 1, "Varicose vein": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0810", "histograms": [{"histogram": {"Chest pain": 31, "Dyspnoea": 22, "Fatigue": 21, "SARS-CoV-2 test": 19, "Headache": 17, "Inappropriate schedule of product administration": 17, "Pericarditis": 16, "Myocarditis": 15, "Pyrexia": 15, "Myopericarditis": 14, "Palpitations": 14, "Dizziness": 13, "Pain in extremity": 12, "Pain": 11, "Vaccination site pain": 8, "Angina pectoris": 6, "Chest discomfort": 6, "Drug ineffective": 6, "Hypoaesthesia": 6, "Tachycardia": 6, "Arthralgia": 5, "COVID-19": 5, "Chills": 5, "Heavy menstrual bleeding": 5, "Loss of consciousness": 5, "Asthenia": 4, "Blood test": 4, "Cough": 4, "Electrocardiogram": 4, "Heart rate": 4, "Malaise": 4, "Paraesthesia": 4, "Tinnitus": 4, "X-ray": 4, "Angiogram": 3, "Burning sensation": 3, "Diarrhoea": 3, "Dysmenorrhoea": 3, "Fall": 3, "Feeling abnormal": 3, "Head discomfort": 3, "Heart rate irregular": 3, "Hyperhidrosis": 3, "Immunisation": 3, "Investigation": 3, "Lymphadenopathy": 3, "Menstruation irregular": 3, "Myalgia": 3, "Nausea": 3, "Off label use": 3, "Oropharyngeal pain": 3, "Polymerase chain reaction": 3, "Postmenopausal haemorrhage": 3, "Swelling": 3, "Syncope": 3, "Ultrasound scan": 3, "Vision blurred": 3, "Visual impairment": 3, "Abdominal pain": 2, "Acoustic stimulation tests": 2, "Blood pressure decreased": 2, "Blood pressure measurement": 2, "Cardiac failure congestive": 2, "Cardiac flutter": 2, "Cardiac stress test": 2, "Cardiogenic shock": 2, "Colonoscopy": 2, "Constipation": 2, "Deafness": 2, "Diverticulitis": 2, "Echocardiogram": 2, "Erythema": 2, "Feeling hot": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Inflammation": 2, "Influenza like illness": 2, "Insomnia": 2, "Laboratory test": 2, "Left ventricular dysfunction": 2, "Magnetic resonance imaging": 2, "Migraine": 2, "Neck pain": 2, "Neuralgia": 2, "Pain in jaw": 2, "Pericardial effusion": 2, "Pleuritic pain": 2, "Product administered at inappropriate site": 2, "Sciatica": 2, "Suspected COVID-19": 2, "Vomiting": 2, "Abnormal uterine bleeding": 1, "Acne": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Acute pulmonary oedema": 1, "Affective disorder": 1, "Aggression": 1, "Amnesia": 1, "Anisocoria": 1, "Antibody test": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arthritis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Back pain": 1, "Balance test": 1, "Bell's palsy": 1, "Blindness transient": 1, "Blood pressure diastolic increased": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Body temperature": 1, "Bradycardia": 1, "Bursitis": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Confusional state": 1, "Coronary artery disease": 1, "Cystitis": 1, "Deafness neurosensory": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dissociation": 1, "Diverticulum": 1, "Dizziness postural": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Dysuria": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Endometrial disorder": 1, "Exercise tolerance decreased": 1, "Eye irritation": 1, "Feeling cold": 1, "Fine motor skill dysfunction": 1, "Gait inability": 1, "Generalised oedema": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhage urinary tract": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hypersomnia": 1, "Hypomenorrhoea": 1, "Hypothermia": 1, "Illness": 1, "Impaired quality of life": 1, "Influenza": 1, "Injection site movement impairment": 1, "Inner ear inflammation": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Ischaemic hepatitis": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Lethargy": 1, "Limb discomfort": 1, "Liver disorder": 1, "Loss of personal independence in daily activities": 1, "Lung assist device therapy": 1, "Lung consolidation": 1, "Lymph node pain": 1, "Memory impairment": 1, "Mental fatigue": 1, "Mitral valve incompetence": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Myocardial oedema": 1, "Nasal discomfort": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Optic neuritis": 1, "Painful respiration": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pollakiuria": 1, "Pruritus": 1, "Pulmonary thrombosis": 1, "Rash": 1, "Raynaud's phenomenon": 1, "Renal impairment": 1, "Renal tubular necrosis": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Scleroderma": 1, "Sinus tachycardia": 1, "Skin odour abnormal": 1, "Smear cervix": 1, "Spondylitis": 1, "Sputum discoloured": 1, "Supraventricular tachycardia": 1, "Tachypnoea": 1, "Taste disorder": 1, "Throat irritation": 1, "Thrombosis": 1, "Tongue biting": 1, "Tracheostomy tube removal": 1, "Tremor": 1, "Urinary tract infection": 1, "Urine output decreased": 1, "Vaccination failure": 1, "Vaccination site inflammation": 1, "Vaccination site joint pain": 1, "Vaccination site movement impairment": 1, "Vaginal infection": 1, "Varicose vein": 1}, "batchcodes": ["FD0810"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD1204.json b/docs/data/histograms/Canada/FD1204.json
index 66ca79824d2..d95eeebd381 100644
--- a/docs/data/histograms/Canada/FD1204.json
+++ b/docs/data/histograms/Canada/FD1204.json
@@ -1 +1 @@
-{"batchcode": "FD1204", "histograms": [{"batchcodes": ["FD1204"], "histogram": {"Abdominal discomfort": 1, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Cold sweat": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heavy menstrual bleeding": 1, "Intermenstrual bleeding": 1, "Menstruation irregular": 1, "Ultrasound pelvis": 1}}]}
\ No newline at end of file
+{"batchcode": "FD1204", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Cold sweat": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heavy menstrual bleeding": 1, "Intermenstrual bleeding": 1, "Menstruation irregular": 1, "Ultrasound pelvis": 1}, "batchcodes": ["FD1204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD206.json b/docs/data/histograms/Canada/FD206.json
index c8bc616e5a0..e2dc3d4d3e2 100644
--- a/docs/data/histograms/Canada/FD206.json
+++ b/docs/data/histograms/Canada/FD206.json
@@ -1 +1 @@
-{"batchcode": "FD206", "histograms": [{"batchcodes": ["FD206"], "histogram": {"Alopecia": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "FD206", "histograms": [{"histogram": {"Alopecia": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["FD206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD2704.json b/docs/data/histograms/Canada/FD2704.json
index a9b1a88d212..6963b4df7de 100644
--- a/docs/data/histograms/Canada/FD2704.json
+++ b/docs/data/histograms/Canada/FD2704.json
@@ -1 +1 @@
-{"batchcode": "FD2704", "histograms": [{"batchcodes": ["FD2704"], "histogram": {"Arrhythmia": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Myocarditis": 1, "Nausea": 1, "Sinus bradycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD2704", "histograms": [{"histogram": {"Arrhythmia": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Myocarditis": 1, "Nausea": 1, "Sinus bradycardia": 1}, "batchcodes": ["FD2704"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD5204.json b/docs/data/histograms/Canada/FD5204.json
index 4f606856289..5a49111adca 100644
--- a/docs/data/histograms/Canada/FD5204.json
+++ b/docs/data/histograms/Canada/FD5204.json
@@ -1 +1 @@
-{"batchcode": "FD5204", "histograms": [{"batchcodes": ["FD5204"], "histogram": {"Drug ineffective": 1, "Lung neoplasm malignant": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5204", "histograms": [{"histogram": {"Drug ineffective": 1, "Lung neoplasm malignant": 1, "Suspected COVID-19": 1}, "batchcodes": ["FD5204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD6840; FE6208.json b/docs/data/histograms/Canada/FD6840; FE6208.json
index 79ba1264576..bdb60846ed7 100644
--- a/docs/data/histograms/Canada/FD6840; FE6208.json
+++ b/docs/data/histograms/Canada/FD6840; FE6208.json
@@ -1 +1 @@
-{"batchcode": "FD6840; FE6208", "histograms": [{"batchcodes": ["FD6840; FE6208"], "histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1, "Vaccination site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FD6840; FE6208", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1, "Vaccination site haemorrhage": 1}, "batchcodes": ["FD6840; FE6208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD704.json b/docs/data/histograms/Canada/FD704.json
index 41a224812fa..1626ec4fe36 100644
--- a/docs/data/histograms/Canada/FD704.json
+++ b/docs/data/histograms/Canada/FD704.json
@@ -1 +1 @@
-{"batchcode": "FD704", "histograms": [{"batchcodes": ["FD704"], "histogram": {"Appendicitis perforated": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FD704", "histograms": [{"histogram": {"Appendicitis perforated": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FD704"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD7204.json b/docs/data/histograms/Canada/FD7204.json
index 3fbac460f00..63112e30c4f 100644
--- a/docs/data/histograms/Canada/FD7204.json
+++ b/docs/data/histograms/Canada/FD7204.json
@@ -1 +1 @@
-{"batchcode": "FD7204", "histograms": [{"batchcodes": ["FD7204"], "histogram": {"Chest pain": 59, "Myocarditis": 35, "Dyspnoea": 29, "Pericarditis": 29, "Palpitations": 26, "SARS-CoV-2 test": 26, "Pyrexia": 22, "Myopericarditis": 21, "Pain in extremity": 20, "Inappropriate schedule of product administration": 17, "Fatigue": 16, "Headache": 15, "Nausea": 15, "Chest discomfort": 14, "Arthralgia": 12, "Asthenia": 11, "Chills": 11, "Dizziness": 11, "Cough": 10, "Hyperhidrosis": 9, "Hypoaesthesia": 9, "Pain": 9, "Blood test": 8, "Abdominal pain": 7, "Electrocardiogram": 7, "Neck pain": 7, "Syncope": 7, "Vaccination site pain": 7, "COVID-19": 6, "Paraesthesia": 6, "Vomiting": 6, "X-ray": 6, "Angina pectoris": 5, "Condition aggravated": 5, "Joint swelling": 5, "Pericardial effusion": 5, "Abdominal pain upper": 4, "Anxiety": 4, "Blood pressure measurement": 4, "Cardiac flutter": 4, "Diarrhoea": 4, "Drug ineffective": 4, "Feeling abnormal": 4, "Heavy menstrual bleeding": 4, "Loss of personal independence in daily activities": 4, "Myalgia": 4, "Oropharyngeal pain": 4, "Peripheral swelling": 4, "Pharyngeal swelling": 4, "Tachycardia": 4, "Burning sensation": 3, "Cardiac disorder": 3, "Dehydration": 3, "Dysphagia": 3, "Dyspnoea at rest": 3, "Dyspnoea exertional": 3, "Fall": 3, "Heart rate": 3, "Heart rate increased": 3, "Hypertension": 3, "Lethargy": 3, "Lip swelling": 3, "Lymphadenopathy": 3, "Malaise": 3, "Pleuritic pain": 3, "Pruritus": 3, "Rash": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Vision blurred": 3, "Visual impairment": 3, "Abdominal discomfort": 2, "Ageusia": 2, "Anosmia": 2, "Arrhythmia": 2, "Arthritis": 2, "Bell's palsy": 2, "Blood pressure increased": 2, "Cardiac discomfort": 2, "Chest X-ray": 2, "Diabetes mellitus": 2, "Ear infection": 2, "Eating disorder": 2, "Echocardiogram": 2, "Facial paralysis": 2, "Flushing": 2, "Furuncle": 2, "Insomnia": 2, "Investigation": 2, "Lymphadenitis": 2, "Menstrual disorder": 2, "Menstruation irregular": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Off label use": 2, "Oligomenorrhoea": 2, "Pain in jaw": 2, "Painful respiration": 2, "Pallor": 2, "Pneumonia": 2, "Pulmonary embolism": 2, "Rhinorrhoea": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test negative": 2, "Seizure": 2, "Suspected COVID-19": 2, "Thrombosis": 2, "Ventricular tachycardia": 2, "Weight": 2, "Weight decreased": 2, "Abdominal pain lower": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Acute respiratory failure": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Amenorrhoea": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Anti-thyroid antibody": 1, "Arteriospasm coronary": 1, "Arthropathy": 1, "Asthma": 1, "Atrial fibrillation": 1, "Autoimmune thyroiditis": 1, "Axillary pain": 1, "Back pain": 1, "Blister": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood testosterone": 1, "Body temperature": 1, "Bone pain": 1, "Bone swelling": 1, "Bradycardia": 1, "Breast pain": 1, "Bundle branch block left": 1, "Cardiac infection": 1, "Cardiac stress test": 1, "Cardiopulmonary exercise test": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Cerebral disorder": 1, "Chapped lips": 1, "Chorioretinopathy": 1, "Computerised tomogram": 1, "Continuous positive airway pressure": 1, "Contusion": 1, "Coronary ostial stenosis": 1, "Dactylitis": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dental discomfort": 1, "Dermatitis allergic": 1, "Diffuse alopecia": 1, "Disorientation": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dyspepsia": 1, "Dysuria": 1, "Ear discomfort": 1, "Ear disorder": 1, "Ear pain": 1, "Ear swelling": 1, "Ear, nose and throat examination": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Emotional disorder": 1, "Endoscopy upper gastrointestinal tract": 1, "Enzyme level test": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Epistaxis": 1, "Erectile dysfunction": 1, "Exposure during pregnancy": 1, "Eye disorder": 1, "Facial pain": 1, "Faeces discoloured": 1, "Faeces soft": 1, "Feeling hot": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Glioblastoma": 1, "Glucose urine present": 1, "Guillain-Barre syndrome": 1, "Haemoptysis": 1, "Haemorrhage urinary tract": 1, "Head circumference": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Hyperbilirubinaemia neonatal": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hypothyroidism": 1, "Illness": 1, "Illusion": 1, "Immune system disorder": 1, "Immunisation": 1, "Impaired work ability": 1, "Inflammation": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Intracranial pressure increased": 1, "Ischaemic stroke": 1, "Joint lock": 1, "Joint range of motion decreased": 1, "Left atrial enlargement": 1, "Length at birth": 1, "Lip dry": 1, "Lower respiratory tract infection": 1, "Lung disorder": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Migraine with aura": 1, "Mood swings": 1, "Muscle disorder": 1, "Muscle spasms": 1, "Muscle spasticity": 1, "Muscle strength abnormal": 1, "Muscle tightness": 1, "Myocardial oedema": 1, "Nasal congestion": 1, "Neck mass": 1, "Nervousness": 1, "Neuralgia": 1, "Neurogenic shock": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Optic neuritis": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Peroneal nerve palsy": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngitis": 1, "Photopsia": 1, "Pleural effusion": 1, "Pneumonitis": 1, "Pollakiuria": 1, "Postmenopausal haemorrhage": 1, "Premature baby": 1, "Presyncope": 1, "Product use issue": 1, "Psoriasis": 1, "Psoriatic arthropathy": 1, "Pulmonary contusion": 1, "Rash papular": 1, "Rash pruritic": 1, "Restlessness": 1, "Rosacea": 1, "SARS-CoV-1 test": 1, "Scratch": 1, "Sinus arrhythmia": 1, "Sinus congestion": 1, "Sinus tachycardia": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion": 1, "Skin wound": 1, "Sleep disorder": 1, "Speech disorder": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Target skin lesion": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid pain": 1, "Tongue dry": 1, "Tourette's disorder": 1, "Tremor": 1, "Troponin": 1, "Tuberculin test": 1, "Tuberculosis": 1, "Ultrasound breast": 1, "Ultrasound chest": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Urticaria": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Vein rupture": 1, "Ventilation/perfusion scan": 1, "Ventricular dysfunction": 1, "Ventricular extrasystoles": 1, "Vestibular neuronitis": 1, "Vitreous detachment": 1, "Walking disability": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7204", "histograms": [{"histogram": {"Chest pain": 59, "Myocarditis": 35, "Dyspnoea": 29, "Pericarditis": 29, "Palpitations": 26, "SARS-CoV-2 test": 26, "Pyrexia": 22, "Myopericarditis": 21, "Pain in extremity": 20, "Inappropriate schedule of product administration": 17, "Fatigue": 16, "Headache": 15, "Nausea": 15, "Chest discomfort": 14, "Arthralgia": 12, "Asthenia": 11, "Chills": 11, "Dizziness": 11, "Cough": 10, "Hyperhidrosis": 9, "Hypoaesthesia": 9, "Pain": 9, "Blood test": 8, "Abdominal pain": 7, "Electrocardiogram": 7, "Neck pain": 7, "Syncope": 7, "Vaccination site pain": 7, "COVID-19": 6, "Paraesthesia": 6, "Vomiting": 6, "X-ray": 6, "Angina pectoris": 5, "Condition aggravated": 5, "Joint swelling": 5, "Pericardial effusion": 5, "Abdominal pain upper": 4, "Anxiety": 4, "Blood pressure measurement": 4, "Cardiac flutter": 4, "Diarrhoea": 4, "Drug ineffective": 4, "Feeling abnormal": 4, "Heavy menstrual bleeding": 4, "Loss of personal independence in daily activities": 4, "Myalgia": 4, "Oropharyngeal pain": 4, "Peripheral swelling": 4, "Pharyngeal swelling": 4, "Tachycardia": 4, "Burning sensation": 3, "Cardiac disorder": 3, "Dehydration": 3, "Dysphagia": 3, "Dyspnoea at rest": 3, "Dyspnoea exertional": 3, "Fall": 3, "Heart rate": 3, "Heart rate increased": 3, "Hypertension": 3, "Lethargy": 3, "Lip swelling": 3, "Lymphadenopathy": 3, "Malaise": 3, "Pleuritic pain": 3, "Pruritus": 3, "Rash": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Vision blurred": 3, "Visual impairment": 3, "Abdominal discomfort": 2, "Ageusia": 2, "Anosmia": 2, "Arrhythmia": 2, "Arthritis": 2, "Bell's palsy": 2, "Blood pressure increased": 2, "Cardiac discomfort": 2, "Chest X-ray": 2, "Diabetes mellitus": 2, "Ear infection": 2, "Eating disorder": 2, "Echocardiogram": 2, "Facial paralysis": 2, "Flushing": 2, "Furuncle": 2, "Insomnia": 2, "Investigation": 2, "Lymphadenitis": 2, "Menstrual disorder": 2, "Menstruation irregular": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Off label use": 2, "Oligomenorrhoea": 2, "Pain in jaw": 2, "Painful respiration": 2, "Pallor": 2, "Pneumonia": 2, "Pulmonary embolism": 2, "Rhinorrhoea": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test negative": 2, "Seizure": 2, "Suspected COVID-19": 2, "Thrombosis": 2, "Ventricular tachycardia": 2, "Weight": 2, "Weight decreased": 2, "Abdominal pain lower": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Acute respiratory failure": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Amenorrhoea": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Anti-thyroid antibody": 1, "Arteriospasm coronary": 1, "Arthropathy": 1, "Asthma": 1, "Atrial fibrillation": 1, "Autoimmune thyroiditis": 1, "Axillary pain": 1, "Back pain": 1, "Blister": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood testosterone": 1, "Body temperature": 1, "Bone pain": 1, "Bone swelling": 1, "Bradycardia": 1, "Breast pain": 1, "Bundle branch block left": 1, "Cardiac infection": 1, "Cardiac stress test": 1, "Cardiopulmonary exercise test": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Cerebral disorder": 1, "Chapped lips": 1, "Chorioretinopathy": 1, "Computerised tomogram": 1, "Continuous positive airway pressure": 1, "Contusion": 1, "Coronary ostial stenosis": 1, "Dactylitis": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dental discomfort": 1, "Dermatitis allergic": 1, "Diffuse alopecia": 1, "Disorientation": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dyspepsia": 1, "Dysuria": 1, "Ear discomfort": 1, "Ear disorder": 1, "Ear pain": 1, "Ear swelling": 1, "Ear, nose and throat examination": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Emotional disorder": 1, "Endoscopy upper gastrointestinal tract": 1, "Enzyme level test": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Epistaxis": 1, "Erectile dysfunction": 1, "Exposure during pregnancy": 1, "Eye disorder": 1, "Facial pain": 1, "Faeces discoloured": 1, "Faeces soft": 1, "Feeling hot": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Glioblastoma": 1, "Glucose urine present": 1, "Guillain-Barre syndrome": 1, "Haemoptysis": 1, "Haemorrhage urinary tract": 1, "Head circumference": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Hyperbilirubinaemia neonatal": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hypothyroidism": 1, "Illness": 1, "Illusion": 1, "Immune system disorder": 1, "Immunisation": 1, "Impaired work ability": 1, "Inflammation": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Intracranial pressure increased": 1, "Ischaemic stroke": 1, "Joint lock": 1, "Joint range of motion decreased": 1, "Left atrial enlargement": 1, "Length at birth": 1, "Lip dry": 1, "Lower respiratory tract infection": 1, "Lung disorder": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Migraine with aura": 1, "Mood swings": 1, "Muscle disorder": 1, "Muscle spasms": 1, "Muscle spasticity": 1, "Muscle strength abnormal": 1, "Muscle tightness": 1, "Myocardial oedema": 1, "Nasal congestion": 1, "Neck mass": 1, "Nervousness": 1, "Neuralgia": 1, "Neurogenic shock": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Optic neuritis": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Peroneal nerve palsy": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngitis": 1, "Photopsia": 1, "Pleural effusion": 1, "Pneumonitis": 1, "Pollakiuria": 1, "Postmenopausal haemorrhage": 1, "Premature baby": 1, "Presyncope": 1, "Product use issue": 1, "Psoriasis": 1, "Psoriatic arthropathy": 1, "Pulmonary contusion": 1, "Rash papular": 1, "Rash pruritic": 1, "Restlessness": 1, "Rosacea": 1, "SARS-CoV-1 test": 1, "Scratch": 1, "Sinus arrhythmia": 1, "Sinus congestion": 1, "Sinus tachycardia": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion": 1, "Skin wound": 1, "Sleep disorder": 1, "Speech disorder": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Target skin lesion": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid pain": 1, "Tongue dry": 1, "Tourette's disorder": 1, "Tremor": 1, "Troponin": 1, "Tuberculin test": 1, "Tuberculosis": 1, "Ultrasound breast": 1, "Ultrasound chest": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Urticaria": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Vein rupture": 1, "Ventilation/perfusion scan": 1, "Ventricular dysfunction": 1, "Ventricular extrasystoles": 1, "Vestibular neuronitis": 1, "Vitreous detachment": 1, "Walking disability": 1, "Wheezing": 1}, "batchcodes": ["FD7204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD7206-CC05.json b/docs/data/histograms/Canada/FD7206-CC05.json
index 2ff77e4e72c..f770a972be0 100644
--- a/docs/data/histograms/Canada/FD7206-CC05.json
+++ b/docs/data/histograms/Canada/FD7206-CC05.json
@@ -1 +1 @@
-{"batchcode": "FD7206-CC05", "histograms": [{"batchcodes": ["FD7206-CC05"], "histogram": {"Asthenia": 1, "Chills": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Mobility decreased": 1, "Pain": 1, "Pyrexia": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7206-CC05", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Mobility decreased": 1, "Pain": 1, "Pyrexia": 1, "Tenderness": 1}, "batchcodes": ["FD7206-CC05"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD7206.json b/docs/data/histograms/Canada/FD7206.json
index 83bc92beeca..7b409708e5d 100644
--- a/docs/data/histograms/Canada/FD7206.json
+++ b/docs/data/histograms/Canada/FD7206.json
@@ -1 +1 @@
-{"batchcode": "FD7206", "histograms": [{"batchcodes": ["FD7206"], "histogram": {"Chest pain": 58, "Myocarditis": 42, "Pericarditis": 32, "Inappropriate schedule of product administration": 30, "Dyspnoea": 27, "SARS-CoV-2 test": 24, "Dizziness": 19, "Palpitations": 18, "Headache": 17, "Nausea": 17, "Myopericarditis": 16, "Fatigue": 15, "Pyrexia": 15, "Chest discomfort": 11, "Pain in extremity": 10, "Malaise": 9, "Blood pressure measurement": 7, "Chills": 7, "Heart rate": 7, "Paraesthesia": 7, "Arthralgia": 6, "Asthenia": 6, "Hyperhidrosis": 6, "Hypoaesthesia": 6, "Tachycardia": 6, "Vomiting": 6, "Back pain": 5, "Diarrhoea": 5, "Dyspnoea exertional": 5, "Investigation": 5, "Pleuritic pain": 5, "Presyncope": 5, "Tinnitus": 5, "Vertigo": 5, "Abdominal pain": 4, "Atrial fibrillation": 4, "Blood test": 4, "Burning sensation": 4, "COVID-19": 4, "Feeling abnormal": 4, "Heavy menstrual bleeding": 4, "Insomnia": 4, "Loss of consciousness": 4, "Loss of personal independence in daily activities": 4, "Migraine": 4, "Pain": 4, "Weight": 4, "Arthritis": 3, "Body temperature": 3, "Deafness unilateral": 3, "Decreased appetite": 3, "Heart rate increased": 3, "Lethargy": 3, "Lymphadenopathy": 3, "Menstruation irregular": 3, "Myalgia": 3, "Nasopharyngitis": 3, "Oropharyngeal pain": 3, "Pruritus": 3, "Seizure": 3, "Sinus tachycardia": 3, "Swollen tongue": 3, "Syncope": 3, "Tremor": 3, "Weight decreased": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Amnesia": 2, "Anxiety": 2, "Blood pressure increased": 2, "Chest X-ray": 2, "Condition aggravated": 2, "Cough": 2, "Dizziness postural": 2, "Drug ineffective": 2, "Dry eye": 2, "Dry mouth": 2, "Dysgeusia": 2, "Dysmenorrhoea": 2, "Dysuria": 2, "Endoscopy": 2, "Extrasystoles": 2, "Feeling hot": 2, "Heart rate irregular": 2, "Herpes zoster": 2, "Left ventricular dysfunction": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Musculoskeletal stiffness": 2, "Myocardial infarction": 2, "Off label use": 2, "Pain in jaw": 2, "Pallor": 2, "Pericardial effusion": 2, "Pharyngeal swelling": 2, "Polymenorrhoea": 2, "Postmenopausal haemorrhage": 2, "Retching": 2, "Rhinorrhoea": 2, "Sinus arrhythmia": 2, "Skin burning sensation": 2, "Urine analysis": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Abnormal sensation in eye": 1, "Abortion spontaneous": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Adnexa uteri pain": 1, "Affective disorder": 1, "Allergy test": 1, "Alopecia": 1, "Amenorrhoea": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Antibody test": 1, "Aphonia": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Asthma": 1, "Barium swallow": 1, "Biopsy endometrium": 1, "Blindness": 1, "Blood cholesterol increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Body height": 1, "Bone pain": 1, "Bradycardia": 1, "Bundle branch block right": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cardiomyopathy": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Congenital anomaly": 1, "Coronary artery dilatation": 1, "Coronary artery disease": 1, "Costochondritis": 1, "Crying": 1, "Deafness neurosensory": 1, "Death": 1, "Deep vein thrombosis": 1, "Defect conduction intraventricular": 1, "Diplacusis": 1, "Diplopia": 1, "Discomfort": 1, "Dyshidrotic eczema": 1, "Ear discomfort": 1, "Ear disorder": 1, "Ear swelling": 1, "Electrocardiogram ST segment elevation": 1, "Epistaxis": 1, "Erythema": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Gait disturbance": 1, "Gallbladder polyp": 1, "Gastrooesophageal reflux disease": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heart rate abnormal": 1, "High density lipoprotein": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hydronephrosis": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypotension": 1, "Illness": 1, "Impaired gastric emptying": 1, "Influenza": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Laboratory test": 1, "Left ventricular dilatation": 1, "Left ventricular hypertrophy": 1, "Limb discomfort": 1, "Lip oedema": 1, "Low density lipoprotein": 1, "Lung hyperinflation": 1, "Mammogram": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Multiple sclerosis": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Myasthenia gravis": 1, "Myocardial injury": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neurosis": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Optic neuritis": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1, "Painful respiration": 1, "Palmoplantar pustulosis": 1, "Pericardial fibrosis": 1, "Photosensitivity reaction": 1, "Platelet count": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Premenstrual syndrome": 1, "Product administered at inappropriate site": 1, "Product use issue": 1, "Psoriasis": 1, "Pyelonephritis acute": 1, "Rash": 1, "Rash macular": 1, "Raynaud's phenomenon": 1, "Rectal haemorrhage": 1, "Renal failure": 1, "Respiratory disorder": 1, "Respiratory tract infection": 1, "Rhinovirus infection": 1, "Right ventricular dilatation": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Serology test": 1, "Sinus bradycardia": 1, "Smear cervix": 1, "Suicidal ideation": 1, "Swelling": 1, "Tachypnoea": 1, "Tenderness": 1, "Tendonitis": 1, "Throat irritation": 1, "Thrombosis": 1, "Thyroid function test": 1, "Troponin": 1, "Ulcer": 1, "Ultrasound Doppler": 1, "Ultrasound scan abnormal": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Ventricular hypokinesia": 1, "Ventricular pre-excitation": 1, "Vulval ulceration": 1, "Vulvovaginal swelling": 1, "Walking disability": 1, "Weight increased": 1, "Wolff-Parkinson-White syndrome": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7206", "histograms": [{"histogram": {"Chest pain": 58, "Myocarditis": 42, "Pericarditis": 32, "Inappropriate schedule of product administration": 30, "Dyspnoea": 27, "SARS-CoV-2 test": 24, "Dizziness": 19, "Palpitations": 18, "Headache": 17, "Nausea": 17, "Myopericarditis": 16, "Fatigue": 15, "Pyrexia": 15, "Chest discomfort": 11, "Pain in extremity": 10, "Malaise": 9, "Blood pressure measurement": 7, "Chills": 7, "Heart rate": 7, "Paraesthesia": 7, "Arthralgia": 6, "Asthenia": 6, "Hyperhidrosis": 6, "Hypoaesthesia": 6, "Tachycardia": 6, "Vomiting": 6, "Back pain": 5, "Diarrhoea": 5, "Dyspnoea exertional": 5, "Investigation": 5, "Pleuritic pain": 5, "Presyncope": 5, "Tinnitus": 5, "Vertigo": 5, "Abdominal pain": 4, "Atrial fibrillation": 4, "Blood test": 4, "Burning sensation": 4, "COVID-19": 4, "Feeling abnormal": 4, "Heavy menstrual bleeding": 4, "Insomnia": 4, "Loss of consciousness": 4, "Loss of personal independence in daily activities": 4, "Migraine": 4, "Pain": 4, "Weight": 4, "Arthritis": 3, "Body temperature": 3, "Deafness unilateral": 3, "Decreased appetite": 3, "Heart rate increased": 3, "Lethargy": 3, "Lymphadenopathy": 3, "Menstruation irregular": 3, "Myalgia": 3, "Nasopharyngitis": 3, "Oropharyngeal pain": 3, "Pruritus": 3, "Seizure": 3, "Sinus tachycardia": 3, "Swollen tongue": 3, "Syncope": 3, "Tremor": 3, "Weight decreased": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Amnesia": 2, "Anxiety": 2, "Blood pressure increased": 2, "Chest X-ray": 2, "Condition aggravated": 2, "Cough": 2, "Dizziness postural": 2, "Drug ineffective": 2, "Dry eye": 2, "Dry mouth": 2, "Dysgeusia": 2, "Dysmenorrhoea": 2, "Dysuria": 2, "Endoscopy": 2, "Extrasystoles": 2, "Feeling hot": 2, "Heart rate irregular": 2, "Herpes zoster": 2, "Left ventricular dysfunction": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Musculoskeletal stiffness": 2, "Myocardial infarction": 2, "Off label use": 2, "Pain in jaw": 2, "Pallor": 2, "Pericardial effusion": 2, "Pharyngeal swelling": 2, "Polymenorrhoea": 2, "Postmenopausal haemorrhage": 2, "Retching": 2, "Rhinorrhoea": 2, "Sinus arrhythmia": 2, "Skin burning sensation": 2, "Urine analysis": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Abnormal sensation in eye": 1, "Abortion spontaneous": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Adnexa uteri pain": 1, "Affective disorder": 1, "Allergy test": 1, "Alopecia": 1, "Amenorrhoea": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Antibody test": 1, "Aphonia": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Asthma": 1, "Barium swallow": 1, "Biopsy endometrium": 1, "Blindness": 1, "Blood cholesterol increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Body height": 1, "Bone pain": 1, "Bradycardia": 1, "Bundle branch block right": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cardiomyopathy": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Congenital anomaly": 1, "Coronary artery dilatation": 1, "Coronary artery disease": 1, "Costochondritis": 1, "Crying": 1, "Deafness neurosensory": 1, "Death": 1, "Deep vein thrombosis": 1, "Defect conduction intraventricular": 1, "Diplacusis": 1, "Diplopia": 1, "Discomfort": 1, "Dyshidrotic eczema": 1, "Ear discomfort": 1, "Ear disorder": 1, "Ear swelling": 1, "Electrocardiogram ST segment elevation": 1, "Epistaxis": 1, "Erythema": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Gait disturbance": 1, "Gallbladder polyp": 1, "Gastrooesophageal reflux disease": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heart rate abnormal": 1, "High density lipoprotein": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hydronephrosis": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypotension": 1, "Illness": 1, "Impaired gastric emptying": 1, "Influenza": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Laboratory test": 1, "Left ventricular dilatation": 1, "Left ventricular hypertrophy": 1, "Limb discomfort": 1, "Lip oedema": 1, "Low density lipoprotein": 1, "Lung hyperinflation": 1, "Mammogram": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Multiple sclerosis": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Myasthenia gravis": 1, "Myocardial injury": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neurosis": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Optic neuritis": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1, "Painful respiration": 1, "Palmoplantar pustulosis": 1, "Pericardial fibrosis": 1, "Photosensitivity reaction": 1, "Platelet count": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Premenstrual syndrome": 1, "Product administered at inappropriate site": 1, "Product use issue": 1, "Psoriasis": 1, "Pyelonephritis acute": 1, "Rash": 1, "Rash macular": 1, "Raynaud's phenomenon": 1, "Rectal haemorrhage": 1, "Renal failure": 1, "Respiratory disorder": 1, "Respiratory tract infection": 1, "Rhinovirus infection": 1, "Right ventricular dilatation": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Serology test": 1, "Sinus bradycardia": 1, "Smear cervix": 1, "Suicidal ideation": 1, "Swelling": 1, "Tachypnoea": 1, "Tenderness": 1, "Tendonitis": 1, "Throat irritation": 1, "Thrombosis": 1, "Thyroid function test": 1, "Troponin": 1, "Ulcer": 1, "Ultrasound Doppler": 1, "Ultrasound scan abnormal": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Ventricular hypokinesia": 1, "Ventricular pre-excitation": 1, "Vulval ulceration": 1, "Vulvovaginal swelling": 1, "Walking disability": 1, "Weight increased": 1, "Wolff-Parkinson-White syndrome": 1, "X-ray": 1}, "batchcodes": ["FD7206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD7208.json b/docs/data/histograms/Canada/FD7208.json
index 2501545b8d2..69ba87dd90d 100644
--- a/docs/data/histograms/Canada/FD7208.json
+++ b/docs/data/histograms/Canada/FD7208.json
@@ -1 +1 @@
-{"batchcode": "FD7208", "histograms": [{"batchcodes": ["FD7208"], "histogram": {"Myocarditis": 6, "Chest pain": 5, "Pericarditis": 4, "SARS-CoV-2 test": 3, "Dyspnoea": 2, "Fatigue": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Rash": 2, "Vomiting": 2, "Abdominal pain": 1, "Arthralgia": 1, "Basophil count": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Bronchitis bacterial": 1, "COVID-19": 1, "Dizziness": 1, "Drug ineffective": 1, "Eosinophil count": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Menstrual disorder": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Neutrophil count": 1, "Ovulation pain": 1, "Pain in extremity": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Pruritus": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Seizure": 1, "Sinus tachycardia": 1, "Syncope": 1, "Thyroxine": 1, "Urinary retention": 1, "Vision blurred": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7208", "histograms": [{"histogram": {"Myocarditis": 6, "Chest pain": 5, "Pericarditis": 4, "SARS-CoV-2 test": 3, "Dyspnoea": 2, "Fatigue": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Rash": 2, "Vomiting": 2, "Abdominal pain": 1, "Arthralgia": 1, "Basophil count": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Bronchitis bacterial": 1, "COVID-19": 1, "Dizziness": 1, "Drug ineffective": 1, "Eosinophil count": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Menstrual disorder": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Neutrophil count": 1, "Ovulation pain": 1, "Pain in extremity": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Pruritus": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Seizure": 1, "Sinus tachycardia": 1, "Syncope": 1, "Thyroxine": 1, "Urinary retention": 1, "Vision blurred": 1, "White blood cell count": 1}, "batchcodes": ["FD7208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD810.json b/docs/data/histograms/Canada/FD810.json
index 5b714931dd6..1ed331e6db4 100644
--- a/docs/data/histograms/Canada/FD810.json
+++ b/docs/data/histograms/Canada/FD810.json
@@ -1 +1 @@
-{"batchcode": "FD810", "histograms": [{"batchcodes": ["FD810"], "histogram": {"Blood test": 1, "Herpes pharyngitis": 1, "Inappropriate schedule of product administration": 1, "Oral herpes": 1, "Postmenopausal haemorrhage": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FD810", "histograms": [{"histogram": {"Blood test": 1, "Herpes pharyngitis": 1, "Inappropriate schedule of product administration": 1, "Oral herpes": 1, "Postmenopausal haemorrhage": 1, "White blood cell count": 1}, "batchcodes": ["FD810"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FD8448.json b/docs/data/histograms/Canada/FD8448.json
index b5ba14756fd..1671ae6298e 100644
--- a/docs/data/histograms/Canada/FD8448.json
+++ b/docs/data/histograms/Canada/FD8448.json
@@ -1 +1 @@
-{"batchcode": "FD8448", "histograms": [{"batchcodes": ["FD8448"], "histogram": {"Hyperventilation": 1, "Speech disorder": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8448", "histograms": [{"histogram": {"Hyperventilation": 1, "Speech disorder": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["FD8448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FDO810.json b/docs/data/histograms/Canada/FDO810.json
index d124fd2435b..3104de75cc7 100644
--- a/docs/data/histograms/Canada/FDO810.json
+++ b/docs/data/histograms/Canada/FDO810.json
@@ -1 +1 @@
-{"batchcode": "FDO810", "histograms": [{"batchcodes": ["FDO810"], "histogram": {"Pneumonia": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FDO810", "histograms": [{"histogram": {"Pneumonia": 1, "Polymerase chain reaction": 1}, "batchcodes": ["FDO810"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FE3591.json b/docs/data/histograms/Canada/FE3591.json
index 15804341c03..470231950d5 100644
--- a/docs/data/histograms/Canada/FE3591.json
+++ b/docs/data/histograms/Canada/FE3591.json
@@ -1 +1 @@
-{"batchcode": "FE3591", "histograms": [{"batchcodes": ["FE3591"], "histogram": {"Chest pain": 2, "Myopericarditis": 2, "Cardiac flutter": 1, "Dizziness": 1, "Dyspnoea": 1, "Myocarditis": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3591", "histograms": [{"histogram": {"Chest pain": 2, "Myopericarditis": 2, "Cardiac flutter": 1, "Dizziness": 1, "Dyspnoea": 1, "Myocarditis": 1, "Palpitations": 1}, "batchcodes": ["FE3591"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FE5109.json b/docs/data/histograms/Canada/FE5109.json
index f6fa140c360..94c297de7db 100644
--- a/docs/data/histograms/Canada/FE5109.json
+++ b/docs/data/histograms/Canada/FE5109.json
@@ -1 +1 @@
-{"batchcode": "FE5109", "histograms": [{"batchcodes": ["FE5109"], "histogram": {"Alanine aminotransferase": 1, "Autoimmune hepatitis": 1, "Basophil count": 1, "Blood creatinine": 1, "Blood glucose": 1, "Eosinophil count": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Investigation": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Platelet count": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Urticaria": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FE5109", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Autoimmune hepatitis": 1, "Basophil count": 1, "Blood creatinine": 1, "Blood glucose": 1, "Eosinophil count": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Investigation": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Platelet count": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Urticaria": 1, "White blood cell count": 1}, "batchcodes": ["FE5109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FF 5109.json b/docs/data/histograms/Canada/FF 5109.json
index c669da3428e..e2cfac6cbb5 100644
--- a/docs/data/histograms/Canada/FF 5109.json
+++ b/docs/data/histograms/Canada/FF 5109.json
@@ -1 +1 @@
-{"batchcode": "FF 5109", "histograms": [{"batchcodes": ["FF 5109"], "histogram": {"Blood test": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Lichenification": 1, "Melanocytic naevus": 1, "Papule": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Skin burning sensation": 1}}]}
\ No newline at end of file
+{"batchcode": "FF 5109", "histograms": [{"histogram": {"Blood test": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Lichenification": 1, "Melanocytic naevus": 1, "Papule": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Skin burning sensation": 1}, "batchcodes": ["FF 5109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FF25595.json b/docs/data/histograms/Canada/FF25595.json
index 2980ff753f0..53e61cced16 100644
--- a/docs/data/histograms/Canada/FF25595.json
+++ b/docs/data/histograms/Canada/FF25595.json
@@ -1 +1 @@
-{"batchcode": "FF25595", "histograms": [{"batchcodes": ["043021A", "EN1198", "FF25595"], "histogram": {"Acne": 1, "Fall": 1, "Feeling abnormal": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Platelet factor 4": 1, "Screaming": 1, "Skin infection": 1, "Skin papilloma": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "FF25595", "histograms": [{"histogram": {"Acne": 1, "Fall": 1, "Feeling abnormal": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Platelet factor 4": 1, "Screaming": 1, "Skin infection": 1, "Skin papilloma": 1, "Sleep disorder": 1}, "batchcodes": ["043021A", "EN1198", "FF25595"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FF2595.json b/docs/data/histograms/Canada/FF2595.json
index ce351f5b25e..8ccc29e6140 100644
--- a/docs/data/histograms/Canada/FF2595.json
+++ b/docs/data/histograms/Canada/FF2595.json
@@ -1 +1 @@
-{"batchcode": "FF2595", "histograms": [{"batchcodes": ["063H21A", "FF2595"], "histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1}}, {"batchcodes": ["FF2595"], "histogram": {"Chest pain": 18, "Myopericarditis": 12, "SARS-CoV-2 test": 12, "Chest discomfort": 10, "Dyspnoea": 10, "Palpitations": 10, "Inappropriate schedule of product administration": 9, "Chills": 7, "Fatigue": 7, "Immunisation": 7, "Myocarditis": 7, "Pyrexia": 7, "Blood pressure measurement": 6, "Headache": 6, "Investigation": 6, "COVID-19": 5, "Dizziness": 5, "Drug ineffective": 5, "Hypoaesthesia": 5, "Pain": 5, "Tinnitus": 5, "Heart rate": 4, "Hypertension": 4, "Pain in extremity": 4, "Pericarditis": 4, "Abdominal pain upper": 3, "Bell's palsy": 3, "Blood test": 3, "Computerised tomogram": 3, "Loss of consciousness": 3, "Malaise": 3, "Nausea": 3, "Paraesthesia": 3, "Alopecia": 2, "Anxiety": 2, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "Biopsy": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "Diarrhoea": 2, "Dyspnoea exertional": 2, "Electrocardiogram": 2, "Feeling hot": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate increased": 2, "Heavy menstrual bleeding": 2, "Joint swelling": 2, "Loss of personal independence in daily activities": 2, "Lymphadenopathy": 2, "Migraine": 2, "Off label use": 2, "Polymerase chain reaction": 2, "Pruritus": 2, "Rash": 2, "Rhinorrhoea": 2, "Splenomegaly": 2, "Thrombosis": 2, "Ultrasound scan": 2, "Vision blurred": 2, "Weight decreased": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Amylase": 1, "Angina pectoris": 1, "Aphthous ulcer": 1, "Arrhythmia": 1, "Arthropathy": 1, "Aspartate aminotransferase": 1, "Atrioventricular block first degree": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood alkaline phosphatase normal": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood creatine phosphokinase": 1, "Blood creatinine normal": 1, "Blood electrolytes normal": 1, "Blood glucose normal": 1, "Blood gonadotrophin normal": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood pressure systolic increased": 1, "Blood urea": 1, "Bradykinesia": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac flutter": 1, "Coagulopathy": 1, "Colonoscopy": 1, "Confusional state": 1, "Coordination abnormal": 1, "Coronary artery disease": 1, "Cough": 1, "Crohn's disease": 1, "Decreased appetite": 1, "Dermatitis atopic": 1, "Diagnostic aspiration": 1, "Drug level therapeutic": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear pain": 1, "Eye haemorrhage": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Food allergy": 1, "Formication": 1, "Full blood count": 1, "Glomerular filtration rate": 1, "Goitre": 1, "Haematochezia": 1, "Heart rate irregular": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hyperthyroidism": 1, "Hypotension": 1, "IgA nephropathy": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Lethargy": 1, "Limb deformity": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Menstrual disorder": 1, "Microangiopathy": 1, "Mitochondrial myopathy": 1, "Monocytosis": 1, "Muscle spasms": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nerve injury": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Nystagmus": 1, "Ocular hyperaemia": 1, "Oligomenorrhoea": 1, "Oral mucosal blistering": 1, "Ovarian cyst ruptured": 1, "Panic attack": 1, "Peripheral coldness": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Post herpetic neuralgia": 1, "Postmenopausal haemorrhage": 1, "Pregnancy test": 1, "Protein total normal": 1, "Rash macular": 1, "Renal transplant": 1, "Respiratory failure": 1, "SARS-CoV-1 test": 1, "Salivary gland cyst": 1, "Secretion discharge": 1, "Seizure": 1, "Sneezing": 1, "Specialist consultation": 1, "Stress cardiomyopathy": 1, "Suspected COVID-19": 1, "Swelling": 1, "Target skin lesion": 1, "Tension headache": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thyroiditis": 1, "Tremor": 1, "Troponin I": 1, "Ultrasound testes": 1, "Upper-airway cough syndrome": 1, "Urine analysis": 1, "Urticaria": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vertigo": 1, "Viral test": 1, "Vomiting": 1, "Weight": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2595", "histograms": [{"histogram": {"COVID-19": 1, "Disease recurrence": 1, "Drug ineffective": 1}, "batchcodes": ["063H21A", "FF2595"]}, {"histogram": {"Chest pain": 18, "Myopericarditis": 12, "SARS-CoV-2 test": 12, "Chest discomfort": 10, "Dyspnoea": 10, "Palpitations": 10, "Inappropriate schedule of product administration": 9, "Chills": 7, "Fatigue": 7, "Immunisation": 7, "Myocarditis": 7, "Pyrexia": 7, "Blood pressure measurement": 6, "Headache": 6, "Investigation": 6, "COVID-19": 5, "Dizziness": 5, "Drug ineffective": 5, "Hypoaesthesia": 5, "Pain": 5, "Tinnitus": 5, "Heart rate": 4, "Hypertension": 4, "Pain in extremity": 4, "Pericarditis": 4, "Abdominal pain upper": 3, "Bell's palsy": 3, "Blood test": 3, "Computerised tomogram": 3, "Loss of consciousness": 3, "Malaise": 3, "Nausea": 3, "Paraesthesia": 3, "Alopecia": 2, "Anxiety": 2, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "Biopsy": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "Diarrhoea": 2, "Dyspnoea exertional": 2, "Electrocardiogram": 2, "Feeling hot": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate increased": 2, "Heavy menstrual bleeding": 2, "Joint swelling": 2, "Loss of personal independence in daily activities": 2, "Lymphadenopathy": 2, "Migraine": 2, "Off label use": 2, "Polymerase chain reaction": 2, "Pruritus": 2, "Rash": 2, "Rhinorrhoea": 2, "Splenomegaly": 2, "Thrombosis": 2, "Ultrasound scan": 2, "Vision blurred": 2, "Weight decreased": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Amylase": 1, "Angina pectoris": 1, "Aphthous ulcer": 1, "Arrhythmia": 1, "Arthropathy": 1, "Aspartate aminotransferase": 1, "Atrioventricular block first degree": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood alkaline phosphatase normal": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood creatine phosphokinase": 1, "Blood creatinine normal": 1, "Blood electrolytes normal": 1, "Blood glucose normal": 1, "Blood gonadotrophin normal": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood pressure systolic increased": 1, "Blood urea": 1, "Bradykinesia": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac flutter": 1, "Coagulopathy": 1, "Colonoscopy": 1, "Confusional state": 1, "Coordination abnormal": 1, "Coronary artery disease": 1, "Cough": 1, "Crohn's disease": 1, "Decreased appetite": 1, "Dermatitis atopic": 1, "Diagnostic aspiration": 1, "Drug level therapeutic": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear pain": 1, "Eye haemorrhage": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Food allergy": 1, "Formication": 1, "Full blood count": 1, "Glomerular filtration rate": 1, "Goitre": 1, "Haematochezia": 1, "Heart rate irregular": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hyperthyroidism": 1, "Hypotension": 1, "IgA nephropathy": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Lethargy": 1, "Limb deformity": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Menstrual disorder": 1, "Microangiopathy": 1, "Mitochondrial myopathy": 1, "Monocytosis": 1, "Muscle spasms": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nerve injury": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Nystagmus": 1, "Ocular hyperaemia": 1, "Oligomenorrhoea": 1, "Oral mucosal blistering": 1, "Ovarian cyst ruptured": 1, "Panic attack": 1, "Peripheral coldness": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pneumonia": 1, "Post herpetic neuralgia": 1, "Postmenopausal haemorrhage": 1, "Pregnancy test": 1, "Protein total normal": 1, "Rash macular": 1, "Renal transplant": 1, "Respiratory failure": 1, "SARS-CoV-1 test": 1, "Salivary gland cyst": 1, "Secretion discharge": 1, "Seizure": 1, "Sneezing": 1, "Specialist consultation": 1, "Stress cardiomyopathy": 1, "Suspected COVID-19": 1, "Swelling": 1, "Target skin lesion": 1, "Tension headache": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thyroiditis": 1, "Tremor": 1, "Troponin I": 1, "Ultrasound testes": 1, "Upper-airway cough syndrome": 1, "Urine analysis": 1, "Urticaria": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vertigo": 1, "Viral test": 1, "Vomiting": 1, "Weight": 1, "X-ray": 1}, "batchcodes": ["FF2595"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FF2596.json b/docs/data/histograms/Canada/FF2596.json
index 7fa724dbd27..0feb4c241c0 100644
--- a/docs/data/histograms/Canada/FF2596.json
+++ b/docs/data/histograms/Canada/FF2596.json
@@ -1 +1 @@
-{"batchcode": "FF2596", "histograms": [{"batchcodes": ["FF2596"], "histogram": {"Aphonia": 1, "Dysphonia": 1, "Inflammation": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2596", "histograms": [{"histogram": {"Aphonia": 1, "Dysphonia": 1, "Inflammation": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FF2596"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FF5109.json b/docs/data/histograms/Canada/FF5109.json
index 6b43bf82c6f..e7dfd71ecb2 100644
--- a/docs/data/histograms/Canada/FF5109.json
+++ b/docs/data/histograms/Canada/FF5109.json
@@ -1 +1 @@
-{"batchcode": "FF5109", "histograms": [{"batchcodes": ["FF5109"], "histogram": {"Pericarditis": 11, "Dyspnoea": 10, "SARS-CoV-2 test": 10, "Chest discomfort": 8, "Immunisation": 7, "Chest pain": 6, "Headache": 6, "Dizziness": 5, "Pain": 5, "Chills": 4, "Inappropriate schedule of product administration": 4, "Interchange of vaccine products": 4, "Off label use": 4, "Pyrexia": 4, "Tinnitus": 4, "Vomiting": 4, "Angina pectoris": 3, "Blood pressure measurement": 3, "Deafness": 3, "Fatigue": 3, "Myalgia": 3, "Myocarditis": 3, "Palpitations": 3, "Tachycardia": 3, "Anxiety": 2, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "COVID-19": 2, "Condition aggravated": 2, "Cough": 2, "Drug ineffective": 2, "Dysphagia": 2, "Electrocardiogram": 2, "Feeling abnormal": 2, "Hypertension": 2, "Lymphadenopathy": 2, "Musculoskeletal stiffness": 2, "Myopericarditis": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Pleural effusion": 2, "Pneumonia": 2, "Rash": 2, "Thrombosis": 2, "Abdominal distension": 1, "Acoustic stimulation tests": 1, "Axillary pain": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Bronchoscopy": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Chillblains": 1, "Choking sensation": 1, "Computerised tomogram": 1, "Confusional state": 1, "Crepitations": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Diarrhoea haemorrhagic": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Ear swelling": 1, "Eye pain": 1, "Eye pruritus": 1, "Fall": 1, "Fluid retention": 1, "Gastrointestinal pain": 1, "General physical health deterioration": 1, "Goitre": 1, "Haematochezia": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Illness": 1, "Influenza": 1, "Insomnia": 1, "Investigation": 1, "Jaw operation": 1, "Laboratory test": 1, "Lethargy": 1, "Lymph node pain": 1, "Malaise": 1, "Mammogram": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oedema": 1, "Panic attack": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pleuritic pain": 1, "Postmenopausal haemorrhage": 1, "Respiratory symptom": 1, "Restlessness": 1, "SARS-CoV-2 test negative": 1, "Sinus tachycardia": 1, "Syncope": 1, "Tenosynovitis stenosans": 1, "Thyroid pain": 1, "Tremor": 1, "Troponin": 1, "Ultrasound testes": 1, "Urinary incontinence": 1, "Vaccination site pain": 1, "Vaccination site urticaria": 1, "Vasculitis": 1, "Venoocclusive liver disease": 1, "Vertigo": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5109", "histograms": [{"histogram": {"Pericarditis": 11, "Dyspnoea": 10, "SARS-CoV-2 test": 10, "Chest discomfort": 8, "Immunisation": 7, "Chest pain": 6, "Headache": 6, "Dizziness": 5, "Pain": 5, "Chills": 4, "Inappropriate schedule of product administration": 4, "Interchange of vaccine products": 4, "Off label use": 4, "Pyrexia": 4, "Tinnitus": 4, "Vomiting": 4, "Angina pectoris": 3, "Blood pressure measurement": 3, "Deafness": 3, "Fatigue": 3, "Myalgia": 3, "Myocarditis": 3, "Palpitations": 3, "Tachycardia": 3, "Anxiety": 2, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "COVID-19": 2, "Condition aggravated": 2, "Cough": 2, "Drug ineffective": 2, "Dysphagia": 2, "Electrocardiogram": 2, "Feeling abnormal": 2, "Hypertension": 2, "Lymphadenopathy": 2, "Musculoskeletal stiffness": 2, "Myopericarditis": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Pleural effusion": 2, "Pneumonia": 2, "Rash": 2, "Thrombosis": 2, "Abdominal distension": 1, "Acoustic stimulation tests": 1, "Axillary pain": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Bronchoscopy": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Chillblains": 1, "Choking sensation": 1, "Computerised tomogram": 1, "Confusional state": 1, "Crepitations": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Diarrhoea haemorrhagic": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Ear swelling": 1, "Eye pain": 1, "Eye pruritus": 1, "Fall": 1, "Fluid retention": 1, "Gastrointestinal pain": 1, "General physical health deterioration": 1, "Goitre": 1, "Haematochezia": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Illness": 1, "Influenza": 1, "Insomnia": 1, "Investigation": 1, "Jaw operation": 1, "Laboratory test": 1, "Lethargy": 1, "Lymph node pain": 1, "Malaise": 1, "Mammogram": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oedema": 1, "Panic attack": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pleuritic pain": 1, "Postmenopausal haemorrhage": 1, "Respiratory symptom": 1, "Restlessness": 1, "SARS-CoV-2 test negative": 1, "Sinus tachycardia": 1, "Syncope": 1, "Tenosynovitis stenosans": 1, "Thyroid pain": 1, "Tremor": 1, "Troponin": 1, "Ultrasound testes": 1, "Urinary incontinence": 1, "Vaccination site pain": 1, "Vaccination site urticaria": 1, "Vasculitis": 1, "Venoocclusive liver disease": 1, "Vertigo": 1, "X-ray": 1}, "batchcodes": ["FF5109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FF51V9.json b/docs/data/histograms/Canada/FF51V9.json
index 6714459dfc1..6e9be75ddf1 100644
--- a/docs/data/histograms/Canada/FF51V9.json
+++ b/docs/data/histograms/Canada/FF51V9.json
@@ -1 +1 @@
-{"batchcode": "FF51V9", "histograms": [{"batchcodes": ["FF51V9"], "histogram": {"Bronchitis": 1, "Inappropriate schedule of product administration": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FF51V9", "histograms": [{"histogram": {"Bronchitis": 1, "Inappropriate schedule of product administration": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FF51V9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FG6995.json b/docs/data/histograms/Canada/FG6995.json
index a145f8a0d63..f1fe9f1f63c 100644
--- a/docs/data/histograms/Canada/FG6995.json
+++ b/docs/data/histograms/Canada/FG6995.json
@@ -1 +1 @@
-{"batchcode": "FG6995", "histograms": [{"batchcodes": ["FG6995"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "FG6995", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["FG6995"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FJ1611.json b/docs/data/histograms/Canada/FJ1611.json
index b945d593ec8..5869a07a244 100644
--- a/docs/data/histograms/Canada/FJ1611.json
+++ b/docs/data/histograms/Canada/FJ1611.json
@@ -1 +1 @@
-{"batchcode": "FJ1611", "histograms": [{"batchcodes": ["FJ1611"], "histogram": {"Balance disorder": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Computerised tomogram": 1, "Hypoaesthesia": 1, "Investigation": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1611", "histograms": [{"histogram": {"Balance disorder": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Computerised tomogram": 1, "Hypoaesthesia": 1, "Investigation": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Paraesthesia": 1}, "batchcodes": ["FJ1611"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FJ1620.json b/docs/data/histograms/Canada/FJ1620.json
index 085b2766e3d..fae4ba20121 100644
--- a/docs/data/histograms/Canada/FJ1620.json
+++ b/docs/data/histograms/Canada/FJ1620.json
@@ -1 +1 @@
-{"batchcode": "FJ1620", "histograms": [{"batchcodes": ["FJ1620"], "histogram": {"Chest pain": 1, "Oropharyngeal discomfort": 1, "Painful respiration": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1620", "histograms": [{"histogram": {"Chest pain": 1, "Oropharyngeal discomfort": 1, "Painful respiration": 1}, "batchcodes": ["FJ1620"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FJ8762.json b/docs/data/histograms/Canada/FJ8762.json
index efae6c3b732..96f97891d16 100644
--- a/docs/data/histograms/Canada/FJ8762.json
+++ b/docs/data/histograms/Canada/FJ8762.json
@@ -1 +1 @@
-{"batchcode": "FJ8762", "histograms": [{"batchcodes": ["FJ8762"], "histogram": {"Dizziness": 1, "Electrocardiogram": 1, "Fall": 1, "Head injury": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "No adverse event": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8762", "histograms": [{"histogram": {"Dizziness": 1, "Electrocardiogram": 1, "Fall": 1, "Head injury": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "No adverse event": 1, "Pain in extremity": 1}, "batchcodes": ["FJ8762"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FK5618.json b/docs/data/histograms/Canada/FK5618.json
index c6c17a1e1fd..7ab76588f2f 100644
--- a/docs/data/histograms/Canada/FK5618.json
+++ b/docs/data/histograms/Canada/FK5618.json
@@ -1 +1 @@
-{"batchcode": "FK5618", "histograms": [{"batchcodes": ["FK5618"], "histogram": {"Chest pain": 9, "Pericarditis": 7, "Myopericarditis": 6, "COVID-19": 5, "Chest discomfort": 3, "Drug ineffective": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Abdominal pain": 2, "Chills": 2, "Dyspnoea exertional": 2, "Erythema": 2, "Hyperhidrosis": 2, "Malaise": 2, "Myocarditis": 2, "Pericardial effusion": 2, "Swelling face": 2, "Urticaria": 2, "Vaccination failure": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Allergy test": 1, "Angioedema": 1, "Arthralgia": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Cardiac tamponade": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysuria": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperaesthesia": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Insomnia": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Nausea": 1, "Painful respiration": 1, "Palpitations": 1, "Paralysis": 1, "Polymerase chain reaction": 1, "Product administered at inappropriate site": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Restlessness": 1, "SARS-CoV-2 RNA": 1, "Sinus arrhythmia": 1, "Supraventricular tachycardia": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FK5618", "histograms": [{"histogram": {"Chest pain": 9, "Pericarditis": 7, "Myopericarditis": 6, "COVID-19": 5, "Chest discomfort": 3, "Drug ineffective": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Abdominal pain": 2, "Chills": 2, "Dyspnoea exertional": 2, "Erythema": 2, "Hyperhidrosis": 2, "Malaise": 2, "Myocarditis": 2, "Pericardial effusion": 2, "Swelling face": 2, "Urticaria": 2, "Vaccination failure": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Allergy test": 1, "Angioedema": 1, "Arthralgia": 1, "Asthenia": 1, "Autoimmune disorder": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Cardiac tamponade": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysuria": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperaesthesia": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Insomnia": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Nausea": 1, "Painful respiration": 1, "Palpitations": 1, "Paralysis": 1, "Polymerase chain reaction": 1, "Product administered at inappropriate site": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Restlessness": 1, "SARS-CoV-2 RNA": 1, "Sinus arrhythmia": 1, "Supraventricular tachycardia": 1, "Tachycardia": 1}, "batchcodes": ["FK5618"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FK9894.json b/docs/data/histograms/Canada/FK9894.json
index c59effa7a42..c67a419432a 100644
--- a/docs/data/histograms/Canada/FK9894.json
+++ b/docs/data/histograms/Canada/FK9894.json
@@ -1 +1 @@
-{"batchcode": "FK9894", "histograms": [{"batchcodes": ["FK9894"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1, "Productive cough": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9894", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1, "Productive cough": 1, "Throat tightness": 1}, "batchcodes": ["FK9894"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FK9896.json b/docs/data/histograms/Canada/FK9896.json
index aef63b42482..0ca833ee88f 100644
--- a/docs/data/histograms/Canada/FK9896.json
+++ b/docs/data/histograms/Canada/FK9896.json
@@ -1 +1 @@
-{"batchcode": "FK9896", "histograms": [{"batchcodes": ["FK9896"], "histogram": {"Dizziness": 2, "Anxiety": 1, "Asthenia": 1, "Pallor": 1, "Respiratory rate increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9896", "histograms": [{"histogram": {"Dizziness": 2, "Anxiety": 1, "Asthenia": 1, "Pallor": 1, "Respiratory rate increased": 1}, "batchcodes": ["FK9896"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FL3003.json b/docs/data/histograms/Canada/FL3003.json
index 0629de2f070..4b95137fcc6 100644
--- a/docs/data/histograms/Canada/FL3003.json
+++ b/docs/data/histograms/Canada/FL3003.json
@@ -1 +1 @@
-{"batchcode": "FL3003", "histograms": [{"batchcodes": ["FL3003"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Nausea": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3003", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Nausea": 1, "Swelling face": 1}, "batchcodes": ["FL3003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FL3197.json b/docs/data/histograms/Canada/FL3197.json
index 4279bc789af..16bf0ab99df 100644
--- a/docs/data/histograms/Canada/FL3197.json
+++ b/docs/data/histograms/Canada/FL3197.json
@@ -1 +1 @@
-{"batchcode": "FL3197", "histograms": [{"batchcodes": ["FL3197"], "histogram": {"Blindness": 1, "Feeling abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3197", "histograms": [{"histogram": {"Blindness": 1, "Feeling abnormal": 1}, "batchcodes": ["FL3197"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FL3202.json b/docs/data/histograms/Canada/FL3202.json
index a169b593048..60aaf7acb41 100644
--- a/docs/data/histograms/Canada/FL3202.json
+++ b/docs/data/histograms/Canada/FL3202.json
@@ -1 +1 @@
-{"batchcode": "FL3202", "histograms": [{"batchcodes": ["FL3202"], "histogram": {"Fatigue": 1, "Heavy menstrual bleeding": 1, "Interchange of vaccine products": 1, "Menstrual disorder": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3202", "histograms": [{"histogram": {"Fatigue": 1, "Heavy menstrual bleeding": 1, "Interchange of vaccine products": 1, "Menstrual disorder": 1, "Off label use": 1}, "batchcodes": ["FL3202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FL3203.json b/docs/data/histograms/Canada/FL3203.json
index 8b860f01288..f9421e59756 100644
--- a/docs/data/histograms/Canada/FL3203.json
+++ b/docs/data/histograms/Canada/FL3203.json
@@ -1 +1 @@
-{"batchcode": "FL3203", "histograms": [{"batchcodes": ["FL3203"], "histogram": {"SARS-CoV-2 test": 10, "COVID-19": 7, "Drug ineffective": 6, "Headache": 5, "Interchange of vaccine products": 5, "Off label use": 5, "Chest pain": 4, "Blood test": 3, "Dyspnoea": 3, "Fatigue": 3, "Hypoaesthesia": 3, "Myocarditis": 3, "Pericarditis": 3, "Pyrexia": 3, "Arthralgia": 2, "Bell's palsy": 2, "Cardiac disorder": 2, "Chills": 2, "Computerised tomogram": 2, "Heart rate": 2, "Heart rate increased": 2, "Immunisation": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Myopericarditis": 2, "Nausea": 2, "Pain": 2, "Pain in extremity": 2, "Paralysis": 2, "Tinnitus": 2, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Affect lability": 1, "Alopecia": 1, "Angina pectoris": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthritis": 1, "Arthropathy": 1, "Asthenia": 1, "Blood calcium": 1, "Blood calcium increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Bone pain": 1, "Breast pain": 1, "Breast tenderness": 1, "Burning sensation": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Chest X-ray": 1, "Cough": 1, "Depression": 1, "Diarrhoea haemorrhagic": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea exertional": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrointestinal haemorrhage": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Lacrimation increased": 1, "Low density lipoprotein": 1, "Mobility decreased": 1, "Mood swings": 1, "Multiple sclerosis": 1, "Muscle tightness": 1, "Neck pain": 1, "Neoplasm skin": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Premenstrual syndrome": 1, "Product use issue": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "SARS-CoV-2 antibody test": 1, "Skin lesion": 1, "Sneezing": 1, "Specialist consultation": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Varicella zoster virus infection": 1, "Vomiting": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3203", "histograms": [{"histogram": {"SARS-CoV-2 test": 10, "COVID-19": 7, "Drug ineffective": 6, "Headache": 5, "Interchange of vaccine products": 5, "Off label use": 5, "Chest pain": 4, "Blood test": 3, "Dyspnoea": 3, "Fatigue": 3, "Hypoaesthesia": 3, "Myocarditis": 3, "Pericarditis": 3, "Pyrexia": 3, "Arthralgia": 2, "Bell's palsy": 2, "Cardiac disorder": 2, "Chills": 2, "Computerised tomogram": 2, "Heart rate": 2, "Heart rate increased": 2, "Immunisation": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Myopericarditis": 2, "Nausea": 2, "Pain": 2, "Pain in extremity": 2, "Paralysis": 2, "Tinnitus": 2, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Affect lability": 1, "Alopecia": 1, "Angina pectoris": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthritis": 1, "Arthropathy": 1, "Asthenia": 1, "Blood calcium": 1, "Blood calcium increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Bone pain": 1, "Breast pain": 1, "Breast tenderness": 1, "Burning sensation": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Chest X-ray": 1, "Cough": 1, "Depression": 1, "Diarrhoea haemorrhagic": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea exertional": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrointestinal haemorrhage": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Lacrimation increased": 1, "Low density lipoprotein": 1, "Mobility decreased": 1, "Mood swings": 1, "Multiple sclerosis": 1, "Muscle tightness": 1, "Neck pain": 1, "Neoplasm skin": 1, "Non-high-density lipoprotein cholesterol": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Premenstrual syndrome": 1, "Product use issue": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "SARS-CoV-2 antibody test": 1, "Skin lesion": 1, "Sneezing": 1, "Specialist consultation": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Varicella zoster virus infection": 1, "Vomiting": 1, "Weight": 1}, "batchcodes": ["FL3203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FL3209.json b/docs/data/histograms/Canada/FL3209.json
index 50538f74ab0..9a7b77fd33e 100644
--- a/docs/data/histograms/Canada/FL3209.json
+++ b/docs/data/histograms/Canada/FL3209.json
@@ -1 +1 @@
-{"batchcode": "FL3209", "histograms": [{"batchcodes": ["FL3209"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3209", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["FL3209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FL3210.json b/docs/data/histograms/Canada/FL3210.json
index 228479c4cb6..7a7d0ee7b4e 100644
--- a/docs/data/histograms/Canada/FL3210.json
+++ b/docs/data/histograms/Canada/FL3210.json
@@ -1 +1 @@
-{"batchcode": "FL3210", "histograms": [{"batchcodes": ["FL3210"], "histogram": {"Chest pain": 6, "Fatigue": 5, "SARS-CoV-2 test": 5, "COVID-19": 4, "Immunisation": 4, "Pyrexia": 4, "Chest discomfort": 3, "Chills": 3, "Drug ineffective": 3, "Headache": 3, "Myopericarditis": 3, "Pain": 3, "Pericarditis": 3, "Dizziness": 2, "Dyspnoea": 2, "Dyspnoea exertional": 2, "Heart rate increased": 2, "Malaise": 2, "Off label use": 2, "Abdominal pain upper": 1, "Adnexa uteri pain": 1, "Angina pectoris": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Head discomfort": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Intracranial pressure increased": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pleuritic pain": 1, "SARS-CoV-2 test positive": 1, "Swelling": 1, "Syncope": 1, "Vaccination failure": 1, "Vaccination site mass": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3210", "histograms": [{"histogram": {"Chest pain": 6, "Fatigue": 5, "SARS-CoV-2 test": 5, "COVID-19": 4, "Immunisation": 4, "Pyrexia": 4, "Chest discomfort": 3, "Chills": 3, "Drug ineffective": 3, "Headache": 3, "Myopericarditis": 3, "Pain": 3, "Pericarditis": 3, "Dizziness": 2, "Dyspnoea": 2, "Dyspnoea exertional": 2, "Heart rate increased": 2, "Malaise": 2, "Off label use": 2, "Abdominal pain upper": 1, "Adnexa uteri pain": 1, "Angina pectoris": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Head discomfort": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Intracranial pressure increased": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pleuritic pain": 1, "SARS-CoV-2 test positive": 1, "Swelling": 1, "Syncope": 1, "Vaccination failure": 1, "Vaccination site mass": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["FL3210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FL4211.json b/docs/data/histograms/Canada/FL4211.json
index f4cd2ffaa0f..2f72722e96c 100644
--- a/docs/data/histograms/Canada/FL4211.json
+++ b/docs/data/histograms/Canada/FL4211.json
@@ -1 +1 @@
-{"batchcode": "FL4211", "histograms": [{"batchcodes": ["FL4211"], "histogram": {"COVID-19": 4, "Drug ineffective": 4, "Poor quality product administered": 3, "Product administration error": 3, "Expired product administered": 2, "Myocarditis": 2, "Chest discomfort": 1, "Chest pain": 1, "Cough": 1, "Immunodeficiency": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pericarditis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FL4211", "histograms": [{"histogram": {"COVID-19": 4, "Drug ineffective": 4, "Poor quality product administered": 3, "Product administration error": 3, "Expired product administered": 2, "Myocarditis": 2, "Chest discomfort": 1, "Chest pain": 1, "Cough": 1, "Immunodeficiency": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pericarditis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FL4211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FM2952.json b/docs/data/histograms/Canada/FM2952.json
index ba2fa661e9f..a3640ed35ad 100644
--- a/docs/data/histograms/Canada/FM2952.json
+++ b/docs/data/histograms/Canada/FM2952.json
@@ -1 +1 @@
-{"batchcode": "FM2952", "histograms": [{"batchcodes": ["FM2952"], "histogram": {"COVID-19": 6, "SARS-CoV-2 test": 6, "Pericarditis": 4, "Vaccination failure": 4, "Arthralgia": 2, "Chest pain": 2, "Drug ineffective": 2, "Electric shock sensation": 2, "Immunisation": 2, "Inappropriate schedule of product administration": 2, "Off label use": 2, "Angina pectoris": 1, "Anxiety": 1, "Appendicitis": 1, "Arthropathy": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chronic fatigue syndrome": 1, "Condition aggravated": 1, "Cough": 1, "Dysmenorrhoea": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Endometrial disorder": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Herpes zoster": 1, "Hypoacusis": 1, "Impaired work ability": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "Myalgia": 1, "Myocarditis": 1, "Myopericarditis": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Ovarian abscess": 1, "Pain in extremity": 1, "Palpitations": 1, "Pleurisy": 1, "Post viral fatigue syndrome": 1, "Postmenopausal haemorrhage": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Sensitive skin": 1, "Stress": 1, "Swelling": 1, "Tinnitus": 1, "Vaccination site bruising": 1, "Vaccination site pain": 1, "Vestibular disorder": 1, "Viral pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2952", "histograms": [{"histogram": {"COVID-19": 6, "SARS-CoV-2 test": 6, "Pericarditis": 4, "Vaccination failure": 4, "Arthralgia": 2, "Chest pain": 2, "Drug ineffective": 2, "Electric shock sensation": 2, "Immunisation": 2, "Inappropriate schedule of product administration": 2, "Off label use": 2, "Angina pectoris": 1, "Anxiety": 1, "Appendicitis": 1, "Arthropathy": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chronic fatigue syndrome": 1, "Condition aggravated": 1, "Cough": 1, "Dysmenorrhoea": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Endometrial disorder": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Herpes zoster": 1, "Hypoacusis": 1, "Impaired work ability": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "Myalgia": 1, "Myocarditis": 1, "Myopericarditis": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Ovarian abscess": 1, "Pain in extremity": 1, "Palpitations": 1, "Pleurisy": 1, "Post viral fatigue syndrome": 1, "Postmenopausal haemorrhage": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Sensitive skin": 1, "Stress": 1, "Swelling": 1, "Tinnitus": 1, "Vaccination site bruising": 1, "Vaccination site pain": 1, "Vestibular disorder": 1, "Viral pericarditis": 1}, "batchcodes": ["FM2952"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FM3780.json b/docs/data/histograms/Canada/FM3780.json
index f55c59d3335..db937c047ab 100644
--- a/docs/data/histograms/Canada/FM3780.json
+++ b/docs/data/histograms/Canada/FM3780.json
@@ -1 +1 @@
-{"batchcode": "FM3780", "histograms": [{"batchcodes": ["FM3780"], "histogram": {"Facial pain": 1, "Hyperaesthesia teeth": 1, "Toothache": 1, "Trigeminal neuritis": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3780", "histograms": [{"histogram": {"Facial pain": 1, "Hyperaesthesia teeth": 1, "Toothache": 1, "Trigeminal neuritis": 1}, "batchcodes": ["FM3780"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FM7380.json b/docs/data/histograms/Canada/FM7380.json
index 0c95209b62a..39417f1c3d2 100644
--- a/docs/data/histograms/Canada/FM7380.json
+++ b/docs/data/histograms/Canada/FM7380.json
@@ -1 +1 @@
-{"batchcode": "FM7380", "histograms": [{"batchcodes": ["FM7380"], "histogram": {"SARS-CoV-2 test": 6, "Myocarditis": 5, "COVID-19": 4, "Chest discomfort": 3, "Chest pain": 3, "Myopericarditis": 3, "Off label use": 3, "Pain in extremity": 3, "Vaccination failure": 3, "Body temperature": 2, "Dyspnoea": 2, "Fatigue": 2, "Headache": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Immunisation": 2, "Loss of consciousness": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pain": 2, "Paraesthesia": 2, "Pericarditis": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Arrhythmia": 1, "Atrioventricular block": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Cerebrovascular accident": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea exertional": 1, "Fall": 1, "Feeling of body temperature change": 1, "Flank pain": 1, "Free thyroxine index": 1, "Gait inability": 1, "Heavy menstrual bleeding": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Motion sickness": 1, "Muscle twitching": 1, "Neck pain": 1, "Nervous system disorder": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pericardial rub": 1, "Peripheral swelling": 1, "Syncope": 1, "Temperature intolerance": 1, "Tinnitus": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7380", "histograms": [{"histogram": {"SARS-CoV-2 test": 6, "Myocarditis": 5, "COVID-19": 4, "Chest discomfort": 3, "Chest pain": 3, "Myopericarditis": 3, "Off label use": 3, "Pain in extremity": 3, "Vaccination failure": 3, "Body temperature": 2, "Dyspnoea": 2, "Fatigue": 2, "Headache": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Immunisation": 2, "Loss of consciousness": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pain": 2, "Paraesthesia": 2, "Pericarditis": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Arrhythmia": 1, "Atrioventricular block": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Cerebrovascular accident": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea exertional": 1, "Fall": 1, "Feeling of body temperature change": 1, "Flank pain": 1, "Free thyroxine index": 1, "Gait inability": 1, "Heavy menstrual bleeding": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Motion sickness": 1, "Muscle twitching": 1, "Neck pain": 1, "Nervous system disorder": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pericardial rub": 1, "Peripheral swelling": 1, "Syncope": 1, "Temperature intolerance": 1, "Tinnitus": 1, "Wound": 1}, "batchcodes": ["FM7380"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FN2908.json b/docs/data/histograms/Canada/FN2908.json
index 280bfe0e2e7..f0086da83f8 100644
--- a/docs/data/histograms/Canada/FN2908.json
+++ b/docs/data/histograms/Canada/FN2908.json
@@ -1 +1 @@
-{"batchcode": "FN2908", "histograms": [{"batchcodes": ["FN2908"], "histogram": {"Anxiety": 1, "Dizziness": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2908", "histograms": [{"histogram": {"Anxiety": 1, "Dizziness": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["FN2908"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FN4365.json b/docs/data/histograms/Canada/FN4365.json
index 6731a28e1d3..5a13accc87f 100644
--- a/docs/data/histograms/Canada/FN4365.json
+++ b/docs/data/histograms/Canada/FN4365.json
@@ -1 +1 @@
-{"batchcode": "FN4365", "histograms": [{"batchcodes": ["FN4365"], "histogram": {"Acoustic stimulation tests": 1, "Blood pressure measurement": 1, "Depression": 1, "Dizziness": 1, "Fatigue": 1, "Immunisation": 1, "Influenza like illness": 1, "Malaise": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Specialist consultation": 1, "Tinnitus": 1, "Vestibular neuronitis": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4365", "histograms": [{"histogram": {"Acoustic stimulation tests": 1, "Blood pressure measurement": 1, "Depression": 1, "Dizziness": 1, "Fatigue": 1, "Immunisation": 1, "Influenza like illness": 1, "Malaise": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Specialist consultation": 1, "Tinnitus": 1, "Vestibular neuronitis": 1}, "batchcodes": ["FN4365"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FN7934.json b/docs/data/histograms/Canada/FN7934.json
index 91f22cb8f2b..83a4c3eda9a 100644
--- a/docs/data/histograms/Canada/FN7934.json
+++ b/docs/data/histograms/Canada/FN7934.json
@@ -1 +1 @@
-{"batchcode": "FN7934", "histograms": [{"batchcodes": ["FN7934"], "histogram": {"Chest pain": 11, "Immunisation": 11, "Off label use": 11, "SARS-CoV-2 test": 7, "COVID-19": 6, "Dyspnoea": 5, "Drug ineffective": 4, "Fatigue": 4, "Pericarditis": 4, "Dizziness": 3, "Interchange of vaccine products": 3, "Lymphadenopathy": 3, "Myopericarditis": 3, "Pyrexia": 3, "Axillary pain": 2, "Back pain": 2, "Blood pressure measurement": 2, "Blood test": 2, "Cough": 2, "Feeling abnormal": 2, "Headache": 2, "Heart rate": 2, "Heavy menstrual bleeding": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Myocarditis": 2, "Swelling face": 2, "Tinnitus": 2, "Tremor": 2, "Vaccination failure": 2, "Vision blurred": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Angina unstable": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Chills": 1, "Clumsiness": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Coronary artery occlusion": 1, "Deafness unilateral": 1, "Death": 1, "Disturbance in attention": 1, "Dysmenorrhoea": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Ear inflammation": 1, "Ear pain": 1, "Ear swelling": 1, "Eczema": 1, "Electrocardiogram": 1, "Erythema": 1, "Fall": 1, "Fear": 1, "Gait inability": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Herpes simplex": 1, "Hormone level abnormal": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Illness": 1, "Impaired quality of life": 1, "Inner ear inflammation": 1, "Insomnia": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Meniere's disease": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Multiple sclerosis relapse": 1, "Muscle spasms": 1, "Myocardial infarction": 1, "Nausea": 1, "Neuralgia": 1, "Neurogenic shock": 1, "Neutropenia": 1, "Otic examination": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Phonophobia": 1, "Pleuritic pain": 1, "Poor quality product administered": 1, "Product administration error": 1, "Pulmonary embolism": 1, "Seizure": 1, "Sensory loss": 1, "Syncope": 1, "Tachycardia": 1, "Thrombosis": 1, "Vaccination site pain": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN7934", "histograms": [{"histogram": {"Chest pain": 11, "Immunisation": 11, "Off label use": 11, "SARS-CoV-2 test": 7, "COVID-19": 6, "Dyspnoea": 5, "Drug ineffective": 4, "Fatigue": 4, "Pericarditis": 4, "Dizziness": 3, "Interchange of vaccine products": 3, "Lymphadenopathy": 3, "Myopericarditis": 3, "Pyrexia": 3, "Axillary pain": 2, "Back pain": 2, "Blood pressure measurement": 2, "Blood test": 2, "Cough": 2, "Feeling abnormal": 2, "Headache": 2, "Heart rate": 2, "Heavy menstrual bleeding": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Myocarditis": 2, "Swelling face": 2, "Tinnitus": 2, "Tremor": 2, "Vaccination failure": 2, "Vision blurred": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Angina unstable": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Chills": 1, "Clumsiness": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Coronary artery occlusion": 1, "Deafness unilateral": 1, "Death": 1, "Disturbance in attention": 1, "Dysmenorrhoea": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Ear inflammation": 1, "Ear pain": 1, "Ear swelling": 1, "Eczema": 1, "Electrocardiogram": 1, "Erythema": 1, "Fall": 1, "Fear": 1, "Gait inability": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Herpes simplex": 1, "Hormone level abnormal": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Illness": 1, "Impaired quality of life": 1, "Inner ear inflammation": 1, "Insomnia": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Meniere's disease": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Multiple sclerosis relapse": 1, "Muscle spasms": 1, "Myocardial infarction": 1, "Nausea": 1, "Neuralgia": 1, "Neurogenic shock": 1, "Neutropenia": 1, "Otic examination": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Phonophobia": 1, "Pleuritic pain": 1, "Poor quality product administered": 1, "Product administration error": 1, "Pulmonary embolism": 1, "Seizure": 1, "Sensory loss": 1, "Syncope": 1, "Tachycardia": 1, "Thrombosis": 1, "Vaccination site pain": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["FN7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FN934.json b/docs/data/histograms/Canada/FN934.json
index 6525a88e41e..fb165c48e1d 100644
--- a/docs/data/histograms/Canada/FN934.json
+++ b/docs/data/histograms/Canada/FN934.json
@@ -1 +1 @@
-{"batchcode": "FN934", "histograms": [{"batchcodes": ["FN934"], "histogram": {"Alopecia": 1, "Condition aggravated": 1}}]}
\ No newline at end of file
+{"batchcode": "FN934", "histograms": [{"histogram": {"Alopecia": 1, "Condition aggravated": 1}, "batchcodes": ["FN934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FN9501.json b/docs/data/histograms/Canada/FN9501.json
index ec5cc97f8de..b707ef64c09 100644
--- a/docs/data/histograms/Canada/FN9501.json
+++ b/docs/data/histograms/Canada/FN9501.json
@@ -1 +1 @@
-{"batchcode": "FN9501", "histograms": [{"batchcodes": ["FN9501"], "histogram": {"Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Ultrasound scan": 2, "Antibody test": 1, "Bell's palsy": 1, "Blindness unilateral": 1, "Blood test": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Drug ineffective": 1, "Haematoma": 1, "Myocarditis": 1, "Pericarditis": 1, "Polymerase chain reaction": 1, "Retinal artery occlusion": 1, "Retinal artery thrombosis": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FN9501", "histograms": [{"histogram": {"Immunisation": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Ultrasound scan": 2, "Antibody test": 1, "Bell's palsy": 1, "Blindness unilateral": 1, "Blood test": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Drug ineffective": 1, "Haematoma": 1, "Myocarditis": 1, "Pericarditis": 1, "Polymerase chain reaction": 1, "Retinal artery occlusion": 1, "Retinal artery thrombosis": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Thrombosis": 1}, "batchcodes": ["FN9501"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FO7206.json b/docs/data/histograms/Canada/FO7206.json
index 40cd48e8fc1..547b82b2593 100644
--- a/docs/data/histograms/Canada/FO7206.json
+++ b/docs/data/histograms/Canada/FO7206.json
@@ -1 +1 @@
-{"batchcode": "FO7206", "histograms": [{"batchcodes": ["FO7206"], "histogram": {"Bell's palsy": 1, "Blood pressure increased": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Myocardial injury": 1}}]}
\ No newline at end of file
+{"batchcode": "FO7206", "histograms": [{"histogram": {"Bell's palsy": 1, "Blood pressure increased": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Myocardial injury": 1}, "batchcodes": ["FO7206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FT 8471.json b/docs/data/histograms/Canada/FT 8471.json
index 923e721104c..9c56b518549 100644
--- a/docs/data/histograms/Canada/FT 8471.json
+++ b/docs/data/histograms/Canada/FT 8471.json
@@ -1 +1 @@
-{"batchcode": "FT 8471", "histograms": [{"batchcodes": ["FT 8471"], "histogram": {"Asthenia": 1, "Feeling hot": 1, "Incorrect drug administration rate": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Nausea": 1, "Pain in extremity": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FT 8471", "histograms": [{"histogram": {"Asthenia": 1, "Feeling hot": 1, "Incorrect drug administration rate": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Nausea": 1, "Pain in extremity": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["FT 8471"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FT8471.json b/docs/data/histograms/Canada/FT8471.json
index 3e9a93f7667..10cc9503628 100644
--- a/docs/data/histograms/Canada/FT8471.json
+++ b/docs/data/histograms/Canada/FT8471.json
@@ -1 +1 @@
-{"batchcode": "FT8471", "histograms": [{"batchcodes": ["FT8471"], "histogram": {"SARS-CoV-2 test": 3, "COVID-19": 2, "Drug ineffective": 2, "Arthralgia": 1, "Fatigue": 1, "Head discomfort": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Malaise": 1, "Myalgia": 1, "Nervous system disorder": 1, "Off label use": 1, "Pain": 1, "Pruritus": 1, "Seizure": 1, "Swelling of eyelid": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FT8471", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "COVID-19": 2, "Drug ineffective": 2, "Arthralgia": 1, "Fatigue": 1, "Head discomfort": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Malaise": 1, "Myalgia": 1, "Nervous system disorder": 1, "Off label use": 1, "Pain": 1, "Pruritus": 1, "Seizure": 1, "Swelling of eyelid": 1, "Tremor": 1}, "batchcodes": ["FT8471"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FW3344.json b/docs/data/histograms/Canada/FW3344.json
index faaa0f2d855..598f30edfb3 100644
--- a/docs/data/histograms/Canada/FW3344.json
+++ b/docs/data/histograms/Canada/FW3344.json
@@ -1 +1 @@
-{"batchcode": "FW3344", "histograms": [{"batchcodes": ["FW3344"], "histogram": {"Bell's palsy": 1, "Blood test": 1, "Computerised tomogram head": 1}}]}
\ No newline at end of file
+{"batchcode": "FW3344", "histograms": [{"histogram": {"Bell's palsy": 1, "Blood test": 1, "Computerised tomogram head": 1}, "batchcodes": ["FW3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/FY0578.json b/docs/data/histograms/Canada/FY0578.json
index 4df107275f4..1105bc18e46 100644
--- a/docs/data/histograms/Canada/FY0578.json
+++ b/docs/data/histograms/Canada/FY0578.json
@@ -1 +1 @@
-{"batchcode": "FY0578", "histograms": [{"batchcodes": ["FY0578"], "histogram": {"Asthenia": 1, "Chest pain": 1, "Head discomfort": 1, "Headache": 1, "Illness": 1, "Interchange of vaccine products": 1, "Noninfective encephalitis": 1, "Off label use": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FY0578", "histograms": [{"histogram": {"Asthenia": 1, "Chest pain": 1, "Head discomfort": 1, "Headache": 1, "Illness": 1, "Interchange of vaccine products": 1, "Noninfective encephalitis": 1, "Off label use": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FY0578"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/GEN-COMIRNATY.json b/docs/data/histograms/Canada/GEN-COMIRNATY.json
index f532ab37172..5cf9a934088 100644
--- a/docs/data/histograms/Canada/GEN-COMIRNATY.json
+++ b/docs/data/histograms/Canada/GEN-COMIRNATY.json
@@ -1 +1 @@
-{"batchcode": "GEN-COMIRNATY", "histograms": [{"batchcodes": ["GEN-COMIRNATY"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "GEN-COMIRNATY", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["GEN-COMIRNATY"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/GK0924.json b/docs/data/histograms/Canada/GK0924.json
index 15f4cb8a276..73b6024f956 100644
--- a/docs/data/histograms/Canada/GK0924.json
+++ b/docs/data/histograms/Canada/GK0924.json
@@ -1 +1 @@
-{"batchcode": "GK0924", "histograms": [{"batchcodes": ["GK0924"], "histogram": {"COVID-19": 9, "Drug ineffective": 9, "SARS-CoV-2 test": 8, "Interchange of vaccine products": 5, "Off label use": 2, "Anaphylactic shock": 1, "Arthralgia": 1, "Arthritis": 1, "Back pain": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Body mass index": 1, "Burning sensation": 1, "Chest X-ray": 1, "Cough": 1, "Dry mouth": 1, "Dysphagia": 1, "Exophthalmos": 1, "Heart rate": 1, "Immunisation": 1, "Investigation": 1, "Joint swelling": 1, "Loss of consciousness": 1, "Musculoskeletal chest pain": 1, "Osteoarthritis": 1, "Oxygen consumption decreased": 1, "Pallor": 1, "Paraesthesia": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Shock": 1, "Tachycardia": 1, "Uveitis": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "GK0924", "histograms": [{"histogram": {"COVID-19": 9, "Drug ineffective": 9, "SARS-CoV-2 test": 8, "Interchange of vaccine products": 5, "Off label use": 2, "Anaphylactic shock": 1, "Arthralgia": 1, "Arthritis": 1, "Back pain": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Body mass index": 1, "Burning sensation": 1, "Chest X-ray": 1, "Cough": 1, "Dry mouth": 1, "Dysphagia": 1, "Exophthalmos": 1, "Heart rate": 1, "Immunisation": 1, "Investigation": 1, "Joint swelling": 1, "Loss of consciousness": 1, "Musculoskeletal chest pain": 1, "Osteoarthritis": 1, "Oxygen consumption decreased": 1, "Pallor": 1, "Paraesthesia": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Shock": 1, "Tachycardia": 1, "Uveitis": 1, "Vision blurred": 1}, "batchcodes": ["GK0924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/GK0926.json b/docs/data/histograms/Canada/GK0926.json
index b566c70b080..09c20cf9ea2 100644
--- a/docs/data/histograms/Canada/GK0926.json
+++ b/docs/data/histograms/Canada/GK0926.json
@@ -1 +1 @@
-{"batchcode": "GK0926", "histograms": [{"batchcodes": ["GK0926"], "histogram": {"SARS-CoV-2 test": 3, "Asthenia": 2, "COVID-19": 2, "Drug ineffective": 2, "Feeling hot": 2, "Loss of consciousness": 2, "Nausea": 2, "Off label use": 2, "Pallor": 2, "Seizure": 2, "Vomiting": 2, "Aortic stenosis": 1, "Immunisation": 1, "Product use issue": 1, "Sinusitis": 1, "Vertigo positional": 1}}]}
\ No newline at end of file
+{"batchcode": "GK0926", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "Asthenia": 2, "COVID-19": 2, "Drug ineffective": 2, "Feeling hot": 2, "Loss of consciousness": 2, "Nausea": 2, "Off label use": 2, "Pallor": 2, "Seizure": 2, "Vomiting": 2, "Aortic stenosis": 1, "Immunisation": 1, "Product use issue": 1, "Sinusitis": 1, "Vertigo positional": 1}, "batchcodes": ["GK0926"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/HAMILTON.json b/docs/data/histograms/Canada/HAMILTON.json
index db208d12205..c1c1244aa29 100644
--- a/docs/data/histograms/Canada/HAMILTON.json
+++ b/docs/data/histograms/Canada/HAMILTON.json
@@ -1 +1 @@
-{"batchcode": "HAMILTON", "histograms": [{"batchcodes": ["HAMILTON"], "histogram": {"Chest pain": 1, "Diplopia": 1, "Dyspnoea": 1, "Intracranial pressure increased": 1, "Nausea": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "HAMILTON", "histograms": [{"histogram": {"Chest pain": 1, "Diplopia": 1, "Dyspnoea": 1, "Intracranial pressure increased": 1, "Nausea": 1, "Paraesthesia": 1}, "batchcodes": ["HAMILTON"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/MT0055.json b/docs/data/histograms/Canada/MT0055.json
index 02a67af37be..0f5b7c871e8 100644
--- a/docs/data/histograms/Canada/MT0055.json
+++ b/docs/data/histograms/Canada/MT0055.json
@@ -1 +1 @@
-{"batchcode": "MT0055", "histograms": [{"batchcodes": ["042D21A", "MT0055"], "histogram": {"Fatigue": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Prolonged labour": 1}}]}
\ No newline at end of file
+{"batchcode": "MT0055", "histograms": [{"histogram": {"Fatigue": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Prolonged labour": 1}, "batchcodes": ["042D21A", "MT0055"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/NJ0338.json b/docs/data/histograms/Canada/NJ0338.json
index e60a77e707a..dc39db22b39 100644
--- a/docs/data/histograms/Canada/NJ0338.json
+++ b/docs/data/histograms/Canada/NJ0338.json
@@ -1 +1 @@
-{"batchcode": "NJ0338", "histograms": [{"batchcodes": ["EW0216", "NJ0338"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "NJ0338", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["EW0216", "NJ0338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/NOT AVAILABLE.json b/docs/data/histograms/Canada/NOT AVAILABLE.json
index 740b35708fa..ec0626a77f3 100644
--- a/docs/data/histograms/Canada/NOT AVAILABLE.json
+++ b/docs/data/histograms/Canada/NOT AVAILABLE.json
@@ -1 +1 @@
-{"batchcode": "NOT AVAILABLE", "histograms": [{"batchcodes": ["NOT AVAILABLE"], "histogram": {"Arthritis": 2, "Blood test": 2, "Fatigue": 2, "Pyrexia": 2, "Asthenia": 1, "Blood cholesterol": 1, "Blood pressure systolic increased": 1, "Chest X-ray": 1, "Chills": 1, "Condition aggravated": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Gingival bleeding": 1, "Gingival discomfort": 1, "Gingival disorder": 1, "Haemorrhage": 1, "Headache": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Joint stiffness": 1, "Joint swelling": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Osteoarthritis": 1, "Pain": 1, "Pain in extremity": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Trigger finger": 1, "Ultrasound scan": 1, "Weight decreased": 1, "X-ray limb": 1}}]}
\ No newline at end of file
+{"batchcode": "NOT AVAILABLE", "histograms": [{"histogram": {"Arthritis": 2, "Blood test": 2, "Fatigue": 2, "Pyrexia": 2, "Asthenia": 1, "Blood cholesterol": 1, "Blood pressure systolic increased": 1, "Chest X-ray": 1, "Chills": 1, "Condition aggravated": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Gingival bleeding": 1, "Gingival discomfort": 1, "Gingival disorder": 1, "Haemorrhage": 1, "Headache": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Joint stiffness": 1, "Joint swelling": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Osteoarthritis": 1, "Pain": 1, "Pain in extremity": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Trigger finger": 1, "Ultrasound scan": 1, "Weight decreased": 1, "X-ray limb": 1}, "batchcodes": ["NOT AVAILABLE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/NUFIT5C.json b/docs/data/histograms/Canada/NUFIT5C.json
index 4f5e465f539..f733d8c1282 100644
--- a/docs/data/histograms/Canada/NUFIT5C.json
+++ b/docs/data/histograms/Canada/NUFIT5C.json
@@ -1 +1 @@
-{"batchcode": "NUFIT5C", "histograms": [{"batchcodes": ["NUFIT5C"], "histogram": {"Deafness unilateral": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "NUFIT5C", "histograms": [{"histogram": {"Deafness unilateral": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["NUFIT5C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/PFIZER ER1742.json b/docs/data/histograms/Canada/PFIZER ER1742.json
index e88b9e7bba9..301596359e1 100644
--- a/docs/data/histograms/Canada/PFIZER ER1742.json
+++ b/docs/data/histograms/Canada/PFIZER ER1742.json
@@ -1 +1 @@
-{"batchcode": "PFIZER ER1742", "histograms": [{"batchcodes": ["042D21A", "PFIZER ER1742"], "histogram": {"Cellulitis": 1, "Chest discomfort": 1, "Dizziness": 1, "Interchange of vaccine products": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Skin warm": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "PFIZER ER1742", "histograms": [{"histogram": {"Cellulitis": 1, "Chest discomfort": 1, "Dizziness": 1, "Interchange of vaccine products": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Skin warm": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["042D21A", "PFIZER ER1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/QC13-684567B.json b/docs/data/histograms/Canada/QC13-684567B.json
index 3274f1e0818..b238c4c7172 100644
--- a/docs/data/histograms/Canada/QC13-684567B.json
+++ b/docs/data/histograms/Canada/QC13-684567B.json
@@ -1 +1 @@
-{"batchcode": "QC13-684567B", "histograms": [{"batchcodes": ["QC13-684567B"], "histogram": {"Computerised tomogram head": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Headache": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "QC13-684567B", "histograms": [{"histogram": {"Computerised tomogram head": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Headache": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Seizure": 1}, "batchcodes": ["QC13-684567B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/SA8721.json b/docs/data/histograms/Canada/SA8721.json
index 2ab60ac7851..d7fd824b0ac 100644
--- a/docs/data/histograms/Canada/SA8721.json
+++ b/docs/data/histograms/Canada/SA8721.json
@@ -1 +1 @@
-{"batchcode": "SA8721", "histograms": [{"batchcodes": ["SA8721"], "histogram": {"Peripheral swelling": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "SA8721", "histograms": [{"histogram": {"Peripheral swelling": 1, "Seizure": 1}, "batchcodes": ["SA8721"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/SA9091.json b/docs/data/histograms/Canada/SA9091.json
index 65dcc7e4cd7..3776267ff01 100644
--- a/docs/data/histograms/Canada/SA9091.json
+++ b/docs/data/histograms/Canada/SA9091.json
@@ -1 +1 @@
-{"batchcode": "SA9091", "histograms": [{"batchcodes": ["SA9091"], "histogram": {"Antibody test": 1, "Asthenia": 1, "Blood test": 1, "Computerised tomogram": 1, "Disturbance in attention": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Mental fatigue": 1, "Mental impairment": 1, "Sleep disorder": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "SA9091", "histograms": [{"histogram": {"Antibody test": 1, "Asthenia": 1, "Blood test": 1, "Computerised tomogram": 1, "Disturbance in attention": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Mental fatigue": 1, "Mental impairment": 1, "Sleep disorder": 1, "Tinnitus": 1}, "batchcodes": ["SA9091"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/SD7206.json b/docs/data/histograms/Canada/SD7206.json
index 705e02b310e..ae12e9f4400 100644
--- a/docs/data/histograms/Canada/SD7206.json
+++ b/docs/data/histograms/Canada/SD7206.json
@@ -1 +1 @@
-{"batchcode": "SD7206", "histograms": [{"batchcodes": ["SD7206"], "histogram": {"Fatigue": 1, "Heavy menstrual bleeding": 1, "Human papilloma virus test": 1, "Inappropriate schedule of product administration": 1, "Intermenstrual bleeding": 1, "Pregnancy test": 1, "Sexually transmitted disease test": 1}}]}
\ No newline at end of file
+{"batchcode": "SD7206", "histograms": [{"histogram": {"Fatigue": 1, "Heavy menstrual bleeding": 1, "Human papilloma virus test": 1, "Inappropriate schedule of product administration": 1, "Intermenstrual bleeding": 1, "Pregnancy test": 1, "Sexually transmitted disease test": 1}, "batchcodes": ["SD7206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/SK4245.json b/docs/data/histograms/Canada/SK4245.json
index 077c3910bd7..c738f703f06 100644
--- a/docs/data/histograms/Canada/SK4245.json
+++ b/docs/data/histograms/Canada/SK4245.json
@@ -1 +1 @@
-{"batchcode": "SK4245", "histograms": [{"batchcodes": ["SK4245"], "histogram": {"Blood calcium": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Bone density abnormal": 1, "Discomfort": 1, "EGFR status assay": 1, "Full blood count": 1, "Irritability": 1, "Mucosal disorder": 1, "Mucosal inflammation": 1, "Oral mucosal erythema": 1, "Protein total": 1, "Serum ferritin": 1, "Skin exfoliation": 1, "Swelling": 1, "Urine analysis": 1, "Vitamin B12": 1}}]}
\ No newline at end of file
+{"batchcode": "SK4245", "histograms": [{"histogram": {"Blood calcium": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Bone density abnormal": 1, "Discomfort": 1, "EGFR status assay": 1, "Full blood count": 1, "Irritability": 1, "Mucosal disorder": 1, "Mucosal inflammation": 1, "Oral mucosal erythema": 1, "Protein total": 1, "Serum ferritin": 1, "Skin exfoliation": 1, "Swelling": 1, "Urine analysis": 1, "Vitamin B12": 1}, "batchcodes": ["SK4245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/SM2952.json b/docs/data/histograms/Canada/SM2952.json
index 5af2b874652..649379c8051 100644
--- a/docs/data/histograms/Canada/SM2952.json
+++ b/docs/data/histograms/Canada/SM2952.json
@@ -1 +1 @@
-{"batchcode": "SM2952", "histograms": [{"batchcodes": ["SM2952"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Ear pain": 1, "Headache": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sinus congestion": 1}}]}
\ No newline at end of file
+{"batchcode": "SM2952", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Ear pain": 1, "Headache": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sinus congestion": 1}, "batchcodes": ["SM2952"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/SS5109.json b/docs/data/histograms/Canada/SS5109.json
index af531a6aa3b..165afef4fdf 100644
--- a/docs/data/histograms/Canada/SS5109.json
+++ b/docs/data/histograms/Canada/SS5109.json
@@ -1 +1 @@
-{"batchcode": "SS5109", "histograms": [{"batchcodes": ["SS5109"], "histogram": {"Fatigue": 1, "Headache": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Sinus pain": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "SS5109", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Sinus pain": 1, "Throat irritation": 1}, "batchcodes": ["SS5109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/UNK.json b/docs/data/histograms/Canada/UNK.json
index fdbccf9fd7d..9da1473c377 100644
--- a/docs/data/histograms/Canada/UNK.json
+++ b/docs/data/histograms/Canada/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK"], "histogram": {"Blood pressure measurement": 3, "Cough": 3, "Dyspnoea exertional": 3, "Heart rate": 3, "Heart rate increased": 3, "Inappropriate schedule of product administration": 3, "Oxygen saturation": 3, "Oxygen saturation decreased": 3, "Pneumonia": 3, "Asthenia": 2, "Blood pressure increased": 2, "Dysphonia": 2, "Oropharyngeal pain": 2, "Stress": 2, "Alopecia": 1, "Blood pressure decreased": 1, "Chest pain": 1, "Cystitis": 1, "Death": 1, "Dehydration": 1, "Diarrhoea": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Eye irritation": 1, "Fall": 1, "Fatigue": 1, "Gastrointestinal infection": 1, "Glaucoma": 1, "Headache": 1, "Hospitalisation": 1, "Hypersensitivity": 1, "Injection site pain": 1, "Insomnia": 1, "Kidney infection": 1, "Laboratory test": 1, "Laryngeal injury": 1, "Loss of consciousness": 1, "Macular degeneration": 1, "Mass": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1, "Oxygen saturation abnormal": 1, "Oxygen therapy": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pollakiuria": 1, "Poor quality sleep": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pulmonary mass": 1, "Pyrexia": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Renal impairment": 1, "Respiratory syncytial virus infection": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Skin irritation": 1, "Sneezing": 1, "Sputum abnormal": 1, "Sputum discoloured": 1, "Trismus": 1, "Urinary tract infection": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"Blood pressure measurement": 3, "Cough": 3, "Dyspnoea exertional": 3, "Heart rate": 3, "Heart rate increased": 3, "Inappropriate schedule of product administration": 3, "Oxygen saturation": 3, "Oxygen saturation decreased": 3, "Pneumonia": 3, "Asthenia": 2, "Blood pressure increased": 2, "Dysphonia": 2, "Oropharyngeal pain": 2, "Stress": 2, "Alopecia": 1, "Blood pressure decreased": 1, "Chest pain": 1, "Cystitis": 1, "Death": 1, "Dehydration": 1, "Diarrhoea": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Eye irritation": 1, "Fall": 1, "Fatigue": 1, "Gastrointestinal infection": 1, "Glaucoma": 1, "Headache": 1, "Hospitalisation": 1, "Hypersensitivity": 1, "Injection site pain": 1, "Insomnia": 1, "Kidney infection": 1, "Laboratory test": 1, "Laryngeal injury": 1, "Loss of consciousness": 1, "Macular degeneration": 1, "Mass": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1, "Oxygen saturation abnormal": 1, "Oxygen therapy": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pollakiuria": 1, "Poor quality sleep": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pulmonary mass": 1, "Pyrexia": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Renal impairment": 1, "Respiratory syncytial virus infection": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Skin irritation": 1, "Sneezing": 1, "Sputum abnormal": 1, "Sputum discoloured": 1, "Trismus": 1, "Urinary tract infection": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1, "Wound": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/V2117445.json b/docs/data/histograms/Canada/V2117445.json
index 66c1fbdcee4..fb9d261206b 100644
--- a/docs/data/histograms/Canada/V2117445.json
+++ b/docs/data/histograms/Canada/V2117445.json
@@ -1 +1 @@
-{"batchcode": "V2117445", "histograms": [{"batchcodes": ["V2117445"], "histogram": {"Asthenia": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Myalgia": 1, "Myocarditis": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "V2117445", "histograms": [{"histogram": {"Asthenia": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Myalgia": 1, "Myocarditis": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["V2117445"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/VIS-P6306.json b/docs/data/histograms/Canada/VIS-P6306.json
index b0bc508b4ba..58082cfb9c2 100644
--- a/docs/data/histograms/Canada/VIS-P6306.json
+++ b/docs/data/histograms/Canada/VIS-P6306.json
@@ -1 +1 @@
-{"batchcode": "VIS-P6306", "histograms": [{"batchcodes": ["VIS-P6306"], "histogram": {"Electric shock sensation": 1, "Loss of consciousness": 1, "Malaise": 1, "Neuralgia": 1, "Pain in extremity": 1, "Premature ovulation": 1}}]}
\ No newline at end of file
+{"batchcode": "VIS-P6306", "histograms": [{"histogram": {"Electric shock sensation": 1, "Loss of consciousness": 1, "Malaise": 1, "Neuralgia": 1, "Pain in extremity": 1, "Premature ovulation": 1}, "batchcodes": ["VIS-P6306"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Canada/XE423.json b/docs/data/histograms/Canada/XE423.json
index 9c66ff13c7d..bd6c213a9af 100644
--- a/docs/data/histograms/Canada/XE423.json
+++ b/docs/data/histograms/Canada/XE423.json
@@ -1 +1 @@
-{"batchcode": "XE423", "histograms": [{"batchcodes": ["XE423"], "histogram": {"Alopecia": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Fatigue": 1, "Heart rate": 1, "Hypotension": 1, "Insomnia": 1, "Rash": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "XE423", "histograms": [{"histogram": {"Alopecia": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Fatigue": 1, "Heart rate": 1, "Hypotension": 1, "Insomnia": 1, "Rash": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["XE423"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cayman Islands/012L20A.json b/docs/data/histograms/Cayman Islands/012L20A.json
index c2d68435671..e608d1f6bd1 100644
--- a/docs/data/histograms/Cayman Islands/012L20A.json
+++ b/docs/data/histograms/Cayman Islands/012L20A.json
@@ -1 +1 @@
-{"batchcode": "012L20A", "histograms": [{"batchcodes": ["012L20A"], "histogram": {"Acute respiratory distress syndrome": 1, "COVID-19 pneumonia": 1, "Death": 1, "Endotracheal intubation": 1, "Respiratory failure": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20A", "histograms": [{"histogram": {"Acute respiratory distress syndrome": 1, "COVID-19 pneumonia": 1, "Death": 1, "Endotracheal intubation": 1, "Respiratory failure": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["012L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cayman Islands/EK1768.json b/docs/data/histograms/Cayman Islands/EK1768.json
index 86bdb4493a1..bd4c376d372 100644
--- a/docs/data/histograms/Cayman Islands/EK1768.json
+++ b/docs/data/histograms/Cayman Islands/EK1768.json
@@ -1 +1 @@
-{"batchcode": "EK1768", "histograms": [{"batchcodes": ["EK1768"], "histogram": {"Abdominal pain upper": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Decreased appetite": 1, "Disorientation": 1, "Dyspepsia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Irritability": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Tendon pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EK1768", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Decreased appetite": 1, "Disorientation": 1, "Dyspepsia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Irritability": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Tendon pain": 1, "Vision blurred": 1}, "batchcodes": ["EK1768"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/EK4241.json b/docs/data/histograms/Chile/EK4241.json
index 7808974e49a..2f1ccb0fbfd 100644
--- a/docs/data/histograms/Chile/EK4241.json
+++ b/docs/data/histograms/Chile/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Body temperature": 1, "Chills": 1, "Crying": 1, "Dry mouth": 1, "Headache": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Paraesthesia": 1, "Photophobia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Body temperature": 1, "Chills": 1, "Crying": 1, "Dry mouth": 1, "Headache": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Paraesthesia": 1, "Photophobia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/EL0200.json b/docs/data/histograms/Chile/EL0200.json
index b263702d2ea..170ad02fadd 100644
--- a/docs/data/histograms/Chile/EL0200.json
+++ b/docs/data/histograms/Chile/EL0200.json
@@ -1 +1 @@
-{"batchcode": "EL0200", "histograms": [{"batchcodes": ["EL0200"], "histogram": {"Abdominal pain upper": 1, "Blood pressure measurement": 1, "Body height": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Dysbiosis": 1, "Hypersensitivity": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0200", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Blood pressure measurement": 1, "Body height": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Dysbiosis": 1, "Hypersensitivity": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Weight": 1}, "batchcodes": ["EL0200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/EN6199.json b/docs/data/histograms/Chile/EN6199.json
index f4631b6bb6c..4412e919328 100644
--- a/docs/data/histograms/Chile/EN6199.json
+++ b/docs/data/histograms/Chile/EN6199.json
@@ -1 +1 @@
-{"batchcode": "EN6199", "histograms": [{"batchcodes": ["EN6199"], "histogram": {"Chills": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6199", "histograms": [{"histogram": {"Chills": 1, "Malaise": 1}, "batchcodes": ["EN6199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/EP6775.json b/docs/data/histograms/Chile/EP6775.json
index 3d79ce58493..5651a6fef79 100644
--- a/docs/data/histograms/Chile/EP6775.json
+++ b/docs/data/histograms/Chile/EP6775.json
@@ -1 +1 @@
-{"batchcode": "EP6775", "histograms": [{"batchcodes": ["EP6775"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6775", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["EP6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/ER9449.json b/docs/data/histograms/Chile/ER9449.json
index cad8dca6c5e..52a00bb3135 100644
--- a/docs/data/histograms/Chile/ER9449.json
+++ b/docs/data/histograms/Chile/ER9449.json
@@ -1 +1 @@
-{"batchcode": "ER9449", "histograms": [{"batchcodes": ["ER9449"], "histogram": {"Axillary pain": 1, "Blood chloride": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac stress test": 1, "Chest pain": 1, "Depressed mood": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "HIV antibody": 1, "Lipoma": 1, "Lymphadenopathy": 1, "Panic attack": 1, "Treponema test": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9449", "histograms": [{"histogram": {"Axillary pain": 1, "Blood chloride": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac stress test": 1, "Chest pain": 1, "Depressed mood": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "HIV antibody": 1, "Lipoma": 1, "Lymphadenopathy": 1, "Panic attack": 1, "Treponema test": 1, "Urine analysis": 1}, "batchcodes": ["ER9449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/EY0585.json b/docs/data/histograms/Chile/EY0585.json
index 36db3043179..f0b28d02aac 100644
--- a/docs/data/histograms/Chile/EY0585.json
+++ b/docs/data/histograms/Chile/EY0585.json
@@ -1 +1 @@
-{"batchcode": "EY0585", "histograms": [{"batchcodes": ["EY0585"], "histogram": {"Electromyogram": 1, "Hypotonia": 1, "Neuralgic amyotrophy": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0585", "histograms": [{"histogram": {"Electromyogram": 1, "Hypotonia": 1, "Neuralgic amyotrophy": 1}, "batchcodes": ["EY0585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/FE3593.json b/docs/data/histograms/Chile/FE3593.json
index 9a4e66a5f81..155241e6d4a 100644
--- a/docs/data/histograms/Chile/FE3593.json
+++ b/docs/data/histograms/Chile/FE3593.json
@@ -1 +1 @@
-{"batchcode": "FE3593", "histograms": [{"batchcodes": ["FE3593"], "histogram": {"Bronchial obstruction": 1, "Cough": 1, "Dysphonia": 1, "Pharyngeal disorder": 1, "Pruritus": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3593", "histograms": [{"histogram": {"Bronchial obstruction": 1, "Cough": 1, "Dysphonia": 1, "Pharyngeal disorder": 1, "Pruritus": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["FE3593"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/FJ8763.json b/docs/data/histograms/Chile/FJ8763.json
index 353581f5bb3..633085c0420 100644
--- a/docs/data/histograms/Chile/FJ8763.json
+++ b/docs/data/histograms/Chile/FJ8763.json
@@ -1 +1 @@
-{"batchcode": "FJ8763", "histograms": [{"batchcodes": ["FJ8763"], "histogram": {"Autoimmune thyroiditis": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Muscular weakness": 1, "Off label use": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8763", "histograms": [{"histogram": {"Autoimmune thyroiditis": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Muscular weakness": 1, "Off label use": 1, "Pain in extremity": 1}, "batchcodes": ["FJ8763"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/FL3210.json b/docs/data/histograms/Chile/FL3210.json
index 952b0a1d92f..0288900d5ac 100644
--- a/docs/data/histograms/Chile/FL3210.json
+++ b/docs/data/histograms/Chile/FL3210.json
@@ -1 +1 @@
-{"batchcode": "FL3210", "histograms": [{"batchcodes": ["FL3210"], "histogram": {"Back pain": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Musculoskeletal chest pain": 1, "Nausea": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3210", "histograms": [{"histogram": {"Back pain": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Musculoskeletal chest pain": 1, "Nausea": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1}, "batchcodes": ["FL3210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/FM2952.json b/docs/data/histograms/Chile/FM2952.json
index c311a769464..3872787e606 100644
--- a/docs/data/histograms/Chile/FM2952.json
+++ b/docs/data/histograms/Chile/FM2952.json
@@ -1 +1 @@
-{"batchcode": "FM2952", "histograms": [{"batchcodes": ["FM2952"], "histogram": {"Dermatitis acneiform": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pain": 1, "Pruritus": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2952", "histograms": [{"histogram": {"Dermatitis acneiform": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pain": 1, "Pruritus": 1, "Swelling face": 1}, "batchcodes": ["FM2952"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/FN0087.json b/docs/data/histograms/Chile/FN0087.json
index 60e9670411b..d38efb1bbe8 100644
--- a/docs/data/histograms/Chile/FN0087.json
+++ b/docs/data/histograms/Chile/FN0087.json
@@ -1 +1 @@
-{"batchcode": "FN0087", "histograms": [{"batchcodes": ["FN0087"], "histogram": {"Hemiplegia": 1, "Imaging procedure": 1, "Investigation": 1, "Myelitis transverse": 1}}]}
\ No newline at end of file
+{"batchcode": "FN0087", "histograms": [{"histogram": {"Hemiplegia": 1, "Imaging procedure": 1, "Investigation": 1, "Myelitis transverse": 1}, "batchcodes": ["FN0087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Chile/UNK.json b/docs/data/histograms/Chile/UNK.json
index 42218603073..54ce54f7d9b 100644
--- a/docs/data/histograms/Chile/UNK.json
+++ b/docs/data/histograms/Chile/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK"], "histogram": {"Hypotonia": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Respiratory disorder": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"Hypotonia": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Respiratory disorder": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/China/1808978.json b/docs/data/histograms/China/1808978.json
index e53d46d46a4..f90e8e71fa2 100644
--- a/docs/data/histograms/China/1808978.json
+++ b/docs/data/histograms/China/1808978.json
@@ -1 +1 @@
-{"batchcode": "1808978", "histograms": [{"batchcodes": ["1808978"], "histogram": {"Aortic arteriosclerosis": 1, "Atelectasis": 1, "Biopsy bone marrow": 1, "Blood test": 1, "COVID-19": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Gingival bleeding": 1, "Glucose-6-phosphate dehydrogenase": 1, "Glycogen storage disease type I": 1, "Hepatic cyst": 1, "Hepatic steatosis": 1, "Hyperuricaemia": 1, "Laboratory test": 1, "Liver function test": 1, "Myelodysplastic syndrome": 1, "Nucleic acid test": 1, "Platelet count decreased": 1, "Renal cyst": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Stool analysis": 1, "Syncope": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Vaccination failure": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "1808978", "histograms": [{"histogram": {"Aortic arteriosclerosis": 1, "Atelectasis": 1, "Biopsy bone marrow": 1, "Blood test": 1, "COVID-19": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Gingival bleeding": 1, "Glucose-6-phosphate dehydrogenase": 1, "Glycogen storage disease type I": 1, "Hepatic cyst": 1, "Hepatic steatosis": 1, "Hyperuricaemia": 1, "Laboratory test": 1, "Liver function test": 1, "Myelodysplastic syndrome": 1, "Nucleic acid test": 1, "Platelet count decreased": 1, "Renal cyst": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Stool analysis": 1, "Syncope": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Vaccination failure": 1, "Vertigo": 1}, "batchcodes": ["1808978"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/China/EW0182.json b/docs/data/histograms/China/EW0182.json
index 34cd8d136e7..05206599064 100644
--- a/docs/data/histograms/China/EW0182.json
+++ b/docs/data/histograms/China/EW0182.json
@@ -1 +1 @@
-{"batchcode": "EW0182", "histograms": [{"batchcodes": ["EW0182"], "histogram": {"Blood magnesium": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Drug screen": 1, "Electroencephalogram": 1, "Full blood count": 1, "Haematuria": 1, "Heart rate": 1, "Magnetic resonance imaging head": 1, "Metabolic function test": 1, "Pain in extremity": 1, "Respiratory rate": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0182", "histograms": [{"histogram": {"Blood magnesium": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Drug screen": 1, "Electroencephalogram": 1, "Full blood count": 1, "Haematuria": 1, "Heart rate": 1, "Magnetic resonance imaging head": 1, "Metabolic function test": 1, "Pain in extremity": 1, "Respiratory rate": 1, "Urine analysis": 1}, "batchcodes": ["EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/China/FN5254.json b/docs/data/histograms/China/FN5254.json
index 53b9aeb132d..8e58fbc8c39 100644
--- a/docs/data/histograms/China/FN5254.json
+++ b/docs/data/histograms/China/FN5254.json
@@ -1 +1 @@
-{"batchcode": "FN5254", "histograms": [{"batchcodes": ["FN5254"], "histogram": {"Allergy test": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FN5254", "histograms": [{"histogram": {"Allergy test": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}, "batchcodes": ["FN5254"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cocos (Keeling) Islands/036A21A.json b/docs/data/histograms/Cocos (Keeling) Islands/036A21A.json
index 4dc1eb2c039..9e0e1279219 100644
--- a/docs/data/histograms/Cocos (Keeling) Islands/036A21A.json
+++ b/docs/data/histograms/Cocos (Keeling) Islands/036A21A.json
@@ -1 +1 @@
-{"batchcode": "036A21A", "histograms": [{"batchcodes": ["036A21A"], "histogram": {"Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "036A21A", "histograms": [{"histogram": {"Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Rash erythematous": 1}, "batchcodes": ["036A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/#ER8733.json b/docs/data/histograms/Colombia/#ER8733.json
index f0e198f7a94..5d620f420ce 100644
--- a/docs/data/histograms/Colombia/#ER8733.json
+++ b/docs/data/histograms/Colombia/#ER8733.json
@@ -1 +1 @@
-{"batchcode": "#ER8733", "histograms": [{"batchcodes": ["#ER8733"], "histogram": {"Biopsy kidney abnormal": 1, "COVID-19": 1, "Fall": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Intensive care": 1, "Laboratory test abnormal": 1, "Plasma cell myeloma": 1}}]}
\ No newline at end of file
+{"batchcode": "#ER8733", "histograms": [{"histogram": {"Biopsy kidney abnormal": 1, "COVID-19": 1, "Fall": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Intensive care": 1, "Laboratory test abnormal": 1, "Plasma cell myeloma": 1}, "batchcodes": ["#ER8733"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/001B21A.json b/docs/data/histograms/Colombia/001B21A.json
index 26cd6f8d8a9..4253b5c46d1 100644
--- a/docs/data/histograms/Colombia/001B21A.json
+++ b/docs/data/histograms/Colombia/001B21A.json
@@ -1 +1 @@
-{"batchcode": "001B21A", "histograms": [{"batchcodes": ["001B21A"], "histogram": {"Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21A", "histograms": [{"histogram": {"Muscle spasms": 1}, "batchcodes": ["001B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/011J20A.json b/docs/data/histograms/Colombia/011J20A.json
index 87efc48c1f1..9f8f7619b96 100644
--- a/docs/data/histograms/Colombia/011J20A.json
+++ b/docs/data/histograms/Colombia/011J20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A", "histograms": [{"batchcodes": ["011J20A"], "histogram": {"Chills": 1, "Influenza virus test": 1, "Influenza virus test negative": 1, "Pain in extremity": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A", "histograms": [{"histogram": {"Chills": 1, "Influenza virus test": 1, "Influenza virus test negative": 1, "Pain in extremity": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/0126L20A.json b/docs/data/histograms/Colombia/0126L20A.json
index 2206b91c4db..181c6d80582 100644
--- a/docs/data/histograms/Colombia/0126L20A.json
+++ b/docs/data/histograms/Colombia/0126L20A.json
@@ -1 +1 @@
-{"batchcode": "0126L20A", "histograms": [{"batchcodes": ["0126L20A"], "histogram": {"Cellulitis": 1, "Injection site reaction": 1, "Injection site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0126L20A", "histograms": [{"histogram": {"Cellulitis": 1, "Injection site reaction": 1, "Injection site swelling": 1}, "batchcodes": ["0126L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/012L20A.json b/docs/data/histograms/Colombia/012L20A.json
index 0f7433a04c9..a8bcaed8f76 100644
--- a/docs/data/histograms/Colombia/012L20A.json
+++ b/docs/data/histograms/Colombia/012L20A.json
@@ -1 +1 @@
-{"batchcode": "012L20A", "histograms": [{"batchcodes": ["012L20A"], "histogram": {"Dizziness": 1, "Hyporesponsive to stimuli": 1, "Lethargy": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20A", "histograms": [{"histogram": {"Dizziness": 1, "Hyporesponsive to stimuli": 1, "Lethargy": 1, "Urinary tract infection": 1}, "batchcodes": ["012L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/015F21A.json b/docs/data/histograms/Colombia/015F21A.json
index 996dbfb5cc0..90fc9a4fdc8 100644
--- a/docs/data/histograms/Colombia/015F21A.json
+++ b/docs/data/histograms/Colombia/015F21A.json
@@ -1 +1 @@
-{"batchcode": "015F21A", "histograms": [{"batchcodes": ["015F21A", "FA5843"], "histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "015F21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Suspected COVID-19": 1}, "batchcodes": ["015F21A", "FA5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/016M20A.json b/docs/data/histograms/Colombia/016M20A.json
index 5931af8e9e8..1ca0a926176 100644
--- a/docs/data/histograms/Colombia/016M20A.json
+++ b/docs/data/histograms/Colombia/016M20A.json
@@ -1 +1 @@
-{"batchcode": "016M20A", "histograms": [{"batchcodes": ["016M20A"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Pain in extremity": 1, "Rash papular": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20A", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Pain in extremity": 1, "Rash papular": 1}, "batchcodes": ["016M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/025L20A.json b/docs/data/histograms/Colombia/025L20A.json
index 1e1246b2fa7..24f9b84e197 100644
--- a/docs/data/histograms/Colombia/025L20A.json
+++ b/docs/data/histograms/Colombia/025L20A.json
@@ -1 +1 @@
-{"batchcode": "025L20A", "histograms": [{"batchcodes": ["025L20A"], "histogram": {"Heart rate increased": 1, "Hypoaesthesia": 1, "Impaired driving ability": 1, "Paraesthesia oral": 1}}]}
\ No newline at end of file
+{"batchcode": "025L20A", "histograms": [{"histogram": {"Heart rate increased": 1, "Hypoaesthesia": 1, "Impaired driving ability": 1, "Paraesthesia oral": 1}, "batchcodes": ["025L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/027B21A.json b/docs/data/histograms/Colombia/027B21A.json
index 737b6ba9e7b..64a86f83381 100644
--- a/docs/data/histograms/Colombia/027B21A.json
+++ b/docs/data/histograms/Colombia/027B21A.json
@@ -1 +1 @@
-{"batchcode": "027B21A", "histograms": [{"batchcodes": ["027B21A", "029A21A"], "histogram": {"Cardiac monitoring normal": 1, "Catheterisation cardiac normal": 1, "Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "027B21A", "histograms": [{"histogram": {"Cardiac monitoring normal": 1, "Catheterisation cardiac normal": 1, "Myocardial infarction": 1}, "batchcodes": ["027B21A", "029A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/029A21A.json b/docs/data/histograms/Colombia/029A21A.json
index bfca6e52865..447323b6d17 100644
--- a/docs/data/histograms/Colombia/029A21A.json
+++ b/docs/data/histograms/Colombia/029A21A.json
@@ -1 +1 @@
-{"batchcode": "029A21A", "histograms": [{"batchcodes": ["027B21A", "029A21A"], "histogram": {"Cardiac monitoring normal": 1, "Catheterisation cardiac normal": 1, "Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "029A21A", "histograms": [{"histogram": {"Cardiac monitoring normal": 1, "Catheterisation cardiac normal": 1, "Myocardial infarction": 1}, "batchcodes": ["027B21A", "029A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/030A21A.json b/docs/data/histograms/Colombia/030A21A.json
index 71df508a5e6..893dce9b13f 100644
--- a/docs/data/histograms/Colombia/030A21A.json
+++ b/docs/data/histograms/Colombia/030A21A.json
@@ -1 +1 @@
-{"batchcode": "030A21A", "histograms": [{"batchcodes": ["030A21A"], "histogram": {"Arthralgia": 1, "Burning sensation": 1, "Chills": 1, "Feeling abnormal": 1, "Headache": 1, "Muscle spasms": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "030A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Burning sensation": 1, "Chills": 1, "Feeling abnormal": 1, "Headache": 1, "Muscle spasms": 1, "Myalgia": 1}, "batchcodes": ["030A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/030L20A.json b/docs/data/histograms/Colombia/030L20A.json
index a09689644a1..5f8b8b21031 100644
--- a/docs/data/histograms/Colombia/030L20A.json
+++ b/docs/data/histograms/Colombia/030L20A.json
@@ -1 +1 @@
-{"batchcode": "030L20A", "histograms": [{"batchcodes": ["030L20A"], "histogram": {"Death": 1, "Intentional dose omission": 1, "Intentional underdose": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20A", "histograms": [{"histogram": {"Death": 1, "Intentional dose omission": 1, "Intentional underdose": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["030L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/036A21A.json b/docs/data/histograms/Colombia/036A21A.json
index b60e29664a4..deb21f3a4bf 100644
--- a/docs/data/histograms/Colombia/036A21A.json
+++ b/docs/data/histograms/Colombia/036A21A.json
@@ -1 +1 @@
-{"batchcode": "036A21A", "histograms": [{"batchcodes": ["036A21A"], "histogram": {"Fatigue": 1, "Injection site pain": 1, "Injection site swelling": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "036A21A", "histograms": [{"histogram": {"Fatigue": 1, "Injection site pain": 1, "Injection site swelling": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["036A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/039K20-2A.json b/docs/data/histograms/Colombia/039K20-2A.json
index 70f9c8bf336..e891e3f3482 100644
--- a/docs/data/histograms/Colombia/039K20-2A.json
+++ b/docs/data/histograms/Colombia/039K20-2A.json
@@ -1 +1 @@
-{"batchcode": "039K20-2A", "histograms": [{"batchcodes": ["039K20-2A"], "histogram": {"Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "039K20-2A", "histograms": [{"histogram": {"Throat tightness": 1}, "batchcodes": ["039K20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/039K20A.json b/docs/data/histograms/Colombia/039K20A.json
index cc7ac85deee..9604420425b 100644
--- a/docs/data/histograms/Colombia/039K20A.json
+++ b/docs/data/histograms/Colombia/039K20A.json
@@ -1 +1 @@
-{"batchcode": "039K20A", "histograms": [{"batchcodes": ["039K20A"], "histogram": {"Diarrhoea": 1, "Dizziness": 1, "Injection site erythema": 1, "Injection site inflammation": 1, "Local reaction": 1, "Migraine": 1, "Paraesthesia oral": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "039K20A", "histograms": [{"histogram": {"Diarrhoea": 1, "Dizziness": 1, "Injection site erythema": 1, "Injection site inflammation": 1, "Local reaction": 1, "Migraine": 1, "Paraesthesia oral": 1, "Pyrexia": 1}, "batchcodes": ["039K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/042A21A.json b/docs/data/histograms/Colombia/042A21A.json
index 23896105ec5..149fb0f36b3 100644
--- a/docs/data/histograms/Colombia/042A21A.json
+++ b/docs/data/histograms/Colombia/042A21A.json
@@ -1 +1 @@
-{"batchcode": "042A21A", "histograms": [{"batchcodes": ["042A21A"], "histogram": {"Blood pressure increased": 1, "Chest discomfort": 1, "Chest pain": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "042A21A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Chest discomfort": 1, "Chest pain": 1, "Injection site pain": 1}, "batchcodes": ["042A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/055021A.json b/docs/data/histograms/Colombia/055021A.json
index 2b4acb7b66e..61ffaff9644 100644
--- a/docs/data/histograms/Colombia/055021A.json
+++ b/docs/data/histograms/Colombia/055021A.json
@@ -1 +1 @@
-{"batchcode": "055021A", "histograms": [{"batchcodes": ["055021A"], "histogram": {"Confusional state": 1, "Intentional dose omission": 1, "Mental impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "055021A", "histograms": [{"histogram": {"Confusional state": 1, "Intentional dose omission": 1, "Mental impairment": 1}, "batchcodes": ["055021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/0585.json b/docs/data/histograms/Colombia/0585.json
index d2261b0a7a2..a7567e65bca 100644
--- a/docs/data/histograms/Colombia/0585.json
+++ b/docs/data/histograms/Colombia/0585.json
@@ -1 +1 @@
-{"batchcode": "0585", "histograms": [{"batchcodes": ["0585"], "histogram": {"Rash": 1, "Skin lesion": 1, "Toxic skin eruption": 1}}]}
\ No newline at end of file
+{"batchcode": "0585", "histograms": [{"histogram": {"Rash": 1, "Skin lesion": 1, "Toxic skin eruption": 1}, "batchcodes": ["0585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/060M21A.json b/docs/data/histograms/Colombia/060M21A.json
index 569922342f1..2bef19e3407 100644
--- a/docs/data/histograms/Colombia/060M21A.json
+++ b/docs/data/histograms/Colombia/060M21A.json
@@ -1 +1 @@
-{"batchcode": "060M21A", "histograms": [{"batchcodes": ["060M21A"], "histogram": {"Interchange of vaccine products": 1, "Retinal detachment": 1}}]}
\ No newline at end of file
+{"batchcode": "060M21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Retinal detachment": 1}, "batchcodes": ["060M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/1026596867.json b/docs/data/histograms/Colombia/1026596867.json
index 2a893df8331..6a0f521925b 100644
--- a/docs/data/histograms/Colombia/1026596867.json
+++ b/docs/data/histograms/Colombia/1026596867.json
@@ -1 +1 @@
-{"batchcode": "1026596867", "histograms": [{"batchcodes": ["1026596867"], "histogram": {"Muscular weakness": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "1026596867", "histograms": [{"histogram": {"Muscular weakness": 1, "Tremor": 1}, "batchcodes": ["1026596867"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/18970.json b/docs/data/histograms/Colombia/18970.json
index 71af56879f0..904e1078574 100644
--- a/docs/data/histograms/Colombia/18970.json
+++ b/docs/data/histograms/Colombia/18970.json
@@ -1 +1 @@
-{"batchcode": "18970", "histograms": [{"batchcodes": ["18970"], "histogram": {"Antibody test": 1, "Discomfort": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "18970", "histograms": [{"histogram": {"Antibody test": 1, "Discomfort": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["18970"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/202G21A.json b/docs/data/histograms/Colombia/202G21A.json
index 86fa0be4ba4..d638472cdd2 100644
--- a/docs/data/histograms/Colombia/202G21A.json
+++ b/docs/data/histograms/Colombia/202G21A.json
@@ -1 +1 @@
-{"batchcode": "202G21A", "histograms": [{"batchcodes": ["202G21A"], "histogram": {"Body temperature": 1, "Chills": 1, "Delirium": 1, "Hunger": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Off label use": 1, "Pain": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Thirst": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "202G21A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Delirium": 1, "Hunger": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Off label use": 1, "Pain": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Thirst": 1, "Vaccination site pain": 1}, "batchcodes": ["202G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/203S21A.json b/docs/data/histograms/Colombia/203S21A.json
index 0f3f41d59ca..5f4d3f67ce0 100644
--- a/docs/data/histograms/Colombia/203S21A.json
+++ b/docs/data/histograms/Colombia/203S21A.json
@@ -1 +1 @@
-{"batchcode": "203S21A", "histograms": [{"batchcodes": ["203S21A"], "histogram": {"Anosmia": 1, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Fall": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Seizure": 1, "Thermal burn": 1}}]}
\ No newline at end of file
+{"batchcode": "203S21A", "histograms": [{"histogram": {"Anosmia": 1, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Fall": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Seizure": 1, "Thermal burn": 1}, "batchcodes": ["203S21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/204A21A.json b/docs/data/histograms/Colombia/204A21A.json
index 2c61bbec4e2..cfb9e1fd8a9 100644
--- a/docs/data/histograms/Colombia/204A21A.json
+++ b/docs/data/histograms/Colombia/204A21A.json
@@ -1 +1 @@
-{"batchcode": "204A21A", "histograms": [{"batchcodes": ["204A21A"], "histogram": {"Abnormal sensation in eye": 1, "Body temperature": 1, "Bone pain": 1, "Hemiparesis": 1, "Inflammation": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Vaccination failure": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "204A21A", "histograms": [{"histogram": {"Abnormal sensation in eye": 1, "Body temperature": 1, "Bone pain": 1, "Hemiparesis": 1, "Inflammation": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Vaccination failure": 1, "Vertigo": 1}, "batchcodes": ["204A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/205A21A.json b/docs/data/histograms/Colombia/205A21A.json
index 32bec50d1b1..ebcf8f1a6db 100644
--- a/docs/data/histograms/Colombia/205A21A.json
+++ b/docs/data/histograms/Colombia/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"Expired product administered": 2, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"Expired product administered": 2, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/206#21A.json b/docs/data/histograms/Colombia/206#21A.json
index f389f3d5112..2b33c5edbc7 100644
--- a/docs/data/histograms/Colombia/206#21A.json
+++ b/docs/data/histograms/Colombia/206#21A.json
@@ -1 +1 @@
-{"batchcode": "206#21A", "histograms": [{"batchcodes": ["206#21A"], "histogram": {"Haematoma": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Spinal cord disorder": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "206#21A", "histograms": [{"histogram": {"Haematoma": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Spinal cord disorder": 1, "Thrombosis": 1}, "batchcodes": ["206#21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/207A21A.json b/docs/data/histograms/Colombia/207A21A.json
index eeb55df92e7..b54eb5a86ab 100644
--- a/docs/data/histograms/Colombia/207A21A.json
+++ b/docs/data/histograms/Colombia/207A21A.json
@@ -1 +1 @@
-{"batchcode": "207A21A", "histograms": [{"batchcodes": ["207A21A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "207A21A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["207A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/2081A211A.json b/docs/data/histograms/Colombia/2081A211A.json
index ed63e27e34e..1d66f8a1b4e 100644
--- a/docs/data/histograms/Colombia/2081A211A.json
+++ b/docs/data/histograms/Colombia/2081A211A.json
@@ -1 +1 @@
-{"batchcode": "2081A211A", "histograms": [{"batchcodes": ["2081A211A"], "histogram": {"Back pain": 1, "Basophil count": 1, "Bone pain": 1, "Choking": 1, "Eosinophil count": 1}}]}
\ No newline at end of file
+{"batchcode": "2081A211A", "histograms": [{"histogram": {"Back pain": 1, "Basophil count": 1, "Bone pain": 1, "Choking": 1, "Eosinophil count": 1}, "batchcodes": ["2081A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/208A21A.json b/docs/data/histograms/Colombia/208A21A.json
index 1d3736eba99..42751ff2400 100644
--- a/docs/data/histograms/Colombia/208A21A.json
+++ b/docs/data/histograms/Colombia/208A21A.json
@@ -1 +1 @@
-{"batchcode": "208A21A", "histograms": [{"batchcodes": ["208A21A"], "histogram": {"Angiogram": 1, "Chills": 1, "Coagulation time": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Full blood count": 1, "Haematoma": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Platelet aggregation test": 1, "Platelet count": 1, "Prothrombin time": 1, "Ultrasound scan": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "208A21A", "histograms": [{"histogram": {"Angiogram": 1, "Chills": 1, "Coagulation time": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Full blood count": 1, "Haematoma": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Platelet aggregation test": 1, "Platelet count": 1, "Prothrombin time": 1, "Ultrasound scan": 1, "X-ray": 1}, "batchcodes": ["208A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/210958.json b/docs/data/histograms/Colombia/210958.json
index a0852fa3714..8251d0f5785 100644
--- a/docs/data/histograms/Colombia/210958.json
+++ b/docs/data/histograms/Colombia/210958.json
@@ -1 +1 @@
-{"batchcode": "210958", "histograms": [{"batchcodes": ["210958"], "histogram": {"COVID-19": 2, "Oxygen saturation": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "210958", "histograms": [{"histogram": {"COVID-19": 2, "Oxygen saturation": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}, "batchcodes": ["210958"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/210963.json b/docs/data/histograms/Colombia/210963.json
index b19207437a6..658b7edcf38 100644
--- a/docs/data/histograms/Colombia/210963.json
+++ b/docs/data/histograms/Colombia/210963.json
@@ -1 +1 @@
-{"batchcode": "210963", "histograms": [{"batchcodes": ["210963"], "histogram": {"Asthenia": 1, "Bedridden": 1, "Body temperature": 1, "Chills": 1, "Condition aggravated": 1, "Headache": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1, "Ocular hyperaemia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "210963", "histograms": [{"histogram": {"Asthenia": 1, "Bedridden": 1, "Body temperature": 1, "Chills": 1, "Condition aggravated": 1, "Headache": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1, "Ocular hyperaemia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["210963"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/212A21A.json b/docs/data/histograms/Colombia/212A21A.json
index f793bfa3c0a..992ec162301 100644
--- a/docs/data/histograms/Colombia/212A21A.json
+++ b/docs/data/histograms/Colombia/212A21A.json
@@ -1 +1 @@
-{"batchcode": "212A21A", "histograms": [{"batchcodes": ["212A21A"], "histogram": {"Headache": 2, "SARS-CoV-2 test": 2, "Activated partial thromboplastin time": 1, "Balance disorder": 1, "Basophil count": 1, "Basophil percentage": 1, "Blast cells": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood test": 1, "Body temperature": 1, "Choking sensation": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Cough": 1, "Diagnostic procedure": 1, "Differential white blood cell count": 1, "Dizziness": 1, "Dysphonia": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Fatigue": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Immature granulocyte count": 1, "Impaired work ability": 1, "Influenza": 1, "International normalised ratio": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Metamyelocyte count": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Myelocyte count": 1, "Nausea": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Paraesthesia": 1, "Platelet count": 1, "Platelet morphology": 1, "Promyelocyte count": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Slow speech": 1, "Speech disorder": 1, "Therapy non-responder": 1, "Thrombocytopenia": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "212A21A", "histograms": [{"histogram": {"Headache": 2, "SARS-CoV-2 test": 2, "Activated partial thromboplastin time": 1, "Balance disorder": 1, "Basophil count": 1, "Basophil percentage": 1, "Blast cells": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood test": 1, "Body temperature": 1, "Choking sensation": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Cough": 1, "Diagnostic procedure": 1, "Differential white blood cell count": 1, "Dizziness": 1, "Dysphonia": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Fatigue": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Immature granulocyte count": 1, "Impaired work ability": 1, "Influenza": 1, "International normalised ratio": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Metamyelocyte count": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Myelocyte count": 1, "Nausea": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Paraesthesia": 1, "Platelet count": 1, "Platelet morphology": 1, "Promyelocyte count": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Slow speech": 1, "Speech disorder": 1, "Therapy non-responder": 1, "Thrombocytopenia": 1, "White blood cell count": 1}, "batchcodes": ["212A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/213A 21A.json b/docs/data/histograms/Colombia/213A 21A.json
index 5ad4f94181a..8b2b831911c 100644
--- a/docs/data/histograms/Colombia/213A 21A.json
+++ b/docs/data/histograms/Colombia/213A 21A.json
@@ -1 +1 @@
-{"batchcode": "213A 21A", "histograms": [{"batchcodes": ["213A 21A"], "histogram": {"SARS-CoV-2 antibody test": 1, "Therapy non-responder": 1}}]}
\ No newline at end of file
+{"batchcode": "213A 21A", "histograms": [{"histogram": {"SARS-CoV-2 antibody test": 1, "Therapy non-responder": 1}, "batchcodes": ["213A 21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/213A21A.json b/docs/data/histograms/Colombia/213A21A.json
index 3f9ccfd1376..f8f3b9a4d35 100644
--- a/docs/data/histograms/Colombia/213A21A.json
+++ b/docs/data/histograms/Colombia/213A21A.json
@@ -1 +1 @@
-{"batchcode": "213A21A", "histograms": [{"batchcodes": ["213A21A"], "histogram": {"Body temperature": 1, "Cardiogenic shock": 1, "Encephalitis autoimmune": 1, "Generalised tonic-clonic seizure": 1, "Heart rate": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Muscle spasms": 1, "Oxygen saturation": 1, "Postictal state": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "213A21A", "histograms": [{"histogram": {"Body temperature": 1, "Cardiogenic shock": 1, "Encephalitis autoimmune": 1, "Generalised tonic-clonic seizure": 1, "Heart rate": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Muscle spasms": 1, "Oxygen saturation": 1, "Postictal state": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1, "Weight decreased": 1}, "batchcodes": ["213A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/2915BA.json b/docs/data/histograms/Colombia/2915BA.json
index 114e770dfb7..12864966ced 100644
--- a/docs/data/histograms/Colombia/2915BA.json
+++ b/docs/data/histograms/Colombia/2915BA.json
@@ -1 +1 @@
-{"batchcode": "2915BA", "histograms": [{"batchcodes": ["2915BA"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Discouragement": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Hypersensitivity": 1, "Investigation": 1, "Laryngopharyngitis": 1, "Pain": 1, "Pharyngotonsillitis": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Suspected COVID-19": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "2915BA", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Discouragement": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Hypersensitivity": 1, "Investigation": 1, "Laryngopharyngitis": 1, "Pain": 1, "Pharyngotonsillitis": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Suspected COVID-19": 1, "Urticaria": 1}, "batchcodes": ["2915BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/30A21A.json b/docs/data/histograms/Colombia/30A21A.json
index a64ae9301b0..eeff0fb6cf3 100644
--- a/docs/data/histograms/Colombia/30A21A.json
+++ b/docs/data/histograms/Colombia/30A21A.json
@@ -1 +1 @@
-{"batchcode": "30A21A", "histograms": [{"batchcodes": ["30A21A"], "histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "30A21A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["30A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/A4875.json b/docs/data/histograms/Colombia/A4875.json
index 978f355cb5b..98a1a3a6732 100644
--- a/docs/data/histograms/Colombia/A4875.json
+++ b/docs/data/histograms/Colombia/A4875.json
@@ -1 +1 @@
-{"batchcode": "A4875", "histograms": [{"batchcodes": ["A4875"], "histogram": {"Abscess": 1, "Dysstasia": 1, "Fall": 1, "Gait disturbance": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Monoplegia": 1, "Pleural decortication": 1, "Pyrexia": 1, "Seizure": 1, "Spinal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "A4875", "histograms": [{"histogram": {"Abscess": 1, "Dysstasia": 1, "Fall": 1, "Gait disturbance": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Monoplegia": 1, "Pleural decortication": 1, "Pyrexia": 1, "Seizure": 1, "Spinal pain": 1}, "batchcodes": ["A4875"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ACC5853.json b/docs/data/histograms/Colombia/ACC5853.json
index b4a3a703ac2..c73889ecf3b 100644
--- a/docs/data/histograms/Colombia/ACC5853.json
+++ b/docs/data/histograms/Colombia/ACC5853.json
@@ -1 +1 @@
-{"batchcode": "ACC5853", "histograms": [{"batchcodes": ["ACC5853"], "histogram": {"Axillary pain": 1, "Bedridden": 1, "Blood pressure measurement": 1, "Headache": 1, "Hypertension": 1, "Immunisation": 1, "Joint range of motion decreased": 1, "Malaise": 1, "Off label use": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ACC5853", "histograms": [{"histogram": {"Axillary pain": 1, "Bedridden": 1, "Blood pressure measurement": 1, "Headache": 1, "Hypertension": 1, "Immunisation": 1, "Joint range of motion decreased": 1, "Malaise": 1, "Off label use": 1, "Pyrexia": 1}, "batchcodes": ["ACC5853"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/E40585.json b/docs/data/histograms/Colombia/E40585.json
index 166986b1b6a..711d1cb7690 100644
--- a/docs/data/histograms/Colombia/E40585.json
+++ b/docs/data/histograms/Colombia/E40585.json
@@ -1 +1 @@
-{"batchcode": "E40585", "histograms": [{"batchcodes": ["E40585"], "histogram": {"Asthmatic crisis": 1, "Blood iron": 1, "Blood iron abnormal": 1, "COVID-19": 1, "Fibrin D dimer": 1, "Oxygen saturation": 1, "Platelet count": 1, "Platelet disorder": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1, "White blood cell count": 1, "White blood cell disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "E40585", "histograms": [{"histogram": {"Asthmatic crisis": 1, "Blood iron": 1, "Blood iron abnormal": 1, "COVID-19": 1, "Fibrin D dimer": 1, "Oxygen saturation": 1, "Platelet count": 1, "Platelet disorder": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1, "White blood cell count": 1, "White blood cell disorder": 1}, "batchcodes": ["E40585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/E40586.json b/docs/data/histograms/Colombia/E40586.json
index bbade4d1875..89385c9f25e 100644
--- a/docs/data/histograms/Colombia/E40586.json
+++ b/docs/data/histograms/Colombia/E40586.json
@@ -1 +1 @@
-{"batchcode": "E40586", "histograms": [{"batchcodes": ["E40586"], "histogram": {"Arthritis": 1, "Chest pain": 1, "Dry skin": 1, "Dyspnoea": 1, "Fatigue": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "E40586", "histograms": [{"histogram": {"Arthritis": 1, "Chest pain": 1, "Dry skin": 1, "Dyspnoea": 1, "Fatigue": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["E40586"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EA5843.json b/docs/data/histograms/Colombia/EA5843.json
index e3497d63188..0043063fa0b 100644
--- a/docs/data/histograms/Colombia/EA5843.json
+++ b/docs/data/histograms/Colombia/EA5843.json
@@ -1 +1 @@
-{"batchcode": "EA5843", "histograms": [{"batchcodes": ["EA5843"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Suffocation feeling": 1}}]}
\ No newline at end of file
+{"batchcode": "EA5843", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Suffocation feeling": 1}, "batchcodes": ["EA5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EJ1685.json b/docs/data/histograms/Colombia/EJ1685.json
index 54271a91d60..d9c05abdfb1 100644
--- a/docs/data/histograms/Colombia/EJ1685.json
+++ b/docs/data/histograms/Colombia/EJ1685.json
@@ -1 +1 @@
-{"batchcode": "EJ1685", "histograms": [{"batchcodes": ["EJ1685"], "histogram": {"Dyspnoea": 1, "Pharyngeal swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ1685", "histograms": [{"histogram": {"Dyspnoea": 1, "Pharyngeal swelling": 1}, "batchcodes": ["EJ1685"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EK5730.json b/docs/data/histograms/Colombia/EK5730.json
index 702337b53d3..77f31a41a8b 100644
--- a/docs/data/histograms/Colombia/EK5730.json
+++ b/docs/data/histograms/Colombia/EK5730.json
@@ -1 +1 @@
-{"batchcode": "EK5730", "histograms": [{"batchcodes": ["EK5730"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EK5730", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["EK5730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EL9266.json b/docs/data/histograms/Colombia/EL9266.json
index c2854f105e9..dbb4cbb8c9d 100644
--- a/docs/data/histograms/Colombia/EL9266.json
+++ b/docs/data/histograms/Colombia/EL9266.json
@@ -1 +1 @@
-{"batchcode": "EL9266", "histograms": [{"batchcodes": ["EL9266"], "histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Hypotension": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9266", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Hypotension": 1, "Vomiting": 1}, "batchcodes": ["EL9266"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EM9809.json b/docs/data/histograms/Colombia/EM9809.json
index 1d9cb5888ae..4f63f50f9a4 100644
--- a/docs/data/histograms/Colombia/EM9809.json
+++ b/docs/data/histograms/Colombia/EM9809.json
@@ -1 +1 @@
-{"batchcode": "EM9809", "histograms": [{"batchcodes": ["EM9809"], "histogram": {"Diplopia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9809", "histograms": [{"histogram": {"Diplopia": 1, "Vision blurred": 1}, "batchcodes": ["EM9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EN0191.json b/docs/data/histograms/Colombia/EN0191.json
index 81bb4c1cf90..34d613c384b 100644
--- a/docs/data/histograms/Colombia/EN0191.json
+++ b/docs/data/histograms/Colombia/EN0191.json
@@ -1 +1 @@
-{"batchcode": "EN0191", "histograms": [{"batchcodes": ["EN0191"], "histogram": {"Insomnia": 1}}]}
\ No newline at end of file
+{"batchcode": "EN0191", "histograms": [{"histogram": {"Insomnia": 1}, "batchcodes": ["EN0191"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EN1145.json b/docs/data/histograms/Colombia/EN1145.json
index 0cef37a44be..045133f0661 100644
--- a/docs/data/histograms/Colombia/EN1145.json
+++ b/docs/data/histograms/Colombia/EN1145.json
@@ -1 +1 @@
-{"batchcode": "EN1145", "histograms": [{"batchcodes": ["EN1145"], "histogram": {"Abdominal pain upper": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Anaemia": 1, "Arthralgia": 1, "Ascites": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Asthenia": 1, "Back pain": 1, "Bilirubin conjugated": 1, "Bladder spasm": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood ketone body": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood osmolarity": 1, "Blood pH": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urine": 1, "Body mass index": 1, "Body temperature": 1, "Breath sounds abnormal": 1, "C-reactive protein": 1, "Cardiac murmur": 1, "Cardiomegaly": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Chronic kidney disease": 1, "Coma scale": 1, "Costochondritis": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysuria": 1, "Electrocardiogram": 1, "Electrocardiogram repolarisation abnormality": 1, "Embolism": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fluid retention": 1, "Fraction of inspired oxygen": 1, "Glomerulonephritis": 1, "Glucose urine": 1, "Gram stain": 1, "Granulocyte count": 1, "Granulocyte percentage": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Heart rate": 1, "Hyperkalaemia": 1, "Hypertensive crisis": 1, "Hypoaesthesia": 1, "Intracardiac thrombus": 1, "Investigation": 1, "Ischaemia": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Metabolic acidosis": 1, "Micturition urgency": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Nausea": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Normochromic anaemia": 1, "Normocytic anaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "PCO2": 1, "PO2": 1, "PaO2/FiO2 ratio": 1, "Pain": 1, "Pericarditis uraemic": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Pneumonia": 1, "Protein urine": 1, "Proteinuria": 1, "Pulmonary thrombosis": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Respiratory acidosis": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Tachycardia": 1, "Tachypnoea": 1, "Troponin": 1, "Troponin I": 1, "Troponin increased": 1, "Urinary sediment": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine leukocyte esterase": 1, "Urobilinogen urine": 1, "Viral myocarditis": 1, "Vomiting": 1, "White blood cell count": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1145", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Anaemia": 1, "Arthralgia": 1, "Ascites": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Asthenia": 1, "Back pain": 1, "Bilirubin conjugated": 1, "Bladder spasm": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood ketone body": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood osmolarity": 1, "Blood pH": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urine": 1, "Body mass index": 1, "Body temperature": 1, "Breath sounds abnormal": 1, "C-reactive protein": 1, "Cardiac murmur": 1, "Cardiomegaly": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Chronic kidney disease": 1, "Coma scale": 1, "Costochondritis": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysuria": 1, "Electrocardiogram": 1, "Electrocardiogram repolarisation abnormality": 1, "Embolism": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fluid retention": 1, "Fraction of inspired oxygen": 1, "Glomerulonephritis": 1, "Glucose urine": 1, "Gram stain": 1, "Granulocyte count": 1, "Granulocyte percentage": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Heart rate": 1, "Hyperkalaemia": 1, "Hypertensive crisis": 1, "Hypoaesthesia": 1, "Intracardiac thrombus": 1, "Investigation": 1, "Ischaemia": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Metabolic acidosis": 1, "Micturition urgency": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Nausea": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Normochromic anaemia": 1, "Normocytic anaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "PCO2": 1, "PO2": 1, "PaO2/FiO2 ratio": 1, "Pain": 1, "Pericarditis uraemic": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Pneumonia": 1, "Protein urine": 1, "Proteinuria": 1, "Pulmonary thrombosis": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Respiratory acidosis": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Tachycardia": 1, "Tachypnoea": 1, "Troponin": 1, "Troponin I": 1, "Troponin increased": 1, "Urinary sediment": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine leukocyte esterase": 1, "Urobilinogen urine": 1, "Viral myocarditis": 1, "Vomiting": 1, "White blood cell count": 1, "pH urine": 1}, "batchcodes": ["EN1145"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EN1194.json b/docs/data/histograms/Colombia/EN1194.json
index 77bd4f0c218..bd8cf3f318f 100644
--- a/docs/data/histograms/Colombia/EN1194.json
+++ b/docs/data/histograms/Colombia/EN1194.json
@@ -1 +1 @@
-{"batchcode": "EN1194", "histograms": [{"batchcodes": ["EN1194"], "histogram": {"Asthenia": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Malaise": 1, "Rash": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1194", "histograms": [{"histogram": {"Asthenia": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Malaise": 1, "Rash": 1, "Vertigo": 1}, "batchcodes": ["EN1194"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EN1195.json b/docs/data/histograms/Colombia/EN1195.json
index 529e9c179d8..313b9cd4a23 100644
--- a/docs/data/histograms/Colombia/EN1195.json
+++ b/docs/data/histograms/Colombia/EN1195.json
@@ -1 +1 @@
-{"batchcode": "EN1195", "histograms": [{"batchcodes": ["EN1195"], "histogram": {"Conversion disorder": 1, "Dyskinesia": 1, "Dystonia": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Myalgia": 1, "Somatic symptom disorder": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1195", "histograms": [{"histogram": {"Conversion disorder": 1, "Dyskinesia": 1, "Dystonia": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Myalgia": 1, "Somatic symptom disorder": 1, "Tremor": 1}, "batchcodes": ["EN1195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EN6204.json b/docs/data/histograms/Colombia/EN6204.json
index 342823a93f0..07d2959d247 100644
--- a/docs/data/histograms/Colombia/EN6204.json
+++ b/docs/data/histograms/Colombia/EN6204.json
@@ -1 +1 @@
-{"batchcode": "EN6204", "histograms": [{"batchcodes": ["EN6204"], "histogram": {"Herpes zoster": 1, "Pruritus": 1, "Skin lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6204", "histograms": [{"histogram": {"Herpes zoster": 1, "Pruritus": 1, "Skin lesion": 1}, "batchcodes": ["EN6204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ER1742.json b/docs/data/histograms/Colombia/ER1742.json
index 37345ae1d68..9f4bcb570cc 100644
--- a/docs/data/histograms/Colombia/ER1742.json
+++ b/docs/data/histograms/Colombia/ER1742.json
@@ -1 +1 @@
-{"batchcode": "ER1742", "histograms": [{"batchcodes": ["ER1742"], "histogram": {"COVID-19": 1, "Cholecystitis": 1, "Cholelithiasis": 1, "Drug ineffective": 1, "Hepatic steatosis": 1, "Hepatitis": 1, "Hypertension": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ER1742", "histograms": [{"histogram": {"COVID-19": 1, "Cholecystitis": 1, "Cholelithiasis": 1, "Drug ineffective": 1, "Hepatic steatosis": 1, "Hepatitis": 1, "Hypertension": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ER1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ER4449.json b/docs/data/histograms/Colombia/ER4449.json
index e41f24ae4f2..57e8ce342e7 100644
--- a/docs/data/histograms/Colombia/ER4449.json
+++ b/docs/data/histograms/Colombia/ER4449.json
@@ -1 +1 @@
-{"batchcode": "ER4449", "histograms": [{"batchcodes": ["ER4449"], "histogram": {"Asthenia": 1, "C-reactive protein": 1, "Joint range of motion decreased": 1, "Myalgia": 1, "Paraesthesia": 1, "Polymyalgia rheumatica": 1, "Rheumatoid factor": 1, "Tendonitis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER4449", "histograms": [{"histogram": {"Asthenia": 1, "C-reactive protein": 1, "Joint range of motion decreased": 1, "Myalgia": 1, "Paraesthesia": 1, "Polymyalgia rheumatica": 1, "Rheumatoid factor": 1, "Tendonitis": 1}, "batchcodes": ["ER4449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ER8727.json b/docs/data/histograms/Colombia/ER8727.json
index 35e242d545e..9432cb3b1ad 100644
--- a/docs/data/histograms/Colombia/ER8727.json
+++ b/docs/data/histograms/Colombia/ER8727.json
@@ -1 +1 @@
-{"batchcode": "ER8727", "histograms": [{"batchcodes": ["ER8727"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8727", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "No adverse event": 1}, "batchcodes": ["ER8727"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ER8729.json b/docs/data/histograms/Colombia/ER8729.json
index 2fa483962aa..d9f24087423 100644
--- a/docs/data/histograms/Colombia/ER8729.json
+++ b/docs/data/histograms/Colombia/ER8729.json
@@ -1 +1 @@
-{"batchcode": "ER8729", "histograms": [{"batchcodes": ["ER8729"], "histogram": {"Erythema": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8729", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["ER8729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ER9449.json b/docs/data/histograms/Colombia/ER9449.json
index 19b7787282b..d3f002fc279 100644
--- a/docs/data/histograms/Colombia/ER9449.json
+++ b/docs/data/histograms/Colombia/ER9449.json
@@ -1 +1 @@
-{"batchcode": "ER9449", "histograms": [{"batchcodes": ["ER9449"], "histogram": {"Headache": 3, "Asthenia": 2, "COVID-19": 2, "Vaccination failure": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blindness transient": 1, "Bone pain": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Hot flush": 1, "Hypertension": 1, "Impaired quality of life": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Monoplegia": 1, "Myalgia": 1, "Nasal congestion": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain": 1, "Polymerase chain reaction positive": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9449", "histograms": [{"histogram": {"Headache": 3, "Asthenia": 2, "COVID-19": 2, "Vaccination failure": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blindness transient": 1, "Bone pain": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Hot flush": 1, "Hypertension": 1, "Impaired quality of life": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Monoplegia": 1, "Myalgia": 1, "Nasal congestion": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain": 1, "Polymerase chain reaction positive": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1}, "batchcodes": ["ER9449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ET 6924.json b/docs/data/histograms/Colombia/ET 6924.json
index 4160271167e..2f8dc6d5230 100644
--- a/docs/data/histograms/Colombia/ET 6924.json
+++ b/docs/data/histograms/Colombia/ET 6924.json
@@ -1 +1 @@
-{"batchcode": "ET 6924", "histograms": [{"batchcodes": ["ET 6924"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Headache": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ET 6924", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Headache": 1, "Oropharyngeal pain": 1}, "batchcodes": ["ET 6924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ET6924 OR ET692.json b/docs/data/histograms/Colombia/ET6924 OR ET692.json
index 01a9ff203c4..911ec0be3eb 100644
--- a/docs/data/histograms/Colombia/ET6924 OR ET692.json
+++ b/docs/data/histograms/Colombia/ET6924 OR ET692.json
@@ -1 +1 @@
-{"batchcode": "ET6924 OR ET692", "histograms": [{"batchcodes": ["ET6924 OR ET692"], "histogram": {"Hypersensitivity": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6924 OR ET692", "histograms": [{"histogram": {"Hypersensitivity": 1, "Rash": 1}, "batchcodes": ["ET6924 OR ET692"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ET6924.json b/docs/data/histograms/Colombia/ET6924.json
index 97891cbf351..5b6b05b1436 100644
--- a/docs/data/histograms/Colombia/ET6924.json
+++ b/docs/data/histograms/Colombia/ET6924.json
@@ -1 +1 @@
-{"batchcode": "ET6924", "histograms": [{"batchcodes": ["ET6924"], "histogram": {"Pyrexia": 2, "Vaccination failure": 2, "Activated partial thromboplastin time": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Anosmia": 1, "Arthralgia": 1, "Arthropathy": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Bilirubin conjugated": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "C-reactive protein": 1, "COVID-19": 1, "Cellulitis": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Cough": 1, "Deafness": 1, "Dermatitis exfoliative": 1, "Eczema": 1, "Erythema": 1, "Free thyroxine index": 1, "Gait inability": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hand deformity": 1, "Heart rate": 1, "Hyperkeratosis": 1, "Hypertension": 1, "Hypochromic anaemia": 1, "Hypokalaemia": 1, "International normalised ratio": 1, "Lymphocyte count": 1, "Madarosis": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Nausea": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Otitis externa": 1, "Pain": 1, "Peripheral swelling": 1, "Platelet count": 1, "Prothrombin time": 1, "Pruritus": 1, "Rash": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Tachycardia": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6924", "histograms": [{"histogram": {"Pyrexia": 2, "Vaccination failure": 2, "Activated partial thromboplastin time": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Anosmia": 1, "Arthralgia": 1, "Arthropathy": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Bilirubin conjugated": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "C-reactive protein": 1, "COVID-19": 1, "Cellulitis": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Cough": 1, "Deafness": 1, "Dermatitis exfoliative": 1, "Eczema": 1, "Erythema": 1, "Free thyroxine index": 1, "Gait inability": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hand deformity": 1, "Heart rate": 1, "Hyperkeratosis": 1, "Hypertension": 1, "Hypochromic anaemia": 1, "Hypokalaemia": 1, "International normalised ratio": 1, "Lymphocyte count": 1, "Madarosis": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Nausea": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Otitis externa": 1, "Pain": 1, "Peripheral swelling": 1, "Platelet count": 1, "Prothrombin time": 1, "Pruritus": 1, "Rash": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Tachycardia": 1, "White blood cell count": 1}, "batchcodes": ["ET6924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ET692Y.json b/docs/data/histograms/Colombia/ET692Y.json
index 942924063aa..c7d3c51f59c 100644
--- a/docs/data/histograms/Colombia/ET692Y.json
+++ b/docs/data/histograms/Colombia/ET692Y.json
@@ -1 +1 @@
-{"batchcode": "ET692Y", "histograms": [{"batchcodes": ["ET692Y"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "ET692Y", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["ET692Y"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/ET6949.json b/docs/data/histograms/Colombia/ET6949.json
index 93e6dc25b39..70769996aa9 100644
--- a/docs/data/histograms/Colombia/ET6949.json
+++ b/docs/data/histograms/Colombia/ET6949.json
@@ -1 +1 @@
-{"batchcode": "ET6949", "histograms": [{"batchcodes": ["ET6949"], "histogram": {"COVID-19": 1, "Diarrhoea": 1, "Discomfort": 1, "Headache": 1, "Pain": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6949", "histograms": [{"histogram": {"COVID-19": 1, "Diarrhoea": 1, "Discomfort": 1, "Headache": 1, "Pain": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["ET6949"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EVO586.json b/docs/data/histograms/Colombia/EVO586.json
index fa36a509664..e3616ae7121 100644
--- a/docs/data/histograms/Colombia/EVO586.json
+++ b/docs/data/histograms/Colombia/EVO586.json
@@ -1 +1 @@
-{"batchcode": "EVO586", "histograms": [{"batchcodes": ["EVO586"], "histogram": {"Arthralgia": 1, "Dermatitis": 1, "Hypersensitivity": 1, "Malaise": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EVO586", "histograms": [{"histogram": {"Arthralgia": 1, "Dermatitis": 1, "Hypersensitivity": 1, "Malaise": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["EVO586"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW-0195.json b/docs/data/histograms/Colombia/EW-0195.json
index 1bd384fca5e..f121794ae84 100644
--- a/docs/data/histograms/Colombia/EW-0195.json
+++ b/docs/data/histograms/Colombia/EW-0195.json
@@ -1 +1 @@
-{"batchcode": "EW-0195", "histograms": [{"batchcodes": ["EW-0195"], "histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Exposure to SARS-CoV-2": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW-0195", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Exposure to SARS-CoV-2": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW-0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0161.json b/docs/data/histograms/Colombia/EW0161.json
index bcd99f843e0..862999b0670 100644
--- a/docs/data/histograms/Colombia/EW0161.json
+++ b/docs/data/histograms/Colombia/EW0161.json
@@ -1 +1 @@
-{"batchcode": "EW0161", "histograms": [{"batchcodes": ["EW0161"], "histogram": {"Glomerulonephritis": 1, "Investigation": 1, "Protein urine": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0161", "histograms": [{"histogram": {"Glomerulonephritis": 1, "Investigation": 1, "Protein urine": 1}, "batchcodes": ["EW0161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0171.json b/docs/data/histograms/Colombia/EW0171.json
index 088913a6449..d3b2237d54d 100644
--- a/docs/data/histograms/Colombia/EW0171.json
+++ b/docs/data/histograms/Colombia/EW0171.json
@@ -1 +1 @@
-{"batchcode": "EW0171", "histograms": [{"batchcodes": ["EW0171"], "histogram": {"Alcohol use": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0171", "histograms": [{"histogram": {"Alcohol use": 1, "Nausea": 1}, "batchcodes": ["EW0171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0173.json b/docs/data/histograms/Colombia/EW0173.json
index 08d6f15c133..f8549230a64 100644
--- a/docs/data/histograms/Colombia/EW0173.json
+++ b/docs/data/histograms/Colombia/EW0173.json
@@ -1 +1 @@
-{"batchcode": "EW0173", "histograms": [{"batchcodes": ["EW0173"], "histogram": {"Chest pain": 1, "Electrocardiogram": 1, "Myocarditis": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Troponin": 1, "Troponin increased": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0173", "histograms": [{"histogram": {"Chest pain": 1, "Electrocardiogram": 1, "Myocarditis": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Troponin": 1, "Troponin increased": 1}, "batchcodes": ["EW0173"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0179.json b/docs/data/histograms/Colombia/EW0179.json
index 6fb125febff..e037e96cdb3 100644
--- a/docs/data/histograms/Colombia/EW0179.json
+++ b/docs/data/histograms/Colombia/EW0179.json
@@ -1 +1 @@
-{"batchcode": "EW0179", "histograms": [{"batchcodes": ["EW0179"], "histogram": {"Anxiety": 1, "Asthenia": 1, "Bronchitis": 1, "Depression": 1, "Headache": 1, "Hyperthyroidism": 1, "Insomnia": 1, "Irritability": 1, "Muscle disorder": 1, "Nervousness": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0179", "histograms": [{"histogram": {"Anxiety": 1, "Asthenia": 1, "Bronchitis": 1, "Depression": 1, "Headache": 1, "Hyperthyroidism": 1, "Insomnia": 1, "Irritability": 1, "Muscle disorder": 1, "Nervousness": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Weight decreased": 1}, "batchcodes": ["EW0179"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0181.json b/docs/data/histograms/Colombia/EW0181.json
index d9bf4cf6061..de797407f52 100644
--- a/docs/data/histograms/Colombia/EW0181.json
+++ b/docs/data/histograms/Colombia/EW0181.json
@@ -1 +1 @@
-{"batchcode": "EW0181", "histograms": [{"batchcodes": ["EW0181"], "histogram": {"Extra dose administered": 1, "Feeling abnormal": 1, "Interchange of vaccine products": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0181", "histograms": [{"histogram": {"Extra dose administered": 1, "Feeling abnormal": 1, "Interchange of vaccine products": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["EW0181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0182.json b/docs/data/histograms/Colombia/EW0182.json
index ddabf202ac0..1c9aba64bd3 100644
--- a/docs/data/histograms/Colombia/EW0182.json
+++ b/docs/data/histograms/Colombia/EW0182.json
@@ -1 +1 @@
-{"batchcode": "EW0182", "histograms": [{"batchcodes": ["EW0182"], "histogram": {"Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0182", "histograms": [{"histogram": {"Wrong product administered": 1}, "batchcodes": ["EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0185.json b/docs/data/histograms/Colombia/EW0185.json
index 5d5968a993e..0ffd506848a 100644
--- a/docs/data/histograms/Colombia/EW0185.json
+++ b/docs/data/histograms/Colombia/EW0185.json
@@ -1 +1 @@
-{"batchcode": "EW0185", "histograms": [{"batchcodes": ["EW0185"], "histogram": {"Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0185", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["EW0185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0191.json b/docs/data/histograms/Colombia/EW0191.json
index 4ca309afe66..41f8a201db8 100644
--- a/docs/data/histograms/Colombia/EW0191.json
+++ b/docs/data/histograms/Colombia/EW0191.json
@@ -1 +1 @@
-{"batchcode": "EW0191", "histograms": [{"batchcodes": ["EW0191"], "histogram": {"Fatigue": 1, "Insomnia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0191", "histograms": [{"histogram": {"Fatigue": 1, "Insomnia": 1}, "batchcodes": ["EW0191"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0195.json b/docs/data/histograms/Colombia/EW0195.json
index ce7fdb5b9d4..2b0a70281aa 100644
--- a/docs/data/histograms/Colombia/EW0195.json
+++ b/docs/data/histograms/Colombia/EW0195.json
@@ -1 +1 @@
-{"batchcode": "EW0195", "histograms": [{"batchcodes": ["EW0195"], "histogram": {"Asthenia": 1, "Back pain": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Morning sickness": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pneumonia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0195", "histograms": [{"histogram": {"Asthenia": 1, "Back pain": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Morning sickness": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pneumonia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0206.json b/docs/data/histograms/Colombia/EW0206.json
index c3ed7039c06..a52c57777c6 100644
--- a/docs/data/histograms/Colombia/EW0206.json
+++ b/docs/data/histograms/Colombia/EW0206.json
@@ -1 +1 @@
-{"batchcode": "EW0206", "histograms": [{"batchcodes": ["EW0206"], "histogram": {"Fatigue": 2, "Rhinorrhoea": 2, "Anosmia": 1, "Arthralgia": 1, "Asphyxia": 1, "Asthenia": 1, "Blood test": 1, "COVID-19": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Cold sweat": 1, "Diarrhoea": 1, "Eye irritation": 1, "Headache": 1, "Hot flush": 1, "Myalgia": 1, "Nipple inflammation": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Respiratory failure": 1, "SARS-CoV-2 test": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0206", "histograms": [{"histogram": {"Fatigue": 2, "Rhinorrhoea": 2, "Anosmia": 1, "Arthralgia": 1, "Asphyxia": 1, "Asthenia": 1, "Blood test": 1, "COVID-19": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Cold sweat": 1, "Diarrhoea": 1, "Eye irritation": 1, "Headache": 1, "Hot flush": 1, "Myalgia": 1, "Nipple inflammation": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Respiratory failure": 1, "SARS-CoV-2 test": 1, "Sneezing": 1}, "batchcodes": ["EW0206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0216.json b/docs/data/histograms/Colombia/EW0216.json
index 4271636c930..43832775631 100644
--- a/docs/data/histograms/Colombia/EW0216.json
+++ b/docs/data/histograms/Colombia/EW0216.json
@@ -1 +1 @@
-{"batchcode": "EW0216", "histograms": [{"batchcodes": ["EW0216"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Hypersensitivity": 1, "Rash": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0216", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Hypersensitivity": 1, "Rash": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW0217.json b/docs/data/histograms/Colombia/EW0217.json
index b5b4461fa43..ecc6b8d617d 100644
--- a/docs/data/histograms/Colombia/EW0217.json
+++ b/docs/data/histograms/Colombia/EW0217.json
@@ -1 +1 @@
-{"batchcode": "EW0217", "histograms": [{"batchcodes": ["EW0217"], "histogram": {"Erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0217", "histograms": [{"histogram": {"Erythema": 1}, "batchcodes": ["EW0217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW1095.json b/docs/data/histograms/Colombia/EW1095.json
index f3653c179a0..28f08db4c1f 100644
--- a/docs/data/histograms/Colombia/EW1095.json
+++ b/docs/data/histograms/Colombia/EW1095.json
@@ -1 +1 @@
-{"batchcode": "EW1095", "histograms": [{"batchcodes": ["EW1095"], "histogram": {"Cough": 1, "Drowning": 1, "Drug ineffective": 1, "Dysphonia": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW1095", "histograms": [{"histogram": {"Cough": 1, "Drowning": 1, "Drug ineffective": 1, "Dysphonia": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1, "Vaccination site pain": 1}, "batchcodes": ["EW1095"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW3344.json b/docs/data/histograms/Colombia/EW3344.json
index b097b6119be..fac082a2e5c 100644
--- a/docs/data/histograms/Colombia/EW3344.json
+++ b/docs/data/histograms/Colombia/EW3344.json
@@ -1 +1 @@
-{"batchcode": "EW3344", "histograms": [{"batchcodes": ["EW3344"], "histogram": {"SARS-CoV-2 test": 2, "Abdominal pain upper": 1, "Asphyxia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Choking": 1, "Choking sensation": 1, "Cough": 1, "Dyspnoea": 1, "Feeling cold": 1, "Feeling hot": 1, "Flatulence": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Spirometry": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW3344", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "Abdominal pain upper": 1, "Asphyxia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Choking": 1, "Choking sensation": 1, "Cough": 1, "Dyspnoea": 1, "Feeling cold": 1, "Feeling hot": 1, "Flatulence": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Spirometry": 1, "Vaccination site pain": 1}, "batchcodes": ["EW3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EW4109.json b/docs/data/histograms/Colombia/EW4109.json
index 9f0929e0199..ffcb7cd6271 100644
--- a/docs/data/histograms/Colombia/EW4109.json
+++ b/docs/data/histograms/Colombia/EW4109.json
@@ -1 +1 @@
-{"batchcode": "EW4109", "histograms": [{"batchcodes": ["EW4109"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Basophil count": 1, "Basophil percentage": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cellulitis": 1, "Dizziness": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Erythema": 1, "Feeling hot": 1, "Flushing": 1, "Full blood count": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypotension": 1, "Immature granulocyte count": 1, "Investigation": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Oedema": 1, "Oxygen saturation": 1, "Pain": 1, "Physical examination": 1, "Platelet count": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EW4109", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Basophil count": 1, "Basophil percentage": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cellulitis": 1, "Dizziness": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Erythema": 1, "Feeling hot": 1, "Flushing": 1, "Full blood count": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypotension": 1, "Immature granulocyte count": 1, "Investigation": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Oedema": 1, "Oxygen saturation": 1, "Pain": 1, "Physical examination": 1, "Platelet count": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1, "White blood cell count": 1}, "batchcodes": ["EW4109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EX0438.json b/docs/data/histograms/Colombia/EX0438.json
index daaf78792b7..f89824cc6d7 100644
--- a/docs/data/histograms/Colombia/EX0438.json
+++ b/docs/data/histograms/Colombia/EX0438.json
@@ -1 +1 @@
-{"batchcode": "EX0438", "histograms": [{"batchcodes": ["EX0438"], "histogram": {"Axillary pain": 1, "Chills": 1, "Lethargy": 1, "Pyrexia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EX0438", "histograms": [{"histogram": {"Axillary pain": 1, "Chills": 1, "Lethargy": 1, "Pyrexia": 1, "Swelling": 1}, "batchcodes": ["EX0438"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EY00586.json b/docs/data/histograms/Colombia/EY00586.json
index 7a1d73b61cc..1d7b41fbf7a 100644
--- a/docs/data/histograms/Colombia/EY00586.json
+++ b/docs/data/histograms/Colombia/EY00586.json
@@ -1 +1 @@
-{"batchcode": "EY00586", "histograms": [{"batchcodes": ["EY00586"], "histogram": {"Cardiac disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EY00586", "histograms": [{"histogram": {"Cardiac disorder": 1}, "batchcodes": ["EY00586"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EY0574.json b/docs/data/histograms/Colombia/EY0574.json
index 48ae4138820..fe6d8138aa7 100644
--- a/docs/data/histograms/Colombia/EY0574.json
+++ b/docs/data/histograms/Colombia/EY0574.json
@@ -1 +1 @@
-{"batchcode": "EY0574", "histograms": [{"batchcodes": ["EY0574"], "histogram": {"Investigation": 2, "Angioedema": 1, "Arthralgia": 1, "Asphyxia": 1, "Asthenia": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac aneurysm": 1, "Computerised tomogram": 1, "Cutaneous vasculitis": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Encephalomalacia": 1, "Fatigue": 1, "Head injury": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Loss of consciousness": 1, "Malaise": 1, "Migraine": 1, "Palpitations": 1, "Pruritus": 1, "Pyrexia": 1, "Rash papular": 1, "SARS-CoV-2 test": 1, "Skeletal injury": 1, "Syncope": 1, "Tachycardia": 1, "Urticaria": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0574", "histograms": [{"histogram": {"Investigation": 2, "Angioedema": 1, "Arthralgia": 1, "Asphyxia": 1, "Asthenia": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac aneurysm": 1, "Computerised tomogram": 1, "Cutaneous vasculitis": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Encephalomalacia": 1, "Fatigue": 1, "Head injury": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Loss of consciousness": 1, "Malaise": 1, "Migraine": 1, "Palpitations": 1, "Pruritus": 1, "Pyrexia": 1, "Rash papular": 1, "SARS-CoV-2 test": 1, "Skeletal injury": 1, "Syncope": 1, "Tachycardia": 1, "Urticaria": 1, "Weight": 1}, "batchcodes": ["EY0574"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EY0579.json b/docs/data/histograms/Colombia/EY0579.json
index 960b114a423..3a45dd25ce5 100644
--- a/docs/data/histograms/Colombia/EY0579.json
+++ b/docs/data/histograms/Colombia/EY0579.json
@@ -1 +1 @@
-{"batchcode": "EY0579", "histograms": [{"batchcodes": ["EY0579"], "histogram": {"Abscess": 1, "Biopsy": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Body mass index": 1, "Body temperature": 1, "Bradycardia": 1, "Chills": 1, "Headache": 1, "Heart rate": 1, "Inflammation": 1, "Investigation": 1, "Lymphadenopathy": 1, "Mean arterial pressure": 1, "Nausea": 1, "Neurological examination normal": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Physical examination": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory rate": 1, "Skin burning sensation": 1, "Somnolence": 1, "Syncope": 1, "Ultrasound scan": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0579", "histograms": [{"histogram": {"Abscess": 1, "Biopsy": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Body mass index": 1, "Body temperature": 1, "Bradycardia": 1, "Chills": 1, "Headache": 1, "Heart rate": 1, "Inflammation": 1, "Investigation": 1, "Lymphadenopathy": 1, "Mean arterial pressure": 1, "Nausea": 1, "Neurological examination normal": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Physical examination": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory rate": 1, "Skin burning sensation": 1, "Somnolence": 1, "Syncope": 1, "Ultrasound scan": 1, "Vital signs measurement": 1}, "batchcodes": ["EY0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EY0585.json b/docs/data/histograms/Colombia/EY0585.json
index cb52af5d278..535529638ab 100644
--- a/docs/data/histograms/Colombia/EY0585.json
+++ b/docs/data/histograms/Colombia/EY0585.json
@@ -1 +1 @@
-{"batchcode": "EY0585", "histograms": [{"batchcodes": ["EY0585"], "histogram": {"Aphthous ulcer": 1, "Dizziness": 1, "Hypoaesthesia": 1, "Micturition urgency": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Petechiae": 1, "Rash": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0585", "histograms": [{"histogram": {"Aphthous ulcer": 1, "Dizziness": 1, "Hypoaesthesia": 1, "Micturition urgency": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Petechiae": 1, "Rash": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EY0585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EY0586.json b/docs/data/histograms/Colombia/EY0586.json
index 95c99cb1c33..a4f8aeb13c3 100644
--- a/docs/data/histograms/Colombia/EY0586.json
+++ b/docs/data/histograms/Colombia/EY0586.json
@@ -1 +1 @@
-{"batchcode": "EY0586", "histograms": [{"batchcodes": ["EY0586"], "histogram": {"COVID-19": 3, "Cough": 2, "Drug ineffective": 2, "Dyskinesia": 2, "Headache": 2, "Hypotension": 2, "Abdominal pain upper": 1, "Altered state of consciousness": 1, "Asthenia": 1, "Chest discomfort": 1, "Exposure to SARS-CoV-2": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Illness": 1, "Influenza": 1, "Loss of consciousness": 1, "Pallor": 1, "Pneumonia": 1, "Pyrexia": 1, "Vaccination failure": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0586", "histograms": [{"histogram": {"COVID-19": 3, "Cough": 2, "Drug ineffective": 2, "Dyskinesia": 2, "Headache": 2, "Hypotension": 2, "Abdominal pain upper": 1, "Altered state of consciousness": 1, "Asthenia": 1, "Chest discomfort": 1, "Exposure to SARS-CoV-2": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Illness": 1, "Influenza": 1, "Loss of consciousness": 1, "Pallor": 1, "Pneumonia": 1, "Pyrexia": 1, "Vaccination failure": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["EY0586"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/EY4825.json b/docs/data/histograms/Colombia/EY4825.json
index 400d21256d3..db076293994 100644
--- a/docs/data/histograms/Colombia/EY4825.json
+++ b/docs/data/histograms/Colombia/EY4825.json
@@ -1 +1 @@
-{"batchcode": "EY4825", "histograms": [{"batchcodes": ["EY4825"], "histogram": {"Drug ineffective": 2, "COVID-19": 1, "Nasal congestion": 1, "Pain": 1, "Polymerase chain reaction": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4825", "histograms": [{"histogram": {"Drug ineffective": 2, "COVID-19": 1, "Nasal congestion": 1, "Pain": 1, "Polymerase chain reaction": 1, "Suspected COVID-19": 1}, "batchcodes": ["EY4825"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FA 5843.json b/docs/data/histograms/Colombia/FA 5843.json
index cb286cac2c7..050bbd08eeb 100644
--- a/docs/data/histograms/Colombia/FA 5843.json
+++ b/docs/data/histograms/Colombia/FA 5843.json
@@ -1 +1 @@
-{"batchcode": "FA 5843", "histograms": [{"batchcodes": ["FA 5843"], "histogram": {"Electroneuromyography": 1, "Hypoaesthesia oral": 1, "Pain in extremity": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Small fibre neuropathy": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 5843", "histograms": [{"histogram": {"Electroneuromyography": 1, "Hypoaesthesia oral": 1, "Pain in extremity": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Small fibre neuropathy": 1}, "batchcodes": ["FA 5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FA-9100.json b/docs/data/histograms/Colombia/FA-9100.json
index 261018d9d71..05fdfec23d5 100644
--- a/docs/data/histograms/Colombia/FA-9100.json
+++ b/docs/data/histograms/Colombia/FA-9100.json
@@ -1 +1 @@
-{"batchcode": "FA-9100", "histograms": [{"batchcodes": ["FA-9100"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "FA-9100", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["FA-9100"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FA0579.json b/docs/data/histograms/Colombia/FA0579.json
index 3863becd07a..95a6c03bcb8 100644
--- a/docs/data/histograms/Colombia/FA0579.json
+++ b/docs/data/histograms/Colombia/FA0579.json
@@ -1 +1 @@
-{"batchcode": "FA0579", "histograms": [{"batchcodes": ["FA0579"], "histogram": {"Paraesthesia": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FA0579", "histograms": [{"histogram": {"Paraesthesia": 1, "Thrombosis": 1}, "batchcodes": ["FA0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FA5843.json b/docs/data/histograms/Colombia/FA5843.json
index 3247d9d2c8f..b50bc01aca0 100644
--- a/docs/data/histograms/Colombia/FA5843.json
+++ b/docs/data/histograms/Colombia/FA5843.json
@@ -1 +1 @@
-{"batchcode": "FA5843", "histograms": [{"batchcodes": ["015F21A", "FA5843"], "histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["FA5843"], "histogram": {"Drug ineffective": 4, "COVID-19": 3, "Arthralgia": 1, "Chest pain": 1, "Dyspnoea": 1, "Exposure to SARS-CoV-2": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5843", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Suspected COVID-19": 1}, "batchcodes": ["015F21A", "FA5843"]}, {"histogram": {"Drug ineffective": 4, "COVID-19": 3, "Arthralgia": 1, "Chest pain": 1, "Dyspnoea": 1, "Exposure to SARS-CoV-2": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Vaccination site pain": 1}, "batchcodes": ["FA5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FA7478.json b/docs/data/histograms/Colombia/FA7478.json
index 189a18a5387..e6f2288aadd 100644
--- a/docs/data/histograms/Colombia/FA7478.json
+++ b/docs/data/histograms/Colombia/FA7478.json
@@ -1 +1 @@
-{"batchcode": "FA7478", "histograms": [{"batchcodes": ["FA7478"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Drug ineffective": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Tonsillar inflammation": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7478", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Drug ineffective": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Tonsillar inflammation": 1, "Urticaria": 1}, "batchcodes": ["FA7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FA7485.json b/docs/data/histograms/Colombia/FA7485.json
index a356d121638..266e0f07e67 100644
--- a/docs/data/histograms/Colombia/FA7485.json
+++ b/docs/data/histograms/Colombia/FA7485.json
@@ -1 +1 @@
-{"batchcode": "FA7485", "histograms": [{"batchcodes": ["FA7485"], "histogram": {"Arthralgia": 1, "Blister": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7485", "histograms": [{"histogram": {"Arthralgia": 1, "Blister": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["FA7485"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FA9100.json b/docs/data/histograms/Colombia/FA9100.json
index 1e9e31d75f8..f106040980d 100644
--- a/docs/data/histograms/Colombia/FA9100.json
+++ b/docs/data/histograms/Colombia/FA9100.json
@@ -1 +1 @@
-{"batchcode": "FA9100", "histograms": [{"batchcodes": ["FA9100"], "histogram": {"COVID-19": 2, "Drug ineffective": 2, "Blepharitis": 1, "Blood urine present": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Urine abnormality": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9100", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 2, "Blepharitis": 1, "Blood urine present": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Urine abnormality": 1, "Vaccination failure": 1}, "batchcodes": ["FA9100"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FD8448.json b/docs/data/histograms/Colombia/FD8448.json
index 9657a652cdf..160519f18ec 100644
--- a/docs/data/histograms/Colombia/FD8448.json
+++ b/docs/data/histograms/Colombia/FD8448.json
@@ -1 +1 @@
-{"batchcode": "FD8448", "histograms": [{"batchcodes": ["FD8448"], "histogram": {"Chest X-ray": 1, "Chest pain": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Palpitations": 1, "Throat tightness": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8448", "histograms": [{"histogram": {"Chest X-ray": 1, "Chest pain": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Palpitations": 1, "Throat tightness": 1, "Ultrasound scan": 1}, "batchcodes": ["FD8448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FF 88 43.json b/docs/data/histograms/Colombia/FF 88 43.json
index 94d53f91668..44ddb275af1 100644
--- a/docs/data/histograms/Colombia/FF 88 43.json
+++ b/docs/data/histograms/Colombia/FF 88 43.json
@@ -1 +1 @@
-{"batchcode": "FF 88 43", "histograms": [{"batchcodes": ["FF 88 43"], "histogram": {"Angina pectoris": 1, "Dyspnoea": 1, "Ear discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "FF 88 43", "histograms": [{"histogram": {"Angina pectoris": 1, "Dyspnoea": 1, "Ear discomfort": 1}, "batchcodes": ["FF 88 43"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FF2588.json b/docs/data/histograms/Colombia/FF2588.json
index d7bfdc674d1..96c78cc02f8 100644
--- a/docs/data/histograms/Colombia/FF2588.json
+++ b/docs/data/histograms/Colombia/FF2588.json
@@ -1 +1 @@
-{"batchcode": "FF2588", "histograms": [{"batchcodes": ["FF2588"], "histogram": {"Erythema": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2588", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1}, "batchcodes": ["FF2588"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FG352B.json b/docs/data/histograms/Colombia/FG352B.json
index f985ead7369..a9e74526072 100644
--- a/docs/data/histograms/Colombia/FG352B.json
+++ b/docs/data/histograms/Colombia/FG352B.json
@@ -1 +1 @@
-{"batchcode": "FG352B", "histograms": [{"batchcodes": ["FG352B"], "histogram": {"Blood pressure measurement": 1, "Heart rate": 1, "Hypersensitivity": 1, "Investigation": 1, "Oxygen saturation": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FG352B", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Heart rate": 1, "Hypersensitivity": 1, "Investigation": 1, "Oxygen saturation": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["FG352B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FH8024.json b/docs/data/histograms/Colombia/FH8024.json
index 4652be28719..6a9cef75e38 100644
--- a/docs/data/histograms/Colombia/FH8024.json
+++ b/docs/data/histograms/Colombia/FH8024.json
@@ -1 +1 @@
-{"batchcode": "FH8024", "histograms": [{"batchcodes": ["FH8024"], "histogram": {"Discomfort": 1, "Headache": 1, "Inflammation": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Vaccination site inflammation": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8024", "histograms": [{"histogram": {"Discomfort": 1, "Headache": 1, "Inflammation": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Vaccination site inflammation": 1}, "batchcodes": ["FH8024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FJ1966.json b/docs/data/histograms/Colombia/FJ1966.json
index 2d97b92a8da..3609033dcdf 100644
--- a/docs/data/histograms/Colombia/FJ1966.json
+++ b/docs/data/histograms/Colombia/FJ1966.json
@@ -1 +1 @@
-{"batchcode": "FJ1966", "histograms": [{"batchcodes": ["FJ1966"], "histogram": {"Blood glucose": 1, "COVID-19": 1, "Hypokinesia": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Toxoplasma serology": 1, "Ultrasound foetal": 1, "Vaccination failure": 1, "Vaccination site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1966", "histograms": [{"histogram": {"Blood glucose": 1, "COVID-19": 1, "Hypokinesia": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Toxoplasma serology": 1, "Ultrasound foetal": 1, "Vaccination failure": 1, "Vaccination site haemorrhage": 1}, "batchcodes": ["FJ1966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FL8094.json b/docs/data/histograms/Colombia/FL8094.json
index 43eb4c549c2..fd339dff1e2 100644
--- a/docs/data/histograms/Colombia/FL8094.json
+++ b/docs/data/histograms/Colombia/FL8094.json
@@ -1 +1 @@
-{"batchcode": "FL8094", "histograms": [{"batchcodes": ["FL8094"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8094", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}, "batchcodes": ["FL8094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/FY0575.json b/docs/data/histograms/Colombia/FY0575.json
index e4076c5e8c8..0426a22523b 100644
--- a/docs/data/histograms/Colombia/FY0575.json
+++ b/docs/data/histograms/Colombia/FY0575.json
@@ -1 +1 @@
-{"batchcode": "FY0575", "histograms": [{"batchcodes": ["FY0575"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FY0575", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FY0575"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Colombia/PCA0074.json b/docs/data/histograms/Colombia/PCA0074.json
index a1b74e8136f..edd97dd41ec 100644
--- a/docs/data/histograms/Colombia/PCA0074.json
+++ b/docs/data/histograms/Colombia/PCA0074.json
@@ -1 +1 @@
-{"batchcode": "PCA0074", "histograms": [{"batchcodes": ["PCA0074"], "histogram": {"Cough": 1, "Dysphonia": 1, "Immunisation": 1, "Laryngitis": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0074", "histograms": [{"histogram": {"Cough": 1, "Dysphonia": 1, "Immunisation": 1, "Laryngitis": 1, "Off label use": 1}, "batchcodes": ["PCA0074"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Congo, The Democratic Republic of the/03M20A.json b/docs/data/histograms/Congo, The Democratic Republic of the/03M20A.json
index f0372711947..3df77137bd6 100644
--- a/docs/data/histograms/Congo, The Democratic Republic of the/03M20A.json
+++ b/docs/data/histograms/Congo, The Democratic Republic of the/03M20A.json
@@ -1 +1 @@
-{"batchcode": "03M20A", "histograms": [{"batchcodes": ["03M20A"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "03M20A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["03M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Cook Islands/FD0927-002.json b/docs/data/histograms/Cook Islands/FD0927-002.json
index a287b4b12fe..67fffe1a764 100644
--- a/docs/data/histograms/Cook Islands/FD0927-002.json
+++ b/docs/data/histograms/Cook Islands/FD0927-002.json
@@ -1 +1 @@
-{"batchcode": "FD0927-002", "histograms": [{"batchcodes": ["FD0927-002"], "histogram": {"Neuropathy peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0927-002", "histograms": [{"histogram": {"Neuropathy peripheral": 1}, "batchcodes": ["FD0927-002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/1821286.json b/docs/data/histograms/Costa Rica/1821286.json
index b9da0c7709b..a97c35e8568 100644
--- a/docs/data/histograms/Costa Rica/1821286.json
+++ b/docs/data/histograms/Costa Rica/1821286.json
@@ -1 +1 @@
-{"batchcode": "1821286", "histograms": [{"batchcodes": ["1821286"], "histogram": {"Asthenia": 1, "Chills": 1, "Hypoaesthesia": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "1821286", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Hypoaesthesia": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["1821286"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/34030BD.json b/docs/data/histograms/Costa Rica/34030BD.json
index bd125919bf9..500667b02ba 100644
--- a/docs/data/histograms/Costa Rica/34030BD.json
+++ b/docs/data/histograms/Costa Rica/34030BD.json
@@ -1 +1 @@
-{"batchcode": "34030BD", "histograms": [{"batchcodes": ["34030BD"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "34030BD", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["34030BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/35040BD.json b/docs/data/histograms/Costa Rica/35040BD.json
index 84bc19f4f88..9aa09642e49 100644
--- a/docs/data/histograms/Costa Rica/35040BD.json
+++ b/docs/data/histograms/Costa Rica/35040BD.json
@@ -1 +1 @@
-{"batchcode": "35040BD", "histograms": [{"batchcodes": ["35040BD"], "histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Pain": 3, "Headache": 2, "Oropharyngeal pain": 2, "Rhinorrhoea": 2, "Vaccination failure": 2, "Conjunctivitis": 1, "Discomfort": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Fatigue": 1, "Gastroenteritis viral": 1, "Interchange of vaccine products": 1, "Laryngitis": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Pain in extremity": 1, "Pharyngitis": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "35040BD", "histograms": [{"histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Pain": 3, "Headache": 2, "Oropharyngeal pain": 2, "Rhinorrhoea": 2, "Vaccination failure": 2, "Conjunctivitis": 1, "Discomfort": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Fatigue": 1, "Gastroenteritis viral": 1, "Interchange of vaccine products": 1, "Laryngitis": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Pain in extremity": 1, "Pharyngitis": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["35040BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EL0142.json b/docs/data/histograms/Costa Rica/EL0142.json
index 2ab224f17d0..44b1cd6f18f 100644
--- a/docs/data/histograms/Costa Rica/EL0142.json
+++ b/docs/data/histograms/Costa Rica/EL0142.json
@@ -1 +1 @@
-{"batchcode": "EL0142", "histograms": [{"batchcodes": ["EL0142", "EM9809"], "histogram": {"COVID-19": 14, "SARS-CoV-2 test positive": 6, "SARS-CoV-2 test": 3, "Polymerase chain reaction": 1, "Vaccine breakthrough infection": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0142", "histograms": [{"histogram": {"COVID-19": 14, "SARS-CoV-2 test positive": 6, "SARS-CoV-2 test": 3, "Polymerase chain reaction": 1, "Vaccine breakthrough infection": 1}, "batchcodes": ["EL0142", "EM9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EL0200.json b/docs/data/histograms/Costa Rica/EL0200.json
index ec2d04cbf5c..0fabdaa3847 100644
--- a/docs/data/histograms/Costa Rica/EL0200.json
+++ b/docs/data/histograms/Costa Rica/EL0200.json
@@ -1 +1 @@
-{"batchcode": "EL0200", "histograms": [{"batchcodes": ["EL0200"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "EL0200", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}, "batchcodes": ["EL0200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EL8713.json b/docs/data/histograms/Costa Rica/EL8713.json
index 667743ffc12..0cdd1c281ba 100644
--- a/docs/data/histograms/Costa Rica/EL8713.json
+++ b/docs/data/histograms/Costa Rica/EL8713.json
@@ -1 +1 @@
-{"batchcode": "EL8713", "histograms": [{"batchcodes": ["EL8713"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EL8713", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EL8713"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EM9809.json b/docs/data/histograms/Costa Rica/EM9809.json
index 62f897c5951..605dbee4b21 100644
--- a/docs/data/histograms/Costa Rica/EM9809.json
+++ b/docs/data/histograms/Costa Rica/EM9809.json
@@ -1 +1 @@
-{"batchcode": "EM9809", "histograms": [{"batchcodes": ["EL0142", "EM9809"], "histogram": {"COVID-19": 14, "SARS-CoV-2 test positive": 6, "SARS-CoV-2 test": 3, "Polymerase chain reaction": 1, "Vaccine breakthrough infection": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9809", "histograms": [{"histogram": {"COVID-19": 14, "SARS-CoV-2 test positive": 6, "SARS-CoV-2 test": 3, "Polymerase chain reaction": 1, "Vaccine breakthrough infection": 1}, "batchcodes": ["EL0142", "EM9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/ER1741.json b/docs/data/histograms/Costa Rica/ER1741.json
index cdf24a9bc4f..0830b16bcc0 100644
--- a/docs/data/histograms/Costa Rica/ER1741.json
+++ b/docs/data/histograms/Costa Rica/ER1741.json
@@ -1 +1 @@
-{"batchcode": "ER1741", "histograms": [{"batchcodes": ["ER1741"], "histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "ER1741", "histograms": [{"histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["ER1741"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/ER1742.json b/docs/data/histograms/Costa Rica/ER1742.json
index f65ede15b6c..f528f6ceff1 100644
--- a/docs/data/histograms/Costa Rica/ER1742.json
+++ b/docs/data/histograms/Costa Rica/ER1742.json
@@ -1 +1 @@
-{"batchcode": "ER1742", "histograms": [{"batchcodes": ["ER1742"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}}]}
\ No newline at end of file
+{"batchcode": "ER1742", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}, "batchcodes": ["ER1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/ER7934.json b/docs/data/histograms/Costa Rica/ER7934.json
index 4f1ee7ce8be..867fb9fcef3 100644
--- a/docs/data/histograms/Costa Rica/ER7934.json
+++ b/docs/data/histograms/Costa Rica/ER7934.json
@@ -1 +1 @@
-{"batchcode": "ER7934", "histograms": [{"batchcodes": ["ER7934"], "histogram": {"COVID-19": 2, "Polymerase chain reaction": 2, "Vaccination failure": 2, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Headache": 1, "Nasal congestion": 1, "Pain": 1, "Pyrexia": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7934", "histograms": [{"histogram": {"COVID-19": 2, "Polymerase chain reaction": 2, "Vaccination failure": 2, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Headache": 1, "Nasal congestion": 1, "Pain": 1, "Pyrexia": 1, "Suspected COVID-19": 1}, "batchcodes": ["ER7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/ET0384.json b/docs/data/histograms/Costa Rica/ET0384.json
index fbb06e6d9cb..1c5435bc4d6 100644
--- a/docs/data/histograms/Costa Rica/ET0384.json
+++ b/docs/data/histograms/Costa Rica/ET0384.json
@@ -1 +1 @@
-{"batchcode": "ET0384", "histograms": [{"batchcodes": ["ET0384"], "histogram": {"Sciatica": 1}}]}
\ No newline at end of file
+{"batchcode": "ET0384", "histograms": [{"histogram": {"Sciatica": 1}, "batchcodes": ["ET0384"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/ET6924.json b/docs/data/histograms/Costa Rica/ET6924.json
index fa84928abd4..a4cdbefe2ab 100644
--- a/docs/data/histograms/Costa Rica/ET6924.json
+++ b/docs/data/histograms/Costa Rica/ET6924.json
@@ -1 +1 @@
-{"batchcode": "ET6924", "histograms": [{"batchcodes": ["ET6924"], "histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6924", "histograms": [{"histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}, "batchcodes": ["ET6924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EW0151.json b/docs/data/histograms/Costa Rica/EW0151.json
index bd12874bbc6..5c2c1a058b3 100644
--- a/docs/data/histograms/Costa Rica/EW0151.json
+++ b/docs/data/histograms/Costa Rica/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Pain in extremity": 2, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Pain in extremity": 2, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Throat irritation": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EW0171.json b/docs/data/histograms/Costa Rica/EW0171.json
index 609e68d0367..df2be4c552a 100644
--- a/docs/data/histograms/Costa Rica/EW0171.json
+++ b/docs/data/histograms/Costa Rica/EW0171.json
@@ -1 +1 @@
-{"batchcode": "EW0171", "histograms": [{"batchcodes": ["EW0171"], "histogram": {"COVID-19": 1, "HIV test positive": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0171", "histograms": [{"histogram": {"COVID-19": 1, "HIV test positive": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EW0171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EW0179.json b/docs/data/histograms/Costa Rica/EW0179.json
index 0680c17f26c..3f74ae6436b 100644
--- a/docs/data/histograms/Costa Rica/EW0179.json
+++ b/docs/data/histograms/Costa Rica/EW0179.json
@@ -1 +1 @@
-{"batchcode": "EW0179", "histograms": [{"batchcodes": ["EW0179"], "histogram": {"Fatigue": 1, "Limb discomfort": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0179", "histograms": [{"histogram": {"Fatigue": 1, "Limb discomfort": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0179"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EW0185.json b/docs/data/histograms/Costa Rica/EW0185.json
index 00dba3b3bb1..8b2888856fc 100644
--- a/docs/data/histograms/Costa Rica/EW0185.json
+++ b/docs/data/histograms/Costa Rica/EW0185.json
@@ -1 +1 @@
-{"batchcode": "EW0185", "histograms": [{"batchcodes": ["EW0185"], "histogram": {"Formication": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Oral pruritus": 1, "Paraesthesia": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0185", "histograms": [{"histogram": {"Formication": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Oral pruritus": 1, "Paraesthesia": 1, "Pruritus": 1}, "batchcodes": ["EW0185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EW0206.json b/docs/data/histograms/Costa Rica/EW0206.json
index 8d340e1908f..0cdd787e35f 100644
--- a/docs/data/histograms/Costa Rica/EW0206.json
+++ b/docs/data/histograms/Costa Rica/EW0206.json
@@ -1 +1 @@
-{"batchcode": "EW0206", "histograms": [{"batchcodes": ["EW0206"], "histogram": {"Bronchospasm": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Feeling hot": 1, "Heart rate": 1, "Heart rate increased": 1, "Nausea": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0206", "histograms": [{"histogram": {"Bronchospasm": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Feeling hot": 1, "Heart rate": 1, "Heart rate increased": 1, "Nausea": 1, "Wheezing": 1}, "batchcodes": ["EW0206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/EY0574.json b/docs/data/histograms/Costa Rica/EY0574.json
index 20fd8ac21b7..6cc7e3ffaa4 100644
--- a/docs/data/histograms/Costa Rica/EY0574.json
+++ b/docs/data/histograms/Costa Rica/EY0574.json
@@ -1 +1 @@
-{"batchcode": "EY0574", "histograms": [{"batchcodes": ["EY0574"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Herpes zoster": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0574", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Herpes zoster": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EY0574"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/FC3184.json b/docs/data/histograms/Costa Rica/FC3184.json
index 5d6ed6c7aa8..07ed972d998 100644
--- a/docs/data/histograms/Costa Rica/FC3184.json
+++ b/docs/data/histograms/Costa Rica/FC3184.json
@@ -1 +1 @@
-{"batchcode": "FC3184", "histograms": [{"batchcodes": ["FC3184"], "histogram": {"Drug ineffective": 2, "COVID-19": 1, "Cough": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3184", "histograms": [{"histogram": {"Drug ineffective": 2, "COVID-19": 1, "Cough": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["FC3184"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/FG3529.json b/docs/data/histograms/Costa Rica/FG3529.json
index cfbc9f3d2c7..664af173294 100644
--- a/docs/data/histograms/Costa Rica/FG3529.json
+++ b/docs/data/histograms/Costa Rica/FG3529.json
@@ -1 +1 @@
-{"batchcode": "FG3529", "histograms": [{"batchcodes": ["FG3529"], "histogram": {"COVID-19": 2, "Chest discomfort": 1, "Drug ineffective": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Nausea": 1, "Near death experience": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3529", "histograms": [{"histogram": {"COVID-19": 2, "Chest discomfort": 1, "Drug ineffective": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Nausea": 1, "Near death experience": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["FG3529"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/FN0087.json b/docs/data/histograms/Costa Rica/FN0087.json
index 0cbbb9f2c52..6183068f947 100644
--- a/docs/data/histograms/Costa Rica/FN0087.json
+++ b/docs/data/histograms/Costa Rica/FN0087.json
@@ -1 +1 @@
-{"batchcode": "FN0087", "histograms": [{"batchcodes": ["FN0087"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FN0087", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FN0087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/FP1176.json b/docs/data/histograms/Costa Rica/FP1176.json
index 2029f4dca0e..97ee4d57f67 100644
--- a/docs/data/histograms/Costa Rica/FP1176.json
+++ b/docs/data/histograms/Costa Rica/FP1176.json
@@ -1 +1 @@
-{"batchcode": "FP1176", "histograms": [{"batchcodes": ["FP1176"], "histogram": {"Nausea": 2, "Pallor": 2, "Palpitations": 2, "Tremor": 2, "Abdominal pain upper": 1, "Acute respiratory failure": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Flushing": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Oxygen saturation abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "FP1176", "histograms": [{"histogram": {"Nausea": 2, "Pallor": 2, "Palpitations": 2, "Tremor": 2, "Abdominal pain upper": 1, "Acute respiratory failure": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Flushing": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Oxygen saturation abnormal": 1}, "batchcodes": ["FP1176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/FT0366.json b/docs/data/histograms/Costa Rica/FT0366.json
index 5fd9bbb352e..b7fbac96942 100644
--- a/docs/data/histograms/Costa Rica/FT0366.json
+++ b/docs/data/histograms/Costa Rica/FT0366.json
@@ -1 +1 @@
-{"batchcode": "FT0366", "histograms": [{"batchcodes": ["FT0366"], "histogram": {"Back pain": 1, "Body temperature": 1, "Dysmenorrhoea": 1, "Dyspnoea at rest": 1, "Fatigue": 1, "Feeling hot": 1, "Headache": 1, "Interchange of vaccine products": 1, "Menstrual discomfort": 1, "Menstrual disorder": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Painful respiration": 1, "Somnolence": 1, "Vaccination site discomfort": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FT0366", "histograms": [{"histogram": {"Back pain": 1, "Body temperature": 1, "Dysmenorrhoea": 1, "Dyspnoea at rest": 1, "Fatigue": 1, "Feeling hot": 1, "Headache": 1, "Interchange of vaccine products": 1, "Menstrual discomfort": 1, "Menstrual disorder": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Painful respiration": 1, "Somnolence": 1, "Vaccination site discomfort": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FT0366"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/LD200.json b/docs/data/histograms/Costa Rica/LD200.json
index abfd4440d8b..08a42d1f5e9 100644
--- a/docs/data/histograms/Costa Rica/LD200.json
+++ b/docs/data/histograms/Costa Rica/LD200.json
@@ -1 +1 @@
-{"batchcode": "LD200", "histograms": [{"batchcodes": ["LD200"], "histogram": {"Abdominal pain upper": 1, "Chills": 1, "Cold sweat": 1, "Dizziness": 1, "Fall": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Migraine": 1, "Nausea": 1, "Photopsia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "LD200", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Chills": 1, "Cold sweat": 1, "Dizziness": 1, "Fall": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Migraine": 1, "Nausea": 1, "Photopsia": 1, "Pyrexia": 1}, "batchcodes": ["LD200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Costa Rica/PCA0055.json b/docs/data/histograms/Costa Rica/PCA0055.json
index 8ecddfc3d71..865686f1a7e 100644
--- a/docs/data/histograms/Costa Rica/PCA0055.json
+++ b/docs/data/histograms/Costa Rica/PCA0055.json
@@ -1 +1 @@
-{"batchcode": "PCA0055", "histograms": [{"batchcodes": ["PCA0055"], "histogram": {"Biopsy": 1, "Chills": 1, "Mammogram": 1, "Mucinous breast carcinoma": 1, "Neoplasm swelling": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Ultrasound breast": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0055", "histograms": [{"histogram": {"Biopsy": 1, "Chills": 1, "Mammogram": 1, "Mucinous breast carcinoma": 1, "Neoplasm swelling": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Ultrasound breast": 1}, "batchcodes": ["PCA0055"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/208921-2A.json b/docs/data/histograms/Côte d'Ivoire/208921-2A.json
index 1df456016a7..5eb9a332332 100644
--- a/docs/data/histograms/Côte d'Ivoire/208921-2A.json
+++ b/docs/data/histograms/Côte d'Ivoire/208921-2A.json
@@ -1 +1 @@
-{"batchcode": "208921-2A", "histograms": [{"batchcodes": ["208921-2A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "208921-2A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["208921-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/208D21-2A.json b/docs/data/histograms/Côte d'Ivoire/208D21-2A.json
index 305a4c746ee..897a1ffa1c3 100644
--- a/docs/data/histograms/Côte d'Ivoire/208D21-2A.json
+++ b/docs/data/histograms/Côte d'Ivoire/208D21-2A.json
@@ -1 +1 @@
-{"batchcode": "208D21-2A", "histograms": [{"batchcodes": ["208D21-2A"], "histogram": {"Pyrexia": 2, "Asthenia": 1, "Dizziness": 1, "Muscle spasms": 1, "Pain": 1, "Salivary hypersecretion": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "208D21-2A", "histograms": [{"histogram": {"Pyrexia": 2, "Asthenia": 1, "Dizziness": 1, "Muscle spasms": 1, "Pain": 1, "Salivary hypersecretion": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["208D21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/208D212A.json b/docs/data/histograms/Côte d'Ivoire/208D212A.json
index af2ba9e19cb..b6d0d4aa2f5 100644
--- a/docs/data/histograms/Côte d'Ivoire/208D212A.json
+++ b/docs/data/histograms/Côte d'Ivoire/208D212A.json
@@ -1 +1 @@
-{"batchcode": "208D212A", "histograms": [{"batchcodes": ["208D212A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "208D212A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["208D212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/219021A.json b/docs/data/histograms/Côte d'Ivoire/219021A.json
index efb65bfa2f9..0df6695898c 100644
--- a/docs/data/histograms/Côte d'Ivoire/219021A.json
+++ b/docs/data/histograms/Côte d'Ivoire/219021A.json
@@ -1 +1 @@
-{"batchcode": "219021A", "histograms": [{"batchcodes": ["219021A"], "histogram": {"Anaphylactic reaction": 1, "Hyperhidrosis": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "219021A", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Hyperhidrosis": 1, "Vertigo": 1}, "batchcodes": ["219021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/31055BD.json b/docs/data/histograms/Côte d'Ivoire/31055BD.json
index a86eccf8f4c..84bb3a488a7 100644
--- a/docs/data/histograms/Côte d'Ivoire/31055BD.json
+++ b/docs/data/histograms/Côte d'Ivoire/31055BD.json
@@ -1 +1 @@
-{"batchcode": "31055BD", "histograms": [{"batchcodes": ["31055BD"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "31055BD", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1}, "batchcodes": ["31055BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/ACB6893.json b/docs/data/histograms/Côte d'Ivoire/ACB6893.json
index 0f8fd0a58bd..f30b06e0a6a 100644
--- a/docs/data/histograms/Côte d'Ivoire/ACB6893.json
+++ b/docs/data/histograms/Côte d'Ivoire/ACB6893.json
@@ -1 +1 @@
-{"batchcode": "ACB6893", "histograms": [{"batchcodes": ["ACB6893"], "histogram": {"Pyrexia": 4, "Anaphylactic reaction": 1, "Epididymal disorder": 1, "Seizure": 1, "Testicular pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB6893", "histograms": [{"histogram": {"Pyrexia": 4, "Anaphylactic reaction": 1, "Epididymal disorder": 1, "Seizure": 1, "Testicular pain": 1}, "batchcodes": ["ACB6893"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/EN 5318.json b/docs/data/histograms/Côte d'Ivoire/EN 5318.json
index 0406d7daa11..08b423bfb89 100644
--- a/docs/data/histograms/Côte d'Ivoire/EN 5318.json
+++ b/docs/data/histograms/Côte d'Ivoire/EN 5318.json
@@ -1 +1 @@
-{"batchcode": "EN 5318", "histograms": [{"batchcodes": ["EN 5318", "EN5318"], "histogram": {"Extra dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "EN 5318", "histograms": [{"histogram": {"Extra dose administered": 1}, "batchcodes": ["EN 5318", "EN5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/EN5318.json b/docs/data/histograms/Côte d'Ivoire/EN5318.json
index 21a710f8692..7b425460355 100644
--- a/docs/data/histograms/Côte d'Ivoire/EN5318.json
+++ b/docs/data/histograms/Côte d'Ivoire/EN5318.json
@@ -1 +1 @@
-{"batchcode": "EN5318", "histograms": [{"batchcodes": ["EN 5318", "EN5318"], "histogram": {"Extra dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "EN5318", "histograms": [{"histogram": {"Extra dose administered": 1}, "batchcodes": ["EN 5318", "EN5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/EX443.json b/docs/data/histograms/Côte d'Ivoire/EX443.json
index 7856af4b4b2..64360c85569 100644
--- a/docs/data/histograms/Côte d'Ivoire/EX443.json
+++ b/docs/data/histograms/Côte d'Ivoire/EX443.json
@@ -1 +1 @@
-{"batchcode": "EX443", "histograms": [{"batchcodes": ["EX443"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EX443", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["EX443"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/X E443.json b/docs/data/histograms/Côte d'Ivoire/X E443.json
index 595261e539a..9f3444cfe12 100644
--- a/docs/data/histograms/Côte d'Ivoire/X E443.json
+++ b/docs/data/histograms/Côte d'Ivoire/X E443.json
@@ -1 +1 @@
-{"batchcode": "X E443", "histograms": [{"batchcodes": ["X E443"], "histogram": {"Haematochezia": 1, "Headache": 1, "Mucous stools": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "X E443", "histograms": [{"histogram": {"Haematochezia": 1, "Headache": 1, "Mucous stools": 1, "Pyrexia": 1}, "batchcodes": ["X E443"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/XE041.json b/docs/data/histograms/Côte d'Ivoire/XE041.json
index 1e579064a35..10e20bda359 100644
--- a/docs/data/histograms/Côte d'Ivoire/XE041.json
+++ b/docs/data/histograms/Côte d'Ivoire/XE041.json
@@ -1 +1 @@
-{"batchcode": "XE041", "histograms": [{"batchcodes": ["XE041"], "histogram": {"Abscess": 1}}]}
\ No newline at end of file
+{"batchcode": "XE041", "histograms": [{"histogram": {"Abscess": 1}, "batchcodes": ["XE041"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/XE436.json b/docs/data/histograms/Côte d'Ivoire/XE436.json
index d5ac32ccba7..582f8997497 100644
--- a/docs/data/histograms/Côte d'Ivoire/XE436.json
+++ b/docs/data/histograms/Côte d'Ivoire/XE436.json
@@ -1 +1 @@
-{"batchcode": "XE436", "histograms": [{"batchcodes": ["XE436"], "histogram": {"Asthenia": 1, "Headache": 1, "Hypertension": 1, "Injection site abscess": 1, "Injection site swelling": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1, "Sepsis": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "XE436", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Hypertension": 1, "Injection site abscess": 1, "Injection site swelling": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1, "Sepsis": 1, "Sleep disorder": 1}, "batchcodes": ["XE436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/XE480.json b/docs/data/histograms/Côte d'Ivoire/XE480.json
index 4483a4664a1..8a710a63a05 100644
--- a/docs/data/histograms/Côte d'Ivoire/XE480.json
+++ b/docs/data/histograms/Côte d'Ivoire/XE480.json
@@ -1 +1 @@
-{"batchcode": "XE480", "histograms": [{"batchcodes": ["XE480"], "histogram": {"Local reaction": 14, "Pyrexia": 3, "Pain": 2, "Asthenia": 1, "Fatigue": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "XE480", "histograms": [{"histogram": {"Local reaction": 14, "Pyrexia": 3, "Pain": 2, "Asthenia": 1, "Fatigue": 1, "Injection site pain": 1}, "batchcodes": ["XE480"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Côte d'Ivoire/XE531.json b/docs/data/histograms/Côte d'Ivoire/XE531.json
index 5c3134c0a13..33610be7ae0 100644
--- a/docs/data/histograms/Côte d'Ivoire/XE531.json
+++ b/docs/data/histograms/Côte d'Ivoire/XE531.json
@@ -1 +1 @@
-{"batchcode": "XE531", "histograms": [{"batchcodes": ["XE531"], "histogram": {"Pyrexia": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "XE531", "histograms": [{"histogram": {"Pyrexia": 1, "Thrombocytopenia": 1}, "batchcodes": ["XE531"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/004M20A.json b/docs/data/histograms/Dominican Republic/004M20A.json
index a65413b6cee..948f9667818 100644
--- a/docs/data/histograms/Dominican Republic/004M20A.json
+++ b/docs/data/histograms/Dominican Republic/004M20A.json
@@ -1 +1 @@
-{"batchcode": "004M20A", "histograms": [{"batchcodes": ["004M20A"], "histogram": {"Asthenia": 1, "Blood test": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Myalgia": 1, "Palpitations": 1, "Paraesthesia": 1, "SARS-CoV-2 test negative": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "004M20A", "histograms": [{"histogram": {"Asthenia": 1, "Blood test": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Myalgia": 1, "Palpitations": 1, "Paraesthesia": 1, "SARS-CoV-2 test negative": 1, "Tachycardia": 1}, "batchcodes": ["004M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/006BZ1A.json b/docs/data/histograms/Dominican Republic/006BZ1A.json
index ec5c92073ef..c8ac40e6290 100644
--- a/docs/data/histograms/Dominican Republic/006BZ1A.json
+++ b/docs/data/histograms/Dominican Republic/006BZ1A.json
@@ -1 +1 @@
-{"batchcode": "006BZ1A", "histograms": [{"batchcodes": ["006BZ1A"], "histogram": {"Asthma": 1, "Chest discomfort": 1, "Lip swelling": 1, "Pruritus": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "006BZ1A", "histograms": [{"histogram": {"Asthma": 1, "Chest discomfort": 1, "Lip swelling": 1, "Pruritus": 1, "Swollen tongue": 1}, "batchcodes": ["006BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/011A21A ,007B21.json b/docs/data/histograms/Dominican Republic/011A21A ,007B21.json
index 655abb834d5..8106142f61a 100644
--- a/docs/data/histograms/Dominican Republic/011A21A ,007B21.json
+++ b/docs/data/histograms/Dominican Republic/011A21A ,007B21.json
@@ -1 +1 @@
-{"batchcode": "011A21A ,007B21", "histograms": [{"batchcodes": ["011A21A ,007B21"], "histogram": {"Blood test": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Magnetic resonance imaging head": 1, "Rheumatoid factor": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21A ,007B21", "histograms": [{"histogram": {"Blood test": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Magnetic resonance imaging head": 1, "Rheumatoid factor": 1}, "batchcodes": ["011A21A ,007B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/036B21A.json b/docs/data/histograms/Dominican Republic/036B21A.json
index 71f395560c0..a1823ee3987 100644
--- a/docs/data/histograms/Dominican Republic/036B21A.json
+++ b/docs/data/histograms/Dominican Republic/036B21A.json
@@ -1 +1 @@
-{"batchcode": "036B21A", "histograms": [{"batchcodes": ["036B21A"], "histogram": {"Deep vein thrombosis": 1, "Disturbance in attention": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Headache": 1, "Laboratory test": 1, "Ultrasound scan abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "036B21A", "histograms": [{"histogram": {"Deep vein thrombosis": 1, "Disturbance in attention": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Headache": 1, "Laboratory test": 1, "Ultrasound scan abnormal": 1}, "batchcodes": ["036B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/047A21A.json b/docs/data/histograms/Dominican Republic/047A21A.json
index 12dc9ac1c4c..b3bfa24ab08 100644
--- a/docs/data/histograms/Dominican Republic/047A21A.json
+++ b/docs/data/histograms/Dominican Republic/047A21A.json
@@ -1 +1 @@
-{"batchcode": "047A21A", "histograms": [{"batchcodes": ["047A21A"], "histogram": {"Blood pressure fluctuation": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash erythematous": 1, "Somnolence": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "047A21A", "histograms": [{"histogram": {"Blood pressure fluctuation": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash erythematous": 1, "Somnolence": 1, "Swelling": 1}, "batchcodes": ["047A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/1805031.json b/docs/data/histograms/Dominican Republic/1805031.json
index c6e4d773e16..bd73e0cca83 100644
--- a/docs/data/histograms/Dominican Republic/1805031.json
+++ b/docs/data/histograms/Dominican Republic/1805031.json
@@ -1 +1 @@
-{"batchcode": "1805031", "histograms": [{"batchcodes": ["1805031"], "histogram": {"Chills": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1805031", "histograms": [{"histogram": {"Chills": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["1805031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/205A21A.json b/docs/data/histograms/Dominican Republic/205A21A.json
index 495b605532c..b9cb736bfbb 100644
--- a/docs/data/histograms/Dominican Republic/205A21A.json
+++ b/docs/data/histograms/Dominican Republic/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"Asthenia": 1, "Influenza": 1, "Pneumonitis": 1, "Respiratory tract irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"Asthenia": 1, "Influenza": 1, "Pneumonitis": 1, "Respiratory tract irritation": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/301358A.json b/docs/data/histograms/Dominican Republic/301358A.json
index f821fb6f881..b87749b54da 100644
--- a/docs/data/histograms/Dominican Republic/301358A.json
+++ b/docs/data/histograms/Dominican Republic/301358A.json
@@ -1 +1 @@
-{"batchcode": "301358A", "histograms": [{"batchcodes": ["301358A"], "histogram": {"Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "301358A", "histograms": [{"histogram": {"Skin discolouration": 1}, "batchcodes": ["301358A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/DO NOT KNOW.json b/docs/data/histograms/Dominican Republic/DO NOT KNOW.json
index bb923cec2da..0c46c250f47 100644
--- a/docs/data/histograms/Dominican Republic/DO NOT KNOW.json
+++ b/docs/data/histograms/Dominican Republic/DO NOT KNOW.json
@@ -1 +1 @@
-{"batchcode": "DO NOT KNOW", "histograms": [{"batchcodes": ["DO NOT KNOW"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Body temperature increased": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Myalgia": 1, "Nausea": 1, "SARS-CoV-2 test negative": 1, "Tremor": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "DO NOT KNOW", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Body temperature increased": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Myalgia": 1, "Nausea": 1, "SARS-CoV-2 test negative": 1, "Tremor": 1, "Vomiting": 1}, "batchcodes": ["DO NOT KNOW"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/DON?T KNOW.json b/docs/data/histograms/Dominican Republic/DON?T KNOW.json
index f065cdf4315..f4df8652447 100644
--- a/docs/data/histograms/Dominican Republic/DON?T KNOW.json
+++ b/docs/data/histograms/Dominican Republic/DON?T KNOW.json
@@ -1 +1 @@
-{"batchcode": "DON?T KNOW", "histograms": [{"batchcodes": ["DON?T KNOW"], "histogram": {"Fatigue": 2, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "DON?T KNOW", "histograms": [{"histogram": {"Fatigue": 2, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["DON?T KNOW"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/EL 3249.json b/docs/data/histograms/Dominican Republic/EL 3249.json
index 9e4f975de47..4c44a550f50 100644
--- a/docs/data/histograms/Dominican Republic/EL 3249.json
+++ b/docs/data/histograms/Dominican Republic/EL 3249.json
@@ -1 +1 @@
-{"batchcode": "EL 3249", "histograms": [{"batchcodes": ["EL 3249"], "histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL 3249", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Pain": 1}, "batchcodes": ["EL 3249"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/EL3302.json b/docs/data/histograms/Dominican Republic/EL3302.json
index bf2b82bd993..0897c281584 100644
--- a/docs/data/histograms/Dominican Republic/EL3302.json
+++ b/docs/data/histograms/Dominican Republic/EL3302.json
@@ -1 +1 @@
-{"batchcode": "EL3302", "histograms": [{"batchcodes": ["EL3302"], "histogram": {"Chills": 1, "Cold sweat": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Troponin normal": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3302", "histograms": [{"histogram": {"Chills": 1, "Cold sweat": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Troponin normal": 1, "X-ray": 1}, "batchcodes": ["EL3302"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/EL9262.json b/docs/data/histograms/Dominican Republic/EL9262.json
index 23b789de7b2..d4122ef038f 100644
--- a/docs/data/histograms/Dominican Republic/EL9262.json
+++ b/docs/data/histograms/Dominican Republic/EL9262.json
@@ -1 +1 @@
-{"batchcode": "EL9262", "histograms": [{"batchcodes": ["EL9262"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9262", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1}, "batchcodes": ["EL9262"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/ER8729.json b/docs/data/histograms/Dominican Republic/ER8729.json
index a2f0c6526b5..ae0084f2dd8 100644
--- a/docs/data/histograms/Dominican Republic/ER8729.json
+++ b/docs/data/histograms/Dominican Republic/ER8729.json
@@ -1 +1 @@
-{"batchcode": "ER8729", "histograms": [{"batchcodes": ["ER8729"], "histogram": {"Heart rate increased": 1, "Hypoaesthesia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8729", "histograms": [{"histogram": {"Heart rate increased": 1, "Hypoaesthesia": 1, "Seizure": 1}, "batchcodes": ["ER8729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/EW0217.json b/docs/data/histograms/Dominican Republic/EW0217.json
index 2f28665bddb..cd5b1823277 100644
--- a/docs/data/histograms/Dominican Republic/EW0217.json
+++ b/docs/data/histograms/Dominican Republic/EW0217.json
@@ -1 +1 @@
-{"batchcode": "EW0217", "histograms": [{"batchcodes": ["EW0217"], "histogram": {"Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0217", "histograms": [{"histogram": {"Rash": 1, "Urticaria": 1}, "batchcodes": ["EW0217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Dominican Republic/EY0575.json b/docs/data/histograms/Dominican Republic/EY0575.json
index 64c5c0e9f4b..49df565d150 100644
--- a/docs/data/histograms/Dominican Republic/EY0575.json
+++ b/docs/data/histograms/Dominican Republic/EY0575.json
@@ -1 +1 @@
-{"batchcode": "EY0575", "histograms": [{"batchcodes": ["EY0575"], "histogram": {"Blood test": 1, "Computerised tomogram": 1, "Exercise electrocardiogram": 1, "Positron emission tomogram": 1, "Rash": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0575", "histograms": [{"histogram": {"Blood test": 1, "Computerised tomogram": 1, "Exercise electrocardiogram": 1, "Positron emission tomogram": 1, "Rash": 1, "Ultrasound scan": 1}, "batchcodes": ["EY0575"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ecuador/ER7934.json b/docs/data/histograms/Ecuador/ER7934.json
index 2c43aa27ab1..7795127d2b4 100644
--- a/docs/data/histograms/Ecuador/ER7934.json
+++ b/docs/data/histograms/Ecuador/ER7934.json
@@ -1 +1 @@
-{"batchcode": "ER7934", "histograms": [{"batchcodes": ["ER7934"], "histogram": {"SARS-CoV-2 test": 2, "Arthralgia": 1, "Body temperature": 1, "Fibrin D dimer": 1, "Herpes zoster": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "Ultrasound Doppler": 1, "Venous thrombosis limb": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7934", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "Arthralgia": 1, "Body temperature": 1, "Fibrin D dimer": 1, "Herpes zoster": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "Ultrasound Doppler": 1, "Venous thrombosis limb": 1}, "batchcodes": ["ER7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ecuador/EW0195.json b/docs/data/histograms/Ecuador/EW0195.json
index d578a2e6b49..954c3cbc543 100644
--- a/docs/data/histograms/Ecuador/EW0195.json
+++ b/docs/data/histograms/Ecuador/EW0195.json
@@ -1 +1 @@
-{"batchcode": "EW0195", "histograms": [{"batchcodes": ["EW0195"], "histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Basophil count": 1, "Basophil percentage": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood grouping": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thromboplastin": 1, "Blood triglycerides": 1, "Blood urea": 1, "Cyanosis": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "High density lipoprotein": 1, "Hypersensitivity": 1, "International normalised ratio": 1, "Investigation": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Platelet count": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Polymerase chain reaction": 1, "Polymerase chain reaction positive": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Skin discolouration": 1, "Thrombosis": 1, "Urine analysis": 1, "Urticaria": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0195", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Basophil count": 1, "Basophil percentage": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood grouping": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thromboplastin": 1, "Blood triglycerides": 1, "Blood urea": 1, "Cyanosis": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "High density lipoprotein": 1, "Hypersensitivity": 1, "International normalised ratio": 1, "Investigation": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Platelet count": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Polymerase chain reaction": 1, "Polymerase chain reaction positive": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Skin discolouration": 1, "Thrombosis": 1, "Urine analysis": 1, "Urticaria": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["EW0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ecuador/FE3380.json b/docs/data/histograms/Ecuador/FE3380.json
index 97e8817564c..7e706cc5320 100644
--- a/docs/data/histograms/Ecuador/FE3380.json
+++ b/docs/data/histograms/Ecuador/FE3380.json
@@ -1 +1 @@
-{"batchcode": "FE3380", "histograms": [{"batchcodes": ["FE3380"], "histogram": {"Application site burn": 1, "Erythema": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Urticaria": 1, "Vaccination site vesicles": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3380", "histograms": [{"histogram": {"Application site burn": 1, "Erythema": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Urticaria": 1, "Vaccination site vesicles": 1}, "batchcodes": ["FE3380"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ecuador/FN3815.json b/docs/data/histograms/Ecuador/FN3815.json
index 72aa946f02a..373d7f742f7 100644
--- a/docs/data/histograms/Ecuador/FN3815.json
+++ b/docs/data/histograms/Ecuador/FN3815.json
@@ -1 +1 @@
-{"batchcode": "FN3815", "histograms": [{"batchcodes": ["FN3815"], "histogram": {"Chest pain": 1, "Investigation": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FN3815", "histograms": [{"histogram": {"Chest pain": 1, "Investigation": 1, "Pain": 1}, "batchcodes": ["FN3815"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ecuador/NK0155.json b/docs/data/histograms/Ecuador/NK0155.json
index d06f273f41c..a179c684477 100644
--- a/docs/data/histograms/Ecuador/NK0155.json
+++ b/docs/data/histograms/Ecuador/NK0155.json
@@ -1 +1 @@
-{"batchcode": "NK0155", "histograms": [{"batchcodes": ["NK0155", "PAA156571"], "histogram": {"Heart rate": 1, "Heart rate increased": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "NK0155", "histograms": [{"histogram": {"Heart rate": 1, "Heart rate increased": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["NK0155", "PAA156571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ecuador/PAA156571.json b/docs/data/histograms/Ecuador/PAA156571.json
index ec4f2fac672..f1971b8cd83 100644
--- a/docs/data/histograms/Ecuador/PAA156571.json
+++ b/docs/data/histograms/Ecuador/PAA156571.json
@@ -1 +1 @@
-{"batchcode": "PAA156571", "histograms": [{"batchcodes": ["NK0155", "PAA156571"], "histogram": {"Heart rate": 1, "Heart rate increased": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA156571", "histograms": [{"histogram": {"Heart rate": 1, "Heart rate increased": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["NK0155", "PAA156571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Egypt/NOT REPORTED.json b/docs/data/histograms/Egypt/NOT REPORTED.json
index b409dc312f4..1c267f2f176 100644
--- a/docs/data/histograms/Egypt/NOT REPORTED.json
+++ b/docs/data/histograms/Egypt/NOT REPORTED.json
@@ -1 +1 @@
-{"batchcode": "NOT REPORTED", "histograms": [{"batchcodes": ["NOT REPORTED"], "histogram": {"Eyelid ptosis": 1, "Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Immune system disorder": 1, "Laboratory test": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "NOT REPORTED", "histograms": [{"histogram": {"Eyelid ptosis": 1, "Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Immune system disorder": 1, "Laboratory test": 1, "Muscular weakness": 1}, "batchcodes": ["NOT REPORTED"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/El Salvador/205A21A.json b/docs/data/histograms/El Salvador/205A21A.json
index 117f3421f1c..ef4ea3dfcc9 100644
--- a/docs/data/histograms/El Salvador/205A21A.json
+++ b/docs/data/histograms/El Salvador/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"COVID-19": 1, "Headache": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"COVID-19": 1, "Headache": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/El Salvador/EP6955.json b/docs/data/histograms/El Salvador/EP6955.json
index cc01879ee9c..996793877b3 100644
--- a/docs/data/histograms/El Salvador/EP6955.json
+++ b/docs/data/histograms/El Salvador/EP6955.json
@@ -1 +1 @@
-{"batchcode": "EP6955", "histograms": [{"batchcodes": ["EP6955"], "histogram": {"Atypical pneumonia": 1, "Back pain": 1, "Bronchospasm": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Insomnia": 1, "Pulmonary oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6955", "histograms": [{"histogram": {"Atypical pneumonia": 1, "Back pain": 1, "Bronchospasm": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Insomnia": 1, "Pulmonary oedema": 1}, "batchcodes": ["EP6955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/El Salvador/ER8735.json b/docs/data/histograms/El Salvador/ER8735.json
index 0dd52735e5b..8e0849561bc 100644
--- a/docs/data/histograms/El Salvador/ER8735.json
+++ b/docs/data/histograms/El Salvador/ER8735.json
@@ -1 +1 @@
-{"batchcode": "ER8735", "histograms": [{"batchcodes": ["ER8735"], "histogram": {"Back pain": 1, "Breast pain": 1, "Condition aggravated": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8735", "histograms": [{"histogram": {"Back pain": 1, "Breast pain": 1, "Condition aggravated": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["ER8735"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/El Salvador/EW0185.json b/docs/data/histograms/El Salvador/EW0185.json
index 713c0872dde..193e587a549 100644
--- a/docs/data/histograms/El Salvador/EW0185.json
+++ b/docs/data/histograms/El Salvador/EW0185.json
@@ -1 +1 @@
-{"batchcode": "EW0185", "histograms": [{"batchcodes": ["EW0185"], "histogram": {"Myocarditis": 1, "Pericarditis": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0185", "histograms": [{"histogram": {"Myocarditis": 1, "Pericarditis": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/El Salvador/FA7812.json b/docs/data/histograms/El Salvador/FA7812.json
index ab5267f40b0..ca2f9ea7930 100644
--- a/docs/data/histograms/El Salvador/FA7812.json
+++ b/docs/data/histograms/El Salvador/FA7812.json
@@ -1 +1 @@
-{"batchcode": "FA7812", "histograms": [{"batchcodes": ["FA7812"], "histogram": {"Anti-thyroid antibody": 1, "Bursitis": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Joint effusion": 1, "Lymphadenopathy": 1, "Muscular weakness": 1, "Ophthalmic herpes zoster": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7812", "histograms": [{"histogram": {"Anti-thyroid antibody": 1, "Bursitis": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Joint effusion": 1, "Lymphadenopathy": 1, "Muscular weakness": 1, "Ophthalmic herpes zoster": 1, "Pyrexia": 1}, "batchcodes": ["FA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Eritrea/ER2613.json b/docs/data/histograms/Eritrea/ER2613.json
index 2cb17a3e788..396791bb168 100644
--- a/docs/data/histograms/Eritrea/ER2613.json
+++ b/docs/data/histograms/Eritrea/ER2613.json
@@ -1 +1 @@
-{"batchcode": "ER2613", "histograms": [{"batchcodes": ["ER2613"], "histogram": {"Cellulitis": 1, "Dyspnoea": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2613", "histograms": [{"histogram": {"Cellulitis": 1, "Dyspnoea": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Rash": 1, "Urticaria": 1}, "batchcodes": ["ER2613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Eritrea/ER83137.json b/docs/data/histograms/Eritrea/ER83137.json
index 678c888c484..b8623c676cf 100644
--- a/docs/data/histograms/Eritrea/ER83137.json
+++ b/docs/data/histograms/Eritrea/ER83137.json
@@ -1 +1 @@
-{"batchcode": "ER83137", "histograms": [{"batchcodes": ["ER83137"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Cough": 1, "Dyspnoea": 1, "Ear infection": 1, "Fatigue": 1, "Headache": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "ER83137", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Cough": 1, "Dyspnoea": 1, "Ear infection": 1, "Fatigue": 1, "Headache": 1, "Sneezing": 1}, "batchcodes": ["ER83137"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Eritrea/ER8731.json b/docs/data/histograms/Eritrea/ER8731.json
index bdf8f230eab..77343026a68 100644
--- a/docs/data/histograms/Eritrea/ER8731.json
+++ b/docs/data/histograms/Eritrea/ER8731.json
@@ -1 +1 @@
-{"batchcode": "ER8731", "histograms": [{"batchcodes": ["ER8731"], "histogram": {"Bladder pain": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Eye pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Gastric ulcer": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging spinal abnormal": 1, "Muscular weakness": 1, "Myelitis transverse": 1, "Nausea": 1, "Neuralgia": 1, "Oral pain": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Panic attack": 1, "Pelvic pain": 1, "Pyrexia": 1, "Urinary retention": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8731", "histograms": [{"histogram": {"Bladder pain": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Eye pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Gastric ulcer": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging spinal abnormal": 1, "Muscular weakness": 1, "Myelitis transverse": 1, "Nausea": 1, "Neuralgia": 1, "Oral pain": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Panic attack": 1, "Pelvic pain": 1, "Pyrexia": 1, "Urinary retention": 1, "Visual impairment": 1}, "batchcodes": ["ER8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Fiji/FJ5682.json b/docs/data/histograms/Fiji/FJ5682.json
index ed6d48aa181..572fba37442 100644
--- a/docs/data/histograms/Fiji/FJ5682.json
+++ b/docs/data/histograms/Fiji/FJ5682.json
@@ -1 +1 @@
-{"batchcode": "FJ5682", "histograms": [{"batchcodes": ["FJ5682"], "histogram": {"Back pain": 1, "Headache": 1, "Hypoaesthesia": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5682", "histograms": [{"histogram": {"Back pain": 1, "Headache": 1, "Hypoaesthesia": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Paraesthesia": 1}, "batchcodes": ["FJ5682"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Fiji/FJ6369.json b/docs/data/histograms/Fiji/FJ6369.json
index 90d173b32d7..d9a31c9c197 100644
--- a/docs/data/histograms/Fiji/FJ6369.json
+++ b/docs/data/histograms/Fiji/FJ6369.json
@@ -1 +1 @@
-{"batchcode": "FJ6369", "histograms": [{"batchcodes": ["FJ6369"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ6369", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["FJ6369"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Finland/039A21A.json b/docs/data/histograms/Finland/039A21A.json
index 77852b24405..284e38da91e 100644
--- a/docs/data/histograms/Finland/039A21A.json
+++ b/docs/data/histograms/Finland/039A21A.json
@@ -1 +1 @@
-{"batchcode": "039A21A", "histograms": [{"batchcodes": ["039A21A"], "histogram": {"Asthenia": 1, "Back pain": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "039A21A", "histograms": [{"histogram": {"Asthenia": 1, "Back pain": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["039A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Finland/3002338.json b/docs/data/histograms/Finland/3002338.json
index 3f8705612f3..7420ea36884 100644
--- a/docs/data/histograms/Finland/3002338.json
+++ b/docs/data/histograms/Finland/3002338.json
@@ -1 +1 @@
-{"batchcode": "3002338", "histograms": [{"batchcodes": ["3002338"], "histogram": {"COVID-19 immunisation": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "3002338", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["3002338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Finland/FIRST) EL8982 A.json b/docs/data/histograms/Finland/FIRST) EL8982 A.json
index 266249b9290..fd241faac7f 100644
--- a/docs/data/histograms/Finland/FIRST) EL8982 A.json
+++ b/docs/data/histograms/Finland/FIRST) EL8982 A.json
@@ -1 +1 @@
-{"batchcode": "FIRST) EL8982 A", "histograms": [{"batchcodes": ["FIRST) EL8982 A"], "histogram": {"Eye swelling": 1, "Swelling face": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FIRST) EL8982 A", "histograms": [{"histogram": {"Eye swelling": 1, "Swelling face": 1, "Urticaria": 1}, "batchcodes": ["FIRST) EL8982 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/166701.json b/docs/data/histograms/French Polynesia/166701.json
index 2d8ce8cdd31..556dc124d04 100644
--- a/docs/data/histograms/French Polynesia/166701.json
+++ b/docs/data/histograms/French Polynesia/166701.json
@@ -1 +1 @@
-{"batchcode": "166701", "histograms": [{"batchcodes": ["166701"], "histogram": {"Unevaluable event": 1}}]}
\ No newline at end of file
+{"batchcode": "166701", "histograms": [{"histogram": {"Unevaluable event": 1}, "batchcodes": ["166701"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EJ1686.json b/docs/data/histograms/French Polynesia/EJ1686.json
index cc366cac925..038a164013b 100644
--- a/docs/data/histograms/French Polynesia/EJ1686.json
+++ b/docs/data/histograms/French Polynesia/EJ1686.json
@@ -1 +1 @@
-{"batchcode": "EJ1686", "histograms": [{"batchcodes": ["EJ1686"], "histogram": {"Dizziness": 1, "Dysstasia": 1, "Nervousness": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ1686", "histograms": [{"histogram": {"Dizziness": 1, "Dysstasia": 1, "Nervousness": 1}, "batchcodes": ["EJ1686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EJ6789.json b/docs/data/histograms/French Polynesia/EJ6789.json
index 09dce8259fa..8a85d512956 100644
--- a/docs/data/histograms/French Polynesia/EJ6789.json
+++ b/docs/data/histograms/French Polynesia/EJ6789.json
@@ -1 +1 @@
-{"batchcode": "EJ6789", "histograms": [{"batchcodes": ["EJ6789"], "histogram": {"Body mass index": 1, "COVID-19 pneumonia": 1, "Gene sequencing": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ6789", "histograms": [{"histogram": {"Body mass index": 1, "COVID-19 pneumonia": 1, "Gene sequencing": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}, "batchcodes": ["EJ6789"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EK5730.json b/docs/data/histograms/French Polynesia/EK5730.json
index f2b4ae79eb2..02cf7be7213 100644
--- a/docs/data/histograms/French Polynesia/EK5730.json
+++ b/docs/data/histograms/French Polynesia/EK5730.json
@@ -1 +1 @@
-{"batchcode": "EK5730", "histograms": [{"batchcodes": ["EK5730"], "histogram": {"Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EK5730", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["EK5730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EK9231.json b/docs/data/histograms/French Polynesia/EK9231.json
index 94f35cbde83..ecdbb6bdb56 100644
--- a/docs/data/histograms/French Polynesia/EK9231.json
+++ b/docs/data/histograms/French Polynesia/EK9231.json
@@ -1 +1 @@
-{"batchcode": "EK9231", "histograms": [{"batchcodes": ["EK9231"], "histogram": {"Chest discomfort": 1, "Headache": 1, "Multiple sclerosis": 1, "Musculoskeletal stiffness": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EK9231", "histograms": [{"histogram": {"Chest discomfort": 1, "Headache": 1, "Multiple sclerosis": 1, "Musculoskeletal stiffness": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EK9231"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL1234.json b/docs/data/histograms/French Polynesia/EL1234.json
index 43b0409881b..77589903eed 100644
--- a/docs/data/histograms/French Polynesia/EL1234.json
+++ b/docs/data/histograms/French Polynesia/EL1234.json
@@ -1 +1 @@
-{"batchcode": "EL1234", "histograms": [{"batchcodes": ["EL1234"], "histogram": {"Cold sweat": 1, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1234", "histograms": [{"histogram": {"Cold sweat": 1, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1}, "batchcodes": ["EL1234"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL3247.json b/docs/data/histograms/French Polynesia/EL3247.json
index d23b3b5ff68..cba5311c100 100644
--- a/docs/data/histograms/French Polynesia/EL3247.json
+++ b/docs/data/histograms/French Polynesia/EL3247.json
@@ -1 +1 @@
-{"batchcode": "EL3247", "histograms": [{"batchcodes": ["EL3247"], "histogram": {"Hyperhidrosis": 2, "Asthenia": 1, "Blood pressure decreased": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Head discomfort": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Immediate post-injection reaction": 1, "Influenza": 1, "Migraine": 1, "Nausea": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Rash": 1, "Throat irritation": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3247", "histograms": [{"histogram": {"Hyperhidrosis": 2, "Asthenia": 1, "Blood pressure decreased": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Head discomfort": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Immediate post-injection reaction": 1, "Influenza": 1, "Migraine": 1, "Nausea": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Rash": 1, "Throat irritation": 1, "Vomiting": 1}, "batchcodes": ["EL3247"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL3302.json b/docs/data/histograms/French Polynesia/EL3302.json
index 3a60d777b0a..a37befcc374 100644
--- a/docs/data/histograms/French Polynesia/EL3302.json
+++ b/docs/data/histograms/French Polynesia/EL3302.json
@@ -1 +1 @@
-{"batchcode": "EL3302", "histograms": [{"batchcodes": ["EL3302"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Headache": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3302", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Headache": 1, "Oropharyngeal pain": 1}, "batchcodes": ["EL3302"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL9261.json b/docs/data/histograms/French Polynesia/EL9261.json
index 34d4cf9f1a5..31da9641862 100644
--- a/docs/data/histograms/French Polynesia/EL9261.json
+++ b/docs/data/histograms/French Polynesia/EL9261.json
@@ -1 +1 @@
-{"batchcode": "EL9261", "histograms": [{"batchcodes": ["EL9261"], "histogram": {"Dizziness": 4, "Blood pressure increased": 2, "Headache": 2, "Nervousness": 2, "Cold sweat": 1, "Computerised tomogram": 1, "Dizziness postural": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Feeling jittery": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Laboratory test": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pallor": 1, "Palpitations": 1, "Pneumonia": 1, "Pupillary disorder": 1, "Throat tightness": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9261", "histograms": [{"histogram": {"Dizziness": 4, "Blood pressure increased": 2, "Headache": 2, "Nervousness": 2, "Cold sweat": 1, "Computerised tomogram": 1, "Dizziness postural": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Feeling jittery": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Laboratory test": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pallor": 1, "Palpitations": 1, "Pneumonia": 1, "Pupillary disorder": 1, "Throat tightness": 1, "Vomiting": 1}, "batchcodes": ["EL9261"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL9262.json b/docs/data/histograms/French Polynesia/EL9262.json
index e0e09250778..e6593885da1 100644
--- a/docs/data/histograms/French Polynesia/EL9262.json
+++ b/docs/data/histograms/French Polynesia/EL9262.json
@@ -1 +1 @@
-{"batchcode": "EL9262", "histograms": [{"batchcodes": ["EL9262"], "histogram": {"Blood pressure increased": 1, "Dysgeusia": 1, "Impaired driving ability": 1, "Ocular discomfort": 1, "Paraesthesia": 1, "Paraesthesia oral": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9262", "histograms": [{"histogram": {"Blood pressure increased": 1, "Dysgeusia": 1, "Impaired driving ability": 1, "Ocular discomfort": 1, "Paraesthesia": 1, "Paraesthesia oral": 1}, "batchcodes": ["EL9262"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL9264.json b/docs/data/histograms/French Polynesia/EL9264.json
index 1f5bb838467..b0afe44236f 100644
--- a/docs/data/histograms/French Polynesia/EL9264.json
+++ b/docs/data/histograms/French Polynesia/EL9264.json
@@ -1 +1 @@
-{"batchcode": "EL9264", "histograms": [{"batchcodes": ["EL9264"], "histogram": {"Dizziness": 2, "Asthma": 1, "Body temperature": 1, "Dehydration": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Panic attack": 1, "Pyrexia": 1, "Tremor": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9264", "histograms": [{"histogram": {"Dizziness": 2, "Asthma": 1, "Body temperature": 1, "Dehydration": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Panic attack": 1, "Pyrexia": 1, "Tremor": 1, "Vision blurred": 1}, "batchcodes": ["EL9264"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL9265.json b/docs/data/histograms/French Polynesia/EL9265.json
index 681c8d5a169..5711a721594 100644
--- a/docs/data/histograms/French Polynesia/EL9265.json
+++ b/docs/data/histograms/French Polynesia/EL9265.json
@@ -1 +1 @@
-{"batchcode": "EL9265", "histograms": [{"batchcodes": ["EL9265"], "histogram": {"Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood potassium": 1, "Blood potassium decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9265", "histograms": [{"histogram": {"Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood potassium": 1, "Blood potassium decreased": 1}, "batchcodes": ["EL9265"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EL9269.json b/docs/data/histograms/French Polynesia/EL9269.json
index f387389b702..7d7018982a9 100644
--- a/docs/data/histograms/French Polynesia/EL9269.json
+++ b/docs/data/histograms/French Polynesia/EL9269.json
@@ -1 +1 @@
-{"batchcode": "EL9269", "histograms": [{"batchcodes": ["EL9269"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9269", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pain": 1}, "batchcodes": ["EL9269"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EM9809.json b/docs/data/histograms/French Polynesia/EM9809.json
index 4ea823518ce..b2cdfcef89c 100644
--- a/docs/data/histograms/French Polynesia/EM9809.json
+++ b/docs/data/histograms/French Polynesia/EM9809.json
@@ -1 +1 @@
-{"batchcode": "EM9809", "histograms": [{"batchcodes": ["EM9809"], "histogram": {"Anxiety": 1, "Dizziness": 1, "Erythema": 1, "Flushing": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Retching": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9809", "histograms": [{"histogram": {"Anxiety": 1, "Dizziness": 1, "Erythema": 1, "Flushing": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Retching": 1, "Visual impairment": 1}, "batchcodes": ["EM9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EM9829.json b/docs/data/histograms/French Polynesia/EM9829.json
index 5f1a7ec6acf..b461a321fda 100644
--- a/docs/data/histograms/French Polynesia/EM9829.json
+++ b/docs/data/histograms/French Polynesia/EM9829.json
@@ -1 +1 @@
-{"batchcode": "EM9829", "histograms": [{"batchcodes": ["EM9829"], "histogram": {"Arthralgia": 1, "Cold sweat": 1, "Flushing": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9829", "histograms": [{"histogram": {"Arthralgia": 1, "Cold sweat": 1, "Flushing": 1, "Paraesthesia": 1}, "batchcodes": ["EM9829"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EN6198.json b/docs/data/histograms/French Polynesia/EN6198.json
index 490342843eb..52dc0c018de 100644
--- a/docs/data/histograms/French Polynesia/EN6198.json
+++ b/docs/data/histograms/French Polynesia/EN6198.json
@@ -1 +1 @@
-{"batchcode": "EN6198", "histograms": [{"batchcodes": ["EN6198"], "histogram": {"Exposure to SARS-CoV-2": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6198", "histograms": [{"histogram": {"Exposure to SARS-CoV-2": 1}, "batchcodes": ["EN6198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EN6201.json b/docs/data/histograms/French Polynesia/EN6201.json
index 9e2bb0b4df6..273b6a9fe08 100644
--- a/docs/data/histograms/French Polynesia/EN6201.json
+++ b/docs/data/histograms/French Polynesia/EN6201.json
@@ -1 +1 @@
-{"batchcode": "EN6201", "histograms": [{"batchcodes": ["EN6201"], "histogram": {"Asthenia": 1, "Confusional state": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Hallucination": 1, "Heart rate increased": 1, "Obsessive-compulsive personality disorder": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6201", "histograms": [{"histogram": {"Asthenia": 1, "Confusional state": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Hallucination": 1, "Heart rate increased": 1, "Obsessive-compulsive personality disorder": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["EN6201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EN6203.json b/docs/data/histograms/French Polynesia/EN6203.json
index 62d8076f82c..077bae7b3f6 100644
--- a/docs/data/histograms/French Polynesia/EN6203.json
+++ b/docs/data/histograms/French Polynesia/EN6203.json
@@ -1 +1 @@
-{"batchcode": "EN6203", "histograms": [{"batchcodes": ["EN6203"], "histogram": {"Anger": 1, "Feeling abnormal": 1, "Headache": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Insomnia": 1, "Nausea": 1, "Neck pain": 1, "Nephrolithiasis": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6203", "histograms": [{"histogram": {"Anger": 1, "Feeling abnormal": 1, "Headache": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Insomnia": 1, "Nausea": 1, "Neck pain": 1, "Nephrolithiasis": 1}, "batchcodes": ["EN6203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EN6204.json b/docs/data/histograms/French Polynesia/EN6204.json
index 72c0f7d570e..f7fb34dd530 100644
--- a/docs/data/histograms/French Polynesia/EN6204.json
+++ b/docs/data/histograms/French Polynesia/EN6204.json
@@ -1 +1 @@
-{"batchcode": "EN6204", "histograms": [{"batchcodes": ["EN6204"], "histogram": {"Blood test": 1, "Blood urine present": 1, "COVID-19": 1, "Culture": 1, "Drug ineffective": 1, "Headache": 1, "Hypoaesthesia": 1, "Malaise": 1, "SARS-CoV-2 test": 1, "Urine analysis normal": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6204", "histograms": [{"histogram": {"Blood test": 1, "Blood urine present": 1, "COVID-19": 1, "Culture": 1, "Drug ineffective": 1, "Headache": 1, "Hypoaesthesia": 1, "Malaise": 1, "SARS-CoV-2 test": 1, "Urine analysis normal": 1}, "batchcodes": ["EN6204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EN6206.json b/docs/data/histograms/French Polynesia/EN6206.json
index 7c777f2b0a4..941509de737 100644
--- a/docs/data/histograms/French Polynesia/EN6206.json
+++ b/docs/data/histograms/French Polynesia/EN6206.json
@@ -1 +1 @@
-{"batchcode": "EN6206", "histograms": [{"batchcodes": ["EN6206"], "histogram": {"Chorea": 1, "Dyspnoea": 1, "Muscular weakness": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6206", "histograms": [{"histogram": {"Chorea": 1, "Dyspnoea": 1, "Muscular weakness": 1, "Polymerase chain reaction": 1}, "batchcodes": ["EN6206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EN8207.json b/docs/data/histograms/French Polynesia/EN8207.json
index ce0d9e5ab43..bc4023b94c2 100644
--- a/docs/data/histograms/French Polynesia/EN8207.json
+++ b/docs/data/histograms/French Polynesia/EN8207.json
@@ -1 +1 @@
-{"batchcode": "EN8207", "histograms": [{"batchcodes": ["EN8207"], "histogram": {"Deep vein thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EN8207", "histograms": [{"histogram": {"Deep vein thrombosis": 1}, "batchcodes": ["EN8207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EN8730.json b/docs/data/histograms/French Polynesia/EN8730.json
index 960a5dbfb55..c4c4316ab1f 100644
--- a/docs/data/histograms/French Polynesia/EN8730.json
+++ b/docs/data/histograms/French Polynesia/EN8730.json
@@ -1 +1 @@
-{"batchcode": "EN8730", "histograms": [{"batchcodes": ["EN8730"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EN8730", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EN8730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/ER8732.json b/docs/data/histograms/French Polynesia/ER8732.json
index e5259a100aa..efc953e4c74 100644
--- a/docs/data/histograms/French Polynesia/ER8732.json
+++ b/docs/data/histograms/French Polynesia/ER8732.json
@@ -1 +1 @@
-{"batchcode": "ER8732", "histograms": [{"batchcodes": ["ER8732"], "histogram": {"Lip swelling": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8732", "histograms": [{"histogram": {"Lip swelling": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swollen tongue": 1}, "batchcodes": ["ER8732"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/ER8735.json b/docs/data/histograms/French Polynesia/ER8735.json
index e3b7bfb47b6..c12d2f35468 100644
--- a/docs/data/histograms/French Polynesia/ER8735.json
+++ b/docs/data/histograms/French Polynesia/ER8735.json
@@ -1 +1 @@
-{"batchcode": "ER8735", "histograms": [{"batchcodes": ["ER8735"], "histogram": {"Angina pectoris": 1, "Chest pain": 1, "Contusion": 1, "Dizziness": 1, "Epistaxis": 1, "Haematoma": 1, "Lipids": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Physical examination": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8735", "histograms": [{"histogram": {"Angina pectoris": 1, "Chest pain": 1, "Contusion": 1, "Dizziness": 1, "Epistaxis": 1, "Haematoma": 1, "Lipids": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Physical examination": 1, "Thrombosis": 1}, "batchcodes": ["ER8735"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/ER8736.json b/docs/data/histograms/French Polynesia/ER8736.json
index 59c05e0a889..f0e16b05b65 100644
--- a/docs/data/histograms/French Polynesia/ER8736.json
+++ b/docs/data/histograms/French Polynesia/ER8736.json
@@ -1 +1 @@
-{"batchcode": "ER8736", "histograms": [{"batchcodes": ["ER8736"], "histogram": {"Angioedema": 1, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Fatigue": 1, "Headache": 1, "Intestinal ischaemia": 1, "Nausea": 1, "Pain": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Thrombosis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8736", "histograms": [{"histogram": {"Angioedema": 1, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Fatigue": 1, "Headache": 1, "Intestinal ischaemia": 1, "Nausea": 1, "Pain": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Thrombosis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["ER8736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0162.json b/docs/data/histograms/French Polynesia/EW0162.json
index ce0d1084432..f2d40b3439c 100644
--- a/docs/data/histograms/French Polynesia/EW0162.json
+++ b/docs/data/histograms/French Polynesia/EW0162.json
@@ -1 +1 @@
-{"batchcode": "EW0162", "histograms": [{"batchcodes": ["EW0162"], "histogram": {"Rheumatoid arthritis": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0162", "histograms": [{"histogram": {"Rheumatoid arthritis": 1}, "batchcodes": ["EW0162"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0167.json b/docs/data/histograms/French Polynesia/EW0167.json
index c402a1972af..864a6320f06 100644
--- a/docs/data/histograms/French Polynesia/EW0167.json
+++ b/docs/data/histograms/French Polynesia/EW0167.json
@@ -1 +1 @@
-{"batchcode": "EW0167", "histograms": [{"batchcodes": ["EW0167"], "histogram": {"Chest discomfort": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Headache": 1, "Neck pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Throat tightness": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0167", "histograms": [{"histogram": {"Chest discomfort": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Headache": 1, "Neck pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Throat tightness": 1, "Vomiting": 1}, "batchcodes": ["EW0167"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0170.json b/docs/data/histograms/French Polynesia/EW0170.json
index 9602f4cb163..a45c6a10701 100644
--- a/docs/data/histograms/French Polynesia/EW0170.json
+++ b/docs/data/histograms/French Polynesia/EW0170.json
@@ -1 +1 @@
-{"batchcode": "EW0170", "histograms": [{"batchcodes": ["EW0170"], "histogram": {"Lip swelling": 1, "Swelling face": 1, "Tongue eruption": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0170", "histograms": [{"histogram": {"Lip swelling": 1, "Swelling face": 1, "Tongue eruption": 1}, "batchcodes": ["EW0170"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0172.json b/docs/data/histograms/French Polynesia/EW0172.json
index 4c1c4c6a615..ab77a639e10 100644
--- a/docs/data/histograms/French Polynesia/EW0172.json
+++ b/docs/data/histograms/French Polynesia/EW0172.json
@@ -1 +1 @@
-{"batchcode": "EW0172", "histograms": [{"batchcodes": ["EW0172"], "histogram": {"Rash": 1, "Rash pruritic": 1, "Urticaria": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0172", "histograms": [{"histogram": {"Rash": 1, "Rash pruritic": 1, "Urticaria": 1, "X-ray": 1}, "batchcodes": ["EW0172"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0179.json b/docs/data/histograms/French Polynesia/EW0179.json
index 2cc3401f585..3589934355d 100644
--- a/docs/data/histograms/French Polynesia/EW0179.json
+++ b/docs/data/histograms/French Polynesia/EW0179.json
@@ -1 +1 @@
-{"batchcode": "EW0179", "histograms": [{"batchcodes": ["EW0179"], "histogram": {"Arthralgia": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0179", "histograms": [{"histogram": {"Arthralgia": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["EW0179"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0180.json b/docs/data/histograms/French Polynesia/EW0180.json
index ffc439c9c23..2d941caeb5e 100644
--- a/docs/data/histograms/French Polynesia/EW0180.json
+++ b/docs/data/histograms/French Polynesia/EW0180.json
@@ -1 +1 @@
-{"batchcode": "EW0180", "histograms": [{"batchcodes": ["EW0180"], "histogram": {"Bell's palsy": 1, "Dizziness": 1, "Dyspnoea": 1, "Ear pain": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0180", "histograms": [{"histogram": {"Bell's palsy": 1, "Dizziness": 1, "Dyspnoea": 1, "Ear pain": 1, "Headache": 1}, "batchcodes": ["EW0180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0182.json b/docs/data/histograms/French Polynesia/EW0182.json
index 82e3dc65ea8..b0c5bb3a455 100644
--- a/docs/data/histograms/French Polynesia/EW0182.json
+++ b/docs/data/histograms/French Polynesia/EW0182.json
@@ -1 +1 @@
-{"batchcode": "EW0182", "histograms": [{"batchcodes": ["EW0182"], "histogram": {"Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0182", "histograms": [{"histogram": {"Rash": 1, "Urticaria": 1}, "batchcodes": ["EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/EW0185.json b/docs/data/histograms/French Polynesia/EW0185.json
index 44ede9db041..96257077cbb 100644
--- a/docs/data/histograms/French Polynesia/EW0185.json
+++ b/docs/data/histograms/French Polynesia/EW0185.json
@@ -1 +1 @@
-{"batchcode": "EW0185", "histograms": [{"batchcodes": ["EW0185"], "histogram": {"Condition aggravated": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0185", "histograms": [{"histogram": {"Condition aggravated": 1, "Urticaria": 1}, "batchcodes": ["EW0185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/FF2590.json b/docs/data/histograms/French Polynesia/FF2590.json
index d680b10869f..04f31ad4db1 100644
--- a/docs/data/histograms/French Polynesia/FF2590.json
+++ b/docs/data/histograms/French Polynesia/FF2590.json
@@ -1 +1 @@
-{"batchcode": "FF2590", "histograms": [{"batchcodes": ["FF2590"], "histogram": {"Atrial fibrillation": 1, "Bundle branch block": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac pacemaker insertion": 1, "Catheterisation cardiac normal": 1, "Electrocardiogram": 1, "Implantable defibrillator insertion": 1, "Magnetic resonance imaging heart": 1, "Sinus tachycardia": 1, "Ultrasound scan": 1, "Ventricular arrhythmia": 1, "Ventricular dysfunction": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2590", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Bundle branch block": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac pacemaker insertion": 1, "Catheterisation cardiac normal": 1, "Electrocardiogram": 1, "Implantable defibrillator insertion": 1, "Magnetic resonance imaging heart": 1, "Sinus tachycardia": 1, "Ultrasound scan": 1, "Ventricular arrhythmia": 1, "Ventricular dysfunction": 1}, "batchcodes": ["FF2590"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/FJ1611.json b/docs/data/histograms/French Polynesia/FJ1611.json
index 8ded499092c..d25cd6380f7 100644
--- a/docs/data/histograms/French Polynesia/FJ1611.json
+++ b/docs/data/histograms/French Polynesia/FJ1611.json
@@ -1 +1 @@
-{"batchcode": "FJ1611", "histograms": [{"batchcodes": ["FJ1611"], "histogram": {"Abdominal discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Insomnia": 1, "Muscle spasms": 1, "Myalgia": 1, "Pollakiuria": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1611", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Insomnia": 1, "Muscle spasms": 1, "Myalgia": 1, "Pollakiuria": 1, "Pyrexia": 1}, "batchcodes": ["FJ1611"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/PFIZER EN6208.json b/docs/data/histograms/French Polynesia/PFIZER EN6208.json
index 2bcfd573762..7b9dc98da0f 100644
--- a/docs/data/histograms/French Polynesia/PFIZER EN6208.json
+++ b/docs/data/histograms/French Polynesia/PFIZER EN6208.json
@@ -1 +1 @@
-{"batchcode": "PFIZER EN6208", "histograms": [{"batchcodes": ["PFIZER EN6208"], "histogram": {"Chills": 1, "Dizziness": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PFIZER EN6208", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["PFIZER EN6208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/PFIZER-BIONTECH.json b/docs/data/histograms/French Polynesia/PFIZER-BIONTECH.json
index 31232866157..a8c8abbae66 100644
--- a/docs/data/histograms/French Polynesia/PFIZER-BIONTECH.json
+++ b/docs/data/histograms/French Polynesia/PFIZER-BIONTECH.json
@@ -1 +1 @@
-{"batchcode": "PFIZER-BIONTECH", "histograms": [{"batchcodes": ["PFIZER-BIONTECH"], "histogram": {"Dizziness": 1, "Dysstasia": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Pain in extremity": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "PFIZER-BIONTECH", "histograms": [{"histogram": {"Dizziness": 1, "Dysstasia": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Pain in extremity": 1, "Tremor": 1}, "batchcodes": ["PFIZER-BIONTECH"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/French Polynesia/PFIZER-ER8731.json b/docs/data/histograms/French Polynesia/PFIZER-ER8731.json
index a2c429c3f33..85aae232605 100644
--- a/docs/data/histograms/French Polynesia/PFIZER-ER8731.json
+++ b/docs/data/histograms/French Polynesia/PFIZER-ER8731.json
@@ -1 +1 @@
-{"batchcode": "PFIZER-ER8731", "histograms": [{"batchcodes": ["PFIZER-ER8731"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "PFIZER-ER8731", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["PFIZER-ER8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/EL9267.json b/docs/data/histograms/Georgia/EL9267.json
index cb7d197b6a8..4141437a122 100644
--- a/docs/data/histograms/Georgia/EL9267.json
+++ b/docs/data/histograms/Georgia/EL9267.json
@@ -1 +1 @@
-{"batchcode": "EL9267", "histograms": [{"batchcodes": ["EL9267"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Lymphadenopathy": 1, "Pain": 1, "Swelling": 1, "Tenderness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9267", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Lymphadenopathy": 1, "Pain": 1, "Swelling": 1, "Tenderness": 1, "Vaccination site pain": 1}, "batchcodes": ["EL9267"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/ER7449.json b/docs/data/histograms/Georgia/ER7449.json
index ebdee8f79c7..b5174b7b933 100644
--- a/docs/data/histograms/Georgia/ER7449.json
+++ b/docs/data/histograms/Georgia/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Malaise": 3, "Pyrexia": 3, "Drug ineffective": 2, "Headache": 2, "Angioedema": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Dysphagia": 1, "Haemoptysis": 1, "Hypotension": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "SARS-CoV-2 test positive": 1, "Shock": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Malaise": 3, "Pyrexia": 3, "Drug ineffective": 2, "Headache": 2, "Angioedema": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Dysphagia": 1, "Haemoptysis": 1, "Hypotension": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "SARS-CoV-2 test positive": 1, "Shock": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/EW0170.json b/docs/data/histograms/Georgia/EW0170.json
index 59573b9bf90..2c1841fdd06 100644
--- a/docs/data/histograms/Georgia/EW0170.json
+++ b/docs/data/histograms/Georgia/EW0170.json
@@ -1 +1 @@
-{"batchcode": "EW0170", "histograms": [{"batchcodes": ["EW0170"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Back pain": 1, "Gait disturbance": 1, "Movement disorder": 1, "Walking aid user": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0170", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Back pain": 1, "Gait disturbance": 1, "Movement disorder": 1, "Walking aid user": 1}, "batchcodes": ["EW0170"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/EY0581.json b/docs/data/histograms/Georgia/EY0581.json
index 7df0a93848b..faf682554f6 100644
--- a/docs/data/histograms/Georgia/EY0581.json
+++ b/docs/data/histograms/Georgia/EY0581.json
@@ -1 +1 @@
-{"batchcode": "EY0581", "histograms": [{"batchcodes": ["EY0581"], "histogram": {"Syncope": 8, "Blood pressure measurement": 5, "Hypotension": 5, "Chest pain": 4, "Dizziness": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Arthralgia": 2, "Dysphagia": 2, "Headache": 2, "Pneumonia": 2, "Vaccination site pain": 2, "Angioedema": 1, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Body temperature increased": 1, "Bradycardia": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Chills": 1, "Circulatory collapse": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Myocardial infarction": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test negative": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound scan": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0581", "histograms": [{"histogram": {"Syncope": 8, "Blood pressure measurement": 5, "Hypotension": 5, "Chest pain": 4, "Dizziness": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Arthralgia": 2, "Dysphagia": 2, "Headache": 2, "Pneumonia": 2, "Vaccination site pain": 2, "Angioedema": 1, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Body temperature increased": 1, "Bradycardia": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Chills": 1, "Circulatory collapse": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Myocardial infarction": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test negative": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound scan": 1, "Vomiting": 1}, "batchcodes": ["EY0581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FC3180.json b/docs/data/histograms/Georgia/FC3180.json
index 24e0ac24949..bd50248f68d 100644
--- a/docs/data/histograms/Georgia/FC3180.json
+++ b/docs/data/histograms/Georgia/FC3180.json
@@ -1 +1 @@
-{"batchcode": "FC3180", "histograms": [{"batchcodes": ["FC3180"], "histogram": {"Hypersensitivity": 1, "Thirst": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3180", "histograms": [{"histogram": {"Hypersensitivity": 1, "Thirst": 1, "Vaccination site mass": 1}, "batchcodes": ["FC3180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FD8813.json b/docs/data/histograms/Georgia/FD8813.json
index bbbdc42cb98..a42b214f3ec 100644
--- a/docs/data/histograms/Georgia/FD8813.json
+++ b/docs/data/histograms/Georgia/FD8813.json
@@ -1 +1 @@
-{"batchcode": "FD8813", "histograms": [{"batchcodes": ["FD8813"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Skin discolouration": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8813", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Skin discolouration": 1, "Syncope": 1}, "batchcodes": ["FD8813"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FF2153.json b/docs/data/histograms/Georgia/FF2153.json
index 9fafdfd3210..1f1d215d7c9 100644
--- a/docs/data/histograms/Georgia/FF2153.json
+++ b/docs/data/histograms/Georgia/FF2153.json
@@ -1 +1 @@
-{"batchcode": "FF2153", "histograms": [{"batchcodes": ["FF2153"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2153", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FF2153"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FF7416.json b/docs/data/histograms/Georgia/FF7416.json
index e12e0e43f06..484add93c1c 100644
--- a/docs/data/histograms/Georgia/FF7416.json
+++ b/docs/data/histograms/Georgia/FF7416.json
@@ -1 +1 @@
-{"batchcode": "FF7416", "histograms": [{"batchcodes": ["FF7416"], "histogram": {"Blood pressure measurement": 1, "Hypotension": 1, "Polymerase chain reaction": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FF7416", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Hypotension": 1, "Polymerase chain reaction": 1, "Syncope": 1}, "batchcodes": ["FF7416"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FF8844.json b/docs/data/histograms/Georgia/FF8844.json
index aaf69622af7..6965e2e50aa 100644
--- a/docs/data/histograms/Georgia/FF8844.json
+++ b/docs/data/histograms/Georgia/FF8844.json
@@ -1 +1 @@
-{"batchcode": "FF8844", "histograms": [{"batchcodes": ["FF8844"], "histogram": {"Arthralgia": 1, "COVID-19": 1, "Malaise": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8844", "histograms": [{"histogram": {"Arthralgia": 1, "COVID-19": 1, "Malaise": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FF8844"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FG2872.json b/docs/data/histograms/Georgia/FG2872.json
index b193b912126..a1b08c48ae6 100644
--- a/docs/data/histograms/Georgia/FG2872.json
+++ b/docs/data/histograms/Georgia/FG2872.json
@@ -1 +1 @@
-{"batchcode": "FG2872", "histograms": [{"batchcodes": ["FG2872"], "histogram": {"Anxiety": 1, "Blood pressure measurement": 1, "Circulatory collapse": 1, "Erythema": 1, "Hypertension": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2872", "histograms": [{"histogram": {"Anxiety": 1, "Blood pressure measurement": 1, "Circulatory collapse": 1, "Erythema": 1, "Hypertension": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Skin warm": 1}, "batchcodes": ["FG2872"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FG2943.json b/docs/data/histograms/Georgia/FG2943.json
index 4818b192dce..6d81a4e8e41 100644
--- a/docs/data/histograms/Georgia/FG2943.json
+++ b/docs/data/histograms/Georgia/FG2943.json
@@ -1 +1 @@
-{"batchcode": "FG2943", "histograms": [{"batchcodes": ["FG2943"], "histogram": {"Blood pressure measurement": 2, "Asthenia": 1, "Bradycardia": 1, "Chest pain": 1, "Dizziness": 1, "Hypertension": 1, "Hypotension": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2943", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Asthenia": 1, "Bradycardia": 1, "Chest pain": 1, "Dizziness": 1, "Hypertension": 1, "Hypotension": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FG2943"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Georgia/FP9681.json b/docs/data/histograms/Georgia/FP9681.json
index 6f6b96f3b16..666ccdd73c3 100644
--- a/docs/data/histograms/Georgia/FP9681.json
+++ b/docs/data/histograms/Georgia/FP9681.json
@@ -1 +1 @@
-{"batchcode": "FP9681", "histograms": [{"batchcodes": ["FP9681"], "histogram": {"Asthenia": 1, "Bradycardia": 1, "Cold sweat": 1, "Dizziness": 1, "Hypotension": 1}}]}
\ No newline at end of file
+{"batchcode": "FP9681", "histograms": [{"histogram": {"Asthenia": 1, "Bradycardia": 1, "Cold sweat": 1, "Dizziness": 1, "Hypotension": 1}, "batchcodes": ["FP9681"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Gibraltar/EK9231.json b/docs/data/histograms/Gibraltar/EK9231.json
index 6bac96bf03a..6a0d1e68c73 100644
--- a/docs/data/histograms/Gibraltar/EK9231.json
+++ b/docs/data/histograms/Gibraltar/EK9231.json
@@ -1 +1 @@
-{"batchcode": "EK9231", "histograms": [{"batchcodes": ["EK9231", "EL8782"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "EK9231", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Somnolence": 1}, "batchcodes": ["EK9231", "EL8782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Gibraltar/EL8782.json b/docs/data/histograms/Gibraltar/EL8782.json
index e1708513eac..99028888015 100644
--- a/docs/data/histograms/Gibraltar/EL8782.json
+++ b/docs/data/histograms/Gibraltar/EL8782.json
@@ -1 +1 @@
-{"batchcode": "EL8782", "histograms": [{"batchcodes": ["EK9231", "EL8782"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "EL8782", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Somnolence": 1}, "batchcodes": ["EK9231", "EL8782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Greece/007M20A.json b/docs/data/histograms/Greece/007M20A.json
index 58ffeb845d5..9c20ad4fcb8 100644
--- a/docs/data/histograms/Greece/007M20A.json
+++ b/docs/data/histograms/Greece/007M20A.json
@@ -1 +1 @@
-{"batchcode": "007M20A", "histograms": [{"batchcodes": ["007M20A"], "histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1, "Mass": 1, "Tenderness": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A", "histograms": [{"histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1, "Mass": 1, "Tenderness": 1, "Ultrasound scan": 1}, "batchcodes": ["007M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Guam/029L20A.json b/docs/data/histograms/Guam/029L20A.json
index 6abdccc100d..d59f647b803 100644
--- a/docs/data/histograms/Guam/029L20A.json
+++ b/docs/data/histograms/Guam/029L20A.json
@@ -1 +1 @@
-{"batchcode": "029L20A", "histograms": [{"batchcodes": ["029L20A"], "histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Pruritus": 1, "Throat tightness": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20A", "histograms": [{"histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Pruritus": 1, "Throat tightness": 1, "Vaccination complication": 1}, "batchcodes": ["029L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Guam/1816022.json b/docs/data/histograms/Guam/1816022.json
index 173964a357a..873c38ee2c8 100644
--- a/docs/data/histograms/Guam/1816022.json
+++ b/docs/data/histograms/Guam/1816022.json
@@ -1 +1 @@
-{"batchcode": "1816022", "histograms": [{"batchcodes": ["1816022"], "histogram": {"Body temperature": 2, "Pyrexia": 2, "Feeling cold": 1, "Pain in extremity": 1, "Pollakiuria": 1, "Thirst": 1}}]}
\ No newline at end of file
+{"batchcode": "1816022", "histograms": [{"histogram": {"Body temperature": 2, "Pyrexia": 2, "Feeling cold": 1, "Pain in extremity": 1, "Pollakiuria": 1, "Thirst": 1}, "batchcodes": ["1816022"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Guam/30155BA.json b/docs/data/histograms/Guam/30155BA.json
index f85862751d7..3427afe3fed 100644
--- a/docs/data/histograms/Guam/30155BA.json
+++ b/docs/data/histograms/Guam/30155BA.json
@@ -1 +1 @@
-{"batchcode": "30155BA", "histograms": [{"batchcodes": ["30155BA"], "histogram": {"Polyarthritis": 1, "Rheumatic fever": 1, "Rheumatic heart disease": 1}}]}
\ No newline at end of file
+{"batchcode": "30155BA", "histograms": [{"histogram": {"Polyarthritis": 1, "Rheumatic fever": 1, "Rheumatic heart disease": 1}, "batchcodes": ["30155BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Guam/EL9266.json b/docs/data/histograms/Guam/EL9266.json
index f49b39fdbdc..ac6c9597303 100644
--- a/docs/data/histograms/Guam/EL9266.json
+++ b/docs/data/histograms/Guam/EL9266.json
@@ -1 +1 @@
-{"batchcode": "EL9266", "histograms": [{"batchcodes": ["EL9266"], "histogram": {"Rash": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9266", "histograms": [{"histogram": {"Rash": 1, "Swelling face": 1}, "batchcodes": ["EL9266"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Guam/EW0168.json b/docs/data/histograms/Guam/EW0168.json
index 05dc2502775..4d81efe6a1d 100644
--- a/docs/data/histograms/Guam/EW0168.json
+++ b/docs/data/histograms/Guam/EW0168.json
@@ -1 +1 @@
-{"batchcode": "EW0168", "histograms": [{"batchcodes": ["EW0168"], "histogram": {"Breast mass": 1, "Breast pain": 1, "Discomfort": 1, "Insomnia": 1, "Mammogram": 1, "Mammogram abnormal": 1, "Nipple pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0168", "histograms": [{"histogram": {"Breast mass": 1, "Breast pain": 1, "Discomfort": 1, "Insomnia": 1, "Mammogram": 1, "Mammogram abnormal": 1, "Nipple pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0168"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Holy See (Vatican City State)/006B21A.json b/docs/data/histograms/Holy See (Vatican City State)/006B21A.json
index 94b84411c19..e084f4d9b3b 100644
--- a/docs/data/histograms/Holy See (Vatican City State)/006B21A.json
+++ b/docs/data/histograms/Holy See (Vatican City State)/006B21A.json
@@ -1 +1 @@
-{"batchcode": "006B21A", "histograms": [{"batchcodes": ["006B21A"], "histogram": {"Inappropriate schedule of product administration": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "006B21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Pyrexia": 1}, "batchcodes": ["006B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Holy See (Vatican City State)/049L21A.json b/docs/data/histograms/Holy See (Vatican City State)/049L21A.json
index fc6af47d0a9..1e47a840199 100644
--- a/docs/data/histograms/Holy See (Vatican City State)/049L21A.json
+++ b/docs/data/histograms/Holy See (Vatican City State)/049L21A.json
@@ -1 +1 @@
-{"batchcode": "049L21A", "histograms": [{"batchcodes": ["049L21A"], "histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "049L21A", "histograms": [{"histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["049L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Holy See (Vatican City State)/EN6203.json b/docs/data/histograms/Holy See (Vatican City State)/EN6203.json
index 39e683b1122..6b7c0cc2886 100644
--- a/docs/data/histograms/Holy See (Vatican City State)/EN6203.json
+++ b/docs/data/histograms/Holy See (Vatican City State)/EN6203.json
@@ -1 +1 @@
-{"batchcode": "EN6203", "histograms": [{"batchcodes": ["EN6203"], "histogram": {"Lymphadenopathy": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6203", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Pain": 1}, "batchcodes": ["EN6203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Holy See (Vatican City State)/FD7218.json b/docs/data/histograms/Holy See (Vatican City State)/FD7218.json
index a4d9f58cb1b..8b8f32b23ac 100644
--- a/docs/data/histograms/Holy See (Vatican City State)/FD7218.json
+++ b/docs/data/histograms/Holy See (Vatican City State)/FD7218.json
@@ -1 +1 @@
-{"batchcode": "FD7218", "histograms": [{"batchcodes": ["FD7218"], "histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Cough": 1, "Dyspnoea": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Oxygen saturation decreased": 1, "Productive cough": 1, "Secretion discharge": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7218", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Cough": 1, "Dyspnoea": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Oxygen saturation decreased": 1, "Productive cough": 1, "Secretion discharge": 1}, "batchcodes": ["FD7218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Honduras/206A21A.json b/docs/data/histograms/Honduras/206A21A.json
index 0b5683e87b9..cf533df61a3 100644
--- a/docs/data/histograms/Honduras/206A21A.json
+++ b/docs/data/histograms/Honduras/206A21A.json
@@ -1 +1 @@
-{"batchcode": "206A21A", "histograms": [{"batchcodes": ["206A21A"], "histogram": {"Eye swelling": 1, "Pruritus": 1, "Rash": 1, "Rash vesicular": 1}}]}
\ No newline at end of file
+{"batchcode": "206A21A", "histograms": [{"histogram": {"Eye swelling": 1, "Pruritus": 1, "Rash": 1, "Rash vesicular": 1}, "batchcodes": ["206A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Honduras/EW0164.json b/docs/data/histograms/Honduras/EW0164.json
index 160f4ef0e01..e6f7cb82788 100644
--- a/docs/data/histograms/Honduras/EW0164.json
+++ b/docs/data/histograms/Honduras/EW0164.json
@@ -1 +1 @@
-{"batchcode": "EW0164", "histograms": [{"batchcodes": ["EW0164"], "histogram": {"Decreased appetite": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0164", "histograms": [{"histogram": {"Decreased appetite": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Weight decreased": 1}, "batchcodes": ["EW0164"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Honduras/EW018.json b/docs/data/histograms/Honduras/EW018.json
index 6a021d3925e..5a649a0d416 100644
--- a/docs/data/histograms/Honduras/EW018.json
+++ b/docs/data/histograms/Honduras/EW018.json
@@ -1 +1 @@
-{"batchcode": "EW018", "histograms": [{"batchcodes": ["EW018"], "histogram": {"Influenza like illness": 1, "Myocarditis": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW018", "histograms": [{"histogram": {"Influenza like illness": 1, "Myocarditis": 1, "Tachycardia": 1}, "batchcodes": ["EW018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Honduras/FG3527.json b/docs/data/histograms/Honduras/FG3527.json
index 96b748ab1a0..f105eccc4e3 100644
--- a/docs/data/histograms/Honduras/FG3527.json
+++ b/docs/data/histograms/Honduras/FG3527.json
@@ -1 +1 @@
-{"batchcode": "FG3527", "histograms": [{"batchcodes": ["FG3527"], "histogram": {"Incorrect dose administered": 2, "No adverse event": 2}}]}
\ No newline at end of file
+{"batchcode": "FG3527", "histograms": [{"histogram": {"Incorrect dose administered": 2, "No adverse event": 2}, "batchcodes": ["FG3527"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1B002A.json b/docs/data/histograms/Hong Kong/1B002A.json
index 57ff4541b43..7e7033be178 100644
--- a/docs/data/histograms/Hong Kong/1B002A.json
+++ b/docs/data/histograms/Hong Kong/1B002A.json
@@ -1 +1 @@
-{"batchcode": "1B002A", "histograms": [{"batchcodes": ["1B002A"], "histogram": {"Chest pain": 48, "Dizziness": 44, "Pyrexia": 39, "Bell's palsy": 33, "Chest discomfort": 27, "Palpitations": 24, "Hypertension": 22, "Headache": 21, "Hypoaesthesia": 21, "Dyspnoea": 15, "Blood pressure measurement": 14, "Malaise": 13, "Loss of consciousness": 12, "Nausea": 12, "Rash": 10, "Asthenia": 7, "Cerebrovascular accident": 7, "Vomiting": 7, "Chills": 6, "Hemiparesis": 6, "Lower respiratory tract infection": 6, "Myalgia": 6, "Presyncope": 6, "Syncope": 6, "Abdominal pain": 5, "Back pain": 5, "Body temperature": 5, "Haemorrhage intracranial": 5, "Neck pain": 5, "Urticaria": 5, "Vaccination site pain": 5, "Vertigo": 5, "Abdominal pain upper": 4, "Anaemia": 4, "Anaphylactoid reaction": 4, "Arthralgia": 4, "Blood pressure increased": 4, "Deep vein thrombosis": 4, "Diarrhoea": 4, "Discomfort": 4, "Pain in extremity": 4, "Paraesthesia": 4, "Transient ischaemic attack": 4, "Abdominal pain lower": 3, "Acute myocardial infarction": 3, "Atrial fibrillation": 3, "Cardiac arrest": 3, "Deafness neurosensory": 3, "Dysarthria": 3, "Ischaemic stroke": 3, "Liver function test abnormal": 3, "Muscular weakness": 3, "Peripheral swelling": 3, "Vaginal haemorrhage": 3, "Acute pulmonary oedema": 2, "Cerebral haemorrhage": 2, "Decreased appetite": 2, "Diplopia": 2, "Encephalopathy": 2, "General physical health deterioration": 2, "Gout": 2, "Head injury": 2, "Heart rate": 2, "Herpes zoster": 2, "Hyperhidrosis": 2, "Hypoaesthesia oral": 2, "Liver function test": 2, "Lymphadenopathy": 2, "Musculoskeletal chest pain": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Oropharyngeal pain": 2, "Sepsis": 2, "Swelling": 2, "Swelling face": 2, "Thrombocytopenia": 2, "Tinnitus": 2, "Tremor": 2, "Urinary tract infection": 2, "Uveitis": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abortion spontaneous": 1, "Abscess limb": 1, "Acute coronary syndrome": 1, "Acute psychosis": 1, "Allergy to vaccine": 1, "Angioedema": 1, "Asthma": 1, "Atrial flutter": 1, "Balance disorder": 1, "Basal ganglia haemorrhage": 1, "Blepharitis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood pressure fluctuation": 1, "Bone pain": 1, "Brain neoplasm": 1, "Bronchitis": 1, "Cardiac failure congestive": 1, "Cellulitis": 1, "Cerebral ischaemia": 1, "Contusion": 1, "Coronary artery disease": 1, "Cough": 1, "Deafness": 1, "Deafness unilateral": 1, "Depressed level of consciousness": 1, "Diabetic ketoacidosis": 1, "Disability": 1, "Dizziness postural": 1, "Drooling": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Embolic cerebral infarction": 1, "Embolic stroke": 1, "Epigastric discomfort": 1, "Epiglottitis": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fatigue": 1, "Febrile neutropenia": 1, "Gastroenteritis": 1, "Gastrooesophageal reflux disease": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Guillain-Barre syndrome": 1, "Haemoptysis": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hemiplegia": 1, "Herpes zoster oticus": 1, "Hypertrophic cardiomyopathy": 1, "Hypocalcaemia": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "IVth nerve paralysis": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Infarction": 1, "Intraventricular haemorrhage": 1, "Ischaemic cerebral infarction": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lip ulceration": 1, "Lung cancer metastatic": 1, "Maternal exposure timing unspecified": 1, "Metastases to central nervous system": 1, "Middle lobe syndrome": 1, "Mononeuritis": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Nervous system disorder": 1, "Neuromyotonia": 1, "Neutropenia": 1, "Ocular discomfort": 1, "Odynophagia": 1, "Pain": 1, "Pancreatitis": 1, "Platelet count": 1, "Pleuritic pain": 1, "Pneumothorax": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Putamen haemorrhage": 1, "Rectal haemorrhage": 1, "Retinal vein occlusion": 1, "Rhabdomyolysis": 1, "Sinus tachycardia": 1, "Spinal claudication": 1, "Spinal osteoarthritis": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Supraventricular tachycardia": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Tension headache": 1, "Throat tightness": 1, "VIth nerve paralysis": 1, "Vaccination site swelling": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "Vestibular ataxia": 1, "Viral infection": 1, "Visual field defect": 1, "Visual impairment": 1, "White matter lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "1B002A", "histograms": [{"histogram": {"Chest pain": 48, "Dizziness": 44, "Pyrexia": 39, "Bell's palsy": 33, "Chest discomfort": 27, "Palpitations": 24, "Hypertension": 22, "Headache": 21, "Hypoaesthesia": 21, "Dyspnoea": 15, "Blood pressure measurement": 14, "Malaise": 13, "Loss of consciousness": 12, "Nausea": 12, "Rash": 10, "Asthenia": 7, "Cerebrovascular accident": 7, "Vomiting": 7, "Chills": 6, "Hemiparesis": 6, "Lower respiratory tract infection": 6, "Myalgia": 6, "Presyncope": 6, "Syncope": 6, "Abdominal pain": 5, "Back pain": 5, "Body temperature": 5, "Haemorrhage intracranial": 5, "Neck pain": 5, "Urticaria": 5, "Vaccination site pain": 5, "Vertigo": 5, "Abdominal pain upper": 4, "Anaemia": 4, "Anaphylactoid reaction": 4, "Arthralgia": 4, "Blood pressure increased": 4, "Deep vein thrombosis": 4, "Diarrhoea": 4, "Discomfort": 4, "Pain in extremity": 4, "Paraesthesia": 4, "Transient ischaemic attack": 4, "Abdominal pain lower": 3, "Acute myocardial infarction": 3, "Atrial fibrillation": 3, "Cardiac arrest": 3, "Deafness neurosensory": 3, "Dysarthria": 3, "Ischaemic stroke": 3, "Liver function test abnormal": 3, "Muscular weakness": 3, "Peripheral swelling": 3, "Vaginal haemorrhage": 3, "Acute pulmonary oedema": 2, "Cerebral haemorrhage": 2, "Decreased appetite": 2, "Diplopia": 2, "Encephalopathy": 2, "General physical health deterioration": 2, "Gout": 2, "Head injury": 2, "Heart rate": 2, "Herpes zoster": 2, "Hyperhidrosis": 2, "Hypoaesthesia oral": 2, "Liver function test": 2, "Lymphadenopathy": 2, "Musculoskeletal chest pain": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Oropharyngeal pain": 2, "Sepsis": 2, "Swelling": 2, "Swelling face": 2, "Thrombocytopenia": 2, "Tinnitus": 2, "Tremor": 2, "Urinary tract infection": 2, "Uveitis": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abortion spontaneous": 1, "Abscess limb": 1, "Acute coronary syndrome": 1, "Acute psychosis": 1, "Allergy to vaccine": 1, "Angioedema": 1, "Asthma": 1, "Atrial flutter": 1, "Balance disorder": 1, "Basal ganglia haemorrhage": 1, "Blepharitis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood pressure fluctuation": 1, "Bone pain": 1, "Brain neoplasm": 1, "Bronchitis": 1, "Cardiac failure congestive": 1, "Cellulitis": 1, "Cerebral ischaemia": 1, "Contusion": 1, "Coronary artery disease": 1, "Cough": 1, "Deafness": 1, "Deafness unilateral": 1, "Depressed level of consciousness": 1, "Diabetic ketoacidosis": 1, "Disability": 1, "Dizziness postural": 1, "Drooling": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Embolic cerebral infarction": 1, "Embolic stroke": 1, "Epigastric discomfort": 1, "Epiglottitis": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fatigue": 1, "Febrile neutropenia": 1, "Gastroenteritis": 1, "Gastrooesophageal reflux disease": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Guillain-Barre syndrome": 1, "Haemoptysis": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hemiplegia": 1, "Herpes zoster oticus": 1, "Hypertrophic cardiomyopathy": 1, "Hypocalcaemia": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "IVth nerve paralysis": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Infarction": 1, "Intraventricular haemorrhage": 1, "Ischaemic cerebral infarction": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lip ulceration": 1, "Lung cancer metastatic": 1, "Maternal exposure timing unspecified": 1, "Metastases to central nervous system": 1, "Middle lobe syndrome": 1, "Mononeuritis": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Nervous system disorder": 1, "Neuromyotonia": 1, "Neutropenia": 1, "Ocular discomfort": 1, "Odynophagia": 1, "Pain": 1, "Pancreatitis": 1, "Platelet count": 1, "Pleuritic pain": 1, "Pneumothorax": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Putamen haemorrhage": 1, "Rectal haemorrhage": 1, "Retinal vein occlusion": 1, "Rhabdomyolysis": 1, "Sinus tachycardia": 1, "Spinal claudication": 1, "Spinal osteoarthritis": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Supraventricular tachycardia": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Tension headache": 1, "Throat tightness": 1, "VIth nerve paralysis": 1, "Vaccination site swelling": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "Vestibular ataxia": 1, "Viral infection": 1, "Visual field defect": 1, "Visual impairment": 1, "White matter lesion": 1}, "batchcodes": ["1B002A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1B003A.json b/docs/data/histograms/Hong Kong/1B003A.json
index 18524168b45..3bcaa552e74 100644
--- a/docs/data/histograms/Hong Kong/1B003A.json
+++ b/docs/data/histograms/Hong Kong/1B003A.json
@@ -1 +1 @@
-{"batchcode": "1B003A", "histograms": [{"batchcodes": ["1B003A"], "histogram": {"Pyrexia": 19, "Bell's palsy": 17, "Chest discomfort": 17, "Chest pain": 12, "Palpitations": 11, "Headache": 9, "Dizziness": 8, "Malaise": 6, "Body temperature": 5, "Loss of consciousness": 5, "Rash": 5, "Myalgia": 4, "Hypoaesthesia": 3, "Seizure": 3, "Syncope": 3, "Blood pressure increased": 2, "Deafness": 2, "Hemiparesis": 2, "Hypertension": 2, "Myocarditis": 2, "Nausea": 2, "Neck pain": 2, "Vomiting": 2, "Acute myocardial infarction": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Bradycardia": 1, "Cerebrovascular accident": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Disability": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Facial asymmetry": 1, "Fatigue": 1, "Generalised tonic-clonic seizure": 1, "Haemorrhage intracranial": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Mixed deafness": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Status epilepticus": 1, "Supraventricular tachycardia": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "1B003A", "histograms": [{"histogram": {"Pyrexia": 19, "Bell's palsy": 17, "Chest discomfort": 17, "Chest pain": 12, "Palpitations": 11, "Headache": 9, "Dizziness": 8, "Malaise": 6, "Body temperature": 5, "Loss of consciousness": 5, "Rash": 5, "Myalgia": 4, "Hypoaesthesia": 3, "Seizure": 3, "Syncope": 3, "Blood pressure increased": 2, "Deafness": 2, "Hemiparesis": 2, "Hypertension": 2, "Myocarditis": 2, "Nausea": 2, "Neck pain": 2, "Vomiting": 2, "Acute myocardial infarction": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Bradycardia": 1, "Cerebrovascular accident": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Disability": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Facial asymmetry": 1, "Fatigue": 1, "Generalised tonic-clonic seizure": 1, "Haemorrhage intracranial": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Mixed deafness": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Status epilepticus": 1, "Supraventricular tachycardia": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["1B003A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1B004A.json b/docs/data/histograms/Hong Kong/1B004A.json
index f9d8b014f8e..3df19887466 100644
--- a/docs/data/histograms/Hong Kong/1B004A.json
+++ b/docs/data/histograms/Hong Kong/1B004A.json
@@ -1 +1 @@
-{"batchcode": "1B004A", "histograms": [{"batchcodes": ["1B004A"], "histogram": {"Bell's palsy": 21, "Deafness neurosensory": 3, "Anaphylactic reaction": 2, "Abdominal pain": 1, "Allergy to vaccine": 1, "Brain stem haemorrhage": 1, "Contusion": 1, "Dizziness": 1, "Encephalitis": 1, "Herpes zoster oticus": 1, "Menstruation irregular": 1, "Myocarditis": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Thirst": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "1B004A", "histograms": [{"histogram": {"Bell's palsy": 21, "Deafness neurosensory": 3, "Anaphylactic reaction": 2, "Abdominal pain": 1, "Allergy to vaccine": 1, "Brain stem haemorrhage": 1, "Contusion": 1, "Dizziness": 1, "Encephalitis": 1, "Herpes zoster oticus": 1, "Menstruation irregular": 1, "Myocarditis": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Thirst": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["1B004A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1C005A.json b/docs/data/histograms/Hong Kong/1C005A.json
index 3827d887f8b..5c8fc34b67b 100644
--- a/docs/data/histograms/Hong Kong/1C005A.json
+++ b/docs/data/histograms/Hong Kong/1C005A.json
@@ -1 +1 @@
-{"batchcode": "1C005A", "histograms": [{"batchcodes": ["1C005A"], "histogram": {"Bell's palsy": 6, "Deafness neurosensory": 1}}]}
\ No newline at end of file
+{"batchcode": "1C005A", "histograms": [{"histogram": {"Bell's palsy": 6, "Deafness neurosensory": 1}, "batchcodes": ["1C005A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1E022A.json b/docs/data/histograms/Hong Kong/1E022A.json
index 1257643374e..4ca31b33d9e 100644
--- a/docs/data/histograms/Hong Kong/1E022A.json
+++ b/docs/data/histograms/Hong Kong/1E022A.json
@@ -1 +1 @@
-{"batchcode": "1E022A", "histograms": [{"batchcodes": ["1E022A"], "histogram": {"Bell's palsy": 5, "Deafness neurosensory": 1, "Myelitis transverse": 1, "Pericarditis": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "1E022A", "histograms": [{"histogram": {"Bell's palsy": 5, "Deafness neurosensory": 1, "Myelitis transverse": 1, "Pericarditis": 1, "Tinnitus": 1}, "batchcodes": ["1E022A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1E023-1A.json b/docs/data/histograms/Hong Kong/1E023-1A.json
index 9fd56e00772..9c21bea35f8 100644
--- a/docs/data/histograms/Hong Kong/1E023-1A.json
+++ b/docs/data/histograms/Hong Kong/1E023-1A.json
@@ -1 +1 @@
-{"batchcode": "1E023-1A", "histograms": [{"batchcodes": ["1E023-1A"], "histogram": {"Bell's palsy": 15, "Myocarditis": 12, "Pericarditis": 6, "Deafness neurosensory": 3, "Allergy to vaccine": 1, "Rash": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "1E023-1A", "histograms": [{"histogram": {"Bell's palsy": 15, "Myocarditis": 12, "Pericarditis": 6, "Deafness neurosensory": 3, "Allergy to vaccine": 1, "Rash": 1, "Tinnitus": 1}, "batchcodes": ["1E023-1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1E0231A.json b/docs/data/histograms/Hong Kong/1E0231A.json
index 235f12e0834..49707b30363 100644
--- a/docs/data/histograms/Hong Kong/1E0231A.json
+++ b/docs/data/histograms/Hong Kong/1E0231A.json
@@ -1 +1 @@
-{"batchcode": "1E0231A", "histograms": [{"batchcodes": ["1E0231A"], "histogram": {"Bell's palsy": 1}}]}
\ No newline at end of file
+{"batchcode": "1E0231A", "histograms": [{"histogram": {"Bell's palsy": 1}, "batchcodes": ["1E0231A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1E023A.json b/docs/data/histograms/Hong Kong/1E023A.json
index 55db223d7a8..d64053979f4 100644
--- a/docs/data/histograms/Hong Kong/1E023A.json
+++ b/docs/data/histograms/Hong Kong/1E023A.json
@@ -1 +1 @@
-{"batchcode": "1E023A", "histograms": [{"batchcodes": ["1E023A"], "histogram": {"Bell's palsy": 4, "Deafness neurosensory": 2, "Blister": 1, "Dizziness": 1, "Myocarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "1E023A", "histograms": [{"histogram": {"Bell's palsy": 4, "Deafness neurosensory": 2, "Blister": 1, "Dizziness": 1, "Myocarditis": 1}, "batchcodes": ["1E023A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1E025A.json b/docs/data/histograms/Hong Kong/1E025A.json
index aeaf32ff2ec..6abf628ddd4 100644
--- a/docs/data/histograms/Hong Kong/1E025A.json
+++ b/docs/data/histograms/Hong Kong/1E025A.json
@@ -1 +1 @@
-{"batchcode": "1E025A", "histograms": [{"batchcodes": ["1E025A"], "histogram": {"Bell's palsy": 32, "Pericarditis": 7, "Myocarditis": 5, "Deafness neurosensory": 4, "Coronary artery disease": 2, "Immune thrombocytopenia": 2, "Deafness": 1, "Death": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Heavy menstrual bleeding": 1, "Myelitis transverse": 1, "Platelet count": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "1E025A", "histograms": [{"histogram": {"Bell's palsy": 32, "Pericarditis": 7, "Myocarditis": 5, "Deafness neurosensory": 4, "Coronary artery disease": 2, "Immune thrombocytopenia": 2, "Deafness": 1, "Death": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Heavy menstrual bleeding": 1, "Myelitis transverse": 1, "Platelet count": 1, "Tinnitus": 1}, "batchcodes": ["1E025A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1E027A.json b/docs/data/histograms/Hong Kong/1E027A.json
index b764e43510b..c6f4adfe25f 100644
--- a/docs/data/histograms/Hong Kong/1E027A.json
+++ b/docs/data/histograms/Hong Kong/1E027A.json
@@ -1 +1 @@
-{"batchcode": "1E027A", "histograms": [{"batchcodes": ["1E027A"], "histogram": {"Bell's palsy": 24, "Myocarditis": 20, "Pericarditis": 6, "Death": 2, "Coronary artery disease": 1, "Cough": 1, "Guillain-Barre syndrome": 1, "Myocardial ischaemia": 1, "Myopericarditis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "1E027A", "histograms": [{"histogram": {"Bell's palsy": 24, "Myocarditis": 20, "Pericarditis": 6, "Death": 2, "Coronary artery disease": 1, "Cough": 1, "Guillain-Barre syndrome": 1, "Myocardial ischaemia": 1, "Myopericarditis": 1, "Pyrexia": 1}, "batchcodes": ["1E027A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1F039A.json b/docs/data/histograms/Hong Kong/1F039A.json
index f1a82fa1bf2..e72124610f1 100644
--- a/docs/data/histograms/Hong Kong/1F039A.json
+++ b/docs/data/histograms/Hong Kong/1F039A.json
@@ -1 +1 @@
-{"batchcode": "1F039A", "histograms": [{"batchcodes": ["1F039A"], "histogram": {"Bell's palsy": 18, "Myocarditis": 3, "Cardiac failure congestive": 1, "Deep vein thrombosis": 1, "Ejection fraction": 1, "Guillain-Barre syndrome": 1, "Immune thrombocytopenia": 1, "Lung adenocarcinoma": 1, "Metastases to central nervous system": 1, "Myelitis transverse": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "1F039A", "histograms": [{"histogram": {"Bell's palsy": 18, "Myocarditis": 3, "Cardiac failure congestive": 1, "Deep vein thrombosis": 1, "Ejection fraction": 1, "Guillain-Barre syndrome": 1, "Immune thrombocytopenia": 1, "Lung adenocarcinoma": 1, "Metastases to central nervous system": 1, "Myelitis transverse": 1, "Pulmonary embolism": 1}, "batchcodes": ["1F039A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1G045A.json b/docs/data/histograms/Hong Kong/1G045A.json
index f9b449d54a6..32158c244f4 100644
--- a/docs/data/histograms/Hong Kong/1G045A.json
+++ b/docs/data/histograms/Hong Kong/1G045A.json
@@ -1 +1 @@
-{"batchcode": "1G045A", "histograms": [{"batchcodes": ["1G045A"], "histogram": {"Bell's palsy": 27, "Immunisation": 11, "Off label use": 10, "Deafness neurosensory": 4, "Myocarditis": 4, "Pericarditis": 2, "Acute myocardial infarction": 1, "Ankylosing spondylitis": 1, "Aortic dissection rupture": 1, "Cardiac arrest": 1, "Chest pain": 1, "Chills": 1, "Coronary artery disease": 1, "Diabetes mellitus": 1, "Haemothorax": 1, "Hypertension": 1, "Left ventricular hypertrophy": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Pericardial haemorrhage": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Syncope": 1, "Ventricular fibrillation": 1}}]}
\ No newline at end of file
+{"batchcode": "1G045A", "histograms": [{"histogram": {"Bell's palsy": 27, "Immunisation": 11, "Off label use": 10, "Deafness neurosensory": 4, "Myocarditis": 4, "Pericarditis": 2, "Acute myocardial infarction": 1, "Ankylosing spondylitis": 1, "Aortic dissection rupture": 1, "Cardiac arrest": 1, "Chest pain": 1, "Chills": 1, "Coronary artery disease": 1, "Diabetes mellitus": 1, "Haemothorax": 1, "Hypertension": 1, "Left ventricular hypertrophy": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Pericardial haemorrhage": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Syncope": 1, "Ventricular fibrillation": 1}, "batchcodes": ["1G045A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1H053A.json b/docs/data/histograms/Hong Kong/1H053A.json
index 3a7b88533ee..77bdae1bf67 100644
--- a/docs/data/histograms/Hong Kong/1H053A.json
+++ b/docs/data/histograms/Hong Kong/1H053A.json
@@ -1 +1 @@
-{"batchcode": "1H053A", "histograms": [{"batchcodes": ["1H053A"], "histogram": {"Bell's palsy": 19, "Myocarditis": 3, "Circulatory collapse": 2, "Deafness neurosensory": 2, "Aortic dissection": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Congestive cardiomyopathy": 1, "Coronary artery disease": 1, "Deafness": 1, "Hypotension": 1, "Myopericarditis": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "1H053A", "histograms": [{"histogram": {"Bell's palsy": 19, "Myocarditis": 3, "Circulatory collapse": 2, "Deafness neurosensory": 2, "Aortic dissection": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Congestive cardiomyopathy": 1, "Coronary artery disease": 1, "Deafness": 1, "Hypotension": 1, "Myopericarditis": 1, "Pericarditis": 1}, "batchcodes": ["1H053A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1I066A.json b/docs/data/histograms/Hong Kong/1I066A.json
index 6d70711b078..08684d459d8 100644
--- a/docs/data/histograms/Hong Kong/1I066A.json
+++ b/docs/data/histograms/Hong Kong/1I066A.json
@@ -1 +1 @@
-{"batchcode": "1I066A", "histograms": [{"batchcodes": ["1I066A"], "histogram": {"Bell's palsy": 6, "Myocarditis": 3, "Myopericarditis": 3, "Immunisation": 2, "Off label use": 2, "Circulatory collapse": 1, "Deafness neurosensory": 1, "Inappropriate schedule of product administration": 1, "Myocardial ischaemia": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "1I066A", "histograms": [{"histogram": {"Bell's palsy": 6, "Myocarditis": 3, "Myopericarditis": 3, "Immunisation": 2, "Off label use": 2, "Circulatory collapse": 1, "Deafness neurosensory": 1, "Inappropriate schedule of product administration": 1, "Myocardial ischaemia": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["1I066A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/1I067A.json b/docs/data/histograms/Hong Kong/1I067A.json
index 226f56ec0c5..3837b64f987 100644
--- a/docs/data/histograms/Hong Kong/1I067A.json
+++ b/docs/data/histograms/Hong Kong/1I067A.json
@@ -1 +1 @@
-{"batchcode": "1I067A", "histograms": [{"batchcodes": ["1I067A"], "histogram": {"Bell's palsy": 21, "Myocarditis": 3, "Myopericarditis": 2, "Unresponsive to stimuli": 2, "Cardiac arrest": 1, "Circulatory collapse": 1, "Disseminated intravascular coagulation": 1, "Guillain-Barre syndrome": 1, "Pericarditis": 1, "Shock": 1, "Stomatitis": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "1I067A", "histograms": [{"histogram": {"Bell's palsy": 21, "Myocarditis": 3, "Myopericarditis": 2, "Unresponsive to stimuli": 2, "Cardiac arrest": 1, "Circulatory collapse": 1, "Disseminated intravascular coagulation": 1, "Guillain-Barre syndrome": 1, "Pericarditis": 1, "Shock": 1, "Stomatitis": 1, "Thrombocytopenia": 1}, "batchcodes": ["1I067A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/210102.json b/docs/data/histograms/Hong Kong/210102.json
index 09f93f740f3..80ed3c8a7b4 100644
--- a/docs/data/histograms/Hong Kong/210102.json
+++ b/docs/data/histograms/Hong Kong/210102.json
@@ -1 +1 @@
-{"batchcode": "210102", "histograms": [{"batchcodes": ["210102"], "histogram": {"Bell's palsy": 3, "Chest discomfort": 3, "Chest pain": 3, "Dizziness": 3, "Cellulitis": 2, "Contusion": 2, "Hypoaesthesia": 2, "Ischaemic stroke": 2, "Loss of consciousness": 2, "Lymphadenopathy": 2, "Pyrexia": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute pulmonary oedema": 1, "Anaphylactoid reaction": 1, "Angioedema": 1, "Aphasia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac function test": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Fatigue": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Herpes zoster oticus": 1, "Hypertension": 1, "Lip ulceration": 1, "Magnetic resonance imaging": 1, "Migraine": 1, "Movement disorder": 1, "Mucosal ulceration": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Rash": 1, "Seizure": 1, "Sialoadenitis": 1, "Skin exfoliation": 1, "Syncope": 1, "Syphilis": 1, "Tremor": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "210102", "histograms": [{"histogram": {"Bell's palsy": 3, "Chest discomfort": 3, "Chest pain": 3, "Dizziness": 3, "Cellulitis": 2, "Contusion": 2, "Hypoaesthesia": 2, "Ischaemic stroke": 2, "Loss of consciousness": 2, "Lymphadenopathy": 2, "Pyrexia": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute pulmonary oedema": 1, "Anaphylactoid reaction": 1, "Angioedema": 1, "Aphasia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac function test": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Fatigue": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Herpes zoster oticus": 1, "Hypertension": 1, "Lip ulceration": 1, "Magnetic resonance imaging": 1, "Migraine": 1, "Movement disorder": 1, "Mucosal ulceration": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Rash": 1, "Seizure": 1, "Sialoadenitis": 1, "Skin exfoliation": 1, "Syncope": 1, "Syphilis": 1, "Tremor": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["210102"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/2A088A.json b/docs/data/histograms/Hong Kong/2A088A.json
index 989b3c8e2af..286c8427497 100644
--- a/docs/data/histograms/Hong Kong/2A088A.json
+++ b/docs/data/histograms/Hong Kong/2A088A.json
@@ -1 +1 @@
-{"batchcode": "2A088A", "histograms": [{"batchcodes": ["2A088A"], "histogram": {"Bell's palsy": 54, "Myopericarditis": 9, "Myocarditis": 6, "Cardiac arrest": 4, "Immunisation": 3, "Off label use": 3, "Pericarditis": 3, "Deafness neurosensory": 2, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "COVID-19": 1, "Coronary artery disease": 1, "Diabetic ketoacidosis": 1, "Drug ineffective": 1, "Myocardial infarction": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "2A088A", "histograms": [{"histogram": {"Bell's palsy": 54, "Myopericarditis": 9, "Myocarditis": 6, "Cardiac arrest": 4, "Immunisation": 3, "Off label use": 3, "Pericarditis": 3, "Deafness neurosensory": 2, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "COVID-19": 1, "Coronary artery disease": 1, "Diabetic ketoacidosis": 1, "Drug ineffective": 1, "Myocardial infarction": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["2A088A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Hong Kong/2C096A.json b/docs/data/histograms/Hong Kong/2C096A.json
index 4f832a0f673..6c808324f10 100644
--- a/docs/data/histograms/Hong Kong/2C096A.json
+++ b/docs/data/histograms/Hong Kong/2C096A.json
@@ -1 +1 @@
-{"batchcode": "2C096A", "histograms": [{"batchcodes": ["2C096A"], "histogram": {"Bell's palsy": 14, "Immunisation": 5, "Off label use": 5, "Myopericarditis": 4, "Myocarditis": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "2C096A", "histograms": [{"histogram": {"Bell's palsy": 14, "Immunisation": 5, "Off label use": 5, "Myopericarditis": 4, "Myocarditis": 1, "Pericarditis": 1}, "batchcodes": ["2C096A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/025L20A.json b/docs/data/histograms/India/025L20A.json
index e7ce660aa80..e6e64627760 100644
--- a/docs/data/histograms/India/025L20A.json
+++ b/docs/data/histograms/India/025L20A.json
@@ -1 +1 @@
-{"batchcode": "025L20A", "histograms": [{"batchcodes": ["025L20A"], "histogram": {"Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025L20A", "histograms": [{"histogram": {"Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["025L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/1805020.json b/docs/data/histograms/India/1805020.json
index bc5eda8b2a4..a7696d5e90b 100644
--- a/docs/data/histograms/India/1805020.json
+++ b/docs/data/histograms/India/1805020.json
@@ -1 +1 @@
-{"batchcode": "1805020", "histograms": [{"batchcodes": ["1805020"], "histogram": {"Dizziness": 1, "Hyperhidrosis": 1, "Thirst": 1}}]}
\ No newline at end of file
+{"batchcode": "1805020", "histograms": [{"histogram": {"Dizziness": 1, "Hyperhidrosis": 1, "Thirst": 1}, "batchcodes": ["1805020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/EN6208.json b/docs/data/histograms/India/EN6208.json
index eac4ff89e35..dc1a03a7121 100644
--- a/docs/data/histograms/India/EN6208.json
+++ b/docs/data/histograms/India/EN6208.json
@@ -1 +1 @@
-{"batchcode": "EN6208", "histograms": [{"batchcodes": ["EN6208"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6208", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EN6208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/ENB200.json b/docs/data/histograms/India/ENB200.json
index df0636fe093..ff73f1cfa95 100644
--- a/docs/data/histograms/India/ENB200.json
+++ b/docs/data/histograms/India/ENB200.json
@@ -1 +1 @@
-{"batchcode": "ENB200", "histograms": [{"batchcodes": ["ENB200"], "histogram": {"Arthralgia": 1, "Cyanopsia": 1, "Disorientation": 1, "Dizziness": 1, "Paraesthesia": 1, "Photopsia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "ENB200", "histograms": [{"histogram": {"Arthralgia": 1, "Cyanopsia": 1, "Disorientation": 1, "Dizziness": 1, "Paraesthesia": 1, "Photopsia": 1, "Vision blurred": 1}, "batchcodes": ["ENB200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/EP6955.json b/docs/data/histograms/India/EP6955.json
index 7d8c5a8dd05..5a13c62058d 100644
--- a/docs/data/histograms/India/EP6955.json
+++ b/docs/data/histograms/India/EP6955.json
@@ -1 +1 @@
-{"batchcode": "EP6955", "histograms": [{"batchcodes": ["EP6955"], "histogram": {"Arthralgia": 1, "Pain": 1, "Paralysis": 1, "Peripheral coldness": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6955", "histograms": [{"histogram": {"Arthralgia": 1, "Pain": 1, "Paralysis": 1, "Peripheral coldness": 1}, "batchcodes": ["EP6955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/ER0866.json b/docs/data/histograms/India/ER0866.json
index 7775a383af5..cdf3d057888 100644
--- a/docs/data/histograms/India/ER0866.json
+++ b/docs/data/histograms/India/ER0866.json
@@ -1 +1 @@
-{"batchcode": "ER0866", "histograms": [{"batchcodes": ["ER0866"], "histogram": {"Abnormal behaviour": 1}}]}
\ No newline at end of file
+{"batchcode": "ER0866", "histograms": [{"histogram": {"Abnormal behaviour": 1}, "batchcodes": ["ER0866"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/EW0170.json b/docs/data/histograms/India/EW0170.json
index 196a93451bf..4d346b9f79f 100644
--- a/docs/data/histograms/India/EW0170.json
+++ b/docs/data/histograms/India/EW0170.json
@@ -1 +1 @@
-{"batchcode": "EW0170", "histograms": [{"batchcodes": ["EW0170"], "histogram": {"Facial paralysis": 1, "Magnetic resonance imaging": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0170", "histograms": [{"histogram": {"Facial paralysis": 1, "Magnetic resonance imaging": 1}, "batchcodes": ["EW0170"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/EWO171.json b/docs/data/histograms/India/EWO171.json
index 419bd30d1b1..cc755ebb702 100644
--- a/docs/data/histograms/India/EWO171.json
+++ b/docs/data/histograms/India/EWO171.json
@@ -1 +1 @@
-{"batchcode": "EWO171", "histograms": [{"batchcodes": ["EWO171"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Headache": 1, "SARS-CoV-2 test": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO171", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Headache": 1, "SARS-CoV-2 test": 1, "Thrombocytopenia": 1}, "batchcodes": ["EWO171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/India/FD8448.json b/docs/data/histograms/India/FD8448.json
index 79cbc7aaeea..f89ef9090a1 100644
--- a/docs/data/histograms/India/FD8448.json
+++ b/docs/data/histograms/India/FD8448.json
@@ -1 +1 @@
-{"batchcode": "FD8448", "histograms": [{"batchcodes": ["FD8448"], "histogram": {"Head discomfort": 1, "Headache": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8448", "histograms": [{"histogram": {"Head discomfort": 1, "Headache": 1, "Pain": 1}, "batchcodes": ["FD8448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Indonesia/001C2A1.json b/docs/data/histograms/Indonesia/001C2A1.json
index c0b2d79c925..96e721e468d 100644
--- a/docs/data/histograms/Indonesia/001C2A1.json
+++ b/docs/data/histograms/Indonesia/001C2A1.json
@@ -1 +1 @@
-{"batchcode": "001C2A1", "histograms": [{"batchcodes": ["001C2A1"], "histogram": {"Full blood count normal": 1, "Platelet count normal": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Skin burning sensation": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "001C2A1", "histograms": [{"histogram": {"Full blood count normal": 1, "Platelet count normal": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Skin burning sensation": 1, "Skin warm": 1}, "batchcodes": ["001C2A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Indonesia/011A21A.json b/docs/data/histograms/Indonesia/011A21A.json
index 7188f2d21e3..24ea7d1c898 100644
--- a/docs/data/histograms/Indonesia/011A21A.json
+++ b/docs/data/histograms/Indonesia/011A21A.json
@@ -1 +1 @@
-{"batchcode": "011A21A", "histograms": [{"batchcodes": ["011A21A"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21A", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["011A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Indonesia/2.json b/docs/data/histograms/Indonesia/2.json
index e762968b1b4..05f9c43ac3e 100644
--- a/docs/data/histograms/Indonesia/2.json
+++ b/docs/data/histograms/Indonesia/2.json
@@ -1 +1 @@
-{"batchcode": "2", "histograms": [{"batchcodes": ["2"], "histogram": {"Cholelithiasis": 1, "Ear infection": 1, "Haemorrhoids": 1, "Hiatus hernia": 1, "Infectious mononucleosis": 1, "Oral candidiasis": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "2", "histograms": [{"histogram": {"Cholelithiasis": 1, "Ear infection": 1, "Haemorrhoids": 1, "Hiatus hernia": 1, "Infectious mononucleosis": 1, "Oral candidiasis": 1, "Urinary tract infection": 1}, "batchcodes": ["2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Indonesia/FF4206.json b/docs/data/histograms/Indonesia/FF4206.json
index a541aba7d0b..f39dd577e18 100644
--- a/docs/data/histograms/Indonesia/FF4206.json
+++ b/docs/data/histograms/Indonesia/FF4206.json
@@ -1 +1 @@
-{"batchcode": "FF4206", "histograms": [{"batchcodes": ["FF4206"], "histogram": {"Heart rate": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Tachycardia foetal": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4206", "histograms": [{"histogram": {"Heart rate": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Tachycardia foetal": 1}, "batchcodes": ["FF4206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Indonesia/FG7900.json b/docs/data/histograms/Indonesia/FG7900.json
index 5160c75daf7..777f4a91ff6 100644
--- a/docs/data/histograms/Indonesia/FG7900.json
+++ b/docs/data/histograms/Indonesia/FG7900.json
@@ -1 +1 @@
-{"batchcode": "FG7900", "histograms": [{"batchcodes": ["FG7900"], "histogram": {"Dyspnoea": 1, "Foetal monitoring": 1, "Heart rate": 1, "Investigation": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Premature delivery": 1, "Tachycardia foetal": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7900", "histograms": [{"histogram": {"Dyspnoea": 1, "Foetal monitoring": 1, "Heart rate": 1, "Investigation": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Premature delivery": 1, "Tachycardia foetal": 1}, "batchcodes": ["FG7900"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iran, Islamic Republic of/EW0176.json b/docs/data/histograms/Iran, Islamic Republic of/EW0176.json
index bd66b8480fa..9e61bac0c38 100644
--- a/docs/data/histograms/Iran, Islamic Republic of/EW0176.json
+++ b/docs/data/histograms/Iran, Islamic Republic of/EW0176.json
@@ -1 +1 @@
-{"batchcode": "EW0176", "histograms": [{"batchcodes": ["EW0176"], "histogram": {"Burning sensation": 1, "Muscular weakness": 1, "Vaccine positive rechallenge": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0176", "histograms": [{"histogram": {"Burning sensation": 1, "Muscular weakness": 1, "Vaccine positive rechallenge": 1}, "batchcodes": ["EW0176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iran, Islamic Republic of/EWO182.json b/docs/data/histograms/Iran, Islamic Republic of/EWO182.json
index f4374ec03ab..1ac1ae7a9ab 100644
--- a/docs/data/histograms/Iran, Islamic Republic of/EWO182.json
+++ b/docs/data/histograms/Iran, Islamic Republic of/EWO182.json
@@ -1 +1 @@
-{"batchcode": "EWO182", "histograms": [{"batchcodes": ["EWO182"], "histogram": {"Dizziness": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO182", "histograms": [{"histogram": {"Dizziness": 1, "Vital signs measurement": 1}, "batchcodes": ["EWO182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iran, Islamic Republic of/FP7135.json b/docs/data/histograms/Iran, Islamic Republic of/FP7135.json
index 73ee585169e..c9778148228 100644
--- a/docs/data/histograms/Iran, Islamic Republic of/FP7135.json
+++ b/docs/data/histograms/Iran, Islamic Republic of/FP7135.json
@@ -1 +1 @@
-{"batchcode": "FP7135", "histograms": [{"batchcodes": ["FP7135"], "histogram": {"Incorrect product formulation administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FP7135", "histograms": [{"histogram": {"Incorrect product formulation administered": 1}, "batchcodes": ["FP7135"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/210126A / FE151.json b/docs/data/histograms/Iraq/210126A / FE151.json
index 7e809c74da9..ace9b69b770 100644
--- a/docs/data/histograms/Iraq/210126A / FE151.json
+++ b/docs/data/histograms/Iraq/210126A / FE151.json
@@ -1 +1 @@
-{"batchcode": "210126A / FE151", "histograms": [{"batchcodes": ["210126A / FE151"], "histogram": {"Echocardiogram": 1, "Electrocardiogram": 1, "Extrasystoles": 1, "Fatigue": 1, "Lethargy": 1, "Pyrexia": 1, "Restlessness": 1}}]}
\ No newline at end of file
+{"batchcode": "210126A / FE151", "histograms": [{"histogram": {"Echocardiogram": 1, "Electrocardiogram": 1, "Extrasystoles": 1, "Fatigue": 1, "Lethargy": 1, "Pyrexia": 1, "Restlessness": 1}, "batchcodes": ["210126A / FE151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/94.json b/docs/data/histograms/Iraq/94.json
index b4c1531468a..77ad48ed2b0 100644
--- a/docs/data/histograms/Iraq/94.json
+++ b/docs/data/histograms/Iraq/94.json
@@ -1 +1 @@
-{"batchcode": "94", "histograms": [{"batchcodes": ["94"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "94", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Syncope": 1}, "batchcodes": ["94"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/CD7220.json b/docs/data/histograms/Iraq/CD7220.json
index d1ba6940658..8d42b828a47 100644
--- a/docs/data/histograms/Iraq/CD7220.json
+++ b/docs/data/histograms/Iraq/CD7220.json
@@ -1 +1 @@
-{"batchcode": "CD7220", "histograms": [{"batchcodes": ["CD7220"], "histogram": {"Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "CD7220", "histograms": [{"histogram": {"Myocardial infarction": 1}, "batchcodes": ["CD7220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/EF8087.json b/docs/data/histograms/Iraq/EF8087.json
index 7d041177a00..dfb3df99608 100644
--- a/docs/data/histograms/Iraq/EF8087.json
+++ b/docs/data/histograms/Iraq/EF8087.json
@@ -1 +1 @@
-{"batchcode": "EF8087", "histograms": [{"batchcodes": ["EF8087"], "histogram": {"Diarrhoea": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Shock": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EF8087", "histograms": [{"histogram": {"Diarrhoea": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Shock": 1, "Vomiting": 1}, "batchcodes": ["EF8087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/ET0384.json b/docs/data/histograms/Iraq/ET0384.json
index fb22815b372..588f2ea8fc4 100644
--- a/docs/data/histograms/Iraq/ET0384.json
+++ b/docs/data/histograms/Iraq/ET0384.json
@@ -1 +1 @@
-{"batchcode": "ET0384", "histograms": [{"batchcodes": ["ET0384"], "histogram": {"Syncope": 9, "Pyrexia": 4, "Chest pain": 3, "Arrhythmia": 2, "Bell's palsy": 2, "Dyspnoea": 2, "Fatigue": 2, "Poor feeding infant": 2, "Vaccination site pain": 2, "Coma": 1, "Exposure via breast milk": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Incorrect route of product administration": 1, "Injection site pain": 1, "Ischaemic stroke": 1, "Muscular weakness": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pallor": 1, "Paraesthesia": 1, "Pericarditis": 1, "Presyncope": 1, "Product use issue": 1, "Q fever": 1, "Renal pain": 1, "Somnolence": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Vaccination site joint infection": 1, "Vaccination site joint pain": 1, "Venous thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "ET0384", "histograms": [{"histogram": {"Syncope": 9, "Pyrexia": 4, "Chest pain": 3, "Arrhythmia": 2, "Bell's palsy": 2, "Dyspnoea": 2, "Fatigue": 2, "Poor feeding infant": 2, "Vaccination site pain": 2, "Coma": 1, "Exposure via breast milk": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Incorrect route of product administration": 1, "Injection site pain": 1, "Ischaemic stroke": 1, "Muscular weakness": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pallor": 1, "Paraesthesia": 1, "Pericarditis": 1, "Presyncope": 1, "Product use issue": 1, "Q fever": 1, "Renal pain": 1, "Somnolence": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Vaccination site joint infection": 1, "Vaccination site joint pain": 1, "Venous thrombosis": 1}, "batchcodes": ["ET0384"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/ETO384.json b/docs/data/histograms/Iraq/ETO384.json
index 4b7b3c45387..efdc11d0b43 100644
--- a/docs/data/histograms/Iraq/ETO384.json
+++ b/docs/data/histograms/Iraq/ETO384.json
@@ -1 +1 @@
-{"batchcode": "ETO384", "histograms": [{"batchcodes": ["ETO384"], "histogram": {"Pyrexia": 2, "Body temperature": 1, "Bradycardia": 1, "Fatigue": 1, "Hallucination": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Loss of consciousness": 1, "Nausea": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "ETO384", "histograms": [{"histogram": {"Pyrexia": 2, "Body temperature": 1, "Bradycardia": 1, "Fatigue": 1, "Hallucination": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Loss of consciousness": 1, "Nausea": 1, "Syncope": 1}, "batchcodes": ["ETO384"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/EY4225.json b/docs/data/histograms/Iraq/EY4225.json
index 87d17c6150f..846f8ec996e 100644
--- a/docs/data/histograms/Iraq/EY4225.json
+++ b/docs/data/histograms/Iraq/EY4225.json
@@ -1 +1 @@
-{"batchcode": "EY4225", "histograms": [{"batchcodes": ["EY4225"], "histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4225", "histograms": [{"histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["EY4225"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/EY4825.json b/docs/data/histograms/Iraq/EY4825.json
index 0b273bc5c35..4acf1e99aec 100644
--- a/docs/data/histograms/Iraq/EY4825.json
+++ b/docs/data/histograms/Iraq/EY4825.json
@@ -1 +1 @@
-{"batchcode": "EY4825", "histograms": [{"batchcodes": ["EY4825"], "histogram": {"Pyrexia": 4, "Chills": 2, "Headache": 2, "Nausea": 2, "Pain in extremity": 2, "Syncope": 2, "Balance disorder": 1, "Chest pain": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dyspnoea": 1, "Extensive swelling of vaccinated limb": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Lethargy": 1, "Loss of consciousness": 1, "Malaise": 1, "Palpitations": 1, "Peripheral swelling": 1, "Toxic shock syndrome": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4825", "histograms": [{"histogram": {"Pyrexia": 4, "Chills": 2, "Headache": 2, "Nausea": 2, "Pain in extremity": 2, "Syncope": 2, "Balance disorder": 1, "Chest pain": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dyspnoea": 1, "Extensive swelling of vaccinated limb": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Lethargy": 1, "Loss of consciousness": 1, "Malaise": 1, "Palpitations": 1, "Peripheral swelling": 1, "Toxic shock syndrome": 1, "Vaccination site pain": 1}, "batchcodes": ["EY4825"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/F63626.json b/docs/data/histograms/Iraq/F63626.json
index 4650a09984c..5db2e109832 100644
--- a/docs/data/histograms/Iraq/F63626.json
+++ b/docs/data/histograms/Iraq/F63626.json
@@ -1 +1 @@
-{"batchcode": "F63626", "histograms": [{"batchcodes": ["F63626"], "histogram": {"Body temperature": 1, "Epilepsy": 1, "Headache": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "F63626", "histograms": [{"histogram": {"Body temperature": 1, "Epilepsy": 1, "Headache": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["F63626"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FA-5742.json b/docs/data/histograms/Iraq/FA-5742.json
index bf8bb6086d5..cceb8074670 100644
--- a/docs/data/histograms/Iraq/FA-5742.json
+++ b/docs/data/histograms/Iraq/FA-5742.json
@@ -1 +1 @@
-{"batchcode": "FA-5742", "histograms": [{"batchcodes": ["FA-5742"], "histogram": {"Lymphadenopathy": 1, "Pyrexia": 1, "Shock": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA-5742", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Pyrexia": 1, "Shock": 1, "Vaccination site pain": 1}, "batchcodes": ["FA-5742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FA3762.json b/docs/data/histograms/Iraq/FA3762.json
index d7bf4be3634..f8ed60afa04 100644
--- a/docs/data/histograms/Iraq/FA3762.json
+++ b/docs/data/histograms/Iraq/FA3762.json
@@ -1 +1 @@
-{"batchcode": "FA3762", "histograms": [{"batchcodes": ["FA3762"], "histogram": {"Deafness": 1, "Fatigue": 1, "Pyrexia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FA3762", "histograms": [{"histogram": {"Deafness": 1, "Fatigue": 1, "Pyrexia": 1, "Tinnitus": 1}, "batchcodes": ["FA3762"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FA5742.json b/docs/data/histograms/Iraq/FA5742.json
index 4cbb2425bce..40be10ebdb0 100644
--- a/docs/data/histograms/Iraq/FA5742.json
+++ b/docs/data/histograms/Iraq/FA5742.json
@@ -1 +1 @@
-{"batchcode": "FA5742", "histograms": [{"batchcodes": ["FA5742"], "histogram": {"Nausea": 2, "Pyrexia": 2, "Vomiting": 2, "Anaphylactic reaction": 1, "Arthralgia": 1, "Body temperature": 1, "Bronchospasm": 1, "Brucellosis": 1, "Cardiac arrest": 1, "Chest pain": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Extensive swelling of vaccinated limb": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain in extremity": 1, "Q fever": 1, "Rash": 1, "Seizure": 1, "Syncope": 1, "Tonsillitis": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5742", "histograms": [{"histogram": {"Nausea": 2, "Pyrexia": 2, "Vomiting": 2, "Anaphylactic reaction": 1, "Arthralgia": 1, "Body temperature": 1, "Bronchospasm": 1, "Brucellosis": 1, "Cardiac arrest": 1, "Chest pain": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Extensive swelling of vaccinated limb": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain in extremity": 1, "Q fever": 1, "Rash": 1, "Seizure": 1, "Syncope": 1, "Tonsillitis": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["FA5742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FA5762.json b/docs/data/histograms/Iraq/FA5762.json
index 408f0bc3b94..10ef1cecd5d 100644
--- a/docs/data/histograms/Iraq/FA5762.json
+++ b/docs/data/histograms/Iraq/FA5762.json
@@ -1 +1 @@
-{"batchcode": "FA5762", "histograms": [{"batchcodes": ["FA5762"], "histogram": {"Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Rhinitis": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5762", "histograms": [{"histogram": {"Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Rhinitis": 1}, "batchcodes": ["FA5762"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FA5843.json b/docs/data/histograms/Iraq/FA5843.json
index 2f7900fad5f..a815603e207 100644
--- a/docs/data/histograms/Iraq/FA5843.json
+++ b/docs/data/histograms/Iraq/FA5843.json
@@ -1 +1 @@
-{"batchcode": "FA5843", "histograms": [{"batchcodes": ["FA5843"], "histogram": {"Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Apnoea": 1, "Arrhythmia": 1, "Cough": 1, "Oropharyngeal pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5843", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Apnoea": 1, "Arrhythmia": 1, "Cough": 1, "Oropharyngeal pain": 1, "Vaccination site pain": 1}, "batchcodes": ["FA5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FC8289.json b/docs/data/histograms/Iraq/FC8289.json
index d702c01c08a..aa8ebf6e7bf 100644
--- a/docs/data/histograms/Iraq/FC8289.json
+++ b/docs/data/histograms/Iraq/FC8289.json
@@ -1 +1 @@
-{"batchcode": "FC8289", "histograms": [{"batchcodes": ["FC8289"], "histogram": {"Syncope": 4, "Arthralgia": 2, "Incorrect route of product administration": 2, "Nasal congestion": 2, "Stevens-Johnson syndrome": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Blepharospasm": 1, "Bradycardia": 1, "Cardiomyopathy": 1, "Fatigue": 1, "Irritability postvaccinal": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FC8289", "histograms": [{"histogram": {"Syncope": 4, "Arthralgia": 2, "Incorrect route of product administration": 2, "Nasal congestion": 2, "Stevens-Johnson syndrome": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Blepharospasm": 1, "Bradycardia": 1, "Cardiomyopathy": 1, "Fatigue": 1, "Irritability postvaccinal": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Thrombosis": 1}, "batchcodes": ["FC8289"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FC9001.json b/docs/data/histograms/Iraq/FC9001.json
index a542b51fdca..86a2ddafbf9 100644
--- a/docs/data/histograms/Iraq/FC9001.json
+++ b/docs/data/histograms/Iraq/FC9001.json
@@ -1 +1 @@
-{"batchcode": "FC9001", "histograms": [{"batchcodes": ["FC9001"], "histogram": {"Syncope": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Asphyxia": 1, "Fatigue": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9001", "histograms": [{"histogram": {"Syncope": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Asphyxia": 1, "Fatigue": 1, "Palpitations": 1}, "batchcodes": ["FC9001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FD5613.json b/docs/data/histograms/Iraq/FD5613.json
index 21e67207260..dc1a6e8deeb 100644
--- a/docs/data/histograms/Iraq/FD5613.json
+++ b/docs/data/histograms/Iraq/FD5613.json
@@ -1 +1 @@
-{"batchcode": "FD5613", "histograms": [{"batchcodes": ["FD5613"], "histogram": {"Decreased appetite": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Musculoskeletal pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5613", "histograms": [{"histogram": {"Decreased appetite": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Musculoskeletal pain": 1, "Pyrexia": 1}, "batchcodes": ["FD5613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FD7220.json b/docs/data/histograms/Iraq/FD7220.json
index 42d901c4224..d25bc667826 100644
--- a/docs/data/histograms/Iraq/FD7220.json
+++ b/docs/data/histograms/Iraq/FD7220.json
@@ -1 +1 @@
-{"batchcode": "FD7220", "histograms": [{"batchcodes": ["FD7220"], "histogram": {"Body temperature": 1, "Herpes virus infection": 1, "Incorrect route of product administration": 1, "Lymphadenopathy": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1, "Platelet count": 1, "Pyrexia": 1, "Rash": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7220", "histograms": [{"histogram": {"Body temperature": 1, "Herpes virus infection": 1, "Incorrect route of product administration": 1, "Lymphadenopathy": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1, "Platelet count": 1, "Pyrexia": 1, "Rash": 1, "Thrombocytopenia": 1}, "batchcodes": ["FD7220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FD8813.json b/docs/data/histograms/Iraq/FD8813.json
index aee7d29313a..5621d36f416 100644
--- a/docs/data/histograms/Iraq/FD8813.json
+++ b/docs/data/histograms/Iraq/FD8813.json
@@ -1 +1 @@
-{"batchcode": "FD8813", "histograms": [{"batchcodes": ["FD8813"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8813", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FD8813"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FD8831.json b/docs/data/histograms/Iraq/FD8831.json
index 04bf1f68bf4..203c12526e9 100644
--- a/docs/data/histograms/Iraq/FD8831.json
+++ b/docs/data/histograms/Iraq/FD8831.json
@@ -1 +1 @@
-{"batchcode": "FD8831", "histograms": [{"batchcodes": ["FD8831"], "histogram": {"COVID-19": 1, "Computerised tomogram": 1, "Cough": 1, "Dyspnoea": 1, "Polymerase chain reaction": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8831", "histograms": [{"histogram": {"COVID-19": 1, "Computerised tomogram": 1, "Cough": 1, "Dyspnoea": 1, "Polymerase chain reaction": 1, "Pyrexia": 1}, "batchcodes": ["FD8831"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FE1510.json b/docs/data/histograms/Iraq/FE1510.json
index 9a67df3d238..fdd88a6e564 100644
--- a/docs/data/histograms/Iraq/FE1510.json
+++ b/docs/data/histograms/Iraq/FE1510.json
@@ -1 +1 @@
-{"batchcode": "FE1510", "histograms": [{"batchcodes": ["FE1510"], "histogram": {"Pyrexia": 2, "Body temperature": 1, "Dizziness": 1, "Extrasystoles": 1, "Hypotension": 1, "Syncope": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FE1510", "histograms": [{"histogram": {"Pyrexia": 2, "Body temperature": 1, "Dizziness": 1, "Extrasystoles": 1, "Hypotension": 1, "Syncope": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["FE1510"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FE6014.json b/docs/data/histograms/Iraq/FE6014.json
index 43b83832542..e94fbe271ce 100644
--- a/docs/data/histograms/Iraq/FE6014.json
+++ b/docs/data/histograms/Iraq/FE6014.json
@@ -1 +1 @@
-{"batchcode": "FE6014", "histograms": [{"batchcodes": ["FE6014"], "histogram": {"Palpitations": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FE6014", "histograms": [{"histogram": {"Palpitations": 1, "Syncope": 1}, "batchcodes": ["FE6014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FE8087.json b/docs/data/histograms/Iraq/FE8087.json
index 8c0d3496fef..c73d499472a 100644
--- a/docs/data/histograms/Iraq/FE8087.json
+++ b/docs/data/histograms/Iraq/FE8087.json
@@ -1 +1 @@
-{"batchcode": "FE8087", "histograms": [{"batchcodes": ["FE8087"], "histogram": {"Syncope": 3, "Anaphylactic shock": 2, "Abdominal pain": 1, "Chills": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Myocardial infarction": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8087", "histograms": [{"histogram": {"Syncope": 3, "Anaphylactic shock": 2, "Abdominal pain": 1, "Chills": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Myocardial infarction": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["FE8087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF2154.json b/docs/data/histograms/Iraq/FF2154.json
index 855b67d17db..c701b4fe9ca 100644
--- a/docs/data/histograms/Iraq/FF2154.json
+++ b/docs/data/histograms/Iraq/FF2154.json
@@ -1 +1 @@
-{"batchcode": "FF2154", "histograms": [{"batchcodes": ["FF2154"], "histogram": {"Pyrexia": 7, "Diarrhoea": 3, "Dyspnoea": 3, "Fatigue": 3, "Headache": 3, "Nausea": 3, "Vaccination site pain": 3, "Chills": 2, "Hypoaesthesia": 2, "Syncope": 2, "Abdominal pain": 1, "Angioedema": 1, "Arrhythmia": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood urine present": 1, "Body temperature": 1, "Bradycardia": 1, "Chest pain": 1, "Cluster headache": 1, "Confusional state": 1, "Dizziness": 1, "Facial paresis": 1, "Haematochezia": 1, "Haemorrhage": 1, "Hypotension": 1, "Hypothermia": 1, "Irritable bowel syndrome": 1, "Ischaemic stroke": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Pain": 1, "Paraesthesia": 1, "Rash": 1, "Seizure": 1, "Thrombocytopenia": 1, "Vaccination site haematoma": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2154", "histograms": [{"histogram": {"Pyrexia": 7, "Diarrhoea": 3, "Dyspnoea": 3, "Fatigue": 3, "Headache": 3, "Nausea": 3, "Vaccination site pain": 3, "Chills": 2, "Hypoaesthesia": 2, "Syncope": 2, "Abdominal pain": 1, "Angioedema": 1, "Arrhythmia": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood urine present": 1, "Body temperature": 1, "Bradycardia": 1, "Chest pain": 1, "Cluster headache": 1, "Confusional state": 1, "Dizziness": 1, "Facial paresis": 1, "Haematochezia": 1, "Haemorrhage": 1, "Hypotension": 1, "Hypothermia": 1, "Irritable bowel syndrome": 1, "Ischaemic stroke": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Pain": 1, "Paraesthesia": 1, "Rash": 1, "Seizure": 1, "Thrombocytopenia": 1, "Vaccination site haematoma": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["FF2154"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF215H.json b/docs/data/histograms/Iraq/FF215H.json
index df1d261b127..159bf5a1695 100644
--- a/docs/data/histograms/Iraq/FF215H.json
+++ b/docs/data/histograms/Iraq/FF215H.json
@@ -1 +1 @@
-{"batchcode": "FF215H", "histograms": [{"batchcodes": ["FF215H"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FF215H", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["FF215H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF5109.json b/docs/data/histograms/Iraq/FF5109.json
index dacdaa4d02d..901fb4fa642 100644
--- a/docs/data/histograms/Iraq/FF5109.json
+++ b/docs/data/histograms/Iraq/FF5109.json
@@ -1 +1 @@
-{"batchcode": "FF5109", "histograms": [{"batchcodes": ["FF5109"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Hallucination": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5109", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Hallucination": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["FF5109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF8111.json b/docs/data/histograms/Iraq/FF8111.json
index e133a85e5a0..0ecb632fb10 100644
--- a/docs/data/histograms/Iraq/FF8111.json
+++ b/docs/data/histograms/Iraq/FF8111.json
@@ -1 +1 @@
-{"batchcode": "FF8111", "histograms": [{"batchcodes": ["FF8111"], "histogram": {"Pyrexia": 4, "Syncope": 2, "Vaccination site pain": 2, "Acquired diaphragmatic eventration": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Mastitis": 1, "Nausea": 1, "Pain": 1, "Pharyngitis": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8111", "histograms": [{"histogram": {"Pyrexia": 4, "Syncope": 2, "Vaccination site pain": 2, "Acquired diaphragmatic eventration": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Mastitis": 1, "Nausea": 1, "Pain": 1, "Pharyngitis": 1, "Seizure": 1}, "batchcodes": ["FF8111"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF81111.json b/docs/data/histograms/Iraq/FF81111.json
index 7515df0a819..259d56e16d9 100644
--- a/docs/data/histograms/Iraq/FF81111.json
+++ b/docs/data/histograms/Iraq/FF81111.json
@@ -1 +1 @@
-{"batchcode": "FF81111", "histograms": [{"batchcodes": ["FF81111"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FF81111", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FF81111"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF8830.json b/docs/data/histograms/Iraq/FF8830.json
index b6512f92a98..7b4b3fc6b98 100644
--- a/docs/data/histograms/Iraq/FF8830.json
+++ b/docs/data/histograms/Iraq/FF8830.json
@@ -1 +1 @@
-{"batchcode": "FF8830", "histograms": [{"batchcodes": ["FF8830"], "histogram": {"Cardiac arrest": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8830", "histograms": [{"histogram": {"Cardiac arrest": 1}, "batchcodes": ["FF8830"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF8838.json b/docs/data/histograms/Iraq/FF8838.json
index c909d1ca05a..3961218e7d6 100644
--- a/docs/data/histograms/Iraq/FF8838.json
+++ b/docs/data/histograms/Iraq/FF8838.json
@@ -1 +1 @@
-{"batchcode": "FF8838", "histograms": [{"batchcodes": ["FF8838"], "histogram": {"Headache": 3, "Pyrexia": 3, "Diarrhoea": 2, "Fatigue": 2, "Nausea": 2, "Anxiety": 1, "Arthralgia": 1, "Chills": 1, "Decreased appetite": 1, "Dermatomyositis": 1, "Dizziness": 1, "Dysphagia": 1, "Erythema": 1, "Hallucination": 1, "Hypothyroidism": 1, "Nervousness": 1, "Pain": 1, "Piloerection": 1, "Pruritus": 1, "Sexual dysfunction": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8838", "histograms": [{"histogram": {"Headache": 3, "Pyrexia": 3, "Diarrhoea": 2, "Fatigue": 2, "Nausea": 2, "Anxiety": 1, "Arthralgia": 1, "Chills": 1, "Decreased appetite": 1, "Dermatomyositis": 1, "Dizziness": 1, "Dysphagia": 1, "Erythema": 1, "Hallucination": 1, "Hypothyroidism": 1, "Nervousness": 1, "Pain": 1, "Piloerection": 1, "Pruritus": 1, "Sexual dysfunction": 1, "Syncope": 1}, "batchcodes": ["FF8838"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FF8846.json b/docs/data/histograms/Iraq/FF8846.json
index b732710a403..46474d03451 100644
--- a/docs/data/histograms/Iraq/FF8846.json
+++ b/docs/data/histograms/Iraq/FF8846.json
@@ -1 +1 @@
-{"batchcode": "FF8846", "histograms": [{"batchcodes": ["FF8846"], "histogram": {"Asphyxia": 1, "Chest pain": 1, "Dyspnoea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8846", "histograms": [{"histogram": {"Asphyxia": 1, "Chest pain": 1, "Dyspnoea": 1, "Pain in extremity": 1}, "batchcodes": ["FF8846"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FG3526.json b/docs/data/histograms/Iraq/FG3526.json
index ca868989bbd..759b9575568 100644
--- a/docs/data/histograms/Iraq/FG3526.json
+++ b/docs/data/histograms/Iraq/FG3526.json
@@ -1 +1 @@
-{"batchcode": "FG3526", "histograms": [{"batchcodes": ["FG3526"], "histogram": {"Abdominal pain": 1, "Body temperature": 1, "Dyspnoea": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site abscess": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3526", "histograms": [{"histogram": {"Abdominal pain": 1, "Body temperature": 1, "Dyspnoea": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site abscess": 1, "Vomiting": 1}, "batchcodes": ["FG3526"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FGL964.json b/docs/data/histograms/Iraq/FGL964.json
index 4a1a1fc1905..e2f925c1951 100644
--- a/docs/data/histograms/Iraq/FGL964.json
+++ b/docs/data/histograms/Iraq/FGL964.json
@@ -1 +1 @@
-{"batchcode": "FGL964", "histograms": [{"batchcodes": ["FGL964"], "histogram": {"Asphyxia": 1, "Bradycardia": 1, "Dyspnoea": 1, "Fatigue": 1, "Limb discomfort": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FGL964", "histograms": [{"histogram": {"Asphyxia": 1, "Bradycardia": 1, "Dyspnoea": 1, "Fatigue": 1, "Limb discomfort": 1, "Pain in extremity": 1}, "batchcodes": ["FGL964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FH8021.json b/docs/data/histograms/Iraq/FH8021.json
index 446d0f6eb7d..ba569ecbce0 100644
--- a/docs/data/histograms/Iraq/FH8021.json
+++ b/docs/data/histograms/Iraq/FH8021.json
@@ -1 +1 @@
-{"batchcode": "FH8021", "histograms": [{"batchcodes": ["FH8021"], "histogram": {"Dyspnoea": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8021", "histograms": [{"histogram": {"Dyspnoea": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["FH8021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FI7309.json b/docs/data/histograms/Iraq/FI7309.json
index 3917d3a4df5..da54843e4f9 100644
--- a/docs/data/histograms/Iraq/FI7309.json
+++ b/docs/data/histograms/Iraq/FI7309.json
@@ -1 +1 @@
-{"batchcode": "FI7309", "histograms": [{"batchcodes": ["FI7309"], "histogram": {"Paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FI7309", "histograms": [{"histogram": {"Paralysis": 1}, "batchcodes": ["FI7309"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FJ1964.json b/docs/data/histograms/Iraq/FJ1964.json
index 885bc772579..39f8cf2a180 100644
--- a/docs/data/histograms/Iraq/FJ1964.json
+++ b/docs/data/histograms/Iraq/FJ1964.json
@@ -1 +1 @@
-{"batchcode": "FJ1964", "histograms": [{"batchcodes": ["FJ1964"], "histogram": {"Bradycardia": 1, "Dizziness": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1964", "histograms": [{"histogram": {"Bradycardia": 1, "Dizziness": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["FJ1964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FJ1966.json b/docs/data/histograms/Iraq/FJ1966.json
index a0febbf281c..b6cc9667040 100644
--- a/docs/data/histograms/Iraq/FJ1966.json
+++ b/docs/data/histograms/Iraq/FJ1966.json
@@ -1 +1 @@
-{"batchcode": "FJ1966", "histograms": [{"batchcodes": ["FJ1966"], "histogram": {"Loss of consciousness": 3, "Pyrexia": 3, "Body temperature": 2, "Fatigue": 2, "Pain": 2, "Seizure": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Chest pain": 1, "Chills": 1, "Hypotension": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1966", "histograms": [{"histogram": {"Loss of consciousness": 3, "Pyrexia": 3, "Body temperature": 2, "Fatigue": 2, "Pain": 2, "Seizure": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Chest pain": 1, "Chills": 1, "Hypotension": 1, "Syncope": 1}, "batchcodes": ["FJ1966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FJ4188.json b/docs/data/histograms/Iraq/FJ4188.json
index 6bdb049f06b..a480343483e 100644
--- a/docs/data/histograms/Iraq/FJ4188.json
+++ b/docs/data/histograms/Iraq/FJ4188.json
@@ -1 +1 @@
-{"batchcode": "FJ4188", "histograms": [{"batchcodes": ["FJ4188"], "histogram": {"Pyrexia": 2, "Aphasia": 1, "Body temperature": 1, "Bradycardia": 1, "Deafness": 1, "Fatigue": 1, "Headache": 1, "Limb discomfort": 1, "Musculoskeletal stiffness": 1, "Renal pain": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ4188", "histograms": [{"histogram": {"Pyrexia": 2, "Aphasia": 1, "Body temperature": 1, "Bradycardia": 1, "Deafness": 1, "Fatigue": 1, "Headache": 1, "Limb discomfort": 1, "Musculoskeletal stiffness": 1, "Renal pain": 1, "Somnolence": 1}, "batchcodes": ["FJ4188"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FJ8198.json b/docs/data/histograms/Iraq/FJ8198.json
index 7901683e48e..cdec6ba689e 100644
--- a/docs/data/histograms/Iraq/FJ8198.json
+++ b/docs/data/histograms/Iraq/FJ8198.json
@@ -1 +1 @@
-{"batchcode": "FJ8198", "histograms": [{"batchcodes": ["FJ8198"], "histogram": {"Blood pressure measurement": 1, "Cough": 1, "Dyspnoea": 1, "Hypertension": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8198", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Cough": 1, "Dyspnoea": 1, "Hypertension": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["FJ8198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FJLA964.json b/docs/data/histograms/Iraq/FJLA964.json
index bb0b37356f4..bb60ed667f2 100644
--- a/docs/data/histograms/Iraq/FJLA964.json
+++ b/docs/data/histograms/Iraq/FJLA964.json
@@ -1 +1 @@
-{"batchcode": "FJLA964", "histograms": [{"batchcodes": ["FJLA964"], "histogram": {"Body temperature": 1, "Pyrexia": 1, "Seizure": 1, "Vaccination site abscess": 1}}]}
\ No newline at end of file
+{"batchcode": "FJLA964", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1, "Seizure": 1, "Vaccination site abscess": 1}, "batchcodes": ["FJLA964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FM1455.json b/docs/data/histograms/Iraq/FM1455.json
index 08eb85ec0b2..8c4f068e1e9 100644
--- a/docs/data/histograms/Iraq/FM1455.json
+++ b/docs/data/histograms/Iraq/FM1455.json
@@ -1 +1 @@
-{"batchcode": "FM1455", "histograms": [{"batchcodes": ["FM1455"], "histogram": {"Fever neonatal": 1, "Influenza like illness": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "FM1455", "histograms": [{"histogram": {"Fever neonatal": 1, "Influenza like illness": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["FM1455"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FM2496.json b/docs/data/histograms/Iraq/FM2496.json
index ff01c66a754..3868aa12bb0 100644
--- a/docs/data/histograms/Iraq/FM2496.json
+++ b/docs/data/histograms/Iraq/FM2496.json
@@ -1 +1 @@
-{"batchcode": "FM2496", "histograms": [{"batchcodes": ["FM2496"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2496", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["FM2496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FM3444.json b/docs/data/histograms/Iraq/FM3444.json
index a3df0e99571..1ab84a39f45 100644
--- a/docs/data/histograms/Iraq/FM3444.json
+++ b/docs/data/histograms/Iraq/FM3444.json
@@ -1 +1 @@
-{"batchcode": "FM3444", "histograms": [{"batchcodes": ["FM3444"], "histogram": {"Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3444", "histograms": [{"histogram": {"Palpitations": 1}, "batchcodes": ["FM3444"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FM3496.json b/docs/data/histograms/Iraq/FM3496.json
index ddc1ecbe5a4..721a20a1409 100644
--- a/docs/data/histograms/Iraq/FM3496.json
+++ b/docs/data/histograms/Iraq/FM3496.json
@@ -1 +1 @@
-{"batchcode": "FM3496", "histograms": [{"batchcodes": ["FM3496"], "histogram": {"Vaccination site abscess": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3496", "histograms": [{"histogram": {"Vaccination site abscess": 1}, "batchcodes": ["FM3496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FM3U57.json b/docs/data/histograms/Iraq/FM3U57.json
index 785eb92f16b..b8a36be9e06 100644
--- a/docs/data/histograms/Iraq/FM3U57.json
+++ b/docs/data/histograms/Iraq/FM3U57.json
@@ -1 +1 @@
-{"batchcode": "FM3U57", "histograms": [{"batchcodes": ["FM3U57"], "histogram": {"Abdominal pain": 1, "Angina pectoris": 1, "Arthralgia": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Urinary retention": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3U57", "histograms": [{"histogram": {"Abdominal pain": 1, "Angina pectoris": 1, "Arthralgia": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Urinary retention": 1, "Vaccination site reaction": 1}, "batchcodes": ["FM3U57"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/FNI455.json b/docs/data/histograms/Iraq/FNI455.json
index ac4df329aa7..c1dc96f61b5 100644
--- a/docs/data/histograms/Iraq/FNI455.json
+++ b/docs/data/histograms/Iraq/FNI455.json
@@ -1 +1 @@
-{"batchcode": "FNI455", "histograms": [{"batchcodes": ["FNI455"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FNI455", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FNI455"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/H7309.json b/docs/data/histograms/Iraq/H7309.json
index a80fc996990..5447dbdc14a 100644
--- a/docs/data/histograms/Iraq/H7309.json
+++ b/docs/data/histograms/Iraq/H7309.json
@@ -1 +1 @@
-{"batchcode": "H7309", "histograms": [{"batchcodes": ["H7309"], "histogram": {"Arthralgia": 1, "Asphyxia": 1, "Diarrhoea": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "H7309", "histograms": [{"histogram": {"Arthralgia": 1, "Asphyxia": 1, "Diarrhoea": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Tachycardia": 1}, "batchcodes": ["H7309"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/PCA0093.json b/docs/data/histograms/Iraq/PCA0093.json
index fc6229c6847..e24216120f6 100644
--- a/docs/data/histograms/Iraq/PCA0093.json
+++ b/docs/data/histograms/Iraq/PCA0093.json
@@ -1 +1 @@
-{"batchcode": "PCA0093", "histograms": [{"batchcodes": ["PCA0093"], "histogram": {"Seizure": 2, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0093", "histograms": [{"histogram": {"Seizure": 2, "Pyrexia": 1}, "batchcodes": ["PCA0093"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/PF808A.json b/docs/data/histograms/Iraq/PF808A.json
index 05ec46af7d8..8b3ee483000 100644
--- a/docs/data/histograms/Iraq/PF808A.json
+++ b/docs/data/histograms/Iraq/PF808A.json
@@ -1 +1 @@
-{"batchcode": "PF808A", "histograms": [{"batchcodes": ["PF808A"], "histogram": {"Apnoea": 1, "Cough": 1}}]}
\ No newline at end of file
+{"batchcode": "PF808A", "histograms": [{"histogram": {"Apnoea": 1, "Cough": 1}, "batchcodes": ["PF808A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Iraq/SA5742.json b/docs/data/histograms/Iraq/SA5742.json
index fbde48bec56..43aca1f591e 100644
--- a/docs/data/histograms/Iraq/SA5742.json
+++ b/docs/data/histograms/Iraq/SA5742.json
@@ -1 +1 @@
-{"batchcode": "SA5742", "histograms": [{"batchcodes": ["SA5742"], "histogram": {"Drug ineffective": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "SA5742", "histograms": [{"histogram": {"Drug ineffective": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Vaccination site pain": 1}, "batchcodes": ["SA5742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Isle of Man/027B21B.json b/docs/data/histograms/Isle of Man/027B21B.json
index 6170c016fd9..8d3a9f53af5 100644
--- a/docs/data/histograms/Isle of Man/027B21B.json
+++ b/docs/data/histograms/Isle of Man/027B21B.json
@@ -1 +1 @@
-{"batchcode": "027B21B", "histograms": [{"batchcodes": ["027B21B"], "histogram": {"Irregular breathing": 1, "Paraesthesia": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "027B21B", "histograms": [{"histogram": {"Irregular breathing": 1, "Paraesthesia": 1, "Throat tightness": 1}, "batchcodes": ["027B21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Isle of Man/040B21A.json b/docs/data/histograms/Isle of Man/040B21A.json
index 63d69b0c095..2a5a5eb6ba2 100644
--- a/docs/data/histograms/Isle of Man/040B21A.json
+++ b/docs/data/histograms/Isle of Man/040B21A.json
@@ -1 +1 @@
-{"batchcode": "040B21A", "histograms": [{"batchcodes": ["040B21A"], "histogram": {"Extra dose administered": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "040B21A", "histograms": [{"histogram": {"Extra dose administered": 1, "No adverse event": 1}, "batchcodes": ["040B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Isle of Man/80777-0273-10.json b/docs/data/histograms/Isle of Man/80777-0273-10.json
index 5454171a771..5c6cebe7748 100644
--- a/docs/data/histograms/Isle of Man/80777-0273-10.json
+++ b/docs/data/histograms/Isle of Man/80777-0273-10.json
@@ -1 +1 @@
-{"batchcode": "80777-0273-10", "histograms": [{"batchcodes": ["80777-0273-10"], "histogram": {"Headache": 1, "Injection site pain": 1, "Injection site swelling": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "80777-0273-10", "histograms": [{"histogram": {"Headache": 1, "Injection site pain": 1, "Injection site swelling": 1, "Vertigo": 1}, "batchcodes": ["80777-0273-10"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Isle of Man/O43A.json b/docs/data/histograms/Isle of Man/O43A.json
index 147a3251968..700b1c1d28e 100644
--- a/docs/data/histograms/Isle of Man/O43A.json
+++ b/docs/data/histograms/Isle of Man/O43A.json
@@ -1 +1 @@
-{"batchcode": "O43A", "histograms": [{"batchcodes": ["O43A"], "histogram": {"Dysphagia": 1, "Dyspnoea": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "O43A", "histograms": [{"histogram": {"Dysphagia": 1, "Dyspnoea": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["O43A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/11111.json b/docs/data/histograms/Israel/11111.json
index 4a2ab3aecb3..5ca81dd7d93 100644
--- a/docs/data/histograms/Israel/11111.json
+++ b/docs/data/histograms/Israel/11111.json
@@ -1 +1 @@
-{"batchcode": "11111", "histograms": [{"batchcodes": ["11111"], "histogram": {"Deafness": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "11111", "histograms": [{"histogram": {"Deafness": 1, "Tinnitus": 1}, "batchcodes": ["11111"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/300042460.json b/docs/data/histograms/Israel/300042460.json
index 63104f65d42..66d78c7c003 100644
--- a/docs/data/histograms/Israel/300042460.json
+++ b/docs/data/histograms/Israel/300042460.json
@@ -1 +1 @@
-{"batchcode": "300042460", "histograms": [{"batchcodes": ["300042460"], "histogram": {"Syncope": 2, "Acute respiratory distress syndrome": 1, "Anaphylactic reaction": 1, "Asthenia": 1, "Dizziness": 1, "Headache": 1, "Heart rate": 1, "Hypotension": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "300042460", "histograms": [{"histogram": {"Syncope": 2, "Acute respiratory distress syndrome": 1, "Anaphylactic reaction": 1, "Asthenia": 1, "Dizziness": 1, "Headache": 1, "Heart rate": 1, "Hypotension": 1, "Pyrexia": 1}, "batchcodes": ["300042460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/3000496.json b/docs/data/histograms/Israel/3000496.json
index dd9897c6cd3..158d718fa2b 100644
--- a/docs/data/histograms/Israel/3000496.json
+++ b/docs/data/histograms/Israel/3000496.json
@@ -1 +1 @@
-{"batchcode": "3000496", "histograms": [{"batchcodes": ["3000496"], "histogram": {"Syncope": 3, "Dizziness": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Tachycardia": 2, "VIth nerve disorder": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea at rest": 1, "Facial spasm": 1, "Headache": 1, "Heart rate increased": 1, "Hypertension": 1, "Presyncope": 1, "Swelling": 1, "Swelling face": 1, "Tachypnoea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3000496", "histograms": [{"histogram": {"Syncope": 3, "Dizziness": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Tachycardia": 2, "VIth nerve disorder": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea at rest": 1, "Facial spasm": 1, "Headache": 1, "Heart rate increased": 1, "Hypertension": 1, "Presyncope": 1, "Swelling": 1, "Swelling face": 1, "Tachypnoea": 1, "Vaccination site pain": 1}, "batchcodes": ["3000496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/3001659.json b/docs/data/histograms/Israel/3001659.json
index 92564737a9d..ab0fa18ed91 100644
--- a/docs/data/histograms/Israel/3001659.json
+++ b/docs/data/histograms/Israel/3001659.json
@@ -1 +1 @@
-{"batchcode": "3001659", "histograms": [{"batchcodes": ["3001659"], "histogram": {"Computerised tomogram head": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Troponin": 2, "White blood cell count": 2, "Angiogram": 1, "Blood pressure measurement": 1, "Blood pressure systolic inspiratory decreased": 1, "Body temperature": 1, "C-reactive protein": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Haemoglobin": 1, "Hemianopia homonymous": 1, "Inflammatory marker test": 1, "International normalised ratio": 1, "Ischaemic cerebral infarction": 1, "Magnetic resonance imaging head": 1, "Myocarditis": 1, "Pericarditis": 1, "Stevens-Johnson syndrome": 1, "Transient ischaemic attack": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "3001659", "histograms": [{"histogram": {"Computerised tomogram head": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Troponin": 2, "White blood cell count": 2, "Angiogram": 1, "Blood pressure measurement": 1, "Blood pressure systolic inspiratory decreased": 1, "Body temperature": 1, "C-reactive protein": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Haemoglobin": 1, "Hemianopia homonymous": 1, "Inflammatory marker test": 1, "International normalised ratio": 1, "Ischaemic cerebral infarction": 1, "Magnetic resonance imaging head": 1, "Myocarditis": 1, "Pericarditis": 1, "Stevens-Johnson syndrome": 1, "Transient ischaemic attack": 1, "Visual impairment": 1}, "batchcodes": ["3001659"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/3005889.json b/docs/data/histograms/Israel/3005889.json
index 3bb963a9e5a..419677d909b 100644
--- a/docs/data/histograms/Israel/3005889.json
+++ b/docs/data/histograms/Israel/3005889.json
@@ -1 +1 @@
-{"batchcode": "3005889", "histograms": [{"batchcodes": ["3005889"], "histogram": {"Back pain": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Heart rate": 1, "Limb discomfort": 1, "Maternal exposure during pregnancy": 1, "Myelitis": 1, "Myocarditis": 1, "Night sweats": 1, "Palpitations": 1, "Paraesthesia": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "3005889", "histograms": [{"histogram": {"Back pain": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Heart rate": 1, "Limb discomfort": 1, "Maternal exposure during pregnancy": 1, "Myelitis": 1, "Myocarditis": 1, "Night sweats": 1, "Palpitations": 1, "Paraesthesia": 1, "Troponin": 1}, "batchcodes": ["3005889"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/60304.json b/docs/data/histograms/Israel/60304.json
index 4f666e1c463..4780157cdd6 100644
--- a/docs/data/histograms/Israel/60304.json
+++ b/docs/data/histograms/Israel/60304.json
@@ -1 +1 @@
-{"batchcode": "60304", "histograms": [{"batchcodes": ["60304"], "histogram": {"Anti-thyroid antibody": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone increased": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Electroencephalogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "60304", "histograms": [{"histogram": {"Anti-thyroid antibody": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone increased": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Electroencephalogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Paraesthesia": 1}, "batchcodes": ["60304"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/B2F9984.json b/docs/data/histograms/Israel/B2F9984.json
index 5c216e811f4..f55e42f138b 100644
--- a/docs/data/histograms/Israel/B2F9984.json
+++ b/docs/data/histograms/Israel/B2F9984.json
@@ -1 +1 @@
-{"batchcode": "B2F9984", "histograms": [{"batchcodes": ["B2F9984"], "histogram": {"Arthralgia": 1, "Chills": 1, "Drug ineffective": 1, "Immunisation": 1, "Muscle spasms": 1, "Myalgia": 1, "Off label use": 1, "Pain of skin": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "B2F9984", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Drug ineffective": 1, "Immunisation": 1, "Muscle spasms": 1, "Myalgia": 1, "Off label use": 1, "Pain of skin": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination site pruritus": 1}, "batchcodes": ["B2F9984"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EJ3002.json b/docs/data/histograms/Israel/EJ3002.json
index be2d4dc89cd..872f89ba1b1 100644
--- a/docs/data/histograms/Israel/EJ3002.json
+++ b/docs/data/histograms/Israel/EJ3002.json
@@ -1 +1 @@
-{"batchcode": "EJ3002", "histograms": [{"batchcodes": ["EJ3002"], "histogram": {"Blood creatine phosphokinase": 1, "Erythema": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Hepatic function abnormal": 1, "Pericarditis": 1, "Rhabdomyolysis": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ3002", "histograms": [{"histogram": {"Blood creatine phosphokinase": 1, "Erythema": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Hepatic function abnormal": 1, "Pericarditis": 1, "Rhabdomyolysis": 1, "Swelling face": 1}, "batchcodes": ["EJ3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EK4175.json b/docs/data/histograms/Israel/EK4175.json
index c94af89978b..abf4a4ece8d 100644
--- a/docs/data/histograms/Israel/EK4175.json
+++ b/docs/data/histograms/Israel/EK4175.json
@@ -1 +1 @@
-{"batchcode": "EK4175", "histograms": [{"batchcodes": ["EK4175"], "histogram": {"Paraesthesia": 7, "Haemoglobin": 6, "Death": 5, "Asthenia": 4, "Basophil count": 4, "Blood pressure measurement": 4, "Body temperature": 4, "C-reactive protein": 4, "Electrocardiogram": 4, "Eosinophil count": 4, "Haematocrit": 4, "Heart rate": 4, "Lymphocyte count": 4, "Mean cell haemoglobin": 4, "Mean cell volume": 4, "Mean platelet volume": 4, "Monocyte count": 4, "Neutrophil count": 4, "Oxygen saturation": 4, "Pain assessment": 4, "Platelet count": 4, "Platelet distribution width": 4, "Red blood cell count": 4, "White blood cell count": 4, "Blood chloride": 3, "Blood creatinine": 3, "Blood glucose": 3, "Blood glucose increased": 3, "Blood potassium": 3, "Blood sodium": 3, "Blood urea": 3, "Chest pain": 3, "Dizziness": 3, "Dyspnoea": 3, "Glomerular filtration rate": 3, "Granulocyte count": 3, "Mean cell haemoglobin concentration": 3, "Mean cell haemoglobin decreased": 3, "Nucleated red cells": 3, "Palpitations": 3, "Physical examination": 3, "Pleural effusion": 3, "Procalcitonin": 3, "Pyrexia": 3, "Rash": 3, "Red cell distribution width": 3, "Tachycardia": 3, "Transient ischaemic attack": 3, "Acute myocardial infarction": 2, "Atrial fibrillation": 2, "Basophil percentage": 2, "Blood chloride increased": 2, "Eosinophil percentage": 2, "Feeling abnormal": 2, "Gait disturbance": 2, "Investigation": 2, "Laboratory test": 2, "Lymphocyte percentage": 2, "Magnetic resonance imaging": 2, "Monocyte percentage": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Neutrophil percentage": 2, "Pain in extremity": 2, "Pericardial effusion": 2, "SARS-CoV-2 antibody test": 2, "Tinnitus": 2, "Troponin": 2, "Troponin I": 2, "Acoustic stimulation tests": 1, "Addison's disease": 1, "Allergy to vaccine": 1, "Autoimmune haemolytic anaemia": 1, "Basal cell carcinoma": 1, "Bell's palsy": 1, "Biopsy": 1, "Blood bilirubin unconjugated": 1, "Blood lactate dehydrogenase": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Catheterisation cardiac": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Coma scale": 1, "Coombs test": 1, "Discomfort": 1, "Disease recurrence": 1, "Disseminated intravascular coagulation": 1, "Dysphagia": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Encephalitis": 1, "Endoscopy": 1, "Enzyme level test": 1, "Facial paralysis": 1, "Feeling cold": 1, "Glomerular filtration rate decreased": 1, "Granulocyte percentage": 1, "Haemolytic anaemia": 1, "Headache": 1, "Heart rate increased": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hyponatraemia": 1, "Hypothermia": 1, "Leukocytosis": 1, "Limb discomfort": 1, "Lumbar puncture": 1, "Lymphocyte count increased": 1, "Lymphopenia": 1, "Mean cell haemoglobin concentration decreased": 1, "Mean cell volume decreased": 1, "Mean platelet volume increased": 1, "Monoblast count": 1, "Multiple sclerosis": 1, "Multiple sclerosis relapse": 1, "Myalgia": 1, "NIH stroke scale": 1, "Nausea": 1, "Neurological examination": 1, "Neutrophil count increased": 1, "Nystagmus": 1, "Ocular icterus": 1, "Pain": 1, "Panel-reactive antibody": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Peripheral venous disease": 1, "Plateletcrit": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary oedema": 1, "Red blood cell count increased": 1, "Red cell distribution width increased": 1, "Resuscitation": 1, "Reticulocyte count": 1, "Sensory loss": 1, "Sinus tachycardia": 1, "Speech disorder": 1, "Sudden hearing loss": 1, "Swollen tongue": 1, "Syncope": 1, "Urosepsis": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Viral test": 1, "Vision blurred": 1, "Vomiting": 1, "West Nile virus test": 1, "White blood cell scan": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4175", "histograms": [{"histogram": {"Paraesthesia": 7, "Haemoglobin": 6, "Death": 5, "Asthenia": 4, "Basophil count": 4, "Blood pressure measurement": 4, "Body temperature": 4, "C-reactive protein": 4, "Electrocardiogram": 4, "Eosinophil count": 4, "Haematocrit": 4, "Heart rate": 4, "Lymphocyte count": 4, "Mean cell haemoglobin": 4, "Mean cell volume": 4, "Mean platelet volume": 4, "Monocyte count": 4, "Neutrophil count": 4, "Oxygen saturation": 4, "Pain assessment": 4, "Platelet count": 4, "Platelet distribution width": 4, "Red blood cell count": 4, "White blood cell count": 4, "Blood chloride": 3, "Blood creatinine": 3, "Blood glucose": 3, "Blood glucose increased": 3, "Blood potassium": 3, "Blood sodium": 3, "Blood urea": 3, "Chest pain": 3, "Dizziness": 3, "Dyspnoea": 3, "Glomerular filtration rate": 3, "Granulocyte count": 3, "Mean cell haemoglobin concentration": 3, "Mean cell haemoglobin decreased": 3, "Nucleated red cells": 3, "Palpitations": 3, "Physical examination": 3, "Pleural effusion": 3, "Procalcitonin": 3, "Pyrexia": 3, "Rash": 3, "Red cell distribution width": 3, "Tachycardia": 3, "Transient ischaemic attack": 3, "Acute myocardial infarction": 2, "Atrial fibrillation": 2, "Basophil percentage": 2, "Blood chloride increased": 2, "Eosinophil percentage": 2, "Feeling abnormal": 2, "Gait disturbance": 2, "Investigation": 2, "Laboratory test": 2, "Lymphocyte percentage": 2, "Magnetic resonance imaging": 2, "Monocyte percentage": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Neutrophil percentage": 2, "Pain in extremity": 2, "Pericardial effusion": 2, "SARS-CoV-2 antibody test": 2, "Tinnitus": 2, "Troponin": 2, "Troponin I": 2, "Acoustic stimulation tests": 1, "Addison's disease": 1, "Allergy to vaccine": 1, "Autoimmune haemolytic anaemia": 1, "Basal cell carcinoma": 1, "Bell's palsy": 1, "Biopsy": 1, "Blood bilirubin unconjugated": 1, "Blood lactate dehydrogenase": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Catheterisation cardiac": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Coma scale": 1, "Coombs test": 1, "Discomfort": 1, "Disease recurrence": 1, "Disseminated intravascular coagulation": 1, "Dysphagia": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Encephalitis": 1, "Endoscopy": 1, "Enzyme level test": 1, "Facial paralysis": 1, "Feeling cold": 1, "Glomerular filtration rate decreased": 1, "Granulocyte percentage": 1, "Haemolytic anaemia": 1, "Headache": 1, "Heart rate increased": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hyponatraemia": 1, "Hypothermia": 1, "Leukocytosis": 1, "Limb discomfort": 1, "Lumbar puncture": 1, "Lymphocyte count increased": 1, "Lymphopenia": 1, "Mean cell haemoglobin concentration decreased": 1, "Mean cell volume decreased": 1, "Mean platelet volume increased": 1, "Monoblast count": 1, "Multiple sclerosis": 1, "Multiple sclerosis relapse": 1, "Myalgia": 1, "NIH stroke scale": 1, "Nausea": 1, "Neurological examination": 1, "Neutrophil count increased": 1, "Nystagmus": 1, "Ocular icterus": 1, "Pain": 1, "Panel-reactive antibody": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Peripheral venous disease": 1, "Plateletcrit": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary oedema": 1, "Red blood cell count increased": 1, "Red cell distribution width increased": 1, "Resuscitation": 1, "Reticulocyte count": 1, "Sensory loss": 1, "Sinus tachycardia": 1, "Speech disorder": 1, "Sudden hearing loss": 1, "Swollen tongue": 1, "Syncope": 1, "Urosepsis": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Viral test": 1, "Vision blurred": 1, "Vomiting": 1, "West Nile virus test": 1, "White blood cell scan": 1}, "batchcodes": ["EK4175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EK4237.json b/docs/data/histograms/Israel/EK4237.json
index 0485848fe59..d27b8b35c81 100644
--- a/docs/data/histograms/Israel/EK4237.json
+++ b/docs/data/histograms/Israel/EK4237.json
@@ -1 +1 @@
-{"batchcode": "EK4237", "histograms": [{"batchcodes": ["EK4237"], "histogram": {"Asthenia": 2, "Body temperature": 2, "Death": 2, "Dyspnoea": 2, "Aspiration": 1, "Back pain": 1, "Blood pressure measurement": 1, "Cardiac failure": 1, "Cerebral ischaemia": 1, "Circulatory collapse": 1, "Coagulation test": 1, "Dizziness": 1, "Endoscopy upper gastrointestinal tract": 1, "Facial paralysis": 1, "Facial paresis": 1, "Gastric haemorrhage": 1, "Gastrointestinal necrosis": 1, "Guillain-Barre syndrome": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocarditis": 1, "Neck pain": 1, "Neurological examination": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4237", "histograms": [{"histogram": {"Asthenia": 2, "Body temperature": 2, "Death": 2, "Dyspnoea": 2, "Aspiration": 1, "Back pain": 1, "Blood pressure measurement": 1, "Cardiac failure": 1, "Cerebral ischaemia": 1, "Circulatory collapse": 1, "Coagulation test": 1, "Dizziness": 1, "Endoscopy upper gastrointestinal tract": 1, "Facial paralysis": 1, "Facial paresis": 1, "Gastric haemorrhage": 1, "Gastrointestinal necrosis": 1, "Guillain-Barre syndrome": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocarditis": 1, "Neck pain": 1, "Neurological examination": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["EK4237"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EK4238.json b/docs/data/histograms/Israel/EK4238.json
index 6e0495fc484..871cacfe036 100644
--- a/docs/data/histograms/Israel/EK4238.json
+++ b/docs/data/histograms/Israel/EK4238.json
@@ -1 +1 @@
-{"batchcode": "EK4238", "histograms": [{"batchcodes": ["EK4238"], "histogram": {"Death": 8, "Myocarditis": 4, "Acute myocardial infarction": 3, "Myalgia": 3, "Pain": 3, "Pain in extremity": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Asymptomatic COVID-19": 2, "Atrial fibrillation": 2, "Cardiac arrest": 2, "Computerised tomogram": 2, "Drug ineffective": 2, "Facial paralysis": 2, "Feeling abnormal": 2, "Guillain-Barre syndrome": 2, "Headache": 2, "Investigation": 2, "Muscular weakness": 2, "Physical examination": 2, "Rash": 2, "Seizure": 2, "Transient ischaemic attack": 2, "Abdominal pain upper": 1, "Angiogram": 1, "Appendicitis": 1, "Arthralgia": 1, "Back pain": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure chronic": 1, "Cardiac tamponade": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Contusion": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Epistaxis": 1, "Eye pain": 1, "Fall": 1, "General physical health deterioration": 1, "Haematoma": 1, "Head injury": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Liver function test": 1, "Loss of consciousness": 1, "Lymphocyte count": 1, "Lymphopenia": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Pericarditis": 1, "Peripheral artery occlusion": 1, "Peripheral ischaemia": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Purpura": 1, "Pyrexia": 1, "Rash pruritic": 1, "Renal function test": 1, "Respiratory disorder": 1, "Resuscitation": 1, "Sensory disturbance": 1, "Sinus bradycardia": 1, "Speech disorder": 1, "Syncope": 1, "Tonsillitis": 1, "Transient global amnesia": 1, "Transposition of the great vessels": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Vascular injury": 1, "Ventricular fibrillation": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4238", "histograms": [{"histogram": {"Death": 8, "Myocarditis": 4, "Acute myocardial infarction": 3, "Myalgia": 3, "Pain": 3, "Pain in extremity": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Asymptomatic COVID-19": 2, "Atrial fibrillation": 2, "Cardiac arrest": 2, "Computerised tomogram": 2, "Drug ineffective": 2, "Facial paralysis": 2, "Feeling abnormal": 2, "Guillain-Barre syndrome": 2, "Headache": 2, "Investigation": 2, "Muscular weakness": 2, "Physical examination": 2, "Rash": 2, "Seizure": 2, "Transient ischaemic attack": 2, "Abdominal pain upper": 1, "Angiogram": 1, "Appendicitis": 1, "Arthralgia": 1, "Back pain": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure chronic": 1, "Cardiac tamponade": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Contusion": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Epistaxis": 1, "Eye pain": 1, "Fall": 1, "General physical health deterioration": 1, "Haematoma": 1, "Head injury": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Liver function test": 1, "Loss of consciousness": 1, "Lymphocyte count": 1, "Lymphopenia": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Pericarditis": 1, "Peripheral artery occlusion": 1, "Peripheral ischaemia": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Purpura": 1, "Pyrexia": 1, "Rash pruritic": 1, "Renal function test": 1, "Respiratory disorder": 1, "Resuscitation": 1, "Sensory disturbance": 1, "Sinus bradycardia": 1, "Speech disorder": 1, "Syncope": 1, "Tonsillitis": 1, "Transient global amnesia": 1, "Transposition of the great vessels": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Vascular injury": 1, "Ventricular fibrillation": 1, "Vomiting": 1}, "batchcodes": ["EK4238"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EK4240.json b/docs/data/histograms/Israel/EK4240.json
index e8fbeaf5ca2..11fac35c20c 100644
--- a/docs/data/histograms/Israel/EK4240.json
+++ b/docs/data/histograms/Israel/EK4240.json
@@ -1 +1 @@
-{"batchcode": "EK4240", "histograms": [{"batchcodes": ["EK4240"], "histogram": {"Dyspnoea": 5, "Pericarditis": 5, "Blood pressure measurement": 3, "Chest pain": 3, "Computerised tomogram head": 3, "Death": 3, "Heart rate": 3, "Investigation": 3, "Muscular weakness": 3, "Atrial fibrillation": 2, "Blood creatinine": 2, "Catheterisation cardiac": 2, "Cough": 2, "Dysphagia": 2, "Electromyogram": 2, "Heart rate increased": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Myasthenia gravis": 2, "Pain": 2, "Paraesthesia": 2, "Pyrexia": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Aneurysm ruptured": 1, "Angiogram": 1, "Arteriosclerosis": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Blood culture": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood potassium abnormal": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Culture urine": 1, "Dehydration": 1, "Diplopia": 1, "Dizziness": 1, "Dysarthria": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Foetal death": 1, "Foetal exposure during pregnancy": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Hemiparaesthesia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypothermia": 1, "Leukocytosis": 1, "Loss of consciousness": 1, "Malaise": 1, "Myalgia": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Paraesthesia oral": 1, "Pulmonary embolism": 1, "Pulseless electrical activity": 1, "Pupil fixed": 1, "Renal disorder": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Right ventricular enlargement": 1, "SARS-CoV-2 antibody test negative": 1, "Slow speech": 1, "Spinal stenosis": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4240", "histograms": [{"histogram": {"Dyspnoea": 5, "Pericarditis": 5, "Blood pressure measurement": 3, "Chest pain": 3, "Computerised tomogram head": 3, "Death": 3, "Heart rate": 3, "Investigation": 3, "Muscular weakness": 3, "Atrial fibrillation": 2, "Blood creatinine": 2, "Catheterisation cardiac": 2, "Cough": 2, "Dysphagia": 2, "Electromyogram": 2, "Heart rate increased": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Myasthenia gravis": 2, "Pain": 2, "Paraesthesia": 2, "Pyrexia": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Aneurysm ruptured": 1, "Angiogram": 1, "Arteriosclerosis": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Blood culture": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood potassium abnormal": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Culture urine": 1, "Dehydration": 1, "Diplopia": 1, "Dizziness": 1, "Dysarthria": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Foetal death": 1, "Foetal exposure during pregnancy": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Hemiparaesthesia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypothermia": 1, "Leukocytosis": 1, "Loss of consciousness": 1, "Malaise": 1, "Myalgia": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Paraesthesia oral": 1, "Pulmonary embolism": 1, "Pulseless electrical activity": 1, "Pupil fixed": 1, "Renal disorder": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Right ventricular enlargement": 1, "SARS-CoV-2 antibody test negative": 1, "Slow speech": 1, "Spinal stenosis": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["EK4240"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EK4241.json b/docs/data/histograms/Israel/EK4241.json
index 3e6975f27af..c5f6d4664e4 100644
--- a/docs/data/histograms/Israel/EK4241.json
+++ b/docs/data/histograms/Israel/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"Body temperature": 2, "Myocardial infarction": 2, "Nausea": 2, "Pericarditis": 2, "Pyrexia": 2, "Vomiting": 2, "Atrioventricular block": 1, "Back pain": 1, "Biopsy": 1, "Blood sodium": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Coronary artery occlusion": 1, "Crying": 1, "Death": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Dry mouth": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Headache": 1, "Hyponatraemia": 1, "IIIrd nerve paralysis": 1, "Localised infection": 1, "Neutropenia": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Orthopaedic examination": 1, "Palpitations": 1, "Pancytopenia": 1, "Platelet count": 1, "Pseudomonas infection": 1, "Renal disorder": 1, "Sinus tachycardia": 1, "Speech sound disorder": 1, "Sudden hearing loss": 1, "Syncope": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"Body temperature": 2, "Myocardial infarction": 2, "Nausea": 2, "Pericarditis": 2, "Pyrexia": 2, "Vomiting": 2, "Atrioventricular block": 1, "Back pain": 1, "Biopsy": 1, "Blood sodium": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Coronary artery occlusion": 1, "Crying": 1, "Death": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Dry mouth": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Headache": 1, "Hyponatraemia": 1, "IIIrd nerve paralysis": 1, "Localised infection": 1, "Neutropenia": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Orthopaedic examination": 1, "Palpitations": 1, "Pancytopenia": 1, "Platelet count": 1, "Pseudomonas infection": 1, "Renal disorder": 1, "Sinus tachycardia": 1, "Speech sound disorder": 1, "Sudden hearing loss": 1, "Syncope": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "Visual impairment": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EK4242.json b/docs/data/histograms/Israel/EK4242.json
index 0b21f0fa8d9..2dee3c198d2 100644
--- a/docs/data/histograms/Israel/EK4242.json
+++ b/docs/data/histograms/Israel/EK4242.json
@@ -1 +1 @@
-{"batchcode": "EK4242", "histograms": [{"batchcodes": ["EK4242"], "histogram": {"Death": 6, "Pyrexia": 5, "Chills": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Muscular weakness": 3, "Myocarditis": 3, "Pericarditis": 3, "Syncope": 3, "Angiogram": 2, "Asthenia": 2, "Cerebrovascular accident": 2, "Chest pain": 2, "Electrocardiogram": 2, "Heart rate": 2, "Loss of consciousness": 2, "Oropharyngeal pain": 2, "Presyncope": 2, "Speech disorder": 2, "Vomiting": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Binocular eye movement disorder": 1, "Blood count": 1, "Blood creatinine": 1, "Blood creatinine abnormal": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Body temperature": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Chest X-ray": 1, "Cholangitis": 1, "Chronic obstructive pulmonary disease": 1, "Confusional state": 1, "Cough": 1, "Deafness neurosensory": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Epiglottitis": 1, "Face injury": 1, "Facial nerve disorder": 1, "Facial paralysis": 1, "Facial paresis": 1, "Faeces soft": 1, "Fall": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Haematemesis": 1, "Haemorrhage": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "Inflammation": 1, "Inflammatory marker test": 1, "Intermenstrual bleeding": 1, "Intestinal obstruction": 1, "Investigation": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Menstrual disorder": 1, "Mental disorder": 1, "Multiple organ dysfunction syndrome": 1, "Myalgia": 1, "Myocardial infarction": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Oesophageal disorder": 1, "Pain": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pneumonia": 1, "Pulmonary embolism": 1, "Renal failure": 1, "Respiratory failure": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sarcoidosis": 1, "Seizure": 1, "Septic shock": 1, "Sudden hearing loss": 1, "Throat irritation": 1, "Tonsillitis": 1, "Vertigo": 1, "Wheezing": 1, "Wolff-Parkinson-White syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4242", "histograms": [{"histogram": {"Death": 6, "Pyrexia": 5, "Chills": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Muscular weakness": 3, "Myocarditis": 3, "Pericarditis": 3, "Syncope": 3, "Angiogram": 2, "Asthenia": 2, "Cerebrovascular accident": 2, "Chest pain": 2, "Electrocardiogram": 2, "Heart rate": 2, "Loss of consciousness": 2, "Oropharyngeal pain": 2, "Presyncope": 2, "Speech disorder": 2, "Vomiting": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Binocular eye movement disorder": 1, "Blood count": 1, "Blood creatinine": 1, "Blood creatinine abnormal": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Body temperature": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Chest X-ray": 1, "Cholangitis": 1, "Chronic obstructive pulmonary disease": 1, "Confusional state": 1, "Cough": 1, "Deafness neurosensory": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Epiglottitis": 1, "Face injury": 1, "Facial nerve disorder": 1, "Facial paralysis": 1, "Facial paresis": 1, "Faeces soft": 1, "Fall": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Haematemesis": 1, "Haemorrhage": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "Inflammation": 1, "Inflammatory marker test": 1, "Intermenstrual bleeding": 1, "Intestinal obstruction": 1, "Investigation": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Menstrual disorder": 1, "Mental disorder": 1, "Multiple organ dysfunction syndrome": 1, "Myalgia": 1, "Myocardial infarction": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Oesophageal disorder": 1, "Pain": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Pneumonia": 1, "Pulmonary embolism": 1, "Renal failure": 1, "Respiratory failure": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sarcoidosis": 1, "Seizure": 1, "Septic shock": 1, "Sudden hearing loss": 1, "Throat irritation": 1, "Tonsillitis": 1, "Vertigo": 1, "Wheezing": 1, "Wolff-Parkinson-White syndrome": 1}, "batchcodes": ["EK4242"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EK424240.json b/docs/data/histograms/Israel/EK424240.json
index 80e792689ac..cf881ae1ebb 100644
--- a/docs/data/histograms/Israel/EK424240.json
+++ b/docs/data/histograms/Israel/EK424240.json
@@ -1 +1 @@
-{"batchcode": "EK424240", "histograms": [{"batchcodes": ["EK424240"], "histogram": {"Bell's palsy": 1}}]}
\ No newline at end of file
+{"batchcode": "EK424240", "histograms": [{"histogram": {"Bell's palsy": 1}, "batchcodes": ["EK424240"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL0200.json b/docs/data/histograms/Israel/EL0200.json
index feb4d2f6f56..ba24781f742 100644
--- a/docs/data/histograms/Israel/EL0200.json
+++ b/docs/data/histograms/Israel/EL0200.json
@@ -1 +1 @@
-{"batchcode": "EL0200", "histograms": [{"batchcodes": ["EL0200"], "histogram": {"Myocarditis": 3, "Blindness transient": 1, "Neurological examination": 1, "Pericarditis": 1, "Troponin": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0200", "histograms": [{"histogram": {"Myocarditis": 3, "Blindness transient": 1, "Neurological examination": 1, "Pericarditis": 1, "Troponin": 1, "Vertigo": 1}, "batchcodes": ["EL0200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL0203.json b/docs/data/histograms/Israel/EL0203.json
index 35e7a8d8042..f2cd39394a9 100644
--- a/docs/data/histograms/Israel/EL0203.json
+++ b/docs/data/histograms/Israel/EL0203.json
@@ -1 +1 @@
-{"batchcode": "EL0203", "histograms": [{"batchcodes": ["EL0203"], "histogram": {"Myocarditis": 9, "Chest pain": 6, "Headache": 5, "Pyrexia": 3, "Troponin": 3, "Asthenia": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Dyspnoea": 2, "Ejection fraction": 2, "Electrocardiogram": 2, "Muscular weakness": 2, "Pericarditis": 2, "Pulmonary embolism": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Altered state of consciousness": 1, "Antiphospholipid antibodies positive": 1, "Atopic keratoconjunctivitis": 1, "Blood creatine phosphokinase": 1, "Body temperature": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chills": 1, "Cholangitis": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Corneal reflex decreased": 1, "Death": 1, "Deep vein thrombosis": 1, "Diplopia": 1, "Dyskinesia": 1, "Echocardiogram": 1, "Ejection fraction abnormal": 1, "Escherichia infection": 1, "Facial paralysis": 1, "Facial paresis": 1, "General physical health deterioration": 1, "Hyperhidrosis": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Inflammation": 1, "Investigation": 1, "Leukocytosis": 1, "Leukopenia": 1, "Magnetic resonance imaging": 1, "Myositis": 1, "Nausea": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia oral": 1, "Positron emission tomogram": 1, "Productive cough": 1, "Purpura": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 antibody test": 1, "Sensory disturbance": 1, "Septic shock": 1, "Smear test": 1, "Speech disorder": 1, "Troponin abnormal": 1, "Vision blurred": 1, "Visual impairment": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0203", "histograms": [{"histogram": {"Myocarditis": 9, "Chest pain": 6, "Headache": 5, "Pyrexia": 3, "Troponin": 3, "Asthenia": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Dyspnoea": 2, "Ejection fraction": 2, "Electrocardiogram": 2, "Muscular weakness": 2, "Pericarditis": 2, "Pulmonary embolism": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Altered state of consciousness": 1, "Antiphospholipid antibodies positive": 1, "Atopic keratoconjunctivitis": 1, "Blood creatine phosphokinase": 1, "Body temperature": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chills": 1, "Cholangitis": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Corneal reflex decreased": 1, "Death": 1, "Deep vein thrombosis": 1, "Diplopia": 1, "Dyskinesia": 1, "Echocardiogram": 1, "Ejection fraction abnormal": 1, "Escherichia infection": 1, "Facial paralysis": 1, "Facial paresis": 1, "General physical health deterioration": 1, "Hyperhidrosis": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Inflammation": 1, "Investigation": 1, "Leukocytosis": 1, "Leukopenia": 1, "Magnetic resonance imaging": 1, "Myositis": 1, "Nausea": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia oral": 1, "Positron emission tomogram": 1, "Productive cough": 1, "Purpura": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 antibody test": 1, "Sensory disturbance": 1, "Septic shock": 1, "Smear test": 1, "Speech disorder": 1, "Troponin abnormal": 1, "Vision blurred": 1, "Visual impairment": 1, "White blood cell count": 1}, "batchcodes": ["EL0203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL0303.json b/docs/data/histograms/Israel/EL0303.json
index 8aec6349f35..6429b99e2a0 100644
--- a/docs/data/histograms/Israel/EL0303.json
+++ b/docs/data/histograms/Israel/EL0303.json
@@ -1 +1 @@
-{"batchcode": "EL0303", "histograms": [{"batchcodes": ["EL0303"], "histogram": {"Deafness neurosensory": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0303", "histograms": [{"histogram": {"Deafness neurosensory": 1, "Tinnitus": 1}, "batchcodes": ["EL0303"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL1404.json b/docs/data/histograms/Israel/EL1404.json
index 1b1c29c1f3b..0b6ea2ff7a7 100644
--- a/docs/data/histograms/Israel/EL1404.json
+++ b/docs/data/histograms/Israel/EL1404.json
@@ -1 +1 @@
-{"batchcode": "EL1404", "histograms": [{"batchcodes": ["EL1404"], "histogram": {"Dyspnoea": 2, "Pericarditis": 2, "Acoustic stimulation tests": 1, "Acute myocardial infarction": 1, "Antinuclear antibody": 1, "Autoimmune haemolytic anaemia": 1, "Blood bilirubin": 1, "Deafness neurosensory": 1, "Diarrhoea": 1, "Ear discomfort": 1, "Gait disturbance": 1, "HIV test": 1, "Headache": 1, "Hepatitis viral test": 1, "Jaundice": 1, "Laboratory test": 1, "Myalgia": 1, "Pain in extremity": 1, "Pleuritic pain": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1404", "histograms": [{"histogram": {"Dyspnoea": 2, "Pericarditis": 2, "Acoustic stimulation tests": 1, "Acute myocardial infarction": 1, "Antinuclear antibody": 1, "Autoimmune haemolytic anaemia": 1, "Blood bilirubin": 1, "Deafness neurosensory": 1, "Diarrhoea": 1, "Ear discomfort": 1, "Gait disturbance": 1, "HIV test": 1, "Headache": 1, "Hepatitis viral test": 1, "Jaundice": 1, "Laboratory test": 1, "Myalgia": 1, "Pain in extremity": 1, "Pleuritic pain": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}, "batchcodes": ["EL1404"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL1406.json b/docs/data/histograms/Israel/EL1406.json
index e7171aa0ce7..826cc4185c3 100644
--- a/docs/data/histograms/Israel/EL1406.json
+++ b/docs/data/histograms/Israel/EL1406.json
@@ -1 +1 @@
-{"batchcode": "EL1406", "histograms": [{"batchcodes": ["EL1406"], "histogram": {"Myocarditis": 4, "Dyspnoea": 3, "Chest pain": 2, "Computerised tomogram": 2, "Pulmonary embolism": 2, "Abortion missed": 1, "Acute myocardial infarction": 1, "Angiogram": 1, "Asthenia": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Cough": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Haematemesis": 1, "Haemoglobin": 1, "Hyperventilation": 1, "Imaging procedure": 1, "Impaired gastric emptying": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Presyncope": 1, "Pyrexia": 1, "Syncope": 1, "Troponin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1406", "histograms": [{"histogram": {"Myocarditis": 4, "Dyspnoea": 3, "Chest pain": 2, "Computerised tomogram": 2, "Pulmonary embolism": 2, "Abortion missed": 1, "Acute myocardial infarction": 1, "Angiogram": 1, "Asthenia": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Cough": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Haematemesis": 1, "Haemoglobin": 1, "Hyperventilation": 1, "Imaging procedure": 1, "Impaired gastric emptying": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Presyncope": 1, "Pyrexia": 1, "Syncope": 1, "Troponin": 1, "Vomiting": 1}, "batchcodes": ["EL1406"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL1407.json b/docs/data/histograms/Israel/EL1407.json
index 69d95564ec9..245d5b8c04e 100644
--- a/docs/data/histograms/Israel/EL1407.json
+++ b/docs/data/histograms/Israel/EL1407.json
@@ -1 +1 @@
-{"batchcode": "EL1407", "histograms": [{"batchcodes": ["EL1407"], "histogram": {"Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1407", "histograms": [{"histogram": {"Pericarditis": 1}, "batchcodes": ["EL1407"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL44.json b/docs/data/histograms/Israel/EL44.json
index 4644f47eb73..2db9c8522cf 100644
--- a/docs/data/histograms/Israel/EL44.json
+++ b/docs/data/histograms/Israel/EL44.json
@@ -1 +1 @@
-{"batchcode": "EL44", "histograms": [{"batchcodes": ["EL44"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EL44", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EL44"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL7834.json b/docs/data/histograms/Israel/EL7834.json
index 05f33959d48..c0139d4c52a 100644
--- a/docs/data/histograms/Israel/EL7834.json
+++ b/docs/data/histograms/Israel/EL7834.json
@@ -1 +1 @@
-{"batchcode": "EL7834", "histograms": [{"batchcodes": ["EL7834"], "histogram": {"Myocarditis": 6, "Abdominal discomfort": 3, "Asthenia": 3, "Chest pain": 3, "Headache": 2, "Heavy menstrual bleeding": 2, "Immune thrombocytopenia": 2, "Pyrexia": 2, "Acute myocardial infarction": 1, "Atrial fibrillation": 1, "Blood cholesterol": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chronic obstructive pulmonary disease": 1, "Coronary artery disease": 1, "Culture throat": 1, "Death": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fall": 1, "Fatigue": 1, "General physical health deterioration": 1, "Hepatic enzyme": 1, "Hepatic enzyme abnormal": 1, "Hypoglycaemia": 1, "Hypoglycaemic seizure": 1, "Loss of consciousness": 1, "Myocardial infarction": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pericarditis": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Sinus tachycardia": 1, "Troponin": 1, "Ventricular fibrillation": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EL7834", "histograms": [{"histogram": {"Myocarditis": 6, "Abdominal discomfort": 3, "Asthenia": 3, "Chest pain": 3, "Headache": 2, "Heavy menstrual bleeding": 2, "Immune thrombocytopenia": 2, "Pyrexia": 2, "Acute myocardial infarction": 1, "Atrial fibrillation": 1, "Blood cholesterol": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chronic obstructive pulmonary disease": 1, "Coronary artery disease": 1, "Culture throat": 1, "Death": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fall": 1, "Fatigue": 1, "General physical health deterioration": 1, "Hepatic enzyme": 1, "Hepatic enzyme abnormal": 1, "Hypoglycaemia": 1, "Hypoglycaemic seizure": 1, "Loss of consciousness": 1, "Myocardial infarction": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pericarditis": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Sinus tachycardia": 1, "Troponin": 1, "Ventricular fibrillation": 1, "Vertigo": 1}, "batchcodes": ["EL7834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EL8713.json b/docs/data/histograms/Israel/EL8713.json
index d9a864f6bc3..c02870c75a9 100644
--- a/docs/data/histograms/Israel/EL8713.json
+++ b/docs/data/histograms/Israel/EL8713.json
@@ -1 +1 @@
-{"batchcode": "EL8713", "histograms": [{"batchcodes": ["EL8713"], "histogram": {"Myocarditis": 16, "Chest pain": 6, "Pyrexia": 6, "Chills": 5, "Body temperature": 4, "Cough": 4, "Asthenia": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Headache": 3, "Troponin": 3, "C-reactive protein": 2, "Computerised tomogram head": 2, "Discomfort": 2, "Dyspnoea": 2, "Fatigue": 2, "Hypoaesthesia": 2, "Myalgia": 2, "Pain": 2, "Pericarditis": 2, "Troponin increased": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Acute myocardial infarction": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "C-reactive protein increased": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cholecystitis": 1, "Computerised tomogram coronary artery": 1, "Cyanosis": 1, "Decreased appetite": 1, "Dizziness": 1, "Electrocardiogram abnormal": 1, "Electromyogram": 1, "Exposure to contaminated water": 1, "Facial paralysis": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Haematology test": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypotension": 1, "Investigation": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial necrosis marker": 1, "Nausea": 1, "Neurological examination": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain in extremity": 1, "Painful respiration": 1, "Pallor": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Photopsia": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "Viral test": 1, "Vital signs measurement": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EL8713", "histograms": [{"histogram": {"Myocarditis": 16, "Chest pain": 6, "Pyrexia": 6, "Chills": 5, "Body temperature": 4, "Cough": 4, "Asthenia": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Headache": 3, "Troponin": 3, "C-reactive protein": 2, "Computerised tomogram head": 2, "Discomfort": 2, "Dyspnoea": 2, "Fatigue": 2, "Hypoaesthesia": 2, "Myalgia": 2, "Pain": 2, "Pericarditis": 2, "Troponin increased": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Acute myocardial infarction": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "C-reactive protein increased": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cholecystitis": 1, "Computerised tomogram coronary artery": 1, "Cyanosis": 1, "Decreased appetite": 1, "Dizziness": 1, "Electrocardiogram abnormal": 1, "Electromyogram": 1, "Exposure to contaminated water": 1, "Facial paralysis": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Haematology test": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypotension": 1, "Investigation": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial necrosis marker": 1, "Nausea": 1, "Neurological examination": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain in extremity": 1, "Painful respiration": 1, "Pallor": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Photopsia": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "Viral test": 1, "Vital signs measurement": 1, "Vomiting": 1}, "batchcodes": ["EL8713"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EP6017.json b/docs/data/histograms/Israel/EP6017.json
index a44a03920fa..756db280ac0 100644
--- a/docs/data/histograms/Israel/EP6017.json
+++ b/docs/data/histograms/Israel/EP6017.json
@@ -1 +1 @@
-{"batchcode": "EP6017", "histograms": [{"batchcodes": ["EP6017"], "histogram": {"Asthenia": 2, "Body temperature": 2, "Myocarditis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Allergy to animal": 1, "Anxiety": 1, "Arthralgia": 1, "Coagulopathy": 1, "Condition aggravated": 1, "Contrast media allergy": 1, "Death": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Electrocardiogram T wave inversion": 1, "Facial paresis": 1, "Fatigue": 1, "Hearing disability": 1, "Hepatic function abnormal": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Infertility": 1, "Magnetic resonance imaging": 1, "Migraine": 1, "Mobility decreased": 1, "Myalgia": 1, "Nodule": 1, "Renal impairment": 1, "Serology test": 1, "Suicidal ideation": 1, "Swelling": 1, "Systemic inflammatory response syndrome": 1, "Tinnitus": 1, "Troponin": 1, "Troponin increased": 1, "Urticaria": 1, "Uveitis": 1, "Vaginal haemorrhage": 1, "Vasculitic rash": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6017", "histograms": [{"histogram": {"Asthenia": 2, "Body temperature": 2, "Myocarditis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Allergy to animal": 1, "Anxiety": 1, "Arthralgia": 1, "Coagulopathy": 1, "Condition aggravated": 1, "Contrast media allergy": 1, "Death": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Electrocardiogram T wave inversion": 1, "Facial paresis": 1, "Fatigue": 1, "Hearing disability": 1, "Hepatic function abnormal": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Infertility": 1, "Magnetic resonance imaging": 1, "Migraine": 1, "Mobility decreased": 1, "Myalgia": 1, "Nodule": 1, "Renal impairment": 1, "Serology test": 1, "Suicidal ideation": 1, "Swelling": 1, "Systemic inflammatory response syndrome": 1, "Tinnitus": 1, "Troponin": 1, "Troponin increased": 1, "Urticaria": 1, "Uveitis": 1, "Vaginal haemorrhage": 1, "Vasculitic rash": 1}, "batchcodes": ["EP6017"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/ER0866.json b/docs/data/histograms/Israel/ER0866.json
index 9b5434bccde..fb246e76efe 100644
--- a/docs/data/histograms/Israel/ER0866.json
+++ b/docs/data/histograms/Israel/ER0866.json
@@ -1 +1 @@
-{"batchcode": "ER0866", "histograms": [{"batchcodes": ["ER0866"], "histogram": {"Myocarditis": 15, "Chest pain": 10, "Pyrexia": 7, "Asthenia": 5, "Dizziness": 4, "Myalgia": 4, "Troponin": 4, "Body temperature": 3, "C-reactive protein": 3, "Chills": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Pericarditis": 3, "Angiogram": 2, "Bradycardia": 2, "Cerebrovascular accident": 2, "Computerised tomogram head": 2, "Cough": 2, "Death": 2, "Ear discomfort": 2, "Electroencephalogram": 2, "Fatigue": 2, "Hypoaesthesia": 2, "Pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Abortion spontaneous": 1, "Alopecia": 1, "Angina pectoris": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Back pain": 1, "Balance disorder": 1, "Biopsy": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood fibrinogen": 1, "Blood iron": 1, "Blood iron decreased": 1, "Blood lactic acid": 1, "Body temperature increased": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiogenic shock": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Colitis": 1, "Colonoscopy": 1, "Coronavirus test": 1, "Cyanosis": 1, "Diarrhoea": 1, "Drug hypersensitivity": 1, "Dyspnoea": 1, "Dysuria": 1, "Ear pain": 1, "Electromyogram": 1, "Erythema": 1, "Fibrin D dimer": 1, "Generalised tonic-clonic seizure": 1, "Haematochezia": 1, "Head discomfort": 1, "Headache": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Incontinence": 1, "Inflammation": 1, "Investigation": 1, "Laboratory test": 1, "Liver function test abnormal": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Meningitis viral": 1, "Menstruation irregular": 1, "Migraine": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "Myositis": 1, "Nasal discomfort": 1, "Nausea": 1, "Nervousness": 1, "Obstructive airways disorder": 1, "Palpitations": 1, "Parotitis": 1, "Pelvic inflammatory disease": 1, "Photophobia": 1, "Pleural effusion": 1, "Pleurisy": 1, "Premature labour": 1, "Presyncope": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary congestion": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensory loss": 1, "Sinus tachycardia": 1, "Speech disorder": 1, "Tachycardia": 1, "Tonic convulsion": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Troponin increased": 1, "Ultrasound scan": 1, "Uterine haemorrhage": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Varicella zoster virus infection": 1, "Vascular pain": 1, "Vision blurred": 1, "Vitamin B12": 1, "Vitamin B12 decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "ER0866", "histograms": [{"histogram": {"Myocarditis": 15, "Chest pain": 10, "Pyrexia": 7, "Asthenia": 5, "Dizziness": 4, "Myalgia": 4, "Troponin": 4, "Body temperature": 3, "C-reactive protein": 3, "Chills": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Pericarditis": 3, "Angiogram": 2, "Bradycardia": 2, "Cerebrovascular accident": 2, "Computerised tomogram head": 2, "Cough": 2, "Death": 2, "Ear discomfort": 2, "Electroencephalogram": 2, "Fatigue": 2, "Hypoaesthesia": 2, "Pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Abortion spontaneous": 1, "Alopecia": 1, "Angina pectoris": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Back pain": 1, "Balance disorder": 1, "Biopsy": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood fibrinogen": 1, "Blood iron": 1, "Blood iron decreased": 1, "Blood lactic acid": 1, "Body temperature increased": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiogenic shock": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Colitis": 1, "Colonoscopy": 1, "Coronavirus test": 1, "Cyanosis": 1, "Diarrhoea": 1, "Drug hypersensitivity": 1, "Dyspnoea": 1, "Dysuria": 1, "Ear pain": 1, "Electromyogram": 1, "Erythema": 1, "Fibrin D dimer": 1, "Generalised tonic-clonic seizure": 1, "Haematochezia": 1, "Head discomfort": 1, "Headache": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Incontinence": 1, "Inflammation": 1, "Investigation": 1, "Laboratory test": 1, "Liver function test abnormal": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Meningitis viral": 1, "Menstruation irregular": 1, "Migraine": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "Myositis": 1, "Nasal discomfort": 1, "Nausea": 1, "Nervousness": 1, "Obstructive airways disorder": 1, "Palpitations": 1, "Parotitis": 1, "Pelvic inflammatory disease": 1, "Photophobia": 1, "Pleural effusion": 1, "Pleurisy": 1, "Premature labour": 1, "Presyncope": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary congestion": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensory loss": 1, "Sinus tachycardia": 1, "Speech disorder": 1, "Tachycardia": 1, "Tonic convulsion": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Troponin increased": 1, "Ultrasound scan": 1, "Uterine haemorrhage": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Varicella zoster virus infection": 1, "Vascular pain": 1, "Vision blurred": 1, "Vitamin B12": 1, "Vitamin B12 decreased": 1}, "batchcodes": ["ER0866"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/ER6166.json b/docs/data/histograms/Israel/ER6166.json
index d443ee4e10b..c2c7d56ccad 100644
--- a/docs/data/histograms/Israel/ER6166.json
+++ b/docs/data/histograms/Israel/ER6166.json
@@ -1 +1 @@
-{"batchcode": "ER6166", "histograms": [{"batchcodes": ["ER6166"], "histogram": {"Myocarditis": 6, "Pyrexia": 3, "Abdominal pain": 2, "Appendicitis": 2, "Asthenia": 2, "C-reactive protein": 2, "Chills": 2, "Diarrhoea": 2, "Immune thrombocytopenia": 2, "Platelet count": 2, "SARS-CoV-2 test": 2, "Abortion missed": 1, "Aphasia": 1, "Blood fibrinogen": 1, "Blood lactic acid": 1, "Blood pressure fluctuation": 1, "Blood smear test": 1, "Blood test": 1, "Body temperature": 1, "Chest pain": 1, "Computerised tomogram": 1, "Computerised tomogram abnormal": 1, "Coombs test": 1, "Cough": 1, "Deafness neurosensory": 1, "Death": 1, "Drug ineffective": 1, "Dysphemia": 1, "Dyspnoea": 1, "Electroencephalogram": 1, "Enzyme level test": 1, "Epilepsy": 1, "Erythema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Foetal death": 1, "Inflammatory marker test": 1, "Loss of consciousness": 1, "Malaise": 1, "Myalgia": 1, "Myelitis": 1, "Neutrophil count": 1, "Platelet count decreased": 1, "Pleuritic pain": 1, "Pruritus": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1, "Troponin": 1, "Ultrasound foetal": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "ER6166", "histograms": [{"histogram": {"Myocarditis": 6, "Pyrexia": 3, "Abdominal pain": 2, "Appendicitis": 2, "Asthenia": 2, "C-reactive protein": 2, "Chills": 2, "Diarrhoea": 2, "Immune thrombocytopenia": 2, "Platelet count": 2, "SARS-CoV-2 test": 2, "Abortion missed": 1, "Aphasia": 1, "Blood fibrinogen": 1, "Blood lactic acid": 1, "Blood pressure fluctuation": 1, "Blood smear test": 1, "Blood test": 1, "Body temperature": 1, "Chest pain": 1, "Computerised tomogram": 1, "Computerised tomogram abnormal": 1, "Coombs test": 1, "Cough": 1, "Deafness neurosensory": 1, "Death": 1, "Drug ineffective": 1, "Dysphemia": 1, "Dyspnoea": 1, "Electroencephalogram": 1, "Enzyme level test": 1, "Epilepsy": 1, "Erythema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Foetal death": 1, "Inflammatory marker test": 1, "Loss of consciousness": 1, "Malaise": 1, "Myalgia": 1, "Myelitis": 1, "Neutrophil count": 1, "Platelet count decreased": 1, "Pleuritic pain": 1, "Pruritus": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1, "Troponin": 1, "Ultrasound foetal": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["ER6166"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/ER7834.json b/docs/data/histograms/Israel/ER7834.json
index b3367bc11b1..345996099fb 100644
--- a/docs/data/histograms/Israel/ER7834.json
+++ b/docs/data/histograms/Israel/ER7834.json
@@ -1 +1 @@
-{"batchcode": "ER7834", "histograms": [{"batchcodes": ["ER7834"], "histogram": {"Joint range of motion decreased": 1, "Muscular weakness": 1, "Sensory loss": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7834", "histograms": [{"histogram": {"Joint range of motion decreased": 1, "Muscular weakness": 1, "Sensory loss": 1, "Vaccination site pain": 1}, "batchcodes": ["ER7834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/ET2838.json b/docs/data/histograms/Israel/ET2838.json
index bc1eefe35a5..de25be7d4d5 100644
--- a/docs/data/histograms/Israel/ET2838.json
+++ b/docs/data/histograms/Israel/ET2838.json
@@ -1 +1 @@
-{"batchcode": "ET2838", "histograms": [{"batchcodes": ["ET2838"], "histogram": {"Chest pain": 2, "Death": 2, "Abortion missed": 1, "Body temperature": 1, "Cartilage neoplasm": 1, "Chest discomfort": 1, "Computerised tomogram head": 1, "Costochondritis": 1, "Demyelination": 1, "Dizziness": 1, "Multiple sclerosis relapse": 1, "Musculoskeletal chest pain": 1, "Pain in extremity": 1, "Painful respiration": 1, "Pericarditis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ET2838", "histograms": [{"histogram": {"Chest pain": 2, "Death": 2, "Abortion missed": 1, "Body temperature": 1, "Cartilage neoplasm": 1, "Chest discomfort": 1, "Computerised tomogram head": 1, "Costochondritis": 1, "Demyelination": 1, "Dizziness": 1, "Multiple sclerosis relapse": 1, "Musculoskeletal chest pain": 1, "Pain in extremity": 1, "Painful respiration": 1, "Pericarditis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Vomiting": 1}, "batchcodes": ["ET2838"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EW0151.json b/docs/data/histograms/Israel/EW0151.json
index d4ff53bae82..0c4af8cfd28 100644
--- a/docs/data/histograms/Israel/EW0151.json
+++ b/docs/data/histograms/Israel/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Muscular weakness": 1, "SARS-CoV-2 test": 1, "Vaccination site bruising": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Muscular weakness": 1, "SARS-CoV-2 test": 1, "Vaccination site bruising": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EW2245.json b/docs/data/histograms/Israel/EW2245.json
index 114026159d8..2123bd9fa1e 100644
--- a/docs/data/histograms/Israel/EW2245.json
+++ b/docs/data/histograms/Israel/EW2245.json
@@ -1 +1 @@
-{"batchcode": "EW2245", "histograms": [{"batchcodes": ["EW2245"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2245", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EW2245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/EW3344.json b/docs/data/histograms/Israel/EW3344.json
index 3680a588e14..70f8a5f9362 100644
--- a/docs/data/histograms/Israel/EW3344.json
+++ b/docs/data/histograms/Israel/EW3344.json
@@ -1 +1 @@
-{"batchcode": "EW3344", "histograms": [{"batchcodes": ["EW3344"], "histogram": {"Chest pain": 6, "Echocardiogram": 5, "Electrocardiogram": 5, "Off label use": 5, "Pyrexia": 5, "Immunisation": 4, "Myocarditis": 4, "Troponin": 4, "Diarrhoea": 3, "Laboratory test": 3, "Myalgia": 3, "Asthenia": 2, "Blood creatine phosphokinase": 2, "Body temperature": 2, "Death": 2, "SARS-CoV-2 test": 2, "Anaemia": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blood creatinine": 1, "Blood pressure measurement": 1, "Blood urine": 1, "Brain natriuretic peptide": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Chest discomfort": 1, "Chills": 1, "Chronic obstructive pulmonary disease": 1, "Coagulopathy": 1, "Confusional state": 1, "Coronavirus test": 1, "Cough": 1, "Dehydration": 1, "Depression": 1, "Dizziness": 1, "Dyspnoea": 1, "Extra dose administered": 1, "Fatigue": 1, "Gastroenteritis": 1, "Haemoglobin": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Protein urine": 1, "Pulmonary embolism": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Septic shock": 1, "Serology test": 1, "Sleep disorder": 1, "Tachycardia": 1, "Trigger finger": 1, "Vaccination failure": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EW3344", "histograms": [{"histogram": {"Chest pain": 6, "Echocardiogram": 5, "Electrocardiogram": 5, "Off label use": 5, "Pyrexia": 5, "Immunisation": 4, "Myocarditis": 4, "Troponin": 4, "Diarrhoea": 3, "Laboratory test": 3, "Myalgia": 3, "Asthenia": 2, "Blood creatine phosphokinase": 2, "Body temperature": 2, "Death": 2, "SARS-CoV-2 test": 2, "Anaemia": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blood creatinine": 1, "Blood pressure measurement": 1, "Blood urine": 1, "Brain natriuretic peptide": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Chest discomfort": 1, "Chills": 1, "Chronic obstructive pulmonary disease": 1, "Coagulopathy": 1, "Confusional state": 1, "Coronavirus test": 1, "Cough": 1, "Dehydration": 1, "Depression": 1, "Dizziness": 1, "Dyspnoea": 1, "Extra dose administered": 1, "Fatigue": 1, "Gastroenteritis": 1, "Haemoglobin": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Protein urine": 1, "Pulmonary embolism": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Septic shock": 1, "Serology test": 1, "Sleep disorder": 1, "Tachycardia": 1, "Trigger finger": 1, "Vaccination failure": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["EW3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FF2154.json b/docs/data/histograms/Israel/FF2154.json
index 014ceaf0993..fab0715bbc7 100644
--- a/docs/data/histograms/Israel/FF2154.json
+++ b/docs/data/histograms/Israel/FF2154.json
@@ -1 +1 @@
-{"batchcode": "FF2154", "histograms": [{"batchcodes": ["FF2154"], "histogram": {"Off label use": 17, "Immunisation": 15, "Chest pain": 6, "Pyrexia": 6, "SARS-CoV-2 test": 4, "Asthenia": 3, "Body temperature": 3, "C-reactive protein": 3, "Chills": 3, "Dyspnoea": 3, "Extra dose administered": 3, "Myocarditis": 3, "Atrial fibrillation": 2, "Cerebrovascular accident": 2, "Death": 2, "Echocardiogram": 2, "Headache": 2, "Heart rate": 2, "Loss of consciousness": 2, "Muscular weakness": 2, "Nausea": 2, "Pericarditis": 2, "Tachycardia": 2, "Troponin": 2, "White blood cell count": 2, "Acute myocardial infarction": 1, "Amnesia": 1, "Angina pectoris": 1, "Angiogram": 1, "Antiphospholipid antibodies": 1, "Appendicitis": 1, "Aspiration pleural cavity": 1, "Atrioventricular block complete": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "COVID-19": 1, "Chest X-ray": 1, "Confusional state": 1, "Coronavirus test": 1, "Culture urine": 1, "Cyanosis": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Escherichia test": 1, "Facial asymmetry": 1, "Facial paresis": 1, "Feeling abnormal": 1, "General physical health deterioration": 1, "Haematuria": 1, "Head injury": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Monoplegia": 1, "Muscle spasms": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pallor": 1, "Pleural effusion": 1, "Pneumonia": 1, "Prostatic specific antigen": 1, "Pulmonary embolism": 1, "Respiratory arrest": 1, "Sleep disorder": 1, "Sudden death": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Urinary tract infection": 1, "Urine nitrogen": 1, "Urine osmolarity": 1, "Visual impairment": 1, "Vomiting": 1, "White blood cells urine": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2154", "histograms": [{"histogram": {"Off label use": 17, "Immunisation": 15, "Chest pain": 6, "Pyrexia": 6, "SARS-CoV-2 test": 4, "Asthenia": 3, "Body temperature": 3, "C-reactive protein": 3, "Chills": 3, "Dyspnoea": 3, "Extra dose administered": 3, "Myocarditis": 3, "Atrial fibrillation": 2, "Cerebrovascular accident": 2, "Death": 2, "Echocardiogram": 2, "Headache": 2, "Heart rate": 2, "Loss of consciousness": 2, "Muscular weakness": 2, "Nausea": 2, "Pericarditis": 2, "Tachycardia": 2, "Troponin": 2, "White blood cell count": 2, "Acute myocardial infarction": 1, "Amnesia": 1, "Angina pectoris": 1, "Angiogram": 1, "Antiphospholipid antibodies": 1, "Appendicitis": 1, "Aspiration pleural cavity": 1, "Atrioventricular block complete": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "COVID-19": 1, "Chest X-ray": 1, "Confusional state": 1, "Coronavirus test": 1, "Culture urine": 1, "Cyanosis": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Escherichia test": 1, "Facial asymmetry": 1, "Facial paresis": 1, "Feeling abnormal": 1, "General physical health deterioration": 1, "Haematuria": 1, "Head injury": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Monoplegia": 1, "Muscle spasms": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pallor": 1, "Pleural effusion": 1, "Pneumonia": 1, "Prostatic specific antigen": 1, "Pulmonary embolism": 1, "Respiratory arrest": 1, "Sleep disorder": 1, "Sudden death": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Urinary tract infection": 1, "Urine nitrogen": 1, "Urine osmolarity": 1, "Visual impairment": 1, "Vomiting": 1, "White blood cells urine": 1, "X-ray": 1}, "batchcodes": ["FF2154"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FF7416.json b/docs/data/histograms/Israel/FF7416.json
index da9e21a7eb7..827dc5d8860 100644
--- a/docs/data/histograms/Israel/FF7416.json
+++ b/docs/data/histograms/Israel/FF7416.json
@@ -1 +1 @@
-{"batchcode": "FF7416", "histograms": [{"batchcodes": ["FF7416"], "histogram": {"Immunisation": 19, "Off label use": 18, "Dyspnoea": 7, "Myocarditis": 7, "Pyrexia": 7, "Chest pain": 6, "Electrocardiogram": 5, "Pericarditis": 5, "Troponin": 5, "Cough": 4, "Echocardiogram": 4, "Laboratory test": 4, "Asthenia": 3, "C-reactive protein": 3, "Chest X-ray": 3, "Angiogram": 2, "Atrial fibrillation": 2, "Back pain": 2, "Dizziness": 2, "Fatigue": 2, "Myalgia": 2, "Pneumonia": 2, "Pulmonary embolism": 2, "Rash": 2, "Rash pruritic": 2, "Abdominal pain": 1, "Antibody test": 1, "Arthralgia": 1, "Axillary pain": 1, "Blood creatine phosphokinase": 1, "Body temperature": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Demyelination": 1, "Drug ineffective": 1, "Electrocardiogram ST segment elevation": 1, "Extra dose administered": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Hepatic enzyme": 1, "Hepatitis cholestatic": 1, "Illness": 1, "Imaging procedure": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Insomnia": 1, "JC polyomavirus test": 1, "Jaundice": 1, "Lacrimation increased": 1, "Leiomyoma": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "Musculoskeletal pain": 1, "Myocardial ischaemia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Pancreatitis": 1, "Paraesthesia": 1, "Pericardial drainage": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pneumonia aspiration": 1, "Productive cough": 1, "Pulmonary hypertension": 1, "Pulmonary thrombosis": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "Right ventricular failure": 1, "Seizure": 1, "Sensory disturbance": 1, "Sepsis": 1, "Sinus tachycardia": 1, "Spirometry": 1, "Suspected COVID-19": 1, "Swelling": 1, "Symmetrical drug-related intertriginous and flexural exanthema": 1, "Troponin increased": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FF7416", "histograms": [{"histogram": {"Immunisation": 19, "Off label use": 18, "Dyspnoea": 7, "Myocarditis": 7, "Pyrexia": 7, "Chest pain": 6, "Electrocardiogram": 5, "Pericarditis": 5, "Troponin": 5, "Cough": 4, "Echocardiogram": 4, "Laboratory test": 4, "Asthenia": 3, "C-reactive protein": 3, "Chest X-ray": 3, "Angiogram": 2, "Atrial fibrillation": 2, "Back pain": 2, "Dizziness": 2, "Fatigue": 2, "Myalgia": 2, "Pneumonia": 2, "Pulmonary embolism": 2, "Rash": 2, "Rash pruritic": 2, "Abdominal pain": 1, "Antibody test": 1, "Arthralgia": 1, "Axillary pain": 1, "Blood creatine phosphokinase": 1, "Body temperature": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Demyelination": 1, "Drug ineffective": 1, "Electrocardiogram ST segment elevation": 1, "Extra dose administered": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Hepatic enzyme": 1, "Hepatitis cholestatic": 1, "Illness": 1, "Imaging procedure": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Insomnia": 1, "JC polyomavirus test": 1, "Jaundice": 1, "Lacrimation increased": 1, "Leiomyoma": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "Musculoskeletal pain": 1, "Myocardial ischaemia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Pancreatitis": 1, "Paraesthesia": 1, "Pericardial drainage": 1, "Pleural effusion": 1, "Pleuritic pain": 1, "Pneumonia aspiration": 1, "Productive cough": 1, "Pulmonary hypertension": 1, "Pulmonary thrombosis": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "Right ventricular failure": 1, "Seizure": 1, "Sensory disturbance": 1, "Sepsis": 1, "Sinus tachycardia": 1, "Spirometry": 1, "Suspected COVID-19": 1, "Swelling": 1, "Symmetrical drug-related intertriginous and flexural exanthema": 1, "Troponin increased": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["FF7416"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FF8199.json b/docs/data/histograms/Israel/FF8199.json
index c6debd826c4..d34d49b432f 100644
--- a/docs/data/histograms/Israel/FF8199.json
+++ b/docs/data/histograms/Israel/FF8199.json
@@ -1 +1 @@
-{"batchcode": "FF8199", "histograms": [{"batchcodes": ["FF8199"], "histogram": {"Off label use": 14, "Immunisation": 13, "Electrocardiogram": 8, "Troponin": 8, "Myocarditis": 7, "Pyrexia": 5, "Chest discomfort": 4, "Chest pain": 4, "Dyspnoea": 4, "Myalgia": 4, "Pain in extremity": 4, "Asthenia": 3, "Echocardiogram": 3, "Heart rate increased": 3, "Laboratory test": 3, "Pain": 3, "SARS-CoV-2 test": 3, "Arthralgia": 2, "Back pain": 2, "Blood creatine phosphokinase": 2, "Body temperature": 2, "C-reactive protein": 2, "COVID-19": 2, "Computerised tomogram": 2, "Ejection fraction": 2, "Extra dose administered": 2, "Fatigue": 2, "Full blood count": 2, "Headache": 2, "Heart rate": 2, "Immune thrombocytopenia": 2, "Magnetic resonance imaging": 2, "Oropharyngeal pain": 2, "Platelet count": 2, "Troponin increased": 2, "Vaccination failure": 2, "Abdominal pain": 1, "Arrhythmia": 1, "Arthritis": 1, "Biopsy": 1, "Blood electrolytes": 1, "Blood phosphorus": 1, "Blood test": 1, "C-reactive protein increased": 1, "Catheterisation cardiac": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chills": 1, "Clonus": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Ear pain": 1, "Ejection fraction decreased": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Exercise tolerance decreased": 1, "HIV test": 1, "Haemoglobin": 1, "Hyperhidrosis": 1, "Hyperpyrexia": 1, "Hypertonia": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Monoplegia": 1, "Neck pain": 1, "Neurological examination": 1, "Pallor": 1, "Palpitations": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngitis": 1, "Polymerase chain reaction": 1, "Pregnancy test": 1, "Pulmonary embolism": 1, "Pulmonary valve stenosis": 1, "Sinus tachycardia": 1, "Speech disorder": 1, "Syncope": 1, "Tachycardia": 1, "Thyroid function test": 1, "Thyroiditis acute": 1, "Tongue biting": 1, "Trismus": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "Wheezing": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8199", "histograms": [{"histogram": {"Off label use": 14, "Immunisation": 13, "Electrocardiogram": 8, "Troponin": 8, "Myocarditis": 7, "Pyrexia": 5, "Chest discomfort": 4, "Chest pain": 4, "Dyspnoea": 4, "Myalgia": 4, "Pain in extremity": 4, "Asthenia": 3, "Echocardiogram": 3, "Heart rate increased": 3, "Laboratory test": 3, "Pain": 3, "SARS-CoV-2 test": 3, "Arthralgia": 2, "Back pain": 2, "Blood creatine phosphokinase": 2, "Body temperature": 2, "C-reactive protein": 2, "COVID-19": 2, "Computerised tomogram": 2, "Ejection fraction": 2, "Extra dose administered": 2, "Fatigue": 2, "Full blood count": 2, "Headache": 2, "Heart rate": 2, "Immune thrombocytopenia": 2, "Magnetic resonance imaging": 2, "Oropharyngeal pain": 2, "Platelet count": 2, "Troponin increased": 2, "Vaccination failure": 2, "Abdominal pain": 1, "Arrhythmia": 1, "Arthritis": 1, "Biopsy": 1, "Blood electrolytes": 1, "Blood phosphorus": 1, "Blood test": 1, "C-reactive protein increased": 1, "Catheterisation cardiac": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chills": 1, "Clonus": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Ear pain": 1, "Ejection fraction decreased": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Exercise tolerance decreased": 1, "HIV test": 1, "Haemoglobin": 1, "Hyperhidrosis": 1, "Hyperpyrexia": 1, "Hypertonia": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Monoplegia": 1, "Neck pain": 1, "Neurological examination": 1, "Pallor": 1, "Palpitations": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngitis": 1, "Polymerase chain reaction": 1, "Pregnancy test": 1, "Pulmonary embolism": 1, "Pulmonary valve stenosis": 1, "Sinus tachycardia": 1, "Speech disorder": 1, "Syncope": 1, "Tachycardia": 1, "Thyroid function test": 1, "Thyroiditis acute": 1, "Tongue biting": 1, "Trismus": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "Wheezing": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["FF8199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FG1248.json b/docs/data/histograms/Israel/FG1248.json
index e6e9fb2713c..45a1e5a65f2 100644
--- a/docs/data/histograms/Israel/FG1248.json
+++ b/docs/data/histograms/Israel/FG1248.json
@@ -1 +1 @@
-{"batchcode": "FG1248", "histograms": [{"batchcodes": ["FG1248"], "histogram": {"Immunisation": 12, "Off label use": 12, "Chest pain": 5, "Dyspnoea": 4, "Asthenia": 3, "Myocarditis": 3, "C-reactive protein": 2, "Dizziness": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Pericarditis": 2, "Pyrexia": 2, "Troponin": 2, "Aggression": 1, "Aneurysm ruptured": 1, "Aphasia": 1, "Bell's palsy": 1, "Brain natriuretic peptide": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebrovascular arteriovenous malformation": 1, "Chest X-ray": 1, "Chills": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Cough": 1, "Demyelination": 1, "Diplopia": 1, "Dyspepsia": 1, "Ejection fraction": 1, "Embolism": 1, "Extra dose administered": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Head discomfort": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Myalgia": 1, "Myopericarditis": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Presyncope": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FG1248", "histograms": [{"histogram": {"Immunisation": 12, "Off label use": 12, "Chest pain": 5, "Dyspnoea": 4, "Asthenia": 3, "Myocarditis": 3, "C-reactive protein": 2, "Dizziness": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Pericarditis": 2, "Pyrexia": 2, "Troponin": 2, "Aggression": 1, "Aneurysm ruptured": 1, "Aphasia": 1, "Bell's palsy": 1, "Brain natriuretic peptide": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebrovascular arteriovenous malformation": 1, "Chest X-ray": 1, "Chills": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Cough": 1, "Demyelination": 1, "Diplopia": 1, "Dyspepsia": 1, "Ejection fraction": 1, "Embolism": 1, "Extra dose administered": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Head discomfort": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Myalgia": 1, "Myopericarditis": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Presyncope": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["FG1248"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FG2872.json b/docs/data/histograms/Israel/FG2872.json
index 4f7d7de6b42..c9e5cc65b4e 100644
--- a/docs/data/histograms/Israel/FG2872.json
+++ b/docs/data/histograms/Israel/FG2872.json
@@ -1 +1 @@
-{"batchcode": "FG2872", "histograms": [{"batchcodes": ["FG2872"], "histogram": {"Immunisation": 9, "Off label use": 9, "Chest pain": 6, "Dyspnoea": 3, "Myocarditis": 3, "Troponin": 3, "Body temperature": 2, "Electrocardiogram": 2, "Pain": 2, "Pyrexia": 2, "Acute myocardial infarction": 1, "Blood creatine phosphokinase": 1, "Body temperature abnormal": 1, "C-reactive protein": 1, "Cardiac monitoring": 1, "Chest discomfort": 1, "Choking": 1, "Dysphagia": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pain assessment": 1, "Pericarditis": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Productive cough": 1, "Sepsis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2872", "histograms": [{"histogram": {"Immunisation": 9, "Off label use": 9, "Chest pain": 6, "Dyspnoea": 3, "Myocarditis": 3, "Troponin": 3, "Body temperature": 2, "Electrocardiogram": 2, "Pain": 2, "Pyrexia": 2, "Acute myocardial infarction": 1, "Blood creatine phosphokinase": 1, "Body temperature abnormal": 1, "C-reactive protein": 1, "Cardiac monitoring": 1, "Chest discomfort": 1, "Choking": 1, "Dysphagia": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pain assessment": 1, "Pericarditis": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Productive cough": 1, "Sepsis": 1, "Vomiting": 1}, "batchcodes": ["FG2872"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FG2873.json b/docs/data/histograms/Israel/FG2873.json
index f0a551cb719..94eb1e9c661 100644
--- a/docs/data/histograms/Israel/FG2873.json
+++ b/docs/data/histograms/Israel/FG2873.json
@@ -1 +1 @@
-{"batchcode": "FG2873", "histograms": [{"batchcodes": ["FG2873"], "histogram": {"Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Off label use": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2873", "histograms": [{"histogram": {"Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Off label use": 1, "Paraesthesia": 1}, "batchcodes": ["FG2873"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FG9984.json b/docs/data/histograms/Israel/FG9984.json
index 31235c15135..e6aae731e0c 100644
--- a/docs/data/histograms/Israel/FG9984.json
+++ b/docs/data/histograms/Israel/FG9984.json
@@ -1 +1 @@
-{"batchcode": "FG9984", "histograms": [{"batchcodes": ["FG9984"], "histogram": {"Immunisation": 22, "Off label use": 20, "Chest pain": 16, "Electrocardiogram": 13, "Myocarditis": 13, "Troponin": 12, "C-reactive protein": 8, "Echocardiogram": 8, "Headache": 8, "Pyrexia": 8, "Pericarditis": 6, "Asthenia": 4, "Dyspnoea": 4, "Vomiting": 4, "Body temperature": 3, "Cough": 3, "Laboratory test": 3, "Nausea": 3, "Physical examination": 3, "Axillary pain": 2, "Catheterisation cardiac": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chills": 2, "Computerised tomogram": 2, "Dizziness": 2, "Fatigue": 2, "Haemoglobin": 2, "Investigation": 2, "Malaise": 2, "Myalgia": 2, "Abdominal pain": 1, "Acute respiratory distress syndrome": 1, "Angiogram": 1, "Anuria": 1, "Blood creatine phosphokinase": 1, "Blood electrolytes": 1, "Cardiovascular examination": 1, "Coagulation test": 1, "Cold sweat": 1, "Constipation": 1, "Contusion": 1, "Coronavirus test": 1, "Culture stool": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Diplopia": 1, "Dysphagia": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Fall": 1, "Heart rate": 1, "Heart rate increased": 1, "Hepatic enzyme": 1, "Hyperhidrosis": 1, "Immune thrombocytopenia": 1, "Inflammation": 1, "Influenza": 1, "Leukopenia": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Migraine": 1, "Musculoskeletal stiffness": 1, "Myopericarditis": 1, "Neck pain": 1, "Neutrophilia": 1, "Night sweats": 1, "Non-cardiac chest pain": 1, "Ocular discomfort": 1, "Optic neuritis": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Pallor": 1, "Palpitations": 1, "Pharyngitis": 1, "Platelet count": 1, "Postictal state": 1, "Product administered to patient of inappropriate age": 1, "Pulmonary oedema": 1, "Q fever": 1, "Renal failure": 1, "Renal injury": 1, "Respiration abnormal": 1, "Respiratory disorder": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sepsis": 1, "Swollen tongue": 1, "Upper respiratory tract infection": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Vision blurred": 1, "Visual impairment": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FG9984", "histograms": [{"histogram": {"Immunisation": 22, "Off label use": 20, "Chest pain": 16, "Electrocardiogram": 13, "Myocarditis": 13, "Troponin": 12, "C-reactive protein": 8, "Echocardiogram": 8, "Headache": 8, "Pyrexia": 8, "Pericarditis": 6, "Asthenia": 4, "Dyspnoea": 4, "Vomiting": 4, "Body temperature": 3, "Cough": 3, "Laboratory test": 3, "Nausea": 3, "Physical examination": 3, "Axillary pain": 2, "Catheterisation cardiac": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chills": 2, "Computerised tomogram": 2, "Dizziness": 2, "Fatigue": 2, "Haemoglobin": 2, "Investigation": 2, "Malaise": 2, "Myalgia": 2, "Abdominal pain": 1, "Acute respiratory distress syndrome": 1, "Angiogram": 1, "Anuria": 1, "Blood creatine phosphokinase": 1, "Blood electrolytes": 1, "Cardiovascular examination": 1, "Coagulation test": 1, "Cold sweat": 1, "Constipation": 1, "Contusion": 1, "Coronavirus test": 1, "Culture stool": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Diplopia": 1, "Dysphagia": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Fall": 1, "Heart rate": 1, "Heart rate increased": 1, "Hepatic enzyme": 1, "Hyperhidrosis": 1, "Immune thrombocytopenia": 1, "Inflammation": 1, "Influenza": 1, "Leukopenia": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Migraine": 1, "Musculoskeletal stiffness": 1, "Myopericarditis": 1, "Neck pain": 1, "Neutrophilia": 1, "Night sweats": 1, "Non-cardiac chest pain": 1, "Ocular discomfort": 1, "Optic neuritis": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Pallor": 1, "Palpitations": 1, "Pharyngitis": 1, "Platelet count": 1, "Postictal state": 1, "Product administered to patient of inappropriate age": 1, "Pulmonary oedema": 1, "Q fever": 1, "Renal failure": 1, "Renal injury": 1, "Respiration abnormal": 1, "Respiratory disorder": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sepsis": 1, "Swollen tongue": 1, "Upper respiratory tract infection": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Vision blurred": 1, "Visual impairment": 1, "White blood cell count": 1}, "batchcodes": ["FG9984"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FJ1964.json b/docs/data/histograms/Israel/FJ1964.json
index 23408302aae..5932f1e2d6a 100644
--- a/docs/data/histograms/Israel/FJ1964.json
+++ b/docs/data/histograms/Israel/FJ1964.json
@@ -1 +1 @@
-{"batchcode": "FJ1964", "histograms": [{"batchcodes": ["FJ1964"], "histogram": {"Immunisation": 5, "Off label use": 5, "Chest pain": 3, "Myocarditis": 2, "Nausea": 2, "Angina pectoris": 1, "Asthenia": 1, "Blood creatine increased": 1, "Blood creatinine": 1, "C-reactive protein": 1, "Condition aggravated": 1, "Echocardiogram": 1, "Exposure to unspecified agent": 1, "Malaise": 1, "Pain": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Renal failure": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1964", "histograms": [{"histogram": {"Immunisation": 5, "Off label use": 5, "Chest pain": 3, "Myocarditis": 2, "Nausea": 2, "Angina pectoris": 1, "Asthenia": 1, "Blood creatine increased": 1, "Blood creatinine": 1, "C-reactive protein": 1, "Condition aggravated": 1, "Echocardiogram": 1, "Exposure to unspecified agent": 1, "Malaise": 1, "Pain": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Renal failure": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FJ1964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FK6303.json b/docs/data/histograms/Israel/FK6303.json
index 2ad54cc0426..ecb2518df48 100644
--- a/docs/data/histograms/Israel/FK6303.json
+++ b/docs/data/histograms/Israel/FK6303.json
@@ -1 +1 @@
-{"batchcode": "FK6303", "histograms": [{"batchcodes": ["FK6303"], "histogram": {"Immunisation": 3, "Off label use": 3, "Angiogram": 1, "Condition aggravated": 1, "Confusional state": 1, "Dizziness": 1, "Electrocardiogram": 1, "Gait disturbance": 1, "Pain": 1, "Pericarditis": 1, "Seizure": 1, "Speech disorder": 1, "Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6303", "histograms": [{"histogram": {"Immunisation": 3, "Off label use": 3, "Angiogram": 1, "Condition aggravated": 1, "Confusional state": 1, "Dizziness": 1, "Electrocardiogram": 1, "Gait disturbance": 1, "Pain": 1, "Pericarditis": 1, "Seizure": 1, "Speech disorder": 1, "Transient ischaemic attack": 1}, "batchcodes": ["FK6303"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FL0203.json b/docs/data/histograms/Israel/FL0203.json
index 488e7f6c485..c4af23dd4af 100644
--- a/docs/data/histograms/Israel/FL0203.json
+++ b/docs/data/histograms/Israel/FL0203.json
@@ -1 +1 @@
-{"batchcode": "FL0203", "histograms": [{"batchcodes": ["FL0203"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "FL0203", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Nausea": 1}, "batchcodes": ["FL0203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FL7309.json b/docs/data/histograms/Israel/FL7309.json
index d66fd8e800f..b2a4cb70696 100644
--- a/docs/data/histograms/Israel/FL7309.json
+++ b/docs/data/histograms/Israel/FL7309.json
@@ -1 +1 @@
-{"batchcode": "FL7309", "histograms": [{"batchcodes": ["FL7309"], "histogram": {"Immunisation": 9, "Off label use": 9, "Chest pain": 5, "Myocarditis": 4, "Pyrexia": 4, "Troponin": 4, "Body temperature": 3, "C-reactive protein": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Acute myocardial infarction": 2, "Dyspnoea": 2, "Pericarditis": 2, "Aspiration": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Carotid artery occlusion": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Coronary artery stenosis": 1, "Death": 1, "Dizziness": 1, "Headache": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Laboratory test": 1, "Lung infiltration": 1, "Monoparesis": 1, "Myalgia": 1, "Nausea": 1, "Pericardial effusion": 1, "Pneumonia": 1, "Productive cough": 1, "Speech disorder": 1, "Vascular test": 1, "Ventricular hypokinesia": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FL7309", "histograms": [{"histogram": {"Immunisation": 9, "Off label use": 9, "Chest pain": 5, "Myocarditis": 4, "Pyrexia": 4, "Troponin": 4, "Body temperature": 3, "C-reactive protein": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Acute myocardial infarction": 2, "Dyspnoea": 2, "Pericarditis": 2, "Aspiration": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Carotid artery occlusion": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Coronary artery stenosis": 1, "Death": 1, "Dizziness": 1, "Headache": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Laboratory test": 1, "Lung infiltration": 1, "Monoparesis": 1, "Myalgia": 1, "Nausea": 1, "Pericardial effusion": 1, "Pneumonia": 1, "Productive cough": 1, "Speech disorder": 1, "Vascular test": 1, "Ventricular hypokinesia": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["FL7309"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/FL8094.json b/docs/data/histograms/Israel/FL8094.json
index c30d959104c..fb9a5a2a540 100644
--- a/docs/data/histograms/Israel/FL8094.json
+++ b/docs/data/histograms/Israel/FL8094.json
@@ -1 +1 @@
-{"batchcode": "FL8094", "histograms": [{"batchcodes": ["FL8094"], "histogram": {"Asthenia": 2, "C-reactive protein": 2, "Fatigue": 2, "Abdominal pain": 1, "Acidosis": 1, "Biopsy muscle": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Dermatomyositis": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Eating disorder": 1, "Gait disturbance": 1, "Hyperphagia": 1, "Imaging procedure": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Mumps": 1, "Pain": 1, "Pericarditis": 1, "Polydipsia": 1, "Red blood cell sedimentation rate": 1, "Seizure": 1, "Smear test": 1, "Somnolence": 1, "Tonic clonic movements": 1, "Troponin": 1, "Urinary incontinence": 1, "Vital functions abnormal": 1, "Vomiting": 1, "Water pollution": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8094", "histograms": [{"histogram": {"Asthenia": 2, "C-reactive protein": 2, "Fatigue": 2, "Abdominal pain": 1, "Acidosis": 1, "Biopsy muscle": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Dermatomyositis": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Eating disorder": 1, "Gait disturbance": 1, "Hyperphagia": 1, "Imaging procedure": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Mumps": 1, "Pain": 1, "Pericarditis": 1, "Polydipsia": 1, "Red blood cell sedimentation rate": 1, "Seizure": 1, "Smear test": 1, "Somnolence": 1, "Tonic clonic movements": 1, "Troponin": 1, "Urinary incontinence": 1, "Vital functions abnormal": 1, "Vomiting": 1, "Water pollution": 1, "Weight decreased": 1}, "batchcodes": ["FL8094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/L0200.json b/docs/data/histograms/Israel/L0200.json
index 379188cbae4..bee7df907d6 100644
--- a/docs/data/histograms/Israel/L0200.json
+++ b/docs/data/histograms/Israel/L0200.json
@@ -1 +1 @@
-{"batchcode": "L0200", "histograms": [{"batchcodes": ["L0200"], "histogram": {"Chills": 1, "Feeling cold": 1, "Myocarditis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "L0200", "histograms": [{"histogram": {"Chills": 1, "Feeling cold": 1, "Myocarditis": 1, "Pyrexia": 1}, "batchcodes": ["L0200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Israel/RR0866.json b/docs/data/histograms/Israel/RR0866.json
index 1c43fcc9546..3c9d3042fe0 100644
--- a/docs/data/histograms/Israel/RR0866.json
+++ b/docs/data/histograms/Israel/RR0866.json
@@ -1 +1 @@
-{"batchcode": "RR0866", "histograms": [{"batchcodes": ["RR0866"], "histogram": {"Blood pressure abnormal": 1, "Chest discomfort": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "RR0866", "histograms": [{"histogram": {"Blood pressure abnormal": 1, "Chest discomfort": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["RR0866"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000001A.json b/docs/data/histograms/Japan/000001A.json
index 4cf54a749db..2a1835bbf88 100644
--- a/docs/data/histograms/Japan/000001A.json
+++ b/docs/data/histograms/Japan/000001A.json
@@ -1 +1 @@
-{"batchcode": "000001A", "histograms": [{"batchcodes": ["000001A"], "histogram": {"Body temperature": 14, "Blood pressure measurement": 9, "Oxygen saturation": 9, "Computerised tomogram": 6, "Heart rate": 6, "Electrocardiogram": 5, "Haemoglobin": 5, "Platelet count": 5, "Pyrexia": 5, "White blood cell count": 4, "Activated partial thromboplastin time": 3, "Anti-ganglioside antibody": 3, "Antinuclear antibody": 3, "Blood immunoglobulin G": 3, "Blood immunoglobulin M": 3, "C-reactive protein": 3, "CSF cell count": 3, "Chest X-ray": 3, "Depressed level of consciousness": 3, "Fibrin degradation products": 3, "International normalised ratio": 3, "Laboratory test": 3, "Magnetic resonance imaging head": 3, "Physical examination": 3, "Respiratory rate": 3, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Anaphylactic reaction": 2, "Angiogram": 2, "Angiotensin converting enzyme": 2, "Anti-cyclic citrullinated peptide antibody": 2, "Aspartate aminotransferase": 2, "Blood alkaline phosphatase": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatine phosphokinase": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood immunoglobulin A": 2, "Blood immunoglobulin E": 2, "Blood iron": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood test": 2, "Blood triglycerides": 2, "Blood urea": 2, "Blood uric acid": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiac electrophysiologic study": 2, "Cardio-respiratory arrest": 2, "Coma scale": 2, "Creatinine renal clearance": 2, "Decreased appetite": 2, "Dizziness": 2, "Dyspnoea": 2, "Fibrin D dimer": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "HIV test": 2, "Haematocrit": 2, "High density lipoprotein": 2, "Immunoglobulins": 2, "Loss of consciousness": 2, "Low density lipoprotein": 2, "Malaise": 2, "Matrix metalloproteinase-3": 2, "Mycobacterium tuberculosis complex test": 2, "Nausea": 2, "Nerve conduction studies": 2, "Neurological examination": 2, "Protein total": 2, "Pulmonary embolism": 2, "Red blood cell count": 2, "Red blood cell sedimentation rate": 2, "Rheumatoid factor": 2, "Treponema test": 2, "Tricuspid valve incompetence": 2, "Ultrasound scan": 2, "X-ray": 2, "Acute myocardial infarction": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Anaphylactic shock": 1, "Anti-GAD antibody": 1, "Anti-platelet factor 4 antibody test": 1, "Anti-thyroid antibody": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antiphospholipid antibodies": 1, "Antithrombin III": 1, "Aortic dissection": 1, "Apnoea test": 1, "Arthritis reactive": 1, "Beta 2 globulin": 1, "Beta 2 microglobulin urine": 1, "Beta globulin": 1, "Biopsy spinal cord": 1, "Blood albumin": 1, "Blood beta-D-glucan": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood gases": 1, "Body temperature decreased": 1, "Botulism": 1, "Breath sounds": 1, "CSF culture": 1, "CSF lactate dehydrogenase": 1, "CSF oligoclonal band": 1, "Cardiac failure acute": 1, "Catheterisation cardiac": 1, "Cerebral ventricle dilatation": 1, "Chemical poisoning": 1, "Chills": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Condition aggravated": 1, "Cryoglobulins": 1, "Culture": 1, "Cytology": 1, "Cytomegalovirus test": 1, "DNA antibody": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Depression": 1, "Diplopia": 1, "Double stranded DNA antibody": 1, "Drug level": 1, "Dyskinesia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Encephalitis": 1, "Encephalopathy": 1, "Epilepsy": 1, "Epstein-Barr virus antibody": 1, "Erythema": 1, "Eyelid irritation": 1, "Facial paralysis": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Gait inability": 1, "Gaze palsy": 1, "Glucose-6-phosphate dehydrogenase": 1, "Haemolytic anaemia": 1, "Heart sounds": 1, "Heparin-induced thrombocytopenia test": 1, "Hepatitis B DNA assay": 1, "Hepatitis B core antibody": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C core antibody": 1, "Hepatitis C virus test": 1, "Herpes zoster oticus": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoxia": 1, "Insomnia": 1, "Interleukin-2 receptor assay": 1, "Ischaemia": 1, "Light chain analysis": 1, "Lumbar puncture": 1, "Meningitis": 1, "Meningitis aseptic": 1, "Microscopy": 1, "Mitral valve incompetence": 1, "Mononuclear cell count": 1, "Muscular weakness": 1, "Myasthenia gravis": 1, "Nephrotic syndrome": 1, "Neutrophil percentage": 1, "Ocular discomfort": 1, "Oral candidiasis": 1, "Palpitations": 1, "Peripheral venous disease": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Procalcitonin": 1, "Protein C": 1, "Protein S": 1, "Protein urine": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary arterial pressure": 1, "Pulmonary congestion": 1, "Pulmonary hypertension": 1, "Quadriplegia": 1, "Restlessness": 1, "Right ventricular enlargement": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Scan brain": 1, "Scan with contrast": 1, "Seizure": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Shock": 1, "Subarachnoid haemorrhage": 1, "Systemic lupus erythematosus": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tinnitus": 1, "Total complement activity test": 1, "Tremor": 1, "Troponin": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site pain": 1, "Varicella virus test": 1, "Ventricular septal defect": 1, "Vitamin B1": 1, "Vitamin B12": 1, "White blood cells urine": 1}}]}
\ No newline at end of file
+{"batchcode": "000001A", "histograms": [{"histogram": {"Body temperature": 14, "Blood pressure measurement": 9, "Oxygen saturation": 9, "Computerised tomogram": 6, "Heart rate": 6, "Electrocardiogram": 5, "Haemoglobin": 5, "Platelet count": 5, "Pyrexia": 5, "White blood cell count": 4, "Activated partial thromboplastin time": 3, "Anti-ganglioside antibody": 3, "Antinuclear antibody": 3, "Blood immunoglobulin G": 3, "Blood immunoglobulin M": 3, "C-reactive protein": 3, "CSF cell count": 3, "Chest X-ray": 3, "Depressed level of consciousness": 3, "Fibrin degradation products": 3, "International normalised ratio": 3, "Laboratory test": 3, "Magnetic resonance imaging head": 3, "Physical examination": 3, "Respiratory rate": 3, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Anaphylactic reaction": 2, "Angiogram": 2, "Angiotensin converting enzyme": 2, "Anti-cyclic citrullinated peptide antibody": 2, "Aspartate aminotransferase": 2, "Blood alkaline phosphatase": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatine phosphokinase": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood immunoglobulin A": 2, "Blood immunoglobulin E": 2, "Blood iron": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood test": 2, "Blood triglycerides": 2, "Blood urea": 2, "Blood uric acid": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiac electrophysiologic study": 2, "Cardio-respiratory arrest": 2, "Coma scale": 2, "Creatinine renal clearance": 2, "Decreased appetite": 2, "Dizziness": 2, "Dyspnoea": 2, "Fibrin D dimer": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "HIV test": 2, "Haematocrit": 2, "High density lipoprotein": 2, "Immunoglobulins": 2, "Loss of consciousness": 2, "Low density lipoprotein": 2, "Malaise": 2, "Matrix metalloproteinase-3": 2, "Mycobacterium tuberculosis complex test": 2, "Nausea": 2, "Nerve conduction studies": 2, "Neurological examination": 2, "Protein total": 2, "Pulmonary embolism": 2, "Red blood cell count": 2, "Red blood cell sedimentation rate": 2, "Rheumatoid factor": 2, "Treponema test": 2, "Tricuspid valve incompetence": 2, "Ultrasound scan": 2, "X-ray": 2, "Acute myocardial infarction": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Anaphylactic shock": 1, "Anti-GAD antibody": 1, "Anti-platelet factor 4 antibody test": 1, "Anti-thyroid antibody": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antiphospholipid antibodies": 1, "Antithrombin III": 1, "Aortic dissection": 1, "Apnoea test": 1, "Arthritis reactive": 1, "Beta 2 globulin": 1, "Beta 2 microglobulin urine": 1, "Beta globulin": 1, "Biopsy spinal cord": 1, "Blood albumin": 1, "Blood beta-D-glucan": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood gases": 1, "Body temperature decreased": 1, "Botulism": 1, "Breath sounds": 1, "CSF culture": 1, "CSF lactate dehydrogenase": 1, "CSF oligoclonal band": 1, "Cardiac failure acute": 1, "Catheterisation cardiac": 1, "Cerebral ventricle dilatation": 1, "Chemical poisoning": 1, "Chills": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Condition aggravated": 1, "Cryoglobulins": 1, "Culture": 1, "Cytology": 1, "Cytomegalovirus test": 1, "DNA antibody": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Depression": 1, "Diplopia": 1, "Double stranded DNA antibody": 1, "Drug level": 1, "Dyskinesia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Encephalitis": 1, "Encephalopathy": 1, "Epilepsy": 1, "Epstein-Barr virus antibody": 1, "Erythema": 1, "Eyelid irritation": 1, "Facial paralysis": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Gait inability": 1, "Gaze palsy": 1, "Glucose-6-phosphate dehydrogenase": 1, "Haemolytic anaemia": 1, "Heart sounds": 1, "Heparin-induced thrombocytopenia test": 1, "Hepatitis B DNA assay": 1, "Hepatitis B core antibody": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C core antibody": 1, "Hepatitis C virus test": 1, "Herpes zoster oticus": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoxia": 1, "Insomnia": 1, "Interleukin-2 receptor assay": 1, "Ischaemia": 1, "Light chain analysis": 1, "Lumbar puncture": 1, "Meningitis": 1, "Meningitis aseptic": 1, "Microscopy": 1, "Mitral valve incompetence": 1, "Mononuclear cell count": 1, "Muscular weakness": 1, "Myasthenia gravis": 1, "Nephrotic syndrome": 1, "Neutrophil percentage": 1, "Ocular discomfort": 1, "Oral candidiasis": 1, "Palpitations": 1, "Peripheral venous disease": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Procalcitonin": 1, "Protein C": 1, "Protein S": 1, "Protein urine": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary arterial pressure": 1, "Pulmonary congestion": 1, "Pulmonary hypertension": 1, "Quadriplegia": 1, "Restlessness": 1, "Right ventricular enlargement": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Scan brain": 1, "Scan with contrast": 1, "Seizure": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Shock": 1, "Subarachnoid haemorrhage": 1, "Systemic lupus erythematosus": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tinnitus": 1, "Total complement activity test": 1, "Tremor": 1, "Troponin": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site pain": 1, "Varicella virus test": 1, "Ventricular septal defect": 1, "Vitamin B1": 1, "Vitamin B12": 1, "White blood cells urine": 1}, "batchcodes": ["000001A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000005A.json b/docs/data/histograms/Japan/000005A.json
index a7a2af8ee15..b5b5a65e450 100644
--- a/docs/data/histograms/Japan/000005A.json
+++ b/docs/data/histograms/Japan/000005A.json
@@ -1 +1 @@
-{"batchcode": "000005A", "histograms": [{"batchcodes": ["000005A"], "histogram": {"Body temperature": 8, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Fall": 2, "Neuropathy peripheral": 2, "Agitation": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Blood test": 1, "C-reactive protein": 1, "CSF test": 1, "Carotid artery stenosis": 1, "Cell-mediated immune deficiency": 1, "Cerebral infarction": 1, "Coma scale": 1, "Contusion": 1, "Dehydration": 1, "Delirium": 1, "Disorientation": 1, "Enterocolitis": 1, "Facial paralysis": 1, "Facial spasm": 1, "Feeding disorder": 1, "Hallucination": 1, "Heart rate": 1, "Herpes zoster": 1, "Imaging procedure": 1, "Internal haemorrhage": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Oxygen saturation": 1, "Poriomania": 1, "Presyncope": 1, "Pyrexia": 1, "Seizure": 1, "Spinal compression fracture": 1, "Sudden cardiac death": 1, "Thrombocytopenic purpura": 1, "Tremor": 1, "Type I hypersensitivity": 1, "Vaccination site swelling": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000005A", "histograms": [{"histogram": {"Body temperature": 8, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Fall": 2, "Neuropathy peripheral": 2, "Agitation": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Blood test": 1, "C-reactive protein": 1, "CSF test": 1, "Carotid artery stenosis": 1, "Cell-mediated immune deficiency": 1, "Cerebral infarction": 1, "Coma scale": 1, "Contusion": 1, "Dehydration": 1, "Delirium": 1, "Disorientation": 1, "Enterocolitis": 1, "Facial paralysis": 1, "Facial spasm": 1, "Feeding disorder": 1, "Hallucination": 1, "Heart rate": 1, "Herpes zoster": 1, "Imaging procedure": 1, "Internal haemorrhage": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Oxygen saturation": 1, "Poriomania": 1, "Presyncope": 1, "Pyrexia": 1, "Seizure": 1, "Spinal compression fracture": 1, "Sudden cardiac death": 1, "Thrombocytopenic purpura": 1, "Tremor": 1, "Type I hypersensitivity": 1, "Vaccination site swelling": 1, "White blood cell count": 1}, "batchcodes": ["000005A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000006A.json b/docs/data/histograms/Japan/000006A.json
index dcdfaa8e92c..586ac9ea77c 100644
--- a/docs/data/histograms/Japan/000006A.json
+++ b/docs/data/histograms/Japan/000006A.json
@@ -1 +1 @@
-{"batchcode": "000006A", "histograms": [{"batchcodes": ["000006A"], "histogram": {"Body temperature": 4, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Magnetic resonance imaging head": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Anorectal disorder": 1, "Asthenia": 1, "Back pain": 1, "Bladder disorder": 1, "Blood test": 1, "CSF test": 1, "Cerebral microinfarction": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Fall": 1, "Headache": 1, "Heart rate": 1, "Hypersensitivity": 1, "Liver disorder": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Paraplegia": 1, "Reflex test": 1, "Sensory disturbance": 1, "Still's disease": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000006A", "histograms": [{"histogram": {"Body temperature": 4, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Magnetic resonance imaging head": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Anorectal disorder": 1, "Asthenia": 1, "Back pain": 1, "Bladder disorder": 1, "Blood test": 1, "CSF test": 1, "Cerebral microinfarction": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Fall": 1, "Headache": 1, "Heart rate": 1, "Hypersensitivity": 1, "Liver disorder": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Paraplegia": 1, "Reflex test": 1, "Sensory disturbance": 1, "Still's disease": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vital signs measurement": 1}, "batchcodes": ["000006A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000007A.json b/docs/data/histograms/Japan/000007A.json
index 6e6f6595b7b..9968510d47d 100644
--- a/docs/data/histograms/Japan/000007A.json
+++ b/docs/data/histograms/Japan/000007A.json
@@ -1 +1 @@
-{"batchcode": "000007A", "histograms": [{"batchcodes": ["000007A"], "histogram": {"Body temperature": 5, "Anaphylactoid reaction": 2, "Blood pressure measurement": 2, "Acute disseminated encephalomyelitis": 1, "Balance disorder": 1, "Blood test": 1, "Brain neoplasm": 1, "Coma scale": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysarthria": 1, "Facial paralysis": 1, "Fall": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Oxygen saturation": 1, "Presyncope": 1, "Pyrexia": 1, "Thermal burn": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000007A", "histograms": [{"histogram": {"Body temperature": 5, "Anaphylactoid reaction": 2, "Blood pressure measurement": 2, "Acute disseminated encephalomyelitis": 1, "Balance disorder": 1, "Blood test": 1, "Brain neoplasm": 1, "Coma scale": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysarthria": 1, "Facial paralysis": 1, "Fall": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Oxygen saturation": 1, "Presyncope": 1, "Pyrexia": 1, "Thermal burn": 1, "Vital signs measurement": 1}, "batchcodes": ["000007A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000008A.json b/docs/data/histograms/Japan/000008A.json
index 735eab969a2..a5b9e1142d5 100644
--- a/docs/data/histograms/Japan/000008A.json
+++ b/docs/data/histograms/Japan/000008A.json
@@ -1 +1 @@
-{"batchcode": "000008A", "histograms": [{"batchcodes": ["000008A", "EP9605"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["000008A"], "histogram": {"Body temperature": 3, "Malaise": 3, "Blood pressure measurement": 2, "Magnetic resonance imaging": 2, "Abdominal pain": 1, "Antiacetylcholine receptor antibody": 1, "Apraxia": 1, "Autoimmune thyroiditis": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "C-reactive protein": 1, "Cerebral infarction": 1, "Cognitive disorder": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspraxia": 1, "Facial paralysis": 1, "Fatigue": 1, "Gait disturbance": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Investigation": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Monoparesis": 1, "Muscular weakness": 1, "Myasthenia gravis": 1, "Myelitis": 1, "Paraesthesia": 1, "Paralysis": 1, "Paraplegia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Presyncope": 1, "Prostate cancer": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Tensilon test": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000008A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["000008A", "EP9605"]}, {"histogram": {"Body temperature": 3, "Malaise": 3, "Blood pressure measurement": 2, "Magnetic resonance imaging": 2, "Abdominal pain": 1, "Antiacetylcholine receptor antibody": 1, "Apraxia": 1, "Autoimmune thyroiditis": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "C-reactive protein": 1, "Cerebral infarction": 1, "Cognitive disorder": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspraxia": 1, "Facial paralysis": 1, "Fatigue": 1, "Gait disturbance": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Investigation": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Monoparesis": 1, "Muscular weakness": 1, "Myasthenia gravis": 1, "Myelitis": 1, "Paraesthesia": 1, "Paralysis": 1, "Paraplegia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Presyncope": 1, "Prostate cancer": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Tensilon test": 1, "White blood cell count": 1}, "batchcodes": ["000008A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000009A.json b/docs/data/histograms/Japan/000009A.json
index 8ec7b532245..69747ad8ed3 100644
--- a/docs/data/histograms/Japan/000009A.json
+++ b/docs/data/histograms/Japan/000009A.json
@@ -1 +1 @@
-{"batchcode": "000009A", "histograms": [{"batchcodes": ["000009A"], "histogram": {"Body temperature": 15, "Pyrexia": 8, "Computerised tomogram head": 2, "Malaise": 2, "Muscular weakness": 2, "SARS-CoV-2 test": 2, "Urinary incontinence": 2, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Altered state of consciousness": 1, "Anti-ganglioside antibody": 1, "Blood albumin": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Blood iron": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood zinc": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Death": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Fall": 1, "Guillain-Barre syndrome": 1, "Hemiplegia": 1, "Hyperkalaemia": 1, "Hyperventilation": 1, "Hypoxia": 1, "IIIrd nerve paralysis": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Influenza virus test": 1, "Investigation": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Mobility decreased": 1, "Movement disorder": 1, "Neutrophil count": 1, "Optic neuritis": 1, "Optic perineuritis": 1, "Orthostatic hypotension": 1, "Pain": 1, "Physical deconditioning": 1, "Pneumonia": 1, "Respiratory arrest": 1, "Seizure": 1, "Shock": 1, "Tachycardia": 1, "Tolosa-Hunt syndrome": 1, "Troponin": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Visual acuity tests": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000009A", "histograms": [{"histogram": {"Body temperature": 15, "Pyrexia": 8, "Computerised tomogram head": 2, "Malaise": 2, "Muscular weakness": 2, "SARS-CoV-2 test": 2, "Urinary incontinence": 2, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Altered state of consciousness": 1, "Anti-ganglioside antibody": 1, "Blood albumin": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Blood iron": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood zinc": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Death": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Fall": 1, "Guillain-Barre syndrome": 1, "Hemiplegia": 1, "Hyperkalaemia": 1, "Hyperventilation": 1, "Hypoxia": 1, "IIIrd nerve paralysis": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Influenza virus test": 1, "Investigation": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Mobility decreased": 1, "Movement disorder": 1, "Neutrophil count": 1, "Optic neuritis": 1, "Optic perineuritis": 1, "Orthostatic hypotension": 1, "Pain": 1, "Physical deconditioning": 1, "Pneumonia": 1, "Respiratory arrest": 1, "Seizure": 1, "Shock": 1, "Tachycardia": 1, "Tolosa-Hunt syndrome": 1, "Troponin": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Visual acuity tests": 1, "Vital signs measurement": 1}, "batchcodes": ["000009A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000011A.json b/docs/data/histograms/Japan/000011A.json
index dd6b219dda4..5ad9a0c10a6 100644
--- a/docs/data/histograms/Japan/000011A.json
+++ b/docs/data/histograms/Japan/000011A.json
@@ -1 +1 @@
-{"batchcode": "000011A", "histograms": [{"batchcodes": ["000011A"], "histogram": {"Body temperature": 3, "Computerised tomogram": 2, "Pyrexia": 2, "Acute kidney injury": 1, "Altered state of consciousness": 1, "Angiogram": 1, "Bacterial test": 1, "Blood creatinine": 1, "Blood potassium": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Coma scale": 1, "Cyanosis": 1, "Cytology": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Fungal test": 1, "Gastrointestinal haemorrhage": 1, "Haemorrhage": 1, "Heart rate": 1, "Hyperkalaemia": 1, "Interchange of vaccine products": 1, "Lung opacity": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Meningitis aseptic": 1, "Myelitis": 1, "Transient global amnesia": 1, "Viral test": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000011A", "histograms": [{"histogram": {"Body temperature": 3, "Computerised tomogram": 2, "Pyrexia": 2, "Acute kidney injury": 1, "Altered state of consciousness": 1, "Angiogram": 1, "Bacterial test": 1, "Blood creatinine": 1, "Blood potassium": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Coma scale": 1, "Cyanosis": 1, "Cytology": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Fungal test": 1, "Gastrointestinal haemorrhage": 1, "Haemorrhage": 1, "Heart rate": 1, "Hyperkalaemia": 1, "Interchange of vaccine products": 1, "Lung opacity": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Meningitis aseptic": 1, "Myelitis": 1, "Transient global amnesia": 1, "Viral test": 1, "Vital signs measurement": 1}, "batchcodes": ["000011A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000012A.json b/docs/data/histograms/Japan/000012A.json
index fe94b92aa98..fb7dd313dd7 100644
--- a/docs/data/histograms/Japan/000012A.json
+++ b/docs/data/histograms/Japan/000012A.json
@@ -1 +1 @@
-{"batchcode": "000012A", "histograms": [{"batchcodes": ["000012A"], "histogram": {"Body temperature": 2, "Loss of consciousness": 2, "Abdominal pain": 1, "Acidosis": 1, "Activated partial thromboplastin time": 1, "Acute respiratory distress syndrome": 1, "Aortic dissection": 1, "Blood fibrinogen": 1, "Blood pressure measurement": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Dyspnoea": 1, "Embolism": 1, "Erythema": 1, "Fall": 1, "Fibrin D dimer": 1, "Flushing": 1, "Haematocrit": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertrophy": 1, "Lacrimation increased": 1, "Nausea": 1, "Nucleic acid test": 1, "Oxygen saturation": 1, "Platelet count": 1, "Pregnancy": 1, "Prothrombin time": 1, "Pulse absent": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Thrombocytopenia": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vital signs measurement": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000012A", "histograms": [{"histogram": {"Body temperature": 2, "Loss of consciousness": 2, "Abdominal pain": 1, "Acidosis": 1, "Activated partial thromboplastin time": 1, "Acute respiratory distress syndrome": 1, "Aortic dissection": 1, "Blood fibrinogen": 1, "Blood pressure measurement": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Dyspnoea": 1, "Embolism": 1, "Erythema": 1, "Fall": 1, "Fibrin D dimer": 1, "Flushing": 1, "Haematocrit": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertrophy": 1, "Lacrimation increased": 1, "Nausea": 1, "Nucleic acid test": 1, "Oxygen saturation": 1, "Platelet count": 1, "Pregnancy": 1, "Prothrombin time": 1, "Pulse absent": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Thrombocytopenia": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vital signs measurement": 1, "White blood cell count": 1}, "batchcodes": ["000012A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000013A.json b/docs/data/histograms/Japan/000013A.json
index 9ec0d06cdb1..a68743615fd 100644
--- a/docs/data/histograms/Japan/000013A.json
+++ b/docs/data/histograms/Japan/000013A.json
@@ -1 +1 @@
-{"batchcode": "000013A", "histograms": [{"batchcodes": ["000013A"], "histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Palpitations": 2, "Agitation": 1, "Arrhythmia": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Hyperventilation": 1, "Overdose": 1, "Respiratory rate": 1, "Tachycardia paroxysmal": 1, "Tonic convulsion": 1}}]}
\ No newline at end of file
+{"batchcode": "000013A", "histograms": [{"histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Palpitations": 2, "Agitation": 1, "Arrhythmia": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Hyperventilation": 1, "Overdose": 1, "Respiratory rate": 1, "Tachycardia paroxysmal": 1, "Tonic convulsion": 1}, "batchcodes": ["000013A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000017A.json b/docs/data/histograms/Japan/000017A.json
index 22c45249e8a..dc5632fc93f 100644
--- a/docs/data/histograms/Japan/000017A.json
+++ b/docs/data/histograms/Japan/000017A.json
@@ -1 +1 @@
-{"batchcode": "000017A", "histograms": [{"batchcodes": ["000017A"], "histogram": {"Body temperature": 9, "Pyrexia": 6, "Malaise": 4, "Blood pressure measurement": 3, "Decreased appetite": 3, "Heart rate": 3, "Oxygen saturation": 3, "C-reactive protein": 2, "Coma scale": 2, "Dehydration": 2, "Fall": 2, "Loss of consciousness": 2, "Allergy to vaccine": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asterixis": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Decreased activity": 1, "Depressed level of consciousness": 1, "Feeling hot": 1, "Haematuria": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza virus test": 1, "Insomnia": 1, "Mouth ulceration": 1, "Muscle spasms": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Performance status decreased": 1, "Physical deconditioning": 1, "Presyncope": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Spinal osteoarthritis": 1, "Stab wound": 1, "Vaccination site pain": 1, "Visual impairment": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000017A", "histograms": [{"histogram": {"Body temperature": 9, "Pyrexia": 6, "Malaise": 4, "Blood pressure measurement": 3, "Decreased appetite": 3, "Heart rate": 3, "Oxygen saturation": 3, "C-reactive protein": 2, "Coma scale": 2, "Dehydration": 2, "Fall": 2, "Loss of consciousness": 2, "Allergy to vaccine": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asterixis": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Decreased activity": 1, "Depressed level of consciousness": 1, "Feeling hot": 1, "Haematuria": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza virus test": 1, "Insomnia": 1, "Mouth ulceration": 1, "Muscle spasms": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Performance status decreased": 1, "Physical deconditioning": 1, "Presyncope": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Spinal osteoarthritis": 1, "Stab wound": 1, "Vaccination site pain": 1, "Visual impairment": 1, "Vital signs measurement": 1}, "batchcodes": ["000017A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000018A.json b/docs/data/histograms/Japan/000018A.json
index 6b6669ec10e..f85171a5f5a 100644
--- a/docs/data/histograms/Japan/000018A.json
+++ b/docs/data/histograms/Japan/000018A.json
@@ -1 +1 @@
-{"batchcode": "000018A", "histograms": [{"batchcodes": ["000018A"], "histogram": {"Body temperature": 8, "Oxygen saturation": 4, "Blood pressure measurement": 2, "Heart rate": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure systolic": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomyopathy": 1, "Cellulitis": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Death": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Loss of consciousness": 1, "Meningitis": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nausea": 1, "Pallor": 1, "Physical deconditioning": 1, "Presyncope": 1, "Seizure": 1, "Troponin": 1, "Troponin I": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000018A", "histograms": [{"histogram": {"Body temperature": 8, "Oxygen saturation": 4, "Blood pressure measurement": 2, "Heart rate": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure systolic": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomyopathy": 1, "Cellulitis": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Death": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Loss of consciousness": 1, "Meningitis": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nausea": 1, "Pallor": 1, "Physical deconditioning": 1, "Presyncope": 1, "Seizure": 1, "Troponin": 1, "Troponin I": 1, "Vital signs measurement": 1}, "batchcodes": ["000018A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000020A.json b/docs/data/histograms/Japan/000020A.json
index c399500578e..1e7ba57d276 100644
--- a/docs/data/histograms/Japan/000020A.json
+++ b/docs/data/histograms/Japan/000020A.json
@@ -1 +1 @@
-{"batchcode": "000020A", "histograms": [{"batchcodes": ["000020A"], "histogram": {"Body temperature": 6, "Blood test": 4, "Computerised tomogram": 3, "Cardio-respiratory arrest": 2, "Magnetic resonance imaging": 2, "Neuropathy peripheral": 2, "Pain": 2, "Pyrexia": 2, "Altered state of consciousness": 1, "Amyotrophic lateral sclerosis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Cardiac death": 1, "Cardiac failure acute": 1, "Coma scale": 1, "Electromyogram": 1, "Erythema": 1, "Fall": 1, "Gait disturbance": 1, "Grip strength decreased": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Interstitial lung disease": 1, "Meningitis aseptic": 1, "Meningoencephalitis herpetic": 1, "Movement disorder": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nerve conduction studies": 1, "Neuroleptic malignant syndrome": 1, "Polyarthritis": 1, "Poriomania": 1, "Respiratory failure": 1, "Rheumatoid factor": 1, "Seizure": 1, "Seronegative arthritis": 1, "Swelling face": 1, "Tachypnoea": 1, "Taste disorder": 1, "Troponin I": 1, "Troponin I increased": 1, "Ultrasound joint": 1, "Vaccination site swelling": 1, "Viral test": 1, "Wound": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "000020A", "histograms": [{"histogram": {"Body temperature": 6, "Blood test": 4, "Computerised tomogram": 3, "Cardio-respiratory arrest": 2, "Magnetic resonance imaging": 2, "Neuropathy peripheral": 2, "Pain": 2, "Pyrexia": 2, "Altered state of consciousness": 1, "Amyotrophic lateral sclerosis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Cardiac death": 1, "Cardiac failure acute": 1, "Coma scale": 1, "Electromyogram": 1, "Erythema": 1, "Fall": 1, "Gait disturbance": 1, "Grip strength decreased": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Interstitial lung disease": 1, "Meningitis aseptic": 1, "Meningoencephalitis herpetic": 1, "Movement disorder": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nerve conduction studies": 1, "Neuroleptic malignant syndrome": 1, "Polyarthritis": 1, "Poriomania": 1, "Respiratory failure": 1, "Rheumatoid factor": 1, "Seizure": 1, "Seronegative arthritis": 1, "Swelling face": 1, "Tachypnoea": 1, "Taste disorder": 1, "Troponin I": 1, "Troponin I increased": 1, "Ultrasound joint": 1, "Vaccination site swelling": 1, "Viral test": 1, "Wound": 1, "X-ray": 1}, "batchcodes": ["000020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000021A.json b/docs/data/histograms/Japan/000021A.json
index 5918366ca2d..32cf242df2d 100644
--- a/docs/data/histograms/Japan/000021A.json
+++ b/docs/data/histograms/Japan/000021A.json
@@ -1 +1 @@
-{"batchcode": "000021A", "histograms": [{"batchcodes": ["000021A", "EW0201", "FC5947"], "histogram": {"Antineutrophil cytoplasmic antibody": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Chills": 1, "Eosinophilia": 1, "Infarction": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Peroneal nerve palsy": 1, "Pyrexia": 1, "Vasculitis": 1, "White blood cell count": 1}}, {"batchcodes": ["000021A"], "histogram": {"Body temperature": 4, "Asthenia": 2, "Computerised tomogram": 2, "Pyrexia": 2, "Angiogram": 1, "Anti-ganglioside antibody": 1, "Apnoea": 1, "Barium swallow": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Coma": 1, "Coma scale": 1, "Death": 1, "Decreased appetite": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Grip strength": 1, "Guillain-Barre syndrome": 1, "Interchange of vaccine products": 1, "Intracranial aneurysm": 1, "Laboratory test": 1, "Magnetic resonance imaging head": 1, "Myocardial infarction": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Pulmonary oedema": 1, "Rhabdomyolysis": 1, "Stertor": 1, "Subarachnoid haemorrhage": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "000021A", "histograms": [{"histogram": {"Antineutrophil cytoplasmic antibody": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Chills": 1, "Eosinophilia": 1, "Infarction": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Peroneal nerve palsy": 1, "Pyrexia": 1, "Vasculitis": 1, "White blood cell count": 1}, "batchcodes": ["000021A", "EW0201", "FC5947"]}, {"histogram": {"Body temperature": 4, "Asthenia": 2, "Computerised tomogram": 2, "Pyrexia": 2, "Angiogram": 1, "Anti-ganglioside antibody": 1, "Apnoea": 1, "Barium swallow": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Coma": 1, "Coma scale": 1, "Death": 1, "Decreased appetite": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Grip strength": 1, "Guillain-Barre syndrome": 1, "Interchange of vaccine products": 1, "Intracranial aneurysm": 1, "Laboratory test": 1, "Magnetic resonance imaging head": 1, "Myocardial infarction": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Pulmonary oedema": 1, "Rhabdomyolysis": 1, "Stertor": 1, "Subarachnoid haemorrhage": 1, "Vaccination site pain": 1}, "batchcodes": ["000021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000024A.json b/docs/data/histograms/Japan/000024A.json
index e76b2c85296..5c2ec4454f7 100644
--- a/docs/data/histograms/Japan/000024A.json
+++ b/docs/data/histograms/Japan/000024A.json
@@ -1 +1 @@
-{"batchcode": "000024A", "histograms": [{"batchcodes": ["000024A"], "histogram": {"Body temperature": 4, "Altered state of consciousness": 3, "Pyrexia": 3, "Blood test": 2, "Coma scale": 2, "Fall": 2, "Hyperkalaemia": 2, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Computerised tomogram head": 1, "Dehydration": 1, "Dizziness": 1, "Dyspnoea": 1, "Eating disorder symptom": 1, "Gait disturbance": 1, "Glossoptosis": 1, "Haematoma": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hypersensitivity": 1, "Intracranial aneurysm": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Platelet count decreased": 1, "Presyncope": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Seizure": 1, "Shock": 1, "Subarachnoid haemorrhage": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000024A", "histograms": [{"histogram": {"Body temperature": 4, "Altered state of consciousness": 3, "Pyrexia": 3, "Blood test": 2, "Coma scale": 2, "Fall": 2, "Hyperkalaemia": 2, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Computerised tomogram head": 1, "Dehydration": 1, "Dizziness": 1, "Dyspnoea": 1, "Eating disorder symptom": 1, "Gait disturbance": 1, "Glossoptosis": 1, "Haematoma": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hypersensitivity": 1, "Intracranial aneurysm": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Platelet count decreased": 1, "Presyncope": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Seizure": 1, "Shock": 1, "Subarachnoid haemorrhage": 1, "Vital signs measurement": 1}, "batchcodes": ["000024A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000025A.json b/docs/data/histograms/Japan/000025A.json
index 67fb27fb817..621107abf4a 100644
--- a/docs/data/histograms/Japan/000025A.json
+++ b/docs/data/histograms/Japan/000025A.json
@@ -1 +1 @@
-{"batchcode": "000025A", "histograms": [{"batchcodes": ["000025A"], "histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Blood creatine phosphokinase": 1, "Brain stem infarction": 1, "C-reactive protein increased": 1, "Cardiac arrest": 1, "Cerebral infarction": 1, "Computerised tomogram": 1, "Death": 1, "Decreased appetite": 1, "Disability assessment scale": 1, "Dyskinesia": 1, "Encephalopathy": 1, "Fall": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Meningitis aseptic": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Physical deconditioning": 1, "Presyncope": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "000025A", "histograms": [{"histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Blood creatine phosphokinase": 1, "Brain stem infarction": 1, "C-reactive protein increased": 1, "Cardiac arrest": 1, "Cerebral infarction": 1, "Computerised tomogram": 1, "Death": 1, "Decreased appetite": 1, "Disability assessment scale": 1, "Dyskinesia": 1, "Encephalopathy": 1, "Fall": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Meningitis aseptic": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Physical deconditioning": 1, "Presyncope": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["000025A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000026A.json b/docs/data/histograms/Japan/000026A.json
index bd4bbff7656..566bb56b75d 100644
--- a/docs/data/histograms/Japan/000026A.json
+++ b/docs/data/histograms/Japan/000026A.json
@@ -1 +1 @@
-{"batchcode": "000026A", "histograms": [{"batchcodes": ["000026A"], "histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Blood test": 2, "Oxygen saturation": 2, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Death": 1, "Decreased appetite": 1, "Drug eruption": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Eosinophil percentage": 1, "Erythema multiforme": 1, "Eyelid oedema": 1, "Fibrin D dimer": 1, "Gastric ulcer": 1, "Gastric varices haemorrhage": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hepatosplenomegaly": 1, "High density lipoprotein": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Insomnia": 1, "Interleukin-2 receptor assay": 1, "International normalised ratio": 1, "Investigation": 1, "Laboratory test": 1, "Liver disorder": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin": 1, "Neutrophil count": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Pericarditis": 1, "Platelet count": 1, "Procalcitonin": 1, "SARS-CoV-2 antibody test": 1, "Serum ferritin": 1, "Troponin I": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "000026A", "histograms": [{"histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Blood test": 2, "Oxygen saturation": 2, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Death": 1, "Decreased appetite": 1, "Drug eruption": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Eosinophil percentage": 1, "Erythema multiforme": 1, "Eyelid oedema": 1, "Fibrin D dimer": 1, "Gastric ulcer": 1, "Gastric varices haemorrhage": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hepatosplenomegaly": 1, "High density lipoprotein": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Insomnia": 1, "Interleukin-2 receptor assay": 1, "International normalised ratio": 1, "Investigation": 1, "Laboratory test": 1, "Liver disorder": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin": 1, "Neutrophil count": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Pericarditis": 1, "Platelet count": 1, "Procalcitonin": 1, "SARS-CoV-2 antibody test": 1, "Serum ferritin": 1, "Troponin I": 1, "Weight decreased": 1}, "batchcodes": ["000026A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000028A.json b/docs/data/histograms/Japan/000028A.json
index eceedd0c352..f9e213e93ac 100644
--- a/docs/data/histograms/Japan/000028A.json
+++ b/docs/data/histograms/Japan/000028A.json
@@ -1 +1 @@
-{"batchcode": "000028A", "histograms": [{"batchcodes": ["000028A"], "histogram": {"Body temperature": 4, "Blood pressure measurement": 3, "CSF cell count": 3, "Pyrexia": 3, "Anti-ganglioside antibody": 2, "CSF glucose": 2, "CSF protein": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Death": 2, "Diplopia": 2, "Heart rate": 2, "Magnetic resonance imaging": 2, "Oxygen saturation": 2, "Tremor": 2, "Acute disseminated encephalomyelitis": 1, "Antibody test": 1, "Asthenia": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Binocular eye movement disorder": 1, "Blood creatine phosphokinase": 1, "Blood pressure decreased": 1, "CSF immunoglobulin G index": 1, "CSF oligoclonal band": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cerebellar ataxia": 1, "Cerebral infarction": 1, "Chills": 1, "Coma scale": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Coronavirus infection": 1, "Cytology": 1, "Depressed level of consciousness": 1, "Diffusion-weighted brain MRI": 1, "Dysarthria": 1, "Dysphagia": 1, "Facial paralysis": 1, "Facial paresis": 1, "Guillain-Barre syndrome": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hyporeflexia": 1, "Idiopathic pulmonary fibrosis": 1, "Illness": 1, "Interstitial lung disease": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Myelin oligodendrocyte glycoprotein antibody-associated disease": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nystagmus": 1, "Ophthalmoplegia": 1, "Peripheral coldness": 1, "Protein total": 1, "Reflex test": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000028A", "histograms": [{"histogram": {"Body temperature": 4, "Blood pressure measurement": 3, "CSF cell count": 3, "Pyrexia": 3, "Anti-ganglioside antibody": 2, "CSF glucose": 2, "CSF protein": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Death": 2, "Diplopia": 2, "Heart rate": 2, "Magnetic resonance imaging": 2, "Oxygen saturation": 2, "Tremor": 2, "Acute disseminated encephalomyelitis": 1, "Antibody test": 1, "Asthenia": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Binocular eye movement disorder": 1, "Blood creatine phosphokinase": 1, "Blood pressure decreased": 1, "CSF immunoglobulin G index": 1, "CSF oligoclonal band": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cerebellar ataxia": 1, "Cerebral infarction": 1, "Chills": 1, "Coma scale": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Coronavirus infection": 1, "Cytology": 1, "Depressed level of consciousness": 1, "Diffusion-weighted brain MRI": 1, "Dysarthria": 1, "Dysphagia": 1, "Facial paralysis": 1, "Facial paresis": 1, "Guillain-Barre syndrome": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Hyporeflexia": 1, "Idiopathic pulmonary fibrosis": 1, "Illness": 1, "Interstitial lung disease": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Myelin oligodendrocyte glycoprotein antibody-associated disease": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nystagmus": 1, "Ophthalmoplegia": 1, "Peripheral coldness": 1, "Protein total": 1, "Reflex test": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Vomiting": 1}, "batchcodes": ["000028A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000048A.json b/docs/data/histograms/Japan/000048A.json
index aa74c55dad5..33743ab705e 100644
--- a/docs/data/histograms/Japan/000048A.json
+++ b/docs/data/histograms/Japan/000048A.json
@@ -1 +1 @@
-{"batchcode": "000048A", "histograms": [{"batchcodes": ["000048A"], "histogram": {"Blood test": 3, "Body temperature": 3, "Angiogram": 1, "Blood pressure systolic": 1, "CSF test": 1, "Cellulitis": 1, "Clonic convulsion": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Culture": 1, "Drug screen": 1, "Eosinophilic pneumonia acute": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Illusion": 1, "Mobility decreased": 1, "Presyncope": 1, "Pyrexia": 1, "Respiratory failure": 1, "Restlessness": 1, "Tremor": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000048A", "histograms": [{"histogram": {"Blood test": 3, "Body temperature": 3, "Angiogram": 1, "Blood pressure systolic": 1, "CSF test": 1, "Cellulitis": 1, "Clonic convulsion": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Culture": 1, "Drug screen": 1, "Eosinophilic pneumonia acute": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Illusion": 1, "Mobility decreased": 1, "Presyncope": 1, "Pyrexia": 1, "Respiratory failure": 1, "Restlessness": 1, "Tremor": 1, "Vomiting": 1}, "batchcodes": ["000048A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000049A.json b/docs/data/histograms/Japan/000049A.json
index 5e01acd483a..def9f9b38e6 100644
--- a/docs/data/histograms/Japan/000049A.json
+++ b/docs/data/histograms/Japan/000049A.json
@@ -1 +1 @@
-{"batchcode": "000049A", "histograms": [{"batchcodes": ["000049A"], "histogram": {"Body temperature": 6, "Presyncope": 5, "Blood pressure measurement": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Vital signs measurement": 2, "Alanine aminotransferase": 1, "Arrhythmia": 1, "Arteritis coronary": 1, "Aspartate aminotransferase": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Breath sounds": 1, "C-reactive protein": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Computerised tomogram": 1, "Coronary artery stenosis": 1, "Depressed level of consciousness": 1, "Echocardiogram": 1, "Electrocardiogram normal": 1, "Fall": 1, "Gamma-glutamyltransferase": 1, "Haemorrhage": 1, "Heart rate": 1, "Hepatic function abnormal": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Troponin T": 1}}]}
\ No newline at end of file
+{"batchcode": "000049A", "histograms": [{"histogram": {"Body temperature": 6, "Presyncope": 5, "Blood pressure measurement": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Vital signs measurement": 2, "Alanine aminotransferase": 1, "Arrhythmia": 1, "Arteritis coronary": 1, "Aspartate aminotransferase": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Breath sounds": 1, "C-reactive protein": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Computerised tomogram": 1, "Coronary artery stenosis": 1, "Depressed level of consciousness": 1, "Echocardiogram": 1, "Electrocardiogram normal": 1, "Fall": 1, "Gamma-glutamyltransferase": 1, "Haemorrhage": 1, "Heart rate": 1, "Hepatic function abnormal": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Troponin T": 1}, "batchcodes": ["000049A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000126A.json b/docs/data/histograms/Japan/000126A.json
index 7b4efd21bdb..de7aa5da6b1 100644
--- a/docs/data/histograms/Japan/000126A.json
+++ b/docs/data/histograms/Japan/000126A.json
@@ -1 +1 @@
-{"batchcode": "000126A", "histograms": [{"batchcodes": ["000126A"], "histogram": {"Body temperature": 5, "Asthenia": 2, "Blood test": 2, "Death": 2, "Anti-ganglioside antibody": 1, "Arterial occlusive disease": 1, "Blindness": 1, "Cardiac dysfunction": 1, "Fall": 1, "Laboratory test": 1, "Lacunar infarction": 1, "Magnetic resonance imaging head": 1, "Miller Fisher syndrome": 1, "Myoclonus": 1, "Near drowning": 1, "Nerve conduction studies": 1, "Troponin T": 1}}]}
\ No newline at end of file
+{"batchcode": "000126A", "histograms": [{"histogram": {"Body temperature": 5, "Asthenia": 2, "Blood test": 2, "Death": 2, "Anti-ganglioside antibody": 1, "Arterial occlusive disease": 1, "Blindness": 1, "Cardiac dysfunction": 1, "Fall": 1, "Laboratory test": 1, "Lacunar infarction": 1, "Magnetic resonance imaging head": 1, "Miller Fisher syndrome": 1, "Myoclonus": 1, "Near drowning": 1, "Nerve conduction studies": 1, "Troponin T": 1}, "batchcodes": ["000126A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000127A.json b/docs/data/histograms/Japan/000127A.json
index 2e577e6ea1b..8d177cff2ff 100644
--- a/docs/data/histograms/Japan/000127A.json
+++ b/docs/data/histograms/Japan/000127A.json
@@ -1 +1 @@
-{"batchcode": "000127A", "histograms": [{"batchcodes": ["000127A"], "histogram": {"Body temperature": 2, "Chest X-ray": 1, "Computerised tomogram": 1, "Dyslalia": 1, "Fall": 1, "General physical health deterioration": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Oculomucocutaneous syndrome": 1, "Physical examination": 1, "Urticaria": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000127A", "histograms": [{"histogram": {"Body temperature": 2, "Chest X-ray": 1, "Computerised tomogram": 1, "Dyslalia": 1, "Fall": 1, "General physical health deterioration": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Oculomucocutaneous syndrome": 1, "Physical examination": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["000127A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000193A.json b/docs/data/histograms/Japan/000193A.json
index 64f7055a3a9..5d727dc6f15 100644
--- a/docs/data/histograms/Japan/000193A.json
+++ b/docs/data/histograms/Japan/000193A.json
@@ -1 +1 @@
-{"batchcode": "000193A", "histograms": [{"batchcodes": ["000193A"], "histogram": {"Blood test": 2, "Body temperature": 2, "Rash": 2, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Anaphylactic reaction": 1, "Angiogram": 1, "Asthenia": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Chest discomfort": 1, "Dyskinesia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Head discomfort": 1, "Headache": 1, "Joint range of motion measurement": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Pain in extremity": 1, "Pruritus": 1, "Shoulder injury related to vaccine administration": 1, "Suspected COVID-19": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "000193A", "histograms": [{"histogram": {"Blood test": 2, "Body temperature": 2, "Rash": 2, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Anaphylactic reaction": 1, "Angiogram": 1, "Asthenia": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Chest discomfort": 1, "Dyskinesia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Head discomfort": 1, "Headache": 1, "Joint range of motion measurement": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Pain in extremity": 1, "Pruritus": 1, "Shoulder injury related to vaccine administration": 1, "Suspected COVID-19": 1, "Ultrasound scan": 1}, "batchcodes": ["000193A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000198A.json b/docs/data/histograms/Japan/000198A.json
index 59850a122e8..5ab803cfdfe 100644
--- a/docs/data/histograms/Japan/000198A.json
+++ b/docs/data/histograms/Japan/000198A.json
@@ -1 +1 @@
-{"batchcode": "000198A", "histograms": [{"batchcodes": ["000198A"], "histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Anti-NMDA antibody": 1, "Anti-aquaporin-4 antibody": 1, "Auscultation": 1, "Blood immunoglobulin E": 1, "Breath sounds": 1, "CSF protein": 1, "Cardiac failure acute": 1, "Chest X-ray": 1, "Circulatory collapse": 1, "Contusion": 1, "Decreased appetite": 1, "Dizziness": 1, "Embolism": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Encephalopathy": 1, "Fall": 1, "Head injury": 1, "Heart sounds": 1, "Herpes simplex test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Memory impairment": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuropathy peripheral": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Pupillary light reflex tests": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tryptase": 1, "Visual acuity tests": 1}}]}
\ No newline at end of file
+{"batchcode": "000198A", "histograms": [{"histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Anti-NMDA antibody": 1, "Anti-aquaporin-4 antibody": 1, "Auscultation": 1, "Blood immunoglobulin E": 1, "Breath sounds": 1, "CSF protein": 1, "Cardiac failure acute": 1, "Chest X-ray": 1, "Circulatory collapse": 1, "Contusion": 1, "Decreased appetite": 1, "Dizziness": 1, "Embolism": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Encephalopathy": 1, "Fall": 1, "Head injury": 1, "Heart sounds": 1, "Herpes simplex test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Memory impairment": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuropathy peripheral": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Pupillary light reflex tests": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tryptase": 1, "Visual acuity tests": 1}, "batchcodes": ["000198A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000204A.json b/docs/data/histograms/Japan/000204A.json
index 05eaa71ad3e..8babe44d1d4 100644
--- a/docs/data/histograms/Japan/000204A.json
+++ b/docs/data/histograms/Japan/000204A.json
@@ -1 +1 @@
-{"batchcode": "000204A", "histograms": [{"batchcodes": ["000204A", "EY3860"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1}}, {"batchcodes": ["000204A"], "histogram": {"Anaphylactoid reaction": 1, "Auscultation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebral infarction": 1, "Discomfort": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Muscle tightness": 1, "Oxygen saturation": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "000204A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1}, "batchcodes": ["000204A", "EY3860"]}, {"histogram": {"Anaphylactoid reaction": 1, "Auscultation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebral infarction": 1, "Discomfort": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Muscle tightness": 1, "Oxygen saturation": 1, "Pallor": 1}, "batchcodes": ["000204A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000207A.json b/docs/data/histograms/Japan/000207A.json
index 47f97f2b4c1..9b3cc55c267 100644
--- a/docs/data/histograms/Japan/000207A.json
+++ b/docs/data/histograms/Japan/000207A.json
@@ -1 +1 @@
-{"batchcode": "000207A", "histograms": [{"batchcodes": ["000207A"], "histogram": {"Body temperature": 2, "Aortic dissection rupture": 1, "Arthralgia": 1, "Haemorrhage subcutaneous": 1, "Pain": 1, "Sudden death": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000207A", "histograms": [{"histogram": {"Body temperature": 2, "Aortic dissection rupture": 1, "Arthralgia": 1, "Haemorrhage subcutaneous": 1, "Pain": 1, "Sudden death": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["000207A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000211A.json b/docs/data/histograms/Japan/000211A.json
index 3671f3f9814..16cd42bd24d 100644
--- a/docs/data/histograms/Japan/000211A.json
+++ b/docs/data/histograms/Japan/000211A.json
@@ -1 +1 @@
-{"batchcode": "000211A", "histograms": [{"batchcodes": ["000211A"], "histogram": {"Body temperature": 8, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Blood test": 2, "Heart rate": 2, "Hypertensive emergency": 2, "Liver disorder": 2, "Pyrexia": 2, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood potassium": 1, "COVID-19 immunisation": 1, "Cachexia": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Coma scale": 1, "Computerised tomogram": 1, "Cough": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Electrolyte imbalance": 1, "Encephalomyelitis": 1, "Eye pain": 1, "Feeling abnormal": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hyperkalaemia": 1, "Hyperventilation": 1, "Hypokalaemia": 1, "Hyponatraemia": 1, "Imaging procedure": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Listless": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Physical capacity evaluation": 1, "Pupillary light reflex tests": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000211A", "histograms": [{"histogram": {"Body temperature": 8, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Blood test": 2, "Heart rate": 2, "Hypertensive emergency": 2, "Liver disorder": 2, "Pyrexia": 2, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood potassium": 1, "COVID-19 immunisation": 1, "Cachexia": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Coma scale": 1, "Computerised tomogram": 1, "Cough": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Electrolyte imbalance": 1, "Encephalomyelitis": 1, "Eye pain": 1, "Feeling abnormal": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hyperkalaemia": 1, "Hyperventilation": 1, "Hypokalaemia": 1, "Hyponatraemia": 1, "Imaging procedure": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Listless": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Physical capacity evaluation": 1, "Pupillary light reflex tests": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["000211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000214A.json b/docs/data/histograms/Japan/000214A.json
index c4a3b3d0519..e1e4dd21996 100644
--- a/docs/data/histograms/Japan/000214A.json
+++ b/docs/data/histograms/Japan/000214A.json
@@ -1 +1 @@
-{"batchcode": "000214A", "histograms": [{"batchcodes": ["000214A"], "histogram": {"Altered state of consciousness": 1, "Antibody test": 1, "Biopsy skin": 1, "Brain stem haemorrhage": 1, "CSF protein": 1, "CSF white blood cell count": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Cutaneous vasculitis": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Oedema peripheral": 1, "Protein total": 1, "Purpura": 1, "Quadriplegia": 1, "Rash": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Sensory disturbance": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "000214A", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Antibody test": 1, "Biopsy skin": 1, "Brain stem haemorrhage": 1, "CSF protein": 1, "CSF white blood cell count": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Cutaneous vasculitis": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Oedema peripheral": 1, "Protein total": 1, "Purpura": 1, "Quadriplegia": 1, "Rash": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Sensory disturbance": 1, "Syncope": 1}, "batchcodes": ["000214A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000218A.json b/docs/data/histograms/Japan/000218A.json
index 6ad3e111e5b..3a88e47d1c2 100644
--- a/docs/data/histograms/Japan/000218A.json
+++ b/docs/data/histograms/Japan/000218A.json
@@ -1 +1 @@
-{"batchcode": "000218A", "histograms": [{"batchcodes": ["000218A"], "histogram": {"Body temperature": 1, "COVID-19 immunisation": 1, "Cerebral disorder": 1, "Decreased immune responsiveness": 1, "Diabetes mellitus": 1, "Impaired work ability": 1, "Infection": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Neurological infection": 1, "Neurosyphilis": 1, "Pruritus": 1, "Psychiatric symptom": 1, "Rash": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "000218A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19 immunisation": 1, "Cerebral disorder": 1, "Decreased immune responsiveness": 1, "Diabetes mellitus": 1, "Impaired work ability": 1, "Infection": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Neurological infection": 1, "Neurosyphilis": 1, "Pruritus": 1, "Psychiatric symptom": 1, "Rash": 1, "Rash erythematous": 1}, "batchcodes": ["000218A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000220A.json b/docs/data/histograms/Japan/000220A.json
index 4f1afcad458..15948a728c6 100644
--- a/docs/data/histograms/Japan/000220A.json
+++ b/docs/data/histograms/Japan/000220A.json
@@ -1 +1 @@
-{"batchcode": "000220A", "histograms": [{"batchcodes": ["000220A"], "histogram": {"Body temperature": 6, "COVID-19 immunisation": 3, "Interchange of vaccine products": 3, "Blood test": 2, "Pyrexia": 2, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Blood calcium": 1, "Blood creatinine": 1, "Bronchostenosis": 1, "Chest X-ray": 1, "Chest pain": 1, "Coronavirus infection": 1, "Fall": 1, "Gamma-glutamyltransferase": 1, "Guillain-Barre syndrome": 1, "Hallucination": 1, "IgA nephropathy": 1, "Insomnia": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Meniere's disease": 1, "Muscular weakness": 1, "Pain": 1, "Pain in extremity": 1, "Product administered to patient of inappropriate age": 1, "Protein total": 1, "SARS-CoV-2 test": 1, "Vaccination site dermatitis": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000220A", "histograms": [{"histogram": {"Body temperature": 6, "COVID-19 immunisation": 3, "Interchange of vaccine products": 3, "Blood test": 2, "Pyrexia": 2, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Blood calcium": 1, "Blood creatinine": 1, "Bronchostenosis": 1, "Chest X-ray": 1, "Chest pain": 1, "Coronavirus infection": 1, "Fall": 1, "Gamma-glutamyltransferase": 1, "Guillain-Barre syndrome": 1, "Hallucination": 1, "IgA nephropathy": 1, "Insomnia": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Meniere's disease": 1, "Muscular weakness": 1, "Pain": 1, "Pain in extremity": 1, "Product administered to patient of inappropriate age": 1, "Protein total": 1, "SARS-CoV-2 test": 1, "Vaccination site dermatitis": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["000220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000221A.json b/docs/data/histograms/Japan/000221A.json
index 43d0709187b..c8b3aa2026f 100644
--- a/docs/data/histograms/Japan/000221A.json
+++ b/docs/data/histograms/Japan/000221A.json
@@ -1 +1 @@
-{"batchcode": "000221A", "histograms": [{"batchcodes": ["000221A"], "histogram": {"Abdominal pain lower": 1, "Acute coronary syndrome": 1, "Cardio-respiratory arrest": 1, "Diarrhoea": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "000221A", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Acute coronary syndrome": 1, "Cardio-respiratory arrest": 1, "Diarrhoea": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Seizure": 1}, "batchcodes": ["000221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000222A.json b/docs/data/histograms/Japan/000222A.json
index b06231f741d..2086c62420d 100644
--- a/docs/data/histograms/Japan/000222A.json
+++ b/docs/data/histograms/Japan/000222A.json
@@ -1 +1 @@
-{"batchcode": "000222A", "histograms": [{"batchcodes": ["000222A"], "histogram": {"Abdominal pain": 1, "Body temperature": 1, "Gait disturbance": 1, "Haemoglobin": 1, "Headache": 1, "Malaise": 1, "Pancytopenia": 1, "Platelet count": 1, "Pyrexia": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000222A", "histograms": [{"histogram": {"Abdominal pain": 1, "Body temperature": 1, "Gait disturbance": 1, "Haemoglobin": 1, "Headache": 1, "Malaise": 1, "Pancytopenia": 1, "Platelet count": 1, "Pyrexia": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["000222A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000224A.json b/docs/data/histograms/Japan/000224A.json
index f770e4a272e..184d89e4119 100644
--- a/docs/data/histograms/Japan/000224A.json
+++ b/docs/data/histograms/Japan/000224A.json
@@ -1 +1 @@
-{"batchcode": "000224A", "histograms": [{"batchcodes": ["000224A"], "histogram": {"Body temperature": 3, "Pyrexia": 2, "Asthma": 1, "Cardio-respiratory arrest": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Headache": 1, "Hemiplegia": 1, "Hypertension": 1, "Internal haemorrhage": 1, "Malaise": 1, "Myocardial injury": 1, "Oculomucocutaneous syndrome": 1, "Pain": 1, "Product administered to patient of inappropriate age": 1, "Skin discolouration": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "000224A", "histograms": [{"histogram": {"Body temperature": 3, "Pyrexia": 2, "Asthma": 1, "Cardio-respiratory arrest": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Headache": 1, "Hemiplegia": 1, "Hypertension": 1, "Internal haemorrhage": 1, "Malaise": 1, "Myocardial injury": 1, "Oculomucocutaneous syndrome": 1, "Pain": 1, "Product administered to patient of inappropriate age": 1, "Skin discolouration": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["000224A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000225A.json b/docs/data/histograms/Japan/000225A.json
index 86f70f58691..459c6bb5907 100644
--- a/docs/data/histograms/Japan/000225A.json
+++ b/docs/data/histograms/Japan/000225A.json
@@ -1 +1 @@
-{"batchcode": "000225A", "histograms": [{"batchcodes": ["000225A"], "histogram": {"Blood test": 2, "Hypertension": 2, "Acute psychosis": 1, "Anaphylactic shock": 1, "Ataxia": 1, "Atrial flutter": 1, "Blood immunoglobulin G": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19 immunisation": 1, "CSF protein": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Decreased appetite": 1, "Depressed mood": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electroencephalogram abnormal": 1, "Epigastric discomfort": 1, "Gait inability": 1, "General physical health deterioration": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Hepatitis acute": 1, "Immobile": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Laboratory test": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Mood swings": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Sinus rhythm": 1, "Tachycardia": 1, "Tachycardia induced cardiomyopathy": 1, "Vaccination site reaction": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "000225A", "histograms": [{"histogram": {"Blood test": 2, "Hypertension": 2, "Acute psychosis": 1, "Anaphylactic shock": 1, "Ataxia": 1, "Atrial flutter": 1, "Blood immunoglobulin G": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19 immunisation": 1, "CSF protein": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Decreased appetite": 1, "Depressed mood": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electroencephalogram abnormal": 1, "Epigastric discomfort": 1, "Gait inability": 1, "General physical health deterioration": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Hepatitis acute": 1, "Immobile": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Laboratory test": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Mood swings": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Sinus rhythm": 1, "Tachycardia": 1, "Tachycardia induced cardiomyopathy": 1, "Vaccination site reaction": 1, "Vital signs measurement": 1}, "batchcodes": ["000225A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000232A.json b/docs/data/histograms/Japan/000232A.json
index 7e2e6ef36d6..22c295bb1bf 100644
--- a/docs/data/histograms/Japan/000232A.json
+++ b/docs/data/histograms/Japan/000232A.json
@@ -1 +1 @@
-{"batchcode": "000232A", "histograms": [{"batchcodes": ["000232A"], "histogram": {"Pyrexia": 4, "Body temperature": 3, "Acute kidney injury": 1, "Asthenia": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood test": 1, "C-reactive protein": 1, "Chills": 1, "Condition aggravated": 1, "Cyanosis": 1, "Echocardiogram": 1, "Haematuria": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immunisation reaction": 1, "Laboratory test": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nephritis": 1, "Nerve conduction studies": 1, "Protein total": 1, "Tachycardia": 1, "Tachypnoea": 1, "Troponin T": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "000232A", "histograms": [{"histogram": {"Pyrexia": 4, "Body temperature": 3, "Acute kidney injury": 1, "Asthenia": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood test": 1, "C-reactive protein": 1, "Chills": 1, "Condition aggravated": 1, "Cyanosis": 1, "Echocardiogram": 1, "Haematuria": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immunisation reaction": 1, "Laboratory test": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nephritis": 1, "Nerve conduction studies": 1, "Protein total": 1, "Tachycardia": 1, "Tachypnoea": 1, "Troponin T": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["000232A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000233A.json b/docs/data/histograms/Japan/000233A.json
index 0d1b2390fee..84aea1013fa 100644
--- a/docs/data/histograms/Japan/000233A.json
+++ b/docs/data/histograms/Japan/000233A.json
@@ -1 +1 @@
-{"batchcode": "000233A", "histograms": [{"batchcodes": ["000233A"], "histogram": {"Body temperature": 2, "Chest discomfort": 2, "Dizziness": 2, "Headache": 2, "Pyrexia": 2, "Acute disseminated encephalomyelitis": 1, "Anaphylactoid reaction": 1, "Anorectal disorder": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "CSF test": 1, "Chest pain": 1, "Cough": 1, "Cranial nerve disorder": 1, "Demyelination": 1, "Diplopia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Encephalopathy": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Illness": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "Nausea": 1, "Nervous system disorder": 1, "Otitis media acute": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pericardial effusion": 1, "Rash": 1, "Reflexes abnormal": 1, "SARS-CoV-2 test": 1, "Steroid therapy": 1, "Tolosa-Hunt syndrome": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "000233A", "histograms": [{"histogram": {"Body temperature": 2, "Chest discomfort": 2, "Dizziness": 2, "Headache": 2, "Pyrexia": 2, "Acute disseminated encephalomyelitis": 1, "Anaphylactoid reaction": 1, "Anorectal disorder": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "CSF test": 1, "Chest pain": 1, "Cough": 1, "Cranial nerve disorder": 1, "Demyelination": 1, "Diplopia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Encephalopathy": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Illness": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "Nausea": 1, "Nervous system disorder": 1, "Otitis media acute": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pericardial effusion": 1, "Rash": 1, "Reflexes abnormal": 1, "SARS-CoV-2 test": 1, "Steroid therapy": 1, "Tolosa-Hunt syndrome": 1, "Troponin I": 1}, "batchcodes": ["000233A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000234A.json b/docs/data/histograms/Japan/000234A.json
index ef49ee354cd..ce6404970d8 100644
--- a/docs/data/histograms/Japan/000234A.json
+++ b/docs/data/histograms/Japan/000234A.json
@@ -1 +1 @@
-{"batchcode": "000234A", "histograms": [{"batchcodes": ["000234A"], "histogram": {"Body temperature": 7, "Heart rate": 3, "Pyrexia": 3, "Glycosylated haemoglobin": 2, "Respiratory arrest": 2, "Type 1 diabetes mellitus": 2, "Weight decreased": 2, "Abdominal pain": 1, "Anti-GAD antibody": 1, "Aspiration": 1, "Asthenia": 1, "Blood glucose": 1, "Blood ketone body": 1, "Blood pH": 1, "Blood pressure measurement": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram": 1, "Coronavirus test": 1, "Cyanosis": 1, "Decreased appetite": 1, "Delirium febrile": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Diabetic ketosis": 1, "Disorientation": 1, "Drug eruption": 1, "Dry mouth": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Glucose tolerance test": 1, "Hyperglycaemia": 1, "Hypoxia": 1, "Insulin C-peptide": 1, "Interchange of vaccine products": 1, "Ketoacidosis": 1, "Malaise": 1, "Myocardial infarction": 1, "Neoplasm malignant": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Rash": 1, "Rash erythematous": 1, "Respiratory rate": 1, "Tachypnoea": 1, "Vaccination site swelling": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "000234A", "histograms": [{"histogram": {"Body temperature": 7, "Heart rate": 3, "Pyrexia": 3, "Glycosylated haemoglobin": 2, "Respiratory arrest": 2, "Type 1 diabetes mellitus": 2, "Weight decreased": 2, "Abdominal pain": 1, "Anti-GAD antibody": 1, "Aspiration": 1, "Asthenia": 1, "Blood glucose": 1, "Blood ketone body": 1, "Blood pH": 1, "Blood pressure measurement": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram": 1, "Coronavirus test": 1, "Cyanosis": 1, "Decreased appetite": 1, "Delirium febrile": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Diabetic ketosis": 1, "Disorientation": 1, "Drug eruption": 1, "Dry mouth": 1, "Dysstasia": 1, "Feeling abnormal": 1, "Glucose tolerance test": 1, "Hyperglycaemia": 1, "Hypoxia": 1, "Insulin C-peptide": 1, "Interchange of vaccine products": 1, "Ketoacidosis": 1, "Malaise": 1, "Myocardial infarction": 1, "Neoplasm malignant": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Rash": 1, "Rash erythematous": 1, "Respiratory rate": 1, "Tachypnoea": 1, "Vaccination site swelling": 1, "Weight": 1}, "batchcodes": ["000234A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000235A.json b/docs/data/histograms/Japan/000235A.json
index 6bd2ac8cdd8..0796859cf3b 100644
--- a/docs/data/histograms/Japan/000235A.json
+++ b/docs/data/histograms/Japan/000235A.json
@@ -1 +1 @@
-{"batchcode": "000235A", "histograms": [{"batchcodes": ["000235A"], "histogram": {"Contusion": 3, "Body temperature": 2, "Fall": 2, "Loss of consciousness": 2, "Presyncope": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Interchange of vaccine products": 1, "Meningitis": 1, "Seizure": 1, "Syncope": 1, "Vital signs measurement": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "000235A", "histograms": [{"histogram": {"Contusion": 3, "Body temperature": 2, "Fall": 2, "Loss of consciousness": 2, "Presyncope": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Interchange of vaccine products": 1, "Meningitis": 1, "Seizure": 1, "Syncope": 1, "Vital signs measurement": 1, "Wound": 1}, "batchcodes": ["000235A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000236A.json b/docs/data/histograms/Japan/000236A.json
index e0bf5224f30..344aa30b6b0 100644
--- a/docs/data/histograms/Japan/000236A.json
+++ b/docs/data/histograms/Japan/000236A.json
@@ -1 +1 @@
-{"batchcode": "000236A", "histograms": [{"batchcodes": ["000236A"], "histogram": {"Body temperature": 2, "Malaise": 2, "Angiogram": 1, "Arrhythmia supraventricular": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Cardiac dysfunction": 1, "Cellulitis": 1, "Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Headache": 1, "Immobile": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Muscular weakness": 1, "Myocardial necrosis": 1, "Myocarditis": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Syncope": 1, "Tissue infiltration": 1, "Troponin I": 1, "Ventricular arrhythmia": 1}}]}
\ No newline at end of file
+{"batchcode": "000236A", "histograms": [{"histogram": {"Body temperature": 2, "Malaise": 2, "Angiogram": 1, "Arrhythmia supraventricular": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Cardiac dysfunction": 1, "Cellulitis": 1, "Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Headache": 1, "Immobile": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Muscular weakness": 1, "Myocardial necrosis": 1, "Myocarditis": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Syncope": 1, "Tissue infiltration": 1, "Troponin I": 1, "Ventricular arrhythmia": 1}, "batchcodes": ["000236A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000237A.json b/docs/data/histograms/Japan/000237A.json
index f74c4513c6b..43823bf3b3a 100644
--- a/docs/data/histograms/Japan/000237A.json
+++ b/docs/data/histograms/Japan/000237A.json
@@ -1 +1 @@
-{"batchcode": "000237A", "histograms": [{"batchcodes": ["000237A"], "histogram": {"Body temperature": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "000237A", "histograms": [{"histogram": {"Body temperature": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Pyrexia": 1}, "batchcodes": ["000237A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000240A.json b/docs/data/histograms/Japan/000240A.json
index e59580400c3..97aedc11cd5 100644
--- a/docs/data/histograms/Japan/000240A.json
+++ b/docs/data/histograms/Japan/000240A.json
@@ -1 +1 @@
-{"batchcode": "000240A", "histograms": [{"batchcodes": ["000240A"], "histogram": {"Anaphylactic reaction": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Discharge": 1, "Hypersensitivity": 1, "Illness": 1, "Laryngeal discomfort": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "000240A", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Discharge": 1, "Hypersensitivity": 1, "Illness": 1, "Laryngeal discomfort": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["000240A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000241A.json b/docs/data/histograms/Japan/000241A.json
index 694849740e4..e57cf2f93c3 100644
--- a/docs/data/histograms/Japan/000241A.json
+++ b/docs/data/histograms/Japan/000241A.json
@@ -1 +1 @@
-{"batchcode": "000241A", "histograms": [{"batchcodes": ["000241A", "GJ1836"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1}}, {"batchcodes": ["000241A"], "histogram": {"Vomiting": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Body temperature": 2, "Diarrhoea": 2, "Fibrin D dimer": 2, "Pyrexia": 2, "Activated partial thromboplastin time": 1, "Angiogram": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "C-reactive protein": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Colitis": 1, "Disseminated intravascular coagulation": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram T wave inversion": 1, "Enteritis infectious": 1, "Faeces hard": 1, "Faeces soft": 1, "Fall": 1, "Haematocrit": 1, "Haemoglobin normal": 1, "Headache": 1, "Hypoxic-ischaemic encephalopathy": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Multiple organ dysfunction syndrome": 1, "Myocardial necrosis marker increased": 1, "Myocarditis": 1, "Platelet count": 1, "Prothrombin time": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Troponin I": 1, "Upper gastrointestinal haemorrhage": 1, "Ventricular fibrillation": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000241A", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1}, "batchcodes": ["000241A", "GJ1836"]}, {"histogram": {"Vomiting": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Body temperature": 2, "Diarrhoea": 2, "Fibrin D dimer": 2, "Pyrexia": 2, "Activated partial thromboplastin time": 1, "Angiogram": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "C-reactive protein": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Colitis": 1, "Disseminated intravascular coagulation": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram T wave inversion": 1, "Enteritis infectious": 1, "Faeces hard": 1, "Faeces soft": 1, "Fall": 1, "Haematocrit": 1, "Haemoglobin normal": 1, "Headache": 1, "Hypoxic-ischaemic encephalopathy": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Multiple organ dysfunction syndrome": 1, "Myocardial necrosis marker increased": 1, "Myocarditis": 1, "Platelet count": 1, "Prothrombin time": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Troponin I": 1, "Upper gastrointestinal haemorrhage": 1, "Ventricular fibrillation": 1, "White blood cell count": 1}, "batchcodes": ["000241A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000243A.json b/docs/data/histograms/Japan/000243A.json
index 7c47d186aca..07bae0a3c7a 100644
--- a/docs/data/histograms/Japan/000243A.json
+++ b/docs/data/histograms/Japan/000243A.json
@@ -1 +1 @@
-{"batchcode": "000243A", "histograms": [{"batchcodes": ["000243A"], "histogram": {"Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Body temperature": 2, "Chest X-ray": 2, "Electrocardiogram": 2, "Alanine aminotransferase": 1, "Amylase": 1, "Apnoea": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase normal": 1, "Bacterial test": 1, "Bacteriuria": 1, "Band neutrophil count": 1, "Basophil count": 1, "Bilirubin urine": 1, "Blood alkaline phosphatase": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood iron": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood triglycerides": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chromaturia": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Gamma-glutamyltransferase": 1, "Generalised oedema": 1, "Glucose urine present": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hepatitis B surface antigen": 1, "High density lipoprotein": 1, "Infection": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Myelitis transverse": 1, "Myocardial necrosis marker": 1, "Neutrophil count": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Platelet count": 1, "Protein total normal": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Renal impairment": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Specific gravity urine": 1, "Supraventricular tachycardia": 1, "Treponema test": 1, "Troponin I": 1, "Urinary occult blood": 1, "Urinary sediment present": 1, "Urine abnormality": 1, "Urine ketone body absent": 1, "Urobilinogen urine": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "000243A", "histograms": [{"histogram": {"Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Body temperature": 2, "Chest X-ray": 2, "Electrocardiogram": 2, "Alanine aminotransferase": 1, "Amylase": 1, "Apnoea": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase normal": 1, "Bacterial test": 1, "Bacteriuria": 1, "Band neutrophil count": 1, "Basophil count": 1, "Bilirubin urine": 1, "Blood alkaline phosphatase": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood iron": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood triglycerides": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chromaturia": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Gamma-glutamyltransferase": 1, "Generalised oedema": 1, "Glucose urine present": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hepatitis B surface antigen": 1, "High density lipoprotein": 1, "Infection": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Myelitis transverse": 1, "Myocardial necrosis marker": 1, "Neutrophil count": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Platelet count": 1, "Protein total normal": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Renal impairment": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Specific gravity urine": 1, "Supraventricular tachycardia": 1, "Treponema test": 1, "Troponin I": 1, "Urinary occult blood": 1, "Urinary sediment present": 1, "Urine abnormality": 1, "Urine ketone body absent": 1, "Urobilinogen urine": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH urine": 1}, "batchcodes": ["000243A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000248A.json b/docs/data/histograms/Japan/000248A.json
index 25969e98a6b..6511d906143 100644
--- a/docs/data/histograms/Japan/000248A.json
+++ b/docs/data/histograms/Japan/000248A.json
@@ -1 +1 @@
-{"batchcode": "000248A", "histograms": [{"batchcodes": ["000248A"], "histogram": {"Affective disorder": 1, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebral haemorrhage": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Malaise": 1, "Organising pneumonia": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory distress": 1, "Stress": 1, "Swelling": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "000248A", "histograms": [{"histogram": {"Affective disorder": 1, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebral haemorrhage": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Malaise": 1, "Organising pneumonia": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory distress": 1, "Stress": 1, "Swelling": 1, "Tremor": 1}, "batchcodes": ["000248A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000249A.json b/docs/data/histograms/Japan/000249A.json
index d1129d00963..26060ade962 100644
--- a/docs/data/histograms/Japan/000249A.json
+++ b/docs/data/histograms/Japan/000249A.json
@@ -1 +1 @@
-{"batchcode": "000249A", "histograms": [{"batchcodes": ["000249A"], "histogram": {"Angina pectoris": 1, "Angioedema": 1, "Biopsy": 1, "Biopsy skin": 1, "Cardiac failure": 1, "Echocardiogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count increased": 1, "Eosinophilia": 1, "Eosinophilic myocarditis": 1, "Hyperglycaemia": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Pruritus": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "000249A", "histograms": [{"histogram": {"Angina pectoris": 1, "Angioedema": 1, "Biopsy": 1, "Biopsy skin": 1, "Cardiac failure": 1, "Echocardiogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count increased": 1, "Eosinophilia": 1, "Eosinophilic myocarditis": 1, "Hyperglycaemia": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Pruritus": 1, "Vasculitis": 1}, "batchcodes": ["000249A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000260A.json b/docs/data/histograms/Japan/000260A.json
index d4d7fe46ff1..6a3a08b4951 100644
--- a/docs/data/histograms/Japan/000260A.json
+++ b/docs/data/histograms/Japan/000260A.json
@@ -1 +1 @@
-{"batchcode": "000260A", "histograms": [{"batchcodes": ["000260A"], "histogram": {"Body temperature": 4, "Anaphylactic reaction": 3, "Blood pressure measurement": 2, "Feeling abnormal": 2, "Heart rate": 2, "Oxygen saturation": 2, "Balance disorder": 1, "Chest pain": 1, "Cold sweat": 1, "Depressed level of consciousness": 1, "Erythema": 1, "Feeling cold": 1, "Hypokinesia": 1, "Malaise": 1, "Muscle spasms": 1, "Nausea": 1, "Oedema": 1, "Palpitations": 1, "Posture abnormal": 1, "Pruritus": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site pruritus": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000260A", "histograms": [{"histogram": {"Body temperature": 4, "Anaphylactic reaction": 3, "Blood pressure measurement": 2, "Feeling abnormal": 2, "Heart rate": 2, "Oxygen saturation": 2, "Balance disorder": 1, "Chest pain": 1, "Cold sweat": 1, "Depressed level of consciousness": 1, "Erythema": 1, "Feeling cold": 1, "Hypokinesia": 1, "Malaise": 1, "Muscle spasms": 1, "Nausea": 1, "Oedema": 1, "Palpitations": 1, "Posture abnormal": 1, "Pruritus": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site pruritus": 1, "Vomiting": 1}, "batchcodes": ["000260A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000261A.json b/docs/data/histograms/Japan/000261A.json
index 63c6d63b8e3..a441b35195d 100644
--- a/docs/data/histograms/Japan/000261A.json
+++ b/docs/data/histograms/Japan/000261A.json
@@ -1 +1 @@
-{"batchcode": "000261A", "histograms": [{"batchcodes": ["000261A"], "histogram": {"Anaphylactic reaction": 2, "Body temperature": 2, "COVID-19 immunisation": 2, "Cellulitis": 2, "Interchange of vaccine products": 2, "Abdominal pain": 1, "Angiogram": 1, "Autopsy": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature increased": 1, "Brain stem infarction": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Coagulation test": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dermatitis diaper": 1, "Diarrhoea": 1, "Diffusion-weighted brain MRI": 1, "Drooling": 1, "Dyspnoea": 1, "Erythema": 1, "Fibrin D dimer": 1, "Flushing": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Henoch-Schonlein purpura": 1, "Imaging procedure": 1, "Immunisation reaction": 1, "Ischaemia": 1, "Laryngeal discomfort": 1, "Magnetic resonance imaging head": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pathology test": 1, "Platelet count": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Purpura": 1, "Pyrexia": 1, "Red blood cell count": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Throat irritation": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tracheal stenosis": 1, "Urticaria": 1, "Vasculitis": 1, "Vital signs measurement": 1, "Wheezing": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "000261A", "histograms": [{"histogram": {"Anaphylactic reaction": 2, "Body temperature": 2, "COVID-19 immunisation": 2, "Cellulitis": 2, "Interchange of vaccine products": 2, "Abdominal pain": 1, "Angiogram": 1, "Autopsy": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature increased": 1, "Brain stem infarction": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Coagulation test": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dermatitis diaper": 1, "Diarrhoea": 1, "Diffusion-weighted brain MRI": 1, "Drooling": 1, "Dyspnoea": 1, "Erythema": 1, "Fibrin D dimer": 1, "Flushing": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Henoch-Schonlein purpura": 1, "Imaging procedure": 1, "Immunisation reaction": 1, "Ischaemia": 1, "Laryngeal discomfort": 1, "Magnetic resonance imaging head": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pathology test": 1, "Platelet count": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Purpura": 1, "Pyrexia": 1, "Red blood cell count": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Throat irritation": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tracheal stenosis": 1, "Urticaria": 1, "Vasculitis": 1, "Vital signs measurement": 1, "Wheezing": 1, "White blood cell count increased": 1}, "batchcodes": ["000261A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000262A.json b/docs/data/histograms/Japan/000262A.json
index cd0ce433ba6..370009706eb 100644
--- a/docs/data/histograms/Japan/000262A.json
+++ b/docs/data/histograms/Japan/000262A.json
@@ -1 +1 @@
-{"batchcode": "000262A", "histograms": [{"batchcodes": ["000262A"], "histogram": {"Body temperature": 3, "Cerebrovascular accident": 2, "Anaphylactic reaction": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Enteritis": 1, "Fall": 1, "Hypophagia": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Pneumonia": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "000262A", "histograms": [{"histogram": {"Body temperature": 3, "Cerebrovascular accident": 2, "Anaphylactic reaction": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Enteritis": 1, "Fall": 1, "Hypophagia": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Pneumonia": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["000262A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000267A.json b/docs/data/histograms/Japan/000267A.json
index 3ac158078d4..24849d1c798 100644
--- a/docs/data/histograms/Japan/000267A.json
+++ b/docs/data/histograms/Japan/000267A.json
@@ -1 +1 @@
-{"batchcode": "000267A", "histograms": [{"batchcodes": ["000267A"], "histogram": {"Body temperature": 1, "C-reactive protein": 1, "Computerised tomogram": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000267A", "histograms": [{"histogram": {"Body temperature": 1, "C-reactive protein": 1, "Computerised tomogram": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["000267A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000268A.json b/docs/data/histograms/Japan/000268A.json
index 7953cae4f3e..e3b18a9b815 100644
--- a/docs/data/histograms/Japan/000268A.json
+++ b/docs/data/histograms/Japan/000268A.json
@@ -1 +1 @@
-{"batchcode": "000268A", "histograms": [{"batchcodes": ["000268A"], "histogram": {"Cardio-respiratory arrest": 1, "Circulatory collapse": 1, "Computerised tomogram": 1}}]}
\ No newline at end of file
+{"batchcode": "000268A", "histograms": [{"histogram": {"Cardio-respiratory arrest": 1, "Circulatory collapse": 1, "Computerised tomogram": 1}, "batchcodes": ["000268A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000276A.json b/docs/data/histograms/Japan/000276A.json
index a7d65c1afb7..bb3132c3ab4 100644
--- a/docs/data/histograms/Japan/000276A.json
+++ b/docs/data/histograms/Japan/000276A.json
@@ -1 +1 @@
-{"batchcode": "000276A", "histograms": [{"batchcodes": ["000276A"], "histogram": {"Body temperature": 2, "Blood pressure measurement": 1, "Blood test": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Malaise": 1, "Myocarditis": 1, "Petit mal epilepsy": 1, "Presyncope": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "000276A", "histograms": [{"histogram": {"Body temperature": 2, "Blood pressure measurement": 1, "Blood test": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Malaise": 1, "Myocarditis": 1, "Petit mal epilepsy": 1, "Presyncope": 1, "Pyrexia": 1}, "batchcodes": ["000276A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000277A.json b/docs/data/histograms/Japan/000277A.json
index 0239cfb0935..a3ef56bb619 100644
--- a/docs/data/histograms/Japan/000277A.json
+++ b/docs/data/histograms/Japan/000277A.json
@@ -1 +1 @@
-{"batchcode": "000277A", "histograms": [{"batchcodes": ["000277A"], "histogram": {"Body temperature": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Atrioventricular block complete": 1, "Blood culture": 1, "Blood immunoglobulin E": 1, "C-reactive protein": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Myocarditis": 1, "Nephrolithiasis": 1, "Pneumonia": 1, "Troponin": 1, "Troponin I": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000277A", "histograms": [{"histogram": {"Body temperature": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Atrioventricular block complete": 1, "Blood culture": 1, "Blood immunoglobulin E": 1, "C-reactive protein": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Myocarditis": 1, "Nephrolithiasis": 1, "Pneumonia": 1, "Troponin": 1, "Troponin I": 1, "White blood cell count": 1}, "batchcodes": ["000277A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000278A.json b/docs/data/histograms/Japan/000278A.json
index 83862a1bfea..bb61c422b24 100644
--- a/docs/data/histograms/Japan/000278A.json
+++ b/docs/data/histograms/Japan/000278A.json
@@ -1 +1 @@
-{"batchcode": "000278A", "histograms": [{"batchcodes": ["000278A"], "histogram": {"Body temperature": 3, "Pyrexia": 3, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest pain": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Histology": 1, "Illness": 1, "Lymphadenopathy": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Pericarditis": 1, "Platelet count": 1, "Red blood cell count": 1, "Seizure": 1, "Troponin T": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "000278A", "histograms": [{"histogram": {"Body temperature": 3, "Pyrexia": 3, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest pain": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Histology": 1, "Illness": 1, "Lymphadenopathy": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Pericarditis": 1, "Platelet count": 1, "Red blood cell count": 1, "Seizure": 1, "Troponin T": 1, "White blood cell count": 1}, "batchcodes": ["000278A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000279A.json b/docs/data/histograms/Japan/000279A.json
index a7e22d9a506..38567044f57 100644
--- a/docs/data/histograms/Japan/000279A.json
+++ b/docs/data/histograms/Japan/000279A.json
@@ -1 +1 @@
-{"batchcode": "000279A", "histograms": [{"batchcodes": ["000279A"], "histogram": {"Blood test": 1, "Body temperature": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Haematochezia": 1, "Headache": 1, "Illness": 1, "Influenza": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test negative": 1}}]}
\ No newline at end of file
+{"batchcode": "000279A", "histograms": [{"histogram": {"Blood test": 1, "Body temperature": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Haematochezia": 1, "Headache": 1, "Illness": 1, "Influenza": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test negative": 1}, "batchcodes": ["000279A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000282A.json b/docs/data/histograms/Japan/000282A.json
index e624b4b3b65..d9baf151f96 100644
--- a/docs/data/histograms/Japan/000282A.json
+++ b/docs/data/histograms/Japan/000282A.json
@@ -1 +1 @@
-{"batchcode": "000282A", "histograms": [{"batchcodes": ["000282A"], "histogram": {"Body temperature": 1, "Cerebral haemorrhage": 1, "Computerised tomogram head": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "000282A", "histograms": [{"histogram": {"Body temperature": 1, "Cerebral haemorrhage": 1, "Computerised tomogram head": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["000282A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000291A.json b/docs/data/histograms/Japan/000291A.json
index bfc21e08b51..a637414ca8c 100644
--- a/docs/data/histograms/Japan/000291A.json
+++ b/docs/data/histograms/Japan/000291A.json
@@ -1 +1 @@
-{"batchcode": "000291A", "histograms": [{"batchcodes": ["000291A"], "histogram": {"Laboratory test": 2, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Auscultation": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase": 1, "Blood thyroid stimulating hormone": 1, "Body temperature": 1, "Body temperature increased": 1, "C-reactive protein": 1, "Corneal degeneration": 1, "Corneal graft rejection": 1, "Corneal oedema": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Goitre": 1, "Headache": 1, "Hyperthyroidism": 1, "Insomnia": 1, "Loss of consciousness": 1, "Palpitations": 1, "Psychomotor hyperactivity": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "000291A", "histograms": [{"histogram": {"Laboratory test": 2, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Auscultation": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase": 1, "Blood thyroid stimulating hormone": 1, "Body temperature": 1, "Body temperature increased": 1, "C-reactive protein": 1, "Corneal degeneration": 1, "Corneal graft rejection": 1, "Corneal oedema": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Goitre": 1, "Headache": 1, "Hyperthyroidism": 1, "Insomnia": 1, "Loss of consciousness": 1, "Palpitations": 1, "Psychomotor hyperactivity": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1}, "batchcodes": ["000291A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000300A.json b/docs/data/histograms/Japan/000300A.json
index 5ef1af53a1a..394045af9c0 100644
--- a/docs/data/histograms/Japan/000300A.json
+++ b/docs/data/histograms/Japan/000300A.json
@@ -1 +1 @@
-{"batchcode": "000300A", "histograms": [{"batchcodes": ["000300A"], "histogram": {"Body temperature": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Coma": 1, "Oxygen saturation": 1, "Pulmonary oedema": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "000300A", "histograms": [{"histogram": {"Body temperature": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Coma": 1, "Oxygen saturation": 1, "Pulmonary oedema": 1, "Respiratory distress": 1}, "batchcodes": ["000300A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000305A.json b/docs/data/histograms/Japan/000305A.json
index 6219dc42a61..f96b76ae1f6 100644
--- a/docs/data/histograms/Japan/000305A.json
+++ b/docs/data/histograms/Japan/000305A.json
@@ -1 +1 @@
-{"batchcode": "000305A", "histograms": [{"batchcodes": ["000305A"], "histogram": {"Body temperature": 1, "Cerebral infarction": 1, "Computerised tomogram": 1, "Inflammation": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "000305A", "histograms": [{"histogram": {"Body temperature": 1, "Cerebral infarction": 1, "Computerised tomogram": 1, "Inflammation": 1, "Muscular weakness": 1}, "batchcodes": ["000305A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000306A.json b/docs/data/histograms/Japan/000306A.json
index 3626a475bcc..987d7ff44cb 100644
--- a/docs/data/histograms/Japan/000306A.json
+++ b/docs/data/histograms/Japan/000306A.json
@@ -1 +1 @@
-{"batchcode": "000306A", "histograms": [{"batchcodes": ["000306A"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Cardio-respiratory arrest": 1, "Decreased appetite": 1, "Malaise": 1, "Respiratory arrest": 1}}]}
\ No newline at end of file
+{"batchcode": "000306A", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Cardio-respiratory arrest": 1, "Decreased appetite": 1, "Malaise": 1, "Respiratory arrest": 1}, "batchcodes": ["000306A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000314A.json b/docs/data/histograms/Japan/000314A.json
index 2086798fc4b..fa4f622ef5f 100644
--- a/docs/data/histograms/Japan/000314A.json
+++ b/docs/data/histograms/Japan/000314A.json
@@ -1 +1 @@
-{"batchcode": "000314A", "histograms": [{"batchcodes": ["000314A"], "histogram": {"Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "Pyrexia": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "000314A", "histograms": [{"histogram": {"Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "Pyrexia": 1, "Troponin I": 1}, "batchcodes": ["000314A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000317A.json b/docs/data/histograms/Japan/000317A.json
index b627327e7ef..747bec02546 100644
--- a/docs/data/histograms/Japan/000317A.json
+++ b/docs/data/histograms/Japan/000317A.json
@@ -1 +1 @@
-{"batchcode": "000317A", "histograms": [{"batchcodes": ["000317A"], "histogram": {"Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cardiac failure chronic": 1, "Cerebrovascular accident": 1, "Decreased appetite": 1, "Dementia Alzheimer's type": 1, "Depression": 1, "Diabetes mellitus": 1, "Diabetic nephropathy": 1, "Diabetic retinopathy": 1, "Heart rate": 1, "Hypophagia": 1, "Hypotension": 1, "Laboratory test": 1, "Mental disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "000317A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cardiac failure chronic": 1, "Cerebrovascular accident": 1, "Decreased appetite": 1, "Dementia Alzheimer's type": 1, "Depression": 1, "Diabetes mellitus": 1, "Diabetic nephropathy": 1, "Diabetic retinopathy": 1, "Heart rate": 1, "Hypophagia": 1, "Hypotension": 1, "Laboratory test": 1, "Mental disorder": 1}, "batchcodes": ["000317A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/000318A.json b/docs/data/histograms/Japan/000318A.json
index f2cfeb0b3b8..1733567b230 100644
--- a/docs/data/histograms/Japan/000318A.json
+++ b/docs/data/histograms/Japan/000318A.json
@@ -1 +1 @@
-{"batchcode": "000318A", "histograms": [{"batchcodes": ["000318A"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Cold sweat": 1, "Heart rate": 1, "Loss of consciousness": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "000318A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Cold sweat": 1, "Heart rate": 1, "Loss of consciousness": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["000318A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/003190.json b/docs/data/histograms/Japan/003190.json
index 4d6b3d41ad6..3213f8d5583 100644
--- a/docs/data/histograms/Japan/003190.json
+++ b/docs/data/histograms/Japan/003190.json
@@ -1 +1 @@
-{"batchcode": "003190", "histograms": [{"batchcodes": ["003190"], "histogram": {"Blood pressure measurement": 1, "Erythema": 1, "Heart rate": 1, "Oxygen saturation": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "003190", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Erythema": 1, "Heart rate": 1, "Oxygen saturation": 1, "Presyncope": 1}, "batchcodes": ["003190"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/111236A.json b/docs/data/histograms/Japan/111236A.json
index 56e7246c1b0..52971be4db1 100644
--- a/docs/data/histograms/Japan/111236A.json
+++ b/docs/data/histograms/Japan/111236A.json
@@ -1 +1 @@
-{"batchcode": "111236A", "histograms": [{"batchcodes": ["111236A"], "histogram": {"Vaccination site pain": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "111236A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["111236A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/198A.json b/docs/data/histograms/Japan/198A.json
index 2ce1ea2f08b..e61d1d09683 100644
--- a/docs/data/histograms/Japan/198A.json
+++ b/docs/data/histograms/Japan/198A.json
@@ -1 +1 @@
-{"batchcode": "198A", "histograms": [{"batchcodes": ["198A"], "histogram": {"COVID-19 immunisation": 1, "Cardiac failure acute": 1, "Cardiac failure chronic": 1, "Generalised oedema": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Pneumonia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "198A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Cardiac failure acute": 1, "Cardiac failure chronic": 1, "Generalised oedema": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Pneumonia": 1, "Pyrexia": 1}, "batchcodes": ["198A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/200074A.json b/docs/data/histograms/Japan/200074A.json
index b576a5f929e..e66f99f7ce9 100644
--- a/docs/data/histograms/Japan/200074A.json
+++ b/docs/data/histograms/Japan/200074A.json
@@ -1 +1 @@
-{"batchcode": "200074A", "histograms": [{"batchcodes": ["200074A"], "histogram": {"Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "200074A", "histograms": [{"histogram": {"Myocardial infarction": 1}, "batchcodes": ["200074A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/21A.json b/docs/data/histograms/Japan/21A.json
index 7198e730104..980383d62b2 100644
--- a/docs/data/histograms/Japan/21A.json
+++ b/docs/data/histograms/Japan/21A.json
@@ -1 +1 @@
-{"batchcode": "21A", "histograms": [{"batchcodes": ["21A"], "histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Type 1 diabetes mellitus": 1}}]}
\ No newline at end of file
+{"batchcode": "21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Type 1 diabetes mellitus": 1}, "batchcodes": ["21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/233A.json b/docs/data/histograms/Japan/233A.json
index d1aaa604dc7..019c22e0b23 100644
--- a/docs/data/histograms/Japan/233A.json
+++ b/docs/data/histograms/Japan/233A.json
@@ -1 +1 @@
-{"batchcode": "233A", "histograms": [{"batchcodes": ["233A"], "histogram": {"Expired product administered": 1, "Platelet count": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "233A", "histograms": [{"histogram": {"Expired product administered": 1, "Platelet count": 1, "Thrombocytopenia": 1}, "batchcodes": ["233A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/2Y2173.json b/docs/data/histograms/Japan/2Y2173.json
index bfe41f76fa9..25677842efd 100644
--- a/docs/data/histograms/Japan/2Y2173.json
+++ b/docs/data/histograms/Japan/2Y2173.json
@@ -1 +1 @@
-{"batchcode": "2Y2173", "histograms": [{"batchcodes": ["2Y2173"], "histogram": {"Cerebral infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "2Y2173", "histograms": [{"histogram": {"Cerebral infarction": 1}, "batchcodes": ["2Y2173"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/300-2540.json b/docs/data/histograms/Japan/300-2540.json
index 115e427c190..52c06a473ba 100644
--- a/docs/data/histograms/Japan/300-2540.json
+++ b/docs/data/histograms/Japan/300-2540.json
@@ -1 +1 @@
-{"batchcode": "300-2540", "histograms": [{"batchcodes": ["300-2540"], "histogram": {"Body temperature": 1, "Hallucination, auditory": 1, "Malaise": 1, "Muscular weakness": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "300-2540", "histograms": [{"histogram": {"Body temperature": 1, "Hallucination, auditory": 1, "Malaise": 1, "Muscular weakness": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["300-2540"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3001227.json b/docs/data/histograms/Japan/3001227.json
index e373c3fecd0..707fe4902f4 100644
--- a/docs/data/histograms/Japan/3001227.json
+++ b/docs/data/histograms/Japan/3001227.json
@@ -1 +1 @@
-{"batchcode": "3001227", "histograms": [{"batchcodes": ["3001227"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "3001227", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["3001227"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002128.json b/docs/data/histograms/Japan/3002128.json
index 54d29362542..6ed2c4ed18a 100644
--- a/docs/data/histograms/Japan/3002128.json
+++ b/docs/data/histograms/Japan/3002128.json
@@ -1 +1 @@
-{"batchcode": "3002128", "histograms": [{"batchcodes": ["3002128"], "histogram": {"Nausea": 2, "Blood pressure decreased": 1, "Bradycardia": 1, "Depressed level of consciousness": 1, "Loss of consciousness": 1, "Presyncope": 1, "Seizure": 1, "Sensation of blood flow": 1}}]}
\ No newline at end of file
+{"batchcode": "3002128", "histograms": [{"histogram": {"Nausea": 2, "Blood pressure decreased": 1, "Bradycardia": 1, "Depressed level of consciousness": 1, "Loss of consciousness": 1, "Presyncope": 1, "Seizure": 1, "Sensation of blood flow": 1}, "batchcodes": ["3002128"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002165.json b/docs/data/histograms/Japan/3002165.json
index 09be39ea52b..d0098967491 100644
--- a/docs/data/histograms/Japan/3002165.json
+++ b/docs/data/histograms/Japan/3002165.json
@@ -1 +1 @@
-{"batchcode": "3002165", "histograms": [{"batchcodes": ["3002165"], "histogram": {"Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "Magnetic resonance imaging": 1}}]}
\ No newline at end of file
+{"batchcode": "3002165", "histograms": [{"histogram": {"Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "Magnetic resonance imaging": 1}, "batchcodes": ["3002165"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002180.json b/docs/data/histograms/Japan/3002180.json
index 4e6de5c2aca..020e417c285 100644
--- a/docs/data/histograms/Japan/3002180.json
+++ b/docs/data/histograms/Japan/3002180.json
@@ -1 +1 @@
-{"batchcode": "3002180", "histograms": [{"batchcodes": ["3002180"], "histogram": {"COVID-19": 127, "Nucleic acid test": 95, "SARS-CoV-2 test": 81, "Body temperature": 25, "SARS-CoV-2 test positive": 17, "Anaphylactic reaction": 12, "Vaccination failure": 12, "Pyrexia": 9, "Oxygen saturation": 7, "Blood pressure measurement": 6, "Drug ineffective": 6, "Headache": 6, "Hypertension": 6, "Polymerase chain reaction": 6, "Dyspnoea": 5, "Malaise": 5, "Meniscus injury": 5, "Severe acute respiratory syndrome": 5, "Cellulitis": 4, "Dizziness": 4, "Heart rate": 4, "Erythema": 3, "Fall": 3, "Nausea": 3, "Oropharyngeal pain": 3, "Syncope": 3, "Urticaria": 3, "Vaccination site erythema": 3, "Abdominal pain": 2, "Antibody test": 2, "Arthralgia": 2, "Basophil count": 2, "Blood test": 2, "C-reactive protein": 2, "Cerebral infarction": 2, "Decreased appetite": 2, "Diabetes mellitus": 2, "Feeling abnormal": 2, "Gestational diabetes": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemoglobin": 2, "Immunisation reaction": 2, "Large intestine polyp": 2, "Ligament injury": 2, "Muscular weakness": 2, "Neuropathy peripheral": 2, "Osteoarthritis": 2, "Palpitations": 2, "Peritonsillar abscess": 2, "Platelet count": 2, "Rash": 2, "Red blood cell count": 2, "Subarachnoid haemorrhage": 2, "Swelling": 2, "Vaccination site swelling": 2, "White blood cell count": 2, "Accident": 1, "Acute myocardial infarction": 1, "Alopecia": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Aneurysm ruptured": 1, "Angioedema": 1, "Anxiety disorder": 1, "Aspartate aminotransferase": 1, "Back pain": 1, "Bile duct stone": 1, "Biliary tract infection": 1, "Blood acid phosphatase": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood pressure increased": 1, "COVID-19 immunisation": 1, "CSF oligoclonal band": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Chest pain": 1, "Clavicle fracture": 1, "Coagulation time": 1, "Colitis ischaemic": 1, "Coronavirus test": 1, "Dehydration": 1, "Dermatitis bullous": 1, "Dysentery": 1, "Dyslipidaemia": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Fatigue": 1, "Feeling hot": 1, "Fistula": 1, "Gamma-glutamyltransferase": 1, "Genital haemorrhage": 1, "Glucose tolerance test": 1, "Haemorrhoids": 1, "Hepatic function abnormal": 1, "Hot flush": 1, "Hyperventilation": 1, "Hypokinesia": 1, "IgA nephropathy": 1, "Illness": 1, "Induration": 1, "Injection site cellulitis": 1, "Injection site pruritus": 1, "Interchange of vaccine products": 1, "Intervertebral disc protrusion": 1, "Investigation": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Necrotising fasciitis": 1, "Neurological examination": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Panniculitis": 1, "Paralysis recurrent laryngeal nerve": 1, "Platelet count decreased": 1, "Pregnancy": 1, "Pregnancy test": 1, "Rectal cancer": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Rotator cuff syndrome": 1, "Ruptured cerebral aneurysm": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Sensory disturbance": 1, "Skin ulcer": 1, "Small intestine carcinoma": 1, "Spinal myelogram": 1, "Swelling face": 1, "Tachycardia": 1, "Thermal burn": 1, "Thrombocytopenia": 1, "Tibia fracture": 1, "Traumatic haemothorax": 1, "Troponin I": 1, "Ureterolithiasis": 1, "Vaccination complication": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vertigo": 1, "Vomiting": 1, "Wrist fracture": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3002180", "histograms": [{"histogram": {"COVID-19": 127, "Nucleic acid test": 95, "SARS-CoV-2 test": 81, "Body temperature": 25, "SARS-CoV-2 test positive": 17, "Anaphylactic reaction": 12, "Vaccination failure": 12, "Pyrexia": 9, "Oxygen saturation": 7, "Blood pressure measurement": 6, "Drug ineffective": 6, "Headache": 6, "Hypertension": 6, "Polymerase chain reaction": 6, "Dyspnoea": 5, "Malaise": 5, "Meniscus injury": 5, "Severe acute respiratory syndrome": 5, "Cellulitis": 4, "Dizziness": 4, "Heart rate": 4, "Erythema": 3, "Fall": 3, "Nausea": 3, "Oropharyngeal pain": 3, "Syncope": 3, "Urticaria": 3, "Vaccination site erythema": 3, "Abdominal pain": 2, "Antibody test": 2, "Arthralgia": 2, "Basophil count": 2, "Blood test": 2, "C-reactive protein": 2, "Cerebral infarction": 2, "Decreased appetite": 2, "Diabetes mellitus": 2, "Feeling abnormal": 2, "Gestational diabetes": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemoglobin": 2, "Immunisation reaction": 2, "Large intestine polyp": 2, "Ligament injury": 2, "Muscular weakness": 2, "Neuropathy peripheral": 2, "Osteoarthritis": 2, "Palpitations": 2, "Peritonsillar abscess": 2, "Platelet count": 2, "Rash": 2, "Red blood cell count": 2, "Subarachnoid haemorrhage": 2, "Swelling": 2, "Vaccination site swelling": 2, "White blood cell count": 2, "Accident": 1, "Acute myocardial infarction": 1, "Alopecia": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Aneurysm ruptured": 1, "Angioedema": 1, "Anxiety disorder": 1, "Aspartate aminotransferase": 1, "Back pain": 1, "Bile duct stone": 1, "Biliary tract infection": 1, "Blood acid phosphatase": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood pressure increased": 1, "COVID-19 immunisation": 1, "CSF oligoclonal band": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Chest pain": 1, "Clavicle fracture": 1, "Coagulation time": 1, "Colitis ischaemic": 1, "Coronavirus test": 1, "Dehydration": 1, "Dermatitis bullous": 1, "Dysentery": 1, "Dyslipidaemia": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Fatigue": 1, "Feeling hot": 1, "Fistula": 1, "Gamma-glutamyltransferase": 1, "Genital haemorrhage": 1, "Glucose tolerance test": 1, "Haemorrhoids": 1, "Hepatic function abnormal": 1, "Hot flush": 1, "Hyperventilation": 1, "Hypokinesia": 1, "IgA nephropathy": 1, "Illness": 1, "Induration": 1, "Injection site cellulitis": 1, "Injection site pruritus": 1, "Interchange of vaccine products": 1, "Intervertebral disc protrusion": 1, "Investigation": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Necrotising fasciitis": 1, "Neurological examination": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Panniculitis": 1, "Paralysis recurrent laryngeal nerve": 1, "Platelet count decreased": 1, "Pregnancy": 1, "Pregnancy test": 1, "Rectal cancer": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Rotator cuff syndrome": 1, "Ruptured cerebral aneurysm": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Sensory disturbance": 1, "Skin ulcer": 1, "Small intestine carcinoma": 1, "Spinal myelogram": 1, "Swelling face": 1, "Tachycardia": 1, "Thermal burn": 1, "Thrombocytopenia": 1, "Tibia fracture": 1, "Traumatic haemothorax": 1, "Troponin I": 1, "Ureterolithiasis": 1, "Vaccination complication": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vertigo": 1, "Vomiting": 1, "Wrist fracture": 1, "X-ray": 1}, "batchcodes": ["3002180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002181.json b/docs/data/histograms/Japan/3002181.json
index 6aaa94b9924..edf9c7dcb2a 100644
--- a/docs/data/histograms/Japan/3002181.json
+++ b/docs/data/histograms/Japan/3002181.json
@@ -1 +1 @@
-{"batchcode": "3002181", "histograms": [{"batchcodes": ["3002181"], "histogram": {"Blood pressure measurement": 19, "Heart rate": 15, "Presyncope": 13, "Syncope": 12, "Anaphylactic reaction": 11, "Body temperature": 11, "Feeling abnormal": 8, "Oxygen saturation": 6, "COVID-19": 4, "Depressed level of consciousness": 4, "Malaise": 4, "Nucleic acid test": 4, "Asthma": 3, "Cerebral infarction": 3, "Neuropathy peripheral": 3, "Pyrexia": 3, "Altered state of consciousness": 2, "Blood pressure decreased": 2, "Blood pressure systolic": 2, "Bradycardia": 2, "Dyspnoea": 2, "Grip strength decreased": 2, "Hypersensitivity": 2, "Hypertension": 2, "Hyperventilation": 2, "Oropharyngeal discomfort": 2, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Acute myocardial infarction": 1, "Anti-muscle specific kinase antibody": 1, "Antiacetylcholine receptor antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Asthenia": 1, "Blood creatine": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactic acid": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood pyruvic acid": 1, "Blood thyroid stimulating hormone": 1, "Brain stem infarction": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chills": 1, "Coagulation test": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Cough": 1, "Dehydration": 1, "Diplopia": 1, "Dysarthria": 1, "Dyspraxia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Erythema": 1, "Erythema multiforme": 1, "Eye movement disorder": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Grip strength": 1, "Haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Hyperreflexia": 1, "Hypertensive emergency": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Imaging procedure": 1, "Inflammation": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nausea": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Pain": 1, "Pain in extremity": 1, "Pallor": 1, "Peripheral coldness": 1, "Physical deconditioning": 1, "Postural tremor": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Reflex test": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Strabismus": 1, "Supraventricular tachycardia": 1, "Systemic mastocytosis": 1, "Tachypnoea": 1, "Throat irritation": 1, "Thyroid function test": 1, "Tremor": 1, "VIth nerve paralysis": 1, "Vaccination site paraesthesia": 1, "Vertigo": 1, "Visual impairment": 1, "Vitamin B1": 1, "Vitamin B12": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3002181", "histograms": [{"histogram": {"Blood pressure measurement": 19, "Heart rate": 15, "Presyncope": 13, "Syncope": 12, "Anaphylactic reaction": 11, "Body temperature": 11, "Feeling abnormal": 8, "Oxygen saturation": 6, "COVID-19": 4, "Depressed level of consciousness": 4, "Malaise": 4, "Nucleic acid test": 4, "Asthma": 3, "Cerebral infarction": 3, "Neuropathy peripheral": 3, "Pyrexia": 3, "Altered state of consciousness": 2, "Blood pressure decreased": 2, "Blood pressure systolic": 2, "Bradycardia": 2, "Dyspnoea": 2, "Grip strength decreased": 2, "Hypersensitivity": 2, "Hypertension": 2, "Hyperventilation": 2, "Oropharyngeal discomfort": 2, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Acute myocardial infarction": 1, "Anti-muscle specific kinase antibody": 1, "Antiacetylcholine receptor antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Asthenia": 1, "Blood creatine": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactic acid": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood pyruvic acid": 1, "Blood thyroid stimulating hormone": 1, "Brain stem infarction": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chills": 1, "Coagulation test": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Cough": 1, "Dehydration": 1, "Diplopia": 1, "Dysarthria": 1, "Dyspraxia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Erythema": 1, "Erythema multiforme": 1, "Eye movement disorder": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Grip strength": 1, "Haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Hyperreflexia": 1, "Hypertensive emergency": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Imaging procedure": 1, "Inflammation": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nausea": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Pain": 1, "Pain in extremity": 1, "Pallor": 1, "Peripheral coldness": 1, "Physical deconditioning": 1, "Postural tremor": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Reflex test": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Strabismus": 1, "Supraventricular tachycardia": 1, "Systemic mastocytosis": 1, "Tachypnoea": 1, "Throat irritation": 1, "Thyroid function test": 1, "Tremor": 1, "VIth nerve paralysis": 1, "Vaccination site paraesthesia": 1, "Vertigo": 1, "Visual impairment": 1, "Vitamin B1": 1, "Vitamin B12": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["3002181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002185.json b/docs/data/histograms/Japan/3002185.json
index 223a780c2d1..d243eb681a4 100644
--- a/docs/data/histograms/Japan/3002185.json
+++ b/docs/data/histograms/Japan/3002185.json
@@ -1 +1 @@
-{"batchcode": "3002185", "histograms": [{"batchcodes": ["3002185"], "histogram": {"Anaphylactic reaction": 17, "Body temperature": 13, "Blood pressure measurement": 6, "Oxygen saturation": 6, "Heart rate": 5, "Pyrexia": 4, "Headache": 3, "Hyperventilation": 3, "Loss of consciousness": 2, "Nausea": 2, "Presyncope": 2, "Seizure": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Altered state of consciousness": 1, "Anaphylactoid reaction": 1, "Antibody test": 1, "Arthritis": 1, "Asthma": 1, "Basophil count": 1, "Blood creatine phosphokinase": 1, "Blood pressure systolic": 1, "Blood test": 1, "C-reactive protein": 1, "Cough": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Eosinophil count": 1, "Erythema": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Internal haemorrhage": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Melaena": 1, "Monocyte count": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Pancreatitis acute": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Tetany": 1, "Vaccination site anaesthesia": 1, "Vaccination site pain": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3002185", "histograms": [{"histogram": {"Anaphylactic reaction": 17, "Body temperature": 13, "Blood pressure measurement": 6, "Oxygen saturation": 6, "Heart rate": 5, "Pyrexia": 4, "Headache": 3, "Hyperventilation": 3, "Loss of consciousness": 2, "Nausea": 2, "Presyncope": 2, "Seizure": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Altered state of consciousness": 1, "Anaphylactoid reaction": 1, "Antibody test": 1, "Arthritis": 1, "Asthma": 1, "Basophil count": 1, "Blood creatine phosphokinase": 1, "Blood pressure systolic": 1, "Blood test": 1, "C-reactive protein": 1, "Cough": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Eosinophil count": 1, "Erythema": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Internal haemorrhage": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Melaena": 1, "Monocyte count": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Pancreatitis acute": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Tetany": 1, "Vaccination site anaesthesia": 1, "Vaccination site pain": 1, "White blood cell count": 1}, "batchcodes": ["3002185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002337.json b/docs/data/histograms/Japan/3002337.json
index 3490c2f2bcb..8b5125c27f8 100644
--- a/docs/data/histograms/Japan/3002337.json
+++ b/docs/data/histograms/Japan/3002337.json
@@ -1 +1 @@
-{"batchcode": "3002337", "histograms": [{"batchcodes": ["3002337"], "histogram": {"Body temperature": 19, "Anaphylactic reaction": 15, "Blood pressure measurement": 13, "Heart rate": 10, "Neuropathy peripheral": 9, "Oxygen saturation": 9, "Presyncope": 9, "Loss of consciousness": 6, "Pyrexia": 6, "Magnetic resonance imaging head": 4, "Hypoaesthesia": 3, "Nausea": 3, "Seizure": 3, "Vaccination site pain": 3, "Blood test": 2, "Bradycardia": 2, "Deep vein thrombosis": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Dysaesthesia": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Vertebral artery dissection": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Activated partial thromboplastin time": 1, "Aneurysm ruptured": 1, "Angiogram": 1, "Asthma": 1, "Biopsy heart": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiogenic shock": 1, "Cardiomegaly": 1, "Cerebellar infarction": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram": 1, "Disorientation": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysphoria": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electrocorticogram": 1, "Epilepsy": 1, "Erythema": 1, "Eye swelling": 1, "Face oedema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gaze palsy": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertrophic cardiomyopathy": 1, "Hyperventilation": 1, "International normalised ratio": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Movement disorder": 1, "Muscular weakness": 1, "Myelitis transverse": 1, "Myocarditis": 1, "Nystagmus": 1, "Pallor": 1, "Paresis": 1, "Physical deconditioning": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Prothrombin time": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Radial nerve injury": 1, "Radioisotope scan": 1, "Rash": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Smear test": 1, "Spinal osteoarthritis": 1, "Stress cardiomyopathy": 1, "Tachycardia": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tonic convulsion": 1, "Ultrasound scan": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Vertigo": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3002337", "histograms": [{"histogram": {"Body temperature": 19, "Anaphylactic reaction": 15, "Blood pressure measurement": 13, "Heart rate": 10, "Neuropathy peripheral": 9, "Oxygen saturation": 9, "Presyncope": 9, "Loss of consciousness": 6, "Pyrexia": 6, "Magnetic resonance imaging head": 4, "Hypoaesthesia": 3, "Nausea": 3, "Seizure": 3, "Vaccination site pain": 3, "Blood test": 2, "Bradycardia": 2, "Deep vein thrombosis": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Dysaesthesia": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Vertebral artery dissection": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Activated partial thromboplastin time": 1, "Aneurysm ruptured": 1, "Angiogram": 1, "Asthma": 1, "Biopsy heart": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiogenic shock": 1, "Cardiomegaly": 1, "Cerebellar infarction": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram": 1, "Disorientation": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysphoria": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electrocorticogram": 1, "Epilepsy": 1, "Erythema": 1, "Eye swelling": 1, "Face oedema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gaze palsy": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertrophic cardiomyopathy": 1, "Hyperventilation": 1, "International normalised ratio": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Movement disorder": 1, "Muscular weakness": 1, "Myelitis transverse": 1, "Myocarditis": 1, "Nystagmus": 1, "Pallor": 1, "Paresis": 1, "Physical deconditioning": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Prothrombin time": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Radial nerve injury": 1, "Radioisotope scan": 1, "Rash": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Smear test": 1, "Spinal osteoarthritis": 1, "Stress cardiomyopathy": 1, "Tachycardia": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tonic convulsion": 1, "Ultrasound scan": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Vertigo": 1, "White blood cell count": 1}, "batchcodes": ["3002337"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002431.json b/docs/data/histograms/Japan/3002431.json
index e872bb35c48..357e8bf167b 100644
--- a/docs/data/histograms/Japan/3002431.json
+++ b/docs/data/histograms/Japan/3002431.json
@@ -1 +1 @@
-{"batchcode": "3002431", "histograms": [{"batchcodes": ["3002431"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "3002431", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["3002431"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002539.json b/docs/data/histograms/Japan/3002539.json
index db63f316bec..f73e336fda4 100644
--- a/docs/data/histograms/Japan/3002539.json
+++ b/docs/data/histograms/Japan/3002539.json
@@ -1 +1 @@
-{"batchcode": "3002539", "histograms": [{"batchcodes": ["3002539"], "histogram": {"Body temperature": 16, "Blood pressure measurement": 8, "Presyncope": 7, "Heart rate": 6, "Loss of consciousness": 6, "Oxygen saturation": 5, "Nausea": 4, "Pyrexia": 4, "Anaphylactic reaction": 3, "Bradycardia": 3, "Feeling abnormal": 3, "Headache": 3, "Hypoaesthesia": 3, "Pruritus": 3, "Arthralgia": 2, "Cerebral haemorrhage": 2, "Depressed level of consciousness": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Pallor": 2, "Peripheral coldness": 2, "Platelet count": 2, "Respiratory rate": 2, "Syncope": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Anaphylactoid reaction": 1, "Angioedema": 1, "Asthenia": 1, "Blood test": 1, "Cerebral venous sinus thrombosis": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Constipation": 1, "Contusion": 1, "Cough": 1, "Dizziness": 1, "Dysarthria": 1, "Dyskinesia": 1, "Electroencephalogram": 1, "Endoscopy gastrointestinal": 1, "Eosinophil count increased": 1, "Eyelid injury": 1, "Faeces soft": 1, "Fibrin D dimer": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Immune thrombocytopenia": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Peripheral nerve palsy": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "SARS-CoV-2 test": 1, "Scan with contrast": 1, "Seizure": 1, "Status epilepticus": 1, "Subarachnoid haemorrhage": 1, "Taste disorder": 1, "Thrombocytopenic purpura": 1, "Ultrasound scan": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3002539", "histograms": [{"histogram": {"Body temperature": 16, "Blood pressure measurement": 8, "Presyncope": 7, "Heart rate": 6, "Loss of consciousness": 6, "Oxygen saturation": 5, "Nausea": 4, "Pyrexia": 4, "Anaphylactic reaction": 3, "Bradycardia": 3, "Feeling abnormal": 3, "Headache": 3, "Hypoaesthesia": 3, "Pruritus": 3, "Arthralgia": 2, "Cerebral haemorrhage": 2, "Depressed level of consciousness": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Pallor": 2, "Peripheral coldness": 2, "Platelet count": 2, "Respiratory rate": 2, "Syncope": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Anaphylactoid reaction": 1, "Angioedema": 1, "Asthenia": 1, "Blood test": 1, "Cerebral venous sinus thrombosis": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Constipation": 1, "Contusion": 1, "Cough": 1, "Dizziness": 1, "Dysarthria": 1, "Dyskinesia": 1, "Electroencephalogram": 1, "Endoscopy gastrointestinal": 1, "Eosinophil count increased": 1, "Eyelid injury": 1, "Faeces soft": 1, "Fibrin D dimer": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Immune thrombocytopenia": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Peripheral nerve palsy": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "SARS-CoV-2 test": 1, "Scan with contrast": 1, "Seizure": 1, "Status epilepticus": 1, "Subarachnoid haemorrhage": 1, "Taste disorder": 1, "Thrombocytopenic purpura": 1, "Ultrasound scan": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["3002539"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002540.json b/docs/data/histograms/Japan/3002540.json
index 4439efc09e9..5a805fa84ff 100644
--- a/docs/data/histograms/Japan/3002540.json
+++ b/docs/data/histograms/Japan/3002540.json
@@ -1 +1 @@
-{"batchcode": "3002540", "histograms": [{"batchcodes": ["3002540", "FK 8562"], "histogram": {"Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Aspiration bone marrow": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood bilirubin": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood smear test": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Cold agglutinins": 1, "Cold type haemolytic anaemia": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram neck": 1, "Computerised tomogram thorax": 1, "Coombs direct test": 1, "Cytomegalovirus test": 1, "Electrophoresis protein": 1, "Endoscopy upper gastrointestinal tract": 1, "Epstein-Barr virus test": 1, "Flow cytometry": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haptoglobin": 1, "Headache": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Interchange of vaccine products": 1, "Mean cell volume": 1, "Mycoplasma test": 1, "Parvovirus B19 test": 1, "Platelet count": 1, "Pyrexia": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Total complement activity test": 1, "White blood cell count": 1}}, {"batchcodes": ["3002540"], "histogram": {"Body temperature": 22, "Presyncope": 12, "Blood pressure measurement": 11, "Loss of consciousness": 11, "Anaphylactic reaction": 9, "Heart rate": 8, "Oxygen saturation": 7, "Headache": 5, "Feeling abnormal": 4, "Blood pressure increased": 3, "Myocarditis": 3, "Pyrexia": 3, "Seizure": 3, "Altered state of consciousness": 2, "Dysphoria": 2, "Electrocardiogram": 2, "Erythema": 2, "Facial paralysis": 2, "Fall": 2, "Hypersensitivity": 2, "Malaise": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Visual impairment": 2, "Abdominal pain": 1, "Alopecia": 1, "Angina unstable": 1, "Angiogram": 1, "Aortic dissection": 1, "Apnoea": 1, "Blister": 1, "Blood test": 1, "COVID-19": 1, "Cerebral haemorrhage": 1, "Chest pain": 1, "Cholinergic syndrome": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Computerised tomogram": 1, "Contusion": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Erythema multiforme": 1, "Feeling hot": 1, "Haemoglobin": 1, "Haemolytic anaemia": 1, "Head injury": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hypertensive emergency": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Oculomucocutaneous syndrome": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Panic reaction": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Platelet count": 1, "Pleurisy": 1, "Pruritus": 1, "Radial nerve palsy": 1, "Shock": 1, "Sialoadenitis": 1, "Skin abrasion": 1, "Skin laceration": 1, "Submaxillary gland enlargement": 1, "Sudden death": 1, "Syncope": 1, "Tachypnoea": 1, "Thrombocytopenic purpura": 1, "Tremor": 1, "Troponin T": 1, "Urine analysis": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3002540", "histograms": [{"histogram": {"Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Aspiration bone marrow": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood bilirubin": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood smear test": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Cold agglutinins": 1, "Cold type haemolytic anaemia": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram neck": 1, "Computerised tomogram thorax": 1, "Coombs direct test": 1, "Cytomegalovirus test": 1, "Electrophoresis protein": 1, "Endoscopy upper gastrointestinal tract": 1, "Epstein-Barr virus test": 1, "Flow cytometry": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haptoglobin": 1, "Headache": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Interchange of vaccine products": 1, "Mean cell volume": 1, "Mycoplasma test": 1, "Parvovirus B19 test": 1, "Platelet count": 1, "Pyrexia": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Total complement activity test": 1, "White blood cell count": 1}, "batchcodes": ["3002540", "FK 8562"]}, {"histogram": {"Body temperature": 22, "Presyncope": 12, "Blood pressure measurement": 11, "Loss of consciousness": 11, "Anaphylactic reaction": 9, "Heart rate": 8, "Oxygen saturation": 7, "Headache": 5, "Feeling abnormal": 4, "Blood pressure increased": 3, "Myocarditis": 3, "Pyrexia": 3, "Seizure": 3, "Altered state of consciousness": 2, "Dysphoria": 2, "Electrocardiogram": 2, "Erythema": 2, "Facial paralysis": 2, "Fall": 2, "Hypersensitivity": 2, "Malaise": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Visual impairment": 2, "Abdominal pain": 1, "Alopecia": 1, "Angina unstable": 1, "Angiogram": 1, "Aortic dissection": 1, "Apnoea": 1, "Blister": 1, "Blood test": 1, "COVID-19": 1, "Cerebral haemorrhage": 1, "Chest pain": 1, "Cholinergic syndrome": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Computerised tomogram": 1, "Contusion": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Erythema multiforme": 1, "Feeling hot": 1, "Haemoglobin": 1, "Haemolytic anaemia": 1, "Head injury": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hypertensive emergency": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Oculomucocutaneous syndrome": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Panic reaction": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Platelet count": 1, "Pleurisy": 1, "Pruritus": 1, "Radial nerve palsy": 1, "Shock": 1, "Sialoadenitis": 1, "Skin abrasion": 1, "Skin laceration": 1, "Submaxillary gland enlargement": 1, "Sudden death": 1, "Syncope": 1, "Tachypnoea": 1, "Thrombocytopenic purpura": 1, "Tremor": 1, "Troponin T": 1, "Urine analysis": 1, "Vaccination site pain": 1}, "batchcodes": ["3002540"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002617.json b/docs/data/histograms/Japan/3002617.json
index 965ee1563d8..56912d54d62 100644
--- a/docs/data/histograms/Japan/3002617.json
+++ b/docs/data/histograms/Japan/3002617.json
@@ -1 +1 @@
-{"batchcode": "3002617", "histograms": [{"batchcodes": ["3002617"], "histogram": {"Body temperature": 14, "Anaphylactic reaction": 10, "Blood pressure measurement": 9, "Heart rate": 9, "Pyrexia": 9, "Oxygen saturation": 8, "Loss of consciousness": 6, "Presyncope": 5, "Dizziness": 4, "Dyspnoea": 4, "Headache": 4, "Seizure": 4, "Chills": 3, "Malaise": 3, "Vaccination site pain": 3, "Anaphylactoid reaction": 2, "Cerebral infarction": 2, "Chest pain": 2, "Cough": 2, "Electrocardiogram": 2, "Muscular weakness": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "SARS-CoV-2 test": 2, "Blood pressure increased": 1, "Bradycardia": 1, "COVID-19": 1, "Cardiac disorder": 1, "Cardiac failure acute": 1, "Cold sweat": 1, "Discomfort": 1, "Dysphonia": 1, "Fall": 1, "Feeling cold": 1, "Gingival pain": 1, "Gingival swelling": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Interstitial lung disease": 1, "Magnetic resonance imaging head": 1, "Muscle spasms": 1, "Myocarditis": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Panic attack": 1, "Peripheral coldness": 1, "Pharyngeal oedema": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia": 1, "Pruritus": 1, "Red blood cell count": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test positive": 1, "Sudden hearing loss": 1, "Syncope": 1, "Thrombocytopenic purpura": 1, "Thrombotic cerebral infarction": 1, "Troponin": 1, "Vaccination site inflammation": 1, "Visual impairment": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3002617", "histograms": [{"histogram": {"Body temperature": 14, "Anaphylactic reaction": 10, "Blood pressure measurement": 9, "Heart rate": 9, "Pyrexia": 9, "Oxygen saturation": 8, "Loss of consciousness": 6, "Presyncope": 5, "Dizziness": 4, "Dyspnoea": 4, "Headache": 4, "Seizure": 4, "Chills": 3, "Malaise": 3, "Vaccination site pain": 3, "Anaphylactoid reaction": 2, "Cerebral infarction": 2, "Chest pain": 2, "Cough": 2, "Electrocardiogram": 2, "Muscular weakness": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "SARS-CoV-2 test": 2, "Blood pressure increased": 1, "Bradycardia": 1, "COVID-19": 1, "Cardiac disorder": 1, "Cardiac failure acute": 1, "Cold sweat": 1, "Discomfort": 1, "Dysphonia": 1, "Fall": 1, "Feeling cold": 1, "Gingival pain": 1, "Gingival swelling": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Interstitial lung disease": 1, "Magnetic resonance imaging head": 1, "Muscle spasms": 1, "Myocarditis": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Panic attack": 1, "Peripheral coldness": 1, "Pharyngeal oedema": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia": 1, "Pruritus": 1, "Red blood cell count": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test positive": 1, "Sudden hearing loss": 1, "Syncope": 1, "Thrombocytopenic purpura": 1, "Thrombotic cerebral infarction": 1, "Troponin": 1, "Vaccination site inflammation": 1, "Visual impairment": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["3002617"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002618.json b/docs/data/histograms/Japan/3002618.json
index 51d609c0326..cecb194ae99 100644
--- a/docs/data/histograms/Japan/3002618.json
+++ b/docs/data/histograms/Japan/3002618.json
@@ -1 +1 @@
-{"batchcode": "3002618", "histograms": [{"batchcodes": ["3002618"], "histogram": {"Body temperature": 20, "Blood pressure measurement": 19, "Oxygen saturation": 12, "Anaphylactic reaction": 10, "Heart rate": 10, "Presyncope": 9, "Feeling abnormal": 5, "Depressed level of consciousness": 4, "Contusion": 3, "Fall": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Nausea": 3, "Neuropathy peripheral": 3, "Pruritus": 3, "Syncope": 3, "Anaphylactoid reaction": 2, "Bradycardia": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Electrocardiogram": 2, "Hypoaesthesia": 2, "IgA nephropathy": 2, "Microscopy": 2, "Mouth haemorrhage": 2, "Palpitations": 2, "Pneumonia": 2, "Pyrexia": 2, "Vomiting": 2, "Anal examination": 1, "Anxiety": 1, "Arrhythmia": 1, "Asthma": 1, "Biopsy kidney": 1, "Biopsy lymph gland": 1, "Blood glucose": 1, "Blood test": 1, "COVID-19": 1, "Cardio-respiratory arrest": 1, "Cytology": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Feeling hot": 1, "Gastrointestinal haemorrhage": 1, "Gingival bleeding": 1, "Haemorrhoids": 1, "Headache": 1, "Hypertension": 1, "Hyperventilation": 1, "Lymph node abscess": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Parosmia": 1, "Pneumonia viral": 1, "Rash": 1, "Renal function test": 1, "Respiratory symptom": 1, "Seizure": 1, "Subarachnoid haemorrhage": 1, "Subcutaneous haematoma": 1, "Taste disorder": 1, "Toothache": 1, "Tremor": 1, "Troponin I": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vagus nerve disorder": 1, "Vertebral artery dissection": 1, "Wound": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3002618", "histograms": [{"histogram": {"Body temperature": 20, "Blood pressure measurement": 19, "Oxygen saturation": 12, "Anaphylactic reaction": 10, "Heart rate": 10, "Presyncope": 9, "Feeling abnormal": 5, "Depressed level of consciousness": 4, "Contusion": 3, "Fall": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Nausea": 3, "Neuropathy peripheral": 3, "Pruritus": 3, "Syncope": 3, "Anaphylactoid reaction": 2, "Bradycardia": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Electrocardiogram": 2, "Hypoaesthesia": 2, "IgA nephropathy": 2, "Microscopy": 2, "Mouth haemorrhage": 2, "Palpitations": 2, "Pneumonia": 2, "Pyrexia": 2, "Vomiting": 2, "Anal examination": 1, "Anxiety": 1, "Arrhythmia": 1, "Asthma": 1, "Biopsy kidney": 1, "Biopsy lymph gland": 1, "Blood glucose": 1, "Blood test": 1, "COVID-19": 1, "Cardio-respiratory arrest": 1, "Cytology": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Feeling hot": 1, "Gastrointestinal haemorrhage": 1, "Gingival bleeding": 1, "Haemorrhoids": 1, "Headache": 1, "Hypertension": 1, "Hyperventilation": 1, "Lymph node abscess": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Parosmia": 1, "Pneumonia viral": 1, "Rash": 1, "Renal function test": 1, "Respiratory symptom": 1, "Seizure": 1, "Subarachnoid haemorrhage": 1, "Subcutaneous haematoma": 1, "Taste disorder": 1, "Toothache": 1, "Tremor": 1, "Troponin I": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vagus nerve disorder": 1, "Vertebral artery dissection": 1, "Wound": 1, "X-ray": 1}, "batchcodes": ["3002618"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002619.json b/docs/data/histograms/Japan/3002619.json
index 488c9a1df1c..c0af1ed08a4 100644
--- a/docs/data/histograms/Japan/3002619.json
+++ b/docs/data/histograms/Japan/3002619.json
@@ -1 +1 @@
-{"batchcode": "3002619", "histograms": [{"batchcodes": ["3002619"], "histogram": {"Presyncope": 15, "Body temperature": 12, "Blood pressure measurement": 11, "Anaphylactic reaction": 9, "Loss of consciousness": 8, "Heart rate": 7, "Oxygen saturation": 4, "Blood pressure decreased": 3, "Coma scale": 3, "Pyrexia": 3, "Arthritis": 2, "Fall": 2, "Pain": 2, "Syncope": 2, "Anaemia": 1, "Bell's palsy": 1, "Blood pressure increased": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Feeling abnormal": 1, "Gaze palsy": 1, "Grip strength": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Movement disorder": 1, "Neuropathy peripheral": 1, "Periarthritis": 1, "Polyarthritis": 1, "Rheumatoid arthritis": 1, "Seizure": 1, "Sleep disorder": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Synovitis": 1, "Tinnitus": 1, "Tonic convulsion": 1, "Tremor": 1, "Ultrasound joint": 1, "Urticaria": 1, "Vertigo positional": 1}}]}
\ No newline at end of file
+{"batchcode": "3002619", "histograms": [{"histogram": {"Presyncope": 15, "Body temperature": 12, "Blood pressure measurement": 11, "Anaphylactic reaction": 9, "Loss of consciousness": 8, "Heart rate": 7, "Oxygen saturation": 4, "Blood pressure decreased": 3, "Coma scale": 3, "Pyrexia": 3, "Arthritis": 2, "Fall": 2, "Pain": 2, "Syncope": 2, "Anaemia": 1, "Bell's palsy": 1, "Blood pressure increased": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Feeling abnormal": 1, "Gaze palsy": 1, "Grip strength": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Movement disorder": 1, "Neuropathy peripheral": 1, "Periarthritis": 1, "Polyarthritis": 1, "Rheumatoid arthritis": 1, "Seizure": 1, "Sleep disorder": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Synovitis": 1, "Tinnitus": 1, "Tonic convulsion": 1, "Tremor": 1, "Ultrasound joint": 1, "Urticaria": 1, "Vertigo positional": 1}, "batchcodes": ["3002619"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3002915.json b/docs/data/histograms/Japan/3002915.json
index 5ed7161ae07..570303d9a59 100644
--- a/docs/data/histograms/Japan/3002915.json
+++ b/docs/data/histograms/Japan/3002915.json
@@ -1 +1 @@
-{"batchcode": "3002915", "histograms": [{"batchcodes": ["3002915"], "histogram": {"Anaphylactic reaction": 20, "Body temperature": 17, "Blood pressure measurement": 10, "Pyrexia": 8, "Oxygen saturation": 7, "Heart rate": 6, "Neuropathy peripheral": 6, "Presyncope": 6, "Loss of consciousness": 4, "Syncope": 3, "Asthma": 2, "Dyspnoea": 2, "Feeling abnormal": 2, "Lip injury": 2, "Urticaria": 2, "Abdominal pain": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Arthropathy": 1, "Bell's palsy": 1, "Beta haemolytic streptococcal infection": 1, "Biopsy skin": 1, "Blood pressure decreased": 1, "Blood test": 1, "Cardiac failure": 1, "Condition aggravated": 1, "Contusion": 1, "Cytomegalovirus infection": 1, "Cytomegalovirus infection reactivation": 1, "Decreased appetite": 1, "Decreased immune responsiveness": 1, "Dizziness": 1, "Facial paralysis": 1, "Fall": 1, "Genital herpes": 1, "Genital infection bacterial": 1, "Headache": 1, "Herpes virus infection": 1, "Hypersensitivity vasculitis": 1, "Insomnia": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Liver disorder": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Peritonsillitis": 1, "Pharyngeal oedema": 1, "Pharyngitis": 1, "Seizure": 1, "Serology test": 1, "Shoulder injury related to vaccine administration": 1, "Systemic lupus erythematosus": 1, "Vaccination site paraesthesia": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3002915", "histograms": [{"histogram": {"Anaphylactic reaction": 20, "Body temperature": 17, "Blood pressure measurement": 10, "Pyrexia": 8, "Oxygen saturation": 7, "Heart rate": 6, "Neuropathy peripheral": 6, "Presyncope": 6, "Loss of consciousness": 4, "Syncope": 3, "Asthma": 2, "Dyspnoea": 2, "Feeling abnormal": 2, "Lip injury": 2, "Urticaria": 2, "Abdominal pain": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Arthropathy": 1, "Bell's palsy": 1, "Beta haemolytic streptococcal infection": 1, "Biopsy skin": 1, "Blood pressure decreased": 1, "Blood test": 1, "Cardiac failure": 1, "Condition aggravated": 1, "Contusion": 1, "Cytomegalovirus infection": 1, "Cytomegalovirus infection reactivation": 1, "Decreased appetite": 1, "Decreased immune responsiveness": 1, "Dizziness": 1, "Facial paralysis": 1, "Fall": 1, "Genital herpes": 1, "Genital infection bacterial": 1, "Headache": 1, "Herpes virus infection": 1, "Hypersensitivity vasculitis": 1, "Insomnia": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Liver disorder": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Peritonsillitis": 1, "Pharyngeal oedema": 1, "Pharyngitis": 1, "Seizure": 1, "Serology test": 1, "Shoulder injury related to vaccine administration": 1, "Systemic lupus erythematosus": 1, "Vaccination site paraesthesia": 1, "X-ray": 1}, "batchcodes": ["3002915"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/300318.json b/docs/data/histograms/Japan/300318.json
index 4893a9528be..d21dad109a2 100644
--- a/docs/data/histograms/Japan/300318.json
+++ b/docs/data/histograms/Japan/300318.json
@@ -1 +1 @@
-{"batchcode": "300318", "histograms": [{"batchcodes": ["300318"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "300318", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["300318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003180.json b/docs/data/histograms/Japan/3003180.json
index bbbb3d737a9..3f6d99592c0 100644
--- a/docs/data/histograms/Japan/3003180.json
+++ b/docs/data/histograms/Japan/3003180.json
@@ -1 +1 @@
-{"batchcode": "3003180", "histograms": [{"batchcodes": ["3003180"], "histogram": {"Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "3003180", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Dizziness": 1}, "batchcodes": ["3003180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003182.json b/docs/data/histograms/Japan/3003182.json
index 984a47da2ca..6ad118b8b6b 100644
--- a/docs/data/histograms/Japan/3003182.json
+++ b/docs/data/histograms/Japan/3003182.json
@@ -1 +1 @@
-{"batchcode": "3003182", "histograms": [{"batchcodes": ["3003182"], "histogram": {"Anaphylactic reaction": 80, "Body temperature": 15, "Blood pressure measurement": 4, "Headache": 4, "Presyncope": 4, "Pyrexia": 4, "Heart rate": 3, "Malaise": 3, "Oxygen saturation": 3, "Loss of consciousness": 2, "Neuropathy peripheral": 2, "Oropharyngeal discomfort": 2, "Seizure": 2, "Syncope": 2, "Abdominal pain upper": 1, "Back pain": 1, "Blood pressure increased": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Coronavirus test": 1, "Coronavirus test positive": 1, "Deep vein thrombosis": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Fall": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Hypoxic-ischaemic encephalopathy": 1, "Injection site hypoaesthesia": 1, "Laboratory test": 1, "Myocarditis": 1, "Pain in extremity": 1, "Palpitations": 1, "Pulmonary embolism": 1, "Retinal vein occlusion": 1, "Urticaria": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "3003182", "histograms": [{"histogram": {"Anaphylactic reaction": 80, "Body temperature": 15, "Blood pressure measurement": 4, "Headache": 4, "Presyncope": 4, "Pyrexia": 4, "Heart rate": 3, "Malaise": 3, "Oxygen saturation": 3, "Loss of consciousness": 2, "Neuropathy peripheral": 2, "Oropharyngeal discomfort": 2, "Seizure": 2, "Syncope": 2, "Abdominal pain upper": 1, "Back pain": 1, "Blood pressure increased": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Coronavirus test": 1, "Coronavirus test positive": 1, "Deep vein thrombosis": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Fall": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Hypoxic-ischaemic encephalopathy": 1, "Injection site hypoaesthesia": 1, "Laboratory test": 1, "Myocarditis": 1, "Pain in extremity": 1, "Palpitations": 1, "Pulmonary embolism": 1, "Retinal vein occlusion": 1, "Urticaria": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1}, "batchcodes": ["3003182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003189.json b/docs/data/histograms/Japan/3003189.json
index f2bf83b6e7f..30b6260f02e 100644
--- a/docs/data/histograms/Japan/3003189.json
+++ b/docs/data/histograms/Japan/3003189.json
@@ -1 +1 @@
-{"batchcode": "3003189", "histograms": [{"batchcodes": ["3003189"], "histogram": {"Blood pressure measurement": 12, "Anaphylactic reaction": 11, "Body temperature": 11, "Heart rate": 11, "Oxygen saturation": 5, "Presyncope": 5, "Loss of consciousness": 4, "Pyrexia": 4, "Altered state of consciousness": 3, "Bradycardia": 3, "Guillain-Barre syndrome": 2, "Headache": 2, "Malaise": 2, "Myocarditis": 2, "Pallor": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Anaphylactoid reaction": 1, "Arrhythmia": 1, "Blood pressure increased": 1, "COVID-19": 1, "CSF test": 1, "Cardiomyopathy": 1, "Clonic convulsion": 1, "Cold sweat": 1, "Depressed level of consciousness": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Encephalopathy": 1, "Epigastric discomfort": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Feeling abnormal": 1, "Heart rate decreased": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Lip discolouration": 1, "Livedo reticularis": 1, "Meningitis aseptic": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neurogenic shock": 1, "Oral contusion": 1, "Oropharyngeal discomfort": 1, "Seizure": 1, "Urticaria": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "3003189", "histograms": [{"histogram": {"Blood pressure measurement": 12, "Anaphylactic reaction": 11, "Body temperature": 11, "Heart rate": 11, "Oxygen saturation": 5, "Presyncope": 5, "Loss of consciousness": 4, "Pyrexia": 4, "Altered state of consciousness": 3, "Bradycardia": 3, "Guillain-Barre syndrome": 2, "Headache": 2, "Malaise": 2, "Myocarditis": 2, "Pallor": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Anaphylactoid reaction": 1, "Arrhythmia": 1, "Blood pressure increased": 1, "COVID-19": 1, "CSF test": 1, "Cardiomyopathy": 1, "Clonic convulsion": 1, "Cold sweat": 1, "Depressed level of consciousness": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Encephalopathy": 1, "Epigastric discomfort": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Feeling abnormal": 1, "Heart rate decreased": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Lip discolouration": 1, "Livedo reticularis": 1, "Meningitis aseptic": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neurogenic shock": 1, "Oral contusion": 1, "Oropharyngeal discomfort": 1, "Seizure": 1, "Urticaria": 1, "Visual impairment": 1}, "batchcodes": ["3003189"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003190.json b/docs/data/histograms/Japan/3003190.json
index 8b30b805721..53d651af0e8 100644
--- a/docs/data/histograms/Japan/3003190.json
+++ b/docs/data/histograms/Japan/3003190.json
@@ -1 +1 @@
-{"batchcode": "3003190", "histograms": [{"batchcodes": ["3003190"], "histogram": {"Presyncope": 14, "Blood pressure measurement": 11, "Body temperature": 10, "Loss of consciousness": 9, "Anaphylactic reaction": 8, "Oxygen saturation": 7, "Bradycardia": 5, "Heart rate": 5, "Pyrexia": 5, "Seizure": 4, "COVID-19": 3, "Cardiogenic shock": 2, "Dehydration": 2, "Dizziness": 2, "Electrocardiogram": 2, "Feeling abnormal": 2, "Guillain-Barre syndrome": 2, "Headache": 2, "Malaise": 2, "Myocarditis": 2, "Neuropathy peripheral": 2, "Pallor": 2, "Palpitations": 2, "Subarachnoid haemorrhage": 2, "Abdominal discomfort": 1, "Angiocardiogram": 1, "Antibody test": 1, "Arrhythmia": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Blood bicarbonate": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "C-reactive protein": 1, "CSF volume": 1, "Cardiac failure": 1, "Cerebral venous sinus thrombosis": 1, "Chest X-ray": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Enterocolitis": 1, "Fall": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Haemorrhagic infarction": 1, "Heat illness": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocardial necrosis marker": 1, "Nerve conduction studies": 1, "Oculomucocutaneous syndrome": 1, "PCO2": 1, "PO2": 1, "Shock": 1, "Shock symptom": 1, "Speech disorder": 1, "Thrombosis": 1, "Tinnitus": 1, "Troponin I": 1, "Uveitis": 1, "Vogt-Koyanagi-Harada disease": 1, "Vomiting": 1, "X-ray": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "3003190", "histograms": [{"histogram": {"Presyncope": 14, "Blood pressure measurement": 11, "Body temperature": 10, "Loss of consciousness": 9, "Anaphylactic reaction": 8, "Oxygen saturation": 7, "Bradycardia": 5, "Heart rate": 5, "Pyrexia": 5, "Seizure": 4, "COVID-19": 3, "Cardiogenic shock": 2, "Dehydration": 2, "Dizziness": 2, "Electrocardiogram": 2, "Feeling abnormal": 2, "Guillain-Barre syndrome": 2, "Headache": 2, "Malaise": 2, "Myocarditis": 2, "Neuropathy peripheral": 2, "Pallor": 2, "Palpitations": 2, "Subarachnoid haemorrhage": 2, "Abdominal discomfort": 1, "Angiocardiogram": 1, "Antibody test": 1, "Arrhythmia": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Blood bicarbonate": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "C-reactive protein": 1, "CSF volume": 1, "Cardiac failure": 1, "Cerebral venous sinus thrombosis": 1, "Chest X-ray": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Enterocolitis": 1, "Fall": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Haemorrhagic infarction": 1, "Heat illness": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocardial necrosis marker": 1, "Nerve conduction studies": 1, "Oculomucocutaneous syndrome": 1, "PCO2": 1, "PO2": 1, "Shock": 1, "Shock symptom": 1, "Speech disorder": 1, "Thrombosis": 1, "Tinnitus": 1, "Troponin I": 1, "Uveitis": 1, "Vogt-Koyanagi-Harada disease": 1, "Vomiting": 1, "X-ray": 1, "pH body fluid": 1}, "batchcodes": ["3003190"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003653.json b/docs/data/histograms/Japan/3003653.json
index 6303bb855a6..157555b3353 100644
--- a/docs/data/histograms/Japan/3003653.json
+++ b/docs/data/histograms/Japan/3003653.json
@@ -1 +1 @@
-{"batchcode": "3003653", "histograms": [{"batchcodes": ["3003653"], "histogram": {"Anaphylactic reaction": 17, "Body temperature": 14, "Presyncope": 10, "Blood pressure measurement": 7, "Loss of consciousness": 5, "Oxygen saturation": 5, "Fall": 4, "Heart rate": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Pyrexia": 3, "Bradycardia": 2, "Hyperventilation": 2, "Hypoaesthesia": 2, "Nausea": 2, "Abdominal pain": 1, "Acute disseminated encephalomyelitis": 1, "Altered state of consciousness": 1, "Anxiety": 1, "Arthralgia": 1, "Blood creatinine": 1, "Blood test": 1, "Chills": 1, "Cold sweat": 1, "Deafness": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysaesthesia": 1, "Eating disorder symptom": 1, "Eye pruritus": 1, "Fixed eruption": 1, "Flank pain": 1, "Grip strength": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hyperpyrexia": 1, "Hypotension": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Oculomucocutaneous syndrome": 1, "Pallor": 1, "Panic disorder": 1, "Pregnancy": 1, "Renal failure": 1, "Respiratory rate": 1, "Shock symptom": 1, "Stevens-Johnson syndrome": 1, "Syncope": 1, "Thrombotic cerebral infarction": 1, "Tinnitus": 1, "Tremor": 1, "Vision blurred": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Vogt-Koyanagi-Harada disease": 1}}]}
\ No newline at end of file
+{"batchcode": "3003653", "histograms": [{"histogram": {"Anaphylactic reaction": 17, "Body temperature": 14, "Presyncope": 10, "Blood pressure measurement": 7, "Loss of consciousness": 5, "Oxygen saturation": 5, "Fall": 4, "Heart rate": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Pyrexia": 3, "Bradycardia": 2, "Hyperventilation": 2, "Hypoaesthesia": 2, "Nausea": 2, "Abdominal pain": 1, "Acute disseminated encephalomyelitis": 1, "Altered state of consciousness": 1, "Anxiety": 1, "Arthralgia": 1, "Blood creatinine": 1, "Blood test": 1, "Chills": 1, "Cold sweat": 1, "Deafness": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dysaesthesia": 1, "Eating disorder symptom": 1, "Eye pruritus": 1, "Fixed eruption": 1, "Flank pain": 1, "Grip strength": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hyperpyrexia": 1, "Hypotension": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Oculomucocutaneous syndrome": 1, "Pallor": 1, "Panic disorder": 1, "Pregnancy": 1, "Renal failure": 1, "Respiratory rate": 1, "Shock symptom": 1, "Stevens-Johnson syndrome": 1, "Syncope": 1, "Thrombotic cerebral infarction": 1, "Tinnitus": 1, "Tremor": 1, "Vision blurred": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Vogt-Koyanagi-Harada disease": 1}, "batchcodes": ["3003653"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003654.json b/docs/data/histograms/Japan/3003654.json
index d8f9d4171ca..5ab22b89b8e 100644
--- a/docs/data/histograms/Japan/3003654.json
+++ b/docs/data/histograms/Japan/3003654.json
@@ -1 +1 @@
-{"batchcode": "3003654", "histograms": [{"batchcodes": ["3003654"], "histogram": {"Anaphylactic reaction": 12, "Blood pressure measurement": 12, "Body temperature": 12, "Heart rate": 8, "Oxygen saturation": 6, "Presyncope": 6, "Abdominal pain": 2, "Blood pressure decreased": 2, "Bradycardia": 2, "Loss of consciousness": 2, "Pyrexia": 2, "Type I hypersensitivity": 2, "Adverse reaction": 1, "Anaphylactoid reaction": 1, "Arthralgia": 1, "Blood test": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysaesthesia": 1, "Electrocardiogram": 1, "Erythema": 1, "Fall": 1, "Feeling cold": 1, "Haematuria": 1, "Insomnia": 1, "Investigation": 1, "Malaise": 1, "Myalgia": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Protein urine": 1, "Proteinuria": 1, "Respiratory distress": 1, "Skin discolouration": 1, "Syncope": 1, "Urinary occult blood": 1, "Venous thrombosis limb": 1, "Visual field defect": 1}}]}
\ No newline at end of file
+{"batchcode": "3003654", "histograms": [{"histogram": {"Anaphylactic reaction": 12, "Blood pressure measurement": 12, "Body temperature": 12, "Heart rate": 8, "Oxygen saturation": 6, "Presyncope": 6, "Abdominal pain": 2, "Blood pressure decreased": 2, "Bradycardia": 2, "Loss of consciousness": 2, "Pyrexia": 2, "Type I hypersensitivity": 2, "Adverse reaction": 1, "Anaphylactoid reaction": 1, "Arthralgia": 1, "Blood test": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysaesthesia": 1, "Electrocardiogram": 1, "Erythema": 1, "Fall": 1, "Feeling cold": 1, "Haematuria": 1, "Insomnia": 1, "Investigation": 1, "Malaise": 1, "Myalgia": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Protein urine": 1, "Proteinuria": 1, "Respiratory distress": 1, "Skin discolouration": 1, "Syncope": 1, "Urinary occult blood": 1, "Venous thrombosis limb": 1, "Visual field defect": 1}, "batchcodes": ["3003654"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003656.json b/docs/data/histograms/Japan/3003656.json
index 43e612ae364..bf3ca32b0d9 100644
--- a/docs/data/histograms/Japan/3003656.json
+++ b/docs/data/histograms/Japan/3003656.json
@@ -1 +1 @@
-{"batchcode": "3003656", "histograms": [{"batchcodes": ["3003656"], "histogram": {"Body temperature": 8, "Presyncope": 7, "Pyrexia": 5, "Headache": 4, "Loss of consciousness": 4, "Neuropathy peripheral": 4, "Anaphylactic reaction": 3, "Back pain": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Chills": 2, "Depressed level of consciousness": 2, "Diarrhoea": 2, "Electroencephalogram": 2, "Peripheral swelling": 2, "Seizure": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Arthralgia": 1, "Biopsy kidney": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Coronavirus test": 1, "Dehydration": 1, "Dyslalia": 1, "Electrocardiogram": 1, "Enteritis": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Hemiparesis": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Imaging procedure": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Myalgia": 1, "Mydriasis": 1, "Nausea": 1, "Nephrotic syndrome": 1, "Palpitations": 1, "Post cardiac arrest syndrome": 1, "Radial nerve palsy": 1, "Respiratory failure": 1, "Sense of oppression": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Thrombosis": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3003656", "histograms": [{"histogram": {"Body temperature": 8, "Presyncope": 7, "Pyrexia": 5, "Headache": 4, "Loss of consciousness": 4, "Neuropathy peripheral": 4, "Anaphylactic reaction": 3, "Back pain": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Chills": 2, "Depressed level of consciousness": 2, "Diarrhoea": 2, "Electroencephalogram": 2, "Peripheral swelling": 2, "Seizure": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Arthralgia": 1, "Biopsy kidney": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Coronavirus test": 1, "Dehydration": 1, "Dyslalia": 1, "Electrocardiogram": 1, "Enteritis": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Hemiparesis": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Imaging procedure": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Myalgia": 1, "Mydriasis": 1, "Nausea": 1, "Nephrotic syndrome": 1, "Palpitations": 1, "Post cardiac arrest syndrome": 1, "Radial nerve palsy": 1, "Respiratory failure": 1, "Sense of oppression": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Thrombosis": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site pain": 1}, "batchcodes": ["3003656"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003657.json b/docs/data/histograms/Japan/3003657.json
index 19ce7a7a3b5..9e471513090 100644
--- a/docs/data/histograms/Japan/3003657.json
+++ b/docs/data/histograms/Japan/3003657.json
@@ -1 +1 @@
-{"batchcode": "3003657", "histograms": [{"batchcodes": ["3003657"], "histogram": {"Body temperature": 11, "Bradycardia": 6, "Presyncope": 6, "Pyrexia": 5, "Seizure": 5, "Blood creatine phosphokinase": 2, "COVID-19": 2, "Death": 2, "Electrocardiogram": 2, "Fall": 2, "Hyperhidrosis": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Neuropathy peripheral": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test": 2, "Shock": 2, "Swelling": 2, "Tremor": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Acute myocardial infarction": 1, "Acute pulmonary oedema": 1, "Amylase": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Application site swelling": 1, "Aspartate aminotransferase": 1, "Blood creatine phosphokinase MB": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Brain contusion": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Catheterisation cardiac": 1, "Cerebral infarction": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Encephalopathy": 1, "Exposure to extreme temperature": 1, "Face injury": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Hyperventilation": 1, "Inappropriate schedule of product administration": 1, "Intracranial aneurysm": 1, "Low cardiac output syndrome": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Myocardial necrosis marker": 1, "Nausea": 1, "Pallor": 1, "Photopsia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Red blood cell count": 1, "Respiratory distress": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Thrombosis": 1, "Troponin": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3003657", "histograms": [{"histogram": {"Body temperature": 11, "Bradycardia": 6, "Presyncope": 6, "Pyrexia": 5, "Seizure": 5, "Blood creatine phosphokinase": 2, "COVID-19": 2, "Death": 2, "Electrocardiogram": 2, "Fall": 2, "Hyperhidrosis": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Neuropathy peripheral": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test": 2, "Shock": 2, "Swelling": 2, "Tremor": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Acute myocardial infarction": 1, "Acute pulmonary oedema": 1, "Amylase": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Application site swelling": 1, "Aspartate aminotransferase": 1, "Blood creatine phosphokinase MB": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Brain contusion": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Catheterisation cardiac": 1, "Cerebral infarction": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Encephalopathy": 1, "Exposure to extreme temperature": 1, "Face injury": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Hyperventilation": 1, "Inappropriate schedule of product administration": 1, "Intracranial aneurysm": 1, "Low cardiac output syndrome": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Myocardial necrosis marker": 1, "Nausea": 1, "Pallor": 1, "Photopsia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Red blood cell count": 1, "Respiratory distress": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Thrombosis": 1, "Troponin": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["3003657"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003658.json b/docs/data/histograms/Japan/3003658.json
index 35dffae735c..c00318b5be9 100644
--- a/docs/data/histograms/Japan/3003658.json
+++ b/docs/data/histograms/Japan/3003658.json
@@ -1 +1 @@
-{"batchcode": "3003658", "histograms": [{"batchcodes": ["3003658"], "histogram": {"Presyncope": 12, "Blood pressure measurement": 9, "Body temperature": 9, "COVID-19": 9, "Bradycardia": 7, "Heart rate": 7, "Anaphylactic reaction": 6, "SARS-CoV-2 test": 6, "Oxygen saturation": 5, "Loss of consciousness": 3, "Syncope": 3, "Contusion": 2, "Headache": 2, "Hypoaesthesia": 2, "Pyrexia": 2, "Visual impairment": 2, "Confusional state": 1, "Depressed level of consciousness": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysaesthesia": 1, "Erythema": 1, "Facial pain": 1, "Fall": 1, "Feeling abnormal": 1, "Focal dyscognitive seizures": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Hyponatraemia": 1, "Incontinence": 1, "Malaise": 1, "Muscular weakness": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain": 1, "Rash": 1, "Saliva analysis": 1, "Seizure": 1, "Sepsis": 1, "Skin injury": 1, "Sudden death": 1, "Trigeminal neuralgia": 1, "Type 1 diabetes mellitus": 1}}]}
\ No newline at end of file
+{"batchcode": "3003658", "histograms": [{"histogram": {"Presyncope": 12, "Blood pressure measurement": 9, "Body temperature": 9, "COVID-19": 9, "Bradycardia": 7, "Heart rate": 7, "Anaphylactic reaction": 6, "SARS-CoV-2 test": 6, "Oxygen saturation": 5, "Loss of consciousness": 3, "Syncope": 3, "Contusion": 2, "Headache": 2, "Hypoaesthesia": 2, "Pyrexia": 2, "Visual impairment": 2, "Confusional state": 1, "Depressed level of consciousness": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysaesthesia": 1, "Erythema": 1, "Facial pain": 1, "Fall": 1, "Feeling abnormal": 1, "Focal dyscognitive seizures": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Hyponatraemia": 1, "Incontinence": 1, "Malaise": 1, "Muscular weakness": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain": 1, "Rash": 1, "Saliva analysis": 1, "Seizure": 1, "Sepsis": 1, "Skin injury": 1, "Sudden death": 1, "Trigeminal neuralgia": 1, "Type 1 diabetes mellitus": 1}, "batchcodes": ["3003658"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3003659.json b/docs/data/histograms/Japan/3003659.json
index 4e7b528a5dc..1835d6165cd 100644
--- a/docs/data/histograms/Japan/3003659.json
+++ b/docs/data/histograms/Japan/3003659.json
@@ -1 +1 @@
-{"batchcode": "3003659", "histograms": [{"batchcodes": ["3003659"], "histogram": {"Blood pressure measurement": 1, "Depressed level of consciousness": 1, "Heart rate": 1, "Oxygen saturation": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3003659", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Depressed level of consciousness": 1, "Heart rate": 1, "Oxygen saturation": 1, "Presyncope": 1}, "batchcodes": ["3003659"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004220.json b/docs/data/histograms/Japan/3004220.json
index 0f3ba208aba..25c8439d238 100644
--- a/docs/data/histograms/Japan/3004220.json
+++ b/docs/data/histograms/Japan/3004220.json
@@ -1 +1 @@
-{"batchcode": "3004220", "histograms": [{"batchcodes": ["3004220"], "histogram": {"Presyncope": 12, "Syncope": 7, "Anaphylactic reaction": 6, "Blood pressure measurement": 4, "Body temperature": 4, "Computerised tomogram": 3, "Magnetic resonance imaging": 3, "Oxygen saturation": 3, "Acidosis": 2, "Arrhythmia": 2, "Bradycardia": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Heart rate": 2, "Nausea": 2, "Seizure": 2, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Anti-platelet factor 4 antibody test": 1, "Antiphospholipid syndrome": 1, "Anxiety": 1, "Biopsy muscle": 1, "Biopsy skin": 1, "Blood creatine phosphokinase": 1, "Cardiac death": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Colitis ischaemic": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Discoloured vomit": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Fall": 1, "Gastrointestinal haemorrhage": 1, "Gaze palsy": 1, "Hepatic infarction": 1, "Hypersensitivity": 1, "Myelocyte count": 1, "Myocarditis": 1, "Neuropathy peripheral": 1, "Pallor": 1, "Pharyngeal stenosis": 1, "Platelet count": 1, "Positron emission tomogram": 1, "Putamen haemorrhage": 1, "Renal infarct": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Russell's viper venom time": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Shock haemorrhagic": 1, "Systemic candida": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tinnitus": 1, "Total complement activity test": 1, "Ultrasound scan": 1, "Urticaria": 1, "Visual impairment": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3004220", "histograms": [{"histogram": {"Presyncope": 12, "Syncope": 7, "Anaphylactic reaction": 6, "Blood pressure measurement": 4, "Body temperature": 4, "Computerised tomogram": 3, "Magnetic resonance imaging": 3, "Oxygen saturation": 3, "Acidosis": 2, "Arrhythmia": 2, "Bradycardia": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Heart rate": 2, "Nausea": 2, "Seizure": 2, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Anti-platelet factor 4 antibody test": 1, "Antiphospholipid syndrome": 1, "Anxiety": 1, "Biopsy muscle": 1, "Biopsy skin": 1, "Blood creatine phosphokinase": 1, "Cardiac death": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Colitis ischaemic": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Discoloured vomit": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Fall": 1, "Gastrointestinal haemorrhage": 1, "Gaze palsy": 1, "Hepatic infarction": 1, "Hypersensitivity": 1, "Myelocyte count": 1, "Myocarditis": 1, "Neuropathy peripheral": 1, "Pallor": 1, "Pharyngeal stenosis": 1, "Platelet count": 1, "Positron emission tomogram": 1, "Putamen haemorrhage": 1, "Renal infarct": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Russell's viper venom time": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Shock haemorrhagic": 1, "Systemic candida": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tinnitus": 1, "Total complement activity test": 1, "Ultrasound scan": 1, "Urticaria": 1, "Visual impairment": 1, "White blood cell count": 1}, "batchcodes": ["3004220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004221.json b/docs/data/histograms/Japan/3004221.json
index c1c6a047a7f..7f12dce5b6b 100644
--- a/docs/data/histograms/Japan/3004221.json
+++ b/docs/data/histograms/Japan/3004221.json
@@ -1 +1 @@
-{"batchcode": "3004221", "histograms": [{"batchcodes": ["3004221"], "histogram": {"Body temperature": 7, "Anaphylactic reaction": 4, "Blood pressure measurement": 3, "Feeling abnormal": 3, "Heart rate": 3, "Presyncope": 3, "Pyrexia": 3, "Vomiting": 3, "Bradycardia": 2, "Headache": 2, "Hyperhidrosis": 2, "Hyperventilation": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Oxygen saturation": 2, "Vertigo": 2, "Wound": 2, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Antiviral treatment": 1, "Arterial catheterisation": 1, "Blood pressure decreased": 1, "Blood test": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cellulitis": 1, "Chest discomfort": 1, "Chest pain": 1, "Cold sweat": 1, "Coma scale": 1, "Computerised tomogram": 1, "Cubital tunnel syndrome": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Gaze palsy": 1, "Haemoglobin": 1, "Herpes simplex": 1, "Hypoaesthesia": 1, "Interleukin-2 receptor assay": 1, "Laboratory test": 1, "Magnetic resonance imaging heart": 1, "Matrix metalloproteinase-3": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Panic disorder": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Polymyalgia rheumatica": 1, "Rash": 1, "Red blood cell count": 1, "Respiration abnormal": 1, "Steroid therapy": 1, "Tachycardia paroxysmal": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "3004221", "histograms": [{"histogram": {"Body temperature": 7, "Anaphylactic reaction": 4, "Blood pressure measurement": 3, "Feeling abnormal": 3, "Heart rate": 3, "Presyncope": 3, "Pyrexia": 3, "Vomiting": 3, "Bradycardia": 2, "Headache": 2, "Hyperhidrosis": 2, "Hyperventilation": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Oxygen saturation": 2, "Vertigo": 2, "Wound": 2, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Antiviral treatment": 1, "Arterial catheterisation": 1, "Blood pressure decreased": 1, "Blood test": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cellulitis": 1, "Chest discomfort": 1, "Chest pain": 1, "Cold sweat": 1, "Coma scale": 1, "Computerised tomogram": 1, "Cubital tunnel syndrome": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Gaze palsy": 1, "Haemoglobin": 1, "Herpes simplex": 1, "Hypoaesthesia": 1, "Interleukin-2 receptor assay": 1, "Laboratory test": 1, "Magnetic resonance imaging heart": 1, "Matrix metalloproteinase-3": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Panic disorder": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Polymyalgia rheumatica": 1, "Rash": 1, "Red blood cell count": 1, "Respiration abnormal": 1, "Steroid therapy": 1, "Tachycardia paroxysmal": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Troponin": 1}, "batchcodes": ["3004221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004226.json b/docs/data/histograms/Japan/3004226.json
index 1c660d3183b..657fa7f0333 100644
--- a/docs/data/histograms/Japan/3004226.json
+++ b/docs/data/histograms/Japan/3004226.json
@@ -1 +1 @@
-{"batchcode": "3004226", "histograms": [{"batchcodes": ["3004226"], "histogram": {"Pyrexia": 5, "Anaphylactic reaction": 3, "Hypoaesthesia": 3, "Vomiting": 3, "Altered state of consciousness": 2, "Blood pressure measurement": 2, "Diarrhoea": 2, "Heart rate": 2, "Myalgia": 2, "Oxygen saturation": 2, "Presyncope": 2, "Anaphylactic shock": 1, "Asthma": 1, "Body temperature": 1, "Bradycardia": 1, "Chills": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Depressed level of consciousness": 1, "Dysaesthesia": 1, "Haematochezia": 1, "Haphephobia": 1, "Infection": 1, "Laryngeal oedema": 1, "Malaise": 1, "Myocarditis": 1, "Neuropathy peripheral": 1, "Peripheral coldness": 1, "Scleritis": 1, "Seizure": 1, "Sudden hearing loss": 1, "Swelling of eyelid": 1, "Syncope": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "3004226", "histograms": [{"histogram": {"Pyrexia": 5, "Anaphylactic reaction": 3, "Hypoaesthesia": 3, "Vomiting": 3, "Altered state of consciousness": 2, "Blood pressure measurement": 2, "Diarrhoea": 2, "Heart rate": 2, "Myalgia": 2, "Oxygen saturation": 2, "Presyncope": 2, "Anaphylactic shock": 1, "Asthma": 1, "Body temperature": 1, "Bradycardia": 1, "Chills": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Depressed level of consciousness": 1, "Dysaesthesia": 1, "Haematochezia": 1, "Haphephobia": 1, "Infection": 1, "Laryngeal oedema": 1, "Malaise": 1, "Myocarditis": 1, "Neuropathy peripheral": 1, "Peripheral coldness": 1, "Scleritis": 1, "Seizure": 1, "Sudden hearing loss": 1, "Swelling of eyelid": 1, "Syncope": 1, "Vaccination complication": 1}, "batchcodes": ["3004226"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004227.json b/docs/data/histograms/Japan/3004227.json
index 2ebfc55177e..8ad4a5abb15 100644
--- a/docs/data/histograms/Japan/3004227.json
+++ b/docs/data/histograms/Japan/3004227.json
@@ -1 +1 @@
-{"batchcode": "3004227", "histograms": [{"batchcodes": ["3004227"], "histogram": {"Anaphylactic reaction": 21, "Presyncope": 12, "Body temperature": 8, "Blood pressure measurement": 6, "Depressed level of consciousness": 5, "Heart rate": 5, "Loss of consciousness": 5, "Seizure": 4, "Bradycardia": 3, "Oxygen saturation": 3, "Hypersensitivity": 2, "Nausea": 2, "Pyrexia": 2, "Chills": 1, "Chronic fatigue syndrome": 1, "Contusion": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Epilepsy": 1, "Erythema": 1, "Fall": 1, "Headache": 1, "Loss of personal independence in daily activities": 1, "Myoclonus": 1, "Oxygen consumption": 1, "Pain": 1, "Somnolence": 1, "Swelling": 1, "Syncope": 1, "Tonic convulsion": 1}}]}
\ No newline at end of file
+{"batchcode": "3004227", "histograms": [{"histogram": {"Anaphylactic reaction": 21, "Presyncope": 12, "Body temperature": 8, "Blood pressure measurement": 6, "Depressed level of consciousness": 5, "Heart rate": 5, "Loss of consciousness": 5, "Seizure": 4, "Bradycardia": 3, "Oxygen saturation": 3, "Hypersensitivity": 2, "Nausea": 2, "Pyrexia": 2, "Chills": 1, "Chronic fatigue syndrome": 1, "Contusion": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Epilepsy": 1, "Erythema": 1, "Fall": 1, "Headache": 1, "Loss of personal independence in daily activities": 1, "Myoclonus": 1, "Oxygen consumption": 1, "Pain": 1, "Somnolence": 1, "Swelling": 1, "Syncope": 1, "Tonic convulsion": 1}, "batchcodes": ["3004227"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004228.json b/docs/data/histograms/Japan/3004228.json
index 5c288172003..bd06efd0836 100644
--- a/docs/data/histograms/Japan/3004228.json
+++ b/docs/data/histograms/Japan/3004228.json
@@ -1 +1 @@
-{"batchcode": "3004228", "histograms": [{"batchcodes": ["3004228"], "histogram": {"Loss of consciousness": 10, "Presyncope": 7, "Body temperature": 4, "Fall": 4, "Anaphylactic reaction": 3, "Blood pressure measurement": 3, "Contusion": 3, "Heart rate": 3, "Diarrhoea": 2, "Erythema": 2, "Pruritus": 2, "Pyrexia": 2, "Type I hypersensitivity": 2, "Abdominal pain lower": 1, "Alcohol poisoning": 1, "Alcoholic ketoacidosis": 1, "Arthralgia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood test": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Chest pain": 1, "Cough": 1, "Death": 1, "Dizziness": 1, "Drug hypersensitivity": 1, "Eye pain": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gaze palsy": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Hepatic steatosis": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypophagia": 1, "Migraine": 1, "Monoplegia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Paraesthesia": 1, "Pathology test": 1, "Pericardial drainage test": 1, "Pollakiuria": 1, "Rash": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Sensory disturbance": 1, "Skin abrasion": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Syncope": 1, "Throat tightness": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Urine ketone body": 1, "Urticaria": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004228", "histograms": [{"histogram": {"Loss of consciousness": 10, "Presyncope": 7, "Body temperature": 4, "Fall": 4, "Anaphylactic reaction": 3, "Blood pressure measurement": 3, "Contusion": 3, "Heart rate": 3, "Diarrhoea": 2, "Erythema": 2, "Pruritus": 2, "Pyrexia": 2, "Type I hypersensitivity": 2, "Abdominal pain lower": 1, "Alcohol poisoning": 1, "Alcoholic ketoacidosis": 1, "Arthralgia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood test": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Chest pain": 1, "Cough": 1, "Death": 1, "Dizziness": 1, "Drug hypersensitivity": 1, "Eye pain": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gaze palsy": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Hepatic steatosis": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypophagia": 1, "Migraine": 1, "Monoplegia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Paraesthesia": 1, "Pathology test": 1, "Pericardial drainage test": 1, "Pollakiuria": 1, "Rash": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Sensory disturbance": 1, "Skin abrasion": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Syncope": 1, "Throat tightness": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Urine ketone body": 1, "Urticaria": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["3004228"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004229.json b/docs/data/histograms/Japan/3004229.json
index 7603eafa9b1..dce2e34ee25 100644
--- a/docs/data/histograms/Japan/3004229.json
+++ b/docs/data/histograms/Japan/3004229.json
@@ -1 +1 @@
-{"batchcode": "3004229", "histograms": [{"batchcodes": ["3004229"], "histogram": {"Pyrexia": 6, "Presyncope": 5, "Myocarditis": 3, "Body temperature": 2, "Bradycardia": 2, "Dizziness": 2, "Fall": 2, "Loss of consciousness": 2, "Malaise": 2, "Oxygen saturation": 2, "Seizure": 2, "Syncope": 2, "Urticaria": 2, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthma": 1, "Audiogram": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Brugada syndrome": 1, "Cardiovascular disorder": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Cough": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Discomfort": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Gaze palsy": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Hypereosinophilic syndrome": 1, "Hypersensitivity": 1, "Leukaemia": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Muscle spasms": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Pericarditis": 1, "Pruritus": 1, "Radioisotope scan": 1, "Restless legs syndrome": 1, "Subdural haematoma": 1, "Subdural haematoma evacuation": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3004229", "histograms": [{"histogram": {"Pyrexia": 6, "Presyncope": 5, "Myocarditis": 3, "Body temperature": 2, "Bradycardia": 2, "Dizziness": 2, "Fall": 2, "Loss of consciousness": 2, "Malaise": 2, "Oxygen saturation": 2, "Seizure": 2, "Syncope": 2, "Urticaria": 2, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthma": 1, "Audiogram": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Brugada syndrome": 1, "Cardiovascular disorder": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Cough": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Discomfort": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Gaze palsy": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Hypereosinophilic syndrome": 1, "Hypersensitivity": 1, "Leukaemia": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Muscle spasms": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Pericarditis": 1, "Pruritus": 1, "Radioisotope scan": 1, "Restless legs syndrome": 1, "Subdural haematoma": 1, "Subdural haematoma evacuation": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "White blood cell count": 1}, "batchcodes": ["3004229"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004230.json b/docs/data/histograms/Japan/3004230.json
index 90a969bed6e..864d48607f7 100644
--- a/docs/data/histograms/Japan/3004230.json
+++ b/docs/data/histograms/Japan/3004230.json
@@ -1 +1 @@
-{"batchcode": "3004230", "histograms": [{"batchcodes": ["3004230"], "histogram": {"Presyncope": 8, "Loss of consciousness": 7, "Blood pressure measurement": 6, "Body temperature": 5, "Fall": 4, "Heart rate": 4, "Anaphylactic reaction": 3, "Oxygen saturation": 3, "Arthralgia": 2, "Depressed level of consciousness": 2, "Pyrexia": 2, "Respiratory rate": 2, "Arrhythmia": 1, "Body temperature decreased": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Coma scale": 1, "Contusion": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Feeling abnormal": 1, "Flatback syndrome": 1, "Headache": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Mobility decreased": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain assessment": 1, "Pericarditis": 1, "Pleural effusion": 1, "SARS-CoV-2 antibody test": 1, "Syncope": 1, "Tachypnoea": 1, "Viral test": 1, "Wound haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "3004230", "histograms": [{"histogram": {"Presyncope": 8, "Loss of consciousness": 7, "Blood pressure measurement": 6, "Body temperature": 5, "Fall": 4, "Heart rate": 4, "Anaphylactic reaction": 3, "Oxygen saturation": 3, "Arthralgia": 2, "Depressed level of consciousness": 2, "Pyrexia": 2, "Respiratory rate": 2, "Arrhythmia": 1, "Body temperature decreased": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Coma scale": 1, "Contusion": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Feeling abnormal": 1, "Flatback syndrome": 1, "Headache": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Mobility decreased": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain assessment": 1, "Pericarditis": 1, "Pleural effusion": 1, "SARS-CoV-2 antibody test": 1, "Syncope": 1, "Tachypnoea": 1, "Viral test": 1, "Wound haemorrhage": 1}, "batchcodes": ["3004230"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004231.json b/docs/data/histograms/Japan/3004231.json
index 828636b5d27..bcc1ff765a2 100644
--- a/docs/data/histograms/Japan/3004231.json
+++ b/docs/data/histograms/Japan/3004231.json
@@ -1 +1 @@
-{"batchcode": "3004231", "histograms": [{"batchcodes": ["3004231"], "histogram": {"Anaphylactic reaction": 6, "Body temperature": 5, "Bradycardia": 4, "Chest pain": 3, "Dizziness": 3, "Loss of consciousness": 3, "Presyncope": 3, "Blood pressure measurement": 2, "Urticaria": 2, "Blood pressure increased": 1, "Cerebral infarction": 1, "Contusion": 1, "Erythema": 1, "Fall": 1, "Gastroenteritis": 1, "Headache": 1, "Heart rate": 1, "Intracranial pressure increased": 1, "Malaise": 1, "Myocarditis": 1, "Nausea": 1, "Nipple oedema": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Palpitations": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Putamen haemorrhage": 1, "Pyrexia": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "3004231", "histograms": [{"histogram": {"Anaphylactic reaction": 6, "Body temperature": 5, "Bradycardia": 4, "Chest pain": 3, "Dizziness": 3, "Loss of consciousness": 3, "Presyncope": 3, "Blood pressure measurement": 2, "Urticaria": 2, "Blood pressure increased": 1, "Cerebral infarction": 1, "Contusion": 1, "Erythema": 1, "Fall": 1, "Gastroenteritis": 1, "Headache": 1, "Heart rate": 1, "Intracranial pressure increased": 1, "Malaise": 1, "Myocarditis": 1, "Nausea": 1, "Nipple oedema": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Palpitations": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Putamen haemorrhage": 1, "Pyrexia": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tremor": 1}, "batchcodes": ["3004231"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004232.json b/docs/data/histograms/Japan/3004232.json
index bb208c8b767..02dade1049e 100644
--- a/docs/data/histograms/Japan/3004232.json
+++ b/docs/data/histograms/Japan/3004232.json
@@ -1 +1 @@
-{"batchcode": "3004232", "histograms": [{"batchcodes": ["3004232"], "histogram": {"Body temperature": 5, "Presyncope": 5, "Anaphylactic reaction": 3, "Loss of consciousness": 3, "Pyrexia": 3, "Blood pressure measurement": 2, "Bradycardia": 2, "Chills": 2, "Fall": 2, "Headache": 2, "Heart rate": 2, "Hyperventilation": 2, "Nausea": 2, "Seizure": 2, "Vomiting": 2, "Acute disseminated encephalomyelitis": 1, "Anaphylactoid reaction": 1, "Blood pressure decreased": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dizziness": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gaze palsy": 1, "Magnetic resonance imaging": 1, "Melaena": 1, "Muscular weakness": 1, "Myocarditis": 1, "Neuromyelitis optica spectrum disorder": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Paresis": 1, "Peripheral coldness": 1, "Somatic symptom disorder": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3004232", "histograms": [{"histogram": {"Body temperature": 5, "Presyncope": 5, "Anaphylactic reaction": 3, "Loss of consciousness": 3, "Pyrexia": 3, "Blood pressure measurement": 2, "Bradycardia": 2, "Chills": 2, "Fall": 2, "Headache": 2, "Heart rate": 2, "Hyperventilation": 2, "Nausea": 2, "Seizure": 2, "Vomiting": 2, "Acute disseminated encephalomyelitis": 1, "Anaphylactoid reaction": 1, "Blood pressure decreased": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dizziness": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gaze palsy": 1, "Magnetic resonance imaging": 1, "Melaena": 1, "Muscular weakness": 1, "Myocarditis": 1, "Neuromyelitis optica spectrum disorder": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Paresis": 1, "Peripheral coldness": 1, "Somatic symptom disorder": 1, "Syncope": 1}, "batchcodes": ["3004232"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004495.json b/docs/data/histograms/Japan/3004495.json
index 377c52cf0cf..aa00deb61fc 100644
--- a/docs/data/histograms/Japan/3004495.json
+++ b/docs/data/histograms/Japan/3004495.json
@@ -1 +1 @@
-{"batchcode": "3004495", "histograms": [{"batchcodes": ["3004495"], "histogram": {"Presyncope": 11, "Syncope": 7, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Body temperature": 4, "Oxygen saturation": 4, "Bradycardia": 3, "Heart rate": 3, "Chest pain": 2, "Loss of consciousness": 2, "Anxiety": 1, "Arthralgia": 1, "Clonic convulsion": 1, "Contusion": 1, "Dizziness": 1, "Dyspnoea": 1, "Fall": 1, "Haematoma": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Labile blood pressure": 1, "Malaise": 1, "Nausea": 1, "Panic disorder": 1, "Paraesthesia oral": 1, "Peripheral circulatory failure": 1, "Pseudoallergic reaction": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate": 1, "Restlessness": 1, "Seizure": 1, "Skin abrasion": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004495", "histograms": [{"histogram": {"Presyncope": 11, "Syncope": 7, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Body temperature": 4, "Oxygen saturation": 4, "Bradycardia": 3, "Heart rate": 3, "Chest pain": 2, "Loss of consciousness": 2, "Anxiety": 1, "Arthralgia": 1, "Clonic convulsion": 1, "Contusion": 1, "Dizziness": 1, "Dyspnoea": 1, "Fall": 1, "Haematoma": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Labile blood pressure": 1, "Malaise": 1, "Nausea": 1, "Panic disorder": 1, "Paraesthesia oral": 1, "Peripheral circulatory failure": 1, "Pseudoallergic reaction": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate": 1, "Restlessness": 1, "Seizure": 1, "Skin abrasion": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["3004495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004496.json b/docs/data/histograms/Japan/3004496.json
index 683db9008e3..a59c067c145 100644
--- a/docs/data/histograms/Japan/3004496.json
+++ b/docs/data/histograms/Japan/3004496.json
@@ -1 +1 @@
-{"batchcode": "3004496", "histograms": [{"batchcodes": ["3004496"], "histogram": {"Anaphylactic reaction": 8, "Body temperature": 5, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Blood bilirubin": 3, "Platelet count": 3, "Pyrexia": 3, "Bilirubin conjugated": 2, "Blood alkaline phosphatase": 2, "Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure measurement": 2, "C-reactive protein": 2, "Depressed level of consciousness": 2, "Fall": 2, "Gamma-glutamyltransferase": 2, "Haemoglobin": 2, "Hepatic function abnormal": 2, "Loss of consciousness": 2, "Presyncope": 2, "White blood cell count": 2, "Acquired immunodeficiency syndrome": 1, "Acute hepatic failure": 1, "Amylase": 1, "Anaemia": 1, "Antinuclear antibody": 1, "Application site paraesthesia": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "COVID-19": 1, "Cerebral venous sinus thrombosis": 1, "Cholelithiasis": 1, "Computerised tomogram head": 1, "Cough": 1, "Cytomegalovirus immunisation": 1, "Cytomegalovirus test": 1, "Disorientation": 1, "Dizziness": 1, "Dyspnoea": 1, "EGFR status assay": 1, "Endoscopy": 1, "Eosinophil count": 1, "Feeling hot": 1, "Gallbladder enlargement": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Headache": 1, "Heart rate": 1, "Hepatic cyst": 1, "Hepatitis A virus test": 1, "Hepatitis B DNA assay": 1, "Hepatitis C RNA": 1, "Herpes simplex": 1, "Human herpesvirus 6 infection": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Lymphocyte count": 1, "Lymphocyte stimulation test": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Mouth haemorrhage": 1, "Musculoskeletal stiffness": 1, "Mycoplasma infection": 1, "Myocarditis": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Protein total": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Respiratory rate": 1, "Rhabdomyolysis": 1, "SJS-TEN overlap": 1, "Stevens-Johnson syndrome": 1, "Syncope": 1, "Thirst": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004496", "histograms": [{"histogram": {"Anaphylactic reaction": 8, "Body temperature": 5, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Blood bilirubin": 3, "Platelet count": 3, "Pyrexia": 3, "Bilirubin conjugated": 2, "Blood alkaline phosphatase": 2, "Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure measurement": 2, "C-reactive protein": 2, "Depressed level of consciousness": 2, "Fall": 2, "Gamma-glutamyltransferase": 2, "Haemoglobin": 2, "Hepatic function abnormal": 2, "Loss of consciousness": 2, "Presyncope": 2, "White blood cell count": 2, "Acquired immunodeficiency syndrome": 1, "Acute hepatic failure": 1, "Amylase": 1, "Anaemia": 1, "Antinuclear antibody": 1, "Application site paraesthesia": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "COVID-19": 1, "Cerebral venous sinus thrombosis": 1, "Cholelithiasis": 1, "Computerised tomogram head": 1, "Cough": 1, "Cytomegalovirus immunisation": 1, "Cytomegalovirus test": 1, "Disorientation": 1, "Dizziness": 1, "Dyspnoea": 1, "EGFR status assay": 1, "Endoscopy": 1, "Eosinophil count": 1, "Feeling hot": 1, "Gallbladder enlargement": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Headache": 1, "Heart rate": 1, "Hepatic cyst": 1, "Hepatitis A virus test": 1, "Hepatitis B DNA assay": 1, "Hepatitis C RNA": 1, "Herpes simplex": 1, "Human herpesvirus 6 infection": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Lymphocyte count": 1, "Lymphocyte stimulation test": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Mouth haemorrhage": 1, "Musculoskeletal stiffness": 1, "Mycoplasma infection": 1, "Myocarditis": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Protein total": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Respiratory rate": 1, "Rhabdomyolysis": 1, "SJS-TEN overlap": 1, "Stevens-Johnson syndrome": 1, "Syncope": 1, "Thirst": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["3004496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004497.json b/docs/data/histograms/Japan/3004497.json
index 07463c75708..3f47a42ba2a 100644
--- a/docs/data/histograms/Japan/3004497.json
+++ b/docs/data/histograms/Japan/3004497.json
@@ -1 +1 @@
-{"batchcode": "3004497", "histograms": [{"batchcodes": ["3004497"], "histogram": {"Loss of consciousness": 4, "Seizure": 4, "Presyncope": 3, "Anaphylactic reaction": 2, "Dizziness": 2, "Palpitations": 2, "Altered state of consciousness": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bradycardia": 1, "Cerebellar infarction": 1, "Colitis ulcerative": 1, "Computerised tomogram": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysphoria": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Gaze palsy": 1, "Haematochezia": 1, "Heart rate": 1, "Muscle spasms": 1, "Nausea": 1, "Oculogyric crisis": 1, "Oedema peripheral": 1, "Oral herpes": 1, "Sudden hearing loss": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tongue oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "3004497", "histograms": [{"histogram": {"Loss of consciousness": 4, "Seizure": 4, "Presyncope": 3, "Anaphylactic reaction": 2, "Dizziness": 2, "Palpitations": 2, "Altered state of consciousness": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bradycardia": 1, "Cerebellar infarction": 1, "Colitis ulcerative": 1, "Computerised tomogram": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysphoria": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Gaze palsy": 1, "Haematochezia": 1, "Heart rate": 1, "Muscle spasms": 1, "Nausea": 1, "Oculogyric crisis": 1, "Oedema peripheral": 1, "Oral herpes": 1, "Sudden hearing loss": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tongue oedema": 1}, "batchcodes": ["3004497"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004501.json b/docs/data/histograms/Japan/3004501.json
index 02a43af0a1d..a42e00394d1 100644
--- a/docs/data/histograms/Japan/3004501.json
+++ b/docs/data/histograms/Japan/3004501.json
@@ -1 +1 @@
-{"batchcode": "3004501", "histograms": [{"batchcodes": ["3004501"], "histogram": {"Headache": 3, "Blood test": 2, "Body temperature": 2, "Fall": 2, "Presyncope": 2, "Pyrexia": 2, "Syncope": 2, "Amylase": 1, "Anaphylactoid reaction": 1, "Arthralgia": 1, "Basophil count": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "CSF test": 1, "Contusion": 1, "Dermatitis allergic": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Erythema": 1, "Face oedema": 1, "Haematocrit": 1, "Haemoglobin": 1, "Loss of consciousness": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Monocyte count": 1, "Nausea": 1, "Neutrophil percentage": 1, "Palpitations": 1, "Platelet count": 1, "Polyarteritis nodosa": 1, "Rash": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Stiff person syndrome": 1, "Swelling": 1, "Thrombosis": 1, "Vasculitis": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3004501", "histograms": [{"histogram": {"Headache": 3, "Blood test": 2, "Body temperature": 2, "Fall": 2, "Presyncope": 2, "Pyrexia": 2, "Syncope": 2, "Amylase": 1, "Anaphylactoid reaction": 1, "Arthralgia": 1, "Basophil count": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "CSF test": 1, "Contusion": 1, "Dermatitis allergic": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Erythema": 1, "Face oedema": 1, "Haematocrit": 1, "Haemoglobin": 1, "Loss of consciousness": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Monocyte count": 1, "Nausea": 1, "Neutrophil percentage": 1, "Palpitations": 1, "Platelet count": 1, "Polyarteritis nodosa": 1, "Rash": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Stiff person syndrome": 1, "Swelling": 1, "Thrombosis": 1, "Vasculitis": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["3004501"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004656.json b/docs/data/histograms/Japan/3004656.json
index 8991d257e02..a3d0b70db7b 100644
--- a/docs/data/histograms/Japan/3004656.json
+++ b/docs/data/histograms/Japan/3004656.json
@@ -1 +1 @@
-{"batchcode": "3004656", "histograms": [{"batchcodes": ["3004656"], "histogram": {"Cardiac failure": 1, "Feeling abnormal": 1, "Malaise": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3004656", "histograms": [{"histogram": {"Cardiac failure": 1, "Feeling abnormal": 1, "Malaise": 1, "Pyrexia": 1}, "batchcodes": ["3004656"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004666.json b/docs/data/histograms/Japan/3004666.json
index a9a708bfc96..3c46da852e6 100644
--- a/docs/data/histograms/Japan/3004666.json
+++ b/docs/data/histograms/Japan/3004666.json
@@ -1 +1 @@
-{"batchcode": "3004666", "histograms": [{"batchcodes": ["3004666"], "histogram": {"Body temperature": 4, "Myocarditis": 4, "Dyspnoea": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Presyncope": 3, "Pyrexia": 3, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Blood test": 2, "C-reactive protein": 2, "Chest discomfort": 2, "Feeling abnormal": 2, "Acute kidney injury": 1, "Altered state of consciousness": 1, "Anti-ganglioside antibody": 1, "Arrhythmia": 1, "Autoantibody test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Brain natriuretic peptide": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cardiac ventricular thrombosis": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Chills": 1, "Computerised tomogram head": 1, "Contusion": 1, "Dizziness": 1, "Fall": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mental disorder": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Protein urine": 1, "Syncope": 1, "Tachycardia": 1, "Troponin": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "3004666", "histograms": [{"histogram": {"Body temperature": 4, "Myocarditis": 4, "Dyspnoea": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Presyncope": 3, "Pyrexia": 3, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Blood test": 2, "C-reactive protein": 2, "Chest discomfort": 2, "Feeling abnormal": 2, "Acute kidney injury": 1, "Altered state of consciousness": 1, "Anti-ganglioside antibody": 1, "Arrhythmia": 1, "Autoantibody test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Brain natriuretic peptide": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cardiac ventricular thrombosis": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Chills": 1, "Computerised tomogram head": 1, "Contusion": 1, "Dizziness": 1, "Fall": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mental disorder": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Protein urine": 1, "Syncope": 1, "Tachycardia": 1, "Troponin": 1, "Ultrasound scan": 1}, "batchcodes": ["3004666"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004667.json b/docs/data/histograms/Japan/3004667.json
index fcaebcb0471..58ebbcf3953 100644
--- a/docs/data/histograms/Japan/3004667.json
+++ b/docs/data/histograms/Japan/3004667.json
@@ -1 +1 @@
-{"batchcode": "3004667", "histograms": [{"batchcodes": ["3004667"], "histogram": {"Anaphylactic reaction": 3, "Dyspnoea": 3, "Headache": 3, "Malaise": 3, "Pyrexia": 3, "Angina pectoris": 2, "Body temperature": 2, "Fall": 2, "Palpitations": 2, "Presyncope": 2, "Seizure": 2, "Syncope": 2, "Urticaria": 2, "Adnexa uteri pain": 1, "Allergy to metals": 1, "Anaemia": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blood test": 1, "Bradycardia": 1, "Brain oedema": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Gastrointestinal oedema": 1, "General physical health deterioration": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Muscle twitching": 1, "Neuropathy peripheral": 1, "Oropharyngeal pain": 1, "Ovulation pain": 1, "Physical deconditioning": 1, "Prinzmetal angina": 1, "Rash": 1, "Renal pain": 1, "Sense of oppression": 1, "Skin discolouration": 1, "Tinnitus": 1, "Tonsillitis": 1, "Tremor": 1, "Uterine pain": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "3004667", "histograms": [{"histogram": {"Anaphylactic reaction": 3, "Dyspnoea": 3, "Headache": 3, "Malaise": 3, "Pyrexia": 3, "Angina pectoris": 2, "Body temperature": 2, "Fall": 2, "Palpitations": 2, "Presyncope": 2, "Seizure": 2, "Syncope": 2, "Urticaria": 2, "Adnexa uteri pain": 1, "Allergy to metals": 1, "Anaemia": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blood test": 1, "Bradycardia": 1, "Brain oedema": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Gastrointestinal oedema": 1, "General physical health deterioration": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Muscle twitching": 1, "Neuropathy peripheral": 1, "Oropharyngeal pain": 1, "Ovulation pain": 1, "Physical deconditioning": 1, "Prinzmetal angina": 1, "Rash": 1, "Renal pain": 1, "Sense of oppression": 1, "Skin discolouration": 1, "Tinnitus": 1, "Tonsillitis": 1, "Tremor": 1, "Uterine pain": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["3004667"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004733.json b/docs/data/histograms/Japan/3004733.json
index 71d7b0a956b..94783b3f33a 100644
--- a/docs/data/histograms/Japan/3004733.json
+++ b/docs/data/histograms/Japan/3004733.json
@@ -1 +1 @@
-{"batchcode": "3004733", "histograms": [{"batchcodes": ["3004733"], "histogram": {"Presyncope": 4, "Loss of consciousness": 3, "Blood pressure measurement": 2, "Dizziness": 2, "Heart rate": 2, "Oxygen saturation": 2, "Palpitations": 2, "Seizure": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Aortic dissection": 1, "Arrhythmia": 1, "Body temperature": 1, "Depressed level of consciousness": 1, "Dermatitis allergic": 1, "Feeling abnormal": 1, "Headache": 1, "Neuropathy peripheral": 1, "Physical deconditioning": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3004733", "histograms": [{"histogram": {"Presyncope": 4, "Loss of consciousness": 3, "Blood pressure measurement": 2, "Dizziness": 2, "Heart rate": 2, "Oxygen saturation": 2, "Palpitations": 2, "Seizure": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Aortic dissection": 1, "Arrhythmia": 1, "Body temperature": 1, "Depressed level of consciousness": 1, "Dermatitis allergic": 1, "Feeling abnormal": 1, "Headache": 1, "Neuropathy peripheral": 1, "Physical deconditioning": 1, "Pyrexia": 1}, "batchcodes": ["3004733"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004734.json b/docs/data/histograms/Japan/3004734.json
index e68f83201fd..c67a0846e66 100644
--- a/docs/data/histograms/Japan/3004734.json
+++ b/docs/data/histograms/Japan/3004734.json
@@ -1 +1 @@
-{"batchcode": "3004734", "histograms": [{"batchcodes": ["3004734"], "histogram": {"Pyrexia": 4, "Blood pressure measurement": 3, "Body temperature": 3, "Headache": 3, "Oxygen saturation": 3, "Presyncope": 3, "Contusion": 2, "Decreased appetite": 2, "Facial paralysis": 2, "Loss of consciousness": 2, "Rash": 2, "Syncope": 2, "Abdominal pain": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Biopsy liver": 1, "Blood test": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Diarrhoea": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epstein-Barr virus test": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Feeling abnormal": 1, "Flushing": 1, "Heart rate": 1, "Hepatic function abnormal": 1, "Hepatitis acute": 1, "Idiopathic orbital inflammation": 1, "Lymphocyte stimulation test": 1, "Malaise": 1, "Mass": 1, "Melaena": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Periarthritis": 1, "Pericarditis": 1, "Poor quality product administered": 1, "Product contamination physical": 1, "Pruritus": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Seizure": 1, "Snoring": 1, "Sudden cardiac death": 1, "Ultrasound abdomen": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1, "Vomiting": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "3004734", "histograms": [{"histogram": {"Pyrexia": 4, "Blood pressure measurement": 3, "Body temperature": 3, "Headache": 3, "Oxygen saturation": 3, "Presyncope": 3, "Contusion": 2, "Decreased appetite": 2, "Facial paralysis": 2, "Loss of consciousness": 2, "Rash": 2, "Syncope": 2, "Abdominal pain": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Biopsy liver": 1, "Blood test": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Diarrhoea": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epstein-Barr virus test": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Feeling abnormal": 1, "Flushing": 1, "Heart rate": 1, "Hepatic function abnormal": 1, "Hepatitis acute": 1, "Idiopathic orbital inflammation": 1, "Lymphocyte stimulation test": 1, "Malaise": 1, "Mass": 1, "Melaena": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Periarthritis": 1, "Pericarditis": 1, "Poor quality product administered": 1, "Product contamination physical": 1, "Pruritus": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Seizure": 1, "Snoring": 1, "Sudden cardiac death": 1, "Ultrasound abdomen": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1, "Vomiting": 1, "Wound": 1}, "batchcodes": ["3004734"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3004956.json b/docs/data/histograms/Japan/3004956.json
index 6927cea8d50..893ad78406b 100644
--- a/docs/data/histograms/Japan/3004956.json
+++ b/docs/data/histograms/Japan/3004956.json
@@ -1 +1 @@
-{"batchcode": "3004956", "histograms": [{"batchcodes": ["3004956"], "histogram": {"Neuropathy peripheral": 2, "Deafness unilateral": 1, "Erythema multiforme": 1, "Headache": 1, "Pain in extremity": 1, "Sensory disturbance": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "3004956", "histograms": [{"histogram": {"Neuropathy peripheral": 2, "Deafness unilateral": 1, "Erythema multiforme": 1, "Headache": 1, "Pain in extremity": 1, "Sensory disturbance": 1, "Swelling": 1}, "batchcodes": ["3004956"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/30052086.json b/docs/data/histograms/Japan/30052086.json
index 80bb8d76fd5..be9155f9b33 100644
--- a/docs/data/histograms/Japan/30052086.json
+++ b/docs/data/histograms/Japan/30052086.json
@@ -1 +1 @@
-{"batchcode": "30052086", "histograms": [{"batchcodes": ["30052086"], "histogram": {"Bradycardia": 1, "Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "30052086", "histograms": [{"histogram": {"Bradycardia": 1, "Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Presyncope": 1}, "batchcodes": ["30052086"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005235.json b/docs/data/histograms/Japan/3005235.json
index 3a8e25f039f..58fe9079ca8 100644
--- a/docs/data/histograms/Japan/3005235.json
+++ b/docs/data/histograms/Japan/3005235.json
@@ -1 +1 @@
-{"batchcode": "3005235", "histograms": [{"batchcodes": ["3005235"], "histogram": {"Presyncope": 13, "Body temperature": 6, "Fall": 6, "Loss of consciousness": 6, "Blood pressure measurement": 4, "Headache": 3, "Heart rate": 3, "Oxygen saturation": 3, "Pyrexia": 3, "Syncope": 3, "Altered state of consciousness": 2, "Anaphylactic reaction": 2, "Bradycardia": 2, "Dyspnoea": 2, "Hypoaesthesia": 2, "Myocarditis": 2, "Nausea": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Acid base balance": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anaphylactic shock": 1, "Anion gap": 1, "Aspartate aminotransferase": 1, "Back pain": 1, "Base excess": 1, "Basophil count": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Chest pain": 1, "Cold sweat": 1, "Cough": 1, "Cough variant asthma": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Erythema": 1, "Erythroblast count": 1, "Eyelid oedema": 1, "Feeling abnormal": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypertensive emergency": 1, "Intracranial aneurysm": 1, "Lateral medullary syndrome": 1, "Leukaemia monocytic": 1, "Liver disorder": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Metabolic acidosis": 1, "Monocyte count": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "PCO2": 1, "PO2": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral circulatory failure": 1, "Platelet count": 1, "Product contamination physical": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Renal failure": 1, "Shock": 1, "Tenderness": 1, "Throat irritation": 1, "Troponin I": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vertebral artery occlusion": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005235", "histograms": [{"histogram": {"Presyncope": 13, "Body temperature": 6, "Fall": 6, "Loss of consciousness": 6, "Blood pressure measurement": 4, "Headache": 3, "Heart rate": 3, "Oxygen saturation": 3, "Pyrexia": 3, "Syncope": 3, "Altered state of consciousness": 2, "Anaphylactic reaction": 2, "Bradycardia": 2, "Dyspnoea": 2, "Hypoaesthesia": 2, "Myocarditis": 2, "Nausea": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Acid base balance": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anaphylactic shock": 1, "Anion gap": 1, "Aspartate aminotransferase": 1, "Back pain": 1, "Base excess": 1, "Basophil count": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Chest pain": 1, "Cold sweat": 1, "Cough": 1, "Cough variant asthma": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Erythema": 1, "Erythroblast count": 1, "Eyelid oedema": 1, "Feeling abnormal": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypertensive emergency": 1, "Intracranial aneurysm": 1, "Lateral medullary syndrome": 1, "Leukaemia monocytic": 1, "Liver disorder": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Metabolic acidosis": 1, "Monocyte count": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "PCO2": 1, "PO2": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral circulatory failure": 1, "Platelet count": 1, "Product contamination physical": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Renal failure": 1, "Shock": 1, "Tenderness": 1, "Throat irritation": 1, "Troponin I": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vertebral artery occlusion": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["3005235"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005236.json b/docs/data/histograms/Japan/3005236.json
index 7740dd10005..7e676109b21 100644
--- a/docs/data/histograms/Japan/3005236.json
+++ b/docs/data/histograms/Japan/3005236.json
@@ -1 +1 @@
-{"batchcode": "3005236", "histograms": [{"batchcodes": ["3005236"], "histogram": {"Body temperature": 13, "Anaphylactic reaction": 10, "Myocarditis": 8, "Presyncope": 7, "Blood pressure measurement": 5, "Pyrexia": 5, "Blood creatine phosphokinase": 4, "Bradycardia": 4, "Depressed level of consciousness": 4, "Neuropathy peripheral": 4, "Blood creatine phosphokinase MB": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Heart rate": 3, "Oxygen saturation": 3, "Dyspnoea": 2, "Feeling abnormal": 2, "Head discomfort": 2, "Troponin T": 2, "Acute hepatic failure": 1, "Anaphylactoid reaction": 1, "Angiocardiogram": 1, "Aspartate aminotransferase": 1, "Biopsy heart": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Blood pressure systolic": 1, "Blood test": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiothoracic ratio": 1, "Catheterisation cardiac": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Cystogram": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Electroencephalogram": 1, "Fall": 1, "Fibrin degradation products": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Lip swelling": 1, "Liver function test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Organ failure": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Panic disorder": 1, "Pericarditis": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Pupillary light reflex tests": 1, "Radial nerve palsy": 1, "Renal function test": 1, "Respiratory rate": 1, "Seizure": 1, "Sense of oppression": 1, "Somnolence": 1, "Status epilepticus": 1, "Tachycardia": 1, "Thrombosis": 1, "Troponin": 1, "Troponin I": 1, "Upper gastrointestinal haemorrhage": 1, "Urticaria": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3005236", "histograms": [{"histogram": {"Body temperature": 13, "Anaphylactic reaction": 10, "Myocarditis": 8, "Presyncope": 7, "Blood pressure measurement": 5, "Pyrexia": 5, "Blood creatine phosphokinase": 4, "Bradycardia": 4, "Depressed level of consciousness": 4, "Neuropathy peripheral": 4, "Blood creatine phosphokinase MB": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Heart rate": 3, "Oxygen saturation": 3, "Dyspnoea": 2, "Feeling abnormal": 2, "Head discomfort": 2, "Troponin T": 2, "Acute hepatic failure": 1, "Anaphylactoid reaction": 1, "Angiocardiogram": 1, "Aspartate aminotransferase": 1, "Biopsy heart": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Blood pressure systolic": 1, "Blood test": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiothoracic ratio": 1, "Catheterisation cardiac": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Cystogram": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Electroencephalogram": 1, "Fall": 1, "Fibrin degradation products": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Lip swelling": 1, "Liver function test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Organ failure": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Panic disorder": 1, "Pericarditis": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Pupillary light reflex tests": 1, "Radial nerve palsy": 1, "Renal function test": 1, "Respiratory rate": 1, "Seizure": 1, "Sense of oppression": 1, "Somnolence": 1, "Status epilepticus": 1, "Tachycardia": 1, "Thrombosis": 1, "Troponin": 1, "Troponin I": 1, "Upper gastrointestinal haemorrhage": 1, "Urticaria": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["3005236"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005239.json b/docs/data/histograms/Japan/3005239.json
index a6edacd4a83..eb521587ca2 100644
--- a/docs/data/histograms/Japan/3005239.json
+++ b/docs/data/histograms/Japan/3005239.json
@@ -1 +1 @@
-{"batchcode": "3005239", "histograms": [{"batchcodes": ["3005239"], "histogram": {"Body temperature": 7, "Presyncope": 7, "Pyrexia": 4, "Seizure": 4, "Anaphylactic reaction": 3, "Depressed level of consciousness": 3, "Heart rate": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Blood pressure measurement": 2, "Fall": 2, "Oxygen saturation": 2, "Aortic dissection": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood test": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Carotid artery occlusion": 1, "Central pain syndrome": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cerebral ventricular rupture": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram": 1, "Contusion": 1, "Decreased appetite": 1, "Dehydration": 1, "Delusion": 1, "Dizziness": 1, "Dyslalia": 1, "Electrocardiogram": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Hallucination": 1, "Headache": 1, "Neuropathy peripheral": 1, "Petit mal epilepsy": 1, "Restlessness": 1, "Toxic skin eruption": 1, "Tremor": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3005239", "histograms": [{"histogram": {"Body temperature": 7, "Presyncope": 7, "Pyrexia": 4, "Seizure": 4, "Anaphylactic reaction": 3, "Depressed level of consciousness": 3, "Heart rate": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Blood pressure measurement": 2, "Fall": 2, "Oxygen saturation": 2, "Aortic dissection": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood test": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Carotid artery occlusion": 1, "Central pain syndrome": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cerebral ventricular rupture": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram": 1, "Contusion": 1, "Decreased appetite": 1, "Dehydration": 1, "Delusion": 1, "Dizziness": 1, "Dyslalia": 1, "Electrocardiogram": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Hallucination": 1, "Headache": 1, "Neuropathy peripheral": 1, "Petit mal epilepsy": 1, "Restlessness": 1, "Toxic skin eruption": 1, "Tremor": 1, "Urticaria": 1}, "batchcodes": ["3005239"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005240.json b/docs/data/histograms/Japan/3005240.json
index 5bf2a1fbd00..2de8c92e4d5 100644
--- a/docs/data/histograms/Japan/3005240.json
+++ b/docs/data/histograms/Japan/3005240.json
@@ -1 +1 @@
-{"batchcode": "3005240", "histograms": [{"batchcodes": ["3005240"], "histogram": {"Body temperature": 9, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Myocarditis": 4, "Presyncope": 4, "Circulatory collapse": 2, "Depressed level of consciousness": 2, "Headache": 2, "Heart rate": 2, "Loss of consciousness": 2, "Oxygen saturation": 2, "Angiogram": 1, "Aortic valve incompetence": 1, "Back pain": 1, "Biopsy": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood pressure systolic": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Chills": 1, "Cold sweat": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Haemorrhagic disorder": 1, "Heart sounds": 1, "Herpes simplex encephalitis": 1, "Herpes simplex test": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Neuropathy peripheral": 1, "Oculomucocutaneous syndrome": 1, "Pericarditis": 1, "Physical examination": 1, "Pyrexia": 1, "Respiratory rate": 1, "Seizure": 1, "Shock": 1, "Sudden cardiac death": 1, "Syncope": 1, "Troponin I": 1, "Urticaria": 1, "Vaccination site pain": 1, "White blood cell count": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "3005240", "histograms": [{"histogram": {"Body temperature": 9, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Myocarditis": 4, "Presyncope": 4, "Circulatory collapse": 2, "Depressed level of consciousness": 2, "Headache": 2, "Heart rate": 2, "Loss of consciousness": 2, "Oxygen saturation": 2, "Angiogram": 1, "Aortic valve incompetence": 1, "Back pain": 1, "Biopsy": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood pressure systolic": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Chills": 1, "Cold sweat": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Guillain-Barre syndrome": 1, "Haemorrhagic disorder": 1, "Heart sounds": 1, "Herpes simplex encephalitis": 1, "Herpes simplex test": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Neuropathy peripheral": 1, "Oculomucocutaneous syndrome": 1, "Pericarditis": 1, "Physical examination": 1, "Pyrexia": 1, "Respiratory rate": 1, "Seizure": 1, "Shock": 1, "Sudden cardiac death": 1, "Syncope": 1, "Troponin I": 1, "Urticaria": 1, "Vaccination site pain": 1, "White blood cell count": 1, "Yawning": 1}, "batchcodes": ["3005240"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005272.json b/docs/data/histograms/Japan/3005272.json
index 7d723bbd5ef..b98221ee1fd 100644
--- a/docs/data/histograms/Japan/3005272.json
+++ b/docs/data/histograms/Japan/3005272.json
@@ -1 +1 @@
-{"batchcode": "3005272", "histograms": [{"batchcodes": ["3005272"], "histogram": {"Presyncope": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3005272", "histograms": [{"histogram": {"Presyncope": 1, "Syncope": 1}, "batchcodes": ["3005272"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005273.json b/docs/data/histograms/Japan/3005273.json
index cbd445ca95f..ff3d498ead7 100644
--- a/docs/data/histograms/Japan/3005273.json
+++ b/docs/data/histograms/Japan/3005273.json
@@ -1 +1 @@
-{"batchcode": "3005273", "histograms": [{"batchcodes": ["3005273"], "histogram": {"Arrhythmia": 1, "Gaze palsy": 1, "Loss of consciousness": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3005273", "histograms": [{"histogram": {"Arrhythmia": 1, "Gaze palsy": 1, "Loss of consciousness": 1, "Presyncope": 1}, "batchcodes": ["3005273"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005286.json b/docs/data/histograms/Japan/3005286.json
index 9b63dc92145..e180e1347be 100644
--- a/docs/data/histograms/Japan/3005286.json
+++ b/docs/data/histograms/Japan/3005286.json
@@ -1 +1 @@
-{"batchcode": "3005286", "histograms": [{"batchcodes": ["3005286"], "histogram": {"Body temperature": 5, "Presyncope": 5, "Anaphylactic reaction": 4, "Bradycardia": 4, "Loss of consciousness": 4, "Neuropathy peripheral": 4, "Fall": 3, "Malaise": 3, "Pallor": 3, "Pyrexia": 3, "Syncope": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Cough": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Heart rate": 2, "Oxygen saturation": 2, "Rash": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Anti-ganglioside antibody": 1, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Biopsy heart": 1, "Blood test": 1, "Body temperature decreased": 1, "C-reactive protein": 1, "Cardiac electrophysiologic study": 1, "Cerebrovascular arteriovenous malformation": 1, "Chest discomfort": 1, "Cold sweat": 1, "Constipation": 1, "Contusion": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Incontinence": 1, "Laboratory test": 1, "Language disorder": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Middle insomnia": 1, "Miller Fisher syndrome": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Nerve conduction studies": 1, "Oculomucocutaneous syndrome": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Physical deconditioning": 1, "Respiration abnormal": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Sensory disturbance": 1, "Spinal cord infarction": 1, "Suicidal ideation": 1, "Urticaria": 1, "Visual impairment": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005286", "histograms": [{"histogram": {"Body temperature": 5, "Presyncope": 5, "Anaphylactic reaction": 4, "Bradycardia": 4, "Loss of consciousness": 4, "Neuropathy peripheral": 4, "Fall": 3, "Malaise": 3, "Pallor": 3, "Pyrexia": 3, "Syncope": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Cough": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Heart rate": 2, "Oxygen saturation": 2, "Rash": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Anti-ganglioside antibody": 1, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Biopsy heart": 1, "Blood test": 1, "Body temperature decreased": 1, "C-reactive protein": 1, "Cardiac electrophysiologic study": 1, "Cerebrovascular arteriovenous malformation": 1, "Chest discomfort": 1, "Cold sweat": 1, "Constipation": 1, "Contusion": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Incontinence": 1, "Laboratory test": 1, "Language disorder": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Middle insomnia": 1, "Miller Fisher syndrome": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Nerve conduction studies": 1, "Oculomucocutaneous syndrome": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Physical deconditioning": 1, "Respiration abnormal": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Sensory disturbance": 1, "Spinal cord infarction": 1, "Suicidal ideation": 1, "Urticaria": 1, "Visual impairment": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["3005286"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005288.json b/docs/data/histograms/Japan/3005288.json
index 5818541e110..59fd6ef3417 100644
--- a/docs/data/histograms/Japan/3005288.json
+++ b/docs/data/histograms/Japan/3005288.json
@@ -1 +1 @@
-{"batchcode": "3005288", "histograms": [{"batchcodes": ["3005288", "FR4768"], "histogram": {"Collagen disorder": 1, "Depression": 1, "Grip strength decreased": 1, "Illusion": 1, "Impaired work ability": 1, "Musculoskeletal stiffness": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nodal osteoarthritis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sensory disturbance": 1}}, {"batchcodes": ["3005288"], "histogram": {"Anaphylactic reaction": 5, "Neuropathy peripheral": 5, "Loss of consciousness": 4, "Nausea": 4, "Abdominal pain": 3, "Dizziness": 3, "Pruritus": 3, "Body temperature": 2, "Diarrhoea": 2, "Presyncope": 2, "Purpura": 2, "Pyrexia": 2, "Acute psychosis": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bradycardia": 1, "COVID-19": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Clonic convulsion": 1, "Cold sweat": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dysaesthesia": 1, "Electrocardiogram": 1, "Erythema": 1, "Facial spasm": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate": 1, "Hyperpyrexia": 1, "Hypoaesthesia": 1, "Idiopathic pulmonary fibrosis": 1, "Internal haemorrhage": 1, "Language disorder": 1, "Malaise": 1, "Muscular weakness": 1, "Myocarditis": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pallor": 1, "Platelet count decreased": 1, "Rash": 1, "Respiration abnormal": 1, "Tachycardia": 1, "Throat irritation": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3005288", "histograms": [{"histogram": {"Collagen disorder": 1, "Depression": 1, "Grip strength decreased": 1, "Illusion": 1, "Impaired work ability": 1, "Musculoskeletal stiffness": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nodal osteoarthritis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sensory disturbance": 1}, "batchcodes": ["3005288", "FR4768"]}, {"histogram": {"Anaphylactic reaction": 5, "Neuropathy peripheral": 5, "Loss of consciousness": 4, "Nausea": 4, "Abdominal pain": 3, "Dizziness": 3, "Pruritus": 3, "Body temperature": 2, "Diarrhoea": 2, "Presyncope": 2, "Purpura": 2, "Pyrexia": 2, "Acute psychosis": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bradycardia": 1, "COVID-19": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Clonic convulsion": 1, "Cold sweat": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dysaesthesia": 1, "Electrocardiogram": 1, "Erythema": 1, "Facial spasm": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate": 1, "Hyperpyrexia": 1, "Hypoaesthesia": 1, "Idiopathic pulmonary fibrosis": 1, "Internal haemorrhage": 1, "Language disorder": 1, "Malaise": 1, "Muscular weakness": 1, "Myocarditis": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pallor": 1, "Platelet count decreased": 1, "Rash": 1, "Respiration abnormal": 1, "Tachycardia": 1, "Throat irritation": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["3005288"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005289.json b/docs/data/histograms/Japan/3005289.json
index 1c64058e290..e6a3eca9443 100644
--- a/docs/data/histograms/Japan/3005289.json
+++ b/docs/data/histograms/Japan/3005289.json
@@ -1 +1 @@
-{"batchcode": "3005289", "histograms": [{"batchcodes": ["3005289"], "histogram": {"Body temperature": 5, "Presyncope": 3, "Anaphylactic reaction": 2, "Fall": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Arthralgia": 1, "Blood pressure measurement": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ejection fraction": 1, "Erythema multiforme": 1, "Feeling abnormal": 1, "Hyperventilation": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Seizure": 1, "Urticaria": 1, "Vaccination site pain": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "3005289", "histograms": [{"histogram": {"Body temperature": 5, "Presyncope": 3, "Anaphylactic reaction": 2, "Fall": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Arthralgia": 1, "Blood pressure measurement": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ejection fraction": 1, "Erythema multiforme": 1, "Feeling abnormal": 1, "Hyperventilation": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Seizure": 1, "Urticaria": 1, "Vaccination site pain": 1, "Wound": 1}, "batchcodes": ["3005289"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005292.json b/docs/data/histograms/Japan/3005292.json
index c5c8857329f..1fe925e4804 100644
--- a/docs/data/histograms/Japan/3005292.json
+++ b/docs/data/histograms/Japan/3005292.json
@@ -1 +1 @@
-{"batchcode": "3005292", "histograms": [{"batchcodes": ["3005292"], "histogram": {"Blood pressure measurement": 9, "Body temperature": 6, "Heart rate": 6, "Oxygen saturation": 6, "Presyncope": 6, "Anaphylactic reaction": 5, "Syncope": 5, "Depressed level of consciousness": 3, "Loss of consciousness": 3, "Fall": 2, "Feeling abnormal": 2, "Magnetic resonance imaging": 2, "Pallor": 2, "Seizure": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Asthma": 1, "Blood pressure increased": 1, "Blood test": 1, "Computerised tomogram": 1, "Dysaesthesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Face oedema": 1, "Fibromyalgia": 1, "Headache": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Localised oedema": 1, "Malaise": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Swelling of eyelid": 1, "Thalamus haemorrhage": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "3005292", "histograms": [{"histogram": {"Blood pressure measurement": 9, "Body temperature": 6, "Heart rate": 6, "Oxygen saturation": 6, "Presyncope": 6, "Anaphylactic reaction": 5, "Syncope": 5, "Depressed level of consciousness": 3, "Loss of consciousness": 3, "Fall": 2, "Feeling abnormal": 2, "Magnetic resonance imaging": 2, "Pallor": 2, "Seizure": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Asthma": 1, "Blood pressure increased": 1, "Blood test": 1, "Computerised tomogram": 1, "Dysaesthesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Face oedema": 1, "Fibromyalgia": 1, "Headache": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Localised oedema": 1, "Malaise": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Swelling of eyelid": 1, "Thalamus haemorrhage": 1, "Tremor": 1}, "batchcodes": ["3005292"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005293.json b/docs/data/histograms/Japan/3005293.json
index f249b241309..afc93fdd662 100644
--- a/docs/data/histograms/Japan/3005293.json
+++ b/docs/data/histograms/Japan/3005293.json
@@ -1 +1 @@
-{"batchcode": "3005293", "histograms": [{"batchcodes": ["3005293"], "histogram": {"Presyncope": 7, "Loss of consciousness": 4, "Chest pain": 3, "Magnetic resonance imaging": 3, "Computerised tomogram": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Headache": 2, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Blood test": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Eye haemorrhage": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Malaise": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nausea": 1, "Nervous system disorder": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Palpitations": 1, "Platelet count": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Single photon emission computerised tomogram": 1, "Skin abrasion": 1, "Syncope": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Troponin I": 1, "Ultrasound scan": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "3005293", "histograms": [{"histogram": {"Presyncope": 7, "Loss of consciousness": 4, "Chest pain": 3, "Magnetic resonance imaging": 3, "Computerised tomogram": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Headache": 2, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Blood test": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Eye haemorrhage": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Malaise": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nausea": 1, "Nervous system disorder": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Palpitations": 1, "Platelet count": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Single photon emission computerised tomogram": 1, "Skin abrasion": 1, "Syncope": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Troponin I": 1, "Ultrasound scan": 1, "Vaccination site pruritus": 1}, "batchcodes": ["3005293"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005644.json b/docs/data/histograms/Japan/3005644.json
index bc900d29918..9ce13fb5c05 100644
--- a/docs/data/histograms/Japan/3005644.json
+++ b/docs/data/histograms/Japan/3005644.json
@@ -1 +1 @@
-{"batchcode": "3005644", "histograms": [{"batchcodes": ["3005644"], "histogram": {"Body temperature": 1, "Chills": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "3005644", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Nausea": 1}, "batchcodes": ["3005644"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005685.json b/docs/data/histograms/Japan/3005685.json
index 1a1e74e61b1..85e62d221f0 100644
--- a/docs/data/histograms/Japan/3005685.json
+++ b/docs/data/histograms/Japan/3005685.json
@@ -1 +1 @@
-{"batchcode": "3005685", "histograms": [{"batchcodes": ["3005685"], "histogram": {"Body temperature": 8, "Anaphylactic reaction": 5, "Myocarditis": 5, "Pyrexia": 4, "C-reactive protein": 3, "Chest discomfort": 3, "Echocardiogram": 3, "Hypoaesthesia": 3, "Presyncope": 3, "Anaphylactic shock": 2, "Blood creatine phosphokinase": 2, "Blood test": 2, "Chest X-ray": 2, "Chest pain": 2, "Electrocardiogram": 2, "Gaze palsy": 2, "Pericarditis": 2, "Tonic convulsion": 2, "Tremor": 2, "Abdominal distension": 1, "Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anaemia": 1, "Ankle brachial index": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Atrioventricular block second degree": 1, "Autopsy": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood culture": 1, "Blood gases": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Brain natriuretic peptide": 1, "Cardiothoracic ratio": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Dysphonia": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Exercise electrocardiogram": 1, "Fall": 1, "Fibrin D dimer": 1, "Flank pain": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "High density lipoprotein": 1, "Hyperventilation": 1, "Imaging procedure": 1, "Incontinence": 1, "International normalised ratio": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Muscle spasms": 1, "Nausea": 1, "Nerve conduction studies": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Platelet count": 1, "Platelet count increased": 1, "Procalcitonin": 1, "Protein total": 1, "Pulse wave velocity": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test": 1, "Scan myocardial perfusion": 1, "Seizure": 1, "Swelling of eyelid": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Urine analysis": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005685", "histograms": [{"histogram": {"Body temperature": 8, "Anaphylactic reaction": 5, "Myocarditis": 5, "Pyrexia": 4, "C-reactive protein": 3, "Chest discomfort": 3, "Echocardiogram": 3, "Hypoaesthesia": 3, "Presyncope": 3, "Anaphylactic shock": 2, "Blood creatine phosphokinase": 2, "Blood test": 2, "Chest X-ray": 2, "Chest pain": 2, "Electrocardiogram": 2, "Gaze palsy": 2, "Pericarditis": 2, "Tonic convulsion": 2, "Tremor": 2, "Abdominal distension": 1, "Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anaemia": 1, "Ankle brachial index": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Atrioventricular block second degree": 1, "Autopsy": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood culture": 1, "Blood gases": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Brain natriuretic peptide": 1, "Cardiothoracic ratio": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Dysphonia": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Exercise electrocardiogram": 1, "Fall": 1, "Fibrin D dimer": 1, "Flank pain": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate": 1, "High density lipoprotein": 1, "Hyperventilation": 1, "Imaging procedure": 1, "Incontinence": 1, "International normalised ratio": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Muscle spasms": 1, "Nausea": 1, "Nerve conduction studies": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Platelet count": 1, "Platelet count increased": 1, "Procalcitonin": 1, "Protein total": 1, "Pulse wave velocity": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test": 1, "Scan myocardial perfusion": 1, "Seizure": 1, "Swelling of eyelid": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Urine analysis": 1, "White blood cell count": 1}, "batchcodes": ["3005685"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005691.json b/docs/data/histograms/Japan/3005691.json
index 43cfc308f3f..ec204b9c2cf 100644
--- a/docs/data/histograms/Japan/3005691.json
+++ b/docs/data/histograms/Japan/3005691.json
@@ -1 +1 @@
-{"batchcode": "3005691", "histograms": [{"batchcodes": ["3005691"], "histogram": {"Presyncope": 8, "Pyrexia": 5, "Fall": 4, "Anaphylactic reaction": 3, "Body temperature": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Blood pressure measurement": 2, "Contusion": 2, "Cyanosis": 2, "Heart rate": 2, "Myalgia": 2, "Oxygen saturation": 2, "Troponin T": 2, "Altered state of consciousness": 1, "Autoantibody test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "CSF volume": 1, "Cardiac electrophysiologic study": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Myocardial necrosis marker": 1, "Myoglobin blood": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Post-traumatic pain": 1, "Pruritus": 1, "Rash": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3005691", "histograms": [{"histogram": {"Presyncope": 8, "Pyrexia": 5, "Fall": 4, "Anaphylactic reaction": 3, "Body temperature": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Blood pressure measurement": 2, "Contusion": 2, "Cyanosis": 2, "Heart rate": 2, "Myalgia": 2, "Oxygen saturation": 2, "Troponin T": 2, "Altered state of consciousness": 1, "Autoantibody test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "CSF volume": 1, "Cardiac electrophysiologic study": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Myocardial necrosis marker": 1, "Myoglobin blood": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Post-traumatic pain": 1, "Pruritus": 1, "Rash": 1, "Syncope": 1}, "batchcodes": ["3005691"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005692.json b/docs/data/histograms/Japan/3005692.json
index 25f8836310d..93edad8615c 100644
--- a/docs/data/histograms/Japan/3005692.json
+++ b/docs/data/histograms/Japan/3005692.json
@@ -1 +1 @@
-{"batchcode": "3005692", "histograms": [{"batchcodes": ["3005692"], "histogram": {"Body temperature": 17, "Anaphylactic reaction": 7, "Loss of consciousness": 5, "Neuropathy peripheral": 5, "Oxygen saturation": 5, "Blood pressure measurement": 4, "Pyrexia": 4, "Fall": 3, "Heart rate": 3, "Presyncope": 3, "Blood creatine phosphokinase": 2, "Chest pain": 2, "Contusion": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Gaze palsy": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Myocarditis": 2, "Nausea": 2, "Pallor": 2, "Seizure": 2, "Syncope": 2, "Adrenal mass": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Blood calcium": 1, "Blood pressure decreased": 1, "Blood test": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Decreased appetite": 1, "Disorientation": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophilic myocarditis": 1, "Epilepsy": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fundoscopy": 1, "Genital haemorrhage": 1, "Hypoaesthesia": 1, "Lip injury": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging neck": 1, "Myocardial infarction": 1, "Palpitations": 1, "Pericardial effusion": 1, "Peripheral nerve lesion": 1, "Physical deconditioning": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "SARS-CoV-2 test": 1, "Subcutaneous haematoma": 1, "Tetany": 1, "Tremor": 1, "Troponin I": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3005692", "histograms": [{"histogram": {"Body temperature": 17, "Anaphylactic reaction": 7, "Loss of consciousness": 5, "Neuropathy peripheral": 5, "Oxygen saturation": 5, "Blood pressure measurement": 4, "Pyrexia": 4, "Fall": 3, "Heart rate": 3, "Presyncope": 3, "Blood creatine phosphokinase": 2, "Chest pain": 2, "Contusion": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Gaze palsy": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Myocarditis": 2, "Nausea": 2, "Pallor": 2, "Seizure": 2, "Syncope": 2, "Adrenal mass": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Blood calcium": 1, "Blood pressure decreased": 1, "Blood test": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Decreased appetite": 1, "Disorientation": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophilic myocarditis": 1, "Epilepsy": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fundoscopy": 1, "Genital haemorrhage": 1, "Hypoaesthesia": 1, "Lip injury": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging neck": 1, "Myocardial infarction": 1, "Palpitations": 1, "Pericardial effusion": 1, "Peripheral nerve lesion": 1, "Physical deconditioning": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "SARS-CoV-2 test": 1, "Subcutaneous haematoma": 1, "Tetany": 1, "Tremor": 1, "Troponin I": 1, "Vaccination site pain": 1}, "batchcodes": ["3005692"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005693.json b/docs/data/histograms/Japan/3005693.json
index a391974380f..7b9106a3ea5 100644
--- a/docs/data/histograms/Japan/3005693.json
+++ b/docs/data/histograms/Japan/3005693.json
@@ -1 +1 @@
-{"batchcode": "3005693", "histograms": [{"batchcodes": ["3005693"], "histogram": {"Body temperature": 10, "Presyncope": 8, "Pyrexia": 8, "Anaphylactic reaction": 5, "Blood pressure measurement": 5, "Fall": 5, "Heart rate": 5, "Loss of consciousness": 4, "Myocarditis": 4, "Oxygen saturation": 4, "Seizure": 3, "Bell's palsy": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Dyspnoea": 2, "Gait disturbance": 2, "Hypoaesthesia": 2, "Malaise": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pain": 2, "Pain in extremity": 2, "Syncope": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Amyotrophy": 1, "Anaphylactic shock": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Arrhythmia": 1, "Artery dissection": 1, "Arthralgia": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Bradycardia": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Cold sweat": 1, "Colitis ischaemic": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Extra dose administered": 1, "Febrile convulsion": 1, "Feeding disorder": 1, "Grip strength": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Muscular weakness": 1, "Myelitis": 1, "Oropharyngeal discomfort": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Pharyngeal swelling": 1, "Quadriplegia": 1, "Respiratory rate": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Speech disorder": 1, "Troponin": 1, "Troponin I": 1, "Vaccination site pain": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3005693", "histograms": [{"histogram": {"Body temperature": 10, "Presyncope": 8, "Pyrexia": 8, "Anaphylactic reaction": 5, "Blood pressure measurement": 5, "Fall": 5, "Heart rate": 5, "Loss of consciousness": 4, "Myocarditis": 4, "Oxygen saturation": 4, "Seizure": 3, "Bell's palsy": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Dyspnoea": 2, "Gait disturbance": 2, "Hypoaesthesia": 2, "Malaise": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pain": 2, "Pain in extremity": 2, "Syncope": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Amyotrophy": 1, "Anaphylactic shock": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Arrhythmia": 1, "Artery dissection": 1, "Arthralgia": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Bradycardia": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Cold sweat": 1, "Colitis ischaemic": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Extra dose administered": 1, "Febrile convulsion": 1, "Feeding disorder": 1, "Grip strength": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Muscular weakness": 1, "Myelitis": 1, "Oropharyngeal discomfort": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Pharyngeal swelling": 1, "Quadriplegia": 1, "Respiratory rate": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Speech disorder": 1, "Troponin": 1, "Troponin I": 1, "Vaccination site pain": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["3005693"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005694.json b/docs/data/histograms/Japan/3005694.json
index fa0a614b340..5a4d2ac754b 100644
--- a/docs/data/histograms/Japan/3005694.json
+++ b/docs/data/histograms/Japan/3005694.json
@@ -1 +1 @@
-{"batchcode": "3005694", "histograms": [{"batchcodes": ["3005694"], "histogram": {"Pyrexia": 5, "Anaphylactic reaction": 4, "Body temperature": 4, "Blood pressure measurement": 3, "Depressed level of consciousness": 3, "Decreased appetite": 2, "Heart rate": 2, "Magnetic resonance imaging head": 2, "Nausea": 2, "Oxygen saturation": 2, "Presyncope": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Anaphylactoid reaction": 1, "Anti-ganglioside antibody": 1, "Antibody test": 1, "Antiphospholipid antibodies positive": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Blood albumin": 1, "Blood chloride": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "CHA2DS2-VASc-score": 1, "CSF cell count": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Contusion": 1, "Diplopia": 1, "Dysgeusia": 1, "Eczema": 1, "Electrocardiogram": 1, "Encephalitis Japanese B": 1, "Fatigue": 1, "Gaze palsy": 1, "Grip strength": 1, "Haematuria": 1, "Hyperhidrosis": 1, "Hypertensive emergency": 1, "Hypoaesthesia": 1, "Jaundice": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Lymphocyte stimulation test": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neutrophil count": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Pain": 1, "Paraesthesia": 1, "Pemphigoid": 1, "Pericardial haemorrhage": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pruritus": 1, "Rash": 1, "Sudden death": 1, "Tremor": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Vibration test": 1, "Visual impairment": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005694", "histograms": [{"histogram": {"Pyrexia": 5, "Anaphylactic reaction": 4, "Body temperature": 4, "Blood pressure measurement": 3, "Depressed level of consciousness": 3, "Decreased appetite": 2, "Heart rate": 2, "Magnetic resonance imaging head": 2, "Nausea": 2, "Oxygen saturation": 2, "Presyncope": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Anaphylactoid reaction": 1, "Anti-ganglioside antibody": 1, "Antibody test": 1, "Antiphospholipid antibodies positive": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Blood albumin": 1, "Blood chloride": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "CHA2DS2-VASc-score": 1, "CSF cell count": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Contusion": 1, "Diplopia": 1, "Dysgeusia": 1, "Eczema": 1, "Electrocardiogram": 1, "Encephalitis Japanese B": 1, "Fatigue": 1, "Gaze palsy": 1, "Grip strength": 1, "Haematuria": 1, "Hyperhidrosis": 1, "Hypertensive emergency": 1, "Hypoaesthesia": 1, "Jaundice": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Lymphocyte stimulation test": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neutrophil count": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Pain": 1, "Paraesthesia": 1, "Pemphigoid": 1, "Pericardial haemorrhage": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pruritus": 1, "Rash": 1, "Sudden death": 1, "Tremor": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Vibration test": 1, "Visual impairment": 1, "White blood cell count": 1}, "batchcodes": ["3005694"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005699.json b/docs/data/histograms/Japan/3005699.json
index 277dc8a800f..3c1c41f9cb3 100644
--- a/docs/data/histograms/Japan/3005699.json
+++ b/docs/data/histograms/Japan/3005699.json
@@ -1 +1 @@
-{"batchcode": "3005699", "histograms": [{"batchcodes": ["3005699"], "histogram": {"Presyncope": 5, "Body temperature": 4, "Loss of consciousness": 3, "Anaphylactic reaction": 2, "Contusion": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Fall": 2, "Syncope": 2, "Anaemia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "Dermatomyositis": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Feeling abnormal": 1, "Haemophagocytic lymphohistiocytosis": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Interstitial lung disease": 1, "Multiple sclerosis": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pericarditis": 1, "Troponin I": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3005699", "histograms": [{"histogram": {"Presyncope": 5, "Body temperature": 4, "Loss of consciousness": 3, "Anaphylactic reaction": 2, "Contusion": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Fall": 2, "Syncope": 2, "Anaemia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "Dermatomyositis": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Feeling abnormal": 1, "Haemophagocytic lymphohistiocytosis": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Interstitial lung disease": 1, "Multiple sclerosis": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pericarditis": 1, "Troponin I": 1, "Vomiting": 1}, "batchcodes": ["3005699"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005700.json b/docs/data/histograms/Japan/3005700.json
index 1b5d5d1312f..c5fcecf46b7 100644
--- a/docs/data/histograms/Japan/3005700.json
+++ b/docs/data/histograms/Japan/3005700.json
@@ -1 +1 @@
-{"batchcode": "3005700", "histograms": [{"batchcodes": ["3005700"], "histogram": {"Body temperature": 7, "Pyrexia": 6, "Electrocardiogram": 4, "Headache": 3, "Oxygen saturation": 3, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Malaise": 2, "Myocarditis": 2, "Pericarditis": 2, "Troponin I": 2, "Autoimmune disorder": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest discomfort": 1, "Chills": 1, "Clostridium test": 1, "Colitis": 1, "Colitis ischaemic": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Cough": 1, "Culture stool": 1, "Death": 1, "Decreased appetite": 1, "Dizziness postural": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Endoscopy gastrointestinal": 1, "Eye pain": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Hypersensitivity": 1, "IIIrd nerve paresis": 1, "Magnetic resonance imaging": 1, "Multiple sclerosis relapse": 1, "Pericardial effusion": 1, "Pneumonia aspiration": 1, "Respiratory failure": 1, "Retinal detachment": 1, "Thrombosis": 1, "Type III immune complex mediated reaction": 1, "Ultrasound scan": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3005700", "histograms": [{"histogram": {"Body temperature": 7, "Pyrexia": 6, "Electrocardiogram": 4, "Headache": 3, "Oxygen saturation": 3, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Malaise": 2, "Myocarditis": 2, "Pericarditis": 2, "Troponin I": 2, "Autoimmune disorder": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest discomfort": 1, "Chills": 1, "Clostridium test": 1, "Colitis": 1, "Colitis ischaemic": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Cough": 1, "Culture stool": 1, "Death": 1, "Decreased appetite": 1, "Dizziness postural": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Endoscopy gastrointestinal": 1, "Eye pain": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Hypersensitivity": 1, "IIIrd nerve paresis": 1, "Magnetic resonance imaging": 1, "Multiple sclerosis relapse": 1, "Pericardial effusion": 1, "Pneumonia aspiration": 1, "Respiratory failure": 1, "Retinal detachment": 1, "Thrombosis": 1, "Type III immune complex mediated reaction": 1, "Ultrasound scan": 1, "Vaccination site pain": 1}, "batchcodes": ["3005700"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005701.json b/docs/data/histograms/Japan/3005701.json
index f6085965fd4..15d6cadaba0 100644
--- a/docs/data/histograms/Japan/3005701.json
+++ b/docs/data/histograms/Japan/3005701.json
@@ -1 +1 @@
-{"batchcode": "3005701", "histograms": [{"batchcodes": ["3005701"], "histogram": {"Body temperature": 9, "Echocardiogram": 4, "Presyncope": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Heart rate": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Oxygen saturation": 3, "Blood creatine phosphokinase": 2, "Electrocardiogram": 2, "Fall": 2, "Acute myocardial infarction": 1, "Anaphylactoid reaction": 1, "Bacterial test": 1, "Blood glucose": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "CSF pressure": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Ejection fraction": 1, "Face oedema": 1, "Headache": 1, "Hemiplegia": 1, "Herpes simplex meningitis": 1, "Herpes simplex test": 1, "Lip swelling": 1, "Malaise": 1, "Meningitis aseptic": 1, "Mononuclear cell count": 1, "Multisystem inflammatory syndrome in children": 1, "Muscular weakness": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Oculomucocutaneous syndrome": 1, "Pain in jaw": 1, "Photophobia": 1, "Platelet count": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Protein total": 1, "Respiratory arrest": 1, "Seizure": 1, "Syncope": 1, "Thrombosis": 1, "Tooth fracture": 1, "Tremor": 1, "Ventricular fibrillation": 1, "Wound": 1, "Wound haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "3005701", "histograms": [{"histogram": {"Body temperature": 9, "Echocardiogram": 4, "Presyncope": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Heart rate": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Oxygen saturation": 3, "Blood creatine phosphokinase": 2, "Electrocardiogram": 2, "Fall": 2, "Acute myocardial infarction": 1, "Anaphylactoid reaction": 1, "Bacterial test": 1, "Blood glucose": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "CSF pressure": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Ejection fraction": 1, "Face oedema": 1, "Headache": 1, "Hemiplegia": 1, "Herpes simplex meningitis": 1, "Herpes simplex test": 1, "Lip swelling": 1, "Malaise": 1, "Meningitis aseptic": 1, "Mononuclear cell count": 1, "Multisystem inflammatory syndrome in children": 1, "Muscular weakness": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Oculomucocutaneous syndrome": 1, "Pain in jaw": 1, "Photophobia": 1, "Platelet count": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Protein total": 1, "Respiratory arrest": 1, "Seizure": 1, "Syncope": 1, "Thrombosis": 1, "Tooth fracture": 1, "Tremor": 1, "Ventricular fibrillation": 1, "Wound": 1, "Wound haemorrhage": 1}, "batchcodes": ["3005701"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005702.json b/docs/data/histograms/Japan/3005702.json
index 064d308e47e..98cd31922f4 100644
--- a/docs/data/histograms/Japan/3005702.json
+++ b/docs/data/histograms/Japan/3005702.json
@@ -1 +1 @@
-{"batchcode": "3005702", "histograms": [{"batchcodes": ["3005702"], "histogram": {"Body temperature": 5, "Echocardiogram": 5, "Electrocardiogram": 4, "Myocarditis": 3, "Biopsy heart": 2, "Blood creatine phosphokinase": 2, "Blood pressure decreased": 2, "Chest X-ray": 2, "Chest pain": 2, "Neuropathy peripheral": 2, "Troponin I": 2, "Altered state of consciousness": 1, "Angiocardiogram": 1, "Blood pressure measurement": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Cardiac function test": 1, "Computerised tomogram head": 1, "Cyanosis": 1, "Diplopia": 1, "Endocrine ophthalmopathy": 1, "Eye disorder": 1, "Eye inflammation": 1, "Headache": 1, "Heart rate": 1, "Intraventricular haemorrhage": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Muscle strain": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Pulseless electrical activity": 1, "Pupillary light reflex tests": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Seizure": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "3005702", "histograms": [{"histogram": {"Body temperature": 5, "Echocardiogram": 5, "Electrocardiogram": 4, "Myocarditis": 3, "Biopsy heart": 2, "Blood creatine phosphokinase": 2, "Blood pressure decreased": 2, "Chest X-ray": 2, "Chest pain": 2, "Neuropathy peripheral": 2, "Troponin I": 2, "Altered state of consciousness": 1, "Angiocardiogram": 1, "Blood pressure measurement": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Cardiac function test": 1, "Computerised tomogram head": 1, "Cyanosis": 1, "Diplopia": 1, "Endocrine ophthalmopathy": 1, "Eye disorder": 1, "Eye inflammation": 1, "Headache": 1, "Heart rate": 1, "Intraventricular haemorrhage": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Muscle strain": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Pulseless electrical activity": 1, "Pupillary light reflex tests": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Seizure": 1, "Vaccination site reaction": 1}, "batchcodes": ["3005702"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005706.json b/docs/data/histograms/Japan/3005706.json
index c525d5bf72d..1b2945a640e 100644
--- a/docs/data/histograms/Japan/3005706.json
+++ b/docs/data/histograms/Japan/3005706.json
@@ -1 +1 @@
-{"batchcode": "3005706", "histograms": [{"batchcodes": ["3005706"], "histogram": {"Asthenia": 1, "Fall": 1, "Feeling abnormal": 1, "Headache": 1, "Loss of consciousness": 1, "Pallor": 1, "Peripheral coldness": 1, "Presyncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3005706", "histograms": [{"histogram": {"Asthenia": 1, "Fall": 1, "Feeling abnormal": 1, "Headache": 1, "Loss of consciousness": 1, "Pallor": 1, "Peripheral coldness": 1, "Presyncope": 1, "Vomiting": 1}, "batchcodes": ["3005706"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005785.json b/docs/data/histograms/Japan/3005785.json
index 05c6b6a6270..84d51e60d4b 100644
--- a/docs/data/histograms/Japan/3005785.json
+++ b/docs/data/histograms/Japan/3005785.json
@@ -1 +1 @@
-{"batchcode": "3005785", "histograms": [{"batchcodes": ["3005785"], "histogram": {"Body temperature": 5, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Sudden death": 2, "Activated partial thromboplastin time": 1, "Altered state of consciousness": 1, "Arteriosclerosis coronary artery": 1, "Blood test": 1, "Breath sounds": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Deep vein thrombosis": 1, "Fall": 1, "Fibrin D dimer": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart sounds": 1, "International normalised ratio": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Neurological examination": 1, "Physical examination": 1, "Platelet count": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Scan with contrast": 1, "Syncope": 1, "Tachycardia paroxysmal": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tonic convulsion": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005785", "histograms": [{"histogram": {"Body temperature": 5, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Sudden death": 2, "Activated partial thromboplastin time": 1, "Altered state of consciousness": 1, "Arteriosclerosis coronary artery": 1, "Blood test": 1, "Breath sounds": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Deep vein thrombosis": 1, "Fall": 1, "Fibrin D dimer": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart sounds": 1, "International normalised ratio": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Neurological examination": 1, "Physical examination": 1, "Platelet count": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Scan with contrast": 1, "Syncope": 1, "Tachycardia paroxysmal": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tonic convulsion": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["3005785"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005786.json b/docs/data/histograms/Japan/3005786.json
index 20ac92a0be6..cd61146821a 100644
--- a/docs/data/histograms/Japan/3005786.json
+++ b/docs/data/histograms/Japan/3005786.json
@@ -1 +1 @@
-{"batchcode": "3005786", "histograms": [{"batchcodes": ["3005786"], "histogram": {"Body temperature": 13, "Death": 6, "Cardio-respiratory arrest": 3, "Oxygen saturation": 3, "Pyrexia": 3, "Blood pressure measurement": 2, "C-reactive protein": 2, "Computerised tomogram": 2, "Decreased appetite": 2, "Depressed level of consciousness": 2, "Headache": 2, "Hypoaesthesia": 2, "Amylase": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Anaphylactoid reaction": 1, "Angiocardiogram": 1, "Anti-melanoma differentiation-associated protein 5 antibody positive": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Colonoscopy": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Coronary artery occlusion": 1, "Coronary artery stenosis": 1, "Dermatitis allergic": 1, "Dermatomyositis": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Feeling abnormal": 1, "Haematochezia": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Lacunar infarction": 1, "Liver function test": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Muscular weakness": 1, "Oxygen saturation decreased": 1, "Pancreatitis acute": 1, "Periarthritis": 1, "Pericarditis": 1, "Physical deconditioning": 1, "Polyp": 1, "Presyncope": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Troponin T": 1, "Viral hepatitis carrier": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005786", "histograms": [{"histogram": {"Body temperature": 13, "Death": 6, "Cardio-respiratory arrest": 3, "Oxygen saturation": 3, "Pyrexia": 3, "Blood pressure measurement": 2, "C-reactive protein": 2, "Computerised tomogram": 2, "Decreased appetite": 2, "Depressed level of consciousness": 2, "Headache": 2, "Hypoaesthesia": 2, "Amylase": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Anaphylactoid reaction": 1, "Angiocardiogram": 1, "Anti-melanoma differentiation-associated protein 5 antibody positive": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Colonoscopy": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Coronary artery occlusion": 1, "Coronary artery stenosis": 1, "Dermatitis allergic": 1, "Dermatomyositis": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Feeling abnormal": 1, "Haematochezia": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Lacunar infarction": 1, "Liver function test": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Muscular weakness": 1, "Oxygen saturation decreased": 1, "Pancreatitis acute": 1, "Periarthritis": 1, "Pericarditis": 1, "Physical deconditioning": 1, "Polyp": 1, "Presyncope": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Troponin T": 1, "Viral hepatitis carrier": 1, "White blood cell count": 1}, "batchcodes": ["3005786"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005787.json b/docs/data/histograms/Japan/3005787.json
index f4f97ec7303..213d684ab3c 100644
--- a/docs/data/histograms/Japan/3005787.json
+++ b/docs/data/histograms/Japan/3005787.json
@@ -1 +1 @@
-{"batchcode": "3005787", "histograms": [{"batchcodes": ["3005787"], "histogram": {"Body temperature": 8, "C-reactive protein": 2, "Cardio-respiratory arrest": 2, "Echocardiogram": 2, "Magnetic resonance imaging head": 2, "Angiocardiogram": 1, "Angiogram": 1, "Arrhythmia": 1, "Audiogram": 1, "Axillary nerve injury": 1, "Balance test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Blood test": 1, "Brain natriuretic peptide": 1, "CSF test": 1, "Cardiac failure": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Congestive hepatopathy": 1, "Dyspnoea": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Fibrin D dimer": 1, "Headache": 1, "Hypoxic-ischaemic encephalopathy": 1, "Imaging procedure": 1, "Interstitial lung disease": 1, "KL-6": 1, "Loss of consciousness": 1, "Malaise": 1, "Mania": 1, "Musculoskeletal discomfort": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Near drowning": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Presyncope": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Sudden hearing loss": 1, "Troponin I": 1, "Vaccination site pain": 1, "Vertigo positional": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005787", "histograms": [{"histogram": {"Body temperature": 8, "C-reactive protein": 2, "Cardio-respiratory arrest": 2, "Echocardiogram": 2, "Magnetic resonance imaging head": 2, "Angiocardiogram": 1, "Angiogram": 1, "Arrhythmia": 1, "Audiogram": 1, "Axillary nerve injury": 1, "Balance test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Blood test": 1, "Brain natriuretic peptide": 1, "CSF test": 1, "Cardiac failure": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Congestive hepatopathy": 1, "Dyspnoea": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Fibrin D dimer": 1, "Headache": 1, "Hypoxic-ischaemic encephalopathy": 1, "Imaging procedure": 1, "Interstitial lung disease": 1, "KL-6": 1, "Loss of consciousness": 1, "Malaise": 1, "Mania": 1, "Musculoskeletal discomfort": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Near drowning": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Presyncope": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Sudden hearing loss": 1, "Troponin I": 1, "Vaccination site pain": 1, "Vertigo positional": 1, "White blood cell count": 1}, "batchcodes": ["3005787"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005788.json b/docs/data/histograms/Japan/3005788.json
index 327ce67d272..cd2c354334e 100644
--- a/docs/data/histograms/Japan/3005788.json
+++ b/docs/data/histograms/Japan/3005788.json
@@ -1 +1 @@
-{"batchcode": "3005788", "histograms": [{"batchcodes": ["3005788"], "histogram": {"Body temperature": 12, "Heart rate": 5, "Oxygen saturation": 5, "Blood pressure measurement": 4, "Presyncope": 4, "Anaphylactic reaction": 3, "Contusion": 3, "Electrocardiogram": 3, "Myocarditis": 3, "Pyrexia": 3, "C-reactive protein": 2, "Fall": 2, "Loss of consciousness": 2, "Pain": 2, "Seizure": 2, "Abdominal pain upper": 1, "Abdominal tenderness": 1, "Adverse reaction": 1, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Aspartate aminotransferase": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood thromboplastin": 1, "Blood urea nitrogen/creatinine ratio": 1, "C-reactive protein increased": 1, "Chest pain": 1, "Cholangitis": 1, "Chronic obstructive pulmonary disease": 1, "Decubitus ulcer": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Echocardiogram": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gamma-glutamyltransferase": 1, "Haematemesis": 1, "Haemoglobin": 1, "Haemophagocytic lymphohistiocytosis": 1, "Hepatic function abnormal": 1, "Hypoaesthesia": 1, "Investigation": 1, "Magnetic resonance imaging heart": 1, "Pain in extremity": 1, "Pallor": 1, "Pericarditis": 1, "Platelet count": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Post-traumatic pain": 1, "Procalcitonin": 1, "Prothrombin time": 1, "SARS-CoV-2 test": 1, "Scleritis": 1, "Serum ferritin": 1, "Skin discolouration": 1, "Troponin C": 1, "Upper gastrointestinal haemorrhage": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005788", "histograms": [{"histogram": {"Body temperature": 12, "Heart rate": 5, "Oxygen saturation": 5, "Blood pressure measurement": 4, "Presyncope": 4, "Anaphylactic reaction": 3, "Contusion": 3, "Electrocardiogram": 3, "Myocarditis": 3, "Pyrexia": 3, "C-reactive protein": 2, "Fall": 2, "Loss of consciousness": 2, "Pain": 2, "Seizure": 2, "Abdominal pain upper": 1, "Abdominal tenderness": 1, "Adverse reaction": 1, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Aspartate aminotransferase": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood thromboplastin": 1, "Blood urea nitrogen/creatinine ratio": 1, "C-reactive protein increased": 1, "Chest pain": 1, "Cholangitis": 1, "Chronic obstructive pulmonary disease": 1, "Decubitus ulcer": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Echocardiogram": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gamma-glutamyltransferase": 1, "Haematemesis": 1, "Haemoglobin": 1, "Haemophagocytic lymphohistiocytosis": 1, "Hepatic function abnormal": 1, "Hypoaesthesia": 1, "Investigation": 1, "Magnetic resonance imaging heart": 1, "Pain in extremity": 1, "Pallor": 1, "Pericarditis": 1, "Platelet count": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Post-traumatic pain": 1, "Procalcitonin": 1, "Prothrombin time": 1, "SARS-CoV-2 test": 1, "Scleritis": 1, "Serum ferritin": 1, "Skin discolouration": 1, "Troponin C": 1, "Upper gastrointestinal haemorrhage": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["3005788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005791.json b/docs/data/histograms/Japan/3005791.json
index e0f6931bb23..4a6182d7003 100644
--- a/docs/data/histograms/Japan/3005791.json
+++ b/docs/data/histograms/Japan/3005791.json
@@ -1 +1 @@
-{"batchcode": "3005791", "histograms": [{"batchcodes": ["3005791"], "histogram": {"Body temperature": 4, "Electrocardiogram": 2, "Myocarditis": 2, "Anaphylactic shock": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Echocardiogram": 1, "Hyperhidrosis": 1, "Magnetic resonance imaging heart": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Pyrexia": 1, "Troponin I": 1, "Vaccination site reaction": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005791", "histograms": [{"histogram": {"Body temperature": 4, "Electrocardiogram": 2, "Myocarditis": 2, "Anaphylactic shock": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Echocardiogram": 1, "Hyperhidrosis": 1, "Magnetic resonance imaging heart": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Pyrexia": 1, "Troponin I": 1, "Vaccination site reaction": 1, "White blood cell count": 1}, "batchcodes": ["3005791"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005839.json b/docs/data/histograms/Japan/3005839.json
index c5ba418a6e0..37660ae6030 100644
--- a/docs/data/histograms/Japan/3005839.json
+++ b/docs/data/histograms/Japan/3005839.json
@@ -1 +1 @@
-{"batchcode": "3005839", "histograms": [{"batchcodes": ["3005839"], "histogram": {"Body temperature": 9, "Heart rate": 5, "Myocarditis": 5, "Pyrexia": 5, "Blood pressure measurement": 4, "Electrocardiogram": 4, "Oxygen saturation": 4, "Blood test": 3, "Anaphylactic reaction": 2, "Clonic convulsion": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Presyncope": 2, "Alanine aminotransferase": 1, "Arterial catheterisation": 1, "Aspartate aminotransferase abnormal": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood pressure decreased": 1, "C-reactive protein increased": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Chest pain": 1, "Coma scale": 1, "Contusion": 1, "Death": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ear injury": 1, "Fall": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging heart": 1, "Muscular weakness": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Palpitations": 1, "Post-traumatic pain": 1, "Seizure": 1, "Tremor": 1, "Vaccination site pain": 1, "Wound haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "3005839", "histograms": [{"histogram": {"Body temperature": 9, "Heart rate": 5, "Myocarditis": 5, "Pyrexia": 5, "Blood pressure measurement": 4, "Electrocardiogram": 4, "Oxygen saturation": 4, "Blood test": 3, "Anaphylactic reaction": 2, "Clonic convulsion": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Presyncope": 2, "Alanine aminotransferase": 1, "Arterial catheterisation": 1, "Aspartate aminotransferase abnormal": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood pressure decreased": 1, "C-reactive protein increased": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Chest pain": 1, "Coma scale": 1, "Contusion": 1, "Death": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Ear injury": 1, "Fall": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging heart": 1, "Muscular weakness": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Palpitations": 1, "Post-traumatic pain": 1, "Seizure": 1, "Tremor": 1, "Vaccination site pain": 1, "Wound haemorrhage": 1}, "batchcodes": ["3005839"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005840.json b/docs/data/histograms/Japan/3005840.json
index 1298d6ad0e7..2ba66e05e81 100644
--- a/docs/data/histograms/Japan/3005840.json
+++ b/docs/data/histograms/Japan/3005840.json
@@ -1 +1 @@
-{"batchcode": "3005840", "histograms": [{"batchcodes": ["3005840"], "histogram": {"Body temperature": 5, "Oxygen saturation": 4, "Blood pressure measurement": 3, "Heart rate": 3, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Aortic dissection": 1, "Asthma": 1, "Atrial fibrillation": 1, "Blood creatine phosphokinase": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram": 1, "Dysphonia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Eyelid oedema": 1, "Fall": 1, "Feeling abnormal": 1, "Gastrointestinal oedema": 1, "Loss of consciousness": 1, "Neutrophil count": 1, "Palpitations": 1, "Physical examination": 1, "Presyncope": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sinus tachycardia": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ventricular fibrillation": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005840", "histograms": [{"histogram": {"Body temperature": 5, "Oxygen saturation": 4, "Blood pressure measurement": 3, "Heart rate": 3, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Aortic dissection": 1, "Asthma": 1, "Atrial fibrillation": 1, "Blood creatine phosphokinase": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram": 1, "Dysphonia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Eyelid oedema": 1, "Fall": 1, "Feeling abnormal": 1, "Gastrointestinal oedema": 1, "Loss of consciousness": 1, "Neutrophil count": 1, "Palpitations": 1, "Physical examination": 1, "Presyncope": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sinus tachycardia": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ventricular fibrillation": 1, "White blood cell count": 1}, "batchcodes": ["3005840"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005890.json b/docs/data/histograms/Japan/3005890.json
index 4d1115f5a97..e60c34fd52f 100644
--- a/docs/data/histograms/Japan/3005890.json
+++ b/docs/data/histograms/Japan/3005890.json
@@ -1 +1 @@
-{"batchcode": "3005890", "histograms": [{"batchcodes": ["3005890"], "histogram": {"Body temperature": 5, "Myocarditis": 4, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Blood test": 2, "Heart rate": 2, "Oxygen saturation": 2, "Abdominal X-ray": 1, "Appendicitis perforated": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Cough": 1, "Decreased appetite": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Headache": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Physical capacity evaluation": 1, "Pyrexia": 1, "Troponin I": 1, "Ultrasound abdomen": 1}}]}
\ No newline at end of file
+{"batchcode": "3005890", "histograms": [{"histogram": {"Body temperature": 5, "Myocarditis": 4, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Blood test": 2, "Heart rate": 2, "Oxygen saturation": 2, "Abdominal X-ray": 1, "Appendicitis perforated": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Cough": 1, "Decreased appetite": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Headache": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Physical capacity evaluation": 1, "Pyrexia": 1, "Troponin I": 1, "Ultrasound abdomen": 1}, "batchcodes": ["3005890"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005891.json b/docs/data/histograms/Japan/3005891.json
index a132f505104..c1bf2db2d5d 100644
--- a/docs/data/histograms/Japan/3005891.json
+++ b/docs/data/histograms/Japan/3005891.json
@@ -1 +1 @@
-{"batchcode": "3005891", "histograms": [{"batchcodes": ["3005891"], "histogram": {"Body temperature": 11, "Pyrexia": 6, "Chest X-ray": 4, "Electrocardiogram": 4, "Myocarditis": 4, "Heart rate": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Echocardiogram": 2, "Interstitial lung disease": 2, "Loss of consciousness": 2, "Presyncope": 2, "SARS-CoV-2 test": 2, "Troponin": 2, "Anaphylactic reaction": 1, "Aspartate aminotransferase": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Chest pain": 1, "Chills": 1, "Contusion": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Ejection fraction": 1, "Electrocardiogram PR prolongation": 1, "Fall": 1, "Haematuria": 1, "Hyperhidrosis": 1, "Iridocyclitis": 1, "Lung infiltration": 1, "Lung opacity": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Papilloedema": 1, "Pericarditis": 1, "Pleural effusion": 1, "Putamen haemorrhage": 1, "Respiratory rate": 1, "Scleroderma": 1, "Syncope": 1, "Tonic convulsion": 1, "Tooth fracture": 1, "Troponin increased": 1, "Type I hypersensitivity": 1, "Ultrasound scan": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Weight increased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005891", "histograms": [{"histogram": {"Body temperature": 11, "Pyrexia": 6, "Chest X-ray": 4, "Electrocardiogram": 4, "Myocarditis": 4, "Heart rate": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Echocardiogram": 2, "Interstitial lung disease": 2, "Loss of consciousness": 2, "Presyncope": 2, "SARS-CoV-2 test": 2, "Troponin": 2, "Anaphylactic reaction": 1, "Aspartate aminotransferase": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Chest pain": 1, "Chills": 1, "Contusion": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Ejection fraction": 1, "Electrocardiogram PR prolongation": 1, "Fall": 1, "Haematuria": 1, "Hyperhidrosis": 1, "Iridocyclitis": 1, "Lung infiltration": 1, "Lung opacity": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Papilloedema": 1, "Pericarditis": 1, "Pleural effusion": 1, "Putamen haemorrhage": 1, "Respiratory rate": 1, "Scleroderma": 1, "Syncope": 1, "Tonic convulsion": 1, "Tooth fracture": 1, "Troponin increased": 1, "Type I hypersensitivity": 1, "Ultrasound scan": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Weight increased": 1, "White blood cell count": 1}, "batchcodes": ["3005891"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3005892.json b/docs/data/histograms/Japan/3005892.json
index eccbbea8855..1e8c13606f3 100644
--- a/docs/data/histograms/Japan/3005892.json
+++ b/docs/data/histograms/Japan/3005892.json
@@ -1 +1 @@
-{"batchcode": "3005892", "histograms": [{"batchcodes": ["3005892"], "histogram": {"Body temperature": 7, "Pyrexia": 4, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Depressed level of consciousness": 2, "Heart rate": 2, "Arrhythmia": 1, "Axillary pain": 1, "COVID-19 immunisation": 1, "Cardio-respiratory arrest": 1, "Death": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Gait disturbance": 1, "Head discomfort": 1, "Herpes zoster": 1, "Interchange of vaccine products": 1, "Neuropathy peripheral": 1, "Platelet count": 1, "Thrombocytopenic purpura": 1, "Tremor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3005892", "histograms": [{"histogram": {"Body temperature": 7, "Pyrexia": 4, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Depressed level of consciousness": 2, "Heart rate": 2, "Arrhythmia": 1, "Axillary pain": 1, "COVID-19 immunisation": 1, "Cardio-respiratory arrest": 1, "Death": 1, "Dizziness": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Gait disturbance": 1, "Head discomfort": 1, "Herpes zoster": 1, "Interchange of vaccine products": 1, "Neuropathy peripheral": 1, "Platelet count": 1, "Thrombocytopenic purpura": 1, "Tremor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["3005892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006236.json b/docs/data/histograms/Japan/3006236.json
index 77f63d4963c..51ae0d522fc 100644
--- a/docs/data/histograms/Japan/3006236.json
+++ b/docs/data/histograms/Japan/3006236.json
@@ -1 +1 @@
-{"batchcode": "3006236", "histograms": [{"batchcodes": ["3006236"], "histogram": {"Body temperature": 1, "Cerebrovascular accident": 1, "Computerised tomogram head": 1, "Haematocrit": 1, "Platelet count": 1, "Red blood cell count": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3006236", "histograms": [{"histogram": {"Body temperature": 1, "Cerebrovascular accident": 1, "Computerised tomogram head": 1, "Haematocrit": 1, "Platelet count": 1, "Red blood cell count": 1, "White blood cell count": 1}, "batchcodes": ["3006236"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006277.json b/docs/data/histograms/Japan/3006277.json
index 14ee7ac3113..46b0a2d3762 100644
--- a/docs/data/histograms/Japan/3006277.json
+++ b/docs/data/histograms/Japan/3006277.json
@@ -1 +1 @@
-{"batchcode": "3006277", "histograms": [{"batchcodes": ["3006277"], "histogram": {"Body temperature": 13, "Pyrexia": 6, "Blood pressure measurement": 5, "Oxygen saturation": 5, "Heart rate": 4, "Presyncope": 4, "Echocardiogram": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Blood creatine phosphokinase MB": 2, "Chest pain": 2, "Coma scale": 2, "Depressed level of consciousness": 2, "IgA nephropathy": 2, "Troponin T": 2, "Urinary occult blood": 2, "Altered state of consciousness": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Autonomic nervous system imbalance": 1, "Back pain": 1, "Biopsy kidney": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Chest discomfort": 1, "Dehydration": 1, "Diarrhoea": 1, "Dizziness": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Facial paralysis": 1, "Fall": 1, "Femoral neck fracture": 1, "Glomerulonephritis rapidly progressive": 1, "Haematuria": 1, "Headache": 1, "Incontinence": 1, "Neuropathy peripheral": 1, "Oropharyngeal discomfort": 1, "Partial seizures": 1, "Pericarditis": 1, "Pneumonia aspiration": 1, "Putamen haemorrhage": 1, "Scan myocardial perfusion": 1, "Urine protein/creatinine ratio": 1, "Vomiting": 1, "White blood cell analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "3006277", "histograms": [{"histogram": {"Body temperature": 13, "Pyrexia": 6, "Blood pressure measurement": 5, "Oxygen saturation": 5, "Heart rate": 4, "Presyncope": 4, "Echocardiogram": 3, "Loss of consciousness": 3, "Myocarditis": 3, "Blood creatine phosphokinase MB": 2, "Chest pain": 2, "Coma scale": 2, "Depressed level of consciousness": 2, "IgA nephropathy": 2, "Troponin T": 2, "Urinary occult blood": 2, "Altered state of consciousness": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Autonomic nervous system imbalance": 1, "Back pain": 1, "Biopsy kidney": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Blood test": 1, "Bradycardia": 1, "C-reactive protein": 1, "Cardio-respiratory arrest": 1, "Chest discomfort": 1, "Dehydration": 1, "Diarrhoea": 1, "Dizziness": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Facial paralysis": 1, "Fall": 1, "Femoral neck fracture": 1, "Glomerulonephritis rapidly progressive": 1, "Haematuria": 1, "Headache": 1, "Incontinence": 1, "Neuropathy peripheral": 1, "Oropharyngeal discomfort": 1, "Partial seizures": 1, "Pericarditis": 1, "Pneumonia aspiration": 1, "Putamen haemorrhage": 1, "Scan myocardial perfusion": 1, "Urine protein/creatinine ratio": 1, "Vomiting": 1, "White blood cell analysis": 1}, "batchcodes": ["3006277"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006278.json b/docs/data/histograms/Japan/3006278.json
index 5589964c7f8..922efaae2db 100644
--- a/docs/data/histograms/Japan/3006278.json
+++ b/docs/data/histograms/Japan/3006278.json
@@ -1 +1 @@
-{"batchcode": "3006278", "histograms": [{"batchcodes": ["3006278"], "histogram": {"Body temperature": 6, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Pyrexia": 3, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Heart rate": 2, "Loss of consciousness": 2, "Presyncope": 2, "Rhabdomyolysis": 2, "Alopecia": 1, "Asthenia": 1, "Blood creatinine": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Coma scale": 1, "Death": 1, "Decreased activity": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Dysarthria": 1, "Fall": 1, "Gastrointestinal perforation": 1, "Hypertension": 1, "Hypothyroidism": 1, "Hypoxic-ischaemic encephalopathy": 1, "Incontinence": 1, "Intervertebral disc protrusion": 1, "Lip haemorrhage": 1, "Platelet count": 1, "Pleural effusion": 1, "Renal failure": 1, "Thyroid function test": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "3006278", "histograms": [{"histogram": {"Body temperature": 6, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Pyrexia": 3, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Heart rate": 2, "Loss of consciousness": 2, "Presyncope": 2, "Rhabdomyolysis": 2, "Alopecia": 1, "Asthenia": 1, "Blood creatinine": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Coma scale": 1, "Death": 1, "Decreased activity": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Dysarthria": 1, "Fall": 1, "Gastrointestinal perforation": 1, "Hypertension": 1, "Hypothyroidism": 1, "Hypoxic-ischaemic encephalopathy": 1, "Incontinence": 1, "Intervertebral disc protrusion": 1, "Lip haemorrhage": 1, "Platelet count": 1, "Pleural effusion": 1, "Renal failure": 1, "Thyroid function test": 1, "Tremor": 1}, "batchcodes": ["3006278"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006279.json b/docs/data/histograms/Japan/3006279.json
index 0942d31c13f..640df0de721 100644
--- a/docs/data/histograms/Japan/3006279.json
+++ b/docs/data/histograms/Japan/3006279.json
@@ -1 +1 @@
-{"batchcode": "3006279", "histograms": [{"batchcodes": ["3006279", "EY0572", "FA5715"], "histogram": {"Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Seizure": 1, "Sinus bradycardia": 1}}, {"batchcodes": ["3006279"], "histogram": {"Body temperature": 19, "Pyrexia": 8, "Blood pressure measurement": 5, "Blood test": 4, "C-reactive protein": 4, "Heart rate": 4, "Oxygen saturation": 4, "Seizure": 4, "Cardio-respiratory arrest": 3, "Chest pain": 3, "Chills": 3, "Computerised tomogram head": 3, "Electrocardiogram": 3, "Loss of consciousness": 3, "Malaise": 3, "Antineutrophil cytoplasmic antibody": 2, "Apnoea": 2, "Arrhythmia": 2, "Atrial fibrillation": 2, "Blood creatine phosphokinase": 2, "Blood creatine phosphokinase MB": 2, "COVID-19 immunisation": 2, "Cardiac arrest": 2, "Cerebral infarction": 2, "Complement factor": 2, "Death": 2, "Echocardiogram": 2, "Fibrin D dimer": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging": 2, "Memory impairment": 2, "Pain": 2, "Physical examination": 2, "Respiratory rate": 2, "Somnolence": 2, "Taste disorder": 2, "Acute myocardial infarction": 1, "Arteriosclerosis": 1, "Arthralgia": 1, "Asthenia": 1, "Autonomic nervous system imbalance": 1, "Autonomic neuropathy": 1, "Autopsy": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood pressure ambulatory": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Cardiac failure acute": 1, "Cardiovascular function test": 1, "Chest discomfort": 1, "Coagulation test": 1, "Coma scale": 1, "Complement factor increased": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Cranial nerve palsies multiple": 1, "Culture urine": 1, "Cyanosis": 1, "Cystitis haemorrhagic": 1, "Cystoscopy": 1, "Delusion": 1, "Disseminated intravascular coagulation": 1, "Dizziness": 1, "Drowning": 1, "Drug eruption": 1, "Dysarthria": 1, "Ejection fraction": 1, "Electrocardiogram normal": 1, "Embolism": 1, "Erectile dysfunction": 1, "Erythema": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Glaucoma": 1, "Glomerular filtration rate": 1, "Granulomatosis with polyangiitis": 1, "Haemorrhagic infarction": 1, "Hallucination": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypoxia": 1, "IIIrd nerve paralysis": 1, "Laboratory test": 1, "Listless": 1, "Lymphocyte count": 1, "Lymphopenia": 1, "Magnetic resonance imaging head": 1, "Motor dysfunction": 1, "Muscular weakness": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Near drowning": 1, "Nephritis": 1, "Neuralgic amyotrophy": 1, "Neuropathy peripheral": 1, "Orthostatic hypotension": 1, "Paraesthesia": 1, "Pericarditis": 1, "Physical deconditioning": 1, "Pregnancy": 1, "Protein urine": 1, "Psychomotor hyperactivity": 1, "Renal atrophy": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sinus tachycardia": 1, "Sinusitis": 1, "Syncope": 1, "Tachycardia": 1, "Toxic skin eruption": 1, "Toxicologic test": 1, "Transient ischaemic attack": 1, "Trigeminal nerve disorder": 1, "Troponin I": 1, "Troponin T": 1, "Urinary occult blood": 1, "Ventricular fibrillation": 1, "Vital signs measurement": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3006279", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Seizure": 1, "Sinus bradycardia": 1}, "batchcodes": ["3006279", "EY0572", "FA5715"]}, {"histogram": {"Body temperature": 19, "Pyrexia": 8, "Blood pressure measurement": 5, "Blood test": 4, "C-reactive protein": 4, "Heart rate": 4, "Oxygen saturation": 4, "Seizure": 4, "Cardio-respiratory arrest": 3, "Chest pain": 3, "Chills": 3, "Computerised tomogram head": 3, "Electrocardiogram": 3, "Loss of consciousness": 3, "Malaise": 3, "Antineutrophil cytoplasmic antibody": 2, "Apnoea": 2, "Arrhythmia": 2, "Atrial fibrillation": 2, "Blood creatine phosphokinase": 2, "Blood creatine phosphokinase MB": 2, "COVID-19 immunisation": 2, "Cardiac arrest": 2, "Cerebral infarction": 2, "Complement factor": 2, "Death": 2, "Echocardiogram": 2, "Fibrin D dimer": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging": 2, "Memory impairment": 2, "Pain": 2, "Physical examination": 2, "Respiratory rate": 2, "Somnolence": 2, "Taste disorder": 2, "Acute myocardial infarction": 1, "Arteriosclerosis": 1, "Arthralgia": 1, "Asthenia": 1, "Autonomic nervous system imbalance": 1, "Autonomic neuropathy": 1, "Autopsy": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood pressure ambulatory": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Cardiac failure acute": 1, "Cardiovascular function test": 1, "Chest discomfort": 1, "Coagulation test": 1, "Coma scale": 1, "Complement factor increased": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Cranial nerve palsies multiple": 1, "Culture urine": 1, "Cyanosis": 1, "Cystitis haemorrhagic": 1, "Cystoscopy": 1, "Delusion": 1, "Disseminated intravascular coagulation": 1, "Dizziness": 1, "Drowning": 1, "Drug eruption": 1, "Dysarthria": 1, "Ejection fraction": 1, "Electrocardiogram normal": 1, "Embolism": 1, "Erectile dysfunction": 1, "Erythema": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Glaucoma": 1, "Glomerular filtration rate": 1, "Granulomatosis with polyangiitis": 1, "Haemorrhagic infarction": 1, "Hallucination": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hypoxia": 1, "IIIrd nerve paralysis": 1, "Laboratory test": 1, "Listless": 1, "Lymphocyte count": 1, "Lymphopenia": 1, "Magnetic resonance imaging head": 1, "Motor dysfunction": 1, "Muscular weakness": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Near drowning": 1, "Nephritis": 1, "Neuralgic amyotrophy": 1, "Neuropathy peripheral": 1, "Orthostatic hypotension": 1, "Paraesthesia": 1, "Pericarditis": 1, "Physical deconditioning": 1, "Pregnancy": 1, "Protein urine": 1, "Psychomotor hyperactivity": 1, "Renal atrophy": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sinus tachycardia": 1, "Sinusitis": 1, "Syncope": 1, "Tachycardia": 1, "Toxic skin eruption": 1, "Toxicologic test": 1, "Transient ischaemic attack": 1, "Trigeminal nerve disorder": 1, "Troponin I": 1, "Troponin T": 1, "Urinary occult blood": 1, "Ventricular fibrillation": 1, "Vital signs measurement": 1, "White blood cell count": 1}, "batchcodes": ["3006279"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006326.json b/docs/data/histograms/Japan/3006326.json
index 28f093e650b..61c3d1721b0 100644
--- a/docs/data/histograms/Japan/3006326.json
+++ b/docs/data/histograms/Japan/3006326.json
@@ -1 +1 @@
-{"batchcode": "3006326", "histograms": [{"batchcodes": ["3006326"], "histogram": {"Body temperature": 11, "Pyrexia": 5, "C-reactive protein": 4, "Electrocardiogram": 4, "Blood creatine phosphokinase MB": 3, "Blood pressure measurement": 3, "Depressed level of consciousness": 3, "Oxygen saturation": 3, "Troponin I": 3, "Blood test": 2, "COVID-19 immunisation": 2, "Coma scale": 2, "Dizziness": 2, "Echocardiogram": 2, "Erythema": 2, "Heart rate": 2, "Hypersensitivity": 2, "Interchange of vaccine products": 2, "Laboratory test": 2, "Myocarditis": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pericarditis": 2, "Vomiting": 2, "Antineutrophil cytoplasmic antibody negative": 1, "Antinuclear antibody": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood pressure systolic": 1, "Chest X-ray": 1, "Chest pain": 1, "Complement factor": 1, "Computerised tomogram head": 1, "Decreased appetite": 1, "Dementia": 1, "Dyspnoea": 1, "Face oedema": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hot flush": 1, "Hypoglycaemia": 1, "Imaging procedure": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Nerve conduction studies": 1, "Pallor": 1, "Physical examination": 1, "Pneumonia": 1, "Presyncope": 1, "Pruritus": 1, "Reflex test": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Schizophrenia": 1, "Serum ferritin": 1, "Spinal osteoarthritis": 1, "Ultrasound scan": 1, "Vision blurred": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3006326", "histograms": [{"histogram": {"Body temperature": 11, "Pyrexia": 5, "C-reactive protein": 4, "Electrocardiogram": 4, "Blood creatine phosphokinase MB": 3, "Blood pressure measurement": 3, "Depressed level of consciousness": 3, "Oxygen saturation": 3, "Troponin I": 3, "Blood test": 2, "COVID-19 immunisation": 2, "Coma scale": 2, "Dizziness": 2, "Echocardiogram": 2, "Erythema": 2, "Heart rate": 2, "Hypersensitivity": 2, "Interchange of vaccine products": 2, "Laboratory test": 2, "Myocarditis": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pericarditis": 2, "Vomiting": 2, "Antineutrophil cytoplasmic antibody negative": 1, "Antinuclear antibody": 1, "Asthenia": 1, "Blood creatine phosphokinase": 1, "Blood pressure systolic": 1, "Chest X-ray": 1, "Chest pain": 1, "Complement factor": 1, "Computerised tomogram head": 1, "Decreased appetite": 1, "Dementia": 1, "Dyspnoea": 1, "Face oedema": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hot flush": 1, "Hypoglycaemia": 1, "Imaging procedure": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Nerve conduction studies": 1, "Pallor": 1, "Physical examination": 1, "Pneumonia": 1, "Presyncope": 1, "Pruritus": 1, "Reflex test": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Schizophrenia": 1, "Serum ferritin": 1, "Spinal osteoarthritis": 1, "Ultrasound scan": 1, "Vision blurred": 1, "White blood cell count": 1}, "batchcodes": ["3006326"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006327.json b/docs/data/histograms/Japan/3006327.json
index 908deb86d6d..19188cc8584 100644
--- a/docs/data/histograms/Japan/3006327.json
+++ b/docs/data/histograms/Japan/3006327.json
@@ -1 +1 @@
-{"batchcode": "3006327", "histograms": [{"batchcodes": ["3006327"], "histogram": {"Body temperature": 3, "Dyspnoea": 2, "Neuropathy peripheral": 2, "Asthenia": 1, "Basal ganglia infarction": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "COVID-19 immunisation": 1, "Cardiac failure congestive": 1, "Cerebral infarction": 1, "Chest discomfort": 1, "Chills": 1, "Chronic obstructive pulmonary disease": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fatigue": 1, "Feeding disorder": 1, "General physical health deterioration": 1, "Haemorrhage": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Myocarditis": 1, "Troponin I": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "3006327", "histograms": [{"histogram": {"Body temperature": 3, "Dyspnoea": 2, "Neuropathy peripheral": 2, "Asthenia": 1, "Basal ganglia infarction": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "COVID-19 immunisation": 1, "Cardiac failure congestive": 1, "Cerebral infarction": 1, "Chest discomfort": 1, "Chills": 1, "Chronic obstructive pulmonary disease": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fatigue": 1, "Feeding disorder": 1, "General physical health deterioration": 1, "Haemorrhage": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Myocarditis": 1, "Troponin I": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["3006327"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006343.json b/docs/data/histograms/Japan/3006343.json
index a546e5afea2..3f48b8d2556 100644
--- a/docs/data/histograms/Japan/3006343.json
+++ b/docs/data/histograms/Japan/3006343.json
@@ -1 +1 @@
-{"batchcode": "3006343", "histograms": [{"batchcodes": ["3006343"], "histogram": {"Body temperature": 9, "Blood pressure measurement": 6, "Oxygen saturation": 5, "Heart rate": 4, "Fall": 3, "Loss of consciousness": 2, "Pyrexia": 2, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "Blood urine": 1, "Chest pain": 1, "Chills": 1, "Coma scale": 1, "Contusion": 1, "Coronavirus infection": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling abnormal": 1, "Headache": 1, "Humerus fracture": 1, "Hypertensive emergency": 1, "Illness": 1, "Lactic acidosis": 1, "Malaise": 1, "Muscle disorder": 1, "Oropharyngeal pain": 1, "Pain": 1, "Peripheral circulatory failure": 1, "Peripheral coldness": 1, "Presyncope": 1, "Radial pulse": 1, "Respiratory rate": 1, "Skin abrasion": 1, "Tremor": 1, "Type I hypersensitivity": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3006343", "histograms": [{"histogram": {"Body temperature": 9, "Blood pressure measurement": 6, "Oxygen saturation": 5, "Heart rate": 4, "Fall": 3, "Loss of consciousness": 2, "Pyrexia": 2, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "Blood urine": 1, "Chest pain": 1, "Chills": 1, "Coma scale": 1, "Contusion": 1, "Coronavirus infection": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling abnormal": 1, "Headache": 1, "Humerus fracture": 1, "Hypertensive emergency": 1, "Illness": 1, "Lactic acidosis": 1, "Malaise": 1, "Muscle disorder": 1, "Oropharyngeal pain": 1, "Pain": 1, "Peripheral circulatory failure": 1, "Peripheral coldness": 1, "Presyncope": 1, "Radial pulse": 1, "Respiratory rate": 1, "Skin abrasion": 1, "Tremor": 1, "Type I hypersensitivity": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["3006343"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006353.json b/docs/data/histograms/Japan/3006353.json
index 75cf68b99b3..b7130e2bae1 100644
--- a/docs/data/histograms/Japan/3006353.json
+++ b/docs/data/histograms/Japan/3006353.json
@@ -1 +1 @@
-{"batchcode": "3006353", "histograms": [{"batchcodes": ["3006353"], "histogram": {"Bradycardia": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3006353", "histograms": [{"histogram": {"Bradycardia": 1, "Presyncope": 1}, "batchcodes": ["3006353"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3006653.json b/docs/data/histograms/Japan/3006653.json
index 6b2c99a39da..f9b8742b96b 100644
--- a/docs/data/histograms/Japan/3006653.json
+++ b/docs/data/histograms/Japan/3006653.json
@@ -1 +1 @@
-{"batchcode": "3006653", "histograms": [{"batchcodes": ["3006653"], "histogram": {"Fall": 1, "Illness": 1, "Loss of consciousness": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3006653", "histograms": [{"histogram": {"Fall": 1, "Illness": 1, "Loss of consciousness": 1, "Presyncope": 1}, "batchcodes": ["3006653"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/3302617.json b/docs/data/histograms/Japan/3302617.json
index 9909f1af90c..d8ed1477d87 100644
--- a/docs/data/histograms/Japan/3302617.json
+++ b/docs/data/histograms/Japan/3302617.json
@@ -1 +1 @@
-{"batchcode": "3302617", "histograms": [{"batchcodes": ["3302617"], "histogram": {"Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Oxygen saturation": 1}}]}
\ No newline at end of file
+{"batchcode": "3302617", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Oxygen saturation": 1}, "batchcodes": ["3302617"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/33130BA.json b/docs/data/histograms/Japan/33130BA.json
index ded6f843a1d..221d574519c 100644
--- a/docs/data/histograms/Japan/33130BA.json
+++ b/docs/data/histograms/Japan/33130BA.json
@@ -1 +1 @@
-{"batchcode": "33130BA", "histograms": [{"batchcodes": ["33130BA"], "histogram": {"Drug ineffective": 1, "Erythema": 1, "Headache": 1, "Hunger": 1, "Increased appetite": 1, "Pruritus": 1, "Rash macular": 1, "Somnolence": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "33130BA", "histograms": [{"histogram": {"Drug ineffective": 1, "Erythema": 1, "Headache": 1, "Hunger": 1, "Increased appetite": 1, "Pruritus": 1, "Rash macular": 1, "Somnolence": 1, "Suspected COVID-19": 1}, "batchcodes": ["33130BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/85-YEAR-OLD.json b/docs/data/histograms/Japan/85-YEAR-OLD.json
index 6dd67c51137..ce01df6970e 100644
--- a/docs/data/histograms/Japan/85-YEAR-OLD.json
+++ b/docs/data/histograms/Japan/85-YEAR-OLD.json
@@ -1 +1 @@
-{"batchcode": "85-YEAR-OLD", "histograms": [{"batchcodes": ["85-YEAR-OLD"], "histogram": {"Body temperature": 1, "Respiratory failure": 1}}]}
\ No newline at end of file
+{"batchcode": "85-YEAR-OLD", "histograms": [{"histogram": {"Body temperature": 1, "Respiratory failure": 1}, "batchcodes": ["85-YEAR-OLD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/9005694.json b/docs/data/histograms/Japan/9005694.json
index 61072101d64..22971630582 100644
--- a/docs/data/histograms/Japan/9005694.json
+++ b/docs/data/histograms/Japan/9005694.json
@@ -1 +1 @@
-{"batchcode": "9005694", "histograms": [{"batchcodes": ["9005694"], "histogram": {"Drug eruption": 1, "Oedema peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "9005694", "histograms": [{"histogram": {"Drug eruption": 1, "Oedema peripheral": 1}, "batchcodes": ["9005694"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ASKU.json b/docs/data/histograms/Japan/ASKU.json
index 88de1a34af6..6b6cdd97565 100644
--- a/docs/data/histograms/Japan/ASKU.json
+++ b/docs/data/histograms/Japan/ASKU.json
@@ -1 +1 @@
-{"batchcode": "ASKU", "histograms": [{"batchcodes": ["ASKU"], "histogram": {"COVID-19 immunisation": 5, "Interchange of vaccine products": 5, "Anaphylactic reaction": 2, "Tubulointerstitial nephritis": 2, "Allergy test": 1, "Angioedema": 1, "Biopsy kidney": 1, "Body temperature": 1, "Castleman's disease": 1, "Cough": 1, "Diverticulitis": 1, "Eosinophilic pneumonia": 1, "Extrasystoles": 1, "Gait inability": 1, "Haemorrhage": 1, "Hodgkin's disease": 1, "Immunoglobulin G4 related disease": 1, "Impaired work ability": 1, "Lymphoedema": 1, "Malaise": 1, "Myocardial infarction": 1, "Nausea": 1, "Nephritis": 1, "Pain in extremity": 1, "Pyoderma gangrenosum": 1, "Pyrexia": 1, "Renal impairment": 1, "Rheumatoid arthritis": 1, "Seronegative arthritis": 1, "Syncope": 1, "Type 1 diabetes mellitus": 1, "White blood cell count": 1, "White blood cell count increased": 1, "Wound infection": 1}}]}
\ No newline at end of file
+{"batchcode": "ASKU", "histograms": [{"histogram": {"COVID-19 immunisation": 5, "Interchange of vaccine products": 5, "Anaphylactic reaction": 2, "Tubulointerstitial nephritis": 2, "Allergy test": 1, "Angioedema": 1, "Biopsy kidney": 1, "Body temperature": 1, "Castleman's disease": 1, "Cough": 1, "Diverticulitis": 1, "Eosinophilic pneumonia": 1, "Extrasystoles": 1, "Gait inability": 1, "Haemorrhage": 1, "Hodgkin's disease": 1, "Immunoglobulin G4 related disease": 1, "Impaired work ability": 1, "Lymphoedema": 1, "Malaise": 1, "Myocardial infarction": 1, "Nausea": 1, "Nephritis": 1, "Pain in extremity": 1, "Pyoderma gangrenosum": 1, "Pyrexia": 1, "Renal impairment": 1, "Rheumatoid arthritis": 1, "Seronegative arthritis": 1, "Syncope": 1, "Type 1 diabetes mellitus": 1, "White blood cell count": 1, "White blood cell count increased": 1, "Wound infection": 1}, "batchcodes": ["ASKU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/BY4834.json b/docs/data/histograms/Japan/BY4834.json
index f1d43d69e63..e729d55efdb 100644
--- a/docs/data/histograms/Japan/BY4834.json
+++ b/docs/data/histograms/Japan/BY4834.json
@@ -1 +1 @@
-{"batchcode": "BY4834", "histograms": [{"batchcodes": ["BY4834"], "histogram": {"Cerebral artery occlusion": 1, "Cerebral infarction": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "BY4834", "histograms": [{"histogram": {"Cerebral artery occlusion": 1, "Cerebral infarction": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["BY4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/DY5423.json b/docs/data/histograms/Japan/DY5423.json
index dc0033ce2ab..9ba220c1f48 100644
--- a/docs/data/histograms/Japan/DY5423.json
+++ b/docs/data/histograms/Japan/DY5423.json
@@ -1 +1 @@
-{"batchcode": "DY5423", "histograms": [{"batchcodes": ["DY5423"], "histogram": {"Conjunctival haemorrhage": 1, "Off label use": 1, "Tongue rough": 1}}]}
\ No newline at end of file
+{"batchcode": "DY5423", "histograms": [{"histogram": {"Conjunctival haemorrhage": 1, "Off label use": 1, "Tongue rough": 1}, "batchcodes": ["DY5423"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/E3674.json b/docs/data/histograms/Japan/E3674.json
index b7196e90c5d..9c7f8632721 100644
--- a/docs/data/histograms/Japan/E3674.json
+++ b/docs/data/histograms/Japan/E3674.json
@@ -1 +1 @@
-{"batchcode": "E3674", "histograms": [{"batchcodes": ["E3674"], "histogram": {"Cardiac failure acute": 1}}]}
\ No newline at end of file
+{"batchcode": "E3674", "histograms": [{"histogram": {"Cardiac failure acute": 1}, "batchcodes": ["E3674"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EF8206.json b/docs/data/histograms/Japan/EF8206.json
index d65ae1d2b1c..13936e80bd6 100644
--- a/docs/data/histograms/Japan/EF8206.json
+++ b/docs/data/histograms/Japan/EF8206.json
@@ -1 +1 @@
-{"batchcode": "EF8206", "histograms": [{"batchcodes": ["EF8206"], "histogram": {"Body temperature": 1, "C-reactive protein": 1, "Computerised tomogram": 1, "Culture urine": 1, "Dysuria": 1, "Inflammation": 1, "Prostatitis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EF8206", "histograms": [{"histogram": {"Body temperature": 1, "C-reactive protein": 1, "Computerised tomogram": 1, "Culture urine": 1, "Dysuria": 1, "Inflammation": 1, "Prostatitis": 1, "Pyrexia": 1}, "batchcodes": ["EF8206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP 9605.json b/docs/data/histograms/Japan/EP 9605.json
index fae75aaeded..c86179bfa4a 100644
--- a/docs/data/histograms/Japan/EP 9605.json
+++ b/docs/data/histograms/Japan/EP 9605.json
@@ -1 +1 @@
-{"batchcode": "EP 9605", "histograms": [{"batchcodes": ["EP 9605"], "histogram": {"Body temperature": 2, "Erythema": 2, "Anaphylactic reaction": 1, "Asthma": 1, "Blood pressure measurement": 1, "Dyspnoea": 1, "Heart rate": 1, "Musculoskeletal discomfort": 1, "Oculomucocutaneous syndrome": 1, "Oxygen saturation": 1, "Pruritus": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EP 9605", "histograms": [{"histogram": {"Body temperature": 2, "Erythema": 2, "Anaphylactic reaction": 1, "Asthma": 1, "Blood pressure measurement": 1, "Dyspnoea": 1, "Heart rate": 1, "Musculoskeletal discomfort": 1, "Oculomucocutaneous syndrome": 1, "Oxygen saturation": 1, "Pruritus": 1, "Wheezing": 1}, "batchcodes": ["EP 9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP2163.json b/docs/data/histograms/Japan/EP2163.json
index 800a44a8963..9c75eae39e0 100644
--- a/docs/data/histograms/Japan/EP2163.json
+++ b/docs/data/histograms/Japan/EP2163.json
@@ -1 +1 @@
-{"batchcode": "EP2163", "histograms": [{"batchcodes": ["EP2163"], "histogram": {"Body temperature": 220, "SARS-CoV-2 test": 103, "Blood pressure measurement": 82, "Oxygen saturation": 74, "Vaccination failure": 69, "COVID-19": 66, "Heart rate": 66, "Anaphylactic reaction": 63, "Pyrexia": 49, "Vaccination site pain": 46, "Headache": 37, "Malaise": 34, "Pruritus": 34, "Cough": 32, "Erythema": 32, "Dyspnoea": 31, "Feeling abnormal": 30, "Maternal exposure before pregnancy": 28, "Nausea": 26, "Blood pressure increased": 25, "Computerised tomogram": 22, "Nucleic acid test": 22, "Palpitations": 22, "Hypoaesthesia": 19, "Oropharyngeal discomfort": 19, "Rash": 19, "Blood test": 18, "Magnetic resonance imaging": 18, "Urticaria": 17, "Diarrhoea": 15, "Dizziness": 15, "Respiratory rate": 15, "Vomiting": 15, "Asthma": 14, "Myalgia": 14, "Arthralgia": 13, "Chills": 13, "Investigation": 13, "White blood cell count": 13, "C-reactive protein": 11, "Hypertension": 11, "Muscular weakness": 11, "Electrocardiogram": 10, "Hyperhidrosis": 10, "Hypersensitivity": 10, "Asthenia": 9, "Neuropathy peripheral": 9, "SARS-CoV-2 antibody test": 9, "Tachycardia": 9, "Abdominal pain": 8, "Chest X-ray": 8, "Computerised tomogram head": 8, "Decreased appetite": 8, "Feeling hot": 8, "Pain": 8, "Polymerase chain reaction": 8, "Rhinorrhoea": 8, "Abortion spontaneous": 7, "Head discomfort": 7, "Heart rate increased": 7, "Hypoaesthesia oral": 7, "Loss of consciousness": 7, "Oropharyngeal pain": 7, "Wheezing": 7, "X-ray": 7, "Depressed level of consciousness": 6, "Pain in extremity": 6, "Premature labour": 6, "Presyncope": 6, "Vertigo": 6, "Auscultation": 5, "Cholelithiasis": 5, "Coma scale": 5, "Discomfort": 5, "Dysphonia": 5, "Exposure via breast milk": 5, "Face oedema": 5, "Facial paralysis": 5, "Fatigue": 5, "Feeling cold": 5, "Flushing": 5, "Gait disturbance": 5, "Hot flush": 5, "Influenza virus test": 5, "Maternal exposure during pregnancy": 5, "Swelling face": 5, "Ultrasound scan": 5, "Vaccination site swelling": 5, "Appendicitis": 4, "Blood pressure systolic": 4, "Blood pressure systolic increased": 4, "Chest discomfort": 4, "Computerised tomogram thorax": 4, "Condition aggravated": 4, "Drug eruption": 4, "Eyelid oedema": 4, "Hyperventilation": 4, "Internal haemorrhage": 4, "Pallor": 4, "Premature baby": 4, "Rash erythematous": 4, "Seizure": 4, "Sudden hearing loss": 4, "Swelling": 4, "Syncope": 4, "Throat irritation": 4, "Throat tightness": 4, "Trigeminal nerve disorder": 4, "Vital signs measurement": 4, "Abdominal discomfort": 3, "Abdominal pain lower": 3, "Abdominal pain upper": 3, "Abortion threatened": 3, "Asymptomatic COVID-19": 3, "Blood chloride": 3, "Blood sodium": 3, "Brain natriuretic peptide": 3, "Breast cancer": 3, "Computerised tomogram abdomen": 3, "Diverticulitis": 3, "Echocardiogram": 3, "Fall": 3, "Intervertebral disc protrusion": 3, "Lacrimation increased": 3, "Large intestine polyp": 3, "Magnetic resonance imaging head": 3, "Movement disorder": 3, "Neutrophil count": 3, "Ocular hyperaemia": 3, "PO2": 3, "Pain assessment": 3, "Peripheral coldness": 3, "Peritonsillar abscess": 3, "Pneumonia": 3, "Pregnancy test": 3, "Respiratory distress": 3, "Sensory disturbance": 3, "Sneezing": 3, "Sputum purulent": 3, "Abnormal sensation in eye": 2, "Acute abdomen": 2, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Amylase": 2, "Anaemia": 2, "Anaemia neonatal": 2, "Anaphylactic shock": 2, "Anaphylactoid reaction": 2, "Antibody test": 2, "Anxiety": 2, "Aortic dissection": 2, "Aspartate aminotransferase": 2, "Bacterial infection": 2, "Biopsy": 2, "Blood creatine phosphokinase": 2, "Blood culture": 2, "Blood glucose": 2, "Blood immunoglobulin E": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood pressure decreased": 2, "Blood urea": 2, "Body temperature increased": 2, "Breath sounds": 2, "C-reactive protein increased": 2, "CSF cell count": 2, "Calculus urinary": 2, "Cardio-respiratory arrest": 2, "Cellulitis": 2, "Cerebral haemorrhage": 2, "Cerebral infarction": 2, "Cervical dysplasia": 2, "Cold sweat": 2, "Computerised tomogram neck": 2, "Delivery": 2, "Dermatitis atopic": 2, "Diabetes mellitus": 2, "Disease recurrence": 2, "Dysaesthesia": 2, "Dysgeusia": 2, "Dysphagia": 2, "Ectopic pregnancy": 2, "Endoscopy gastrointestinal": 2, "Feeding disorder": 2, "Gastrointestinal oedema": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "Haemoglobin": 2, "Haemophagocytic lymphohistiocytosis": 2, "Hepatic function abnormal": 2, "Humerus fracture": 2, "Hyperemesis gravidarum": 2, "IgA nephropathy": 2, "Joint range of motion decreased": 2, "Laboratory test": 2, "Lacunar infarction": 2, "Limb discomfort": 2, "Lip swelling": 2, "Lymphadenopathy": 2, "Meniere's disease": 2, "Meningitis aseptic": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Myocarditis": 2, "Myositis": 2, "Neck pain": 2, "Neonatal respiratory distress syndrome": 2, "Oral discomfort": 2, "Ovarian cyst": 2, "Patent ductus arteriosus": 2, "Pharyngeal swelling": 2, "Physical deconditioning": 2, "Platelet count": 2, "Productive cough": 2, "Pulse abnormal": 2, "Pyelonephritis": 2, "Rash pruritic": 2, "Reaction to excipient": 2, "Respiratory disorder": 2, "Serum ferritin": 2, "Somnolence": 2, "Spinal stenosis": 2, "Stress": 2, "Swelling of eyelid": 2, "Thirst": 2, "Tremor": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Ureterolithiasis": 2, "Uterine leiomyoma": 2, "Vaccination site erythema": 2, "Vaccination site haemorrhage": 2, "Vaccination site pruritus": 2, "Viral infection": 2, "White blood cell count increased": 2, "AST/ALT ratio": 1, "Abortion missed": 1, "Accident": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Adenomyosis": 1, "Affective disorder": 1, "Alanine aminotransferase increased": 1, "Allergic reaction to excipient": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Angina unstable": 1, "Angioedema": 1, "Antinuclear antibody": 1, "Apnoea": 1, "Apraxia": 1, "Arrhythmia": 1, "Arthritis": 1, "Aspartate aminotransferase decreased": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Atrial fibrillation": 1, "Atrial septal defect": 1, "Audiogram": 1, "Back pain": 1, "Bacteraemia": 1, "Bacterial prostatitis": 1, "Bacterial test": 1, "Band neutrophil count": 1, "Bile duct cancer": 1, "Biopsy kidney": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood creatine": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood pressure diastolic": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Brain natriuretic peptide increased": 1, "Brain stem auditory evoked response": 1, "Bronchostenosis": 1, "Burning sensation": 1, "CSF culture": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Caesarean section": 1, "Capillary nail refill test": 1, "Cardiac electrophysiologic study": 1, "Cardiac tamponade": 1, "Catamenial pneumothorax": 1, "Cataract": 1, "Cervical incompetence": 1, "Choking": 1, "Cholangitis": 1, "Cholecystitis": 1, "Chromosome banding": 1, "Clavicle fracture": 1, "Cleft lip": 1, "Coccydynia": 1, "Colonoscopy": 1, "Colposcopy": 1, "Complex regional pain syndrome": 1, "Congenital skin disorder": 1, "Conjunctival hyperaemia": 1, "Coronavirus infection": 1, "Culture urine": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Cytomegalovirus test": 1, "Daydreaming": 1, "Deafness neurosensory": 1, "Death": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dermatitis allergic": 1, "Diagnostic aspiration": 1, "Diffuse panbronchiolitis": 1, "Dissociative disorder": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug exposure before pregnancy": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dysarthria": 1, "Dysphoria": 1, "EGFR status assay": 1, "Ear swelling": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram abnormal": 1, "Electrocorticogram": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Electroneurography": 1, "Endoscopy": 1, "Enteritis": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eye discharge": 1, "Eye disorder": 1, "Eye oedema": 1, "Eye pruritus": 1, "Eye swelling": 1, "Feeling jittery": 1, "Fibrin": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Fibrin degradation products increased": 1, "Fibromyalgia": 1, "Foaming at mouth": 1, "Foetal death": 1, "Foetal heart rate": 1, "Foreign body sensation in eyes": 1, "Fractured sacrum": 1, "Full blood count": 1, "Fungal test": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal hypomotility": 1, "Gastrointestinal motility disorder": 1, "Generalised oedema": 1, "Gnathoschisis": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haemangioblastoma": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage": 1, "Haemorrhoids": 1, "Head circumference": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatic necrosis": 1, "Hydronephrosis": 1, "Hyperreflexia": 1, "Hypersensitivity pneumonitis": 1, "Hypokalaemia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Hypoventilation": 1, "Hypoxic-ischaemic encephalopathy": 1, "IL-2 receptor assay": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Infection": 1, "Inflammation": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Inner ear disorder": 1, "Intestinal ischaemia": 1, "Intestinal ulcer": 1, "Knee operation": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Legionella test": 1, "Lid margin discharge": 1, "Ligament injury": 1, "Lip pruritus": 1, "Listless": 1, "Liver disorder": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lung infiltration": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningioma": 1, "Migraine": 1, "Mononuclear cell count": 1, "Muscle disorder": 1, "Muscle swelling": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Nasal congestion": 1, "Nasal mucosal disorder": 1, "Nasal pruritus": 1, "Nasopharyngitis": 1, "Neoplasm recurrence": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neuropathic arthropathy": 1, "Neutrophil percentage": 1, "Nystagmus": 1, "Obstructive airways disorder": 1, "Odynophagia": 1, "Oedema": 1, "Off label use": 1, "Orthostatic hypotension": 1, "Osteochondrodysplasia": 1, "Ovarian cyst torsion": 1, "Ovarian hyperstimulation syndrome": 1, "Oxygen consumption": 1, "Oxygen saturation decreased": 1, "Oxygen saturation increased": 1, "Pancreatitis acute": 1, "Panic attack": 1, "Parvovirus B19 test": 1, "Paternal exposure before pregnancy": 1, "Pelvi-ureteric obstruction": 1, "Peripheral nerve paresis": 1, "Peritonsillitis": 1, "Petit mal epilepsy": 1, "Photopsia": 1, "Physical examination": 1, "Placenta praevia": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Polymyositis": 1, "Poor quality sleep": 1, "Postural tremor": 1, "Prenatal screening test": 1, "Primary hyperaldosteronism": 1, "Prostatitis": 1, "Prostatomegaly": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary artery thrombosis": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary valve stenosis congenital": 1, "Pyelonephritis acute": 1, "Radius fracture": 1, "Rectal examination": 1, "Red blood cell count": 1, "Respiratory disorder neonatal": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Reticulocyte count": 1, "Rib fracture": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 RNA": 1, "Salivary hypersecretion": 1, "Sciatica": 1, "Sensation of foreign body": 1, "Sepsis": 1, "Serum sickness": 1, "Shoulder injury related to vaccine administration": 1, "Skin abrasion": 1, "Skin cancer": 1, "Skin mass": 1, "Sleep disorder": 1, "Smear test": 1, "Soft tissue atrophy": 1, "Sputum culture": 1, "Stevens-Johnson syndrome": 1, "Streptococcal infection": 1, "Subarachnoid haemorrhage": 1, "Suffocation feeling": 1, "Tenderness": 1, "Tension headache": 1, "Tetany": 1, "Thrombosis": 1, "Tinnitus": 1, "Tonsillitis": 1, "Toxic skin eruption": 1, "Troponin abnormal": 1, "Ultrasound breast": 1, "Ultrasound scan vagina": 1, "Ultrasound uterus": 1, "Ureteric cancer": 1, "Urine analysis": 1, "Urine ketone body": 1, "Uterine cancer": 1, "VIth nerve disorder": 1, "Vaccination complication": 1, "Vaccination site movement impairment": 1, "Vaccination site vesicles": 1, "Vascular pseudoaneurysm": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Visual analogue scale": 1, "Visual impairment": 1, "Vocal cord disorder": 1, "Weight increased": 1, "White blood cells urine": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "EP2163", "histograms": [{"histogram": {"Body temperature": 220, "SARS-CoV-2 test": 103, "Blood pressure measurement": 82, "Oxygen saturation": 74, "Vaccination failure": 69, "COVID-19": 66, "Heart rate": 66, "Anaphylactic reaction": 63, "Pyrexia": 49, "Vaccination site pain": 46, "Headache": 37, "Malaise": 34, "Pruritus": 34, "Cough": 32, "Erythema": 32, "Dyspnoea": 31, "Feeling abnormal": 30, "Maternal exposure before pregnancy": 28, "Nausea": 26, "Blood pressure increased": 25, "Computerised tomogram": 22, "Nucleic acid test": 22, "Palpitations": 22, "Hypoaesthesia": 19, "Oropharyngeal discomfort": 19, "Rash": 19, "Blood test": 18, "Magnetic resonance imaging": 18, "Urticaria": 17, "Diarrhoea": 15, "Dizziness": 15, "Respiratory rate": 15, "Vomiting": 15, "Asthma": 14, "Myalgia": 14, "Arthralgia": 13, "Chills": 13, "Investigation": 13, "White blood cell count": 13, "C-reactive protein": 11, "Hypertension": 11, "Muscular weakness": 11, "Electrocardiogram": 10, "Hyperhidrosis": 10, "Hypersensitivity": 10, "Asthenia": 9, "Neuropathy peripheral": 9, "SARS-CoV-2 antibody test": 9, "Tachycardia": 9, "Abdominal pain": 8, "Chest X-ray": 8, "Computerised tomogram head": 8, "Decreased appetite": 8, "Feeling hot": 8, "Pain": 8, "Polymerase chain reaction": 8, "Rhinorrhoea": 8, "Abortion spontaneous": 7, "Head discomfort": 7, "Heart rate increased": 7, "Hypoaesthesia oral": 7, "Loss of consciousness": 7, "Oropharyngeal pain": 7, "Wheezing": 7, "X-ray": 7, "Depressed level of consciousness": 6, "Pain in extremity": 6, "Premature labour": 6, "Presyncope": 6, "Vertigo": 6, "Auscultation": 5, "Cholelithiasis": 5, "Coma scale": 5, "Discomfort": 5, "Dysphonia": 5, "Exposure via breast milk": 5, "Face oedema": 5, "Facial paralysis": 5, "Fatigue": 5, "Feeling cold": 5, "Flushing": 5, "Gait disturbance": 5, "Hot flush": 5, "Influenza virus test": 5, "Maternal exposure during pregnancy": 5, "Swelling face": 5, "Ultrasound scan": 5, "Vaccination site swelling": 5, "Appendicitis": 4, "Blood pressure systolic": 4, "Blood pressure systolic increased": 4, "Chest discomfort": 4, "Computerised tomogram thorax": 4, "Condition aggravated": 4, "Drug eruption": 4, "Eyelid oedema": 4, "Hyperventilation": 4, "Internal haemorrhage": 4, "Pallor": 4, "Premature baby": 4, "Rash erythematous": 4, "Seizure": 4, "Sudden hearing loss": 4, "Swelling": 4, "Syncope": 4, "Throat irritation": 4, "Throat tightness": 4, "Trigeminal nerve disorder": 4, "Vital signs measurement": 4, "Abdominal discomfort": 3, "Abdominal pain lower": 3, "Abdominal pain upper": 3, "Abortion threatened": 3, "Asymptomatic COVID-19": 3, "Blood chloride": 3, "Blood sodium": 3, "Brain natriuretic peptide": 3, "Breast cancer": 3, "Computerised tomogram abdomen": 3, "Diverticulitis": 3, "Echocardiogram": 3, "Fall": 3, "Intervertebral disc protrusion": 3, "Lacrimation increased": 3, "Large intestine polyp": 3, "Magnetic resonance imaging head": 3, "Movement disorder": 3, "Neutrophil count": 3, "Ocular hyperaemia": 3, "PO2": 3, "Pain assessment": 3, "Peripheral coldness": 3, "Peritonsillar abscess": 3, "Pneumonia": 3, "Pregnancy test": 3, "Respiratory distress": 3, "Sensory disturbance": 3, "Sneezing": 3, "Sputum purulent": 3, "Abnormal sensation in eye": 2, "Acute abdomen": 2, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Amylase": 2, "Anaemia": 2, "Anaemia neonatal": 2, "Anaphylactic shock": 2, "Anaphylactoid reaction": 2, "Antibody test": 2, "Anxiety": 2, "Aortic dissection": 2, "Aspartate aminotransferase": 2, "Bacterial infection": 2, "Biopsy": 2, "Blood creatine phosphokinase": 2, "Blood culture": 2, "Blood glucose": 2, "Blood immunoglobulin E": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood pressure decreased": 2, "Blood urea": 2, "Body temperature increased": 2, "Breath sounds": 2, "C-reactive protein increased": 2, "CSF cell count": 2, "Calculus urinary": 2, "Cardio-respiratory arrest": 2, "Cellulitis": 2, "Cerebral haemorrhage": 2, "Cerebral infarction": 2, "Cervical dysplasia": 2, "Cold sweat": 2, "Computerised tomogram neck": 2, "Delivery": 2, "Dermatitis atopic": 2, "Diabetes mellitus": 2, "Disease recurrence": 2, "Dysaesthesia": 2, "Dysgeusia": 2, "Dysphagia": 2, "Ectopic pregnancy": 2, "Endoscopy gastrointestinal": 2, "Feeding disorder": 2, "Gastrointestinal oedema": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "Haemoglobin": 2, "Haemophagocytic lymphohistiocytosis": 2, "Hepatic function abnormal": 2, "Humerus fracture": 2, "Hyperemesis gravidarum": 2, "IgA nephropathy": 2, "Joint range of motion decreased": 2, "Laboratory test": 2, "Lacunar infarction": 2, "Limb discomfort": 2, "Lip swelling": 2, "Lymphadenopathy": 2, "Meniere's disease": 2, "Meningitis aseptic": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Myocarditis": 2, "Myositis": 2, "Neck pain": 2, "Neonatal respiratory distress syndrome": 2, "Oral discomfort": 2, "Ovarian cyst": 2, "Patent ductus arteriosus": 2, "Pharyngeal swelling": 2, "Physical deconditioning": 2, "Platelet count": 2, "Productive cough": 2, "Pulse abnormal": 2, "Pyelonephritis": 2, "Rash pruritic": 2, "Reaction to excipient": 2, "Respiratory disorder": 2, "Serum ferritin": 2, "Somnolence": 2, "Spinal stenosis": 2, "Stress": 2, "Swelling of eyelid": 2, "Thirst": 2, "Tremor": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Ureterolithiasis": 2, "Uterine leiomyoma": 2, "Vaccination site erythema": 2, "Vaccination site haemorrhage": 2, "Vaccination site pruritus": 2, "Viral infection": 2, "White blood cell count increased": 2, "AST/ALT ratio": 1, "Abortion missed": 1, "Accident": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Adenomyosis": 1, "Affective disorder": 1, "Alanine aminotransferase increased": 1, "Allergic reaction to excipient": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Angina unstable": 1, "Angioedema": 1, "Antinuclear antibody": 1, "Apnoea": 1, "Apraxia": 1, "Arrhythmia": 1, "Arthritis": 1, "Aspartate aminotransferase decreased": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Atrial fibrillation": 1, "Atrial septal defect": 1, "Audiogram": 1, "Back pain": 1, "Bacteraemia": 1, "Bacterial prostatitis": 1, "Bacterial test": 1, "Band neutrophil count": 1, "Bile duct cancer": 1, "Biopsy kidney": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood creatine": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood pressure diastolic": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Brain natriuretic peptide increased": 1, "Brain stem auditory evoked response": 1, "Bronchostenosis": 1, "Burning sensation": 1, "CSF culture": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Caesarean section": 1, "Capillary nail refill test": 1, "Cardiac electrophysiologic study": 1, "Cardiac tamponade": 1, "Catamenial pneumothorax": 1, "Cataract": 1, "Cervical incompetence": 1, "Choking": 1, "Cholangitis": 1, "Cholecystitis": 1, "Chromosome banding": 1, "Clavicle fracture": 1, "Cleft lip": 1, "Coccydynia": 1, "Colonoscopy": 1, "Colposcopy": 1, "Complex regional pain syndrome": 1, "Congenital skin disorder": 1, "Conjunctival hyperaemia": 1, "Coronavirus infection": 1, "Culture urine": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Cytomegalovirus test": 1, "Daydreaming": 1, "Deafness neurosensory": 1, "Death": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dermatitis allergic": 1, "Diagnostic aspiration": 1, "Diffuse panbronchiolitis": 1, "Dissociative disorder": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug exposure before pregnancy": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dysarthria": 1, "Dysphoria": 1, "EGFR status assay": 1, "Ear swelling": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram abnormal": 1, "Electrocorticogram": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Electroneurography": 1, "Endoscopy": 1, "Enteritis": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eye discharge": 1, "Eye disorder": 1, "Eye oedema": 1, "Eye pruritus": 1, "Eye swelling": 1, "Feeling jittery": 1, "Fibrin": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Fibrin degradation products increased": 1, "Fibromyalgia": 1, "Foaming at mouth": 1, "Foetal death": 1, "Foetal heart rate": 1, "Foreign body sensation in eyes": 1, "Fractured sacrum": 1, "Full blood count": 1, "Fungal test": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal hypomotility": 1, "Gastrointestinal motility disorder": 1, "Generalised oedema": 1, "Gnathoschisis": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haemangioblastoma": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage": 1, "Haemorrhoids": 1, "Head circumference": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatic necrosis": 1, "Hydronephrosis": 1, "Hyperreflexia": 1, "Hypersensitivity pneumonitis": 1, "Hypokalaemia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Hypoventilation": 1, "Hypoxic-ischaemic encephalopathy": 1, "IL-2 receptor assay": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Infection": 1, "Inflammation": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Inner ear disorder": 1, "Intestinal ischaemia": 1, "Intestinal ulcer": 1, "Knee operation": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Legionella test": 1, "Lid margin discharge": 1, "Ligament injury": 1, "Lip pruritus": 1, "Listless": 1, "Liver disorder": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lung infiltration": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningioma": 1, "Migraine": 1, "Mononuclear cell count": 1, "Muscle disorder": 1, "Muscle swelling": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Nasal congestion": 1, "Nasal mucosal disorder": 1, "Nasal pruritus": 1, "Nasopharyngitis": 1, "Neoplasm recurrence": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neuropathic arthropathy": 1, "Neutrophil percentage": 1, "Nystagmus": 1, "Obstructive airways disorder": 1, "Odynophagia": 1, "Oedema": 1, "Off label use": 1, "Orthostatic hypotension": 1, "Osteochondrodysplasia": 1, "Ovarian cyst torsion": 1, "Ovarian hyperstimulation syndrome": 1, "Oxygen consumption": 1, "Oxygen saturation decreased": 1, "Oxygen saturation increased": 1, "Pancreatitis acute": 1, "Panic attack": 1, "Parvovirus B19 test": 1, "Paternal exposure before pregnancy": 1, "Pelvi-ureteric obstruction": 1, "Peripheral nerve paresis": 1, "Peritonsillitis": 1, "Petit mal epilepsy": 1, "Photopsia": 1, "Physical examination": 1, "Placenta praevia": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Polymyositis": 1, "Poor quality sleep": 1, "Postural tremor": 1, "Prenatal screening test": 1, "Primary hyperaldosteronism": 1, "Prostatitis": 1, "Prostatomegaly": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary artery thrombosis": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary valve stenosis congenital": 1, "Pyelonephritis acute": 1, "Radius fracture": 1, "Rectal examination": 1, "Red blood cell count": 1, "Respiratory disorder neonatal": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Reticulocyte count": 1, "Rib fracture": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 RNA": 1, "Salivary hypersecretion": 1, "Sciatica": 1, "Sensation of foreign body": 1, "Sepsis": 1, "Serum sickness": 1, "Shoulder injury related to vaccine administration": 1, "Skin abrasion": 1, "Skin cancer": 1, "Skin mass": 1, "Sleep disorder": 1, "Smear test": 1, "Soft tissue atrophy": 1, "Sputum culture": 1, "Stevens-Johnson syndrome": 1, "Streptococcal infection": 1, "Subarachnoid haemorrhage": 1, "Suffocation feeling": 1, "Tenderness": 1, "Tension headache": 1, "Tetany": 1, "Thrombosis": 1, "Tinnitus": 1, "Tonsillitis": 1, "Toxic skin eruption": 1, "Troponin abnormal": 1, "Ultrasound breast": 1, "Ultrasound scan vagina": 1, "Ultrasound uterus": 1, "Ureteric cancer": 1, "Urine analysis": 1, "Urine ketone body": 1, "Uterine cancer": 1, "VIth nerve disorder": 1, "Vaccination complication": 1, "Vaccination site movement impairment": 1, "Vaccination site vesicles": 1, "Vascular pseudoaneurysm": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Visual analogue scale": 1, "Visual impairment": 1, "Vocal cord disorder": 1, "Weight increased": 1, "White blood cells urine": 1, "Yawning": 1}, "batchcodes": ["EP2163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP2173.json b/docs/data/histograms/Japan/EP2173.json
index d3d71f8715d..ec4c413544e 100644
--- a/docs/data/histograms/Japan/EP2173.json
+++ b/docs/data/histograms/Japan/EP2173.json
@@ -1 +1 @@
-{"batchcode": "EP2173", "histograms": [{"batchcodes": ["EP2173"], "histogram": {"Anaphylactic reaction": 1, "Body temperature": 1, "Erythema": 1, "Peripheral coldness": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EP2173", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Body temperature": 1, "Erythema": 1, "Peripheral coldness": 1, "Tremor": 1}, "batchcodes": ["EP2173"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP2659.json b/docs/data/histograms/Japan/EP2659.json
index 77b9d48f629..9c2c2f869d8 100644
--- a/docs/data/histograms/Japan/EP2659.json
+++ b/docs/data/histograms/Japan/EP2659.json
@@ -1 +1 @@
-{"batchcode": "EP2659", "histograms": [{"batchcodes": ["EP2659"], "histogram": {"Body temperature": 5, "Chills": 3, "Cough": 3, "Oxygen saturation": 3, "Vital signs measurement": 3, "Blood pressure measurement": 2, "Headache": 2, "Myalgia": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthma": 1, "Autophony": 1, "Blood phosphorus": 1, "Blood pressure increased": 1, "Chest pain": 1, "Cold sweat": 1, "Cough variant asthma": 1, "Depressed level of consciousness": 1, "Disease recurrence": 1, "Dysphonia": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Malaise": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pallor": 1, "Pericarditis": 1, "Pneumothorax spontaneous": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Tinnitus": 1, "Urticaria": 1, "Vaccination site pain": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EP2659", "histograms": [{"histogram": {"Body temperature": 5, "Chills": 3, "Cough": 3, "Oxygen saturation": 3, "Vital signs measurement": 3, "Blood pressure measurement": 2, "Headache": 2, "Myalgia": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthma": 1, "Autophony": 1, "Blood phosphorus": 1, "Blood pressure increased": 1, "Chest pain": 1, "Cold sweat": 1, "Cough variant asthma": 1, "Depressed level of consciousness": 1, "Disease recurrence": 1, "Dysphonia": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Malaise": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pallor": 1, "Pericarditis": 1, "Pneumothorax spontaneous": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Tinnitus": 1, "Urticaria": 1, "Vaccination site pain": 1, "Wheezing": 1}, "batchcodes": ["EP2659"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP6905.json b/docs/data/histograms/Japan/EP6905.json
index db28290bd32..48cb32b9d05 100644
--- a/docs/data/histograms/Japan/EP6905.json
+++ b/docs/data/histograms/Japan/EP6905.json
@@ -1 +1 @@
-{"batchcode": "EP6905", "histograms": [{"batchcodes": ["EP6905"], "histogram": {"Feeling abnormal": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6905", "histograms": [{"histogram": {"Feeling abnormal": 1, "Nausea": 1}, "batchcodes": ["EP6905"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP7449.json b/docs/data/histograms/Japan/EP7449.json
index 8529dc38de5..2510882d19e 100644
--- a/docs/data/histograms/Japan/EP7449.json
+++ b/docs/data/histograms/Japan/EP7449.json
@@ -1 +1 @@
-{"batchcode": "EP7449", "histograms": [{"batchcodes": ["EP7449"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Loss of consciousness": 1, "Oxygen saturation": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EP7449", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Loss of consciousness": 1, "Oxygen saturation": 1, "Presyncope": 1}, "batchcodes": ["EP7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP9065.json b/docs/data/histograms/Japan/EP9065.json
index 9c6b89143e1..6741f2e0c99 100644
--- a/docs/data/histograms/Japan/EP9065.json
+++ b/docs/data/histograms/Japan/EP9065.json
@@ -1 +1 @@
-{"batchcode": "EP9065", "histograms": [{"batchcodes": ["EP9065"], "histogram": {"Body temperature": 1, "Cold sweat": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Feeling cold": 1, "Palpitations": 1, "Pruritus": 1, "Rash": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EP9065", "histograms": [{"histogram": {"Body temperature": 1, "Cold sweat": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Feeling cold": 1, "Palpitations": 1, "Pruritus": 1, "Rash": 1, "Tachycardia": 1}, "batchcodes": ["EP9065"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP9480.json b/docs/data/histograms/Japan/EP9480.json
index 355362f1b58..2a8a957bff1 100644
--- a/docs/data/histograms/Japan/EP9480.json
+++ b/docs/data/histograms/Japan/EP9480.json
@@ -1 +1 @@
-{"batchcode": "EP9480", "histograms": [{"batchcodes": ["EP9480"], "histogram": {"Auscultation": 1, "Body temperature": 1, "Oral pruritus": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Vital signs measurement": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EP9480", "histograms": [{"histogram": {"Auscultation": 1, "Body temperature": 1, "Oral pruritus": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Vital signs measurement": 1, "Wheezing": 1}, "batchcodes": ["EP9480"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EP9605.json b/docs/data/histograms/Japan/EP9605.json
index 7322c0d42db..e99d2f72f53 100644
--- a/docs/data/histograms/Japan/EP9605.json
+++ b/docs/data/histograms/Japan/EP9605.json
@@ -1 +1 @@
-{"batchcode": "EP9605", "histograms": [{"batchcodes": ["000008A", "EP9605"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["EP9605"], "histogram": {"Body temperature": 556, "Blood pressure measurement": 244, "Anaphylactic reaction": 223, "Oxygen saturation": 200, "Heart rate": 184, "Pruritus": 139, "Nausea": 123, "Cough": 121, "Headache": 115, "Erythema": 114, "Dyspnoea": 106, "Oropharyngeal discomfort": 102, "Pyrexia": 95, "Malaise": 92, "Feeling abnormal": 85, "Urticaria": 77, "Rash": 76, "Blood pressure increased": 74, "Palpitations": 74, "Dizziness": 70, "Vomiting": 54, "Hypoaesthesia": 52, "Vaccination site pain": 51, "Respiratory rate": 48, "Chills": 47, "Arthralgia": 37, "Vital signs measurement": 32, "Diarrhoea": 27, "Presyncope": 27, "SARS-CoV-2 test": 27, "Heart rate increased": 26, "Tachycardia": 26, "Asthma": 25, "Blood test": 24, "Cold sweat": 24, "Flushing": 23, "Myalgia": 23, "Chest discomfort": 22, "Feeling hot": 22, "Hot flush": 22, "Hypersensitivity": 22, "Pain": 22, "Abdominal pain": 21, "Throat irritation": 21, "Asthenia": 20, "Pain in extremity": 19, "Wheezing": 19, "Hyperhidrosis": 18, "Neuropathy peripheral": 17, "Abdominal discomfort": 16, "Dysphonia": 16, "Electrocardiogram": 16, "Loss of consciousness": 16, "Pallor": 16, "Depressed level of consciousness": 15, "Throat tightness": 15, "Head discomfort": 14, "White blood cell count": 14, "Arrhythmia": 13, "Blood pressure decreased": 13, "Conjunctival hyperaemia": 13, "Hyperventilation": 13, "Somnolence": 13, "Swelling": 13, "Chest pain": 12, "Fatigue": 12, "Muscular weakness": 12, "Oropharyngeal pain": 12, "Peripheral coldness": 12, "Tremor": 12, "Vaccination site swelling": 12, "Decreased appetite": 11, "Hypertension": 11, "PO2": 11, "C-reactive protein": 10, "Computerised tomogram": 10, "Feeling cold": 10, "Investigation": 10, "Syncope": 10, "Eye pruritus": 9, "Internal haemorrhage": 9, "Lip swelling": 9, "Ocular hyperaemia": 9, "Polymerase chain reaction": 9, "Rash erythematous": 9, "Seizure": 9, "Swelling of eyelid": 9, "Vaccination site erythema": 9, "Altered state of consciousness": 8, "Anaphylactic shock": 8, "COVID-19": 8, "Discomfort": 8, "Eyelid oedema": 8, "Facial paralysis": 8, "Hypoaesthesia oral": 8, "Magnetic resonance imaging": 8, "Mental impairment": 8, "Swelling face": 8, "Tachypnoea": 8, "Auscultation": 7, "Back pain": 7, "Magnetic resonance imaging head": 7, "Paraesthesia": 7, "Platelet count": 7, "Rhinorrhoea": 7, "Allergy to vaccine": 6, "Blood creatinine": 6, "Disease recurrence": 6, "Dizziness postural": 6, "Drug ineffective": 6, "Dysphoria": 6, "Fall": 6, "Meningitis aseptic": 6, "Mobility decreased": 6, "Nasal congestion": 6, "Vaccination site pruritus": 6, "Yawning": 6, "Abdominal pain upper": 5, "Aspartate aminotransferase": 5, "Cerebral haemorrhage": 5, "Chest X-ray": 5, "Coma scale": 5, "Deafness": 5, "Ear discomfort": 5, "Haemoglobin": 5, "Haemorrhage subcutaneous": 5, "Muscle spasms": 5, "Oculomucocutaneous syndrome": 5, "Oral discomfort": 5, "Oxygen saturation decreased": 5, "Pharyngeal swelling": 5, "Shock": 5, "Alanine aminotransferase": 4, "Allergy test": 4, "Blood albumin": 4, "Blood calcium": 4, "Blood creatine phosphokinase": 4, "Blood glucose": 4, "Blood potassium": 4, "Blood pressure abnormal": 4, "Blood pressure systolic": 4, "Blood urea": 4, "Computerised tomogram head": 4, "Condition aggravated": 4, "Eczema": 4, "Gamma-glutamyltransferase": 4, "Heart rate decreased": 4, "Herpes zoster": 4, "Laryngeal discomfort": 4, "Larynx irritation": 4, "Limb discomfort": 4, "Musculoskeletal stiffness": 4, "Nasal obstruction": 4, "Neck pain": 4, "PCO2": 4, "Protein total": 4, "Respiratory distress": 4, "Respiratory symptom": 4, "Sensation of foreign body": 4, "Sensory disturbance": 4, "Stridor": 4, "Sudden hearing loss": 4, "Vertigo": 4, "Visual impairment": 4, "pH body fluid": 4, "Amylase": 3, "Anxiety": 3, "Basophil percentage": 3, "Blood alkaline phosphatase": 3, "Blood bilirubin": 3, "Blood chloride": 3, "Blood immunoglobulin E": 3, "Blood lactate dehydrogenase": 3, "Blood sodium": 3, "Breath sounds abnormal": 3, "Bronchostenosis": 3, "CSF test": 3, "Cellulitis": 3, "Computerised tomogram thorax": 3, "Dehydration": 3, "Echocardiogram": 3, "Eosinophil count": 3, "Eosinophil percentage": 3, "Eye disorder": 3, "Face oedema": 3, "Glomerular filtration rate": 3, "Grip strength": 3, "Grip strength decreased": 3, "Haematocrit": 3, "Insomnia": 3, "Joint range of motion decreased": 3, "Laryngeal oedema": 3, "Lymphadenopathy": 3, "Maternal exposure during pregnancy": 3, "Mean cell haemoglobin": 3, "Mean cell haemoglobin concentration": 3, "Mean cell volume": 3, "Mouth swelling": 3, "Neutrophil percentage": 3, "Oedema": 3, "Oedema peripheral": 3, "Oral pruritus": 3, "Paraesthesia oral": 3, "Platelet count decreased": 3, "Radial pulse abnormal": 3, "Red blood cell count": 3, "Respiratory rate increased": 3, "Retinal haemorrhage": 3, "SARS-CoV-2 antibody test": 3, "Smear test": 3, "Subarachnoid haemorrhage": 3, "Tension": 3, "Thirst": 3, "Tinnitus": 3, "Tracheal obstruction": 3, "Type I hypersensitivity": 3, "Vasculitis": 3, "X-ray": 3, "Activated partial thromboplastin time": 2, "Albumin globulin ratio": 2, "Anaemia": 2, "Anaphylactoid reaction": 2, "Angioedema": 2, "Angiogram": 2, "Antibody test": 2, "Aphonia": 2, "Asthenopia": 2, "Autoantibody test": 2, "Axillary pain": 2, "Blepharospasm": 2, "Blood bicarbonate": 2, "Blood culture": 2, "Blood lactic acid": 2, "Blood phosphorus": 2, "Blood pressure diastolic increased": 2, "Blood pressure systolic increased": 2, "Blood uric acid": 2, "Breath sounds": 2, "Bronchospasm": 2, "Burning sensation": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Choking sensation": 2, "Circulatory collapse": 2, "Colitis ulcerative": 2, "Conjunctival haemorrhage": 2, "Cutaneous symptom": 2, "Dry mouth": 2, "Dry skin": 2, "Dyskinesia": 2, "Eating disorder": 2, "Embolism": 2, "Enteritis infectious": 2, "Erythema multiforme": 2, "Erythema of eyelid": 2, "Eye swelling": 2, "Eyelid ptosis": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Gastrointestinal hypermotility": 2, "Gaze palsy": 2, "Haematochezia": 2, "Haematology test": 2, "Haemolysis": 2, "Haemorrhage": 2, "Heart rate normal": 2, "Hepatic function abnormal": 2, "Intermittent claudication": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Lymph node pain": 2, "Lymphocyte percentage": 2, "Melaena": 2, "Monocyte percentage": 2, "Movement disorder": 2, "Myocardial infarction": 2, "Paralysis": 2, "Peripheral swelling": 2, "Pharyngeal oedema": 2, "Pharyngeal stenosis": 2, "Physical deconditioning": 2, "Physical examination": 2, "Prinzmetal angina": 2, "Product administered at inappropriate site": 2, "Productive cough": 2, "Protein urine present": 2, "Prothrombin level": 2, "Prothrombin time": 2, "Red cell distribution width": 2, "Respiratory alkalosis": 2, "Respiratory disorder": 2, "Skin test": 2, "Sneezing": 2, "Speech disorder": 2, "Thrombocytopenic purpura": 2, "Total complement activity test": 2, "Toxic skin eruption": 2, "Unresponsive to stimuli": 2, "Vaccination site hypoaesthesia": 2, "Vaccination site warmth": 2, "Ventricular extrasystoles": 2, "Vision blurred": 2, "AST/ALT ratio": 1, "Abdominal X-ray": 1, "Abdominal exploration": 1, "Abdominal pain lower": 1, "Abdominal symptom": 1, "Abnormal sensation in eye": 1, "Abortion threatened": 1, "Acidosis": 1, "Acoustic neuroma": 1, "Acoustic stimulation tests": 1, "Acute febrile neutrophilic dermatosis": 1, "Acute lymphocytic leukaemia": 1, "Acute myocardial infarction": 1, "Adenovirus test": 1, "Adjusted calcium": 1, "Agitation": 1, "Alanine aminotransferase normal": 1, "Allergic reaction to excipient": 1, "Amnesia": 1, "Anaesthesia dolorosa": 1, "Anencephaly": 1, "Aneurysm ruptured": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Anosmia": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Apnoea": 1, "Arterial injury": 1, "Artery dissection": 1, "Arthritis": 1, "Ascites": 1, "Asphyxia": 1, "Aspiration bone marrow": 1, "Atrial fibrillation": 1, "Atrial tachycardia": 1, "Audiogram": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood count": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood pH": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure immeasurable": 1, "Blood triglycerides": 1, "Blood urine": 1, "Body temperature abnormal": 1, "Body temperature increased": 1, "Bradyphrenia": 1, "Brain compression": 1, "Brain neoplasm": 1, "Breath sounds normal": 1, "Bronchial obstruction": 1, "Bronchiectasis": 1, "CSF cell count": 1, "CSF culture": 1, "CSF electrophoresis": 1, "CSF protein increased": 1, "CSF volume": 1, "Campylobacter test positive": 1, "Carbon dioxide": 1, "Carbon dioxide increased": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cardiovascular disorder": 1, "Cerebellar infarction": 1, "Cerebral artery embolism": 1, "Cerebral congestion": 1, "Cerebral ischaemia": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricular rupture": 1, "Chromatopsia": 1, "Chromaturia": 1, "Colitis": 1, "Colitis ischaemic": 1, "Colonoscopy": 1, "Communication disorder": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Complex regional pain syndrome": 1, "Contusion": 1, "Coronavirus test": 1, "Cryoglobulins": 1, "Culture stool": 1, "Cyanosis": 1, "Cystitis": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diplopia": 1, "Disorientation": 1, "Distractibility": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Diverticulum": 1, "Dysaesthesia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysstasia": 1, "Dysuria": 1, "Eczema herpeticum": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram normal": 1, "Electroencephalogram": 1, "Endoscopy": 1, "Enterocolitis": 1, "Enzyme level increased": 1, "Epilepsy": 1, "Epistaxis": 1, "Excessive eye blinking": 1, "External ear pain": 1, "Extra dose administered": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid function disorder": 1, "Eyelid irritation": 1, "Facial pain": 1, "Faeces soft": 1, "Fasciitis": 1, "Feeding disorder": 1, "Foetal malformation": 1, "Foreign body in throat": 1, "Fraction of inspired oxygen": 1, "Fracture": 1, "Frequent bowel movements": 1, "Gait inability": 1, "Gastroenteritis bacterial": 1, "Gastrointestinal disorder": 1, "Gastrointestinal haemorrhage": 1, "Gastrointestinal oedema": 1, "Genital haemorrhage": 1, "Glare": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Hallucination, visual": 1, "Heart disease congenital": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Herpes virus infection": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "Hyperaemia": 1, "Hyperpyrexia": 1, "Hyperreflexia": 1, "Hypertensive urgency": 1, "Hypochromic anaemia": 1, "Hypokalaemia": 1, "Hypophagia": 1, "Hypothermia": 1, "Hypotonia": 1, "Hypoxia": 1, "Ileus paralytic": 1, "Illness": 1, "Illusion": 1, "Immune complex assay": 1, "Induration": 1, "Infective spondylitis": 1, "Intermenstrual bleeding": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Irregular breathing": 1, "Jaundice": 1, "Joint swelling": 1, "Kernig's sign": 1, "Labile blood pressure": 1, "Lactescent serum": 1, "Laryngeal pain": 1, "Lethargy": 1, "Lip erythema": 1, "Lip pruritus": 1, "Liver injury": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Magnetic resonance imaging neck": 1, "Maximum heart rate": 1, "Mean platelet volume": 1, "Memory impairment": 1, "Meniere's disease": 1, "Meningitis": 1, "Meningitis bacterial": 1, "Meningitis herpes": 1, "Monoblast count": 1, "Motion sickness": 1, "Moyamoya disease": 1, "Muscle tightness": 1, "Myelitis": 1, "Myocarditis": 1, "Neck exploration": 1, "Nervousness": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Neutrophilic dermatosis": 1, "Night sweats": 1, "Obstructive airways disorder": 1, "Ocular discomfort": 1, "Opisthotonus": 1, "Oral mucosal erythema": 1, "Orthopnoea": 1, "Orthostatic intolerance": 1, "Palmoplantar pustulosis": 1, "Panic attack": 1, "Parosmia": 1, "Parotitis": 1, "Peak expiratory flow rate": 1, "Periarthritis": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral circulatory failure": 1, "Peripheral venous disease": 1, "Petit mal epilepsy": 1, "Pharyngeal erythema": 1, "Photopsia": 1, "Pigmentation disorder": 1, "Piloerection": 1, "Pneumonia": 1, "Pollakiuria": 1, "Premature baby": 1, "Product administered to patient of inappropriate age": 1, "Prolonged expiration": 1, "Protein urine": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Puncture site pain": 1, "Pustule": 1, "Putamen haemorrhage": 1, "Radial pulse increased": 1, "Reaction to excipient": 1, "Red blood cells urine positive": 1, "Retinal vein occlusion": 1, "Retroplacental haematoma": 1, "Rheumatoid arthritis": 1, "Rhinitis allergic": 1, "Scleritis": 1, "Sensation of blood flow": 1, "Sepsis": 1, "Shock symptom": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Sjogren's syndrome": 1, "Skin plaque": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Slow response to stimuli": 1, "Somatic symptom disorder": 1, "Speech sound disorder": 1, "Sputum retention": 1, "Stenosis": 1, "Stress": 1, "Supraventricular extrasystoles": 1, "Swollen tongue": 1, "Sympathicotonia": 1, "Temperature intolerance": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tongue rough": 1, "Total cholesterol/HDL ratio": 1, "Tracheal stenosis": 1, "Trigeminal neuralgia": 1, "Tryptase": 1, "Tumour marker test": 1, "Ultrasound abdomen": 1, "Upper airway obstruction": 1, "Ureterolithiasis": 1, "Urinary occult blood positive": 1, "Urinary retention": 1, "Urine analysis": 1, "Urine ketone body": 1, "Urticaria chronic": 1, "Vaccination site movement impairment": 1, "Vaccination site paraesthesia": 1, "Varicella virus test positive": 1, "Venous occlusion": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vertebral artery dissection": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Visual acuity reduced": 1, "Walking disability": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "White blood cells urine positive": 1, "Wrong technique in product usage process": 1, "Xeroderma pigmentosum": 1, "Yergason's test": 1}}]}
\ No newline at end of file
+{"batchcode": "EP9605", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["000008A", "EP9605"]}, {"histogram": {"Body temperature": 556, "Blood pressure measurement": 244, "Anaphylactic reaction": 223, "Oxygen saturation": 200, "Heart rate": 184, "Pruritus": 139, "Nausea": 123, "Cough": 121, "Headache": 115, "Erythema": 114, "Dyspnoea": 106, "Oropharyngeal discomfort": 102, "Pyrexia": 95, "Malaise": 92, "Feeling abnormal": 85, "Urticaria": 77, "Rash": 76, "Blood pressure increased": 74, "Palpitations": 74, "Dizziness": 70, "Vomiting": 54, "Hypoaesthesia": 52, "Vaccination site pain": 51, "Respiratory rate": 48, "Chills": 47, "Arthralgia": 37, "Vital signs measurement": 32, "Diarrhoea": 27, "Presyncope": 27, "SARS-CoV-2 test": 27, "Heart rate increased": 26, "Tachycardia": 26, "Asthma": 25, "Blood test": 24, "Cold sweat": 24, "Flushing": 23, "Myalgia": 23, "Chest discomfort": 22, "Feeling hot": 22, "Hot flush": 22, "Hypersensitivity": 22, "Pain": 22, "Abdominal pain": 21, "Throat irritation": 21, "Asthenia": 20, "Pain in extremity": 19, "Wheezing": 19, "Hyperhidrosis": 18, "Neuropathy peripheral": 17, "Abdominal discomfort": 16, "Dysphonia": 16, "Electrocardiogram": 16, "Loss of consciousness": 16, "Pallor": 16, "Depressed level of consciousness": 15, "Throat tightness": 15, "Head discomfort": 14, "White blood cell count": 14, "Arrhythmia": 13, "Blood pressure decreased": 13, "Conjunctival hyperaemia": 13, "Hyperventilation": 13, "Somnolence": 13, "Swelling": 13, "Chest pain": 12, "Fatigue": 12, "Muscular weakness": 12, "Oropharyngeal pain": 12, "Peripheral coldness": 12, "Tremor": 12, "Vaccination site swelling": 12, "Decreased appetite": 11, "Hypertension": 11, "PO2": 11, "C-reactive protein": 10, "Computerised tomogram": 10, "Feeling cold": 10, "Investigation": 10, "Syncope": 10, "Eye pruritus": 9, "Internal haemorrhage": 9, "Lip swelling": 9, "Ocular hyperaemia": 9, "Polymerase chain reaction": 9, "Rash erythematous": 9, "Seizure": 9, "Swelling of eyelid": 9, "Vaccination site erythema": 9, "Altered state of consciousness": 8, "Anaphylactic shock": 8, "COVID-19": 8, "Discomfort": 8, "Eyelid oedema": 8, "Facial paralysis": 8, "Hypoaesthesia oral": 8, "Magnetic resonance imaging": 8, "Mental impairment": 8, "Swelling face": 8, "Tachypnoea": 8, "Auscultation": 7, "Back pain": 7, "Magnetic resonance imaging head": 7, "Paraesthesia": 7, "Platelet count": 7, "Rhinorrhoea": 7, "Allergy to vaccine": 6, "Blood creatinine": 6, "Disease recurrence": 6, "Dizziness postural": 6, "Drug ineffective": 6, "Dysphoria": 6, "Fall": 6, "Meningitis aseptic": 6, "Mobility decreased": 6, "Nasal congestion": 6, "Vaccination site pruritus": 6, "Yawning": 6, "Abdominal pain upper": 5, "Aspartate aminotransferase": 5, "Cerebral haemorrhage": 5, "Chest X-ray": 5, "Coma scale": 5, "Deafness": 5, "Ear discomfort": 5, "Haemoglobin": 5, "Haemorrhage subcutaneous": 5, "Muscle spasms": 5, "Oculomucocutaneous syndrome": 5, "Oral discomfort": 5, "Oxygen saturation decreased": 5, "Pharyngeal swelling": 5, "Shock": 5, "Alanine aminotransferase": 4, "Allergy test": 4, "Blood albumin": 4, "Blood calcium": 4, "Blood creatine phosphokinase": 4, "Blood glucose": 4, "Blood potassium": 4, "Blood pressure abnormal": 4, "Blood pressure systolic": 4, "Blood urea": 4, "Computerised tomogram head": 4, "Condition aggravated": 4, "Eczema": 4, "Gamma-glutamyltransferase": 4, "Heart rate decreased": 4, "Herpes zoster": 4, "Laryngeal discomfort": 4, "Larynx irritation": 4, "Limb discomfort": 4, "Musculoskeletal stiffness": 4, "Nasal obstruction": 4, "Neck pain": 4, "PCO2": 4, "Protein total": 4, "Respiratory distress": 4, "Respiratory symptom": 4, "Sensation of foreign body": 4, "Sensory disturbance": 4, "Stridor": 4, "Sudden hearing loss": 4, "Vertigo": 4, "Visual impairment": 4, "pH body fluid": 4, "Amylase": 3, "Anxiety": 3, "Basophil percentage": 3, "Blood alkaline phosphatase": 3, "Blood bilirubin": 3, "Blood chloride": 3, "Blood immunoglobulin E": 3, "Blood lactate dehydrogenase": 3, "Blood sodium": 3, "Breath sounds abnormal": 3, "Bronchostenosis": 3, "CSF test": 3, "Cellulitis": 3, "Computerised tomogram thorax": 3, "Dehydration": 3, "Echocardiogram": 3, "Eosinophil count": 3, "Eosinophil percentage": 3, "Eye disorder": 3, "Face oedema": 3, "Glomerular filtration rate": 3, "Grip strength": 3, "Grip strength decreased": 3, "Haematocrit": 3, "Insomnia": 3, "Joint range of motion decreased": 3, "Laryngeal oedema": 3, "Lymphadenopathy": 3, "Maternal exposure during pregnancy": 3, "Mean cell haemoglobin": 3, "Mean cell haemoglobin concentration": 3, "Mean cell volume": 3, "Mouth swelling": 3, "Neutrophil percentage": 3, "Oedema": 3, "Oedema peripheral": 3, "Oral pruritus": 3, "Paraesthesia oral": 3, "Platelet count decreased": 3, "Radial pulse abnormal": 3, "Red blood cell count": 3, "Respiratory rate increased": 3, "Retinal haemorrhage": 3, "SARS-CoV-2 antibody test": 3, "Smear test": 3, "Subarachnoid haemorrhage": 3, "Tension": 3, "Thirst": 3, "Tinnitus": 3, "Tracheal obstruction": 3, "Type I hypersensitivity": 3, "Vasculitis": 3, "X-ray": 3, "Activated partial thromboplastin time": 2, "Albumin globulin ratio": 2, "Anaemia": 2, "Anaphylactoid reaction": 2, "Angioedema": 2, "Angiogram": 2, "Antibody test": 2, "Aphonia": 2, "Asthenopia": 2, "Autoantibody test": 2, "Axillary pain": 2, "Blepharospasm": 2, "Blood bicarbonate": 2, "Blood culture": 2, "Blood lactic acid": 2, "Blood phosphorus": 2, "Blood pressure diastolic increased": 2, "Blood pressure systolic increased": 2, "Blood uric acid": 2, "Breath sounds": 2, "Bronchospasm": 2, "Burning sensation": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Choking sensation": 2, "Circulatory collapse": 2, "Colitis ulcerative": 2, "Conjunctival haemorrhage": 2, "Cutaneous symptom": 2, "Dry mouth": 2, "Dry skin": 2, "Dyskinesia": 2, "Eating disorder": 2, "Embolism": 2, "Enteritis infectious": 2, "Erythema multiforme": 2, "Erythema of eyelid": 2, "Eye swelling": 2, "Eyelid ptosis": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Gastrointestinal hypermotility": 2, "Gaze palsy": 2, "Haematochezia": 2, "Haematology test": 2, "Haemolysis": 2, "Haemorrhage": 2, "Heart rate normal": 2, "Hepatic function abnormal": 2, "Intermittent claudication": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Lymph node pain": 2, "Lymphocyte percentage": 2, "Melaena": 2, "Monocyte percentage": 2, "Movement disorder": 2, "Myocardial infarction": 2, "Paralysis": 2, "Peripheral swelling": 2, "Pharyngeal oedema": 2, "Pharyngeal stenosis": 2, "Physical deconditioning": 2, "Physical examination": 2, "Prinzmetal angina": 2, "Product administered at inappropriate site": 2, "Productive cough": 2, "Protein urine present": 2, "Prothrombin level": 2, "Prothrombin time": 2, "Red cell distribution width": 2, "Respiratory alkalosis": 2, "Respiratory disorder": 2, "Skin test": 2, "Sneezing": 2, "Speech disorder": 2, "Thrombocytopenic purpura": 2, "Total complement activity test": 2, "Toxic skin eruption": 2, "Unresponsive to stimuli": 2, "Vaccination site hypoaesthesia": 2, "Vaccination site warmth": 2, "Ventricular extrasystoles": 2, "Vision blurred": 2, "AST/ALT ratio": 1, "Abdominal X-ray": 1, "Abdominal exploration": 1, "Abdominal pain lower": 1, "Abdominal symptom": 1, "Abnormal sensation in eye": 1, "Abortion threatened": 1, "Acidosis": 1, "Acoustic neuroma": 1, "Acoustic stimulation tests": 1, "Acute febrile neutrophilic dermatosis": 1, "Acute lymphocytic leukaemia": 1, "Acute myocardial infarction": 1, "Adenovirus test": 1, "Adjusted calcium": 1, "Agitation": 1, "Alanine aminotransferase normal": 1, "Allergic reaction to excipient": 1, "Amnesia": 1, "Anaesthesia dolorosa": 1, "Anencephaly": 1, "Aneurysm ruptured": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Anosmia": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Apnoea": 1, "Arterial injury": 1, "Artery dissection": 1, "Arthritis": 1, "Ascites": 1, "Asphyxia": 1, "Aspiration bone marrow": 1, "Atrial fibrillation": 1, "Atrial tachycardia": 1, "Audiogram": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood count": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood pH": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure immeasurable": 1, "Blood triglycerides": 1, "Blood urine": 1, "Body temperature abnormal": 1, "Body temperature increased": 1, "Bradyphrenia": 1, "Brain compression": 1, "Brain neoplasm": 1, "Breath sounds normal": 1, "Bronchial obstruction": 1, "Bronchiectasis": 1, "CSF cell count": 1, "CSF culture": 1, "CSF electrophoresis": 1, "CSF protein increased": 1, "CSF volume": 1, "Campylobacter test positive": 1, "Carbon dioxide": 1, "Carbon dioxide increased": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cardiovascular disorder": 1, "Cerebellar infarction": 1, "Cerebral artery embolism": 1, "Cerebral congestion": 1, "Cerebral ischaemia": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricular rupture": 1, "Chromatopsia": 1, "Chromaturia": 1, "Colitis": 1, "Colitis ischaemic": 1, "Colonoscopy": 1, "Communication disorder": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Complex regional pain syndrome": 1, "Contusion": 1, "Coronavirus test": 1, "Cryoglobulins": 1, "Culture stool": 1, "Cyanosis": 1, "Cystitis": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diplopia": 1, "Disorientation": 1, "Distractibility": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Diverticulum": 1, "Dysaesthesia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysstasia": 1, "Dysuria": 1, "Eczema herpeticum": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram normal": 1, "Electroencephalogram": 1, "Endoscopy": 1, "Enterocolitis": 1, "Enzyme level increased": 1, "Epilepsy": 1, "Epistaxis": 1, "Excessive eye blinking": 1, "External ear pain": 1, "Extra dose administered": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid function disorder": 1, "Eyelid irritation": 1, "Facial pain": 1, "Faeces soft": 1, "Fasciitis": 1, "Feeding disorder": 1, "Foetal malformation": 1, "Foreign body in throat": 1, "Fraction of inspired oxygen": 1, "Fracture": 1, "Frequent bowel movements": 1, "Gait inability": 1, "Gastroenteritis bacterial": 1, "Gastrointestinal disorder": 1, "Gastrointestinal haemorrhage": 1, "Gastrointestinal oedema": 1, "Genital haemorrhage": 1, "Glare": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Hallucination, visual": 1, "Heart disease congenital": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Herpes virus infection": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "Hyperaemia": 1, "Hyperpyrexia": 1, "Hyperreflexia": 1, "Hypertensive urgency": 1, "Hypochromic anaemia": 1, "Hypokalaemia": 1, "Hypophagia": 1, "Hypothermia": 1, "Hypotonia": 1, "Hypoxia": 1, "Ileus paralytic": 1, "Illness": 1, "Illusion": 1, "Immune complex assay": 1, "Induration": 1, "Infective spondylitis": 1, "Intermenstrual bleeding": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Irregular breathing": 1, "Jaundice": 1, "Joint swelling": 1, "Kernig's sign": 1, "Labile blood pressure": 1, "Lactescent serum": 1, "Laryngeal pain": 1, "Lethargy": 1, "Lip erythema": 1, "Lip pruritus": 1, "Liver injury": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Magnetic resonance imaging neck": 1, "Maximum heart rate": 1, "Mean platelet volume": 1, "Memory impairment": 1, "Meniere's disease": 1, "Meningitis": 1, "Meningitis bacterial": 1, "Meningitis herpes": 1, "Monoblast count": 1, "Motion sickness": 1, "Moyamoya disease": 1, "Muscle tightness": 1, "Myelitis": 1, "Myocarditis": 1, "Neck exploration": 1, "Nervousness": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Neutrophilic dermatosis": 1, "Night sweats": 1, "Obstructive airways disorder": 1, "Ocular discomfort": 1, "Opisthotonus": 1, "Oral mucosal erythema": 1, "Orthopnoea": 1, "Orthostatic intolerance": 1, "Palmoplantar pustulosis": 1, "Panic attack": 1, "Parosmia": 1, "Parotitis": 1, "Peak expiratory flow rate": 1, "Periarthritis": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral circulatory failure": 1, "Peripheral venous disease": 1, "Petit mal epilepsy": 1, "Pharyngeal erythema": 1, "Photopsia": 1, "Pigmentation disorder": 1, "Piloerection": 1, "Pneumonia": 1, "Pollakiuria": 1, "Premature baby": 1, "Product administered to patient of inappropriate age": 1, "Prolonged expiration": 1, "Protein urine": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Puncture site pain": 1, "Pustule": 1, "Putamen haemorrhage": 1, "Radial pulse increased": 1, "Reaction to excipient": 1, "Red blood cells urine positive": 1, "Retinal vein occlusion": 1, "Retroplacental haematoma": 1, "Rheumatoid arthritis": 1, "Rhinitis allergic": 1, "Scleritis": 1, "Sensation of blood flow": 1, "Sepsis": 1, "Shock symptom": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Sjogren's syndrome": 1, "Skin plaque": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Slow response to stimuli": 1, "Somatic symptom disorder": 1, "Speech sound disorder": 1, "Sputum retention": 1, "Stenosis": 1, "Stress": 1, "Supraventricular extrasystoles": 1, "Swollen tongue": 1, "Sympathicotonia": 1, "Temperature intolerance": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tongue rough": 1, "Total cholesterol/HDL ratio": 1, "Tracheal stenosis": 1, "Trigeminal neuralgia": 1, "Tryptase": 1, "Tumour marker test": 1, "Ultrasound abdomen": 1, "Upper airway obstruction": 1, "Ureterolithiasis": 1, "Urinary occult blood positive": 1, "Urinary retention": 1, "Urine analysis": 1, "Urine ketone body": 1, "Urticaria chronic": 1, "Vaccination site movement impairment": 1, "Vaccination site paraesthesia": 1, "Varicella virus test positive": 1, "Venous occlusion": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vertebral artery dissection": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Visual acuity reduced": 1, "Walking disability": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "White blood cells urine positive": 1, "Wrong technique in product usage process": 1, "Xeroderma pigmentosum": 1, "Yergason's test": 1}, "batchcodes": ["EP9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER 7449.json b/docs/data/histograms/Japan/ER 7449.json
index 7756438233b..434b238ebbc 100644
--- a/docs/data/histograms/Japan/ER 7449.json
+++ b/docs/data/histograms/Japan/ER 7449.json
@@ -1 +1 @@
-{"batchcode": "ER 7449", "histograms": [{"batchcodes": ["ER 7449"], "histogram": {"Chest pain": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "ER 7449", "histograms": [{"histogram": {"Chest pain": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Nausea": 1}, "batchcodes": ["ER 7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER 9480.json b/docs/data/histograms/Japan/ER 9480.json
index 0e908b40ddf..96a22e66ce7 100644
--- a/docs/data/histograms/Japan/ER 9480.json
+++ b/docs/data/histograms/Japan/ER 9480.json
@@ -1 +1 @@
-{"batchcode": "ER 9480", "histograms": [{"batchcodes": ["ER 9480"], "histogram": {"Body temperature": 1, "Pyrexia": 1, "Uveitis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER 9480", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1, "Uveitis": 1}, "batchcodes": ["ER 9480"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER-2659.json b/docs/data/histograms/Japan/ER-2659.json
index 245744fc735..35f0dcec7c9 100644
--- a/docs/data/histograms/Japan/ER-2659.json
+++ b/docs/data/histograms/Japan/ER-2659.json
@@ -1 +1 @@
-{"batchcode": "ER-2659", "histograms": [{"batchcodes": ["ER-2659"], "histogram": {"Body temperature": 1, "Erythema": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Palpitations": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "ER-2659", "histograms": [{"histogram": {"Body temperature": 1, "Erythema": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Palpitations": 1, "Pruritus": 1}, "batchcodes": ["ER-2659"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER.json b/docs/data/histograms/Japan/ER.json
index d1fe9582941..6b01aa200ac 100644
--- a/docs/data/histograms/Japan/ER.json
+++ b/docs/data/histograms/Japan/ER.json
@@ -1 +1 @@
-{"batchcode": "ER", "histograms": [{"batchcodes": ["ER"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "ER", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Palpitations": 1}, "batchcodes": ["ER"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER2163.json b/docs/data/histograms/Japan/ER2163.json
index e594dcfc04a..f4ae149d740 100644
--- a/docs/data/histograms/Japan/ER2163.json
+++ b/docs/data/histograms/Japan/ER2163.json
@@ -1 +1 @@
-{"batchcode": "ER2163", "histograms": [{"batchcodes": ["ER2163"], "histogram": {"Body temperature": 1, "Dysgeusia": 1, "Paraesthesia oral": 1, "Pharyngeal paraesthesia": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2163", "histograms": [{"histogram": {"Body temperature": 1, "Dysgeusia": 1, "Paraesthesia oral": 1, "Pharyngeal paraesthesia": 1, "Throat irritation": 1}, "batchcodes": ["ER2163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER2659.json b/docs/data/histograms/Japan/ER2659.json
index 6ce27354862..914b95083c7 100644
--- a/docs/data/histograms/Japan/ER2659.json
+++ b/docs/data/histograms/Japan/ER2659.json
@@ -1 +1 @@
-{"batchcode": "ER2659", "histograms": [{"batchcodes": ["ER2659"], "histogram": {"Body temperature": 310, "Blood pressure measurement": 120, "Pyrexia": 117, "Anaphylactic reaction": 110, "Headache": 96, "Oxygen saturation": 96, "Malaise": 87, "Heart rate": 86, "Nausea": 80, "Pruritus": 69, "Cough": 55, "Erythema": 54, "Arthralgia": 52, "Vaccination site pain": 49, "Rash": 44, "Chills": 42, "Blood pressure increased": 40, "Dyspnoea": 38, "Feeling abnormal": 37, "Urticaria": 36, "Myalgia": 35, "Dizziness": 34, "Hypoaesthesia": 29, "Oropharyngeal discomfort": 29, "Diarrhoea": 28, "Palpitations": 23, "Fatigue": 22, "Vomiting": 22, "Abdominal pain": 21, "Vaccination site swelling": 21, "Blood test": 20, "Loss of consciousness": 17, "Pain": 17, "Respiratory rate": 16, "Electrocardiogram": 13, "Pain in extremity": 13, "Presyncope": 13, "Asthma": 12, "Blood pressure decreased": 12, "Depressed level of consciousness": 12, "Vaccination site erythema": 12, "Feeling hot": 11, "Investigation": 11, "Magnetic resonance imaging": 11, "Tremor": 11, "Feeling cold": 10, "Muscular weakness": 10, "Neuropathy peripheral": 10, "SARS-CoV-2 test": 10, "Anaphylactic shock": 9, "Hypersensitivity": 9, "Pallor": 9, "Peripheral coldness": 9, "Tachycardia": 9, "Back pain": 8, "Computerised tomogram": 8, "Magnetic resonance imaging head": 8, "Asthenia": 7, "Bradycardia": 7, "Chest X-ray": 7, "Computerised tomogram head": 7, "Fibrin D dimer": 7, "Gait disturbance": 7, "Head discomfort": 7, "Internal haemorrhage": 7, "Lymphadenopathy": 7, "Seizure": 7, "Altered state of consciousness": 6, "Arrhythmia": 6, "Auscultation": 6, "Chest discomfort": 6, "Cold sweat": 6, "Flushing": 6, "Haemorrhage subcutaneous": 6, "Swelling": 6, "Throat tightness": 6, "Vaccination site pruritus": 6, "Vital signs measurement": 6, "Wheezing": 6, "Blepharospasm": 5, "C-reactive protein": 5, "Discomfort": 5, "Dysphagia": 5, "Echocardiogram": 5, "Heart rate increased": 5, "Hyperhidrosis": 5, "Physical deconditioning": 5, "Subarachnoid haemorrhage": 5, "Allergy to vaccine": 4, "Circulatory collapse": 4, "Dysphonia": 4, "Facial paralysis": 4, "Hepatic function abnormal": 4, "Neck pain": 4, "Oropharyngeal pain": 4, "Physical examination": 4, "Rhinorrhoea": 4, "Somnolence": 4, "Syncope": 4, "Throat irritation": 4, "White blood cell count": 4, "Abdominal discomfort": 3, "Alanine aminotransferase": 3, "Aphasia": 3, "Aspartate aminotransferase": 3, "Blood bilirubin": 3, "Blood creatine phosphokinase": 3, "Blood pressure systolic": 3, "Cerebral infarction": 3, "Chest pain": 3, "Computerised tomogram thorax": 3, "Decreased appetite": 3, "Dysphoria": 3, "Dysstasia": 3, "Eyelid oedema": 3, "Fibrin D dimer increased": 3, "Gamma-glutamyltransferase": 3, "Guillain-Barre syndrome": 3, "Haematocrit": 3, "Haemoglobin": 3, "Hypertension": 3, "Hyperventilation": 3, "Hypothermia": 3, "Laboratory test": 3, "Movement disorder": 3, "Muscle spasms": 3, "Myocarditis": 3, "Ocular hyperaemia": 3, "Oxygen saturation decreased": 3, "PO2": 3, "Paraesthesia": 3, "Peripheral swelling": 3, "Platelet count": 3, "Respiratory disorder": 3, "Sensory disturbance": 3, "Swelling face": 3, "Ultrasound scan": 3, "Vaccination site warmth": 3, "Visual impairment": 3, "Abdominal pain upper": 2, "Acute disseminated encephalomyelitis": 2, "Anaemia": 2, "Aneurysm ruptured": 2, "Angina pectoris": 2, "Angioedema": 2, "Antinuclear antibody": 2, "Aphonia": 2, "Apnoea": 2, "Arthritis": 2, "Bell's palsy": 2, "Bilirubin conjugated": 2, "Blood albumin": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "CSF test": 2, "Capillary nail refill test": 2, "Cardio-respiratory arrest": 2, "Cerebral haemorrhage": 2, "Colitis ulcerative": 2, "Colonoscopy": 2, "Coma scale": 2, "Condition aggravated": 2, "Conjunctival hyperaemia": 2, "Dehydration": 2, "Dermatitis atopic": 2, "Drug eruption": 2, "Dyskinesia": 2, "Ear discomfort": 2, "Electrocardiogram ambulatory": 2, "Endoscopy gastrointestinal": 2, "Endoscopy large bowel": 2, "Endoscopy upper gastrointestinal tract": 2, "Erythema multiforme": 2, "Faeces soft": 2, "Fall": 2, "Feeding disorder": 2, "Full blood count": 2, "Gastrointestinal disorder": 2, "Genital haemorrhage": 2, "Haematochezia": 2, "Hepatitis acute": 2, "Herpes zoster": 2, "Hypoaesthesia oral": 2, "Illness": 2, "Imaging procedure": 2, "Insomnia": 2, "Intracranial aneurysm": 2, "Intraventricular haemorrhage": 2, "Laryngeal discomfort": 2, "Limb discomfort": 2, "Mastitis": 2, "Melaena": 2, "Muscle tightness": 2, "Myelitis": 2, "Nasopharyngitis": 2, "Neuralgia": 2, "Neurological examination": 2, "Oral discomfort": 2, "Papule": 2, "Periorbital swelling": 2, "Peripheral circulatory failure": 2, "Pharyngeal swelling": 2, "Productive cough": 2, "Rash erythematous": 2, "Raynaud's phenomenon": 2, "Red blood cell count": 2, "Respiratory rate increased": 2, "Sinus rhythm": 2, "Stridor": 2, "Systemic lupus erythematosus": 2, "Toxic skin eruption": 2, "Urine abnormality": 2, "Vaccination site haemorrhage": 2, "Vaccination site movement impairment": 2, "X-ray": 2, "Yawning": 2, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute endocarditis": 1, "Acute respiratory distress syndrome": 1, "Amnesia": 1, "Amylase": 1, "Angiocardiogram": 1, "Angiogram": 1, "Antiphospholipid syndrome": 1, "Anxiety": 1, "Arterial stenosis": 1, "Arteriosclerosis": 1, "Atrial fibrillation": 1, "Atrial septal defect": 1, "Atrial tachycardia": 1, "Audiogram": 1, "Autoimmune haemolytic anaemia": 1, "Bacterial test": 1, "Basophil percentage": 1, "Bedridden": 1, "Bilirubinuria": 1, "Biopsy skin": 1, "Blister": 1, "Blood albumin decreased": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood fibrinogen increased": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood pressure diastolic decreased": 1, "Blood pressure normal": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood urea": 1, "Bone pain": 1, "Brain herniation": 1, "Brain stem infarction": 1, "Breath sounds": 1, "Bronchitis": 1, "Bronchoscopy": 1, "Bundle branch block right": 1, "Burning sensation": 1, "Burnout syndrome": 1, "CSF cell count": 1, "Caesarean section": 1, "Calcinosis": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Carotid artery dissection": 1, "Carotid artery stenosis": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Cerebrovascular accident": 1, "Chromaturia": 1, "Circumoral oedema": 1, "Coagulation test": 1, "Coagulopathy": 1, "Coma": 1, "Completed suicide": 1, "Complex regional pain syndrome": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Conversion disorder": 1, "Coombs test": 1, "Coronary artery occlusion": 1, "Cough variant asthma": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Cytokine storm": 1, "Deafness": 1, "Deafness neurosensory": 1, "Death": 1, "Dermatitis exfoliative generalised": 1, "Disease recurrence": 1, "Dissociative disorder": 1, "Drug hypersensitivity": 1, "Dry mouth": 1, "Dry throat": 1, "Dyslalia": 1, "Dyspepsia": 1, "Ear pain": 1, "Echoencephalogram": 1, "Eczema": 1, "Electrocardiogram ST segment elevation": 1, "Encephalitis": 1, "Enterocolitis": 1, "Eosinophil percentage": 1, "Epstein-Barr virus infection reactivation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid irritation": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Flank pain": 1, "Fundoscopy": 1, "Gastric ulcer": 1, "Gastric ulcer haemorrhage": 1, "Gastrointestinal hypermotility": 1, "Gastrointestinal motility disorder": 1, "Gastrointestinal mucosal disorder": 1, "Gaze palsy": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematocrit decreased": 1, "Haematuria": 1, "Haemoglobin decreased": 1, "Haemolysis": 1, "Haemorrhage": 1, "Hemiparesis": 1, "Herpes simplex test": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypophagia": 1, "Hypopnoea": 1, "Hypotension": 1, "Hypotonia": 1, "Inappropriate schedule of product administration": 1, "Infective spondylitis": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site vesicles": 1, "Intention tremor": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intestinal haemorrhage": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "LE cells present": 1, "Lacunar infarction": 1, "Laryngeal oedema": 1, "Laryngospasm": 1, "Leukopenia": 1, "Lip pruritus": 1, "Lip swelling": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphocyte percentage": 1, "Lymphoedema": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Middle insomnia": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte count increased": 1, "Monocyte percentage": 1, "Multiple sclerosis": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myelodysplastic syndrome": 1, "Myocardial infarction": 1, "Myoclonus": 1, "Nasal congestion": 1, "Nasal obstruction": 1, "Nephrotic syndrome": 1, "Neurological examination normal": 1, "Neutrophil percentage": 1, "Nystagmus": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Office visit": 1, "Oligohydramnios": 1, "Ophthalmological examination": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "PCO2": 1, "Pain assessment": 1, "Palatal oedema": 1, "Paraesthesia oral": 1, "Paresis": 1, "Parotid gland enlargement": 1, "Penis injury": 1, "Periarthritis": 1, "Perivascular dermatitis": 1, "Pharyngeal oedema": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal stenosis": 1, "Pharyngitis bacterial": 1, "Photopsia": 1, "Pigmentation disorder": 1, "Piloerection": 1, "Pityriasis rosea": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Posturing": 1, "Premature separation of placenta": 1, "Primary hyperaldosteronism": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin time": 1, "Prurigo": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Pyelonephritis": 1, "Radial nerve palsy": 1, "Radial pulse abnormal": 1, "Rash macular": 1, "Rash papular": 1, "Rectal tenesmus": 1, "Red cell distribution width": 1, "Reduced facial expression": 1, "Respiratory rate decreased": 1, "Restlessness": 1, "Reticulocyte count": 1, "Retinal haemorrhage": 1, "Retroplacental haematoma": 1, "Scan with contrast": 1, "Sensation of foreign body": 1, "Sensory loss": 1, "Sepsis": 1, "Serology test": 1, "Shock": 1, "Sinus bradycardia": 1, "Sinusitis": 1, "Skin laceration": 1, "Sneezing": 1, "Speech disorder": 1, "Spinal cord infarction": 1, "Sputum retention": 1, "Supraventricular extrasystoles": 1, "Swelling of eyelid": 1, "Tachypnoea": 1, "Tendon pain": 1, "Tension": 1, "Thirst": 1, "Thrombosis": 1, "Tongue erythema": 1, "Tonsillitis": 1, "Trigeminal neuralgia": 1, "Troponin": 1, "Troponin I": 1, "Troponin increased": 1, "Ultrasound Doppler": 1, "Urine analysis abnormal": 1, "Uveitis": 1, "Vaccination site coldness": 1, "Vaccination site induration": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vascular injury": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Visual field defect": 1, "Vogt-Koyanagi-Harada disease": 1, "White blood cell count normal": 1, "White matter lesion": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2659", "histograms": [{"histogram": {"Body temperature": 310, "Blood pressure measurement": 120, "Pyrexia": 117, "Anaphylactic reaction": 110, "Headache": 96, "Oxygen saturation": 96, "Malaise": 87, "Heart rate": 86, "Nausea": 80, "Pruritus": 69, "Cough": 55, "Erythema": 54, "Arthralgia": 52, "Vaccination site pain": 49, "Rash": 44, "Chills": 42, "Blood pressure increased": 40, "Dyspnoea": 38, "Feeling abnormal": 37, "Urticaria": 36, "Myalgia": 35, "Dizziness": 34, "Hypoaesthesia": 29, "Oropharyngeal discomfort": 29, "Diarrhoea": 28, "Palpitations": 23, "Fatigue": 22, "Vomiting": 22, "Abdominal pain": 21, "Vaccination site swelling": 21, "Blood test": 20, "Loss of consciousness": 17, "Pain": 17, "Respiratory rate": 16, "Electrocardiogram": 13, "Pain in extremity": 13, "Presyncope": 13, "Asthma": 12, "Blood pressure decreased": 12, "Depressed level of consciousness": 12, "Vaccination site erythema": 12, "Feeling hot": 11, "Investigation": 11, "Magnetic resonance imaging": 11, "Tremor": 11, "Feeling cold": 10, "Muscular weakness": 10, "Neuropathy peripheral": 10, "SARS-CoV-2 test": 10, "Anaphylactic shock": 9, "Hypersensitivity": 9, "Pallor": 9, "Peripheral coldness": 9, "Tachycardia": 9, "Back pain": 8, "Computerised tomogram": 8, "Magnetic resonance imaging head": 8, "Asthenia": 7, "Bradycardia": 7, "Chest X-ray": 7, "Computerised tomogram head": 7, "Fibrin D dimer": 7, "Gait disturbance": 7, "Head discomfort": 7, "Internal haemorrhage": 7, "Lymphadenopathy": 7, "Seizure": 7, "Altered state of consciousness": 6, "Arrhythmia": 6, "Auscultation": 6, "Chest discomfort": 6, "Cold sweat": 6, "Flushing": 6, "Haemorrhage subcutaneous": 6, "Swelling": 6, "Throat tightness": 6, "Vaccination site pruritus": 6, "Vital signs measurement": 6, "Wheezing": 6, "Blepharospasm": 5, "C-reactive protein": 5, "Discomfort": 5, "Dysphagia": 5, "Echocardiogram": 5, "Heart rate increased": 5, "Hyperhidrosis": 5, "Physical deconditioning": 5, "Subarachnoid haemorrhage": 5, "Allergy to vaccine": 4, "Circulatory collapse": 4, "Dysphonia": 4, "Facial paralysis": 4, "Hepatic function abnormal": 4, "Neck pain": 4, "Oropharyngeal pain": 4, "Physical examination": 4, "Rhinorrhoea": 4, "Somnolence": 4, "Syncope": 4, "Throat irritation": 4, "White blood cell count": 4, "Abdominal discomfort": 3, "Alanine aminotransferase": 3, "Aphasia": 3, "Aspartate aminotransferase": 3, "Blood bilirubin": 3, "Blood creatine phosphokinase": 3, "Blood pressure systolic": 3, "Cerebral infarction": 3, "Chest pain": 3, "Computerised tomogram thorax": 3, "Decreased appetite": 3, "Dysphoria": 3, "Dysstasia": 3, "Eyelid oedema": 3, "Fibrin D dimer increased": 3, "Gamma-glutamyltransferase": 3, "Guillain-Barre syndrome": 3, "Haematocrit": 3, "Haemoglobin": 3, "Hypertension": 3, "Hyperventilation": 3, "Hypothermia": 3, "Laboratory test": 3, "Movement disorder": 3, "Muscle spasms": 3, "Myocarditis": 3, "Ocular hyperaemia": 3, "Oxygen saturation decreased": 3, "PO2": 3, "Paraesthesia": 3, "Peripheral swelling": 3, "Platelet count": 3, "Respiratory disorder": 3, "Sensory disturbance": 3, "Swelling face": 3, "Ultrasound scan": 3, "Vaccination site warmth": 3, "Visual impairment": 3, "Abdominal pain upper": 2, "Acute disseminated encephalomyelitis": 2, "Anaemia": 2, "Aneurysm ruptured": 2, "Angina pectoris": 2, "Angioedema": 2, "Antinuclear antibody": 2, "Aphonia": 2, "Apnoea": 2, "Arthritis": 2, "Bell's palsy": 2, "Bilirubin conjugated": 2, "Blood albumin": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "CSF test": 2, "Capillary nail refill test": 2, "Cardio-respiratory arrest": 2, "Cerebral haemorrhage": 2, "Colitis ulcerative": 2, "Colonoscopy": 2, "Coma scale": 2, "Condition aggravated": 2, "Conjunctival hyperaemia": 2, "Dehydration": 2, "Dermatitis atopic": 2, "Drug eruption": 2, "Dyskinesia": 2, "Ear discomfort": 2, "Electrocardiogram ambulatory": 2, "Endoscopy gastrointestinal": 2, "Endoscopy large bowel": 2, "Endoscopy upper gastrointestinal tract": 2, "Erythema multiforme": 2, "Faeces soft": 2, "Fall": 2, "Feeding disorder": 2, "Full blood count": 2, "Gastrointestinal disorder": 2, "Genital haemorrhage": 2, "Haematochezia": 2, "Hepatitis acute": 2, "Herpes zoster": 2, "Hypoaesthesia oral": 2, "Illness": 2, "Imaging procedure": 2, "Insomnia": 2, "Intracranial aneurysm": 2, "Intraventricular haemorrhage": 2, "Laryngeal discomfort": 2, "Limb discomfort": 2, "Mastitis": 2, "Melaena": 2, "Muscle tightness": 2, "Myelitis": 2, "Nasopharyngitis": 2, "Neuralgia": 2, "Neurological examination": 2, "Oral discomfort": 2, "Papule": 2, "Periorbital swelling": 2, "Peripheral circulatory failure": 2, "Pharyngeal swelling": 2, "Productive cough": 2, "Rash erythematous": 2, "Raynaud's phenomenon": 2, "Red blood cell count": 2, "Respiratory rate increased": 2, "Sinus rhythm": 2, "Stridor": 2, "Systemic lupus erythematosus": 2, "Toxic skin eruption": 2, "Urine abnormality": 2, "Vaccination site haemorrhage": 2, "Vaccination site movement impairment": 2, "X-ray": 2, "Yawning": 2, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute endocarditis": 1, "Acute respiratory distress syndrome": 1, "Amnesia": 1, "Amylase": 1, "Angiocardiogram": 1, "Angiogram": 1, "Antiphospholipid syndrome": 1, "Anxiety": 1, "Arterial stenosis": 1, "Arteriosclerosis": 1, "Atrial fibrillation": 1, "Atrial septal defect": 1, "Atrial tachycardia": 1, "Audiogram": 1, "Autoimmune haemolytic anaemia": 1, "Bacterial test": 1, "Basophil percentage": 1, "Bedridden": 1, "Bilirubinuria": 1, "Biopsy skin": 1, "Blister": 1, "Blood albumin decreased": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood fibrinogen increased": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood pressure diastolic decreased": 1, "Blood pressure normal": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood urea": 1, "Bone pain": 1, "Brain herniation": 1, "Brain stem infarction": 1, "Breath sounds": 1, "Bronchitis": 1, "Bronchoscopy": 1, "Bundle branch block right": 1, "Burning sensation": 1, "Burnout syndrome": 1, "CSF cell count": 1, "Caesarean section": 1, "Calcinosis": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Carotid artery dissection": 1, "Carotid artery stenosis": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Cerebrovascular accident": 1, "Chromaturia": 1, "Circumoral oedema": 1, "Coagulation test": 1, "Coagulopathy": 1, "Coma": 1, "Completed suicide": 1, "Complex regional pain syndrome": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Conversion disorder": 1, "Coombs test": 1, "Coronary artery occlusion": 1, "Cough variant asthma": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Cytokine storm": 1, "Deafness": 1, "Deafness neurosensory": 1, "Death": 1, "Dermatitis exfoliative generalised": 1, "Disease recurrence": 1, "Dissociative disorder": 1, "Drug hypersensitivity": 1, "Dry mouth": 1, "Dry throat": 1, "Dyslalia": 1, "Dyspepsia": 1, "Ear pain": 1, "Echoencephalogram": 1, "Eczema": 1, "Electrocardiogram ST segment elevation": 1, "Encephalitis": 1, "Enterocolitis": 1, "Eosinophil percentage": 1, "Epstein-Barr virus infection reactivation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid irritation": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Flank pain": 1, "Fundoscopy": 1, "Gastric ulcer": 1, "Gastric ulcer haemorrhage": 1, "Gastrointestinal hypermotility": 1, "Gastrointestinal motility disorder": 1, "Gastrointestinal mucosal disorder": 1, "Gaze palsy": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematocrit decreased": 1, "Haematuria": 1, "Haemoglobin decreased": 1, "Haemolysis": 1, "Haemorrhage": 1, "Hemiparesis": 1, "Herpes simplex test": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypophagia": 1, "Hypopnoea": 1, "Hypotension": 1, "Hypotonia": 1, "Inappropriate schedule of product administration": 1, "Infective spondylitis": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site vesicles": 1, "Intention tremor": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intestinal haemorrhage": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "LE cells present": 1, "Lacunar infarction": 1, "Laryngeal oedema": 1, "Laryngospasm": 1, "Leukopenia": 1, "Lip pruritus": 1, "Lip swelling": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphocyte percentage": 1, "Lymphoedema": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Middle insomnia": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte count increased": 1, "Monocyte percentage": 1, "Multiple sclerosis": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myelodysplastic syndrome": 1, "Myocardial infarction": 1, "Myoclonus": 1, "Nasal congestion": 1, "Nasal obstruction": 1, "Nephrotic syndrome": 1, "Neurological examination normal": 1, "Neutrophil percentage": 1, "Nystagmus": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Office visit": 1, "Oligohydramnios": 1, "Ophthalmological examination": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "PCO2": 1, "Pain assessment": 1, "Palatal oedema": 1, "Paraesthesia oral": 1, "Paresis": 1, "Parotid gland enlargement": 1, "Penis injury": 1, "Periarthritis": 1, "Perivascular dermatitis": 1, "Pharyngeal oedema": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal stenosis": 1, "Pharyngitis bacterial": 1, "Photopsia": 1, "Pigmentation disorder": 1, "Piloerection": 1, "Pityriasis rosea": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Posturing": 1, "Premature separation of placenta": 1, "Primary hyperaldosteronism": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin time": 1, "Prurigo": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Pyelonephritis": 1, "Radial nerve palsy": 1, "Radial pulse abnormal": 1, "Rash macular": 1, "Rash papular": 1, "Rectal tenesmus": 1, "Red cell distribution width": 1, "Reduced facial expression": 1, "Respiratory rate decreased": 1, "Restlessness": 1, "Reticulocyte count": 1, "Retinal haemorrhage": 1, "Retroplacental haematoma": 1, "Scan with contrast": 1, "Sensation of foreign body": 1, "Sensory loss": 1, "Sepsis": 1, "Serology test": 1, "Shock": 1, "Sinus bradycardia": 1, "Sinusitis": 1, "Skin laceration": 1, "Sneezing": 1, "Speech disorder": 1, "Spinal cord infarction": 1, "Sputum retention": 1, "Supraventricular extrasystoles": 1, "Swelling of eyelid": 1, "Tachypnoea": 1, "Tendon pain": 1, "Tension": 1, "Thirst": 1, "Thrombosis": 1, "Tongue erythema": 1, "Tonsillitis": 1, "Trigeminal neuralgia": 1, "Troponin": 1, "Troponin I": 1, "Troponin increased": 1, "Ultrasound Doppler": 1, "Urine analysis abnormal": 1, "Uveitis": 1, "Vaccination site coldness": 1, "Vaccination site induration": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vascular injury": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Visual field defect": 1, "Vogt-Koyanagi-Harada disease": 1, "White blood cell count normal": 1, "White matter lesion": 1, "pH body fluid": 1}, "batchcodes": ["ER2659"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER2695.json b/docs/data/histograms/Japan/ER2695.json
index cfdfa90e3dc..5cbf5a4a64e 100644
--- a/docs/data/histograms/Japan/ER2695.json
+++ b/docs/data/histograms/Japan/ER2695.json
@@ -1 +1 @@
-{"batchcode": "ER2695", "histograms": [{"batchcodes": ["ER2695"], "histogram": {"Asthma": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2695", "histograms": [{"histogram": {"Asthma": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Wheezing": 1}, "batchcodes": ["ER2695"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER3674.json b/docs/data/histograms/Japan/ER3674.json
index c1e358b5782..9afb84eb75c 100644
--- a/docs/data/histograms/Japan/ER3674.json
+++ b/docs/data/histograms/Japan/ER3674.json
@@ -1 +1 @@
-{"batchcode": "ER3674", "histograms": [{"batchcodes": ["ER3674"], "histogram": {"Amnesia": 1, "Asthma": 1, "Body temperature": 1, "Delirium": 1, "Dyspnoea": 1, "Insomnia": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "ER3674", "histograms": [{"histogram": {"Amnesia": 1, "Asthma": 1, "Body temperature": 1, "Delirium": 1, "Dyspnoea": 1, "Insomnia": 1, "Wheezing": 1}, "batchcodes": ["ER3674"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER7449.json b/docs/data/histograms/Japan/ER7449.json
index 109eb140444..fc7521bd88d 100644
--- a/docs/data/histograms/Japan/ER7449.json
+++ b/docs/data/histograms/Japan/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Body temperature": 442, "Blood pressure measurement": 173, "Anaphylactic reaction": 161, "Oxygen saturation": 128, "Heart rate": 116, "Headache": 92, "Nausea": 89, "Pruritus": 83, "Pyrexia": 77, "Erythema": 72, "Malaise": 72, "Dyspnoea": 71, "Feeling abnormal": 66, "Blood pressure increased": 60, "Urticaria": 52, "Cough": 47, "Rash": 47, "Dizziness": 44, "Hypoaesthesia": 43, "Oropharyngeal discomfort": 40, "Vomiting": 40, "Palpitations": 37, "Vaccination site pain": 32, "Depressed level of consciousness": 24, "Diarrhoea": 23, "Chills": 22, "Arthralgia": 21, "Pallor": 21, "Feeling cold": 20, "Myalgia": 20, "Hypersensitivity": 19, "Blood test": 18, "Pain": 18, "Presyncope": 18, "Blood pressure decreased": 17, "Magnetic resonance imaging": 17, "Oxygen saturation decreased": 17, "Tachycardia": 17, "Abdominal pain": 16, "Electrocardiogram": 16, "Investigation": 15, "Respiratory rate": 15, "Vital signs measurement": 15, "Asthenia": 14, "Asthma": 14, "Pain in extremity": 14, "SARS-CoV-2 test": 13, "Throat tightness": 13, "Computerised tomogram": 12, "Feeling hot": 12, "Cold sweat": 11, "Decreased appetite": 11, "Hyperhidrosis": 11, "Hyperventilation": 11, "White blood cell count": 11, "C-reactive protein": 10, "Dysphonia": 10, "Flushing": 10, "Muscular weakness": 10, "Neuropathy peripheral": 10, "Throat irritation": 10, "Back pain": 9, "Chest discomfort": 9, "Computerised tomogram head": 9, "Fatigue": 9, "Hot flush": 9, "Loss of consciousness": 9, "Oropharyngeal pain": 9, "Swelling": 9, "Wheezing": 9, "Dysphoria": 8, "Facial paralysis": 8, "Paraesthesia": 8, "Seizure": 8, "Somnolence": 8, "Syncope": 8, "Tremor": 8, "Vaccination site swelling": 8, "Visual impairment": 8, "Altered state of consciousness": 7, "Head discomfort": 7, "Heart rate increased": 7, "Hepatic function abnormal": 7, "Lymphadenopathy": 7, "Ocular hyperaemia": 7, "Peripheral coldness": 7, "Abdominal discomfort": 6, "Body temperature increased": 6, "Dysphagia": 6, "Fall": 6, "Hypoaesthesia oral": 6, "Subarachnoid haemorrhage": 6, "Vaccination site pruritus": 6, "Anaphylactic shock": 5, "Anxiety": 5, "Coma scale": 5, "Discomfort": 5, "Drug eruption": 5, "Echocardiogram": 5, "Eczema": 5, "Genital haemorrhage": 5, "Haemorrhage": 5, "Hypertension": 5, "Magnetic resonance imaging head": 5, "Platelet count": 5, "Sensory disturbance": 5, "Abdominal pain lower": 4, "Abdominal pain upper": 4, "Auscultation": 4, "Blood pressure systolic": 4, "Bradycardia": 4, "Cardio-respiratory arrest": 4, "Cerebral infarction": 4, "Chest X-ray": 4, "Dehydration": 4, "Eye pruritus": 4, "Face oedema": 4, "Feeding disorder": 4, "Guillain-Barre syndrome": 4, "Laryngeal discomfort": 4, "Muscle spasms": 4, "Musculoskeletal stiffness": 4, "Neurological symptom": 4, "PO2": 4, "Pharyngeal swelling": 4, "Physical deconditioning": 4, "Rhinorrhoea": 4, "Sensation of foreign body": 4, "Tachypnoea": 4, "Type I hypersensitivity": 4, "Vaccination site erythema": 4, "Abdominal distension": 3, "Alanine aminotransferase": 3, "Allergy to vaccine": 3, "Amylase": 3, "Anxiety disorder": 3, "Arrhythmia": 3, "Arthropathy": 3, "Aspartate aminotransferase": 3, "Asphyxia": 3, "Blood creatinine": 3, "Blood lactate dehydrogenase": 3, "Blood potassium": 3, "Blood urea": 3, "COVID-19": 3, "Chest pain": 3, "Computerised tomogram thorax": 3, "Cyanosis": 3, "Dizziness postural": 3, "Epilepsy": 3, "Erythema multiforme": 3, "Gait disturbance": 3, "Hypotension": 3, "Hypoxia": 3, "Insomnia": 3, "Larynx irritation": 3, "Lip swelling": 3, "Lymphocyte count": 3, "Myocarditis": 3, "Nasal congestion": 3, "Neck pain": 3, "Neutrophil count": 3, "Oral discomfort": 3, "Oral pruritus": 3, "Peripheral swelling": 3, "Polymerase chain reaction": 3, "Rash erythematous": 3, "Rash papular": 3, "Red blood cell count": 3, "Respiratory disorder": 3, "Respiratory rate increased": 3, "Skin exfoliation": 3, "Swelling of eyelid": 3, "Urinary occult blood": 3, "Angioedema": 2, "Angiogram": 2, "Aphasia": 2, "Arthritis": 2, "Atrial fibrillation": 2, "Axillary pain": 2, "Blister": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood pressure abnormal": 2, "Blood pressure systolic increased": 2, "Bronchospasm": 2, "CSF test": 2, "Cerebral haemorrhage": 2, "Cerebrovascular disorder": 2, "Colitis ischaemic": 2, "Condition aggravated": 2, "Conjunctival hyperaemia": 2, "Cystitis": 2, "Death": 2, "Deep vein thrombosis": 2, "Depressed mood": 2, "Dermatitis": 2, "Dermatitis allergic": 2, "Diplopia": 2, "Drug hypersensitivity": 2, "Drug ineffective": 2, "Dysstasia": 2, "Dysuria": 2, "Epistaxis": 2, "Eye haemorrhage": 2, "Eyelid oedema": 2, "Gamma-glutamyltransferase": 2, "Gastrointestinal disorder": 2, "Haematochezia": 2, "Haematocrit": 2, "Haematuria": 2, "Haemoglobin": 2, "Haemorrhage subcutaneous": 2, "Heart rate decreased": 2, "Herpes zoster": 2, "High density lipoprotein": 2, "Hypophagia": 2, "Inflammation": 2, "Internal haemorrhage": 2, "Intracranial aneurysm": 2, "Joint range of motion decreased": 2, "Laryngeal obstruction": 2, "Laryngeal oedema": 2, "Liver function test": 2, "Low density lipoprotein": 2, "Lymphadenitis": 2, "Lymphocyte count decreased": 2, "Maternal exposure during pregnancy": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Meniere's disease": 2, "Miller Fisher syndrome": 2, "Monoparesis": 2, "Movement disorder": 2, "Muscle tightness": 2, "Neutrophil count decreased": 2, "Oculomucocutaneous syndrome": 2, "Oedema": 2, "Oedema mouth": 2, "Orthostatic hypotension": 2, "Panic attack": 2, "Paralysis": 2, "Parosmia": 2, "Periorbital swelling": 2, "Physical examination": 2, "Protein total": 2, "Protein urine": 2, "Rash pruritic": 2, "Renal impairment": 2, "Respiratory distress": 2, "Retinal haemorrhage": 2, "Retinal vein occlusion": 2, "Sinus tachycardia": 2, "Smear test": 2, "Swelling face": 2, "Tension": 2, "Thirst": 2, "Toxic skin eruption": 2, "Transient ischaemic attack": 2, "Ultrasound scan": 2, "Urinary tract infection": 2, "Vaccination site movement impairment": 2, "Ventricular extrasystoles": 2, "Visual acuity reduced": 2, "Weight": 2, "Abnormal behaviour": 1, "Abnormal faeces": 1, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute abdomen": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Albumin globulin ratio": 1, "Allergic reaction to excipient": 1, "Allergy test": 1, "Aneurysm": 1, "Angina pectoris": 1, "Anti-RNA polymerase III antibody": 1, "Anti-ganglioside antibody": 1, "Anticipatory anxiety": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Apathy": 1, "Areflexia": 1, "Arrhythmia supraventricular": 1, "Arteriosclerosis": 1, "Artery dissection": 1, "Arthritis reactive": 1, "Auditory disorder": 1, "Autoantibody test": 1, "Autonomic neuropathy": 1, "Balance disorder": 1, "Basilar artery occlusion": 1, "Basophil count": 1, "Bell's palsy": 1, "Biopsy": 1, "Biopsy skin": 1, "Blepharospasm": 1, "Blindness unilateral": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood gases": 1, "Blood pressure ambulatory abnormal": 1, "Blood pressure diastolic increased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Blue toe syndrome": 1, "Body height": 1, "Bone pain": 1, "Brain natriuretic peptide": 1, "Brain stem infarction": 1, "Bursal fluid accumulation": 1, "COVID-19 pneumonia": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Capillary nail refill test": 1, "Cardiac discomfort": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure acute": 1, "Cardiac failure congestive": 1, "Cerebral palsy": 1, "Cerebral ventricular rupture": 1, "Chillblains": 1, "Choking sensation": 1, "Clonic convulsion": 1, "Colitis ulcerative": 1, "Colonoscopy": 1, "Completed suicide": 1, "Computerised tomogram abdomen": 1, "Congestive cardiomyopathy": 1, "Conjunctivitis": 1, "Cubital tunnel syndrome": 1, "Culture stool": 1, "Deafness": 1, "Deafness neurosensory": 1, "Dermatitis bullous": 1, "Diabetes mellitus": 1, "Disease recurrence": 1, "Distractibility": 1, "Disturbance in attention": 1, "Dry skin": 1, "Dysarthria": 1, "Dyschezia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dyspnoea exertional": 1, "EGFR status assay": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Eating disorder": 1, "Ecchymosis": 1, "Electroencephalogram": 1, "Electroencephalogram abnormal": 1, "Electroneurography": 1, "Embolic stroke": 1, "Enanthema": 1, "Encephalitis": 1, "Encephalopathy": 1, "Endoscopy": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Erythropsia": 1, "Exposure during pregnancy": 1, "Extraocular muscle disorder": 1, "Extremity contracture": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eye swelling": 1, "Eyelid rash": 1, "Eyelids pruritus": 1, "Facial neuralgia": 1, "Fat tissue increased": 1, "Feeling drunk": 1, "Female reproductive tract disorder": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Flatulence": 1, "Foetal malformation": 1, "Foot fracture": 1, "Foreign body in respiratory tract": 1, "Gastrointestinal necrosis": 1, "General physical health deterioration": 1, "Gingival bleeding": 1, "Grip strength": 1, "Haematoma": 1, "Hand dermatitis": 1, "Head injury": 1, "Heat illness": 1, "Heavy menstrual bleeding": 1, "Hemiataxia": 1, "Hemiplegia": 1, "Hepatitis": 1, "Herpes zoster oticus": 1, "Hiccups": 1, "Hypoacusis": 1, "Hypokalaemia": 1, "Illusion": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Inflammatory marker increased": 1, "Initial insomnia": 1, "Injection site pruritus": 1, "Intra-cerebral aneurysm operation": 1, "Intraocular pressure increased": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Language disorder": 1, "Laryngeal pain": 1, "Leucine aminopeptidase": 1, "Limb discomfort": 1, "Lip erythema": 1, "Lip haemorrhage": 1, "Lip oedema": 1, "Listless": 1, "Local reaction": 1, "Loss of control of legs": 1, "Lumbar puncture": 1, "Lumbar spinal stenosis": 1, "Lumbar vertebral fracture": 1, "Lymph node pain": 1, "Lymphocyte stimulation test": 1, "Lymphoma": 1, "Macular oedema": 1, "Meningitis aseptic": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Mental impairment": 1, "Mesenteric arterial occlusion": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte count": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Mouth ulceration": 1, "Mucosal inflammation": 1, "Muscle fatigue": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myopathy": 1, "Nail bed disorder": 1, "Neoplasm": 1, "Nephropathy": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neuritis cranial": 1, "Nucleic acid test": 1, "Nystagmus": 1, "Odynophagia": 1, "Oedema mucosal": 1, "Oedema peripheral": 1, "Ophthalmoplegia": 1, "Optic neuritis": 1, "Orbital oedema": 1, "Organising pneumonia": 1, "Ovarian haemorrhage": 1, "PCO2": 1, "Pain of skin": 1, "Panic disorder": 1, "Papule": 1, "Paraesthesia oral": 1, "Paralysis recurrent laryngeal nerve": 1, "Parotid gland enlargement": 1, "Pemphigoid": 1, "Peripheral circulatory failure": 1, "Peripheral vascular disorder": 1, "Pharyngeal oedema": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal stenosis": 1, "Pharyngitis": 1, "Pharyngitis bacterial": 1, "Photopsia": 1, "Platelet count decreased": 1, "Platelet disorder": 1, "Pneumonia aspiration": 1, "Pneumothorax": 1, "Pollakiuria": 1, "Poor quality sleep": 1, "Portal vein embolism": 1, "Posthaemorrhagic hydrocephalus": 1, "Postmenopausal haemorrhage": 1, "Posture abnormal": 1, "Procalcitonin": 1, "Productive cough": 1, "Progressive supranuclear palsy": 1, "Prurigo": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pulse abnormal": 1, "Pupils unequal": 1, "Pyelonephritis": 1, "Quadriparesis": 1, "Radial pulse": 1, "Radial pulse abnormal": 1, "Reaction to preservatives": 1, "Renal function test": 1, "Respiratory acidosis": 1, "Respiratory failure": 1, "Rheumatic disorder": 1, "Rheumatoid factor": 1, "Rhinitis": 1, "Ruptured cerebral aneurysm": 1, "Scan with contrast": 1, "Sciatica": 1, "Scratch": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sialoadenitis": 1, "Sinus arrest": 1, "Sinus bradycardia": 1, "Skin abrasion": 1, "Sleep deficit": 1, "Slow speech": 1, "Sneezing": 1, "Splenomegaly": 1, "Status migrainosus": 1, "Still's disease": 1, "Stress": 1, "Sudden death": 1, "Taste disorder": 1, "Tetany": 1, "Thalamic infarction": 1, "Thalamus haemorrhage": 1, "Thrombosis": 1, "Tic": 1, "Tinnitus": 1, "Tongue discomfort": 1, "Tonsillitis": 1, "Tonsillitis bacterial": 1, "Tracheal stenosis": 1, "Transient global amnesia": 1, "Type IV hypersensitivity reaction": 1, "Ulnar nerve palsy": 1, "Urinary occult blood positive": 1, "Urine output decreased": 1, "VIth nerve disorder": 1, "Vaccination failure": 1, "Vaccination site coldness": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Varicella virus test": 1, "Venous oxygen saturation": 1, "Venous thrombosis limb": 1, "Viral infection": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual brightness": 1, "Visual field defect": 1, "Vocal cord paralysis": 1, "Weight increased": 1, "X-ray": 1, "Yawning": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Body temperature": 442, "Blood pressure measurement": 173, "Anaphylactic reaction": 161, "Oxygen saturation": 128, "Heart rate": 116, "Headache": 92, "Nausea": 89, "Pruritus": 83, "Pyrexia": 77, "Erythema": 72, "Malaise": 72, "Dyspnoea": 71, "Feeling abnormal": 66, "Blood pressure increased": 60, "Urticaria": 52, "Cough": 47, "Rash": 47, "Dizziness": 44, "Hypoaesthesia": 43, "Oropharyngeal discomfort": 40, "Vomiting": 40, "Palpitations": 37, "Vaccination site pain": 32, "Depressed level of consciousness": 24, "Diarrhoea": 23, "Chills": 22, "Arthralgia": 21, "Pallor": 21, "Feeling cold": 20, "Myalgia": 20, "Hypersensitivity": 19, "Blood test": 18, "Pain": 18, "Presyncope": 18, "Blood pressure decreased": 17, "Magnetic resonance imaging": 17, "Oxygen saturation decreased": 17, "Tachycardia": 17, "Abdominal pain": 16, "Electrocardiogram": 16, "Investigation": 15, "Respiratory rate": 15, "Vital signs measurement": 15, "Asthenia": 14, "Asthma": 14, "Pain in extremity": 14, "SARS-CoV-2 test": 13, "Throat tightness": 13, "Computerised tomogram": 12, "Feeling hot": 12, "Cold sweat": 11, "Decreased appetite": 11, "Hyperhidrosis": 11, "Hyperventilation": 11, "White blood cell count": 11, "C-reactive protein": 10, "Dysphonia": 10, "Flushing": 10, "Muscular weakness": 10, "Neuropathy peripheral": 10, "Throat irritation": 10, "Back pain": 9, "Chest discomfort": 9, "Computerised tomogram head": 9, "Fatigue": 9, "Hot flush": 9, "Loss of consciousness": 9, "Oropharyngeal pain": 9, "Swelling": 9, "Wheezing": 9, "Dysphoria": 8, "Facial paralysis": 8, "Paraesthesia": 8, "Seizure": 8, "Somnolence": 8, "Syncope": 8, "Tremor": 8, "Vaccination site swelling": 8, "Visual impairment": 8, "Altered state of consciousness": 7, "Head discomfort": 7, "Heart rate increased": 7, "Hepatic function abnormal": 7, "Lymphadenopathy": 7, "Ocular hyperaemia": 7, "Peripheral coldness": 7, "Abdominal discomfort": 6, "Body temperature increased": 6, "Dysphagia": 6, "Fall": 6, "Hypoaesthesia oral": 6, "Subarachnoid haemorrhage": 6, "Vaccination site pruritus": 6, "Anaphylactic shock": 5, "Anxiety": 5, "Coma scale": 5, "Discomfort": 5, "Drug eruption": 5, "Echocardiogram": 5, "Eczema": 5, "Genital haemorrhage": 5, "Haemorrhage": 5, "Hypertension": 5, "Magnetic resonance imaging head": 5, "Platelet count": 5, "Sensory disturbance": 5, "Abdominal pain lower": 4, "Abdominal pain upper": 4, "Auscultation": 4, "Blood pressure systolic": 4, "Bradycardia": 4, "Cardio-respiratory arrest": 4, "Cerebral infarction": 4, "Chest X-ray": 4, "Dehydration": 4, "Eye pruritus": 4, "Face oedema": 4, "Feeding disorder": 4, "Guillain-Barre syndrome": 4, "Laryngeal discomfort": 4, "Muscle spasms": 4, "Musculoskeletal stiffness": 4, "Neurological symptom": 4, "PO2": 4, "Pharyngeal swelling": 4, "Physical deconditioning": 4, "Rhinorrhoea": 4, "Sensation of foreign body": 4, "Tachypnoea": 4, "Type I hypersensitivity": 4, "Vaccination site erythema": 4, "Abdominal distension": 3, "Alanine aminotransferase": 3, "Allergy to vaccine": 3, "Amylase": 3, "Anxiety disorder": 3, "Arrhythmia": 3, "Arthropathy": 3, "Aspartate aminotransferase": 3, "Asphyxia": 3, "Blood creatinine": 3, "Blood lactate dehydrogenase": 3, "Blood potassium": 3, "Blood urea": 3, "COVID-19": 3, "Chest pain": 3, "Computerised tomogram thorax": 3, "Cyanosis": 3, "Dizziness postural": 3, "Epilepsy": 3, "Erythema multiforme": 3, "Gait disturbance": 3, "Hypotension": 3, "Hypoxia": 3, "Insomnia": 3, "Larynx irritation": 3, "Lip swelling": 3, "Lymphocyte count": 3, "Myocarditis": 3, "Nasal congestion": 3, "Neck pain": 3, "Neutrophil count": 3, "Oral discomfort": 3, "Oral pruritus": 3, "Peripheral swelling": 3, "Polymerase chain reaction": 3, "Rash erythematous": 3, "Rash papular": 3, "Red blood cell count": 3, "Respiratory disorder": 3, "Respiratory rate increased": 3, "Skin exfoliation": 3, "Swelling of eyelid": 3, "Urinary occult blood": 3, "Angioedema": 2, "Angiogram": 2, "Aphasia": 2, "Arthritis": 2, "Atrial fibrillation": 2, "Axillary pain": 2, "Blister": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood pressure abnormal": 2, "Blood pressure systolic increased": 2, "Bronchospasm": 2, "CSF test": 2, "Cerebral haemorrhage": 2, "Cerebrovascular disorder": 2, "Colitis ischaemic": 2, "Condition aggravated": 2, "Conjunctival hyperaemia": 2, "Cystitis": 2, "Death": 2, "Deep vein thrombosis": 2, "Depressed mood": 2, "Dermatitis": 2, "Dermatitis allergic": 2, "Diplopia": 2, "Drug hypersensitivity": 2, "Drug ineffective": 2, "Dysstasia": 2, "Dysuria": 2, "Epistaxis": 2, "Eye haemorrhage": 2, "Eyelid oedema": 2, "Gamma-glutamyltransferase": 2, "Gastrointestinal disorder": 2, "Haematochezia": 2, "Haematocrit": 2, "Haematuria": 2, "Haemoglobin": 2, "Haemorrhage subcutaneous": 2, "Heart rate decreased": 2, "Herpes zoster": 2, "High density lipoprotein": 2, "Hypophagia": 2, "Inflammation": 2, "Internal haemorrhage": 2, "Intracranial aneurysm": 2, "Joint range of motion decreased": 2, "Laryngeal obstruction": 2, "Laryngeal oedema": 2, "Liver function test": 2, "Low density lipoprotein": 2, "Lymphadenitis": 2, "Lymphocyte count decreased": 2, "Maternal exposure during pregnancy": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Meniere's disease": 2, "Miller Fisher syndrome": 2, "Monoparesis": 2, "Movement disorder": 2, "Muscle tightness": 2, "Neutrophil count decreased": 2, "Oculomucocutaneous syndrome": 2, "Oedema": 2, "Oedema mouth": 2, "Orthostatic hypotension": 2, "Panic attack": 2, "Paralysis": 2, "Parosmia": 2, "Periorbital swelling": 2, "Physical examination": 2, "Protein total": 2, "Protein urine": 2, "Rash pruritic": 2, "Renal impairment": 2, "Respiratory distress": 2, "Retinal haemorrhage": 2, "Retinal vein occlusion": 2, "Sinus tachycardia": 2, "Smear test": 2, "Swelling face": 2, "Tension": 2, "Thirst": 2, "Toxic skin eruption": 2, "Transient ischaemic attack": 2, "Ultrasound scan": 2, "Urinary tract infection": 2, "Vaccination site movement impairment": 2, "Ventricular extrasystoles": 2, "Visual acuity reduced": 2, "Weight": 2, "Abnormal behaviour": 1, "Abnormal faeces": 1, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute abdomen": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Albumin globulin ratio": 1, "Allergic reaction to excipient": 1, "Allergy test": 1, "Aneurysm": 1, "Angina pectoris": 1, "Anti-RNA polymerase III antibody": 1, "Anti-ganglioside antibody": 1, "Anticipatory anxiety": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Apathy": 1, "Areflexia": 1, "Arrhythmia supraventricular": 1, "Arteriosclerosis": 1, "Artery dissection": 1, "Arthritis reactive": 1, "Auditory disorder": 1, "Autoantibody test": 1, "Autonomic neuropathy": 1, "Balance disorder": 1, "Basilar artery occlusion": 1, "Basophil count": 1, "Bell's palsy": 1, "Biopsy": 1, "Biopsy skin": 1, "Blepharospasm": 1, "Blindness unilateral": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood gases": 1, "Blood pressure ambulatory abnormal": 1, "Blood pressure diastolic increased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Blue toe syndrome": 1, "Body height": 1, "Bone pain": 1, "Brain natriuretic peptide": 1, "Brain stem infarction": 1, "Bursal fluid accumulation": 1, "COVID-19 pneumonia": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Capillary nail refill test": 1, "Cardiac discomfort": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure acute": 1, "Cardiac failure congestive": 1, "Cerebral palsy": 1, "Cerebral ventricular rupture": 1, "Chillblains": 1, "Choking sensation": 1, "Clonic convulsion": 1, "Colitis ulcerative": 1, "Colonoscopy": 1, "Completed suicide": 1, "Computerised tomogram abdomen": 1, "Congestive cardiomyopathy": 1, "Conjunctivitis": 1, "Cubital tunnel syndrome": 1, "Culture stool": 1, "Deafness": 1, "Deafness neurosensory": 1, "Dermatitis bullous": 1, "Diabetes mellitus": 1, "Disease recurrence": 1, "Distractibility": 1, "Disturbance in attention": 1, "Dry skin": 1, "Dysarthria": 1, "Dyschezia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dyspnoea exertional": 1, "EGFR status assay": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Eating disorder": 1, "Ecchymosis": 1, "Electroencephalogram": 1, "Electroencephalogram abnormal": 1, "Electroneurography": 1, "Embolic stroke": 1, "Enanthema": 1, "Encephalitis": 1, "Encephalopathy": 1, "Endoscopy": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Erythropsia": 1, "Exposure during pregnancy": 1, "Extraocular muscle disorder": 1, "Extremity contracture": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eye swelling": 1, "Eyelid rash": 1, "Eyelids pruritus": 1, "Facial neuralgia": 1, "Fat tissue increased": 1, "Feeling drunk": 1, "Female reproductive tract disorder": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Flatulence": 1, "Foetal malformation": 1, "Foot fracture": 1, "Foreign body in respiratory tract": 1, "Gastrointestinal necrosis": 1, "General physical health deterioration": 1, "Gingival bleeding": 1, "Grip strength": 1, "Haematoma": 1, "Hand dermatitis": 1, "Head injury": 1, "Heat illness": 1, "Heavy menstrual bleeding": 1, "Hemiataxia": 1, "Hemiplegia": 1, "Hepatitis": 1, "Herpes zoster oticus": 1, "Hiccups": 1, "Hypoacusis": 1, "Hypokalaemia": 1, "Illusion": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Inflammatory marker increased": 1, "Initial insomnia": 1, "Injection site pruritus": 1, "Intra-cerebral aneurysm operation": 1, "Intraocular pressure increased": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Language disorder": 1, "Laryngeal pain": 1, "Leucine aminopeptidase": 1, "Limb discomfort": 1, "Lip erythema": 1, "Lip haemorrhage": 1, "Lip oedema": 1, "Listless": 1, "Local reaction": 1, "Loss of control of legs": 1, "Lumbar puncture": 1, "Lumbar spinal stenosis": 1, "Lumbar vertebral fracture": 1, "Lymph node pain": 1, "Lymphocyte stimulation test": 1, "Lymphoma": 1, "Macular oedema": 1, "Meningitis aseptic": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Mental impairment": 1, "Mesenteric arterial occlusion": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte count": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Mouth ulceration": 1, "Mucosal inflammation": 1, "Muscle fatigue": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myopathy": 1, "Nail bed disorder": 1, "Neoplasm": 1, "Nephropathy": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neuritis cranial": 1, "Nucleic acid test": 1, "Nystagmus": 1, "Odynophagia": 1, "Oedema mucosal": 1, "Oedema peripheral": 1, "Ophthalmoplegia": 1, "Optic neuritis": 1, "Orbital oedema": 1, "Organising pneumonia": 1, "Ovarian haemorrhage": 1, "PCO2": 1, "Pain of skin": 1, "Panic disorder": 1, "Papule": 1, "Paraesthesia oral": 1, "Paralysis recurrent laryngeal nerve": 1, "Parotid gland enlargement": 1, "Pemphigoid": 1, "Peripheral circulatory failure": 1, "Peripheral vascular disorder": 1, "Pharyngeal oedema": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal stenosis": 1, "Pharyngitis": 1, "Pharyngitis bacterial": 1, "Photopsia": 1, "Platelet count decreased": 1, "Platelet disorder": 1, "Pneumonia aspiration": 1, "Pneumothorax": 1, "Pollakiuria": 1, "Poor quality sleep": 1, "Portal vein embolism": 1, "Posthaemorrhagic hydrocephalus": 1, "Postmenopausal haemorrhage": 1, "Posture abnormal": 1, "Procalcitonin": 1, "Productive cough": 1, "Progressive supranuclear palsy": 1, "Prurigo": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pulse abnormal": 1, "Pupils unequal": 1, "Pyelonephritis": 1, "Quadriparesis": 1, "Radial pulse": 1, "Radial pulse abnormal": 1, "Reaction to preservatives": 1, "Renal function test": 1, "Respiratory acidosis": 1, "Respiratory failure": 1, "Rheumatic disorder": 1, "Rheumatoid factor": 1, "Rhinitis": 1, "Ruptured cerebral aneurysm": 1, "Scan with contrast": 1, "Sciatica": 1, "Scratch": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sialoadenitis": 1, "Sinus arrest": 1, "Sinus bradycardia": 1, "Skin abrasion": 1, "Sleep deficit": 1, "Slow speech": 1, "Sneezing": 1, "Splenomegaly": 1, "Status migrainosus": 1, "Still's disease": 1, "Stress": 1, "Sudden death": 1, "Taste disorder": 1, "Tetany": 1, "Thalamic infarction": 1, "Thalamus haemorrhage": 1, "Thrombosis": 1, "Tic": 1, "Tinnitus": 1, "Tongue discomfort": 1, "Tonsillitis": 1, "Tonsillitis bacterial": 1, "Tracheal stenosis": 1, "Transient global amnesia": 1, "Type IV hypersensitivity reaction": 1, "Ulnar nerve palsy": 1, "Urinary occult blood positive": 1, "Urine output decreased": 1, "VIth nerve disorder": 1, "Vaccination failure": 1, "Vaccination site coldness": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Varicella virus test": 1, "Venous oxygen saturation": 1, "Venous thrombosis limb": 1, "Viral infection": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual brightness": 1, "Visual field defect": 1, "Vocal cord paralysis": 1, "Weight increased": 1, "X-ray": 1, "Yawning": 1, "pH body fluid": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER7449?.json b/docs/data/histograms/Japan/ER7449?.json
index 0dbbb6e8cc3..9bda3c49f9e 100644
--- a/docs/data/histograms/Japan/ER7449?.json
+++ b/docs/data/histograms/Japan/ER7449?.json
@@ -1 +1 @@
-{"batchcode": "ER7449?", "histograms": [{"batchcodes": ["ER7449?"], "histogram": {"Blood pressure measurement": 1, "Cough": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pallor": 1, "Presyncope": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449?", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Cough": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pallor": 1, "Presyncope": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["ER7449?"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER7499.json b/docs/data/histograms/Japan/ER7499.json
index 1280d0b2114..692576f1dd4 100644
--- a/docs/data/histograms/Japan/ER7499.json
+++ b/docs/data/histograms/Japan/ER7499.json
@@ -1 +1 @@
-{"batchcode": "ER7499", "histograms": [{"batchcodes": ["ER7499"], "histogram": {"Pruritus": 2, "Urticaria": 2, "Body temperature": 1, "Cough": 1, "Dysphonia": 1, "Eczema": 1, "Erythema": 1, "Feeling abnormal": 1, "Headache": 1, "Oral discomfort": 1, "Oral pruritus": 1, "Paralysis": 1, "Rash": 1, "Tongue erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7499", "histograms": [{"histogram": {"Pruritus": 2, "Urticaria": 2, "Body temperature": 1, "Cough": 1, "Dysphonia": 1, "Eczema": 1, "Erythema": 1, "Feeling abnormal": 1, "Headache": 1, "Oral discomfort": 1, "Oral pruritus": 1, "Paralysis": 1, "Rash": 1, "Tongue erythema": 1}, "batchcodes": ["ER7499"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER9408.json b/docs/data/histograms/Japan/ER9408.json
index be9f7f2f6bb..131dc9354b8 100644
--- a/docs/data/histograms/Japan/ER9408.json
+++ b/docs/data/histograms/Japan/ER9408.json
@@ -1 +1 @@
-{"batchcode": "ER9408", "histograms": [{"batchcodes": ["ER9408"], "histogram": {"Headache": 1, "Hot flush": 1, "Limb discomfort": 1, "Peripheral swelling": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9408", "histograms": [{"histogram": {"Headache": 1, "Hot flush": 1, "Limb discomfort": 1, "Peripheral swelling": 1, "Pruritus": 1}, "batchcodes": ["ER9408"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER9480.json b/docs/data/histograms/Japan/ER9480.json
index 1f1bc130ecd..ace1679b5be 100644
--- a/docs/data/histograms/Japan/ER9480.json
+++ b/docs/data/histograms/Japan/ER9480.json
@@ -1 +1 @@
-{"batchcode": "ER9480", "histograms": [{"batchcodes": ["ER9480"], "histogram": {"Body temperature": 361, "Blood pressure measurement": 163, "Oxygen saturation": 124, "Anaphylactic reaction": 113, "Heart rate": 110, "Pyrexia": 92, "Nausea": 87, "Headache": 85, "Malaise": 72, "Pruritus": 60, "Blood pressure increased": 54, "Dyspnoea": 54, "Erythema": 51, "Oropharyngeal discomfort": 49, "Palpitations": 41, "Feeling abnormal": 39, "Cough": 37, "Dizziness": 36, "Hypoaesthesia": 36, "Rash": 36, "Vomiting": 27, "Chills": 25, "Urticaria": 25, "Diarrhoea": 21, "Tachycardia": 21, "Vaccination site pain": 21, "Arthralgia": 20, "Asthma": 20, "Feeling hot": 20, "Abdominal pain": 19, "Vital signs measurement": 19, "Neuropathy peripheral": 18, "Blood test": 17, "Myalgia": 17, "Presyncope": 16, "Respiratory rate": 16, "Wheezing": 15, "Blood pressure decreased": 14, "Computerised tomogram": 14, "Electrocardiogram": 14, "Cold sweat": 13, "Hypersensitivity": 13, "Throat tightness": 13, "Sensory disturbance": 12, "Dysphoria": 11, "Hot flush": 11, "Hyperhidrosis": 11, "Magnetic resonance imaging": 11, "Muscular weakness": 11, "SARS-CoV-2 test": 11, "Decreased appetite": 10, "Vaccination site erythema": 10, "Vaccination site swelling": 10, "Anaphylactic shock": 9, "Back pain": 9, "Heart rate increased": 9, "Hypertension": 9, "Hypoaesthesia oral": 9, "Pain in extremity": 9, "Throat irritation": 9, "White blood cell count": 9, "C-reactive protein": 8, "Hyperventilation": 8, "Oxygen saturation decreased": 8, "Rhinorrhoea": 8, "Abdominal discomfort": 7, "Coma scale": 7, "Feeling cold": 7, "Investigation": 7, "Loss of consciousness": 7, "Pain": 7, "Pallor": 7, "Peripheral coldness": 7, "Anxiety": 6, "Cerebral infarction": 6, "Depressed level of consciousness": 6, "Fatigue": 6, "Tremor": 6, "Blood lactate dehydrogenase": 5, "Bradycardia": 5, "Chest pain": 5, "Dysphonia": 5, "Flushing": 5, "Internal haemorrhage": 5, "Magnetic resonance imaging head": 5, "Oculomucocutaneous syndrome": 5, "Oropharyngeal pain": 5, "Seizure": 5, "Somnolence": 5, "Vaccination site pruritus": 5, "Vertigo": 5, "Arrhythmia": 4, "Auscultation": 4, "Blood sodium": 4, "Blood urea": 4, "Chest discomfort": 4, "Drug eruption": 4, "Face oedema": 4, "Facial paralysis": 4, "Head discomfort": 4, "Lip swelling": 4, "Paraesthesia": 4, "Paraesthesia oral": 4, "Platelet count": 4, "Polymerase chain reaction": 4, "Red blood cell count": 4, "Tachypnoea": 4, "Visual impairment": 4, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Asthenia": 3, "Blood chloride": 3, "Blood creatine phosphokinase": 3, "Blood glucose": 3, "Blood potassium": 3, "Blood pressure systolic": 3, "C-reactive protein increased": 3, "COVID-19": 3, "Cardiac arrest": 3, "Cardio-respiratory arrest": 3, "Computerised tomogram head": 3, "Computerised tomogram thorax": 3, "Drug hypersensitivity": 3, "Enterocolitis": 3, "Eye disorder": 3, "Gait disturbance": 3, "Haematocrit": 3, "Haemoglobin": 3, "Haemorrhage": 3, "Heart rate decreased": 3, "Lip oedema": 3, "Multiple sclerosis": 3, "Neck pain": 3, "Oedema": 3, "Oedema mouth": 3, "Oral discomfort": 3, "Paralysis": 3, "Pharyngeal oedema": 3, "Photopsia": 3, "Rash erythematous": 3, "Subarachnoid haemorrhage": 3, "Swelling": 3, "Swelling face": 3, "Thirst": 3, "Vaccination site hypoaesthesia": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Acute kidney injury": 2, "Altered state of consciousness": 2, "Anaemia": 2, "Antibody test": 2, "Arthritis": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood creatine": 2, "Blood creatinine": 2, "Blood phosphorus": 2, "Cellulitis": 2, "Chest X-ray": 2, "Computerised tomogram abdomen": 2, "Condition aggravated": 2, "Confusional state": 2, "Coronavirus test": 2, "Dehydration": 2, "Dermatitis allergic": 2, "Discomfort": 2, "Disease progression": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Dysstasia": 2, "Eosinophil count": 2, "Eosinophil percentage": 2, "Erythema multiforme": 2, "Extrasystoles": 2, "Eye movement disorder": 2, "Eye pain": 2, "Eye pruritus": 2, "Eyelid oedema": 2, "Faeces pale": 2, "Fall": 2, "Fibrin D dimer": 2, "Gamma-glutamyltransferase": 2, "Haematemesis": 2, "Haematochezia": 2, "Hemiparesis": 2, "Hepatic function abnormal": 2, "Hypophagia": 2, "Hypotension": 2, "Hypothermia": 2, "Immunisation reaction": 2, "Interstitial lung disease": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Laryngeal discomfort": 2, "Laryngeal oedema": 2, "Lymphocyte count": 2, "Lymphocyte percentage": 2, "Marasmus": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Nasal congestion": 2, "Nasal obstruction": 2, "Neutrophil percentage": 2, "Oral pruritus": 2, "Organising pneumonia": 2, "Physical deconditioning": 2, "Pneumonia aspiration": 2, "Protein total": 2, "Respiratory disorder": 2, "Retinal haemorrhage": 2, "Sensation of foreign body": 2, "Sinus tachycardia": 2, "Sneezing": 2, "Syncope": 2, "Tension": 2, "Vaccination site warmth": 2, "Ventricular extrasystoles": 2, "Abdominal symptom": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Angina pectoris": 1, "Angina unstable": 1, "Angioedema": 1, "Anti-aquaporin-4 antibody": 1, "Anuria": 1, "Aphasia": 1, "Apnoea": 1, "Arterial occlusive disease": 1, "Asphyxia": 1, "Aspiration": 1, "Asthenopia": 1, "Asthmatic crisis": 1, "Autoantibody test": 1, "Autoimmune pancreatitis": 1, "Axillary pain": 1, "Basophil count": 1, "Basophil percentage": 1, "Bell's palsy": 1, "Biliary dilatation": 1, "Blood calcium": 1, "Blood creatine increased": 1, "Blood gases": 1, "Blood immunoglobulin E": 1, "Blood pH": 1, "Blood phosphorus increased": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Brain stem infarction": 1, "Breast neoplasm": 1, "Bronchial disorder": 1, "Bronchostenosis": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "Capillary nail refill test": 1, "Cerebral artery stenosis": 1, "Cerebral microhaemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral venous thrombosis": 1, "Cheilitis": 1, "Choking": 1, "Choking sensation": 1, "Cholangitis sclerosing": 1, "Cholinergic syndrome": 1, "Computerised tomogram thorax abnormal": 1, "Conjunctival hyperaemia": 1, "Coronary artery stenosis": 1, "Coronavirus infection": 1, "Cyanosis": 1, "Cystitis": 1, "Deafness": 1, "Decreased vibratory sense": 1, "Deep vein thrombosis": 1, "Dermal cyst": 1, "Dizziness postural": 1, "Duodenal ulcer": 1, "Dysaesthesia": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Eczema": 1, "Embolic cerebral infarction": 1, "Endoscopy": 1, "Enzyme level test": 1, "Eosinophil count increased": 1, "Epigastric discomfort": 1, "Excessive eye blinking": 1, "Exposure during pregnancy": 1, "Eye haemorrhage": 1, "Facial pain": 1, "Fibrin degradation products": 1, "Finger deformity": 1, "Gastric disorder": 1, "Gastrointestinal disorder": 1, "Gastrointestinal haemorrhage": 1, "Gaze palsy": 1, "General physical health deterioration": 1, "Generalised oedema": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Glossodynia": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematology test": 1, "Haematoma": 1, "Haemoglobin decreased": 1, "Haemolysis": 1, "Haemorrhage subcutaneous": 1, "Hallucination": 1, "Hemiplegia": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis viral test": 1, "Hyperaemia": 1, "Hyperplasia": 1, "Hyperpyrexia": 1, "Hyperthermia": 1, "Hypokalaemia": 1, "Hypopnoea": 1, "Hypothyroidism": 1, "Imaging procedure": 1, "Inflammation": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Injection site movement impairment": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Intracranial aneurysm": 1, "Irregular breathing": 1, "Irritability": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Laryngeal obstruction": 1, "Larynx irritation": 1, "Lethargy": 1, "Lip discolouration": 1, "Lip pain": 1, "Listless": 1, "Lividity": 1, "Lung infiltration": 1, "Lymphadenopathy": 1, "Mean platelet volume": 1, "Melaena": 1, "Meningitis aseptic": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Motion sickness": 1, "Movement disorder": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Nail discolouration": 1, "Nerve conduction studies": 1, "Neurological symptom": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Neutrophilia": 1, "Nightmare": 1, "Nucleic acid test": 1, "Oedema peripheral": 1, "Oliguria": 1, "PO2": 1, "Palmar erythema": 1, "Parotid gland enlargement": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Pharyngeal disorder": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Plantar erythema": 1, "Platelet distribution width": 1, "Platelet-large cell ratio": 1, "Pneumonia": 1, "Pollakiuria": 1, "Portal vein thrombosis": 1, "Procalcitonin": 1, "Productive cough": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary artery thrombosis": 1, "Pulmonary imaging procedure": 1, "Pulmonary thrombosis": 1, "Purulence": 1, "Pyelonephritis": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory rate decreased": 1, "Respiratory symptom": 1, "Restless legs syndrome": 1, "Scan": 1, "Scratch": 1, "Sensitisation": 1, "Shock": 1, "Shoulder injury related to vaccine administration": 1, "Sitting disability": 1, "Sleep disorder": 1, "Speech disorder": 1, "Status asthmaticus": 1, "Stenosis": 1, "Supraventricular tachycardia": 1, "Suspected COVID-19": 1, "Sympathicotonia": 1, "Tetany": 1, "Thrombocytopenia": 1, "Thyroglobulin": 1, "Thyroid function test": 1, "Thyroiditis subacute": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Toxic skin eruption": 1, "Tracheal obstruction": 1, "Ulnar neuritis": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1, "Urinary retention": 1, "Urine analysis": 1, "Urine output": 1, "Vaccination site cellulitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Viral test": 1, "Vision blurred": 1, "Vitreous floaters": 1, "Weight decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9480", "histograms": [{"histogram": {"Body temperature": 361, "Blood pressure measurement": 163, "Oxygen saturation": 124, "Anaphylactic reaction": 113, "Heart rate": 110, "Pyrexia": 92, "Nausea": 87, "Headache": 85, "Malaise": 72, "Pruritus": 60, "Blood pressure increased": 54, "Dyspnoea": 54, "Erythema": 51, "Oropharyngeal discomfort": 49, "Palpitations": 41, "Feeling abnormal": 39, "Cough": 37, "Dizziness": 36, "Hypoaesthesia": 36, "Rash": 36, "Vomiting": 27, "Chills": 25, "Urticaria": 25, "Diarrhoea": 21, "Tachycardia": 21, "Vaccination site pain": 21, "Arthralgia": 20, "Asthma": 20, "Feeling hot": 20, "Abdominal pain": 19, "Vital signs measurement": 19, "Neuropathy peripheral": 18, "Blood test": 17, "Myalgia": 17, "Presyncope": 16, "Respiratory rate": 16, "Wheezing": 15, "Blood pressure decreased": 14, "Computerised tomogram": 14, "Electrocardiogram": 14, "Cold sweat": 13, "Hypersensitivity": 13, "Throat tightness": 13, "Sensory disturbance": 12, "Dysphoria": 11, "Hot flush": 11, "Hyperhidrosis": 11, "Magnetic resonance imaging": 11, "Muscular weakness": 11, "SARS-CoV-2 test": 11, "Decreased appetite": 10, "Vaccination site erythema": 10, "Vaccination site swelling": 10, "Anaphylactic shock": 9, "Back pain": 9, "Heart rate increased": 9, "Hypertension": 9, "Hypoaesthesia oral": 9, "Pain in extremity": 9, "Throat irritation": 9, "White blood cell count": 9, "C-reactive protein": 8, "Hyperventilation": 8, "Oxygen saturation decreased": 8, "Rhinorrhoea": 8, "Abdominal discomfort": 7, "Coma scale": 7, "Feeling cold": 7, "Investigation": 7, "Loss of consciousness": 7, "Pain": 7, "Pallor": 7, "Peripheral coldness": 7, "Anxiety": 6, "Cerebral infarction": 6, "Depressed level of consciousness": 6, "Fatigue": 6, "Tremor": 6, "Blood lactate dehydrogenase": 5, "Bradycardia": 5, "Chest pain": 5, "Dysphonia": 5, "Flushing": 5, "Internal haemorrhage": 5, "Magnetic resonance imaging head": 5, "Oculomucocutaneous syndrome": 5, "Oropharyngeal pain": 5, "Seizure": 5, "Somnolence": 5, "Vaccination site pruritus": 5, "Vertigo": 5, "Arrhythmia": 4, "Auscultation": 4, "Blood sodium": 4, "Blood urea": 4, "Chest discomfort": 4, "Drug eruption": 4, "Face oedema": 4, "Facial paralysis": 4, "Head discomfort": 4, "Lip swelling": 4, "Paraesthesia": 4, "Paraesthesia oral": 4, "Platelet count": 4, "Polymerase chain reaction": 4, "Red blood cell count": 4, "Tachypnoea": 4, "Visual impairment": 4, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Asthenia": 3, "Blood chloride": 3, "Blood creatine phosphokinase": 3, "Blood glucose": 3, "Blood potassium": 3, "Blood pressure systolic": 3, "C-reactive protein increased": 3, "COVID-19": 3, "Cardiac arrest": 3, "Cardio-respiratory arrest": 3, "Computerised tomogram head": 3, "Computerised tomogram thorax": 3, "Drug hypersensitivity": 3, "Enterocolitis": 3, "Eye disorder": 3, "Gait disturbance": 3, "Haematocrit": 3, "Haemoglobin": 3, "Haemorrhage": 3, "Heart rate decreased": 3, "Lip oedema": 3, "Multiple sclerosis": 3, "Neck pain": 3, "Oedema": 3, "Oedema mouth": 3, "Oral discomfort": 3, "Paralysis": 3, "Pharyngeal oedema": 3, "Photopsia": 3, "Rash erythematous": 3, "Subarachnoid haemorrhage": 3, "Swelling": 3, "Swelling face": 3, "Thirst": 3, "Vaccination site hypoaesthesia": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Acute kidney injury": 2, "Altered state of consciousness": 2, "Anaemia": 2, "Antibody test": 2, "Arthritis": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood creatine": 2, "Blood creatinine": 2, "Blood phosphorus": 2, "Cellulitis": 2, "Chest X-ray": 2, "Computerised tomogram abdomen": 2, "Condition aggravated": 2, "Confusional state": 2, "Coronavirus test": 2, "Dehydration": 2, "Dermatitis allergic": 2, "Discomfort": 2, "Disease progression": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Dysstasia": 2, "Eosinophil count": 2, "Eosinophil percentage": 2, "Erythema multiforme": 2, "Extrasystoles": 2, "Eye movement disorder": 2, "Eye pain": 2, "Eye pruritus": 2, "Eyelid oedema": 2, "Faeces pale": 2, "Fall": 2, "Fibrin D dimer": 2, "Gamma-glutamyltransferase": 2, "Haematemesis": 2, "Haematochezia": 2, "Hemiparesis": 2, "Hepatic function abnormal": 2, "Hypophagia": 2, "Hypotension": 2, "Hypothermia": 2, "Immunisation reaction": 2, "Interstitial lung disease": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Laryngeal discomfort": 2, "Laryngeal oedema": 2, "Lymphocyte count": 2, "Lymphocyte percentage": 2, "Marasmus": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Nasal congestion": 2, "Nasal obstruction": 2, "Neutrophil percentage": 2, "Oral pruritus": 2, "Organising pneumonia": 2, "Physical deconditioning": 2, "Pneumonia aspiration": 2, "Protein total": 2, "Respiratory disorder": 2, "Retinal haemorrhage": 2, "Sensation of foreign body": 2, "Sinus tachycardia": 2, "Sneezing": 2, "Syncope": 2, "Tension": 2, "Vaccination site warmth": 2, "Ventricular extrasystoles": 2, "Abdominal symptom": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Angina pectoris": 1, "Angina unstable": 1, "Angioedema": 1, "Anti-aquaporin-4 antibody": 1, "Anuria": 1, "Aphasia": 1, "Apnoea": 1, "Arterial occlusive disease": 1, "Asphyxia": 1, "Aspiration": 1, "Asthenopia": 1, "Asthmatic crisis": 1, "Autoantibody test": 1, "Autoimmune pancreatitis": 1, "Axillary pain": 1, "Basophil count": 1, "Basophil percentage": 1, "Bell's palsy": 1, "Biliary dilatation": 1, "Blood calcium": 1, "Blood creatine increased": 1, "Blood gases": 1, "Blood immunoglobulin E": 1, "Blood pH": 1, "Blood phosphorus increased": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Brain stem infarction": 1, "Breast neoplasm": 1, "Bronchial disorder": 1, "Bronchostenosis": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "Capillary nail refill test": 1, "Cerebral artery stenosis": 1, "Cerebral microhaemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral venous thrombosis": 1, "Cheilitis": 1, "Choking": 1, "Choking sensation": 1, "Cholangitis sclerosing": 1, "Cholinergic syndrome": 1, "Computerised tomogram thorax abnormal": 1, "Conjunctival hyperaemia": 1, "Coronary artery stenosis": 1, "Coronavirus infection": 1, "Cyanosis": 1, "Cystitis": 1, "Deafness": 1, "Decreased vibratory sense": 1, "Deep vein thrombosis": 1, "Dermal cyst": 1, "Dizziness postural": 1, "Duodenal ulcer": 1, "Dysaesthesia": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Eczema": 1, "Embolic cerebral infarction": 1, "Endoscopy": 1, "Enzyme level test": 1, "Eosinophil count increased": 1, "Epigastric discomfort": 1, "Excessive eye blinking": 1, "Exposure during pregnancy": 1, "Eye haemorrhage": 1, "Facial pain": 1, "Fibrin degradation products": 1, "Finger deformity": 1, "Gastric disorder": 1, "Gastrointestinal disorder": 1, "Gastrointestinal haemorrhage": 1, "Gaze palsy": 1, "General physical health deterioration": 1, "Generalised oedema": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Glossodynia": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematology test": 1, "Haematoma": 1, "Haemoglobin decreased": 1, "Haemolysis": 1, "Haemorrhage subcutaneous": 1, "Hallucination": 1, "Hemiplegia": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis viral test": 1, "Hyperaemia": 1, "Hyperplasia": 1, "Hyperpyrexia": 1, "Hyperthermia": 1, "Hypokalaemia": 1, "Hypopnoea": 1, "Hypothyroidism": 1, "Imaging procedure": 1, "Inflammation": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Injection site movement impairment": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Intracranial aneurysm": 1, "Irregular breathing": 1, "Irritability": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Laryngeal obstruction": 1, "Larynx irritation": 1, "Lethargy": 1, "Lip discolouration": 1, "Lip pain": 1, "Listless": 1, "Lividity": 1, "Lung infiltration": 1, "Lymphadenopathy": 1, "Mean platelet volume": 1, "Melaena": 1, "Meningitis aseptic": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Motion sickness": 1, "Movement disorder": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Nail discolouration": 1, "Nerve conduction studies": 1, "Neurological symptom": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Neutrophilia": 1, "Nightmare": 1, "Nucleic acid test": 1, "Oedema peripheral": 1, "Oliguria": 1, "PO2": 1, "Palmar erythema": 1, "Parotid gland enlargement": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Pharyngeal disorder": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Plantar erythema": 1, "Platelet distribution width": 1, "Platelet-large cell ratio": 1, "Pneumonia": 1, "Pollakiuria": 1, "Portal vein thrombosis": 1, "Procalcitonin": 1, "Productive cough": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary artery thrombosis": 1, "Pulmonary imaging procedure": 1, "Pulmonary thrombosis": 1, "Purulence": 1, "Pyelonephritis": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory rate decreased": 1, "Respiratory symptom": 1, "Restless legs syndrome": 1, "Scan": 1, "Scratch": 1, "Sensitisation": 1, "Shock": 1, "Shoulder injury related to vaccine administration": 1, "Sitting disability": 1, "Sleep disorder": 1, "Speech disorder": 1, "Status asthmaticus": 1, "Stenosis": 1, "Supraventricular tachycardia": 1, "Suspected COVID-19": 1, "Sympathicotonia": 1, "Tetany": 1, "Thrombocytopenia": 1, "Thyroglobulin": 1, "Thyroid function test": 1, "Thyroiditis subacute": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Toxic skin eruption": 1, "Tracheal obstruction": 1, "Ulnar neuritis": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1, "Urinary retention": 1, "Urine analysis": 1, "Urine output": 1, "Vaccination site cellulitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Viral test": 1, "Vision blurred": 1, "Vitreous floaters": 1, "Weight decreased": 1, "X-ray": 1}, "batchcodes": ["ER9480"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ER9605.json b/docs/data/histograms/Japan/ER9605.json
index 8b91be5bb30..efffc6c0d91 100644
--- a/docs/data/histograms/Japan/ER9605.json
+++ b/docs/data/histograms/Japan/ER9605.json
@@ -1 +1 @@
-{"batchcode": "ER9605", "histograms": [{"batchcodes": ["ER9605"], "histogram": {"Body temperature": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9605", "histograms": [{"histogram": {"Body temperature": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1}, "batchcodes": ["ER9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ET2173.json b/docs/data/histograms/Japan/ET2173.json
index 5fb36c7f0fe..6298e7e77a0 100644
--- a/docs/data/histograms/Japan/ET2173.json
+++ b/docs/data/histograms/Japan/ET2173.json
@@ -1 +1 @@
-{"batchcode": "ET2173", "histograms": [{"batchcodes": ["ET2173"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "ET2173", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["ET2173"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ET3673.json b/docs/data/histograms/Japan/ET3673.json
index 8cdba3e335f..470eb583c65 100644
--- a/docs/data/histograms/Japan/ET3673.json
+++ b/docs/data/histograms/Japan/ET3673.json
@@ -1 +1 @@
-{"batchcode": "ET3673", "histograms": [{"batchcodes": ["ET3673"], "histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cough": 1, "Heart rate": 1, "Investigation": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "ET3673", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cough": 1, "Heart rate": 1, "Investigation": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Seizure": 1}, "batchcodes": ["ET3673"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ET3674.json b/docs/data/histograms/Japan/ET3674.json
index c4b686f7623..ce85db53d62 100644
--- a/docs/data/histograms/Japan/ET3674.json
+++ b/docs/data/histograms/Japan/ET3674.json
@@ -1 +1 @@
-{"batchcode": "ET3674", "histograms": [{"batchcodes": ["ET3674"], "histogram": {"Body temperature": 254, "Blood pressure measurement": 106, "Oxygen saturation": 82, "Heart rate": 72, "Anaphylactic reaction": 71, "Blood pressure increased": 50, "Nausea": 46, "Headache": 39, "Feeling abnormal": 35, "Malaise": 35, "Dizziness": 34, "Pyrexia": 34, "Vaccination site pain": 34, "Pruritus": 33, "Oropharyngeal discomfort": 32, "Uveitis": 29, "Cough": 26, "Erythema": 26, "Dyspnoea": 25, "Hypoaesthesia": 24, "Urticaria": 23, "Palpitations": 22, "Presyncope": 18, "Vomiting": 17, "Asthma": 15, "Rash": 14, "Blood pressure decreased": 12, "Chest discomfort": 11, "Computerised tomogram head": 10, "Diarrhoea": 10, "Hypersensitivity": 10, "Investigation": 10, "Muscular weakness": 10, "Neuropathy peripheral": 10, "Pain": 10, "Pallor": 10, "Asthenia": 9, "Blood test": 9, "Dysphoria": 9, "Feeling hot": 9, "Abdominal pain": 8, "Hepatic function abnormal": 8, "Hyperventilation": 8, "Oxygen saturation decreased": 8, "Tachycardia": 8, "Arthralgia": 7, "C-reactive protein": 7, "Chills": 7, "Electrocardiogram": 7, "Myalgia": 7, "SARS-CoV-2 test": 7, "Cold sweat": 6, "Computerised tomogram": 6, "Depressed level of consciousness": 6, "Hot flush": 6, "Hyperhidrosis": 6, "Hypertension": 6, "Somnolence": 6, "White blood cell count": 6, "Cardiac failure": 5, "Dysstasia": 5, "Heart rate increased": 5, "Loss of consciousness": 5, "Magnetic resonance imaging": 5, "Respiratory rate": 5, "Rhinorrhoea": 5, "Sensory disturbance": 5, "Vital signs measurement": 5, "Alanine aminotransferase": 4, "Altered state of consciousness": 4, "Aspartate aminotransferase": 4, "Auscultation": 4, "Back pain": 4, "Blood pressure systolic": 4, "Decreased appetite": 4, "Feeling cold": 4, "Pain in extremity": 4, "Pneumonia": 4, "Vaccination site swelling": 4, "Blood alkaline phosphatase": 3, "Blood bilirubin": 3, "Cerebral haemorrhage": 3, "Cerebral infarction": 3, "Coma scale": 3, "Computerised tomogram thorax": 3, "Eye pain": 3, "Eye pruritus": 3, "Flushing": 3, "Gamma-glutamyltransferase": 3, "Haemoglobin": 3, "Head discomfort": 3, "Hemiplegia": 3, "Hypoaesthesia oral": 3, "Internal haemorrhage": 3, "Laryngeal oedema": 3, "Liver function test": 3, "Mobility decreased": 3, "Nasopharyngitis": 3, "Ocular hyperaemia": 3, "Peripheral coldness": 3, "Peripheral swelling": 3, "Pharyngeal oedema": 3, "Platelet count": 3, "Red blood cell count": 3, "Sensation of foreign body": 3, "Throat irritation": 3, "Throat tightness": 3, "Urine analysis": 3, "Vaccination site pruritus": 3, "Vertigo": 3, "Wheezing": 3, "Acute disseminated encephalomyelitis": 2, "Anxiety": 2, "Asthenopia": 2, "Bilirubin conjugated": 2, "Blood albumin": 2, "Blood creatinine": 2, "Blood lactate dehydrogenase": 2, "Blood pressure immeasurable": 2, "Blood urea": 2, "Breath sounds abnormal": 2, "Chest X-ray": 2, "Cyanosis": 2, "Death": 2, "Dehydration": 2, "Drug hypersensitivity": 2, "Dysarthria": 2, "Dysphonia": 2, "Echocardiogram": 2, "Electrocardiogram ambulatory": 2, "Epilepsy": 2, "Erythema of eyelid": 2, "Eye movement disorder": 2, "Face oedema": 2, "Facial paralysis": 2, "Fall": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemorrhage subcutaneous": 2, "Heart rate decreased": 2, "Hypertensive emergency": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Hypotension": 2, "Injected limb mobility decreased": 2, "Insomnia": 2, "Iritis": 2, "Lip swelling": 2, "Lymphadenitis": 2, "Lymphocyte count": 2, "Magnetic resonance imaging head": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Neutrophil count": 2, "Oculomucocutaneous syndrome": 2, "Oedema": 2, "Oedema peripheral": 2, "Oropharyngeal pain": 2, "PO2": 2, "Paraesthesia": 2, "Photophobia": 2, "Physical examination": 2, "Protein total": 2, "Pulse abnormal": 2, "Putamen haemorrhage": 2, "Rash erythematous": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abnormal sensation in eye": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Albumin globulin ratio": 1, "Albumin urine": 1, "Allergic gastroenteritis": 1, "Allergic pharyngitis": 1, "Allergy to vaccine": 1, "Amylase": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Anisocytosis": 1, "Ankle brachial index": 1, "Anti-platelet antibody": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Anxiety disorder": 1, "Aortic dissection": 1, "Aortic valve stenosis": 1, "Aphasia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arthritis": 1, "Asphyxia": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Band neutrophil count": 1, "Basophil count": 1, "Bile duct cancer": 1, "Bile duct stone": 1, "Biliary dilatation": 1, "Bilirubin urine": 1, "Biopsy": 1, "Blister": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood ketone body": 1, "Blood potassium": 1, "Blood pressure diastolic increased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood uric acid": 1, "Body temperature increased": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Bronchospasm": 1, "Bronchostenosis": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cardiac failure acute": 1, "Cardiac tamponade": 1, "Cardio-respiratory arrest": 1, "Cardiolipin antibody": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cerebral artery embolism": 1, "Cerebral mass effect": 1, "Chest pain": 1, "Cholangitis": 1, "Cholecystitis": 1, "Clonus": 1, "Complement factor": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Conductive deafness": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Conjunctivitis": 1, "Creatinine urine": 1, "DNA antibody": 1, "Deafness": 1, "Decreased activity": 1, "Demyelination": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Electrocardiogram ST segment elevation": 1, "Electromyogram": 1, "Embolism venous": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count": 1, "Episcleritis": 1, "Epistaxis": 1, "Erythema nodosum": 1, "Excessive eye blinking": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Foreign body sensation in eyes": 1, "Fracture": 1, "Full blood count": 1, "Gait disturbance": 1, "Gallbladder enlargement": 1, "Gastric ulcer haemorrhage": 1, "Gaze palsy": 1, "Genital haemorrhage": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Grip strength decreased": 1, "Haemarthrosis": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematology test": 1, "Haemorrhage": 1, "Henoch-Schonlein purpura": 1, "Hepatic enzyme increased": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "High density lipoprotein": 1, "Hyperreflexia": 1, "Hypertonia": 1, "Hypothermia": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Illusion": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Impaired driving ability": 1, "Infarction": 1, "Inflammation": 1, "Intermittent claudication": 1, "International normalised ratio": 1, "Iridocyclitis": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "KL-6": 1, "LDL/HDL ratio": 1, "Legionella test": 1, "Leukocyte alkaline phosphatase": 1, "Limb discomfort": 1, "Lip pruritus": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphadenopathy": 1, "Lymphocyte count increased": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Mental disorder": 1, "Mental impairment": 1, "Metamyelocyte count": 1, "Migraine": 1, "Monocyte count": 1, "Mucous stools": 1, "Multiple sclerosis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Myositis": 1, "Neck pain": 1, "Neuritis": 1, "Neutrophil count decreased": 1, "Neutrophil percentage": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Nucleic acid test": 1, "Ocular discomfort": 1, "PO2 decreased": 1, "Panic attack": 1, "Paroxysmal sympathetic hyperactivity": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Productive cough": 1, "Prostatic specific antigen": 1, "Protein urine": 1, "Pulmonary embolism": 1, "Radial nerve injury": 1, "Radiation pneumonitis": 1, "Rash pruritic": 1, "Red blood cell analysis": 1, "Red cell distribution width": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Reticulocyte count": 1, "Scleritis": 1, "Seizure": 1, "Shock": 1, "Sinus tachycardia": 1, "Sinusitis": 1, "Sneezing": 1, "Specific gravity urine": 1, "Speech disorder": 1, "Spinal cord disorder": 1, "Spinal stenosis": 1, "Streptococcus test": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Synovial cyst": 1, "Taste disorder": 1, "Tension": 1, "Tetany": 1, "Thrombocytopenic purpura": 1, "Tongue erythema": 1, "Total bile acids": 1, "Tracheal stenosis": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Trigeminal neuralgia": 1, "Type I hypersensitivity": 1, "Type IV hypersensitivity reaction": 1, "Ulcerative keratitis": 1, "Ulnar nerve palsy": 1, "Urinary incontinence": 1, "Urinary sediment": 1, "Urobilinogen urine": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Ventricular extrasystoles": 1, "Ventricular fibrillation": 1, "Visual impairment": 1, "Vitritis": 1, "White blood cell analysis": 1, "White blood cell count decreased": 1, "White blood cells urine": 1, "X-ray": 1, "Xeroderma pigmentosum": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "ET3674", "histograms": [{"histogram": {"Body temperature": 254, "Blood pressure measurement": 106, "Oxygen saturation": 82, "Heart rate": 72, "Anaphylactic reaction": 71, "Blood pressure increased": 50, "Nausea": 46, "Headache": 39, "Feeling abnormal": 35, "Malaise": 35, "Dizziness": 34, "Pyrexia": 34, "Vaccination site pain": 34, "Pruritus": 33, "Oropharyngeal discomfort": 32, "Uveitis": 29, "Cough": 26, "Erythema": 26, "Dyspnoea": 25, "Hypoaesthesia": 24, "Urticaria": 23, "Palpitations": 22, "Presyncope": 18, "Vomiting": 17, "Asthma": 15, "Rash": 14, "Blood pressure decreased": 12, "Chest discomfort": 11, "Computerised tomogram head": 10, "Diarrhoea": 10, "Hypersensitivity": 10, "Investigation": 10, "Muscular weakness": 10, "Neuropathy peripheral": 10, "Pain": 10, "Pallor": 10, "Asthenia": 9, "Blood test": 9, "Dysphoria": 9, "Feeling hot": 9, "Abdominal pain": 8, "Hepatic function abnormal": 8, "Hyperventilation": 8, "Oxygen saturation decreased": 8, "Tachycardia": 8, "Arthralgia": 7, "C-reactive protein": 7, "Chills": 7, "Electrocardiogram": 7, "Myalgia": 7, "SARS-CoV-2 test": 7, "Cold sweat": 6, "Computerised tomogram": 6, "Depressed level of consciousness": 6, "Hot flush": 6, "Hyperhidrosis": 6, "Hypertension": 6, "Somnolence": 6, "White blood cell count": 6, "Cardiac failure": 5, "Dysstasia": 5, "Heart rate increased": 5, "Loss of consciousness": 5, "Magnetic resonance imaging": 5, "Respiratory rate": 5, "Rhinorrhoea": 5, "Sensory disturbance": 5, "Vital signs measurement": 5, "Alanine aminotransferase": 4, "Altered state of consciousness": 4, "Aspartate aminotransferase": 4, "Auscultation": 4, "Back pain": 4, "Blood pressure systolic": 4, "Decreased appetite": 4, "Feeling cold": 4, "Pain in extremity": 4, "Pneumonia": 4, "Vaccination site swelling": 4, "Blood alkaline phosphatase": 3, "Blood bilirubin": 3, "Cerebral haemorrhage": 3, "Cerebral infarction": 3, "Coma scale": 3, "Computerised tomogram thorax": 3, "Eye pain": 3, "Eye pruritus": 3, "Flushing": 3, "Gamma-glutamyltransferase": 3, "Haemoglobin": 3, "Head discomfort": 3, "Hemiplegia": 3, "Hypoaesthesia oral": 3, "Internal haemorrhage": 3, "Laryngeal oedema": 3, "Liver function test": 3, "Mobility decreased": 3, "Nasopharyngitis": 3, "Ocular hyperaemia": 3, "Peripheral coldness": 3, "Peripheral swelling": 3, "Pharyngeal oedema": 3, "Platelet count": 3, "Red blood cell count": 3, "Sensation of foreign body": 3, "Throat irritation": 3, "Throat tightness": 3, "Urine analysis": 3, "Vaccination site pruritus": 3, "Vertigo": 3, "Wheezing": 3, "Acute disseminated encephalomyelitis": 2, "Anxiety": 2, "Asthenopia": 2, "Bilirubin conjugated": 2, "Blood albumin": 2, "Blood creatinine": 2, "Blood lactate dehydrogenase": 2, "Blood pressure immeasurable": 2, "Blood urea": 2, "Breath sounds abnormal": 2, "Chest X-ray": 2, "Cyanosis": 2, "Death": 2, "Dehydration": 2, "Drug hypersensitivity": 2, "Dysarthria": 2, "Dysphonia": 2, "Echocardiogram": 2, "Electrocardiogram ambulatory": 2, "Epilepsy": 2, "Erythema of eyelid": 2, "Eye movement disorder": 2, "Face oedema": 2, "Facial paralysis": 2, "Fall": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemorrhage subcutaneous": 2, "Heart rate decreased": 2, "Hypertensive emergency": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Hypotension": 2, "Injected limb mobility decreased": 2, "Insomnia": 2, "Iritis": 2, "Lip swelling": 2, "Lymphadenitis": 2, "Lymphocyte count": 2, "Magnetic resonance imaging head": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Neutrophil count": 2, "Oculomucocutaneous syndrome": 2, "Oedema": 2, "Oedema peripheral": 2, "Oropharyngeal pain": 2, "PO2": 2, "Paraesthesia": 2, "Photophobia": 2, "Physical examination": 2, "Protein total": 2, "Pulse abnormal": 2, "Putamen haemorrhage": 2, "Rash erythematous": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abnormal sensation in eye": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Albumin globulin ratio": 1, "Albumin urine": 1, "Allergic gastroenteritis": 1, "Allergic pharyngitis": 1, "Allergy to vaccine": 1, "Amylase": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Anisocytosis": 1, "Ankle brachial index": 1, "Anti-platelet antibody": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Anxiety disorder": 1, "Aortic dissection": 1, "Aortic valve stenosis": 1, "Aphasia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arthritis": 1, "Asphyxia": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Band neutrophil count": 1, "Basophil count": 1, "Bile duct cancer": 1, "Bile duct stone": 1, "Biliary dilatation": 1, "Bilirubin urine": 1, "Biopsy": 1, "Blister": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood ketone body": 1, "Blood potassium": 1, "Blood pressure diastolic increased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood uric acid": 1, "Body temperature increased": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Bronchospasm": 1, "Bronchostenosis": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cardiac failure acute": 1, "Cardiac tamponade": 1, "Cardio-respiratory arrest": 1, "Cardiolipin antibody": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cerebral artery embolism": 1, "Cerebral mass effect": 1, "Chest pain": 1, "Cholangitis": 1, "Cholecystitis": 1, "Clonus": 1, "Complement factor": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Conductive deafness": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Conjunctivitis": 1, "Creatinine urine": 1, "DNA antibody": 1, "Deafness": 1, "Decreased activity": 1, "Demyelination": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Electrocardiogram ST segment elevation": 1, "Electromyogram": 1, "Embolism venous": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count": 1, "Episcleritis": 1, "Epistaxis": 1, "Erythema nodosum": 1, "Excessive eye blinking": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Foreign body sensation in eyes": 1, "Fracture": 1, "Full blood count": 1, "Gait disturbance": 1, "Gallbladder enlargement": 1, "Gastric ulcer haemorrhage": 1, "Gaze palsy": 1, "Genital haemorrhage": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Grip strength decreased": 1, "Haemarthrosis": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematology test": 1, "Haemorrhage": 1, "Henoch-Schonlein purpura": 1, "Hepatic enzyme increased": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "High density lipoprotein": 1, "Hyperreflexia": 1, "Hypertonia": 1, "Hypothermia": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Illusion": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Impaired driving ability": 1, "Infarction": 1, "Inflammation": 1, "Intermittent claudication": 1, "International normalised ratio": 1, "Iridocyclitis": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "KL-6": 1, "LDL/HDL ratio": 1, "Legionella test": 1, "Leukocyte alkaline phosphatase": 1, "Limb discomfort": 1, "Lip pruritus": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphadenopathy": 1, "Lymphocyte count increased": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Mental disorder": 1, "Mental impairment": 1, "Metamyelocyte count": 1, "Migraine": 1, "Monocyte count": 1, "Mucous stools": 1, "Multiple sclerosis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Myositis": 1, "Neck pain": 1, "Neuritis": 1, "Neutrophil count decreased": 1, "Neutrophil percentage": 1, "Nitrite urine": 1, "Non-high-density lipoprotein cholesterol": 1, "Nucleic acid test": 1, "Ocular discomfort": 1, "PO2 decreased": 1, "Panic attack": 1, "Paroxysmal sympathetic hyperactivity": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Productive cough": 1, "Prostatic specific antigen": 1, "Protein urine": 1, "Pulmonary embolism": 1, "Radial nerve injury": 1, "Radiation pneumonitis": 1, "Rash pruritic": 1, "Red blood cell analysis": 1, "Red cell distribution width": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Reticulocyte count": 1, "Scleritis": 1, "Seizure": 1, "Shock": 1, "Sinus tachycardia": 1, "Sinusitis": 1, "Sneezing": 1, "Specific gravity urine": 1, "Speech disorder": 1, "Spinal cord disorder": 1, "Spinal stenosis": 1, "Streptococcus test": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Synovial cyst": 1, "Taste disorder": 1, "Tension": 1, "Tetany": 1, "Thrombocytopenic purpura": 1, "Tongue erythema": 1, "Total bile acids": 1, "Tracheal stenosis": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Trigeminal neuralgia": 1, "Type I hypersensitivity": 1, "Type IV hypersensitivity reaction": 1, "Ulcerative keratitis": 1, "Ulnar nerve palsy": 1, "Urinary incontinence": 1, "Urinary sediment": 1, "Urobilinogen urine": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Ventricular extrasystoles": 1, "Ventricular fibrillation": 1, "Visual impairment": 1, "Vitritis": 1, "White blood cell analysis": 1, "White blood cell count decreased": 1, "White blood cells urine": 1, "X-ray": 1, "Xeroderma pigmentosum": 1, "pH urine": 1}, "batchcodes": ["ET3674"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ET9096.json b/docs/data/histograms/Japan/ET9096.json
index aaeaae19694..15d876b85cf 100644
--- a/docs/data/histograms/Japan/ET9096.json
+++ b/docs/data/histograms/Japan/ET9096.json
@@ -1 +1 @@
-{"batchcode": "ET9096", "histograms": [{"batchcodes": ["ET9096"], "histogram": {"Body temperature": 121, "Anaphylactic reaction": 41, "Blood pressure measurement": 34, "Pyrexia": 32, "Heart rate": 29, "Oxygen saturation": 26, "Nausea": 25, "Pruritus": 24, "Dyspnoea": 19, "Vomiting": 19, "Headache": 17, "Malaise": 16, "Chills": 15, "Cough": 14, "Oropharyngeal discomfort": 14, "Rash": 14, "Blood pressure increased": 13, "Hypoaesthesia": 13, "Palpitations": 12, "Urticaria": 12, "Dizziness": 11, "Arthralgia": 10, "Asthenia": 10, "Feeling abnormal": 9, "Erythema": 8, "Electrocardiogram": 7, "Oxygen saturation decreased": 7, "Heart rate increased": 6, "Vaccination site pain": 6, "Blood pressure decreased": 5, "Depressed level of consciousness": 5, "Feeling hot": 5, "Hypersensitivity": 5, "Loss of consciousness": 5, "Presyncope": 5, "SARS-CoV-2 test": 5, "Abdominal pain": 4, "Asthma": 4, "Chest discomfort": 4, "Computerised tomogram head": 4, "Dysphoria": 4, "Muscular weakness": 4, "Pain": 4, "Tachycardia": 4, "Throat irritation": 4, "Cardio-respiratory arrest": 3, "Cerebral infarction": 3, "Cold sweat": 3, "Computerised tomogram": 3, "Dysphonia": 3, "Feeling cold": 3, "Flushing": 3, "Investigation": 3, "Laryngeal oedema": 3, "Obstructive airways disorder": 3, "Pallor": 3, "Peripheral coldness": 3, "Throat tightness": 3, "Tremor": 3, "Vital signs measurement": 3, "Angioedema": 2, "Anxiety": 2, "Apnoea": 2, "Arrhythmia": 2, "Blood test": 2, "CSF test": 2, "Coma scale": 2, "Conjunctival haemorrhage": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Disease recurrence": 2, "Dizziness postural": 2, "Dysstasia": 2, "Echocardiogram": 2, "Fall": 2, "Gait disturbance": 2, "Hot flush": 2, "Lip swelling": 2, "Magnetic resonance imaging head": 2, "Nasal congestion": 2, "Oedema": 2, "Pharyngeal swelling": 2, "Rhabdomyolysis": 2, "Seizure": 2, "Sensation of foreign body": 2, "Sneezing": 2, "Somnolence": 2, "Toxic skin eruption": 2, "Urinary retention": 2, "Vaccination site pruritus": 2, "Wheezing": 2, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Antibody test": 1, "Aphasia": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Axillary pain": 1, "Back pain": 1, "Bedridden": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Body temperature increased": 1, "Bone densitometry": 1, "Bradycardia": 1, "Brain stem haemorrhage": 1, "Breath sounds abnormal": 1, "Bronchial disorder": 1, "Bursa disorder": 1, "Bursitis": 1, "CSF lymphocyte count": 1, "CSF lymphocyte count increased": 1, "Capillary nail refill test": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure acute": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Cerebral artery embolism": 1, "Cerebral artery occlusion": 1, "Chest pain": 1, "Chronic tonsillitis": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Deep vein thrombosis": 1, "Disseminated intravascular coagulation": 1, "Dissociation": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Erythema multiforme": 1, "Eye pain": 1, "Eyelid rash": 1, "Faeces soft": 1, "Febrile convulsion": 1, "Gastrointestinal disorder": 1, "Haematuria": 1, "Haemorrhage subcutaneous": 1, "Hallucination, visual": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Hepatic enzyme increased": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "IgA nephropathy": 1, "Ileus": 1, "Immune system disorder": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Intermenstrual bleeding": 1, "Jaundice": 1, "Laryngoscopy": 1, "Larynx irritation": 1, "Limb discomfort": 1, "Lip oedema": 1, "Lip pruritus": 1, "Lymphadenopathy": 1, "Lymphocyte count abnormal": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging spinal": 1, "Marasmus": 1, "Migraine": 1, "Mobility decreased": 1, "Movement disorder": 1, "Myalgia": 1, "Myelitis": 1, "Myofascial pain syndrome": 1, "Nephrotic syndrome": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuropathy peripheral": 1, "Oculomucocutaneous syndrome": 1, "Oral pruritus": 1, "PO2": 1, "Pain in extremity": 1, "Panic disorder": 1, "Parotitis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Portal vein thrombosis": 1, "Productive cough": 1, "Pseudomonas test": 1, "Pyelonephritis": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test": 1, "Sinus tachycardia": 1, "Skin discomfort": 1, "Skin test positive": 1, "Speech disorder": 1, "Staphylococcus test": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Syncope": 1, "Tachypnoea": 1, "Taste disorder": 1, "Tension": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thyroxine free": 1, "Tonsillar hypertrophy": 1, "Tri-iodothyronine free": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Ultrasound Doppler": 1, "Urinary incontinence": 1, "Vaccination site movement impairment": 1, "Vaccination site urticaria": 1, "Venogram": 1, "Ventricular extrasystoles": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "ET9096", "histograms": [{"histogram": {"Body temperature": 121, "Anaphylactic reaction": 41, "Blood pressure measurement": 34, "Pyrexia": 32, "Heart rate": 29, "Oxygen saturation": 26, "Nausea": 25, "Pruritus": 24, "Dyspnoea": 19, "Vomiting": 19, "Headache": 17, "Malaise": 16, "Chills": 15, "Cough": 14, "Oropharyngeal discomfort": 14, "Rash": 14, "Blood pressure increased": 13, "Hypoaesthesia": 13, "Palpitations": 12, "Urticaria": 12, "Dizziness": 11, "Arthralgia": 10, "Asthenia": 10, "Feeling abnormal": 9, "Erythema": 8, "Electrocardiogram": 7, "Oxygen saturation decreased": 7, "Heart rate increased": 6, "Vaccination site pain": 6, "Blood pressure decreased": 5, "Depressed level of consciousness": 5, "Feeling hot": 5, "Hypersensitivity": 5, "Loss of consciousness": 5, "Presyncope": 5, "SARS-CoV-2 test": 5, "Abdominal pain": 4, "Asthma": 4, "Chest discomfort": 4, "Computerised tomogram head": 4, "Dysphoria": 4, "Muscular weakness": 4, "Pain": 4, "Tachycardia": 4, "Throat irritation": 4, "Cardio-respiratory arrest": 3, "Cerebral infarction": 3, "Cold sweat": 3, "Computerised tomogram": 3, "Dysphonia": 3, "Feeling cold": 3, "Flushing": 3, "Investigation": 3, "Laryngeal oedema": 3, "Obstructive airways disorder": 3, "Pallor": 3, "Peripheral coldness": 3, "Throat tightness": 3, "Tremor": 3, "Vital signs measurement": 3, "Angioedema": 2, "Anxiety": 2, "Apnoea": 2, "Arrhythmia": 2, "Blood test": 2, "CSF test": 2, "Coma scale": 2, "Conjunctival haemorrhage": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Disease recurrence": 2, "Dizziness postural": 2, "Dysstasia": 2, "Echocardiogram": 2, "Fall": 2, "Gait disturbance": 2, "Hot flush": 2, "Lip swelling": 2, "Magnetic resonance imaging head": 2, "Nasal congestion": 2, "Oedema": 2, "Pharyngeal swelling": 2, "Rhabdomyolysis": 2, "Seizure": 2, "Sensation of foreign body": 2, "Sneezing": 2, "Somnolence": 2, "Toxic skin eruption": 2, "Urinary retention": 2, "Vaccination site pruritus": 2, "Wheezing": 2, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Antibody test": 1, "Aphasia": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Axillary pain": 1, "Back pain": 1, "Bedridden": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Body temperature increased": 1, "Bone densitometry": 1, "Bradycardia": 1, "Brain stem haemorrhage": 1, "Breath sounds abnormal": 1, "Bronchial disorder": 1, "Bursa disorder": 1, "Bursitis": 1, "CSF lymphocyte count": 1, "CSF lymphocyte count increased": 1, "Capillary nail refill test": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure acute": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Cerebral artery embolism": 1, "Cerebral artery occlusion": 1, "Chest pain": 1, "Chronic tonsillitis": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Deep vein thrombosis": 1, "Disseminated intravascular coagulation": 1, "Dissociation": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Erythema multiforme": 1, "Eye pain": 1, "Eyelid rash": 1, "Faeces soft": 1, "Febrile convulsion": 1, "Gastrointestinal disorder": 1, "Haematuria": 1, "Haemorrhage subcutaneous": 1, "Hallucination, visual": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Hepatic enzyme increased": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hyperthyroidism": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "IgA nephropathy": 1, "Ileus": 1, "Immune system disorder": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Intermenstrual bleeding": 1, "Jaundice": 1, "Laryngoscopy": 1, "Larynx irritation": 1, "Limb discomfort": 1, "Lip oedema": 1, "Lip pruritus": 1, "Lymphadenopathy": 1, "Lymphocyte count abnormal": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging spinal": 1, "Marasmus": 1, "Migraine": 1, "Mobility decreased": 1, "Movement disorder": 1, "Myalgia": 1, "Myelitis": 1, "Myofascial pain syndrome": 1, "Nephrotic syndrome": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuropathy peripheral": 1, "Oculomucocutaneous syndrome": 1, "Oral pruritus": 1, "PO2": 1, "Pain in extremity": 1, "Panic disorder": 1, "Parotitis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Portal vein thrombosis": 1, "Productive cough": 1, "Pseudomonas test": 1, "Pyelonephritis": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test": 1, "Sinus tachycardia": 1, "Skin discomfort": 1, "Skin test positive": 1, "Speech disorder": 1, "Staphylococcus test": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Syncope": 1, "Tachypnoea": 1, "Taste disorder": 1, "Tension": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thyroxine free": 1, "Tonsillar hypertrophy": 1, "Tri-iodothyronine free": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Ultrasound Doppler": 1, "Urinary incontinence": 1, "Vaccination site movement impairment": 1, "Vaccination site urticaria": 1, "Venogram": 1, "Ventricular extrasystoles": 1, "Vertigo": 1}, "batchcodes": ["ET9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/ET9606.json b/docs/data/histograms/Japan/ET9606.json
index 1f9297bfd12..eea33e52cf4 100644
--- a/docs/data/histograms/Japan/ET9606.json
+++ b/docs/data/histograms/Japan/ET9606.json
@@ -1 +1 @@
-{"batchcode": "ET9606", "histograms": [{"batchcodes": ["ET9606"], "histogram": {"Body temperature": 1, "Computerised tomogram": 1, "Magnetic resonance imaging neck": 1, "Muscle spasms": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "ET9606", "histograms": [{"histogram": {"Body temperature": 1, "Computerised tomogram": 1, "Magnetic resonance imaging neck": 1, "Muscle spasms": 1, "Seizure": 1}, "batchcodes": ["ET9606"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW0201.json b/docs/data/histograms/Japan/EW0201.json
index 927afdb9c52..8edd6a60857 100644
--- a/docs/data/histograms/Japan/EW0201.json
+++ b/docs/data/histograms/Japan/EW0201.json
@@ -1 +1 @@
-{"batchcode": "EW0201", "histograms": [{"batchcodes": ["000021A", "EW0201", "FC5947"], "histogram": {"Antineutrophil cytoplasmic antibody": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Chills": 1, "Eosinophilia": 1, "Infarction": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Peroneal nerve palsy": 1, "Pyrexia": 1, "Vasculitis": 1, "White blood cell count": 1}}, {"batchcodes": ["EW0201"], "histogram": {"Body temperature": 109, "Blood pressure measurement": 58, "Oxygen saturation": 47, "Heart rate": 38, "Anaphylactic reaction": 23, "Blood pressure increased": 21, "Pyrexia": 20, "Dyspnoea": 18, "Presyncope": 17, "Blood pressure decreased": 16, "Feeling abnormal": 15, "Nausea": 14, "Malaise": 13, "Oxygen saturation decreased": 13, "Cerebral infarction": 10, "Computerised tomogram": 10, "Dizziness": 10, "Erythema": 10, "Loss of consciousness": 9, "Magnetic resonance imaging": 9, "Vomiting": 9, "C-reactive protein": 8, "Cardio-respiratory arrest": 8, "Cough": 8, "Hypoaesthesia": 8, "Movement disorder": 8, "Muscular weakness": 8, "Oropharyngeal discomfort": 8, "Pain in extremity": 8, "Depressed level of consciousness": 7, "Headache": 7, "Pruritus": 7, "Blood test": 6, "Electrocardiogram": 6, "Gait disturbance": 6, "Investigation": 6, "Palpitations": 6, "Platelet count": 6, "Rash": 6, "Urticaria": 6, "White blood cell count": 6, "Abdominal pain": 5, "Altered state of consciousness": 5, "Arthralgia": 5, "Asthenia": 5, "Blood pressure systolic": 5, "Bradycardia": 5, "Chills": 5, "Diarrhoea": 5, "Pallor": 5, "Peripheral swelling": 5, "Blood creatine phosphokinase": 4, "CSF test": 4, "Chest X-ray": 4, "Computerised tomogram head": 4, "Echocardiogram": 4, "Haemoglobin": 4, "Heart rate increased": 4, "Respiratory arrest": 4, "Respiratory rate": 4, "SARS-CoV-2 test": 4, "Tremor": 4, "Alanine aminotransferase": 3, "Angiogram": 3, "Aspartate aminotransferase": 3, "Blood alkaline phosphatase": 3, "Blood creatinine": 3, "Blood lactate dehydrogenase": 3, "Cardiac arrest": 3, "Cold sweat": 3, "Coma scale": 3, "Death": 3, "Disease recurrence": 3, "Feeling hot": 3, "Gamma-glutamyltransferase": 3, "Guillain-Barre syndrome": 3, "Hyperhidrosis": 3, "Inflammation": 3, "Magnetic resonance imaging head": 3, "Musculoskeletal stiffness": 3, "Myocarditis": 3, "Nerve conduction studies": 3, "Neuropathy peripheral": 3, "Polymyalgia rheumatica": 3, "Respiratory failure": 3, "Rhinorrhoea": 3, "Seizure": 3, "Tachycardia": 3, "Throat irritation": 3, "Thrombosis": 3, "Toxic skin eruption": 3, "Vaccination site pain": 3, "Abdominal pain upper": 2, "Acute stress disorder": 2, "Anaphylactic shock": 2, "Aortic dissection": 2, "Asthma": 2, "Back pain": 2, "Blood albumin": 2, "Blood bilirubin": 2, "Blood gases": 2, "Blood potassium": 2, "Blood urea": 2, "C-reactive protein increased": 2, "COVID-19": 2, "Cardiac electrophysiologic study": 2, "Cardiac failure": 2, "Cardiac failure chronic": 2, "Cerebral artery embolism": 2, "Cerebral haemorrhage": 2, "Chest pain": 2, "Computerised tomogram thorax": 2, "Cyanosis": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Dyskinesia": 2, "Dysphonia": 2, "Dysphoria": 2, "Dyspnoea exertional": 2, "Fall": 2, "Feeling cold": 2, "Fibrin D dimer": 2, "Haematocrit": 2, "Heart rate decreased": 2, "Hemiplegia": 2, "Hepatic function abnormal": 2, "Hypersensitivity": 2, "Hypertension": 2, "Hyperventilation": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Hypoxia": 2, "Limb discomfort": 2, "Monoplegia": 2, "Myocardial infarction": 2, "Oral discomfort": 2, "PCO2": 2, "PO2": 2, "Pain": 2, "Paralysis": 2, "Pleural effusion": 2, "Pneumonia": 2, "Pneumonia aspiration": 2, "Pneumothorax": 2, "Protein total": 2, "Prothrombin time": 2, "Red blood cell count": 2, "Somnolence": 2, "Speech disorder": 2, "Urinary retention": 2, "Urinary tract infection": 2, "Vital signs measurement": 2, "Wheezing": 2, "Xeroderma pigmentosum": 2, "Abdominal discomfort": 1, "Abdominal tenderness": 1, "Abnormal behaviour": 1, "Acne": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Adrenal insufficiency": 1, "Ageusia": 1, "Alanine aminotransferase increased": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Ammonia": 1, "Anaemia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Anorectal disorder": 1, "Antiacetylcholine receptor antibody": 1, "Antibody test": 1, "Anuria": 1, "Aphonia": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Aspartate aminotransferase increased": 1, "Atonic seizures": 1, "Auscultation": 1, "Autoantibody test": 1, "Ballismus": 1, "Base excess": 1, "Basophil count": 1, "Basophil count increased": 1, "Bell's palsy": 1, "Bilirubinuria": 1, "Biopsy bone marrow": 1, "Bladder disorder": 1, "Blepharospasm": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase increased": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood uric acid": 1, "Brain natriuretic peptide": 1, "Breast cancer": 1, "Breath sounds abnormal": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac disorder": 1, "Cardiac function test": 1, "Cardiac function test abnormal": 1, "Cardiomyopathy": 1, "Carotid artery stenosis": 1, "Carpal tunnel syndrome": 1, "Catheterisation cardiac": 1, "Cervical radiculopathy": 1, "Chest discomfort": 1, "Choking sensation": 1, "Colitis ischaemic": 1, "Computerised tomogram abdomen": 1, "Conduction disorder": 1, "Conjunctival hyperaemia": 1, "Consciousness fluctuating": 1, "Contusion": 1, "Creatinine renal clearance": 1, "Deafness": 1, "Dehydration": 1, "Demyelinating polyneuropathy": 1, "Depressed mood": 1, "Diplopia": 1, "Drowning": 1, "Drug eruption": 1, "Dysgeusia": 1, "Dyslalia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysuria": 1, "EGFR status assay": 1, "Electrocardiogram ST segment elevation": 1, "Embolism": 1, "Embolism arterial": 1, "Eosinophil count": 1, "Epigastric discomfort": 1, "Erythema multiforme": 1, "Erythema of eyelid": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Faeces soft": 1, "Flushing": 1, "Foaming at mouth": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "General physical condition": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematuria": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Haemorrhagic diathesis": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate irregular": 1, "Helicobacter infection": 1, "Hepatic cirrhosis": 1, "Hepatic encephalopathy": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Herpes simplex": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "Heterophoria": 1, "Hiccups": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hydronephrosis": 1, "Hypoacusis": 1, "Hypokalaemia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Illness": 1, "Immune thrombocytopenia": 1, "Initial insomnia": 1, "Insomnia": 1, "Intermittent claudication": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Investigation abnormal": 1, "Irritable bowel syndrome": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Jugular vein thrombosis": 1, "Laryngeal discomfort": 1, "Limb mass": 1, "Lipoma": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Lymphoma": 1, "Malnutrition": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meniere's disease": 1, "Migraine": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Multiple organ dysfunction syndrome": 1, "Muscle neoplasm": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker increased": 1, "Neoplasm malignant": 1, "Neurologic neglect syndrome": 1, "Neutrophil count": 1, "Nucleic acid test": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Paraplegia": 1, "Pericardial effusion": 1, "Peripheral arterial occlusive disease": 1, "Peripheral artery occlusion": 1, "Peripheral coldness": 1, "Peritoneal perforation": 1, "Petechiae": 1, "Physical examination": 1, "Platelet count decreased": 1, "Polymerase chain reaction": 1, "Polymyositis": 1, "Portal vein thrombosis": 1, "Post herpetic neuralgia": 1, "Procalcitonin": 1, "Procalcitonin increased": 1, "Protein total increased": 1, "Prothrombin time ratio": 1, "Pulmonary artery thrombosis": 1, "Pulmonary infarction": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Pulse pressure decreased": 1, "Pulse waveform": 1, "Pupillary light reflex tests": 1, "Pupillary reflex impaired": 1, "Purpura": 1, "Quadriplegia": 1, "Radial pulse abnormal": 1, "Red blood cell sedimentation rate": 1, "Renal failure": 1, "Renal impairment": 1, "Respiratory alkalosis": 1, "Respiratory rate decreased": 1, "Respiratory rate increased": 1, "Reticulocyte count": 1, "Reticulocyte count increased": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Septic shock": 1, "Serum ferritin": 1, "Shock": 1, "Shunt occlusion": 1, "Sinus node dysfunction": 1, "Skin discolouration": 1, "Smear test": 1, "Spinal cord disorder": 1, "Spinal osteoarthritis": 1, "Splenomegaly": 1, "Stertor": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Syncope": 1, "Tenderness": 1, "Tensilon test": 1, "Thrombocytopenia": 1, "Thymoma": 1, "Torticollis": 1, "Transient ischaemic attack": 1, "Treponema test": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Ultrasound scan": 1, "Urethral fistula": 1, "Urine output": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Visceral pain": 1, "Vision blurred": 1, "Visual brightness": 1, "Weight increased": 1, "X-ray": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0201", "histograms": [{"histogram": {"Antineutrophil cytoplasmic antibody": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Chills": 1, "Eosinophilia": 1, "Infarction": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Peroneal nerve palsy": 1, "Pyrexia": 1, "Vasculitis": 1, "White blood cell count": 1}, "batchcodes": ["000021A", "EW0201", "FC5947"]}, {"histogram": {"Body temperature": 109, "Blood pressure measurement": 58, "Oxygen saturation": 47, "Heart rate": 38, "Anaphylactic reaction": 23, "Blood pressure increased": 21, "Pyrexia": 20, "Dyspnoea": 18, "Presyncope": 17, "Blood pressure decreased": 16, "Feeling abnormal": 15, "Nausea": 14, "Malaise": 13, "Oxygen saturation decreased": 13, "Cerebral infarction": 10, "Computerised tomogram": 10, "Dizziness": 10, "Erythema": 10, "Loss of consciousness": 9, "Magnetic resonance imaging": 9, "Vomiting": 9, "C-reactive protein": 8, "Cardio-respiratory arrest": 8, "Cough": 8, "Hypoaesthesia": 8, "Movement disorder": 8, "Muscular weakness": 8, "Oropharyngeal discomfort": 8, "Pain in extremity": 8, "Depressed level of consciousness": 7, "Headache": 7, "Pruritus": 7, "Blood test": 6, "Electrocardiogram": 6, "Gait disturbance": 6, "Investigation": 6, "Palpitations": 6, "Platelet count": 6, "Rash": 6, "Urticaria": 6, "White blood cell count": 6, "Abdominal pain": 5, "Altered state of consciousness": 5, "Arthralgia": 5, "Asthenia": 5, "Blood pressure systolic": 5, "Bradycardia": 5, "Chills": 5, "Diarrhoea": 5, "Pallor": 5, "Peripheral swelling": 5, "Blood creatine phosphokinase": 4, "CSF test": 4, "Chest X-ray": 4, "Computerised tomogram head": 4, "Echocardiogram": 4, "Haemoglobin": 4, "Heart rate increased": 4, "Respiratory arrest": 4, "Respiratory rate": 4, "SARS-CoV-2 test": 4, "Tremor": 4, "Alanine aminotransferase": 3, "Angiogram": 3, "Aspartate aminotransferase": 3, "Blood alkaline phosphatase": 3, "Blood creatinine": 3, "Blood lactate dehydrogenase": 3, "Cardiac arrest": 3, "Cold sweat": 3, "Coma scale": 3, "Death": 3, "Disease recurrence": 3, "Feeling hot": 3, "Gamma-glutamyltransferase": 3, "Guillain-Barre syndrome": 3, "Hyperhidrosis": 3, "Inflammation": 3, "Magnetic resonance imaging head": 3, "Musculoskeletal stiffness": 3, "Myocarditis": 3, "Nerve conduction studies": 3, "Neuropathy peripheral": 3, "Polymyalgia rheumatica": 3, "Respiratory failure": 3, "Rhinorrhoea": 3, "Seizure": 3, "Tachycardia": 3, "Throat irritation": 3, "Thrombosis": 3, "Toxic skin eruption": 3, "Vaccination site pain": 3, "Abdominal pain upper": 2, "Acute stress disorder": 2, "Anaphylactic shock": 2, "Aortic dissection": 2, "Asthma": 2, "Back pain": 2, "Blood albumin": 2, "Blood bilirubin": 2, "Blood gases": 2, "Blood potassium": 2, "Blood urea": 2, "C-reactive protein increased": 2, "COVID-19": 2, "Cardiac electrophysiologic study": 2, "Cardiac failure": 2, "Cardiac failure chronic": 2, "Cerebral artery embolism": 2, "Cerebral haemorrhage": 2, "Chest pain": 2, "Computerised tomogram thorax": 2, "Cyanosis": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Dyskinesia": 2, "Dysphonia": 2, "Dysphoria": 2, "Dyspnoea exertional": 2, "Fall": 2, "Feeling cold": 2, "Fibrin D dimer": 2, "Haematocrit": 2, "Heart rate decreased": 2, "Hemiplegia": 2, "Hepatic function abnormal": 2, "Hypersensitivity": 2, "Hypertension": 2, "Hyperventilation": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Hypoxia": 2, "Limb discomfort": 2, "Monoplegia": 2, "Myocardial infarction": 2, "Oral discomfort": 2, "PCO2": 2, "PO2": 2, "Pain": 2, "Paralysis": 2, "Pleural effusion": 2, "Pneumonia": 2, "Pneumonia aspiration": 2, "Pneumothorax": 2, "Protein total": 2, "Prothrombin time": 2, "Red blood cell count": 2, "Somnolence": 2, "Speech disorder": 2, "Urinary retention": 2, "Urinary tract infection": 2, "Vital signs measurement": 2, "Wheezing": 2, "Xeroderma pigmentosum": 2, "Abdominal discomfort": 1, "Abdominal tenderness": 1, "Abnormal behaviour": 1, "Acne": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Adrenal insufficiency": 1, "Ageusia": 1, "Alanine aminotransferase increased": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Ammonia": 1, "Anaemia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Anorectal disorder": 1, "Antiacetylcholine receptor antibody": 1, "Antibody test": 1, "Anuria": 1, "Aphonia": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Aspartate aminotransferase increased": 1, "Atonic seizures": 1, "Auscultation": 1, "Autoantibody test": 1, "Ballismus": 1, "Base excess": 1, "Basophil count": 1, "Basophil count increased": 1, "Bell's palsy": 1, "Bilirubinuria": 1, "Biopsy bone marrow": 1, "Bladder disorder": 1, "Blepharospasm": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase increased": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood uric acid": 1, "Brain natriuretic peptide": 1, "Breast cancer": 1, "Breath sounds abnormal": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac disorder": 1, "Cardiac function test": 1, "Cardiac function test abnormal": 1, "Cardiomyopathy": 1, "Carotid artery stenosis": 1, "Carpal tunnel syndrome": 1, "Catheterisation cardiac": 1, "Cervical radiculopathy": 1, "Chest discomfort": 1, "Choking sensation": 1, "Colitis ischaemic": 1, "Computerised tomogram abdomen": 1, "Conduction disorder": 1, "Conjunctival hyperaemia": 1, "Consciousness fluctuating": 1, "Contusion": 1, "Creatinine renal clearance": 1, "Deafness": 1, "Dehydration": 1, "Demyelinating polyneuropathy": 1, "Depressed mood": 1, "Diplopia": 1, "Drowning": 1, "Drug eruption": 1, "Dysgeusia": 1, "Dyslalia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysuria": 1, "EGFR status assay": 1, "Electrocardiogram ST segment elevation": 1, "Embolism": 1, "Embolism arterial": 1, "Eosinophil count": 1, "Epigastric discomfort": 1, "Erythema multiforme": 1, "Erythema of eyelid": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Faeces soft": 1, "Flushing": 1, "Foaming at mouth": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "General physical condition": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematuria": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Haemorrhagic diathesis": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate irregular": 1, "Helicobacter infection": 1, "Hepatic cirrhosis": 1, "Hepatic encephalopathy": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Herpes simplex": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "Heterophoria": 1, "Hiccups": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hydronephrosis": 1, "Hypoacusis": 1, "Hypokalaemia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Illness": 1, "Immune thrombocytopenia": 1, "Initial insomnia": 1, "Insomnia": 1, "Intermittent claudication": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Investigation abnormal": 1, "Irritable bowel syndrome": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Jugular vein thrombosis": 1, "Laryngeal discomfort": 1, "Limb mass": 1, "Lipoma": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Lymphoma": 1, "Malnutrition": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meniere's disease": 1, "Migraine": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Multiple organ dysfunction syndrome": 1, "Muscle neoplasm": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker increased": 1, "Neoplasm malignant": 1, "Neurologic neglect syndrome": 1, "Neutrophil count": 1, "Nucleic acid test": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Paraplegia": 1, "Pericardial effusion": 1, "Peripheral arterial occlusive disease": 1, "Peripheral artery occlusion": 1, "Peripheral coldness": 1, "Peritoneal perforation": 1, "Petechiae": 1, "Physical examination": 1, "Platelet count decreased": 1, "Polymerase chain reaction": 1, "Polymyositis": 1, "Portal vein thrombosis": 1, "Post herpetic neuralgia": 1, "Procalcitonin": 1, "Procalcitonin increased": 1, "Protein total increased": 1, "Prothrombin time ratio": 1, "Pulmonary artery thrombosis": 1, "Pulmonary infarction": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Pulse pressure decreased": 1, "Pulse waveform": 1, "Pupillary light reflex tests": 1, "Pupillary reflex impaired": 1, "Purpura": 1, "Quadriplegia": 1, "Radial pulse abnormal": 1, "Red blood cell sedimentation rate": 1, "Renal failure": 1, "Renal impairment": 1, "Respiratory alkalosis": 1, "Respiratory rate decreased": 1, "Respiratory rate increased": 1, "Reticulocyte count": 1, "Reticulocyte count increased": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Septic shock": 1, "Serum ferritin": 1, "Shock": 1, "Shunt occlusion": 1, "Sinus node dysfunction": 1, "Skin discolouration": 1, "Smear test": 1, "Spinal cord disorder": 1, "Spinal osteoarthritis": 1, "Splenomegaly": 1, "Stertor": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Syncope": 1, "Tenderness": 1, "Tensilon test": 1, "Thrombocytopenia": 1, "Thymoma": 1, "Torticollis": 1, "Transient ischaemic attack": 1, "Treponema test": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Ultrasound scan": 1, "Urethral fistula": 1, "Urine output": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Visceral pain": 1, "Vision blurred": 1, "Visual brightness": 1, "Weight increased": 1, "X-ray": 1, "pH body fluid": 1}, "batchcodes": ["EW0201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW02021.json b/docs/data/histograms/Japan/EW02021.json
index 60f8f6b252f..91989cc8cbb 100644
--- a/docs/data/histograms/Japan/EW02021.json
+++ b/docs/data/histograms/Japan/EW02021.json
@@ -1 +1 @@
-{"batchcode": "EW02021", "histograms": [{"batchcodes": ["EW02021"], "histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Blood pressure increased": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Concussion": 1, "Condition aggravated": 1, "Electrocardiogram": 1, "Face injury": 1, "Fall": 1, "Fracture": 1, "Heart rate": 1, "Ischaemia": 1, "Joint dislocation": 1, "Loss of consciousness": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Presyncope": 1, "Retinal exudates": 1, "Retinal haemorrhage": 1, "Retinal vein occlusion": 1, "Skin laceration": 1, "Swelling face": 1, "Trismus": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1}}]}
\ No newline at end of file
+{"batchcode": "EW02021", "histograms": [{"histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Blood pressure increased": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Concussion": 1, "Condition aggravated": 1, "Electrocardiogram": 1, "Face injury": 1, "Fall": 1, "Fracture": 1, "Heart rate": 1, "Ischaemia": 1, "Joint dislocation": 1, "Loss of consciousness": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Presyncope": 1, "Retinal exudates": 1, "Retinal haemorrhage": 1, "Retinal vein occlusion": 1, "Skin laceration": 1, "Swelling face": 1, "Trismus": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1}, "batchcodes": ["EW02021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW0203.json b/docs/data/histograms/Japan/EW0203.json
index fe231136ccb..7303f5e8f8f 100644
--- a/docs/data/histograms/Japan/EW0203.json
+++ b/docs/data/histograms/Japan/EW0203.json
@@ -1 +1 @@
-{"batchcode": "EW0203", "histograms": [{"batchcodes": ["EW0203"], "histogram": {"Body temperature": 92, "Blood pressure measurement": 49, "Oxygen saturation": 35, "Heart rate": 33, "Anaphylactic reaction": 22, "Pyrexia": 22, "Blood pressure increased": 20, "Dyspnoea": 15, "Nausea": 15, "Headache": 10, "Malaise": 10, "Urticaria": 10, "Vomiting": 10, "Feeling abnormal": 9, "Hypoaesthesia": 9, "Loss of consciousness": 8, "Palpitations": 8, "Pruritus": 8, "Rash": 8, "Cough": 7, "Depressed level of consciousness": 7, "Oropharyngeal discomfort": 7, "Blood pressure decreased": 6, "Blood test": 6, "Cardio-respiratory arrest": 6, "Hypertension": 6, "Asthenia": 5, "Cold sweat": 5, "Computerised tomogram head": 5, "Decreased appetite": 5, "Electrocardiogram": 5, "Pallor": 5, "Presyncope": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "Asthma": 4, "Chest discomfort": 4, "Dizziness": 4, "Dysphonia": 4, "Erythema": 4, "Fall": 4, "Heart rate decreased": 4, "Pain in extremity": 4, "Platelet count": 4, "Pneumonia": 4, "Respiratory rate": 4, "SARS-CoV-2 test": 4, "Wheezing": 4, "Arthralgia": 3, "Bradycardia": 3, "Chest pain": 3, "Chills": 3, "Coma scale": 3, "Diarrhoea": 3, "Dysphoria": 3, "Fibrin D dimer": 3, "Guillain-Barre syndrome": 3, "Heart rate increased": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hyperventilation": 3, "Hypoxia": 3, "Investigation": 3, "Magnetic resonance imaging head": 3, "Seizure": 3, "Tachycardia": 3, "White blood cell count": 3, "Abdominal pain": 2, "Acute myocardial infarction": 2, "Aortic dissection": 2, "Blood lactate dehydrogenase": 2, "C-reactive protein": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Dysstasia": 2, "Eczema": 2, "Endoscopy upper gastrointestinal tract": 2, "Erythema multiforme": 2, "Flushing": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Neuropathy peripheral": 2, "Obstructive airways disorder": 2, "Oedema peripheral": 2, "PO2": 2, "Pain": 2, "Paralysis": 2, "Rash erythematous": 2, "Rhinorrhoea": 2, "Sensation of foreign body": 2, "Somnolence": 2, "Sudden hearing loss": 2, "Throat irritation": 2, "Throat tightness": 2, "Tremor": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Vital signs measurement": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Acidosis": 1, "Acute coronary syndrome": 1, "Acute respiratory failure": 1, "Allergy to vaccine": 1, "Altered state of consciousness": 1, "Amniotic cavity infection": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antibody test": 1, "Anxiety": 1, "Apathy": 1, "Arteriosclerosis": 1, "Autoimmune encephalopathy": 1, "Autonomic seizure": 1, "Bacterial infection": 1, "Bacterial test": 1, "Base excess": 1, "Beta 2 microglobulin urine": 1, "Binocular eye movement disorder": 1, "Biopsy heart": 1, "Blindness": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure diastolic decreased": 1, "Body mass index": 1, "Breath sounds": 1, "Bronchitis bacterial": 1, "Bronchospasm": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF culture": 1, "CSF glucose": 1, "CSF granulocyte count": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cognitive disorder": 1, "Colitis ulcerative": 1, "Colon cancer": 1, "Colonoscopy": 1, "Coma": 1, "Computerised tomogram abdomen": 1, "Constipation": 1, "Coronary artery stenosis": 1, "Death": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Dermatitis": 1, "Diabetes mellitus": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorganised speech": 1, "Drug hypersensitivity": 1, "Duodenal stenosis": 1, "Duodenal ulcer": 1, "Dyslalia": 1, "Dyspraxia": 1, "Ear pruritus": 1, "Encephalitis autoimmune": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Epistaxis": 1, "Erythema nodosum": 1, "Eye pain": 1, "Eye swelling": 1, "Eyelid ptosis": 1, "Face injury": 1, "Face oedema": 1, "Facial paralysis": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Foetal malformation": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gastric cancer": 1, "Gastrointestinal disorder": 1, "Gastrointestinal oedema": 1, "Genital haemorrhage": 1, "Glycosylated haemoglobin": 1, "Grip strength decreased": 1, "Haemangiopericytoma": 1, "Haematochezia": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Hand dermatitis": 1, "Head discomfort": 1, "Heart disease congenital": 1, "Hepatitis cholestatic": 1, "Hepatocellular injury": 1, "Hot flush": 1, "Hyperkinesia": 1, "Hyperpyrexia": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Immune thrombocytopenia": 1, "Immunodeficiency": 1, "Inflammation": 1, "Interleukin level": 1, "Internal haemorrhage": 1, "Intestinal obstruction": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Labile blood pressure": 1, "Large intestinal ulcer": 1, "Lip swelling": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Meningitis aseptic": 1, "Menstruation irregular": 1, "Miller Fisher syndrome": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "NIH stroke scale": 1, "Nasal congestion": 1, "Neurological examination": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Oedema mouth": 1, "Oral discomfort": 1, "Oral mucosal erythema": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "Paraesthesia": 1, "Pathology test": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Physical deconditioning": 1, "Platelet count decreased": 1, "Polymerase chain reaction": 1, "Proctosigmoidoscopy abnormal": 1, "Prothrombin time ratio": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulse absent": 1, "Pulse pressure decreased": 1, "Pupillary reflex impaired": 1, "Pyelitis": 1, "Rales": 1, "Rash papular": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Single umbilical artery": 1, "Sitting disability": 1, "Slow response to stimuli": 1, "Somatic symptom disorder": 1, "Speech disorder": 1, "Staring": 1, "Steroid dependence": 1, "Still's disease": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Tachypnoea": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Thyroiditis acute": 1, "Tonic convulsion": 1, "Transient ischaemic attack": 1, "Trigeminal palsy": 1, "Troponin T": 1, "Troponin T increased": 1, "Ultrasound Doppler": 1, "Umbilical cord around neck": 1, "Upper respiratory tract congestion": 1, "Vaccination failure": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Vision blurred": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0203", "histograms": [{"histogram": {"Body temperature": 92, "Blood pressure measurement": 49, "Oxygen saturation": 35, "Heart rate": 33, "Anaphylactic reaction": 22, "Pyrexia": 22, "Blood pressure increased": 20, "Dyspnoea": 15, "Nausea": 15, "Headache": 10, "Malaise": 10, "Urticaria": 10, "Vomiting": 10, "Feeling abnormal": 9, "Hypoaesthesia": 9, "Loss of consciousness": 8, "Palpitations": 8, "Pruritus": 8, "Rash": 8, "Cough": 7, "Depressed level of consciousness": 7, "Oropharyngeal discomfort": 7, "Blood pressure decreased": 6, "Blood test": 6, "Cardio-respiratory arrest": 6, "Hypertension": 6, "Asthenia": 5, "Cold sweat": 5, "Computerised tomogram head": 5, "Decreased appetite": 5, "Electrocardiogram": 5, "Pallor": 5, "Presyncope": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "Asthma": 4, "Chest discomfort": 4, "Dizziness": 4, "Dysphonia": 4, "Erythema": 4, "Fall": 4, "Heart rate decreased": 4, "Pain in extremity": 4, "Platelet count": 4, "Pneumonia": 4, "Respiratory rate": 4, "SARS-CoV-2 test": 4, "Wheezing": 4, "Arthralgia": 3, "Bradycardia": 3, "Chest pain": 3, "Chills": 3, "Coma scale": 3, "Diarrhoea": 3, "Dysphoria": 3, "Fibrin D dimer": 3, "Guillain-Barre syndrome": 3, "Heart rate increased": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hyperventilation": 3, "Hypoxia": 3, "Investigation": 3, "Magnetic resonance imaging head": 3, "Seizure": 3, "Tachycardia": 3, "White blood cell count": 3, "Abdominal pain": 2, "Acute myocardial infarction": 2, "Aortic dissection": 2, "Blood lactate dehydrogenase": 2, "C-reactive protein": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Dysstasia": 2, "Eczema": 2, "Endoscopy upper gastrointestinal tract": 2, "Erythema multiforme": 2, "Flushing": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Neuropathy peripheral": 2, "Obstructive airways disorder": 2, "Oedema peripheral": 2, "PO2": 2, "Pain": 2, "Paralysis": 2, "Rash erythematous": 2, "Rhinorrhoea": 2, "Sensation of foreign body": 2, "Somnolence": 2, "Sudden hearing loss": 2, "Throat irritation": 2, "Throat tightness": 2, "Tremor": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Vital signs measurement": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Acidosis": 1, "Acute coronary syndrome": 1, "Acute respiratory failure": 1, "Allergy to vaccine": 1, "Altered state of consciousness": 1, "Amniotic cavity infection": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antibody test": 1, "Anxiety": 1, "Apathy": 1, "Arteriosclerosis": 1, "Autoimmune encephalopathy": 1, "Autonomic seizure": 1, "Bacterial infection": 1, "Bacterial test": 1, "Base excess": 1, "Beta 2 microglobulin urine": 1, "Binocular eye movement disorder": 1, "Biopsy heart": 1, "Blindness": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure diastolic decreased": 1, "Body mass index": 1, "Breath sounds": 1, "Bronchitis bacterial": 1, "Bronchospasm": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF culture": 1, "CSF glucose": 1, "CSF granulocyte count": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cognitive disorder": 1, "Colitis ulcerative": 1, "Colon cancer": 1, "Colonoscopy": 1, "Coma": 1, "Computerised tomogram abdomen": 1, "Constipation": 1, "Coronary artery stenosis": 1, "Death": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Dermatitis": 1, "Diabetes mellitus": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorganised speech": 1, "Drug hypersensitivity": 1, "Duodenal stenosis": 1, "Duodenal ulcer": 1, "Dyslalia": 1, "Dyspraxia": 1, "Ear pruritus": 1, "Encephalitis autoimmune": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Epistaxis": 1, "Erythema nodosum": 1, "Eye pain": 1, "Eye swelling": 1, "Eyelid ptosis": 1, "Face injury": 1, "Face oedema": 1, "Facial paralysis": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Foetal malformation": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gastric cancer": 1, "Gastrointestinal disorder": 1, "Gastrointestinal oedema": 1, "Genital haemorrhage": 1, "Glycosylated haemoglobin": 1, "Grip strength decreased": 1, "Haemangiopericytoma": 1, "Haematochezia": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Hand dermatitis": 1, "Head discomfort": 1, "Heart disease congenital": 1, "Hepatitis cholestatic": 1, "Hepatocellular injury": 1, "Hot flush": 1, "Hyperkinesia": 1, "Hyperpyrexia": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Immune thrombocytopenia": 1, "Immunodeficiency": 1, "Inflammation": 1, "Interleukin level": 1, "Internal haemorrhage": 1, "Intestinal obstruction": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Labile blood pressure": 1, "Large intestinal ulcer": 1, "Lip swelling": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Meningitis aseptic": 1, "Menstruation irregular": 1, "Miller Fisher syndrome": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "NIH stroke scale": 1, "Nasal congestion": 1, "Neurological examination": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Oedema mouth": 1, "Oral discomfort": 1, "Oral mucosal erythema": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "Paraesthesia": 1, "Pathology test": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Physical deconditioning": 1, "Platelet count decreased": 1, "Polymerase chain reaction": 1, "Proctosigmoidoscopy abnormal": 1, "Prothrombin time ratio": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulse absent": 1, "Pulse pressure decreased": 1, "Pupillary reflex impaired": 1, "Pyelitis": 1, "Rales": 1, "Rash papular": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Single umbilical artery": 1, "Sitting disability": 1, "Slow response to stimuli": 1, "Somatic symptom disorder": 1, "Speech disorder": 1, "Staring": 1, "Steroid dependence": 1, "Still's disease": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Tachypnoea": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Thyroiditis acute": 1, "Tonic convulsion": 1, "Transient ischaemic attack": 1, "Trigeminal palsy": 1, "Troponin T": 1, "Troponin T increased": 1, "Ultrasound Doppler": 1, "Umbilical cord around neck": 1, "Upper respiratory tract congestion": 1, "Vaccination failure": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Vision blurred": 1, "pH body fluid": 1}, "batchcodes": ["EW0203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW0207.json b/docs/data/histograms/Japan/EW0207.json
index b2b096753be..fb21bd7790f 100644
--- a/docs/data/histograms/Japan/EW0207.json
+++ b/docs/data/histograms/Japan/EW0207.json
@@ -1 +1 @@
-{"batchcode": "EW0207", "histograms": [{"batchcodes": ["EW0207"], "histogram": {"Body temperature": 98, "Blood pressure measurement": 37, "Oxygen saturation": 28, "Heart rate": 21, "Anaphylactic reaction": 20, "Blood pressure increased": 18, "Pyrexia": 16, "Malaise": 14, "Dyspnoea": 12, "Feeling abnormal": 12, "Nausea": 12, "Rash": 12, "Blood pressure decreased": 10, "Blood test": 10, "Erythema": 10, "Pruritus": 10, "Hypoaesthesia": 9, "Loss of consciousness": 9, "Depressed level of consciousness": 8, "Fall": 8, "Muscular weakness": 8, "SARS-CoV-2 test": 8, "Decreased appetite": 7, "Dizziness": 7, "Electrocardiogram": 7, "Headache": 7, "Magnetic resonance imaging head": 7, "Presyncope": 7, "Urticaria": 7, "Vomiting": 7, "Asthenia": 6, "Computerised tomogram": 6, "Platelet count": 6, "Somnolence": 6, "Vaccination site pain": 6, "Back pain": 5, "C-reactive protein": 5, "Chills": 5, "Coma scale": 5, "Computerised tomogram head": 5, "Cough": 5, "Diarrhoea": 5, "Dysphoria": 5, "Platelet count decreased": 5, "Seizure": 5, "Vital signs measurement": 5, "Altered state of consciousness": 4, "Cardio-respiratory arrest": 4, "Cerebral infarction": 4, "Chest discomfort": 4, "Cold sweat": 4, "Death": 4, "Facial paralysis": 4, "Heart rate increased": 4, "Hyperhidrosis": 4, "Investigation": 4, "Magnetic resonance imaging": 4, "Movement disorder": 4, "Oedema": 4, "Oropharyngeal discomfort": 4, "Oxygen saturation decreased": 4, "Pain": 4, "Pallor": 4, "Palpitations": 4, "White blood cell count": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Blood pressure systolic": 3, "Blood pressure systolic increased": 3, "COVID-19": 3, "CSF test": 3, "Cardiac arrest": 3, "Chest X-ray": 3, "Chest pain": 3, "Dehydration": 3, "Drug eruption": 3, "Dyslalia": 3, "Dysphagia": 3, "Dysphonia": 3, "Gastrointestinal disorder": 3, "Herpes zoster": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Respiratory arrest": 3, "Respiratory rate": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Antibody test": 2, "Aortic dissection": 2, "Auscultation": 2, "Biopsy skin": 2, "Blood creatine": 2, "Blood glucose": 2, "Brain natriuretic peptide": 2, "Cerebral haemorrhage": 2, "Condition aggravated": 2, "Confusional state": 2, "Cutaneous vasculitis": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Eosinophil count": 2, "Eosinophil count increased": 2, "Epilepsy": 2, "Feeling cold": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Gait inability": 2, "Haematocrit": 2, "Haemoglobin": 2, "Heart rate decreased": 2, "Henoch-Schonlein purpura": 2, "Hepatic function abnormal": 2, "Hyperventilation": 2, "Hypoaesthesia oral": 2, "Mean cell volume": 2, "Myelitis transverse": 2, "Myocardial infarction": 2, "Neck pain": 2, "Nerve conduction studies": 2, "Neurological examination": 2, "Paralysis": 2, "Peripheral swelling": 2, "Physical deconditioning": 2, "Pleural effusion": 2, "Pneumonia bacterial": 2, "Polymerase chain reaction": 2, "Red blood cell count": 2, "Restlessness": 2, "Speech disorder": 2, "Tachycardia": 2, "Thirst": 2, "Throat irritation": 2, "Throat tightness": 2, "Tremor": 2, "Trigeminal palsy": 2, "Vaccination failure": 2, "Visual impairment": 2, "Wheezing": 2, "X-ray": 2, "Abdominal pain lower": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Adrenocortical insufficiency acute": 1, "Allergic bronchopulmonary mycosis": 1, "Allergic reaction to excipient": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angioedema": 1, "Angiogram": 1, "Angiopathy": 1, "Anti-aquaporin-4 antibody": 1, "Anxiety": 1, "Apnoea": 1, "Arthralgia": 1, "Ascites": 1, "Aspiration bone marrow": 1, "Ataxia": 1, "Autoantibody test": 1, "Basilar artery stenosis": 1, "Bell's palsy": 1, "Biopsy heart": 1, "Biopsy pericardium": 1, "Biopsy pleura": 1, "Blister": 1, "Blood cholesterol": 1, "Blood creatine increased": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood phosphorus": 1, "Blood pressure systolic decreased": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Brain herniation": 1, "Brain stem infarction": 1, "C-reactive protein increased": 1, "CSF cell count": 1, "CSF myelin basic protein": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "Cardiac disorder": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiac perforation": 1, "Cardiac tamponade": 1, "Castleman's disease": 1, "Catheterisation cardiac": 1, "Cerebellar infarction": 1, "Cerebral arteriosclerosis": 1, "Circulatory collapse": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Conversion disorder": 1, "Coronary artery occlusion": 1, "Cyanosis": 1, "Delirium": 1, "Diplopia": 1, "Diverticulum intestinal": 1, "Diverticulum intestinal haemorrhagic": 1, "Dizziness postural": 1, "Duodenal ulcer": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysstasia": 1, "Ear pain": 1, "Ear swelling": 1, "Eating disorder": 1, "Eczema": 1, "Electrocardiogram Q wave abnormal": 1, "Electrocardiogram Q waves": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram abnormal": 1, "Electroencephalogram": 1, "Encephalopathy": 1, "Endoscopy large bowel": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophilia": 1, "Eosinophilic pneumonia": 1, "Eructation": 1, "Eye pain": 1, "Eye pruritus": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Flank pain": 1, "Flushing": 1, "Foaming at mouth": 1, "Gallbladder enlargement": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Glossodynia": 1, "Granulocyte count": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heat illness": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatosplenomegaly": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hydrothorax": 1, "Hypercholesterolaemia": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypopnoea": 1, "Hyporeflexia": 1, "Immune thrombocytopenia": 1, "Immunoglobulins": 1, "Immunoglobulins increased": 1, "Immunosuppression": 1, "Increased appetite": 1, "Inflammation": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Intestinal obstruction": 1, "Irregular breathing": 1, "Irritable bowel syndrome": 1, "Ischaemic cerebral infarction": 1, "Kernig's sign": 1, "Laziness": 1, "Limb discomfort": 1, "Lip erosion": 1, "Lip swelling": 1, "Lower limb fracture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte stimulation test": 1, "Lymphocyte stimulation test positive": 1, "Macular oedema": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mechanical ileus": 1, "Mediastinoscopy": 1, "Melaena": 1, "Mesenteric panniculitis": 1, "Mobility decreased": 1, "Monocyte count": 1, "Mood altered": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial rupture": 1, "N-telopeptide urine": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Neuralgia": 1, "Nodule": 1, "Nystagmus": 1, "Occipital neuralgia": 1, "Oculomucocutaneous syndrome": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Osteomyelitis": 1, "Pain assessment": 1, "Palatal swelling": 1, "Palmar erythema": 1, "Panic attack": 1, "Panniculitis": 1, "Paraparesis": 1, "Parosmia": 1, "Parotitis": 1, "Pericarditis": 1, "Peripheral circulatory failure": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pleural fluid analysis": 1, "Pleurisy": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Pollakiuria": 1, "Protein induced by vitamin K absence or antagonist II": 1, "Pulmonary oedema": 1, "Pulmonary tuberculosis": 1, "Pulse abnormal": 1, "Pulseless electrical activity": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Pyramidal tract syndrome": 1, "Renal impairment": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Retinal vein occlusion": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinalgia": 1, "Rubella": 1, "Sensation of foreign body": 1, "Skin test": 1, "Somatic symptom disorder": 1, "Splenomegaly": 1, "Sputum test": 1, "Status epilepticus": 1, "Stevens-Johnson syndrome": 1, "Stiff person syndrome": 1, "Stomatitis": 1, "Subarachnoid haemorrhage": 1, "Subretinal fluid": 1, "Sudden cardiac death": 1, "Suspected COVID-19": 1, "Swelling": 1, "Syncope": 1, "Tachypnoea": 1, "Taste disorder": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Tongue blistering": 1, "Tongue pruritus": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Type I hypersensitivity": 1, "Ultrasound Doppler": 1, "Unresponsive to stimuli": 1, "Urine albumin/creatinine ratio": 1, "Urine analysis": 1, "Urticarial vasculitis": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Varicella virus test": 1, "Vasculitis": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Vitamin B1": 1, "Vitamin B12": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0207", "histograms": [{"histogram": {"Body temperature": 98, "Blood pressure measurement": 37, "Oxygen saturation": 28, "Heart rate": 21, "Anaphylactic reaction": 20, "Blood pressure increased": 18, "Pyrexia": 16, "Malaise": 14, "Dyspnoea": 12, "Feeling abnormal": 12, "Nausea": 12, "Rash": 12, "Blood pressure decreased": 10, "Blood test": 10, "Erythema": 10, "Pruritus": 10, "Hypoaesthesia": 9, "Loss of consciousness": 9, "Depressed level of consciousness": 8, "Fall": 8, "Muscular weakness": 8, "SARS-CoV-2 test": 8, "Decreased appetite": 7, "Dizziness": 7, "Electrocardiogram": 7, "Headache": 7, "Magnetic resonance imaging head": 7, "Presyncope": 7, "Urticaria": 7, "Vomiting": 7, "Asthenia": 6, "Computerised tomogram": 6, "Platelet count": 6, "Somnolence": 6, "Vaccination site pain": 6, "Back pain": 5, "C-reactive protein": 5, "Chills": 5, "Coma scale": 5, "Computerised tomogram head": 5, "Cough": 5, "Diarrhoea": 5, "Dysphoria": 5, "Platelet count decreased": 5, "Seizure": 5, "Vital signs measurement": 5, "Altered state of consciousness": 4, "Cardio-respiratory arrest": 4, "Cerebral infarction": 4, "Chest discomfort": 4, "Cold sweat": 4, "Death": 4, "Facial paralysis": 4, "Heart rate increased": 4, "Hyperhidrosis": 4, "Investigation": 4, "Magnetic resonance imaging": 4, "Movement disorder": 4, "Oedema": 4, "Oropharyngeal discomfort": 4, "Oxygen saturation decreased": 4, "Pain": 4, "Pallor": 4, "Palpitations": 4, "White blood cell count": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Blood pressure systolic": 3, "Blood pressure systolic increased": 3, "COVID-19": 3, "CSF test": 3, "Cardiac arrest": 3, "Chest X-ray": 3, "Chest pain": 3, "Dehydration": 3, "Drug eruption": 3, "Dyslalia": 3, "Dysphagia": 3, "Dysphonia": 3, "Gastrointestinal disorder": 3, "Herpes zoster": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Respiratory arrest": 3, "Respiratory rate": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Antibody test": 2, "Aortic dissection": 2, "Auscultation": 2, "Biopsy skin": 2, "Blood creatine": 2, "Blood glucose": 2, "Brain natriuretic peptide": 2, "Cerebral haemorrhage": 2, "Condition aggravated": 2, "Confusional state": 2, "Cutaneous vasculitis": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Eosinophil count": 2, "Eosinophil count increased": 2, "Epilepsy": 2, "Feeling cold": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Gait inability": 2, "Haematocrit": 2, "Haemoglobin": 2, "Heart rate decreased": 2, "Henoch-Schonlein purpura": 2, "Hepatic function abnormal": 2, "Hyperventilation": 2, "Hypoaesthesia oral": 2, "Mean cell volume": 2, "Myelitis transverse": 2, "Myocardial infarction": 2, "Neck pain": 2, "Nerve conduction studies": 2, "Neurological examination": 2, "Paralysis": 2, "Peripheral swelling": 2, "Physical deconditioning": 2, "Pleural effusion": 2, "Pneumonia bacterial": 2, "Polymerase chain reaction": 2, "Red blood cell count": 2, "Restlessness": 2, "Speech disorder": 2, "Tachycardia": 2, "Thirst": 2, "Throat irritation": 2, "Throat tightness": 2, "Tremor": 2, "Trigeminal palsy": 2, "Vaccination failure": 2, "Visual impairment": 2, "Wheezing": 2, "X-ray": 2, "Abdominal pain lower": 1, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Adrenocortical insufficiency acute": 1, "Allergic bronchopulmonary mycosis": 1, "Allergic reaction to excipient": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angioedema": 1, "Angiogram": 1, "Angiopathy": 1, "Anti-aquaporin-4 antibody": 1, "Anxiety": 1, "Apnoea": 1, "Arthralgia": 1, "Ascites": 1, "Aspiration bone marrow": 1, "Ataxia": 1, "Autoantibody test": 1, "Basilar artery stenosis": 1, "Bell's palsy": 1, "Biopsy heart": 1, "Biopsy pericardium": 1, "Biopsy pleura": 1, "Blister": 1, "Blood cholesterol": 1, "Blood creatine increased": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood phosphorus": 1, "Blood pressure systolic decreased": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Brain herniation": 1, "Brain stem infarction": 1, "C-reactive protein increased": 1, "CSF cell count": 1, "CSF myelin basic protein": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "Cardiac disorder": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiac perforation": 1, "Cardiac tamponade": 1, "Castleman's disease": 1, "Catheterisation cardiac": 1, "Cerebellar infarction": 1, "Cerebral arteriosclerosis": 1, "Circulatory collapse": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Conversion disorder": 1, "Coronary artery occlusion": 1, "Cyanosis": 1, "Delirium": 1, "Diplopia": 1, "Diverticulum intestinal": 1, "Diverticulum intestinal haemorrhagic": 1, "Dizziness postural": 1, "Duodenal ulcer": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysstasia": 1, "Ear pain": 1, "Ear swelling": 1, "Eating disorder": 1, "Eczema": 1, "Electrocardiogram Q wave abnormal": 1, "Electrocardiogram Q waves": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram abnormal": 1, "Electroencephalogram": 1, "Encephalopathy": 1, "Endoscopy large bowel": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophilia": 1, "Eosinophilic pneumonia": 1, "Eructation": 1, "Eye pain": 1, "Eye pruritus": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Flank pain": 1, "Flushing": 1, "Foaming at mouth": 1, "Gallbladder enlargement": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Glossodynia": 1, "Granulocyte count": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heat illness": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatosplenomegaly": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hydrothorax": 1, "Hypercholesterolaemia": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypopnoea": 1, "Hyporeflexia": 1, "Immune thrombocytopenia": 1, "Immunoglobulins": 1, "Immunoglobulins increased": 1, "Immunosuppression": 1, "Increased appetite": 1, "Inflammation": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Intestinal obstruction": 1, "Irregular breathing": 1, "Irritable bowel syndrome": 1, "Ischaemic cerebral infarction": 1, "Kernig's sign": 1, "Laziness": 1, "Limb discomfort": 1, "Lip erosion": 1, "Lip swelling": 1, "Lower limb fracture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte stimulation test": 1, "Lymphocyte stimulation test positive": 1, "Macular oedema": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mechanical ileus": 1, "Mediastinoscopy": 1, "Melaena": 1, "Mesenteric panniculitis": 1, "Mobility decreased": 1, "Monocyte count": 1, "Mood altered": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial rupture": 1, "N-telopeptide urine": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Neuralgia": 1, "Nodule": 1, "Nystagmus": 1, "Occipital neuralgia": 1, "Oculomucocutaneous syndrome": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Osteomyelitis": 1, "Pain assessment": 1, "Palatal swelling": 1, "Palmar erythema": 1, "Panic attack": 1, "Panniculitis": 1, "Paraparesis": 1, "Parosmia": 1, "Parotitis": 1, "Pericarditis": 1, "Peripheral circulatory failure": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pleural fluid analysis": 1, "Pleurisy": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Pollakiuria": 1, "Protein induced by vitamin K absence or antagonist II": 1, "Pulmonary oedema": 1, "Pulmonary tuberculosis": 1, "Pulse abnormal": 1, "Pulseless electrical activity": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Pyramidal tract syndrome": 1, "Renal impairment": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Retinal vein occlusion": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinalgia": 1, "Rubella": 1, "Sensation of foreign body": 1, "Skin test": 1, "Somatic symptom disorder": 1, "Splenomegaly": 1, "Sputum test": 1, "Status epilepticus": 1, "Stevens-Johnson syndrome": 1, "Stiff person syndrome": 1, "Stomatitis": 1, "Subarachnoid haemorrhage": 1, "Subretinal fluid": 1, "Sudden cardiac death": 1, "Suspected COVID-19": 1, "Swelling": 1, "Syncope": 1, "Tachypnoea": 1, "Taste disorder": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Tongue blistering": 1, "Tongue pruritus": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Type I hypersensitivity": 1, "Ultrasound Doppler": 1, "Unresponsive to stimuli": 1, "Urine albumin/creatinine ratio": 1, "Urine analysis": 1, "Urticarial vasculitis": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Varicella virus test": 1, "Vasculitis": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Vitamin B1": 1, "Vitamin B12": 1}, "batchcodes": ["EW0207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW0583.json b/docs/data/histograms/Japan/EW0583.json
index 3dccad78e7d..3a24503ccf9 100644
--- a/docs/data/histograms/Japan/EW0583.json
+++ b/docs/data/histograms/Japan/EW0583.json
@@ -1 +1 @@
-{"batchcode": "EW0583", "histograms": [{"batchcodes": ["EW0583"], "histogram": {"Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body temperature": 1, "Feeling hot": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0583", "histograms": [{"histogram": {"Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body temperature": 1, "Feeling hot": 1, "Headache": 1}, "batchcodes": ["EW0583"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW201.json b/docs/data/histograms/Japan/EW201.json
index 33f7f7d1d76..de9a1e05089 100644
--- a/docs/data/histograms/Japan/EW201.json
+++ b/docs/data/histograms/Japan/EW201.json
@@ -1 +1 @@
-{"batchcode": "EW201", "histograms": [{"batchcodes": ["EW201"], "histogram": {"Body temperature": 1, "Central nervous system lesion": 1, "Diarrhoea": 1, "Head discomfort": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Pyrexia": 1, "Urinary retention": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW201", "histograms": [{"histogram": {"Body temperature": 1, "Central nervous system lesion": 1, "Diarrhoea": 1, "Head discomfort": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Pyrexia": 1, "Urinary retention": 1, "Vomiting": 1}, "batchcodes": ["EW201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW4811.json b/docs/data/histograms/Japan/EW4811.json
index be94e379360..8b9710dd772 100644
--- a/docs/data/histograms/Japan/EW4811.json
+++ b/docs/data/histograms/Japan/EW4811.json
@@ -1 +1 @@
-{"batchcode": "EW4811", "histograms": [{"batchcodes": ["EW4811"], "histogram": {"Body temperature": 650, "Blood pressure measurement": 288, "Oxygen saturation": 223, "Anaphylactic reaction": 210, "Heart rate": 199, "Pyrexia": 187, "Headache": 142, "Malaise": 133, "Nausea": 121, "Blood pressure increased": 111, "Pruritus": 110, "Erythema": 100, "Dyspnoea": 96, "Feeling abnormal": 92, "Cough": 80, "Urticaria": 76, "Dizziness": 75, "Hypoaesthesia": 74, "Palpitations": 65, "Vomiting": 55, "Arthralgia": 53, "Oropharyngeal discomfort": 51, "Vaccination site pain": 47, "Presyncope": 45, "Rash": 44, "Blood pressure decreased": 40, "Chills": 37, "Decreased appetite": 29, "Diarrhoea": 29, "Heart rate increased": 29, "Pain in extremity": 29, "Tachycardia": 29, "Myalgia": 28, "Asthenia": 27, "Asthma": 27, "Blood test": 27, "Tremor": 27, "Hyperhidrosis": 26, "Chest discomfort": 25, "Depressed level of consciousness": 25, "Loss of consciousness": 25, "SARS-CoV-2 test": 25, "Pain": 24, "Electrocardiogram": 23, "Muscular weakness": 23, "Hypersensitivity": 22, "Oxygen saturation decreased": 22, "Computerised tomogram": 21, "Feeling hot": 21, "Pallor": 21, "Computerised tomogram head": 20, "Cold sweat": 19, "Feeling cold": 19, "Hypertension": 19, "Vital signs measurement": 19, "Altered state of consciousness": 18, "Neuropathy peripheral": 18, "Throat tightness": 18, "Dysphoria": 17, "Abdominal pain": 16, "Gait disturbance": 16, "Throat irritation": 15, "Wheezing": 15, "Flushing": 14, "Peripheral coldness": 14, "Seizure": 14, "Vaccination site swelling": 14, "Fall": 13, "Arrhythmia": 12, "Auscultation": 12, "Cerebral infarction": 12, "Hyperventilation": 12, "Magnetic resonance imaging head": 12, "Syncope": 12, "C-reactive protein": 11, "Cerebral haemorrhage": 11, "Head discomfort": 11, "White blood cell count": 11, "Dysphonia": 10, "Heart rate decreased": 10, "Hot flush": 10, "Investigation": 10, "Magnetic resonance imaging": 10, "Polymerase chain reaction": 10, "Sensory disturbance": 10, "Blood pressure systolic": 9, "Chest pain": 9, "Discomfort": 9, "Disease recurrence": 9, "Dysstasia": 9, "Facial paralysis": 9, "Internal haemorrhage": 9, "Swelling": 9, "Vertigo": 9, "Blood pressure systolic increased": 8, "Bradycardia": 8, "Cardio-respiratory arrest": 8, "Movement disorder": 8, "Muscle spasms": 8, "Pneumonia": 8, "Rash erythematous": 8, "Rhinorrhoea": 8, "Tinnitus": 8, "Abdominal discomfort": 7, "Alanine aminotransferase": 7, "Anaphylactic shock": 7, "Aspartate aminotransferase": 7, "Fatigue": 7, "Haemorrhage subcutaneous": 7, "Hypoaesthesia oral": 7, "Lymphadenopathy": 7, "Oropharyngeal pain": 7, "Peripheral swelling": 7, "Somnolence": 7, "Vaccination site erythema": 7, "Back pain": 6, "Body temperature increased": 6, "Conjunctival hyperaemia": 6, "Cyanosis": 6, "Dyslalia": 6, "Hemiplegia": 6, "Herpes zoster": 6, "Paraesthesia": 6, "Paralysis": 6, "Platelet count": 6, "Respiratory rate": 6, "Swelling face": 6, "Thirst": 6, "Ultrasound scan": 6, "Vision blurred": 6, "Visual impairment": 6, "Abdominal pain upper": 5, "Atrial fibrillation": 5, "Blood creatine phosphokinase": 5, "Blood lactate dehydrogenase": 5, "C-reactive protein increased": 5, "COVID-19": 5, "Chest X-ray": 5, "Coma scale": 5, "Dysarthria": 5, "Dysphagia": 5, "Echocardiogram": 5, "Face oedema": 5, "Gamma-glutamyltransferase": 5, "Guillain-Barre syndrome": 5, "Haemorrhage": 5, "Hypoxia": 5, "Musculoskeletal stiffness": 5, "Myocardial infarction": 5, "Neck pain": 5, "Oedema": 5, "Pneumonia aspiration": 5, "Respiratory distress": 5, "Sinus tachycardia": 5, "Vaccination site pruritus": 5, "Arthritis": 4, "Breath sounds": 4, "Bronchospasm": 4, "Burning sensation": 4, "Cellulitis": 4, "Colitis ischaemic": 4, "Condition aggravated": 4, "Dehydration": 4, "Dizziness postural": 4, "Drug eruption": 4, "Fibrin D dimer": 4, "Genital haemorrhage": 4, "Haematochezia": 4, "Insomnia": 4, "Mobility decreased": 4, "Nystagmus": 4, "Ocular hyperaemia": 4, "Oedema peripheral": 4, "Oral discomfort": 4, "Paraesthesia oral": 4, "Photopsia": 4, "Physical deconditioning": 4, "Physical examination": 4, "Platelet count decreased": 4, "Respiratory arrest": 4, "Respiratory disorder": 4, "Restlessness": 4, "Sensation of foreign body": 4, "Shock": 4, "Stomatitis": 4, "Thrombosis": 4, "Urinary tract infection": 4, "Vaccination site hypoaesthesia": 4, "Vaccination site warmth": 4, "X-ray": 4, "Acute disseminated encephalomyelitis": 3, "Acute myocardial infarction": 3, "Amnesia": 3, "Angioedema": 3, "Anxiety": 3, "Aphasia": 3, "Blepharospasm": 3, "Blood albumin": 3, "Blood bilirubin": 3, "Blood glucose": 3, "Blood thyroid stimulating hormone": 3, "Cardiac failure congestive": 3, "Death": 3, "Dysgeusia": 3, "Dyskinesia": 3, "Eczema": 3, "Encephalitis": 3, "Epilepsy": 3, "Eye pain": 3, "Eyelid oedema": 3, "Faeces soft": 3, "Heavy menstrual bleeding": 3, "Hemiparesis": 3, "Hepatic function abnormal": 3, "Hypophagia": 3, "Induration": 3, "Lymph node pain": 3, "Magnetic resonance imaging neck": 3, "Meniere's disease": 3, "Nasal congestion": 3, "Nasopharyngitis": 3, "PO2": 3, "Pharyngeal swelling": 3, "Putamen haemorrhage": 3, "Red blood cell count": 3, "Shock symptom": 3, "Stress cardiomyopathy": 3, "Swelling of eyelid": 3, "Tachypnoea": 3, "Type I hypersensitivity": 3, "Vaccination site induration": 3, "Abdominal X-ray": 2, "Abnormal sensation in eye": 2, "Adjusted calcium": 2, "Anaphylactoid reaction": 2, "Antibody test": 2, "Aortic dissection": 2, "Aspartate aminotransferase increased": 2, "Asphyxia": 2, "Aspiration": 2, "Axillary pain": 2, "Bacteraemia": 2, "Basophil count": 2, "Biopsy bone marrow": 2, "Blister": 2, "Blood alkaline phosphatase": 2, "Blood calcium": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase MB": 2, "Blood creatinine": 2, "Blood culture": 2, "Blood phosphorus": 2, "Blood potassium": 2, "Blood pressure diastolic decreased": 2, "Blood pressure fluctuation": 2, "Blood pressure immeasurable": 2, "Blood sodium": 2, "Blood urea": 2, "Blood uric acid": 2, "Cardiac arrest": 2, "Cardiac disorder": 2, "Cardiac failure": 2, "Cardiac failure acute": 2, "Chromaturia": 2, "Circumoral swelling": 2, "Computerised tomogram abdomen": 2, "Cough variant asthma": 2, "Deep vein thrombosis": 2, "Dermatitis bullous": 2, "Diplopia": 2, "Drug ineffective": 2, "Ear discomfort": 2, "Encephalopathy": 2, "Eosinophil count": 2, "Epigastric discomfort": 2, "Erythema multiforme": 2, "Eye disorder": 2, "Fibrin degradation products": 2, "General physical health deterioration": 2, "Glassy eyes": 2, "Haematuria": 2, "High density lipoprotein": 2, "Hyperglycaemia": 2, "Hyperthyroidism": 2, "Ileus": 2, "Illness": 2, "Imaging procedure": 2, "Incontinence": 2, "Inflammation": 2, "Intermenstrual bleeding": 2, "International normalised ratio": 2, "Lacrimation increased": 2, "Limb discomfort": 2, "Lip erythema": 2, "Low density lipoprotein": 2, "Lymphocyte count": 2, "Lymphoma": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Mental impairment": 2, "Migraine": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Myelitis": 2, "Myocardial ischaemia": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nasal obstruction": 2, "Nerve conduction studies": 2, "Neurological examination": 2, "Neutrophil count": 2, "Nightmare": 2, "Obstructive airways disorder": 2, "Oral pruritus": 2, "Oxygen saturation immeasurable": 2, "Pain of skin": 2, "Papule": 2, "Pericarditis": 2, "Photophobia": 2, "Pleural effusion": 2, "Pneumonia bacterial": 2, "Purpura": 2, "Radial nerve palsy": 2, "Respiration abnormal": 2, "Respiratory failure": 2, "Respiratory tract oedema": 2, "Retinal haemorrhage": 2, "Rotator cuff syndrome": 2, "Salivary hypersecretion": 2, "Sepsis": 2, "Sputum increased": 2, "Tenderness": 2, "Thyroid hormones increased": 2, "Thyroxine free": 2, "Troponin I": 2, "Troponin T": 2, "Urine analysis": 2, "Vaccination failure": 2, "Abdominal distension": 1, "Abdominal symptom": 1, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Acute abdomen": 1, "Acute kidney injury": 1, "Acute respiratory distress syndrome": 1, "Acute respiratory failure": 1, "Adjusted calcium decreased": 1, "Adrenal insufficiency": 1, "Age-related macular degeneration": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Alcoholic seizure": 1, "Allergic oedema": 1, "Allergy test": 1, "Amenorrhoea": 1, "Amylase": 1, "Anal incontinence": 1, "Angina pectoris": 1, "Anti-islet cell antibody": 1, "Anxiety disorder": 1, "Aortic aneurysm rupture": 1, "Appetite disorder": 1, "Aspartate aminotransferase abnormal": 1, "Asterixis": 1, "Asthenopia": 1, "Ataxia": 1, "Atonic seizures": 1, "Autoimmune hepatitis": 1, "Basal ganglia infarction": 1, "Base excess": 1, "Basedow's disease": 1, "Bedridden": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Biopsy skin": 1, "Blindness transient": 1, "Blood alkaline phosphatase increased": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood cholesterol increased": 1, "Blood copper": 1, "Blood creatine phosphokinase increased": 1, "Blood erythropoietin": 1, "Blood folate": 1, "Blood gonadotrophin decreased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood iron": 1, "Blood lactate dehydrogenase increased": 1, "Blood magnesium": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic abnormal": 1, "Blood triglycerides": 1, "Blood urine": 1, "Blood zinc": 1, "Bradykinesia": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain stem thrombosis": 1, "Bronchitis bacterial": 1, "Brugada syndrome": 1, "CSF test": 1, "Candida test": 1, "Capillary nail refill test": 1, "Cardiac electrophysiologic study": 1, "Cardiac tamponade": 1, "Cardiomyopathy": 1, "Cardiothoracic ratio": 1, "Cardiovascular examination": 1, "Carotid artery aneurysm": 1, "Carpal tunnel syndrome": 1, "Catheterisation cardiac": 1, "Cerebral artery embolism": 1, "Choking": 1, "Choking sensation": 1, "Clonic convulsion": 1, "Cold urticaria": 1, "Communication disorder": 1, "Computerised tomogram abnormal": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Convulsions local": 1, "Coronary artery occlusion": 1, "Coronary artery stenosis": 1, "Croup infectious": 1, "Culture throat": 1, "Cystitis haemorrhagic": 1, "Cytology": 1, "Daydreaming": 1, "Deafness neurosensory": 1, "Decerebrate posture": 1, "Delirium": 1, "Dementia": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Dermatitis atopic": 1, "Diabetes insipidus": 1, "Diabetic ketoacidosis": 1, "Disseminated intravascular coagulation": 1, "Dizziness exertional": 1, "Drug dependence": 1, "Drug hypersensitivity": 1, "Drug-induced liver injury": 1, "Dysaesthesia": 1, "Dyschezia": 1, "Dyspnoea exertional": 1, "Dystonia": 1, "EGFR status assay": 1, "Ear pruritus": 1, "Electric shock sensation": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Electrocardiogram change": 1, "Electromyogram": 1, "Embolic cerebral infarction": 1, "Embolic stroke": 1, "Endoscopy large bowel": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count increased": 1, "Epstein-Barr virus antibody": 1, "Erythema of eyelid": 1, "Extrasystoles": 1, "Eye haemorrhage": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Eyelid bleeding": 1, "Eyelid irritation": 1, "Eyelid pain": 1, "Facial pain": 1, "Facial spasm": 1, "Fear": 1, "Feeding disorder": 1, "Flatulence": 1, "Fluid intake restriction": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal disorder": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Gaze palsy": 1, "Gingivitis": 1, "Glare": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Grip strength": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemorrhagic diathesis": 1, "Haemorrhagic disorder": 1, "Hallucination": 1, "Hand dermatitis": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Hepatic fibrosis": 1, "Hepatitis acute": 1, "Hepatitis viral": 1, "Herpes zoster oticus": 1, "Hordeolum": 1, "Hyperreflexia": 1, "Hypersomnia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypoglycaemia": 1, "Hypokalaemia": 1, "Hypopnoea": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Infection": 1, "Infectious mononucleosis": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Intercostal neuralgia": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Intestinal haemorrhage": 1, "Intracranial pressure increased": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Joint warmth": 1, "Labile blood pressure": 1, "Laboratory test": 1, "Laryngeal discomfort": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Leucine aminopeptidase": 1, "Ligament injury": 1, "Lip oedema": 1, "Lip swelling": 1, "Liver disorder": 1, "Liver function test increased": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein increased": 1, "Lower limb fracture": 1, "Lymphadenitis viral": 1, "Lymphocyte morphology abnormal": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging spinal": 1, "Malassezia infection": 1, "Mass": 1, "Melaena": 1, "Meningitis": 1, "Meningitis aseptic": 1, "Monocyte count": 1, "Mononuclear cell count": 1, "Motor dysfunction": 1, "Mouth haemorrhage": 1, "Mouth ulceration": 1, "Mucosal hyperaemia": 1, "Muscle contracture": 1, "Muscle haemorrhage": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Mutism": 1, "Myelosuppression": 1, "Myocarditis": 1, "Myoglobin blood": 1, "Nasal oedema": 1, "Nerve compression": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "Notalgia paraesthetica": 1, "Odynophagia": 1, "Oligomenorrhoea": 1, "Ophthalmological examination": 1, "Oral disorder": 1, "Oral herpes": 1, "Oxygen saturation increased": 1, "PCO2": 1, "PO2 decreased": 1, "Painful respiration": 1, "Palmar erythema": 1, "Pancreatitis necrotising": 1, "Paresis": 1, "Periarthritis": 1, "Periorbital swelling": 1, "Peripheral nerve palsy": 1, "Peripheral venous disease": 1, "Petechiae": 1, "Petit mal epilepsy": 1, "Pharyngeal oedema": 1, "Pharyngeal stenosis": 1, "Phlebitis": 1, "Pigmentation disorder": 1, "Pneumomediastinum": 1, "Polydipsia": 1, "Polyuria": 1, "Postmenopausal haemorrhage": 1, "Postural orthostatic tachycardia syndrome": 1, "Precerebral artery thrombosis": 1, "Pregnancy test": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Protein total": 1, "Protein urine present": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary thrombosis": 1, "Pulse abnormal": 1, "Purulence": 1, "Pyelonephritis": 1, "Radial nerve injury": 1, "Radial pulse abnormal": 1, "Rash pruritic": 1, "Renal disorder": 1, "Respiratory symptom": 1, "Retching": 1, "Reticulocyte count": 1, "Retinal detachment": 1, "Retrograde amnesia": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Road traffic accident": 1, "Ruptured cerebral aneurysm": 1, "SARS-CoV-2 antibody test": 1, "Satoyoshi syndrome": 1, "Scan": 1, "Scar pain": 1, "Scleral haemorrhage": 1, "Sensory loss": 1, "Septic shock": 1, "Serum ferritin": 1, "Skin tightness": 1, "Sleep attacks": 1, "Somatic symptom disorder": 1, "Somatosensory evoked potentials": 1, "Speech disorder": 1, "Sputum retention": 1, "Stenosis": 1, "Stevens-Johnson syndrome": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Supraventricular tachyarrhythmia": 1, "Temporomandibular joint syndrome": 1, "Tension": 1, "Tension headache": 1, "Thrombin-antithrombin III complex": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Tonic convulsion": 1, "Toxic skin eruption": 1, "Trance": 1, "Transaminases": 1, "Transaminases decreased": 1, "Transcranial electrical motor evoked potential monitoring": 1, "Tri-iodothyronine": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Tunnel vision": 1, "Ultrasound abdomen": 1, "Upper respiratory tract infection bacterial": 1, "Urine abnormality": 1, "Urosepsis": 1, "Uterine haemorrhage": 1, "Vaccination site bruising": 1, "Vaccination site coldness": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Varicella virus test positive": 1, "Vasculitis": 1, "Venous thrombosis limb": 1, "Ventricular tachycardia": 1, "Vertebral artery dissection": 1, "Viral rash": 1, "Visceral pain": 1, "Visual acuity reduced": 1, "Vitamin B12": 1, "Vitreous haemorrhage": 1, "Weight": 1, "Wheelchair user": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "Wound": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EW4811", "histograms": [{"histogram": {"Body temperature": 650, "Blood pressure measurement": 288, "Oxygen saturation": 223, "Anaphylactic reaction": 210, "Heart rate": 199, "Pyrexia": 187, "Headache": 142, "Malaise": 133, "Nausea": 121, "Blood pressure increased": 111, "Pruritus": 110, "Erythema": 100, "Dyspnoea": 96, "Feeling abnormal": 92, "Cough": 80, "Urticaria": 76, "Dizziness": 75, "Hypoaesthesia": 74, "Palpitations": 65, "Vomiting": 55, "Arthralgia": 53, "Oropharyngeal discomfort": 51, "Vaccination site pain": 47, "Presyncope": 45, "Rash": 44, "Blood pressure decreased": 40, "Chills": 37, "Decreased appetite": 29, "Diarrhoea": 29, "Heart rate increased": 29, "Pain in extremity": 29, "Tachycardia": 29, "Myalgia": 28, "Asthenia": 27, "Asthma": 27, "Blood test": 27, "Tremor": 27, "Hyperhidrosis": 26, "Chest discomfort": 25, "Depressed level of consciousness": 25, "Loss of consciousness": 25, "SARS-CoV-2 test": 25, "Pain": 24, "Electrocardiogram": 23, "Muscular weakness": 23, "Hypersensitivity": 22, "Oxygen saturation decreased": 22, "Computerised tomogram": 21, "Feeling hot": 21, "Pallor": 21, "Computerised tomogram head": 20, "Cold sweat": 19, "Feeling cold": 19, "Hypertension": 19, "Vital signs measurement": 19, "Altered state of consciousness": 18, "Neuropathy peripheral": 18, "Throat tightness": 18, "Dysphoria": 17, "Abdominal pain": 16, "Gait disturbance": 16, "Throat irritation": 15, "Wheezing": 15, "Flushing": 14, "Peripheral coldness": 14, "Seizure": 14, "Vaccination site swelling": 14, "Fall": 13, "Arrhythmia": 12, "Auscultation": 12, "Cerebral infarction": 12, "Hyperventilation": 12, "Magnetic resonance imaging head": 12, "Syncope": 12, "C-reactive protein": 11, "Cerebral haemorrhage": 11, "Head discomfort": 11, "White blood cell count": 11, "Dysphonia": 10, "Heart rate decreased": 10, "Hot flush": 10, "Investigation": 10, "Magnetic resonance imaging": 10, "Polymerase chain reaction": 10, "Sensory disturbance": 10, "Blood pressure systolic": 9, "Chest pain": 9, "Discomfort": 9, "Disease recurrence": 9, "Dysstasia": 9, "Facial paralysis": 9, "Internal haemorrhage": 9, "Swelling": 9, "Vertigo": 9, "Blood pressure systolic increased": 8, "Bradycardia": 8, "Cardio-respiratory arrest": 8, "Movement disorder": 8, "Muscle spasms": 8, "Pneumonia": 8, "Rash erythematous": 8, "Rhinorrhoea": 8, "Tinnitus": 8, "Abdominal discomfort": 7, "Alanine aminotransferase": 7, "Anaphylactic shock": 7, "Aspartate aminotransferase": 7, "Fatigue": 7, "Haemorrhage subcutaneous": 7, "Hypoaesthesia oral": 7, "Lymphadenopathy": 7, "Oropharyngeal pain": 7, "Peripheral swelling": 7, "Somnolence": 7, "Vaccination site erythema": 7, "Back pain": 6, "Body temperature increased": 6, "Conjunctival hyperaemia": 6, "Cyanosis": 6, "Dyslalia": 6, "Hemiplegia": 6, "Herpes zoster": 6, "Paraesthesia": 6, "Paralysis": 6, "Platelet count": 6, "Respiratory rate": 6, "Swelling face": 6, "Thirst": 6, "Ultrasound scan": 6, "Vision blurred": 6, "Visual impairment": 6, "Abdominal pain upper": 5, "Atrial fibrillation": 5, "Blood creatine phosphokinase": 5, "Blood lactate dehydrogenase": 5, "C-reactive protein increased": 5, "COVID-19": 5, "Chest X-ray": 5, "Coma scale": 5, "Dysarthria": 5, "Dysphagia": 5, "Echocardiogram": 5, "Face oedema": 5, "Gamma-glutamyltransferase": 5, "Guillain-Barre syndrome": 5, "Haemorrhage": 5, "Hypoxia": 5, "Musculoskeletal stiffness": 5, "Myocardial infarction": 5, "Neck pain": 5, "Oedema": 5, "Pneumonia aspiration": 5, "Respiratory distress": 5, "Sinus tachycardia": 5, "Vaccination site pruritus": 5, "Arthritis": 4, "Breath sounds": 4, "Bronchospasm": 4, "Burning sensation": 4, "Cellulitis": 4, "Colitis ischaemic": 4, "Condition aggravated": 4, "Dehydration": 4, "Dizziness postural": 4, "Drug eruption": 4, "Fibrin D dimer": 4, "Genital haemorrhage": 4, "Haematochezia": 4, "Insomnia": 4, "Mobility decreased": 4, "Nystagmus": 4, "Ocular hyperaemia": 4, "Oedema peripheral": 4, "Oral discomfort": 4, "Paraesthesia oral": 4, "Photopsia": 4, "Physical deconditioning": 4, "Physical examination": 4, "Platelet count decreased": 4, "Respiratory arrest": 4, "Respiratory disorder": 4, "Restlessness": 4, "Sensation of foreign body": 4, "Shock": 4, "Stomatitis": 4, "Thrombosis": 4, "Urinary tract infection": 4, "Vaccination site hypoaesthesia": 4, "Vaccination site warmth": 4, "X-ray": 4, "Acute disseminated encephalomyelitis": 3, "Acute myocardial infarction": 3, "Amnesia": 3, "Angioedema": 3, "Anxiety": 3, "Aphasia": 3, "Blepharospasm": 3, "Blood albumin": 3, "Blood bilirubin": 3, "Blood glucose": 3, "Blood thyroid stimulating hormone": 3, "Cardiac failure congestive": 3, "Death": 3, "Dysgeusia": 3, "Dyskinesia": 3, "Eczema": 3, "Encephalitis": 3, "Epilepsy": 3, "Eye pain": 3, "Eyelid oedema": 3, "Faeces soft": 3, "Heavy menstrual bleeding": 3, "Hemiparesis": 3, "Hepatic function abnormal": 3, "Hypophagia": 3, "Induration": 3, "Lymph node pain": 3, "Magnetic resonance imaging neck": 3, "Meniere's disease": 3, "Nasal congestion": 3, "Nasopharyngitis": 3, "PO2": 3, "Pharyngeal swelling": 3, "Putamen haemorrhage": 3, "Red blood cell count": 3, "Shock symptom": 3, "Stress cardiomyopathy": 3, "Swelling of eyelid": 3, "Tachypnoea": 3, "Type I hypersensitivity": 3, "Vaccination site induration": 3, "Abdominal X-ray": 2, "Abnormal sensation in eye": 2, "Adjusted calcium": 2, "Anaphylactoid reaction": 2, "Antibody test": 2, "Aortic dissection": 2, "Aspartate aminotransferase increased": 2, "Asphyxia": 2, "Aspiration": 2, "Axillary pain": 2, "Bacteraemia": 2, "Basophil count": 2, "Biopsy bone marrow": 2, "Blister": 2, "Blood alkaline phosphatase": 2, "Blood calcium": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase MB": 2, "Blood creatinine": 2, "Blood culture": 2, "Blood phosphorus": 2, "Blood potassium": 2, "Blood pressure diastolic decreased": 2, "Blood pressure fluctuation": 2, "Blood pressure immeasurable": 2, "Blood sodium": 2, "Blood urea": 2, "Blood uric acid": 2, "Cardiac arrest": 2, "Cardiac disorder": 2, "Cardiac failure": 2, "Cardiac failure acute": 2, "Chromaturia": 2, "Circumoral swelling": 2, "Computerised tomogram abdomen": 2, "Cough variant asthma": 2, "Deep vein thrombosis": 2, "Dermatitis bullous": 2, "Diplopia": 2, "Drug ineffective": 2, "Ear discomfort": 2, "Encephalopathy": 2, "Eosinophil count": 2, "Epigastric discomfort": 2, "Erythema multiforme": 2, "Eye disorder": 2, "Fibrin degradation products": 2, "General physical health deterioration": 2, "Glassy eyes": 2, "Haematuria": 2, "High density lipoprotein": 2, "Hyperglycaemia": 2, "Hyperthyroidism": 2, "Ileus": 2, "Illness": 2, "Imaging procedure": 2, "Incontinence": 2, "Inflammation": 2, "Intermenstrual bleeding": 2, "International normalised ratio": 2, "Lacrimation increased": 2, "Limb discomfort": 2, "Lip erythema": 2, "Low density lipoprotein": 2, "Lymphocyte count": 2, "Lymphoma": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Mental impairment": 2, "Migraine": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Myelitis": 2, "Myocardial ischaemia": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nasal obstruction": 2, "Nerve conduction studies": 2, "Neurological examination": 2, "Neutrophil count": 2, "Nightmare": 2, "Obstructive airways disorder": 2, "Oral pruritus": 2, "Oxygen saturation immeasurable": 2, "Pain of skin": 2, "Papule": 2, "Pericarditis": 2, "Photophobia": 2, "Pleural effusion": 2, "Pneumonia bacterial": 2, "Purpura": 2, "Radial nerve palsy": 2, "Respiration abnormal": 2, "Respiratory failure": 2, "Respiratory tract oedema": 2, "Retinal haemorrhage": 2, "Rotator cuff syndrome": 2, "Salivary hypersecretion": 2, "Sepsis": 2, "Sputum increased": 2, "Tenderness": 2, "Thyroid hormones increased": 2, "Thyroxine free": 2, "Troponin I": 2, "Troponin T": 2, "Urine analysis": 2, "Vaccination failure": 2, "Abdominal distension": 1, "Abdominal symptom": 1, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Acute abdomen": 1, "Acute kidney injury": 1, "Acute respiratory distress syndrome": 1, "Acute respiratory failure": 1, "Adjusted calcium decreased": 1, "Adrenal insufficiency": 1, "Age-related macular degeneration": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Alcoholic seizure": 1, "Allergic oedema": 1, "Allergy test": 1, "Amenorrhoea": 1, "Amylase": 1, "Anal incontinence": 1, "Angina pectoris": 1, "Anti-islet cell antibody": 1, "Anxiety disorder": 1, "Aortic aneurysm rupture": 1, "Appetite disorder": 1, "Aspartate aminotransferase abnormal": 1, "Asterixis": 1, "Asthenopia": 1, "Ataxia": 1, "Atonic seizures": 1, "Autoimmune hepatitis": 1, "Basal ganglia infarction": 1, "Base excess": 1, "Basedow's disease": 1, "Bedridden": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Biopsy skin": 1, "Blindness transient": 1, "Blood alkaline phosphatase increased": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood cholesterol increased": 1, "Blood copper": 1, "Blood creatine phosphokinase increased": 1, "Blood erythropoietin": 1, "Blood folate": 1, "Blood gonadotrophin decreased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood iron": 1, "Blood lactate dehydrogenase increased": 1, "Blood magnesium": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic abnormal": 1, "Blood triglycerides": 1, "Blood urine": 1, "Blood zinc": 1, "Bradykinesia": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain stem thrombosis": 1, "Bronchitis bacterial": 1, "Brugada syndrome": 1, "CSF test": 1, "Candida test": 1, "Capillary nail refill test": 1, "Cardiac electrophysiologic study": 1, "Cardiac tamponade": 1, "Cardiomyopathy": 1, "Cardiothoracic ratio": 1, "Cardiovascular examination": 1, "Carotid artery aneurysm": 1, "Carpal tunnel syndrome": 1, "Catheterisation cardiac": 1, "Cerebral artery embolism": 1, "Choking": 1, "Choking sensation": 1, "Clonic convulsion": 1, "Cold urticaria": 1, "Communication disorder": 1, "Computerised tomogram abnormal": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Convulsions local": 1, "Coronary artery occlusion": 1, "Coronary artery stenosis": 1, "Croup infectious": 1, "Culture throat": 1, "Cystitis haemorrhagic": 1, "Cytology": 1, "Daydreaming": 1, "Deafness neurosensory": 1, "Decerebrate posture": 1, "Delirium": 1, "Dementia": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Dermatitis atopic": 1, "Diabetes insipidus": 1, "Diabetic ketoacidosis": 1, "Disseminated intravascular coagulation": 1, "Dizziness exertional": 1, "Drug dependence": 1, "Drug hypersensitivity": 1, "Drug-induced liver injury": 1, "Dysaesthesia": 1, "Dyschezia": 1, "Dyspnoea exertional": 1, "Dystonia": 1, "EGFR status assay": 1, "Ear pruritus": 1, "Electric shock sensation": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Electrocardiogram change": 1, "Electromyogram": 1, "Embolic cerebral infarction": 1, "Embolic stroke": 1, "Endoscopy large bowel": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count increased": 1, "Epstein-Barr virus antibody": 1, "Erythema of eyelid": 1, "Extrasystoles": 1, "Eye haemorrhage": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Eyelid bleeding": 1, "Eyelid irritation": 1, "Eyelid pain": 1, "Facial pain": 1, "Facial spasm": 1, "Fear": 1, "Feeding disorder": 1, "Flatulence": 1, "Fluid intake restriction": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal disorder": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Gaze palsy": 1, "Gingivitis": 1, "Glare": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Grip strength": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemorrhagic diathesis": 1, "Haemorrhagic disorder": 1, "Hallucination": 1, "Hand dermatitis": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Hepatic fibrosis": 1, "Hepatitis acute": 1, "Hepatitis viral": 1, "Herpes zoster oticus": 1, "Hordeolum": 1, "Hyperreflexia": 1, "Hypersomnia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypoglycaemia": 1, "Hypokalaemia": 1, "Hypopnoea": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Infection": 1, "Infectious mononucleosis": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Intercostal neuralgia": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Intestinal haemorrhage": 1, "Intracranial pressure increased": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Joint warmth": 1, "Labile blood pressure": 1, "Laboratory test": 1, "Laryngeal discomfort": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Leucine aminopeptidase": 1, "Ligament injury": 1, "Lip oedema": 1, "Lip swelling": 1, "Liver disorder": 1, "Liver function test increased": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein increased": 1, "Lower limb fracture": 1, "Lymphadenitis viral": 1, "Lymphocyte morphology abnormal": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging spinal": 1, "Malassezia infection": 1, "Mass": 1, "Melaena": 1, "Meningitis": 1, "Meningitis aseptic": 1, "Monocyte count": 1, "Mononuclear cell count": 1, "Motor dysfunction": 1, "Mouth haemorrhage": 1, "Mouth ulceration": 1, "Mucosal hyperaemia": 1, "Muscle contracture": 1, "Muscle haemorrhage": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Mutism": 1, "Myelosuppression": 1, "Myocarditis": 1, "Myoglobin blood": 1, "Nasal oedema": 1, "Nerve compression": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "Notalgia paraesthetica": 1, "Odynophagia": 1, "Oligomenorrhoea": 1, "Ophthalmological examination": 1, "Oral disorder": 1, "Oral herpes": 1, "Oxygen saturation increased": 1, "PCO2": 1, "PO2 decreased": 1, "Painful respiration": 1, "Palmar erythema": 1, "Pancreatitis necrotising": 1, "Paresis": 1, "Periarthritis": 1, "Periorbital swelling": 1, "Peripheral nerve palsy": 1, "Peripheral venous disease": 1, "Petechiae": 1, "Petit mal epilepsy": 1, "Pharyngeal oedema": 1, "Pharyngeal stenosis": 1, "Phlebitis": 1, "Pigmentation disorder": 1, "Pneumomediastinum": 1, "Polydipsia": 1, "Polyuria": 1, "Postmenopausal haemorrhage": 1, "Postural orthostatic tachycardia syndrome": 1, "Precerebral artery thrombosis": 1, "Pregnancy test": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Protein total": 1, "Protein urine present": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary thrombosis": 1, "Pulse abnormal": 1, "Purulence": 1, "Pyelonephritis": 1, "Radial nerve injury": 1, "Radial pulse abnormal": 1, "Rash pruritic": 1, "Renal disorder": 1, "Respiratory symptom": 1, "Retching": 1, "Reticulocyte count": 1, "Retinal detachment": 1, "Retrograde amnesia": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Road traffic accident": 1, "Ruptured cerebral aneurysm": 1, "SARS-CoV-2 antibody test": 1, "Satoyoshi syndrome": 1, "Scan": 1, "Scar pain": 1, "Scleral haemorrhage": 1, "Sensory loss": 1, "Septic shock": 1, "Serum ferritin": 1, "Skin tightness": 1, "Sleep attacks": 1, "Somatic symptom disorder": 1, "Somatosensory evoked potentials": 1, "Speech disorder": 1, "Sputum retention": 1, "Stenosis": 1, "Stevens-Johnson syndrome": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Supraventricular tachyarrhythmia": 1, "Temporomandibular joint syndrome": 1, "Tension": 1, "Tension headache": 1, "Thrombin-antithrombin III complex": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Tonic convulsion": 1, "Toxic skin eruption": 1, "Trance": 1, "Transaminases": 1, "Transaminases decreased": 1, "Transcranial electrical motor evoked potential monitoring": 1, "Tri-iodothyronine": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Tunnel vision": 1, "Ultrasound abdomen": 1, "Upper respiratory tract infection bacterial": 1, "Urine abnormality": 1, "Urosepsis": 1, "Uterine haemorrhage": 1, "Vaccination site bruising": 1, "Vaccination site coldness": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Varicella virus test positive": 1, "Vasculitis": 1, "Venous thrombosis limb": 1, "Ventricular tachycardia": 1, "Vertebral artery dissection": 1, "Viral rash": 1, "Visceral pain": 1, "Visual acuity reduced": 1, "Vitamin B12": 1, "Vitreous haemorrhage": 1, "Weight": 1, "Wheelchair user": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "Wound": 1, "pH body fluid": 1}, "batchcodes": ["EW4811"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EW4811?.json b/docs/data/histograms/Japan/EW4811?.json
index a1b9e66e2d7..b46a4d4594f 100644
--- a/docs/data/histograms/Japan/EW4811?.json
+++ b/docs/data/histograms/Japan/EW4811?.json
@@ -1 +1 @@
-{"batchcode": "EW4811?", "histograms": [{"batchcodes": ["EW4811?"], "histogram": {"Blood pressure decreased": 1, "Eczema": 1, "Erythema": 1, "Face oedema": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pruritus": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW4811?", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Eczema": 1, "Erythema": 1, "Face oedema": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pruritus": 1, "Vomiting": 1}, "batchcodes": ["EW4811?"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EX3617.json b/docs/data/histograms/Japan/EX3617.json
index 3cf1d032686..e1228e36a91 100644
--- a/docs/data/histograms/Japan/EX3617.json
+++ b/docs/data/histograms/Japan/EX3617.json
@@ -1 +1 @@
-{"batchcode": "EX3617", "histograms": [{"batchcodes": ["EX3617"], "histogram": {"Body temperature": 344, "Blood pressure measurement": 117, "Oxygen saturation": 92, "Pyrexia": 79, "Anaphylactic reaction": 75, "Heart rate": 73, "Malaise": 49, "Blood pressure increased": 42, "Dyspnoea": 39, "Headache": 39, "Nausea": 38, "Erythema": 36, "Pruritus": 35, "Rash": 33, "Cerebral infarction": 32, "Computerised tomogram": 31, "Urticaria": 31, "Blood pressure decreased": 27, "Feeling abnormal": 26, "Vomiting": 26, "White blood cell count": 24, "Decreased appetite": 23, "Dizziness": 22, "Loss of consciousness": 22, "Magnetic resonance imaging": 22, "Blood test": 21, "Hypoaesthesia": 21, "Arthralgia": 20, "C-reactive protein": 20, "Platelet count": 19, "Electrocardiogram": 18, "Investigation": 18, "Altered state of consciousness": 17, "Oxygen saturation decreased": 17, "Chills": 16, "Pain in extremity": 16, "Cough": 15, "Depressed level of consciousness": 15, "Vaccination site pain": 15, "Cardio-respiratory arrest": 14, "Cardiac failure": 13, "Diarrhoea": 13, "Pain": 13, "Palpitations": 13, "Back pain": 12, "Coma scale": 12, "Hypersensitivity": 12, "SARS-CoV-2 test": 12, "Wheezing": 12, "Feeling hot": 11, "Presyncope": 11, "Alanine aminotransferase": 10, "Aspartate aminotransferase": 10, "Blood creatine phosphokinase": 10, "Blood glucose": 10, "Cerebral haemorrhage": 10, "Cold sweat": 10, "Dehydration": 10, "Fall": 10, "Magnetic resonance imaging head": 10, "Muscular weakness": 10, "Pneumonia": 10, "Asthenia": 9, "Chest discomfort": 9, "Computerised tomogram head": 9, "Heart rate increased": 9, "Hyperventilation": 9, "Myalgia": 9, "Vital signs measurement": 9, "Abdominal pain": 8, "Asthma": 8, "Blood potassium": 8, "Blood sodium": 8, "Dysphoria": 8, "Flushing": 8, "Haemoglobin": 8, "Hot flush": 8, "Oropharyngeal discomfort": 8, "Pallor": 8, "Platelet count decreased": 8, "Tachycardia": 8, "Acute myocardial infarction": 7, "Blood creatinine": 7, "Blood lactate dehydrogenase": 7, "Blood urea": 7, "Cardiac failure acute": 7, "Chest X-ray": 7, "Chest pain": 7, "Fatigue": 7, "Fibrin D dimer": 7, "Gait disturbance": 7, "Herpes zoster": 7, "Hyperhidrosis": 7, "Hypertension": 7, "Myocardial infarction": 7, "Physical deconditioning": 7, "Physical examination": 7, "Pleural effusion": 7, "Respiratory arrest": 7, "Seizure": 7, "Arthritis": 6, "Atrial fibrillation": 6, "Blood chloride": 6, "Computerised tomogram thorax": 6, "Facial paralysis": 6, "Gamma-glutamyltransferase": 6, "Inflammation": 6, "Mean cell haemoglobin": 6, "Mean cell volume": 6, "Neutrophil count": 6, "Oedema peripheral": 6, "Protein total": 6, "Somnolence": 6, "Anaphylactic shock": 5, "Aphasia": 5, "Arrhythmia": 5, "Blood bilirubin": 5, "Blood uric acid": 5, "Bradycardia": 5, "C-reactive protein increased": 5, "Dysphonia": 5, "Glomerular filtration rate": 5, "Glycosylated haemoglobin": 5, "Haematocrit": 5, "Internal haemorrhage": 5, "Interstitial lung disease": 5, "Low density lipoprotein": 5, "Lymphocyte count": 5, "Mean cell haemoglobin concentration": 5, "Purpura": 5, "Red blood cell count": 5, "Respiratory distress": 5, "Respiratory rate": 5, "Subarachnoid haemorrhage": 5, "Swelling": 5, "Swelling face": 5, "Tremor": 5, "White blood cell count increased": 5, "Anxiety": 4, "Blood albumin": 4, "Blood alkaline phosphatase": 4, "Blood calcium": 4, "Blood immunoglobulin G": 4, "Blood pressure systolic increased": 4, "Blood triglycerides": 4, "Condition aggravated": 4, "Disease recurrence": 4, "Drug eruption": 4, "Dyslalia": 4, "Dysstasia": 4, "Echocardiogram": 4, "Eosinophil count": 4, "Guillain-Barre syndrome": 4, "Haemorrhage subcutaneous": 4, "Hemiplegia": 4, "Hepatic function abnormal": 4, "High density lipoprotein": 4, "Movement disorder": 4, "Neuropathy peripheral": 4, "Pneumonia aspiration": 4, "Tachypnoea": 4, "Thrombocytopenic purpura": 4, "Thrombosis": 4, "Ultrasound scan": 4, "Urine analysis": 4, "X-ray": 4, "Activated partial thromboplastin time": 3, "Acute kidney injury": 3, "Alanine aminotransferase increased": 3, "Amylase": 3, "Aortic aneurysm rupture": 3, "Aspartate aminotransferase increased": 3, "Basophil count": 3, "Blood creatinine increased": 3, "Cardiac failure chronic": 3, "Cellulitis": 3, "Colitis ischaemic": 3, "Conjunctival hyperaemia": 3, "Death": 3, "Deep vein thrombosis": 3, "Dysphagia": 3, "Eating disorder": 3, "Eyelid oedema": 3, "Feeding disorder": 3, "Fibrin D dimer increased": 3, "Fibrin degradation products": 3, "Heart rate decreased": 3, "Immune thrombocytopenia": 3, "Laboratory test": 3, "Lacunar infarction": 3, "Monocyte count": 3, "Neutrophil percentage": 3, "Peripheral coldness": 3, "Petechiae": 3, "Rash erythematous": 3, "Respiratory failure": 3, "Sepsis": 3, "Shock": 3, "Sudden cardiac death": 3, "Swollen tongue": 3, "Throat tightness": 3, "Troponin T": 3, "Vaccination site pruritus": 3, "Vaccination site swelling": 3, "Visual impairment": 3, "Yawning": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Albumin globulin ratio": 2, "Angiogram": 2, "Bacteraemia": 2, "Blepharospasm": 2, "Blood bilirubin increased": 2, "Blood cholinesterase": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Blood culture": 2, "Blood fibrinogen": 2, "Blood glucose increased": 2, "Blood immunoglobulin M": 2, "Blood lactate dehydrogenase increased": 2, "Blood pressure systolic": 2, "Blood thyroid stimulating hormone": 2, "Blood urea increased": 2, "Body temperature increased": 2, "Bradykinesia": 2, "Brain natriuretic peptide": 2, "Bronchospasm": 2, "CSF white blood cell count": 2, "Cardiac arrest": 2, "Cardiac death": 2, "Cardiac failure congestive": 2, "Catheterisation cardiac": 2, "Cerebellar haemorrhage": 2, "Cerebellar infarction": 2, "Coagulation test": 2, "Computerised tomogram normal": 2, "Computerised tomogram pelvis": 2, "Disseminated intravascular coagulation": 2, "Dysarthria": 2, "Electroencephalogram": 2, "Epistaxis": 2, "Face oedema": 2, "Faeces soft": 2, "Feeling cold": 2, "Gamma-glutamyltransferase increased": 2, "Genital haemorrhage": 2, "Haematochezia": 2, "Haemoptysis": 2, "Hemiparesis": 2, "Hyperthermia": 2, "Hypophagia": 2, "Hypoxia": 2, "Hypoxic-ischaemic encephalopathy": 2, "Insomnia": 2, "Lip swelling": 2, "Liver function test": 2, "Loss of personal independence in daily activities": 2, "Lymphoma": 2, "Moaning": 2, "Multiple organ dysfunction syndrome": 2, "Muscle contracture": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Myocardial ischaemia": 2, "Myocarditis": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nephrotic syndrome": 2, "Neurological examination": 2, "Nystagmus": 2, "Occult blood": 2, "Ocular hyperaemia": 2, "Oral discomfort": 2, "PO2": 2, "Paraesthesia": 2, "Paralysis": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Polymerase chain reaction": 2, "Productive cough": 2, "Protein total decreased": 2, "Protein urine": 2, "Prothrombin time": 2, "Prothrombin time prolonged": 2, "Pulmonary alveolar haemorrhage": 2, "Pulmonary congestion": 2, "Putamen haemorrhage": 2, "Radial pulse abnormal": 2, "Renal failure": 2, "Renal impairment": 2, "Respiratory disorder": 2, "Rhabdomyolysis": 2, "Salivary hypersecretion": 2, "Sensation of foreign body": 2, "Skin discolouration": 2, "Skin laceration": 2, "Speech disorder": 2, "Stress cardiomyopathy": 2, "Subcutaneous haematoma": 2, "Sudden hearing loss": 2, "Thrombocytopenia": 2, "Thrombotic cerebral infarction": 2, "Toxic skin eruption": 2, "Troponin": 2, "Urinary tract infection": 2, "Vaccination site erythema": 2, "Vaccination site warmth": 2, "Vision blurred": 2, "Visual field defect": 2, "White blood cell count decreased": 2, "White blood cells urine": 2, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Abscess": 1, "Acne": 1, "Acquired haemophilia": 1, "Activated partial thromboplastin time prolonged": 1, "Acute disseminated encephalomyelitis": 1, "Acute respiratory distress syndrome": 1, "Akathisia": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alpha 1 foetoprotein": 1, "Amaurosis fugax": 1, "Amylase decreased": 1, "Anaemia": 1, "Anal incontinence": 1, "Angiocardiogram": 1, "Angioedema": 1, "Anti-glomerular basement membrane antibody": 1, "Anti-glomerular basement membrane disease": 1, "Antibody test": 1, "Antimitochondrial antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid syndrome": 1, "Aortic dissection": 1, "Apnoea": 1, "Arteriogram abnormal": 1, "Asphyxia": 1, "Atrioventricular block complete": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Autopsy": 1, "Axillary mass": 1, "Axillary pain": 1, "Bacterial test": 1, "Balance disorder": 1, "Band neutrophil count": 1, "Bilevel positive airway pressure": 1, "Bilirubin conjugated": 1, "Bilirubin urine": 1, "Biopsy": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood albumin decreased": 1, "Blood bilirubin unconjugated": 1, "Blood chloride decreased": 1, "Blood cholesterol": 1, "Blood cholinesterase increased": 1, "Blood creatine": 1, "Blood creatine phosphokinase decreased": 1, "Blood fibrinogen decreased": 1, "Blood gases": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood iron": 1, "Blood ketone body": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure immeasurable": 1, "Blood sodium decreased": 1, "Blood triglycerides increased": 1, "Blood zinc": 1, "Body mass index": 1, "Body temperature decreased": 1, "Brain injury": 1, "Brain stem infarction": 1, "Breast cancer": 1, "Breath sounds": 1, "Bundle branch block right": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cachexia": 1, "Capillary nail refill test": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac function test": 1, "Cardiac index": 1, "Cardiac monitoring": 1, "Cardiac ventriculogram left": 1, "Cardiothoracic ratio": 1, "Cells in urine": 1, "Cerebral artery embolism": 1, "Cerebral ischaemia": 1, "Cerebral venous thrombosis": 1, "Cerebrovascular disorder": 1, "Chest scan": 1, "Chondrocalcinosis pyrophosphate": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Chronic respiratory failure": 1, "Circulatory collapse": 1, "Clostridium test": 1, "Coagulopathy": 1, "Coma": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Conjunctival haemorrhage": 1, "Contusion": 1, "Convulsions local": 1, "Coronary angioplasty": 1, "Coronary artery stenosis": 1, "Creatinine renal clearance": 1, "Culture urine": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Defaecation urgency": 1, "Delirium": 1, "Dermatitis": 1, "Dermatitis bullous": 1, "Dermatitis exfoliative generalised": 1, "Diabetes mellitus": 1, "Diabetic coma": 1, "Discomfort": 1, "Disease progression": 1, "Dizziness postural": 1, "Drowning": 1, "Drug ineffective": 1, "Drug screen": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysgraphia": 1, "Dyspepsia": 1, "Dysphemia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Ejection fraction": 1, "Electrocardiogram ST segment elevation": 1, "Embolic stroke": 1, "Embolism arterial": 1, "Encephalitis": 1, "Enterocolitis": 1, "Eosinophil percentage": 1, "Erythema multiforme": 1, "Escherichia test": 1, "Executive dysfunction": 1, "Exposure during pregnancy": 1, "Eye oedema": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Eyelid thickening": 1, "Facial pain": 1, "Faeces discoloured": 1, "Febrile convulsion": 1, "Feeling jittery": 1, "Fibrin degradation products increased": 1, "Foaming at mouth": 1, "Foetal haemoglobin": 1, "Full blood count": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Glaucoma": 1, "Glucose urine": 1, "Granulocyte count": 1, "Haematocrit increased": 1, "Haematoma": 1, "Haemoglobin decreased": 1, "Haemoglobin increased": 1, "Haemolysis": 1, "Haemorrhage": 1, "Haemorrhagic cerebral infarction": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Heart sounds": 1, "Heart sounds abnormal": 1, "Heat illness": 1, "Hemianopia homonymous": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis E": 1, "High density lipoprotein decreased": 1, "Hyperaesthesia": 1, "Hypernatraemia": 1, "Hyperpyrexia": 1, "Hypertonia": 1, "Hypokalaemia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Hypotension": 1, "Hypothermia": 1, "Illness": 1, "Imaging procedure": 1, "Immobile": 1, "Immunisation reaction": 1, "Immunoglobulins": 1, "Immunology test": 1, "Immunophenotyping": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Infarction": 1, "Infection": 1, "Infectious mononucleosis": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Injection site pain": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Iron binding capacity unsaturated": 1, "Joint swelling": 1, "Jugular vein distension": 1, "Lack of spontaneous speech": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Laryngeal stenosis": 1, "Larynx irritation": 1, "Left ventricular dysfunction": 1, "Leukocytosis": 1, "Lid sulcus deepened": 1, "Light chain analysis": 1, "Limb discomfort": 1, "Liver disorder": 1, "Low density lipoprotein decreased": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphangitis": 1, "Lymphatic fistula": 1, "Lymphoblast count": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphoedema": 1, "Magnetic resonance imaging head abnormal": 1, "Memory impairment": 1, "Mesenteric arterial occlusion": 1, "Microbiology test": 1, "Mobility decreased": 1, "Monocyte count increased": 1, "Monoplegia": 1, "Mood altered": 1, "Mouth haemorrhage": 1, "Mouth injury": 1, "Mouth swelling": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Near drowning": 1, "Neck pain": 1, "Necrosis": 1, "Neoplasm malignant": 1, "Neutrophil count decreased": 1, "Nitrite urine": 1, "Nucleic acid test": 1, "Obstructive airways disorder": 1, "Ocular discomfort": 1, "Oculomucocutaneous syndrome": 1, "Oedema mucosal": 1, "Optic neuritis": 1, "Oral pruritus": 1, "Oxygen saturation normal": 1, "Oxygen therapy": 1, "PCO2": 1, "PO2 decreased": 1, "Pancreatitis acute": 1, "Panic disorder": 1, "Papule": 1, "Paresis": 1, "Parkinson's disease": 1, "Pericardial haemorrhage": 1, "Peripheral swelling": 1, "Pharyngeal oedema": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Platelet count abnormal": 1, "Platelet factor 4": 1, "Platelet function test": 1, "Pneumonia bacterial": 1, "Pneumonia pseudomonal": 1, "Polymyalgia rheumatica": 1, "Poor peripheral circulation": 1, "Presbyastasis": 1, "Prostatic specific antigen": 1, "Protein induced by vitamin K absence or antagonist II": 1, "Protein urine present": 1, "Prurigo": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Rales": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Renal disorder": 1, "Renal function test": 1, "Respiration abnormal": 1, "Respiratory alkalosis": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Reticulocyte count": 1, "Retinal tear": 1, "Rhinorrhoea": 1, "Right ventricular enlargement": 1, "Road traffic accident": 1, "Ruptured cerebral aneurysm": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Scratch": 1, "Sensory disturbance": 1, "Septal panniculitis": 1, "Serum ferritin": 1, "Sinus node dysfunction": 1, "Skin atrophy": 1, "Skin erosion": 1, "Skin mass": 1, "Sleep apnoea syndrome": 1, "Sleep disorder": 1, "Small intestinal haemorrhage": 1, "Specific gravity urine": 1, "Speech sound disorder": 1, "Spinal osteoarthritis": 1, "Spinal pain": 1, "Sputum abnormal": 1, "Sputum culture": 1, "Sputum increased": 1, "Sputum retention": 1, "Sputum test": 1, "Strabismus": 1, "Stupor": 1, "Suffocation feeling": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Tachyarrhythmia": 1, "Tenosynovitis": 1, "Thalamus haemorrhage": 1, "Thrombophlebitis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroxine free": 1, "Tongue dry": 1, "Tongue haematoma": 1, "Tonic convulsion": 1, "Total complement activity test": 1, "Treponema test": 1, "Tri-iodothyronine free": 1, "Trismus": 1, "Troponin T increased": 1, "Tryptase": 1, "Ultrasound Doppler": 1, "Ultrasound testes": 1, "Unresponsive to stimuli": 1, "Upper airway obstruction": 1, "Urinary casts": 1, "Urinary sediment": 1, "Urinary sediment present": 1, "Urine analysis abnormal": 1, "Urine ketone body": 1, "Urine output": 1, "Urine output decreased": 1, "Urobilinogen urine": 1, "Use of accessory respiratory muscles": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site reaction": 1, "Vaccination site thrombosis": 1, "Vaccination site ulcer": 1, "Varicose vein": 1, "Vasculitis": 1, "Venogram abnormal": 1, "Venous thrombosis": 1, "Venous thrombosis limb": 1, "Ventricular extrasystoles": 1, "Ventricular fibrillation": 1, "Ventricular hypertrophy": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Viral test": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual field tests": 1, "Vitreous floaters": 1, "Vocal cord disorder": 1, "Weight increased": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "EX3617", "histograms": [{"histogram": {"Body temperature": 344, "Blood pressure measurement": 117, "Oxygen saturation": 92, "Pyrexia": 79, "Anaphylactic reaction": 75, "Heart rate": 73, "Malaise": 49, "Blood pressure increased": 42, "Dyspnoea": 39, "Headache": 39, "Nausea": 38, "Erythema": 36, "Pruritus": 35, "Rash": 33, "Cerebral infarction": 32, "Computerised tomogram": 31, "Urticaria": 31, "Blood pressure decreased": 27, "Feeling abnormal": 26, "Vomiting": 26, "White blood cell count": 24, "Decreased appetite": 23, "Dizziness": 22, "Loss of consciousness": 22, "Magnetic resonance imaging": 22, "Blood test": 21, "Hypoaesthesia": 21, "Arthralgia": 20, "C-reactive protein": 20, "Platelet count": 19, "Electrocardiogram": 18, "Investigation": 18, "Altered state of consciousness": 17, "Oxygen saturation decreased": 17, "Chills": 16, "Pain in extremity": 16, "Cough": 15, "Depressed level of consciousness": 15, "Vaccination site pain": 15, "Cardio-respiratory arrest": 14, "Cardiac failure": 13, "Diarrhoea": 13, "Pain": 13, "Palpitations": 13, "Back pain": 12, "Coma scale": 12, "Hypersensitivity": 12, "SARS-CoV-2 test": 12, "Wheezing": 12, "Feeling hot": 11, "Presyncope": 11, "Alanine aminotransferase": 10, "Aspartate aminotransferase": 10, "Blood creatine phosphokinase": 10, "Blood glucose": 10, "Cerebral haemorrhage": 10, "Cold sweat": 10, "Dehydration": 10, "Fall": 10, "Magnetic resonance imaging head": 10, "Muscular weakness": 10, "Pneumonia": 10, "Asthenia": 9, "Chest discomfort": 9, "Computerised tomogram head": 9, "Heart rate increased": 9, "Hyperventilation": 9, "Myalgia": 9, "Vital signs measurement": 9, "Abdominal pain": 8, "Asthma": 8, "Blood potassium": 8, "Blood sodium": 8, "Dysphoria": 8, "Flushing": 8, "Haemoglobin": 8, "Hot flush": 8, "Oropharyngeal discomfort": 8, "Pallor": 8, "Platelet count decreased": 8, "Tachycardia": 8, "Acute myocardial infarction": 7, "Blood creatinine": 7, "Blood lactate dehydrogenase": 7, "Blood urea": 7, "Cardiac failure acute": 7, "Chest X-ray": 7, "Chest pain": 7, "Fatigue": 7, "Fibrin D dimer": 7, "Gait disturbance": 7, "Herpes zoster": 7, "Hyperhidrosis": 7, "Hypertension": 7, "Myocardial infarction": 7, "Physical deconditioning": 7, "Physical examination": 7, "Pleural effusion": 7, "Respiratory arrest": 7, "Seizure": 7, "Arthritis": 6, "Atrial fibrillation": 6, "Blood chloride": 6, "Computerised tomogram thorax": 6, "Facial paralysis": 6, "Gamma-glutamyltransferase": 6, "Inflammation": 6, "Mean cell haemoglobin": 6, "Mean cell volume": 6, "Neutrophil count": 6, "Oedema peripheral": 6, "Protein total": 6, "Somnolence": 6, "Anaphylactic shock": 5, "Aphasia": 5, "Arrhythmia": 5, "Blood bilirubin": 5, "Blood uric acid": 5, "Bradycardia": 5, "C-reactive protein increased": 5, "Dysphonia": 5, "Glomerular filtration rate": 5, "Glycosylated haemoglobin": 5, "Haematocrit": 5, "Internal haemorrhage": 5, "Interstitial lung disease": 5, "Low density lipoprotein": 5, "Lymphocyte count": 5, "Mean cell haemoglobin concentration": 5, "Purpura": 5, "Red blood cell count": 5, "Respiratory distress": 5, "Respiratory rate": 5, "Subarachnoid haemorrhage": 5, "Swelling": 5, "Swelling face": 5, "Tremor": 5, "White blood cell count increased": 5, "Anxiety": 4, "Blood albumin": 4, "Blood alkaline phosphatase": 4, "Blood calcium": 4, "Blood immunoglobulin G": 4, "Blood pressure systolic increased": 4, "Blood triglycerides": 4, "Condition aggravated": 4, "Disease recurrence": 4, "Drug eruption": 4, "Dyslalia": 4, "Dysstasia": 4, "Echocardiogram": 4, "Eosinophil count": 4, "Guillain-Barre syndrome": 4, "Haemorrhage subcutaneous": 4, "Hemiplegia": 4, "Hepatic function abnormal": 4, "High density lipoprotein": 4, "Movement disorder": 4, "Neuropathy peripheral": 4, "Pneumonia aspiration": 4, "Tachypnoea": 4, "Thrombocytopenic purpura": 4, "Thrombosis": 4, "Ultrasound scan": 4, "Urine analysis": 4, "X-ray": 4, "Activated partial thromboplastin time": 3, "Acute kidney injury": 3, "Alanine aminotransferase increased": 3, "Amylase": 3, "Aortic aneurysm rupture": 3, "Aspartate aminotransferase increased": 3, "Basophil count": 3, "Blood creatinine increased": 3, "Cardiac failure chronic": 3, "Cellulitis": 3, "Colitis ischaemic": 3, "Conjunctival hyperaemia": 3, "Death": 3, "Deep vein thrombosis": 3, "Dysphagia": 3, "Eating disorder": 3, "Eyelid oedema": 3, "Feeding disorder": 3, "Fibrin D dimer increased": 3, "Fibrin degradation products": 3, "Heart rate decreased": 3, "Immune thrombocytopenia": 3, "Laboratory test": 3, "Lacunar infarction": 3, "Monocyte count": 3, "Neutrophil percentage": 3, "Peripheral coldness": 3, "Petechiae": 3, "Rash erythematous": 3, "Respiratory failure": 3, "Sepsis": 3, "Shock": 3, "Sudden cardiac death": 3, "Swollen tongue": 3, "Throat tightness": 3, "Troponin T": 3, "Vaccination site pruritus": 3, "Vaccination site swelling": 3, "Visual impairment": 3, "Yawning": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Albumin globulin ratio": 2, "Angiogram": 2, "Bacteraemia": 2, "Blepharospasm": 2, "Blood bilirubin increased": 2, "Blood cholinesterase": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Blood culture": 2, "Blood fibrinogen": 2, "Blood glucose increased": 2, "Blood immunoglobulin M": 2, "Blood lactate dehydrogenase increased": 2, "Blood pressure systolic": 2, "Blood thyroid stimulating hormone": 2, "Blood urea increased": 2, "Body temperature increased": 2, "Bradykinesia": 2, "Brain natriuretic peptide": 2, "Bronchospasm": 2, "CSF white blood cell count": 2, "Cardiac arrest": 2, "Cardiac death": 2, "Cardiac failure congestive": 2, "Catheterisation cardiac": 2, "Cerebellar haemorrhage": 2, "Cerebellar infarction": 2, "Coagulation test": 2, "Computerised tomogram normal": 2, "Computerised tomogram pelvis": 2, "Disseminated intravascular coagulation": 2, "Dysarthria": 2, "Electroencephalogram": 2, "Epistaxis": 2, "Face oedema": 2, "Faeces soft": 2, "Feeling cold": 2, "Gamma-glutamyltransferase increased": 2, "Genital haemorrhage": 2, "Haematochezia": 2, "Haemoptysis": 2, "Hemiparesis": 2, "Hyperthermia": 2, "Hypophagia": 2, "Hypoxia": 2, "Hypoxic-ischaemic encephalopathy": 2, "Insomnia": 2, "Lip swelling": 2, "Liver function test": 2, "Loss of personal independence in daily activities": 2, "Lymphoma": 2, "Moaning": 2, "Multiple organ dysfunction syndrome": 2, "Muscle contracture": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Myocardial ischaemia": 2, "Myocarditis": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nephrotic syndrome": 2, "Neurological examination": 2, "Nystagmus": 2, "Occult blood": 2, "Ocular hyperaemia": 2, "Oral discomfort": 2, "PO2": 2, "Paraesthesia": 2, "Paralysis": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Polymerase chain reaction": 2, "Productive cough": 2, "Protein total decreased": 2, "Protein urine": 2, "Prothrombin time": 2, "Prothrombin time prolonged": 2, "Pulmonary alveolar haemorrhage": 2, "Pulmonary congestion": 2, "Putamen haemorrhage": 2, "Radial pulse abnormal": 2, "Renal failure": 2, "Renal impairment": 2, "Respiratory disorder": 2, "Rhabdomyolysis": 2, "Salivary hypersecretion": 2, "Sensation of foreign body": 2, "Skin discolouration": 2, "Skin laceration": 2, "Speech disorder": 2, "Stress cardiomyopathy": 2, "Subcutaneous haematoma": 2, "Sudden hearing loss": 2, "Thrombocytopenia": 2, "Thrombotic cerebral infarction": 2, "Toxic skin eruption": 2, "Troponin": 2, "Urinary tract infection": 2, "Vaccination site erythema": 2, "Vaccination site warmth": 2, "Vision blurred": 2, "Visual field defect": 2, "White blood cell count decreased": 2, "White blood cells urine": 2, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Abscess": 1, "Acne": 1, "Acquired haemophilia": 1, "Activated partial thromboplastin time prolonged": 1, "Acute disseminated encephalomyelitis": 1, "Acute respiratory distress syndrome": 1, "Akathisia": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alpha 1 foetoprotein": 1, "Amaurosis fugax": 1, "Amylase decreased": 1, "Anaemia": 1, "Anal incontinence": 1, "Angiocardiogram": 1, "Angioedema": 1, "Anti-glomerular basement membrane antibody": 1, "Anti-glomerular basement membrane disease": 1, "Antibody test": 1, "Antimitochondrial antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid syndrome": 1, "Aortic dissection": 1, "Apnoea": 1, "Arteriogram abnormal": 1, "Asphyxia": 1, "Atrioventricular block complete": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Autopsy": 1, "Axillary mass": 1, "Axillary pain": 1, "Bacterial test": 1, "Balance disorder": 1, "Band neutrophil count": 1, "Bilevel positive airway pressure": 1, "Bilirubin conjugated": 1, "Bilirubin urine": 1, "Biopsy": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood albumin decreased": 1, "Blood bilirubin unconjugated": 1, "Blood chloride decreased": 1, "Blood cholesterol": 1, "Blood cholinesterase increased": 1, "Blood creatine": 1, "Blood creatine phosphokinase decreased": 1, "Blood fibrinogen decreased": 1, "Blood gases": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood iron": 1, "Blood ketone body": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure immeasurable": 1, "Blood sodium decreased": 1, "Blood triglycerides increased": 1, "Blood zinc": 1, "Body mass index": 1, "Body temperature decreased": 1, "Brain injury": 1, "Brain stem infarction": 1, "Breast cancer": 1, "Breath sounds": 1, "Bundle branch block right": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cachexia": 1, "Capillary nail refill test": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac function test": 1, "Cardiac index": 1, "Cardiac monitoring": 1, "Cardiac ventriculogram left": 1, "Cardiothoracic ratio": 1, "Cells in urine": 1, "Cerebral artery embolism": 1, "Cerebral ischaemia": 1, "Cerebral venous thrombosis": 1, "Cerebrovascular disorder": 1, "Chest scan": 1, "Chondrocalcinosis pyrophosphate": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Chronic respiratory failure": 1, "Circulatory collapse": 1, "Clostridium test": 1, "Coagulopathy": 1, "Coma": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Conjunctival haemorrhage": 1, "Contusion": 1, "Convulsions local": 1, "Coronary angioplasty": 1, "Coronary artery stenosis": 1, "Creatinine renal clearance": 1, "Culture urine": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Defaecation urgency": 1, "Delirium": 1, "Dermatitis": 1, "Dermatitis bullous": 1, "Dermatitis exfoliative generalised": 1, "Diabetes mellitus": 1, "Diabetic coma": 1, "Discomfort": 1, "Disease progression": 1, "Dizziness postural": 1, "Drowning": 1, "Drug ineffective": 1, "Drug screen": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysgraphia": 1, "Dyspepsia": 1, "Dysphemia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Ejection fraction": 1, "Electrocardiogram ST segment elevation": 1, "Embolic stroke": 1, "Embolism arterial": 1, "Encephalitis": 1, "Enterocolitis": 1, "Eosinophil percentage": 1, "Erythema multiforme": 1, "Escherichia test": 1, "Executive dysfunction": 1, "Exposure during pregnancy": 1, "Eye oedema": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Eyelid thickening": 1, "Facial pain": 1, "Faeces discoloured": 1, "Febrile convulsion": 1, "Feeling jittery": 1, "Fibrin degradation products increased": 1, "Foaming at mouth": 1, "Foetal haemoglobin": 1, "Full blood count": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Glaucoma": 1, "Glucose urine": 1, "Granulocyte count": 1, "Haematocrit increased": 1, "Haematoma": 1, "Haemoglobin decreased": 1, "Haemoglobin increased": 1, "Haemolysis": 1, "Haemorrhage": 1, "Haemorrhagic cerebral infarction": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Heart sounds": 1, "Heart sounds abnormal": 1, "Heat illness": 1, "Hemianopia homonymous": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis E": 1, "High density lipoprotein decreased": 1, "Hyperaesthesia": 1, "Hypernatraemia": 1, "Hyperpyrexia": 1, "Hypertonia": 1, "Hypokalaemia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Hypotension": 1, "Hypothermia": 1, "Illness": 1, "Imaging procedure": 1, "Immobile": 1, "Immunisation reaction": 1, "Immunoglobulins": 1, "Immunology test": 1, "Immunophenotyping": 1, "Impaired quality of life": 1, "Inappropriate schedule of product administration": 1, "Infarction": 1, "Infection": 1, "Infectious mononucleosis": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Injection site pain": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Iron binding capacity unsaturated": 1, "Joint swelling": 1, "Jugular vein distension": 1, "Lack of spontaneous speech": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Laryngeal stenosis": 1, "Larynx irritation": 1, "Left ventricular dysfunction": 1, "Leukocytosis": 1, "Lid sulcus deepened": 1, "Light chain analysis": 1, "Limb discomfort": 1, "Liver disorder": 1, "Low density lipoprotein decreased": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphangitis": 1, "Lymphatic fistula": 1, "Lymphoblast count": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphoedema": 1, "Magnetic resonance imaging head abnormal": 1, "Memory impairment": 1, "Mesenteric arterial occlusion": 1, "Microbiology test": 1, "Mobility decreased": 1, "Monocyte count increased": 1, "Monoplegia": 1, "Mood altered": 1, "Mouth haemorrhage": 1, "Mouth injury": 1, "Mouth swelling": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Near drowning": 1, "Neck pain": 1, "Necrosis": 1, "Neoplasm malignant": 1, "Neutrophil count decreased": 1, "Nitrite urine": 1, "Nucleic acid test": 1, "Obstructive airways disorder": 1, "Ocular discomfort": 1, "Oculomucocutaneous syndrome": 1, "Oedema mucosal": 1, "Optic neuritis": 1, "Oral pruritus": 1, "Oxygen saturation normal": 1, "Oxygen therapy": 1, "PCO2": 1, "PO2 decreased": 1, "Pancreatitis acute": 1, "Panic disorder": 1, "Papule": 1, "Paresis": 1, "Parkinson's disease": 1, "Pericardial haemorrhage": 1, "Peripheral swelling": 1, "Pharyngeal oedema": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Platelet count abnormal": 1, "Platelet factor 4": 1, "Platelet function test": 1, "Pneumonia bacterial": 1, "Pneumonia pseudomonal": 1, "Polymyalgia rheumatica": 1, "Poor peripheral circulation": 1, "Presbyastasis": 1, "Prostatic specific antigen": 1, "Protein induced by vitamin K absence or antagonist II": 1, "Protein urine present": 1, "Prurigo": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Rales": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Renal disorder": 1, "Renal function test": 1, "Respiration abnormal": 1, "Respiratory alkalosis": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Reticulocyte count": 1, "Retinal tear": 1, "Rhinorrhoea": 1, "Right ventricular enlargement": 1, "Road traffic accident": 1, "Ruptured cerebral aneurysm": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Scratch": 1, "Sensory disturbance": 1, "Septal panniculitis": 1, "Serum ferritin": 1, "Sinus node dysfunction": 1, "Skin atrophy": 1, "Skin erosion": 1, "Skin mass": 1, "Sleep apnoea syndrome": 1, "Sleep disorder": 1, "Small intestinal haemorrhage": 1, "Specific gravity urine": 1, "Speech sound disorder": 1, "Spinal osteoarthritis": 1, "Spinal pain": 1, "Sputum abnormal": 1, "Sputum culture": 1, "Sputum increased": 1, "Sputum retention": 1, "Sputum test": 1, "Strabismus": 1, "Stupor": 1, "Suffocation feeling": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Tachyarrhythmia": 1, "Tenosynovitis": 1, "Thalamus haemorrhage": 1, "Thrombophlebitis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroxine free": 1, "Tongue dry": 1, "Tongue haematoma": 1, "Tonic convulsion": 1, "Total complement activity test": 1, "Treponema test": 1, "Tri-iodothyronine free": 1, "Trismus": 1, "Troponin T increased": 1, "Tryptase": 1, "Ultrasound Doppler": 1, "Ultrasound testes": 1, "Unresponsive to stimuli": 1, "Upper airway obstruction": 1, "Urinary casts": 1, "Urinary sediment": 1, "Urinary sediment present": 1, "Urine analysis abnormal": 1, "Urine ketone body": 1, "Urine output": 1, "Urine output decreased": 1, "Urobilinogen urine": 1, "Use of accessory respiratory muscles": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site reaction": 1, "Vaccination site thrombosis": 1, "Vaccination site ulcer": 1, "Varicose vein": 1, "Vasculitis": 1, "Venogram abnormal": 1, "Venous thrombosis": 1, "Venous thrombosis limb": 1, "Ventricular extrasystoles": 1, "Ventricular fibrillation": 1, "Ventricular hypertrophy": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Viral test": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual field tests": 1, "Vitreous floaters": 1, "Vocal cord disorder": 1, "Weight increased": 1, "pH urine": 1}, "batchcodes": ["EX3617"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EX3619.json b/docs/data/histograms/Japan/EX3619.json
index aa3fe4251e0..5f2a7a228be 100644
--- a/docs/data/histograms/Japan/EX3619.json
+++ b/docs/data/histograms/Japan/EX3619.json
@@ -1 +1 @@
-{"batchcode": "EX3619", "histograms": [{"batchcodes": ["EX3619"], "histogram": {"Arrhythmia": 1, "Body temperature": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Myocardial necrosis marker": 1, "Ventricular extrasystoles": 1}}]}
\ No newline at end of file
+{"batchcode": "EX3619", "histograms": [{"histogram": {"Arrhythmia": 1, "Body temperature": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Myocardial necrosis marker": 1, "Ventricular extrasystoles": 1}, "batchcodes": ["EX3619"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EX5420.json b/docs/data/histograms/Japan/EX5420.json
index 82b280196d2..dadfbc55e6b 100644
--- a/docs/data/histograms/Japan/EX5420.json
+++ b/docs/data/histograms/Japan/EX5420.json
@@ -1 +1 @@
-{"batchcode": "EX5420", "histograms": [{"batchcodes": ["EX5420"], "histogram": {"Body temperature": 1, "Brain natriuretic peptide": 1, "Cardiac disorder": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EX5420", "histograms": [{"histogram": {"Body temperature": 1, "Brain natriuretic peptide": 1, "Cardiac disorder": 1, "Thrombosis": 1}, "batchcodes": ["EX5420"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EX6564.json b/docs/data/histograms/Japan/EX6564.json
index 4ef3aa8edf0..154f9de9826 100644
--- a/docs/data/histograms/Japan/EX6564.json
+++ b/docs/data/histograms/Japan/EX6564.json
@@ -1 +1 @@
-{"batchcode": "EX6564", "histograms": [{"batchcodes": ["EX6564"], "histogram": {"Body temperature": 17, "Anaphylactic reaction": 6, "Headache": 5, "Malaise": 5, "Dizziness": 4, "Dyspnoea": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Cough": 3, "Oropharyngeal discomfort": 3, "Arthralgia": 2, "Blood pressure increased": 2, "Facial paralysis": 2, "Feeling abnormal": 2, "Hypoaesthesia": 2, "Neuropathy peripheral": 2, "Oxygen saturation": 2, "Pain": 2, "Vaccination site pain": 2, "Vital signs measurement": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Axillary pain": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body mass index": 1, "C-reactive protein": 1, "Chills": 1, "Cognitive disorder": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Diplopia": 1, "Disorientation": 1, "Drug-induced liver injury": 1, "Dysgeusia": 1, "Faeces soft": 1, "Fall": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal perforation": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hepatic function abnormal": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypersensitivity pneumonitis": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hyponatraemia": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mesenteric arterial occlusion": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Physical deconditioning": 1, "Platelet count": 1, "Presyncope": 1, "Protein total": 1, "Pruritus": 1, "Putamen haemorrhage": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Somnolence": 1, "Swelling": 1, "Tachypnoea": 1, "Throat irritation": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EX6564", "histograms": [{"histogram": {"Body temperature": 17, "Anaphylactic reaction": 6, "Headache": 5, "Malaise": 5, "Dizziness": 4, "Dyspnoea": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Cough": 3, "Oropharyngeal discomfort": 3, "Arthralgia": 2, "Blood pressure increased": 2, "Facial paralysis": 2, "Feeling abnormal": 2, "Hypoaesthesia": 2, "Neuropathy peripheral": 2, "Oxygen saturation": 2, "Pain": 2, "Vaccination site pain": 2, "Vital signs measurement": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Axillary pain": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body mass index": 1, "C-reactive protein": 1, "Chills": 1, "Cognitive disorder": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Diplopia": 1, "Disorientation": 1, "Drug-induced liver injury": 1, "Dysgeusia": 1, "Faeces soft": 1, "Fall": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal perforation": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hepatic function abnormal": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypersensitivity pneumonitis": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hyponatraemia": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mesenteric arterial occlusion": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Physical deconditioning": 1, "Platelet count": 1, "Presyncope": 1, "Protein total": 1, "Pruritus": 1, "Putamen haemorrhage": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Somnolence": 1, "Swelling": 1, "Tachypnoea": 1, "Throat irritation": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["EX6564"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY0079.json b/docs/data/histograms/Japan/EY0079.json
index 0dc52861051..7eb1dabb84e 100644
--- a/docs/data/histograms/Japan/EY0079.json
+++ b/docs/data/histograms/Japan/EY0079.json
@@ -1 +1 @@
-{"batchcode": "EY0079", "histograms": [{"batchcodes": ["EY0079"], "histogram": {"Body temperature": 1, "Cold sweat": 1, "Fall": 1, "Loss of consciousness": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0079", "histograms": [{"histogram": {"Body temperature": 1, "Cold sweat": 1, "Fall": 1, "Loss of consciousness": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["EY0079"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY0572.json b/docs/data/histograms/Japan/EY0572.json
index e9c1a156432..453af4738e5 100644
--- a/docs/data/histograms/Japan/EY0572.json
+++ b/docs/data/histograms/Japan/EY0572.json
@@ -1 +1 @@
-{"batchcode": "EY0572", "histograms": [{"batchcodes": ["3006279", "EY0572", "FA5715"], "histogram": {"Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Seizure": 1, "Sinus bradycardia": 1}}, {"batchcodes": ["EY0572"], "histogram": {"Body temperature": 89, "Blood pressure measurement": 40, "Heart rate": 28, "Oxygen saturation": 27, "Pyrexia": 20, "Anaphylactic reaction": 17, "Blood pressure increased": 14, "Nausea": 14, "Blood pressure decreased": 12, "Dyspnoea": 10, "Hypoaesthesia": 10, "Presyncope": 10, "Feeling abnormal": 9, "Blood test": 7, "Erythema": 7, "Cold sweat": 6, "Cough": 6, "Depressed level of consciousness": 6, "Dizziness": 6, "Heart rate increased": 6, "Malaise": 6, "Oropharyngeal discomfort": 6, "Vital signs measurement": 6, "Death": 5, "Headache": 5, "Loss of consciousness": 5, "Rash": 5, "SARS-CoV-2 test": 5, "Vomiting": 5, "Arthralgia": 4, "Bradycardia": 4, "Chest pain": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Diarrhoea": 4, "Fall": 4, "Hypersensitivity": 4, "Hyperventilation": 4, "Movement disorder": 4, "Oxygen saturation decreased": 4, "Pain": 4, "Pallor": 4, "Respiratory rate": 4, "Abdominal pain": 3, "Back pain": 3, "Blood urea": 3, "C-reactive protein": 3, "COVID-19": 3, "Chest X-ray": 3, "Electrocardiogram": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Hypoaesthesia oral": 3, "Magnetic resonance imaging": 3, "PO2": 3, "Palpitations": 3, "Sensory disturbance": 3, "Syncope": 3, "Urticaria": 3, "Vaccination failure": 3, "Vaccination site pain": 3, "Alanine aminotransferase": 2, "Aortic dissection": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Asthma": 2, "Audiogram": 2, "Biopsy": 2, "Blood creatine": 2, "Brain stem haemorrhage": 2, "Cardiac failure acute": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Clonic convulsion": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Condition aggravated": 2, "Disease recurrence": 2, "Dysphoria": 2, "Dysstasia": 2, "Epilepsy": 2, "Fatigue": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Herpes zoster": 2, "Hot flush": 2, "Hypertension": 2, "Inflammation": 2, "Insomnia": 2, "Muscular weakness": 2, "Myalgia": 2, "Pneumonia": 2, "Polymerase chain reaction": 2, "Pruritus": 2, "Respiratory rate increased": 2, "Tinnitus": 2, "Urine analysis": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "White blood cell count": 2, "Activated partial thromboplastin time": 1, "Acute febrile neutrophilic dermatosis": 1, "Altered state of consciousness": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Anti-aquaporin-4 antibody": 1, "Antimitochondrial antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aphasia": 1, "Apnoea": 1, "Arthritis": 1, "Arthropathy": 1, "Ataxia": 1, "Atrioventricular block second degree": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood creatinine": 1, "Blood culture": 1, "Blood follicle stimulating hormone": 1, "Blood glucose": 1, "Blood pressure diastolic increased": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Blood uric acid": 1, "Brain stem infarction": 1, "Breath sounds": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "CSF oligoclonal band": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiac failure chronic": 1, "Cardiac hypertrophy": 1, "Cardiac resynchronisation therapy": 1, "Cardio-respiratory arrest": 1, "Cataract": 1, "Cellulitis": 1, "Cerebral ventricular rupture": 1, "Chills": 1, "Circulatory collapse": 1, "Computerised tomogram thorax": 1, "Conjunctival hyperaemia": 1, "Cyanosis": 1, "Deafness": 1, "Deafness neurosensory": 1, "Dehydration": 1, "Demyelination": 1, "Discomfort": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Ear discomfort": 1, "Ear disorder": 1, "Eating disorder": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment elevation": 1, "Embolism": 1, "Erythema nodosum": 1, "Eye disorder": 1, "Eye luxation": 1, "Eye pruritus": 1, "Face oedema": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fine motor skill dysfunction": 1, "Flushing": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "General physical health deterioration": 1, "Glycosylated haemoglobin": 1, "Grunting": 1, "Haematuria": 1, "Haemorrhage urinary tract": 1, "Head discomfort": 1, "Heart sounds": 1, "Heavy menstrual bleeding": 1, "Hyposplenism": 1, "Illness": 1, "Immunosuppression": 1, "Inappropriate schedule of product administration": 1, "Interstitial lung disease": 1, "Investigation": 1, "Lip injury": 1, "Liver abscess": 1, "Liver function test": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Menstrual disorder": 1, "Monoplegia": 1, "Mumps": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Myocarditis": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Oestradiol": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oral mucosal blistering": 1, "Organising pneumonia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paralysis": 1, "Paraplegia": 1, "Parosmia": 1, "Percussion test": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Pharyngoscopy": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumococcal infection": 1, "Primary biliary cholangitis": 1, "Procalcitonin": 1, "Product use issue": 1, "Productive cough": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Rash macular": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Retinal vein occlusion": 1, "Seizure": 1, "Skin burning sensation": 1, "Somnolence": 1, "Spinal cord haemorrhage": 1, "Spinal vessel congenital anomaly": 1, "Stress": 1, "Stridor": 1, "Subretinal fluid": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Tachypnoea": 1, "Talipes": 1, "Taste disorder": 1, "Tension": 1, "Throat tightness": 1, "Thrombosis": 1, "Thyroxine free": 1, "Tonic convulsion": 1, "Tooth disorder": 1, "Toxic skin eruption": 1, "Tremor": 1, "Tri-iodothyronine free": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urinary occult blood": 1, "Urticaria cholinergic": 1, "Vaccination site mass": 1, "Vaccination site scar": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Vestibular function test": 1, "Vestibular function test abnormal": 1, "Viral infection": 1, "Viral test": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Wall motion score index abnormal": 1, "Weight": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0572", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Seizure": 1, "Sinus bradycardia": 1}, "batchcodes": ["3006279", "EY0572", "FA5715"]}, {"histogram": {"Body temperature": 89, "Blood pressure measurement": 40, "Heart rate": 28, "Oxygen saturation": 27, "Pyrexia": 20, "Anaphylactic reaction": 17, "Blood pressure increased": 14, "Nausea": 14, "Blood pressure decreased": 12, "Dyspnoea": 10, "Hypoaesthesia": 10, "Presyncope": 10, "Feeling abnormal": 9, "Blood test": 7, "Erythema": 7, "Cold sweat": 6, "Cough": 6, "Depressed level of consciousness": 6, "Dizziness": 6, "Heart rate increased": 6, "Malaise": 6, "Oropharyngeal discomfort": 6, "Vital signs measurement": 6, "Death": 5, "Headache": 5, "Loss of consciousness": 5, "Rash": 5, "SARS-CoV-2 test": 5, "Vomiting": 5, "Arthralgia": 4, "Bradycardia": 4, "Chest pain": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Diarrhoea": 4, "Fall": 4, "Hypersensitivity": 4, "Hyperventilation": 4, "Movement disorder": 4, "Oxygen saturation decreased": 4, "Pain": 4, "Pallor": 4, "Respiratory rate": 4, "Abdominal pain": 3, "Back pain": 3, "Blood urea": 3, "C-reactive protein": 3, "COVID-19": 3, "Chest X-ray": 3, "Electrocardiogram": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Hypoaesthesia oral": 3, "Magnetic resonance imaging": 3, "PO2": 3, "Palpitations": 3, "Sensory disturbance": 3, "Syncope": 3, "Urticaria": 3, "Vaccination failure": 3, "Vaccination site pain": 3, "Alanine aminotransferase": 2, "Aortic dissection": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Asthma": 2, "Audiogram": 2, "Biopsy": 2, "Blood creatine": 2, "Brain stem haemorrhage": 2, "Cardiac failure acute": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Clonic convulsion": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Condition aggravated": 2, "Disease recurrence": 2, "Dysphoria": 2, "Dysstasia": 2, "Epilepsy": 2, "Fatigue": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Herpes zoster": 2, "Hot flush": 2, "Hypertension": 2, "Inflammation": 2, "Insomnia": 2, "Muscular weakness": 2, "Myalgia": 2, "Pneumonia": 2, "Polymerase chain reaction": 2, "Pruritus": 2, "Respiratory rate increased": 2, "Tinnitus": 2, "Urine analysis": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "White blood cell count": 2, "Activated partial thromboplastin time": 1, "Acute febrile neutrophilic dermatosis": 1, "Altered state of consciousness": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Anti-aquaporin-4 antibody": 1, "Antimitochondrial antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aphasia": 1, "Apnoea": 1, "Arthritis": 1, "Arthropathy": 1, "Ataxia": 1, "Atrioventricular block second degree": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood creatinine": 1, "Blood culture": 1, "Blood follicle stimulating hormone": 1, "Blood glucose": 1, "Blood pressure diastolic increased": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Blood uric acid": 1, "Brain stem infarction": 1, "Breath sounds": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "CSF oligoclonal band": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiac failure chronic": 1, "Cardiac hypertrophy": 1, "Cardiac resynchronisation therapy": 1, "Cardio-respiratory arrest": 1, "Cataract": 1, "Cellulitis": 1, "Cerebral ventricular rupture": 1, "Chills": 1, "Circulatory collapse": 1, "Computerised tomogram thorax": 1, "Conjunctival hyperaemia": 1, "Cyanosis": 1, "Deafness": 1, "Deafness neurosensory": 1, "Dehydration": 1, "Demyelination": 1, "Discomfort": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Ear discomfort": 1, "Ear disorder": 1, "Eating disorder": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment elevation": 1, "Embolism": 1, "Erythema nodosum": 1, "Eye disorder": 1, "Eye luxation": 1, "Eye pruritus": 1, "Face oedema": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fine motor skill dysfunction": 1, "Flushing": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "General physical health deterioration": 1, "Glycosylated haemoglobin": 1, "Grunting": 1, "Haematuria": 1, "Haemorrhage urinary tract": 1, "Head discomfort": 1, "Heart sounds": 1, "Heavy menstrual bleeding": 1, "Hyposplenism": 1, "Illness": 1, "Immunosuppression": 1, "Inappropriate schedule of product administration": 1, "Interstitial lung disease": 1, "Investigation": 1, "Lip injury": 1, "Liver abscess": 1, "Liver function test": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Menstrual disorder": 1, "Monoplegia": 1, "Mumps": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Myocarditis": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Oestradiol": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oral mucosal blistering": 1, "Organising pneumonia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paralysis": 1, "Paraplegia": 1, "Parosmia": 1, "Percussion test": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Pharyngoscopy": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumococcal infection": 1, "Primary biliary cholangitis": 1, "Procalcitonin": 1, "Product use issue": 1, "Productive cough": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Rash macular": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Retinal vein occlusion": 1, "Seizure": 1, "Skin burning sensation": 1, "Somnolence": 1, "Spinal cord haemorrhage": 1, "Spinal vessel congenital anomaly": 1, "Stress": 1, "Stridor": 1, "Subretinal fluid": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Tachypnoea": 1, "Talipes": 1, "Taste disorder": 1, "Tension": 1, "Throat tightness": 1, "Thrombosis": 1, "Thyroxine free": 1, "Tonic convulsion": 1, "Tooth disorder": 1, "Toxic skin eruption": 1, "Tremor": 1, "Tri-iodothyronine free": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urinary occult blood": 1, "Urticaria cholinergic": 1, "Vaccination site mass": 1, "Vaccination site scar": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Vestibular function test": 1, "Vestibular function test abnormal": 1, "Viral infection": 1, "Viral test": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Wall motion score index abnormal": 1, "Weight": 1, "Wheezing": 1}, "batchcodes": ["EY0572"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY0573.json b/docs/data/histograms/Japan/EY0573.json
index 9d500e461d2..65091776340 100644
--- a/docs/data/histograms/Japan/EY0573.json
+++ b/docs/data/histograms/Japan/EY0573.json
@@ -1 +1 @@
-{"batchcode": "EY0573", "histograms": [{"batchcodes": ["EY0573"], "histogram": {"Body temperature": 108, "Blood pressure measurement": 57, "Oxygen saturation": 46, "Heart rate": 29, "Anaphylactic reaction": 21, "Pyrexia": 21, "Blood pressure increased": 15, "Dyspnoea": 15, "Blood pressure decreased": 14, "Nausea": 13, "Pruritus": 13, "Computerised tomogram": 12, "Vomiting": 12, "Cerebral infarction": 11, "Electrocardiogram": 11, "Presyncope": 11, "Urticaria": 11, "Dizziness": 10, "Oxygen saturation decreased": 10, "Seizure": 10, "Blood test": 9, "Feeling abnormal": 9, "Depressed level of consciousness": 8, "Erythema": 8, "Headache": 8, "Hypoaesthesia": 8, "Investigation": 8, "Loss of consciousness": 8, "Pallor": 8, "Computerised tomogram head": 7, "Magnetic resonance imaging": 7, "Malaise": 7, "Oropharyngeal discomfort": 7, "Arthralgia": 6, "Heart rate increased": 6, "Hyperventilation": 6, "Magnetic resonance imaging head": 6, "Palpitations": 6, "Peripheral swelling": 6, "Rash": 6, "Cardio-respiratory arrest": 5, "Death": 5, "Fall": 5, "Movement disorder": 5, "Muscular weakness": 5, "Pain in extremity": 5, "White blood cell count": 5, "Abdominal discomfort": 4, "Altered state of consciousness": 4, "Asthenia": 4, "Blood creatine phosphokinase": 4, "Chest X-ray": 4, "Chest discomfort": 4, "Chills": 4, "Cough": 4, "Decreased appetite": 4, "Hypertension": 4, "SARS-CoV-2 test": 4, "Tension": 4, "Ultrasound scan": 4, "Asthma": 3, "Auscultation": 3, "Blood potassium": 3, "Blood pressure systolic increased": 3, "C-reactive protein": 3, "Cardiac failure": 3, "Cerebral haemorrhage": 3, "Computerised tomogram thorax": 3, "Diarrhoea": 3, "Echocardiogram": 3, "Epilepsy": 3, "Face oedema": 3, "Hemiplegia": 3, "Musculoskeletal stiffness": 3, "Neuropathy peripheral": 3, "Thrombosis": 3, "Tremor": 3, "Visual impairment": 3, "Wheezing": 3, "X-ray": 3, "Alanine aminotransferase": 2, "Angina pectoris": 2, "Angioedema": 2, "Aphasia": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Back pain": 2, "Basal ganglia haemorrhage": 2, "Blood glucose": 2, "Blood pressure diastolic decreased": 2, "Blood pressure diastolic increased": 2, "Blood sodium": 2, "C-reactive protein increased": 2, "Cardiac failure acute": 2, "Coma scale": 2, "Condition aggravated": 2, "Dehydration": 2, "Disease recurrence": 2, "Dysarthria": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "Fibrin D dimer increased": 2, "Gait disturbance": 2, "Gaze palsy": 2, "Glycosylated haemoglobin": 2, "Hemianopia homonymous": 2, "Hemiparesis": 2, "Hepatic function abnormal": 2, "Hyperhidrosis": 2, "Hypoaesthesia oral": 2, "Laryngeal discomfort": 2, "Laryngeal oedema": 2, "Limb discomfort": 2, "Mobility decreased": 2, "Muscle rigidity": 2, "Muscle spasms": 2, "Myalgia": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Neutrophil count": 2, "Paraesthesia": 2, "Physical examination": 2, "Pneumonia": 2, "Product administered at inappropriate site": 2, "Pulmonary embolism": 2, "Renal failure": 2, "Respiratory failure": 2, "Respiratory rate": 2, "Rhabdomyolysis": 2, "Stress": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Tetany": 2, "Throat tightness": 2, "Tumour marker test": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Visual acuity reduced": 2, "Visual field tests": 2, "Vital signs measurement": 2, "White blood cell count decreased": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute hepatic failure": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Amnesia": 1, "Angiogram": 1, "Anxiety": 1, "Aortic dissection": 1, "Arthritis": 1, "Arthrogram": 1, "Arthropathy": 1, "Aspiration joint": 1, "Atrial fibrillation": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Basophil count": 1, "Binocular eye movement disorder": 1, "Biopsy heart": 1, "Biopsy soft tissue": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cadmium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "Blood pressure systolic": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body mass index": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Bursitis": 1, "COVID-19": 1, "CSF cell count": 1, "Carbohydrate antigen 19-9": 1, "Carbohydrate antigen 19-9 increased": 1, "Cardiac disorder": 1, "Cardiac failure chronic": 1, "Cardiothoracic ratio": 1, "Cellulitis": 1, "Cerebellar infarction": 1, "Cervical radiculopathy": 1, "Chest pain": 1, "Clostridium test": 1, "Collagen disorder": 1, "Communication disorder": 1, "Contrast media reaction": 1, "Contusion": 1, "Conversion disorder": 1, "Coronavirus test": 1, "Crush injury": 1, "Decreased activity": 1, "Deep vein thrombosis": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Dissociative disorder": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphoria": 1, "Dysstasia": 1, "Eating disorder": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram normal": 1, "Embolic stroke": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Exostosis": 1, "Eyelid oedema": 1, "Facial paralysis": 1, "Facial spasm": 1, "Feeling cold": 1, "Flushing": 1, "Gamma-glutamyltransferase": 1, "Gastric pH decreased": 1, "General symptom": 1, "Glossoptosis": 1, "Glycosylated haemoglobin increased": 1, "Haematemesis": 1, "Haematocrit": 1, "Haematology test": 1, "Haemodynamic instability": 1, "Haemoglobin": 1, "Haemophagocytic lymphohistiocytosis": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Heart rate decreased": 1, "Hemianopia": 1, "Hepatic failure": 1, "Hepatorenal syndrome": 1, "Herpes simplex": 1, "Herpes zoster": 1, "Hypercapnia": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hypernatraemia": 1, "Hypersensitivity": 1, "Hypersensitivity pneumonitis": 1, "Hypertonia": 1, "Hypokalaemia": 1, "Hypophagia": 1, "Imaging procedure": 1, "Immobilisation syndrome": 1, "Immunology test": 1, "Incontinence": 1, "Induration": 1, "Inflammation": 1, "Infrequent bowel movements": 1, "Injected limb mobility decreased": 1, "Internal haemorrhage": 1, "Intervertebral disc space narrowing": 1, "Joint instability": 1, "Joint swelling": 1, "Lip disorder": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte stimulation test": 1, "Magnetic resonance cholangiopancreatography": 1, "Magnetic resonance imaging neck": 1, "Monocyte count": 1, "Monoplegia": 1, "Muscle tightness": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Myoclonus": 1, "Neck pain": 1, "Neutrophil count decreased": 1, "Neutrophil percentage": 1, "Neutrophil percentage decreased": 1, "Nyctalgia": 1, "Oedema": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Oral discharge": 1, "Paraesthesia oral": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Peritonitis": 1, "Pharyngeal swelling": 1, "Piloerection": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Protein total": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary congestion": 1, "Pulmonary hypertension": 1, "Radiculopathy": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Renal impairment": 1, "Retinal artery occlusion": 1, "Ruptured cerebral aneurysm": 1, "Scan": 1, "Sensory disturbance": 1, "Somatic symptom disorder": 1, "Somnolence": 1, "Stenocephaly": 1, "Stridor": 1, "Swelling": 1, "Swelling of eyelid": 1, "Synovial fluid analysis": 1, "Tachycardia": 1, "Transient ischaemic attack": 1, "Trismus": 1, "Troponin T": 1, "Troponin T increased": 1, "Tumour marker increased": 1, "Urethritis": 1, "Urinary occult blood": 1, "Venous thrombosis limb": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Vogt-Koyanagi-Harada disease": 1, "White blood cell count increased": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0573", "histograms": [{"histogram": {"Body temperature": 108, "Blood pressure measurement": 57, "Oxygen saturation": 46, "Heart rate": 29, "Anaphylactic reaction": 21, "Pyrexia": 21, "Blood pressure increased": 15, "Dyspnoea": 15, "Blood pressure decreased": 14, "Nausea": 13, "Pruritus": 13, "Computerised tomogram": 12, "Vomiting": 12, "Cerebral infarction": 11, "Electrocardiogram": 11, "Presyncope": 11, "Urticaria": 11, "Dizziness": 10, "Oxygen saturation decreased": 10, "Seizure": 10, "Blood test": 9, "Feeling abnormal": 9, "Depressed level of consciousness": 8, "Erythema": 8, "Headache": 8, "Hypoaesthesia": 8, "Investigation": 8, "Loss of consciousness": 8, "Pallor": 8, "Computerised tomogram head": 7, "Magnetic resonance imaging": 7, "Malaise": 7, "Oropharyngeal discomfort": 7, "Arthralgia": 6, "Heart rate increased": 6, "Hyperventilation": 6, "Magnetic resonance imaging head": 6, "Palpitations": 6, "Peripheral swelling": 6, "Rash": 6, "Cardio-respiratory arrest": 5, "Death": 5, "Fall": 5, "Movement disorder": 5, "Muscular weakness": 5, "Pain in extremity": 5, "White blood cell count": 5, "Abdominal discomfort": 4, "Altered state of consciousness": 4, "Asthenia": 4, "Blood creatine phosphokinase": 4, "Chest X-ray": 4, "Chest discomfort": 4, "Chills": 4, "Cough": 4, "Decreased appetite": 4, "Hypertension": 4, "SARS-CoV-2 test": 4, "Tension": 4, "Ultrasound scan": 4, "Asthma": 3, "Auscultation": 3, "Blood potassium": 3, "Blood pressure systolic increased": 3, "C-reactive protein": 3, "Cardiac failure": 3, "Cerebral haemorrhage": 3, "Computerised tomogram thorax": 3, "Diarrhoea": 3, "Echocardiogram": 3, "Epilepsy": 3, "Face oedema": 3, "Hemiplegia": 3, "Musculoskeletal stiffness": 3, "Neuropathy peripheral": 3, "Thrombosis": 3, "Tremor": 3, "Visual impairment": 3, "Wheezing": 3, "X-ray": 3, "Alanine aminotransferase": 2, "Angina pectoris": 2, "Angioedema": 2, "Aphasia": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Back pain": 2, "Basal ganglia haemorrhage": 2, "Blood glucose": 2, "Blood pressure diastolic decreased": 2, "Blood pressure diastolic increased": 2, "Blood sodium": 2, "C-reactive protein increased": 2, "Cardiac failure acute": 2, "Coma scale": 2, "Condition aggravated": 2, "Dehydration": 2, "Disease recurrence": 2, "Dysarthria": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "Fibrin D dimer increased": 2, "Gait disturbance": 2, "Gaze palsy": 2, "Glycosylated haemoglobin": 2, "Hemianopia homonymous": 2, "Hemiparesis": 2, "Hepatic function abnormal": 2, "Hyperhidrosis": 2, "Hypoaesthesia oral": 2, "Laryngeal discomfort": 2, "Laryngeal oedema": 2, "Limb discomfort": 2, "Mobility decreased": 2, "Muscle rigidity": 2, "Muscle spasms": 2, "Myalgia": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Neutrophil count": 2, "Paraesthesia": 2, "Physical examination": 2, "Pneumonia": 2, "Product administered at inappropriate site": 2, "Pulmonary embolism": 2, "Renal failure": 2, "Respiratory failure": 2, "Respiratory rate": 2, "Rhabdomyolysis": 2, "Stress": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Tetany": 2, "Throat tightness": 2, "Tumour marker test": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Visual acuity reduced": 2, "Visual field tests": 2, "Vital signs measurement": 2, "White blood cell count decreased": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute hepatic failure": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Amnesia": 1, "Angiogram": 1, "Anxiety": 1, "Aortic dissection": 1, "Arthritis": 1, "Arthrogram": 1, "Arthropathy": 1, "Aspiration joint": 1, "Atrial fibrillation": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Basophil count": 1, "Binocular eye movement disorder": 1, "Biopsy heart": 1, "Biopsy soft tissue": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cadmium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "Blood pressure systolic": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body mass index": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Bursitis": 1, "COVID-19": 1, "CSF cell count": 1, "Carbohydrate antigen 19-9": 1, "Carbohydrate antigen 19-9 increased": 1, "Cardiac disorder": 1, "Cardiac failure chronic": 1, "Cardiothoracic ratio": 1, "Cellulitis": 1, "Cerebellar infarction": 1, "Cervical radiculopathy": 1, "Chest pain": 1, "Clostridium test": 1, "Collagen disorder": 1, "Communication disorder": 1, "Contrast media reaction": 1, "Contusion": 1, "Conversion disorder": 1, "Coronavirus test": 1, "Crush injury": 1, "Decreased activity": 1, "Deep vein thrombosis": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Dissociative disorder": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphoria": 1, "Dysstasia": 1, "Eating disorder": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram normal": 1, "Embolic stroke": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Exostosis": 1, "Eyelid oedema": 1, "Facial paralysis": 1, "Facial spasm": 1, "Feeling cold": 1, "Flushing": 1, "Gamma-glutamyltransferase": 1, "Gastric pH decreased": 1, "General symptom": 1, "Glossoptosis": 1, "Glycosylated haemoglobin increased": 1, "Haematemesis": 1, "Haematocrit": 1, "Haematology test": 1, "Haemodynamic instability": 1, "Haemoglobin": 1, "Haemophagocytic lymphohistiocytosis": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Heart rate decreased": 1, "Hemianopia": 1, "Hepatic failure": 1, "Hepatorenal syndrome": 1, "Herpes simplex": 1, "Herpes zoster": 1, "Hypercapnia": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hypernatraemia": 1, "Hypersensitivity": 1, "Hypersensitivity pneumonitis": 1, "Hypertonia": 1, "Hypokalaemia": 1, "Hypophagia": 1, "Imaging procedure": 1, "Immobilisation syndrome": 1, "Immunology test": 1, "Incontinence": 1, "Induration": 1, "Inflammation": 1, "Infrequent bowel movements": 1, "Injected limb mobility decreased": 1, "Internal haemorrhage": 1, "Intervertebral disc space narrowing": 1, "Joint instability": 1, "Joint swelling": 1, "Lip disorder": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte stimulation test": 1, "Magnetic resonance cholangiopancreatography": 1, "Magnetic resonance imaging neck": 1, "Monocyte count": 1, "Monoplegia": 1, "Muscle tightness": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Myoclonus": 1, "Neck pain": 1, "Neutrophil count decreased": 1, "Neutrophil percentage": 1, "Neutrophil percentage decreased": 1, "Nyctalgia": 1, "Oedema": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Oral discharge": 1, "Paraesthesia oral": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Peritonitis": 1, "Pharyngeal swelling": 1, "Piloerection": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Protein total": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary congestion": 1, "Pulmonary hypertension": 1, "Radiculopathy": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Renal impairment": 1, "Retinal artery occlusion": 1, "Ruptured cerebral aneurysm": 1, "Scan": 1, "Sensory disturbance": 1, "Somatic symptom disorder": 1, "Somnolence": 1, "Stenocephaly": 1, "Stridor": 1, "Swelling": 1, "Swelling of eyelid": 1, "Synovial fluid analysis": 1, "Tachycardia": 1, "Transient ischaemic attack": 1, "Trismus": 1, "Troponin T": 1, "Troponin T increased": 1, "Tumour marker increased": 1, "Urethritis": 1, "Urinary occult blood": 1, "Venous thrombosis limb": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Vogt-Koyanagi-Harada disease": 1, "White blood cell count increased": 1, "Yawning": 1}, "batchcodes": ["EY0573"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY0583.json b/docs/data/histograms/Japan/EY0583.json
index d425b02d9c7..5ec1b791249 100644
--- a/docs/data/histograms/Japan/EY0583.json
+++ b/docs/data/histograms/Japan/EY0583.json
@@ -1 +1 @@
-{"batchcode": "EY0583", "histograms": [{"batchcodes": ["EY0583"], "histogram": {"Body temperature": 74, "Blood pressure measurement": 31, "Heart rate": 20, "Oxygen saturation": 20, "Pyrexia": 16, "Anaphylactic reaction": 14, "Dyspnoea": 13, "Cough": 11, "Headache": 11, "Malaise": 10, "Presyncope": 10, "Blood pressure decreased": 9, "Blood pressure increased": 9, "Erythema": 9, "Oropharyngeal discomfort": 9, "Urticaria": 9, "Hypoaesthesia": 8, "Rash": 8, "Feeling abnormal": 6, "Pruritus": 6, "Dizziness": 5, "Nausea": 5, "Blood test": 4, "Death": 4, "Neuropathy peripheral": 4, "Arthritis": 3, "Asthma": 3, "Cold sweat": 3, "Computerised tomogram": 3, "Computerised tomogram head": 3, "Dysphonia": 3, "Electrocardiogram": 3, "Facial paralysis": 3, "Fall": 3, "Feeling hot": 3, "Inflammation": 3, "Loss of consciousness": 3, "Oxygen saturation decreased": 3, "Pain in extremity": 3, "Pallor": 3, "Palpitations": 3, "Platelet count": 3, "Respiratory disorder": 3, "Respiratory rate": 3, "Seizure": 3, "Syncope": 3, "Vomiting": 3, "White blood cell count": 3, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Antibody test": 2, "Arthralgia": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Auscultation": 2, "Blood pressure fluctuation": 2, "Bradycardia": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Coma scale": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Epilepsy": 2, "Haemoglobin": 2, "Haemorrhage subcutaneous": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hemiparesis": 2, "Hemiplegia": 2, "Hypersensitivity": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Oedema peripheral": 2, "Red blood cell count": 2, "Respiratory arrest": 2, "SARS-CoV-2 test": 2, "Synovitis": 2, "Throat irritation": 2, "Ultrasound scan": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vertigo": 2, "Viral infection": 2, "Vital signs measurement": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Activated partial thromboplastin time": 1, "Allergy to vaccine": 1, "Allodynia": 1, "Alopecia": 1, "Alopecia areata": 1, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Antinuclear antibody": 1, "Antinuclear antibody increased": 1, "Antiphospholipid antibodies": 1, "Antiphospholipid antibodies positive": 1, "Anxiety": 1, "Aortic dissection": 1, "Arrhythmia": 1, "Arthritis reactive": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Autopsy": 1, "Bacterial infection": 1, "Bacterial test": 1, "Basilar artery occlusion": 1, "Bell's palsy": 1, "Biopsy liver": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood fibrinogen": 1, "Blood pressure diastolic decreased": 1, "Breast scan": 1, "C-reactive protein": 1, "CSF cell count abnormal": 1, "Capillary leak syndrome": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Chills": 1, "Coagulation test": 1, "Collagen disorder": 1, "Complement factor": 1, "Complement factor increased": 1, "Completed suicide": 1, "Complex regional pain syndrome": 1, "Conjunctival hyperaemia": 1, "Culture": 1, "Deep vein thrombosis": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Diplopia": 1, "Disease recurrence": 1, "Drooling": 1, "Dry skin": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysstasia": 1, "Eye disorder": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait disturbance": 1, "Gastrointestinal haemorrhage": 1, "Glycosylated haemoglobin": 1, "Haematemesis": 1, "Haematocrit": 1, "Hallucination, visual": 1, "Heart rate increased": 1, "Heat illness": 1, "Herpes simplex": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Imaging procedure": 1, "Immune thrombocytopenia": 1, "Inflammatory marker test": 1, "Injected limb mobility decreased": 1, "Injury": 1, "Internal haemorrhage": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Leukoderma": 1, "Liver disorder": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Meningitis aseptic": 1, "Mental impairment": 1, "Multiple organ dysfunction syndrome": 1, "Multiple sclerosis": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Nervousness": 1, "Obstructive airways disorder": 1, "Pain": 1, "Palmoplantar pustulosis": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polyarthritis": 1, "Post-acute COVID-19 syndrome": 1, "Posture abnormal": 1, "Procalcitonin": 1, "Pulse abnormal": 1, "Putamen haemorrhage": 1, "Radial pulse": 1, "Radial pulse abnormal": 1, "Radial pulse decreased": 1, "Respiratory symptom": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Sensory disturbance": 1, "Shock": 1, "Speech disorder": 1, "Spinal osteoarthritis": 1, "Spondylitis": 1, "Stridor": 1, "Subarachnoid haemorrhage": 1, "Subcutaneous abscess": 1, "Subdural haematoma": 1, "Sudden death": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Thalamus haemorrhage": 1, "Thrombocytopenia": 1, "Tinel's sign": 1, "Tinnitus": 1, "Ulnar nerve palsy": 1, "Urinary incontinence": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Varicella zoster virus infection": 1, "Ventricular arrhythmia": 1, "Visual acuity reduced": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0583", "histograms": [{"histogram": {"Body temperature": 74, "Blood pressure measurement": 31, "Heart rate": 20, "Oxygen saturation": 20, "Pyrexia": 16, "Anaphylactic reaction": 14, "Dyspnoea": 13, "Cough": 11, "Headache": 11, "Malaise": 10, "Presyncope": 10, "Blood pressure decreased": 9, "Blood pressure increased": 9, "Erythema": 9, "Oropharyngeal discomfort": 9, "Urticaria": 9, "Hypoaesthesia": 8, "Rash": 8, "Feeling abnormal": 6, "Pruritus": 6, "Dizziness": 5, "Nausea": 5, "Blood test": 4, "Death": 4, "Neuropathy peripheral": 4, "Arthritis": 3, "Asthma": 3, "Cold sweat": 3, "Computerised tomogram": 3, "Computerised tomogram head": 3, "Dysphonia": 3, "Electrocardiogram": 3, "Facial paralysis": 3, "Fall": 3, "Feeling hot": 3, "Inflammation": 3, "Loss of consciousness": 3, "Oxygen saturation decreased": 3, "Pain in extremity": 3, "Pallor": 3, "Palpitations": 3, "Platelet count": 3, "Respiratory disorder": 3, "Respiratory rate": 3, "Seizure": 3, "Syncope": 3, "Vomiting": 3, "White blood cell count": 3, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Antibody test": 2, "Arthralgia": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Auscultation": 2, "Blood pressure fluctuation": 2, "Bradycardia": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Coma scale": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Epilepsy": 2, "Haemoglobin": 2, "Haemorrhage subcutaneous": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hemiparesis": 2, "Hemiplegia": 2, "Hypersensitivity": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Oedema peripheral": 2, "Red blood cell count": 2, "Respiratory arrest": 2, "SARS-CoV-2 test": 2, "Synovitis": 2, "Throat irritation": 2, "Ultrasound scan": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vertigo": 2, "Viral infection": 2, "Vital signs measurement": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Activated partial thromboplastin time": 1, "Allergy to vaccine": 1, "Allodynia": 1, "Alopecia": 1, "Alopecia areata": 1, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Antinuclear antibody": 1, "Antinuclear antibody increased": 1, "Antiphospholipid antibodies": 1, "Antiphospholipid antibodies positive": 1, "Anxiety": 1, "Aortic dissection": 1, "Arrhythmia": 1, "Arthritis reactive": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Autopsy": 1, "Bacterial infection": 1, "Bacterial test": 1, "Basilar artery occlusion": 1, "Bell's palsy": 1, "Biopsy liver": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood fibrinogen": 1, "Blood pressure diastolic decreased": 1, "Breast scan": 1, "C-reactive protein": 1, "CSF cell count abnormal": 1, "Capillary leak syndrome": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Chills": 1, "Coagulation test": 1, "Collagen disorder": 1, "Complement factor": 1, "Complement factor increased": 1, "Completed suicide": 1, "Complex regional pain syndrome": 1, "Conjunctival hyperaemia": 1, "Culture": 1, "Deep vein thrombosis": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Diplopia": 1, "Disease recurrence": 1, "Drooling": 1, "Dry skin": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysstasia": 1, "Eye disorder": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait disturbance": 1, "Gastrointestinal haemorrhage": 1, "Glycosylated haemoglobin": 1, "Haematemesis": 1, "Haematocrit": 1, "Hallucination, visual": 1, "Heart rate increased": 1, "Heat illness": 1, "Herpes simplex": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Imaging procedure": 1, "Immune thrombocytopenia": 1, "Inflammatory marker test": 1, "Injected limb mobility decreased": 1, "Injury": 1, "Internal haemorrhage": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Leukoderma": 1, "Liver disorder": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Meningitis aseptic": 1, "Mental impairment": 1, "Multiple organ dysfunction syndrome": 1, "Multiple sclerosis": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Nervousness": 1, "Obstructive airways disorder": 1, "Pain": 1, "Palmoplantar pustulosis": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polyarthritis": 1, "Post-acute COVID-19 syndrome": 1, "Posture abnormal": 1, "Procalcitonin": 1, "Pulse abnormal": 1, "Putamen haemorrhage": 1, "Radial pulse": 1, "Radial pulse abnormal": 1, "Radial pulse decreased": 1, "Respiratory symptom": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Sensory disturbance": 1, "Shock": 1, "Speech disorder": 1, "Spinal osteoarthritis": 1, "Spondylitis": 1, "Stridor": 1, "Subarachnoid haemorrhage": 1, "Subcutaneous abscess": 1, "Subdural haematoma": 1, "Sudden death": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Thalamus haemorrhage": 1, "Thrombocytopenia": 1, "Tinel's sign": 1, "Tinnitus": 1, "Ulnar nerve palsy": 1, "Urinary incontinence": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Varicella zoster virus infection": 1, "Ventricular arrhythmia": 1, "Visual acuity reduced": 1, "White blood cell count decreased": 1}, "batchcodes": ["EY0583"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY0779.json b/docs/data/histograms/Japan/EY0779.json
index 1d6cbea37b7..4cbdf4f1b8d 100644
--- a/docs/data/histograms/Japan/EY0779.json
+++ b/docs/data/histograms/Japan/EY0779.json
@@ -1 +1 @@
-{"batchcode": "EY0779", "histograms": [{"batchcodes": ["EY0779"], "histogram": {"Body temperature": 272, "Blood pressure measurement": 123, "Oxygen saturation": 97, "Heart rate": 86, "Pyrexia": 72, "Blood pressure increased": 62, "Anaphylactic reaction": 60, "Headache": 43, "Dyspnoea": 42, "Nausea": 39, "Malaise": 35, "Pruritus": 31, "Feeling abnormal": 29, "Vomiting": 28, "Dizziness": 27, "Erythema": 27, "Cerebral infarction": 25, "Hypoaesthesia": 24, "Presyncope": 24, "Rash": 24, "Cough": 22, "Palpitations": 22, "Blood test": 20, "Urticaria": 19, "Depressed level of consciousness": 17, "Muscular weakness": 17, "Pain": 17, "Arthralgia": 16, "Cold sweat": 16, "Investigation": 16, "Loss of consciousness": 15, "Pallor": 15, "White blood cell count": 13, "Asthma": 12, "Blood pressure decreased": 12, "Chest discomfort": 12, "Hypertension": 12, "Magnetic resonance imaging head": 12, "Myalgia": 12, "Oropharyngeal discomfort": 12, "C-reactive protein": 11, "Electrocardiogram": 11, "Feeling cold": 11, "Magnetic resonance imaging": 11, "SARS-CoV-2 test": 11, "Alanine aminotransferase": 10, "Aspartate aminotransferase": 10, "Computerised tomogram": 10, "Computerised tomogram head": 10, "Decreased appetite": 10, "Gait disturbance": 10, "Gamma-glutamyltransferase": 10, "Platelet count": 10, "Tachycardia": 10, "Abdominal pain": 9, "Diarrhoea": 9, "Fatigue": 9, "Feeling hot": 9, "Hyperhidrosis": 9, "Oxygen saturation decreased": 9, "Altered state of consciousness": 8, "Blood creatinine": 8, "Fibrin D dimer": 8, "Asthenia": 7, "Blood lactate dehydrogenase": 7, "Chest X-ray": 7, "Chills": 7, "Dysstasia": 7, "Fall": 7, "Guillain-Barre syndrome": 7, "Haematocrit": 7, "Haemoglobin": 7, "Heart rate decreased": 7, "Heart rate increased": 7, "Neuropathy peripheral": 7, "PO2": 7, "Red blood cell count": 7, "Syncope": 7, "Throat tightness": 7, "Vaccination site pain": 7, "Amylase": 6, "Blood creatine phosphokinase": 6, "Blood glucose": 6, "Cardio-respiratory arrest": 6, "Chest pain": 6, "Computerised tomogram thorax": 6, "Dysphoria": 6, "Glomerular filtration rate": 6, "Mean cell haemoglobin": 6, "Mean cell haemoglobin concentration": 6, "Mean cell volume": 6, "Paraesthesia": 6, "Physical deconditioning": 6, "Platelet count decreased": 6, "Protein total": 6, "Seizure": 6, "Somnolence": 6, "Swelling": 6, "Arrhythmia": 5, "Blood chloride": 5, "Blood potassium": 5, "Blood sodium": 5, "Blood triglycerides": 5, "Blood urea": 5, "Coma scale": 5, "Death": 5, "Flushing": 5, "Hemiplegia": 5, "Hepatic function abnormal": 5, "High density lipoprotein": 5, "Hot flush": 5, "Hypersensitivity": 5, "Insomnia": 5, "Laboratory test": 5, "Low density lipoprotein": 5, "Movement disorder": 5, "Pneumonia": 5, "Subarachnoid haemorrhage": 5, "Tremor": 5, "Anaphylactic shock": 4, "Anxiety": 4, "Atrial fibrillation": 4, "Blood albumin": 4, "Blood alkaline phosphatase": 4, "Blood pressure systolic increased": 4, "Blood uric acid": 4, "Condition aggravated": 4, "Dysphagia": 4, "Eczema": 4, "Eyelid oedema": 4, "Hyperventilation": 4, "Lymphocyte count": 4, "Neutrophil count": 4, "Pneumonia aspiration": 4, "Respiratory arrest": 4, "Sensory disturbance": 4, "Swelling of eyelid": 4, "Throat irritation": 4, "Urinary tract infection": 4, "Vaccination site erythema": 4, "Abdominal pain lower": 3, "Angioedema": 3, "Aphasia": 3, "Arthritis": 3, "Asphyxia": 3, "Back pain": 3, "Blood bilirubin": 3, "Blood calcium": 3, "Blood cholesterol": 3, "Blood iron": 3, "Blood pressure systolic": 3, "Bradycardia": 3, "C-reactive protein increased": 3, "Cardiac failure acute": 3, "Cerebral haemorrhage": 3, "Deep vein thrombosis": 3, "Dehydration": 3, "Diplopia": 3, "Disease recurrence": 3, "Drug eruption": 3, "Dyslalia": 3, "Erythema multiforme": 3, "Facial paralysis": 3, "Gait inability": 3, "General physical health deterioration": 3, "Glucose urine": 3, "Glycosylated haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Head discomfort": 3, "Interstitial lung disease": 3, "Limb discomfort": 3, "Lip oedema": 3, "Magnetic resonance imaging spinal": 3, "Mobility decreased": 3, "Myocarditis": 3, "N-terminal prohormone brain natriuretic peptide": 3, "Nasal congestion": 3, "Oral discomfort": 3, "Oropharyngeal pain": 3, "Pain in extremity": 3, "Paralysis": 3, "Paresis": 3, "Peripheral coldness": 3, "Purpura": 3, "Respiratory failure": 3, "Respiratory rate": 3, "Restlessness": 3, "Serum ferritin": 3, "Specific gravity urine": 3, "Ultrasound scan": 3, "Urine analysis": 3, "Urobilinogen urine": 3, "Vaccination site swelling": 3, "Visual acuity reduced": 3, "Wheezing": 3, "Abdominal pain upper": 2, "Activated partial thromboplastin time": 2, "Acute respiratory failure": 2, "Alanine aminotransferase increased": 2, "Albumin globulin ratio": 2, "Allergy to vaccine": 2, "Anaemia": 2, "Antinuclear antibody": 2, "Arteriogram": 2, "Aspartate aminotransferase increased": 2, "Basophil count": 2, "Bilirubin urine": 2, "Blood glucose increased": 2, "Blood phosphorus": 2, "COVID-19": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiac arrest": 2, "Cerebellar infarction": 2, "Cerebral artery occlusion": 2, "Computerised tomogram abdomen": 2, "Conjunctival hyperaemia": 2, "Coronary artery occlusion": 2, "Diabetes mellitus": 2, "Discomfort": 2, "Disease progression": 2, "Dyskinesia": 2, "Dysphonia": 2, "Dyspraxia": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Endocarditis": 2, "Epigastric discomfort": 2, "Feeding disorder": 2, "Fibrin D dimer increased": 2, "Gamma-glutamyltransferase increased": 2, "Gaze palsy": 2, "Granulocyte count": 2, "Haematochezia": 2, "Hepatitis B surface antigen": 2, "Hepatitis C antibody": 2, "IIIrd nerve paralysis": 2, "Injury": 2, "Iritis": 2, "Lacunar infarction": 2, "Laryngeal discomfort": 2, "Laryngeal obstruction": 2, "Lumbar puncture": 2, "Lymphadenopathy": 2, "Lymphocyte count decreased": 2, "Lymphocyte percentage": 2, "Monocyte count": 2, "Monocyte percentage": 2, "Muscle spasms": 2, "Nasopharyngitis": 2, "Neurological examination": 2, "Nitrite urine": 2, "Oedema peripheral": 2, "Ophthalmological examination": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Physical examination": 2, "Pleural effusion": 2, "Productive cough": 2, "Protein urine": 2, "Pulmonary embolism": 2, "Renal infarct": 2, "Respiratory disorder": 2, "Skin exfoliation": 2, "Somatic symptom disorder": 2, "Splenic infarction": 2, "Tachypnoea": 2, "Tension": 2, "Thrombosis": 2, "Total cholesterol/HDL ratio": 2, "Toxic skin eruption": 2, "Urine ketone body": 2, "Vaccination site hypoaesthesia": 2, "Vasculitis": 2, "Venous thrombosis limb": 2, "Visual impairment": 2, "Vital signs measurement": 2, "White blood cell count increased": 2, "pH urine": 2, "AST/ALT ratio": 1, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal symptom": 1, "Abdominal tenderness": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Adrenal insufficiency": 1, "Allergy test": 1, "Amnesia": 1, "Amylase increased": 1, "Anaphylactoid reaction": 1, "Aneurysm ruptured": 1, "Angina pectoris": 1, "Angina unstable": 1, "Angiocardiogram": 1, "Anisocytosis": 1, "Anorectal disorder": 1, "Antibody test": 1, "Aortic rupture": 1, "Apolipoprotein": 1, "Apraxia": 1, "Arterial occlusive disease": 1, "Arterial stenosis": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase normal": 1, "Atelectasis": 1, "Atonic seizures": 1, "Atrioventricular block complete": 1, "Atrioventricular block second degree": 1, "Auscultation": 1, "Autoantibody test": 1, "Bacteraemia": 1, "Bacterial test": 1, "Basedow's disease": 1, "Basophil percentage": 1, "Biopsy skin": 1, "Bladder disorder": 1, "Blood alkaline phosphatase decreased": 1, "Blood cholesterol increased": 1, "Blood cholinesterase": 1, "Blood corticotrophin": 1, "Blood cortisol": 1, "Blood creatinine increased": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood gases": 1, "Blood gases abnormal": 1, "Blood lead": 1, "Blood magnesium": 1, "Blood pressure immeasurable": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Body height": 1, "Bradykinesia": 1, "Bradyphrenia": 1, "Brain natriuretic peptide": 1, "Brain neoplasm": 1, "Brain stem infarction": 1, "Breast cancer": 1, "Bronchoalveolar lavage": 1, "Bronchospasm": 1, "COVID-19 pneumonia": 1, "CSF cell count abnormal": 1, "CSF white blood cell count": 1, "CSF white blood cell count positive": 1, "Carcinoembryonic antigen": 1, "Cardiac ablation": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiac monitoring": 1, "Cardiac ventricular thrombosis": 1, "Cardiogenic shock": 1, "Cardiovascular evaluation": 1, "Carotid artery aneurysm": 1, "Cataract": 1, "Cells in urine": 1, "Cellulitis": 1, "Cerebral small vessel ischaemic disease": 1, "Cerebral venous thrombosis": 1, "Chest scan": 1, "Choking": 1, "Coagulation factor": 1, "Coagulation time": 1, "Colitis ischaemic": 1, "Coma scale abnormal": 1, "Communication disorder": 1, "Computerised tomogram coronary artery": 1, "Conversion disorder": 1, "Convulsions local": 1, "Corneal disorder": 1, "Coxsackie virus test positive": 1, "Culture": 1, "Culture urine": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Deafness unilateral": 1, "Defaecation urgency": 1, "Delusion": 1, "Dementia": 1, "Dementia Alzheimer's type": 1, "Dermatitis exfoliative generalised": 1, "Diabetic retinopathy": 1, "Diagnostic procedure": 1, "Diplegia": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drooling": 1, "Drowning": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dry throat": 1, "Dysarthria": 1, "Dysgeusia": 1, "Eating disorder": 1, "Ecchymosis": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "Endoscopy gastrointestinal": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Epidermolysis bullosa": 1, "Epistaxis": 1, "Escherichia urinary tract infection": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Faeces hard": 1, "Faeces soft": 1, "Fat tissue increased": 1, "Fibrin D dimer decreased": 1, "Fungal test": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "Gastrointestinal haemorrhage": 1, "Gastrointestinal sounds abnormal": 1, "Gastrostomy": 1, "Generalised oedema": 1, "Gram stain": 1, "Grip strength decreased": 1, "Haematology test": 1, "Haemorrhagic infarction": 1, "Hallucination, visual": 1, "Head injury": 1, "Hemianopia": 1, "Hemianopia homonymous": 1, "Hemiparesis": 1, "Henoch-Schonlein purpura": 1, "Hepatitis B antigen": 1, "Hyperpyrexia": 1, "Hyperreflexia": 1, "Hypertensive encephalopathy": 1, "Hyperthyroidism": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypochromasia": 1, "Hypoglycaemia": 1, "Hypotension": 1, "Imaging procedure": 1, "Impaired work ability": 1, "Inadequate diet": 1, "Inappropriate schedule of product administration": 1, "Infectious pleural effusion": 1, "Inflammation": 1, "Influenza virus test": 1, "Insulin C-peptide": 1, "International normalised ratio": 1, "Intestinal obstruction": 1, "Intracardiac mass": 1, "Intraocular pressure increased": 1, "Intraocular pressure test": 1, "Intraventricular haemorrhage": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Joint range of motion decreased": 1, "Lack of spontaneous speech": 1, "Lacrimation increased": 1, "Laryngeal oedema": 1, "Larynx irritation": 1, "Limbic encephalitis": 1, "Lip swelling": 1, "Listless": 1, "Liver disorder": 1, "Low density lipoprotein increased": 1, "Lymphatic fistula": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage decreased": 1, "Macular oedema": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Mean cell volume abnormal": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Multisystem inflammatory syndrome": 1, "Muscle swelling": 1, "Musculoskeletal disorder": 1, "Mutism": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Nasal obstruction": 1, "Neck pain": 1, "Neoplasm progression": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Neutrophil percentage increased": 1, "Neutrophil/lymphocyte ratio": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Off label use": 1, "Optic neuritis": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "Oral mucosal erythema": 1, "Oral pruritus": 1, "Osteoarthritis": 1, "PO2 decreased": 1, "Panic disorder": 1, "Panic reaction": 1, "Papule": 1, "Parkinsonism": 1, "Pericardial fibrosis": 1, "Periorbital pain": 1, "Peripheral swelling": 1, "Peritonitis": 1, "Pharyngitis": 1, "Photopsia": 1, "Pneumonia bacterial": 1, "Polychromasia": 1, "Polymenorrhoea": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Polyuria": 1, "Poor peripheral circulation": 1, "Premature labour": 1, "Product administered at inappropriate site": 1, "Prostatic specific antigen": 1, "Protein S": 1, "Protein total decreased": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulmonary artery occlusion": 1, "Pulmonary hypertension": 1, "Pulse abnormal": 1, "Pupillary light reflex tests abnormal": 1, "Quadriplegia": 1, "Rash erythematous": 1, "Rash papular": 1, "Renal impairment": 1, "Respiratory distress": 1, "Reticulocyte count": 1, "Retinal artery occlusion": 1, "Retinal haemorrhage": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinitis allergic": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test": 1, "Satoyoshi syndrome": 1, "Scar": 1, "Sensation of foreign body": 1, "Sense of oppression": 1, "Sensory processing disorder": 1, "Serology test": 1, "Shock": 1, "Sialoadenitis": 1, "Skin discolouration": 1, "Skin oedema": 1, "Slow speech": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Spinal deformity": 1, "Spinal stenosis": 1, "Spirometry": 1, "Staphylococcal infection": 1, "Stress cardiomyopathy": 1, "Stress fracture": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Swelling face": 1, "Symptom recurrence": 1, "Tachycardia paroxysmal": 1, "Thalamic infarction": 1, "Thinking abnormal": 1, "Thirst": 1, "Thrombocytopenic purpura": 1, "Thrombotic cerebral infarction": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroxine free": 1, "Troponin I": 1, "Troponin I increased": 1, "Tympanic membrane disorder": 1, "Ultrasound abdomen": 1, "Urinary casts": 1, "Urinary incontinence": 1, "Urinary occult blood": 1, "Urinary retention": 1, "Urinary sediment present": 1, "Urinary tract infection bacterial": 1, "Urinary tract infection enterococcal": 1, "Urinary tract infection fungal": 1, "Urine abnormality": 1, "Urine output": 1, "Urine uric acid": 1, "Vaccination failure": 1, "Vaccination site induration": 1, "Vaccination site urticaria": 1, "Vascular purpura": 1, "Ventricular extrasystoles": 1, "Ventricular hypokinesia": 1, "Viral test positive": 1, "Visual acuity tests": 1, "Vitamin B12": 1, "Vitreous floaters": 1, "Vitreous haemorrhage": 1, "Weight": 1, "Weight decreased": 1, "Weight increased": 1, "X-ray": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0779", "histograms": [{"histogram": {"Body temperature": 272, "Blood pressure measurement": 123, "Oxygen saturation": 97, "Heart rate": 86, "Pyrexia": 72, "Blood pressure increased": 62, "Anaphylactic reaction": 60, "Headache": 43, "Dyspnoea": 42, "Nausea": 39, "Malaise": 35, "Pruritus": 31, "Feeling abnormal": 29, "Vomiting": 28, "Dizziness": 27, "Erythema": 27, "Cerebral infarction": 25, "Hypoaesthesia": 24, "Presyncope": 24, "Rash": 24, "Cough": 22, "Palpitations": 22, "Blood test": 20, "Urticaria": 19, "Depressed level of consciousness": 17, "Muscular weakness": 17, "Pain": 17, "Arthralgia": 16, "Cold sweat": 16, "Investigation": 16, "Loss of consciousness": 15, "Pallor": 15, "White blood cell count": 13, "Asthma": 12, "Blood pressure decreased": 12, "Chest discomfort": 12, "Hypertension": 12, "Magnetic resonance imaging head": 12, "Myalgia": 12, "Oropharyngeal discomfort": 12, "C-reactive protein": 11, "Electrocardiogram": 11, "Feeling cold": 11, "Magnetic resonance imaging": 11, "SARS-CoV-2 test": 11, "Alanine aminotransferase": 10, "Aspartate aminotransferase": 10, "Computerised tomogram": 10, "Computerised tomogram head": 10, "Decreased appetite": 10, "Gait disturbance": 10, "Gamma-glutamyltransferase": 10, "Platelet count": 10, "Tachycardia": 10, "Abdominal pain": 9, "Diarrhoea": 9, "Fatigue": 9, "Feeling hot": 9, "Hyperhidrosis": 9, "Oxygen saturation decreased": 9, "Altered state of consciousness": 8, "Blood creatinine": 8, "Fibrin D dimer": 8, "Asthenia": 7, "Blood lactate dehydrogenase": 7, "Chest X-ray": 7, "Chills": 7, "Dysstasia": 7, "Fall": 7, "Guillain-Barre syndrome": 7, "Haematocrit": 7, "Haemoglobin": 7, "Heart rate decreased": 7, "Heart rate increased": 7, "Neuropathy peripheral": 7, "PO2": 7, "Red blood cell count": 7, "Syncope": 7, "Throat tightness": 7, "Vaccination site pain": 7, "Amylase": 6, "Blood creatine phosphokinase": 6, "Blood glucose": 6, "Cardio-respiratory arrest": 6, "Chest pain": 6, "Computerised tomogram thorax": 6, "Dysphoria": 6, "Glomerular filtration rate": 6, "Mean cell haemoglobin": 6, "Mean cell haemoglobin concentration": 6, "Mean cell volume": 6, "Paraesthesia": 6, "Physical deconditioning": 6, "Platelet count decreased": 6, "Protein total": 6, "Seizure": 6, "Somnolence": 6, "Swelling": 6, "Arrhythmia": 5, "Blood chloride": 5, "Blood potassium": 5, "Blood sodium": 5, "Blood triglycerides": 5, "Blood urea": 5, "Coma scale": 5, "Death": 5, "Flushing": 5, "Hemiplegia": 5, "Hepatic function abnormal": 5, "High density lipoprotein": 5, "Hot flush": 5, "Hypersensitivity": 5, "Insomnia": 5, "Laboratory test": 5, "Low density lipoprotein": 5, "Movement disorder": 5, "Pneumonia": 5, "Subarachnoid haemorrhage": 5, "Tremor": 5, "Anaphylactic shock": 4, "Anxiety": 4, "Atrial fibrillation": 4, "Blood albumin": 4, "Blood alkaline phosphatase": 4, "Blood pressure systolic increased": 4, "Blood uric acid": 4, "Condition aggravated": 4, "Dysphagia": 4, "Eczema": 4, "Eyelid oedema": 4, "Hyperventilation": 4, "Lymphocyte count": 4, "Neutrophil count": 4, "Pneumonia aspiration": 4, "Respiratory arrest": 4, "Sensory disturbance": 4, "Swelling of eyelid": 4, "Throat irritation": 4, "Urinary tract infection": 4, "Vaccination site erythema": 4, "Abdominal pain lower": 3, "Angioedema": 3, "Aphasia": 3, "Arthritis": 3, "Asphyxia": 3, "Back pain": 3, "Blood bilirubin": 3, "Blood calcium": 3, "Blood cholesterol": 3, "Blood iron": 3, "Blood pressure systolic": 3, "Bradycardia": 3, "C-reactive protein increased": 3, "Cardiac failure acute": 3, "Cerebral haemorrhage": 3, "Deep vein thrombosis": 3, "Dehydration": 3, "Diplopia": 3, "Disease recurrence": 3, "Drug eruption": 3, "Dyslalia": 3, "Erythema multiforme": 3, "Facial paralysis": 3, "Gait inability": 3, "General physical health deterioration": 3, "Glucose urine": 3, "Glycosylated haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Head discomfort": 3, "Interstitial lung disease": 3, "Limb discomfort": 3, "Lip oedema": 3, "Magnetic resonance imaging spinal": 3, "Mobility decreased": 3, "Myocarditis": 3, "N-terminal prohormone brain natriuretic peptide": 3, "Nasal congestion": 3, "Oral discomfort": 3, "Oropharyngeal pain": 3, "Pain in extremity": 3, "Paralysis": 3, "Paresis": 3, "Peripheral coldness": 3, "Purpura": 3, "Respiratory failure": 3, "Respiratory rate": 3, "Restlessness": 3, "Serum ferritin": 3, "Specific gravity urine": 3, "Ultrasound scan": 3, "Urine analysis": 3, "Urobilinogen urine": 3, "Vaccination site swelling": 3, "Visual acuity reduced": 3, "Wheezing": 3, "Abdominal pain upper": 2, "Activated partial thromboplastin time": 2, "Acute respiratory failure": 2, "Alanine aminotransferase increased": 2, "Albumin globulin ratio": 2, "Allergy to vaccine": 2, "Anaemia": 2, "Antinuclear antibody": 2, "Arteriogram": 2, "Aspartate aminotransferase increased": 2, "Basophil count": 2, "Bilirubin urine": 2, "Blood glucose increased": 2, "Blood phosphorus": 2, "COVID-19": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiac arrest": 2, "Cerebellar infarction": 2, "Cerebral artery occlusion": 2, "Computerised tomogram abdomen": 2, "Conjunctival hyperaemia": 2, "Coronary artery occlusion": 2, "Diabetes mellitus": 2, "Discomfort": 2, "Disease progression": 2, "Dyskinesia": 2, "Dysphonia": 2, "Dyspraxia": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Endocarditis": 2, "Epigastric discomfort": 2, "Feeding disorder": 2, "Fibrin D dimer increased": 2, "Gamma-glutamyltransferase increased": 2, "Gaze palsy": 2, "Granulocyte count": 2, "Haematochezia": 2, "Hepatitis B surface antigen": 2, "Hepatitis C antibody": 2, "IIIrd nerve paralysis": 2, "Injury": 2, "Iritis": 2, "Lacunar infarction": 2, "Laryngeal discomfort": 2, "Laryngeal obstruction": 2, "Lumbar puncture": 2, "Lymphadenopathy": 2, "Lymphocyte count decreased": 2, "Lymphocyte percentage": 2, "Monocyte count": 2, "Monocyte percentage": 2, "Muscle spasms": 2, "Nasopharyngitis": 2, "Neurological examination": 2, "Nitrite urine": 2, "Oedema peripheral": 2, "Ophthalmological examination": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Physical examination": 2, "Pleural effusion": 2, "Productive cough": 2, "Protein urine": 2, "Pulmonary embolism": 2, "Renal infarct": 2, "Respiratory disorder": 2, "Skin exfoliation": 2, "Somatic symptom disorder": 2, "Splenic infarction": 2, "Tachypnoea": 2, "Tension": 2, "Thrombosis": 2, "Total cholesterol/HDL ratio": 2, "Toxic skin eruption": 2, "Urine ketone body": 2, "Vaccination site hypoaesthesia": 2, "Vasculitis": 2, "Venous thrombosis limb": 2, "Visual impairment": 2, "Vital signs measurement": 2, "White blood cell count increased": 2, "pH urine": 2, "AST/ALT ratio": 1, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal symptom": 1, "Abdominal tenderness": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Adrenal insufficiency": 1, "Allergy test": 1, "Amnesia": 1, "Amylase increased": 1, "Anaphylactoid reaction": 1, "Aneurysm ruptured": 1, "Angina pectoris": 1, "Angina unstable": 1, "Angiocardiogram": 1, "Anisocytosis": 1, "Anorectal disorder": 1, "Antibody test": 1, "Aortic rupture": 1, "Apolipoprotein": 1, "Apraxia": 1, "Arterial occlusive disease": 1, "Arterial stenosis": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase normal": 1, "Atelectasis": 1, "Atonic seizures": 1, "Atrioventricular block complete": 1, "Atrioventricular block second degree": 1, "Auscultation": 1, "Autoantibody test": 1, "Bacteraemia": 1, "Bacterial test": 1, "Basedow's disease": 1, "Basophil percentage": 1, "Biopsy skin": 1, "Bladder disorder": 1, "Blood alkaline phosphatase decreased": 1, "Blood cholesterol increased": 1, "Blood cholinesterase": 1, "Blood corticotrophin": 1, "Blood cortisol": 1, "Blood creatinine increased": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood gases": 1, "Blood gases abnormal": 1, "Blood lead": 1, "Blood magnesium": 1, "Blood pressure immeasurable": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Body height": 1, "Bradykinesia": 1, "Bradyphrenia": 1, "Brain natriuretic peptide": 1, "Brain neoplasm": 1, "Brain stem infarction": 1, "Breast cancer": 1, "Bronchoalveolar lavage": 1, "Bronchospasm": 1, "COVID-19 pneumonia": 1, "CSF cell count abnormal": 1, "CSF white blood cell count": 1, "CSF white blood cell count positive": 1, "Carcinoembryonic antigen": 1, "Cardiac ablation": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiac monitoring": 1, "Cardiac ventricular thrombosis": 1, "Cardiogenic shock": 1, "Cardiovascular evaluation": 1, "Carotid artery aneurysm": 1, "Cataract": 1, "Cells in urine": 1, "Cellulitis": 1, "Cerebral small vessel ischaemic disease": 1, "Cerebral venous thrombosis": 1, "Chest scan": 1, "Choking": 1, "Coagulation factor": 1, "Coagulation time": 1, "Colitis ischaemic": 1, "Coma scale abnormal": 1, "Communication disorder": 1, "Computerised tomogram coronary artery": 1, "Conversion disorder": 1, "Convulsions local": 1, "Corneal disorder": 1, "Coxsackie virus test positive": 1, "Culture": 1, "Culture urine": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Deafness unilateral": 1, "Defaecation urgency": 1, "Delusion": 1, "Dementia": 1, "Dementia Alzheimer's type": 1, "Dermatitis exfoliative generalised": 1, "Diabetic retinopathy": 1, "Diagnostic procedure": 1, "Diplegia": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drooling": 1, "Drowning": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dry throat": 1, "Dysarthria": 1, "Dysgeusia": 1, "Eating disorder": 1, "Ecchymosis": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "Endoscopy gastrointestinal": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Epidermolysis bullosa": 1, "Epistaxis": 1, "Escherichia urinary tract infection": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Faeces hard": 1, "Faeces soft": 1, "Fat tissue increased": 1, "Fibrin D dimer decreased": 1, "Fungal test": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "Gastrointestinal haemorrhage": 1, "Gastrointestinal sounds abnormal": 1, "Gastrostomy": 1, "Generalised oedema": 1, "Gram stain": 1, "Grip strength decreased": 1, "Haematology test": 1, "Haemorrhagic infarction": 1, "Hallucination, visual": 1, "Head injury": 1, "Hemianopia": 1, "Hemianopia homonymous": 1, "Hemiparesis": 1, "Henoch-Schonlein purpura": 1, "Hepatitis B antigen": 1, "Hyperpyrexia": 1, "Hyperreflexia": 1, "Hypertensive encephalopathy": 1, "Hyperthyroidism": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypochromasia": 1, "Hypoglycaemia": 1, "Hypotension": 1, "Imaging procedure": 1, "Impaired work ability": 1, "Inadequate diet": 1, "Inappropriate schedule of product administration": 1, "Infectious pleural effusion": 1, "Inflammation": 1, "Influenza virus test": 1, "Insulin C-peptide": 1, "International normalised ratio": 1, "Intestinal obstruction": 1, "Intracardiac mass": 1, "Intraocular pressure increased": 1, "Intraocular pressure test": 1, "Intraventricular haemorrhage": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Joint range of motion decreased": 1, "Lack of spontaneous speech": 1, "Lacrimation increased": 1, "Laryngeal oedema": 1, "Larynx irritation": 1, "Limbic encephalitis": 1, "Lip swelling": 1, "Listless": 1, "Liver disorder": 1, "Low density lipoprotein increased": 1, "Lymphatic fistula": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage decreased": 1, "Macular oedema": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Mean cell volume abnormal": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Multisystem inflammatory syndrome": 1, "Muscle swelling": 1, "Musculoskeletal disorder": 1, "Mutism": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Nasal obstruction": 1, "Neck pain": 1, "Neoplasm progression": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Neutrophil percentage increased": 1, "Neutrophil/lymphocyte ratio": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Off label use": 1, "Optic neuritis": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "Oral mucosal erythema": 1, "Oral pruritus": 1, "Osteoarthritis": 1, "PO2 decreased": 1, "Panic disorder": 1, "Panic reaction": 1, "Papule": 1, "Parkinsonism": 1, "Pericardial fibrosis": 1, "Periorbital pain": 1, "Peripheral swelling": 1, "Peritonitis": 1, "Pharyngitis": 1, "Photopsia": 1, "Pneumonia bacterial": 1, "Polychromasia": 1, "Polymenorrhoea": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Polyuria": 1, "Poor peripheral circulation": 1, "Premature labour": 1, "Product administered at inappropriate site": 1, "Prostatic specific antigen": 1, "Protein S": 1, "Protein total decreased": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulmonary artery occlusion": 1, "Pulmonary hypertension": 1, "Pulse abnormal": 1, "Pupillary light reflex tests abnormal": 1, "Quadriplegia": 1, "Rash erythematous": 1, "Rash papular": 1, "Renal impairment": 1, "Respiratory distress": 1, "Reticulocyte count": 1, "Retinal artery occlusion": 1, "Retinal haemorrhage": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinitis allergic": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test": 1, "Satoyoshi syndrome": 1, "Scar": 1, "Sensation of foreign body": 1, "Sense of oppression": 1, "Sensory processing disorder": 1, "Serology test": 1, "Shock": 1, "Sialoadenitis": 1, "Skin discolouration": 1, "Skin oedema": 1, "Slow speech": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Spinal deformity": 1, "Spinal stenosis": 1, "Spirometry": 1, "Staphylococcal infection": 1, "Stress cardiomyopathy": 1, "Stress fracture": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Swelling face": 1, "Symptom recurrence": 1, "Tachycardia paroxysmal": 1, "Thalamic infarction": 1, "Thinking abnormal": 1, "Thirst": 1, "Thrombocytopenic purpura": 1, "Thrombotic cerebral infarction": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroxine free": 1, "Troponin I": 1, "Troponin I increased": 1, "Tympanic membrane disorder": 1, "Ultrasound abdomen": 1, "Urinary casts": 1, "Urinary incontinence": 1, "Urinary occult blood": 1, "Urinary retention": 1, "Urinary sediment present": 1, "Urinary tract infection bacterial": 1, "Urinary tract infection enterococcal": 1, "Urinary tract infection fungal": 1, "Urine abnormality": 1, "Urine output": 1, "Urine uric acid": 1, "Vaccination failure": 1, "Vaccination site induration": 1, "Vaccination site urticaria": 1, "Vascular purpura": 1, "Ventricular extrasystoles": 1, "Ventricular hypokinesia": 1, "Viral test positive": 1, "Visual acuity tests": 1, "Vitamin B12": 1, "Vitreous floaters": 1, "Vitreous haemorrhage": 1, "Weight": 1, "Weight decreased": 1, "Weight increased": 1, "X-ray": 1, "pH body fluid": 1}, "batchcodes": ["EY0779"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY2123.json b/docs/data/histograms/Japan/EY2123.json
index 7c3dd013ae5..8c1e435c6a3 100644
--- a/docs/data/histograms/Japan/EY2123.json
+++ b/docs/data/histograms/Japan/EY2123.json
@@ -1 +1 @@
-{"batchcode": "EY2123", "histograms": [{"batchcodes": ["EY2123"], "histogram": {"Body temperature": 1, "Diarrhoea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EY2123", "histograms": [{"histogram": {"Body temperature": 1, "Diarrhoea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["EY2123"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY2173.json b/docs/data/histograms/Japan/EY2173.json
index 1896fe59ef6..61209eff45c 100644
--- a/docs/data/histograms/Japan/EY2173.json
+++ b/docs/data/histograms/Japan/EY2173.json
@@ -1 +1 @@
-{"batchcode": "EY2173", "histograms": [{"batchcodes": ["EY2173", "GJ7139"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["EY2173"], "histogram": {"Body temperature": 503, "Blood pressure measurement": 196, "Pyrexia": 151, "Oxygen saturation": 132, "Anaphylactic reaction": 130, "Heart rate": 121, "Headache": 98, "Malaise": 98, "Nausea": 92, "Blood pressure increased": 89, "Pruritus": 65, "Dyspnoea": 64, "Feeling abnormal": 63, "Erythema": 61, "Dizziness": 48, "Cough": 47, "Hypoaesthesia": 47, "Arthralgia": 45, "Rash": 45, "Vaccination site pain": 45, "Vomiting": 42, "Urticaria": 40, "Oropharyngeal discomfort": 37, "Chills": 34, "Myalgia": 31, "Palpitations": 31, "Blood test": 30, "Diarrhoea": 27, "Blood pressure decreased": 25, "Electrocardiogram": 24, "Presyncope": 22, "Tachycardia": 22, "Abdominal pain": 21, "Pain in extremity": 21, "Neuropathy peripheral": 20, "Asthma": 19, "Cold sweat": 19, "Tremor": 19, "Depressed level of consciousness": 18, "Hypertension": 18, "Investigation": 18, "Loss of consciousness": 18, "Chest discomfort": 17, "Hypersensitivity": 17, "Magnetic resonance imaging": 17, "Cerebral infarction": 16, "Decreased appetite": 16, "Muscular weakness": 16, "Pain": 16, "Throat tightness": 16, "Wheezing": 16, "White blood cell count": 16, "Feeling hot": 15, "Hyperventilation": 14, "Oxygen saturation decreased": 14, "Asthenia": 13, "C-reactive protein": 13, "Computerised tomogram head": 13, "Heart rate increased": 13, "Vital signs measurement": 13, "Altered state of consciousness": 12, "Chest pain": 12, "Computerised tomogram": 12, "Dysphonia": 12, "Fatigue": 12, "Hyperhidrosis": 12, "Hypoaesthesia oral": 12, "Pallor": 12, "Anaphylactic shock": 11, "Platelet count": 11, "SARS-CoV-2 test": 11, "Seizure": 11, "Arrhythmia": 10, "Feeling cold": 10, "Hot flush": 10, "Swelling": 10, "Back pain": 9, "Flushing": 9, "Magnetic resonance imaging head": 9, "Peripheral swelling": 9, "Pneumonia": 9, "Vaccination site swelling": 9, "Disease recurrence": 8, "Dysstasia": 8, "Haemorrhage subcutaneous": 8, "Sensory disturbance": 8, "Abdominal discomfort": 7, "Blood pressure systolic": 7, "Face oedema": 7, "Facial paralysis": 7, "Genital haemorrhage": 7, "Haemoglobin": 7, "Peripheral coldness": 7, "Throat irritation": 7, "Allergy to vaccine": 6, "Angioedema": 6, "Auscultation": 6, "Cardiac failure acute": 6, "Cerebral haemorrhage": 6, "Dysphagia": 6, "Dysphoria": 6, "Heart rate decreased": 6, "Laboratory test": 6, "Mental impairment": 6, "Oedema peripheral": 6, "Oropharyngeal pain": 6, "Paraesthesia": 6, "Rash erythematous": 6, "Respiratory rate": 6, "Somnolence": 6, "Abdominal pain upper": 5, "Bradycardia": 5, "Cellulitis": 5, "Coma scale": 5, "Computerised tomogram thorax": 5, "Death": 5, "Dehydration": 5, "Discomfort": 5, "Dyskinesia": 5, "Eczema": 5, "Eye pruritus": 5, "Fall": 5, "Internal haemorrhage": 5, "Lymphadenopathy": 5, "Movement disorder": 5, "Physical examination": 5, "Thirst": 5, "Ultrasound scan": 5, "X-ray": 5, "Acute disseminated encephalomyelitis": 4, "Acute myocardial infarction": 4, "Blood lactate dehydrogenase": 4, "Breath sounds": 4, "CSF test": 4, "Cardiac failure": 4, "Cardio-respiratory arrest": 4, "Cyanosis": 4, "Drug eruption": 4, "Electroencephalogram": 4, "Epilepsy": 4, "Eyelid oedema": 4, "Feeding disorder": 4, "Haematochezia": 4, "Head discomfort": 4, "Hyperpyrexia": 4, "Insomnia": 4, "Mobility decreased": 4, "Nasal congestion": 4, "Ocular hyperaemia": 4, "Oculomucocutaneous syndrome": 4, "PO2": 4, "Platelet count decreased": 4, "Purpura": 4, "Respiratory arrest": 4, "Respiratory distress": 4, "Sinus tachycardia": 4, "Subarachnoid haemorrhage": 4, "Swelling face": 4, "Swelling of eyelid": 4, "Syncope": 4, "Thrombocytopenic purpura": 4, "Urinary tract infection": 4, "Vaccination site pruritus": 4, "Abdominal pain lower": 3, "Alanine aminotransferase": 3, "Anxiety": 3, "Arthritis": 3, "Aspartate aminotransferase": 3, "Atrial fibrillation": 3, "Blood creatine": 3, "Blood culture": 3, "Blood glucose": 3, "Blood potassium": 3, "Blood pressure systolic increased": 3, "Body temperature increased": 3, "C-reactive protein increased": 3, "Chest X-ray": 3, "Colitis ischaemic": 3, "Dizziness postural": 3, "Echocardiogram": 3, "Electrocardiogram T wave inversion": 3, "Eye pain": 3, "Fibrin D dimer": 3, "Gastrointestinal disorder": 3, "Haemorrhage": 3, "Hepatic function abnormal": 3, "Hyperthyroidism": 3, "Hypotension": 3, "Intracranial pressure increased": 3, "Lip oedema": 3, "Lip pruritus": 3, "Meningitis aseptic": 3, "Monoplegia": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Papule": 3, "Pleural effusion": 3, "Pneumonia aspiration": 3, "Pulmonary embolism": 3, "Shock": 3, "Thalamus haemorrhage": 3, "Thrombosis": 3, "Tinnitus": 3, "Type I hypersensitivity": 3, "Urine analysis": 3, "Vaccination site erythema": 3, "Visual impairment": 3, "White blood cell count decreased": 3, "Yawning": 3, "Abdominal distension": 2, "Alopecia": 2, "Angina pectoris": 2, "Anti-cyclic citrullinated peptide antibody": 2, "Antibody test": 2, "Antibody test negative": 2, "Antinuclear antibody": 2, "Aphasia": 2, "Atrioventricular block": 2, "Basedow's disease": 2, "Biopsy kidney": 2, "Biopsy skin": 2, "Blood creatinine": 2, "Blood immunoglobulin E": 2, "Blood potassium increased": 2, "Blood pressure abnormal": 2, "Blood urea": 2, "Cardiac arrest": 2, "Cerebellar infarction": 2, "Coagulopathy": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram neck": 2, "Condition aggravated": 2, "Conjunctival haemorrhage": 2, "Conjunctival hyperaemia": 2, "Constipation": 2, "Deep vein thrombosis": 2, "Dysmenorrhoea": 2, "Dysuria": 2, "Ear discomfort": 2, "Eating disorder": 2, "Electrocardiogram ambulatory": 2, "Endoscopy gastrointestinal": 2, "Endoscopy upper gastrointestinal tract": 2, "Eosinophil count": 2, "Erythema of eyelid": 2, "Extrasystoles": 2, "Feeling drunk": 2, "Gait disturbance": 2, "General physical health deterioration": 2, "Grip strength decreased": 2, "Guillain-Barre syndrome": 2, "Haematology test": 2, "Haematuria": 2, "Heparin-induced thrombocytopenia test": 2, "Hyperthermia": 2, "Hypoalbuminaemia": 2, "Hypopnoea": 2, "Immobile": 2, "Incorrect route of product administration": 2, "Inflammation": 2, "Interleukin therapy": 2, "Joint swelling": 2, "Laryngeal obstruction": 2, "Lethargy": 2, "Lip swelling": 2, "Magnetic resonance imaging neck": 2, "Magnetic resonance imaging spinal": 2, "Marasmus": 2, "Maternal exposure before pregnancy": 2, "Melaena": 2, "Monocyte count": 2, "Myelitis": 2, "Myocardial ischaemia": 2, "Nasal obstruction": 2, "Neck pain": 2, "Neurological examination": 2, "Neutrophil count": 2, "Oedema": 2, "Oral pruritus": 2, "Pain in jaw": 2, "Pancytopenia": 2, "Petechiae": 2, "Pharyngeal stenosis": 2, "Pharyngeal swelling": 2, "Physical deconditioning": 2, "Polymerase chain reaction": 2, "Polymyalgia rheumatica": 2, "Putamen haemorrhage": 2, "Renal disorder": 2, "Respiratory failure": 2, "Respiratory symptom": 2, "Retinal haemorrhage": 2, "Rheumatoid factor": 2, "Rhinorrhoea": 2, "Sensation of foreign body": 2, "Sneezing": 2, "Stridor": 2, "Subdural haematoma": 2, "Sudden death": 2, "Tachypnoea": 2, "Tenderness": 2, "Toxic skin eruption": 2, "Vaccination site warmth": 2, "Venous thrombosis": 2, "Ventricular extrasystoles": 2, "Vertigo": 2, "Vision blurred": 2, "Visual field defect": 2, "Xeroderma pigmentosum": 2, "Abnormal behaviour": 1, "Abortion missed": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Aggression": 1, "Alanine aminotransferase abnormal": 1, "Alanine aminotransferase increased": 1, "Amnesia": 1, "Anal incontinence": 1, "Anti-GAD antibody": 1, "Anti-aquaporin-4 antibody": 1, "Anti-thyroid antibody": 1, "Antiphospholipid antibodies": 1, "Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Aortic dissection rupture": 1, "Aphonia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase abnormal": 1, "Aspartate aminotransferase increased": 1, "Ataxia": 1, "Atrioventricular block complete": 1, "Autoimmune hepatitis": 1, "Autonomic nervous system imbalance": 1, "Azotaemia": 1, "Basophil count": 1, "Biopsy bone marrow": 1, "Blepharospasm": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase abnormal": 1, "Blood creatinine increased": 1, "Blood gases": 1, "Blood glucose decreased": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urine present": 1, "Bloody discharge": 1, "Brain neoplasm": 1, "Brain stem haemorrhage": 1, "Brain stem infarction": 1, "Breath sounds abnormal": 1, "Bronchitis": 1, "Bronchostenosis": 1, "Bursal fluid accumulation": 1, "CD4/CD8 ratio": 1, "COVID-19": 1, "CSF cell count": 1, "CSF oligoclonal band": 1, "CSF oligoclonal band present": 1, "CSF test abnormal": 1, "Cardiac failure chronic": 1, "Cardiac failure congestive": 1, "Cardiac tamponade": 1, "Cardiolipin antibody": 1, "Castleman's disease": 1, "Catecholamines urine": 1, "Catheterisation cardiac": 1, "Cerebellar ataxia": 1, "Cerebral artery occlusion": 1, "Cerebral calcification": 1, "Cerebral ischaemia": 1, "Choking sensation": 1, "Chronic kidney disease": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Collagen disorder": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Convulsions local": 1, "Coronary artery occlusion": 1, "Coronavirus test negative": 1, "Culture": 1, "Culture throat": 1, "Culture urine": 1, "Cutaneous symptom": 1, "Cutaneous vasculitis": 1, "Cystitis": 1, "Cystitis bacterial": 1, "Cytology": 1, "Delirium": 1, "Dementia": 1, "Diffuse large B-cell lymphoma": 1, "Disease progression": 1, "Dissociative disorder": 1, "Disturbance in attention": 1, "Double stranded DNA antibody": 1, "Dry mouth": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyslalia": 1, "Ear pain": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram abnormal": 1, "Electroneurography": 1, "Electronystagmogram": 1, "Encephalitis autoimmune": 1, "Enterobacter sepsis": 1, "Eosinophil percentage increased": 1, "Epigastric discomfort": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Euphoric mood": 1, "Eye luxation": 1, "Eye movement disorder": 1, "Eye oedema": 1, "Eye swelling": 1, "Eyelid function disorder": 1, "Eyelid ptosis": 1, "Eyelids pruritus": 1, "Facial pain": 1, "Faeces discoloured": 1, "Femur fracture": 1, "Fibrin D dimer increased": 1, "Flat affect": 1, "Fluid intake reduced": 1, "Foetal heart rate": 1, "Foetal heart rate abnormal": 1, "Foreign body in throat": 1, "Gamma-glutamyltransferase": 1, "Gastric ulcer": 1, "Gastritis": 1, "Gastrointestinal haemorrhage": 1, "Gastrointestinal stromal tumour": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Gingival swelling": 1, "Gingivitis": 1, "Glare": 1, "Glomerular filtration rate": 1, "Glycated albumin": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Gynaecological examination": 1, "Haemarthrosis": 1, "Haemorrhagic disorder": 1, "Haemorrhoidal haemorrhage": 1, "Heart sounds": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Herpes virus infection": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "High density lipoprotein decreased": 1, "Hydrocephalus": 1, "Hyperacusis": 1, "Hyperlipidaemia": 1, "Hypogeusia": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Hypothermia": 1, "Hypoventilation": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Ileus": 1, "Illusion": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Influenza like illness": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site pain": 1, "Insulin C-peptide": 1, "Intercostal neuralgia": 1, "Intermenstrual bleeding": 1, "Interstitial lung disease": 1, "Intra-abdominal haemorrhage": 1, "Intussusception": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Ischaemia": 1, "Joint range of motion decreased": 1, "Judgement impaired": 1, "Lacrimation increased": 1, "Language disorder": 1, "Laryngeal oedema": 1, "Laryngitis allergic": 1, "Larynx irritation": 1, "Left ventricular hypertrophy": 1, "Limb discomfort": 1, "Listless": 1, "Liver function test": 1, "Liver injury": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lumbar spinal stenosis": 1, "Lymphocyte count": 1, "Lymphocyte stimulation test": 1, "Lymphoproliferative disorder": 1, "Magnetic resonance imaging spinal abnormal": 1, "Malnutrition": 1, "Matrix metalloproteinase-3": 1, "Mechanical urticaria": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Moaning": 1, "Mucocutaneous rash": 1, "Multiple sclerosis": 1, "Muscle atrophy": 1, "Muscle fatigue": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuropsychological test": 1, "Neurosis": 1, "Neutrophil percentage": 1, "Night sweats": 1, "Norepinephrine": 1, "Odynophagia": 1, "Oral discomfort": 1, "Pain of skin": 1, "Palmar erythema": 1, "Panniculitis": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Parotitis": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral nerve injury": 1, "Pharyngeal oedema": 1, "Phlebitis": 1, "Photopsia": 1, "Photosensitivity reaction": 1, "Pleurisy": 1, "Pneumonia chlamydial": 1, "Proctoscopy": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Protein S": 1, "Protein total": 1, "Protein urine": 1, "Proteinuria": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Pulmonary hypertension": 1, "Pulse abnormal": 1, "Pulse pressure decreased": 1, "Pupillary light reflex tests": 1, "Rash pruritic": 1, "Red blood cell count increased": 1, "Reflexes abnormal": 1, "Renal failure": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory disorder": 1, "Respiratory rate decreased": 1, "Respiratory tract infection": 1, "Restlessness": 1, "Retching": 1, "Retinal vascular thrombosis": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Salivary hypersecretion": 1, "Scan brain": 1, "Scan with contrast": 1, "Screaming": 1, "Sepsis": 1, "Sinusitis bacterial": 1, "Sitting disability": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin mass": 1, "Skin reaction": 1, "Slow response to stimuli": 1, "Sluggishness": 1, "Small fibre neuropathy": 1, "Small intestinal haemorrhage": 1, "Speech disorder": 1, "Spinal disorder": 1, "Spinal osteoarthritis": 1, "Sputum culture": 1, "Sputum discoloured": 1, "Sputum retention": 1, "Status epilepticus": 1, "Status migrainosus": 1, "Stenosis": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Stool analysis": 1, "Subcutaneous haematoma": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Swollen tongue": 1, "Syphilis": 1, "Systemic lupus erythematosus": 1, "Tachycardia paroxysmal": 1, "Taste disorder": 1, "Tetany": 1, "Thermoanaesthesia": 1, "Thrombocytopenia": 1, "Thrombotic cerebral infarction": 1, "Thyroglobulin": 1, "Thyroid function test": 1, "Thyroid hormones test": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Tonsillitis": 1, "Toothache": 1, "Total complement activity test": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine free": 1, "Type 1 diabetes mellitus": 1, "Upper limb fracture": 1, "Upper respiratory tract inflammation": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine output decreased": 1, "Urine protein/creatinine ratio": 1, "Uterine haemorrhage": 1, "Uveitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site joint erythema": 1, "Vaccination site joint movement impairment": 1, "Vaccination site joint pain": 1, "Vaccination site movement impairment": 1, "Vasculitis": 1, "Vasodilatation": 1, "Venous thrombosis limb": 1, "Vestibular disorder": 1, "Viraemia": 1, "Viral pericarditis": 1, "Volume blood decreased": 1, "Walking disability": 1, "Weight decreased": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "White matter lesion": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EY2173", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EY2173", "GJ7139"]}, {"histogram": {"Body temperature": 503, "Blood pressure measurement": 196, "Pyrexia": 151, "Oxygen saturation": 132, "Anaphylactic reaction": 130, "Heart rate": 121, "Headache": 98, "Malaise": 98, "Nausea": 92, "Blood pressure increased": 89, "Pruritus": 65, "Dyspnoea": 64, "Feeling abnormal": 63, "Erythema": 61, "Dizziness": 48, "Cough": 47, "Hypoaesthesia": 47, "Arthralgia": 45, "Rash": 45, "Vaccination site pain": 45, "Vomiting": 42, "Urticaria": 40, "Oropharyngeal discomfort": 37, "Chills": 34, "Myalgia": 31, "Palpitations": 31, "Blood test": 30, "Diarrhoea": 27, "Blood pressure decreased": 25, "Electrocardiogram": 24, "Presyncope": 22, "Tachycardia": 22, "Abdominal pain": 21, "Pain in extremity": 21, "Neuropathy peripheral": 20, "Asthma": 19, "Cold sweat": 19, "Tremor": 19, "Depressed level of consciousness": 18, "Hypertension": 18, "Investigation": 18, "Loss of consciousness": 18, "Chest discomfort": 17, "Hypersensitivity": 17, "Magnetic resonance imaging": 17, "Cerebral infarction": 16, "Decreased appetite": 16, "Muscular weakness": 16, "Pain": 16, "Throat tightness": 16, "Wheezing": 16, "White blood cell count": 16, "Feeling hot": 15, "Hyperventilation": 14, "Oxygen saturation decreased": 14, "Asthenia": 13, "C-reactive protein": 13, "Computerised tomogram head": 13, "Heart rate increased": 13, "Vital signs measurement": 13, "Altered state of consciousness": 12, "Chest pain": 12, "Computerised tomogram": 12, "Dysphonia": 12, "Fatigue": 12, "Hyperhidrosis": 12, "Hypoaesthesia oral": 12, "Pallor": 12, "Anaphylactic shock": 11, "Platelet count": 11, "SARS-CoV-2 test": 11, "Seizure": 11, "Arrhythmia": 10, "Feeling cold": 10, "Hot flush": 10, "Swelling": 10, "Back pain": 9, "Flushing": 9, "Magnetic resonance imaging head": 9, "Peripheral swelling": 9, "Pneumonia": 9, "Vaccination site swelling": 9, "Disease recurrence": 8, "Dysstasia": 8, "Haemorrhage subcutaneous": 8, "Sensory disturbance": 8, "Abdominal discomfort": 7, "Blood pressure systolic": 7, "Face oedema": 7, "Facial paralysis": 7, "Genital haemorrhage": 7, "Haemoglobin": 7, "Peripheral coldness": 7, "Throat irritation": 7, "Allergy to vaccine": 6, "Angioedema": 6, "Auscultation": 6, "Cardiac failure acute": 6, "Cerebral haemorrhage": 6, "Dysphagia": 6, "Dysphoria": 6, "Heart rate decreased": 6, "Laboratory test": 6, "Mental impairment": 6, "Oedema peripheral": 6, "Oropharyngeal pain": 6, "Paraesthesia": 6, "Rash erythematous": 6, "Respiratory rate": 6, "Somnolence": 6, "Abdominal pain upper": 5, "Bradycardia": 5, "Cellulitis": 5, "Coma scale": 5, "Computerised tomogram thorax": 5, "Death": 5, "Dehydration": 5, "Discomfort": 5, "Dyskinesia": 5, "Eczema": 5, "Eye pruritus": 5, "Fall": 5, "Internal haemorrhage": 5, "Lymphadenopathy": 5, "Movement disorder": 5, "Physical examination": 5, "Thirst": 5, "Ultrasound scan": 5, "X-ray": 5, "Acute disseminated encephalomyelitis": 4, "Acute myocardial infarction": 4, "Blood lactate dehydrogenase": 4, "Breath sounds": 4, "CSF test": 4, "Cardiac failure": 4, "Cardio-respiratory arrest": 4, "Cyanosis": 4, "Drug eruption": 4, "Electroencephalogram": 4, "Epilepsy": 4, "Eyelid oedema": 4, "Feeding disorder": 4, "Haematochezia": 4, "Head discomfort": 4, "Hyperpyrexia": 4, "Insomnia": 4, "Mobility decreased": 4, "Nasal congestion": 4, "Ocular hyperaemia": 4, "Oculomucocutaneous syndrome": 4, "PO2": 4, "Platelet count decreased": 4, "Purpura": 4, "Respiratory arrest": 4, "Respiratory distress": 4, "Sinus tachycardia": 4, "Subarachnoid haemorrhage": 4, "Swelling face": 4, "Swelling of eyelid": 4, "Syncope": 4, "Thrombocytopenic purpura": 4, "Urinary tract infection": 4, "Vaccination site pruritus": 4, "Abdominal pain lower": 3, "Alanine aminotransferase": 3, "Anxiety": 3, "Arthritis": 3, "Aspartate aminotransferase": 3, "Atrial fibrillation": 3, "Blood creatine": 3, "Blood culture": 3, "Blood glucose": 3, "Blood potassium": 3, "Blood pressure systolic increased": 3, "Body temperature increased": 3, "C-reactive protein increased": 3, "Chest X-ray": 3, "Colitis ischaemic": 3, "Dizziness postural": 3, "Echocardiogram": 3, "Electrocardiogram T wave inversion": 3, "Eye pain": 3, "Fibrin D dimer": 3, "Gastrointestinal disorder": 3, "Haemorrhage": 3, "Hepatic function abnormal": 3, "Hyperthyroidism": 3, "Hypotension": 3, "Intracranial pressure increased": 3, "Lip oedema": 3, "Lip pruritus": 3, "Meningitis aseptic": 3, "Monoplegia": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Papule": 3, "Pleural effusion": 3, "Pneumonia aspiration": 3, "Pulmonary embolism": 3, "Shock": 3, "Thalamus haemorrhage": 3, "Thrombosis": 3, "Tinnitus": 3, "Type I hypersensitivity": 3, "Urine analysis": 3, "Vaccination site erythema": 3, "Visual impairment": 3, "White blood cell count decreased": 3, "Yawning": 3, "Abdominal distension": 2, "Alopecia": 2, "Angina pectoris": 2, "Anti-cyclic citrullinated peptide antibody": 2, "Antibody test": 2, "Antibody test negative": 2, "Antinuclear antibody": 2, "Aphasia": 2, "Atrioventricular block": 2, "Basedow's disease": 2, "Biopsy kidney": 2, "Biopsy skin": 2, "Blood creatinine": 2, "Blood immunoglobulin E": 2, "Blood potassium increased": 2, "Blood pressure abnormal": 2, "Blood urea": 2, "Cardiac arrest": 2, "Cerebellar infarction": 2, "Coagulopathy": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram neck": 2, "Condition aggravated": 2, "Conjunctival haemorrhage": 2, "Conjunctival hyperaemia": 2, "Constipation": 2, "Deep vein thrombosis": 2, "Dysmenorrhoea": 2, "Dysuria": 2, "Ear discomfort": 2, "Eating disorder": 2, "Electrocardiogram ambulatory": 2, "Endoscopy gastrointestinal": 2, "Endoscopy upper gastrointestinal tract": 2, "Eosinophil count": 2, "Erythema of eyelid": 2, "Extrasystoles": 2, "Feeling drunk": 2, "Gait disturbance": 2, "General physical health deterioration": 2, "Grip strength decreased": 2, "Guillain-Barre syndrome": 2, "Haematology test": 2, "Haematuria": 2, "Heparin-induced thrombocytopenia test": 2, "Hyperthermia": 2, "Hypoalbuminaemia": 2, "Hypopnoea": 2, "Immobile": 2, "Incorrect route of product administration": 2, "Inflammation": 2, "Interleukin therapy": 2, "Joint swelling": 2, "Laryngeal obstruction": 2, "Lethargy": 2, "Lip swelling": 2, "Magnetic resonance imaging neck": 2, "Magnetic resonance imaging spinal": 2, "Marasmus": 2, "Maternal exposure before pregnancy": 2, "Melaena": 2, "Monocyte count": 2, "Myelitis": 2, "Myocardial ischaemia": 2, "Nasal obstruction": 2, "Neck pain": 2, "Neurological examination": 2, "Neutrophil count": 2, "Oedema": 2, "Oral pruritus": 2, "Pain in jaw": 2, "Pancytopenia": 2, "Petechiae": 2, "Pharyngeal stenosis": 2, "Pharyngeal swelling": 2, "Physical deconditioning": 2, "Polymerase chain reaction": 2, "Polymyalgia rheumatica": 2, "Putamen haemorrhage": 2, "Renal disorder": 2, "Respiratory failure": 2, "Respiratory symptom": 2, "Retinal haemorrhage": 2, "Rheumatoid factor": 2, "Rhinorrhoea": 2, "Sensation of foreign body": 2, "Sneezing": 2, "Stridor": 2, "Subdural haematoma": 2, "Sudden death": 2, "Tachypnoea": 2, "Tenderness": 2, "Toxic skin eruption": 2, "Vaccination site warmth": 2, "Venous thrombosis": 2, "Ventricular extrasystoles": 2, "Vertigo": 2, "Vision blurred": 2, "Visual field defect": 2, "Xeroderma pigmentosum": 2, "Abnormal behaviour": 1, "Abortion missed": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Aggression": 1, "Alanine aminotransferase abnormal": 1, "Alanine aminotransferase increased": 1, "Amnesia": 1, "Anal incontinence": 1, "Anti-GAD antibody": 1, "Anti-aquaporin-4 antibody": 1, "Anti-thyroid antibody": 1, "Antiphospholipid antibodies": 1, "Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Aortic dissection rupture": 1, "Aphonia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase abnormal": 1, "Aspartate aminotransferase increased": 1, "Ataxia": 1, "Atrioventricular block complete": 1, "Autoimmune hepatitis": 1, "Autonomic nervous system imbalance": 1, "Azotaemia": 1, "Basophil count": 1, "Biopsy bone marrow": 1, "Blepharospasm": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase abnormal": 1, "Blood creatinine increased": 1, "Blood gases": 1, "Blood glucose decreased": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urine present": 1, "Bloody discharge": 1, "Brain neoplasm": 1, "Brain stem haemorrhage": 1, "Brain stem infarction": 1, "Breath sounds abnormal": 1, "Bronchitis": 1, "Bronchostenosis": 1, "Bursal fluid accumulation": 1, "CD4/CD8 ratio": 1, "COVID-19": 1, "CSF cell count": 1, "CSF oligoclonal band": 1, "CSF oligoclonal band present": 1, "CSF test abnormal": 1, "Cardiac failure chronic": 1, "Cardiac failure congestive": 1, "Cardiac tamponade": 1, "Cardiolipin antibody": 1, "Castleman's disease": 1, "Catecholamines urine": 1, "Catheterisation cardiac": 1, "Cerebellar ataxia": 1, "Cerebral artery occlusion": 1, "Cerebral calcification": 1, "Cerebral ischaemia": 1, "Choking sensation": 1, "Chronic kidney disease": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Collagen disorder": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Convulsions local": 1, "Coronary artery occlusion": 1, "Coronavirus test negative": 1, "Culture": 1, "Culture throat": 1, "Culture urine": 1, "Cutaneous symptom": 1, "Cutaneous vasculitis": 1, "Cystitis": 1, "Cystitis bacterial": 1, "Cytology": 1, "Delirium": 1, "Dementia": 1, "Diffuse large B-cell lymphoma": 1, "Disease progression": 1, "Dissociative disorder": 1, "Disturbance in attention": 1, "Double stranded DNA antibody": 1, "Dry mouth": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyslalia": 1, "Ear pain": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram abnormal": 1, "Electroneurography": 1, "Electronystagmogram": 1, "Encephalitis autoimmune": 1, "Enterobacter sepsis": 1, "Eosinophil percentage increased": 1, "Epigastric discomfort": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Euphoric mood": 1, "Eye luxation": 1, "Eye movement disorder": 1, "Eye oedema": 1, "Eye swelling": 1, "Eyelid function disorder": 1, "Eyelid ptosis": 1, "Eyelids pruritus": 1, "Facial pain": 1, "Faeces discoloured": 1, "Femur fracture": 1, "Fibrin D dimer increased": 1, "Flat affect": 1, "Fluid intake reduced": 1, "Foetal heart rate": 1, "Foetal heart rate abnormal": 1, "Foreign body in throat": 1, "Gamma-glutamyltransferase": 1, "Gastric ulcer": 1, "Gastritis": 1, "Gastrointestinal haemorrhage": 1, "Gastrointestinal stromal tumour": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Gingival swelling": 1, "Gingivitis": 1, "Glare": 1, "Glomerular filtration rate": 1, "Glycated albumin": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Gynaecological examination": 1, "Haemarthrosis": 1, "Haemorrhagic disorder": 1, "Haemorrhoidal haemorrhage": 1, "Heart sounds": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Herpes virus infection": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "High density lipoprotein decreased": 1, "Hydrocephalus": 1, "Hyperacusis": 1, "Hyperlipidaemia": 1, "Hypogeusia": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Hypothermia": 1, "Hypoventilation": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Ileus": 1, "Illusion": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Influenza like illness": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site pain": 1, "Insulin C-peptide": 1, "Intercostal neuralgia": 1, "Intermenstrual bleeding": 1, "Interstitial lung disease": 1, "Intra-abdominal haemorrhage": 1, "Intussusception": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Ischaemia": 1, "Joint range of motion decreased": 1, "Judgement impaired": 1, "Lacrimation increased": 1, "Language disorder": 1, "Laryngeal oedema": 1, "Laryngitis allergic": 1, "Larynx irritation": 1, "Left ventricular hypertrophy": 1, "Limb discomfort": 1, "Listless": 1, "Liver function test": 1, "Liver injury": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lumbar spinal stenosis": 1, "Lymphocyte count": 1, "Lymphocyte stimulation test": 1, "Lymphoproliferative disorder": 1, "Magnetic resonance imaging spinal abnormal": 1, "Malnutrition": 1, "Matrix metalloproteinase-3": 1, "Mechanical urticaria": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Moaning": 1, "Mucocutaneous rash": 1, "Multiple sclerosis": 1, "Muscle atrophy": 1, "Muscle fatigue": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuropsychological test": 1, "Neurosis": 1, "Neutrophil percentage": 1, "Night sweats": 1, "Norepinephrine": 1, "Odynophagia": 1, "Oral discomfort": 1, "Pain of skin": 1, "Palmar erythema": 1, "Panniculitis": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Parotitis": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral nerve injury": 1, "Pharyngeal oedema": 1, "Phlebitis": 1, "Photopsia": 1, "Photosensitivity reaction": 1, "Pleurisy": 1, "Pneumonia chlamydial": 1, "Proctoscopy": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Protein S": 1, "Protein total": 1, "Protein urine": 1, "Proteinuria": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Pulmonary hypertension": 1, "Pulse abnormal": 1, "Pulse pressure decreased": 1, "Pupillary light reflex tests": 1, "Rash pruritic": 1, "Red blood cell count increased": 1, "Reflexes abnormal": 1, "Renal failure": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory disorder": 1, "Respiratory rate decreased": 1, "Respiratory tract infection": 1, "Restlessness": 1, "Retching": 1, "Retinal vascular thrombosis": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Salivary hypersecretion": 1, "Scan brain": 1, "Scan with contrast": 1, "Screaming": 1, "Sepsis": 1, "Sinusitis bacterial": 1, "Sitting disability": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin mass": 1, "Skin reaction": 1, "Slow response to stimuli": 1, "Sluggishness": 1, "Small fibre neuropathy": 1, "Small intestinal haemorrhage": 1, "Speech disorder": 1, "Spinal disorder": 1, "Spinal osteoarthritis": 1, "Sputum culture": 1, "Sputum discoloured": 1, "Sputum retention": 1, "Status epilepticus": 1, "Status migrainosus": 1, "Stenosis": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Stool analysis": 1, "Subcutaneous haematoma": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Swollen tongue": 1, "Syphilis": 1, "Systemic lupus erythematosus": 1, "Tachycardia paroxysmal": 1, "Taste disorder": 1, "Tetany": 1, "Thermoanaesthesia": 1, "Thrombocytopenia": 1, "Thrombotic cerebral infarction": 1, "Thyroglobulin": 1, "Thyroid function test": 1, "Thyroid hormones test": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Tonsillitis": 1, "Toothache": 1, "Total complement activity test": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine free": 1, "Type 1 diabetes mellitus": 1, "Upper limb fracture": 1, "Upper respiratory tract inflammation": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine output decreased": 1, "Urine protein/creatinine ratio": 1, "Uterine haemorrhage": 1, "Uveitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site joint erythema": 1, "Vaccination site joint movement impairment": 1, "Vaccination site joint pain": 1, "Vaccination site movement impairment": 1, "Vasculitis": 1, "Vasodilatation": 1, "Venous thrombosis limb": 1, "Vestibular disorder": 1, "Viraemia": 1, "Viral pericarditis": 1, "Volume blood decreased": 1, "Walking disability": 1, "Weight decreased": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "White matter lesion": 1, "Yellow skin": 1}, "batchcodes": ["EY2173"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY2713.json b/docs/data/histograms/Japan/EY2713.json
index d6a8e7c9877..b0a303b9bec 100644
--- a/docs/data/histograms/Japan/EY2713.json
+++ b/docs/data/histograms/Japan/EY2713.json
@@ -1 +1 @@
-{"batchcode": "EY2713", "histograms": [{"batchcodes": ["EY2713"], "histogram": {"Anaphylactic reaction": 1, "Body temperature": 1, "Heart rate": 1, "Oxygen saturation": 1, "Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EY2713", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Body temperature": 1, "Heart rate": 1, "Oxygen saturation": 1, "Speech disorder": 1}, "batchcodes": ["EY2713"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY3173.json b/docs/data/histograms/Japan/EY3173.json
index bfa106880d6..b169f904c3c 100644
--- a/docs/data/histograms/Japan/EY3173.json
+++ b/docs/data/histograms/Japan/EY3173.json
@@ -1 +1 @@
-{"batchcode": "EY3173", "histograms": [{"batchcodes": ["EY3173"], "histogram": {"Bradycardia": 1, "Cold sweat": 1, "Fall": 1, "Feeling abnormal": 1, "Pallor": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EY3173", "histograms": [{"histogram": {"Bradycardia": 1, "Cold sweat": 1, "Fall": 1, "Feeling abnormal": 1, "Pallor": 1, "Presyncope": 1}, "batchcodes": ["EY3173"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY3860.json b/docs/data/histograms/Japan/EY3860.json
index fa26bfb0c62..14bcd473b2f 100644
--- a/docs/data/histograms/Japan/EY3860.json
+++ b/docs/data/histograms/Japan/EY3860.json
@@ -1 +1 @@
-{"batchcode": "EY3860", "histograms": [{"batchcodes": ["000204A", "EY3860"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1}}, {"batchcodes": ["EY3860"], "histogram": {"Body temperature": 146, "Blood pressure measurement": 52, "Oxygen saturation": 46, "Heart rate": 35, "Pyrexia": 34, "Anaphylactic reaction": 28, "Malaise": 21, "Dyspnoea": 18, "Nausea": 18, "Blood test": 15, "Erythema": 15, "Blood pressure decreased": 14, "Cerebral infarction": 13, "Pruritus": 13, "SARS-CoV-2 test": 12, "Vomiting": 12, "Blood pressure increased": 11, "Computerised tomogram": 11, "Depressed level of consciousness": 11, "Feeling abnormal": 11, "Decreased appetite": 10, "Platelet count": 10, "Oxygen saturation decreased": 9, "Rash": 9, "White blood cell count": 9, "Altered state of consciousness": 8, "C-reactive protein": 8, "Cough": 8, "Electrocardiogram": 8, "Headache": 8, "Oropharyngeal discomfort": 8, "Presyncope": 8, "Feeling cold": 7, "Magnetic resonance imaging": 7, "Magnetic resonance imaging head": 7, "Pain in extremity": 7, "Urticaria": 7, "Asthma": 6, "Cold sweat": 6, "Hypoaesthesia": 6, "Seizure": 6, "Abdominal pain": 5, "Anaphylactic shock": 5, "Asthenia": 5, "Cardiac arrest": 5, "Chest discomfort": 5, "Coma scale": 5, "Death": 5, "Dizziness": 5, "Haemorrhage subcutaneous": 5, "Hypertension": 5, "Loss of consciousness": 5, "Movement disorder": 5, "Muscular weakness": 5, "Pain": 5, "Pallor": 5, "Blood glucose": 4, "Bradycardia": 4, "C-reactive protein increased": 4, "Chills": 4, "Computerised tomogram head": 4, "Dehydration": 4, "Diarrhoea": 4, "Disease recurrence": 4, "Fall": 4, "Fatigue": 4, "Feeling hot": 4, "Fibrin D dimer": 4, "Heart rate increased": 4, "Hypersensitivity": 4, "Hypophagia": 4, "Investigation": 4, "Pneumonia": 4, "Pneumonia aspiration": 4, "Respiratory arrest": 4, "Wheezing": 4, "Anxiety": 3, "Blood creatine phosphokinase": 3, "COVID-19": 3, "Cardio-respiratory arrest": 3, "Chest pain": 3, "Condition aggravated": 3, "Dysphonia": 3, "Echocardiogram": 3, "Epilepsy": 3, "Facial paralysis": 3, "Glycosylated haemoglobin": 3, "Guillain-Barre syndrome": 3, "Haemoglobin": 3, "Head discomfort": 3, "Hepatic function abnormal": 3, "Hyperhidrosis": 3, "Hyperventilation": 3, "Hypoglycaemia": 3, "Lip swelling": 3, "Neuropathy peripheral": 3, "Palpitations": 3, "Paraesthesia": 3, "Paralysis": 3, "Peripheral swelling": 3, "Red blood cell count": 3, "Respiratory failure": 3, "Respiratory rate": 3, "Sepsis": 3, "Shock": 3, "Tachycardia": 3, "Tremor": 3, "Vaccination site pain": 3, "Vaccination site pruritus": 3, "Abdominal tenderness": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase": 2, "Alanine aminotransferase increased": 2, "Arthralgia": 2, "Arthritis": 2, "Autoantibody test": 2, "Blindness": 2, "Blister": 2, "Blood creatinine": 2, "Blood lactate dehydrogenase": 2, "Blood lactate dehydrogenase increased": 2, "Blood potassium": 2, "Blood potassium decreased": 2, "Blood pressure abnormal": 2, "Blood pressure systolic increased": 2, "Blood sodium": 2, "Cardiac failure acute": 2, "Cellulitis": 2, "Cerebellar infarction": 2, "Cerebral haemorrhage": 2, "Chest X-ray": 2, "Coagulopathy": 2, "Computerised tomogram thorax": 2, "Cyanosis": 2, "Dermatitis allergic": 2, "Disseminated intravascular coagulation": 2, "Drug eruption": 2, "Drug ineffective": 2, "Dyslalia": 2, "Dysstasia": 2, "Electroencephalogram": 2, "Fibrin degradation products": 2, "Flushing": 2, "Haematocrit": 2, "Heart rate decreased": 2, "Herpes simplex": 2, "Herpes zoster": 2, "Hot flush": 2, "Hyperthermia": 2, "Immobile": 2, "Immune thrombocytopenia": 2, "Incontinence": 2, "Liver disorder": 2, "Myocardial infarction": 2, "Neuralgic amyotrophy": 2, "PCO2": 2, "PO2": 2, "Papule": 2, "Peripheral coldness": 2, "Platelet count decreased": 2, "Protein total decreased": 2, "Prothrombin time": 2, "Renal impairment": 2, "Respiratory rate increased": 2, "Septic shock": 2, "Somnolence": 2, "Subarachnoid haemorrhage": 2, "Subdural haematoma": 2, "Throat irritation": 2, "Urinary tract infection": 2, "Vaccination failure": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Vital signs measurement": 2, "Weight": 2, "AST/ALT ratio": 1, "Abdominal pain upper": 1, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Acute hepatic failure": 1, "Agitation": 1, "Allergic bronchitis": 1, "Allergy to vaccine": 1, "Amyloidosis": 1, "Anaemia": 1, "Aneurysm ruptured": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Angioedema": 1, "Anion gap": 1, "Aortic dissection": 1, "Aphasia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arterial occlusive disease": 1, "Arterial puncture": 1, "Arteriosclerosis coronary artery": 1, "Arthritis bacterial": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Aspiration": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Back pain": 1, "Bacterial test": 1, "Band neutrophil count": 1, "Band neutrophil count increased": 1, "Base excess": 1, "Basophil count": 1, "Bell's palsy": 1, "Bilirubin conjugated": 1, "Biopsy bone marrow": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood bicarbonate": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood iron": 1, "Blood methaemoglobin": 1, "Blood osmolarity": 1, "Blood pressure systolic": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body height": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Brain stem haemorrhage": 1, "Breath sounds abnormal": 1, "Bronchoalveolar lavage": 1, "Bronchospasm": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Carbon dioxide": 1, "Carboxyhaemoglobin": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac index": 1, "Cardiac tamponade": 1, "Cardiogenic shock": 1, "Cardiomegaly": 1, "Cataract": 1, "Cerebral arteriosclerosis": 1, "Cerebral artery occlusion": 1, "Cerebral thrombosis": 1, "Cholecystitis": 1, "Cholelithiasis": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Chronic obstructive pulmonary disease": 1, "Clonic convulsion": 1, "Colitis ulcerative": 1, "Computerised tomogram abdomen": 1, "Coronary artery stenosis": 1, "Cutaneous symptom": 1, "Cyclic vomiting syndrome": 1, "Decubitus ulcer": 1, "Delirium": 1, "Dementia Alzheimer's type": 1, "Dermatitis": 1, "Dermatitis exfoliative generalised": 1, "Diabetes mellitus": 1, "Diabetes mellitus inadequate control": 1, "Drooling": 1, "Drug screen": 1, "Drug-induced liver injury": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dysmetria": 1, "Dyspepsia": 1, "Dysphoria": 1, "Dyspraxia": 1, "Ear pain": 1, "Eating disorder": 1, "Embolic stroke": 1, "Emphysema": 1, "Encephalitis": 1, "Encephalopathy": 1, "Endoscopy": 1, "Endoscopy upper gastrointestinal tract": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Escherichia urinary tract infection": 1, "Eye disorder": 1, "Eye movement disorder": 1, "Eyelid function disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastric adenoma": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal oedema": 1, "Gastrointestinal sounds abnormal": 1, "Giant cell arteritis": 1, "Glaucoma": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Glucose tolerance impaired": 1, "Glycosylated haemoglobin increased": 1, "Haematochezia": 1, "Haemoglobin decreased": 1, "Haemolysis": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Heat illness": 1, "Hemiplegia": 1, "Herpes zoster oticus": 1, "Hypercapnia": 1, "Hyperglycaemia": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hyperpyrexia": 1, "Hypoaesthesia oral": 1, "Hyporesponsive to stimuli": 1, "Hypotension": 1, "Hypoxia": 1, "Ileus": 1, "Imaging procedure": 1, "Infected skin ulcer": 1, "Infection": 1, "Inflammation": 1, "Internal haemorrhage": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intracranial aneurysm": 1, "Intracranial pressure increased": 1, "Intraventricular haemorrhage": 1, "Klebsiella sepsis": 1, "Laboratory test": 1, "Large intestine erosion": 1, "Light chain analysis": 1, "Lip erythema": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Low density lipoprotein": 1, "Lumbar spinal stenosis": 1, "Lung disorder": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Lymphoma": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Mean platelet volume": 1, "Memory impairment": 1, "Meningitis herpes": 1, "Mental impairment": 1, "Methaemoglobinaemia": 1, "Mobility decreased": 1, "Monoblast count": 1, "Monocyte count": 1, "Monocyte count decreased": 1, "Monocyte count increased": 1, "Monoparesis": 1, "Mouth swelling": 1, "Multiple organ dysfunction syndrome": 1, "Muscle atrophy": 1, "Muscle strength normal": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Myocardial rupture": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Nystagmus": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oesophagitis": 1, "Oropharyngeal pain": 1, "Pancreatitis acute": 1, "Pancytopenia": 1, "Paraesthesia oral": 1, "Paresis": 1, "Pathology test": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pharyngeal paraesthesia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count increased": 1, "Platelet distribution width": 1, "Platelet distribution width decreased": 1, "Pneumothorax": 1, "Pollakiuria": 1, "Primary amyloidosis": 1, "Procalcitonin": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Progesterone receptor assay": 1, "Protein total": 1, "Protein total normal": 1, "Prothrombin level": 1, "Psoriasis": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Reaction to excipient": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal disorder": 1, "Respiratory rate decreased": 1, "Respiratory symptom": 1, "Retinal vein occlusion": 1, "Rhinorrhoea": 1, "Right ventricular failure": 1, "SARS-CoV-2 antibody test": 1, "Sensory loss": 1, "Serum ferritin": 1, "Specific gravity urine": 1, "Specific gravity urine decreased": 1, "Spinal compression fracture": 1, "Spinal osteoarthritis": 1, "Subcutaneous haematoma": 1, "Sudden cardiac death": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Tachypnoea": 1, "Tenderness": 1, "Thalamus haemorrhage": 1, "Thirst": 1, "Thrombocytopenia": 1, "Thyroxine free": 1, "Toxic skin eruption": 1, "Transient global amnesia": 1, "Traumatic haemothorax": 1, "Troponin T": 1, "Tuberculosis": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Urine ketone body present": 1, "Vaccination site rash": 1, "Vasculitis": 1, "Viral test": 1, "Visual impairment": 1, "Weight decreased": 1, "Yawning": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EY3860", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1}, "batchcodes": ["000204A", "EY3860"]}, {"histogram": {"Body temperature": 146, "Blood pressure measurement": 52, "Oxygen saturation": 46, "Heart rate": 35, "Pyrexia": 34, "Anaphylactic reaction": 28, "Malaise": 21, "Dyspnoea": 18, "Nausea": 18, "Blood test": 15, "Erythema": 15, "Blood pressure decreased": 14, "Cerebral infarction": 13, "Pruritus": 13, "SARS-CoV-2 test": 12, "Vomiting": 12, "Blood pressure increased": 11, "Computerised tomogram": 11, "Depressed level of consciousness": 11, "Feeling abnormal": 11, "Decreased appetite": 10, "Platelet count": 10, "Oxygen saturation decreased": 9, "Rash": 9, "White blood cell count": 9, "Altered state of consciousness": 8, "C-reactive protein": 8, "Cough": 8, "Electrocardiogram": 8, "Headache": 8, "Oropharyngeal discomfort": 8, "Presyncope": 8, "Feeling cold": 7, "Magnetic resonance imaging": 7, "Magnetic resonance imaging head": 7, "Pain in extremity": 7, "Urticaria": 7, "Asthma": 6, "Cold sweat": 6, "Hypoaesthesia": 6, "Seizure": 6, "Abdominal pain": 5, "Anaphylactic shock": 5, "Asthenia": 5, "Cardiac arrest": 5, "Chest discomfort": 5, "Coma scale": 5, "Death": 5, "Dizziness": 5, "Haemorrhage subcutaneous": 5, "Hypertension": 5, "Loss of consciousness": 5, "Movement disorder": 5, "Muscular weakness": 5, "Pain": 5, "Pallor": 5, "Blood glucose": 4, "Bradycardia": 4, "C-reactive protein increased": 4, "Chills": 4, "Computerised tomogram head": 4, "Dehydration": 4, "Diarrhoea": 4, "Disease recurrence": 4, "Fall": 4, "Fatigue": 4, "Feeling hot": 4, "Fibrin D dimer": 4, "Heart rate increased": 4, "Hypersensitivity": 4, "Hypophagia": 4, "Investigation": 4, "Pneumonia": 4, "Pneumonia aspiration": 4, "Respiratory arrest": 4, "Wheezing": 4, "Anxiety": 3, "Blood creatine phosphokinase": 3, "COVID-19": 3, "Cardio-respiratory arrest": 3, "Chest pain": 3, "Condition aggravated": 3, "Dysphonia": 3, "Echocardiogram": 3, "Epilepsy": 3, "Facial paralysis": 3, "Glycosylated haemoglobin": 3, "Guillain-Barre syndrome": 3, "Haemoglobin": 3, "Head discomfort": 3, "Hepatic function abnormal": 3, "Hyperhidrosis": 3, "Hyperventilation": 3, "Hypoglycaemia": 3, "Lip swelling": 3, "Neuropathy peripheral": 3, "Palpitations": 3, "Paraesthesia": 3, "Paralysis": 3, "Peripheral swelling": 3, "Red blood cell count": 3, "Respiratory failure": 3, "Respiratory rate": 3, "Sepsis": 3, "Shock": 3, "Tachycardia": 3, "Tremor": 3, "Vaccination site pain": 3, "Vaccination site pruritus": 3, "Abdominal tenderness": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase": 2, "Alanine aminotransferase increased": 2, "Arthralgia": 2, "Arthritis": 2, "Autoantibody test": 2, "Blindness": 2, "Blister": 2, "Blood creatinine": 2, "Blood lactate dehydrogenase": 2, "Blood lactate dehydrogenase increased": 2, "Blood potassium": 2, "Blood potassium decreased": 2, "Blood pressure abnormal": 2, "Blood pressure systolic increased": 2, "Blood sodium": 2, "Cardiac failure acute": 2, "Cellulitis": 2, "Cerebellar infarction": 2, "Cerebral haemorrhage": 2, "Chest X-ray": 2, "Coagulopathy": 2, "Computerised tomogram thorax": 2, "Cyanosis": 2, "Dermatitis allergic": 2, "Disseminated intravascular coagulation": 2, "Drug eruption": 2, "Drug ineffective": 2, "Dyslalia": 2, "Dysstasia": 2, "Electroencephalogram": 2, "Fibrin degradation products": 2, "Flushing": 2, "Haematocrit": 2, "Heart rate decreased": 2, "Herpes simplex": 2, "Herpes zoster": 2, "Hot flush": 2, "Hyperthermia": 2, "Immobile": 2, "Immune thrombocytopenia": 2, "Incontinence": 2, "Liver disorder": 2, "Myocardial infarction": 2, "Neuralgic amyotrophy": 2, "PCO2": 2, "PO2": 2, "Papule": 2, "Peripheral coldness": 2, "Platelet count decreased": 2, "Protein total decreased": 2, "Prothrombin time": 2, "Renal impairment": 2, "Respiratory rate increased": 2, "Septic shock": 2, "Somnolence": 2, "Subarachnoid haemorrhage": 2, "Subdural haematoma": 2, "Throat irritation": 2, "Urinary tract infection": 2, "Vaccination failure": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Vital signs measurement": 2, "Weight": 2, "AST/ALT ratio": 1, "Abdominal pain upper": 1, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Acute hepatic failure": 1, "Agitation": 1, "Allergic bronchitis": 1, "Allergy to vaccine": 1, "Amyloidosis": 1, "Anaemia": 1, "Aneurysm ruptured": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Angioedema": 1, "Anion gap": 1, "Aortic dissection": 1, "Aphasia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arterial occlusive disease": 1, "Arterial puncture": 1, "Arteriosclerosis coronary artery": 1, "Arthritis bacterial": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Aspiration": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Back pain": 1, "Bacterial test": 1, "Band neutrophil count": 1, "Band neutrophil count increased": 1, "Base excess": 1, "Basophil count": 1, "Bell's palsy": 1, "Bilirubin conjugated": 1, "Biopsy bone marrow": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood bicarbonate": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood iron": 1, "Blood methaemoglobin": 1, "Blood osmolarity": 1, "Blood pressure systolic": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body height": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Brain stem haemorrhage": 1, "Breath sounds abnormal": 1, "Bronchoalveolar lavage": 1, "Bronchospasm": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Carbon dioxide": 1, "Carboxyhaemoglobin": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac index": 1, "Cardiac tamponade": 1, "Cardiogenic shock": 1, "Cardiomegaly": 1, "Cataract": 1, "Cerebral arteriosclerosis": 1, "Cerebral artery occlusion": 1, "Cerebral thrombosis": 1, "Cholecystitis": 1, "Cholelithiasis": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Chronic obstructive pulmonary disease": 1, "Clonic convulsion": 1, "Colitis ulcerative": 1, "Computerised tomogram abdomen": 1, "Coronary artery stenosis": 1, "Cutaneous symptom": 1, "Cyclic vomiting syndrome": 1, "Decubitus ulcer": 1, "Delirium": 1, "Dementia Alzheimer's type": 1, "Dermatitis": 1, "Dermatitis exfoliative generalised": 1, "Diabetes mellitus": 1, "Diabetes mellitus inadequate control": 1, "Drooling": 1, "Drug screen": 1, "Drug-induced liver injury": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dysmetria": 1, "Dyspepsia": 1, "Dysphoria": 1, "Dyspraxia": 1, "Ear pain": 1, "Eating disorder": 1, "Embolic stroke": 1, "Emphysema": 1, "Encephalitis": 1, "Encephalopathy": 1, "Endoscopy": 1, "Endoscopy upper gastrointestinal tract": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Escherichia urinary tract infection": 1, "Eye disorder": 1, "Eye movement disorder": 1, "Eyelid function disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastric adenoma": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal oedema": 1, "Gastrointestinal sounds abnormal": 1, "Giant cell arteritis": 1, "Glaucoma": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Glucose tolerance impaired": 1, "Glycosylated haemoglobin increased": 1, "Haematochezia": 1, "Haemoglobin decreased": 1, "Haemolysis": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Heat illness": 1, "Hemiplegia": 1, "Herpes zoster oticus": 1, "Hypercapnia": 1, "Hyperglycaemia": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hyperpyrexia": 1, "Hypoaesthesia oral": 1, "Hyporesponsive to stimuli": 1, "Hypotension": 1, "Hypoxia": 1, "Ileus": 1, "Imaging procedure": 1, "Infected skin ulcer": 1, "Infection": 1, "Inflammation": 1, "Internal haemorrhage": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intracranial aneurysm": 1, "Intracranial pressure increased": 1, "Intraventricular haemorrhage": 1, "Klebsiella sepsis": 1, "Laboratory test": 1, "Large intestine erosion": 1, "Light chain analysis": 1, "Lip erythema": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Low density lipoprotein": 1, "Lumbar spinal stenosis": 1, "Lung disorder": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Lymphoma": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Mean platelet volume": 1, "Memory impairment": 1, "Meningitis herpes": 1, "Mental impairment": 1, "Methaemoglobinaemia": 1, "Mobility decreased": 1, "Monoblast count": 1, "Monocyte count": 1, "Monocyte count decreased": 1, "Monocyte count increased": 1, "Monoparesis": 1, "Mouth swelling": 1, "Multiple organ dysfunction syndrome": 1, "Muscle atrophy": 1, "Muscle strength normal": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Myocardial rupture": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Nystagmus": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oesophagitis": 1, "Oropharyngeal pain": 1, "Pancreatitis acute": 1, "Pancytopenia": 1, "Paraesthesia oral": 1, "Paresis": 1, "Pathology test": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pharyngeal paraesthesia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count increased": 1, "Platelet distribution width": 1, "Platelet distribution width decreased": 1, "Pneumothorax": 1, "Pollakiuria": 1, "Primary amyloidosis": 1, "Procalcitonin": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Progesterone receptor assay": 1, "Protein total": 1, "Protein total normal": 1, "Prothrombin level": 1, "Psoriasis": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Reaction to excipient": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal disorder": 1, "Respiratory rate decreased": 1, "Respiratory symptom": 1, "Retinal vein occlusion": 1, "Rhinorrhoea": 1, "Right ventricular failure": 1, "SARS-CoV-2 antibody test": 1, "Sensory loss": 1, "Serum ferritin": 1, "Specific gravity urine": 1, "Specific gravity urine decreased": 1, "Spinal compression fracture": 1, "Spinal osteoarthritis": 1, "Subcutaneous haematoma": 1, "Sudden cardiac death": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Tachypnoea": 1, "Tenderness": 1, "Thalamus haemorrhage": 1, "Thirst": 1, "Thrombocytopenia": 1, "Thyroxine free": 1, "Toxic skin eruption": 1, "Transient global amnesia": 1, "Traumatic haemothorax": 1, "Troponin T": 1, "Tuberculosis": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Urine ketone body present": 1, "Vaccination site rash": 1, "Vasculitis": 1, "Viral test": 1, "Visual impairment": 1, "Weight decreased": 1, "Yawning": 1, "pH body fluid": 1}, "batchcodes": ["EY3860"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY4522.json b/docs/data/histograms/Japan/EY4522.json
index 59268c59c2b..60f99a616e2 100644
--- a/docs/data/histograms/Japan/EY4522.json
+++ b/docs/data/histograms/Japan/EY4522.json
@@ -1 +1 @@
-{"batchcode": "EY4522", "histograms": [{"batchcodes": ["EY4522"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4522", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["EY4522"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY4834.json b/docs/data/histograms/Japan/EY4834.json
index 98f65219615..a517a60a13c 100644
--- a/docs/data/histograms/Japan/EY4834.json
+++ b/docs/data/histograms/Japan/EY4834.json
@@ -1 +1 @@
-{"batchcode": "EY4834", "histograms": [{"batchcodes": ["EY4834"], "histogram": {"Body temperature": 190, "Blood pressure measurement": 64, "Oxygen saturation": 51, "Pyrexia": 49, "Heart rate": 48, "Anaphylactic reaction": 43, "Headache": 30, "Erythema": 27, "Nausea": 27, "Blood pressure increased": 26, "Dizziness": 25, "Pruritus": 25, "Malaise": 21, "Dyspnoea": 20, "Muscular weakness": 20, "Hypoaesthesia": 19, "Vomiting": 19, "Urticaria": 17, "Oropharyngeal discomfort": 15, "Cough": 14, "Cerebral infarction": 13, "Feeling abnormal": 13, "Oxygen saturation decreased": 13, "Rash": 13, "Magnetic resonance imaging": 12, "Cold sweat": 10, "Loss of consciousness": 10, "Vaccination site pain": 10, "Arthralgia": 9, "Computerised tomogram": 9, "Blood test": 8, "Cardio-respiratory arrest": 8, "Computerised tomogram head": 8, "Decreased appetite": 8, "Pain in extremity": 8, "Presyncope": 8, "Vital signs measurement": 8, "White blood cell count": 8, "Altered state of consciousness": 7, "Asthma": 7, "Chills": 7, "Depressed level of consciousness": 7, "Gait disturbance": 7, "Tremor": 7, "Asthenia": 6, "Blood pressure decreased": 6, "Death": 6, "Diarrhoea": 6, "Electrocardiogram": 6, "Fall": 6, "Heart rate increased": 6, "Hypertension": 6, "Pain": 6, "Pallor": 6, "Palpitations": 6, "SARS-CoV-2 test": 6, "Abdominal pain": 5, "Bradycardia": 5, "C-reactive protein": 5, "Chest X-ray": 5, "Chest discomfort": 5, "Feeling cold": 5, "Hypersensitivity": 5, "Photopsia": 5, "Feeling hot": 4, "Guillain-Barre syndrome": 4, "Hemiplegia": 4, "Herpes zoster": 4, "Hyperventilation": 4, "Magnetic resonance imaging head": 4, "Myalgia": 4, "Myocardial infarction": 4, "Neuropathy peripheral": 4, "Pneumonia": 4, "Rash erythematous": 4, "Somnolence": 4, "Blood creatine phosphokinase": 3, "Blood pressure systolic": 3, "C-reactive protein increased": 3, "COVID-19": 3, "Cardiac tamponade": 3, "Coma scale": 3, "Drug ineffective": 3, "Dyskinesia": 3, "Dysphoria": 3, "Dysstasia": 3, "Eczema": 3, "Embolic stroke": 3, "Facial paralysis": 3, "Fibrin D dimer": 3, "Flushing": 3, "Haemoglobin": 3, "Head discomfort": 3, "Inappropriate schedule of product administration": 3, "Investigation": 3, "Joint range of motion decreased": 3, "Laryngeal discomfort": 3, "Neck pain": 3, "PO2": 3, "Peripheral coldness": 3, "Respiratory disorder": 3, "Syncope": 3, "Tachycardia": 3, "Type I hypersensitivity": 3, "Activated partial thromboplastin time": 2, "Acute respiratory failure": 2, "Alanine aminotransferase": 2, "Anxiety": 2, "Aortic dissection": 2, "Arrhythmia": 2, "Auscultation": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Brain natriuretic peptide": 2, "CSF test": 2, "Cardiac failure": 2, "Cardiac failure acute": 2, "Cardiac failure chronic": 2, "Cerebral haemorrhage": 2, "Dehydration": 2, "Depressive symptom": 2, "Diabetes mellitus": 2, "Disease recurrence": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Dysphagia": 2, "Electrocardiogram ST segment depression": 2, "Electromyogram": 2, "Erythema of eyelid": 2, "Eye pruritus": 2, "Eyelid oedema": 2, "Fibrin D dimer increased": 2, "Gastroenteritis": 2, "Glycosylated haemoglobin": 2, "Hemiparesis": 2, "Hot flush": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Lacunar infarction": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Oedema": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "Paresis": 2, "Peripheral swelling": 2, "Pharyngeal swelling": 2, "Physical deconditioning": 2, "Pneumothorax": 2, "Rash pruritic": 2, "Respiratory arrest": 2, "Respiratory distress": 2, "Rhabdomyolysis": 2, "Seizure": 2, "Sensation of foreign body": 2, "Sensory disturbance": 2, "Subarachnoid haemorrhage": 2, "Tachypnoea": 2, "Tension": 2, "Throat irritation": 2, "Throat tightness": 2, "Troponin": 2, "Ultrasound scan": 2, "Urinary retention": 2, "Vasculitis": 2, "Wheezing": 2, "White blood cell count increased": 2, "AST/ALT ratio": 1, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Allergy to vaccine": 1, "Alopecia areata": 1, "Amnesia": 1, "Amylase": 1, "Amylase increased": 1, "Anal haemorrhage": 1, "Anti-GAD antibody": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Arterial stenosis": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase abnormal": 1, "Asthenopia": 1, "Ataxia": 1, "Atheroembolism": 1, "Atonic seizures": 1, "Atrial fibrillation": 1, "Autoimmune haemolytic anaemia": 1, "Axillary pain": 1, "Balance disorder": 1, "Beta haemolytic streptococcal infection": 1, "Binocular eye movement disorder": 1, "Blindness": 1, "Blister": 1, "Blood culture": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure normal": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature decreased": 1, "Brain stem infarction": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiomegaly": 1, "Catheterisation cardiac": 1, "Cerebral atrophy": 1, "Cerebral thrombosis": 1, "Cervical radiculopathy": 1, "Chest pain": 1, "Choking": 1, "Cholecystitis acute": 1, "Colitis ischaemic": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Contusion": 1, "Culture urine": 1, "Cyanosis": 1, "Cytomegalovirus infection": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Decreased activity": 1, "Delirium febrile": 1, "Dementia": 1, "Depression": 1, "Diplopia": 1, "Disease progression": 1, "Disorientation": 1, "Drug eruption": 1, "Dysaesthesia": 1, "Dyslalia": 1, "Dyslipidaemia": 1, "Dysphonia": 1, "Dysuria": 1, "Embolic cerebral infarction": 1, "Embolism": 1, "Enanthema": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophil count": 1, "Epstein-Barr virus infection": 1, "Epstein-Barr virus test": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Eye irritation": 1, "Eyelid function disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Gamma-glutamyltransferase": 1, "Gastritis erosive": 1, "Gastrointestinal haemorrhage": 1, "Glomerular filtration rate": 1, "Grip strength": 1, "Haematemesis": 1, "Haematochezia": 1, "Haemorrhagic cerebral infarction": 1, "Haemorrhagic disorder": 1, "Heart rate decreased": 1, "Henoch-Schonlein purpura": 1, "Hepatic function abnormal": 1, "Histology": 1, "Hydrocephalus": 1, "Hypercapnia": 1, "Hyperhidrosis": 1, "Hyperthermia": 1, "Hyponatraemia": 1, "Hypopnoea": 1, "Hyporeflexia": 1, "Ileus": 1, "Inflammation": 1, "Initial insomnia": 1, "Insomnia": 1, "Insulin C-peptide": 1, "Intermittent claudication": 1, "Joint stiffness": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Legionella test": 1, "Limb discomfort": 1, "Lip oedema": 1, "Lip swelling": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Matrix metalloproteinase-3": 1, "Meningitis": 1, "Mental disorder": 1, "Mononeuritis": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle disorder": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Mycoplasma test": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Neurologic neglect syndrome": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuromyopathy": 1, "Neutrophil count": 1, "Nuchal rigidity": 1, "Nucleic acid test": 1, "Obstructive airways disorder": 1, "Obturator hernia": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Oedema peripheral": 1, "Optic nerve disorder": 1, "Optic neuritis": 1, "Oral mucosa erosion": 1, "Oral mucosal roughening": 1, "Oral pain": 1, "Papule": 1, "Paralysis": 1, "Pemphigoid": 1, "Pemphigus": 1, "Perivascular dermatitis": 1, "Pharyngeal paraesthesia": 1, "Plantar erythema": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Pneumonia staphylococcal": 1, "Pneumonia streptococcal": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Post herpetic neuralgia": 1, "Posture abnormal": 1, "Productive cough": 1, "Prostate cancer": 1, "Prothrombin time": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Purpura": 1, "Pyelonephritis acute": 1, "Radioallergosorbent test": 1, "Red blood cell sedimentation rate": 1, "Regurgitation": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "Retinal artery occlusion": 1, "Rheumatic disorder": 1, "Rheumatoid factor": 1, "Sepsis": 1, "Septic shock": 1, "Seronegative arthritis": 1, "Skin discolouration": 1, "Social anxiety disorder": 1, "Somatic symptom disorder": 1, "Specialist consultation": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Stridor": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suicide attempt": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Tachyarrhythmia": 1, "Temperature perception test abnormal": 1, "Tenosynovitis": 1, "Thirst": 1, "Thrombocytopenia": 1, "Troponin increased": 1, "Type 1 diabetes mellitus": 1, "Ultrasound Doppler": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Use of accessory respiratory muscles": 1, "Vaccination site haemorrhage": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vertigo positional": 1, "Visual brightness": 1, "Visual perseveration": 1, "Vital functions abnormal": 1, "X-ray": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4834", "histograms": [{"histogram": {"Body temperature": 190, "Blood pressure measurement": 64, "Oxygen saturation": 51, "Pyrexia": 49, "Heart rate": 48, "Anaphylactic reaction": 43, "Headache": 30, "Erythema": 27, "Nausea": 27, "Blood pressure increased": 26, "Dizziness": 25, "Pruritus": 25, "Malaise": 21, "Dyspnoea": 20, "Muscular weakness": 20, "Hypoaesthesia": 19, "Vomiting": 19, "Urticaria": 17, "Oropharyngeal discomfort": 15, "Cough": 14, "Cerebral infarction": 13, "Feeling abnormal": 13, "Oxygen saturation decreased": 13, "Rash": 13, "Magnetic resonance imaging": 12, "Cold sweat": 10, "Loss of consciousness": 10, "Vaccination site pain": 10, "Arthralgia": 9, "Computerised tomogram": 9, "Blood test": 8, "Cardio-respiratory arrest": 8, "Computerised tomogram head": 8, "Decreased appetite": 8, "Pain in extremity": 8, "Presyncope": 8, "Vital signs measurement": 8, "White blood cell count": 8, "Altered state of consciousness": 7, "Asthma": 7, "Chills": 7, "Depressed level of consciousness": 7, "Gait disturbance": 7, "Tremor": 7, "Asthenia": 6, "Blood pressure decreased": 6, "Death": 6, "Diarrhoea": 6, "Electrocardiogram": 6, "Fall": 6, "Heart rate increased": 6, "Hypertension": 6, "Pain": 6, "Pallor": 6, "Palpitations": 6, "SARS-CoV-2 test": 6, "Abdominal pain": 5, "Bradycardia": 5, "C-reactive protein": 5, "Chest X-ray": 5, "Chest discomfort": 5, "Feeling cold": 5, "Hypersensitivity": 5, "Photopsia": 5, "Feeling hot": 4, "Guillain-Barre syndrome": 4, "Hemiplegia": 4, "Herpes zoster": 4, "Hyperventilation": 4, "Magnetic resonance imaging head": 4, "Myalgia": 4, "Myocardial infarction": 4, "Neuropathy peripheral": 4, "Pneumonia": 4, "Rash erythematous": 4, "Somnolence": 4, "Blood creatine phosphokinase": 3, "Blood pressure systolic": 3, "C-reactive protein increased": 3, "COVID-19": 3, "Cardiac tamponade": 3, "Coma scale": 3, "Drug ineffective": 3, "Dyskinesia": 3, "Dysphoria": 3, "Dysstasia": 3, "Eczema": 3, "Embolic stroke": 3, "Facial paralysis": 3, "Fibrin D dimer": 3, "Flushing": 3, "Haemoglobin": 3, "Head discomfort": 3, "Inappropriate schedule of product administration": 3, "Investigation": 3, "Joint range of motion decreased": 3, "Laryngeal discomfort": 3, "Neck pain": 3, "PO2": 3, "Peripheral coldness": 3, "Respiratory disorder": 3, "Syncope": 3, "Tachycardia": 3, "Type I hypersensitivity": 3, "Activated partial thromboplastin time": 2, "Acute respiratory failure": 2, "Alanine aminotransferase": 2, "Anxiety": 2, "Aortic dissection": 2, "Arrhythmia": 2, "Auscultation": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Brain natriuretic peptide": 2, "CSF test": 2, "Cardiac failure": 2, "Cardiac failure acute": 2, "Cardiac failure chronic": 2, "Cerebral haemorrhage": 2, "Dehydration": 2, "Depressive symptom": 2, "Diabetes mellitus": 2, "Disease recurrence": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Dysphagia": 2, "Electrocardiogram ST segment depression": 2, "Electromyogram": 2, "Erythema of eyelid": 2, "Eye pruritus": 2, "Eyelid oedema": 2, "Fibrin D dimer increased": 2, "Gastroenteritis": 2, "Glycosylated haemoglobin": 2, "Hemiparesis": 2, "Hot flush": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Lacunar infarction": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Oedema": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "Paresis": 2, "Peripheral swelling": 2, "Pharyngeal swelling": 2, "Physical deconditioning": 2, "Pneumothorax": 2, "Rash pruritic": 2, "Respiratory arrest": 2, "Respiratory distress": 2, "Rhabdomyolysis": 2, "Seizure": 2, "Sensation of foreign body": 2, "Sensory disturbance": 2, "Subarachnoid haemorrhage": 2, "Tachypnoea": 2, "Tension": 2, "Throat irritation": 2, "Throat tightness": 2, "Troponin": 2, "Ultrasound scan": 2, "Urinary retention": 2, "Vasculitis": 2, "Wheezing": 2, "White blood cell count increased": 2, "AST/ALT ratio": 1, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Allergy to vaccine": 1, "Alopecia areata": 1, "Amnesia": 1, "Amylase": 1, "Amylase increased": 1, "Anal haemorrhage": 1, "Anti-GAD antibody": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Arterial stenosis": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase abnormal": 1, "Asthenopia": 1, "Ataxia": 1, "Atheroembolism": 1, "Atonic seizures": 1, "Atrial fibrillation": 1, "Autoimmune haemolytic anaemia": 1, "Axillary pain": 1, "Balance disorder": 1, "Beta haemolytic streptococcal infection": 1, "Binocular eye movement disorder": 1, "Blindness": 1, "Blister": 1, "Blood culture": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure normal": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature decreased": 1, "Brain stem infarction": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiomegaly": 1, "Catheterisation cardiac": 1, "Cerebral atrophy": 1, "Cerebral thrombosis": 1, "Cervical radiculopathy": 1, "Chest pain": 1, "Choking": 1, "Cholecystitis acute": 1, "Colitis ischaemic": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Contusion": 1, "Culture urine": 1, "Cyanosis": 1, "Cytomegalovirus infection": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Decreased activity": 1, "Delirium febrile": 1, "Dementia": 1, "Depression": 1, "Diplopia": 1, "Disease progression": 1, "Disorientation": 1, "Drug eruption": 1, "Dysaesthesia": 1, "Dyslalia": 1, "Dyslipidaemia": 1, "Dysphonia": 1, "Dysuria": 1, "Embolic cerebral infarction": 1, "Embolism": 1, "Enanthema": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophil count": 1, "Epstein-Barr virus infection": 1, "Epstein-Barr virus test": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Eye irritation": 1, "Eyelid function disorder": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Gamma-glutamyltransferase": 1, "Gastritis erosive": 1, "Gastrointestinal haemorrhage": 1, "Glomerular filtration rate": 1, "Grip strength": 1, "Haematemesis": 1, "Haematochezia": 1, "Haemorrhagic cerebral infarction": 1, "Haemorrhagic disorder": 1, "Heart rate decreased": 1, "Henoch-Schonlein purpura": 1, "Hepatic function abnormal": 1, "Histology": 1, "Hydrocephalus": 1, "Hypercapnia": 1, "Hyperhidrosis": 1, "Hyperthermia": 1, "Hyponatraemia": 1, "Hypopnoea": 1, "Hyporeflexia": 1, "Ileus": 1, "Inflammation": 1, "Initial insomnia": 1, "Insomnia": 1, "Insulin C-peptide": 1, "Intermittent claudication": 1, "Joint stiffness": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Legionella test": 1, "Limb discomfort": 1, "Lip oedema": 1, "Lip swelling": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Matrix metalloproteinase-3": 1, "Meningitis": 1, "Mental disorder": 1, "Mononeuritis": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle disorder": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Mycoplasma test": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Neurologic neglect syndrome": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neuromyopathy": 1, "Neutrophil count": 1, "Nuchal rigidity": 1, "Nucleic acid test": 1, "Obstructive airways disorder": 1, "Obturator hernia": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Oedema peripheral": 1, "Optic nerve disorder": 1, "Optic neuritis": 1, "Oral mucosa erosion": 1, "Oral mucosal roughening": 1, "Oral pain": 1, "Papule": 1, "Paralysis": 1, "Pemphigoid": 1, "Pemphigus": 1, "Perivascular dermatitis": 1, "Pharyngeal paraesthesia": 1, "Plantar erythema": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Pneumonia staphylococcal": 1, "Pneumonia streptococcal": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Post herpetic neuralgia": 1, "Posture abnormal": 1, "Productive cough": 1, "Prostate cancer": 1, "Prothrombin time": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Purpura": 1, "Pyelonephritis acute": 1, "Radioallergosorbent test": 1, "Red blood cell sedimentation rate": 1, "Regurgitation": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "Retinal artery occlusion": 1, "Rheumatic disorder": 1, "Rheumatoid factor": 1, "Sepsis": 1, "Septic shock": 1, "Seronegative arthritis": 1, "Skin discolouration": 1, "Social anxiety disorder": 1, "Somatic symptom disorder": 1, "Specialist consultation": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Stridor": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suicide attempt": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Tachyarrhythmia": 1, "Temperature perception test abnormal": 1, "Tenosynovitis": 1, "Thirst": 1, "Thrombocytopenia": 1, "Troponin increased": 1, "Type 1 diabetes mellitus": 1, "Ultrasound Doppler": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Use of accessory respiratory muscles": 1, "Vaccination site haemorrhage": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vertigo positional": 1, "Visual brightness": 1, "Visual perseveration": 1, "Vital functions abnormal": 1, "X-ray": 1, "pH body fluid": 1}, "batchcodes": ["EY4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY4838.json b/docs/data/histograms/Japan/EY4838.json
index 14543a3ca9a..93c5d10b7e9 100644
--- a/docs/data/histograms/Japan/EY4838.json
+++ b/docs/data/histograms/Japan/EY4838.json
@@ -1 +1 @@
-{"batchcode": "EY4838", "histograms": [{"batchcodes": ["EY4838"], "histogram": {"Body temperature": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Palpitations": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4838", "histograms": [{"histogram": {"Body temperature": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Palpitations": 1, "Pulmonary embolism": 1}, "batchcodes": ["EY4838"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY5220.json b/docs/data/histograms/Japan/EY5220.json
index b7304a8a257..a932c9a96ef 100644
--- a/docs/data/histograms/Japan/EY5220.json
+++ b/docs/data/histograms/Japan/EY5220.json
@@ -1 +1 @@
-{"batchcode": "EY5220", "histograms": [{"batchcodes": ["EY5220"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Palpitations": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5220", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Palpitations": 1, "Swelling face": 1}, "batchcodes": ["EY5220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY5420.json b/docs/data/histograms/Japan/EY5420.json
index 8c286e57ffc..19084a1a852 100644
--- a/docs/data/histograms/Japan/EY5420.json
+++ b/docs/data/histograms/Japan/EY5420.json
@@ -1 +1 @@
-{"batchcode": "EY5420", "histograms": [{"batchcodes": ["EY5420"], "histogram": {"Body temperature": 311, "Blood pressure measurement": 119, "Oxygen saturation": 101, "Heart rate": 87, "Pyrexia": 75, "Anaphylactic reaction": 61, "Feeling abnormal": 41, "Headache": 41, "Malaise": 39, "Blood pressure increased": 38, "Nausea": 36, "Pruritus": 33, "Dizziness": 30, "Erythema": 30, "Dyspnoea": 29, "Hypoaesthesia": 29, "Cough": 25, "Blood test": 23, "Vomiting": 23, "Blood pressure decreased": 20, "Rash": 20, "Vaccination site pain": 19, "Cerebral infarction": 18, "Palpitations": 18, "Seizure": 18, "C-reactive protein": 17, "Myalgia": 17, "Oropharyngeal discomfort": 17, "Tremor": 17, "Oxygen saturation decreased": 16, "Urticaria": 16, "White blood cell count": 16, "Vital signs measurement": 15, "Presyncope": 14, "Asthenia": 13, "Cardio-respiratory arrest": 13, "Chills": 13, "Computerised tomogram head": 13, "Magnetic resonance imaging": 13, "Investigation": 12, "Pain": 12, "Arthralgia": 11, "Computerised tomogram": 11, "Electrocardiogram": 11, "Heart rate increased": 11, "Loss of consciousness": 11, "Abdominal pain": 10, "Diarrhoea": 10, "Fall": 10, "Feeling cold": 10, "Pallor": 10, "Respiratory rate": 10, "SARS-CoV-2 test": 10, "Tachycardia": 10, "Back pain": 9, "Chest discomfort": 9, "Cold sweat": 9, "Fatigue": 9, "Fibrin D dimer": 9, "Hypertension": 9, "Pain in extremity": 9, "Platelet count": 9, "Alanine aminotransferase": 8, "Altered state of consciousness": 8, "Aspartate aminotransferase": 8, "Asthma": 8, "C-reactive protein increased": 8, "Decreased appetite": 8, "Depressed level of consciousness": 8, "Echocardiogram": 8, "Gamma-glutamyltransferase": 8, "Magnetic resonance imaging head": 8, "Throat tightness": 8, "Cerebral haemorrhage": 7, "Computerised tomogram thorax": 7, "Facial paralysis": 7, "Fibrin degradation products": 7, "Hypersensitivity": 7, "Hyperventilation": 7, "Inflammation": 7, "Muscular weakness": 7, "Pneumonia": 7, "Somnolence": 7, "Atrial fibrillation": 6, "COVID-19": 6, "Chest pain": 6, "Coagulopathy": 6, "Cyanosis": 6, "Drug ineffective": 6, "Dysphonia": 6, "Dysphoria": 6, "Haemorrhage subcutaneous": 6, "Hemiplegia": 6, "Hyperhidrosis": 6, "Neuropathy peripheral": 6, "Wheezing": 6, "Blood glucose": 5, "Cardiac arrest": 5, "Eyelid oedema": 5, "Head discomfort": 5, "Hepatic function abnormal": 5, "Herpes zoster": 5, "Hot flush": 5, "Movement disorder": 5, "Peripheral swelling": 5, "Shock": 5, "Urine analysis": 5, "Blood creatinine": 4, "Blood urea": 4, "Cardiac failure acute": 4, "Computerised tomogram abdomen": 4, "Disease recurrence": 4, "Drug eruption": 4, "Dysstasia": 4, "Feeling hot": 4, "Fibrin D dimer increased": 4, "Gait inability": 4, "Hypoaesthesia oral": 4, "Hypopnoea": 4, "Myocardial infarction": 4, "Myocarditis": 4, "Paraesthesia": 4, "Rhinorrhoea": 4, "Speech disorder": 4, "Swelling": 4, "Throat irritation": 4, "Thrombocytopenic purpura": 4, "Thrombosis": 4, "Vaccination site erythema": 4, "Vaccination site swelling": 4, "White blood cell count increased": 4, "X-ray": 4, "Abdominal distension": 3, "Antinuclear antibody": 3, "Aortic dissection": 3, "Aphasia": 3, "Arrhythmia": 3, "Auscultation": 3, "Basophil count": 3, "Blood alkaline phosphatase": 3, "Blood bilirubin": 3, "Blood lactate dehydrogenase": 3, "Blood pressure systolic": 3, "Cellulitis": 3, "Chronic obstructive pulmonary disease": 3, "Coma scale": 3, "Condition aggravated": 3, "Deafness": 3, "Delirium": 3, "Dyslalia": 3, "Eosinophil count": 3, "Erythema multiforme": 3, "Face oedema": 3, "Feeding disorder": 3, "Fibrin degradation products increased": 3, "Flushing": 3, "Haemoglobin": 3, "Haemorrhage": 3, "Hyperthermia": 3, "Ileus": 3, "Lip swelling": 3, "Lymphocyte count": 3, "Monocyte count": 3, "Neck pain": 3, "Neutrophil count": 3, "Oropharyngeal pain": 3, "Paresis": 3, "Pericarditis": 3, "Peripheral coldness": 3, "Physical examination": 3, "Platelet count decreased": 3, "Pneumonia aspiration": 3, "Rash erythematous": 3, "Red blood cell count": 3, "Restlessness": 3, "Sensory disturbance": 3, "Subarachnoid haemorrhage": 3, "Tachypnoea": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Vaccination site pruritus": 3, "Activated partial thromboplastin time": 2, "Alanine aminotransferase increased": 2, "Amylase": 2, "Angioedema": 2, "Aspartate aminotransferase increased": 2, "Blood creatine phosphokinase": 2, "Blood creatinine increased": 2, "Blood culture": 2, "Blood potassium": 2, "Blood uric acid": 2, "Carcinoembryonic antigen": 2, "Cardiac failure": 2, "Coagulation test abnormal": 2, "Cognitive disorder": 2, "Colitis ischaemic": 2, "Collagen disorder": 2, "Complement factor C3": 2, "Complement factor C4": 2, "Cutaneous symptom": 2, "Death": 2, "Deep vein thrombosis": 2, "Diplopia": 2, "Discomfort": 2, "Dysarthria": 2, "Dyspnoea exertional": 2, "Eczema": 2, "Embolic stroke": 2, "Encephalopathy": 2, "Epilepsy": 2, "Epistaxis": 2, "Erythema of eyelid": 2, "Eye pruritus": 2, "Gait disturbance": 2, "Gastrointestinal disorder": 2, "General physical health deterioration": 2, "Genital haemorrhage": 2, "Haematocrit": 2, "Haematuria": 2, "Hemiparesis": 2, "Hypoxia": 2, "Imaging procedure": 2, "Internal haemorrhage": 2, "Jaundice": 2, "Joint range of motion decreased": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Marasmus": 2, "Monoplegia": 2, "Musculoskeletal stiffness": 2, "Nitrite urine": 2, "Ocular hyperaemia": 2, "Oculomucocutaneous syndrome": 2, "Oedema peripheral": 2, "Petechiae": 2, "Polymyalgia rheumatica": 2, "Protein total": 2, "Prothrombin time": 2, "Pulmonary embolism": 2, "Pulse absent": 2, "Rash pruritic": 2, "Respiratory arrest": 2, "Respiratory depression": 2, "Respiratory distress": 2, "Rheumatoid factor": 2, "Sinus tachycardia": 2, "Sudden death": 2, "Suspected COVID-19": 2, "Syncope": 2, "Thalamus haemorrhage": 2, "Tonic convulsion": 2, "Toxic skin eruption": 2, "Troponin": 2, "Urinary sediment": 2, "Urinary tract infection": 2, "Vaccination failure": 2, "Vasculitis": 2, "Vertigo": 2, "Visual impairment": 2, "Yawning": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Abnormal faeces": 1, "Acoustic stimulation tests": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Adenomyosis": 1, "Adrenal insufficiency": 1, "Akathisia": 1, "Akinesia": 1, "Allergy test": 1, "Allergy to metals": 1, "Allergy to vaccine": 1, "Alpha 1 foetoprotein": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Anxiety": 1, "Aortic aneurysm": 1, "Apnoea": 1, "Arteriosclerosis": 1, "Asphyxia": 1, "Atrial septal defect": 1, "Atrioventricular block second degree": 1, "Autoantibody test": 1, "Axillary pain": 1, "Bell's palsy": 1, "Bilirubin conjugated": 1, "Biopsy heart": 1, "Biopsy kidney": 1, "Biopsy muscle": 1, "Biopsy skin": 1, "Bladder cancer": 1, "Blindness": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood count": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucose fluctuation": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood ketone body": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure normal": 1, "Blood pressure orthostatic decreased": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Body temperature increased": 1, "Bradycardia": 1, "Bradykinesia": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Breath sounds": 1, "Bronchospasm": 1, "Candida infection": 1, "Cardiac failure chronic": 1, "Cardiogenic shock": 1, "Cells in urine": 1, "Cerebellar infarction": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Choking": 1, "Choking sensation": 1, "Cholangitis": 1, "Cholinergic syndrome": 1, "Chondrocalcinosis pyrophosphate": 1, "Chronic fatigue syndrome": 1, "Chronic respiratory failure": 1, "Clinical dementia rating scale": 1, "Clot retraction": 1, "Coagulation factor": 1, "Coagulation test": 1, "Conjunctival haemorrhage": 1, "Conjunctival hyperaemia": 1, "Conjunctival oedema": 1, "Coordination abnormal": 1, "Coronary artery occlusion": 1, "Coronavirus test": 1, "Cranial nerve disorder": 1, "Crepitations": 1, "Cystitis": 1, "Cystitis haemorrhagic": 1, "Decreased immune responsiveness": 1, "Deformity thorax": 1, "Dehydration": 1, "Dementia": 1, "Dementia with Lewy bodies": 1, "Dermatitis allergic": 1, "Dermatomyositis": 1, "Disorganised speech": 1, "Disturbance in attention": 1, "Drooling": 1, "Dysgraphia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dyspraxia": 1, "Eating disorder": 1, "Eating disorder symptom": 1, "Electrocardiogram QRS complex": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Embolism": 1, "Enanthema": 1, "Encephalitis": 1, "Escherichia sepsis": 1, "Eye pain": 1, "Eye symptom": 1, "Faeces soft": 1, "Feeling jittery": 1, "Femur fracture": 1, "Flatulence": 1, "Foreign body in throat": 1, "Fracture pain": 1, "Full blood count": 1, "Functional residual capacity decreased": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal sounds abnormal": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Grip strength decreased": 1, "Groin pain": 1, "Growth hormone deficiency": 1, "HIV antibody": 1, "Haemolysis": 1, "Haemoptysis": 1, "Haemorrhagic diathesis": 1, "Hallucination, auditory": 1, "Hemianopia": 1, "Hemianopia homonymous": 1, "Hepatitis B antibody": 1, "Hepatitis B antigen": 1, "Hepatitis B core antibody": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis C virus test": 1, "Hepatitis fulminant": 1, "Histology": 1, "Hydrocephalus": 1, "Hyperkinesia": 1, "Hyperpyrexia": 1, "Hypertensive encephalopathy": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Hypotension": 1, "Hypothyroidism": 1, "Hypoxic-ischaemic encephalopathy": 1, "IgA nephropathy": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Immunisation reaction": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Infarction": 1, "Infection": 1, "Influenza like illness": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intracardiac thrombus": 1, "Joint ankylosis": 1, "Juvenile idiopathic arthritis": 1, "KL-6": 1, "Laryngeal discomfort": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lipaemic index score": 1, "Liver function test increased": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphocytic infiltration": 1, "Lymphoedema": 1, "Lymphoma": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging neck": 1, "Mammogram": 1, "Mass": 1, "Matrix metalloproteinase-3": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Meniere's disease": 1, "Meningitis": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myoclonic epilepsy": 1, "Myoclonus": 1, "Myositis": 1, "Nail bed bleeding": 1, "Nasal obstruction": 1, "Nasopharyngitis": 1, "Nasopharyngoscopy": 1, "Nerve conduction studies": 1, "Nervousness": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neurologic neglect syndrome": 1, "Neurological examination": 1, "Neurological examination normal": 1, "Nitrite urine present": 1, "Normal pressure hydrocephalus": 1, "Occult blood": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oral discomfort": 1, "Orthostatic hypotension": 1, "PO2": 1, "Palpatory finding abnormal": 1, "Pancreatitis acute": 1, "Papillary thyroid cancer": 1, "Papule": 1, "Paradoxical embolism": 1, "Pathology test": 1, "Pernio-like erythema": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal oedema": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Pharyngitis": 1, "Photopsia": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumothorax": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Protein urine": 1, "Proteinuria": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary fibrosis": 1, "Pulmonary thrombosis": 1, "Pulmonary toxicity": 1, "Pulse abnormal": 1, "Pupil fixed": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Red blood cell scan": 1, "Renal haemorrhage": 1, "Respiration abnormal": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Retinal artery occlusion": 1, "Rheumatoid factor increased": 1, "Ruptured cerebral aneurysm": 1, "Salivary hypersecretion": 1, "Satoyoshi syndrome": 1, "Scratch": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Skin weeping": 1, "Slow response to stimuli": 1, "Slow speech": 1, "Sneezing": 1, "Soliloquy": 1, "Specific gravity body fluid": 1, "Splenomegaly": 1, "Sputum culture": 1, "Sputum retention": 1, "Squamous cell carcinoma": 1, "Stertor": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Stridor": 1, "Subdural haematoma": 1, "Subdural haemorrhage": 1, "Supraventricular extrasystoles": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Systolic dysfunction": 1, "Tachyarrhythmia": 1, "Taste disorder": 1, "Tetany": 1, "Thirst": 1, "Thrombocytopenia": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic cerebral infarction": 1, "Thyroid gland scan abnormal": 1, "Thyroxine free": 1, "Total complement activity test": 1, "Transient ischaemic attack": 1, "Transitional cell carcinoma": 1, "Troponin I": 1, "Troponin increased": 1, "Tumour marker test": 1, "Type I hypersensitivity": 1, "Ultrasound testes": 1, "Unresponsive to stimuli": 1, "Upper respiratory tract inflammation": 1, "Urinary casts": 1, "Urinary incontinence": 1, "Urinary tract infection bacterial": 1, "Urine abnormality": 1, "Urobilinogen urine": 1, "Uterine leiomyoma": 1, "Vaccination site coldness": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Vascular insufficiency": 1, "Vasospasm": 1, "Ventricular extrasystoles": 1, "Ventricular hypokinesia": 1, "Viral test": 1, "Vision blurred": 1, "Vital capacity": 1, "Yellow skin": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5420", "histograms": [{"histogram": {"Body temperature": 311, "Blood pressure measurement": 119, "Oxygen saturation": 101, "Heart rate": 87, "Pyrexia": 75, "Anaphylactic reaction": 61, "Feeling abnormal": 41, "Headache": 41, "Malaise": 39, "Blood pressure increased": 38, "Nausea": 36, "Pruritus": 33, "Dizziness": 30, "Erythema": 30, "Dyspnoea": 29, "Hypoaesthesia": 29, "Cough": 25, "Blood test": 23, "Vomiting": 23, "Blood pressure decreased": 20, "Rash": 20, "Vaccination site pain": 19, "Cerebral infarction": 18, "Palpitations": 18, "Seizure": 18, "C-reactive protein": 17, "Myalgia": 17, "Oropharyngeal discomfort": 17, "Tremor": 17, "Oxygen saturation decreased": 16, "Urticaria": 16, "White blood cell count": 16, "Vital signs measurement": 15, "Presyncope": 14, "Asthenia": 13, "Cardio-respiratory arrest": 13, "Chills": 13, "Computerised tomogram head": 13, "Magnetic resonance imaging": 13, "Investigation": 12, "Pain": 12, "Arthralgia": 11, "Computerised tomogram": 11, "Electrocardiogram": 11, "Heart rate increased": 11, "Loss of consciousness": 11, "Abdominal pain": 10, "Diarrhoea": 10, "Fall": 10, "Feeling cold": 10, "Pallor": 10, "Respiratory rate": 10, "SARS-CoV-2 test": 10, "Tachycardia": 10, "Back pain": 9, "Chest discomfort": 9, "Cold sweat": 9, "Fatigue": 9, "Fibrin D dimer": 9, "Hypertension": 9, "Pain in extremity": 9, "Platelet count": 9, "Alanine aminotransferase": 8, "Altered state of consciousness": 8, "Aspartate aminotransferase": 8, "Asthma": 8, "C-reactive protein increased": 8, "Decreased appetite": 8, "Depressed level of consciousness": 8, "Echocardiogram": 8, "Gamma-glutamyltransferase": 8, "Magnetic resonance imaging head": 8, "Throat tightness": 8, "Cerebral haemorrhage": 7, "Computerised tomogram thorax": 7, "Facial paralysis": 7, "Fibrin degradation products": 7, "Hypersensitivity": 7, "Hyperventilation": 7, "Inflammation": 7, "Muscular weakness": 7, "Pneumonia": 7, "Somnolence": 7, "Atrial fibrillation": 6, "COVID-19": 6, "Chest pain": 6, "Coagulopathy": 6, "Cyanosis": 6, "Drug ineffective": 6, "Dysphonia": 6, "Dysphoria": 6, "Haemorrhage subcutaneous": 6, "Hemiplegia": 6, "Hyperhidrosis": 6, "Neuropathy peripheral": 6, "Wheezing": 6, "Blood glucose": 5, "Cardiac arrest": 5, "Eyelid oedema": 5, "Head discomfort": 5, "Hepatic function abnormal": 5, "Herpes zoster": 5, "Hot flush": 5, "Movement disorder": 5, "Peripheral swelling": 5, "Shock": 5, "Urine analysis": 5, "Blood creatinine": 4, "Blood urea": 4, "Cardiac failure acute": 4, "Computerised tomogram abdomen": 4, "Disease recurrence": 4, "Drug eruption": 4, "Dysstasia": 4, "Feeling hot": 4, "Fibrin D dimer increased": 4, "Gait inability": 4, "Hypoaesthesia oral": 4, "Hypopnoea": 4, "Myocardial infarction": 4, "Myocarditis": 4, "Paraesthesia": 4, "Rhinorrhoea": 4, "Speech disorder": 4, "Swelling": 4, "Throat irritation": 4, "Thrombocytopenic purpura": 4, "Thrombosis": 4, "Vaccination site erythema": 4, "Vaccination site swelling": 4, "White blood cell count increased": 4, "X-ray": 4, "Abdominal distension": 3, "Antinuclear antibody": 3, "Aortic dissection": 3, "Aphasia": 3, "Arrhythmia": 3, "Auscultation": 3, "Basophil count": 3, "Blood alkaline phosphatase": 3, "Blood bilirubin": 3, "Blood lactate dehydrogenase": 3, "Blood pressure systolic": 3, "Cellulitis": 3, "Chronic obstructive pulmonary disease": 3, "Coma scale": 3, "Condition aggravated": 3, "Deafness": 3, "Delirium": 3, "Dyslalia": 3, "Eosinophil count": 3, "Erythema multiforme": 3, "Face oedema": 3, "Feeding disorder": 3, "Fibrin degradation products increased": 3, "Flushing": 3, "Haemoglobin": 3, "Haemorrhage": 3, "Hyperthermia": 3, "Ileus": 3, "Lip swelling": 3, "Lymphocyte count": 3, "Monocyte count": 3, "Neck pain": 3, "Neutrophil count": 3, "Oropharyngeal pain": 3, "Paresis": 3, "Pericarditis": 3, "Peripheral coldness": 3, "Physical examination": 3, "Platelet count decreased": 3, "Pneumonia aspiration": 3, "Rash erythematous": 3, "Red blood cell count": 3, "Restlessness": 3, "Sensory disturbance": 3, "Subarachnoid haemorrhage": 3, "Tachypnoea": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Vaccination site pruritus": 3, "Activated partial thromboplastin time": 2, "Alanine aminotransferase increased": 2, "Amylase": 2, "Angioedema": 2, "Aspartate aminotransferase increased": 2, "Blood creatine phosphokinase": 2, "Blood creatinine increased": 2, "Blood culture": 2, "Blood potassium": 2, "Blood uric acid": 2, "Carcinoembryonic antigen": 2, "Cardiac failure": 2, "Coagulation test abnormal": 2, "Cognitive disorder": 2, "Colitis ischaemic": 2, "Collagen disorder": 2, "Complement factor C3": 2, "Complement factor C4": 2, "Cutaneous symptom": 2, "Death": 2, "Deep vein thrombosis": 2, "Diplopia": 2, "Discomfort": 2, "Dysarthria": 2, "Dyspnoea exertional": 2, "Eczema": 2, "Embolic stroke": 2, "Encephalopathy": 2, "Epilepsy": 2, "Epistaxis": 2, "Erythema of eyelid": 2, "Eye pruritus": 2, "Gait disturbance": 2, "Gastrointestinal disorder": 2, "General physical health deterioration": 2, "Genital haemorrhage": 2, "Haematocrit": 2, "Haematuria": 2, "Hemiparesis": 2, "Hypoxia": 2, "Imaging procedure": 2, "Internal haemorrhage": 2, "Jaundice": 2, "Joint range of motion decreased": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Marasmus": 2, "Monoplegia": 2, "Musculoskeletal stiffness": 2, "Nitrite urine": 2, "Ocular hyperaemia": 2, "Oculomucocutaneous syndrome": 2, "Oedema peripheral": 2, "Petechiae": 2, "Polymyalgia rheumatica": 2, "Protein total": 2, "Prothrombin time": 2, "Pulmonary embolism": 2, "Pulse absent": 2, "Rash pruritic": 2, "Respiratory arrest": 2, "Respiratory depression": 2, "Respiratory distress": 2, "Rheumatoid factor": 2, "Sinus tachycardia": 2, "Sudden death": 2, "Suspected COVID-19": 2, "Syncope": 2, "Thalamus haemorrhage": 2, "Tonic convulsion": 2, "Toxic skin eruption": 2, "Troponin": 2, "Urinary sediment": 2, "Urinary tract infection": 2, "Vaccination failure": 2, "Vasculitis": 2, "Vertigo": 2, "Visual impairment": 2, "Yawning": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Abnormal faeces": 1, "Acoustic stimulation tests": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Adenomyosis": 1, "Adrenal insufficiency": 1, "Akathisia": 1, "Akinesia": 1, "Allergy test": 1, "Allergy to metals": 1, "Allergy to vaccine": 1, "Alpha 1 foetoprotein": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Anxiety": 1, "Aortic aneurysm": 1, "Apnoea": 1, "Arteriosclerosis": 1, "Asphyxia": 1, "Atrial septal defect": 1, "Atrioventricular block second degree": 1, "Autoantibody test": 1, "Axillary pain": 1, "Bell's palsy": 1, "Bilirubin conjugated": 1, "Biopsy heart": 1, "Biopsy kidney": 1, "Biopsy muscle": 1, "Biopsy skin": 1, "Bladder cancer": 1, "Blindness": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood count": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucose fluctuation": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood ketone body": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure normal": 1, "Blood pressure orthostatic decreased": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Body temperature increased": 1, "Bradycardia": 1, "Bradykinesia": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Breath sounds": 1, "Bronchospasm": 1, "Candida infection": 1, "Cardiac failure chronic": 1, "Cardiogenic shock": 1, "Cells in urine": 1, "Cerebellar infarction": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Choking": 1, "Choking sensation": 1, "Cholangitis": 1, "Cholinergic syndrome": 1, "Chondrocalcinosis pyrophosphate": 1, "Chronic fatigue syndrome": 1, "Chronic respiratory failure": 1, "Clinical dementia rating scale": 1, "Clot retraction": 1, "Coagulation factor": 1, "Coagulation test": 1, "Conjunctival haemorrhage": 1, "Conjunctival hyperaemia": 1, "Conjunctival oedema": 1, "Coordination abnormal": 1, "Coronary artery occlusion": 1, "Coronavirus test": 1, "Cranial nerve disorder": 1, "Crepitations": 1, "Cystitis": 1, "Cystitis haemorrhagic": 1, "Decreased immune responsiveness": 1, "Deformity thorax": 1, "Dehydration": 1, "Dementia": 1, "Dementia with Lewy bodies": 1, "Dermatitis allergic": 1, "Dermatomyositis": 1, "Disorganised speech": 1, "Disturbance in attention": 1, "Drooling": 1, "Dysgraphia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dyspraxia": 1, "Eating disorder": 1, "Eating disorder symptom": 1, "Electrocardiogram QRS complex": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Embolism": 1, "Enanthema": 1, "Encephalitis": 1, "Escherichia sepsis": 1, "Eye pain": 1, "Eye symptom": 1, "Faeces soft": 1, "Feeling jittery": 1, "Femur fracture": 1, "Flatulence": 1, "Foreign body in throat": 1, "Fracture pain": 1, "Full blood count": 1, "Functional residual capacity decreased": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal sounds abnormal": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Grip strength decreased": 1, "Groin pain": 1, "Growth hormone deficiency": 1, "HIV antibody": 1, "Haemolysis": 1, "Haemoptysis": 1, "Haemorrhagic diathesis": 1, "Hallucination, auditory": 1, "Hemianopia": 1, "Hemianopia homonymous": 1, "Hepatitis B antibody": 1, "Hepatitis B antigen": 1, "Hepatitis B core antibody": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis C virus test": 1, "Hepatitis fulminant": 1, "Histology": 1, "Hydrocephalus": 1, "Hyperkinesia": 1, "Hyperpyrexia": 1, "Hypertensive encephalopathy": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Hypotension": 1, "Hypothyroidism": 1, "Hypoxic-ischaemic encephalopathy": 1, "IgA nephropathy": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Immunisation reaction": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Infarction": 1, "Infection": 1, "Influenza like illness": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intracardiac thrombus": 1, "Joint ankylosis": 1, "Juvenile idiopathic arthritis": 1, "KL-6": 1, "Laryngeal discomfort": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lipaemic index score": 1, "Liver function test increased": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphocytic infiltration": 1, "Lymphoedema": 1, "Lymphoma": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging neck": 1, "Mammogram": 1, "Mass": 1, "Matrix metalloproteinase-3": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Meniere's disease": 1, "Meningitis": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myoclonic epilepsy": 1, "Myoclonus": 1, "Myositis": 1, "Nail bed bleeding": 1, "Nasal obstruction": 1, "Nasopharyngitis": 1, "Nasopharyngoscopy": 1, "Nerve conduction studies": 1, "Nervousness": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neurologic neglect syndrome": 1, "Neurological examination": 1, "Neurological examination normal": 1, "Nitrite urine present": 1, "Normal pressure hydrocephalus": 1, "Occult blood": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oral discomfort": 1, "Orthostatic hypotension": 1, "PO2": 1, "Palpatory finding abnormal": 1, "Pancreatitis acute": 1, "Papillary thyroid cancer": 1, "Papule": 1, "Paradoxical embolism": 1, "Pathology test": 1, "Pernio-like erythema": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal oedema": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Pharyngitis": 1, "Photopsia": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumothorax": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Protein urine": 1, "Proteinuria": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary fibrosis": 1, "Pulmonary thrombosis": 1, "Pulmonary toxicity": 1, "Pulse abnormal": 1, "Pupil fixed": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Red blood cell scan": 1, "Renal haemorrhage": 1, "Respiration abnormal": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Retinal artery occlusion": 1, "Rheumatoid factor increased": 1, "Ruptured cerebral aneurysm": 1, "Salivary hypersecretion": 1, "Satoyoshi syndrome": 1, "Scratch": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Skin weeping": 1, "Slow response to stimuli": 1, "Slow speech": 1, "Sneezing": 1, "Soliloquy": 1, "Specific gravity body fluid": 1, "Splenomegaly": 1, "Sputum culture": 1, "Sputum retention": 1, "Squamous cell carcinoma": 1, "Stertor": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Stridor": 1, "Subdural haematoma": 1, "Subdural haemorrhage": 1, "Supraventricular extrasystoles": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Systolic dysfunction": 1, "Tachyarrhythmia": 1, "Taste disorder": 1, "Tetany": 1, "Thirst": 1, "Thrombocytopenia": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic cerebral infarction": 1, "Thyroid gland scan abnormal": 1, "Thyroxine free": 1, "Total complement activity test": 1, "Transient ischaemic attack": 1, "Transitional cell carcinoma": 1, "Troponin I": 1, "Troponin increased": 1, "Tumour marker test": 1, "Type I hypersensitivity": 1, "Ultrasound testes": 1, "Unresponsive to stimuli": 1, "Upper respiratory tract inflammation": 1, "Urinary casts": 1, "Urinary incontinence": 1, "Urinary tract infection bacterial": 1, "Urine abnormality": 1, "Urobilinogen urine": 1, "Uterine leiomyoma": 1, "Vaccination site coldness": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Vascular insufficiency": 1, "Vasospasm": 1, "Ventricular extrasystoles": 1, "Ventricular hypokinesia": 1, "Viral test": 1, "Vision blurred": 1, "Vital capacity": 1, "Yellow skin": 1, "pH body fluid": 1}, "batchcodes": ["EY5420"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY5422.json b/docs/data/histograms/Japan/EY5422.json
index 215a37c6fac..548dcd8e8c4 100644
--- a/docs/data/histograms/Japan/EY5422.json
+++ b/docs/data/histograms/Japan/EY5422.json
@@ -1 +1 @@
-{"batchcode": "EY5422", "histograms": [{"batchcodes": ["EY5422"], "histogram": {"Body temperature": 124, "Blood pressure measurement": 52, "Oxygen saturation": 42, "Heart rate": 30, "Blood pressure increased": 24, "Pyrexia": 22, "Dyspnoea": 21, "Anaphylactic reaction": 19, "Pruritus": 15, "Vomiting": 15, "Erythema": 14, "Feeling abnormal": 14, "Blood pressure decreased": 12, "Rash": 12, "Cerebral infarction": 11, "Nausea": 10, "Presyncope": 10, "Electrocardiogram": 9, "Headache": 9, "Loss of consciousness": 9, "Cold sweat": 8, "Dizziness": 8, "Hypoaesthesia": 8, "Muscular weakness": 8, "Oxygen saturation decreased": 8, "Urticaria": 8, "Arthralgia": 7, "Investigation": 7, "Malaise": 7, "Palpitations": 7, "SARS-CoV-2 test": 7, "Seizure": 7, "C-reactive protein": 6, "Magnetic resonance imaging": 6, "Magnetic resonance imaging head": 6, "Arthritis": 5, "Blood test": 5, "Cardio-respiratory arrest": 5, "Computerised tomogram": 5, "Condition aggravated": 5, "Hypersensitivity": 5, "Hyperventilation": 5, "Pericardial effusion": 5, "Platelet count": 5, "Pneumonia aspiration": 5, "Tremor": 5, "Wheezing": 5, "Asthenia": 4, "Chest X-ray": 4, "Cough": 4, "Facial paralysis": 4, "Feeling hot": 4, "Neuropathy peripheral": 4, "Pain in extremity": 4, "Pallor": 4, "Physical deconditioning": 4, "Vaccination site pain": 4, "Abdominal pain": 3, "Anaemia": 3, "Atrial fibrillation": 3, "Blood creatine phosphokinase": 3, "Blood urea": 3, "Body temperature increased": 3, "Cardiac arrest": 3, "Chest discomfort": 3, "Coma scale": 3, "Computerised tomogram head": 3, "Computerised tomogram thorax": 3, "Depressed level of consciousness": 3, "Drug eruption": 3, "Dysarthria": 3, "Dysphagia": 3, "Echocardiogram": 3, "Fall": 3, "Flushing": 3, "Haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Hemiplegia": 3, "Hyperhidrosis": 3, "Myocarditis": 3, "Oropharyngeal discomfort": 3, "Paralysis": 3, "Peripheral coldness": 3, "Pneumonia": 3, "Respiratory arrest": 3, "Respiratory rate": 3, "Sensory disturbance": 3, "Vaccination site swelling": 3, "White blood cell count": 3, "Acute respiratory distress syndrome": 2, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Antineutrophil cytoplasmic antibody": 2, "Antinuclear antibody": 2, "Aortic dissection": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Biopsy skin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood creatine": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Brain natriuretic peptide": 2, "C-reactive protein increased": 2, "COVID-19": 2, "Cardiac tamponade": 2, "Chills": 2, "Decreased appetite": 2, "Deep vein thrombosis": 2, "Dehydration": 2, "Diarrhoea": 2, "Discomfort": 2, "Dyskinesia": 2, "Dysphoria": 2, "Dysstasia": 2, "Electromyogram": 2, "Eosinophil count": 2, "Feeling cold": 2, "Fibrin D dimer": 2, "Gamma-glutamyltransferase": 2, "Grip strength": 2, "Grip strength decreased": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Heat illness": 2, "Hemiparesis": 2, "Hot flush": 2, "Hypertension": 2, "Inflammation": 2, "Interstitial lung disease": 2, "Movement disorder": 2, "Neck pain": 2, "Nerve conduction studies": 2, "Neutrophil count": 2, "PO2": 2, "Paraesthesia": 2, "Pericarditis": 2, "Platelet count decreased": 2, "Pleural effusion": 2, "Pulmonary embolism": 2, "Pulse abnormal": 2, "Serum ferritin": 2, "Shock": 2, "Somnolence": 2, "Thrombocytopenic purpura": 2, "Troponin T": 2, "Ultrasound scan": 2, "Vaccination site erythema": 2, "Vaccination site movement impairment": 2, "Vasculitis": 2, "White blood cell count increased": 2, "X-ray": 2, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Akinesia": 1, "Albumin globulin ratio": 1, "Allergy to vaccine": 1, "Amylase": 1, "Anaphylactic shock": 1, "Angina unstable": 1, "Angiocardiogram": 1, "Angiogram": 1, "Angular cheilitis": 1, "Antibody test": 1, "Anxiety disorder": 1, "Aplasia pure red cell": 1, "Arthropathy": 1, "Aspiration": 1, "Aspiration bone marrow": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Audiogram": 1, "Autonomic nervous system imbalance": 1, "Bacterial infection": 1, "Bacteriuria": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood albumin": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood uric acid": 1, "Bradycardia": 1, "Bradykinesia": 1, "Brain natriuretic peptide increased": 1, "Bronchospasm": 1, "Carbohydrate antigen 125": 1, "Carbohydrate antigen 19-9": 1, "Carbon dioxide": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiogenic shock": 1, "Cardiomegaly": 1, "Cerebellar infarction": 1, "Cerebral haemorrhage": 1, "Chest injury": 1, "Chest pain": 1, "Circulatory collapse": 1, "Colonoscopy": 1, "Coma": 1, "Complex regional pain syndrome": 1, "Computerised tomogram abdomen": 1, "Conjunctival hyperaemia": 1, "Culture": 1, "Cyanosis": 1, "Cystitis": 1, "Cytology": 1, "Deafness neurosensory": 1, "Death": 1, "Decubitus ulcer": 1, "Dermatitis": 1, "Dermatitis bullous": 1, "Disease recurrence": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Ear pruritus": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "End stage renal disease": 1, "Endoscopy upper gastrointestinal tract": 1, "Epistaxis": 1, "Erythema multiforme": 1, "External ear pain": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrostomy": 1, "Gaze palsy": 1, "Glaucoma": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma": 1, "Haemolytic anaemia": 1, "Heart rate normal": 1, "Helicobacter test": 1, "Herpes zoster": 1, "Histology": 1, "Hypoacusis": 1, "Hyponatraemia": 1, "Hypotension": 1, "Hypoxia": 1, "Idiopathic pulmonary fibrosis": 1, "Illness": 1, "Imaging procedure": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Infectious mononucleosis": 1, "Insomnia": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Iron deficiency anaemia": 1, "Joint swelling": 1, "Joint warmth": 1, "KL-6": 1, "Lip blister": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Malignant ascites": 1, "Marasmus": 1, "Mass": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Melaena": 1, "Meningitis aseptic": 1, "Meningitis viral": 1, "Metamyelocyte count": 1, "Milia": 1, "Mixed deafness": 1, "Mobility decreased": 1, "Monocyte count": 1, "Mononeuropathy multiplex": 1, "Mononuclear cell count": 1, "Mononuclear cell count increased": 1, "Monoplegia": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Muscle swelling": 1, "Myalgia": 1, "Myelitis": 1, "Myelodysplastic syndrome": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neoplasm malignant": 1, "Nephrogenic anaemia": 1, "Neurological examination": 1, "Neurological symptom": 1, "Normocytic anaemia": 1, "Oculomucocutaneous syndrome": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Organ failure": 1, "Oropharyngeal spasm": 1, "Orthopnoea": 1, "Osteoarthritis": 1, "Paresis": 1, "Periarthritis": 1, "Pericardial drainage test": 1, "Peripheral swelling": 1, "Peritoneal fluid analysis": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Positron emission tomography-magnetic resonance imaging": 1, "Productive cough": 1, "Protein total": 1, "Protein total increased": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary hypertension": 1, "Purpura": 1, "Pyuria": 1, "Quadriparesis": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Renal failure": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Right ventricular failure": 1, "Salivary gland enlargement": 1, "Serology test": 1, "Skin abrasion": 1, "Skin erosion": 1, "Specialist consultation": 1, "Speech disorder": 1, "Speech rehabilitation": 1, "Spinal column injury": 1, "Spinal myelogram": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Stridor": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Tachycardia": 1, "Tachypnoea": 1, "Target skin lesion": 1, "Taste disorder": 1, "Tetany": 1, "Thalamus haemorrhage": 1, "Thrombocytopenia": 1, "Thrombophlebitis": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Tumour marker test": 1, "Tympanic membrane perforation": 1, "Type I hypersensitivity": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site vesicles": 1, "Venous haemorrhage": 1, "Ventricular tachycardia": 1, "Viral test": 1, "Visual impairment": 1, "Water intoxication": 1, "Yellow skin": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5422", "histograms": [{"histogram": {"Body temperature": 124, "Blood pressure measurement": 52, "Oxygen saturation": 42, "Heart rate": 30, "Blood pressure increased": 24, "Pyrexia": 22, "Dyspnoea": 21, "Anaphylactic reaction": 19, "Pruritus": 15, "Vomiting": 15, "Erythema": 14, "Feeling abnormal": 14, "Blood pressure decreased": 12, "Rash": 12, "Cerebral infarction": 11, "Nausea": 10, "Presyncope": 10, "Electrocardiogram": 9, "Headache": 9, "Loss of consciousness": 9, "Cold sweat": 8, "Dizziness": 8, "Hypoaesthesia": 8, "Muscular weakness": 8, "Oxygen saturation decreased": 8, "Urticaria": 8, "Arthralgia": 7, "Investigation": 7, "Malaise": 7, "Palpitations": 7, "SARS-CoV-2 test": 7, "Seizure": 7, "C-reactive protein": 6, "Magnetic resonance imaging": 6, "Magnetic resonance imaging head": 6, "Arthritis": 5, "Blood test": 5, "Cardio-respiratory arrest": 5, "Computerised tomogram": 5, "Condition aggravated": 5, "Hypersensitivity": 5, "Hyperventilation": 5, "Pericardial effusion": 5, "Platelet count": 5, "Pneumonia aspiration": 5, "Tremor": 5, "Wheezing": 5, "Asthenia": 4, "Chest X-ray": 4, "Cough": 4, "Facial paralysis": 4, "Feeling hot": 4, "Neuropathy peripheral": 4, "Pain in extremity": 4, "Pallor": 4, "Physical deconditioning": 4, "Vaccination site pain": 4, "Abdominal pain": 3, "Anaemia": 3, "Atrial fibrillation": 3, "Blood creatine phosphokinase": 3, "Blood urea": 3, "Body temperature increased": 3, "Cardiac arrest": 3, "Chest discomfort": 3, "Coma scale": 3, "Computerised tomogram head": 3, "Computerised tomogram thorax": 3, "Depressed level of consciousness": 3, "Drug eruption": 3, "Dysarthria": 3, "Dysphagia": 3, "Echocardiogram": 3, "Fall": 3, "Flushing": 3, "Haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Hemiplegia": 3, "Hyperhidrosis": 3, "Myocarditis": 3, "Oropharyngeal discomfort": 3, "Paralysis": 3, "Peripheral coldness": 3, "Pneumonia": 3, "Respiratory arrest": 3, "Respiratory rate": 3, "Sensory disturbance": 3, "Vaccination site swelling": 3, "White blood cell count": 3, "Acute respiratory distress syndrome": 2, "Alanine aminotransferase": 2, "Altered state of consciousness": 2, "Antineutrophil cytoplasmic antibody": 2, "Antinuclear antibody": 2, "Aortic dissection": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Biopsy skin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood creatine": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Brain natriuretic peptide": 2, "C-reactive protein increased": 2, "COVID-19": 2, "Cardiac tamponade": 2, "Chills": 2, "Decreased appetite": 2, "Deep vein thrombosis": 2, "Dehydration": 2, "Diarrhoea": 2, "Discomfort": 2, "Dyskinesia": 2, "Dysphoria": 2, "Dysstasia": 2, "Electromyogram": 2, "Eosinophil count": 2, "Feeling cold": 2, "Fibrin D dimer": 2, "Gamma-glutamyltransferase": 2, "Grip strength": 2, "Grip strength decreased": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Heat illness": 2, "Hemiparesis": 2, "Hot flush": 2, "Hypertension": 2, "Inflammation": 2, "Interstitial lung disease": 2, "Movement disorder": 2, "Neck pain": 2, "Nerve conduction studies": 2, "Neutrophil count": 2, "PO2": 2, "Paraesthesia": 2, "Pericarditis": 2, "Platelet count decreased": 2, "Pleural effusion": 2, "Pulmonary embolism": 2, "Pulse abnormal": 2, "Serum ferritin": 2, "Shock": 2, "Somnolence": 2, "Thrombocytopenic purpura": 2, "Troponin T": 2, "Ultrasound scan": 2, "Vaccination site erythema": 2, "Vaccination site movement impairment": 2, "Vasculitis": 2, "White blood cell count increased": 2, "X-ray": 2, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Akinesia": 1, "Albumin globulin ratio": 1, "Allergy to vaccine": 1, "Amylase": 1, "Anaphylactic shock": 1, "Angina unstable": 1, "Angiocardiogram": 1, "Angiogram": 1, "Angular cheilitis": 1, "Antibody test": 1, "Anxiety disorder": 1, "Aplasia pure red cell": 1, "Arthropathy": 1, "Aspiration": 1, "Aspiration bone marrow": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Audiogram": 1, "Autonomic nervous system imbalance": 1, "Bacterial infection": 1, "Bacteriuria": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood albumin": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood uric acid": 1, "Bradycardia": 1, "Bradykinesia": 1, "Brain natriuretic peptide increased": 1, "Bronchospasm": 1, "Carbohydrate antigen 125": 1, "Carbohydrate antigen 19-9": 1, "Carbon dioxide": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiogenic shock": 1, "Cardiomegaly": 1, "Cerebellar infarction": 1, "Cerebral haemorrhage": 1, "Chest injury": 1, "Chest pain": 1, "Circulatory collapse": 1, "Colonoscopy": 1, "Coma": 1, "Complex regional pain syndrome": 1, "Computerised tomogram abdomen": 1, "Conjunctival hyperaemia": 1, "Culture": 1, "Cyanosis": 1, "Cystitis": 1, "Cytology": 1, "Deafness neurosensory": 1, "Death": 1, "Decubitus ulcer": 1, "Dermatitis": 1, "Dermatitis bullous": 1, "Disease recurrence": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Ear pruritus": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "End stage renal disease": 1, "Endoscopy upper gastrointestinal tract": 1, "Epistaxis": 1, "Erythema multiforme": 1, "External ear pain": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrostomy": 1, "Gaze palsy": 1, "Glaucoma": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma": 1, "Haemolytic anaemia": 1, "Heart rate normal": 1, "Helicobacter test": 1, "Herpes zoster": 1, "Histology": 1, "Hypoacusis": 1, "Hyponatraemia": 1, "Hypotension": 1, "Hypoxia": 1, "Idiopathic pulmonary fibrosis": 1, "Illness": 1, "Imaging procedure": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Infectious mononucleosis": 1, "Insomnia": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Iron deficiency anaemia": 1, "Joint swelling": 1, "Joint warmth": 1, "KL-6": 1, "Lip blister": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Malignant ascites": 1, "Marasmus": 1, "Mass": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Melaena": 1, "Meningitis aseptic": 1, "Meningitis viral": 1, "Metamyelocyte count": 1, "Milia": 1, "Mixed deafness": 1, "Mobility decreased": 1, "Monocyte count": 1, "Mononeuropathy multiplex": 1, "Mononuclear cell count": 1, "Mononuclear cell count increased": 1, "Monoplegia": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Muscle swelling": 1, "Myalgia": 1, "Myelitis": 1, "Myelodysplastic syndrome": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neoplasm malignant": 1, "Nephrogenic anaemia": 1, "Neurological examination": 1, "Neurological symptom": 1, "Normocytic anaemia": 1, "Oculomucocutaneous syndrome": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Organ failure": 1, "Oropharyngeal spasm": 1, "Orthopnoea": 1, "Osteoarthritis": 1, "Paresis": 1, "Periarthritis": 1, "Pericardial drainage test": 1, "Peripheral swelling": 1, "Peritoneal fluid analysis": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Positron emission tomography-magnetic resonance imaging": 1, "Productive cough": 1, "Protein total": 1, "Protein total increased": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary hypertension": 1, "Purpura": 1, "Pyuria": 1, "Quadriparesis": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Renal failure": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Right ventricular failure": 1, "Salivary gland enlargement": 1, "Serology test": 1, "Skin abrasion": 1, "Skin erosion": 1, "Specialist consultation": 1, "Speech disorder": 1, "Speech rehabilitation": 1, "Spinal column injury": 1, "Spinal myelogram": 1, "Stevens-Johnson syndrome": 1, "Stomatitis": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Stridor": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Tachycardia": 1, "Tachypnoea": 1, "Target skin lesion": 1, "Taste disorder": 1, "Tetany": 1, "Thalamus haemorrhage": 1, "Thrombocytopenia": 1, "Thrombophlebitis": 1, "Thrombotic cerebral infarction": 1, "Thyroid function test": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Tumour marker test": 1, "Tympanic membrane perforation": 1, "Type I hypersensitivity": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site vesicles": 1, "Venous haemorrhage": 1, "Ventricular tachycardia": 1, "Viral test": 1, "Visual impairment": 1, "Water intoxication": 1, "Yellow skin": 1, "pH body fluid": 1}, "batchcodes": ["EY5422"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY5423.json b/docs/data/histograms/Japan/EY5423.json
index be401bbef4a..79110de4efc 100644
--- a/docs/data/histograms/Japan/EY5423.json
+++ b/docs/data/histograms/Japan/EY5423.json
@@ -1 +1 @@
-{"batchcode": "EY5423", "histograms": [{"batchcodes": ["EY5423"], "histogram": {"Body temperature": 164, "Blood pressure measurement": 79, "Oxygen saturation": 59, "Pyrexia": 45, "Heart rate": 43, "Blood pressure increased": 28, "Anaphylactic reaction": 24, "Erythema": 21, "Nausea": 20, "Feeling abnormal": 19, "Headache": 17, "Malaise": 17, "Cough": 16, "Pruritus": 16, "Blood test": 14, "Dizziness": 14, "Hypoaesthesia": 14, "Cerebral infarction": 13, "Presyncope": 13, "Rash": 13, "Blood pressure decreased": 12, "Oropharyngeal discomfort": 12, "Vomiting": 12, "Oxygen saturation decreased": 11, "Urticaria": 11, "Computerised tomogram": 10, "Depressed level of consciousness": 9, "Dyspnoea": 9, "Investigation": 9, "SARS-CoV-2 test": 9, "Hypertension": 8, "Palpitations": 8, "Platelet count": 8, "Blood creatine phosphokinase": 7, "Cold sweat": 7, "Electrocardiogram": 7, "Fall": 7, "Respiratory rate": 7, "Tremor": 7, "Vaccination site pain": 7, "Vital signs measurement": 7, "White blood cell count": 7, "Alanine aminotransferase": 6, "Arthralgia": 6, "Aspartate aminotransferase": 6, "Asthma": 6, "Blood glucose": 6, "C-reactive protein": 6, "Cardio-respiratory arrest": 6, "Chills": 6, "Heart rate increased": 6, "Loss of consciousness": 6, "Magnetic resonance imaging": 6, "Blood alkaline phosphatase": 5, "Chest X-ray": 5, "Computerised tomogram head": 5, "Decreased appetite": 5, "Diarrhoea": 5, "Dysphonia": 5, "Echocardiogram": 5, "Facial paralysis": 5, "Pneumonia": 5, "Tachycardia": 5, "Anaphylactic shock": 4, "Asthenia": 4, "Blood bilirubin": 4, "Blood chloride": 4, "Blood creatinine": 4, "Blood potassium": 4, "Blood urea": 4, "Cardiac arrest": 4, "Cardiac failure": 4, "Chest discomfort": 4, "Coma scale": 4, "Death": 4, "Dysphoria": 4, "Gait disturbance": 4, "Gamma-glutamyltransferase": 4, "Herpes zoster": 4, "Hyperventilation": 4, "Magnetic resonance imaging head": 4, "Muscle spasms": 4, "Muscular weakness": 4, "Neuropathy peripheral": 4, "Paralysis": 4, "Protein total": 4, "Rash erythematous": 4, "Respiratory arrest": 4, "Seizure": 4, "Tachypnoea": 4, "Toxic skin eruption": 4, "Wheezing": 4, "Abdominal pain": 3, "Altered state of consciousness": 3, "Back pain": 3, "Blood albumin": 3, "Blood creatine phosphokinase increased": 3, "Blood glucose increased": 3, "Blood lactate dehydrogenase": 3, "Blood pressure immeasurable": 3, "Blood pressure systolic increased": 3, "Blood sodium": 3, "Blood uric acid": 3, "C-reactive protein increased": 3, "COVID-19": 3, "Chest pain": 3, "Computerised tomogram thorax": 3, "Condition aggravated": 3, "Cyanosis": 3, "Hemiplegia": 3, "Hot flush": 3, "Imaging procedure": 3, "Immune thrombocytopenia": 3, "Internal haemorrhage": 3, "Interstitial lung disease": 3, "Low density lipoprotein": 3, "Myocarditis": 3, "Nasal congestion": 3, "Oropharyngeal pain": 3, "Pain": 3, "Pain in extremity": 3, "Pallor": 3, "Sneezing": 3, "Throat irritation": 3, "Urine analysis": 3, "Vaccination failure": 3, "Vision blurred": 3, "Abdominal discomfort": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase increased": 2, "Aspartate aminotransferase increased": 2, "Aspiration": 2, "Atrial fibrillation": 2, "Auscultation": 2, "Blood calcium": 2, "Blood cholesterol": 2, "Blood phosphorus": 2, "Blood pressure abnormal": 2, "Blood thyroid stimulating hormone": 2, "Blood triglycerides": 2, "Bradycardia": 2, "Breath sounds abnormal": 2, "CSF cell count": 2, "CSF test": 2, "Circulatory collapse": 2, "Cytology": 2, "Dermatitis bullous": 2, "Disease recurrence": 2, "Drug eruption": 2, "Dysphagia": 2, "Dysstasia": 2, "Eczema": 2, "Encephalitis": 2, "Faeces discoloured": 2, "Feeling cold": 2, "Flushing": 2, "Glomerular filtration rate": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemoglobin": 2, "Heart rate decreased": 2, "Hemiparesis": 2, "Hepatic function abnormal": 2, "High density lipoprotein": 2, "Hyperglycaemia": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Inflammation": 2, "Lacrimation increased": 2, "Limb discomfort": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Meningitis aseptic": 2, "Myalgia": 2, "Myocardial infarction": 2, "Neck pain": 2, "Ocular hyperaemia": 2, "PO2": 2, "Paresis": 2, "Parkinsonism": 2, "Pharyngeal swelling": 2, "Platelet count decreased": 2, "Pleural effusion": 2, "Pneumonia aspiration": 2, "Productive cough": 2, "Purpura": 2, "Red blood cell count": 2, "Respiratory failure": 2, "Restlessness": 2, "Rhinorrhoea": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Tension": 2, "Thrombocytopenia": 2, "Thrombocytopenic purpura": 2, "Thrombotic cerebral infarction": 2, "Thyroxine free": 2, "Type I hypersensitivity": 2, "Vaccination site erythema": 2, "Vaccination site induration": 2, "Vaccination site swelling": 2, "Ventricular fibrillation": 2, "Ventricular tachycardia": 2, "White blood cells urine": 2, "AST/ALT ratio": 1, "Abdominal pain lower": 1, "Abdominal tenderness": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Adjusted calcium": 1, "Adrenocortical insufficiency acute": 1, "Affect lability": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Alopecia areata": 1, "Alveolitis": 1, "Amylase": 1, "Angiogram": 1, "Angiopathy": 1, "Anti-aquaporin-4 antibody": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Aplastic anaemia": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arteriovenous malformation": 1, "Ascites": 1, "Asthenopia": 1, "Atrioventricular block complete": 1, "Autoantibody test": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Bacterial infection": 1, "Bacterial test": 1, "Bed rest": 1, "Bilirubin urine": 1, "Bilirubinuria": 1, "Biopsy bone marrow": 1, "Biopsy lung": 1, "Biopsy skin": 1, "Blister": 1, "Blood albumin increased": 1, "Blood alkaline phosphatase increased": 1, "Blood cholesterol increased": 1, "Blood cholinesterase": 1, "Blood cholinesterase increased": 1, "Blood count": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase increased": 1, "Blood loss anaemia": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood smear test": 1, "Blood urea increased": 1, "Brain compression": 1, "Brain natriuretic peptide": 1, "Bronchoalveolar lavage": 1, "Bronchospasm": 1, "COVID-19 pneumonia": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac dysfunction": 1, "Cardiac hypertrophy": 1, "Cardiac ventriculogram left": 1, "Cerebellar haemorrhage": 1, "Cerebral ischaemia": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular disorder": 1, "Cholecystitis": 1, "Collagen disorder": 1, "Coma": 1, "Computerised tomogram normal": 1, "Conjunctival haemorrhage": 1, "Contusion": 1, "Coronary artery stenosis": 1, "Cortisol decreased": 1, "Culture": 1, "Dehydration": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Dermatitis atopic": 1, "Discomfort": 1, "Double stranded DNA antibody": 1, "Drowning": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dry eye": 1, "Dysaesthesia": 1, "Dyslalia": 1, "Dyspnoea paroxysmal nocturnal": 1, "Dyspraxia": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Eating disorder": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment abnormal": 1, "Electroneurography": 1, "Encephalopathy": 1, "Endocarditis": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Epistaxis": 1, "Eye disorder": 1, "Eye pruritus": 1, "Eye swelling": 1, "Face oedema": 1, "Facial pain": 1, "Feeding disorder": 1, "Fluid intake reduced": 1, "Full blood count": 1, "Gastrointestinal haemorrhage": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate decreased": 1, "Glucose urine": 1, "Grip strength": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematocrit decreased": 1, "Haematuria": 1, "Haemorrhage": 1, "Haemorrhoidal haemorrhage": 1, "Head discomfort": 1, "Heart rate normal": 1, "Helicobacter gastritis": 1, "Hepatic neoplasm": 1, "Hepatitis B": 1, "Hepatitis C virus test": 1, "Hepatitis viral test": 1, "Hyperbilirubinaemia": 1, "Hypercapnia": 1, "Hyperkalaemia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypoacusis": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Idiopathic pulmonary fibrosis": 1, "Idiopathic urticaria": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Internal capsule infarction": 1, "LDL/HDL ratio": 1, "Laboratory test": 1, "Laryngeal discomfort": 1, "Left ventricular dysfunction": 1, "Leucine aminopeptidase": 1, "Lichen planus": 1, "Liver disorder": 1, "Localised oedema": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Mononuclear cell count": 1, "Mouth breathing": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Myoclonus": 1, "Myofascial pain syndrome": 1, "Nasopharyngitis": 1, "Near drowning": 1, "Neurological examination": 1, "Nitrite urine": 1, "Norepinephrine": 1, "Normal pressure hydrocephalus": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Oliguria": 1, "Oral disorder": 1, "Oral mucosal roughening": 1, "Pain in jaw": 1, "Pancreatic neoplasm": 1, "Panic reaction": 1, "Panniculitis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Petechiae": 1, "Petit mal epilepsy": 1, "Pharyngeal erythema": 1, "Pharyngeal paraesthesia": 1, "Physical examination": 1, "Platelet distribution width": 1, "Polyarthritis": 1, "Prinzmetal angina": 1, "Prolonged expiration": 1, "Protein urine": 1, "Prothrombin time": 1, "Prurigo": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pyelonephritis": 1, "Quadriplegia": 1, "Radial nerve palsy": 1, "Radial pulse": 1, "Radiculopathy": 1, "Rash pruritic": 1, "Red blood cell nucleated morphology": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Rheumatoid arthritis": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Septic shock": 1, "Shock": 1, "Shock haemorrhagic": 1, "Sinus bradycardia": 1, "Somnolence": 1, "Specific gravity urine": 1, "Splenectomy": 1, "Splenic infarction": 1, "Splenic rupture": 1, "Splenomegaly": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Stridor": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Thirst": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroglobulin": 1, "Tongue dry": 1, "Tongue rough": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Troponin I": 1, "Troponin T": 1, "Upper gastrointestinal haemorrhage": 1, "Urinary casts": 1, "Urinary sediment present": 1, "Urinary tract infection": 1, "Urine abnormality": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Urosepsis": 1, "VIth nerve paralysis": 1, "Vaccination site irritation": 1, "Vaccination site movement impairment": 1, "Vaccination site pruritus": 1, "Varicella virus test": 1, "Vertebral artery dissection": 1, "Vertigo positional": 1, "Viral infection": 1, "Viral myocarditis": 1, "Visual field defect": 1, "Visual impairment": 1, "Weight": 1, "White blood cell count decreased": 1, "White blood cells urine positive": 1, "X-ray": 1, "Yawning": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5423", "histograms": [{"histogram": {"Body temperature": 164, "Blood pressure measurement": 79, "Oxygen saturation": 59, "Pyrexia": 45, "Heart rate": 43, "Blood pressure increased": 28, "Anaphylactic reaction": 24, "Erythema": 21, "Nausea": 20, "Feeling abnormal": 19, "Headache": 17, "Malaise": 17, "Cough": 16, "Pruritus": 16, "Blood test": 14, "Dizziness": 14, "Hypoaesthesia": 14, "Cerebral infarction": 13, "Presyncope": 13, "Rash": 13, "Blood pressure decreased": 12, "Oropharyngeal discomfort": 12, "Vomiting": 12, "Oxygen saturation decreased": 11, "Urticaria": 11, "Computerised tomogram": 10, "Depressed level of consciousness": 9, "Dyspnoea": 9, "Investigation": 9, "SARS-CoV-2 test": 9, "Hypertension": 8, "Palpitations": 8, "Platelet count": 8, "Blood creatine phosphokinase": 7, "Cold sweat": 7, "Electrocardiogram": 7, "Fall": 7, "Respiratory rate": 7, "Tremor": 7, "Vaccination site pain": 7, "Vital signs measurement": 7, "White blood cell count": 7, "Alanine aminotransferase": 6, "Arthralgia": 6, "Aspartate aminotransferase": 6, "Asthma": 6, "Blood glucose": 6, "C-reactive protein": 6, "Cardio-respiratory arrest": 6, "Chills": 6, "Heart rate increased": 6, "Loss of consciousness": 6, "Magnetic resonance imaging": 6, "Blood alkaline phosphatase": 5, "Chest X-ray": 5, "Computerised tomogram head": 5, "Decreased appetite": 5, "Diarrhoea": 5, "Dysphonia": 5, "Echocardiogram": 5, "Facial paralysis": 5, "Pneumonia": 5, "Tachycardia": 5, "Anaphylactic shock": 4, "Asthenia": 4, "Blood bilirubin": 4, "Blood chloride": 4, "Blood creatinine": 4, "Blood potassium": 4, "Blood urea": 4, "Cardiac arrest": 4, "Cardiac failure": 4, "Chest discomfort": 4, "Coma scale": 4, "Death": 4, "Dysphoria": 4, "Gait disturbance": 4, "Gamma-glutamyltransferase": 4, "Herpes zoster": 4, "Hyperventilation": 4, "Magnetic resonance imaging head": 4, "Muscle spasms": 4, "Muscular weakness": 4, "Neuropathy peripheral": 4, "Paralysis": 4, "Protein total": 4, "Rash erythematous": 4, "Respiratory arrest": 4, "Seizure": 4, "Tachypnoea": 4, "Toxic skin eruption": 4, "Wheezing": 4, "Abdominal pain": 3, "Altered state of consciousness": 3, "Back pain": 3, "Blood albumin": 3, "Blood creatine phosphokinase increased": 3, "Blood glucose increased": 3, "Blood lactate dehydrogenase": 3, "Blood pressure immeasurable": 3, "Blood pressure systolic increased": 3, "Blood sodium": 3, "Blood uric acid": 3, "C-reactive protein increased": 3, "COVID-19": 3, "Chest pain": 3, "Computerised tomogram thorax": 3, "Condition aggravated": 3, "Cyanosis": 3, "Hemiplegia": 3, "Hot flush": 3, "Imaging procedure": 3, "Immune thrombocytopenia": 3, "Internal haemorrhage": 3, "Interstitial lung disease": 3, "Low density lipoprotein": 3, "Myocarditis": 3, "Nasal congestion": 3, "Oropharyngeal pain": 3, "Pain": 3, "Pain in extremity": 3, "Pallor": 3, "Sneezing": 3, "Throat irritation": 3, "Urine analysis": 3, "Vaccination failure": 3, "Vision blurred": 3, "Abdominal discomfort": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase increased": 2, "Aspartate aminotransferase increased": 2, "Aspiration": 2, "Atrial fibrillation": 2, "Auscultation": 2, "Blood calcium": 2, "Blood cholesterol": 2, "Blood phosphorus": 2, "Blood pressure abnormal": 2, "Blood thyroid stimulating hormone": 2, "Blood triglycerides": 2, "Bradycardia": 2, "Breath sounds abnormal": 2, "CSF cell count": 2, "CSF test": 2, "Circulatory collapse": 2, "Cytology": 2, "Dermatitis bullous": 2, "Disease recurrence": 2, "Drug eruption": 2, "Dysphagia": 2, "Dysstasia": 2, "Eczema": 2, "Encephalitis": 2, "Faeces discoloured": 2, "Feeling cold": 2, "Flushing": 2, "Glomerular filtration rate": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemoglobin": 2, "Heart rate decreased": 2, "Hemiparesis": 2, "Hepatic function abnormal": 2, "High density lipoprotein": 2, "Hyperglycaemia": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Inflammation": 2, "Lacrimation increased": 2, "Limb discomfort": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Meningitis aseptic": 2, "Myalgia": 2, "Myocardial infarction": 2, "Neck pain": 2, "Ocular hyperaemia": 2, "PO2": 2, "Paresis": 2, "Parkinsonism": 2, "Pharyngeal swelling": 2, "Platelet count decreased": 2, "Pleural effusion": 2, "Pneumonia aspiration": 2, "Productive cough": 2, "Purpura": 2, "Red blood cell count": 2, "Respiratory failure": 2, "Restlessness": 2, "Rhinorrhoea": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Tension": 2, "Thrombocytopenia": 2, "Thrombocytopenic purpura": 2, "Thrombotic cerebral infarction": 2, "Thyroxine free": 2, "Type I hypersensitivity": 2, "Vaccination site erythema": 2, "Vaccination site induration": 2, "Vaccination site swelling": 2, "Ventricular fibrillation": 2, "Ventricular tachycardia": 2, "White blood cells urine": 2, "AST/ALT ratio": 1, "Abdominal pain lower": 1, "Abdominal tenderness": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Adjusted calcium": 1, "Adrenocortical insufficiency acute": 1, "Affect lability": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Alopecia areata": 1, "Alveolitis": 1, "Amylase": 1, "Angiogram": 1, "Angiopathy": 1, "Anti-aquaporin-4 antibody": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Aplastic anaemia": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arteriovenous malformation": 1, "Ascites": 1, "Asthenopia": 1, "Atrioventricular block complete": 1, "Autoantibody test": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Bacterial infection": 1, "Bacterial test": 1, "Bed rest": 1, "Bilirubin urine": 1, "Bilirubinuria": 1, "Biopsy bone marrow": 1, "Biopsy lung": 1, "Biopsy skin": 1, "Blister": 1, "Blood albumin increased": 1, "Blood alkaline phosphatase increased": 1, "Blood cholesterol increased": 1, "Blood cholinesterase": 1, "Blood cholinesterase increased": 1, "Blood count": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase increased": 1, "Blood loss anaemia": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood smear test": 1, "Blood urea increased": 1, "Brain compression": 1, "Brain natriuretic peptide": 1, "Bronchoalveolar lavage": 1, "Bronchospasm": 1, "COVID-19 pneumonia": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac dysfunction": 1, "Cardiac hypertrophy": 1, "Cardiac ventriculogram left": 1, "Cerebellar haemorrhage": 1, "Cerebral ischaemia": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular disorder": 1, "Cholecystitis": 1, "Collagen disorder": 1, "Coma": 1, "Computerised tomogram normal": 1, "Conjunctival haemorrhage": 1, "Contusion": 1, "Coronary artery stenosis": 1, "Cortisol decreased": 1, "Culture": 1, "Dehydration": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Dermatitis atopic": 1, "Discomfort": 1, "Double stranded DNA antibody": 1, "Drowning": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dry eye": 1, "Dysaesthesia": 1, "Dyslalia": 1, "Dyspnoea paroxysmal nocturnal": 1, "Dyspraxia": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Eating disorder": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment abnormal": 1, "Electroneurography": 1, "Encephalopathy": 1, "Endocarditis": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Epistaxis": 1, "Eye disorder": 1, "Eye pruritus": 1, "Eye swelling": 1, "Face oedema": 1, "Facial pain": 1, "Feeding disorder": 1, "Fluid intake reduced": 1, "Full blood count": 1, "Gastrointestinal haemorrhage": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate decreased": 1, "Glucose urine": 1, "Grip strength": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematocrit decreased": 1, "Haematuria": 1, "Haemorrhage": 1, "Haemorrhoidal haemorrhage": 1, "Head discomfort": 1, "Heart rate normal": 1, "Helicobacter gastritis": 1, "Hepatic neoplasm": 1, "Hepatitis B": 1, "Hepatitis C virus test": 1, "Hepatitis viral test": 1, "Hyperbilirubinaemia": 1, "Hypercapnia": 1, "Hyperkalaemia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypoacusis": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Idiopathic pulmonary fibrosis": 1, "Idiopathic urticaria": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Internal capsule infarction": 1, "LDL/HDL ratio": 1, "Laboratory test": 1, "Laryngeal discomfort": 1, "Left ventricular dysfunction": 1, "Leucine aminopeptidase": 1, "Lichen planus": 1, "Liver disorder": 1, "Localised oedema": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Mononuclear cell count": 1, "Mouth breathing": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Myoclonus": 1, "Myofascial pain syndrome": 1, "Nasopharyngitis": 1, "Near drowning": 1, "Neurological examination": 1, "Nitrite urine": 1, "Norepinephrine": 1, "Normal pressure hydrocephalus": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Oliguria": 1, "Oral disorder": 1, "Oral mucosal roughening": 1, "Pain in jaw": 1, "Pancreatic neoplasm": 1, "Panic reaction": 1, "Panniculitis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Petechiae": 1, "Petit mal epilepsy": 1, "Pharyngeal erythema": 1, "Pharyngeal paraesthesia": 1, "Physical examination": 1, "Platelet distribution width": 1, "Polyarthritis": 1, "Prinzmetal angina": 1, "Prolonged expiration": 1, "Protein urine": 1, "Prothrombin time": 1, "Prurigo": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pyelonephritis": 1, "Quadriplegia": 1, "Radial nerve palsy": 1, "Radial pulse": 1, "Radiculopathy": 1, "Rash pruritic": 1, "Red blood cell nucleated morphology": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Rheumatoid arthritis": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Septic shock": 1, "Shock": 1, "Shock haemorrhagic": 1, "Sinus bradycardia": 1, "Somnolence": 1, "Specific gravity urine": 1, "Splenectomy": 1, "Splenic infarction": 1, "Splenic rupture": 1, "Splenomegaly": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Stridor": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Thirst": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroglobulin": 1, "Tongue dry": 1, "Tongue rough": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Troponin I": 1, "Troponin T": 1, "Upper gastrointestinal haemorrhage": 1, "Urinary casts": 1, "Urinary sediment present": 1, "Urinary tract infection": 1, "Urine abnormality": 1, "Urine ketone body": 1, "Urobilinogen urine": 1, "Urosepsis": 1, "VIth nerve paralysis": 1, "Vaccination site irritation": 1, "Vaccination site movement impairment": 1, "Vaccination site pruritus": 1, "Varicella virus test": 1, "Vertebral artery dissection": 1, "Vertigo positional": 1, "Viral infection": 1, "Viral myocarditis": 1, "Visual field defect": 1, "Visual impairment": 1, "Weight": 1, "White blood cell count decreased": 1, "White blood cells urine positive": 1, "X-ray": 1, "Yawning": 1, "pH urine": 1}, "batchcodes": ["EY5423"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY5432.json b/docs/data/histograms/Japan/EY5432.json
index ff501006329..cf405ad4a48 100644
--- a/docs/data/histograms/Japan/EY5432.json
+++ b/docs/data/histograms/Japan/EY5432.json
@@ -1 +1 @@
-{"batchcode": "EY5432", "histograms": [{"batchcodes": ["EY5432"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5432", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["EY5432"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EY9860.json b/docs/data/histograms/Japan/EY9860.json
index d8af3e28ab5..6a60103c569 100644
--- a/docs/data/histograms/Japan/EY9860.json
+++ b/docs/data/histograms/Japan/EY9860.json
@@ -1 +1 @@
-{"batchcode": "EY9860", "histograms": [{"batchcodes": ["EY9860"], "histogram": {"Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Back pain": 1, "Blood pressure immeasurable": 1, "Body temperature": 1, "Computerised tomogram": 1, "Loss of consciousness": 1, "Respiratory arrest": 1}}]}
\ No newline at end of file
+{"batchcode": "EY9860", "histograms": [{"histogram": {"Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Back pain": 1, "Blood pressure immeasurable": 1, "Body temperature": 1, "Computerised tomogram": 1, "Loss of consciousness": 1, "Respiratory arrest": 1}, "batchcodes": ["EY9860"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/EYO.json b/docs/data/histograms/Japan/EYO.json
index db18249133a..c2fc39e275a 100644
--- a/docs/data/histograms/Japan/EYO.json
+++ b/docs/data/histograms/Japan/EYO.json
@@ -1 +1 @@
-{"batchcode": "EYO", "histograms": [{"batchcodes": ["EYO"], "histogram": {"Bell's palsy": 1, "Ear pain": 1, "Feeling abnormal": 1, "Herpes zoster": 1, "Investigation": 1, "Pain in jaw": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO", "histograms": [{"histogram": {"Bell's palsy": 1, "Ear pain": 1, "Feeling abnormal": 1, "Herpes zoster": 1, "Investigation": 1, "Pain in jaw": 1}, "batchcodes": ["EYO"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA.json b/docs/data/histograms/Japan/FA.json
index d88cfe917c9..2b9413097be 100644
--- a/docs/data/histograms/Japan/FA.json
+++ b/docs/data/histograms/Japan/FA.json
@@ -1 +1 @@
-{"batchcode": "FA", "histograms": [{"batchcodes": ["FA"], "histogram": {"Pleural effusion": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FA", "histograms": [{"histogram": {"Pleural effusion": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA2453.json b/docs/data/histograms/Japan/FA2453.json
index 2cfcdd43cdb..2acfc804abb 100644
--- a/docs/data/histograms/Japan/FA2453.json
+++ b/docs/data/histograms/Japan/FA2453.json
@@ -1 +1 @@
-{"batchcode": "FA2453", "histograms": [{"batchcodes": ["FA2453"], "histogram": {"Body temperature": 200, "Blood pressure measurement": 69, "Oxygen saturation": 60, "Heart rate": 48, "Pyrexia": 44, "Anaphylactic reaction": 36, "Dyspnoea": 27, "Pruritus": 23, "Computerised tomogram": 21, "Blood pressure increased": 20, "Headache": 20, "Nausea": 20, "Malaise": 19, "Erythema": 18, "Blood pressure decreased": 17, "Hypoaesthesia": 17, "C-reactive protein": 16, "Feeling abnormal": 16, "Rash": 16, "Urticaria": 16, "Arthralgia": 14, "Blood test": 13, "Depressed level of consciousness": 13, "Dizziness": 13, "Loss of consciousness": 13, "Cardio-respiratory arrest": 12, "Cerebral infarction": 12, "Cough": 12, "Decreased appetite": 11, "Fall": 11, "Vomiting": 11, "C-reactive protein increased": 10, "Wheezing": 10, "White blood cell count": 10, "Investigation": 9, "Oxygen saturation decreased": 9, "Pain": 9, "Pain in extremity": 9, "Platelet count": 9, "Asthenia": 8, "Cerebral haemorrhage": 8, "Magnetic resonance imaging head": 8, "Respiratory rate": 8, "Vital signs measurement": 8, "Chills": 7, "Computerised tomogram head": 7, "Diarrhoea": 7, "Electrocardiogram": 7, "Presyncope": 7, "SARS-CoV-2 test": 7, "Vaccination site pain": 7, "Cardiac failure": 6, "Chest X-ray": 6, "Coma scale": 6, "Gait disturbance": 6, "Hyperhidrosis": 6, "Hyperventilation": 6, "Interstitial lung disease": 6, "Pneumonia": 6, "Respiratory arrest": 6, "Altered state of consciousness": 5, "Chest pain": 5, "Heart rate decreased": 5, "Magnetic resonance imaging": 5, "Muscular weakness": 5, "Palpitations": 5, "Platelet count decreased": 5, "Seizure": 5, "Tachycardia": 5, "Thrombosis": 5, "Acute myocardial infarction": 4, "Asthma": 4, "Atrial fibrillation": 4, "Blood albumin": 4, "Blood creatinine": 4, "Blood pressure systolic increased": 4, "Echocardiogram": 4, "Feeding disorder": 4, "Fibrin D dimer": 4, "Myalgia": 4, "Neuropathy peripheral": 4, "Oedema peripheral": 4, "Oropharyngeal discomfort": 4, "Pallor": 4, "Paraesthesia": 4, "Pleural effusion": 4, "Shock": 4, "Subarachnoid haemorrhage": 4, "Tremor": 4, "Troponin T": 4, "Urinary tract infection": 4, "Alanine aminotransferase": 3, "Aortic dissection": 3, "Arrhythmia": 3, "Back pain": 3, "Blood immunoglobulin E": 3, "Blood lactate dehydrogenase": 3, "Blood potassium": 3, "Cardiac arrest": 3, "Computerised tomogram thorax": 3, "Condition aggravated": 3, "Cyanosis": 3, "Deep vein thrombosis": 3, "Dehydration": 3, "Discomfort": 3, "Disseminated intravascular coagulation": 3, "Dysarthria": 3, "Dysphoria": 3, "Dyspnoea exertional": 3, "Facial paralysis": 3, "Feeling hot": 3, "Flushing": 3, "Glomerular filtration rate": 3, "Haemoglobin": 3, "Head discomfort": 3, "Heart rate increased": 3, "Hepatic function abnormal": 3, "Hypersensitivity": 3, "Hypotension": 3, "Joint range of motion decreased": 3, "Joint swelling": 3, "Movement disorder": 3, "Myocardial infarction": 3, "Productive cough": 3, "Pulmonary embolism": 3, "Red blood cell count": 3, "Respiratory disorder": 3, "Sudden death": 3, "Tachypnoea": 3, "Thalamus haemorrhage": 3, "Throat irritation": 3, "Vaccination site rash": 3, "Visual impairment": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Acute coronary syndrome": 2, "Amylase": 2, "Anaemia": 2, "Angina pectoris": 2, "Anxiety": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Basal ganglia haemorrhage": 2, "Bilirubin conjugated": 2, "Blindness unilateral": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood cholinesterase": 2, "Blood creatine phosphokinase": 2, "Blood culture": 2, "Blood glucose": 2, "Blood iron": 2, "Blood pressure systolic": 2, "Blood sodium": 2, "Blood triglycerides": 2, "Blood urea": 2, "Blood uric acid": 2, "Breast cancer": 2, "Breath sounds": 2, "Bronchospasm": 2, "Cardiac death": 2, "Cardiac disorder": 2, "Cardiac failure chronic": 2, "Cardiothoracic ratio": 2, "Cerebral artery embolism": 2, "Chest discomfort": 2, "Cold sweat": 2, "Death": 2, "Dyslalia": 2, "Dysstasia": 2, "Eczema": 2, "Embolic stroke": 2, "Endoscopy upper gastrointestinal tract": 2, "Eosinophil count": 2, "Eyelid oedema": 2, "Gamma-glutamyltransferase": 2, "Glycosylated haemoglobin": 2, "Haematemesis": 2, "Haematocrit": 2, "Haemorrhage": 2, "Haemorrhage subcutaneous": 2, "Hemiplegia": 2, "High density lipoprotein": 2, "Hypertension": 2, "Hypoaesthesia oral": 2, "Hypophagia": 2, "Infection": 2, "Inflammation": 2, "Internal haemorrhage": 2, "Jaundice": 2, "Laboratory test": 2, "Lip swelling": 2, "Liver function test": 2, "Low density lipoprotein": 2, "Lung disorder": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monoparesis": 2, "Musculoskeletal stiffness": 2, "Nerve conduction studies": 2, "Neutrophil count": 2, "Oedema": 2, "Oropharyngeal pain": 2, "PO2": 2, "Panic attack": 2, "Papule": 2, "Paralysis": 2, "Peripheral coldness": 2, "Physical deconditioning": 2, "Polyarthritis": 2, "Polymerase chain reaction": 2, "Polymyalgia rheumatica": 2, "Protein total": 2, "Quadriplegia": 2, "Rales": 2, "Rash erythematous": 2, "Renal impairment": 2, "Respiratory failure": 2, "Rhabdomyolysis": 2, "Serum ferritin": 2, "Somnolence": 2, "Syncope": 2, "Tension": 2, "Thrombocytopenia": 2, "Thrombocytopenic purpura": 2, "Ultrasound scan": 2, "Urine output decreased": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Ventricular fibrillation": 2, "Ventricular tachycardia": 2, "Vision blurred": 2, "Visual acuity reduced": 2, "Visual field defect": 2, "Weight decreased": 2, "White blood cell count increased": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Acute myeloid leukaemia": 1, "Acute respiratory distress syndrome": 1, "Acute respiratory failure": 1, "Agonal respiration": 1, "Albumin globulin ratio": 1, "Allergic bronchitis": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Aneurysm ruptured": 1, "Angina unstable": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aortic stenosis": 1, "Aphasia": 1, "Apnoea": 1, "Arterial stenosis": 1, "Ascites": 1, "Aspartate aminotransferase abnormal": 1, "Ataxia": 1, "Audiogram": 1, "Auscultation": 1, "Autoantibody test": 1, "Balance disorder": 1, "Base excess": 1, "Basophil count": 1, "Bedridden": 1, "Bell's palsy": 1, "Beta 2 microglobulin": 1, "Blindness": 1, "Blood albumin decreased": 1, "Blood bicarbonate": 1, "Blood bilirubin unconjugated": 1, "Blood creatinine increased": 1, "Blood fibrinogen": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bone cancer metastatic": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Bronchiectasis": 1, "Bronchostenosis": 1, "Burning sensation": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF myelin basic protein": 1, "CSF myelin basic protein increased": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "Cardiac dysfunction": 1, "Cardiac failure congestive": 1, "Cardiomegaly": 1, "Castleman's disease": 1, "Catheter placement": 1, "Cellulitis": 1, "Cerebellar haemorrhage": 1, "Cerebellar infarction": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular accident": 1, "Chest X-ray abnormal": 1, "Cholangitis": 1, "Cholecystitis": 1, "Completed suicide": 1, "Complex regional pain syndrome": 1, "Computerised tomogram abdomen": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Coombs direct test": 1, "Creatinine renal clearance": 1, "Creatinine urine": 1, "Culture stool": 1, "Culture urine": 1, "Cytology": 1, "Deafness": 1, "Dermatitis": 1, "Dermatitis exfoliative generalised": 1, "Diplopia": 1, "Disease recurrence": 1, "Dissociative disorder": 1, "Diverticulum intestinal haemorrhagic": 1, "Dizziness postural": 1, "Drowning": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dysgeusia": 1, "Dyslipidaemia": 1, "Dysphonia": 1, "Ejection fraction": 1, "Electrocardiogram Q wave abnormal": 1, "Electroencephalogram": 1, "Endoscopy": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Epstein-Barr virus infection reactivation": 1, "Epstein-Barr virus test": 1, "Extrasystoles": 1, "Eye disorder": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial paresis": 1, "Fatigue": 1, "Fibrosis": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "Gastrooesophageal reflux disease": 1, "Gingival bleeding": 1, "Glaucoma": 1, "Glycogen storage disease type V": 1, "Granulocyte count increased": 1, "Granulocyte percentage": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematoma": 1, "Haemoptysis": 1, "Haemorrhagic cerebral infarction": 1, "Heat illness": 1, "Hepatic enzyme increased": 1, "Herpes zoster infection neurological": 1, "Herpes zoster oticus": 1, "Hiatus hernia": 1, "Hot flush": 1, "Hydrocephalus": 1, "Hyperthermia": 1, "Hypoalbuminaemia": 1, "Hypokalaemia": 1, "Hypoxia": 1, "Imaging procedure": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incision site abscess": 1, "Incontinence": 1, "Insomnia": 1, "International normalised ratio": 1, "Intra-abdominal haemorrhage": 1, "Intracranial aneurysm": 1, "Iritis": 1, "Iron binding capacity total": 1, "Ischaemia": 1, "Ischaemic stroke": 1, "Joint stiffness": 1, "Limb discomfort": 1, "Lip disorder": 1, "Liver disorder": 1, "Lumbar puncture": 1, "Lung infiltration": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Mania": 1, "Marasmus": 1, "Meniere's disease": 1, "Meningitis aseptic": 1, "Metastases to bone": 1, "Metastatic neoplasm": 1, "Monocyte count": 1, "Mononeuritis": 1, "Monoplegia": 1, "Multi-organ disorder": 1, "Multiple organ dysfunction syndrome": 1, "Multiple system atrophy": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myasthenia gravis": 1, "Mycobacterial infection": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "NIH stroke scale": 1, "Nerve conduction studies abnormal": 1, "Neurogenic shock": 1, "Neurologic neglect syndrome": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oliguria": 1, "Ophthalmic herpes zoster": 1, "Optic neuritis": 1, "Optical coherence tomography": 1, "PCO2": 1, "Panic reaction": 1, "Paresis": 1, "Pericardial effusion": 1, "Peripheral circulatory failure": 1, "Peripheral swelling": 1, "Pharyngeal paraesthesia": 1, "Photopsia": 1, "Physical disability": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Positron emission tomogram": 1, "Posterior interosseous syndrome": 1, "Procalcitonin": 1, "Product administered at inappropriate site": 1, "Protein urine": 1, "Pseudomonas infection": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary haemorrhage": 1, "Pulmonary oedema": 1, "Rash macular": 1, "Rash papular": 1, "Red cell distribution width": 1, "Renal failure": 1, "Renal infarct": 1, "Respiratory distress": 1, "Respiratory tract infection": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "Retinal detachment": 1, "Retinal operation": 1, "Retinal vein occlusion": 1, "Rheumatoid factor": 1, "Right ventricular systolic pressure": 1, "Romberg test": 1, "Romberg test positive": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sneezing": 1, "Speech disorder": 1, "Still's disease": 1, "Stillbirth": 1, "Strabismus": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Swelling of eyelid": 1, "Thalamic infarction": 1, "Throat tightness": 1, "Thrombotic thrombocytopenic purpura": 1, "Thyroxine free": 1, "Toxic skin eruption": 1, "Traumatic intracranial haemorrhage": 1, "Troponin T increased": 1, "Trousseau's sign": 1, "Ultrasound abdomen": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Urine output": 1, "Urine protein/creatinine ratio": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vascular pain": 1, "Vasodilatation": 1, "Venous thrombosis limb": 1, "Ventricular hypokinesia": 1, "Vertigo": 1, "Visual analogue scale": 1, "Vitreous floaters": 1, "Vitreous opacities": 1, "Weight": 1, "White blood cell analysis": 1, "White blood cell count decreased": 1, "White blood cell disorder": 1, "Xeroderma pigmentosum": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FA2453", "histograms": [{"histogram": {"Body temperature": 200, "Blood pressure measurement": 69, "Oxygen saturation": 60, "Heart rate": 48, "Pyrexia": 44, "Anaphylactic reaction": 36, "Dyspnoea": 27, "Pruritus": 23, "Computerised tomogram": 21, "Blood pressure increased": 20, "Headache": 20, "Nausea": 20, "Malaise": 19, "Erythema": 18, "Blood pressure decreased": 17, "Hypoaesthesia": 17, "C-reactive protein": 16, "Feeling abnormal": 16, "Rash": 16, "Urticaria": 16, "Arthralgia": 14, "Blood test": 13, "Depressed level of consciousness": 13, "Dizziness": 13, "Loss of consciousness": 13, "Cardio-respiratory arrest": 12, "Cerebral infarction": 12, "Cough": 12, "Decreased appetite": 11, "Fall": 11, "Vomiting": 11, "C-reactive protein increased": 10, "Wheezing": 10, "White blood cell count": 10, "Investigation": 9, "Oxygen saturation decreased": 9, "Pain": 9, "Pain in extremity": 9, "Platelet count": 9, "Asthenia": 8, "Cerebral haemorrhage": 8, "Magnetic resonance imaging head": 8, "Respiratory rate": 8, "Vital signs measurement": 8, "Chills": 7, "Computerised tomogram head": 7, "Diarrhoea": 7, "Electrocardiogram": 7, "Presyncope": 7, "SARS-CoV-2 test": 7, "Vaccination site pain": 7, "Cardiac failure": 6, "Chest X-ray": 6, "Coma scale": 6, "Gait disturbance": 6, "Hyperhidrosis": 6, "Hyperventilation": 6, "Interstitial lung disease": 6, "Pneumonia": 6, "Respiratory arrest": 6, "Altered state of consciousness": 5, "Chest pain": 5, "Heart rate decreased": 5, "Magnetic resonance imaging": 5, "Muscular weakness": 5, "Palpitations": 5, "Platelet count decreased": 5, "Seizure": 5, "Tachycardia": 5, "Thrombosis": 5, "Acute myocardial infarction": 4, "Asthma": 4, "Atrial fibrillation": 4, "Blood albumin": 4, "Blood creatinine": 4, "Blood pressure systolic increased": 4, "Echocardiogram": 4, "Feeding disorder": 4, "Fibrin D dimer": 4, "Myalgia": 4, "Neuropathy peripheral": 4, "Oedema peripheral": 4, "Oropharyngeal discomfort": 4, "Pallor": 4, "Paraesthesia": 4, "Pleural effusion": 4, "Shock": 4, "Subarachnoid haemorrhage": 4, "Tremor": 4, "Troponin T": 4, "Urinary tract infection": 4, "Alanine aminotransferase": 3, "Aortic dissection": 3, "Arrhythmia": 3, "Back pain": 3, "Blood immunoglobulin E": 3, "Blood lactate dehydrogenase": 3, "Blood potassium": 3, "Cardiac arrest": 3, "Computerised tomogram thorax": 3, "Condition aggravated": 3, "Cyanosis": 3, "Deep vein thrombosis": 3, "Dehydration": 3, "Discomfort": 3, "Disseminated intravascular coagulation": 3, "Dysarthria": 3, "Dysphoria": 3, "Dyspnoea exertional": 3, "Facial paralysis": 3, "Feeling hot": 3, "Flushing": 3, "Glomerular filtration rate": 3, "Haemoglobin": 3, "Head discomfort": 3, "Heart rate increased": 3, "Hepatic function abnormal": 3, "Hypersensitivity": 3, "Hypotension": 3, "Joint range of motion decreased": 3, "Joint swelling": 3, "Movement disorder": 3, "Myocardial infarction": 3, "Productive cough": 3, "Pulmonary embolism": 3, "Red blood cell count": 3, "Respiratory disorder": 3, "Sudden death": 3, "Tachypnoea": 3, "Thalamus haemorrhage": 3, "Throat irritation": 3, "Vaccination site rash": 3, "Visual impairment": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Acute coronary syndrome": 2, "Amylase": 2, "Anaemia": 2, "Angina pectoris": 2, "Anxiety": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Basal ganglia haemorrhage": 2, "Bilirubin conjugated": 2, "Blindness unilateral": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood cholinesterase": 2, "Blood creatine phosphokinase": 2, "Blood culture": 2, "Blood glucose": 2, "Blood iron": 2, "Blood pressure systolic": 2, "Blood sodium": 2, "Blood triglycerides": 2, "Blood urea": 2, "Blood uric acid": 2, "Breast cancer": 2, "Breath sounds": 2, "Bronchospasm": 2, "Cardiac death": 2, "Cardiac disorder": 2, "Cardiac failure chronic": 2, "Cardiothoracic ratio": 2, "Cerebral artery embolism": 2, "Chest discomfort": 2, "Cold sweat": 2, "Death": 2, "Dyslalia": 2, "Dysstasia": 2, "Eczema": 2, "Embolic stroke": 2, "Endoscopy upper gastrointestinal tract": 2, "Eosinophil count": 2, "Eyelid oedema": 2, "Gamma-glutamyltransferase": 2, "Glycosylated haemoglobin": 2, "Haematemesis": 2, "Haematocrit": 2, "Haemorrhage": 2, "Haemorrhage subcutaneous": 2, "Hemiplegia": 2, "High density lipoprotein": 2, "Hypertension": 2, "Hypoaesthesia oral": 2, "Hypophagia": 2, "Infection": 2, "Inflammation": 2, "Internal haemorrhage": 2, "Jaundice": 2, "Laboratory test": 2, "Lip swelling": 2, "Liver function test": 2, "Low density lipoprotein": 2, "Lung disorder": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monoparesis": 2, "Musculoskeletal stiffness": 2, "Nerve conduction studies": 2, "Neutrophil count": 2, "Oedema": 2, "Oropharyngeal pain": 2, "PO2": 2, "Panic attack": 2, "Papule": 2, "Paralysis": 2, "Peripheral coldness": 2, "Physical deconditioning": 2, "Polyarthritis": 2, "Polymerase chain reaction": 2, "Polymyalgia rheumatica": 2, "Protein total": 2, "Quadriplegia": 2, "Rales": 2, "Rash erythematous": 2, "Renal impairment": 2, "Respiratory failure": 2, "Rhabdomyolysis": 2, "Serum ferritin": 2, "Somnolence": 2, "Syncope": 2, "Tension": 2, "Thrombocytopenia": 2, "Thrombocytopenic purpura": 2, "Ultrasound scan": 2, "Urine output decreased": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Ventricular fibrillation": 2, "Ventricular tachycardia": 2, "Vision blurred": 2, "Visual acuity reduced": 2, "Visual field defect": 2, "Weight decreased": 2, "White blood cell count increased": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal sensation in eye": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Acute myeloid leukaemia": 1, "Acute respiratory distress syndrome": 1, "Acute respiratory failure": 1, "Agonal respiration": 1, "Albumin globulin ratio": 1, "Allergic bronchitis": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Aneurysm ruptured": 1, "Angina unstable": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aortic stenosis": 1, "Aphasia": 1, "Apnoea": 1, "Arterial stenosis": 1, "Ascites": 1, "Aspartate aminotransferase abnormal": 1, "Ataxia": 1, "Audiogram": 1, "Auscultation": 1, "Autoantibody test": 1, "Balance disorder": 1, "Base excess": 1, "Basophil count": 1, "Bedridden": 1, "Bell's palsy": 1, "Beta 2 microglobulin": 1, "Blindness": 1, "Blood albumin decreased": 1, "Blood bicarbonate": 1, "Blood bilirubin unconjugated": 1, "Blood creatinine increased": 1, "Blood fibrinogen": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bone cancer metastatic": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Bronchiectasis": 1, "Bronchostenosis": 1, "Burning sensation": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF myelin basic protein": 1, "CSF myelin basic protein increased": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "Cardiac dysfunction": 1, "Cardiac failure congestive": 1, "Cardiomegaly": 1, "Castleman's disease": 1, "Catheter placement": 1, "Cellulitis": 1, "Cerebellar haemorrhage": 1, "Cerebellar infarction": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular accident": 1, "Chest X-ray abnormal": 1, "Cholangitis": 1, "Cholecystitis": 1, "Completed suicide": 1, "Complex regional pain syndrome": 1, "Computerised tomogram abdomen": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Coombs direct test": 1, "Creatinine renal clearance": 1, "Creatinine urine": 1, "Culture stool": 1, "Culture urine": 1, "Cytology": 1, "Deafness": 1, "Dermatitis": 1, "Dermatitis exfoliative generalised": 1, "Diplopia": 1, "Disease recurrence": 1, "Dissociative disorder": 1, "Diverticulum intestinal haemorrhagic": 1, "Dizziness postural": 1, "Drowning": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dysgeusia": 1, "Dyslipidaemia": 1, "Dysphonia": 1, "Ejection fraction": 1, "Electrocardiogram Q wave abnormal": 1, "Electroencephalogram": 1, "Endoscopy": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Epstein-Barr virus infection reactivation": 1, "Epstein-Barr virus test": 1, "Extrasystoles": 1, "Eye disorder": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial paresis": 1, "Fatigue": 1, "Fibrosis": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "Gastrooesophageal reflux disease": 1, "Gingival bleeding": 1, "Glaucoma": 1, "Glycogen storage disease type V": 1, "Granulocyte count increased": 1, "Granulocyte percentage": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematoma": 1, "Haemoptysis": 1, "Haemorrhagic cerebral infarction": 1, "Heat illness": 1, "Hepatic enzyme increased": 1, "Herpes zoster infection neurological": 1, "Herpes zoster oticus": 1, "Hiatus hernia": 1, "Hot flush": 1, "Hydrocephalus": 1, "Hyperthermia": 1, "Hypoalbuminaemia": 1, "Hypokalaemia": 1, "Hypoxia": 1, "Imaging procedure": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incision site abscess": 1, "Incontinence": 1, "Insomnia": 1, "International normalised ratio": 1, "Intra-abdominal haemorrhage": 1, "Intracranial aneurysm": 1, "Iritis": 1, "Iron binding capacity total": 1, "Ischaemia": 1, "Ischaemic stroke": 1, "Joint stiffness": 1, "Limb discomfort": 1, "Lip disorder": 1, "Liver disorder": 1, "Lumbar puncture": 1, "Lung infiltration": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Mania": 1, "Marasmus": 1, "Meniere's disease": 1, "Meningitis aseptic": 1, "Metastases to bone": 1, "Metastatic neoplasm": 1, "Monocyte count": 1, "Mononeuritis": 1, "Monoplegia": 1, "Multi-organ disorder": 1, "Multiple organ dysfunction syndrome": 1, "Multiple system atrophy": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myasthenia gravis": 1, "Mycobacterial infection": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "NIH stroke scale": 1, "Nerve conduction studies abnormal": 1, "Neurogenic shock": 1, "Neurologic neglect syndrome": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oliguria": 1, "Ophthalmic herpes zoster": 1, "Optic neuritis": 1, "Optical coherence tomography": 1, "PCO2": 1, "Panic reaction": 1, "Paresis": 1, "Pericardial effusion": 1, "Peripheral circulatory failure": 1, "Peripheral swelling": 1, "Pharyngeal paraesthesia": 1, "Photopsia": 1, "Physical disability": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Positron emission tomogram": 1, "Posterior interosseous syndrome": 1, "Procalcitonin": 1, "Product administered at inappropriate site": 1, "Protein urine": 1, "Pseudomonas infection": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary haemorrhage": 1, "Pulmonary oedema": 1, "Rash macular": 1, "Rash papular": 1, "Red cell distribution width": 1, "Renal failure": 1, "Renal infarct": 1, "Respiratory distress": 1, "Respiratory tract infection": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "Retinal detachment": 1, "Retinal operation": 1, "Retinal vein occlusion": 1, "Rheumatoid factor": 1, "Right ventricular systolic pressure": 1, "Romberg test": 1, "Romberg test positive": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sneezing": 1, "Speech disorder": 1, "Still's disease": 1, "Stillbirth": 1, "Strabismus": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Swelling of eyelid": 1, "Thalamic infarction": 1, "Throat tightness": 1, "Thrombotic thrombocytopenic purpura": 1, "Thyroxine free": 1, "Toxic skin eruption": 1, "Traumatic intracranial haemorrhage": 1, "Troponin T increased": 1, "Trousseau's sign": 1, "Ultrasound abdomen": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Urine output": 1, "Urine protein/creatinine ratio": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vascular pain": 1, "Vasodilatation": 1, "Venous thrombosis limb": 1, "Ventricular hypokinesia": 1, "Vertigo": 1, "Visual analogue scale": 1, "Vitreous floaters": 1, "Vitreous opacities": 1, "Weight": 1, "White blood cell analysis": 1, "White blood cell count decreased": 1, "White blood cell disorder": 1, "Xeroderma pigmentosum": 1, "pH body fluid": 1}, "batchcodes": ["FA2453"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA4597.json b/docs/data/histograms/Japan/FA4597.json
index 5ff33a4b467..428c7e3c092 100644
--- a/docs/data/histograms/Japan/FA4597.json
+++ b/docs/data/histograms/Japan/FA4597.json
@@ -1 +1 @@
-{"batchcode": "FA4597", "histograms": [{"batchcodes": ["FA4597"], "histogram": {"Body temperature": 160, "Blood pressure measurement": 75, "Pyrexia": 51, "Oxygen saturation": 46, "Heart rate": 40, "Blood pressure increased": 29, "Anaphylactic reaction": 27, "Vomiting": 25, "Dyspnoea": 24, "C-reactive protein": 19, "Malaise": 19, "Nausea": 19, "Electrocardiogram": 18, "Feeling abnormal": 18, "Hypoaesthesia": 18, "Blood pressure decreased": 17, "Dizziness": 16, "Pruritus": 16, "Cerebral infarction": 15, "Headache": 15, "Erythema": 14, "Muscular weakness": 14, "White blood cell count": 14, "Blood creatine phosphokinase": 11, "Cough": 11, "Investigation": 10, "Computerised tomogram head": 9, "Magnetic resonance imaging": 9, "Pain in extremity": 9, "Presyncope": 9, "Urticaria": 9, "Arthralgia": 8, "Decreased appetite": 8, "Depressed level of consciousness": 8, "Echocardiogram": 8, "Loss of consciousness": 8, "N-terminal prohormone brain natriuretic peptide": 8, "Pallor": 8, "Blood test": 7, "C-reactive protein increased": 7, "Cerebral haemorrhage": 7, "Chest X-ray": 7, "Chest discomfort": 7, "Coma scale": 7, "Computerised tomogram": 7, "Blood lactate dehydrogenase": 6, "Cardiac failure": 6, "Cardio-respiratory arrest": 6, "Chills": 6, "Fall": 6, "Heart rate increased": 6, "Hypersensitivity": 6, "Movement disorder": 6, "Myocarditis": 6, "Oedema": 6, "Pain": 6, "Pneumonia": 6, "Rash": 6, "SARS-CoV-2 test": 6, "Seizure": 6, "Troponin T": 6, "Vaccination site pain": 6, "Alanine aminotransferase": 5, "Arrhythmia": 5, "Aspartate aminotransferase": 5, "Asthma": 5, "Feeling cold": 5, "Hyperhidrosis": 5, "N-terminal prohormone brain natriuretic peptide increased": 5, "Paraesthesia": 5, "Platelet count": 5, "Blood alkaline phosphatase": 4, "Blood creatinine": 4, "Blood urea": 4, "Cold sweat": 4, "Cyanosis": 4, "Diarrhoea": 4, "Erythema multiforme": 4, "Feeling hot": 4, "Flushing": 4, "Gamma-glutamyltransferase": 4, "Hypertension": 4, "Hypophagia": 4, "Neutrophil count": 4, "Oxygen saturation decreased": 4, "Rash erythematous": 4, "Respiratory arrest": 4, "Respiratory disorder": 4, "Tachycardia": 4, "Thrombosis": 4, "Altered state of consciousness": 3, "Angiogram": 3, "Antineutrophil cytoplasmic antibody": 3, "Atrial fibrillation": 3, "Blood potassium": 3, "Blood pressure diastolic decreased": 3, "Death": 3, "Dermatitis allergic": 3, "Dyslalia": 3, "Ejection fraction decreased": 3, "Fibrin degradation products": 3, "Gait disturbance": 3, "Generalised oedema": 3, "Glycosylated haemoglobin": 3, "Guillain-Barre syndrome": 3, "Heart rate decreased": 3, "Hyperventilation": 3, "Hypotension": 3, "Imaging procedure": 3, "Nerve conduction studies": 3, "Oropharyngeal discomfort": 3, "PO2": 3, "Palpitations": 3, "Peripheral coldness": 3, "Pneumonia aspiration": 3, "Pulmonary embolism": 3, "Respiratory rate": 3, "Sepsis": 3, "Subarachnoid haemorrhage": 3, "Vaccination site swelling": 3, "Wheezing": 3, "White blood cell count increased": 3, "Abdominal pain": 2, "Activated partial thromboplastin time": 2, "Acute myocardial infarction": 2, "Acute respiratory failure": 2, "Allergy to vaccine": 2, "Angina pectoris": 2, "Antibody test": 2, "Areflexia": 2, "Aspartate aminotransferase increased": 2, "Asthenia": 2, "Autoantibody test": 2, "Blepharospasm": 2, "Blood albumin": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Blood glucose": 2, "Blood pressure systolic": 2, "Blood sodium": 2, "Blood thyroid stimulating hormone": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "Cardiac arrest": 2, "Cerebral thrombosis": 2, "Condition aggravated": 2, "Deep vein thrombosis": 2, "Dysarthria": 2, "Dysphoria": 2, "Dysstasia": 2, "Ejection fraction": 2, "Eye pain": 2, "Face oedema": 2, "Facial paralysis": 2, "Gastroenteritis": 2, "Haematochezia": 2, "Haematuria": 2, "Haemoglobin": 2, "Heart rate normal": 2, "Hemiplegia": 2, "Hepatic function abnormal": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Hypoxia": 2, "Incontinence": 2, "Magnetic resonance imaging head": 2, "Microscopic polyangiitis": 2, "Moaning": 2, "Monoplegia": 2, "Muscle spasms": 2, "Myocardial infarction": 2, "Neurogenic shock": 2, "Neurological examination": 2, "Paralysis": 2, "Paresis": 2, "Peripheral swelling": 2, "Productive cough": 2, "Protein total": 2, "Prothrombin time ratio": 2, "Pupillary reflex impaired": 2, "Respiratory distress": 2, "Rhabdomyolysis": 2, "Somnolence": 2, "Speech disorder": 2, "Sudden death": 2, "Supraventricular tachycardia": 2, "Swelling": 2, "Syncope": 2, "Tachypnoea": 2, "Throat tightness": 2, "Thyroxine free": 2, "Troponin T increased": 2, "Vasculitis": 2, "Ventricular hypokinesia": 2, "Abdominal discomfort": 1, "Abnormal faeces": 1, "Acetonaemia": 1, "Acquired haemophilia": 1, "Acute abdomen": 1, "Acute disseminated encephalomyelitis": 1, "Acute febrile neutrophilic dermatosis": 1, "Acute kidney injury": 1, "Acute respiratory distress syndrome": 1, "Alanine aminotransferase increased": 1, "Amnesia": 1, "Amylase": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Anxiety": 1, "Aortic valve stenosis": 1, "Aphasia": 1, "Arrhythmia supraventricular": 1, "Arthritis": 1, "Asthenopia": 1, "Atrioventricular block complete": 1, "Atrioventricular block first degree": 1, "Back pain": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy skin": 1, "Blood albumin decreased": 1, "Blood calcium": 1, "Blood calcium decreased": 1, "Blood cholinesterase": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucagon": 1, "Blood glucose abnormal": 1, "Blood immunoglobulin E": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urea increased": 1, "Blood uric acid": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bradycardia": 1, "Brain compression": 1, "Brain natriuretic peptide increased": 1, "Brain stem infarction": 1, "Burning sensation": 1, "COVID-19": 1, "CSF test": 1, "Cardiac failure acute": 1, "Cardiac hypertrophy": 1, "Cardiomegaly": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Cerebral ischaemia": 1, "Chest pain": 1, "Cholangitis": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation test": 1, "Coma": 1, "Complement factor": 1, "Complex regional pain syndrome": 1, "Computerised tomogram thorax": 1, "Congestive cardiomyopathy": 1, "Conjunctival haemorrhage": 1, "Conjunctival oedema": 1, "Contusion": 1, "Cough variant asthma": 1, "Decubitus ulcer": 1, "Defect conduction intraventricular": 1, "Dehydration": 1, "Delirium": 1, "Demyelination": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Dizziness postural": 1, "Drowning": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dysacusis": 1, "Dyspepsia": 1, "Dysphagia": 1, "Eczema": 1, "Electrocardiogram Q wave abnormal": 1, "Electrocardiogram Q waves": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Electrocardiogram low voltage": 1, "Electromyogram": 1, "Encephalopathy": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face crushing": 1, "Face injury": 1, "Fatigue": 1, "Fear": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Fibrinolysis": 1, "Fibrosis": 1, "Finger deformity": 1, "Full blood count": 1, "Fundoscopy": 1, "Gait inability": 1, "Gallbladder oedema": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal haemorrhage": 1, "Gastrooesophageal reflux disease": 1, "General physical condition": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glossodynia": 1, "Glycated albumin": 1, "Glycosuria": 1, "Glycosylated haemoglobin increased": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haematoma": 1, "Haemorrhage subcutaneous": 1, "Haemorrhagic infarction": 1, "Hallucination": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Heat illness": 1, "Hepatic failure": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hypertrophic cardiomyopathy": 1, "Hypoalbuminaemia": 1, "Hypothermia": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Inflammation": 1, "Influenza": 1, "Influenza A virus test": 1, "Influenza virus test": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Joint instability": 1, "Joint range of motion decreased": 1, "Lack of spontaneous speech": 1, "Lacunar infarction": 1, "Language disorder": 1, "Large intestine perforation": 1, "Laryngeal discomfort": 1, "Laryngeal pain": 1, "Left ventricular dysfunction": 1, "Limb discomfort": 1, "Lip dry": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lung disorder": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Lymphocyte percentage": 1, "Marasmus": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mesenteric arterial occlusion": 1, "Monocyte count": 1, "Mouth breathing": 1, "Mouth haemorrhage": 1, "Muscle haemorrhage": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycoplasma test": 1, "Neck mass": 1, "Neck pain": 1, "Necrotising colitis": 1, "Nerve conduction studies abnormal": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Nystagmus": 1, "Oculomucocutaneous syndrome": 1, "Oedema peripheral": 1, "Oral discomfort": 1, "Oral pruritus": 1, "Oxygen consumption": 1, "Pancytopenia": 1, "Paradoxical pressor response": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia bacterial": 1, "Polymyalgia rheumatica": 1, "Portal vein thrombosis": 1, "Prinzmetal angina": 1, "Product administered at inappropriate site": 1, "Protein total decreased": 1, "Protein urine present": 1, "Prothrombin time": 1, "Prurigo": 1, "Pulse absent": 1, "Pupillary light reflex tests": 1, "Pupils unequal": 1, "Putamen haemorrhage": 1, "Pyelonephritis": 1, "Radial pulse decreased": 1, "Red blood cell count": 1, "Renal failure": 1, "Respiration abnormal": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Retinal vein occlusion": 1, "Sensory disturbance": 1, "Septic shock": 1, "Shock": 1, "Shock symptom": 1, "Shunt occlusion": 1, "Skin discolouration": 1, "Snoring": 1, "Specific gravity urine": 1, "Spinal X-ray": 1, "Spinal osteoarthritis": 1, "Stool analysis": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Thalamus haemorrhage": 1, "Throat clearing": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Troponin I": 1, "Type 2 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Urobilinogen urine": 1, "Vaccination site atrophy": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site vesicles": 1, "Venogram": 1, "Ventricular enlargement": 1, "Ventricular extrasystoles": 1, "Ventricular internal diameter abnormal": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Visual acuity reduced": 1, "Vital signs measurement": 1, "Wrist deformity": 1, "X-ray": 1, "X-ray limb": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "FA4597", "histograms": [{"histogram": {"Body temperature": 160, "Blood pressure measurement": 75, "Pyrexia": 51, "Oxygen saturation": 46, "Heart rate": 40, "Blood pressure increased": 29, "Anaphylactic reaction": 27, "Vomiting": 25, "Dyspnoea": 24, "C-reactive protein": 19, "Malaise": 19, "Nausea": 19, "Electrocardiogram": 18, "Feeling abnormal": 18, "Hypoaesthesia": 18, "Blood pressure decreased": 17, "Dizziness": 16, "Pruritus": 16, "Cerebral infarction": 15, "Headache": 15, "Erythema": 14, "Muscular weakness": 14, "White blood cell count": 14, "Blood creatine phosphokinase": 11, "Cough": 11, "Investigation": 10, "Computerised tomogram head": 9, "Magnetic resonance imaging": 9, "Pain in extremity": 9, "Presyncope": 9, "Urticaria": 9, "Arthralgia": 8, "Decreased appetite": 8, "Depressed level of consciousness": 8, "Echocardiogram": 8, "Loss of consciousness": 8, "N-terminal prohormone brain natriuretic peptide": 8, "Pallor": 8, "Blood test": 7, "C-reactive protein increased": 7, "Cerebral haemorrhage": 7, "Chest X-ray": 7, "Chest discomfort": 7, "Coma scale": 7, "Computerised tomogram": 7, "Blood lactate dehydrogenase": 6, "Cardiac failure": 6, "Cardio-respiratory arrest": 6, "Chills": 6, "Fall": 6, "Heart rate increased": 6, "Hypersensitivity": 6, "Movement disorder": 6, "Myocarditis": 6, "Oedema": 6, "Pain": 6, "Pneumonia": 6, "Rash": 6, "SARS-CoV-2 test": 6, "Seizure": 6, "Troponin T": 6, "Vaccination site pain": 6, "Alanine aminotransferase": 5, "Arrhythmia": 5, "Aspartate aminotransferase": 5, "Asthma": 5, "Feeling cold": 5, "Hyperhidrosis": 5, "N-terminal prohormone brain natriuretic peptide increased": 5, "Paraesthesia": 5, "Platelet count": 5, "Blood alkaline phosphatase": 4, "Blood creatinine": 4, "Blood urea": 4, "Cold sweat": 4, "Cyanosis": 4, "Diarrhoea": 4, "Erythema multiforme": 4, "Feeling hot": 4, "Flushing": 4, "Gamma-glutamyltransferase": 4, "Hypertension": 4, "Hypophagia": 4, "Neutrophil count": 4, "Oxygen saturation decreased": 4, "Rash erythematous": 4, "Respiratory arrest": 4, "Respiratory disorder": 4, "Tachycardia": 4, "Thrombosis": 4, "Altered state of consciousness": 3, "Angiogram": 3, "Antineutrophil cytoplasmic antibody": 3, "Atrial fibrillation": 3, "Blood potassium": 3, "Blood pressure diastolic decreased": 3, "Death": 3, "Dermatitis allergic": 3, "Dyslalia": 3, "Ejection fraction decreased": 3, "Fibrin degradation products": 3, "Gait disturbance": 3, "Generalised oedema": 3, "Glycosylated haemoglobin": 3, "Guillain-Barre syndrome": 3, "Heart rate decreased": 3, "Hyperventilation": 3, "Hypotension": 3, "Imaging procedure": 3, "Nerve conduction studies": 3, "Oropharyngeal discomfort": 3, "PO2": 3, "Palpitations": 3, "Peripheral coldness": 3, "Pneumonia aspiration": 3, "Pulmonary embolism": 3, "Respiratory rate": 3, "Sepsis": 3, "Subarachnoid haemorrhage": 3, "Vaccination site swelling": 3, "Wheezing": 3, "White blood cell count increased": 3, "Abdominal pain": 2, "Activated partial thromboplastin time": 2, "Acute myocardial infarction": 2, "Acute respiratory failure": 2, "Allergy to vaccine": 2, "Angina pectoris": 2, "Antibody test": 2, "Areflexia": 2, "Aspartate aminotransferase increased": 2, "Asthenia": 2, "Autoantibody test": 2, "Blepharospasm": 2, "Blood albumin": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Blood glucose": 2, "Blood pressure systolic": 2, "Blood sodium": 2, "Blood thyroid stimulating hormone": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "Cardiac arrest": 2, "Cerebral thrombosis": 2, "Condition aggravated": 2, "Deep vein thrombosis": 2, "Dysarthria": 2, "Dysphoria": 2, "Dysstasia": 2, "Ejection fraction": 2, "Eye pain": 2, "Face oedema": 2, "Facial paralysis": 2, "Gastroenteritis": 2, "Haematochezia": 2, "Haematuria": 2, "Haemoglobin": 2, "Heart rate normal": 2, "Hemiplegia": 2, "Hepatic function abnormal": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Hypoxia": 2, "Incontinence": 2, "Magnetic resonance imaging head": 2, "Microscopic polyangiitis": 2, "Moaning": 2, "Monoplegia": 2, "Muscle spasms": 2, "Myocardial infarction": 2, "Neurogenic shock": 2, "Neurological examination": 2, "Paralysis": 2, "Paresis": 2, "Peripheral swelling": 2, "Productive cough": 2, "Protein total": 2, "Prothrombin time ratio": 2, "Pupillary reflex impaired": 2, "Respiratory distress": 2, "Rhabdomyolysis": 2, "Somnolence": 2, "Speech disorder": 2, "Sudden death": 2, "Supraventricular tachycardia": 2, "Swelling": 2, "Syncope": 2, "Tachypnoea": 2, "Throat tightness": 2, "Thyroxine free": 2, "Troponin T increased": 2, "Vasculitis": 2, "Ventricular hypokinesia": 2, "Abdominal discomfort": 1, "Abnormal faeces": 1, "Acetonaemia": 1, "Acquired haemophilia": 1, "Acute abdomen": 1, "Acute disseminated encephalomyelitis": 1, "Acute febrile neutrophilic dermatosis": 1, "Acute kidney injury": 1, "Acute respiratory distress syndrome": 1, "Alanine aminotransferase increased": 1, "Amnesia": 1, "Amylase": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Anxiety": 1, "Aortic valve stenosis": 1, "Aphasia": 1, "Arrhythmia supraventricular": 1, "Arthritis": 1, "Asthenopia": 1, "Atrioventricular block complete": 1, "Atrioventricular block first degree": 1, "Back pain": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy skin": 1, "Blood albumin decreased": 1, "Blood calcium": 1, "Blood calcium decreased": 1, "Blood cholinesterase": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood gases": 1, "Blood glucagon": 1, "Blood glucose abnormal": 1, "Blood immunoglobulin E": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urea increased": 1, "Blood uric acid": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bradycardia": 1, "Brain compression": 1, "Brain natriuretic peptide increased": 1, "Brain stem infarction": 1, "Burning sensation": 1, "COVID-19": 1, "CSF test": 1, "Cardiac failure acute": 1, "Cardiac hypertrophy": 1, "Cardiomegaly": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Cerebral ischaemia": 1, "Chest pain": 1, "Cholangitis": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation test": 1, "Coma": 1, "Complement factor": 1, "Complex regional pain syndrome": 1, "Computerised tomogram thorax": 1, "Congestive cardiomyopathy": 1, "Conjunctival haemorrhage": 1, "Conjunctival oedema": 1, "Contusion": 1, "Cough variant asthma": 1, "Decubitus ulcer": 1, "Defect conduction intraventricular": 1, "Dehydration": 1, "Delirium": 1, "Demyelination": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Dizziness postural": 1, "Drowning": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dysacusis": 1, "Dyspepsia": 1, "Dysphagia": 1, "Eczema": 1, "Electrocardiogram Q wave abnormal": 1, "Electrocardiogram Q waves": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Electrocardiogram low voltage": 1, "Electromyogram": 1, "Encephalopathy": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face crushing": 1, "Face injury": 1, "Fatigue": 1, "Fear": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Fibrinolysis": 1, "Fibrosis": 1, "Finger deformity": 1, "Full blood count": 1, "Fundoscopy": 1, "Gait inability": 1, "Gallbladder oedema": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal haemorrhage": 1, "Gastrooesophageal reflux disease": 1, "General physical condition": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glossodynia": 1, "Glycated albumin": 1, "Glycosuria": 1, "Glycosylated haemoglobin increased": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haematoma": 1, "Haemorrhage subcutaneous": 1, "Haemorrhagic infarction": 1, "Hallucination": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Heat illness": 1, "Hepatic failure": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hypertrophic cardiomyopathy": 1, "Hypoalbuminaemia": 1, "Hypothermia": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Inflammation": 1, "Influenza": 1, "Influenza A virus test": 1, "Influenza virus test": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Joint instability": 1, "Joint range of motion decreased": 1, "Lack of spontaneous speech": 1, "Lacunar infarction": 1, "Language disorder": 1, "Large intestine perforation": 1, "Laryngeal discomfort": 1, "Laryngeal pain": 1, "Left ventricular dysfunction": 1, "Limb discomfort": 1, "Lip dry": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lung disorder": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Lymphocyte percentage": 1, "Marasmus": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mesenteric arterial occlusion": 1, "Monocyte count": 1, "Mouth breathing": 1, "Mouth haemorrhage": 1, "Muscle haemorrhage": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycoplasma test": 1, "Neck mass": 1, "Neck pain": 1, "Necrotising colitis": 1, "Nerve conduction studies abnormal": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Nystagmus": 1, "Oculomucocutaneous syndrome": 1, "Oedema peripheral": 1, "Oral discomfort": 1, "Oral pruritus": 1, "Oxygen consumption": 1, "Pancytopenia": 1, "Paradoxical pressor response": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia bacterial": 1, "Polymyalgia rheumatica": 1, "Portal vein thrombosis": 1, "Prinzmetal angina": 1, "Product administered at inappropriate site": 1, "Protein total decreased": 1, "Protein urine present": 1, "Prothrombin time": 1, "Prurigo": 1, "Pulse absent": 1, "Pupillary light reflex tests": 1, "Pupils unequal": 1, "Putamen haemorrhage": 1, "Pyelonephritis": 1, "Radial pulse decreased": 1, "Red blood cell count": 1, "Renal failure": 1, "Respiration abnormal": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Retinal vein occlusion": 1, "Sensory disturbance": 1, "Septic shock": 1, "Shock": 1, "Shock symptom": 1, "Shunt occlusion": 1, "Skin discolouration": 1, "Snoring": 1, "Specific gravity urine": 1, "Spinal X-ray": 1, "Spinal osteoarthritis": 1, "Stool analysis": 1, "Subdural haematoma": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Thalamus haemorrhage": 1, "Throat clearing": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Troponin I": 1, "Type 2 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Urobilinogen urine": 1, "Vaccination site atrophy": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site vesicles": 1, "Venogram": 1, "Ventricular enlargement": 1, "Ventricular extrasystoles": 1, "Ventricular internal diameter abnormal": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Visual acuity reduced": 1, "Vital signs measurement": 1, "Wrist deformity": 1, "X-ray": 1, "X-ray limb": 1, "pH urine": 1}, "batchcodes": ["FA4597"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA4599.json b/docs/data/histograms/Japan/FA4599.json
index 8e969f86f28..149ad50b601 100644
--- a/docs/data/histograms/Japan/FA4599.json
+++ b/docs/data/histograms/Japan/FA4599.json
@@ -1 +1 @@
-{"batchcode": "FA4599", "histograms": [{"batchcodes": ["FA4599"], "histogram": {"Acute myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "FA4599", "histograms": [{"histogram": {"Acute myocardial infarction": 1}, "batchcodes": ["FA4599"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA5422.json b/docs/data/histograms/Japan/FA5422.json
index e67921ba41e..6f1ddc58733 100644
--- a/docs/data/histograms/Japan/FA5422.json
+++ b/docs/data/histograms/Japan/FA5422.json
@@ -1 +1 @@
-{"batchcode": "FA5422", "histograms": [{"batchcodes": ["FA5422"], "histogram": {"Cerebral haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5422", "histograms": [{"histogram": {"Cerebral haemorrhage": 1}, "batchcodes": ["FA5422"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA5715.json b/docs/data/histograms/Japan/FA5715.json
index f2cb5ed7c58..6a05781ca33 100644
--- a/docs/data/histograms/Japan/FA5715.json
+++ b/docs/data/histograms/Japan/FA5715.json
@@ -1 +1 @@
-{"batchcode": "FA5715", "histograms": [{"batchcodes": ["3006279", "EY0572", "FA5715"], "histogram": {"Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Seizure": 1, "Sinus bradycardia": 1}}, {"batchcodes": ["FA5715"], "histogram": {"Body temperature": 39, "Blood pressure measurement": 15, "Pyrexia": 13, "Heart rate": 11, "Oxygen saturation": 11, "Pruritus": 9, "Nausea": 7, "Rash": 7, "Urticaria": 7, "Dizziness": 6, "Erythema": 6, "Headache": 6, "Magnetic resonance imaging": 6, "Malaise": 6, "Blood pressure decreased": 5, "Muscular weakness": 5, "Pain in extremity": 5, "Anaphylactic reaction": 4, "Cerebral infarction": 4, "Coma scale": 4, "Computerised tomogram": 4, "Dyspnoea": 4, "Feeling abnormal": 4, "Hypoaesthesia": 4, "Investigation": 4, "Vomiting": 4, "Altered state of consciousness": 3, "Arthralgia": 3, "Blood pressure increased": 3, "Cardio-respiratory arrest": 3, "Death": 3, "Electrocardiogram": 3, "Interstitial lung disease": 3, "Pallor": 3, "Palpitations": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Brain stem haemorrhage": 2, "Cerebral haemorrhage": 2, "Chills": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Cough": 2, "Diarrhoea": 2, "Gait disturbance": 2, "Hypertension": 2, "Hypoxia": 2, "Lung opacity": 2, "Magnetic resonance imaging head": 2, "Nasal congestion": 2, "Oropharyngeal discomfort": 2, "Pneumonia": 2, "Purpura": 2, "Rash papular": 2, "Subarachnoid haemorrhage": 2, "Toxic skin eruption": 2, "Vaccination site erythema": 2, "X-ray": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Allergic reaction to excipient": 1, "Angioedema": 1, "Angiogram cerebral": 1, "Aortic rupture": 1, "Arrhythmia": 1, "Arteriosclerosis coronary artery": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Auscultation": 1, "Autoantibody test": 1, "Aversion": 1, "Axillary nerve injury": 1, "Basal ganglia infarction": 1, "Basilar artery occlusion": 1, "Biopsy lymph gland": 1, "Blood culture": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood test": 1, "Body mass index": 1, "Brain stem infarction": 1, "C-reactive protein": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "CSF white blood cell count": 1, "Capillary leak syndrome": 1, "Cardiac failure": 1, "Cerebellar infarction": 1, "Cerebrovascular accident": 1, "Cervical spinal stenosis": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chronic respiratory failure": 1, "Clonic convulsion": 1, "Colitis ischaemic": 1, "Condition aggravated": 1, "Confusional state": 1, "Constipation": 1, "Culture": 1, "Cyanosis": 1, "Decreased activity": 1, "Dehydration": 1, "Dermatitis allergic": 1, "Diabetic ketoacidosis": 1, "Diagnostic procedure": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dural arteriovenous fistula": 1, "Dyslalia": 1, "Dysphonia": 1, "Dysstasia": 1, "Eating disorder": 1, "Facial paralysis": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Hepatic function abnormal": 1, "Hiccups": 1, "Hot flush": 1, "Hypercapnia": 1, "Hyperthermia": 1, "Hypoglycaemia": 1, "Illness": 1, "Immune-mediated adverse reaction": 1, "Incoherent": 1, "Influenza like illness": 1, "Intervertebral disc protrusion": 1, "Intestinal perforation": 1, "Intracranial pressure increased": 1, "Laryngoscopy": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Lumbar spinal stenosis": 1, "Lymphadenopathy": 1, "Lymphocyte stimulation test": 1, "Meningitis aseptic": 1, "Mobility decreased": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle tightness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Neck pain": 1, "Neuritis": 1, "Neuropathy peripheral": 1, "Ophthalmic artery thrombosis": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Paraesthesia": 1, "Paralysis recurrent laryngeal nerve": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Prothrombin time": 1, "Pseudomonas test positive": 1, "Pulmonary oedema": 1, "Reaction to excipient": 1, "Salmonellosis": 1, "Seizure": 1, "Self-consciousness": 1, "Sensory disturbance": 1, "Sepsis": 1, "Shock": 1, "Skin swelling": 1, "Speech disorder": 1, "Sputum culture": 1, "Staphylococcus test positive": 1, "Still's disease": 1, "Tachycardia": 1, "Tachypnoea": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine output decreased": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vascular malformation": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Vital signs measurement": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5715", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Seizure": 1, "Sinus bradycardia": 1}, "batchcodes": ["3006279", "EY0572", "FA5715"]}, {"histogram": {"Body temperature": 39, "Blood pressure measurement": 15, "Pyrexia": 13, "Heart rate": 11, "Oxygen saturation": 11, "Pruritus": 9, "Nausea": 7, "Rash": 7, "Urticaria": 7, "Dizziness": 6, "Erythema": 6, "Headache": 6, "Magnetic resonance imaging": 6, "Malaise": 6, "Blood pressure decreased": 5, "Muscular weakness": 5, "Pain in extremity": 5, "Anaphylactic reaction": 4, "Cerebral infarction": 4, "Coma scale": 4, "Computerised tomogram": 4, "Dyspnoea": 4, "Feeling abnormal": 4, "Hypoaesthesia": 4, "Investigation": 4, "Vomiting": 4, "Altered state of consciousness": 3, "Arthralgia": 3, "Blood pressure increased": 3, "Cardio-respiratory arrest": 3, "Death": 3, "Electrocardiogram": 3, "Interstitial lung disease": 3, "Pallor": 3, "Palpitations": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Brain stem haemorrhage": 2, "Cerebral haemorrhage": 2, "Chills": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Cough": 2, "Diarrhoea": 2, "Gait disturbance": 2, "Hypertension": 2, "Hypoxia": 2, "Lung opacity": 2, "Magnetic resonance imaging head": 2, "Nasal congestion": 2, "Oropharyngeal discomfort": 2, "Pneumonia": 2, "Purpura": 2, "Rash papular": 2, "Subarachnoid haemorrhage": 2, "Toxic skin eruption": 2, "Vaccination site erythema": 2, "X-ray": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Allergic reaction to excipient": 1, "Angioedema": 1, "Angiogram cerebral": 1, "Aortic rupture": 1, "Arrhythmia": 1, "Arteriosclerosis coronary artery": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Auscultation": 1, "Autoantibody test": 1, "Aversion": 1, "Axillary nerve injury": 1, "Basal ganglia infarction": 1, "Basilar artery occlusion": 1, "Biopsy lymph gland": 1, "Blood culture": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood test": 1, "Body mass index": 1, "Brain stem infarction": 1, "C-reactive protein": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "CSF white blood cell count": 1, "Capillary leak syndrome": 1, "Cardiac failure": 1, "Cerebellar infarction": 1, "Cerebrovascular accident": 1, "Cervical spinal stenosis": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chronic respiratory failure": 1, "Clonic convulsion": 1, "Colitis ischaemic": 1, "Condition aggravated": 1, "Confusional state": 1, "Constipation": 1, "Culture": 1, "Cyanosis": 1, "Decreased activity": 1, "Dehydration": 1, "Dermatitis allergic": 1, "Diabetic ketoacidosis": 1, "Diagnostic procedure": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dural arteriovenous fistula": 1, "Dyslalia": 1, "Dysphonia": 1, "Dysstasia": 1, "Eating disorder": 1, "Facial paralysis": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Hepatic function abnormal": 1, "Hiccups": 1, "Hot flush": 1, "Hypercapnia": 1, "Hyperthermia": 1, "Hypoglycaemia": 1, "Illness": 1, "Immune-mediated adverse reaction": 1, "Incoherent": 1, "Influenza like illness": 1, "Intervertebral disc protrusion": 1, "Intestinal perforation": 1, "Intracranial pressure increased": 1, "Laryngoscopy": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Lumbar spinal stenosis": 1, "Lymphadenopathy": 1, "Lymphocyte stimulation test": 1, "Meningitis aseptic": 1, "Mobility decreased": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle tightness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Neck pain": 1, "Neuritis": 1, "Neuropathy peripheral": 1, "Ophthalmic artery thrombosis": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Paraesthesia": 1, "Paralysis recurrent laryngeal nerve": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Prothrombin time": 1, "Pseudomonas test positive": 1, "Pulmonary oedema": 1, "Reaction to excipient": 1, "Salmonellosis": 1, "Seizure": 1, "Self-consciousness": 1, "Sensory disturbance": 1, "Sepsis": 1, "Shock": 1, "Skin swelling": 1, "Speech disorder": 1, "Sputum culture": 1, "Staphylococcus test positive": 1, "Still's disease": 1, "Tachycardia": 1, "Tachypnoea": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine output decreased": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vascular malformation": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Vital signs measurement": 1, "White blood cell count": 1}, "batchcodes": ["FA5715"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA5765.json b/docs/data/histograms/Japan/FA5765.json
index d7bb6d6a070..c4be5f0c28b 100644
--- a/docs/data/histograms/Japan/FA5765.json
+++ b/docs/data/histograms/Japan/FA5765.json
@@ -1 +1 @@
-{"batchcode": "FA5765", "histograms": [{"batchcodes": ["FA5765"], "histogram": {"Body temperature": 199, "Blood pressure measurement": 91, "Oxygen saturation": 76, "Heart rate": 57, "Pyrexia": 44, "Blood pressure increased": 38, "Anaphylactic reaction": 36, "Computerised tomogram": 27, "Erythema": 24, "Feeling abnormal": 24, "Blood test": 22, "Urticaria": 22, "Dizziness": 21, "Dyspnoea": 21, "Headache": 21, "Nausea": 21, "Oxygen saturation decreased": 21, "Malaise": 19, "Vomiting": 18, "Pruritus": 17, "Rash": 16, "Blood pressure decreased": 15, "Electrocardiogram": 15, "Hypoaesthesia": 15, "Cardio-respiratory arrest": 12, "Cerebral infarction": 12, "Cough": 12, "Loss of consciousness": 12, "C-reactive protein": 11, "Magnetic resonance imaging": 11, "C-reactive protein increased": 10, "Decreased appetite": 10, "Depressed level of consciousness": 10, "Palpitations": 10, "Presyncope": 9, "SARS-CoV-2 test": 9, "Vital signs measurement": 9, "Asthma": 8, "Chest X-ray": 8, "Cold sweat": 8, "Death": 8, "Investigation": 8, "Platelet count": 8, "Vaccination site pain": 8, "White blood cell count": 8, "Altered state of consciousness": 7, "Chest discomfort": 7, "Dysphoria": 7, "Echocardiogram": 7, "Gait disturbance": 7, "Muscular weakness": 7, "Oropharyngeal discomfort": 7, "Respiratory rate": 7, "Seizure": 7, "Tachycardia": 7, "Chest pain": 6, "Fall": 6, "Fibrin D dimer": 6, "Guillain-Barre syndrome": 6, "Neuropathy peripheral": 6, "Oedema peripheral": 6, "Respiratory failure": 6, "Somnolence": 6, "Acute myocardial infarction": 5, "Atrial fibrillation": 5, "Cardiac arrest": 5, "Cardiac failure acute": 5, "Chills": 5, "Coma scale": 5, "Computerised tomogram head": 5, "Hyperhidrosis": 5, "Myalgia": 5, "Platelet count decreased": 5, "Pneumonia": 5, "Pulmonary embolism": 5, "Vaccination site pruritus": 5, "Anaemia": 4, "Bradycardia": 4, "Cardiac failure": 4, "Diarrhoea": 4, "Disease recurrence": 4, "Feeling cold": 4, "Haemoglobin": 4, "Haemorrhage subcutaneous": 4, "Heart rate increased": 4, "Hypersensitivity": 4, "Hypoxia": 4, "Inflammation": 4, "Movement disorder": 4, "Neck pain": 4, "Pain": 4, "Pain in extremity": 4, "Pallor": 4, "Peripheral swelling": 4, "Polymerase chain reaction": 4, "Troponin T": 4, "Urine analysis": 4, "Wheezing": 4, "X-ray": 4, "Anaphylactic shock": 3, "Arthralgia": 3, "Asthenia": 3, "Auscultation": 3, "Autoantibody test": 3, "Blood creatine phosphokinase": 3, "CSF cell count": 3, "Cardiac failure congestive": 3, "Cerebral haemorrhage": 3, "Deep vein thrombosis": 3, "Discomfort": 3, "Dysarthria": 3, "Dysstasia": 3, "Epilepsy": 3, "Faeces discoloured": 3, "Fatigue": 3, "Hot flush": 3, "Hypertension": 3, "Hypoaesthesia oral": 3, "Magnetic resonance imaging head": 3, "Meningitis aseptic": 3, "Mobility decreased": 3, "Mouth haemorrhage": 3, "Myocarditis": 3, "N-terminal prohormone brain natriuretic peptide": 3, "N-terminal prohormone brain natriuretic peptide increased": 3, "Nerve conduction studies": 3, "Ocular hyperaemia": 3, "PO2": 3, "Paraesthesia": 3, "Paralysis": 3, "Physical deconditioning": 3, "Pleural effusion": 3, "Purpura": 3, "Restlessness": 3, "Sensory disturbance": 3, "Sudden death": 3, "Ultrasound scan": 3, "Abdominal discomfort": 2, "Anxiety": 2, "Aortic dissection": 2, "Aphasia": 2, "Areflexia": 2, "Arrhythmia": 2, "Back pain": 2, "Blood culture": 2, "Blood glucose": 2, "Body temperature increased": 2, "Breath sounds": 2, "Breath sounds abnormal": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiomegaly": 2, "Cellulitis": 2, "Coma": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Culture urine": 2, "Cyanosis": 2, "Dehydration": 2, "Dermatitis allergic": 2, "Dysphagia": 2, "Eczema": 2, "Electrocardiogram ST segment elevation": 2, "Eyelid oedema": 2, "Facial paralysis": 2, "Feeding disorder": 2, "Feeling hot": 2, "Gait inability": 2, "Grip strength decreased": 2, "Haemorrhagic diathesis": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hemiplegia": 2, "Hyponatraemia": 2, "Immune thrombocytopenia": 2, "Infection": 2, "Internal haemorrhage": 2, "Interstitial lung disease": 2, "Lacunar infarction": 2, "Limb discomfort": 2, "Liver function test": 2, "Lymphadenopathy": 2, "Lymphocyte count": 2, "Monoplegia": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Myocardial infarction": 2, "Neutrophil count": 2, "Oedema": 2, "Pneumonia aspiration": 2, "Pulmonary oedema": 2, "Putamen haemorrhage": 2, "Rash erythematous": 2, "Rash pruritic": 2, "Renal impairment": 2, "Sepsis": 2, "Speech disorder": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Thalamus haemorrhage": 2, "Throat irritation": 2, "Tremor": 2, "Type I hypersensitivity": 2, "Vasculitis": 2, "Weight increased": 2, "AST/ALT ratio": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acidosis": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute generalised exanthematous pustulosis": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Angina pectoris": 1, "Angina unstable": 1, "Angiocardiogram": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Aortic aneurysm rupture": 1, "Apnoea": 1, "Arteriosclerosis": 1, "Arteriosclerosis coronary artery": 1, "Arthritis": 1, "Arthritis reactive": 1, "Asphyxia": 1, "Aspiration": 1, "Asterixis": 1, "Atelectasis": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Balance disorder": 1, "Bell's palsy": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood albumin": 1, "Blood creatine": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Bradyphrenia": 1, "Brain compression": 1, "Brain stem infarction": 1, "Bronchostenosis": 1, "Bulbar palsy": 1, "COVID-19": 1, "CSF culture": 1, "CSF white blood cell count": 1, "Cardiac death": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure chronic": 1, "Cardiac hypertrophy": 1, "Cardiolipin antibody": 1, "Cardiolipin antibody positive": 1, "Cardiovascular disorder": 1, "Cerebellar haemorrhage": 1, "Cerebellar infarction": 1, "Cerebral haematoma": 1, "Cholecystitis": 1, "Cholecystitis acute": 1, "Chondrocalcinosis pyrophosphate": 1, "Chronic fatigue syndrome": 1, "Chronic kidney disease": 1, "Chvostek's sign": 1, "Circulatory collapse": 1, "Conjunctival hyperaemia": 1, "Coronary artery stenosis": 1, "Cutaneous vasculitis": 1, "Cytomegalovirus test": 1, "Delirium": 1, "Demyelination": 1, "Diastolic dysfunction": 1, "Disorientation": 1, "Dissociative disorder": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dyschezia": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dyspraxia": 1, "Dysuria": 1, "Eating disorder": 1, "Eczema herpeticum": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST-T segment abnormal": 1, "Electrocardiogram T wave inversion": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "Encephalopathy": 1, "Endoscopy": 1, "Endoscopy gastrointestinal": 1, "Epistaxis": 1, "Epstein-Barr virus antibody": 1, "Epstein-Barr virus test": 1, "Erythema of eyelid": 1, "Extraocular muscle disorder": 1, "Eye irritation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Face oedema": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Foot fracture": 1, "Gastric ulcer haemorrhage": 1, "Gastroenteritis": 1, "Gastrointestinal necrosis": 1, "Gaze palsy": 1, "General symptom": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Haematemesis": 1, "Haematoma": 1, "Haematuria": 1, "Haemolysis": 1, "Haemorrhage": 1, "Haemorrhage urinary tract": 1, "Haemorrhagic cerebral infarction": 1, "Haemorrhagic urticaria": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Heart rate irregular": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Herpes simplex encephalitis": 1, "Hiccups": 1, "Hydrocephalus": 1, "Hyperpyrexia": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Jaundice": 1, "Lactic acidosis": 1, "Large intestinal polypectomy": 1, "Lip discolouration": 1, "Lip haemorrhage": 1, "Lip oedema": 1, "Lip swelling": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lung neoplasm malignant": 1, "Lung opacity": 1, "Lymphadenitis": 1, "Lymphocyte stimulation test": 1, "Lymphopenia": 1, "Magnetic resonance imaging abnormal": 1, "Melaena": 1, "Memory impairment": 1, "Mental impairment": 1, "Mitral valve incompetence": 1, "Mononuclear cell count increased": 1, "Multiple organ dysfunction syndrome": 1, "Muscle rigidity": 1, "Musculoskeletal discomfort": 1, "Nasal discomfort": 1, "Neoplasm malignant": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neurologic neglect syndrome": 1, "Neutrophil percentage": 1, "Oesophageal carcinoma": 1, "Oesophagogastroduodenoscopy": 1, "Oral discomfort": 1, "Orthostatic intolerance": 1, "Oxygen saturation abnormal": 1, "Papule": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral vascular disorder": 1, "Peroneal nerve palsy": 1, "Pharyngeal paraesthesia": 1, "Photophobia": 1, "Physical examination": 1, "Platelet aggregation abnormal": 1, "Pneumonia bacterial": 1, "Polymyalgia rheumatica": 1, "Polyuria": 1, "Prinzmetal angina": 1, "Protein total": 1, "Protein urine": 1, "Pulse abnormal": 1, "Pulse pressure increased": 1, "Pyoderma": 1, "Rales": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Renal failure": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory paralysis": 1, "Respiratory rate increased": 1, "Rheumatic disorder": 1, "Rib fracture": 1, "Road traffic accident": 1, "Scan with contrast": 1, "Scratch": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Shock haemorrhagic": 1, "Sinus node dysfunction": 1, "Slow response to stimuli": 1, "Small intestinal haemorrhage": 1, "Spinal disorder": 1, "Spinal osteoarthritis": 1, "Staphylococcal bacteraemia": 1, "Strabismus": 1, "Stupor": 1, "Subdural haemorrhage": 1, "Swelling face": 1, "Systolic dysfunction": 1, "Tachypnoea": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Tinnitus": 1, "Troponin I": 1, "Troponin T increased": 1, "Tumour marker test": 1, "Ultrasound Doppler": 1, "Upper-airway cough syndrome": 1, "Urinary incontinence": 1, "Urinary occult blood": 1, "Urinary tract infection": 1, "Urine ketone body": 1, "Urine output": 1, "Urticaria vesiculosa": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Venous occlusion": 1, "Ventilation/perfusion scan": 1, "Ventricular arrhythmia": 1, "Ventricular dysfunction": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Visual impairment": 1, "Vitamin D deficiency": 1, "Weight": 1, "White blood cell count increased": 1, "White blood cell disorder": 1, "White blood cells urine": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5765", "histograms": [{"histogram": {"Body temperature": 199, "Blood pressure measurement": 91, "Oxygen saturation": 76, "Heart rate": 57, "Pyrexia": 44, "Blood pressure increased": 38, "Anaphylactic reaction": 36, "Computerised tomogram": 27, "Erythema": 24, "Feeling abnormal": 24, "Blood test": 22, "Urticaria": 22, "Dizziness": 21, "Dyspnoea": 21, "Headache": 21, "Nausea": 21, "Oxygen saturation decreased": 21, "Malaise": 19, "Vomiting": 18, "Pruritus": 17, "Rash": 16, "Blood pressure decreased": 15, "Electrocardiogram": 15, "Hypoaesthesia": 15, "Cardio-respiratory arrest": 12, "Cerebral infarction": 12, "Cough": 12, "Loss of consciousness": 12, "C-reactive protein": 11, "Magnetic resonance imaging": 11, "C-reactive protein increased": 10, "Decreased appetite": 10, "Depressed level of consciousness": 10, "Palpitations": 10, "Presyncope": 9, "SARS-CoV-2 test": 9, "Vital signs measurement": 9, "Asthma": 8, "Chest X-ray": 8, "Cold sweat": 8, "Death": 8, "Investigation": 8, "Platelet count": 8, "Vaccination site pain": 8, "White blood cell count": 8, "Altered state of consciousness": 7, "Chest discomfort": 7, "Dysphoria": 7, "Echocardiogram": 7, "Gait disturbance": 7, "Muscular weakness": 7, "Oropharyngeal discomfort": 7, "Respiratory rate": 7, "Seizure": 7, "Tachycardia": 7, "Chest pain": 6, "Fall": 6, "Fibrin D dimer": 6, "Guillain-Barre syndrome": 6, "Neuropathy peripheral": 6, "Oedema peripheral": 6, "Respiratory failure": 6, "Somnolence": 6, "Acute myocardial infarction": 5, "Atrial fibrillation": 5, "Cardiac arrest": 5, "Cardiac failure acute": 5, "Chills": 5, "Coma scale": 5, "Computerised tomogram head": 5, "Hyperhidrosis": 5, "Myalgia": 5, "Platelet count decreased": 5, "Pneumonia": 5, "Pulmonary embolism": 5, "Vaccination site pruritus": 5, "Anaemia": 4, "Bradycardia": 4, "Cardiac failure": 4, "Diarrhoea": 4, "Disease recurrence": 4, "Feeling cold": 4, "Haemoglobin": 4, "Haemorrhage subcutaneous": 4, "Heart rate increased": 4, "Hypersensitivity": 4, "Hypoxia": 4, "Inflammation": 4, "Movement disorder": 4, "Neck pain": 4, "Pain": 4, "Pain in extremity": 4, "Pallor": 4, "Peripheral swelling": 4, "Polymerase chain reaction": 4, "Troponin T": 4, "Urine analysis": 4, "Wheezing": 4, "X-ray": 4, "Anaphylactic shock": 3, "Arthralgia": 3, "Asthenia": 3, "Auscultation": 3, "Autoantibody test": 3, "Blood creatine phosphokinase": 3, "CSF cell count": 3, "Cardiac failure congestive": 3, "Cerebral haemorrhage": 3, "Deep vein thrombosis": 3, "Discomfort": 3, "Dysarthria": 3, "Dysstasia": 3, "Epilepsy": 3, "Faeces discoloured": 3, "Fatigue": 3, "Hot flush": 3, "Hypertension": 3, "Hypoaesthesia oral": 3, "Magnetic resonance imaging head": 3, "Meningitis aseptic": 3, "Mobility decreased": 3, "Mouth haemorrhage": 3, "Myocarditis": 3, "N-terminal prohormone brain natriuretic peptide": 3, "N-terminal prohormone brain natriuretic peptide increased": 3, "Nerve conduction studies": 3, "Ocular hyperaemia": 3, "PO2": 3, "Paraesthesia": 3, "Paralysis": 3, "Physical deconditioning": 3, "Pleural effusion": 3, "Purpura": 3, "Restlessness": 3, "Sensory disturbance": 3, "Sudden death": 3, "Ultrasound scan": 3, "Abdominal discomfort": 2, "Anxiety": 2, "Aortic dissection": 2, "Aphasia": 2, "Areflexia": 2, "Arrhythmia": 2, "Back pain": 2, "Blood culture": 2, "Blood glucose": 2, "Body temperature increased": 2, "Breath sounds": 2, "Breath sounds abnormal": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiomegaly": 2, "Cellulitis": 2, "Coma": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Culture urine": 2, "Cyanosis": 2, "Dehydration": 2, "Dermatitis allergic": 2, "Dysphagia": 2, "Eczema": 2, "Electrocardiogram ST segment elevation": 2, "Eyelid oedema": 2, "Facial paralysis": 2, "Feeding disorder": 2, "Feeling hot": 2, "Gait inability": 2, "Grip strength decreased": 2, "Haemorrhagic diathesis": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hemiplegia": 2, "Hyponatraemia": 2, "Immune thrombocytopenia": 2, "Infection": 2, "Internal haemorrhage": 2, "Interstitial lung disease": 2, "Lacunar infarction": 2, "Limb discomfort": 2, "Liver function test": 2, "Lymphadenopathy": 2, "Lymphocyte count": 2, "Monoplegia": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Myocardial infarction": 2, "Neutrophil count": 2, "Oedema": 2, "Pneumonia aspiration": 2, "Pulmonary oedema": 2, "Putamen haemorrhage": 2, "Rash erythematous": 2, "Rash pruritic": 2, "Renal impairment": 2, "Sepsis": 2, "Speech disorder": 2, "Subarachnoid haemorrhage": 2, "Syncope": 2, "Thalamus haemorrhage": 2, "Throat irritation": 2, "Tremor": 2, "Type I hypersensitivity": 2, "Vasculitis": 2, "Weight increased": 2, "AST/ALT ratio": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acidosis": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute generalised exanthematous pustulosis": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Angina pectoris": 1, "Angina unstable": 1, "Angiocardiogram": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Aortic aneurysm rupture": 1, "Apnoea": 1, "Arteriosclerosis": 1, "Arteriosclerosis coronary artery": 1, "Arthritis": 1, "Arthritis reactive": 1, "Asphyxia": 1, "Aspiration": 1, "Asterixis": 1, "Atelectasis": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Balance disorder": 1, "Bell's palsy": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood albumin": 1, "Blood creatine": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Bradyphrenia": 1, "Brain compression": 1, "Brain stem infarction": 1, "Bronchostenosis": 1, "Bulbar palsy": 1, "COVID-19": 1, "CSF culture": 1, "CSF white blood cell count": 1, "Cardiac death": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure chronic": 1, "Cardiac hypertrophy": 1, "Cardiolipin antibody": 1, "Cardiolipin antibody positive": 1, "Cardiovascular disorder": 1, "Cerebellar haemorrhage": 1, "Cerebellar infarction": 1, "Cerebral haematoma": 1, "Cholecystitis": 1, "Cholecystitis acute": 1, "Chondrocalcinosis pyrophosphate": 1, "Chronic fatigue syndrome": 1, "Chronic kidney disease": 1, "Chvostek's sign": 1, "Circulatory collapse": 1, "Conjunctival hyperaemia": 1, "Coronary artery stenosis": 1, "Cutaneous vasculitis": 1, "Cytomegalovirus test": 1, "Delirium": 1, "Demyelination": 1, "Diastolic dysfunction": 1, "Disorientation": 1, "Dissociative disorder": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dyschezia": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dyspraxia": 1, "Dysuria": 1, "Eating disorder": 1, "Eczema herpeticum": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST-T segment abnormal": 1, "Electrocardiogram T wave inversion": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "Encephalopathy": 1, "Endoscopy": 1, "Endoscopy gastrointestinal": 1, "Epistaxis": 1, "Epstein-Barr virus antibody": 1, "Epstein-Barr virus test": 1, "Erythema of eyelid": 1, "Extraocular muscle disorder": 1, "Eye irritation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Face oedema": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Foot fracture": 1, "Gastric ulcer haemorrhage": 1, "Gastroenteritis": 1, "Gastrointestinal necrosis": 1, "Gaze palsy": 1, "General symptom": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Haematemesis": 1, "Haematoma": 1, "Haematuria": 1, "Haemolysis": 1, "Haemorrhage": 1, "Haemorrhage urinary tract": 1, "Haemorrhagic cerebral infarction": 1, "Haemorrhagic urticaria": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Heart rate irregular": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Herpes simplex encephalitis": 1, "Hiccups": 1, "Hydrocephalus": 1, "Hyperpyrexia": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Jaundice": 1, "Lactic acidosis": 1, "Large intestinal polypectomy": 1, "Lip discolouration": 1, "Lip haemorrhage": 1, "Lip oedema": 1, "Lip swelling": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lung neoplasm malignant": 1, "Lung opacity": 1, "Lymphadenitis": 1, "Lymphocyte stimulation test": 1, "Lymphopenia": 1, "Magnetic resonance imaging abnormal": 1, "Melaena": 1, "Memory impairment": 1, "Mental impairment": 1, "Mitral valve incompetence": 1, "Mononuclear cell count increased": 1, "Multiple organ dysfunction syndrome": 1, "Muscle rigidity": 1, "Musculoskeletal discomfort": 1, "Nasal discomfort": 1, "Neoplasm malignant": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neurologic neglect syndrome": 1, "Neutrophil percentage": 1, "Oesophageal carcinoma": 1, "Oesophagogastroduodenoscopy": 1, "Oral discomfort": 1, "Orthostatic intolerance": 1, "Oxygen saturation abnormal": 1, "Papule": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral vascular disorder": 1, "Peroneal nerve palsy": 1, "Pharyngeal paraesthesia": 1, "Photophobia": 1, "Physical examination": 1, "Platelet aggregation abnormal": 1, "Pneumonia bacterial": 1, "Polymyalgia rheumatica": 1, "Polyuria": 1, "Prinzmetal angina": 1, "Protein total": 1, "Protein urine": 1, "Pulse abnormal": 1, "Pulse pressure increased": 1, "Pyoderma": 1, "Rales": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Renal failure": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory paralysis": 1, "Respiratory rate increased": 1, "Rheumatic disorder": 1, "Rib fracture": 1, "Road traffic accident": 1, "Scan with contrast": 1, "Scratch": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Shock haemorrhagic": 1, "Sinus node dysfunction": 1, "Slow response to stimuli": 1, "Small intestinal haemorrhage": 1, "Spinal disorder": 1, "Spinal osteoarthritis": 1, "Staphylococcal bacteraemia": 1, "Strabismus": 1, "Stupor": 1, "Subdural haemorrhage": 1, "Swelling face": 1, "Systolic dysfunction": 1, "Tachypnoea": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Tinnitus": 1, "Troponin I": 1, "Troponin T increased": 1, "Tumour marker test": 1, "Ultrasound Doppler": 1, "Upper-airway cough syndrome": 1, "Urinary incontinence": 1, "Urinary occult blood": 1, "Urinary tract infection": 1, "Urine ketone body": 1, "Urine output": 1, "Urticaria vesiculosa": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Venous occlusion": 1, "Ventilation/perfusion scan": 1, "Ventricular arrhythmia": 1, "Ventricular dysfunction": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "Vestibular neuronitis": 1, "Viral test": 1, "Visual impairment": 1, "Vitamin D deficiency": 1, "Weight": 1, "White blood cell count increased": 1, "White blood cell disorder": 1, "White blood cells urine": 1}, "batchcodes": ["FA5765"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA5829.json b/docs/data/histograms/Japan/FA5829.json
index b70f4befa96..71bca3cdcc4 100644
--- a/docs/data/histograms/Japan/FA5829.json
+++ b/docs/data/histograms/Japan/FA5829.json
@@ -1 +1 @@
-{"batchcode": "FA5829", "histograms": [{"batchcodes": ["FA5829"], "histogram": {"Body temperature": 92, "Blood pressure measurement": 38, "Oxygen saturation": 30, "Heart rate": 24, "Pyrexia": 20, "Anaphylactic reaction": 13, "Dyspnoea": 13, "Nausea": 13, "Blood pressure increased": 11, "Cerebral infarction": 11, "Malaise": 11, "Blood pressure decreased": 10, "Headache": 10, "Oxygen saturation decreased": 10, "Erythema": 9, "Computerised tomogram head": 8, "Cough": 8, "Feeling abnormal": 8, "Hypoaesthesia": 8, "Vomiting": 8, "C-reactive protein": 7, "Platelet count": 7, "Pruritus": 7, "Chills": 6, "Decreased appetite": 6, "Dizziness": 6, "Feeling hot": 6, "Investigation": 6, "Magnetic resonance imaging": 6, "Rash": 6, "Respiratory rate": 6, "Blood test": 5, "Cardiac failure": 5, "Dehydration": 5, "Pallor": 5, "Tremor": 5, "Urticaria": 5, "White blood cell count": 5, "Arthralgia": 4, "Aspartate aminotransferase": 4, "Asthenia": 4, "Asthma": 4, "Cardio-respiratory arrest": 4, "Computerised tomogram thorax": 4, "Gait disturbance": 4, "Heart rate decreased": 4, "Hyperventilation": 4, "Magnetic resonance imaging head": 4, "Platelet count decreased": 4, "Pneumonia": 4, "Vital signs measurement": 4, "Abdominal pain upper": 3, "Alanine aminotransferase": 3, "Alanine aminotransferase increased": 3, "Altered state of consciousness": 3, "Aspartate aminotransferase increased": 3, "Blood creatine phosphokinase": 3, "Blood pressure systolic increased": 3, "C-reactive protein increased": 3, "Cold sweat": 3, "Death": 3, "Diarrhoea": 3, "Echocardiogram": 3, "Hypertension": 3, "Loss of consciousness": 3, "Palpitations": 3, "Physical deconditioning": 3, "Presyncope": 3, "Seizure": 3, "Thrombosis": 3, "ADAMTS13 activity assay": 2, "Abdominal pain": 2, "Anaemia": 2, "Anaphylactic shock": 2, "Aortic dissection": 2, "Arrhythmia": 2, "Blood bilirubin increased": 2, "Cardiac arrest": 2, "Cellulitis": 2, "Cerebral artery occlusion": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Dysphonia": 2, "Dysphoria": 2, "Dysstasia": 2, "Ejection fraction": 2, "Electrocardiogram": 2, "Facial paralysis": 2, "Fall": 2, "Flushing": 2, "Glycosylated haemoglobin": 2, "Haemoglobin": 2, "Heart rate increased": 2, "Hepatic function abnormal": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hypoaesthesia oral": 2, "Hypophagia": 2, "Hypoxia": 2, "Infection": 2, "International normalised ratio": 2, "International normalised ratio increased": 2, "Joint swelling": 2, "Liver disorder": 2, "Mobility decreased": 2, "Myalgia": 2, "Myocardial infarction": 2, "Neutrophil count": 2, "Oropharyngeal discomfort": 2, "PO2": 2, "Pain": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Pleural effusion": 2, "Productive cough": 2, "Respiratory failure": 2, "SARS-CoV-2 test": 2, "Stress": 2, "Tachycardia": 2, "Tachypnoea": 2, "Tenderness": 2, "Thrombocytopenia": 2, "Urine output decreased": 2, "White blood cell count increased": 2, "White blood cell disorder": 2, "X-ray": 2, "ADAMTS13 activity decreased": 1, "Abdominal discomfort": 1, "Abdominal distension": 1, "Activated partial thromboplastin time": 1, "Activated partial thromboplastin time prolonged": 1, "Acute respiratory distress syndrome": 1, "Allergy to vaccine": 1, "Angioedema": 1, "Angiogram": 1, "Angiogram cerebral": 1, "Anxiety": 1, "Aortic aneurysm rupture": 1, "Aortic valve incompetence": 1, "Aortogram": 1, "Aphonia": 1, "Arterial occlusive disease": 1, "Arteriosclerosis": 1, "Arthritis": 1, "Ascites": 1, "Asphyxia": 1, "Atrial fibrillation": 1, "Atrial flutter": 1, "Audiogram": 1, "Auscultation": 1, "Bacterial test": 1, "Bilirubin conjugated": 1, "Bilirubin conjugated increased": 1, "Biopsy bone marrow": 1, "Blindness transient": 1, "Blood bilirubin": 1, "Blood creatine": 1, "Blood creatine phosphokinase MB": 1, "Blood lactate dehydrogenase": 1, "Blood pressure diastolic decreased": 1, "Blood urea": 1, "Body temperature increased": 1, "Bone contusion": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Brain stem haemorrhage": 1, "Bursitis": 1, "C-reactive protein abnormal": 1, "CSF test": 1, "Carbon dioxide": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac failure acute": 1, "Cardiac septal hypertrophy": 1, "Cardiogenic shock": 1, "Chest discomfort": 1, "Cholecystitis acute": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Coagulation test": 1, "Colitis ischaemic": 1, "Coma scale": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Culture urine": 1, "Deafness neurosensory": 1, "Dermatitis exfoliative": 1, "Diastolic dysfunction": 1, "Disease recurrence": 1, "Disorientation": 1, "Drooling": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dyslalia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Eczema": 1, "Electroencephalogram": 1, "Endocarditis": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Enlarged uvula": 1, "Enteritis": 1, "Erythema multiforme": 1, "Faeces soft": 1, "Fibrin degradation products": 1, "Fraction of inspired oxygen": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Glycosylated haemoglobin increased": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma muscle": 1, "Haemolytic anaemia": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Hallucination, visual": 1, "Head discomfort": 1, "Heat illness": 1, "Hepatitis B": 1, "Herpes zoster": 1, "Hypercoagulation": 1, "Hypertensive encephalopathy": 1, "Hyperthermia": 1, "Hypoproteinaemia": 1, "Hypothermia": 1, "Idiopathic pulmonary fibrosis": 1, "Imaging procedure": 1, "Incontinence": 1, "Inferior vena cava dilatation": 1, "Insomnia": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Larynx irritation": 1, "Lip swelling": 1, "Liver function test": 1, "Lumbar puncture": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphoblast count": 1, "Lymphopenia": 1, "Magnetic resonance cholangiopancreatography": 1, "Magnetic resonance imaging renal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Metastases to liver": 1, "Mitral valve incompetence": 1, "Monoparesis": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle haemorrhage": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Neutrophil count increased": 1, "Nucleic acid test": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Orthopnoea": 1, "Oxygen therapy": 1, "PaO2/FiO2 ratio": 1, "Pain in jaw": 1, "Papule": 1, "Paraesthesia": 1, "Partial seizures": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Peripheral nerve destruction": 1, "Pharyngeal swelling": 1, "Pneumonia bacterial": 1, "Pneumonia staphylococcal": 1, "Proteinuria": 1, "Prothrombin time": 1, "Prothrombin time prolonged": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Putamen haemorrhage": 1, "Red blood cell count": 1, "Renal disorder": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "SARS-CoV-2 RNA": 1, "Sepsis": 1, "Shock": 1, "Skin exfoliation": 1, "Small intestine carcinoma": 1, "Speech disorder": 1, "Sputum increased": 1, "Sputum purulent": 1, "Status epilepticus": 1, "Stridor": 1, "Sudden hearing loss": 1, "Syncope": 1, "Tension": 1, "Tetany": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Thrombotic cerebral infarction": 1, "Thrombotic thrombocytopenic purpura": 1, "Tinnitus": 1, "Tricuspid valve incompetence": 1, "Troponin": 1, "Troponin T": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Urinary occult blood": 1, "Uterine haemorrhage": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Venous thrombosis limb": 1, "Ventricular enlargement": 1, "Ventricular hypertrophy": 1, "Ventricular hypokinesia": 1, "Ventricular internal diameter": 1, "Wall motion score index": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5829", "histograms": [{"histogram": {"Body temperature": 92, "Blood pressure measurement": 38, "Oxygen saturation": 30, "Heart rate": 24, "Pyrexia": 20, "Anaphylactic reaction": 13, "Dyspnoea": 13, "Nausea": 13, "Blood pressure increased": 11, "Cerebral infarction": 11, "Malaise": 11, "Blood pressure decreased": 10, "Headache": 10, "Oxygen saturation decreased": 10, "Erythema": 9, "Computerised tomogram head": 8, "Cough": 8, "Feeling abnormal": 8, "Hypoaesthesia": 8, "Vomiting": 8, "C-reactive protein": 7, "Platelet count": 7, "Pruritus": 7, "Chills": 6, "Decreased appetite": 6, "Dizziness": 6, "Feeling hot": 6, "Investigation": 6, "Magnetic resonance imaging": 6, "Rash": 6, "Respiratory rate": 6, "Blood test": 5, "Cardiac failure": 5, "Dehydration": 5, "Pallor": 5, "Tremor": 5, "Urticaria": 5, "White blood cell count": 5, "Arthralgia": 4, "Aspartate aminotransferase": 4, "Asthenia": 4, "Asthma": 4, "Cardio-respiratory arrest": 4, "Computerised tomogram thorax": 4, "Gait disturbance": 4, "Heart rate decreased": 4, "Hyperventilation": 4, "Magnetic resonance imaging head": 4, "Platelet count decreased": 4, "Pneumonia": 4, "Vital signs measurement": 4, "Abdominal pain upper": 3, "Alanine aminotransferase": 3, "Alanine aminotransferase increased": 3, "Altered state of consciousness": 3, "Aspartate aminotransferase increased": 3, "Blood creatine phosphokinase": 3, "Blood pressure systolic increased": 3, "C-reactive protein increased": 3, "Cold sweat": 3, "Death": 3, "Diarrhoea": 3, "Echocardiogram": 3, "Hypertension": 3, "Loss of consciousness": 3, "Palpitations": 3, "Physical deconditioning": 3, "Presyncope": 3, "Seizure": 3, "Thrombosis": 3, "ADAMTS13 activity assay": 2, "Abdominal pain": 2, "Anaemia": 2, "Anaphylactic shock": 2, "Aortic dissection": 2, "Arrhythmia": 2, "Blood bilirubin increased": 2, "Cardiac arrest": 2, "Cellulitis": 2, "Cerebral artery occlusion": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Dysphonia": 2, "Dysphoria": 2, "Dysstasia": 2, "Ejection fraction": 2, "Electrocardiogram": 2, "Facial paralysis": 2, "Fall": 2, "Flushing": 2, "Glycosylated haemoglobin": 2, "Haemoglobin": 2, "Heart rate increased": 2, "Hepatic function abnormal": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hypoaesthesia oral": 2, "Hypophagia": 2, "Hypoxia": 2, "Infection": 2, "International normalised ratio": 2, "International normalised ratio increased": 2, "Joint swelling": 2, "Liver disorder": 2, "Mobility decreased": 2, "Myalgia": 2, "Myocardial infarction": 2, "Neutrophil count": 2, "Oropharyngeal discomfort": 2, "PO2": 2, "Pain": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Pleural effusion": 2, "Productive cough": 2, "Respiratory failure": 2, "SARS-CoV-2 test": 2, "Stress": 2, "Tachycardia": 2, "Tachypnoea": 2, "Tenderness": 2, "Thrombocytopenia": 2, "Urine output decreased": 2, "White blood cell count increased": 2, "White blood cell disorder": 2, "X-ray": 2, "ADAMTS13 activity decreased": 1, "Abdominal discomfort": 1, "Abdominal distension": 1, "Activated partial thromboplastin time": 1, "Activated partial thromboplastin time prolonged": 1, "Acute respiratory distress syndrome": 1, "Allergy to vaccine": 1, "Angioedema": 1, "Angiogram": 1, "Angiogram cerebral": 1, "Anxiety": 1, "Aortic aneurysm rupture": 1, "Aortic valve incompetence": 1, "Aortogram": 1, "Aphonia": 1, "Arterial occlusive disease": 1, "Arteriosclerosis": 1, "Arthritis": 1, "Ascites": 1, "Asphyxia": 1, "Atrial fibrillation": 1, "Atrial flutter": 1, "Audiogram": 1, "Auscultation": 1, "Bacterial test": 1, "Bilirubin conjugated": 1, "Bilirubin conjugated increased": 1, "Biopsy bone marrow": 1, "Blindness transient": 1, "Blood bilirubin": 1, "Blood creatine": 1, "Blood creatine phosphokinase MB": 1, "Blood lactate dehydrogenase": 1, "Blood pressure diastolic decreased": 1, "Blood urea": 1, "Body temperature increased": 1, "Bone contusion": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Brain stem haemorrhage": 1, "Bursitis": 1, "C-reactive protein abnormal": 1, "CSF test": 1, "Carbon dioxide": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac failure acute": 1, "Cardiac septal hypertrophy": 1, "Cardiogenic shock": 1, "Chest discomfort": 1, "Cholecystitis acute": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Coagulation test": 1, "Colitis ischaemic": 1, "Coma scale": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Culture urine": 1, "Deafness neurosensory": 1, "Dermatitis exfoliative": 1, "Diastolic dysfunction": 1, "Disease recurrence": 1, "Disorientation": 1, "Drooling": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dyslalia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Eczema": 1, "Electroencephalogram": 1, "Endocarditis": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Enlarged uvula": 1, "Enteritis": 1, "Erythema multiforme": 1, "Faeces soft": 1, "Fibrin degradation products": 1, "Fraction of inspired oxygen": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Glycosylated haemoglobin increased": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma muscle": 1, "Haemolytic anaemia": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhage subcutaneous": 1, "Hallucination, visual": 1, "Head discomfort": 1, "Heat illness": 1, "Hepatitis B": 1, "Herpes zoster": 1, "Hypercoagulation": 1, "Hypertensive encephalopathy": 1, "Hyperthermia": 1, "Hypoproteinaemia": 1, "Hypothermia": 1, "Idiopathic pulmonary fibrosis": 1, "Imaging procedure": 1, "Incontinence": 1, "Inferior vena cava dilatation": 1, "Insomnia": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Larynx irritation": 1, "Lip swelling": 1, "Liver function test": 1, "Lumbar puncture": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphoblast count": 1, "Lymphopenia": 1, "Magnetic resonance cholangiopancreatography": 1, "Magnetic resonance imaging renal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Metastases to liver": 1, "Mitral valve incompetence": 1, "Monoparesis": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle haemorrhage": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Neutrophil count increased": 1, "Nucleic acid test": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Orthopnoea": 1, "Oxygen therapy": 1, "PaO2/FiO2 ratio": 1, "Pain in jaw": 1, "Papule": 1, "Paraesthesia": 1, "Partial seizures": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Peripheral nerve destruction": 1, "Pharyngeal swelling": 1, "Pneumonia bacterial": 1, "Pneumonia staphylococcal": 1, "Proteinuria": 1, "Prothrombin time": 1, "Prothrombin time prolonged": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Putamen haemorrhage": 1, "Red blood cell count": 1, "Renal disorder": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "SARS-CoV-2 RNA": 1, "Sepsis": 1, "Shock": 1, "Skin exfoliation": 1, "Small intestine carcinoma": 1, "Speech disorder": 1, "Sputum increased": 1, "Sputum purulent": 1, "Status epilepticus": 1, "Stridor": 1, "Sudden hearing loss": 1, "Syncope": 1, "Tension": 1, "Tetany": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Thrombotic cerebral infarction": 1, "Thrombotic thrombocytopenic purpura": 1, "Tinnitus": 1, "Tricuspid valve incompetence": 1, "Troponin": 1, "Troponin T": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Urinary occult blood": 1, "Uterine haemorrhage": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Venous thrombosis limb": 1, "Ventricular enlargement": 1, "Ventricular hypertrophy": 1, "Ventricular hypokinesia": 1, "Ventricular internal diameter": 1, "Wall motion score index": 1, "Wheezing": 1}, "batchcodes": ["FA5829"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA7338.json b/docs/data/histograms/Japan/FA7338.json
index f267fbbccd8..582d6fc64d2 100644
--- a/docs/data/histograms/Japan/FA7338.json
+++ b/docs/data/histograms/Japan/FA7338.json
@@ -1 +1 @@
-{"batchcode": "FA7338", "histograms": [{"batchcodes": ["FA7338"], "histogram": {"Body temperature": 175, "Blood pressure measurement": 66, "Oxygen saturation": 61, "Heart rate": 47, "Pyrexia": 40, "Anaphylactic reaction": 35, "Dyspnoea": 23, "Nausea": 22, "Blood pressure increased": 20, "Headache": 18, "Erythema": 17, "Pruritus": 17, "Rash": 17, "Blood pressure decreased": 16, "Computerised tomogram": 15, "Vomiting": 15, "Urticaria": 14, "Dizziness": 13, "Blood test": 12, "Cerebral infarction": 12, "Electrocardiogram": 12, "Hypoaesthesia": 12, "Malaise": 12, "Cardio-respiratory arrest": 11, "Cold sweat": 11, "Diarrhoea": 11, "SARS-CoV-2 test": 11, "Depressed level of consciousness": 10, "Feeling abnormal": 10, "Magnetic resonance imaging head": 10, "Muscular weakness": 10, "Chills": 9, "Arthralgia": 8, "C-reactive protein": 8, "Cough": 8, "Pallor": 8, "Palpitations": 8, "Presyncope": 8, "White blood cell count": 8, "Computerised tomogram head": 7, "Loss of consciousness": 7, "Magnetic resonance imaging": 7, "Oxygen saturation decreased": 7, "Respiratory rate": 7, "Vaccination site pain": 7, "Wheezing": 7, "Death": 6, "Hypertension": 6, "Movement disorder": 6, "Pneumonia": 6, "Vaccination site erythema": 6, "Back pain": 5, "Cerebral haemorrhage": 5, "Chest pain": 5, "Decreased appetite": 5, "Echocardiogram": 5, "Facial paralysis": 5, "Fall": 5, "Feeling hot": 5, "Heart rate increased": 5, "Hyperhidrosis": 5, "Neuropathy peripheral": 5, "Oropharyngeal discomfort": 5, "Pain": 5, "Pain in extremity": 5, "Platelet count": 5, "Abdominal pain upper": 4, "Alanine aminotransferase": 4, "Altered state of consciousness": 4, "Chest discomfort": 4, "Dehydration": 4, "Disease recurrence": 4, "Dysphonia": 4, "Dysphoria": 4, "Gait disturbance": 4, "Hemiplegia": 4, "Investigation": 4, "Physical deconditioning": 4, "Seizure": 4, "Sensory disturbance": 4, "Somnolence": 4, "Tachycardia": 4, "Ultrasound abdomen": 4, "Abdominal pain": 3, "Antibody test": 3, "Arrhythmia": 3, "Aspartate aminotransferase": 3, "Asthenia": 3, "Asthma": 3, "Atrial fibrillation": 3, "C-reactive protein increased": 3, "Cardiac failure congestive": 3, "Chest X-ray": 3, "Coma scale": 3, "Dysarthria": 3, "Dyspnoea exertional": 3, "Dysstasia": 3, "Face oedema": 3, "Fatigue": 3, "Haematocrit": 3, "Haemoglobin": 3, "Heart rate decreased": 3, "Hyperventilation": 3, "Hypotension": 3, "Inflammation": 3, "Interstitial lung disease": 3, "Myocardial infarction": 3, "Oropharyngeal pain": 3, "PO2": 3, "Pulmonary embolism": 3, "Sudden death": 3, "Tremor": 3, "Urinary tract infection": 3, "Urine analysis": 3, "Vision blurred": 3, "Abdominal pain lower": 2, "Acute coronary syndrome": 2, "Amylase": 2, "Angina pectoris": 2, "Angioedema": 2, "Antinuclear antibody": 2, "Aphasia": 2, "Auscultation": 2, "Bell's palsy": 2, "Blood bicarbonate": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase": 2, "Blood creatinine": 2, "Blood culture": 2, "Blood glucose": 2, "Blood lactate dehydrogenase": 2, "Blood sodium": 2, "Blood uric acid": 2, "Bradycardia": 2, "Cardiac failure": 2, "Catheterisation cardiac": 2, "Computerised tomogram thorax": 2, "Dermatitis allergic": 2, "Embolic stroke": 2, "Gamma-glutamyltransferase": 2, "Gaze palsy": 2, "Guillain-Barre syndrome": 2, "Hepatic enzyme increased": 2, "Herpes zoster": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hyperthermia": 2, "Hypoaesthesia oral": 2, "Hyponatraemia": 2, "Hyporesponsive to stimuli": 2, "Hypoxic-ischaemic encephalopathy": 2, "Limb discomfort": 2, "Lymphadenopathy": 2, "Marasmus": 2, "Neck pain": 2, "Neutrophil count": 2, "Oedema peripheral": 2, "PCO2": 2, "Pancytopenia": 2, "Paraesthesia": 2, "Pericardial effusion": 2, "Peripheral coldness": 2, "Pneumonia bacterial": 2, "Pollakiuria": 2, "Pyelonephritis": 2, "Rash erythematous": 2, "Red blood cell count": 2, "Respiratory arrest": 2, "Subdural haematoma": 2, "Syncope": 2, "Tachypnoea": 2, "Throat tightness": 2, "Transient ischaemic attack": 2, "Urinary occult blood positive": 2, "Vasculitis": 2, "X-ray": 2, "pH body fluid": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Amylase increased": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Anion gap": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-glomerular basement membrane antibody": 1, "Anti-platelet antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody increased": 1, "Anxiety": 1, "Aortic dissection": 1, "Apnoea": 1, "Arrhythmia supraventricular": 1, "Arterial thrombosis": 1, "Arteriogram": 1, "Arthritis": 1, "Aspartate aminotransferase increased": 1, "Atrioventricular block complete": 1, "Autoantibody test": 1, "Autoimmune disorder": 1, "Autonomic seizure": 1, "Babinski reflex test": 1, "Bacterial test": 1, "Band neutrophil count": 1, "Basophil count": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood beta-D-glucan": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood gases": 1, "Blood glucagon": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood pH increased": 1, "Blood potassium": 1, "Blood pressure diastolic increased": 1, "Blood pressure fluctuation": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic increased": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood urine": 1, "Body temperature increased": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Brain stem infarction": 1, "Bronchial wall thickening": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Calculus urinary": 1, "Carbon dioxide": 1, "Cardiac dysfunction": 1, "Cardiac failure acute": 1, "Cardiac ventriculogram left": 1, "Cardiomyopathy": 1, "Carotid artery occlusion": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Cerebral artery embolism": 1, "Cerebral artery stenosis": 1, "Cerebral ischaemia": 1, "Cerebrovascular disorder": 1, "Chromaturia": 1, "Colitis ischaemic": 1, "Coma": 1, "Coma scale abnormal": 1, "Completed suicide": 1, "Computerised tomogram neck": 1, "Conjunctival hyperaemia": 1, "Coordination abnormal": 1, "Culture urine": 1, "Cyanosis": 1, "Cytopenia": 1, "Decreased vibratory sense": 1, "Demyelination": 1, "Depressive symptom": 1, "Diplopia": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Electrocardiogram ST segment elevation": 1, "Encephalitis": 1, "Encephalopathy": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Epilepsy": 1, "Erythema nodosum": 1, "Escherichia test positive": 1, "Eye pain": 1, "Eyelid oedema": 1, "Faeces soft": 1, "Fear": 1, "Fear of closed spaces": 1, "Fibrin D dimer": 1, "Flushing": 1, "Fracture": 1, "Gait deviation": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrointestinal haemorrhage": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Granulocyte count": 1, "Granulocyte count increased": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematuria": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate normal": 1, "Heparin-induced thrombocytopenia test": 1, "High density lipoprotein": 1, "Hyperglycaemia": 1, "Hyperpyrexia": 1, "Hypertensive crisis": 1, "Hypoacusis": 1, "Hypokalaemia": 1, "Hypophagia": 1, "Hypoventilation": 1, "Hypoxia": 1, "Idiopathic neutropenia": 1, "IgA nephropathy": 1, "Inappropriate antidiuretic hormone secretion": 1, "Inguinal hernia": 1, "Insomnia": 1, "Intentional self-injury": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Iridocyclitis": 1, "Joint swelling": 1, "KL-6": 1, "Lacunar infarction": 1, "Laryngeal oedema": 1, "Left ventricular hypertrophy": 1, "Lip pruritus": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar spinal stenosis": 1, "Lung disorder": 1, "Lung infiltration": 1, "Lung opacity": 1, "Lymphadenopathy mediastinal": 1, "Lymphatic fistula": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mental impairment": 1, "Metastatic lymphoma": 1, "Mobility decreased": 1, "Monocyte count": 1, "Monoparesis": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycoplasma test": 1, "Myoclonic epilepsy": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasal congestion": 1, "Neoplasm progression": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutropenia": 1, "Nitrite urine": 1, "Nitrite urine present": 1, "Oculomucocutaneous syndrome": 1, "Oral disorder": 1, "Orthopaedic procedure": 1, "Orthopnoea": 1, "PCO2 decreased": 1, "PaO2/FiO2 ratio": 1, "Pancreatitis acute": 1, "Paralysis": 1, "Paresis": 1, "Pericarditis": 1, "Perineal erythema": 1, "Pharyngeal oedema": 1, "Pharyngeal swelling": 1, "Physical disability": 1, "Physical examination": 1, "Platelet aggregation test": 1, "Platelet count decreased": 1, "Platelet distribution width": 1, "Platelet factor 4": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Positron emission tomography-magnetic resonance imaging": 1, "Postictal paralysis": 1, "Procalcitonin": 1, "Product administered at inappropriate site": 1, "Protein total": 1, "Putamen haemorrhage": 1, "Red cell distribution width": 1, "Renal failure": 1, "Renal impairment": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Retinal haemorrhage": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Shock": 1, "Shock symptom": 1, "Small intestinal obstruction": 1, "Spinal epidural haematoma": 1, "Spinal osteoarthritis": 1, "Spinal stenosis": 1, "Sputum retention": 1, "Status asthmaticus": 1, "Stool analysis": 1, "Stress cardiomyopathy": 1, "Subarachnoid haemorrhage": 1, "Sulphur dioxide test": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Tenderness": 1, "Thalamus haemorrhage": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic cerebral infarction": 1, "Tongue disorder": 1, "Tongue paralysis": 1, "Tonsil cancer": 1, "Tonsillar disorder": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Unresponsive to stimuli": 1, "Urinary occult blood": 1, "Urinary retention": 1, "Urine output decreased": 1, "Vaccination site bruising": 1, "Vaccination site movement impairment": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vascular pain": 1, "Ventricular extrasystoles": 1, "Visual field defect": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight": 1, "Weight increased": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "Whole body scan": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7338", "histograms": [{"histogram": {"Body temperature": 175, "Blood pressure measurement": 66, "Oxygen saturation": 61, "Heart rate": 47, "Pyrexia": 40, "Anaphylactic reaction": 35, "Dyspnoea": 23, "Nausea": 22, "Blood pressure increased": 20, "Headache": 18, "Erythema": 17, "Pruritus": 17, "Rash": 17, "Blood pressure decreased": 16, "Computerised tomogram": 15, "Vomiting": 15, "Urticaria": 14, "Dizziness": 13, "Blood test": 12, "Cerebral infarction": 12, "Electrocardiogram": 12, "Hypoaesthesia": 12, "Malaise": 12, "Cardio-respiratory arrest": 11, "Cold sweat": 11, "Diarrhoea": 11, "SARS-CoV-2 test": 11, "Depressed level of consciousness": 10, "Feeling abnormal": 10, "Magnetic resonance imaging head": 10, "Muscular weakness": 10, "Chills": 9, "Arthralgia": 8, "C-reactive protein": 8, "Cough": 8, "Pallor": 8, "Palpitations": 8, "Presyncope": 8, "White blood cell count": 8, "Computerised tomogram head": 7, "Loss of consciousness": 7, "Magnetic resonance imaging": 7, "Oxygen saturation decreased": 7, "Respiratory rate": 7, "Vaccination site pain": 7, "Wheezing": 7, "Death": 6, "Hypertension": 6, "Movement disorder": 6, "Pneumonia": 6, "Vaccination site erythema": 6, "Back pain": 5, "Cerebral haemorrhage": 5, "Chest pain": 5, "Decreased appetite": 5, "Echocardiogram": 5, "Facial paralysis": 5, "Fall": 5, "Feeling hot": 5, "Heart rate increased": 5, "Hyperhidrosis": 5, "Neuropathy peripheral": 5, "Oropharyngeal discomfort": 5, "Pain": 5, "Pain in extremity": 5, "Platelet count": 5, "Abdominal pain upper": 4, "Alanine aminotransferase": 4, "Altered state of consciousness": 4, "Chest discomfort": 4, "Dehydration": 4, "Disease recurrence": 4, "Dysphonia": 4, "Dysphoria": 4, "Gait disturbance": 4, "Hemiplegia": 4, "Investigation": 4, "Physical deconditioning": 4, "Seizure": 4, "Sensory disturbance": 4, "Somnolence": 4, "Tachycardia": 4, "Ultrasound abdomen": 4, "Abdominal pain": 3, "Antibody test": 3, "Arrhythmia": 3, "Aspartate aminotransferase": 3, "Asthenia": 3, "Asthma": 3, "Atrial fibrillation": 3, "C-reactive protein increased": 3, "Cardiac failure congestive": 3, "Chest X-ray": 3, "Coma scale": 3, "Dysarthria": 3, "Dyspnoea exertional": 3, "Dysstasia": 3, "Face oedema": 3, "Fatigue": 3, "Haematocrit": 3, "Haemoglobin": 3, "Heart rate decreased": 3, "Hyperventilation": 3, "Hypotension": 3, "Inflammation": 3, "Interstitial lung disease": 3, "Myocardial infarction": 3, "Oropharyngeal pain": 3, "PO2": 3, "Pulmonary embolism": 3, "Sudden death": 3, "Tremor": 3, "Urinary tract infection": 3, "Urine analysis": 3, "Vision blurred": 3, "Abdominal pain lower": 2, "Acute coronary syndrome": 2, "Amylase": 2, "Angina pectoris": 2, "Angioedema": 2, "Antinuclear antibody": 2, "Aphasia": 2, "Auscultation": 2, "Bell's palsy": 2, "Blood bicarbonate": 2, "Blood cholesterol": 2, "Blood creatine phosphokinase": 2, "Blood creatinine": 2, "Blood culture": 2, "Blood glucose": 2, "Blood lactate dehydrogenase": 2, "Blood sodium": 2, "Blood uric acid": 2, "Bradycardia": 2, "Cardiac failure": 2, "Catheterisation cardiac": 2, "Computerised tomogram thorax": 2, "Dermatitis allergic": 2, "Embolic stroke": 2, "Gamma-glutamyltransferase": 2, "Gaze palsy": 2, "Guillain-Barre syndrome": 2, "Hepatic enzyme increased": 2, "Herpes zoster": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hyperthermia": 2, "Hypoaesthesia oral": 2, "Hyponatraemia": 2, "Hyporesponsive to stimuli": 2, "Hypoxic-ischaemic encephalopathy": 2, "Limb discomfort": 2, "Lymphadenopathy": 2, "Marasmus": 2, "Neck pain": 2, "Neutrophil count": 2, "Oedema peripheral": 2, "PCO2": 2, "Pancytopenia": 2, "Paraesthesia": 2, "Pericardial effusion": 2, "Peripheral coldness": 2, "Pneumonia bacterial": 2, "Pollakiuria": 2, "Pyelonephritis": 2, "Rash erythematous": 2, "Red blood cell count": 2, "Respiratory arrest": 2, "Subdural haematoma": 2, "Syncope": 2, "Tachypnoea": 2, "Throat tightness": 2, "Transient ischaemic attack": 2, "Urinary occult blood positive": 2, "Vasculitis": 2, "X-ray": 2, "pH body fluid": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Amylase increased": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Anion gap": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-glomerular basement membrane antibody": 1, "Anti-platelet antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody increased": 1, "Anxiety": 1, "Aortic dissection": 1, "Apnoea": 1, "Arrhythmia supraventricular": 1, "Arterial thrombosis": 1, "Arteriogram": 1, "Arthritis": 1, "Aspartate aminotransferase increased": 1, "Atrioventricular block complete": 1, "Autoantibody test": 1, "Autoimmune disorder": 1, "Autonomic seizure": 1, "Babinski reflex test": 1, "Bacterial test": 1, "Band neutrophil count": 1, "Basophil count": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood beta-D-glucan": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood gases": 1, "Blood glucagon": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood pH increased": 1, "Blood potassium": 1, "Blood pressure diastolic increased": 1, "Blood pressure fluctuation": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic increased": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood urine": 1, "Body temperature increased": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Brain stem infarction": 1, "Bronchial wall thickening": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Calculus urinary": 1, "Carbon dioxide": 1, "Cardiac dysfunction": 1, "Cardiac failure acute": 1, "Cardiac ventriculogram left": 1, "Cardiomyopathy": 1, "Carotid artery occlusion": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Cerebral artery embolism": 1, "Cerebral artery stenosis": 1, "Cerebral ischaemia": 1, "Cerebrovascular disorder": 1, "Chromaturia": 1, "Colitis ischaemic": 1, "Coma": 1, "Coma scale abnormal": 1, "Completed suicide": 1, "Computerised tomogram neck": 1, "Conjunctival hyperaemia": 1, "Coordination abnormal": 1, "Culture urine": 1, "Cyanosis": 1, "Cytopenia": 1, "Decreased vibratory sense": 1, "Demyelination": 1, "Depressive symptom": 1, "Diplopia": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Ear discomfort": 1, "Ear pruritus": 1, "Electrocardiogram ST segment elevation": 1, "Encephalitis": 1, "Encephalopathy": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Epilepsy": 1, "Erythema nodosum": 1, "Escherichia test positive": 1, "Eye pain": 1, "Eyelid oedema": 1, "Faeces soft": 1, "Fear": 1, "Fear of closed spaces": 1, "Fibrin D dimer": 1, "Flushing": 1, "Fracture": 1, "Gait deviation": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrointestinal haemorrhage": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Granulocyte count": 1, "Granulocyte count increased": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematuria": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate normal": 1, "Heparin-induced thrombocytopenia test": 1, "High density lipoprotein": 1, "Hyperglycaemia": 1, "Hyperpyrexia": 1, "Hypertensive crisis": 1, "Hypoacusis": 1, "Hypokalaemia": 1, "Hypophagia": 1, "Hypoventilation": 1, "Hypoxia": 1, "Idiopathic neutropenia": 1, "IgA nephropathy": 1, "Inappropriate antidiuretic hormone secretion": 1, "Inguinal hernia": 1, "Insomnia": 1, "Intentional self-injury": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Iridocyclitis": 1, "Joint swelling": 1, "KL-6": 1, "Lacunar infarction": 1, "Laryngeal oedema": 1, "Left ventricular hypertrophy": 1, "Lip pruritus": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbar spinal stenosis": 1, "Lung disorder": 1, "Lung infiltration": 1, "Lung opacity": 1, "Lymphadenopathy mediastinal": 1, "Lymphatic fistula": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mental impairment": 1, "Metastatic lymphoma": 1, "Mobility decreased": 1, "Monocyte count": 1, "Monoparesis": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycoplasma test": 1, "Myoclonic epilepsy": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasal congestion": 1, "Neoplasm progression": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutropenia": 1, "Nitrite urine": 1, "Nitrite urine present": 1, "Oculomucocutaneous syndrome": 1, "Oral disorder": 1, "Orthopaedic procedure": 1, "Orthopnoea": 1, "PCO2 decreased": 1, "PaO2/FiO2 ratio": 1, "Pancreatitis acute": 1, "Paralysis": 1, "Paresis": 1, "Pericarditis": 1, "Perineal erythema": 1, "Pharyngeal oedema": 1, "Pharyngeal swelling": 1, "Physical disability": 1, "Physical examination": 1, "Platelet aggregation test": 1, "Platelet count decreased": 1, "Platelet distribution width": 1, "Platelet factor 4": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Positron emission tomography-magnetic resonance imaging": 1, "Postictal paralysis": 1, "Procalcitonin": 1, "Product administered at inappropriate site": 1, "Protein total": 1, "Putamen haemorrhage": 1, "Red cell distribution width": 1, "Renal failure": 1, "Renal impairment": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Retinal haemorrhage": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Shock": 1, "Shock symptom": 1, "Small intestinal obstruction": 1, "Spinal epidural haematoma": 1, "Spinal osteoarthritis": 1, "Spinal stenosis": 1, "Sputum retention": 1, "Status asthmaticus": 1, "Stool analysis": 1, "Stress cardiomyopathy": 1, "Subarachnoid haemorrhage": 1, "Sulphur dioxide test": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Tenderness": 1, "Thalamus haemorrhage": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic cerebral infarction": 1, "Tongue disorder": 1, "Tongue paralysis": 1, "Tonsil cancer": 1, "Tonsillar disorder": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Unresponsive to stimuli": 1, "Urinary occult blood": 1, "Urinary retention": 1, "Urine output decreased": 1, "Vaccination site bruising": 1, "Vaccination site movement impairment": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vascular pain": 1, "Ventricular extrasystoles": 1, "Visual field defect": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight": 1, "Weight increased": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "Whole body scan": 1}, "batchcodes": ["FA7338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA7388.json b/docs/data/histograms/Japan/FA7388.json
index ba50dc8143a..7d5c68bf902 100644
--- a/docs/data/histograms/Japan/FA7388.json
+++ b/docs/data/histograms/Japan/FA7388.json
@@ -1 +1 @@
-{"batchcode": "FA7388", "histograms": [{"batchcodes": ["FA7388"], "histogram": {"Body temperature": 2, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Respiratory failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7388", "histograms": [{"histogram": {"Body temperature": 2, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Respiratory failure": 1}, "batchcodes": ["FA7388"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FA7812.json b/docs/data/histograms/Japan/FA7812.json
index 33dab629379..c683b8a8603 100644
--- a/docs/data/histograms/Japan/FA7812.json
+++ b/docs/data/histograms/Japan/FA7812.json
@@ -1 +1 @@
-{"batchcode": "FA7812", "histograms": [{"batchcodes": ["FA7812"], "histogram": {"Body temperature": 47, "Anaphylactic reaction": 14, "Blood pressure measurement": 13, "Pyrexia": 9, "Hypoaesthesia": 8, "Magnetic resonance imaging": 8, "Oxygen saturation": 8, "Erythema": 7, "Heart rate": 7, "Blood test": 6, "Nausea": 6, "Blood pressure decreased": 5, "Blood pressure increased": 5, "Cerebral infarction": 5, "Computerised tomogram": 5, "Malaise": 5, "Seizure": 5, "Altered state of consciousness": 4, "Headache": 4, "Muscular weakness": 4, "SARS-CoV-2 test": 4, "Computerised tomogram head": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Dyspnoea": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Hypoaesthesia oral": 3, "Magnetic resonance imaging head": 3, "Neuropathy peripheral": 3, "Oropharyngeal discomfort": 3, "Oxygen saturation decreased": 3, "Pruritus": 3, "Acute disseminated encephalomyelitis": 2, "Blood creatine phosphokinase increased": 2, "CSF test": 2, "Cardio-respiratory arrest": 2, "Death": 2, "Dysarthria": 2, "Dysphoria": 2, "Epilepsy": 2, "Hypersensitivity": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Oedema peripheral": 2, "Pain": 2, "Pain in extremity": 2, "Pallor": 2, "Physical deconditioning": 2, "Rash": 2, "Sensory disturbance": 2, "Somnolence": 2, "Throat tightness": 2, "Urticaria": 2, "Abdominal pain": 1, "Ageusia": 1, "Alanine aminotransferase increased": 1, "Anaemia macrocytic": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Ankle brachial index": 1, "Anti-aquaporin-4 antibody": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Aortic dissection": 1, "Aplastic anaemia": 1, "Arthralgia": 1, "Aspartate aminotransferase increased": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Back pain": 1, "Blister": 1, "Blood alkaline phosphatase increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Blood magnesium increased": 1, "Blood potassium increased": 1, "Blood pressure systolic decreased": 1, "Bradycardia": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF culture": 1, "CSF glucose": 1, "CSF myelin basic protein": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebrovascular disorder": 1, "Cheyne-Stokes respiration": 1, "Cholangitis": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "DNA antibody": 1, "Decreased appetite": 1, "Defaecation disorder": 1, "Depression": 1, "Dermatitis allergic": 1, "Diplegia": 1, "Discomfort": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dyslalia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Dysuria": 1, "Eczema": 1, "Ejection fraction": 1, "Endoscopy upper gastrointestinal tract": 1, "Epigastric discomfort": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial pain": 1, "Facial paralysis": 1, "Fall": 1, "Fatigue": 1, "Febrile neutropenia": 1, "Feeling cold": 1, "Fluid intake reduced": 1, "Gait deviation": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal disorder": 1, "Gastrointestinal examination": 1, "Giant cell arteritis": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemophagocytic lymphohistiocytosis": 1, "Heart sounds": 1, "Hemianopia homonymous": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Hypertension": 1, "Inflammation": 1, "Investigation": 1, "Jaundice": 1, "Laryngeal cancer": 1, "Limb discomfort": 1, "Limb injury": 1, "Magnetic resonance cholangiopancreatography": 1, "Memory impairment": 1, "Meningoencephalitis herpetic": 1, "Micturition disorder": 1, "Mobility decreased": 1, "Mucosal disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Nerve conduction studies": 1, "Palpitations": 1, "Pancytopenia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pharyngeal hypoaesthesia": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Post herpetic neuralgia": 1, "Presyncope": 1, "Radiculopathy": 1, "Red blood cell sedimentation rate increased": 1, "Respiratory arrest": 1, "Rheumatoid factor": 1, "Road traffic accident": 1, "Seronegative arthritis": 1, "Shock": 1, "Speech disorder": 1, "Sputum retention": 1, "Strabismus": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Taste disorder": 1, "Throat irritation": 1, "Tinea infection": 1, "Tremor": 1, "Troponin": 1, "Urinary tract infection": 1, "Vital signs measurement": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7812", "histograms": [{"histogram": {"Body temperature": 47, "Anaphylactic reaction": 14, "Blood pressure measurement": 13, "Pyrexia": 9, "Hypoaesthesia": 8, "Magnetic resonance imaging": 8, "Oxygen saturation": 8, "Erythema": 7, "Heart rate": 7, "Blood test": 6, "Nausea": 6, "Blood pressure decreased": 5, "Blood pressure increased": 5, "Cerebral infarction": 5, "Computerised tomogram": 5, "Malaise": 5, "Seizure": 5, "Altered state of consciousness": 4, "Headache": 4, "Muscular weakness": 4, "SARS-CoV-2 test": 4, "Computerised tomogram head": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Dyspnoea": 3, "Echocardiogram": 3, "Electrocardiogram": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Hypoaesthesia oral": 3, "Magnetic resonance imaging head": 3, "Neuropathy peripheral": 3, "Oropharyngeal discomfort": 3, "Oxygen saturation decreased": 3, "Pruritus": 3, "Acute disseminated encephalomyelitis": 2, "Blood creatine phosphokinase increased": 2, "CSF test": 2, "Cardio-respiratory arrest": 2, "Death": 2, "Dysarthria": 2, "Dysphoria": 2, "Epilepsy": 2, "Hypersensitivity": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Oedema peripheral": 2, "Pain": 2, "Pain in extremity": 2, "Pallor": 2, "Physical deconditioning": 2, "Rash": 2, "Sensory disturbance": 2, "Somnolence": 2, "Throat tightness": 2, "Urticaria": 2, "Abdominal pain": 1, "Ageusia": 1, "Alanine aminotransferase increased": 1, "Anaemia macrocytic": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Ankle brachial index": 1, "Anti-aquaporin-4 antibody": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Aortic dissection": 1, "Aplastic anaemia": 1, "Arthralgia": 1, "Aspartate aminotransferase increased": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Back pain": 1, "Blister": 1, "Blood alkaline phosphatase increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Blood magnesium increased": 1, "Blood potassium increased": 1, "Blood pressure systolic decreased": 1, "Bradycardia": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF culture": 1, "CSF glucose": 1, "CSF myelin basic protein": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebrovascular disorder": 1, "Cheyne-Stokes respiration": 1, "Cholangitis": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "DNA antibody": 1, "Decreased appetite": 1, "Defaecation disorder": 1, "Depression": 1, "Dermatitis allergic": 1, "Diplegia": 1, "Discomfort": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dyslalia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Dysuria": 1, "Eczema": 1, "Ejection fraction": 1, "Endoscopy upper gastrointestinal tract": 1, "Epigastric discomfort": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial pain": 1, "Facial paralysis": 1, "Fall": 1, "Fatigue": 1, "Febrile neutropenia": 1, "Feeling cold": 1, "Fluid intake reduced": 1, "Gait deviation": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal disorder": 1, "Gastrointestinal examination": 1, "Giant cell arteritis": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemophagocytic lymphohistiocytosis": 1, "Heart sounds": 1, "Hemianopia homonymous": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Hypertension": 1, "Inflammation": 1, "Investigation": 1, "Jaundice": 1, "Laryngeal cancer": 1, "Limb discomfort": 1, "Limb injury": 1, "Magnetic resonance cholangiopancreatography": 1, "Memory impairment": 1, "Meningoencephalitis herpetic": 1, "Micturition disorder": 1, "Mobility decreased": 1, "Mucosal disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Nerve conduction studies": 1, "Palpitations": 1, "Pancytopenia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pharyngeal hypoaesthesia": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Post herpetic neuralgia": 1, "Presyncope": 1, "Radiculopathy": 1, "Red blood cell sedimentation rate increased": 1, "Respiratory arrest": 1, "Rheumatoid factor": 1, "Road traffic accident": 1, "Seronegative arthritis": 1, "Shock": 1, "Speech disorder": 1, "Sputum retention": 1, "Strabismus": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Taste disorder": 1, "Throat irritation": 1, "Tinea infection": 1, "Tremor": 1, "Troponin": 1, "Urinary tract infection": 1, "Vital signs measurement": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "X-ray": 1}, "batchcodes": ["FA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FB4768.json b/docs/data/histograms/Japan/FB4768.json
index 5361459e0ba..e023df25836 100644
--- a/docs/data/histograms/Japan/FB4768.json
+++ b/docs/data/histograms/Japan/FB4768.json
@@ -1 +1 @@
-{"batchcode": "FB4768", "histograms": [{"batchcodes": ["FB4768"], "histogram": {"Intellectual disability": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FB4768", "histograms": [{"histogram": {"Intellectual disability": 1, "Pyrexia": 1}, "batchcodes": ["FB4768"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC0572.json b/docs/data/histograms/Japan/FC0572.json
index 65b842e87fb..6d88912370a 100644
--- a/docs/data/histograms/Japan/FC0572.json
+++ b/docs/data/histograms/Japan/FC0572.json
@@ -1 +1 @@
-{"batchcode": "FC0572", "histograms": [{"batchcodes": ["FC0572"], "histogram": {"Cerebral infarction": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Paresis": 1}}]}
\ No newline at end of file
+{"batchcode": "FC0572", "histograms": [{"histogram": {"Cerebral infarction": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Paresis": 1}, "batchcodes": ["FC0572"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC3611.json b/docs/data/histograms/Japan/FC3611.json
index 1346beb5f24..5dd627df45e 100644
--- a/docs/data/histograms/Japan/FC3611.json
+++ b/docs/data/histograms/Japan/FC3611.json
@@ -1 +1 @@
-{"batchcode": "FC3611", "histograms": [{"batchcodes": ["FC3611"], "histogram": {"Anaphylactic reaction": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Erythema": 1, "Oxygen saturation": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3611", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Erythema": 1, "Oxygen saturation": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["FC3611"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC3661.json b/docs/data/histograms/Japan/FC3661.json
index 8ae94687a59..901c969f4e8 100644
--- a/docs/data/histograms/Japan/FC3661.json
+++ b/docs/data/histograms/Japan/FC3661.json
@@ -1 +1 @@
-{"batchcode": "FC3661", "histograms": [{"batchcodes": ["FC3661"], "histogram": {"Body temperature": 166, "Blood pressure measurement": 56, "Oxygen saturation": 41, "Heart rate": 32, "Pyrexia": 32, "Anaphylactic reaction": 31, "Blood pressure increased": 23, "Dyspnoea": 22, "Feeling abnormal": 21, "Cardio-respiratory arrest": 20, "Computerised tomogram": 20, "Nausea": 19, "Malaise": 17, "Pruritus": 17, "Hypoaesthesia": 16, "Urticaria": 16, "Dizziness": 15, "Headache": 15, "Erythema": 13, "Investigation": 13, "Loss of consciousness": 13, "C-reactive protein": 12, "Cerebral infarction": 12, "Magnetic resonance imaging": 12, "Blood test": 11, "Vomiting": 11, "Blood pressure decreased": 10, "Rash": 10, "Decreased appetite": 9, "Oxygen saturation decreased": 9, "SARS-CoV-2 test": 9, "Computerised tomogram head": 8, "Gait disturbance": 8, "Magnetic resonance imaging head": 8, "Oropharyngeal discomfort": 8, "Pneumonia": 8, "Presyncope": 8, "Seizure": 8, "Cardiac failure": 7, "Chest pain": 7, "Coma scale": 7, "Cough": 7, "Depressed level of consciousness": 7, "Electrocardiogram": 7, "Muscular weakness": 7, "Pain": 7, "Pain in extremity": 7, "Platelet count": 7, "Respiratory arrest": 7, "Altered state of consciousness": 6, "Bradycardia": 6, "Cerebral haemorrhage": 6, "Hyperhidrosis": 6, "Palpitations": 6, "White blood cell count": 6, "Abdominal pain": 5, "Blood creatine phosphokinase": 5, "Blood creatinine": 5, "C-reactive protein increased": 5, "Cardiac arrest": 5, "Chills": 5, "Cold sweat": 5, "Dysphoria": 5, "Haemoglobin": 5, "Heart rate increased": 5, "Hypersensitivity": 5, "Hypertension": 5, "Neuropathy peripheral": 5, "Tremor": 5, "Vaccination site pain": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "Asthma": 4, "Blood glucose": 4, "Blood urea": 4, "Cardiac failure acute": 4, "Echocardiogram": 4, "Face oedema": 4, "Fatigue": 4, "Heat illness": 4, "Inflammation": 4, "PO2": 4, "Pallor": 4, "Red blood cell count": 4, "Respiratory rate": 4, "Somnolence": 4, "Subarachnoid haemorrhage": 4, "Arrhythmia": 3, "Auscultation": 3, "Blood lactate dehydrogenase": 3, "Blood potassium": 3, "Blood sodium": 3, "Blood uric acid": 3, "CSF test": 3, "Cerebral venous sinus thrombosis": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Computerised tomogram thorax": 3, "Death": 3, "Diarrhoea": 3, "Fall": 3, "Feeling hot": 3, "Gamma-glutamyltransferase": 3, "Glycosylated haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Hemiplegia": 3, "Hot flush": 3, "Hyperventilation": 3, "Insomnia": 3, "Movement disorder": 3, "Myocarditis": 3, "Neutrophil count": 3, "Protein total": 3, "Tachycardia": 3, "Urine analysis": 3, "Vertigo": 3, "Wheezing": 3, "X-ray": 3, "Abdominal pain upper": 2, "Acoustic stimulation tests": 2, "Allergy to vaccine": 2, "Angioedema": 2, "Antibody test": 2, "Aphasia": 2, "Arteriosclerosis": 2, "Arthralgia": 2, "Arthritis": 2, "Arthropathy": 2, "Asthenia": 2, "Back pain": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatine phosphokinase increased": 2, "Blood creatinine increased": 2, "Blood triglycerides": 2, "Blood urea increased": 2, "Body mass index": 2, "Breath sounds": 2, "COVID-19": 2, "CSF cell count": 2, "CSF protein": 2, "Cardiac death": 2, "Cardiac disorder": 2, "Cardiac failure chronic": 2, "Catheterisation cardiac": 2, "Chronic kidney disease": 2, "Circulatory collapse": 2, "Computerised tomogram abdomen": 2, "Condition aggravated": 2, "Deafness": 2, "Diplopia": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Dysarthria": 2, "Dyskinesia": 2, "Dysphagia": 2, "Enterocolitis": 2, "Eosinophil count": 2, "Fibrin D dimer": 2, "Glomerular filtration rate": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Heart sounds": 2, "Hyperthermia": 2, "Hypophagia": 2, "Imaging procedure": 2, "Internal haemorrhage": 2, "Joint range of motion decreased": 2, "Joint swelling": 2, "Laryngeal oedema": 2, "Left ventricular failure": 2, "Low density lipoprotein": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monocyte count": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Myocardial ischaemia": 2, "Nerve conduction studies": 2, "Paralysis": 2, "Physical deconditioning": 2, "Platelet count decreased": 2, "Prothrombin time": 2, "Renal failure": 2, "Renal impairment": 2, "Sensory disturbance": 2, "Shock haemorrhagic": 2, "Swelling face": 2, "Tension": 2, "VIth nerve paralysis": 2, "Vaccination site swelling": 2, "Vital signs measurement": 2, "Yawning": 2, "Abdominal tenderness": 1, "Aberrant aortic arch": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Ageusia": 1, "Agonal respiration": 1, "Agranulocytosis": 1, "Albumin globulin ratio": 1, "Alopecia areata": 1, "Amnesia": 1, "Angina pectoris": 1, "Angiogram": 1, "Anterograde amnesia": 1, "Anti-thyroid antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Antithrombin III": 1, "Anxiety disorder": 1, "Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Apnoea": 1, "Apraxia": 1, "Ascites": 1, "Asphyxia": 1, "Aspiration": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Autopsy": 1, "Bacteraemia": 1, "Bacterial sepsis": 1, "Bacterial test": 1, "Basedow's disease": 1, "Basophil count": 1, "Basophil percentage": 1, "Biliary dilatation": 1, "Bilirubinuria": 1, "Biopsy heart": 1, "Biopsy liver": 1, "Blood creatine": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood phosphorus": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides increased": 1, "Blood uric acid increased": 1, "Bradykinesia": 1, "Brain oedema": 1, "Bronchitis": 1, "CSF glucose": 1, "CSF immunoglobulin G index": 1, "CSF myelin basic protein": 1, "CSF oligoclonal band": 1, "CSF white blood cell count": 1, "Cachexia": 1, "Capillary fragility test": 1, "Cardiac output": 1, "Cardiac output decreased": 1, "Cardiogenic shock": 1, "Cardiolipin antibody": 1, "Castleman's disease": 1, "Cerebellar haemorrhage": 1, "Cerebellar infarction": 1, "Cerebral atrophy": 1, "Cerebral ischaemia": 1, "Cerebral thrombosis": 1, "Cerebrovascular disorder": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation test": 1, "Colitis ischaemic": 1, "Completed suicide": 1, "Constipation": 1, "Contusion": 1, "Cystitis": 1, "Decreased immune responsiveness": 1, "Decubitus ulcer": 1, "Dehydration": 1, "Diabetic nephropathy": 1, "Dialysis": 1, "Diplegia": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Diverticulitis": 1, "Drooling": 1, "Drowning": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Duodenal ulcer haemorrhage": 1, "Dyslalia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Eczema": 1, "Electric shock sensation": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Embolic cerebral infarction": 1, "Embolic stroke": 1, "Endocarditis": 1, "Eosinophilic myocarditis": 1, "Eosinophilic pneumonia": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Eye pain": 1, "Facial paralysis": 1, "Facial spasm": 1, "Faeces soft": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Fibromyalgia": 1, "Flank pain": 1, "Fluid intake restriction": 1, "Flushing": 1, "Foaming at mouth": 1, "Full blood count": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrooesophageal reflux disease": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "Haematocrit decreased": 1, "Haemoglobin decreased": 1, "Haemorrhage": 1, "Heart rate decreased": 1, "Heart rate normal": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatic enzyme abnormal": 1, "Hepatic neoplasm": 1, "Herpes zoster": 1, "Hiatus hernia": 1, "Hypertensive emergency": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hyponatraemia": 1, "Hypotension": 1, "Ileus": 1, "Illusion": 1, "Immobilisation syndrome": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Infarction": 1, "Infection": 1, "Injury": 1, "Interstitial lung disease": 1, "Joint effusion": 1, "Laboratory test": 1, "Lack of spontaneous speech": 1, "Laryngeal pain": 1, "Limb discomfort": 1, "Lip pruritus": 1, "Lip swelling": 1, "Lipids": 1, "Lipids abnormal": 1, "Liver disorder": 1, "Loss of personal independence in daily activities": 1, "Low cardiac output syndrome": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Macular oedema": 1, "Magnetic resonance imaging neck": 1, "Matrix metalloproteinase-3": 1, "Mean cell haemoglobin increased": 1, "Mean cell volume increased": 1, "Mean platelet volume": 1, "Mechanical ileus": 1, "Mediastinal haemorrhage": 1, "Meniere's disease": 1, "Meningoencephalitis herpetic": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Monoparesis": 1, "Monoplegia": 1, "Muscle necrosis": 1, "Muscle swelling": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Myelopathy": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Near drowning": 1, "Neoplasm": 1, "Nerve compression": 1, "Neuralgia": 1, "Nystagmus": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Oedema peripheral": 1, "Oesophagogastroduodenoscopy": 1, "Oral discomfort": 1, "Osteoarthritis": 1, "Otolithiasis": 1, "Pain of skin": 1, "Panic disorder": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Peripheral artery occlusion": 1, "Peripheral nerve injury": 1, "Peripheral swelling": 1, "Platelet count increased": 1, "Platelet distribution width": 1, "Pleural effusion": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Posterior interosseous syndrome": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Pulmonary congestion": 1, "Pulmonary hypertension": 1, "Pulmonary oedema": 1, "Pulmonary thrombosis": 1, "Purpura": 1, "Radial pulse abnormal": 1, "Rales": 1, "Red blood cell count decreased": 1, "Red blood cell count increased": 1, "Red cell distribution width": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Retinal vein occlusion": 1, "Retrograde amnesia": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor positive": 1, "Rhinoscopy": 1, "Saliva altered": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Skin ulcer": 1, "Slow response to stimuli": 1, "Specialist consultation": 1, "Sputum culture": 1, "Sputum increased": 1, "Subdural haematoma": 1, "Sudden cardiac death": 1, "Sudden death": 1, "Swelling": 1, "Syncope": 1, "Tenderness": 1, "Thalamic infarction": 1, "Thermohyperaesthesia": 1, "Thirst": 1, "Throat irritation": 1, "Thyroxine free": 1, "Tinnitus": 1, "Tonic convulsion": 1, "Tonic posturing": 1, "Tri-iodothyronine free": 1, "Troponin T": 1, "Troponin T increased": 1, "Tympanometry": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Upper airway obstruction": 1, "Urinary incontinence": 1, "Vaccination site pruritus": 1, "Vasodilatation": 1, "Venogram": 1, "Ventricular hypertrophy": 1, "Visual acuity tests": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count increased": 1, "Wrist fracture": 1, "Xeroderma pigmentosum": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3661", "histograms": [{"histogram": {"Body temperature": 166, "Blood pressure measurement": 56, "Oxygen saturation": 41, "Heart rate": 32, "Pyrexia": 32, "Anaphylactic reaction": 31, "Blood pressure increased": 23, "Dyspnoea": 22, "Feeling abnormal": 21, "Cardio-respiratory arrest": 20, "Computerised tomogram": 20, "Nausea": 19, "Malaise": 17, "Pruritus": 17, "Hypoaesthesia": 16, "Urticaria": 16, "Dizziness": 15, "Headache": 15, "Erythema": 13, "Investigation": 13, "Loss of consciousness": 13, "C-reactive protein": 12, "Cerebral infarction": 12, "Magnetic resonance imaging": 12, "Blood test": 11, "Vomiting": 11, "Blood pressure decreased": 10, "Rash": 10, "Decreased appetite": 9, "Oxygen saturation decreased": 9, "SARS-CoV-2 test": 9, "Computerised tomogram head": 8, "Gait disturbance": 8, "Magnetic resonance imaging head": 8, "Oropharyngeal discomfort": 8, "Pneumonia": 8, "Presyncope": 8, "Seizure": 8, "Cardiac failure": 7, "Chest pain": 7, "Coma scale": 7, "Cough": 7, "Depressed level of consciousness": 7, "Electrocardiogram": 7, "Muscular weakness": 7, "Pain": 7, "Pain in extremity": 7, "Platelet count": 7, "Respiratory arrest": 7, "Altered state of consciousness": 6, "Bradycardia": 6, "Cerebral haemorrhage": 6, "Hyperhidrosis": 6, "Palpitations": 6, "White blood cell count": 6, "Abdominal pain": 5, "Blood creatine phosphokinase": 5, "Blood creatinine": 5, "C-reactive protein increased": 5, "Cardiac arrest": 5, "Chills": 5, "Cold sweat": 5, "Dysphoria": 5, "Haemoglobin": 5, "Heart rate increased": 5, "Hypersensitivity": 5, "Hypertension": 5, "Neuropathy peripheral": 5, "Tremor": 5, "Vaccination site pain": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "Asthma": 4, "Blood glucose": 4, "Blood urea": 4, "Cardiac failure acute": 4, "Echocardiogram": 4, "Face oedema": 4, "Fatigue": 4, "Heat illness": 4, "Inflammation": 4, "PO2": 4, "Pallor": 4, "Red blood cell count": 4, "Respiratory rate": 4, "Somnolence": 4, "Subarachnoid haemorrhage": 4, "Arrhythmia": 3, "Auscultation": 3, "Blood lactate dehydrogenase": 3, "Blood potassium": 3, "Blood sodium": 3, "Blood uric acid": 3, "CSF test": 3, "Cerebral venous sinus thrombosis": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Computerised tomogram thorax": 3, "Death": 3, "Diarrhoea": 3, "Fall": 3, "Feeling hot": 3, "Gamma-glutamyltransferase": 3, "Glycosylated haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Hemiplegia": 3, "Hot flush": 3, "Hyperventilation": 3, "Insomnia": 3, "Movement disorder": 3, "Myocarditis": 3, "Neutrophil count": 3, "Protein total": 3, "Tachycardia": 3, "Urine analysis": 3, "Vertigo": 3, "Wheezing": 3, "X-ray": 3, "Abdominal pain upper": 2, "Acoustic stimulation tests": 2, "Allergy to vaccine": 2, "Angioedema": 2, "Antibody test": 2, "Aphasia": 2, "Arteriosclerosis": 2, "Arthralgia": 2, "Arthritis": 2, "Arthropathy": 2, "Asthenia": 2, "Back pain": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatine phosphokinase increased": 2, "Blood creatinine increased": 2, "Blood triglycerides": 2, "Blood urea increased": 2, "Body mass index": 2, "Breath sounds": 2, "COVID-19": 2, "CSF cell count": 2, "CSF protein": 2, "Cardiac death": 2, "Cardiac disorder": 2, "Cardiac failure chronic": 2, "Catheterisation cardiac": 2, "Chronic kidney disease": 2, "Circulatory collapse": 2, "Computerised tomogram abdomen": 2, "Condition aggravated": 2, "Deafness": 2, "Diplopia": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Dysarthria": 2, "Dyskinesia": 2, "Dysphagia": 2, "Enterocolitis": 2, "Eosinophil count": 2, "Fibrin D dimer": 2, "Glomerular filtration rate": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Heart sounds": 2, "Hyperthermia": 2, "Hypophagia": 2, "Imaging procedure": 2, "Internal haemorrhage": 2, "Joint range of motion decreased": 2, "Joint swelling": 2, "Laryngeal oedema": 2, "Left ventricular failure": 2, "Low density lipoprotein": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monocyte count": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Myocardial ischaemia": 2, "Nerve conduction studies": 2, "Paralysis": 2, "Physical deconditioning": 2, "Platelet count decreased": 2, "Prothrombin time": 2, "Renal failure": 2, "Renal impairment": 2, "Sensory disturbance": 2, "Shock haemorrhagic": 2, "Swelling face": 2, "Tension": 2, "VIth nerve paralysis": 2, "Vaccination site swelling": 2, "Vital signs measurement": 2, "Yawning": 2, "Abdominal tenderness": 1, "Aberrant aortic arch": 1, "Activated partial thromboplastin time": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Ageusia": 1, "Agonal respiration": 1, "Agranulocytosis": 1, "Albumin globulin ratio": 1, "Alopecia areata": 1, "Amnesia": 1, "Angina pectoris": 1, "Angiogram": 1, "Anterograde amnesia": 1, "Anti-thyroid antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Antithrombin III": 1, "Anxiety disorder": 1, "Aortic aneurysm rupture": 1, "Aortic dissection": 1, "Apnoea": 1, "Apraxia": 1, "Ascites": 1, "Asphyxia": 1, "Aspiration": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Autopsy": 1, "Bacteraemia": 1, "Bacterial sepsis": 1, "Bacterial test": 1, "Basedow's disease": 1, "Basophil count": 1, "Basophil percentage": 1, "Biliary dilatation": 1, "Bilirubinuria": 1, "Biopsy heart": 1, "Biopsy liver": 1, "Blood creatine": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood phosphorus": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides increased": 1, "Blood uric acid increased": 1, "Bradykinesia": 1, "Brain oedema": 1, "Bronchitis": 1, "CSF glucose": 1, "CSF immunoglobulin G index": 1, "CSF myelin basic protein": 1, "CSF oligoclonal band": 1, "CSF white blood cell count": 1, "Cachexia": 1, "Capillary fragility test": 1, "Cardiac output": 1, "Cardiac output decreased": 1, "Cardiogenic shock": 1, "Cardiolipin antibody": 1, "Castleman's disease": 1, "Cerebellar haemorrhage": 1, "Cerebellar infarction": 1, "Cerebral atrophy": 1, "Cerebral ischaemia": 1, "Cerebral thrombosis": 1, "Cerebrovascular disorder": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation test": 1, "Colitis ischaemic": 1, "Completed suicide": 1, "Constipation": 1, "Contusion": 1, "Cystitis": 1, "Decreased immune responsiveness": 1, "Decubitus ulcer": 1, "Dehydration": 1, "Diabetic nephropathy": 1, "Dialysis": 1, "Diplegia": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Diverticulitis": 1, "Drooling": 1, "Drowning": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Duodenal ulcer haemorrhage": 1, "Dyslalia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Eczema": 1, "Electric shock sensation": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Embolic cerebral infarction": 1, "Embolic stroke": 1, "Endocarditis": 1, "Eosinophilic myocarditis": 1, "Eosinophilic pneumonia": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Eye pain": 1, "Facial paralysis": 1, "Facial spasm": 1, "Faeces soft": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Fibromyalgia": 1, "Flank pain": 1, "Fluid intake restriction": 1, "Flushing": 1, "Foaming at mouth": 1, "Full blood count": 1, "Gait inability": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrooesophageal reflux disease": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "Haematocrit decreased": 1, "Haemoglobin decreased": 1, "Haemorrhage": 1, "Heart rate decreased": 1, "Heart rate normal": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatic enzyme abnormal": 1, "Hepatic neoplasm": 1, "Herpes zoster": 1, "Hiatus hernia": 1, "Hypertensive emergency": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hyponatraemia": 1, "Hypotension": 1, "Ileus": 1, "Illusion": 1, "Immobilisation syndrome": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Infarction": 1, "Infection": 1, "Injury": 1, "Interstitial lung disease": 1, "Joint effusion": 1, "Laboratory test": 1, "Lack of spontaneous speech": 1, "Laryngeal pain": 1, "Limb discomfort": 1, "Lip pruritus": 1, "Lip swelling": 1, "Lipids": 1, "Lipids abnormal": 1, "Liver disorder": 1, "Loss of personal independence in daily activities": 1, "Low cardiac output syndrome": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Macular oedema": 1, "Magnetic resonance imaging neck": 1, "Matrix metalloproteinase-3": 1, "Mean cell haemoglobin increased": 1, "Mean cell volume increased": 1, "Mean platelet volume": 1, "Mechanical ileus": 1, "Mediastinal haemorrhage": 1, "Meniere's disease": 1, "Meningoencephalitis herpetic": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Monoparesis": 1, "Monoplegia": 1, "Muscle necrosis": 1, "Muscle swelling": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Myelopathy": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Near drowning": 1, "Neoplasm": 1, "Nerve compression": 1, "Neuralgia": 1, "Nystagmus": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Oedema peripheral": 1, "Oesophagogastroduodenoscopy": 1, "Oral discomfort": 1, "Osteoarthritis": 1, "Otolithiasis": 1, "Pain of skin": 1, "Panic disorder": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Peripheral artery occlusion": 1, "Peripheral nerve injury": 1, "Peripheral swelling": 1, "Platelet count increased": 1, "Platelet distribution width": 1, "Pleural effusion": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Posterior interosseous syndrome": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Pulmonary congestion": 1, "Pulmonary hypertension": 1, "Pulmonary oedema": 1, "Pulmonary thrombosis": 1, "Purpura": 1, "Radial pulse abnormal": 1, "Rales": 1, "Red blood cell count decreased": 1, "Red blood cell count increased": 1, "Red cell distribution width": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Retinal vein occlusion": 1, "Retrograde amnesia": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor positive": 1, "Rhinoscopy": 1, "Saliva altered": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Skin ulcer": 1, "Slow response to stimuli": 1, "Specialist consultation": 1, "Sputum culture": 1, "Sputum increased": 1, "Subdural haematoma": 1, "Sudden cardiac death": 1, "Sudden death": 1, "Swelling": 1, "Syncope": 1, "Tenderness": 1, "Thalamic infarction": 1, "Thermohyperaesthesia": 1, "Thirst": 1, "Throat irritation": 1, "Thyroxine free": 1, "Tinnitus": 1, "Tonic convulsion": 1, "Tonic posturing": 1, "Tri-iodothyronine free": 1, "Troponin T": 1, "Troponin T increased": 1, "Tympanometry": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Upper airway obstruction": 1, "Urinary incontinence": 1, "Vaccination site pruritus": 1, "Vasodilatation": 1, "Venogram": 1, "Ventricular hypertrophy": 1, "Visual acuity tests": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count increased": 1, "Wrist fracture": 1, "Xeroderma pigmentosum": 1}, "batchcodes": ["FC3661"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC5295.json b/docs/data/histograms/Japan/FC5295.json
index 038e4f01e67..6c878199545 100644
--- a/docs/data/histograms/Japan/FC5295.json
+++ b/docs/data/histograms/Japan/FC5295.json
@@ -1 +1 @@
-{"batchcode": "FC5295", "histograms": [{"batchcodes": ["FC5295"], "histogram": {"Body temperature": 83, "Blood pressure measurement": 36, "Oxygen saturation": 31, "Anaphylactic reaction": 27, "Heart rate": 26, "Nausea": 21, "Dyspnoea": 16, "Dizziness": 15, "Blood pressure increased": 13, "Feeling abnormal": 13, "Pyrexia": 13, "Rash": 13, "Pruritus": 12, "Urticaria": 11, "Erythema": 10, "Vomiting": 10, "Blood test": 9, "Hypoaesthesia": 9, "Arthralgia": 8, "Blood pressure decreased": 8, "Cerebral infarction": 8, "Headache": 8, "Oropharyngeal discomfort": 7, "White blood cell count": 7, "Electrocardiogram": 6, "Magnetic resonance imaging": 6, "Malaise": 6, "Muscular weakness": 6, "Palpitations": 6, "Blood creatinine": 5, "C-reactive protein": 5, "Cardio-respiratory arrest": 5, "Cough": 5, "Swelling": 5, "Aspartate aminotransferase": 4, "Chills": 4, "Computerised tomogram": 4, "Depressed level of consciousness": 4, "Fall": 4, "Heart rate increased": 4, "Hyperhidrosis": 4, "Hypertension": 4, "Loss of consciousness": 4, "Pain in extremity": 4, "Presyncope": 4, "Respiratory rate": 4, "Tremor": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Blood creatine phosphokinase": 3, "Blood urea": 3, "Blood uric acid": 3, "Cold sweat": 3, "Decreased appetite": 3, "Dysarthria": 3, "Dysphonia": 3, "Gamma-glutamyltransferase": 3, "Glycosylated haemoglobin": 3, "Haematocrit": 3, "Haemoglobin": 3, "Hemiplegia": 3, "Hypersensitivity": 3, "Investigation": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Oedema peripheral": 3, "Oxygen saturation decreased": 3, "Red blood cell count": 3, "Respiratory arrest": 3, "SARS-CoV-2 test": 3, "Sensation of foreign body": 3, "Vaccination site pain": 3, "Vital signs measurement": 3, "Acute myocardial infarction": 2, "Altered state of consciousness": 2, "Anaphylactic shock": 2, "Asthma": 2, "Atrial fibrillation": 2, "Blood alkaline phosphatase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "Blood pressure systolic increased": 2, "Blood triglycerides": 2, "Bradycardia": 2, "COVID-19": 2, "Cardiac failure": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chest pain": 2, "Coma scale": 2, "Death": 2, "Dehydration": 2, "Discomfort": 2, "Drug ineffective": 2, "Dysphoria": 2, "Dysstasia": 2, "Echocardiogram": 2, "Eczema": 2, "Face oedema": 2, "Glomerular filtration rate": 2, "Heart rate decreased": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Imaging procedure": 2, "Laboratory test": 2, "Lymphocyte count": 2, "Magnetic resonance imaging head": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monocyte count": 2, "Monoplegia": 2, "Movement disorder": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Neurological examination": 2, "Pain": 2, "Pallor": 2, "Paraesthesia": 2, "Physical deconditioning": 2, "Physical examination": 2, "Platelet count": 2, "Purpura": 2, "Respiratory disorder": 2, "Seizure": 2, "Sensory disturbance": 2, "Supraventricular extrasystoles": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Thirst": 2, "Tinnitus": 2, "Vaccination failure": 2, "Vascular occlusion": 2, "Vasculitis": 2, "Ventricular extrasystoles": 2, "Vertigo": 2, "Visual impairment": 2, "Wheezing": 2, "White blood cell count increased": 2, "Abdominal pain upper": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Agnosia": 1, "Alanine aminotransferase increased": 1, "Allergy to vaccine": 1, "Amylase": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Apnoea": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Arteriosclerosis": 1, "Aspiration": 1, "Asthenia": 1, "Asthenopia": 1, "Auscultation": 1, "Back pain": 1, "Basophil count": 1, "Biopsy": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase increased": 1, "Blood potassium": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic increased": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Body mass index": 1, "Body temperature increased": 1, "Brain stem infarction": 1, "Breath sounds": 1, "C-reactive protein increased": 1, "Cardiac flutter": 1, "Cardiomyopathy": 1, "Cardiothoracic ratio": 1, "Cardiovascular disorder": 1, "Cardiovascular symptom": 1, "Carotid artery stenosis": 1, "Carotid artery stent insertion": 1, "Cellulitis": 1, "Cerebellar infarction": 1, "Cerebral artery stenosis": 1, "Cerebral disorder": 1, "Cerebral haematoma": 1, "Cerebral haemorrhage": 1, "Chronic active Epstein-Barr virus infection": 1, "Coma": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Coronary artery occlusion": 1, "Cytology abnormal": 1, "Diabetic coma": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Drug hypersensitivity": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ejection fraction": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Embolism": 1, "Eosinophil count": 1, "Epilepsy": 1, "Eye movement disorder": 1, "Eyelid oedema": 1, "Facial paresis": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Flushing": 1, "Focal segmental glomerulosclerosis": 1, "Full blood count": 1, "Functional gastrointestinal disorder": 1, "Gait disturbance": 1, "Gastrointestinal disorder": 1, "Generalised oedema": 1, "Glomerulonephritis rapidly progressive": 1, "Glucocorticoids normal": 1, "Glycosylated haemoglobin increased": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemolysis": 1, "Haemorrhage subcutaneous": 1, "Hemiasomatognosia": 1, "Hemiparesis": 1, "Hepatic function abnormal": 1, "High density lipoprotein": 1, "High density lipoprotein decreased": 1, "Histology": 1, "Hot flush": 1, "Hypercapnia": 1, "Hypophagia": 1, "Hypoxia": 1, "Illusion": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Lacunar infarction": 1, "Laryngeal discomfort": 1, "Larynx irritation": 1, "Leucine aminopeptidase": 1, "Leucine aminopeptidase increased": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lymphadenopathy": 1, "Mean platelet volume": 1, "Microscopic polyangiitis": 1, "Microscopy": 1, "Mitral valve incompetence": 1, "Muscle rigidity": 1, "Musculoskeletal disorder": 1, "Musculoskeletal stiffness": 1, "Mydriasis": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neutrophil count": 1, "Obstruction": 1, "Off label use": 1, "Ophthalmological examination": 1, "Oral discomfort": 1, "Oxygen saturation abnormal": 1, "PO2": 1, "Papule": 1, "Peripheral coldness": 1, "Platelet disorder": 1, "Platelet distribution width": 1, "Platelet-large cell ratio": 1, "Pneumonia": 1, "Polyneuropathy": 1, "Prinzmetal angina": 1, "Procalcitonin": 1, "Product administered to patient of inappropriate age": 1, "Protein total": 1, "Proteinuria": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary artery thrombosis": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Red cell distribution width": 1, "Reflex test": 1, "Renal failure": 1, "Scar": 1, "Seborrhoeic keratosis": 1, "Sensation of blood flow": 1, "Sensory level": 1, "Skin cancer": 1, "Skin ulcer": 1, "Sneezing": 1, "Somnolence": 1, "Stress cardiomyopathy": 1, "Sudden death": 1, "Syncope": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroid function test": 1, "Toxic skin eruption": 1, "Trance": 1, "Troponin": 1, "Troponin increased": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vascular stenosis": 1, "Venous thrombosis limb": 1, "Ventricular hypokinesia": 1, "Ventricular internal diameter": 1, "Vertigo positional": 1, "Vision blurred": 1, "Weight decreased": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5295", "histograms": [{"histogram": {"Body temperature": 83, "Blood pressure measurement": 36, "Oxygen saturation": 31, "Anaphylactic reaction": 27, "Heart rate": 26, "Nausea": 21, "Dyspnoea": 16, "Dizziness": 15, "Blood pressure increased": 13, "Feeling abnormal": 13, "Pyrexia": 13, "Rash": 13, "Pruritus": 12, "Urticaria": 11, "Erythema": 10, "Vomiting": 10, "Blood test": 9, "Hypoaesthesia": 9, "Arthralgia": 8, "Blood pressure decreased": 8, "Cerebral infarction": 8, "Headache": 8, "Oropharyngeal discomfort": 7, "White blood cell count": 7, "Electrocardiogram": 6, "Magnetic resonance imaging": 6, "Malaise": 6, "Muscular weakness": 6, "Palpitations": 6, "Blood creatinine": 5, "C-reactive protein": 5, "Cardio-respiratory arrest": 5, "Cough": 5, "Swelling": 5, "Aspartate aminotransferase": 4, "Chills": 4, "Computerised tomogram": 4, "Depressed level of consciousness": 4, "Fall": 4, "Heart rate increased": 4, "Hyperhidrosis": 4, "Hypertension": 4, "Loss of consciousness": 4, "Pain in extremity": 4, "Presyncope": 4, "Respiratory rate": 4, "Tremor": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Blood creatine phosphokinase": 3, "Blood urea": 3, "Blood uric acid": 3, "Cold sweat": 3, "Decreased appetite": 3, "Dysarthria": 3, "Dysphonia": 3, "Gamma-glutamyltransferase": 3, "Glycosylated haemoglobin": 3, "Haematocrit": 3, "Haemoglobin": 3, "Hemiplegia": 3, "Hypersensitivity": 3, "Investigation": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Oedema peripheral": 3, "Oxygen saturation decreased": 3, "Red blood cell count": 3, "Respiratory arrest": 3, "SARS-CoV-2 test": 3, "Sensation of foreign body": 3, "Vaccination site pain": 3, "Vital signs measurement": 3, "Acute myocardial infarction": 2, "Altered state of consciousness": 2, "Anaphylactic shock": 2, "Asthma": 2, "Atrial fibrillation": 2, "Blood alkaline phosphatase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "Blood pressure systolic increased": 2, "Blood triglycerides": 2, "Bradycardia": 2, "COVID-19": 2, "Cardiac failure": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chest pain": 2, "Coma scale": 2, "Death": 2, "Dehydration": 2, "Discomfort": 2, "Drug ineffective": 2, "Dysphoria": 2, "Dysstasia": 2, "Echocardiogram": 2, "Eczema": 2, "Face oedema": 2, "Glomerular filtration rate": 2, "Heart rate decreased": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Imaging procedure": 2, "Laboratory test": 2, "Lymphocyte count": 2, "Magnetic resonance imaging head": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Monocyte count": 2, "Monoplegia": 2, "Movement disorder": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Neurological examination": 2, "Pain": 2, "Pallor": 2, "Paraesthesia": 2, "Physical deconditioning": 2, "Physical examination": 2, "Platelet count": 2, "Purpura": 2, "Respiratory disorder": 2, "Seizure": 2, "Sensory disturbance": 2, "Supraventricular extrasystoles": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Thirst": 2, "Tinnitus": 2, "Vaccination failure": 2, "Vascular occlusion": 2, "Vasculitis": 2, "Ventricular extrasystoles": 2, "Vertigo": 2, "Visual impairment": 2, "Wheezing": 2, "White blood cell count increased": 2, "Abdominal pain upper": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Agnosia": 1, "Alanine aminotransferase increased": 1, "Allergy to vaccine": 1, "Amylase": 1, "Angina pectoris": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Apnoea": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Arteriosclerosis": 1, "Aspiration": 1, "Asthenia": 1, "Asthenopia": 1, "Auscultation": 1, "Back pain": 1, "Basophil count": 1, "Biopsy": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase increased": 1, "Blood potassium": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic increased": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Body mass index": 1, "Body temperature increased": 1, "Brain stem infarction": 1, "Breath sounds": 1, "C-reactive protein increased": 1, "Cardiac flutter": 1, "Cardiomyopathy": 1, "Cardiothoracic ratio": 1, "Cardiovascular disorder": 1, "Cardiovascular symptom": 1, "Carotid artery stenosis": 1, "Carotid artery stent insertion": 1, "Cellulitis": 1, "Cerebellar infarction": 1, "Cerebral artery stenosis": 1, "Cerebral disorder": 1, "Cerebral haematoma": 1, "Cerebral haemorrhage": 1, "Chronic active Epstein-Barr virus infection": 1, "Coma": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Coronary artery occlusion": 1, "Cytology abnormal": 1, "Diabetic coma": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Drug hypersensitivity": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ejection fraction": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Embolism": 1, "Eosinophil count": 1, "Epilepsy": 1, "Eye movement disorder": 1, "Eyelid oedema": 1, "Facial paresis": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Flushing": 1, "Focal segmental glomerulosclerosis": 1, "Full blood count": 1, "Functional gastrointestinal disorder": 1, "Gait disturbance": 1, "Gastrointestinal disorder": 1, "Generalised oedema": 1, "Glomerulonephritis rapidly progressive": 1, "Glucocorticoids normal": 1, "Glycosylated haemoglobin increased": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemolysis": 1, "Haemorrhage subcutaneous": 1, "Hemiasomatognosia": 1, "Hemiparesis": 1, "Hepatic function abnormal": 1, "High density lipoprotein": 1, "High density lipoprotein decreased": 1, "Histology": 1, "Hot flush": 1, "Hypercapnia": 1, "Hypophagia": 1, "Hypoxia": 1, "Illusion": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Lacunar infarction": 1, "Laryngeal discomfort": 1, "Larynx irritation": 1, "Leucine aminopeptidase": 1, "Leucine aminopeptidase increased": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lymphadenopathy": 1, "Mean platelet volume": 1, "Microscopic polyangiitis": 1, "Microscopy": 1, "Mitral valve incompetence": 1, "Muscle rigidity": 1, "Musculoskeletal disorder": 1, "Musculoskeletal stiffness": 1, "Mydriasis": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neutrophil count": 1, "Obstruction": 1, "Off label use": 1, "Ophthalmological examination": 1, "Oral discomfort": 1, "Oxygen saturation abnormal": 1, "PO2": 1, "Papule": 1, "Peripheral coldness": 1, "Platelet disorder": 1, "Platelet distribution width": 1, "Platelet-large cell ratio": 1, "Pneumonia": 1, "Polyneuropathy": 1, "Prinzmetal angina": 1, "Procalcitonin": 1, "Product administered to patient of inappropriate age": 1, "Protein total": 1, "Proteinuria": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary artery thrombosis": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Red cell distribution width": 1, "Reflex test": 1, "Renal failure": 1, "Scar": 1, "Seborrhoeic keratosis": 1, "Sensation of blood flow": 1, "Sensory level": 1, "Skin cancer": 1, "Skin ulcer": 1, "Sneezing": 1, "Somnolence": 1, "Stress cardiomyopathy": 1, "Sudden death": 1, "Syncope": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroid function test": 1, "Toxic skin eruption": 1, "Trance": 1, "Troponin": 1, "Troponin increased": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vascular stenosis": 1, "Venous thrombosis limb": 1, "Ventricular hypokinesia": 1, "Ventricular internal diameter": 1, "Vertigo positional": 1, "Vision blurred": 1, "Weight decreased": 1, "pH body fluid": 1}, "batchcodes": ["FC5295"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC5947.json b/docs/data/histograms/Japan/FC5947.json
index 8ccf490cb88..83c172f1da9 100644
--- a/docs/data/histograms/Japan/FC5947.json
+++ b/docs/data/histograms/Japan/FC5947.json
@@ -1 +1 @@
-{"batchcode": "FC5947", "histograms": [{"batchcodes": ["000021A", "EW0201", "FC5947"], "histogram": {"Antineutrophil cytoplasmic antibody": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Chills": 1, "Eosinophilia": 1, "Infarction": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Peroneal nerve palsy": 1, "Pyrexia": 1, "Vasculitis": 1, "White blood cell count": 1}}, {"batchcodes": ["FC5947"], "histogram": {"Body temperature": 116, "Blood pressure measurement": 51, "Oxygen saturation": 49, "Heart rate": 39, "Blood pressure increased": 24, "Anaphylactic reaction": 23, "Pyrexia": 19, "Dyspnoea": 18, "Hypoaesthesia": 16, "Feeling abnormal": 14, "Investigation": 13, "Pruritus": 13, "Presyncope": 12, "Blood pressure decreased": 11, "Erythema": 11, "Nausea": 11, "Rash": 11, "Urticaria": 11, "Dizziness": 10, "Oxygen saturation decreased": 10, "Computerised tomogram": 9, "Cough": 9, "Pain in extremity": 9, "White blood cell count": 9, "Blood test": 8, "Cerebral infarction": 8, "Headache": 8, "Loss of consciousness": 8, "Pallor": 8, "Depressed level of consciousness": 7, "Malaise": 7, "Neuropathy peripheral": 7, "SARS-CoV-2 test": 7, "Altered state of consciousness": 6, "Asthenia": 6, "Cold sweat": 6, "Decreased appetite": 6, "Fall": 6, "Haemoglobin": 6, "Muscular weakness": 6, "Palpitations": 6, "Platelet count": 6, "Thrombosis": 6, "Chest X-ray": 5, "Death": 5, "Fibrin D dimer": 5, "Hypersensitivity": 5, "Magnetic resonance imaging": 5, "Oropharyngeal discomfort": 5, "Tachycardia": 5, "Vaccination site pain": 5, "Blood potassium": 4, "Bradycardia": 4, "C-reactive protein": 4, "Electrocardiogram": 4, "Haemorrhage subcutaneous": 4, "Hyperhidrosis": 4, "Hypertension": 4, "Red blood cell count": 4, "Seizure": 4, "Throat tightness": 4, "Tremor": 4, "Vomiting": 4, "Activated partial thromboplastin time": 3, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Asthma": 3, "Blood creatine phosphokinase": 3, "Blood fibrinogen": 3, "Blood glucose": 3, "Breath sounds": 3, "Cardio-respiratory arrest": 3, "Cerebral haemorrhage": 3, "Condition aggravated": 3, "Dyskinesia": 3, "Dysphoria": 3, "Facial paralysis": 3, "Feeling cold": 3, "Feeling hot": 3, "Gait disturbance": 3, "Grip strength": 3, "Haematocrit": 3, "Heart rate increased": 3, "Hot flush": 3, "Nerve conduction studies": 3, "Protein total": 3, "Respiratory rate": 3, "Retinal artery occlusion": 3, "Subarachnoid haemorrhage": 3, "Sudden death": 3, "Thrombocytopenia": 3, "Abdominal discomfort": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Arthralgia": 2, "Autoantibody test": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood creatinine": 2, "Blood lactate dehydrogenase": 2, "Blood sodium": 2, "Blood urea": 2, "COVID-19": 2, "CSF cell count": 2, "CSF protein": 2, "CSF protein increased": 2, "Cardiac death": 2, "Cardiac failure": 2, "Cardiac failure acute": 2, "Chest discomfort": 2, "Chest pain": 2, "Chills": 2, "Coagulation test": 2, "Coma scale": 2, "Dysarthria": 2, "Dysphonia": 2, "Erythema multiforme": 2, "Face oedema": 2, "Hypoaesthesia oral": 2, "Insomnia": 2, "Joint range of motion decreased": 2, "Magnetic resonance imaging head": 2, "Magnetic resonance imaging spinal": 2, "Mobility decreased": 2, "Motor dysfunction": 2, "Neurological examination": 2, "Pain": 2, "Paraesthesia": 2, "Paralysis": 2, "Pericarditis": 2, "Physical deconditioning": 2, "Polymerase chain reaction": 2, "Prothrombin time": 2, "Sensation of foreign body": 2, "Sensory disturbance": 2, "Sepsis": 2, "Shock": 2, "Speech disorder": 2, "Stridor": 2, "Syncope": 2, "Ultrasound scan": 2, "Vaccination failure": 2, "Vaccination site swelling": 2, "Wheezing": 2, "X-ray": 2, "Abdominal X-ray": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Acute leukaemia": 1, "Acute myocardial infarction": 1, "Acute stress disorder": 1, "Amylase": 1, "Anaemia": 1, "Angina unstable": 1, "Angiogram": 1, "Anxiety": 1, "Aphasia": 1, "Areflexia": 1, "Arterial occlusive disease": 1, "Arterial stenosis": 1, "Arteriosclerosis": 1, "Asphyxia": 1, "Asthenopia": 1, "Atrial fibrillation": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Autonomic nervous system imbalance": 1, "Axillary mass": 1, "Axillary pain": 1, "Basophil percentage": 1, "Bile duct cancer": 1, "Bilirubin conjugated": 1, "Biopsy skin": 1, "Blepharospasm": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Brain herniation": 1, "Brain stem infarction": 1, "Bronchoalveolar lavage": 1, "CSF culture": 1, "CSF glucose": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiac electrophysiologic study": 1, "Cardiac pacemaker insertion": 1, "Cardiomegaly": 1, "Cerebellar ataxia": 1, "Cerebral disorder": 1, "Cerebral thrombosis": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Chronic kidney disease": 1, "Circulatory collapse": 1, "Cognitive disorder": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Constipation": 1, "Contusion": 1, "Coronary artery stenosis": 1, "Cough variant asthma": 1, "Cyanosis": 1, "Cytology": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Drooling": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dyslipidaemia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Eating disorder": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Electroneurography": 1, "Embolic stroke": 1, "Eosinophil percentage": 1, "Epilepsy": 1, "Extremity contracture": 1, "Face injury": 1, "Facial discomfort": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gastrointestinal inflammation": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Glossoptosis": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haemorrhagic diathesis": 1, "Heart rate decreased": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Hydrocephalus": 1, "Hyperkalaemia": 1, "Hyperthermia": 1, "Hypertonia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Ileus": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Interchange of vaccine products": 1, "Internal haemorrhage": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Lack of spontaneous speech": 1, "Leucine aminopeptidase": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lumbar puncture": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Lymphocyte percentage": 1, "Magnetic resonance cholangiopancreatography": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Metabolic function test": 1, "Monocyte percentage": 1, "Movement disorder": 1, "Muscle haemorrhage": 1, "Muscle spasms": 1, "Myelitis": 1, "Myocarditis": 1, "Myoclonic epilepsy": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Ocular discomfort": 1, "Oral pruritus": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngeal paraesthesia": 1, "Pigmentation disorder": 1, "Platelet count decreased": 1, "Platelet count normal": 1, "Pneumonia": 1, "Poor peripheral circulation": 1, "Product administered at inappropriate site": 1, "Prothrombin level": 1, "Pulmonary artery thrombosis": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pyelitis": 1, "Pyelonephritis acute": 1, "Radial nerve palsy": 1, "Radioisotope scan": 1, "Rash macular": 1, "Renal failure": 1, "Respiratory arrest": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Retching": 1, "Retrograde amnesia": 1, "SARS-CoV-2 antibody test": 1, "Serum colour abnormal": 1, "Small intestinal obstruction": 1, "Snoring": 1, "Subdural haematoma": 1, "Subileus": 1, "Sudden cardiac death": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Synovial disorder": 1, "Tachypnoea": 1, "Tenderness": 1, "Throat irritation": 1, "Thrombocytopenic purpura": 1, "Thrombophlebitis": 1, "Thyroxine free": 1, "Tongue spasm": 1, "Tonic convulsion": 1, "Toxic skin eruption": 1, "Tri-iodothyronine free": 1, "Tumour marker test": 1, "Type I hypersensitivity": 1, "Ultrasound Doppler": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Urine ketone body": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Vital signs measurement": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5947", "histograms": [{"histogram": {"Antineutrophil cytoplasmic antibody": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Chills": 1, "Eosinophilia": 1, "Infarction": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Neuropathy peripheral": 1, "Peroneal nerve palsy": 1, "Pyrexia": 1, "Vasculitis": 1, "White blood cell count": 1}, "batchcodes": ["000021A", "EW0201", "FC5947"]}, {"histogram": {"Body temperature": 116, "Blood pressure measurement": 51, "Oxygen saturation": 49, "Heart rate": 39, "Blood pressure increased": 24, "Anaphylactic reaction": 23, "Pyrexia": 19, "Dyspnoea": 18, "Hypoaesthesia": 16, "Feeling abnormal": 14, "Investigation": 13, "Pruritus": 13, "Presyncope": 12, "Blood pressure decreased": 11, "Erythema": 11, "Nausea": 11, "Rash": 11, "Urticaria": 11, "Dizziness": 10, "Oxygen saturation decreased": 10, "Computerised tomogram": 9, "Cough": 9, "Pain in extremity": 9, "White blood cell count": 9, "Blood test": 8, "Cerebral infarction": 8, "Headache": 8, "Loss of consciousness": 8, "Pallor": 8, "Depressed level of consciousness": 7, "Malaise": 7, "Neuropathy peripheral": 7, "SARS-CoV-2 test": 7, "Altered state of consciousness": 6, "Asthenia": 6, "Cold sweat": 6, "Decreased appetite": 6, "Fall": 6, "Haemoglobin": 6, "Muscular weakness": 6, "Palpitations": 6, "Platelet count": 6, "Thrombosis": 6, "Chest X-ray": 5, "Death": 5, "Fibrin D dimer": 5, "Hypersensitivity": 5, "Magnetic resonance imaging": 5, "Oropharyngeal discomfort": 5, "Tachycardia": 5, "Vaccination site pain": 5, "Blood potassium": 4, "Bradycardia": 4, "C-reactive protein": 4, "Electrocardiogram": 4, "Haemorrhage subcutaneous": 4, "Hyperhidrosis": 4, "Hypertension": 4, "Red blood cell count": 4, "Seizure": 4, "Throat tightness": 4, "Tremor": 4, "Vomiting": 4, "Activated partial thromboplastin time": 3, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Asthma": 3, "Blood creatine phosphokinase": 3, "Blood fibrinogen": 3, "Blood glucose": 3, "Breath sounds": 3, "Cardio-respiratory arrest": 3, "Cerebral haemorrhage": 3, "Condition aggravated": 3, "Dyskinesia": 3, "Dysphoria": 3, "Facial paralysis": 3, "Feeling cold": 3, "Feeling hot": 3, "Gait disturbance": 3, "Grip strength": 3, "Haematocrit": 3, "Heart rate increased": 3, "Hot flush": 3, "Nerve conduction studies": 3, "Protein total": 3, "Respiratory rate": 3, "Retinal artery occlusion": 3, "Subarachnoid haemorrhage": 3, "Sudden death": 3, "Thrombocytopenia": 3, "Abdominal discomfort": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Arthralgia": 2, "Autoantibody test": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood cholesterol": 2, "Blood creatinine": 2, "Blood lactate dehydrogenase": 2, "Blood sodium": 2, "Blood urea": 2, "COVID-19": 2, "CSF cell count": 2, "CSF protein": 2, "CSF protein increased": 2, "Cardiac death": 2, "Cardiac failure": 2, "Cardiac failure acute": 2, "Chest discomfort": 2, "Chest pain": 2, "Chills": 2, "Coagulation test": 2, "Coma scale": 2, "Dysarthria": 2, "Dysphonia": 2, "Erythema multiforme": 2, "Face oedema": 2, "Hypoaesthesia oral": 2, "Insomnia": 2, "Joint range of motion decreased": 2, "Magnetic resonance imaging head": 2, "Magnetic resonance imaging spinal": 2, "Mobility decreased": 2, "Motor dysfunction": 2, "Neurological examination": 2, "Pain": 2, "Paraesthesia": 2, "Paralysis": 2, "Pericarditis": 2, "Physical deconditioning": 2, "Polymerase chain reaction": 2, "Prothrombin time": 2, "Sensation of foreign body": 2, "Sensory disturbance": 2, "Sepsis": 2, "Shock": 2, "Speech disorder": 2, "Stridor": 2, "Syncope": 2, "Ultrasound scan": 2, "Vaccination failure": 2, "Vaccination site swelling": 2, "Wheezing": 2, "X-ray": 2, "Abdominal X-ray": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Acute leukaemia": 1, "Acute myocardial infarction": 1, "Acute stress disorder": 1, "Amylase": 1, "Anaemia": 1, "Angina unstable": 1, "Angiogram": 1, "Anxiety": 1, "Aphasia": 1, "Areflexia": 1, "Arterial occlusive disease": 1, "Arterial stenosis": 1, "Arteriosclerosis": 1, "Asphyxia": 1, "Asthenopia": 1, "Atrial fibrillation": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Autonomic nervous system imbalance": 1, "Axillary mass": 1, "Axillary pain": 1, "Basophil percentage": 1, "Bile duct cancer": 1, "Bilirubin conjugated": 1, "Biopsy skin": 1, "Blepharospasm": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Brain herniation": 1, "Brain stem infarction": 1, "Bronchoalveolar lavage": 1, "CSF culture": 1, "CSF glucose": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiac electrophysiologic study": 1, "Cardiac pacemaker insertion": 1, "Cardiomegaly": 1, "Cerebellar ataxia": 1, "Cerebral disorder": 1, "Cerebral thrombosis": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Chronic kidney disease": 1, "Circulatory collapse": 1, "Cognitive disorder": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Constipation": 1, "Contusion": 1, "Coronary artery stenosis": 1, "Cough variant asthma": 1, "Cyanosis": 1, "Cytology": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Drooling": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dyslipidaemia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Eating disorder": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Electroneurography": 1, "Embolic stroke": 1, "Eosinophil percentage": 1, "Epilepsy": 1, "Extremity contracture": 1, "Face injury": 1, "Facial discomfort": 1, "Feeding disorder": 1, "Fibrin degradation products": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gastrointestinal inflammation": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Glossoptosis": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haemorrhagic diathesis": 1, "Heart rate decreased": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Hydrocephalus": 1, "Hyperkalaemia": 1, "Hyperthermia": 1, "Hypertonia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Ileus": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Interchange of vaccine products": 1, "Internal haemorrhage": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Lack of spontaneous speech": 1, "Leucine aminopeptidase": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lumbar puncture": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Lymphocyte percentage": 1, "Magnetic resonance cholangiopancreatography": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Metabolic function test": 1, "Monocyte percentage": 1, "Movement disorder": 1, "Muscle haemorrhage": 1, "Muscle spasms": 1, "Myelitis": 1, "Myocarditis": 1, "Myoclonic epilepsy": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Ocular discomfort": 1, "Oral pruritus": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngeal paraesthesia": 1, "Pigmentation disorder": 1, "Platelet count decreased": 1, "Platelet count normal": 1, "Pneumonia": 1, "Poor peripheral circulation": 1, "Product administered at inappropriate site": 1, "Prothrombin level": 1, "Pulmonary artery thrombosis": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pyelitis": 1, "Pyelonephritis acute": 1, "Radial nerve palsy": 1, "Radioisotope scan": 1, "Rash macular": 1, "Renal failure": 1, "Respiratory arrest": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Retching": 1, "Retrograde amnesia": 1, "SARS-CoV-2 antibody test": 1, "Serum colour abnormal": 1, "Small intestinal obstruction": 1, "Snoring": 1, "Subdural haematoma": 1, "Subileus": 1, "Sudden cardiac death": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Swelling": 1, "Synovial disorder": 1, "Tachypnoea": 1, "Tenderness": 1, "Throat irritation": 1, "Thrombocytopenic purpura": 1, "Thrombophlebitis": 1, "Thyroxine free": 1, "Tongue spasm": 1, "Tonic convulsion": 1, "Toxic skin eruption": 1, "Tri-iodothyronine free": 1, "Tumour marker test": 1, "Type I hypersensitivity": 1, "Ultrasound Doppler": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Urine ketone body": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Vital signs measurement": 1, "White blood cell count increased": 1}, "batchcodes": ["FC5947"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC8736.json b/docs/data/histograms/Japan/FC8736.json
index d76fc5e6268..7c1319531d9 100644
--- a/docs/data/histograms/Japan/FC8736.json
+++ b/docs/data/histograms/Japan/FC8736.json
@@ -1 +1 @@
-{"batchcode": "FC8736", "histograms": [{"batchcodes": ["FC8736"], "histogram": {"Body temperature": 80, "Blood pressure measurement": 35, "Oxygen saturation": 27, "Heart rate": 23, "Anaphylactic reaction": 21, "Dyspnoea": 21, "Pyrexia": 14, "Blood pressure increased": 12, "Nausea": 12, "Pruritus": 12, "Blood pressure decreased": 10, "Fall": 10, "Hypoaesthesia": 10, "Presyncope": 10, "Erythema": 9, "Feeling abnormal": 9, "Blood test": 8, "C-reactive protein": 8, "Headache": 8, "Loss of consciousness": 8, "COVID-19": 7, "Drug ineffective": 7, "Pallor": 7, "SARS-CoV-2 test": 7, "Cold sweat": 6, "Computerised tomogram": 6, "Depressed level of consciousness": 6, "Dizziness": 6, "Malaise": 6, "Rash": 6, "Asthenia": 5, "Hyperhidrosis": 5, "Hypersensitivity": 5, "Magnetic resonance imaging head": 5, "Pain in extremity": 5, "Tremor": 5, "Urticaria": 5, "Vital signs measurement": 5, "Vomiting": 5, "White blood cell count": 5, "Anaphylactic shock": 4, "Arthralgia": 4, "Blood pressure systolic": 4, "Magnetic resonance imaging": 4, "Oxygen saturation decreased": 4, "Respiratory arrest": 4, "Abdominal pain": 3, "Altered state of consciousness": 3, "Blood creatine phosphokinase": 3, "Cardio-respiratory arrest": 3, "Cerebral infarction": 3, "Chills": 3, "Computerised tomogram abdomen": 3, "Cough": 3, "Diarrhoea": 3, "Electrocardiogram": 3, "Endoscopy upper gastrointestinal tract": 3, "Heart rate increased": 3, "Hepatic function abnormal": 3, "Movement disorder": 3, "Muscular weakness": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Peripheral swelling": 3, "Physical deconditioning": 3, "Respiratory rate": 3, "Shock": 3, "Tension": 3, "Wheezing": 3, "Alanine aminotransferase": 2, "Anxiety": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Blood pressure diastolic decreased": 2, "Blood pressure fluctuation": 2, "Brain stem infarction": 2, "C-reactive protein increased": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Dehydration": 2, "Dysphoria": 2, "Epilepsy": 2, "Fatigue": 2, "Feeding disorder": 2, "Gait disturbance": 2, "Gallbladder enlargement": 2, "Haematemesis": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Heart rate decreased": 2, "Hemiparesis": 2, "Hemiplegia": 2, "Hypotension": 2, "Inflammation": 2, "Interchange of vaccine products": 2, "Internal haemorrhage": 2, "Investigation": 2, "Lymphadenopathy": 2, "Oedema": 2, "Oropharyngeal discomfort": 2, "Pain": 2, "Palpitations": 2, "Peripheral coldness": 2, "Physical examination": 2, "Seizure": 2, "Sensory disturbance": 2, "Suspected COVID-19": 2, "Syncope": 2, "Troponin T": 2, "Vaccination failure": 2, "Visual field defect": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute respiratory distress syndrome": 1, "Allergy to vaccine": 1, "Alopecia areata": 1, "Aneurysm ruptured": 1, "Angiocardiogram": 1, "Aphasia": 1, "Arrhythmia": 1, "Aspiration": 1, "Asthma": 1, "Ataxia": 1, "Atrioventricular block complete": 1, "Auscultation": 1, "Autoinflammatory disease": 1, "Back pain": 1, "Bed rest": 1, "Bile duct stone": 1, "Biliary colic": 1, "Biopsy heart": 1, "Blindness transient": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatine": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood culture": 1, "Blood gases": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood potassium": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Carotid artery occlusion": 1, "Cellulitis": 1, "Cerebellar ataxia": 1, "Cerebral haemorrhage": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Cholecystitis acute": 1, "Chronic gastritis": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation test": 1, "Compression fracture": 1, "Conduction disorder": 1, "Confusional state": 1, "Coordination abnormal": 1, "Coronary artery stenosis": 1, "Cutaneous symptom": 1, "Death": 1, "Decreased appetite": 1, "Dermatitis allergic": 1, "Dermo-hypodermitis": 1, "Diplopia": 1, "Discomfort": 1, "Dysarthria": 1, "Dyslalia": 1, "Dysstasia": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Eosinophilic pneumonia": 1, "Erythema multiforme": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematochezia": 1, "Haematocrit": 1, "Head discomfort": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hypercapnia": 1, "Hyperoxia": 1, "Hyperventilation": 1, "Imaging procedure": 1, "Immunisation reaction": 1, "Inappropriate schedule of product administration": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Laboratory test": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lymphocyte stimulation test": 1, "Lymphocyte stimulation test positive": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Multiple organ dysfunction syndrome": 1, "Muscle tightness": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neck pain": 1, "Neutrophil count": 1, "Ocular hyperaemia": 1, "Orthostatic hypotension": 1, "PO2": 1, "Paraesthesia": 1, "Paralysis": 1, "Pericarditis": 1, "Peripheral arterial occlusive disease": 1, "Platelet count": 1, "Pneumatosis intestinalis": 1, "Polymerase chain reaction": 1, "Postural tremor": 1, "Psychogenic seizure": 1, "Pulmonary oedema": 1, "Pupillary light reflex tests": 1, "Pupillary reflex impaired": 1, "Putamen haemorrhage": 1, "Quadriplegia": 1, "Quality of life decreased": 1, "Radial pulse": 1, "Red blood cell count": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Scintillating scotoma": 1, "Sense of oppression": 1, "Skin discolouration": 1, "Somatic symptom disorder": 1, "Stridor": 1, "Swelling": 1, "Tachypnoea": 1, "Thalamic infarction": 1, "Thirst": 1, "Throat tightness": 1, "Thrombosis": 1, "Thyroglobulin": 1, "Thyroid function test abnormal": 1, "Thyroiditis subacute": 1, "Tonic convulsion": 1, "Tonsillitis": 1, "Troponin T increased": 1, "Tunnel vision": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site pain": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FC8736", "histograms": [{"histogram": {"Body temperature": 80, "Blood pressure measurement": 35, "Oxygen saturation": 27, "Heart rate": 23, "Anaphylactic reaction": 21, "Dyspnoea": 21, "Pyrexia": 14, "Blood pressure increased": 12, "Nausea": 12, "Pruritus": 12, "Blood pressure decreased": 10, "Fall": 10, "Hypoaesthesia": 10, "Presyncope": 10, "Erythema": 9, "Feeling abnormal": 9, "Blood test": 8, "C-reactive protein": 8, "Headache": 8, "Loss of consciousness": 8, "COVID-19": 7, "Drug ineffective": 7, "Pallor": 7, "SARS-CoV-2 test": 7, "Cold sweat": 6, "Computerised tomogram": 6, "Depressed level of consciousness": 6, "Dizziness": 6, "Malaise": 6, "Rash": 6, "Asthenia": 5, "Hyperhidrosis": 5, "Hypersensitivity": 5, "Magnetic resonance imaging head": 5, "Pain in extremity": 5, "Tremor": 5, "Urticaria": 5, "Vital signs measurement": 5, "Vomiting": 5, "White blood cell count": 5, "Anaphylactic shock": 4, "Arthralgia": 4, "Blood pressure systolic": 4, "Magnetic resonance imaging": 4, "Oxygen saturation decreased": 4, "Respiratory arrest": 4, "Abdominal pain": 3, "Altered state of consciousness": 3, "Blood creatine phosphokinase": 3, "Cardio-respiratory arrest": 3, "Cerebral infarction": 3, "Chills": 3, "Computerised tomogram abdomen": 3, "Cough": 3, "Diarrhoea": 3, "Electrocardiogram": 3, "Endoscopy upper gastrointestinal tract": 3, "Heart rate increased": 3, "Hepatic function abnormal": 3, "Movement disorder": 3, "Muscular weakness": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Peripheral swelling": 3, "Physical deconditioning": 3, "Respiratory rate": 3, "Shock": 3, "Tension": 3, "Wheezing": 3, "Alanine aminotransferase": 2, "Anxiety": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Blood pressure diastolic decreased": 2, "Blood pressure fluctuation": 2, "Brain stem infarction": 2, "C-reactive protein increased": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Dehydration": 2, "Dysphoria": 2, "Epilepsy": 2, "Fatigue": 2, "Feeding disorder": 2, "Gait disturbance": 2, "Gallbladder enlargement": 2, "Haematemesis": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Heart rate decreased": 2, "Hemiparesis": 2, "Hemiplegia": 2, "Hypotension": 2, "Inflammation": 2, "Interchange of vaccine products": 2, "Internal haemorrhage": 2, "Investigation": 2, "Lymphadenopathy": 2, "Oedema": 2, "Oropharyngeal discomfort": 2, "Pain": 2, "Palpitations": 2, "Peripheral coldness": 2, "Physical examination": 2, "Seizure": 2, "Sensory disturbance": 2, "Suspected COVID-19": 2, "Syncope": 2, "Troponin T": 2, "Vaccination failure": 2, "Visual field defect": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute respiratory distress syndrome": 1, "Allergy to vaccine": 1, "Alopecia areata": 1, "Aneurysm ruptured": 1, "Angiocardiogram": 1, "Aphasia": 1, "Arrhythmia": 1, "Aspiration": 1, "Asthma": 1, "Ataxia": 1, "Atrioventricular block complete": 1, "Auscultation": 1, "Autoinflammatory disease": 1, "Back pain": 1, "Bed rest": 1, "Bile duct stone": 1, "Biliary colic": 1, "Biopsy heart": 1, "Blindness transient": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatine": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood culture": 1, "Blood gases": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood potassium": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Carotid artery occlusion": 1, "Cellulitis": 1, "Cerebellar ataxia": 1, "Cerebral haemorrhage": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Cholecystitis acute": 1, "Chronic gastritis": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation test": 1, "Compression fracture": 1, "Conduction disorder": 1, "Confusional state": 1, "Coordination abnormal": 1, "Coronary artery stenosis": 1, "Cutaneous symptom": 1, "Death": 1, "Decreased appetite": 1, "Dermatitis allergic": 1, "Dermo-hypodermitis": 1, "Diplopia": 1, "Discomfort": 1, "Dysarthria": 1, "Dyslalia": 1, "Dysstasia": 1, "Enteritis infectious": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Eosinophilic pneumonia": 1, "Erythema multiforme": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematochezia": 1, "Haematocrit": 1, "Head discomfort": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hypercapnia": 1, "Hyperoxia": 1, "Hyperventilation": 1, "Imaging procedure": 1, "Immunisation reaction": 1, "Inappropriate schedule of product administration": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Laboratory test": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lymphocyte stimulation test": 1, "Lymphocyte stimulation test positive": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Multiple organ dysfunction syndrome": 1, "Muscle tightness": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neck pain": 1, "Neutrophil count": 1, "Ocular hyperaemia": 1, "Orthostatic hypotension": 1, "PO2": 1, "Paraesthesia": 1, "Paralysis": 1, "Pericarditis": 1, "Peripheral arterial occlusive disease": 1, "Platelet count": 1, "Pneumatosis intestinalis": 1, "Polymerase chain reaction": 1, "Postural tremor": 1, "Psychogenic seizure": 1, "Pulmonary oedema": 1, "Pupillary light reflex tests": 1, "Pupillary reflex impaired": 1, "Putamen haemorrhage": 1, "Quadriplegia": 1, "Quality of life decreased": 1, "Radial pulse": 1, "Red blood cell count": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Scintillating scotoma": 1, "Sense of oppression": 1, "Skin discolouration": 1, "Somatic symptom disorder": 1, "Stridor": 1, "Swelling": 1, "Tachypnoea": 1, "Thalamic infarction": 1, "Thirst": 1, "Throat tightness": 1, "Thrombosis": 1, "Thyroglobulin": 1, "Thyroid function test abnormal": 1, "Thyroiditis subacute": 1, "Tonic convulsion": 1, "Tonsillitis": 1, "Troponin T increased": 1, "Tunnel vision": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site pain": 1, "Visual impairment": 1}, "batchcodes": ["FC8736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC8763.json b/docs/data/histograms/Japan/FC8763.json
index 6aa7f229a3c..64fa66acdb1 100644
--- a/docs/data/histograms/Japan/FC8763.json
+++ b/docs/data/histograms/Japan/FC8763.json
@@ -1 +1 @@
-{"batchcode": "FC8763", "histograms": [{"batchcodes": ["FC8763"], "histogram": {"Acute disseminated encephalomyelitis": 1, "Anaphylactic shock": 1, "Anti-NMDA antibody": 1, "Body temperature": 1, "Computerised tomogram head": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Encephalopathy": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Grip strength": 1, "Grip strength decreased": 1, "Muscular weakness": 1, "Pyrexia": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "FC8763", "histograms": [{"histogram": {"Acute disseminated encephalomyelitis": 1, "Anaphylactic shock": 1, "Anti-NMDA antibody": 1, "Body temperature": 1, "Computerised tomogram head": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Encephalopathy": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Grip strength": 1, "Grip strength decreased": 1, "Muscular weakness": 1, "Pyrexia": 1, "Sleep disorder": 1}, "batchcodes": ["FC8763"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC9073.json b/docs/data/histograms/Japan/FC9073.json
index 89383a719f8..6568a6b520e 100644
--- a/docs/data/histograms/Japan/FC9073.json
+++ b/docs/data/histograms/Japan/FC9073.json
@@ -1 +1 @@
-{"batchcode": "FC9073", "histograms": [{"batchcodes": ["FC9073"], "histogram": {"Body temperature": 1, "Lymphadenopathy": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9073", "histograms": [{"histogram": {"Body temperature": 1, "Lymphadenopathy": 1, "Pyrexia": 1}, "batchcodes": ["FC9073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC9873.json b/docs/data/histograms/Japan/FC9873.json
index 05d0f18f095..b4d09e5ce9f 100644
--- a/docs/data/histograms/Japan/FC9873.json
+++ b/docs/data/histograms/Japan/FC9873.json
@@ -1 +1 @@
-{"batchcode": "FC9873", "histograms": [{"batchcodes": ["FC9873"], "histogram": {"Body temperature": 18, "Blood pressure measurement": 13, "Oxygen saturation": 9, "Heart rate": 8, "Dyspnoea": 7, "Presyncope": 6, "Anaphylactic reaction": 5, "Nausea": 5, "Feeling abnormal": 4, "Pyrexia": 4, "Respiratory rate": 4, "Arthralgia": 3, "Blood pressure increased": 3, "Computerised tomogram": 3, "Hypotension": 3, "Acute kidney injury": 2, "Anaphylactic shock": 2, "Blood pressure decreased": 2, "C-reactive protein": 2, "Dizziness": 2, "Hepatic function abnormal": 2, "Hyperhidrosis": 2, "Hyperventilation": 2, "Hypoaesthesia": 2, "Platelet count": 2, "Platelet count decreased": 2, "Vital signs measurement": 2, "Vomiting": 2, "White blood cell count": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anti-aquaporin-4 antibody": 1, "Antibody test": 1, "Anuria": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Auscultation": 1, "Biopsy bone marrow": 1, "Biopsy lymph gland": 1, "Biopsy skin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood test": 1, "Body mass index": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Bronchoscopy": 1, "C-reactive protein increased": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Computerised tomogram abnormal": 1, "Condition aggravated": 1, "Contusion": 1, "Cough": 1, "Cyanosis": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Diplegia": 1, "Disseminated intravascular coagulation": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dysphoria": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Eosinophilia": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Erythema": 1, "Eye disorder": 1, "Facial paralysis": 1, "Fall": 1, "Gamma-glutamyltransferase": 1, "Genital haemorrhage": 1, "Headache": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Human herpesvirus 6 infection reactivation": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Investigation": 1, "Lung opacity": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mitral valve incompetence": 1, "Multiple sclerosis": 1, "Myelitis": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Neuromyelitis optica spectrum disorder": 1, "Oculomucocutaneous syndrome": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PO2": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Paraplegia": 1, "Peripheral swelling": 1, "Photopsia": 1, "Product use issue": 1, "Pruritus": 1, "Pulmonary alveolar haemorrhage": 1, "Pupillary light reflex tests": 1, "Red blood cell count": 1, "Respiratory failure": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Scrub typhus": 1, "Seizure": 1, "Sepsis": 1, "Serum ferritin": 1, "Sinus bradycardia": 1, "Skin erosion": 1, "Splenomegaly": 1, "Syncope": 1, "Tachycardia": 1, "Tension": 1, "Urinary retention": 1, "Vasculitis": 1, "Visual impairment": 1, "White blood cell analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9873", "histograms": [{"histogram": {"Body temperature": 18, "Blood pressure measurement": 13, "Oxygen saturation": 9, "Heart rate": 8, "Dyspnoea": 7, "Presyncope": 6, "Anaphylactic reaction": 5, "Nausea": 5, "Feeling abnormal": 4, "Pyrexia": 4, "Respiratory rate": 4, "Arthralgia": 3, "Blood pressure increased": 3, "Computerised tomogram": 3, "Hypotension": 3, "Acute kidney injury": 2, "Anaphylactic shock": 2, "Blood pressure decreased": 2, "C-reactive protein": 2, "Dizziness": 2, "Hepatic function abnormal": 2, "Hyperhidrosis": 2, "Hyperventilation": 2, "Hypoaesthesia": 2, "Platelet count": 2, "Platelet count decreased": 2, "Vital signs measurement": 2, "Vomiting": 2, "White blood cell count": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anti-aquaporin-4 antibody": 1, "Antibody test": 1, "Anuria": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Auscultation": 1, "Biopsy bone marrow": 1, "Biopsy lymph gland": 1, "Biopsy skin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood test": 1, "Body mass index": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Bronchoscopy": 1, "C-reactive protein increased": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Computerised tomogram abnormal": 1, "Condition aggravated": 1, "Contusion": 1, "Cough": 1, "Cyanosis": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Diplegia": 1, "Disseminated intravascular coagulation": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dysphoria": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Eosinophilia": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Erythema": 1, "Eye disorder": 1, "Facial paralysis": 1, "Fall": 1, "Gamma-glutamyltransferase": 1, "Genital haemorrhage": 1, "Headache": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Human herpesvirus 6 infection reactivation": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Investigation": 1, "Lung opacity": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mitral valve incompetence": 1, "Multiple sclerosis": 1, "Myelitis": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Neuromyelitis optica spectrum disorder": 1, "Oculomucocutaneous syndrome": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PO2": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Paraplegia": 1, "Peripheral swelling": 1, "Photopsia": 1, "Product use issue": 1, "Pruritus": 1, "Pulmonary alveolar haemorrhage": 1, "Pupillary light reflex tests": 1, "Red blood cell count": 1, "Respiratory failure": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Scrub typhus": 1, "Seizure": 1, "Sepsis": 1, "Serum ferritin": 1, "Sinus bradycardia": 1, "Skin erosion": 1, "Splenomegaly": 1, "Syncope": 1, "Tachycardia": 1, "Tension": 1, "Urinary retention": 1, "Vasculitis": 1, "Visual impairment": 1, "White blood cell analysis": 1}, "batchcodes": ["FC9873"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC9880.json b/docs/data/histograms/Japan/FC9880.json
index 7bc3b94f459..af1bbe36837 100644
--- a/docs/data/histograms/Japan/FC9880.json
+++ b/docs/data/histograms/Japan/FC9880.json
@@ -1 +1 @@
-{"batchcode": "FC9880", "histograms": [{"batchcodes": ["FC9880"], "histogram": {"Body temperature": 76, "Blood pressure measurement": 31, "Oxygen saturation": 28, "Heart rate": 18, "Dyspnoea": 15, "Feeling abnormal": 15, "Nausea": 15, "Blood pressure decreased": 14, "Pyrexia": 14, "Anaphylactic reaction": 12, "Presyncope": 11, "Blood pressure increased": 9, "Blood test": 9, "Erythema": 8, "Hypoaesthesia": 8, "Investigation": 8, "Dizziness": 7, "Oxygen saturation decreased": 7, "Pallor": 7, "Vomiting": 7, "Chest discomfort": 6, "Cough": 6, "Headache": 6, "Loss of consciousness": 6, "Malaise": 6, "Pruritus": 6, "White blood cell count": 6, "C-reactive protein": 5, "Magnetic resonance imaging head": 5, "Palpitations": 5, "Urticaria": 5, "Arthralgia": 4, "Blood glucose": 4, "Cold sweat": 4, "Computerised tomogram": 4, "Drug ineffective": 4, "Glycosylated haemoglobin": 4, "Pain": 4, "Pain in extremity": 4, "Rash": 4, "Respiratory rate": 4, "SARS-CoV-2 test": 4, "Tachycardia": 4, "Altered state of consciousness": 3, "Anaphylactic shock": 3, "Asthenia": 3, "Asthma": 3, "Blood creatinine": 3, "CSF cell count": 3, "CSF glucose": 3, "CSF protein": 3, "Disseminated intravascular coagulation": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling hot": 3, "Oropharyngeal discomfort": 3, "Platelet count": 3, "Suspected COVID-19": 3, "White blood cell count increased": 3, "Abdominal pain": 2, "Activated partial thromboplastin time": 2, "Acute kidney injury": 2, "Alanine aminotransferase": 2, "Aphasia": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Biopsy skin": 2, "Blood alkaline phosphatase": 2, "Blood chloride": 2, "Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood urea": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "COVID-19": 2, "CSF test": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Clonic convulsion": 2, "Coma scale": 2, "Cytology": 2, "Death": 2, "Decreased appetite": 2, "Depressed level of consciousness": 2, "Dyskinesia": 2, "Dysphagia": 2, "Echocardiogram": 2, "Epilepsy": 2, "Fibrin degradation products": 2, "Flushing": 2, "General physical health deterioration": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Herpes simplex test": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hypertension": 2, "Hyperventilation": 2, "Hyporesponsive to stimuli": 2, "Ileus": 2, "Intestinal angioedema": 2, "Magnetic resonance imaging": 2, "Mental impairment": 2, "Muscular weakness": 2, "Paraesthesia": 2, "Paralysis": 2, "Platelet count decreased": 2, "Purpura": 2, "Rash erythematous": 2, "Respiratory distress": 2, "Seizure": 2, "Sensory disturbance": 2, "Septic shock": 2, "Sudden hearing loss": 2, "Throat tightness": 2, "Toxic skin eruption": 2, "Troponin I": 2, "Ultrasound scan": 2, "Vital signs measurement": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abortion threatened": 1, "Acarodermatitis": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Albumin CSF": 1, "Amylase": 1, "Anal incontinence": 1, "Antibody test": 1, "Apathy": 1, "Arthritis": 1, "Autoantibody test": 1, "Bacteraemia": 1, "Bacterial infection": 1, "Bacterial test": 1, "Biliary tract infection": 1, "Bilirubin conjugated": 1, "Biopsy kidney": 1, "Blister": 1, "Blood bilirubin": 1, "Blood cadmium": 1, "Blood calcium": 1, "Blood culture": 1, "Blood electrolytes": 1, "Blood glucose increased": 1, "Blood immunoglobulin G": 1, "Blood thyroid stimulating hormone": 1, "Blood uric acid": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Breath sounds": 1, "Bronchitis": 1, "Capillary leak syndrome": 1, "Capillary permeability increased": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiomyopathy": 1, "Cardiovascular examination": 1, "Cerebral disorder": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricle dilatation": 1, "Cervical radiculopathy": 1, "Chest X-ray": 1, "Chills": 1, "Clostridium difficile infection": 1, "Clostridium test": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Constipation": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Dermatitis allergic": 1, "Diabetes mellitus": 1, "Diffusion-weighted brain MRI abnormal": 1, "Distractibility": 1, "Disturbance in attention": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dysphoria": 1, "Dysstasia": 1, "Ear discomfort": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Embolism": 1, "Encephalitis": 1, "Encephalopathy": 1, "Endoscopy gastrointestinal": 1, "Endoscopy upper gastrointestinal tract": 1, "Enteritis": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Eosinophilia": 1, "Erythema multiforme": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Eyelids pruritus": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Fibrin degradation products increased": 1, "Fluid retention": 1, "Focal dyscognitive seizures": 1, "Full blood count": 1, "Fungal test": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Glycosylated haemoglobin increased": 1, "HIV antibody": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Histology": 1, "Hyperhidrosis": 1, "Hypoglycaemia": 1, "Hypophagia": 1, "Hypotonia": 1, "Indifference": 1, "Inflammation": 1, "Insulin-like growth factor": 1, "Intellectual disability": 1, "Internal haemorrhage": 1, "International normalised ratio": 1, "Joint range of motion decreased": 1, "Lacunar infarction": 1, "Laryngeal oedema": 1, "Lichen planus": 1, "Liver disorder": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging spinal": 1, "Maternal exposure during pregnancy": 1, "Meningitis bacterial": 1, "Metabolic acidosis": 1, "Migraine": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle tightness": 1, "Mycobacterium test negative": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Neutrophil percentage": 1, "Obstructive airways disorder": 1, "Oculogyric crisis": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Ophthalmological examination": 1, "Optic neuritis": 1, "Oropharyngeal pain": 1, "Oxygen saturation abnormal": 1, "Pancreatitis acute": 1, "Papule": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Physical deconditioning": 1, "Pleural effusion": 1, "Polymyalgia rheumatica": 1, "Prinzmetal angina": 1, "Procalcitonin": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory rate increased": 1, "Rhabdomyolysis": 1, "Schirmer's test": 1, "Sensation of foreign body": 1, "Sepsis": 1, "Sinus arrhythmia": 1, "Somnolence": 1, "Spinal deformity": 1, "Status epilepticus": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Tachypnoea": 1, "Thoracic outlet syndrome": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thyroxine free": 1, "Tremor": 1, "Treponema test": 1, "Tumour marker test": 1, "Unresponsive to stimuli": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Varicella virus test": 1, "Varicella virus test negative": 1, "Vasculitis": 1, "Viral test": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Weight": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9880", "histograms": [{"histogram": {"Body temperature": 76, "Blood pressure measurement": 31, "Oxygen saturation": 28, "Heart rate": 18, "Dyspnoea": 15, "Feeling abnormal": 15, "Nausea": 15, "Blood pressure decreased": 14, "Pyrexia": 14, "Anaphylactic reaction": 12, "Presyncope": 11, "Blood pressure increased": 9, "Blood test": 9, "Erythema": 8, "Hypoaesthesia": 8, "Investigation": 8, "Dizziness": 7, "Oxygen saturation decreased": 7, "Pallor": 7, "Vomiting": 7, "Chest discomfort": 6, "Cough": 6, "Headache": 6, "Loss of consciousness": 6, "Malaise": 6, "Pruritus": 6, "White blood cell count": 6, "C-reactive protein": 5, "Magnetic resonance imaging head": 5, "Palpitations": 5, "Urticaria": 5, "Arthralgia": 4, "Blood glucose": 4, "Cold sweat": 4, "Computerised tomogram": 4, "Drug ineffective": 4, "Glycosylated haemoglobin": 4, "Pain": 4, "Pain in extremity": 4, "Rash": 4, "Respiratory rate": 4, "SARS-CoV-2 test": 4, "Tachycardia": 4, "Altered state of consciousness": 3, "Anaphylactic shock": 3, "Asthenia": 3, "Asthma": 3, "Blood creatinine": 3, "CSF cell count": 3, "CSF glucose": 3, "CSF protein": 3, "Disseminated intravascular coagulation": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling hot": 3, "Oropharyngeal discomfort": 3, "Platelet count": 3, "Suspected COVID-19": 3, "White blood cell count increased": 3, "Abdominal pain": 2, "Activated partial thromboplastin time": 2, "Acute kidney injury": 2, "Alanine aminotransferase": 2, "Aphasia": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Biopsy skin": 2, "Blood alkaline phosphatase": 2, "Blood chloride": 2, "Blood creatine phosphokinase": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood urea": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "COVID-19": 2, "CSF test": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Clonic convulsion": 2, "Coma scale": 2, "Cytology": 2, "Death": 2, "Decreased appetite": 2, "Depressed level of consciousness": 2, "Dyskinesia": 2, "Dysphagia": 2, "Echocardiogram": 2, "Epilepsy": 2, "Fibrin degradation products": 2, "Flushing": 2, "General physical health deterioration": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Herpes simplex test": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hypertension": 2, "Hyperventilation": 2, "Hyporesponsive to stimuli": 2, "Ileus": 2, "Intestinal angioedema": 2, "Magnetic resonance imaging": 2, "Mental impairment": 2, "Muscular weakness": 2, "Paraesthesia": 2, "Paralysis": 2, "Platelet count decreased": 2, "Purpura": 2, "Rash erythematous": 2, "Respiratory distress": 2, "Seizure": 2, "Sensory disturbance": 2, "Septic shock": 2, "Sudden hearing loss": 2, "Throat tightness": 2, "Toxic skin eruption": 2, "Troponin I": 2, "Ultrasound scan": 2, "Vital signs measurement": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abortion threatened": 1, "Acarodermatitis": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Albumin CSF": 1, "Amylase": 1, "Anal incontinence": 1, "Antibody test": 1, "Apathy": 1, "Arthritis": 1, "Autoantibody test": 1, "Bacteraemia": 1, "Bacterial infection": 1, "Bacterial test": 1, "Biliary tract infection": 1, "Bilirubin conjugated": 1, "Biopsy kidney": 1, "Blister": 1, "Blood bilirubin": 1, "Blood cadmium": 1, "Blood calcium": 1, "Blood culture": 1, "Blood electrolytes": 1, "Blood glucose increased": 1, "Blood immunoglobulin G": 1, "Blood thyroid stimulating hormone": 1, "Blood uric acid": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Breath sounds": 1, "Bronchitis": 1, "Capillary leak syndrome": 1, "Capillary permeability increased": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiomyopathy": 1, "Cardiovascular examination": 1, "Cerebral disorder": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricle dilatation": 1, "Cervical radiculopathy": 1, "Chest X-ray": 1, "Chills": 1, "Clostridium difficile infection": 1, "Clostridium test": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Constipation": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Dermatitis allergic": 1, "Diabetes mellitus": 1, "Diffusion-weighted brain MRI abnormal": 1, "Distractibility": 1, "Disturbance in attention": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dysphoria": 1, "Dysstasia": 1, "Ear discomfort": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Embolism": 1, "Encephalitis": 1, "Encephalopathy": 1, "Endoscopy gastrointestinal": 1, "Endoscopy upper gastrointestinal tract": 1, "Enteritis": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Eosinophilia": 1, "Erythema multiforme": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Eyelids pruritus": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Fibrin degradation products increased": 1, "Fluid retention": 1, "Focal dyscognitive seizures": 1, "Full blood count": 1, "Fungal test": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Glycosylated haemoglobin increased": 1, "HIV antibody": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heart sounds": 1, "Henoch-Schonlein purpura": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Histology": 1, "Hyperhidrosis": 1, "Hypoglycaemia": 1, "Hypophagia": 1, "Hypotonia": 1, "Indifference": 1, "Inflammation": 1, "Insulin-like growth factor": 1, "Intellectual disability": 1, "Internal haemorrhage": 1, "International normalised ratio": 1, "Joint range of motion decreased": 1, "Lacunar infarction": 1, "Laryngeal oedema": 1, "Lichen planus": 1, "Liver disorder": 1, "Liver function test": 1, "Loss of personal independence in daily activities": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging spinal": 1, "Maternal exposure during pregnancy": 1, "Meningitis bacterial": 1, "Metabolic acidosis": 1, "Migraine": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle tightness": 1, "Mycobacterium test negative": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Neutrophil percentage": 1, "Obstructive airways disorder": 1, "Oculogyric crisis": 1, "Oculomucocutaneous syndrome": 1, "Oedema": 1, "Ophthalmological examination": 1, "Optic neuritis": 1, "Oropharyngeal pain": 1, "Oxygen saturation abnormal": 1, "Pancreatitis acute": 1, "Papule": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Physical deconditioning": 1, "Pleural effusion": 1, "Polymyalgia rheumatica": 1, "Prinzmetal angina": 1, "Procalcitonin": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory rate increased": 1, "Rhabdomyolysis": 1, "Schirmer's test": 1, "Sensation of foreign body": 1, "Sepsis": 1, "Sinus arrhythmia": 1, "Somnolence": 1, "Spinal deformity": 1, "Status epilepticus": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Tachypnoea": 1, "Thoracic outlet syndrome": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thyroxine free": 1, "Tremor": 1, "Treponema test": 1, "Tumour marker test": 1, "Unresponsive to stimuli": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Varicella virus test": 1, "Varicella virus test negative": 1, "Vasculitis": 1, "Viral test": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Weight": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["FC9880"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FC9909.json b/docs/data/histograms/Japan/FC9909.json
index 7d1e9949080..d650b413975 100644
--- a/docs/data/histograms/Japan/FC9909.json
+++ b/docs/data/histograms/Japan/FC9909.json
@@ -1 +1 @@
-{"batchcode": "FC9909", "histograms": [{"batchcodes": ["FC9909"], "histogram": {"Body temperature": 43, "Blood pressure measurement": 17, "Oxygen saturation": 14, "Pyrexia": 14, "Heart rate": 12, "Anaphylactic reaction": 10, "Malaise": 9, "Pruritus": 9, "Nausea": 8, "Urticaria": 8, "Blood pressure increased": 7, "Dyspnoea": 6, "Feeling abnormal": 6, "Presyncope": 6, "Vomiting": 6, "Blood test": 5, "C-reactive protein": 5, "Electrocardiogram": 5, "Headache": 5, "Magnetic resonance imaging": 5, "White blood cell count": 5, "C-reactive protein increased": 4, "Cerebral infarction": 4, "Computerised tomogram": 4, "Erythema": 4, "Hypoaesthesia": 4, "Palpitations": 4, "Rash": 4, "SARS-CoV-2 test": 4, "White blood cell count increased": 4, "Computerised tomogram head": 3, "Death": 3, "Decreased appetite": 3, "Depressed level of consciousness": 3, "Dysarthria": 3, "Flushing": 3, "Oropharyngeal discomfort": 3, "Pain": 3, "Seizure": 3, "Vital signs measurement": 3, "Blood bilirubin": 2, "Cough": 2, "Dehydration": 2, "Dizziness": 2, "Feeling cold": 2, "Feeling hot": 2, "Gait disturbance": 2, "Inflammation": 2, "Investigation": 2, "Loss of consciousness": 2, "Magnetic resonance imaging head": 2, "Myalgia": 2, "Neuropathy peripheral": 2, "Physical deconditioning": 2, "Thirst": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Abdominal tenderness": 1, "Abscess": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Adenosine deaminase": 1, "Adenosine deaminase increased": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-thyroid antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Artery dissection": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Auscultation": 1, "Autoantibody test": 1, "Autoimmune haemolytic anaemia": 1, "Biopsy": 1, "Biopsy skin": 1, "Blood bilirubin increased": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood phosphorus": 1, "Blood pressure decreased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature increased": 1, "Burning sensation": 1, "COVID-19": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF mononuclear cell count increased": 1, "CSF protein": 1, "CSF protein increased": 1, "CSF test": 1, "Cardiac failure": 1, "Cerebral haemorrhage": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Colitis ulcerative": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Conjunctival hyperaemia": 1, "Coombs direct test": 1, "Culture stool": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Diffusion-weighted brain MRI": 1, "Diplegia": 1, "Diplopia": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Electroencephalogram": 1, "Endoscopy": 1, "Eosinophil count": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Fall": 1, "Fatigue": 1, "Feeding disorder": 1, "Fulminant type 1 diabetes mellitus": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "General physical health deterioration": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haptoglobin": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hepatic infarction": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Infection": 1, "Insulin C-peptide": 1, "Insulin C-peptide decreased": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Liver disorder": 1, "Lung adenocarcinoma": 1, "Meniere's disease": 1, "Meningitis tuberculous": 1, "Metabolic acidosis": 1, "Mononuclear cell percentage": 1, "Mouth haemorrhage": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Myasthenia gravis": 1, "Myocardial infarction": 1, "Nasal cavity cancer": 1, "Nasal congestion": 1, "Neck pain": 1, "Neoplasm malignant": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pallor": 1, "Paralysis": 1, "Peripheral coldness": 1, "Plasminogen activator inhibitor": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Rash erythematous": 1, "Respiratory disorder": 1, "Salivary hypersecretion": 1, "Secondary adrenocortical insufficiency": 1, "Sensation of foreign body": 1, "Shock": 1, "Single photon emission computerised tomogram": 1, "Sinus tachycardia": 1, "Somnolence": 1, "Splenic infarction": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Thrombin-antithrombin III complex": 1, "Thrombosis": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine free": 1, "Tuberculoma of central nervous system": 1, "Vaccination site erythema": 1, "Vision blurred": 1, "Visual impairment": 1, "White matter lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9909", "histograms": [{"histogram": {"Body temperature": 43, "Blood pressure measurement": 17, "Oxygen saturation": 14, "Pyrexia": 14, "Heart rate": 12, "Anaphylactic reaction": 10, "Malaise": 9, "Pruritus": 9, "Nausea": 8, "Urticaria": 8, "Blood pressure increased": 7, "Dyspnoea": 6, "Feeling abnormal": 6, "Presyncope": 6, "Vomiting": 6, "Blood test": 5, "C-reactive protein": 5, "Electrocardiogram": 5, "Headache": 5, "Magnetic resonance imaging": 5, "White blood cell count": 5, "C-reactive protein increased": 4, "Cerebral infarction": 4, "Computerised tomogram": 4, "Erythema": 4, "Hypoaesthesia": 4, "Palpitations": 4, "Rash": 4, "SARS-CoV-2 test": 4, "White blood cell count increased": 4, "Computerised tomogram head": 3, "Death": 3, "Decreased appetite": 3, "Depressed level of consciousness": 3, "Dysarthria": 3, "Flushing": 3, "Oropharyngeal discomfort": 3, "Pain": 3, "Seizure": 3, "Vital signs measurement": 3, "Blood bilirubin": 2, "Cough": 2, "Dehydration": 2, "Dizziness": 2, "Feeling cold": 2, "Feeling hot": 2, "Gait disturbance": 2, "Inflammation": 2, "Investigation": 2, "Loss of consciousness": 2, "Magnetic resonance imaging head": 2, "Myalgia": 2, "Neuropathy peripheral": 2, "Physical deconditioning": 2, "Thirst": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Abdominal tenderness": 1, "Abscess": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Adenosine deaminase": 1, "Adenosine deaminase increased": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-thyroid antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Artery dissection": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Auscultation": 1, "Autoantibody test": 1, "Autoimmune haemolytic anaemia": 1, "Biopsy": 1, "Biopsy skin": 1, "Blood bilirubin increased": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood phosphorus": 1, "Blood pressure decreased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature increased": 1, "Burning sensation": 1, "COVID-19": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF mononuclear cell count increased": 1, "CSF protein": 1, "CSF protein increased": 1, "CSF test": 1, "Cardiac failure": 1, "Cerebral haemorrhage": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Colitis ulcerative": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Conjunctival hyperaemia": 1, "Coombs direct test": 1, "Culture stool": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Diffusion-weighted brain MRI": 1, "Diplegia": 1, "Diplopia": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Electroencephalogram": 1, "Endoscopy": 1, "Eosinophil count": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Fall": 1, "Fatigue": 1, "Feeding disorder": 1, "Fulminant type 1 diabetes mellitus": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "General physical health deterioration": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haptoglobin": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hepatic infarction": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Infection": 1, "Insulin C-peptide": 1, "Insulin C-peptide decreased": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Liver disorder": 1, "Lung adenocarcinoma": 1, "Meniere's disease": 1, "Meningitis tuberculous": 1, "Metabolic acidosis": 1, "Mononuclear cell percentage": 1, "Mouth haemorrhage": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Myasthenia gravis": 1, "Myocardial infarction": 1, "Nasal cavity cancer": 1, "Nasal congestion": 1, "Neck pain": 1, "Neoplasm malignant": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pallor": 1, "Paralysis": 1, "Peripheral coldness": 1, "Plasminogen activator inhibitor": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Rash erythematous": 1, "Respiratory disorder": 1, "Salivary hypersecretion": 1, "Secondary adrenocortical insufficiency": 1, "Sensation of foreign body": 1, "Shock": 1, "Single photon emission computerised tomogram": 1, "Sinus tachycardia": 1, "Somnolence": 1, "Splenic infarction": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Thrombin-antithrombin III complex": 1, "Thrombosis": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine free": 1, "Tuberculoma of central nervous system": 1, "Vaccination site erythema": 1, "Vision blurred": 1, "Visual impairment": 1, "White matter lesion": 1}, "batchcodes": ["FC9909"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FD0348.json b/docs/data/histograms/Japan/FD0348.json
index ddc88404a6c..6647d71c881 100644
--- a/docs/data/histograms/Japan/FD0348.json
+++ b/docs/data/histograms/Japan/FD0348.json
@@ -1 +1 @@
-{"batchcode": "FD0348", "histograms": [{"batchcodes": ["FD0348"], "histogram": {"Body temperature": 54, "Blood pressure measurement": 38, "Oxygen saturation": 33, "Heart rate": 29, "Anaphylactic reaction": 13, "Dyspnoea": 13, "Blood pressure increased": 12, "Headache": 12, "Presyncope": 11, "Blood pressure decreased": 10, "Feeling abnormal": 9, "Hypoaesthesia": 8, "Nausea": 8, "Pallor": 8, "Coma scale": 7, "Erythema": 6, "Loss of consciousness": 6, "Computerised tomogram head": 5, "Fall": 5, "Magnetic resonance imaging head": 5, "Malaise": 5, "Oxygen saturation decreased": 5, "Pruritus": 5, "Pyrexia": 5, "Rash": 5, "Swelling": 5, "Bradycardia": 4, "Chest discomfort": 4, "Cold sweat": 4, "Depressed level of consciousness": 4, "Dizziness": 4, "Respiratory rate": 4, "Tachycardia": 4, "COVID-19": 3, "Cerebral infarction": 3, "Contusion": 3, "Cough": 3, "Drug ineffective": 3, "Electrocardiogram": 3, "Epilepsy": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Investigation": 3, "Magnetic resonance imaging": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Pain in extremity": 3, "Palpitations": 3, "Pneumonia": 3, "Swelling face": 3, "Vaccination site pain": 3, "Vital signs measurement": 3, "Abnormal sensation in eye": 2, "Altered state of consciousness": 2, "Arthralgia": 2, "Asthenia": 2, "Auscultation": 2, "Back pain": 2, "Blood creatine phosphokinase": 2, "Blood pressure diastolic decreased": 2, "Blood test": 2, "Brain natriuretic peptide": 2, "C-reactive protein": 2, "CSF test": 2, "Cerebral haemorrhage": 2, "Chest X-ray": 2, "Discomfort": 2, "Dysphoria": 2, "Echocardiogram": 2, "Facial paralysis": 2, "Feeling hot": 2, "Generalised tonic-clonic seizure": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Hypotension": 2, "Multiple sclerosis": 2, "Muscular weakness": 2, "Nerve conduction studies": 2, "PO2": 2, "Platelet count": 2, "Seizure": 2, "Somnolence": 2, "Syncope": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "Toxic skin eruption": 2, "Vomiting": 2, "White blood cell count": 2, "Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Ammonia": 1, "Amylase": 1, "Anaemia": 1, "Anal incontinence": 1, "Angina pectoris": 1, "Angiogram": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody increased": 1, "Anxiety": 1, "Aortic dissection": 1, "Aphasia": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Auditory disorder": 1, "Basophil count": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood potassium": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Blood urine": 1, "Brain contusion": 1, "Brain oedema": 1, "C-reactive protein increased": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Carotid artery occlusion": 1, "Carotid artery stenosis": 1, "Cellulitis": 1, "Cerebral artery stenosis": 1, "Cerebral hypoperfusion": 1, "Cerebral ischaemia": 1, "Cerebral mass effect": 1, "Cervical radiculopathy": 1, "Chest pain": 1, "Chills": 1, "Circulatory collapse": 1, "Colitis ischaemic": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Coronavirus test": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Dehydration": 1, "Delirium": 1, "Demyelination": 1, "Dermatitis allergic": 1, "Disease recurrence": 1, "Drug eruption": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphonia": 1, "Eating disorder": 1, "Electrocardiogram ST segment depression": 1, "Embolic stroke": 1, "Embolism": 1, "Eosinophil count": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Eosinophilic pneumonia": 1, "Exposure during pregnancy": 1, "Eye movement disorder": 1, "Fear of injection": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Foetal death": 1, "Foetal movement disorder": 1, "Gastric cancer": 1, "Genital haemorrhage": 1, "Glomerular filtration rate": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Haemolysis": 1, "Haemorrhage subcutaneous": 1, "Hemiplegia": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Inappropriate affect": 1, "Infection": 1, "Inflammation": 1, "Joint ankylosis": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lip disorder": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Myotonia": 1, "Neck pain": 1, "Neuralgic amyotrophy": 1, "Neurogenic bladder": 1, "Neurological symptom": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Nucleic acid test": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "PCO2": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Parosmia": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count increased": 1, "Platelet distribution width": 1, "Pleural effusion": 1, "Pleurisy": 1, "Polymerase chain reaction": 1, "Poor quality sleep": 1, "Procalcitonin": 1, "Product leakage": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin level decreased": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Prothrombin time ratio increased": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pupillary light reflex tests": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Red cell distribution width increased": 1, "Respiratory arrest": 1, "Respiratory rate increased": 1, "Respiratory tract congestion": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Scab": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Septic shock": 1, "Shock": 1, "Sinusitis": 1, "Skin abrasion": 1, "Soliloquy": 1, "Spinal osteoarthritis": 1, "Subarachnoid haemorrhage": 1, "Swelling of eyelid": 1, "Tachypnoea": 1, "Taste disorder": 1, "Tension": 1, "Thrombosis": 1, "Thrombotic cerebral infarction": 1, "Tremor": 1, "Troponin": 1, "Trousseau's sign": 1, "Underdose": 1, "Urine ketone body": 1, "Urine output decreased": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site irritation": 1, "Vaccination site swelling": 1, "Vasculitis": 1, "Ventricular hypokinesia": 1, "Visual field defect": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "X-ray limb": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0348", "histograms": [{"histogram": {"Body temperature": 54, "Blood pressure measurement": 38, "Oxygen saturation": 33, "Heart rate": 29, "Anaphylactic reaction": 13, "Dyspnoea": 13, "Blood pressure increased": 12, "Headache": 12, "Presyncope": 11, "Blood pressure decreased": 10, "Feeling abnormal": 9, "Hypoaesthesia": 8, "Nausea": 8, "Pallor": 8, "Coma scale": 7, "Erythema": 6, "Loss of consciousness": 6, "Computerised tomogram head": 5, "Fall": 5, "Magnetic resonance imaging head": 5, "Malaise": 5, "Oxygen saturation decreased": 5, "Pruritus": 5, "Pyrexia": 5, "Rash": 5, "Swelling": 5, "Bradycardia": 4, "Chest discomfort": 4, "Cold sweat": 4, "Depressed level of consciousness": 4, "Dizziness": 4, "Respiratory rate": 4, "Tachycardia": 4, "COVID-19": 3, "Cerebral infarction": 3, "Contusion": 3, "Cough": 3, "Drug ineffective": 3, "Electrocardiogram": 3, "Epilepsy": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Investigation": 3, "Magnetic resonance imaging": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Pain in extremity": 3, "Palpitations": 3, "Pneumonia": 3, "Swelling face": 3, "Vaccination site pain": 3, "Vital signs measurement": 3, "Abnormal sensation in eye": 2, "Altered state of consciousness": 2, "Arthralgia": 2, "Asthenia": 2, "Auscultation": 2, "Back pain": 2, "Blood creatine phosphokinase": 2, "Blood pressure diastolic decreased": 2, "Blood test": 2, "Brain natriuretic peptide": 2, "C-reactive protein": 2, "CSF test": 2, "Cerebral haemorrhage": 2, "Chest X-ray": 2, "Discomfort": 2, "Dysphoria": 2, "Echocardiogram": 2, "Facial paralysis": 2, "Feeling hot": 2, "Generalised tonic-clonic seizure": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Hypotension": 2, "Multiple sclerosis": 2, "Muscular weakness": 2, "Nerve conduction studies": 2, "PO2": 2, "Platelet count": 2, "Seizure": 2, "Somnolence": 2, "Syncope": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "Toxic skin eruption": 2, "Vomiting": 2, "White blood cell count": 2, "Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Ammonia": 1, "Amylase": 1, "Anaemia": 1, "Anal incontinence": 1, "Angina pectoris": 1, "Angiogram": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody increased": 1, "Anxiety": 1, "Aortic dissection": 1, "Aphasia": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Auditory disorder": 1, "Basophil count": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood potassium": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Blood urine": 1, "Brain contusion": 1, "Brain oedema": 1, "C-reactive protein increased": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Carotid artery occlusion": 1, "Carotid artery stenosis": 1, "Cellulitis": 1, "Cerebral artery stenosis": 1, "Cerebral hypoperfusion": 1, "Cerebral ischaemia": 1, "Cerebral mass effect": 1, "Cervical radiculopathy": 1, "Chest pain": 1, "Chills": 1, "Circulatory collapse": 1, "Colitis ischaemic": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Coronavirus test": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Dehydration": 1, "Delirium": 1, "Demyelination": 1, "Dermatitis allergic": 1, "Disease recurrence": 1, "Drug eruption": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphonia": 1, "Eating disorder": 1, "Electrocardiogram ST segment depression": 1, "Embolic stroke": 1, "Embolism": 1, "Eosinophil count": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Eosinophilic pneumonia": 1, "Exposure during pregnancy": 1, "Eye movement disorder": 1, "Fear of injection": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Foetal death": 1, "Foetal movement disorder": 1, "Gastric cancer": 1, "Genital haemorrhage": 1, "Glomerular filtration rate": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Haemolysis": 1, "Haemorrhage subcutaneous": 1, "Hemiplegia": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Inappropriate affect": 1, "Infection": 1, "Inflammation": 1, "Joint ankylosis": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lip disorder": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Myotonia": 1, "Neck pain": 1, "Neuralgic amyotrophy": 1, "Neurogenic bladder": 1, "Neurological symptom": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Nucleic acid test": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "PCO2": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Parosmia": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count increased": 1, "Platelet distribution width": 1, "Pleural effusion": 1, "Pleurisy": 1, "Polymerase chain reaction": 1, "Poor quality sleep": 1, "Procalcitonin": 1, "Product leakage": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin level decreased": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Prothrombin time ratio increased": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pupillary light reflex tests": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Red cell distribution width increased": 1, "Respiratory arrest": 1, "Respiratory rate increased": 1, "Respiratory tract congestion": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Scab": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Septic shock": 1, "Shock": 1, "Sinusitis": 1, "Skin abrasion": 1, "Soliloquy": 1, "Spinal osteoarthritis": 1, "Subarachnoid haemorrhage": 1, "Swelling of eyelid": 1, "Tachypnoea": 1, "Taste disorder": 1, "Tension": 1, "Thrombosis": 1, "Thrombotic cerebral infarction": 1, "Tremor": 1, "Troponin": 1, "Trousseau's sign": 1, "Underdose": 1, "Urine ketone body": 1, "Urine output decreased": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site irritation": 1, "Vaccination site swelling": 1, "Vasculitis": 1, "Ventricular hypokinesia": 1, "Visual field defect": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "X-ray limb": 1, "pH body fluid": 1}, "batchcodes": ["FD0348"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FD0349.json b/docs/data/histograms/Japan/FD0349.json
index 46e85602809..0428dcc86aa 100644
--- a/docs/data/histograms/Japan/FD0349.json
+++ b/docs/data/histograms/Japan/FD0349.json
@@ -1 +1 @@
-{"batchcode": "FD0349", "histograms": [{"batchcodes": ["FD0349"], "histogram": {"Body temperature": 39, "Blood pressure measurement": 22, "Heart rate": 16, "Oxygen saturation": 15, "Feeling abnormal": 12, "Dyspnoea": 8, "Hypoaesthesia": 8, "Blood pressure decreased": 7, "Nausea": 7, "Presyncope": 7, "Anaphylactic reaction": 6, "Headache": 6, "Pyrexia": 6, "Blood pressure increased": 5, "Dizziness": 5, "Erythema": 5, "Abdominal pain": 4, "Anaphylactic shock": 4, "Loss of consciousness": 4, "Malaise": 4, "Pallor": 4, "Pruritus": 4, "Heart rate increased": 3, "Muscular weakness": 3, "Neuropathy peripheral": 3, "Palpitations": 3, "Rash": 3, "Tachycardia": 3, "Arthralgia": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Cough": 2, "Diarrhoea": 2, "Disease recurrence": 2, "Dysphonia": 2, "Endoscopy upper gastrointestinal tract": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "Magnetic resonance imaging": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation decreased": 2, "Pain in extremity": 2, "Physical deconditioning": 2, "Physical examination": 2, "Syncope": 2, "Throat irritation": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Anaemia": 1, "Anti-thyroid antibody": 1, "Aphonia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arthritis": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoantibody test": 1, "Back pain": 1, "Basedow's disease": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood culture": 1, "Blood gases": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiogenic shock": 1, "Circulatory collapse": 1, "Coma scale": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Convulsions local": 1, "Death": 1, "Drug eruption": 1, "Dyspepsia": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Extremity contracture": 1, "Eye pruritus": 1, "Fall": 1, "Fatigue": 1, "Feeling cold": 1, "Fibromyalgia": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemophagocytic lymphohistiocytosis": 1, "Head injury": 1, "Heart rate decreased": 1, "Henoch-Schonlein purpura": 1, "Hernia": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Injected limb mobility decreased": 1, "Interleukin-2 receptor assay": 1, "Interleukin-2 receptor increased": 1, "Lumbar puncture": 1, "Magnetic resonance imaging abdominal": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Nerve conduction studies": 1, "Nervousness": 1, "Night sweats": 1, "Ocular hyperaemia": 1, "Osteomyelitis": 1, "PCO2 decreased": 1, "Pain": 1, "Panic attack": 1, "Panniculitis": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Rales": 1, "Respiratory alkalosis": 1, "Respiratory rate increased": 1, "Retinitis": 1, "Sacroiliitis": 1, "Scratch": 1, "Sepsis": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Stress": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tension": 1, "Thrombosis": 1, "Thyroid hormones test": 1, "Thyroid stimulating immunoglobulin": 1, "Thyrotoxic crisis": 1, "Thyroxine free": 1, "Toothache": 1, "Tracheal stenosis": 1, "Tremor": 1, "Tri-iodothyronine free": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "Vertigo positional": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Weight": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0349", "histograms": [{"histogram": {"Body temperature": 39, "Blood pressure measurement": 22, "Heart rate": 16, "Oxygen saturation": 15, "Feeling abnormal": 12, "Dyspnoea": 8, "Hypoaesthesia": 8, "Blood pressure decreased": 7, "Nausea": 7, "Presyncope": 7, "Anaphylactic reaction": 6, "Headache": 6, "Pyrexia": 6, "Blood pressure increased": 5, "Dizziness": 5, "Erythema": 5, "Abdominal pain": 4, "Anaphylactic shock": 4, "Loss of consciousness": 4, "Malaise": 4, "Pallor": 4, "Pruritus": 4, "Heart rate increased": 3, "Muscular weakness": 3, "Neuropathy peripheral": 3, "Palpitations": 3, "Rash": 3, "Tachycardia": 3, "Arthralgia": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Cough": 2, "Diarrhoea": 2, "Disease recurrence": 2, "Dysphonia": 2, "Endoscopy upper gastrointestinal tract": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "Magnetic resonance imaging": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation decreased": 2, "Pain in extremity": 2, "Physical deconditioning": 2, "Physical examination": 2, "Syncope": 2, "Throat irritation": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Anaemia": 1, "Anti-thyroid antibody": 1, "Aphonia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arthritis": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoantibody test": 1, "Back pain": 1, "Basedow's disease": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood culture": 1, "Blood gases": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiogenic shock": 1, "Circulatory collapse": 1, "Coma scale": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Convulsions local": 1, "Death": 1, "Drug eruption": 1, "Dyspepsia": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Extremity contracture": 1, "Eye pruritus": 1, "Fall": 1, "Fatigue": 1, "Feeling cold": 1, "Fibromyalgia": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemophagocytic lymphohistiocytosis": 1, "Head injury": 1, "Heart rate decreased": 1, "Henoch-Schonlein purpura": 1, "Hernia": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Injected limb mobility decreased": 1, "Interleukin-2 receptor assay": 1, "Interleukin-2 receptor increased": 1, "Lumbar puncture": 1, "Magnetic resonance imaging abdominal": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Nerve conduction studies": 1, "Nervousness": 1, "Night sweats": 1, "Ocular hyperaemia": 1, "Osteomyelitis": 1, "PCO2 decreased": 1, "Pain": 1, "Panic attack": 1, "Panniculitis": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Rales": 1, "Respiratory alkalosis": 1, "Respiratory rate increased": 1, "Retinitis": 1, "Sacroiliitis": 1, "Scratch": 1, "Sepsis": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Stress": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tension": 1, "Thrombosis": 1, "Thyroid hormones test": 1, "Thyroid stimulating immunoglobulin": 1, "Thyrotoxic crisis": 1, "Thyroxine free": 1, "Toothache": 1, "Tracheal stenosis": 1, "Tremor": 1, "Tri-iodothyronine free": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1, "Vasculitis": 1, "Ventricular tachycardia": 1, "Vertigo positional": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Weight": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1}, "batchcodes": ["FD0349"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FD0889.json b/docs/data/histograms/Japan/FD0889.json
index 28930ee549d..7d8be56b54e 100644
--- a/docs/data/histograms/Japan/FD0889.json
+++ b/docs/data/histograms/Japan/FD0889.json
@@ -1 +1 @@
-{"batchcode": "FD0889", "histograms": [{"batchcodes": ["FD0889"], "histogram": {"Body temperature": 100, "Blood pressure measurement": 48, "Oxygen saturation": 40, "Heart rate": 32, "Anaphylactic reaction": 31, "Blood pressure increased": 17, "Dyspnoea": 16, "Hypoaesthesia": 14, "Pyrexia": 14, "Blood pressure decreased": 12, "Erythema": 12, "Malaise": 12, "Feeling abnormal": 11, "Pruritus": 11, "Dizziness": 10, "Nausea": 10, "Presyncope": 9, "Cold sweat": 8, "Headache": 8, "Oxygen saturation decreased": 8, "C-reactive protein": 7, "Depressed level of consciousness": 7, "Hyperhidrosis": 7, "Loss of consciousness": 7, "Pain": 7, "Rash": 7, "Vaccination site pain": 7, "Vomiting": 7, "Cardiac failure": 6, "Cerebral infarction": 6, "Chest discomfort": 6, "Computerised tomogram": 6, "Cough": 6, "Decreased appetite": 6, "Fall": 6, "Heart rate increased": 6, "Oropharyngeal discomfort": 6, "Palpitations": 6, "Seizure": 6, "Urticaria": 6, "White blood cell count": 6, "Anaphylactic shock": 5, "Arthralgia": 5, "Asthenia": 5, "Diarrhoea": 5, "Investigation": 5, "Magnetic resonance imaging": 5, "SARS-CoV-2 test": 5, "Altered state of consciousness": 4, "Arthritis": 4, "Asthma": 4, "Back pain": 4, "C-reactive protein increased": 4, "Cardiac arrest": 4, "Dysphoria": 4, "Gait disturbance": 4, "Guillain-Barre syndrome": 4, "Heart rate decreased": 4, "Hypersensitivity": 4, "Movement disorder": 4, "Myocarditis": 4, "Neuropathy peripheral": 4, "Pain in extremity": 4, "Pallor": 4, "Tremor": 4, "White blood cell count increased": 4, "Arrhythmia": 3, "Blood test": 3, "Chest X-ray": 3, "Coma scale": 3, "Condition aggravated": 3, "Electrocardiogram": 3, "Feeding disorder": 3, "Feeling hot": 3, "Haemorrhage subcutaneous": 3, "Hot flush": 3, "Hypertension": 3, "Magnetic resonance imaging head": 3, "Musculoskeletal stiffness": 3, "Peripheral swelling": 3, "Physical deconditioning": 3, "Platelet count": 3, "Vaccination site erythema": 3, "Vital signs measurement": 3, "Wheezing": 3, "Acute disseminated encephalomyelitis": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "Blood pressure systolic decreased": 2, "COVID-19": 2, "Cardio-respiratory arrest": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Dehydration": 2, "Dysphagia": 2, "Dysphonia": 2, "Dysstasia": 2, "Echocardiogram": 2, "Flushing": 2, "Hyperventilation": 2, "Hypophagia": 2, "Insomnia": 2, "Internal haemorrhage": 2, "Joint range of motion decreased": 2, "Joint swelling": 2, "Motor dysfunction": 2, "Muscular weakness": 2, "Myalgia": 2, "Oedema": 2, "Paralysis": 2, "Platelet count decreased": 2, "Pulmonary embolism": 2, "Rash erythematous": 2, "Respiratory rate": 2, "Rhabdomyolysis": 2, "Sensory disturbance": 2, "Somnolence": 2, "Subcutaneous haematoma": 2, "Tension": 2, "Throat irritation": 2, "Vaccination failure": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Vasculitis": 2, "Vasospasm": 2, "Abdominal discomfort": 1, "Abscess limb": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Aldolase": 1, "Anaemia": 1, "Angiocardiogram": 1, "Anxiety": 1, "Aphonia": 1, "Apnoea": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Aspiration": 1, "Atrioventricular block": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Basophil percentage": 1, "Biopsy": 1, "Biopsy bone marrow": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase increased": 1, "Blood potassium": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood urea": 1, "Blood uric acid": 1, "Bradycardia": 1, "Bradykinesia": 1, "Bursitis": 1, "CSF glucose normal": 1, "CSF lymphocyte count abnormal": 1, "CSF protein increased": 1, "Cardiac death": 1, "Cardiac function test": 1, "Cardiomyopathy": 1, "Cerebellar infarction": 1, "Chest pain": 1, "Chills": 1, "Chondrocalcinosis pyrophosphate": 1, "Colitis": 1, "Computerised tomogram coronary artery": 1, "Contusion": 1, "Death": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diabetes mellitus": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug eruption": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyslalia": 1, "Ejection fraction": 1, "Electrocardiogram change": 1, "Enteritis": 1, "Enterocolitis": 1, "Eosinophil percentage": 1, "Erythema multiforme": 1, "Extrasystoles": 1, "Faeces soft": 1, "Fat tissue increased": 1, "Feeling cold": 1, "Foaming at mouth": 1, "Fractional exhaled nitric oxide": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate normal": 1, "Heat exhaustion": 1, "Hemianaesthesia": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hemiplegic migraine": 1, "Histology": 1, "Hypercalcaemia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hyponatraemia": 1, "Hyporesponsive to stimuli": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Ileus paralytic": 1, "Imaging procedure": 1, "Immobile": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Injection site atrophy": 1, "Injection site indentation": 1, "Intermenstrual bleeding": 1, "Keloid scar": 1, "Larynx irritation": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lipoatrophy": 1, "Loose tooth": 1, "Lymphocyte count decreased": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphoma": 1, "Malignant ascites": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Metamyelocyte percentage": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Multiple organ dysfunction syndrome": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Myasthenia gravis": 1, "Myasthenia gravis crisis": 1, "Myocardial necrosis": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Myoglobin blood": 1, "Nasal congestion": 1, "Nervousness": 1, "Neuralgia": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Night sweats": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Orthopnoea": 1, "Oxygen saturation abnormal": 1, "PO2": 1, "Palmar erythema": 1, "Pancreatitis": 1, "Papule": 1, "Paresis": 1, "Periarthritis": 1, "Pericarditis": 1, "Peritonitis": 1, "Pharyngeal oedema": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Protein total": 1, "Pulmonary artery thrombosis": 1, "Pulmonary fibrosis": 1, "Pulmonary thrombosis": 1, "Quadriparesis": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "Respiratory depression": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Scan myocardial perfusion": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Shock symptom": 1, "Shoulder injury related to vaccine administration": 1, "Skin disorder": 1, "Skin indentation": 1, "Skull fractured base": 1, "Sleep disorder": 1, "Soft tissue disorder": 1, "Speech disorder": 1, "Sputum retention": 1, "Stiff leg syndrome": 1, "Stress cardiomyopathy": 1, "Subarachnoid haemorrhage": 1, "Subcutaneous emphysema": 1, "Sudden cardiac death": 1, "Syncope": 1, "Tachycardia": 1, "Tachypnoea": 1, "Tenderness": 1, "Tetany": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tooth socket haemorrhage": 1, "Tracheal obstruction": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Troponin T": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Venous thrombosis": 1, "Venous thrombosis limb": 1, "Ventricular arrhythmia": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vertigo": 1, "Vestibular neuronitis": 1, "Viral infection": 1, "Vision blurred": 1, "X-ray": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0889", "histograms": [{"histogram": {"Body temperature": 100, "Blood pressure measurement": 48, "Oxygen saturation": 40, "Heart rate": 32, "Anaphylactic reaction": 31, "Blood pressure increased": 17, "Dyspnoea": 16, "Hypoaesthesia": 14, "Pyrexia": 14, "Blood pressure decreased": 12, "Erythema": 12, "Malaise": 12, "Feeling abnormal": 11, "Pruritus": 11, "Dizziness": 10, "Nausea": 10, "Presyncope": 9, "Cold sweat": 8, "Headache": 8, "Oxygen saturation decreased": 8, "C-reactive protein": 7, "Depressed level of consciousness": 7, "Hyperhidrosis": 7, "Loss of consciousness": 7, "Pain": 7, "Rash": 7, "Vaccination site pain": 7, "Vomiting": 7, "Cardiac failure": 6, "Cerebral infarction": 6, "Chest discomfort": 6, "Computerised tomogram": 6, "Cough": 6, "Decreased appetite": 6, "Fall": 6, "Heart rate increased": 6, "Oropharyngeal discomfort": 6, "Palpitations": 6, "Seizure": 6, "Urticaria": 6, "White blood cell count": 6, "Anaphylactic shock": 5, "Arthralgia": 5, "Asthenia": 5, "Diarrhoea": 5, "Investigation": 5, "Magnetic resonance imaging": 5, "SARS-CoV-2 test": 5, "Altered state of consciousness": 4, "Arthritis": 4, "Asthma": 4, "Back pain": 4, "C-reactive protein increased": 4, "Cardiac arrest": 4, "Dysphoria": 4, "Gait disturbance": 4, "Guillain-Barre syndrome": 4, "Heart rate decreased": 4, "Hypersensitivity": 4, "Movement disorder": 4, "Myocarditis": 4, "Neuropathy peripheral": 4, "Pain in extremity": 4, "Pallor": 4, "Tremor": 4, "White blood cell count increased": 4, "Arrhythmia": 3, "Blood test": 3, "Chest X-ray": 3, "Coma scale": 3, "Condition aggravated": 3, "Electrocardiogram": 3, "Feeding disorder": 3, "Feeling hot": 3, "Haemorrhage subcutaneous": 3, "Hot flush": 3, "Hypertension": 3, "Magnetic resonance imaging head": 3, "Musculoskeletal stiffness": 3, "Peripheral swelling": 3, "Physical deconditioning": 3, "Platelet count": 3, "Vaccination site erythema": 3, "Vital signs measurement": 3, "Wheezing": 3, "Acute disseminated encephalomyelitis": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "Blood pressure systolic decreased": 2, "COVID-19": 2, "Cardio-respiratory arrest": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Dehydration": 2, "Dysphagia": 2, "Dysphonia": 2, "Dysstasia": 2, "Echocardiogram": 2, "Flushing": 2, "Hyperventilation": 2, "Hypophagia": 2, "Insomnia": 2, "Internal haemorrhage": 2, "Joint range of motion decreased": 2, "Joint swelling": 2, "Motor dysfunction": 2, "Muscular weakness": 2, "Myalgia": 2, "Oedema": 2, "Paralysis": 2, "Platelet count decreased": 2, "Pulmonary embolism": 2, "Rash erythematous": 2, "Respiratory rate": 2, "Rhabdomyolysis": 2, "Sensory disturbance": 2, "Somnolence": 2, "Subcutaneous haematoma": 2, "Tension": 2, "Throat irritation": 2, "Vaccination failure": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Vasculitis": 2, "Vasospasm": 2, "Abdominal discomfort": 1, "Abscess limb": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Aldolase": 1, "Anaemia": 1, "Angiocardiogram": 1, "Anxiety": 1, "Aphonia": 1, "Apnoea": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Aspiration": 1, "Atrioventricular block": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Basophil percentage": 1, "Biopsy": 1, "Biopsy bone marrow": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase increased": 1, "Blood potassium": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood urea": 1, "Blood uric acid": 1, "Bradycardia": 1, "Bradykinesia": 1, "Bursitis": 1, "CSF glucose normal": 1, "CSF lymphocyte count abnormal": 1, "CSF protein increased": 1, "Cardiac death": 1, "Cardiac function test": 1, "Cardiomyopathy": 1, "Cerebellar infarction": 1, "Chest pain": 1, "Chills": 1, "Chondrocalcinosis pyrophosphate": 1, "Colitis": 1, "Computerised tomogram coronary artery": 1, "Contusion": 1, "Death": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diabetes mellitus": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug eruption": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyslalia": 1, "Ejection fraction": 1, "Electrocardiogram change": 1, "Enteritis": 1, "Enterocolitis": 1, "Eosinophil percentage": 1, "Erythema multiforme": 1, "Extrasystoles": 1, "Faeces soft": 1, "Fat tissue increased": 1, "Feeling cold": 1, "Foaming at mouth": 1, "Fractional exhaled nitric oxide": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate normal": 1, "Heat exhaustion": 1, "Hemianaesthesia": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hemiplegic migraine": 1, "Histology": 1, "Hypercalcaemia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hyponatraemia": 1, "Hyporesponsive to stimuli": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Ileus paralytic": 1, "Imaging procedure": 1, "Immobile": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Injection site atrophy": 1, "Injection site indentation": 1, "Intermenstrual bleeding": 1, "Keloid scar": 1, "Larynx irritation": 1, "Limb discomfort": 1, "Lip swelling": 1, "Lipoatrophy": 1, "Loose tooth": 1, "Lymphocyte count decreased": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphoma": 1, "Malignant ascites": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Metamyelocyte percentage": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Multiple organ dysfunction syndrome": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Myasthenia gravis": 1, "Myasthenia gravis crisis": 1, "Myocardial necrosis": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Myoglobin blood": 1, "Nasal congestion": 1, "Nervousness": 1, "Neuralgia": 1, "Neutrophil count increased": 1, "Neutrophil percentage": 1, "Night sweats": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Orthopnoea": 1, "Oxygen saturation abnormal": 1, "PO2": 1, "Palmar erythema": 1, "Pancreatitis": 1, "Papule": 1, "Paresis": 1, "Periarthritis": 1, "Pericarditis": 1, "Peritonitis": 1, "Pharyngeal oedema": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Protein total": 1, "Pulmonary artery thrombosis": 1, "Pulmonary fibrosis": 1, "Pulmonary thrombosis": 1, "Quadriparesis": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "Respiratory depression": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Scan myocardial perfusion": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Shock symptom": 1, "Shoulder injury related to vaccine administration": 1, "Skin disorder": 1, "Skin indentation": 1, "Skull fractured base": 1, "Sleep disorder": 1, "Soft tissue disorder": 1, "Speech disorder": 1, "Sputum retention": 1, "Stiff leg syndrome": 1, "Stress cardiomyopathy": 1, "Subarachnoid haemorrhage": 1, "Subcutaneous emphysema": 1, "Sudden cardiac death": 1, "Syncope": 1, "Tachycardia": 1, "Tachypnoea": 1, "Tenderness": 1, "Tetany": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tooth socket haemorrhage": 1, "Tracheal obstruction": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Troponin T": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Venous thrombosis": 1, "Venous thrombosis limb": 1, "Ventricular arrhythmia": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vertigo": 1, "Vestibular neuronitis": 1, "Viral infection": 1, "Vision blurred": 1, "X-ray": 1, "Yawning": 1}, "batchcodes": ["FD0889"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FD1945.json b/docs/data/histograms/Japan/FD1945.json
index 6a25861213b..89dae868ffd 100644
--- a/docs/data/histograms/Japan/FD1945.json
+++ b/docs/data/histograms/Japan/FD1945.json
@@ -1 +1 @@
-{"batchcode": "FD1945", "histograms": [{"batchcodes": ["FD1945"], "histogram": {"Body temperature": 49, "Blood pressure measurement": 20, "Oxygen saturation": 18, "Pyrexia": 14, "Dyspnoea": 13, "Heart rate": 11, "Anaphylactic reaction": 10, "Dizziness": 10, "Feeling abnormal": 7, "Loss of consciousness": 7, "Nausea": 7, "Palpitations": 7, "Blood pressure decreased": 6, "Headache": 6, "Hypoaesthesia": 6, "Presyncope": 6, "Blood pressure increased": 5, "Blood test": 5, "Malaise": 5, "Pruritus": 5, "Cerebral infarction": 4, "Depressed level of consciousness": 4, "Electrocardiogram": 4, "Gait disturbance": 4, "Heart rate increased": 4, "Investigation": 4, "Myocarditis": 4, "Neuropathy peripheral": 4, "Tremor": 4, "Altered state of consciousness": 3, "Arthralgia": 3, "Asthma": 3, "Blood glucose": 3, "C-reactive protein": 3, "Cardio-respiratory arrest": 3, "Chest pain": 3, "Computerised tomogram": 3, "Cough": 3, "Death": 3, "Echocardiogram": 3, "Glycosylated haemoglobin": 3, "Hyperhidrosis": 3, "Magnetic resonance imaging": 3, "Muscular weakness": 3, "Oropharyngeal discomfort": 3, "Pain": 3, "Pain in extremity": 3, "Pallor": 3, "Pulmonary embolism": 3, "Respiratory disorder": 3, "Swelling face": 3, "Urticaria": 3, "Wheezing": 3, "White blood cell count": 3, "Angiogram": 2, "Aspartate aminotransferase": 2, "Auscultation": 2, "Blood creatine phosphokinase": 2, "Bronchospasm": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Electrocardiogram abnormal": 2, "Feeling hot": 2, "Gamma-glutamyltransferase": 2, "Haematuria": 2, "Heart sounds": 2, "Heat illness": 2, "Myalgia": 2, "Oxygen saturation decreased": 2, "Paraesthesia": 2, "Paralysis": 2, "Physical deconditioning": 2, "Proteinuria": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Somnolence": 2, "Tachycardia": 2, "Throat tightness": 2, "Troponin I": 2, "Vaccination site pain": 2, "Ventricular fibrillation": 2, "Vomiting": 2, "Abdominal distension": 1, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Alopecia": 1, "Alopecia areata": 1, "Amylase": 1, "Anaemia": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody increased": 1, "Arrhythmia": 1, "Aspiration bone marrow": 1, "Asterixis": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Atrioventricular block complete": 1, "Back pain": 1, "Balance disorder": 1, "Basedow's disease": 1, "Bilirubin conjugated": 1, "Biopsy heart": 1, "Biopsy kidney": 1, "Biopsy skin": 1, "Blood aldosterone": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose increased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood zinc": 1, "Blood zinc decreased": 1, "Body temperature increased": 1, "Bradycardia": 1, "Bradykinesia": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Breath sounds": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF myelin basic protein": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac failure": 1, "Cardiac index": 1, "Cardiac output": 1, "Catheter placement": 1, "Cerebral haemorrhage": 1, "Cerebral ischaemia": 1, "Cerebral venous sinus thrombosis": 1, "Chills": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Constipation": 1, "Coronary artery disease": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Diarrhoea": 1, "Disseminated intravascular coagulation": 1, "Dysarthria": 1, "Dyslipidaemia": 1, "Dysphonia": 1, "Dysphoria": 1, "Dyspnoea at rest": 1, "Dysuria": 1, "Epilepsy": 1, "Erythema": 1, "Erythema of eyelid": 1, "Extensor plantar response": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fall": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Foaming at mouth": 1, "Gastrointestinal oedema": 1, "Genital haemorrhage": 1, "Guillain-Barre syndrome": 1, "Haemorrhage subcutaneous": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Hemiparesis": 1, "Hepatic failure": 1, "Hot flush": 1, "Hypercapnia": 1, "Hypercholesterolaemia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoacusis": 1, "IgA nephropathy": 1, "Immune thrombocytopenia": 1, "Insomnia": 1, "Intention tremor": 1, "Intestinal ischaemia": 1, "Jaundice": 1, "Laboratory test": 1, "Limb injury": 1, "Lipids": 1, "Macroamylasaemia": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Memory impairment": 1, "Microscopic polyangiitis": 1, "Monoparesis": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Myocardial infarction": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Neutropenia": 1, "Panic attack": 1, "Paresis": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Pharyngeal hypoaesthesia": 1, "Platelet count": 1, "Pleural effusion": 1, "Product administered at inappropriate site": 1, "Protein urine": 1, "Pulmonary hypertension": 1, "Pulse absent": 1, "Purpura": 1, "Purulence": 1, "Radial nerve palsy": 1, "Red blood cell count": 1, "Red blood cells urine positive": 1, "Renal cancer": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Right atrial enlargement": 1, "Right ventricular enlargement": 1, "Right ventricular hypertrophy": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Skin disorder": 1, "Slow response to stimuli": 1, "Sneezing": 1, "Stertor": 1, "Stomach scan": 1, "Stridor": 1, "Suspected COVID-19": 1, "Swelling": 1, "Tachypnoea": 1, "Tension": 1, "Thirst": 1, "Thrombosis": 1, "Urinary incontinence": 1, "Urine flow decreased": 1, "Vasculitis": 1, "Vision blurred": 1, "Visual field defect": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight decreased": 1, "White blood cell count increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FD1945", "histograms": [{"histogram": {"Body temperature": 49, "Blood pressure measurement": 20, "Oxygen saturation": 18, "Pyrexia": 14, "Dyspnoea": 13, "Heart rate": 11, "Anaphylactic reaction": 10, "Dizziness": 10, "Feeling abnormal": 7, "Loss of consciousness": 7, "Nausea": 7, "Palpitations": 7, "Blood pressure decreased": 6, "Headache": 6, "Hypoaesthesia": 6, "Presyncope": 6, "Blood pressure increased": 5, "Blood test": 5, "Malaise": 5, "Pruritus": 5, "Cerebral infarction": 4, "Depressed level of consciousness": 4, "Electrocardiogram": 4, "Gait disturbance": 4, "Heart rate increased": 4, "Investigation": 4, "Myocarditis": 4, "Neuropathy peripheral": 4, "Tremor": 4, "Altered state of consciousness": 3, "Arthralgia": 3, "Asthma": 3, "Blood glucose": 3, "C-reactive protein": 3, "Cardio-respiratory arrest": 3, "Chest pain": 3, "Computerised tomogram": 3, "Cough": 3, "Death": 3, "Echocardiogram": 3, "Glycosylated haemoglobin": 3, "Hyperhidrosis": 3, "Magnetic resonance imaging": 3, "Muscular weakness": 3, "Oropharyngeal discomfort": 3, "Pain": 3, "Pain in extremity": 3, "Pallor": 3, "Pulmonary embolism": 3, "Respiratory disorder": 3, "Swelling face": 3, "Urticaria": 3, "Wheezing": 3, "White blood cell count": 3, "Angiogram": 2, "Aspartate aminotransferase": 2, "Auscultation": 2, "Blood creatine phosphokinase": 2, "Bronchospasm": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Electrocardiogram abnormal": 2, "Feeling hot": 2, "Gamma-glutamyltransferase": 2, "Haematuria": 2, "Heart sounds": 2, "Heat illness": 2, "Myalgia": 2, "Oxygen saturation decreased": 2, "Paraesthesia": 2, "Paralysis": 2, "Physical deconditioning": 2, "Proteinuria": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Somnolence": 2, "Tachycardia": 2, "Throat tightness": 2, "Troponin I": 2, "Vaccination site pain": 2, "Ventricular fibrillation": 2, "Vomiting": 2, "Abdominal distension": 1, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Alopecia": 1, "Alopecia areata": 1, "Amylase": 1, "Anaemia": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody increased": 1, "Arrhythmia": 1, "Aspiration bone marrow": 1, "Asterixis": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Atrioventricular block complete": 1, "Back pain": 1, "Balance disorder": 1, "Basedow's disease": 1, "Bilirubin conjugated": 1, "Biopsy heart": 1, "Biopsy kidney": 1, "Biopsy skin": 1, "Blood aldosterone": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose increased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic increased": 1, "Blood zinc": 1, "Blood zinc decreased": 1, "Body temperature increased": 1, "Bradycardia": 1, "Bradykinesia": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Breath sounds": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF myelin basic protein": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac failure": 1, "Cardiac index": 1, "Cardiac output": 1, "Catheter placement": 1, "Cerebral haemorrhage": 1, "Cerebral ischaemia": 1, "Cerebral venous sinus thrombosis": 1, "Chills": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Coma scale": 1, "Computerised tomogram thorax": 1, "Constipation": 1, "Coronary artery disease": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Diarrhoea": 1, "Disseminated intravascular coagulation": 1, "Dysarthria": 1, "Dyslipidaemia": 1, "Dysphonia": 1, "Dysphoria": 1, "Dyspnoea at rest": 1, "Dysuria": 1, "Epilepsy": 1, "Erythema": 1, "Erythema of eyelid": 1, "Extensor plantar response": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fall": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Foaming at mouth": 1, "Gastrointestinal oedema": 1, "Genital haemorrhage": 1, "Guillain-Barre syndrome": 1, "Haemorrhage subcutaneous": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Hemiparesis": 1, "Hepatic failure": 1, "Hot flush": 1, "Hypercapnia": 1, "Hypercholesterolaemia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoacusis": 1, "IgA nephropathy": 1, "Immune thrombocytopenia": 1, "Insomnia": 1, "Intention tremor": 1, "Intestinal ischaemia": 1, "Jaundice": 1, "Laboratory test": 1, "Limb injury": 1, "Lipids": 1, "Macroamylasaemia": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Memory impairment": 1, "Microscopic polyangiitis": 1, "Monoparesis": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Myocardial infarction": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Neutropenia": 1, "Panic attack": 1, "Paresis": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Pharyngeal hypoaesthesia": 1, "Platelet count": 1, "Pleural effusion": 1, "Product administered at inappropriate site": 1, "Protein urine": 1, "Pulmonary hypertension": 1, "Pulse absent": 1, "Purpura": 1, "Purulence": 1, "Radial nerve palsy": 1, "Red blood cell count": 1, "Red blood cells urine positive": 1, "Renal cancer": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Right atrial enlargement": 1, "Right ventricular enlargement": 1, "Right ventricular hypertrophy": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Skin disorder": 1, "Slow response to stimuli": 1, "Sneezing": 1, "Stertor": 1, "Stomach scan": 1, "Stridor": 1, "Suspected COVID-19": 1, "Swelling": 1, "Tachypnoea": 1, "Tension": 1, "Thirst": 1, "Thrombosis": 1, "Urinary incontinence": 1, "Urine flow decreased": 1, "Vasculitis": 1, "Vision blurred": 1, "Visual field defect": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight decreased": 1, "White blood cell count increased": 1, "X-ray": 1}, "batchcodes": ["FD1945"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FE8126.json b/docs/data/histograms/Japan/FE8126.json
index f7ed6e1da0d..135d39c43b0 100644
--- a/docs/data/histograms/Japan/FE8126.json
+++ b/docs/data/histograms/Japan/FE8126.json
@@ -1 +1 @@
-{"batchcode": "FE8126", "histograms": [{"batchcodes": ["FE8126"], "histogram": {"Body temperature": 1, "Dyskinesia": 1, "Hypoaesthesia": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sensory disturbance": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8126", "histograms": [{"histogram": {"Body temperature": 1, "Dyskinesia": 1, "Hypoaesthesia": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sensory disturbance": 1}, "batchcodes": ["FE8126"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FE8162.json b/docs/data/histograms/Japan/FE8162.json
index 4a9d7006c95..e657b7a0981 100644
--- a/docs/data/histograms/Japan/FE8162.json
+++ b/docs/data/histograms/Japan/FE8162.json
@@ -1 +1 @@
-{"batchcode": "FE8162", "histograms": [{"batchcodes": ["FE8162"], "histogram": {"Body temperature": 93, "Blood pressure measurement": 49, "Oxygen saturation": 44, "Heart rate": 34, "Anaphylactic reaction": 30, "Nausea": 20, "Dyspnoea": 19, "Presyncope": 16, "Blood pressure decreased": 14, "Feeling abnormal": 14, "Hypoaesthesia": 14, "Loss of consciousness": 14, "Pruritus": 13, "Malaise": 12, "Pyrexia": 12, "Vomiting": 12, "Fall": 11, "Rash": 10, "Chest pain": 9, "Blood pressure increased": 8, "Erythema": 8, "Headache": 8, "Hypersensitivity": 8, "Blood test": 7, "Depressed level of consciousness": 7, "Dizziness": 7, "Investigation": 7, "Magnetic resonance imaging": 7, "Pallor": 7, "Computerised tomogram": 6, "Cough": 6, "Electrocardiogram": 6, "Heart rate decreased": 6, "Magnetic resonance imaging head": 6, "Oropharyngeal discomfort": 6, "Vital signs measurement": 6, "Cold sweat": 5, "Coma scale": 5, "Oxygen saturation decreased": 5, "Palpitations": 5, "Anaphylactic shock": 4, "Arthralgia": 4, "Asthenia": 4, "Condition aggravated": 4, "Facial paralysis": 4, "Guillain-Barre syndrome": 4, "Hyperhidrosis": 4, "Hypoaesthesia oral": 4, "Paraesthesia": 4, "SARS-CoV-2 test": 4, "Seizure": 4, "Syncope": 4, "Vaccination site pain": 4, "Wheezing": 4, "Blood creatine phosphokinase increased": 3, "Bradycardia": 3, "CSF test": 3, "Chills": 3, "Diarrhoea": 3, "Dysphoria": 3, "Eyelid oedema": 3, "Feeling hot": 3, "Heart rate increased": 3, "Hyperventilation": 3, "Movement disorder": 3, "Muscular weakness": 3, "Neuropathy peripheral": 3, "Pain": 3, "Tachypnoea": 3, "Throat irritation": 3, "Urticaria": 3, "White blood cell count": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Arrhythmia": 2, "Biopsy skin": 2, "Blood creatine phosphokinase": 2, "Body temperature decreased": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Decreased appetite": 2, "Demyelination": 2, "Depression": 2, "Dysgeusia": 2, "Dyslalia": 2, "Dysphonia": 2, "Electrocardiogram ambulatory": 2, "Electroencephalogram": 2, "Endoscopy": 2, "Epilepsy": 2, "Gastrointestinal disorder": 2, "Herpes zoster": 2, "Joint range of motion decreased": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Myalgia": 2, "Myocarditis": 2, "Oral discomfort": 2, "Orthostatic intolerance": 2, "Pain in extremity": 2, "Pericarditis": 2, "Peripheral nerve paresis": 2, "Physical deconditioning": 2, "Postictal paralysis": 2, "Pulse abnormal": 2, "Quadriplegia": 2, "Respiratory distress": 2, "Respiratory rate": 2, "Respiratory symptom": 2, "Rheumatoid arthritis": 2, "Tachycardia": 2, "Tongue movement disturbance": 2, "Toxic skin eruption": 2, "Tremor": 2, "Troponin": 2, "Ultrasound abdomen": 2, "Abdominal pain lower": 1, "Abnormal sensation in eye": 1, "Acoustic stimulation tests": 1, "Acute disseminated encephalomyelitis": 1, "Alopecia totalis": 1, "Anaemia": 1, "Anaphylactoid reaction": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-aquaporin-4 antibody": 1, "Anti-aquaporin-4 antibody positive": 1, "Antibody test": 1, "Areflexia": 1, "Arthritis": 1, "Arthritis reactive": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Auscultation": 1, "Axillary pain": 1, "Bilirubin conjugated": 1, "Blood bilirubin": 1, "Blood electrolytes": 1, "Blood glucose increased": 1, "Blood lactic acid": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood test abnormal": 1, "Brain death": 1, "Brain stem syndrome": 1, "Bundle branch block right": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac failure congestive": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebellar infarction": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Cholecystitis acute": 1, "Chronic fatigue syndrome": 1, "Circumoral swelling": 1, "Clonic convulsion": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram head normal": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Conversion disorder": 1, "Coronary artery stenosis": 1, "Cranial nerve disorder": 1, "Deafness": 1, "Death": 1, "Dehydration": 1, "Diagnostic procedure": 1, "Diffusion-weighted brain MRI": 1, "Dissociative disorder": 1, "Drug ineffective": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspraxia": 1, "Echocardiogram": 1, "Echocardiogram normal": 1, "Eczema": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram normal": 1, "Encephalopathy": 1, "Enteritis infectious": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Eye movement disorder": 1, "Facial discomfort": 1, "Faeces soft": 1, "Fatigue": 1, "Gait disturbance": 1, "Glycosylated haemoglobin": 1, "Grunting": 1, "Haematochezia": 1, "Haematuria": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Hemianaesthesia": 1, "Hepatic function abnormal": 1, "Hiccups": 1, "Hypertension": 1, "Hyponatraemia": 1, "Immediate post-injection reaction": 1, "Immunisation": 1, "Inappropriate antidiuretic hormone secretion": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Interstitial lung disease": 1, "Joint contracture": 1, "Lack of spontaneous speech": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lip pruritus": 1, "Localised oedema": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Melaena": 1, "Migraine": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Myocardial ischaemia": 1, "Neck pain": 1, "Nephrocalcinosis": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neurological symptom": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Nyctalgia": 1, "Oculomucocutaneous syndrome": 1, "Oral allergy syndrome": 1, "Painful respiration": 1, "Papule": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Polyarthritis": 1, "Polymyalgia rheumatica": 1, "Polyneuropathy": 1, "Post viral fatigue syndrome": 1, "Productive cough": 1, "Pulmonary oedema": 1, "Pupillary reflex impaired": 1, "Rash macular": 1, "Renal disorder": 1, "Retching": 1, "Retinal artery occlusion": 1, "Retinal oedema": 1, "Schellong test": 1, "Sensory disturbance": 1, "Shock": 1, "Shoulder operation": 1, "Skin reaction": 1, "Somatic symptom disorder": 1, "Stridor": 1, "Sudden death": 1, "Suicide attempt": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Type I hypersensitivity": 1, "Upper airway obstruction": 1, "Urine analysis": 1, "Vaccination complication": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Visual impairment": 1, "Weight decreased": 1, "Wolff-Parkinson-White syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8162", "histograms": [{"histogram": {"Body temperature": 93, "Blood pressure measurement": 49, "Oxygen saturation": 44, "Heart rate": 34, "Anaphylactic reaction": 30, "Nausea": 20, "Dyspnoea": 19, "Presyncope": 16, "Blood pressure decreased": 14, "Feeling abnormal": 14, "Hypoaesthesia": 14, "Loss of consciousness": 14, "Pruritus": 13, "Malaise": 12, "Pyrexia": 12, "Vomiting": 12, "Fall": 11, "Rash": 10, "Chest pain": 9, "Blood pressure increased": 8, "Erythema": 8, "Headache": 8, "Hypersensitivity": 8, "Blood test": 7, "Depressed level of consciousness": 7, "Dizziness": 7, "Investigation": 7, "Magnetic resonance imaging": 7, "Pallor": 7, "Computerised tomogram": 6, "Cough": 6, "Electrocardiogram": 6, "Heart rate decreased": 6, "Magnetic resonance imaging head": 6, "Oropharyngeal discomfort": 6, "Vital signs measurement": 6, "Cold sweat": 5, "Coma scale": 5, "Oxygen saturation decreased": 5, "Palpitations": 5, "Anaphylactic shock": 4, "Arthralgia": 4, "Asthenia": 4, "Condition aggravated": 4, "Facial paralysis": 4, "Guillain-Barre syndrome": 4, "Hyperhidrosis": 4, "Hypoaesthesia oral": 4, "Paraesthesia": 4, "SARS-CoV-2 test": 4, "Seizure": 4, "Syncope": 4, "Vaccination site pain": 4, "Wheezing": 4, "Blood creatine phosphokinase increased": 3, "Bradycardia": 3, "CSF test": 3, "Chills": 3, "Diarrhoea": 3, "Dysphoria": 3, "Eyelid oedema": 3, "Feeling hot": 3, "Heart rate increased": 3, "Hyperventilation": 3, "Movement disorder": 3, "Muscular weakness": 3, "Neuropathy peripheral": 3, "Pain": 3, "Tachypnoea": 3, "Throat irritation": 3, "Urticaria": 3, "White blood cell count": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Arrhythmia": 2, "Biopsy skin": 2, "Blood creatine phosphokinase": 2, "Body temperature decreased": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Decreased appetite": 2, "Demyelination": 2, "Depression": 2, "Dysgeusia": 2, "Dyslalia": 2, "Dysphonia": 2, "Electrocardiogram ambulatory": 2, "Electroencephalogram": 2, "Endoscopy": 2, "Epilepsy": 2, "Gastrointestinal disorder": 2, "Herpes zoster": 2, "Joint range of motion decreased": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Myalgia": 2, "Myocarditis": 2, "Oral discomfort": 2, "Orthostatic intolerance": 2, "Pain in extremity": 2, "Pericarditis": 2, "Peripheral nerve paresis": 2, "Physical deconditioning": 2, "Postictal paralysis": 2, "Pulse abnormal": 2, "Quadriplegia": 2, "Respiratory distress": 2, "Respiratory rate": 2, "Respiratory symptom": 2, "Rheumatoid arthritis": 2, "Tachycardia": 2, "Tongue movement disturbance": 2, "Toxic skin eruption": 2, "Tremor": 2, "Troponin": 2, "Ultrasound abdomen": 2, "Abdominal pain lower": 1, "Abnormal sensation in eye": 1, "Acoustic stimulation tests": 1, "Acute disseminated encephalomyelitis": 1, "Alopecia totalis": 1, "Anaemia": 1, "Anaphylactoid reaction": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-aquaporin-4 antibody": 1, "Anti-aquaporin-4 antibody positive": 1, "Antibody test": 1, "Areflexia": 1, "Arthritis": 1, "Arthritis reactive": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Auscultation": 1, "Axillary pain": 1, "Bilirubin conjugated": 1, "Blood bilirubin": 1, "Blood electrolytes": 1, "Blood glucose increased": 1, "Blood lactic acid": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood test abnormal": 1, "Brain death": 1, "Brain stem syndrome": 1, "Bundle branch block right": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac failure congestive": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebellar infarction": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Cholecystitis acute": 1, "Chronic fatigue syndrome": 1, "Circumoral swelling": 1, "Clonic convulsion": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram head normal": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Conversion disorder": 1, "Coronary artery stenosis": 1, "Cranial nerve disorder": 1, "Deafness": 1, "Death": 1, "Dehydration": 1, "Diagnostic procedure": 1, "Diffusion-weighted brain MRI": 1, "Dissociative disorder": 1, "Drug ineffective": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspraxia": 1, "Echocardiogram": 1, "Echocardiogram normal": 1, "Eczema": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram normal": 1, "Encephalopathy": 1, "Enteritis infectious": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Eye movement disorder": 1, "Facial discomfort": 1, "Faeces soft": 1, "Fatigue": 1, "Gait disturbance": 1, "Glycosylated haemoglobin": 1, "Grunting": 1, "Haematochezia": 1, "Haematuria": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Hemianaesthesia": 1, "Hepatic function abnormal": 1, "Hiccups": 1, "Hypertension": 1, "Hyponatraemia": 1, "Immediate post-injection reaction": 1, "Immunisation": 1, "Inappropriate antidiuretic hormone secretion": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Interstitial lung disease": 1, "Joint contracture": 1, "Lack of spontaneous speech": 1, "Laryngeal obstruction": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lip pruritus": 1, "Localised oedema": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Melaena": 1, "Migraine": 1, "Monoplegia": 1, "Motor dysfunction": 1, "Myocardial ischaemia": 1, "Neck pain": 1, "Nephrocalcinosis": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neurological symptom": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Nyctalgia": 1, "Oculomucocutaneous syndrome": 1, "Oral allergy syndrome": 1, "Painful respiration": 1, "Papule": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Polyarthritis": 1, "Polymyalgia rheumatica": 1, "Polyneuropathy": 1, "Post viral fatigue syndrome": 1, "Productive cough": 1, "Pulmonary oedema": 1, "Pupillary reflex impaired": 1, "Rash macular": 1, "Renal disorder": 1, "Retching": 1, "Retinal artery occlusion": 1, "Retinal oedema": 1, "Schellong test": 1, "Sensory disturbance": 1, "Shock": 1, "Shoulder operation": 1, "Skin reaction": 1, "Somatic symptom disorder": 1, "Stridor": 1, "Sudden death": 1, "Suicide attempt": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Type I hypersensitivity": 1, "Upper airway obstruction": 1, "Urine analysis": 1, "Vaccination complication": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Visual impairment": 1, "Weight decreased": 1, "Wolff-Parkinson-White syndrome": 1}, "batchcodes": ["FE8162"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FE8206.json b/docs/data/histograms/Japan/FE8206.json
index 6b40367b7be..95bab26b7ec 100644
--- a/docs/data/histograms/Japan/FE8206.json
+++ b/docs/data/histograms/Japan/FE8206.json
@@ -1 +1 @@
-{"batchcode": "FE8206", "histograms": [{"batchcodes": ["FE8206"], "histogram": {"Body temperature": 86, "Blood pressure measurement": 46, "Oxygen saturation": 34, "Heart rate": 29, "Feeling abnormal": 21, "Presyncope": 21, "Blood pressure decreased": 19, "Anaphylactic reaction": 16, "Blood pressure increased": 15, "Pyrexia": 15, "Loss of consciousness": 14, "Nausea": 13, "Dyspnoea": 11, "Hypoaesthesia": 11, "Electrocardiogram": 10, "Headache": 10, "Pruritus": 10, "Dizziness": 9, "Erythema": 9, "Fall": 9, "Vomiting": 9, "Blood test": 8, "Cold sweat": 8, "Malaise": 7, "Oropharyngeal discomfort": 7, "Oxygen saturation decreased": 7, "Rash": 7, "Seizure": 7, "Palpitations": 6, "Depressed level of consciousness": 5, "Diarrhoea": 5, "Heart rate decreased": 5, "Magnetic resonance imaging": 5, "Pallor": 5, "Anaphylactic shock": 4, "Chest pain": 4, "Cough": 4, "Hyperhidrosis": 4, "Investigation": 4, "Muscular weakness": 4, "Pain": 4, "SARS-CoV-2 test": 4, "Syncope": 4, "Urticaria": 4, "Vaccination site pain": 4, "Altered state of consciousness": 3, "Anaemia": 3, "Asthenia": 3, "Asthma": 3, "Auscultation": 3, "Blood pressure systolic": 3, "Bradycardia": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Chills": 3, "Choking sensation": 3, "Death": 3, "Decreased appetite": 3, "Haemoglobin": 3, "Hypersensitivity": 3, "Hyperventilation": 3, "Hypoaesthesia oral": 3, "Internal haemorrhage": 3, "Muscle spasms": 3, "Myocarditis": 3, "Pain in extremity": 3, "Red blood cell count": 3, "Vital signs measurement": 3, "Acute disseminated encephalomyelitis": 2, "Anxiety": 2, "Arrhythmia": 2, "Arthralgia": 2, "Back pain": 2, "Blood creatine phosphokinase increased": 2, "Blood lactate dehydrogenase": 2, "Breath sounds": 2, "CSF cell count": 2, "CSF protein": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Coma scale": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Confusional state": 2, "Contusion": 2, "Disturbance in attention": 2, "Dysphoria": 2, "Echocardiogram": 2, "Electrocardiogram ST segment elevation": 2, "Encephalopathy": 2, "Epilepsy": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Heart rate increased": 2, "Hypertension": 2, "Insomnia": 2, "Lymph node pain": 2, "Lymphadenopathy": 2, "Mental impairment": 2, "Myalgia": 2, "Neurological examination": 2, "Paraesthesia": 2, "Physical deconditioning": 2, "Pneumonia aspiration": 2, "Respiratory arrest": 2, "Respiratory rate": 2, "Speech disorder": 2, "Swelling face": 2, "Tachycardia": 2, "Urine analysis": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Visual impairment": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Acute stress disorder": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Amylase": 1, "Amylase increased": 1, "Antibody test": 1, "Antinuclear antibody positive": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asterixis": 1, "Ataxia": 1, "Autoantibody test": 1, "Autoimmune haemolytic anaemia": 1, "Axillary pain": 1, "Bedridden": 1, "Biopsy liver": 1, "Blister": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Brain neoplasm": 1, "Brain stem infarction": 1, "Breast cancer": 1, "Bronchostenosis": 1, "C-reactive protein": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF test": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Cognitive test": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Coombs direct test": 1, "Coombs indirect test": 1, "Cutaneous symptom": 1, "Dehydration": 1, "Dementia Alzheimer's type": 1, "Demyelination": 1, "Diplegia": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Ejection fraction": 1, "Electrocardiogram ST-T change": 1, "Electrocardiogram ambulatory": 1, "Encephalitis": 1, "Endoscopy upper gastrointestinal tract": 1, "Enteral nutrition": 1, "Enterocolitis": 1, "Erythema multiforme": 1, "Executive dysfunction": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fluid intake reduced": 1, "Gait disturbance": 1, "Gait inability": 1, "Gaze palsy": 1, "Genital erythema": 1, "Haemolysis": 1, "Haemolytic anaemia": 1, "Haemorrhage subcutaneous": 1, "Head banging": 1, "Heart sounds": 1, "Heat illness": 1, "Helicobacter infection": 1, "Hemianopia": 1, "Hepatic failure": 1, "Hepatic function abnormal": 1, "Hepatitis": 1, "Hepatitis B e antigen": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis B surface antigen positive": 1, "Herpes zoster": 1, "Hyperpyrexia": 1, "Hypokinesia": 1, "Hypophagia": 1, "Hypotension": 1, "Hypoxia": 1, "Illusion": 1, "Immune system disorder": 1, "Incision site complication": 1, "Inflammation": 1, "Inguinal hernia": 1, "International normalised ratio increased": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Laboratory test": 1, "Lip swelling": 1, "Liver abscess": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Meningism": 1, "Meningitis aseptic": 1, "Mini mental status examination": 1, "Mitral valve incompetence": 1, "Mobility decreased": 1, "Multiple sclerosis": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasopharyngitis": 1, "Neck injury": 1, "Neck pain": 1, "Neoplasm malignant": 1, "Nephrotic syndrome": 1, "Neurologic neglect syndrome": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Osteoarthritis": 1, "Pain of skin": 1, "Paralysis": 1, "Paresis": 1, "Parkinsonian gait": 1, "Periarthritis": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Perseveration": 1, "Pharyngeal erythema": 1, "Pharyngeal oedema": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Pulmonary fibrosis": 1, "Pulse abnormal": 1, "Radial pulse abnormal": 1, "Reaction to excipient": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Retinal vascular disorder": 1, "Rhinorrhoea": 1, "Scintillating scotoma": 1, "Senile dementia": 1, "Sensory disturbance": 1, "Shock": 1, "Shock symptom": 1, "Sinus arrest": 1, "Sinus rhythm": 1, "Sjogren's syndrome": 1, "Skin swelling": 1, "Sluggishness": 1, "Sneezing": 1, "Somatic symptom disorder": 1, "Spinal osteoarthritis": 1, "Status epilepticus": 1, "Subarachnoid haemorrhage": 1, "Suicidal ideation": 1, "Supraventricular extrasystoles": 1, "Tension": 1, "Tetany": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Toxic skin eruption": 1, "Troponin": 1, "Troponin T increased": 1, "Vaccination site cellulitis": 1, "Venous thrombosis": 1, "Ventricular extrasystoles": 1, "Ventricular internal diameter": 1, "Ventricular tachycardia": 1, "Vision blurred": 1, "Vitreous floaters": 1, "Volvulus": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count": 1, "X-ray": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8206", "histograms": [{"histogram": {"Body temperature": 86, "Blood pressure measurement": 46, "Oxygen saturation": 34, "Heart rate": 29, "Feeling abnormal": 21, "Presyncope": 21, "Blood pressure decreased": 19, "Anaphylactic reaction": 16, "Blood pressure increased": 15, "Pyrexia": 15, "Loss of consciousness": 14, "Nausea": 13, "Dyspnoea": 11, "Hypoaesthesia": 11, "Electrocardiogram": 10, "Headache": 10, "Pruritus": 10, "Dizziness": 9, "Erythema": 9, "Fall": 9, "Vomiting": 9, "Blood test": 8, "Cold sweat": 8, "Malaise": 7, "Oropharyngeal discomfort": 7, "Oxygen saturation decreased": 7, "Rash": 7, "Seizure": 7, "Palpitations": 6, "Depressed level of consciousness": 5, "Diarrhoea": 5, "Heart rate decreased": 5, "Magnetic resonance imaging": 5, "Pallor": 5, "Anaphylactic shock": 4, "Chest pain": 4, "Cough": 4, "Hyperhidrosis": 4, "Investigation": 4, "Muscular weakness": 4, "Pain": 4, "SARS-CoV-2 test": 4, "Syncope": 4, "Urticaria": 4, "Vaccination site pain": 4, "Altered state of consciousness": 3, "Anaemia": 3, "Asthenia": 3, "Asthma": 3, "Auscultation": 3, "Blood pressure systolic": 3, "Bradycardia": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Chills": 3, "Choking sensation": 3, "Death": 3, "Decreased appetite": 3, "Haemoglobin": 3, "Hypersensitivity": 3, "Hyperventilation": 3, "Hypoaesthesia oral": 3, "Internal haemorrhage": 3, "Muscle spasms": 3, "Myocarditis": 3, "Pain in extremity": 3, "Red blood cell count": 3, "Vital signs measurement": 3, "Acute disseminated encephalomyelitis": 2, "Anxiety": 2, "Arrhythmia": 2, "Arthralgia": 2, "Back pain": 2, "Blood creatine phosphokinase increased": 2, "Blood lactate dehydrogenase": 2, "Breath sounds": 2, "CSF cell count": 2, "CSF protein": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Coma scale": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Confusional state": 2, "Contusion": 2, "Disturbance in attention": 2, "Dysphoria": 2, "Echocardiogram": 2, "Electrocardiogram ST segment elevation": 2, "Encephalopathy": 2, "Epilepsy": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Heart rate increased": 2, "Hypertension": 2, "Insomnia": 2, "Lymph node pain": 2, "Lymphadenopathy": 2, "Mental impairment": 2, "Myalgia": 2, "Neurological examination": 2, "Paraesthesia": 2, "Physical deconditioning": 2, "Pneumonia aspiration": 2, "Respiratory arrest": 2, "Respiratory rate": 2, "Speech disorder": 2, "Swelling face": 2, "Tachycardia": 2, "Urine analysis": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Visual impairment": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Acute stress disorder": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Amylase": 1, "Amylase increased": 1, "Antibody test": 1, "Antinuclear antibody positive": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asterixis": 1, "Ataxia": 1, "Autoantibody test": 1, "Autoimmune haemolytic anaemia": 1, "Axillary pain": 1, "Bedridden": 1, "Biopsy liver": 1, "Blister": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Brain neoplasm": 1, "Brain stem infarction": 1, "Breast cancer": 1, "Bronchostenosis": 1, "C-reactive protein": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF test": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Cognitive test": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Coombs direct test": 1, "Coombs indirect test": 1, "Cutaneous symptom": 1, "Dehydration": 1, "Dementia Alzheimer's type": 1, "Demyelination": 1, "Diplegia": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Ejection fraction": 1, "Electrocardiogram ST-T change": 1, "Electrocardiogram ambulatory": 1, "Encephalitis": 1, "Endoscopy upper gastrointestinal tract": 1, "Enteral nutrition": 1, "Enterocolitis": 1, "Erythema multiforme": 1, "Executive dysfunction": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fluid intake reduced": 1, "Gait disturbance": 1, "Gait inability": 1, "Gaze palsy": 1, "Genital erythema": 1, "Haemolysis": 1, "Haemolytic anaemia": 1, "Haemorrhage subcutaneous": 1, "Head banging": 1, "Heart sounds": 1, "Heat illness": 1, "Helicobacter infection": 1, "Hemianopia": 1, "Hepatic failure": 1, "Hepatic function abnormal": 1, "Hepatitis": 1, "Hepatitis B e antigen": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis B surface antigen positive": 1, "Herpes zoster": 1, "Hyperpyrexia": 1, "Hypokinesia": 1, "Hypophagia": 1, "Hypotension": 1, "Hypoxia": 1, "Illusion": 1, "Immune system disorder": 1, "Incision site complication": 1, "Inflammation": 1, "Inguinal hernia": 1, "International normalised ratio increased": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Laboratory test": 1, "Lip swelling": 1, "Liver abscess": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Meningism": 1, "Meningitis aseptic": 1, "Mini mental status examination": 1, "Mitral valve incompetence": 1, "Mobility decreased": 1, "Multiple sclerosis": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasopharyngitis": 1, "Neck injury": 1, "Neck pain": 1, "Neoplasm malignant": 1, "Nephrotic syndrome": 1, "Neurologic neglect syndrome": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Osteoarthritis": 1, "Pain of skin": 1, "Paralysis": 1, "Paresis": 1, "Parkinsonian gait": 1, "Periarthritis": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Perseveration": 1, "Pharyngeal erythema": 1, "Pharyngeal oedema": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Pulmonary fibrosis": 1, "Pulse abnormal": 1, "Radial pulse abnormal": 1, "Reaction to excipient": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Retinal vascular disorder": 1, "Rhinorrhoea": 1, "Scintillating scotoma": 1, "Senile dementia": 1, "Sensory disturbance": 1, "Shock": 1, "Shock symptom": 1, "Sinus arrest": 1, "Sinus rhythm": 1, "Sjogren's syndrome": 1, "Skin swelling": 1, "Sluggishness": 1, "Sneezing": 1, "Somatic symptom disorder": 1, "Spinal osteoarthritis": 1, "Status epilepticus": 1, "Subarachnoid haemorrhage": 1, "Suicidal ideation": 1, "Supraventricular extrasystoles": 1, "Tension": 1, "Tetany": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Toxic skin eruption": 1, "Troponin": 1, "Troponin T increased": 1, "Vaccination site cellulitis": 1, "Venous thrombosis": 1, "Ventricular extrasystoles": 1, "Ventricular internal diameter": 1, "Ventricular tachycardia": 1, "Vision blurred": 1, "Vitreous floaters": 1, "Volvulus": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count": 1, "X-ray": 1, "pH body fluid": 1}, "batchcodes": ["FE8206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF0834.json b/docs/data/histograms/Japan/FF0834.json
index 0646d18aef9..aa53c326383 100644
--- a/docs/data/histograms/Japan/FF0834.json
+++ b/docs/data/histograms/Japan/FF0834.json
@@ -1 +1 @@
-{"batchcode": "FF0834", "histograms": [{"batchcodes": ["FF0834"], "histogram": {"Dizziness": 1, "Loss of consciousness": 1, "Shock": 1}}]}
\ No newline at end of file
+{"batchcode": "FF0834", "histograms": [{"histogram": {"Dizziness": 1, "Loss of consciousness": 1, "Shock": 1}, "batchcodes": ["FF0834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF0843.json b/docs/data/histograms/Japan/FF0843.json
index fcafb8adc8f..e3eb9870246 100644
--- a/docs/data/histograms/Japan/FF0843.json
+++ b/docs/data/histograms/Japan/FF0843.json
@@ -1 +1 @@
-{"batchcode": "FF0843", "histograms": [{"batchcodes": ["FF0843"], "histogram": {"Body temperature": 102, "Blood pressure measurement": 39, "Oxygen saturation": 34, "Heart rate": 29, "Pyrexia": 23, "Blood pressure decreased": 17, "Feeling abnormal": 17, "Presyncope": 17, "Anaphylactic reaction": 15, "Dyspnoea": 15, "Loss of consciousness": 15, "Pruritus": 14, "Nausea": 13, "Hypoaesthesia": 12, "Malaise": 12, "Blood test": 11, "Fall": 11, "Rash": 11, "Erythema": 10, "Computerised tomogram": 9, "Cough": 9, "SARS-CoV-2 test": 9, "Urticaria": 9, "Asthenia": 8, "Dizziness": 8, "Pallor": 8, "Seizure": 8, "Cold sweat": 7, "Electrocardiogram": 7, "Heart rate decreased": 7, "Oropharyngeal discomfort": 7, "Anaphylactic shock": 6, "C-reactive protein": 6, "Hypoaesthesia oral": 6, "Tremor": 6, "Vital signs measurement": 6, "Vomiting": 6, "Headache": 5, "Magnetic resonance imaging": 5, "Myocarditis": 5, "Oxygen saturation decreased": 5, "Pain in extremity": 5, "Palpitations": 5, "Platelet count": 5, "White blood cell count": 5, "Arthralgia": 4, "Bradycardia": 4, "Cerebral infarction": 4, "Chest X-ray": 4, "Chest discomfort": 4, "Computerised tomogram head": 4, "Decreased appetite": 4, "Haemoglobin": 4, "Hyperhidrosis": 4, "Hypersensitivity": 4, "Investigation": 4, "Muscular weakness": 4, "Neuropathy peripheral": 4, "Pain": 4, "Physical deconditioning": 4, "Thrombosis": 4, "Ventricular fibrillation": 4, "Wheezing": 4, "Altered state of consciousness": 3, "Arrhythmia": 3, "Blood pressure increased": 3, "COVID-19": 3, "Cardiac arrest": 3, "Cardio-respiratory arrest": 3, "Cerebral haemorrhage": 3, "Dehydration": 3, "Depressed level of consciousness": 3, "Echocardiogram": 3, "Gaze palsy": 3, "Magnetic resonance imaging head": 3, "Muscle spasms": 3, "Sensory disturbance": 3, "Alanine aminotransferase": 2, "Anxiety": 2, "Aspartate aminotransferase": 2, "Back pain": 2, "Biopsy skin": 2, "Blindness": 2, "Blister": 2, "Blood creatine": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Blood urea": 2, "Cardiac failure acute": 2, "Cellulitis": 2, "Chest pain": 2, "Cutaneous symptom": 2, "Diarrhoea": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Dyslalia": 2, "Dysphagia": 2, "Dysphonia": 2, "Feeling hot": 2, "Glycosylated haemoglobin": 2, "Haematocrit": 2, "Hypertension": 2, "Hyperthermia": 2, "Hyperventilation": 2, "Hypokinesia": 2, "Hypotension": 2, "Immunosuppression": 2, "Inappropriate schedule of product administration": 2, "International normalised ratio": 2, "Joint range of motion decreased": 2, "Mobility decreased": 2, "Muscle tightness": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Peripheral coldness": 2, "Platelet count decreased": 2, "Polymerase chain reaction": 2, "Rash erythematous": 2, "Red blood cell count": 2, "Rhinorrhoea": 2, "Shock": 2, "Syncope": 2, "Thirst": 2, "Toxic skin eruption": 2, "Type 1 diabetes mellitus": 2, "Vaccination site pain": 2, "Weight": 2, "Abdominal discomfort": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Allergy to vaccine": 1, "Anaemia": 1, "Anaphylactoid reaction": 1, "Angiogram": 1, "Anti-GAD antibody": 1, "Anti-aquaporin-4 antibody": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Arrhythmia supraventricular": 1, "Arterial thrombosis": 1, "Arthritis": 1, "Arthritis reactive": 1, "Asthma": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoantibody test": 1, "Autopsy": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood ketone body": 1, "Blood pressure diastolic decreased": 1, "Blood pressure diastolic increased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood uric acid": 1, "Bradykinesia": 1, "Brain stem haemorrhage": 1, "Breast mass": 1, "Breath sounds abnormal": 1, "Bronchitis": 1, "Bronchitis bacterial": 1, "C-reactive protein increased": 1, "Campylobacter gastroenteritis": 1, "Cardiac discomfort": 1, "Cardiac dysfunction": 1, "Cerebral venous sinus thrombosis": 1, "Chest X-ray abnormal": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Computerised tomogram coronary artery": 1, "Condition aggravated": 1, "Confusional state": 1, "Contusion": 1, "Cough variant asthma": 1, "Coxsackie virus test": 1, "Cyanosis": 1, "Cystitis": 1, "Death": 1, "Dental examination": 1, "Dermatitis allergic": 1, "Disease progression": 1, "Disseminated intravascular coagulation": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dysphoria": 1, "Echovirus test": 1, "Ejection fraction": 1, "Electroencephalogram": 1, "Eosinophilia": 1, "Febrile convulsion": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal hypermotility": 1, "General physical health deterioration": 1, "Glare": 1, "Glaucoma": 1, "Glycosylated haemoglobin increased": 1, "Guillain-Barre syndrome": 1, "Haematocrit increased": 1, "Haematoma": 1, "Haemodynamic test": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Herpes zoster": 1, "Hiccups": 1, "Hot flush": 1, "Hypoacusis": 1, "Hyponatraemia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Infarction": 1, "Infection in an immunocompromised host": 1, "Infection susceptibility increased": 1, "Inflammation": 1, "Influenza like illness": 1, "Initial insomnia": 1, "Interstitial lung disease": 1, "Intestinal ischaemia": 1, "Intraventricular haemorrhage": 1, "Lacunar infarction": 1, "Laryngeal obstruction": 1, "Laryngeal stenosis": 1, "Lip swelling": 1, "Listless": 1, "Lymphadenopathy": 1, "Lymphadenopathy mediastinal": 1, "Lymphocyte count": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Movement disorder": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral allergy syndrome": 1, "Oral pruritus": 1, "Oxygen saturation immeasurable": 1, "Palmar erythema": 1, "Panic attack": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Pericarditis": 1, "Peripheral circulatory failure": 1, "Pharyngeal paraesthesia": 1, "Photopsia": 1, "Polydipsia": 1, "Polyuria": 1, "Postresuscitation encephalopathy": 1, "Procalcitonin": 1, "Product use issue": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary mass": 1, "Pulseless electrical activity": 1, "Pustular psoriasis": 1, "Pustule": 1, "Pyelonephritis": 1, "Radial nerve injury": 1, "Renal failure": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Sarcoidosis": 1, "Scan myocardial perfusion": 1, "Sepsis": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sinus bradycardia": 1, "Skin test": 1, "Skin tightness": 1, "Skin ulcer": 1, "Somnolence": 1, "Speech disorder": 1, "Spinal osteoarthritis": 1, "Still's disease": 1, "Streptococcus test": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic microangiopathy": 1, "Thyroglobulin increased": 1, "Tonic convulsion": 1, "Transient ischaemic attack": 1, "Trigeminal nerve disorder": 1, "Troponin I": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Urine ketone body": 1, "Urine ketone body present": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vagus nerve disorder": 1, "Ventricular arrhythmia": 1, "Ventricular hypokinesia": 1, "Ventricular tachycardia": 1, "Viral myocarditis": 1, "Visual field defect": 1, "Visual impairment": 1, "Weight decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FF0843", "histograms": [{"histogram": {"Body temperature": 102, "Blood pressure measurement": 39, "Oxygen saturation": 34, "Heart rate": 29, "Pyrexia": 23, "Blood pressure decreased": 17, "Feeling abnormal": 17, "Presyncope": 17, "Anaphylactic reaction": 15, "Dyspnoea": 15, "Loss of consciousness": 15, "Pruritus": 14, "Nausea": 13, "Hypoaesthesia": 12, "Malaise": 12, "Blood test": 11, "Fall": 11, "Rash": 11, "Erythema": 10, "Computerised tomogram": 9, "Cough": 9, "SARS-CoV-2 test": 9, "Urticaria": 9, "Asthenia": 8, "Dizziness": 8, "Pallor": 8, "Seizure": 8, "Cold sweat": 7, "Electrocardiogram": 7, "Heart rate decreased": 7, "Oropharyngeal discomfort": 7, "Anaphylactic shock": 6, "C-reactive protein": 6, "Hypoaesthesia oral": 6, "Tremor": 6, "Vital signs measurement": 6, "Vomiting": 6, "Headache": 5, "Magnetic resonance imaging": 5, "Myocarditis": 5, "Oxygen saturation decreased": 5, "Pain in extremity": 5, "Palpitations": 5, "Platelet count": 5, "White blood cell count": 5, "Arthralgia": 4, "Bradycardia": 4, "Cerebral infarction": 4, "Chest X-ray": 4, "Chest discomfort": 4, "Computerised tomogram head": 4, "Decreased appetite": 4, "Haemoglobin": 4, "Hyperhidrosis": 4, "Hypersensitivity": 4, "Investigation": 4, "Muscular weakness": 4, "Neuropathy peripheral": 4, "Pain": 4, "Physical deconditioning": 4, "Thrombosis": 4, "Ventricular fibrillation": 4, "Wheezing": 4, "Altered state of consciousness": 3, "Arrhythmia": 3, "Blood pressure increased": 3, "COVID-19": 3, "Cardiac arrest": 3, "Cardio-respiratory arrest": 3, "Cerebral haemorrhage": 3, "Dehydration": 3, "Depressed level of consciousness": 3, "Echocardiogram": 3, "Gaze palsy": 3, "Magnetic resonance imaging head": 3, "Muscle spasms": 3, "Sensory disturbance": 3, "Alanine aminotransferase": 2, "Anxiety": 2, "Aspartate aminotransferase": 2, "Back pain": 2, "Biopsy skin": 2, "Blindness": 2, "Blister": 2, "Blood creatine": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Blood urea": 2, "Cardiac failure acute": 2, "Cellulitis": 2, "Chest pain": 2, "Cutaneous symptom": 2, "Diarrhoea": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Dyslalia": 2, "Dysphagia": 2, "Dysphonia": 2, "Feeling hot": 2, "Glycosylated haemoglobin": 2, "Haematocrit": 2, "Hypertension": 2, "Hyperthermia": 2, "Hyperventilation": 2, "Hypokinesia": 2, "Hypotension": 2, "Immunosuppression": 2, "Inappropriate schedule of product administration": 2, "International normalised ratio": 2, "Joint range of motion decreased": 2, "Mobility decreased": 2, "Muscle tightness": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Peripheral coldness": 2, "Platelet count decreased": 2, "Polymerase chain reaction": 2, "Rash erythematous": 2, "Red blood cell count": 2, "Rhinorrhoea": 2, "Shock": 2, "Syncope": 2, "Thirst": 2, "Toxic skin eruption": 2, "Type 1 diabetes mellitus": 2, "Vaccination site pain": 2, "Weight": 2, "Abdominal discomfort": 1, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Allergy to vaccine": 1, "Anaemia": 1, "Anaphylactoid reaction": 1, "Angiogram": 1, "Anti-GAD antibody": 1, "Anti-aquaporin-4 antibody": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Arrhythmia supraventricular": 1, "Arterial thrombosis": 1, "Arthritis": 1, "Arthritis reactive": 1, "Asthma": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoantibody test": 1, "Autopsy": 1, "Biopsy heart": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood ketone body": 1, "Blood pressure diastolic decreased": 1, "Blood pressure diastolic increased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood uric acid": 1, "Bradykinesia": 1, "Brain stem haemorrhage": 1, "Breast mass": 1, "Breath sounds abnormal": 1, "Bronchitis": 1, "Bronchitis bacterial": 1, "C-reactive protein increased": 1, "Campylobacter gastroenteritis": 1, "Cardiac discomfort": 1, "Cardiac dysfunction": 1, "Cerebral venous sinus thrombosis": 1, "Chest X-ray abnormal": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Computerised tomogram coronary artery": 1, "Condition aggravated": 1, "Confusional state": 1, "Contusion": 1, "Cough variant asthma": 1, "Coxsackie virus test": 1, "Cyanosis": 1, "Cystitis": 1, "Death": 1, "Dental examination": 1, "Dermatitis allergic": 1, "Disease progression": 1, "Disseminated intravascular coagulation": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dysphoria": 1, "Echovirus test": 1, "Ejection fraction": 1, "Electroencephalogram": 1, "Eosinophilia": 1, "Febrile convulsion": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastrointestinal hypermotility": 1, "General physical health deterioration": 1, "Glare": 1, "Glaucoma": 1, "Glycosylated haemoglobin increased": 1, "Guillain-Barre syndrome": 1, "Haematocrit increased": 1, "Haematoma": 1, "Haemodynamic test": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Herpes zoster": 1, "Hiccups": 1, "Hot flush": 1, "Hypoacusis": 1, "Hyponatraemia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Infarction": 1, "Infection in an immunocompromised host": 1, "Infection susceptibility increased": 1, "Inflammation": 1, "Influenza like illness": 1, "Initial insomnia": 1, "Interstitial lung disease": 1, "Intestinal ischaemia": 1, "Intraventricular haemorrhage": 1, "Lacunar infarction": 1, "Laryngeal obstruction": 1, "Laryngeal stenosis": 1, "Lip swelling": 1, "Listless": 1, "Lymphadenopathy": 1, "Lymphadenopathy mediastinal": 1, "Lymphocyte count": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Movement disorder": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral allergy syndrome": 1, "Oral pruritus": 1, "Oxygen saturation immeasurable": 1, "Palmar erythema": 1, "Panic attack": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Pericarditis": 1, "Peripheral circulatory failure": 1, "Pharyngeal paraesthesia": 1, "Photopsia": 1, "Polydipsia": 1, "Polyuria": 1, "Postresuscitation encephalopathy": 1, "Procalcitonin": 1, "Product use issue": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary mass": 1, "Pulseless electrical activity": 1, "Pustular psoriasis": 1, "Pustule": 1, "Pyelonephritis": 1, "Radial nerve injury": 1, "Renal failure": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Sarcoidosis": 1, "Scan myocardial perfusion": 1, "Sepsis": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sinus bradycardia": 1, "Skin test": 1, "Skin tightness": 1, "Skin ulcer": 1, "Somnolence": 1, "Speech disorder": 1, "Spinal osteoarthritis": 1, "Still's disease": 1, "Streptococcus test": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic microangiopathy": 1, "Thyroglobulin increased": 1, "Tonic convulsion": 1, "Transient ischaemic attack": 1, "Trigeminal nerve disorder": 1, "Troponin I": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Urine ketone body": 1, "Urine ketone body present": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vagus nerve disorder": 1, "Ventricular arrhythmia": 1, "Ventricular hypokinesia": 1, "Ventricular tachycardia": 1, "Viral myocarditis": 1, "Visual field defect": 1, "Visual impairment": 1, "Weight decreased": 1, "X-ray": 1}, "batchcodes": ["FF0843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF08431.json b/docs/data/histograms/Japan/FF08431.json
index 0c57f85b17e..5416dbf9c19 100644
--- a/docs/data/histograms/Japan/FF08431.json
+++ b/docs/data/histograms/Japan/FF08431.json
@@ -1 +1 @@
-{"batchcode": "FF08431", "histograms": [{"batchcodes": ["FF08431"], "histogram": {"Acute kidney injury": 1, "Computerised tomogram abdomen": 1, "Eye swelling": 1, "Hydronephrosis": 1, "Immunoglobulin G4 related disease": 1, "Peripheral swelling": 1, "Retroperitoneal fibrosis": 1, "Ureteric stenosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FF08431", "histograms": [{"histogram": {"Acute kidney injury": 1, "Computerised tomogram abdomen": 1, "Eye swelling": 1, "Hydronephrosis": 1, "Immunoglobulin G4 related disease": 1, "Peripheral swelling": 1, "Retroperitoneal fibrosis": 1, "Ureteric stenosis": 1}, "batchcodes": ["FF08431"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF2018.json b/docs/data/histograms/Japan/FF2018.json
index bd52d82a15a..860d3cf2291 100644
--- a/docs/data/histograms/Japan/FF2018.json
+++ b/docs/data/histograms/Japan/FF2018.json
@@ -1 +1 @@
-{"batchcode": "FF2018", "histograms": [{"batchcodes": ["FF2018"], "histogram": {"Body temperature": 75, "Blood pressure measurement": 35, "Oxygen saturation": 27, "Heart rate": 22, "Anaphylactic reaction": 19, "Blood pressure decreased": 16, "Dyspnoea": 15, "Nausea": 15, "Presyncope": 15, "Loss of consciousness": 14, "Dizziness": 12, "Pyrexia": 12, "Blood test": 11, "Cough": 10, "Feeling abnormal": 9, "Blood pressure increased": 8, "Fall": 8, "Headache": 8, "Rash": 7, "Cold sweat": 6, "Erythema": 6, "Hyperhidrosis": 6, "Hypoaesthesia": 6, "Pain in extremity": 6, "Pallor": 6, "Pruritus": 6, "Altered state of consciousness": 5, "Bradycardia": 5, "Computerised tomogram": 5, "Investigation": 5, "Magnetic resonance imaging": 5, "Seizure": 5, "Tremor": 5, "Urticaria": 5, "Vomiting": 5, "Asthenia": 4, "Chest discomfort": 4, "Chest pain": 4, "Haemoglobin": 4, "Heart rate decreased": 4, "Oxygen saturation decreased": 4, "Peripheral swelling": 4, "Platelet count": 4, "Thrombosis": 4, "Vaccination site pain": 4, "Abdominal pain": 3, "Anaphylactic shock": 3, "Asthma": 3, "Contusion": 3, "Deep vein thrombosis": 3, "Depressed level of consciousness": 3, "Drug eruption": 3, "Dysphoria": 3, "Echocardiogram": 3, "Eczema": 3, "Electrocardiogram": 3, "Movement disorder": 3, "Muscular weakness": 3, "Myocarditis": 3, "Oropharyngeal discomfort": 3, "Pain": 3, "Pulmonary embolism": 3, "Suspected COVID-19": 3, "Throat irritation": 3, "Abdominal pain upper": 2, "Angina pectoris": 2, "Arrhythmia": 2, "Arthralgia": 2, "Biopsy kidney": 2, "Cerebral haemorrhage": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Coma scale": 2, "Complex regional pain syndrome": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Electroencephalogram": 2, "Erythema multiforme": 2, "Eye movement disorder": 2, "Facial paralysis": 2, "Feeling cold": 2, "Feeling hot": 2, "Grip strength decreased": 2, "Guillain-Barre syndrome": 2, "Haematuria": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "IgA nephropathy": 2, "Lip swelling": 2, "Magnetic resonance imaging head": 2, "Maternal exposure during pregnancy": 2, "Myalgia": 2, "Neck pain": 2, "Neuropathy peripheral": 2, "Palpitations": 2, "Peripheral coldness": 2, "Physical examination": 2, "Respiratory arrest": 2, "SARS-CoV-2 test": 2, "Sensory disturbance": 2, "Shock": 2, "Syncope": 2, "Tachycardia": 2, "Ultrasound scan": 2, "White blood cell count": 2, "X-ray": 2, "Abnormal sensation in eye": 1, "Abscess": 1, "Acquired haemophilia": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Amnesia": 1, "Appendicitis": 1, "Areflexia": 1, "Arteriosclerosis": 1, "Artery dissection": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Blepharospasm": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood smear test": 1, "Blood urea": 1, "Blood zinc": 1, "Blood zinc decreased": 1, "Body mass index": 1, "Brain stem infarction": 1, "Breath sounds": 1, "Bronchospasm": 1, "C-reactive protein": 1, "CSF test": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Cerebral artery stenosis": 1, "Cervical vertebral fracture": 1, "Chills": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Computerised tomogram head": 1, "Convulsions local": 1, "Cough variant asthma": 1, "Decreased appetite": 1, "Depressed mood": 1, "Diarrhoea": 1, "Diplopia": 1, "Discomfort": 1, "Drug-induced liver injury": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Electromyogram": 1, "Epilepsy": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid disorder": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Fibrin degradation products": 1, "Fibrin degradation products increased": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastritis": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Haematocrit": 1, "Haemorrhage": 1, "Hand dermatitis": 1, "Hanging": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hyperaesthesia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hyporesponsive to stimuli": 1, "Illusion": 1, "Incontinence": 1, "Injected limb mobility decreased": 1, "Injection site movement impairment": 1, "Insomnia": 1, "Joint contracture": 1, "Laboratory test": 1, "Limb discomfort": 1, "Liver contusion": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Mobility decreased": 1, "Multisystem inflammatory syndrome": 1, "Muscle atrophy": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Nasopharyngitis": 1, "Neuralgia": 1, "Neurological examination": 1, "Oral dysaesthesia": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Palmar erythema": 1, "Papule": 1, "Paraesthesia": 1, "Paralysis": 1, "Penile blister": 1, "Pharyngeal disorder": 1, "Photophobia": 1, "Polymerase chain reaction": 1, "Poor peripheral circulation": 1, "Post viral fatigue syndrome": 1, "Post-traumatic neck syndrome": 1, "Premature baby": 1, "Premature delivery": 1, "Productive cough": 1, "Protein total": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulse abnormal": 1, "Putamen haemorrhage": 1, "Radioisotope scan": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Renal impairment": 1, "Respiratory distress": 1, "Retinal vein occlusion": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Shock haemorrhagic": 1, "Skin abrasion": 1, "Somnolence": 1, "Spinal X-ray": 1, "Sputum retention": 1, "Tenderness": 1, "Tetany": 1, "Throat tightness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic cerebral infarction": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Vaccination site erythema": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site rash": 1, "Vasculitis": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Vertigo": 1, "Viral myocarditis": 1, "Vision blurred": 1, "Visual field defect": 1, "Vital signs measurement": 1, "Walking disability": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2018", "histograms": [{"histogram": {"Body temperature": 75, "Blood pressure measurement": 35, "Oxygen saturation": 27, "Heart rate": 22, "Anaphylactic reaction": 19, "Blood pressure decreased": 16, "Dyspnoea": 15, "Nausea": 15, "Presyncope": 15, "Loss of consciousness": 14, "Dizziness": 12, "Pyrexia": 12, "Blood test": 11, "Cough": 10, "Feeling abnormal": 9, "Blood pressure increased": 8, "Fall": 8, "Headache": 8, "Rash": 7, "Cold sweat": 6, "Erythema": 6, "Hyperhidrosis": 6, "Hypoaesthesia": 6, "Pain in extremity": 6, "Pallor": 6, "Pruritus": 6, "Altered state of consciousness": 5, "Bradycardia": 5, "Computerised tomogram": 5, "Investigation": 5, "Magnetic resonance imaging": 5, "Seizure": 5, "Tremor": 5, "Urticaria": 5, "Vomiting": 5, "Asthenia": 4, "Chest discomfort": 4, "Chest pain": 4, "Haemoglobin": 4, "Heart rate decreased": 4, "Oxygen saturation decreased": 4, "Peripheral swelling": 4, "Platelet count": 4, "Thrombosis": 4, "Vaccination site pain": 4, "Abdominal pain": 3, "Anaphylactic shock": 3, "Asthma": 3, "Contusion": 3, "Deep vein thrombosis": 3, "Depressed level of consciousness": 3, "Drug eruption": 3, "Dysphoria": 3, "Echocardiogram": 3, "Eczema": 3, "Electrocardiogram": 3, "Movement disorder": 3, "Muscular weakness": 3, "Myocarditis": 3, "Oropharyngeal discomfort": 3, "Pain": 3, "Pulmonary embolism": 3, "Suspected COVID-19": 3, "Throat irritation": 3, "Abdominal pain upper": 2, "Angina pectoris": 2, "Arrhythmia": 2, "Arthralgia": 2, "Biopsy kidney": 2, "Cerebral haemorrhage": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Coma scale": 2, "Complex regional pain syndrome": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Electroencephalogram": 2, "Erythema multiforme": 2, "Eye movement disorder": 2, "Facial paralysis": 2, "Feeling cold": 2, "Feeling hot": 2, "Grip strength decreased": 2, "Guillain-Barre syndrome": 2, "Haematuria": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "IgA nephropathy": 2, "Lip swelling": 2, "Magnetic resonance imaging head": 2, "Maternal exposure during pregnancy": 2, "Myalgia": 2, "Neck pain": 2, "Neuropathy peripheral": 2, "Palpitations": 2, "Peripheral coldness": 2, "Physical examination": 2, "Respiratory arrest": 2, "SARS-CoV-2 test": 2, "Sensory disturbance": 2, "Shock": 2, "Syncope": 2, "Tachycardia": 2, "Ultrasound scan": 2, "White blood cell count": 2, "X-ray": 2, "Abnormal sensation in eye": 1, "Abscess": 1, "Acquired haemophilia": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Amnesia": 1, "Appendicitis": 1, "Areflexia": 1, "Arteriosclerosis": 1, "Artery dissection": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Blepharospasm": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure immeasurable": 1, "Blood smear test": 1, "Blood urea": 1, "Blood zinc": 1, "Blood zinc decreased": 1, "Body mass index": 1, "Brain stem infarction": 1, "Breath sounds": 1, "Bronchospasm": 1, "C-reactive protein": 1, "CSF test": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Cerebral artery stenosis": 1, "Cervical vertebral fracture": 1, "Chills": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Computerised tomogram head": 1, "Convulsions local": 1, "Cough variant asthma": 1, "Decreased appetite": 1, "Depressed mood": 1, "Diarrhoea": 1, "Diplopia": 1, "Discomfort": 1, "Drug-induced liver injury": 1, "Dyskinesia": 1, "Dyslalia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Electromyogram": 1, "Epilepsy": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid disorder": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Fibrin degradation products": 1, "Fibrin degradation products increased": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastritis": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Haematocrit": 1, "Haemorrhage": 1, "Hand dermatitis": 1, "Hanging": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hyperaesthesia": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hyporesponsive to stimuli": 1, "Illusion": 1, "Incontinence": 1, "Injected limb mobility decreased": 1, "Injection site movement impairment": 1, "Insomnia": 1, "Joint contracture": 1, "Laboratory test": 1, "Limb discomfort": 1, "Liver contusion": 1, "Malaise": 1, "Miller Fisher syndrome": 1, "Mobility decreased": 1, "Multisystem inflammatory syndrome": 1, "Muscle atrophy": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Nasopharyngitis": 1, "Neuralgia": 1, "Neurological examination": 1, "Oral dysaesthesia": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Palmar erythema": 1, "Papule": 1, "Paraesthesia": 1, "Paralysis": 1, "Penile blister": 1, "Pharyngeal disorder": 1, "Photophobia": 1, "Polymerase chain reaction": 1, "Poor peripheral circulation": 1, "Post viral fatigue syndrome": 1, "Post-traumatic neck syndrome": 1, "Premature baby": 1, "Premature delivery": 1, "Productive cough": 1, "Protein total": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulse abnormal": 1, "Putamen haemorrhage": 1, "Radioisotope scan": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Renal impairment": 1, "Respiratory distress": 1, "Retinal vein occlusion": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Shock haemorrhagic": 1, "Skin abrasion": 1, "Somnolence": 1, "Spinal X-ray": 1, "Sputum retention": 1, "Tenderness": 1, "Tetany": 1, "Throat tightness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic cerebral infarction": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Vaccination site erythema": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site rash": 1, "Vasculitis": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Vertigo": 1, "Viral myocarditis": 1, "Vision blurred": 1, "Visual field defect": 1, "Vital signs measurement": 1, "Walking disability": 1, "Wheezing": 1}, "batchcodes": ["FF2018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF2728.json b/docs/data/histograms/Japan/FF2728.json
index 47cf5134f65..6bf7a485c07 100644
--- a/docs/data/histograms/Japan/FF2728.json
+++ b/docs/data/histograms/Japan/FF2728.json
@@ -1 +1 @@
-{"batchcode": "FF2728", "histograms": [{"batchcodes": ["FF2728"], "histogram": {"Angina pectoris": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2728", "histograms": [{"histogram": {"Angina pectoris": 1}, "batchcodes": ["FF2728"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF2782.json b/docs/data/histograms/Japan/FF2782.json
index 90d0cd57d82..e4edef0b3e6 100644
--- a/docs/data/histograms/Japan/FF2782.json
+++ b/docs/data/histograms/Japan/FF2782.json
@@ -1 +1 @@
-{"batchcode": "FF2782", "histograms": [{"batchcodes": ["FF2782"], "histogram": {"Body temperature": 113, "Blood pressure measurement": 71, "Oxygen saturation": 57, "Heart rate": 52, "Anaphylactic reaction": 33, "Blood pressure increased": 22, "Presyncope": 22, "Blood pressure decreased": 21, "Nausea": 18, "Dyspnoea": 17, "Erythema": 17, "Feeling abnormal": 17, "Headache": 17, "Hypoaesthesia": 17, "Loss of consciousness": 16, "Pyrexia": 16, "Malaise": 11, "Pruritus": 11, "Dizziness": 10, "Oropharyngeal discomfort": 10, "Pallor": 10, "Seizure": 10, "Urticaria": 10, "Blood test": 9, "Oxygen saturation decreased": 9, "Palpitations": 9, "Rash": 9, "Asthenia": 8, "Anaphylactic shock": 7, "Dysphoria": 7, "Fall": 7, "Heart rate decreased": 7, "Heart rate increased": 7, "Investigation": 7, "Muscular weakness": 7, "Neuropathy peripheral": 7, "Vomiting": 7, "Arthralgia": 6, "Cold sweat": 6, "Cough": 6, "Altered state of consciousness": 5, "COVID-19": 5, "Depressed level of consciousness": 5, "Electrocardiogram": 5, "Hyperhidrosis": 5, "Magnetic resonance imaging": 5, "Magnetic resonance imaging head": 5, "Oropharyngeal pain": 5, "Pain in extremity": 5, "SARS-CoV-2 test": 5, "Vital signs measurement": 5, "CSF test": 4, "Dysphonia": 4, "Gait disturbance": 4, "Haemoglobin": 4, "Hypersensitivity": 4, "Hypertension": 4, "Hyperventilation": 4, "Neck pain": 4, "Pain": 4, "Platelet count": 4, "Throat irritation": 4, "Tremor": 4, "Vaccination failure": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Anxiety": 3, "Aspartate aminotransferase": 3, "Autonomic neuropathy": 3, "Blood immunoglobulin E": 3, "Bradycardia": 3, "C-reactive protein": 3, "Cardio-respiratory arrest": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Chest pain": 3, "Computerised tomogram head": 3, "Dyskinesia": 3, "Fatigue": 3, "Feeling cold": 3, "Hypoaesthesia oral": 3, "Paraesthesia": 3, "Peripheral coldness": 3, "Pharyngeal swelling": 3, "Somnolence": 3, "Syncope": 3, "Throat tightness": 3, "Visual impairment": 3, "White blood cell count": 3, "Acute disseminated encephalomyelitis": 2, "Anaemia": 2, "Antibody test": 2, "Anxiety disorder": 2, "Asthma": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood pressure diastolic decreased": 2, "Contusion": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Encephalitis": 2, "Eosinophil count increased": 2, "Gamma-glutamyltransferase": 2, "Glomerular filtration rate": 2, "Grip strength decreased": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Hepatic function abnormal": 2, "Hot flush": 2, "Hypotension": 2, "Intracranial aneurysm": 2, "Magnetic resonance imaging head abnormal": 2, "Movement disorder": 2, "Myocarditis": 2, "Nerve conduction studies": 2, "Neuralgia": 2, "Oedema peripheral": 2, "Pericarditis": 2, "Physical deconditioning": 2, "Polymerase chain reaction": 2, "Quadriplegia": 2, "Respiratory rate": 2, "Rhinorrhoea": 2, "Sensory disturbance": 2, "Swollen tongue": 2, "Tachycardia": 2, "Tension": 2, "Thrombosis": 2, "Tinnitus": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Urine analysis": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Accommodation disorder": 1, "Acoustic stimulation tests": 1, "Allergic reaction to excipient": 1, "Allergy to vaccine": 1, "Amylase": 1, "Antibody test positive": 1, "Anticoagulant therapy": 1, "Aortic aneurysm rupture": 1, "Aphthous ulcer": 1, "Apnoea": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Arthropathy": 1, "Asterixis": 1, "Atrial fibrillation": 1, "Atrial tachycardia": 1, "Audiogram": 1, "Auscultation": 1, "Autoantibody test": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Basophil count": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood chloride decreased": 1, "Blood creatine": 1, "Blood creatine increased": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood glucose normal": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E increased": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure normal": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bone pain": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Breath sounds": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF protein": 1, "Capillary fragility test": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Central nervous system lesion": 1, "Cerebral artery thrombosis": 1, "Cerebral haemorrhage": 1, "Cerebral thrombosis": 1, "Chills": 1, "Circulatory collapse": 1, "Clonic convulsion": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head abnormal": 1, "Cytomegalovirus test": 1, "Deafness bilateral": 1, "Deafness transitory": 1, "Deep vein thrombosis": 1, "Dermatitis atopic": 1, "Differential white blood cell count": 1, "Diplegia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug ineffective": 1, "Dry skin": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Dysuria": 1, "Echocardiogram": 1, "Echoencephalogram": 1, "Eczema": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Embolism arterial": 1, "Endoscopy upper gastrointestinal tract": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Epicondylitis": 1, "Epilepsy": 1, "Epstein-Barr virus test": 1, "Erythema multiforme": 1, "Eye movement disorder": 1, "Facial pain": 1, "Facial paralysis": 1, "Faeces soft": 1, "Fear of injection": 1, "Feeding disorder": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gait inability": 1, "Gastric ulcer haemorrhage": 1, "Groin pain": 1, "Haematochezia": 1, "Haematuria": 1, "Haemorrhage subcutaneous": 1, "Head injury": 1, "Heart rate irregular": 1, "Heart sounds": 1, "Heat illness": 1, "Hemiplegia": 1, "Hepatic enzyme increased": 1, "Hepatitis A virus test": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hyperpyrexia": 1, "Hypertensive urgency": 1, "Hypopnoea": 1, "Illusion": 1, "Influenza virus test": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Lacrimation increased": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lymphoblast count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Medical observation": 1, "Metamorphopsia": 1, "Miller Fisher syndrome": 1, "Monoblast count": 1, "Monoblast count increased": 1, "Monoplegia": 1, "Mouth haemorrhage": 1, "Multiple allergies": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Myoclonus": 1, "Nasopharyngitis": 1, "Nephritis": 1, "Nerve injury": 1, "Nervous system disorder": 1, "Nervousness": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neurosis": 1, "Neutrophil count": 1, "Ophthalmic herpes zoster": 1, "Oxygen saturation immeasurable": 1, "PO2": 1, "Papule": 1, "Paralysis": 1, "Parvovirus B19 test": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Pharyngeal disorder": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia viral": 1, "Prinzmetal angina": 1, "Protein total increased": 1, "Protein urine present": 1, "Pruritus genital": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Respiratory arrest": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Retrograde amnesia": 1, "Sensation of blood flow": 1, "Shock": 1, "Shock haemorrhagic": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Skin depigmentation": 1, "Skin exfoliation": 1, "Sleep deficit": 1, "Sleep disorder": 1, "Stomatitis": 1, "Stress": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Tachycardia paroxysmal": 1, "Tachypnoea": 1, "Thermohypoaesthesia": 1, "Troponin I": 1, "Troponin I increased": 1, "Upper airway obstruction": 1, "Upper respiratory tract inflammation": 1, "Urine output": 1, "Urine protein/creatinine ratio": 1, "Vaccination complication": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vascular fragility": 1, "Venogram": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Viral infection": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Vitreous haemorrhage": 1, "Volume blood": 1, "Wheezing": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2782", "histograms": [{"histogram": {"Body temperature": 113, "Blood pressure measurement": 71, "Oxygen saturation": 57, "Heart rate": 52, "Anaphylactic reaction": 33, "Blood pressure increased": 22, "Presyncope": 22, "Blood pressure decreased": 21, "Nausea": 18, "Dyspnoea": 17, "Erythema": 17, "Feeling abnormal": 17, "Headache": 17, "Hypoaesthesia": 17, "Loss of consciousness": 16, "Pyrexia": 16, "Malaise": 11, "Pruritus": 11, "Dizziness": 10, "Oropharyngeal discomfort": 10, "Pallor": 10, "Seizure": 10, "Urticaria": 10, "Blood test": 9, "Oxygen saturation decreased": 9, "Palpitations": 9, "Rash": 9, "Asthenia": 8, "Anaphylactic shock": 7, "Dysphoria": 7, "Fall": 7, "Heart rate decreased": 7, "Heart rate increased": 7, "Investigation": 7, "Muscular weakness": 7, "Neuropathy peripheral": 7, "Vomiting": 7, "Arthralgia": 6, "Cold sweat": 6, "Cough": 6, "Altered state of consciousness": 5, "COVID-19": 5, "Depressed level of consciousness": 5, "Electrocardiogram": 5, "Hyperhidrosis": 5, "Magnetic resonance imaging": 5, "Magnetic resonance imaging head": 5, "Oropharyngeal pain": 5, "Pain in extremity": 5, "SARS-CoV-2 test": 5, "Vital signs measurement": 5, "CSF test": 4, "Dysphonia": 4, "Gait disturbance": 4, "Haemoglobin": 4, "Hypersensitivity": 4, "Hypertension": 4, "Hyperventilation": 4, "Neck pain": 4, "Pain": 4, "Platelet count": 4, "Throat irritation": 4, "Tremor": 4, "Vaccination failure": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Anxiety": 3, "Aspartate aminotransferase": 3, "Autonomic neuropathy": 3, "Blood immunoglobulin E": 3, "Bradycardia": 3, "C-reactive protein": 3, "Cardio-respiratory arrest": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Chest pain": 3, "Computerised tomogram head": 3, "Dyskinesia": 3, "Fatigue": 3, "Feeling cold": 3, "Hypoaesthesia oral": 3, "Paraesthesia": 3, "Peripheral coldness": 3, "Pharyngeal swelling": 3, "Somnolence": 3, "Syncope": 3, "Throat tightness": 3, "Visual impairment": 3, "White blood cell count": 3, "Acute disseminated encephalomyelitis": 2, "Anaemia": 2, "Antibody test": 2, "Anxiety disorder": 2, "Asthma": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood pressure diastolic decreased": 2, "Contusion": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Encephalitis": 2, "Eosinophil count increased": 2, "Gamma-glutamyltransferase": 2, "Glomerular filtration rate": 2, "Grip strength decreased": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Hepatic function abnormal": 2, "Hot flush": 2, "Hypotension": 2, "Intracranial aneurysm": 2, "Magnetic resonance imaging head abnormal": 2, "Movement disorder": 2, "Myocarditis": 2, "Nerve conduction studies": 2, "Neuralgia": 2, "Oedema peripheral": 2, "Pericarditis": 2, "Physical deconditioning": 2, "Polymerase chain reaction": 2, "Quadriplegia": 2, "Respiratory rate": 2, "Rhinorrhoea": 2, "Sensory disturbance": 2, "Swollen tongue": 2, "Tachycardia": 2, "Tension": 2, "Thrombosis": 2, "Tinnitus": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Urine analysis": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Accommodation disorder": 1, "Acoustic stimulation tests": 1, "Allergic reaction to excipient": 1, "Allergy to vaccine": 1, "Amylase": 1, "Antibody test positive": 1, "Anticoagulant therapy": 1, "Aortic aneurysm rupture": 1, "Aphthous ulcer": 1, "Apnoea": 1, "Arrhythmia": 1, "Arterial thrombosis": 1, "Arthropathy": 1, "Asterixis": 1, "Atrial fibrillation": 1, "Atrial tachycardia": 1, "Audiogram": 1, "Auscultation": 1, "Autoantibody test": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Basophil count": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood chloride decreased": 1, "Blood creatine": 1, "Blood creatine increased": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood glucose normal": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E increased": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure normal": 1, "Blood pressure systolic decreased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bone pain": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Breath sounds": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF protein": 1, "Capillary fragility test": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Central nervous system lesion": 1, "Cerebral artery thrombosis": 1, "Cerebral haemorrhage": 1, "Cerebral thrombosis": 1, "Chills": 1, "Circulatory collapse": 1, "Clonic convulsion": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head abnormal": 1, "Cytomegalovirus test": 1, "Deafness bilateral": 1, "Deafness transitory": 1, "Deep vein thrombosis": 1, "Dermatitis atopic": 1, "Differential white blood cell count": 1, "Diplegia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug ineffective": 1, "Dry skin": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Dysuria": 1, "Echocardiogram": 1, "Echoencephalogram": 1, "Eczema": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Embolism arterial": 1, "Endoscopy upper gastrointestinal tract": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Epicondylitis": 1, "Epilepsy": 1, "Epstein-Barr virus test": 1, "Erythema multiforme": 1, "Eye movement disorder": 1, "Facial pain": 1, "Facial paralysis": 1, "Faeces soft": 1, "Fear of injection": 1, "Feeding disorder": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gait inability": 1, "Gastric ulcer haemorrhage": 1, "Groin pain": 1, "Haematochezia": 1, "Haematuria": 1, "Haemorrhage subcutaneous": 1, "Head injury": 1, "Heart rate irregular": 1, "Heart sounds": 1, "Heat illness": 1, "Hemiplegia": 1, "Hepatic enzyme increased": 1, "Hepatitis A virus test": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hyperpyrexia": 1, "Hypertensive urgency": 1, "Hypopnoea": 1, "Illusion": 1, "Influenza virus test": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Lacrimation increased": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lymphoblast count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Medical observation": 1, "Metamorphopsia": 1, "Miller Fisher syndrome": 1, "Monoblast count": 1, "Monoblast count increased": 1, "Monoplegia": 1, "Mouth haemorrhage": 1, "Multiple allergies": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Myoclonus": 1, "Nasopharyngitis": 1, "Nephritis": 1, "Nerve injury": 1, "Nervous system disorder": 1, "Nervousness": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neurosis": 1, "Neutrophil count": 1, "Ophthalmic herpes zoster": 1, "Oxygen saturation immeasurable": 1, "PO2": 1, "Papule": 1, "Paralysis": 1, "Parvovirus B19 test": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Pharyngeal disorder": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia viral": 1, "Prinzmetal angina": 1, "Protein total increased": 1, "Protein urine present": 1, "Pruritus genital": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Respiratory arrest": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Retrograde amnesia": 1, "Sensation of blood flow": 1, "Shock": 1, "Shock haemorrhagic": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Skin depigmentation": 1, "Skin exfoliation": 1, "Sleep deficit": 1, "Sleep disorder": 1, "Stomatitis": 1, "Stress": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Tachycardia paroxysmal": 1, "Tachypnoea": 1, "Thermohypoaesthesia": 1, "Troponin I": 1, "Troponin I increased": 1, "Upper airway obstruction": 1, "Upper respiratory tract inflammation": 1, "Urine output": 1, "Urine protein/creatinine ratio": 1, "Vaccination complication": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vascular fragility": 1, "Venogram": 1, "Ventricular extrasystoles": 1, "Vertigo": 1, "Viral infection": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual field defect": 1, "Vitreous haemorrhage": 1, "Volume blood": 1, "Wheezing": 1, "White blood cell count decreased": 1}, "batchcodes": ["FF2782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF2783.json b/docs/data/histograms/Japan/FF2783.json
index f24f300cd16..3bb990d63a1 100644
--- a/docs/data/histograms/Japan/FF2783.json
+++ b/docs/data/histograms/Japan/FF2783.json
@@ -1 +1 @@
-{"batchcode": "FF2783", "histograms": [{"batchcodes": ["FF2783"], "histogram": {"Body temperature": 1, "Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2783", "histograms": [{"histogram": {"Body temperature": 1, "Rash": 1, "Urticaria": 1}, "batchcodes": ["FF2783"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF3602.json b/docs/data/histograms/Japan/FF3602.json
index afded8cd815..08c334ab394 100644
--- a/docs/data/histograms/Japan/FF3602.json
+++ b/docs/data/histograms/Japan/FF3602.json
@@ -1 +1 @@
-{"batchcode": "FF3602", "histograms": [{"batchcodes": ["FF3602"], "histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Feeling abnormal": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FF3602", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Feeling abnormal": 1, "Urticaria": 1}, "batchcodes": ["FF3602"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF3620.json b/docs/data/histograms/Japan/FF3620.json
index b2046fa6770..e8afe9e91fa 100644
--- a/docs/data/histograms/Japan/FF3620.json
+++ b/docs/data/histograms/Japan/FF3620.json
@@ -1 +1 @@
-{"batchcode": "FF3620", "histograms": [{"batchcodes": ["FF3620"], "histogram": {"Body temperature": 111, "Blood pressure measurement": 58, "Oxygen saturation": 47, "Heart rate": 46, "Anaphylactic reaction": 25, "Pyrexia": 24, "Dizziness": 21, "Dyspnoea": 21, "Presyncope": 20, "Hypoaesthesia": 19, "Blood pressure increased": 18, "Nausea": 18, "Blood pressure decreased": 17, "Feeling abnormal": 17, "Malaise": 16, "Headache": 15, "Cough": 14, "Loss of consciousness": 14, "Erythema": 13, "Fall": 13, "Pruritus": 13, "Urticaria": 12, "Pain": 11, "Heart rate decreased": 10, "Depressed level of consciousness": 9, "Diarrhoea": 9, "Investigation": 9, "Oxygen saturation decreased": 9, "Chest pain": 8, "Oropharyngeal discomfort": 8, "Pain in extremity": 8, "Palpitations": 8, "Muscular weakness": 7, "Abdominal pain": 6, "Electrocardiogram": 6, "Hypertension": 6, "Rash": 6, "Asthenia": 5, "Blood test": 5, "Decreased appetite": 5, "Dysphoria": 5, "Heart rate increased": 5, "Hyperventilation": 5, "Magnetic resonance imaging": 5, "Seizure": 5, "Shock": 5, "Tachycardia": 5, "Vaccination site pain": 5, "Vomiting": 5, "Altered state of consciousness": 4, "Arthralgia": 4, "Auscultation": 4, "Chills": 4, "Cold sweat": 4, "Contusion": 4, "Eczema": 4, "Hypersensitivity": 4, "Magnetic resonance imaging head": 4, "Neuropathy peripheral": 4, "Rhinorrhoea": 4, "Syncope": 4, "Throat irritation": 4, "White blood cell count": 4, "Amnesia": 3, "Anaemia": 3, "Anaphylactic shock": 3, "Anxiety": 3, "C-reactive protein": 3, "Cerebral haemorrhage": 3, "Cerebral infarction": 3, "Chest X-ray": 3, "Disease recurrence": 3, "Dysstasia": 3, "Epilepsy": 3, "Facial paralysis": 3, "Feeling hot": 3, "Hyperhidrosis": 3, "Hypotension": 3, "Insomnia": 3, "Pallor": 3, "Paraesthesia": 3, "SARS-CoV-2 test": 3, "Swelling": 3, "Tremor": 3, "Vagus nerve disorder": 3, "Visual impairment": 3, "Vital signs measurement": 3, "Angina pectoris": 2, "Anti-aquaporin-4 antibody": 2, "Blood creatinine": 2, "Cellulitis": 2, "Chest discomfort": 2, "Coma scale": 2, "Computerised tomogram": 2, "Computerised tomogram thorax": 2, "Conjunctival hyperaemia": 2, "Dysphonia": 2, "Fatigue": 2, "General physical health deterioration": 2, "Grip strength": 2, "Grip strength decreased": 2, "Herpes zoster": 2, "Hot flush": 2, "Lip oedema": 2, "Myocarditis": 2, "Oropharyngeal pain": 2, "Paraesthesia oral": 2, "Physical deconditioning": 2, "Platelet count": 2, "Renal impairment": 2, "Respiratory rate": 2, "Speech disorder": 2, "Vaccination site swelling": 2, "Visual acuity reduced": 2, "Wheezing": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Adverse event": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase normal": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Amylase increased": 1, "Amyotrophy": 1, "Angiogram retina": 1, "Anosmia": 1, "Anti-aquaporin-4 antibody positive": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase normal": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Azotaemia": 1, "Back pain": 1, "Basophil percentage decreased": 1, "Binocular eye movement disorder": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood alkaline phosphatase decreased": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "Blood bilirubin normal": 1, "Blood calcium normal": 1, "Blood chloride normal": 1, "Blood cholesterol": 1, "Blood cholesterol normal": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatine phosphokinase normal": 1, "Blood creatinine normal": 1, "Blood glucose normal": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood iron": 1, "Blood lactate dehydrogenase normal": 1, "Blood potassium normal": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood sodium normal": 1, "Blood test normal": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood urea normal": 1, "Blood uric acid normal": 1, "Body temperature decreased": 1, "Bradycardia": 1, "Brain stem haemorrhage": 1, "Breath sounds abnormal": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "C-reactive protein normal": 1, "COVID-19": 1, "CSF cell count": 1, "CSF oligoclonal band": 1, "CSF oligoclonal band present": 1, "CSF test": 1, "Cardiac failure acute": 1, "Central nervous system lesion": 1, "Cerebellar haemorrhage": 1, "Cerebral atrophy": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Choking sensation": 1, "Chondropathy": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Clinically isolated syndrome": 1, "Clonus": 1, "Colitis ischaemic": 1, "Collagen disorder": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Computerised tomogram head normal": 1, "Computerised tomogram spine": 1, "Condition aggravated": 1, "Deafness unilateral": 1, "Death": 1, "Dehydration": 1, "Demyelination": 1, "Depression": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug eruption": 1, "Dysarthria": 1, "Dyschromatopsia": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram PR shortened": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram ST segment elevation": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil percentage increased": 1, "Erythema multiforme": 1, "Exposure during pregnancy": 1, "Eye swelling": 1, "Feeding disorder": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibrin D dimer normal": 1, "Flushing": 1, "Foetal death": 1, "Foetal heart rate abnormal": 1, "Fundoscopy": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastroenteritis": 1, "Glomerular filtration rate normal": 1, "Glomerulonephritis": 1, "Glossitis": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin normal": 1, "Haemolysis": 1, "Haemorrhage": 1, "Haptoglobin": 1, "Head discomfort": 1, "Head injury": 1, "Hepatic function abnormal": 1, "Herpes zoster oticus": 1, "High density lipoprotein normal": 1, "Hyperpyrexia": 1, "Hypoperfusion": 1, "Hypopnoea": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Imaging procedure": 1, "Impaired driving ability": 1, "Impaired self-care": 1, "Impaired work ability": 1, "Incontinence": 1, "Infection": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Intervertebral disc space narrowing": 1, "Joint range of motion decreased": 1, "LDL/HDL ratio": 1, "Labile blood pressure": 1, "Lacrimation increased": 1, "Laryngeal disorder": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein normal": 1, "Lung opacity": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphocytosis": 1, "Macular oedema": 1, "Magnetic resonance imaging head normal": 1, "Mean cell haemoglobin concentration normal": 1, "Mean cell haemoglobin increased": 1, "Mean cell volume increased": 1, "Meniere's disease": 1, "Meningitis aseptic": 1, "Metamyelocyte count": 1, "Mite allergy": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle spasms": 1, "Myalgia": 1, "Mycoplasma test": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Neutrophil count normal": 1, "Neutrophil percentage": 1, "Non-high-density lipoprotein cholesterol": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmoplegia": 1, "Optic neuritis": 1, "Organic brain syndrome": 1, "Orthopnoea": 1, "Oxygen saturation immeasurable": 1, "Paralysis": 1, "Pemphigus": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngeal oedema": 1, "Pharyngitis": 1, "Physical examination": 1, "Poor quality sleep": 1, "Post viral fatigue syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Product use issue": 1, "Productive cough": 1, "Protein total": 1, "Protein urine": 1, "Pulmonary function test": 1, "Pulse absent": 1, "Putamen haemorrhage": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Renal function test": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Retinal vein occlusion": 1, "Scab": 1, "Scratch": 1, "Seizure cluster": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Single photon emission computerised tomogram": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Slow response to stimuli": 1, "Sneezing": 1, "Somatic symptom disorder": 1, "Streptococcus test": 1, "Subcutaneous abscess": 1, "Sudden death": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Target skin lesion": 1, "Tenderness": 1, "Tetany": 1, "Thalamus haemorrhage": 1, "Throat tightness": 1, "Thrombosis": 1, "Tic": 1, "Tinnitus": 1, "Toothache": 1, "Troponin increased": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site scar": 1, "Vaccination site warmth": 1, "Ventricular hypertrophy": 1, "Vertebrobasilar insufficiency": 1, "Viral infection": 1, "Viral myocarditis": 1, "Viral test": 1, "Vision blurred": 1, "Visual field defect": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "White blood cell count normal": 1}}]}
\ No newline at end of file
+{"batchcode": "FF3620", "histograms": [{"histogram": {"Body temperature": 111, "Blood pressure measurement": 58, "Oxygen saturation": 47, "Heart rate": 46, "Anaphylactic reaction": 25, "Pyrexia": 24, "Dizziness": 21, "Dyspnoea": 21, "Presyncope": 20, "Hypoaesthesia": 19, "Blood pressure increased": 18, "Nausea": 18, "Blood pressure decreased": 17, "Feeling abnormal": 17, "Malaise": 16, "Headache": 15, "Cough": 14, "Loss of consciousness": 14, "Erythema": 13, "Fall": 13, "Pruritus": 13, "Urticaria": 12, "Pain": 11, "Heart rate decreased": 10, "Depressed level of consciousness": 9, "Diarrhoea": 9, "Investigation": 9, "Oxygen saturation decreased": 9, "Chest pain": 8, "Oropharyngeal discomfort": 8, "Pain in extremity": 8, "Palpitations": 8, "Muscular weakness": 7, "Abdominal pain": 6, "Electrocardiogram": 6, "Hypertension": 6, "Rash": 6, "Asthenia": 5, "Blood test": 5, "Decreased appetite": 5, "Dysphoria": 5, "Heart rate increased": 5, "Hyperventilation": 5, "Magnetic resonance imaging": 5, "Seizure": 5, "Shock": 5, "Tachycardia": 5, "Vaccination site pain": 5, "Vomiting": 5, "Altered state of consciousness": 4, "Arthralgia": 4, "Auscultation": 4, "Chills": 4, "Cold sweat": 4, "Contusion": 4, "Eczema": 4, "Hypersensitivity": 4, "Magnetic resonance imaging head": 4, "Neuropathy peripheral": 4, "Rhinorrhoea": 4, "Syncope": 4, "Throat irritation": 4, "White blood cell count": 4, "Amnesia": 3, "Anaemia": 3, "Anaphylactic shock": 3, "Anxiety": 3, "C-reactive protein": 3, "Cerebral haemorrhage": 3, "Cerebral infarction": 3, "Chest X-ray": 3, "Disease recurrence": 3, "Dysstasia": 3, "Epilepsy": 3, "Facial paralysis": 3, "Feeling hot": 3, "Hyperhidrosis": 3, "Hypotension": 3, "Insomnia": 3, "Pallor": 3, "Paraesthesia": 3, "SARS-CoV-2 test": 3, "Swelling": 3, "Tremor": 3, "Vagus nerve disorder": 3, "Visual impairment": 3, "Vital signs measurement": 3, "Angina pectoris": 2, "Anti-aquaporin-4 antibody": 2, "Blood creatinine": 2, "Cellulitis": 2, "Chest discomfort": 2, "Coma scale": 2, "Computerised tomogram": 2, "Computerised tomogram thorax": 2, "Conjunctival hyperaemia": 2, "Dysphonia": 2, "Fatigue": 2, "General physical health deterioration": 2, "Grip strength": 2, "Grip strength decreased": 2, "Herpes zoster": 2, "Hot flush": 2, "Lip oedema": 2, "Myocarditis": 2, "Oropharyngeal pain": 2, "Paraesthesia oral": 2, "Physical deconditioning": 2, "Platelet count": 2, "Renal impairment": 2, "Respiratory rate": 2, "Speech disorder": 2, "Vaccination site swelling": 2, "Visual acuity reduced": 2, "Wheezing": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Adverse event": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase normal": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Amylase increased": 1, "Amyotrophy": 1, "Angiogram retina": 1, "Anosmia": 1, "Anti-aquaporin-4 antibody positive": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase normal": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Azotaemia": 1, "Back pain": 1, "Basophil percentage decreased": 1, "Binocular eye movement disorder": 1, "Biopsy bone marrow": 1, "Biopsy skin": 1, "Blood alkaline phosphatase decreased": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "Blood bilirubin normal": 1, "Blood calcium normal": 1, "Blood chloride normal": 1, "Blood cholesterol": 1, "Blood cholesterol normal": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatine phosphokinase normal": 1, "Blood creatinine normal": 1, "Blood glucose normal": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood iron": 1, "Blood lactate dehydrogenase normal": 1, "Blood potassium normal": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Blood sodium normal": 1, "Blood test normal": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood urea normal": 1, "Blood uric acid normal": 1, "Body temperature decreased": 1, "Bradycardia": 1, "Brain stem haemorrhage": 1, "Breath sounds abnormal": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "C-reactive protein normal": 1, "COVID-19": 1, "CSF cell count": 1, "CSF oligoclonal band": 1, "CSF oligoclonal band present": 1, "CSF test": 1, "Cardiac failure acute": 1, "Central nervous system lesion": 1, "Cerebellar haemorrhage": 1, "Cerebral atrophy": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Choking sensation": 1, "Chondropathy": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Clinically isolated syndrome": 1, "Clonus": 1, "Colitis ischaemic": 1, "Collagen disorder": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Computerised tomogram head normal": 1, "Computerised tomogram spine": 1, "Condition aggravated": 1, "Deafness unilateral": 1, "Death": 1, "Dehydration": 1, "Demyelination": 1, "Depression": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug eruption": 1, "Dysarthria": 1, "Dyschromatopsia": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram PR shortened": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram ST segment elevation": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil percentage increased": 1, "Erythema multiforme": 1, "Exposure during pregnancy": 1, "Eye swelling": 1, "Feeding disorder": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibrin D dimer normal": 1, "Flushing": 1, "Foetal death": 1, "Foetal heart rate abnormal": 1, "Fundoscopy": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastroenteritis": 1, "Glomerular filtration rate normal": 1, "Glomerulonephritis": 1, "Glossitis": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin normal": 1, "Haemolysis": 1, "Haemorrhage": 1, "Haptoglobin": 1, "Head discomfort": 1, "Head injury": 1, "Hepatic function abnormal": 1, "Herpes zoster oticus": 1, "High density lipoprotein normal": 1, "Hyperpyrexia": 1, "Hypoperfusion": 1, "Hypopnoea": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Imaging procedure": 1, "Impaired driving ability": 1, "Impaired self-care": 1, "Impaired work ability": 1, "Incontinence": 1, "Infection": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Intervertebral disc space narrowing": 1, "Joint range of motion decreased": 1, "LDL/HDL ratio": 1, "Labile blood pressure": 1, "Lacrimation increased": 1, "Laryngeal disorder": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein normal": 1, "Lung opacity": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphocytosis": 1, "Macular oedema": 1, "Magnetic resonance imaging head normal": 1, "Mean cell haemoglobin concentration normal": 1, "Mean cell haemoglobin increased": 1, "Mean cell volume increased": 1, "Meniere's disease": 1, "Meningitis aseptic": 1, "Metamyelocyte count": 1, "Mite allergy": 1, "Monocyte percentage": 1, "Monoplegia": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle spasms": 1, "Myalgia": 1, "Mycoplasma test": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neck pain": 1, "Nephrotic syndrome": 1, "Neutrophil count normal": 1, "Neutrophil percentage": 1, "Non-high-density lipoprotein cholesterol": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmoplegia": 1, "Optic neuritis": 1, "Organic brain syndrome": 1, "Orthopnoea": 1, "Oxygen saturation immeasurable": 1, "Paralysis": 1, "Pemphigus": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngeal oedema": 1, "Pharyngitis": 1, "Physical examination": 1, "Poor quality sleep": 1, "Post viral fatigue syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Product use issue": 1, "Productive cough": 1, "Protein total": 1, "Protein urine": 1, "Pulmonary function test": 1, "Pulse absent": 1, "Putamen haemorrhage": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Renal function test": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Retinal vein occlusion": 1, "Scab": 1, "Scratch": 1, "Seizure cluster": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Single photon emission computerised tomogram": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Slow response to stimuli": 1, "Sneezing": 1, "Somatic symptom disorder": 1, "Streptococcus test": 1, "Subcutaneous abscess": 1, "Sudden death": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Target skin lesion": 1, "Tenderness": 1, "Tetany": 1, "Thalamus haemorrhage": 1, "Throat tightness": 1, "Thrombosis": 1, "Tic": 1, "Tinnitus": 1, "Toothache": 1, "Troponin increased": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site scar": 1, "Vaccination site warmth": 1, "Ventricular hypertrophy": 1, "Vertebrobasilar insufficiency": 1, "Viral infection": 1, "Viral myocarditis": 1, "Viral test": 1, "Vision blurred": 1, "Visual field defect": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "White blood cell count normal": 1}, "batchcodes": ["FF3620"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF3622.json b/docs/data/histograms/Japan/FF3622.json
index 6e26983fb7e..56ab249a89d 100644
--- a/docs/data/histograms/Japan/FF3622.json
+++ b/docs/data/histograms/Japan/FF3622.json
@@ -1 +1 @@
-{"batchcode": "FF3622", "histograms": [{"batchcodes": ["FF3622"], "histogram": {"Body temperature": 114, "Blood pressure measurement": 55, "Oxygen saturation": 41, "Heart rate": 37, "Anaphylactic reaction": 30, "Pyrexia": 30, "Dyspnoea": 25, "Nausea": 23, "Presyncope": 23, "Feeling abnormal": 21, "Blood pressure decreased": 18, "Headache": 18, "Blood pressure increased": 17, "Malaise": 17, "Dizziness": 15, "Electrocardiogram": 14, "Chest discomfort": 13, "Chest pain": 13, "Erythema": 13, "Cough": 12, "Hypoaesthesia": 12, "Loss of consciousness": 12, "Seizure": 11, "Blood test": 10, "Oropharyngeal discomfort": 10, "Cold sweat": 9, "Palpitations": 9, "Pruritus": 9, "Abdominal pain": 8, "Fall": 8, "Myocarditis": 8, "Rash": 8, "Computerised tomogram": 7, "Hypersensitivity": 7, "Pain": 7, "Pain in extremity": 7, "Pallor": 7, "Investigation": 6, "Magnetic resonance imaging": 6, "Muscular weakness": 6, "Tachycardia": 6, "Altered state of consciousness": 5, "Arthralgia": 5, "Depressed level of consciousness": 5, "Magnetic resonance imaging head": 5, "Oxygen saturation decreased": 5, "SARS-CoV-2 test": 5, "Tremor": 5, "Vomiting": 5, "Arrhythmia": 4, "Asthenia": 4, "Asthma": 4, "Blood creatine phosphokinase": 4, "Chills": 4, "Coma scale": 4, "Dysphoria": 4, "Echocardiogram": 4, "Gait disturbance": 4, "Heart rate decreased": 4, "Heart rate increased": 4, "Myalgia": 4, "Oedema peripheral": 4, "Respiratory rate": 4, "Syncope": 4, "Vaccination site pain": 4, "Vital signs measurement": 4, "Wheezing": 4, "Acute disseminated encephalomyelitis": 3, "Angina pectoris": 3, "Bradycardia": 3, "CSF test": 3, "Condition aggravated": 3, "Decreased appetite": 3, "Disease recurrence": 3, "Epilepsy": 3, "Eye movement disorder": 3, "Feeling cold": 3, "Generalised tonic-clonic seizure": 3, "Guillain-Barre syndrome": 3, "Hyperhidrosis": 3, "Hypertension": 3, "Neuropathy peripheral": 3, "Peripheral coldness": 3, "Physical deconditioning": 3, "Platelet count": 3, "Sensation of foreign body": 3, "Suspected COVID-19": 3, "Throat irritation": 3, "Urticaria": 3, "Visual impairment": 3, "X-ray": 3, "Anaphylactic shock": 2, "Anxiety": 2, "Autoantibody test": 2, "Back pain": 2, "Blood albumin": 2, "Blood creatine phosphokinase MB": 2, "Blood creatinine": 2, "Breath sounds": 2, "C-reactive protein": 2, "CSF cell count": 2, "CSF cell count increased": 2, "CSF glucose": 2, "CSF protein": 2, "CSF protein increased": 2, "Cardiac dysfunction": 2, "Cardiomyopathy": 2, "Cerebral haemorrhage": 2, "Computerised tomogram head": 2, "Contusion": 2, "Drug ineffective": 2, "Dysmenorrhoea": 2, "Dysphonia": 2, "Ejection fraction": 2, "Electrocardiogram ambulatory": 2, "Encephalopathy": 2, "Facial paralysis": 2, "Feeling hot": 2, "Haematochezia": 2, "Heart sounds": 2, "Lymphadenopathy": 2, "Mouth swelling": 2, "Myelitis": 2, "Myocardial infarction": 2, "Oedema": 2, "Papule": 2, "Paraesthesia": 2, "Pharyngeal swelling": 2, "Platelet count decreased": 2, "Pneumonia": 2, "Protein urine": 2, "Shock": 2, "Somatic symptom disorder": 2, "Supraventricular tachycardia": 2, "Swelling": 2, "Swelling face": 2, "Systemic lupus erythematosus": 2, "Troponin T": 2, "Vaccination site induration": 2, "Viral myocarditis": 2, "White blood cell count": 2, "Abdominal pain upper": 1, "Adrenal insufficiency": 1, "Adrenocortical insufficiency acute": 1, "Alanine aminotransferase": 1, "Alopecia": 1, "Anti-aquaporin-4 antibody negative": 1, "Anti-ganglioside antibody": 1, "Anti-ganglioside antibody positive": 1, "Antibody test negative": 1, "Antinuclear antibody": 1, "Arteriogram": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atrioventricular block second degree": 1, "Auscultation": 1, "Autonomic dysreflexia": 1, "Band neutrophil percentage": 1, "Band neutrophil percentage increased": 1, "Behcet's syndrome": 1, "Biopsy heart": 1, "Biopsy skin": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase increased": 1, "Blood lactate dehydrogenase": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Brain herniation": 1, "Brain oedema": 1, "Brain stem infarction": 1, "Burning sensation": 1, "CSF glucose increased": 1, "CSF immunoglobulin": 1, "CSF immunoglobulin G index": 1, "CSF immunoglobulin increased": 1, "CSF oligoclonal band": 1, "CSF pressure": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Cerebral haematoma": 1, "Cerebral infarction": 1, "Chromaturia": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Conversion disorder": 1, "Coronary artery disease": 1, "Cytology": 1, "Death": 1, "Decerebrate posture": 1, "Decreased activity": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dermatitis bullous": 1, "Diagnostic procedure": 1, "Discomfort": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear, nose and throat examination": 1, "Eating disorder": 1, "Echocardiogram normal": 1, "Ejection fraction decreased": 1, "Ejection fraction normal": 1, "Electrocardiogram ST-T segment depression": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram change": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Epigastric discomfort": 1, "Erythema of eyelid": 1, "Eye pruritus": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Faeces soft": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Generalised oedema": 1, "Glomerulonephritis": 1, "Haemoptysis": 1, "Haemorrhage subcutaneous": 1, "Heavy menstrual bleeding": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Hernia": 1, "Herpes zoster": 1, "Hyperlipidaemia": 1, "Hyperreflexia": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hyporesponsive to stimuli": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Imaging procedure": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Joint ankylosis": 1, "Joint range of motion decreased": 1, "Laryngeal obstruction": 1, "Lethargy": 1, "Localised infection": 1, "Low density lipoprotein": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphoma": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging spinal": 1, "Medical observation": 1, "Menstruation delayed": 1, "Miller Fisher syndrome": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Monocyte percentage increased": 1, "Motor dysfunction": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Mutism": 1, "Mycobacterium test": 1, "Mycobacterium tuberculosis complex test": 1, "Myelitis transverse": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neurosis": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Nodule": 1, "Oculomotor study": 1, "Ophthalmic herpes zoster": 1, "Ophthalmological examination": 1, "Opticokinetic nystagmus tests": 1, "Paralysis": 1, "Paraneoplastic encephalomyelitis": 1, "Paraplegia": 1, "Partial seizures": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Personality change": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Post herpetic neuralgia": 1, "Protein total": 1, "Protein total increased": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary thrombosis": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pupils unequal": 1, "Purulent discharge": 1, "Putamen haemorrhage": 1, "Pyelonephritis acute": 1, "Quality of life decreased": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red blood cells urine positive": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Resuscitation": 1, "Rhabdomyolysis": 1, "Sarcoidosis": 1, "Scab": 1, "Scan brain": 1, "Sensory disturbance": 1, "Septic shock": 1, "Sinus tachycardia": 1, "Sjogren's syndrome": 1, "Smear test": 1, "Somatosensory evoked potentials": 1, "Stress cardiomyopathy": 1, "Swelling of eyelid": 1, "Tenderness": 1, "Tension": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Toothache": 1, "Toxic skin eruption": 1, "Tropical spastic paresis": 1, "Troponin": 1, "Troponin I": 1, "Type I hypersensitivity": 1, "Urinary occult blood": 1, "Urinary occult blood positive": 1, "Urine protein/creatinine ratio": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vascular malformation": 1, "Vasculitis": 1, "Visual field defect": 1, "Vitamin B12 deficiency": 1, "Weight decreased": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "White matter lesion": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "FF3622", "histograms": [{"histogram": {"Body temperature": 114, "Blood pressure measurement": 55, "Oxygen saturation": 41, "Heart rate": 37, "Anaphylactic reaction": 30, "Pyrexia": 30, "Dyspnoea": 25, "Nausea": 23, "Presyncope": 23, "Feeling abnormal": 21, "Blood pressure decreased": 18, "Headache": 18, "Blood pressure increased": 17, "Malaise": 17, "Dizziness": 15, "Electrocardiogram": 14, "Chest discomfort": 13, "Chest pain": 13, "Erythema": 13, "Cough": 12, "Hypoaesthesia": 12, "Loss of consciousness": 12, "Seizure": 11, "Blood test": 10, "Oropharyngeal discomfort": 10, "Cold sweat": 9, "Palpitations": 9, "Pruritus": 9, "Abdominal pain": 8, "Fall": 8, "Myocarditis": 8, "Rash": 8, "Computerised tomogram": 7, "Hypersensitivity": 7, "Pain": 7, "Pain in extremity": 7, "Pallor": 7, "Investigation": 6, "Magnetic resonance imaging": 6, "Muscular weakness": 6, "Tachycardia": 6, "Altered state of consciousness": 5, "Arthralgia": 5, "Depressed level of consciousness": 5, "Magnetic resonance imaging head": 5, "Oxygen saturation decreased": 5, "SARS-CoV-2 test": 5, "Tremor": 5, "Vomiting": 5, "Arrhythmia": 4, "Asthenia": 4, "Asthma": 4, "Blood creatine phosphokinase": 4, "Chills": 4, "Coma scale": 4, "Dysphoria": 4, "Echocardiogram": 4, "Gait disturbance": 4, "Heart rate decreased": 4, "Heart rate increased": 4, "Myalgia": 4, "Oedema peripheral": 4, "Respiratory rate": 4, "Syncope": 4, "Vaccination site pain": 4, "Vital signs measurement": 4, "Wheezing": 4, "Acute disseminated encephalomyelitis": 3, "Angina pectoris": 3, "Bradycardia": 3, "CSF test": 3, "Condition aggravated": 3, "Decreased appetite": 3, "Disease recurrence": 3, "Epilepsy": 3, "Eye movement disorder": 3, "Feeling cold": 3, "Generalised tonic-clonic seizure": 3, "Guillain-Barre syndrome": 3, "Hyperhidrosis": 3, "Hypertension": 3, "Neuropathy peripheral": 3, "Peripheral coldness": 3, "Physical deconditioning": 3, "Platelet count": 3, "Sensation of foreign body": 3, "Suspected COVID-19": 3, "Throat irritation": 3, "Urticaria": 3, "Visual impairment": 3, "X-ray": 3, "Anaphylactic shock": 2, "Anxiety": 2, "Autoantibody test": 2, "Back pain": 2, "Blood albumin": 2, "Blood creatine phosphokinase MB": 2, "Blood creatinine": 2, "Breath sounds": 2, "C-reactive protein": 2, "CSF cell count": 2, "CSF cell count increased": 2, "CSF glucose": 2, "CSF protein": 2, "CSF protein increased": 2, "Cardiac dysfunction": 2, "Cardiomyopathy": 2, "Cerebral haemorrhage": 2, "Computerised tomogram head": 2, "Contusion": 2, "Drug ineffective": 2, "Dysmenorrhoea": 2, "Dysphonia": 2, "Ejection fraction": 2, "Electrocardiogram ambulatory": 2, "Encephalopathy": 2, "Facial paralysis": 2, "Feeling hot": 2, "Haematochezia": 2, "Heart sounds": 2, "Lymphadenopathy": 2, "Mouth swelling": 2, "Myelitis": 2, "Myocardial infarction": 2, "Oedema": 2, "Papule": 2, "Paraesthesia": 2, "Pharyngeal swelling": 2, "Platelet count decreased": 2, "Pneumonia": 2, "Protein urine": 2, "Shock": 2, "Somatic symptom disorder": 2, "Supraventricular tachycardia": 2, "Swelling": 2, "Swelling face": 2, "Systemic lupus erythematosus": 2, "Troponin T": 2, "Vaccination site induration": 2, "Viral myocarditis": 2, "White blood cell count": 2, "Abdominal pain upper": 1, "Adrenal insufficiency": 1, "Adrenocortical insufficiency acute": 1, "Alanine aminotransferase": 1, "Alopecia": 1, "Anti-aquaporin-4 antibody negative": 1, "Anti-ganglioside antibody": 1, "Anti-ganglioside antibody positive": 1, "Antibody test negative": 1, "Antinuclear antibody": 1, "Arteriogram": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atrioventricular block second degree": 1, "Auscultation": 1, "Autonomic dysreflexia": 1, "Band neutrophil percentage": 1, "Band neutrophil percentage increased": 1, "Behcet's syndrome": 1, "Biopsy heart": 1, "Biopsy skin": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase increased": 1, "Blood lactate dehydrogenase": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Brain herniation": 1, "Brain oedema": 1, "Brain stem infarction": 1, "Burning sensation": 1, "CSF glucose increased": 1, "CSF immunoglobulin": 1, "CSF immunoglobulin G index": 1, "CSF immunoglobulin increased": 1, "CSF oligoclonal band": 1, "CSF pressure": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Cerebral haematoma": 1, "Cerebral infarction": 1, "Chromaturia": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Conversion disorder": 1, "Coronary artery disease": 1, "Cytology": 1, "Death": 1, "Decerebrate posture": 1, "Decreased activity": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dermatitis bullous": 1, "Diagnostic procedure": 1, "Discomfort": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear, nose and throat examination": 1, "Eating disorder": 1, "Echocardiogram normal": 1, "Ejection fraction decreased": 1, "Ejection fraction normal": 1, "Electrocardiogram ST-T segment depression": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram change": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Epigastric discomfort": 1, "Erythema of eyelid": 1, "Eye pruritus": 1, "Eyelid function disorder": 1, "Eyelid oedema": 1, "Faeces soft": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Generalised oedema": 1, "Glomerulonephritis": 1, "Haemoptysis": 1, "Haemorrhage subcutaneous": 1, "Heavy menstrual bleeding": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Hernia": 1, "Herpes zoster": 1, "Hyperlipidaemia": 1, "Hyperreflexia": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hyporesponsive to stimuli": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Imaging procedure": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Joint ankylosis": 1, "Joint range of motion decreased": 1, "Laryngeal obstruction": 1, "Lethargy": 1, "Localised infection": 1, "Low density lipoprotein": 1, "Lymphocyte morphology abnormal": 1, "Lymphocyte percentage": 1, "Lymphoma": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging spinal": 1, "Medical observation": 1, "Menstruation delayed": 1, "Miller Fisher syndrome": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Monocyte percentage increased": 1, "Motor dysfunction": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Mutism": 1, "Mycobacterium test": 1, "Mycobacterium tuberculosis complex test": 1, "Myelitis transverse": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neurosis": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Nodule": 1, "Oculomotor study": 1, "Ophthalmic herpes zoster": 1, "Ophthalmological examination": 1, "Opticokinetic nystagmus tests": 1, "Paralysis": 1, "Paraneoplastic encephalomyelitis": 1, "Paraplegia": 1, "Partial seizures": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Personality change": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Post herpetic neuralgia": 1, "Protein total": 1, "Protein total increased": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary thrombosis": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pupils unequal": 1, "Purulent discharge": 1, "Putamen haemorrhage": 1, "Pyelonephritis acute": 1, "Quality of life decreased": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red blood cells urine positive": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Resuscitation": 1, "Rhabdomyolysis": 1, "Sarcoidosis": 1, "Scab": 1, "Scan brain": 1, "Sensory disturbance": 1, "Septic shock": 1, "Sinus tachycardia": 1, "Sjogren's syndrome": 1, "Smear test": 1, "Somatosensory evoked potentials": 1, "Stress cardiomyopathy": 1, "Swelling of eyelid": 1, "Tenderness": 1, "Tension": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Toothache": 1, "Toxic skin eruption": 1, "Tropical spastic paresis": 1, "Troponin": 1, "Troponin I": 1, "Type I hypersensitivity": 1, "Urinary occult blood": 1, "Urinary occult blood positive": 1, "Urine protein/creatinine ratio": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vascular malformation": 1, "Vasculitis": 1, "Visual field defect": 1, "Vitamin B12 deficiency": 1, "Weight decreased": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "White matter lesion": 1, "Yawning": 1}, "batchcodes": ["FF3622"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF4202.json b/docs/data/histograms/Japan/FF4202.json
index 0995748f160..80e7893dda4 100644
--- a/docs/data/histograms/Japan/FF4202.json
+++ b/docs/data/histograms/Japan/FF4202.json
@@ -1 +1 @@
-{"batchcode": "FF4202", "histograms": [{"batchcodes": ["FF4202"], "histogram": {"Anaphylactic reaction": 1, "Asthma": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Erythema": 1, "Incorrect route of product administration": 1, "Nausea": 1, "Oxygen saturation": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4202", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Asthma": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Erythema": 1, "Incorrect route of product administration": 1, "Nausea": 1, "Oxygen saturation": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["FF4202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF4204.json b/docs/data/histograms/Japan/FF4204.json
index b36c3109635..8b92112d123 100644
--- a/docs/data/histograms/Japan/FF4204.json
+++ b/docs/data/histograms/Japan/FF4204.json
@@ -1 +1 @@
-{"batchcode": "FF4204", "histograms": [{"batchcodes": ["FF4204"], "histogram": {"Body temperature": 100, "Blood pressure measurement": 40, "Oxygen saturation": 36, "Heart rate": 33, "Presyncope": 26, "Anaphylactic reaction": 23, "Pyrexia": 20, "Blood pressure decreased": 18, "Nausea": 15, "Dyspnoea": 14, "Headache": 14, "Loss of consciousness": 13, "Blood test": 12, "Dizziness": 11, "Pruritus": 11, "Urticaria": 11, "Erythema": 10, "Malaise": 10, "Seizure": 10, "Blood pressure increased": 9, "Feeling abnormal": 9, "Hypoaesthesia": 9, "Pallor": 9, "Cold sweat": 8, "Dysphoria": 8, "Palpitations": 8, "Cough": 7, "Depressed level of consciousness": 7, "Muscular weakness": 7, "Chest X-ray": 6, "Electrocardiogram": 6, "Fall": 6, "Investigation": 6, "Rash": 6, "Computerised tomogram head": 5, "Heart rate decreased": 5, "Hyperhidrosis": 5, "Hyperventilation": 5, "Magnetic resonance imaging": 5, "Oropharyngeal discomfort": 5, "Oxygen saturation decreased": 5, "Back pain": 4, "Blood creatine phosphokinase": 4, "Bradycardia": 4, "Coma scale": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Diarrhoea": 4, "Fibrin D dimer": 4, "Hemiplegia": 4, "Musculoskeletal stiffness": 4, "Platelet count": 4, "SARS-CoV-2 test": 4, "Syncope": 4, "Vomiting": 4, "White blood cell count": 4, "Abdominal discomfort": 3, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Anaphylactic shock": 3, "Arthralgia": 3, "Blood pressure systolic": 3, "COVID-19": 3, "Cerebral infarction": 3, "Chest discomfort": 3, "Chest pain": 3, "Chills": 3, "Dysphonia": 3, "Dysstasia": 3, "Echocardiogram": 3, "Feeling cold": 3, "Haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Head discomfort": 3, "Heart rate increased": 3, "Hot flush": 3, "Myalgia": 3, "Neuropathy peripheral": 3, "Pain in extremity": 3, "Pericarditis": 3, "Platelet count decreased": 3, "Red blood cell count": 3, "Respiratory rate": 3, "Tremor": 3, "Ultrasound scan": 3, "Vaccination site pain": 3, "Visual impairment": 3, "Vital signs measurement": 3, "Wheezing": 3, "Activated partial thromboplastin time": 2, "Alanine aminotransferase increased": 2, "Antinuclear antibody": 2, "Anxiety": 2, "Arrhythmia": 2, "Arthritis": 2, "Aspartate aminotransferase increased": 2, "Asthenia": 2, "Blood fibrinogen": 2, "Blood pressure systolic decreased": 2, "Bronchitis": 2, "C-reactive protein increased": 2, "Cardiac failure": 2, "Cerebral haemorrhage": 2, "Collagen disorder": 2, "Contusion": 2, "Death": 2, "Dermatitis exfoliative generalised": 2, "Discomfort": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Eczema": 2, "Epilepsy": 2, "Eye pruritus": 2, "Fibrin degradation products": 2, "Flushing": 2, "Gait disturbance": 2, "Gastroenteritis": 2, "Haematocrit": 2, "Hepatic function abnormal": 2, "Magnetic resonance imaging head": 2, "Maternal exposure during pregnancy": 2, "Meningitis": 2, "Nasopharyngitis": 2, "Oedema": 2, "Pain": 2, "Pharyngitis": 2, "Physical deconditioning": 2, "Pleural effusion": 2, "Speech disorder": 2, "Tachycardia": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "X-ray": 2, "ADAMTS13 activity assay": 1, "ADAMTS13 inhibitor screen assay": 1, "Abdominal lymphadenopathy": 1, "Abdominal pain lower": 1, "Acute respiratory distress syndrome": 1, "Acute stress disorder": 1, "Allergic pharyngitis": 1, "Alopecia areata": 1, "Altered state of consciousness": 1, "Amaurosis fugax": 1, "Amniotic cavity infection": 1, "Angiogram": 1, "Anosmia": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-thyroid antibody": 1, "Anti-thyroid antibody increased": 1, "Antinuclear antibody positive": 1, "Aphasia": 1, "Aphthous ulcer": 1, "Apnoea": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autonomic dysreflexia": 1, "Behcet's syndrome": 1, "Blood albumin": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure diastolic decreased": 1, "Blood smear test": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac failure acute": 1, "Catheterisation cardiac": 1, "Cerebral thrombosis": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Cholangitis acute": 1, "Clubbing": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Conjunctival telangiectasia": 1, "Constipation": 1, "Coronavirus test": 1, "Culture": 1, "Cytomegalovirus infection": 1, "Deep vein thrombosis": 1, "Dermatitis allergic": 1, "Dermatitis bullous": 1, "Disorientation": 1, "Dizziness postural": 1, "Double stranded DNA antibody": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Dyslalia": 1, "Electrocardiogram Q wave abnormal": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram ST segment elevation": 1, "Electrolyte imbalance": 1, "Embolism": 1, "Endoscopy upper gastrointestinal tract": 1, "Epstein-Barr viraemia": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelids pruritus": 1, "Facial paralysis": 1, "Fatigue": 1, "Funisitis": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal mucosal disorder": 1, "Gaze palsy": 1, "General physical condition": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Haemolytic anaemia": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Heart sounds": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatitis": 1, "Histology": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypotension": 1, "Hypothyroidism": 1, "Hypoxia": 1, "Immune thrombocytopenia": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "International normalised ratio": 1, "International normalised ratio increased": 1, "Joint swelling": 1, "Laboratory test": 1, "Laryngeal discomfort": 1, "Laryngopharyngitis": 1, "Lip disorder": 1, "Liver disorder": 1, "Liver function test": 1, "Lung disorder": 1, "Lung opacity": 1, "Lymphocyte morphology abnormal": 1, "Macular opacity": 1, "Mobility decreased": 1, "Motor dysfunction": 1, "Mouth haemorrhage": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Myelitis": 1, "Myocarditis": 1, "Myofascial pain syndrome": 1, "Neoplasm progression": 1, "Nephrotic syndrome": 1, "Neurological symptom": 1, "Nodal rhythm": 1, "Nystagmus": 1, "Ocular hyperaemia": 1, "Oesophageal ulcer": 1, "Off label use": 1, "Olfactory dysfunction": 1, "Olfactory test": 1, "Optical coherence tomography": 1, "PO2": 1, "Panic attack": 1, "Paraesthesia": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Petechiae": 1, "Platelet aggregation test": 1, "Platelet factor 4": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Premature baby": 1, "Premature rupture of membranes": 1, "Product administered at inappropriate site": 1, "Product use issue": 1, "Protein urine": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Prurigo": 1, "Pulmonary artery thrombosis": 1, "Pulmonary congestion": 1, "Pulmonary fibrosis": 1, "Pupillary light reflex tests": 1, "Putamen haemorrhage": 1, "Red blood cell abnormality": 1, "Red blood cell analysis": 1, "Renal disorder": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory distress": 1, "Respiratory symptom": 1, "Retinal haemorrhage": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Sensory disturbance": 1, "Septic shock": 1, "Serology test": 1, "Shoulder injury related to vaccine administration": 1, "Sitting disability": 1, "Somnolence": 1, "Stenosis": 1, "Streptococcus test": 1, "Streptococcus test positive": 1, "Suicide threat": 1, "Supraventricular tachycardia": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Taste disorder": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic thrombocytopenic purpura": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Tri-iodothyronine free": 1, "Tri-iodothyronine free increased": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Upper airway obstruction": 1, "Urinary retention": 1, "Vaccination failure": 1, "Ventricular extrasystoles": 1, "Ventricular fibrillation": 1, "Vertebral lesion": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Volvulus": 1, "Vulval ulceration": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4204", "histograms": [{"histogram": {"Body temperature": 100, "Blood pressure measurement": 40, "Oxygen saturation": 36, "Heart rate": 33, "Presyncope": 26, "Anaphylactic reaction": 23, "Pyrexia": 20, "Blood pressure decreased": 18, "Nausea": 15, "Dyspnoea": 14, "Headache": 14, "Loss of consciousness": 13, "Blood test": 12, "Dizziness": 11, "Pruritus": 11, "Urticaria": 11, "Erythema": 10, "Malaise": 10, "Seizure": 10, "Blood pressure increased": 9, "Feeling abnormal": 9, "Hypoaesthesia": 9, "Pallor": 9, "Cold sweat": 8, "Dysphoria": 8, "Palpitations": 8, "Cough": 7, "Depressed level of consciousness": 7, "Muscular weakness": 7, "Chest X-ray": 6, "Electrocardiogram": 6, "Fall": 6, "Investigation": 6, "Rash": 6, "Computerised tomogram head": 5, "Heart rate decreased": 5, "Hyperhidrosis": 5, "Hyperventilation": 5, "Magnetic resonance imaging": 5, "Oropharyngeal discomfort": 5, "Oxygen saturation decreased": 5, "Back pain": 4, "Blood creatine phosphokinase": 4, "Bradycardia": 4, "Coma scale": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Diarrhoea": 4, "Fibrin D dimer": 4, "Hemiplegia": 4, "Musculoskeletal stiffness": 4, "Platelet count": 4, "SARS-CoV-2 test": 4, "Syncope": 4, "Vomiting": 4, "White blood cell count": 4, "Abdominal discomfort": 3, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Anaphylactic shock": 3, "Arthralgia": 3, "Blood pressure systolic": 3, "COVID-19": 3, "Cerebral infarction": 3, "Chest discomfort": 3, "Chest pain": 3, "Chills": 3, "Dysphonia": 3, "Dysstasia": 3, "Echocardiogram": 3, "Feeling cold": 3, "Haemoglobin": 3, "Haemorrhage subcutaneous": 3, "Head discomfort": 3, "Heart rate increased": 3, "Hot flush": 3, "Myalgia": 3, "Neuropathy peripheral": 3, "Pain in extremity": 3, "Pericarditis": 3, "Platelet count decreased": 3, "Red blood cell count": 3, "Respiratory rate": 3, "Tremor": 3, "Ultrasound scan": 3, "Vaccination site pain": 3, "Visual impairment": 3, "Vital signs measurement": 3, "Wheezing": 3, "Activated partial thromboplastin time": 2, "Alanine aminotransferase increased": 2, "Antinuclear antibody": 2, "Anxiety": 2, "Arrhythmia": 2, "Arthritis": 2, "Aspartate aminotransferase increased": 2, "Asthenia": 2, "Blood fibrinogen": 2, "Blood pressure systolic decreased": 2, "Bronchitis": 2, "C-reactive protein increased": 2, "Cardiac failure": 2, "Cerebral haemorrhage": 2, "Collagen disorder": 2, "Contusion": 2, "Death": 2, "Dermatitis exfoliative generalised": 2, "Discomfort": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Eczema": 2, "Epilepsy": 2, "Eye pruritus": 2, "Fibrin degradation products": 2, "Flushing": 2, "Gait disturbance": 2, "Gastroenteritis": 2, "Haematocrit": 2, "Hepatic function abnormal": 2, "Magnetic resonance imaging head": 2, "Maternal exposure during pregnancy": 2, "Meningitis": 2, "Nasopharyngitis": 2, "Oedema": 2, "Pain": 2, "Pharyngitis": 2, "Physical deconditioning": 2, "Pleural effusion": 2, "Speech disorder": 2, "Tachycardia": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "X-ray": 2, "ADAMTS13 activity assay": 1, "ADAMTS13 inhibitor screen assay": 1, "Abdominal lymphadenopathy": 1, "Abdominal pain lower": 1, "Acute respiratory distress syndrome": 1, "Acute stress disorder": 1, "Allergic pharyngitis": 1, "Alopecia areata": 1, "Altered state of consciousness": 1, "Amaurosis fugax": 1, "Amniotic cavity infection": 1, "Angiogram": 1, "Anosmia": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-thyroid antibody": 1, "Anti-thyroid antibody increased": 1, "Antinuclear antibody positive": 1, "Aphasia": 1, "Aphthous ulcer": 1, "Apnoea": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autonomic dysreflexia": 1, "Behcet's syndrome": 1, "Blood albumin": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure diastolic decreased": 1, "Blood smear test": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac failure acute": 1, "Catheterisation cardiac": 1, "Cerebral thrombosis": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Cholangitis acute": 1, "Clubbing": 1, "Coagulation test": 1, "Cognitive disorder": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Conjunctival telangiectasia": 1, "Constipation": 1, "Coronavirus test": 1, "Culture": 1, "Cytomegalovirus infection": 1, "Deep vein thrombosis": 1, "Dermatitis allergic": 1, "Dermatitis bullous": 1, "Disorientation": 1, "Dizziness postural": 1, "Double stranded DNA antibody": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Dyslalia": 1, "Electrocardiogram Q wave abnormal": 1, "Electrocardiogram QRS complex prolonged": 1, "Electrocardiogram ST segment elevation": 1, "Electrolyte imbalance": 1, "Embolism": 1, "Endoscopy upper gastrointestinal tract": 1, "Epstein-Barr viraemia": 1, "Erythema of eyelid": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelids pruritus": 1, "Facial paralysis": 1, "Fatigue": 1, "Funisitis": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal mucosal disorder": 1, "Gaze palsy": 1, "General physical condition": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Haemolytic anaemia": 1, "Haemorrhagic diathesis": 1, "Head injury": 1, "Heart sounds": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatitis": 1, "Histology": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypotension": 1, "Hypothyroidism": 1, "Hypoxia": 1, "Immune thrombocytopenia": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "International normalised ratio": 1, "International normalised ratio increased": 1, "Joint swelling": 1, "Laboratory test": 1, "Laryngeal discomfort": 1, "Laryngopharyngitis": 1, "Lip disorder": 1, "Liver disorder": 1, "Liver function test": 1, "Lung disorder": 1, "Lung opacity": 1, "Lymphocyte morphology abnormal": 1, "Macular opacity": 1, "Mobility decreased": 1, "Motor dysfunction": 1, "Mouth haemorrhage": 1, "Muscle rigidity": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Myelitis": 1, "Myocarditis": 1, "Myofascial pain syndrome": 1, "Neoplasm progression": 1, "Nephrotic syndrome": 1, "Neurological symptom": 1, "Nodal rhythm": 1, "Nystagmus": 1, "Ocular hyperaemia": 1, "Oesophageal ulcer": 1, "Off label use": 1, "Olfactory dysfunction": 1, "Olfactory test": 1, "Optical coherence tomography": 1, "PO2": 1, "Panic attack": 1, "Paraesthesia": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Petechiae": 1, "Platelet aggregation test": 1, "Platelet factor 4": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Premature baby": 1, "Premature rupture of membranes": 1, "Product administered at inappropriate site": 1, "Product use issue": 1, "Protein urine": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Prurigo": 1, "Pulmonary artery thrombosis": 1, "Pulmonary congestion": 1, "Pulmonary fibrosis": 1, "Pupillary light reflex tests": 1, "Putamen haemorrhage": 1, "Red blood cell abnormality": 1, "Red blood cell analysis": 1, "Renal disorder": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory distress": 1, "Respiratory symptom": 1, "Retinal haemorrhage": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Sensory disturbance": 1, "Septic shock": 1, "Serology test": 1, "Shoulder injury related to vaccine administration": 1, "Sitting disability": 1, "Somnolence": 1, "Stenosis": 1, "Streptococcus test": 1, "Streptococcus test positive": 1, "Suicide threat": 1, "Supraventricular tachycardia": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Taste disorder": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thrombotic thrombocytopenic purpura": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Tri-iodothyronine free": 1, "Tri-iodothyronine free increased": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Upper airway obstruction": 1, "Urinary retention": 1, "Vaccination failure": 1, "Ventricular extrasystoles": 1, "Ventricular fibrillation": 1, "Vertebral lesion": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Volvulus": 1, "Vulval ulceration": 1, "White blood cell count decreased": 1}, "batchcodes": ["FF4204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF5357.json b/docs/data/histograms/Japan/FF5357.json
index f2562644316..db596391481 100644
--- a/docs/data/histograms/Japan/FF5357.json
+++ b/docs/data/histograms/Japan/FF5357.json
@@ -1 +1 @@
-{"batchcode": "FF5357", "histograms": [{"batchcodes": ["FF5357"], "histogram": {"Body temperature": 56, "Blood pressure measurement": 30, "Oxygen saturation": 22, "Anaphylactic reaction": 18, "Heart rate": 17, "Presyncope": 17, "Blood pressure decreased": 14, "Feeling abnormal": 11, "Hypoaesthesia": 11, "Dyspnoea": 10, "Headache": 9, "Pyrexia": 9, "Nausea": 8, "Dizziness": 6, "Dysphoria": 6, "Electrocardiogram": 6, "Loss of consciousness": 6, "Malaise": 6, "Syncope": 6, "Cold sweat": 5, "Fall": 5, "Oropharyngeal discomfort": 5, "Rash": 5, "Urticaria": 5, "Vomiting": 5, "Arthralgia": 4, "Blood test": 4, "Erythema": 4, "Magnetic resonance imaging": 4, "Magnetic resonance imaging head": 4, "Muscular weakness": 4, "Pain in extremity": 4, "Pallor": 4, "Pruritus": 4, "Seizure": 4, "Vital signs measurement": 4, "Blood pressure increased": 3, "Chest discomfort": 3, "Chest pain": 3, "Depressed level of consciousness": 3, "Eye pain": 3, "Facial paralysis": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Investigation": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Respiratory rate": 3, "Shock": 3, "Throat tightness": 3, "Abdominal pain": 2, "Abdominal pain lower": 2, "Arthritis": 2, "Asthenia": 2, "Asthma": 2, "Bradycardia": 2, "Cough": 2, "Cyanosis": 2, "Diarrhoea": 2, "Echocardiogram": 2, "Foetal movement disorder": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hypotension": 2, "Maternal exposure during pregnancy": 2, "Myocarditis": 2, "Neck pain": 2, "Pain": 2, "Palpitations": 2, "Pericardial effusion": 2, "Physical deconditioning": 2, "Rhinorrhoea": 2, "Shoulder injury related to vaccine administration": 2, "Sneezing": 2, "Tachypnoea": 2, "Tremor": 2, "Vaccination site pain": 2, "Acute disseminated encephalomyelitis": 1, "Acute macular neuroretinopathy": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alopecia areata": 1, "Anosmia": 1, "Antibody test": 1, "Apgar score": 1, "Apgar score abnormal": 1, "Aspartate aminotransferase": 1, "Auscultation": 1, "Autoantibody test": 1, "Axillary pain": 1, "Bedridden": 1, "Biopsy heart": 1, "Blister": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood pressure systolic increased": 1, "Bronchospasm": 1, "Bundle branch block right": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "CSF volume": 1, "Caesarean section": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Chest X-ray": 1, "Coma scale": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Delirium": 1, "Dental alveolar anomaly": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Electrocardiogram ST segment elevation": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Eye oedema": 1, "Facial pain": 1, "Feeling cold": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haemoglobin": 1, "Head injury": 1, "Herpes virus infection": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Infection in an immunocompromised host": 1, "Infection susceptibility increased": 1, "Injury": 1, "Joint effusion": 1, "Joint range of motion decreased": 1, "Limb discomfort": 1, "Lip oedema": 1, "Loose tooth": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging neck": 1, "Meconium stain": 1, "Memory impairment": 1, "Mite allergy": 1, "Moaning": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Muscle tightness": 1, "Myocardial necrosis marker increased": 1, "Myositis": 1, "Neonatal asphyxia": 1, "Nervousness": 1, "Neuralgia": 1, "Oedema": 1, "Oedema mouth": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PO2": 1, "Paraesthesia": 1, "Periarthritis": 1, "Pericarditis": 1, "Peripheral nerve injury": 1, "Peripheral swelling": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Preterm premature rupture of membranes": 1, "Product administered at inappropriate site": 1, "Product use issue": 1, "Pulse abnormal": 1, "Respiratory distress": 1, "Scar": 1, "Selective eating disorder": 1, "Sensation of foreign body": 1, "Skin ulcer": 1, "Specialist consultation": 1, "Spinal osteoarthritis": 1, "Stillbirth": 1, "Stomatitis": 1, "Stridor": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swollen tongue": 1, "Tendonitis": 1, "Tinnitus": 1, "Tooth fracture": 1, "Troponin": 1, "Troponin I": 1, "Troponin T": 1, "Troponin T increased": 1, "Urinary incontinence": 1, "Urine ketone body": 1, "Urine ketone body present": 1, "Vertigo": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual brightness": 1, "Visual impairment": 1, "Wheezing": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5357", "histograms": [{"histogram": {"Body temperature": 56, "Blood pressure measurement": 30, "Oxygen saturation": 22, "Anaphylactic reaction": 18, "Heart rate": 17, "Presyncope": 17, "Blood pressure decreased": 14, "Feeling abnormal": 11, "Hypoaesthesia": 11, "Dyspnoea": 10, "Headache": 9, "Pyrexia": 9, "Nausea": 8, "Dizziness": 6, "Dysphoria": 6, "Electrocardiogram": 6, "Loss of consciousness": 6, "Malaise": 6, "Syncope": 6, "Cold sweat": 5, "Fall": 5, "Oropharyngeal discomfort": 5, "Rash": 5, "Urticaria": 5, "Vomiting": 5, "Arthralgia": 4, "Blood test": 4, "Erythema": 4, "Magnetic resonance imaging": 4, "Magnetic resonance imaging head": 4, "Muscular weakness": 4, "Pain in extremity": 4, "Pallor": 4, "Pruritus": 4, "Seizure": 4, "Vital signs measurement": 4, "Blood pressure increased": 3, "Chest discomfort": 3, "Chest pain": 3, "Depressed level of consciousness": 3, "Eye pain": 3, "Facial paralysis": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Investigation": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Respiratory rate": 3, "Shock": 3, "Throat tightness": 3, "Abdominal pain": 2, "Abdominal pain lower": 2, "Arthritis": 2, "Asthenia": 2, "Asthma": 2, "Bradycardia": 2, "Cough": 2, "Cyanosis": 2, "Diarrhoea": 2, "Echocardiogram": 2, "Foetal movement disorder": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hypotension": 2, "Maternal exposure during pregnancy": 2, "Myocarditis": 2, "Neck pain": 2, "Pain": 2, "Palpitations": 2, "Pericardial effusion": 2, "Physical deconditioning": 2, "Rhinorrhoea": 2, "Shoulder injury related to vaccine administration": 2, "Sneezing": 2, "Tachypnoea": 2, "Tremor": 2, "Vaccination site pain": 2, "Acute disseminated encephalomyelitis": 1, "Acute macular neuroretinopathy": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alopecia areata": 1, "Anosmia": 1, "Antibody test": 1, "Apgar score": 1, "Apgar score abnormal": 1, "Aspartate aminotransferase": 1, "Auscultation": 1, "Autoantibody test": 1, "Axillary pain": 1, "Bedridden": 1, "Biopsy heart": 1, "Blister": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood pressure systolic increased": 1, "Bronchospasm": 1, "Bundle branch block right": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "CSF volume": 1, "Caesarean section": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Chest X-ray": 1, "Coma scale": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Delirium": 1, "Dental alveolar anomaly": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Drug eruption": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Electrocardiogram ST segment elevation": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Eye oedema": 1, "Facial pain": 1, "Feeling cold": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Generalised oedema": 1, "Glomerular filtration rate": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haemoglobin": 1, "Head injury": 1, "Herpes virus infection": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Infection in an immunocompromised host": 1, "Infection susceptibility increased": 1, "Injury": 1, "Joint effusion": 1, "Joint range of motion decreased": 1, "Limb discomfort": 1, "Lip oedema": 1, "Loose tooth": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging neck": 1, "Meconium stain": 1, "Memory impairment": 1, "Mite allergy": 1, "Moaning": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Muscle tightness": 1, "Myocardial necrosis marker increased": 1, "Myositis": 1, "Neonatal asphyxia": 1, "Nervousness": 1, "Neuralgia": 1, "Oedema": 1, "Oedema mouth": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PO2": 1, "Paraesthesia": 1, "Periarthritis": 1, "Pericarditis": 1, "Peripheral nerve injury": 1, "Peripheral swelling": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Preterm premature rupture of membranes": 1, "Product administered at inappropriate site": 1, "Product use issue": 1, "Pulse abnormal": 1, "Respiratory distress": 1, "Scar": 1, "Selective eating disorder": 1, "Sensation of foreign body": 1, "Skin ulcer": 1, "Specialist consultation": 1, "Spinal osteoarthritis": 1, "Stillbirth": 1, "Stomatitis": 1, "Stridor": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swollen tongue": 1, "Tendonitis": 1, "Tinnitus": 1, "Tooth fracture": 1, "Troponin": 1, "Troponin I": 1, "Troponin T": 1, "Troponin T increased": 1, "Urinary incontinence": 1, "Urine ketone body": 1, "Urine ketone body present": 1, "Vertigo": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual brightness": 1, "Visual impairment": 1, "Wheezing": 1, "White blood cell count": 1}, "batchcodes": ["FF5357"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF5790.json b/docs/data/histograms/Japan/FF5790.json
index 894252b2e15..8533d8f2ac2 100644
--- a/docs/data/histograms/Japan/FF5790.json
+++ b/docs/data/histograms/Japan/FF5790.json
@@ -1 +1 @@
-{"batchcode": "FF5790", "histograms": [{"batchcodes": ["FF5790"], "histogram": {"Body temperature": 1, "Oxygen saturation": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5790", "histograms": [{"histogram": {"Body temperature": 1, "Oxygen saturation": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["FF5790"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF9942.json b/docs/data/histograms/Japan/FF9942.json
index ee56aa7aca4..ef872bb56f0 100644
--- a/docs/data/histograms/Japan/FF9942.json
+++ b/docs/data/histograms/Japan/FF9942.json
@@ -1 +1 @@
-{"batchcode": "FF9942", "histograms": [{"batchcodes": ["FF9942"], "histogram": {"Body temperature": 71, "Blood pressure measurement": 27, "Nausea": 18, "Oxygen saturation": 17, "Heart rate": 15, "Pyrexia": 15, "Anaphylactic reaction": 14, "Presyncope": 14, "Blood pressure decreased": 12, "Dyspnoea": 12, "Loss of consciousness": 11, "Oropharyngeal discomfort": 11, "Headache": 10, "Hypoaesthesia": 10, "Investigation": 10, "Fall": 9, "Vomiting": 9, "Cough": 8, "Feeling abnormal": 8, "Pallor": 8, "Seizure": 8, "Syncope": 8, "Arthralgia": 7, "Depressed level of consciousness": 6, "Malaise": 6, "Pruritus": 6, "Asthenia": 5, "Blood pressure increased": 5, "Blood test": 5, "Drug ineffective": 5, "Magnetic resonance imaging": 5, "Myocarditis": 5, "Neck pain": 5, "Suspected COVID-19": 5, "Vital signs measurement": 5, "Epilepsy": 4, "Erythema": 4, "Oropharyngeal pain": 4, "Pain": 4, "Pain in extremity": 4, "Palpitations": 4, "SARS-CoV-2 test": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Anaphylactic shock": 3, "Aspartate aminotransferase": 3, "Auscultation": 3, "C-reactive protein": 3, "Cold sweat": 3, "Decreased appetite": 3, "Dizziness": 3, "Dysphoria": 3, "Gamma-glutamyltransferase": 3, "Heart rate increased": 3, "Magnetic resonance imaging head": 3, "Myocardial infarction": 3, "Nerve conduction studies": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Pharyngeal oedema": 3, "Platelet count": 3, "Speech disorder": 3, "Wheezing": 3, "Altered state of consciousness": 2, "Arrhythmia": 2, "Arthritis": 2, "Asthma": 2, "Back pain": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "Computerised tomogram": 2, "Computerised tomogram head": 2, "Condition aggravated": 2, "Electroencephalogram": 2, "Facial paralysis": 2, "Feeling hot": 2, "Guillain-Barre syndrome": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Hyperhidrosis": 2, "Magnetic resonance imaging neck": 2, "Muscular weakness": 2, "Myocardial necrosis marker": 2, "Myocardial necrosis marker increased": 2, "Nasal congestion": 2, "Neuralgia": 2, "Neurological examination": 2, "Oedema peripheral": 2, "Platelet count decreased": 2, "Respiratory rate": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Throat tightness": 2, "Vaccination site pain": 2, "Weight": 2, "Weight decreased": 2, "White blood cell count": 2, "Abdominal pain upper": 1, "Alanine aminotransferase normal": 1, "Alopecia": 1, "Alopecia areata": 1, "Anaemia": 1, "Angiocardiogram": 1, "Aspartate aminotransferase increased": 1, "Atrial fibrillation": 1, "Autoantibody test": 1, "Autonomic nervous system imbalance": 1, "Autonomic neuropathy": 1, "Biopsy bone marrow": 1, "Biopsy heart": 1, "Biopsy kidney": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood pressure diastolic increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Brain compression": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Bronchostenosis": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac failure acute": 1, "Cardiac valve sclerosis": 1, "Cardio-respiratory arrest": 1, "Carotid artery disease": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Cervical radiculopathy": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Colonoscopy": 1, "Coma scale": 1, "Complement factor": 1, "Complement factor increased": 1, "Computerised tomogram head normal": 1, "Computerised tomogram thorax abnormal": 1, "Congenital arterial malformation": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Conversion disorder": 1, "Coronary artery disease": 1, "Coronavirus test": 1, "DNA antibody": 1, "Dehydration": 1, "Dementia Alzheimer's type": 1, "Diarrhoea": 1, "Dissociative disorder": 1, "Diverticulum intestinal haemorrhagic": 1, "Dysphonia": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment elevation": 1, "Electroencephalogram abnormal": 1, "Encephalitis": 1, "Encephalopathy": 1, "Enthesopathy": 1, "Erythema of eyelid": 1, "Extrasystoles": 1, "Eyelid oedema": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase increased": 1, "Generalised tonic-clonic seizure": 1, "HLA marker study": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemorrhage intracranial": 1, "Haemorrhage subcutaneous": 1, "Hemiparesis": 1, "Henoch-Schonlein purpura": 1, "Henoch-Schonlein purpura nephritis": 1, "Hot flush": 1, "Hydrocephalus": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypothermia": 1, "Immune thrombocytopenia": 1, "Incorrect dosage administered": 1, "Insomnia": 1, "Intraventricular haemorrhage": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Kidney congestion": 1, "Laboratory test": 1, "Left ventricular dysfunction": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Myocardial necrosis": 1, "Nephrotic syndrome": 1, "Neuralgic amyotrophy": 1, "Oedema": 1, "Oedema mucosal": 1, "Orthostatic intolerance": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Petechiae": 1, "Pharyngeal erythema": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Polymicrogyria": 1, "Postural orthostatic tachycardia syndrome": 1, "Productive cough": 1, "Protein urine": 1, "Prothrombin time": 1, "Prothrombin time abnormal": 1, "Pulmonary function test": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Radial pulse abnormal": 1, "Rash": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Renal failure": 1, "Renal tubular necrosis": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory rate decreased": 1, "Respiratory tract infection": 1, "Resuscitation": 1, "Shock": 1, "Spinal osteoarthritis": 1, "Spinal stenosis": 1, "Stertor": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Tenosynovitis": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombotic cerebral infarction": 1, "Tinnitus": 1, "Tremor": 1, "Troponin I": 1, "Troponin T": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site joint movement impairment": 1, "Vaccination site swelling": 1, "Vaccination site thrombosis": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Viral infection": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FF9942", "histograms": [{"histogram": {"Body temperature": 71, "Blood pressure measurement": 27, "Nausea": 18, "Oxygen saturation": 17, "Heart rate": 15, "Pyrexia": 15, "Anaphylactic reaction": 14, "Presyncope": 14, "Blood pressure decreased": 12, "Dyspnoea": 12, "Loss of consciousness": 11, "Oropharyngeal discomfort": 11, "Headache": 10, "Hypoaesthesia": 10, "Investigation": 10, "Fall": 9, "Vomiting": 9, "Cough": 8, "Feeling abnormal": 8, "Pallor": 8, "Seizure": 8, "Syncope": 8, "Arthralgia": 7, "Depressed level of consciousness": 6, "Malaise": 6, "Pruritus": 6, "Asthenia": 5, "Blood pressure increased": 5, "Blood test": 5, "Drug ineffective": 5, "Magnetic resonance imaging": 5, "Myocarditis": 5, "Neck pain": 5, "Suspected COVID-19": 5, "Vital signs measurement": 5, "Epilepsy": 4, "Erythema": 4, "Oropharyngeal pain": 4, "Pain": 4, "Pain in extremity": 4, "Palpitations": 4, "SARS-CoV-2 test": 4, "Abdominal pain": 3, "Alanine aminotransferase": 3, "Anaphylactic shock": 3, "Aspartate aminotransferase": 3, "Auscultation": 3, "C-reactive protein": 3, "Cold sweat": 3, "Decreased appetite": 3, "Dizziness": 3, "Dysphoria": 3, "Gamma-glutamyltransferase": 3, "Heart rate increased": 3, "Magnetic resonance imaging head": 3, "Myocardial infarction": 3, "Nerve conduction studies": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Pharyngeal oedema": 3, "Platelet count": 3, "Speech disorder": 3, "Wheezing": 3, "Altered state of consciousness": 2, "Arrhythmia": 2, "Arthritis": 2, "Asthma": 2, "Back pain": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "Computerised tomogram": 2, "Computerised tomogram head": 2, "Condition aggravated": 2, "Electroencephalogram": 2, "Facial paralysis": 2, "Feeling hot": 2, "Guillain-Barre syndrome": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Hyperhidrosis": 2, "Magnetic resonance imaging neck": 2, "Muscular weakness": 2, "Myocardial necrosis marker": 2, "Myocardial necrosis marker increased": 2, "Nasal congestion": 2, "Neuralgia": 2, "Neurological examination": 2, "Oedema peripheral": 2, "Platelet count decreased": 2, "Respiratory rate": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Throat tightness": 2, "Vaccination site pain": 2, "Weight": 2, "Weight decreased": 2, "White blood cell count": 2, "Abdominal pain upper": 1, "Alanine aminotransferase normal": 1, "Alopecia": 1, "Alopecia areata": 1, "Anaemia": 1, "Angiocardiogram": 1, "Aspartate aminotransferase increased": 1, "Atrial fibrillation": 1, "Autoantibody test": 1, "Autonomic nervous system imbalance": 1, "Autonomic neuropathy": 1, "Biopsy bone marrow": 1, "Biopsy heart": 1, "Biopsy kidney": 1, "Blood alkaline phosphatase": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood pressure diastolic increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Brain compression": 1, "Brain natriuretic peptide": 1, "Brain stem haemorrhage": 1, "Bronchostenosis": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF test": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac failure acute": 1, "Cardiac valve sclerosis": 1, "Cardio-respiratory arrest": 1, "Carotid artery disease": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Cervical radiculopathy": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Colonoscopy": 1, "Coma scale": 1, "Complement factor": 1, "Complement factor increased": 1, "Computerised tomogram head normal": 1, "Computerised tomogram thorax abnormal": 1, "Congenital arterial malformation": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Conversion disorder": 1, "Coronary artery disease": 1, "Coronavirus test": 1, "DNA antibody": 1, "Dehydration": 1, "Dementia Alzheimer's type": 1, "Diarrhoea": 1, "Dissociative disorder": 1, "Diverticulum intestinal haemorrhagic": 1, "Dysphonia": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment elevation": 1, "Electroencephalogram abnormal": 1, "Encephalitis": 1, "Encephalopathy": 1, "Enthesopathy": 1, "Erythema of eyelid": 1, "Extrasystoles": 1, "Eyelid oedema": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase increased": 1, "Generalised tonic-clonic seizure": 1, "HLA marker study": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemorrhage intracranial": 1, "Haemorrhage subcutaneous": 1, "Hemiparesis": 1, "Henoch-Schonlein purpura": 1, "Henoch-Schonlein purpura nephritis": 1, "Hot flush": 1, "Hydrocephalus": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypothermia": 1, "Immune thrombocytopenia": 1, "Incorrect dosage administered": 1, "Insomnia": 1, "Intraventricular haemorrhage": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Kidney congestion": 1, "Laboratory test": 1, "Left ventricular dysfunction": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Myocardial necrosis": 1, "Nephrotic syndrome": 1, "Neuralgic amyotrophy": 1, "Oedema": 1, "Oedema mucosal": 1, "Orthostatic intolerance": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Petechiae": 1, "Pharyngeal erythema": 1, "Pharyngeal stenosis": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Polymicrogyria": 1, "Postural orthostatic tachycardia syndrome": 1, "Productive cough": 1, "Protein urine": 1, "Prothrombin time": 1, "Prothrombin time abnormal": 1, "Pulmonary function test": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "Radial pulse abnormal": 1, "Rash": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Renal failure": 1, "Renal tubular necrosis": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory rate decreased": 1, "Respiratory tract infection": 1, "Resuscitation": 1, "Shock": 1, "Spinal osteoarthritis": 1, "Spinal stenosis": 1, "Stertor": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Tenosynovitis": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombotic cerebral infarction": 1, "Tinnitus": 1, "Tremor": 1, "Troponin I": 1, "Troponin T": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site joint movement impairment": 1, "Vaccination site swelling": 1, "Vaccination site thrombosis": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Viral infection": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["FF9942"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FF9944.json b/docs/data/histograms/Japan/FF9944.json
index cc02d01087d..c0e68bb052f 100644
--- a/docs/data/histograms/Japan/FF9944.json
+++ b/docs/data/histograms/Japan/FF9944.json
@@ -1 +1 @@
-{"batchcode": "FF9944", "histograms": [{"batchcodes": ["FF9944"], "histogram": {"Body temperature": 73, "Blood pressure measurement": 39, "Oxygen saturation": 29, "Heart rate": 25, "Blood pressure decreased": 21, "Dyspnoea": 19, "Presyncope": 17, "Anaphylactic reaction": 15, "Nausea": 15, "Loss of consciousness": 13, "Pyrexia": 13, "Fall": 12, "Blood test": 11, "Feeling abnormal": 11, "Cough": 9, "Dizziness": 9, "Pruritus": 9, "Rash": 9, "Headache": 8, "Hypoaesthesia": 8, "Seizure": 8, "Blood pressure increased": 7, "Chest pain": 7, "Depressed level of consciousness": 7, "Erythema": 7, "Magnetic resonance imaging": 7, "Muscular weakness": 7, "Vital signs measurement": 6, "Electrocardiogram": 5, "Malaise": 5, "Pain in extremity": 5, "Vomiting": 5, "Altered state of consciousness": 4, "Arthralgia": 4, "Asthenia": 4, "Cold sweat": 4, "Heart rate decreased": 4, "Hyperhidrosis": 4, "Oropharyngeal discomfort": 4, "Tachycardia": 4, "Urticaria": 4, "Wheezing": 4, "Acute disseminated encephalomyelitis": 3, "Anaphylactic shock": 3, "Axillary pain": 3, "Bradycardia": 3, "Computerised tomogram": 3, "Computerised tomogram head": 3, "Disease recurrence": 3, "Epilepsy": 3, "Eye disorder": 3, "Facial paralysis": 3, "Gait disturbance": 3, "Grip strength": 3, "Hypersensitivity": 3, "Investigation": 3, "Myalgia": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Pain": 3, "Pallor": 3, "Syncope": 3, "Abdominal pain": 2, "Anxiety": 2, "Blood pressure systolic": 2, "Bronchospasm": 2, "C-reactive protein": 2, "CSF test": 2, "Cerebral infarction": 2, "Chills": 2, "Circulatory collapse": 2, "Clonic convulsion": 2, "Constipation": 2, "Cyanosis": 2, "Death": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Dysphonia": 2, "Echocardiogram": 2, "Fatigue": 2, "Feeling cold": 2, "Grip strength decreased": 2, "Inflammation": 2, "Magnetic resonance imaging head": 2, "Motor dysfunction": 2, "Paralysis": 2, "Peripheral swelling": 2, "Physical deconditioning": 2, "Platelet count": 2, "Polymerase chain reaction": 2, "Respiratory rate": 2, "SARS-CoV-2 test": 2, "Sensation of foreign body": 2, "Swelling": 2, "Ultrasound Doppler": 2, "Ultrasound scan": 2, "Unresponsive to stimuli": 2, "Urinary retention": 2, "Vision blurred": 2, "White blood cell count": 2, "Wound": 2, "Activated partial thromboplastin time": 1, "Akinesia": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Anorectal disorder": 1, "Arrhythmia": 1, "Asthma": 1, "Attention deficit hyperactivity disorder": 1, "Auscultation": 1, "Autoimmune encephalopathy": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Axillary mass": 1, "Back pain": 1, "Bell's palsy": 1, "Bladder catheterisation": 1, "Bladder disorder": 1, "Blepharospasm": 1, "Blindness transient": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Brain stem haemorrhage": 1, "COVID-19": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF culture": 1, "CSF glucose normal": 1, "CSF myelin basic protein": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest X-ray abnormal": 1, "Chest discomfort": 1, "Coagulopathy": 1, "Collagen disorder": 1, "Contusion": 1, "Coronavirus test negative": 1, "Culture stool": 1, "Deep vein thrombosis": 1, "Drug eruption": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Echocardiogram abnormal": 1, "Eczema": 1, "Electrocardiogram abnormal": 1, "Electroencephalogram": 1, "Enanthema": 1, "Enterocolitis": 1, "Eosinophil count increased": 1, "Epigastric discomfort": 1, "Erythema multiforme": 1, "Eye pain": 1, "Eyelid myoclonus": 1, "Eyelid oedema": 1, "Feeding disorder": 1, "Feeling hot": 1, "Femoral neck fracture": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Forced vital capacity": 1, "Full blood count": 1, "Gait inability": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Haemangioma": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head injury": 1, "Heart rate increased": 1, "Hiccups": 1, "Hyperacusis": 1, "Hyperreflexia": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Hyporeflexia": 1, "Hypotension": 1, "Imaging procedure": 1, "Immobile": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Laboratory test": 1, "Lacunar infarction": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphangiectasia": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging spinal abnormal": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Myelitis transverse": 1, "Myocardial ischaemia": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neurosis": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oral disorder": 1, "Oral mucosal eruption": 1, "Palpitations": 1, "Paraesthesia": 1, "Paraplegia": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Photophobia": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Polymyalgia rheumatica": 1, "Procalcitonin": 1, "Productive cough": 1, "Protein total": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pulse absent": 1, "Pulse pressure decreased": 1, "Red blood cell count": 1, "Respiratory disorder": 1, "Respiratory muscle weakness": 1, "Rheumatoid arthritis": 1, "Scab": 1, "Scoliosis": 1, "Skin discolouration": 1, "Sleep disorder": 1, "Smear test": 1, "Spinal cord haemorrhage": 1, "Stevens-Johnson syndrome": 1, "Stridor": 1, "Stupor": 1, "Subarachnoid haemorrhage": 1, "Swelling face": 1, "Tachypnoea": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Toxic skin eruption": 1, "Tracheal stenosis": 1, "Tremor": 1, "Troponin": 1, "Troponin increased": 1, "Ulnar neuritis": 1, "Ultrasound abdomen": 1, "Urine analysis": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Visual impairment": 1, "Vital capacity": 1, "White matter lesion": 1, "X-ray": 1, "X-ray of pelvis and hip": 1}}]}
\ No newline at end of file
+{"batchcode": "FF9944", "histograms": [{"histogram": {"Body temperature": 73, "Blood pressure measurement": 39, "Oxygen saturation": 29, "Heart rate": 25, "Blood pressure decreased": 21, "Dyspnoea": 19, "Presyncope": 17, "Anaphylactic reaction": 15, "Nausea": 15, "Loss of consciousness": 13, "Pyrexia": 13, "Fall": 12, "Blood test": 11, "Feeling abnormal": 11, "Cough": 9, "Dizziness": 9, "Pruritus": 9, "Rash": 9, "Headache": 8, "Hypoaesthesia": 8, "Seizure": 8, "Blood pressure increased": 7, "Chest pain": 7, "Depressed level of consciousness": 7, "Erythema": 7, "Magnetic resonance imaging": 7, "Muscular weakness": 7, "Vital signs measurement": 6, "Electrocardiogram": 5, "Malaise": 5, "Pain in extremity": 5, "Vomiting": 5, "Altered state of consciousness": 4, "Arthralgia": 4, "Asthenia": 4, "Cold sweat": 4, "Heart rate decreased": 4, "Hyperhidrosis": 4, "Oropharyngeal discomfort": 4, "Tachycardia": 4, "Urticaria": 4, "Wheezing": 4, "Acute disseminated encephalomyelitis": 3, "Anaphylactic shock": 3, "Axillary pain": 3, "Bradycardia": 3, "Computerised tomogram": 3, "Computerised tomogram head": 3, "Disease recurrence": 3, "Epilepsy": 3, "Eye disorder": 3, "Facial paralysis": 3, "Gait disturbance": 3, "Grip strength": 3, "Hypersensitivity": 3, "Investigation": 3, "Myalgia": 3, "Myocarditis": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Pain": 3, "Pallor": 3, "Syncope": 3, "Abdominal pain": 2, "Anxiety": 2, "Blood pressure systolic": 2, "Bronchospasm": 2, "C-reactive protein": 2, "CSF test": 2, "Cerebral infarction": 2, "Chills": 2, "Circulatory collapse": 2, "Clonic convulsion": 2, "Constipation": 2, "Cyanosis": 2, "Death": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Dysphonia": 2, "Echocardiogram": 2, "Fatigue": 2, "Feeling cold": 2, "Grip strength decreased": 2, "Inflammation": 2, "Magnetic resonance imaging head": 2, "Motor dysfunction": 2, "Paralysis": 2, "Peripheral swelling": 2, "Physical deconditioning": 2, "Platelet count": 2, "Polymerase chain reaction": 2, "Respiratory rate": 2, "SARS-CoV-2 test": 2, "Sensation of foreign body": 2, "Swelling": 2, "Ultrasound Doppler": 2, "Ultrasound scan": 2, "Unresponsive to stimuli": 2, "Urinary retention": 2, "Vision blurred": 2, "White blood cell count": 2, "Wound": 2, "Activated partial thromboplastin time": 1, "Akinesia": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Anorectal disorder": 1, "Arrhythmia": 1, "Asthma": 1, "Attention deficit hyperactivity disorder": 1, "Auscultation": 1, "Autoimmune encephalopathy": 1, "Autonomic nervous system imbalance": 1, "Autopsy": 1, "Axillary mass": 1, "Back pain": 1, "Bell's palsy": 1, "Bladder catheterisation": 1, "Bladder disorder": 1, "Blepharospasm": 1, "Blindness transient": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Brain natriuretic peptide increased": 1, "Brain stem haemorrhage": 1, "COVID-19": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF culture": 1, "CSF glucose normal": 1, "CSF myelin basic protein": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest X-ray abnormal": 1, "Chest discomfort": 1, "Coagulopathy": 1, "Collagen disorder": 1, "Contusion": 1, "Coronavirus test negative": 1, "Culture stool": 1, "Deep vein thrombosis": 1, "Drug eruption": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Echocardiogram abnormal": 1, "Eczema": 1, "Electrocardiogram abnormal": 1, "Electroencephalogram": 1, "Enanthema": 1, "Enterocolitis": 1, "Eosinophil count increased": 1, "Epigastric discomfort": 1, "Erythema multiforme": 1, "Eye pain": 1, "Eyelid myoclonus": 1, "Eyelid oedema": 1, "Feeding disorder": 1, "Feeling hot": 1, "Femoral neck fracture": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Forced vital capacity": 1, "Full blood count": 1, "Gait inability": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Haemangioma": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head injury": 1, "Heart rate increased": 1, "Hiccups": 1, "Hyperacusis": 1, "Hyperreflexia": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Hyporeflexia": 1, "Hypotension": 1, "Imaging procedure": 1, "Immobile": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Laboratory test": 1, "Lacunar infarction": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphangiectasia": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging spinal abnormal": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myelitis": 1, "Myelitis transverse": 1, "Myocardial ischaemia": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neurosis": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oral disorder": 1, "Oral mucosal eruption": 1, "Palpitations": 1, "Paraesthesia": 1, "Paraplegia": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Photophobia": 1, "Physical examination": 1, "Pneumonia aspiration": 1, "Polymyalgia rheumatica": 1, "Procalcitonin": 1, "Productive cough": 1, "Protein total": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pulse absent": 1, "Pulse pressure decreased": 1, "Red blood cell count": 1, "Respiratory disorder": 1, "Respiratory muscle weakness": 1, "Rheumatoid arthritis": 1, "Scab": 1, "Scoliosis": 1, "Skin discolouration": 1, "Sleep disorder": 1, "Smear test": 1, "Spinal cord haemorrhage": 1, "Stevens-Johnson syndrome": 1, "Stridor": 1, "Stupor": 1, "Subarachnoid haemorrhage": 1, "Swelling face": 1, "Tachypnoea": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Tonsillar hypertrophy": 1, "Toxic skin eruption": 1, "Tracheal stenosis": 1, "Tremor": 1, "Troponin": 1, "Troponin increased": 1, "Ulnar neuritis": 1, "Ultrasound abdomen": 1, "Urine analysis": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Visual impairment": 1, "Vital capacity": 1, "White matter lesion": 1, "X-ray": 1, "X-ray of pelvis and hip": 1}, "batchcodes": ["FF9944"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FG0978.json b/docs/data/histograms/Japan/FG0978.json
index 868633c879b..b5fa3edcc39 100644
--- a/docs/data/histograms/Japan/FG0978.json
+++ b/docs/data/histograms/Japan/FG0978.json
@@ -1 +1 @@
-{"batchcode": "FG0978", "histograms": [{"batchcodes": ["FG0978"], "histogram": {"Body temperature": 82, "Blood pressure measurement": 39, "Heart rate": 25, "Pyrexia": 25, "Oxygen saturation": 24, "Headache": 20, "Nausea": 20, "Presyncope": 20, "Blood pressure decreased": 19, "Dyspnoea": 18, "Anaphylactic reaction": 17, "Feeling abnormal": 17, "Hypoaesthesia": 12, "Blood test": 11, "Loss of consciousness": 11, "Vomiting": 11, "Magnetic resonance imaging": 10, "Cold sweat": 9, "Investigation": 8, "Blood pressure increased": 7, "Cough": 7, "Diarrhoea": 7, "Dizziness": 7, "Dysphoria": 7, "Electrocardiogram": 7, "Muscular weakness": 7, "Pallor": 7, "Arthralgia": 6, "Fall": 6, "Malaise": 6, "Myocarditis": 6, "Pain in extremity": 6, "Tremor": 6, "Vital signs measurement": 6, "Abdominal pain": 5, "Anaphylactic shock": 5, "Erythema": 5, "Physical deconditioning": 5, "Pruritus": 5, "Syncope": 5, "Urticaria": 5, "Asthenia": 4, "Asthma": 4, "Cardio-respiratory arrest": 4, "Chest discomfort": 4, "Chest pain": 4, "Computerised tomogram head": 4, "Depressed level of consciousness": 4, "Heart rate decreased": 4, "Magnetic resonance imaging head": 4, "Oropharyngeal discomfort": 4, "Rash": 4, "SARS-CoV-2 test": 4, "Tachycardia": 4, "Wheezing": 4, "Arrhythmia": 3, "C-reactive protein": 3, "Chest X-ray": 3, "Chills": 3, "Dysphonia": 3, "Echocardiogram": 3, "Encephalitis": 3, "Encephalopathy": 3, "Epilepsy": 3, "Feeling hot": 3, "Fibrin D dimer": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypertension": 3, "Hyperventilation": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Palpitations": 3, "Seizure": 3, "White blood cell count": 3, "Altered state of consciousness": 2, "Antibody test": 2, "Anxiety": 2, "Blood creatine phosphokinase": 2, "Blood pressure systolic": 2, "Bradycardia": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiac electrophysiologic study": 2, "Coma scale": 2, "Complex regional pain syndrome": 2, "Computerised tomogram": 2, "Contusion": 2, "Decreased appetite": 2, "Diplopia": 2, "Electroencephalogram": 2, "Enterocolitis": 2, "Fatigue": 2, "Feeling cold": 2, "Fibrin D dimer increased": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Haemorrhage": 2, "Heart rate increased": 2, "Hypotension": 2, "Inappropriate schedule of product administration": 2, "Insomnia": 2, "Limb discomfort": 2, "Myelitis": 2, "Nerve conduction studies": 2, "Pain": 2, "Paraesthesia": 2, "Respiratory rate": 2, "Throat irritation": 2, "Thrombosis": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Amyotrophy": 1, "Angiogram": 1, "Angiotensin converting enzyme": 1, "Anti-aquaporin-4 antibody": 1, "Anti-muscle specific kinase antibody": 1, "Anti-thyroid antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Arachnoid cyst": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atopy": 1, "Atrioventricular block first degree": 1, "Auscultation": 1, "Autoantibody test": 1, "Autoimmune disorder": 1, "Autopsy": 1, "Axillary pain": 1, "Back pain": 1, "Bell's palsy": 1, "Binocular eye movement disorder": 1, "Biopsy kidney": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood homocysteine": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic increased": 1, "Blood pressure systolic decreased": 1, "Blood thyroid stimulating hormone": 1, "Bradypnoea": 1, "Brain stem haemorrhage": 1, "Bronchial oedema": 1, "CSF test abnormal": 1, "CSF white blood cell count": 1, "Cardiac failure congestive": 1, "Cardiolipin antibody": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular disorder": 1, "Chromaturia": 1, "Clinically isolated syndrome": 1, "Clonic convulsion": 1, "Cognitive disorder": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Decerebrate posture": 1, "Decreased gait velocity": 1, "Demyelination": 1, "Dermatitis exfoliative generalised": 1, "Diabetes mellitus": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Drooling": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysstasia": 1, "Eating disorder": 1, "Ejection fraction": 1, "Electroneurography": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Facial nerve disorder": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Fibromyalgia": 1, "Flushing": 1, "Foetal death": 1, "Foetal hypokinesia": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gastroenteritis viral": 1, "Gaze palsy": 1, "Glycosylated haemoglobin": 1, "Grip strength decreased": 1, "Grunting": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Heavy menstrual bleeding": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Hypothyroidism": 1, "IgA nephropathy": 1, "Illiteracy": 1, "Illness": 1, "Immunoelectrophoresis": 1, "Incontinence": 1, "Infarction": 1, "Infusion": 1, "Inguinal mass": 1, "Interleukin-2 receptor assay": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Lacrimation increased": 1, "Laryngeal discomfort": 1, "Laryngeal oedema": 1, "Lip erythema": 1, "Lip pruritus": 1, "Lip swelling": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Meningitis aseptic": 1, "Mini mental status examination": 1, "Moaning": 1, "Mobility decreased": 1, "Mononuclear cell count": 1, "Mononuclear cell count increased": 1, "Movement disorder": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Mydriasis": 1, "Myelin oligodendrocyte glycoprotein antibody-associated disease": 1, "Myocardial necrosis marker increased": 1, "Myositis": 1, "Nasal congestion": 1, "Near drowning": 1, "Nerve stimulation test": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Nodal osteoarthritis": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Palmar erythema": 1, "Panic reaction": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral sensory neuropathy": 1, "Peripheral swelling": 1, "Perseveration": 1, "Pharyngeal oedema": 1, "Phlebitis": 1, "Physical examination": 1, "Platelet count": 1, "Postmenopausal haemorrhage": 1, "Protein C": 1, "Protein C increased": 1, "Protein S": 1, "Protein urine": 1, "Protein urine present": 1, "Pulmonary congestion": 1, "Pulse abnormal": 1, "Radiculopathy": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Sensitivity to weather change": 1, "Sensorimotor disorder": 1, "Shock": 1, "Sinus tachycardia": 1, "Skin discolouration": 1, "Smooth muscle antibody": 1, "Snoring": 1, "Somatic symptom disorder": 1, "Stillbirth": 1, "Stridor": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Taste disorder": 1, "Tenderness": 1, "Tensilon test": 1, "Tension": 1, "Throat tightness": 1, "Thyroxine free": 1, "Tongue biting": 1, "Tongue oedema": 1, "Troponin": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Umbilical cord abnormality": 1, "Urine analysis": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vasculitis": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vision blurred": 1, "Visual field defect": 1, "Walking disability": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FG0978", "histograms": [{"histogram": {"Body temperature": 82, "Blood pressure measurement": 39, "Heart rate": 25, "Pyrexia": 25, "Oxygen saturation": 24, "Headache": 20, "Nausea": 20, "Presyncope": 20, "Blood pressure decreased": 19, "Dyspnoea": 18, "Anaphylactic reaction": 17, "Feeling abnormal": 17, "Hypoaesthesia": 12, "Blood test": 11, "Loss of consciousness": 11, "Vomiting": 11, "Magnetic resonance imaging": 10, "Cold sweat": 9, "Investigation": 8, "Blood pressure increased": 7, "Cough": 7, "Diarrhoea": 7, "Dizziness": 7, "Dysphoria": 7, "Electrocardiogram": 7, "Muscular weakness": 7, "Pallor": 7, "Arthralgia": 6, "Fall": 6, "Malaise": 6, "Myocarditis": 6, "Pain in extremity": 6, "Tremor": 6, "Vital signs measurement": 6, "Abdominal pain": 5, "Anaphylactic shock": 5, "Erythema": 5, "Physical deconditioning": 5, "Pruritus": 5, "Syncope": 5, "Urticaria": 5, "Asthenia": 4, "Asthma": 4, "Cardio-respiratory arrest": 4, "Chest discomfort": 4, "Chest pain": 4, "Computerised tomogram head": 4, "Depressed level of consciousness": 4, "Heart rate decreased": 4, "Magnetic resonance imaging head": 4, "Oropharyngeal discomfort": 4, "Rash": 4, "SARS-CoV-2 test": 4, "Tachycardia": 4, "Wheezing": 4, "Arrhythmia": 3, "C-reactive protein": 3, "Chest X-ray": 3, "Chills": 3, "Dysphonia": 3, "Echocardiogram": 3, "Encephalitis": 3, "Encephalopathy": 3, "Epilepsy": 3, "Feeling hot": 3, "Fibrin D dimer": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypertension": 3, "Hyperventilation": 3, "Neuropathy peripheral": 3, "Oxygen saturation decreased": 3, "Palpitations": 3, "Seizure": 3, "White blood cell count": 3, "Altered state of consciousness": 2, "Antibody test": 2, "Anxiety": 2, "Blood creatine phosphokinase": 2, "Blood pressure systolic": 2, "Bradycardia": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "CSF test": 2, "Cardiac electrophysiologic study": 2, "Coma scale": 2, "Complex regional pain syndrome": 2, "Computerised tomogram": 2, "Contusion": 2, "Decreased appetite": 2, "Diplopia": 2, "Electroencephalogram": 2, "Enterocolitis": 2, "Fatigue": 2, "Feeling cold": 2, "Fibrin D dimer increased": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Haemorrhage": 2, "Heart rate increased": 2, "Hypotension": 2, "Inappropriate schedule of product administration": 2, "Insomnia": 2, "Limb discomfort": 2, "Myelitis": 2, "Nerve conduction studies": 2, "Pain": 2, "Paraesthesia": 2, "Respiratory rate": 2, "Throat irritation": 2, "Thrombosis": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Amyotrophy": 1, "Angiogram": 1, "Angiotensin converting enzyme": 1, "Anti-aquaporin-4 antibody": 1, "Anti-muscle specific kinase antibody": 1, "Anti-thyroid antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Arachnoid cyst": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atopy": 1, "Atrioventricular block first degree": 1, "Auscultation": 1, "Autoantibody test": 1, "Autoimmune disorder": 1, "Autopsy": 1, "Axillary pain": 1, "Back pain": 1, "Bell's palsy": 1, "Binocular eye movement disorder": 1, "Biopsy kidney": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood homocysteine": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic increased": 1, "Blood pressure systolic decreased": 1, "Blood thyroid stimulating hormone": 1, "Bradypnoea": 1, "Brain stem haemorrhage": 1, "Bronchial oedema": 1, "CSF test abnormal": 1, "CSF white blood cell count": 1, "Cardiac failure congestive": 1, "Cardiolipin antibody": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular disorder": 1, "Chromaturia": 1, "Clinically isolated syndrome": 1, "Clonic convulsion": 1, "Cognitive disorder": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Decerebrate posture": 1, "Decreased gait velocity": 1, "Demyelination": 1, "Dermatitis exfoliative generalised": 1, "Diabetes mellitus": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Drooling": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysstasia": 1, "Eating disorder": 1, "Ejection fraction": 1, "Electroneurography": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Facial nerve disorder": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Fibromyalgia": 1, "Flushing": 1, "Foetal death": 1, "Foetal hypokinesia": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gastroenteritis viral": 1, "Gaze palsy": 1, "Glycosylated haemoglobin": 1, "Grip strength decreased": 1, "Grunting": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Heavy menstrual bleeding": 1, "Hemiplegia": 1, "Hepatic function abnormal": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Hypothyroidism": 1, "IgA nephropathy": 1, "Illiteracy": 1, "Illness": 1, "Immunoelectrophoresis": 1, "Incontinence": 1, "Infarction": 1, "Infusion": 1, "Inguinal mass": 1, "Interleukin-2 receptor assay": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Lacrimation increased": 1, "Laryngeal discomfort": 1, "Laryngeal oedema": 1, "Lip erythema": 1, "Lip pruritus": 1, "Lip swelling": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Meningitis aseptic": 1, "Mini mental status examination": 1, "Moaning": 1, "Mobility decreased": 1, "Mononuclear cell count": 1, "Mononuclear cell count increased": 1, "Movement disorder": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Myasthenia gravis": 1, "Mydriasis": 1, "Myelin oligodendrocyte glycoprotein antibody-associated disease": 1, "Myocardial necrosis marker increased": 1, "Myositis": 1, "Nasal congestion": 1, "Near drowning": 1, "Nerve stimulation test": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Nodal osteoarthritis": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Palmar erythema": 1, "Panic reaction": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral sensory neuropathy": 1, "Peripheral swelling": 1, "Perseveration": 1, "Pharyngeal oedema": 1, "Phlebitis": 1, "Physical examination": 1, "Platelet count": 1, "Postmenopausal haemorrhage": 1, "Protein C": 1, "Protein C increased": 1, "Protein S": 1, "Protein urine": 1, "Protein urine present": 1, "Pulmonary congestion": 1, "Pulse abnormal": 1, "Radiculopathy": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Sensitivity to weather change": 1, "Sensorimotor disorder": 1, "Shock": 1, "Sinus tachycardia": 1, "Skin discolouration": 1, "Smooth muscle antibody": 1, "Snoring": 1, "Somatic symptom disorder": 1, "Stillbirth": 1, "Stridor": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Taste disorder": 1, "Tenderness": 1, "Tensilon test": 1, "Tension": 1, "Throat tightness": 1, "Thyroxine free": 1, "Tongue biting": 1, "Tongue oedema": 1, "Troponin": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Umbilical cord abnormality": 1, "Urine analysis": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vasculitis": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vision blurred": 1, "Visual field defect": 1, "Walking disability": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count decreased": 1, "X-ray": 1}, "batchcodes": ["FG0978"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FH0105.json b/docs/data/histograms/Japan/FH0105.json
index 0f312d28cd7..8e98266a1e6 100644
--- a/docs/data/histograms/Japan/FH0105.json
+++ b/docs/data/histograms/Japan/FH0105.json
@@ -1 +1 @@
-{"batchcode": "FH0105", "histograms": [{"batchcodes": ["FH0105"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Oxygen saturation": 1, "Palpitations": 1, "Paraesthesia": 1, "Rash erythematous": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FH0105", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Oxygen saturation": 1, "Palpitations": 1, "Paraesthesia": 1, "Rash erythematous": 1, "Urticaria": 1}, "batchcodes": ["FH0105"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FH0151.json b/docs/data/histograms/Japan/FH0151.json
index b48913a0754..e2cf73c562f 100644
--- a/docs/data/histograms/Japan/FH0151.json
+++ b/docs/data/histograms/Japan/FH0151.json
@@ -1 +1 @@
-{"batchcode": "FH0151", "histograms": [{"batchcodes": ["FH0151"], "histogram": {"Body temperature": 82, "Blood pressure measurement": 54, "Oxygen saturation": 39, "Heart rate": 35, "Presyncope": 26, "Blood pressure decreased": 23, "Anaphylactic reaction": 22, "Pyrexia": 17, "Hypoaesthesia": 16, "Dyspnoea": 15, "Cold sweat": 14, "Nausea": 14, "Dizziness": 13, "Cough": 12, "Fall": 12, "Blood pressure increased": 11, "Blood test": 10, "Chest pain": 10, "Headache": 10, "Loss of consciousness": 10, "Electrocardiogram": 9, "Feeling abnormal": 9, "Malaise": 9, "Heart rate increased": 8, "Pallor": 8, "Urticaria": 8, "Depressed level of consciousness": 7, "Heart rate decreased": 7, "Hyperventilation": 7, "Investigation": 7, "Myocarditis": 7, "Pruritus": 7, "Rash": 7, "Seizure": 7, "Abdominal pain": 6, "Erythema": 6, "Pericarditis": 6, "Peripheral coldness": 6, "Tachycardia": 6, "Blood creatine phosphokinase": 5, "Dysphoria": 5, "Feeling cold": 5, "Hyperhidrosis": 5, "Peripheral swelling": 5, "Syncope": 5, "White blood cell count": 5, "Asthenia": 4, "Chest discomfort": 4, "Computerised tomogram": 4, "Neuropathy peripheral": 4, "Pain": 4, "Pain in extremity": 4, "Tachypnoea": 4, "Throat irritation": 4, "Tremor": 4, "Ultrasound scan": 4, "Unresponsive to stimuli": 4, "Vomiting": 4, "Wheezing": 4, "Altered state of consciousness": 3, "Arthralgia": 3, "Back pain": 3, "Blood glucose": 3, "Bradycardia": 3, "C-reactive protein": 3, "Echocardiogram": 3, "Feeling hot": 3, "Gait disturbance": 3, "Hypotension": 3, "Magnetic resonance imaging": 3, "Muscular weakness": 3, "Oropharyngeal discomfort": 3, "Oxygen saturation decreased": 3, "Paraesthesia": 3, "Physical deconditioning": 3, "Platelet count": 3, "Tension": 3, "Troponin I": 3, "Vaccination site pain": 3, "Anaemia": 2, "Angiocardiogram": 2, "Arthritis": 2, "Auscultation": 2, "Axillary pain": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Chest X-ray": 2, "Chills": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Contusion": 2, "Dizziness postural": 2, "Dyskinesia": 2, "Emotional distress": 2, "Eosinophil count": 2, "Eosinophil count increased": 2, "Eosinophil percentage": 2, "Epilepsy": 2, "Facial paralysis": 2, "Fibrin D dimer": 2, "Gaze palsy": 2, "Grip strength decreased": 2, "Haematocrit": 2, "Haemoglobin": 2, "Herpes zoster": 2, "Hyporesponsive to stimuli": 2, "Joint swelling": 2, "Movement disorder": 2, "Muscle rigidity": 2, "Muscle spasms": 2, "Muscle tightness": 2, "Neck pain": 2, "Neuralgia": 2, "Oculomucocutaneous syndrome": 2, "Palpitations": 2, "Paralysis": 2, "Photopsia": 2, "Red blood cell count": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Shock": 2, "Sinus tachycardia": 2, "Somnolence": 2, "Speech disorder": 2, "Toxic skin eruption": 2, "Troponin I increased": 2, "Troponin T": 2, "Vital signs measurement": 2, "Acidosis": 1, "Acute myocardial infarction": 1, "Acute stress disorder": 1, "Addison's disease": 1, "Adenovirus test": 1, "Adrenal atrophy": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Alexia": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asphyxia": 1, "Asthma": 1, "Autonomic nervous system imbalance": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood cortisol": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood gases abnormal": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature increased": 1, "Burning sensation": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiomyopathy": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Choking sensation": 1, "Cholecystitis acute": 1, "Cholelithiasis": 1, "Complex regional pain syndrome": 1, "Computerised tomogram coronary artery": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Coronary artery thrombosis": 1, "Cortisol decreased": 1, "Cystitis": 1, "Cystitis haemorrhagic": 1, "Deafness": 1, "Decreased appetite": 1, "Defaecation urgency": 1, "Dehydration": 1, "Delirium": 1, "Dermatitis": 1, "Diplegia": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysgeusia": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophil percentage increased": 1, "Eosinophilia": 1, "Erythema multiforme": 1, "Exercise electrocardiogram": 1, "Eye movement disorder": 1, "Face injury": 1, "Faeces soft": 1, "Fatigue": 1, "Gait inability": 1, "Genital haemorrhage": 1, "Gingival pain": 1, "Grip strength": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemorrhage": 1, "Heart sounds": 1, "Heat illness": 1, "Hepatitis acute": 1, "Herpes zoster oticus": 1, "Hot flush": 1, "Human metapneumovirus test": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Incontinence": 1, "Inflammation": 1, "Influenza virus test": 1, "Intestinal ischaemia": 1, "Joint ankylosis": 1, "Laryngeal discomfort": 1, "Laryngospasm": 1, "Lipids abnormal": 1, "Liver disorder": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Middle East respiratory syndrome": 1, "Mouth haemorrhage": 1, "Mucosal haemorrhage": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycoplasma test": 1, "Myocardial infarction": 1, "Myositis": 1, "Myotonia": 1, "Nasal congestion": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurodermatitis": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Orthostatic intolerance": 1, "Oxygen saturation immeasurable": 1, "Oxygenation index": 1, "Pain assessment": 1, "Panic disorder": 1, "Panic reaction": 1, "Papule": 1, "Pemphigus": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Post-traumatic neck syndrome": 1, "Premature labour": 1, "Protein total": 1, "Pulse absent": 1, "Residual urine volume": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Respiratory syncytial virus test": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "Rhinitis allergic": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Shock symptom": 1, "Somatic symptom disorder": 1, "Sputum retention": 1, "Stiff person syndrome": 1, "Subcutaneous haematoma": 1, "Suffocation feeling": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia paroxysmal": 1, "Temperature regulation disorder": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tinnitus": 1, "Tooth injury": 1, "Toothache": 1, "Trigeminal neuralgia": 1, "Troponin T increased": 1, "Upper respiratory tract inflammation": 1, "Urinary tract infection": 1, "Vaccination site warmth": 1, "Ventricular fibrillation": 1, "Vertigo": 1, "Visual impairment": 1, "Weight": 1, "White blood cell count abnormal": 1, "White blood cell count increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FH0151", "histograms": [{"histogram": {"Body temperature": 82, "Blood pressure measurement": 54, "Oxygen saturation": 39, "Heart rate": 35, "Presyncope": 26, "Blood pressure decreased": 23, "Anaphylactic reaction": 22, "Pyrexia": 17, "Hypoaesthesia": 16, "Dyspnoea": 15, "Cold sweat": 14, "Nausea": 14, "Dizziness": 13, "Cough": 12, "Fall": 12, "Blood pressure increased": 11, "Blood test": 10, "Chest pain": 10, "Headache": 10, "Loss of consciousness": 10, "Electrocardiogram": 9, "Feeling abnormal": 9, "Malaise": 9, "Heart rate increased": 8, "Pallor": 8, "Urticaria": 8, "Depressed level of consciousness": 7, "Heart rate decreased": 7, "Hyperventilation": 7, "Investigation": 7, "Myocarditis": 7, "Pruritus": 7, "Rash": 7, "Seizure": 7, "Abdominal pain": 6, "Erythema": 6, "Pericarditis": 6, "Peripheral coldness": 6, "Tachycardia": 6, "Blood creatine phosphokinase": 5, "Dysphoria": 5, "Feeling cold": 5, "Hyperhidrosis": 5, "Peripheral swelling": 5, "Syncope": 5, "White blood cell count": 5, "Asthenia": 4, "Chest discomfort": 4, "Computerised tomogram": 4, "Neuropathy peripheral": 4, "Pain": 4, "Pain in extremity": 4, "Tachypnoea": 4, "Throat irritation": 4, "Tremor": 4, "Ultrasound scan": 4, "Unresponsive to stimuli": 4, "Vomiting": 4, "Wheezing": 4, "Altered state of consciousness": 3, "Arthralgia": 3, "Back pain": 3, "Blood glucose": 3, "Bradycardia": 3, "C-reactive protein": 3, "Echocardiogram": 3, "Feeling hot": 3, "Gait disturbance": 3, "Hypotension": 3, "Magnetic resonance imaging": 3, "Muscular weakness": 3, "Oropharyngeal discomfort": 3, "Oxygen saturation decreased": 3, "Paraesthesia": 3, "Physical deconditioning": 3, "Platelet count": 3, "Tension": 3, "Troponin I": 3, "Vaccination site pain": 3, "Anaemia": 2, "Angiocardiogram": 2, "Arthritis": 2, "Auscultation": 2, "Axillary pain": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Chest X-ray": 2, "Chills": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Contusion": 2, "Dizziness postural": 2, "Dyskinesia": 2, "Emotional distress": 2, "Eosinophil count": 2, "Eosinophil count increased": 2, "Eosinophil percentage": 2, "Epilepsy": 2, "Facial paralysis": 2, "Fibrin D dimer": 2, "Gaze palsy": 2, "Grip strength decreased": 2, "Haematocrit": 2, "Haemoglobin": 2, "Herpes zoster": 2, "Hyporesponsive to stimuli": 2, "Joint swelling": 2, "Movement disorder": 2, "Muscle rigidity": 2, "Muscle spasms": 2, "Muscle tightness": 2, "Neck pain": 2, "Neuralgia": 2, "Oculomucocutaneous syndrome": 2, "Palpitations": 2, "Paralysis": 2, "Photopsia": 2, "Red blood cell count": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Shock": 2, "Sinus tachycardia": 2, "Somnolence": 2, "Speech disorder": 2, "Toxic skin eruption": 2, "Troponin I increased": 2, "Troponin T": 2, "Vital signs measurement": 2, "Acidosis": 1, "Acute myocardial infarction": 1, "Acute stress disorder": 1, "Addison's disease": 1, "Adenovirus test": 1, "Adrenal atrophy": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Alexia": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asphyxia": 1, "Asthma": 1, "Autonomic nervous system imbalance": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood cortisol": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood gases abnormal": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature increased": 1, "Burning sensation": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiomyopathy": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Choking sensation": 1, "Cholecystitis acute": 1, "Cholelithiasis": 1, "Complex regional pain syndrome": 1, "Computerised tomogram coronary artery": 1, "Confusional state": 1, "Conjunctival hyperaemia": 1, "Coronary artery thrombosis": 1, "Cortisol decreased": 1, "Cystitis": 1, "Cystitis haemorrhagic": 1, "Deafness": 1, "Decreased appetite": 1, "Defaecation urgency": 1, "Dehydration": 1, "Delirium": 1, "Dermatitis": 1, "Diplegia": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysgeusia": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophil percentage increased": 1, "Eosinophilia": 1, "Erythema multiforme": 1, "Exercise electrocardiogram": 1, "Eye movement disorder": 1, "Face injury": 1, "Faeces soft": 1, "Fatigue": 1, "Gait inability": 1, "Genital haemorrhage": 1, "Gingival pain": 1, "Grip strength": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemorrhage": 1, "Heart sounds": 1, "Heat illness": 1, "Hepatitis acute": 1, "Herpes zoster oticus": 1, "Hot flush": 1, "Human metapneumovirus test": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Incontinence": 1, "Inflammation": 1, "Influenza virus test": 1, "Intestinal ischaemia": 1, "Joint ankylosis": 1, "Laryngeal discomfort": 1, "Laryngospasm": 1, "Lipids abnormal": 1, "Liver disorder": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Middle East respiratory syndrome": 1, "Mouth haemorrhage": 1, "Mucosal haemorrhage": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mycoplasma test": 1, "Myocardial infarction": 1, "Myositis": 1, "Myotonia": 1, "Nasal congestion": 1, "Nephrotic syndrome": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurodermatitis": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Orthostatic intolerance": 1, "Oxygen saturation immeasurable": 1, "Oxygenation index": 1, "Pain assessment": 1, "Panic disorder": 1, "Panic reaction": 1, "Papule": 1, "Pemphigus": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Post-traumatic neck syndrome": 1, "Premature labour": 1, "Protein total": 1, "Pulse absent": 1, "Residual urine volume": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory rate increased": 1, "Respiratory syncytial virus test": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "Rhinitis allergic": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Shock symptom": 1, "Somatic symptom disorder": 1, "Sputum retention": 1, "Stiff person syndrome": 1, "Subcutaneous haematoma": 1, "Suffocation feeling": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia paroxysmal": 1, "Temperature regulation disorder": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tinnitus": 1, "Tooth injury": 1, "Toothache": 1, "Trigeminal neuralgia": 1, "Troponin T increased": 1, "Upper respiratory tract inflammation": 1, "Urinary tract infection": 1, "Vaccination site warmth": 1, "Ventricular fibrillation": 1, "Vertigo": 1, "Visual impairment": 1, "Weight": 1, "White blood cell count abnormal": 1, "White blood cell count increased": 1, "X-ray": 1}, "batchcodes": ["FH0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FH3023.json b/docs/data/histograms/Japan/FH3023.json
index 6ac274e7c8d..9e8fc094ecc 100644
--- a/docs/data/histograms/Japan/FH3023.json
+++ b/docs/data/histograms/Japan/FH3023.json
@@ -1 +1 @@
-{"batchcode": "FH3023", "histograms": [{"batchcodes": ["FH3023"], "histogram": {"Body temperature": 69, "Blood pressure measurement": 38, "Heart rate": 33, "Oxygen saturation": 32, "Pyrexia": 20, "Blood pressure decreased": 15, "Loss of consciousness": 14, "Hypoaesthesia": 13, "Presyncope": 13, "Heart rate decreased": 12, "Dizziness": 11, "Nausea": 11, "Electrocardiogram": 10, "Anaphylactic reaction": 9, "Blood test": 9, "Dyspnoea": 9, "Fall": 9, "Headache": 9, "Malaise": 9, "Asthenia": 8, "Chest pain": 8, "Feeling abnormal": 7, "Myocarditis": 7, "Rash": 7, "Blood pressure increased": 6, "Chills": 6, "Investigation": 6, "Neuropathy peripheral": 6, "Pallor": 6, "Pruritus": 6, "Seizure": 6, "Altered state of consciousness": 5, "Arthralgia": 5, "Chest discomfort": 5, "Cold sweat": 5, "Magnetic resonance imaging": 5, "Palpitations": 5, "Vital signs measurement": 5, "Vomiting": 5, "Computerised tomogram": 4, "Cough": 4, "Depressed level of consciousness": 4, "Neck pain": 4, "White blood cell count": 4, "Blood creatine phosphokinase": 3, "Blood glucose": 3, "C-reactive protein": 3, "Cerebral infarction": 3, "Coma scale": 3, "Dysstasia": 3, "Echocardiogram": 3, "Erythema": 3, "Grip strength decreased": 3, "Hyperhidrosis": 3, "Laboratory test": 3, "Nerve conduction studies": 3, "Shock": 3, "Tachycardia": 3, "Troponin": 3, "Troponin increased": 3, "Urticaria": 3, "Anaphylactic shock": 2, "Aphasia": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Blood lactate dehydrogenase": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram head": 2, "Dyskinesia": 2, "Electrocardiogram ST segment elevation": 2, "Electrocardiogram abnormal": 2, "Electroencephalogram": 2, "Epilepsy": 2, "Gait disturbance": 2, "Gaze palsy": 2, "Guillain-Barre syndrome": 2, "Haemorrhage subcutaneous": 2, "Hemiplegia": 2, "Inflammation": 2, "Magnetic resonance imaging head": 2, "Movement disorder": 2, "Muscular weakness": 2, "Myalgia": 2, "Oropharyngeal discomfort": 2, "Pain": 2, "Pain in extremity": 2, "Pericarditis": 2, "Peripheral coldness": 2, "Pharyngeal stenosis": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Somnolence": 2, "Stress": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Troponin I": 2, "Troponin I increased": 2, "Vaccination site pain": 2, "Vasculitis": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal symptom": 1, "Acidosis": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Alopecia": 1, "Alopecia areata": 1, "Anion gap": 1, "Anion gap increased": 1, "Aortic wall hypertrophy": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Atrial fibrillation": 1, "Attention deficit hyperactivity disorder": 1, "Autism spectrum disorder": 1, "Autoantibody test": 1, "Back pain": 1, "Biopsy kidney": 1, "Blood bicarbonate": 1, "Blood bicarbonate decreased": 1, "Blood creatine phosphokinase MB increased": 1, "Blood fibrinogen": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood ketone body": 1, "Blood ketone body increased": 1, "Blood lactate dehydrogenase increased": 1, "Blood pH": 1, "Blood pH decreased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Breath sounds": 1, "CSF test": 1, "CSF volume": 1, "Cardiac dysfunction": 1, "Cerebral artery embolism": 1, "Cerebral artery occlusion": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Complement factor C3": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Cough variant asthma": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Decreased appetite": 1, "Dermatitis": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Dyslalia": 1, "Dysphoria": 1, "Ear discomfort": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST-T segment elevation": 1, "Enterocolitis": 1, "Epistaxis": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Fulminant type 1 diabetes mellitus": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Giant cell arteritis": 1, "Glassy eyes": 1, "Glomerulonephritis chronic": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head discomfort": 1, "Hyperacusis": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperkalaemia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "IgA nephropathy": 1, "Imminent abortion": 1, "Immunisation": 1, "Inappropriate schedule of product administration": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "International normalised ratio": 1, "Intrauterine infection": 1, "Ketoacidosis": 1, "Limb discomfort": 1, "Lip oedema": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging spinal": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Monoparesis": 1, "Muscle atrophy": 1, "Musculoskeletal stiffness": 1, "Myoclonus": 1, "Myokymia": 1, "Narcolepsy": 1, "Nervousness": 1, "Neuralgic amyotrophy": 1, "Neutropenia": 1, "Neutrophil count": 1, "Ocular discomfort": 1, "Orthostatic intolerance": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Peripheral swelling": 1, "Peritonitis": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Pollakiuria": 1, "Positron emission tomogram": 1, "Productive cough": 1, "Prostate cancer": 1, "Protein urine": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulse absent": 1, "Radial pulse abnormal": 1, "Red blood cell count": 1, "Respiratory rate increased": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 test": 1, "Seizure like phenomena": 1, "Sinus rhythm": 1, "Somatic symptom disorder": 1, "Speech disorder": 1, "Spinal X-ray": 1, "Stridor": 1, "Sudden hearing loss": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Syphilis": 1, "Systemic inflammatory response syndrome": 1, "Taste disorder": 1, "Thermohyperaesthesia": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid function test": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Troponin T": 1, "Ulnar nerve palsy": 1, "Ulnar neuritis": 1, "Ultrasound scan": 1, "Ureterolithiasis": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Urine protein/creatinine ratio": 1, "Vaccination complication": 1, "Vaccination site bruising": 1, "Vaccination site haemorrhage": 1, "Vaccination site warmth": 1, "Ventricular hypertrophy": 1, "Viral infection": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Weight decreased": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3023", "histograms": [{"histogram": {"Body temperature": 69, "Blood pressure measurement": 38, "Heart rate": 33, "Oxygen saturation": 32, "Pyrexia": 20, "Blood pressure decreased": 15, "Loss of consciousness": 14, "Hypoaesthesia": 13, "Presyncope": 13, "Heart rate decreased": 12, "Dizziness": 11, "Nausea": 11, "Electrocardiogram": 10, "Anaphylactic reaction": 9, "Blood test": 9, "Dyspnoea": 9, "Fall": 9, "Headache": 9, "Malaise": 9, "Asthenia": 8, "Chest pain": 8, "Feeling abnormal": 7, "Myocarditis": 7, "Rash": 7, "Blood pressure increased": 6, "Chills": 6, "Investigation": 6, "Neuropathy peripheral": 6, "Pallor": 6, "Pruritus": 6, "Seizure": 6, "Altered state of consciousness": 5, "Arthralgia": 5, "Chest discomfort": 5, "Cold sweat": 5, "Magnetic resonance imaging": 5, "Palpitations": 5, "Vital signs measurement": 5, "Vomiting": 5, "Computerised tomogram": 4, "Cough": 4, "Depressed level of consciousness": 4, "Neck pain": 4, "White blood cell count": 4, "Blood creatine phosphokinase": 3, "Blood glucose": 3, "C-reactive protein": 3, "Cerebral infarction": 3, "Coma scale": 3, "Dysstasia": 3, "Echocardiogram": 3, "Erythema": 3, "Grip strength decreased": 3, "Hyperhidrosis": 3, "Laboratory test": 3, "Nerve conduction studies": 3, "Shock": 3, "Tachycardia": 3, "Troponin": 3, "Troponin increased": 3, "Urticaria": 3, "Anaphylactic shock": 2, "Aphasia": 2, "Blood creatine phosphokinase MB": 2, "Blood creatine phosphokinase increased": 2, "Blood lactate dehydrogenase": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram head": 2, "Dyskinesia": 2, "Electrocardiogram ST segment elevation": 2, "Electrocardiogram abnormal": 2, "Electroencephalogram": 2, "Epilepsy": 2, "Gait disturbance": 2, "Gaze palsy": 2, "Guillain-Barre syndrome": 2, "Haemorrhage subcutaneous": 2, "Hemiplegia": 2, "Inflammation": 2, "Magnetic resonance imaging head": 2, "Movement disorder": 2, "Muscular weakness": 2, "Myalgia": 2, "Oropharyngeal discomfort": 2, "Pain": 2, "Pain in extremity": 2, "Pericarditis": 2, "Peripheral coldness": 2, "Pharyngeal stenosis": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Somnolence": 2, "Stress": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Troponin I": 2, "Troponin I increased": 2, "Vaccination site pain": 2, "Vasculitis": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal symptom": 1, "Acidosis": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Alopecia": 1, "Alopecia areata": 1, "Anion gap": 1, "Anion gap increased": 1, "Aortic wall hypertrophy": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Atrial fibrillation": 1, "Attention deficit hyperactivity disorder": 1, "Autism spectrum disorder": 1, "Autoantibody test": 1, "Back pain": 1, "Biopsy kidney": 1, "Blood bicarbonate": 1, "Blood bicarbonate decreased": 1, "Blood creatine phosphokinase MB increased": 1, "Blood fibrinogen": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood ketone body": 1, "Blood ketone body increased": 1, "Blood lactate dehydrogenase increased": 1, "Blood pH": 1, "Blood pH decreased": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Breath sounds": 1, "CSF test": 1, "CSF volume": 1, "Cardiac dysfunction": 1, "Cerebral artery embolism": 1, "Cerebral artery occlusion": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Complement factor C3": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Cough variant asthma": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Decreased appetite": 1, "Dermatitis": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Dyslalia": 1, "Dysphoria": 1, "Ear discomfort": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST-T segment elevation": 1, "Enterocolitis": 1, "Epistaxis": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Fulminant type 1 diabetes mellitus": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Giant cell arteritis": 1, "Glassy eyes": 1, "Glomerulonephritis chronic": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head discomfort": 1, "Hyperacusis": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperkalaemia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "IgA nephropathy": 1, "Imminent abortion": 1, "Immunisation": 1, "Inappropriate schedule of product administration": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "International normalised ratio": 1, "Intrauterine infection": 1, "Ketoacidosis": 1, "Limb discomfort": 1, "Lip oedema": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging spinal": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Monoparesis": 1, "Muscle atrophy": 1, "Musculoskeletal stiffness": 1, "Myoclonus": 1, "Myokymia": 1, "Narcolepsy": 1, "Nervousness": 1, "Neuralgic amyotrophy": 1, "Neutropenia": 1, "Neutrophil count": 1, "Ocular discomfort": 1, "Orthostatic intolerance": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Paralysis": 1, "Paresis": 1, "Peripheral swelling": 1, "Peritonitis": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Pollakiuria": 1, "Positron emission tomogram": 1, "Productive cough": 1, "Prostate cancer": 1, "Protein urine": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulse absent": 1, "Radial pulse abnormal": 1, "Red blood cell count": 1, "Respiratory rate increased": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 test": 1, "Seizure like phenomena": 1, "Sinus rhythm": 1, "Somatic symptom disorder": 1, "Speech disorder": 1, "Spinal X-ray": 1, "Stridor": 1, "Sudden hearing loss": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Syphilis": 1, "Systemic inflammatory response syndrome": 1, "Taste disorder": 1, "Thermohyperaesthesia": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid function test": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Troponin T": 1, "Ulnar nerve palsy": 1, "Ulnar neuritis": 1, "Ultrasound scan": 1, "Ureterolithiasis": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Urine protein/creatinine ratio": 1, "Vaccination complication": 1, "Vaccination site bruising": 1, "Vaccination site haemorrhage": 1, "Vaccination site warmth": 1, "Ventricular hypertrophy": 1, "Viral infection": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Weight decreased": 1, "White blood cell count decreased": 1, "White blood cell count increased": 1, "X-ray": 1}, "batchcodes": ["FH3023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FJ1611.json b/docs/data/histograms/Japan/FJ1611.json
index 05df9c5176a..db1d077e5c2 100644
--- a/docs/data/histograms/Japan/FJ1611.json
+++ b/docs/data/histograms/Japan/FJ1611.json
@@ -1 +1 @@
-{"batchcode": "FJ1611", "histograms": [{"batchcodes": ["FJ1611"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Feeling hot": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1611", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Feeling hot": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1}, "batchcodes": ["FJ1611"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FJ1763.json b/docs/data/histograms/Japan/FJ1763.json
index baf0ca4b90c..843519da0e2 100644
--- a/docs/data/histograms/Japan/FJ1763.json
+++ b/docs/data/histograms/Japan/FJ1763.json
@@ -1 +1 @@
-{"batchcode": "FJ1763", "histograms": [{"batchcodes": ["FJ1763"], "histogram": {"Body temperature": 67, "Pyrexia": 31, "Blood pressure measurement": 23, "Electrocardiogram": 20, "Blood test": 19, "Heart rate": 18, "Oxygen saturation": 18, "Chest pain": 17, "Myocarditis": 17, "Vaccination failure": 15, "COVID-19": 14, "Echocardiogram": 14, "SARS-CoV-2 test": 14, "Dyspnoea": 13, "Blood creatine phosphokinase MB": 12, "Feeling abnormal": 11, "Loss of consciousness": 11, "Blood creatine phosphokinase": 10, "C-reactive protein": 9, "Pruritus": 9, "Troponin I": 9, "Headache": 8, "Blood pressure decreased": 7, "Cough": 7, "Electrocardiogram ST segment elevation": 7, "Malaise": 7, "Anaphylactic reaction": 6, "Chest X-ray": 6, "Heart rate decreased": 6, "Magnetic resonance imaging": 6, "Nausea": 6, "Pericarditis": 6, "Troponin I increased": 6, "Blood creatine phosphokinase increased": 5, "Chest discomfort": 5, "Erythema": 5, "Fall": 5, "Fatigue": 5, "Gait disturbance": 5, "Hypoaesthesia": 5, "Immunisation": 5, "Investigation": 5, "Magnetic resonance imaging heart": 5, "Palpitations": 5, "Polymerase chain reaction": 5, "Presyncope": 5, "Seizure": 5, "Troponin T": 5, "White blood cell count": 5, "Abdominal pain": 4, "Asthma": 4, "Blood pressure increased": 4, "Discomfort": 4, "Dizziness": 4, "Electrocardiogram ST segment": 4, "Feeling hot": 4, "Magnetic resonance imaging head": 4, "Muscular weakness": 4, "Pain": 4, "Tremor": 4, "Vital signs measurement": 4, "X-ray": 4, "Altered state of consciousness": 3, "Antibody test": 3, "Antinuclear antibody": 3, "Arrhythmia": 3, "Arthralgia": 3, "Blood creatine phosphokinase MB increased": 3, "CSF test": 3, "Chills": 3, "Cold sweat": 3, "Heart rate increased": 3, "Hypotension": 3, "Insomnia": 3, "Low density lipoprotein": 3, "Nephrotic syndrome": 3, "Nerve conduction studies": 3, "Oropharyngeal discomfort": 3, "Pain in extremity": 3, "Pallor": 3, "Paraesthesia": 3, "Protein urine": 3, "Rash": 3, "Respiratory rate": 3, "Rheumatoid factor": 3, "Sensory disturbance": 3, "Urticaria": 3, "Vaccination site pain": 3, "Viral infection": 3, "Vomiting": 3, "Alanine aminotransferase": 2, "Albumin urine": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Atrial fibrillation": 2, "Back pain": 2, "Blood albumin": 2, "Blood creatinine": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Computerised tomogram coronary artery": 2, "Contusion": 2, "Death": 2, "Depressed level of consciousness": 2, "Dysphoria": 2, "Dysstasia": 2, "Electroencephalogram": 2, "Epilepsy": 2, "Face oedema": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "Inappropriate schedule of product administration": 2, "Inflammation": 2, "Musculoskeletal stiffness": 2, "Neck pain": 2, "Orthostatic intolerance": 2, "Panic reaction": 2, "Peripheral coldness": 2, "Peripheral swelling": 2, "Physical deconditioning": 2, "Sinus rhythm": 2, "Tachycardia": 2, "Troponin": 2, "Troponin T increased": 2, "Ultrasound scan": 2, "Wheezing": 2, "Abortion spontaneous": 1, "Acute disseminated encephalomyelitis": 1, "Adjustment disorder": 1, "Anal incontinence": 1, "Angiotensin converting enzyme": 1, "Anxiety disorder": 1, "Aortic valve incompetence": 1, "Arthritis": 1, "Asymptomatic COVID-19": 1, "Atrial enlargement": 1, "Atrial flutter": 1, "Autoimmune encephalopathy": 1, "Autopsy": 1, "Basophil count": 1, "Bedridden": 1, "Behcet's syndrome": 1, "Biopsy kidney": 1, "Biopsy peripheral nerve": 1, "Blood calcium": 1, "Blood calcium increased": 1, "Blood culture": 1, "Blood folate": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood urea": 1, "Brain natriuretic peptide": 1, "Bronchitis": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac hypertrophy": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Cerebral venous sinus thrombosis": 1, "Choking sensation": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Clavicle fracture": 1, "Clonic convulsion": 1, "Complement factor C3": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Conversion disorder": 1, "Deafness neurosensory": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Diastolic dysfunction": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug ineffective": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Dystonia": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram T wave inversion": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Embolism": 1, "Encephalopathy": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Full blood count": 1, "Generalised tonic-clonic seizure": 1, "Grip strength decreased": 1, "HLA marker study": 1, "Haematocrit": 1, "Haematocrit increased": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemoglobin increased": 1, "Hashimoto's encephalopathy": 1, "Head injury": 1, "Heart rate abnormal": 1, "Henoch-Schonlein purpura": 1, "Henoch-Schonlein purpura nephritis": 1, "Hepatic function abnormal": 1, "Hepatitis": 1, "Hydrothorax": 1, "Hyperreflexia": 1, "Hypertension": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Immunology test": 1, "Initial insomnia": 1, "Injury": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Intra-abdominal fluid collection": 1, "Joint ankylosis": 1, "Juvenile idiopathic arthritis": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lysozyme": 1, "Magnetic resonance imaging neck": 1, "Matrix metalloproteinase-3": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Meniscus injury": 1, "Mental impairment": 1, "Metabolic function test": 1, "Mobility decreased": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Multiple organ dysfunction syndrome": 1, "Muscle contractions involuntary": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myocardial necrosis marker": 1, "Myocardial oedema": 1, "Myoclonus": 1, "Myofascial pain syndrome": 1, "Myositis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasopharyngitis": 1, "Neurological examination": 1, "Neutrophil count": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Panic attack": 1, "Paralysis": 1, "Perineal pain": 1, "Perineal ulceration": 1, "Pharyngeal erythema": 1, "Platelet count": 1, "Post-traumatic stress disorder": 1, "Protein urine present": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulseless electrical activity": 1, "Pyelonephritis acute": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count increased": 1, "Red blood cell sedimentation rate normal": 1, "Rehabilitation therapy": 1, "Respiratory rate increased": 1, "Restless arm syndrome": 1, "Restless legs syndrome": 1, "Retrograde amnesia": 1, "Rhinorrhoea": 1, "Sarcoidosis": 1, "Scrub typhus": 1, "Serum ferritin": 1, "Sinus tachycardia": 1, "Skin cancer": 1, "Sleep disorder": 1, "Somnolence": 1, "Spondylolysis": 1, "Stomatitis": 1, "Streptococcus test": 1, "Stress": 1, "Sudden death": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Systolic dysfunction": 1, "Tachypnoea": 1, "Thyroid function test": 1, "Tinnitus": 1, "Ultrasound abdomen": 1, "Urine analysis": 1, "Urine protein/creatinine ratio": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Ventricular hypokinesia": 1, "Vertigo": 1, "Viral test": 1, "Vitamin B1": 1, "Vitamin B12": 1, "White blood cell analysis": 1, "White blood cell count abnormal": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1763", "histograms": [{"histogram": {"Body temperature": 67, "Pyrexia": 31, "Blood pressure measurement": 23, "Electrocardiogram": 20, "Blood test": 19, "Heart rate": 18, "Oxygen saturation": 18, "Chest pain": 17, "Myocarditis": 17, "Vaccination failure": 15, "COVID-19": 14, "Echocardiogram": 14, "SARS-CoV-2 test": 14, "Dyspnoea": 13, "Blood creatine phosphokinase MB": 12, "Feeling abnormal": 11, "Loss of consciousness": 11, "Blood creatine phosphokinase": 10, "C-reactive protein": 9, "Pruritus": 9, "Troponin I": 9, "Headache": 8, "Blood pressure decreased": 7, "Cough": 7, "Electrocardiogram ST segment elevation": 7, "Malaise": 7, "Anaphylactic reaction": 6, "Chest X-ray": 6, "Heart rate decreased": 6, "Magnetic resonance imaging": 6, "Nausea": 6, "Pericarditis": 6, "Troponin I increased": 6, "Blood creatine phosphokinase increased": 5, "Chest discomfort": 5, "Erythema": 5, "Fall": 5, "Fatigue": 5, "Gait disturbance": 5, "Hypoaesthesia": 5, "Immunisation": 5, "Investigation": 5, "Magnetic resonance imaging heart": 5, "Palpitations": 5, "Polymerase chain reaction": 5, "Presyncope": 5, "Seizure": 5, "Troponin T": 5, "White blood cell count": 5, "Abdominal pain": 4, "Asthma": 4, "Blood pressure increased": 4, "Discomfort": 4, "Dizziness": 4, "Electrocardiogram ST segment": 4, "Feeling hot": 4, "Magnetic resonance imaging head": 4, "Muscular weakness": 4, "Pain": 4, "Tremor": 4, "Vital signs measurement": 4, "X-ray": 4, "Altered state of consciousness": 3, "Antibody test": 3, "Antinuclear antibody": 3, "Arrhythmia": 3, "Arthralgia": 3, "Blood creatine phosphokinase MB increased": 3, "CSF test": 3, "Chills": 3, "Cold sweat": 3, "Heart rate increased": 3, "Hypotension": 3, "Insomnia": 3, "Low density lipoprotein": 3, "Nephrotic syndrome": 3, "Nerve conduction studies": 3, "Oropharyngeal discomfort": 3, "Pain in extremity": 3, "Pallor": 3, "Paraesthesia": 3, "Protein urine": 3, "Rash": 3, "Respiratory rate": 3, "Rheumatoid factor": 3, "Sensory disturbance": 3, "Urticaria": 3, "Vaccination site pain": 3, "Viral infection": 3, "Vomiting": 3, "Alanine aminotransferase": 2, "Albumin urine": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Atrial fibrillation": 2, "Back pain": 2, "Blood albumin": 2, "Blood creatinine": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Computerised tomogram coronary artery": 2, "Contusion": 2, "Death": 2, "Depressed level of consciousness": 2, "Dysphoria": 2, "Dysstasia": 2, "Electroencephalogram": 2, "Epilepsy": 2, "Face oedema": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "Inappropriate schedule of product administration": 2, "Inflammation": 2, "Musculoskeletal stiffness": 2, "Neck pain": 2, "Orthostatic intolerance": 2, "Panic reaction": 2, "Peripheral coldness": 2, "Peripheral swelling": 2, "Physical deconditioning": 2, "Sinus rhythm": 2, "Tachycardia": 2, "Troponin": 2, "Troponin T increased": 2, "Ultrasound scan": 2, "Wheezing": 2, "Abortion spontaneous": 1, "Acute disseminated encephalomyelitis": 1, "Adjustment disorder": 1, "Anal incontinence": 1, "Angiotensin converting enzyme": 1, "Anxiety disorder": 1, "Aortic valve incompetence": 1, "Arthritis": 1, "Asymptomatic COVID-19": 1, "Atrial enlargement": 1, "Atrial flutter": 1, "Autoimmune encephalopathy": 1, "Autopsy": 1, "Basophil count": 1, "Bedridden": 1, "Behcet's syndrome": 1, "Biopsy kidney": 1, "Biopsy peripheral nerve": 1, "Blood calcium": 1, "Blood calcium increased": 1, "Blood culture": 1, "Blood folate": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Blood pressure systolic increased": 1, "Blood urea": 1, "Brain natriuretic peptide": 1, "Bronchitis": 1, "Cardiac arrest": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac hypertrophy": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Cerebral venous sinus thrombosis": 1, "Choking sensation": 1, "Chromaturia": 1, "Chronic fatigue syndrome": 1, "Clavicle fracture": 1, "Clonic convulsion": 1, "Complement factor C3": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Conversion disorder": 1, "Deafness neurosensory": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Diastolic dysfunction": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug ineffective": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Dystonia": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram T wave inversion": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Embolism": 1, "Encephalopathy": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Full blood count": 1, "Generalised tonic-clonic seizure": 1, "Grip strength decreased": 1, "HLA marker study": 1, "Haematocrit": 1, "Haematocrit increased": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemoglobin increased": 1, "Hashimoto's encephalopathy": 1, "Head injury": 1, "Heart rate abnormal": 1, "Henoch-Schonlein purpura": 1, "Henoch-Schonlein purpura nephritis": 1, "Hepatic function abnormal": 1, "Hepatitis": 1, "Hydrothorax": 1, "Hyperreflexia": 1, "Hypertension": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Hyporesponsive to stimuli": 1, "Immunology test": 1, "Initial insomnia": 1, "Injury": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Intra-abdominal fluid collection": 1, "Joint ankylosis": 1, "Juvenile idiopathic arthritis": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lysozyme": 1, "Magnetic resonance imaging neck": 1, "Matrix metalloproteinase-3": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Meniscus injury": 1, "Mental impairment": 1, "Metabolic function test": 1, "Mobility decreased": 1, "Monocyte count": 1, "Motor dysfunction": 1, "Multiple organ dysfunction syndrome": 1, "Muscle contractions involuntary": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myocardial necrosis marker": 1, "Myocardial oedema": 1, "Myoclonus": 1, "Myofascial pain syndrome": 1, "Myositis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasopharyngitis": 1, "Neurological examination": 1, "Neutrophil count": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Panic attack": 1, "Paralysis": 1, "Perineal pain": 1, "Perineal ulceration": 1, "Pharyngeal erythema": 1, "Platelet count": 1, "Post-traumatic stress disorder": 1, "Protein urine present": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pulseless electrical activity": 1, "Pyelonephritis acute": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count increased": 1, "Red blood cell sedimentation rate normal": 1, "Rehabilitation therapy": 1, "Respiratory rate increased": 1, "Restless arm syndrome": 1, "Restless legs syndrome": 1, "Retrograde amnesia": 1, "Rhinorrhoea": 1, "Sarcoidosis": 1, "Scrub typhus": 1, "Serum ferritin": 1, "Sinus tachycardia": 1, "Skin cancer": 1, "Sleep disorder": 1, "Somnolence": 1, "Spondylolysis": 1, "Stomatitis": 1, "Streptococcus test": 1, "Stress": 1, "Sudden death": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Systolic dysfunction": 1, "Tachypnoea": 1, "Thyroid function test": 1, "Tinnitus": 1, "Ultrasound abdomen": 1, "Urine analysis": 1, "Urine protein/creatinine ratio": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Ventricular hypokinesia": 1, "Vertigo": 1, "Viral test": 1, "Vitamin B1": 1, "Vitamin B12": 1, "White blood cell analysis": 1, "White blood cell count abnormal": 1, "White blood cell count increased": 1}, "batchcodes": ["FJ1763"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FJ5790.json b/docs/data/histograms/Japan/FJ5790.json
index 354c3014dd1..05bf28734e1 100644
--- a/docs/data/histograms/Japan/FJ5790.json
+++ b/docs/data/histograms/Japan/FJ5790.json
@@ -1 +1 @@
-{"batchcode": "FJ5790", "histograms": [{"batchcodes": ["FJ5790"], "histogram": {"Body temperature": 85, "Blood pressure measurement": 40, "Oxygen saturation": 34, "Heart rate": 30, "Presyncope": 23, "Pyrexia": 17, "Blood pressure decreased": 16, "Hypoaesthesia": 13, "Nausea": 13, "Anaphylactic reaction": 12, "Heart rate decreased": 11, "Loss of consciousness": 11, "Dizziness": 10, "Dyspnoea": 10, "Fall": 10, "Feeling abnormal": 10, "Electrocardiogram": 9, "Pallor": 9, "Blood pressure increased": 8, "Urticaria": 8, "Cold sweat": 7, "Echocardiogram": 7, "Pruritus": 7, "Investigation": 6, "Malaise": 6, "Neuropathy peripheral": 6, "Oropharyngeal discomfort": 6, "C-reactive protein": 5, "Computerised tomogram": 5, "Headache": 5, "Heart rate increased": 5, "Muscular weakness": 5, "Palpitations": 5, "Seizure": 5, "Vital signs measurement": 5, "Blood test": 4, "Chest pain": 4, "Cyanosis": 4, "Depressed level of consciousness": 4, "Erythema": 4, "Myocarditis": 4, "Pain": 4, "Vomiting": 4, "Arrhythmia": 3, "Arthralgia": 3, "Auscultation": 3, "Blood creatine phosphokinase": 3, "Blood creatine phosphokinase increased": 3, "Bradycardia": 3, "Computerised tomogram head": 3, "Diarrhoea": 3, "Dyskinesia": 3, "Dysphoria": 3, "Electrocardiogram ST segment elevation": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hyperventilation": 3, "Magnetic resonance imaging head": 3, "Oxygen saturation decreased": 3, "Pain in extremity": 3, "Peripheral coldness": 3, "Pulse abnormal": 3, "Swelling": 3, "Syncope": 3, "Tachycardia": 3, "Throat tightness": 3, "White blood cell count": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Asthenia": 2, "Autoantibody test": 2, "Back pain": 2, "Blood creatine phosphokinase MB": 2, "C-reactive protein increased": 2, "Cardiac failure": 2, "Cardiomyopathy": 2, "Cerebral haemorrhage": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Contusion": 2, "Cough": 2, "Dyslalia": 2, "Eyelid function disorder": 2, "Fibrin D dimer": 2, "Flushing": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Infection": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Oedema peripheral": 2, "Pericarditis": 2, "Platelet count": 2, "Rash": 2, "Respiratory arrest": 2, "SARS-CoV-2 test": 2, "Stress": 2, "Stress cardiomyopathy": 2, "Tachypnoea": 2, "Troponin T": 2, "Troponin T increased": 2, "Vaccination site pain": 2, "Visual impairment": 2, "ADAMTS13 activity assay": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Acute coronary syndrome": 1, "Albumin urine present": 1, "Anaemia": 1, "Anal incontinence": 1, "Angiocardiogram": 1, "Anti-thyroid antibody": 1, "Apraxia": 1, "Areflexia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asterixis": 1, "Atrial fibrillation": 1, "Autonomic nervous system imbalance": 1, "Autonomic neuropathy": 1, "Basedow's disease": 1, "Bladder dilatation": 1, "Blood creatine phosphokinase MB increased": 1, "Blood glucose": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Body temperature increased": 1, "Brain oedema": 1, "Breath sounds abnormal": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF protein increased": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cardiac function test abnormal": 1, "Cardiac murmur": 1, "Cardiomegaly": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Cervicobrachial syndrome": 1, "Chills": 1, "Coeliac artery stenosis": 1, "Condition aggravated": 1, "Death": 1, "Decreased appetite": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Dizziness postural": 1, "Dysphonia": 1, "Dysstasia": 1, "Eczema": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ambulatory": 1, "Enlarged uvula": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Erythema of eyelid": 1, "Extrasystoles": 1, "Eyelid oedema": 1, "Eyelids pruritus": 1, "Feeling cold": 1, "Fibrin D dimer increased": 1, "Gait inability": 1, "Goitre": 1, "Haemangioma": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemoglobin increased": 1, "Haemorrhage": 1, "Hemiparesis": 1, "Hepatic function abnormal": 1, "Hepatitis viral test": 1, "Herpes simplex": 1, "Herpes simplex test": 1, "Histology": 1, "Hyperaemia": 1, "Hyperpyrexia": 1, "Hypertension": 1, "Hyperthermia": 1, "Hyperthyroidism": 1, "Hypokinesia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Hypoxic-ischaemic encephalopathy": 1, "Immunisation": 1, "Induration": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "Internal haemorrhage": 1, "Labour pain": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Mass": 1, "Memory impairment": 1, "Meningoencephalitis herpetic": 1, "Mental impairment": 1, "Migraine": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Mydriasis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Nerve conduction studies": 1, "Neurological symptom": 1, "Neutrophil percentage": 1, "Obstructive airways disorder": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Pathology test": 1, "Periarthritis": 1, "Peritonsillar abscess": 1, "Physical deconditioning": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polyneuropathy": 1, "Premature baby": 1, "Protein total": 1, "Psychogenic seizure": 1, "Pulmonary oedema": 1, "Pupillary reflex impaired": 1, "Red blood cell count": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Rhabdomyolysis": 1, "Scan myocardial perfusion": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Sinus rhythm": 1, "Snoring": 1, "Somatic symptom disorder": 1, "Somnolence": 1, "Speech disorder": 1, "Splenic infarction": 1, "Stertor": 1, "Suicidal behaviour": 1, "Throat irritation": 1, "Thrombotic thrombocytopenic purpura": 1, "Thyroid disorder": 1, "Thyroid function test": 1, "Toxic skin eruption": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine albumin/creatinine ratio": 1, "Urinoma": 1, "Vaccination site pruritus": 1, "Vasculitis": 1, "Ventricular enlargement": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5790", "histograms": [{"histogram": {"Body temperature": 85, "Blood pressure measurement": 40, "Oxygen saturation": 34, "Heart rate": 30, "Presyncope": 23, "Pyrexia": 17, "Blood pressure decreased": 16, "Hypoaesthesia": 13, "Nausea": 13, "Anaphylactic reaction": 12, "Heart rate decreased": 11, "Loss of consciousness": 11, "Dizziness": 10, "Dyspnoea": 10, "Fall": 10, "Feeling abnormal": 10, "Electrocardiogram": 9, "Pallor": 9, "Blood pressure increased": 8, "Urticaria": 8, "Cold sweat": 7, "Echocardiogram": 7, "Pruritus": 7, "Investigation": 6, "Malaise": 6, "Neuropathy peripheral": 6, "Oropharyngeal discomfort": 6, "C-reactive protein": 5, "Computerised tomogram": 5, "Headache": 5, "Heart rate increased": 5, "Muscular weakness": 5, "Palpitations": 5, "Seizure": 5, "Vital signs measurement": 5, "Blood test": 4, "Chest pain": 4, "Cyanosis": 4, "Depressed level of consciousness": 4, "Erythema": 4, "Myocarditis": 4, "Pain": 4, "Vomiting": 4, "Arrhythmia": 3, "Arthralgia": 3, "Auscultation": 3, "Blood creatine phosphokinase": 3, "Blood creatine phosphokinase increased": 3, "Bradycardia": 3, "Computerised tomogram head": 3, "Diarrhoea": 3, "Dyskinesia": 3, "Dysphoria": 3, "Electrocardiogram ST segment elevation": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hyperventilation": 3, "Magnetic resonance imaging head": 3, "Oxygen saturation decreased": 3, "Pain in extremity": 3, "Peripheral coldness": 3, "Pulse abnormal": 3, "Swelling": 3, "Syncope": 3, "Tachycardia": 3, "Throat tightness": 3, "White blood cell count": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Asthenia": 2, "Autoantibody test": 2, "Back pain": 2, "Blood creatine phosphokinase MB": 2, "C-reactive protein increased": 2, "Cardiac failure": 2, "Cardiomyopathy": 2, "Cerebral haemorrhage": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Contusion": 2, "Cough": 2, "Dyslalia": 2, "Eyelid function disorder": 2, "Fibrin D dimer": 2, "Flushing": 2, "Gait disturbance": 2, "Guillain-Barre syndrome": 2, "Infection": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Oedema peripheral": 2, "Pericarditis": 2, "Platelet count": 2, "Rash": 2, "Respiratory arrest": 2, "SARS-CoV-2 test": 2, "Stress": 2, "Stress cardiomyopathy": 2, "Tachypnoea": 2, "Troponin T": 2, "Troponin T increased": 2, "Vaccination site pain": 2, "Visual impairment": 2, "ADAMTS13 activity assay": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Acute coronary syndrome": 1, "Albumin urine present": 1, "Anaemia": 1, "Anal incontinence": 1, "Angiocardiogram": 1, "Anti-thyroid antibody": 1, "Apraxia": 1, "Areflexia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asterixis": 1, "Atrial fibrillation": 1, "Autonomic nervous system imbalance": 1, "Autonomic neuropathy": 1, "Basedow's disease": 1, "Bladder dilatation": 1, "Blood creatine phosphokinase MB increased": 1, "Blood glucose": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "Body temperature increased": 1, "Brain oedema": 1, "Breath sounds abnormal": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF protein increased": 1, "CSF test": 1, "Cardiac electrophysiologic study": 1, "Cardiac function test abnormal": 1, "Cardiac murmur": 1, "Cardiomegaly": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Cervicobrachial syndrome": 1, "Chills": 1, "Coeliac artery stenosis": 1, "Condition aggravated": 1, "Death": 1, "Decreased appetite": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Dizziness postural": 1, "Dysphonia": 1, "Dysstasia": 1, "Eczema": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ambulatory": 1, "Enlarged uvula": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Erythema of eyelid": 1, "Extrasystoles": 1, "Eyelid oedema": 1, "Eyelids pruritus": 1, "Feeling cold": 1, "Fibrin D dimer increased": 1, "Gait inability": 1, "Goitre": 1, "Haemangioma": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemoglobin increased": 1, "Haemorrhage": 1, "Hemiparesis": 1, "Hepatic function abnormal": 1, "Hepatitis viral test": 1, "Herpes simplex": 1, "Herpes simplex test": 1, "Histology": 1, "Hyperaemia": 1, "Hyperpyrexia": 1, "Hypertension": 1, "Hyperthermia": 1, "Hyperthyroidism": 1, "Hypokinesia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Hypoxic-ischaemic encephalopathy": 1, "Immunisation": 1, "Induration": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "Internal haemorrhage": 1, "Labour pain": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Mass": 1, "Memory impairment": 1, "Meningoencephalitis herpetic": 1, "Mental impairment": 1, "Migraine": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Mydriasis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Nerve conduction studies": 1, "Neurological symptom": 1, "Neutrophil percentage": 1, "Obstructive airways disorder": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Pathology test": 1, "Periarthritis": 1, "Peritonsillar abscess": 1, "Physical deconditioning": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polyneuropathy": 1, "Premature baby": 1, "Protein total": 1, "Psychogenic seizure": 1, "Pulmonary oedema": 1, "Pupillary reflex impaired": 1, "Red blood cell count": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Rhabdomyolysis": 1, "Scan myocardial perfusion": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Sinus rhythm": 1, "Snoring": 1, "Somatic symptom disorder": 1, "Somnolence": 1, "Speech disorder": 1, "Splenic infarction": 1, "Stertor": 1, "Suicidal behaviour": 1, "Throat irritation": 1, "Thrombotic thrombocytopenic purpura": 1, "Thyroid disorder": 1, "Thyroid function test": 1, "Toxic skin eruption": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine albumin/creatinine ratio": 1, "Urinoma": 1, "Vaccination site pruritus": 1, "Vasculitis": 1, "Ventricular enlargement": 1, "Ventricular fibrillation": 1, "Ventricular hypokinesia": 1, "Vision blurred": 1}, "batchcodes": ["FJ5790"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FJ5929.json b/docs/data/histograms/Japan/FJ5929.json
index 3a764b64224..47246a439bc 100644
--- a/docs/data/histograms/Japan/FJ5929.json
+++ b/docs/data/histograms/Japan/FJ5929.json
@@ -1 +1 @@
-{"batchcode": "FJ5929", "histograms": [{"batchcodes": ["FJ5929"], "histogram": {"Body temperature": 98, "SARS-CoV-2 test": 32, "Pyrexia": 27, "Drug ineffective": 25, "Immunisation": 23, "Oxygen saturation": 22, "Blood pressure measurement": 21, "COVID-19": 21, "Heart rate": 18, "Anaphylactic reaction": 17, "Malaise": 16, "Nausea": 15, "Dyspnoea": 13, "Headache": 12, "COVID-19 pneumonia": 10, "Erythema": 10, "Palpitations": 10, "Vomiting": 10, "C-reactive protein": 9, "Cough": 8, "Electrocardiogram": 8, "Feeling abnormal": 8, "Blood test": 7, "Pruritus": 7, "Asthma": 6, "Blood pressure increased": 6, "Chest pain": 6, "Chills": 6, "Hypoaesthesia": 6, "Investigation": 6, "Oropharyngeal discomfort": 6, "Arrhythmia": 5, "Aspartate aminotransferase": 5, "Fall": 5, "Muscular weakness": 5, "Myocarditis": 5, "Oxygen saturation decreased": 5, "Pain": 5, "Urticaria": 5, "Vaccination failure": 5, "White blood cell count": 5, "Abdominal pain": 4, "Arthralgia": 4, "Blood creatine phosphokinase": 4, "Blood pressure decreased": 4, "Cardio-respiratory arrest": 4, "Death": 4, "Diarrhoea": 4, "Echocardiogram": 4, "Loss of consciousness": 4, "Myalgia": 4, "Pallor": 4, "Pericarditis": 4, "Presyncope": 4, "Vaccination site pain": 4, "Vital signs measurement": 4, "Alanine aminotransferase": 3, "Asthenia": 3, "C-reactive protein increased": 3, "Cardiac failure": 3, "Cerebral haemorrhage": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Dysphonia": 3, "Face oedema": 3, "Feeling cold": 3, "Gamma-glutamyltransferase": 3, "Hot flush": 3, "Hypersensitivity": 3, "Liver disorder": 3, "Magnetic resonance imaging": 3, "Pain in extremity": 3, "Rash": 3, "Seizure": 3, "Wheezing": 3, "Abdominal discomfort": 2, "Acute myocardial infarction": 2, "Angioedema": 2, "Aspartate aminotransferase increased": 2, "Atrial fibrillation": 2, "Back pain": 2, "Biopsy skin": 2, "Bradycardia": 2, "Cardiomegaly": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Depressed level of consciousness": 2, "Discomfort": 2, "Dysphoria": 2, "Ear discomfort": 2, "Gait disturbance": 2, "Haematochezia": 2, "Interstitial lung disease": 2, "Joint swelling": 2, "Liver function test": 2, "Musculoskeletal discomfort": 2, "Nucleic acid test": 2, "Oedema peripheral": 2, "Pancreatitis": 2, "Pollakiuria": 2, "Productive cough": 2, "Renal failure": 2, "Respiratory arrest": 2, "Respiratory rate": 2, "Rhabdomyolysis": 2, "Somnolence": 2, "Sudden death": 2, "Swelling": 2, "Syncope": 2, "Throat irritation": 2, "Throat tightness": 2, "Thrombosis": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Ultrasound scan": 2, "Abortion spontaneous": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Acute respiratory failure": 1, "Affect lability": 1, "Alanine aminotransferase increased": 1, "Alopecia": 1, "Alopecia areata": 1, "Angiocardiogram": 1, "Arrhythmia supraventricular": 1, "Asthenopia": 1, "Autonomic nervous system imbalance": 1, "Autophony": 1, "Autopsy": 1, "Axillary pain": 1, "Bacterial test": 1, "Bedridden": 1, "Biopsy bone marrow": 1, "Biopsy lymph gland": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood immunoglobulin E": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Bone marrow oedema": 1, "Brain natriuretic peptide": 1, "Breath sounds abnormal": 1, "Bronchoscopy": 1, "Bronchostenosis": 1, "Bursitis": 1, "CD4/CD8 ratio": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiac failure congestive": 1, "Cardiothoracic ratio increased": 1, "Cardiovascular disorder": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral infarction": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular disorder": 1, "Choreoathetosis": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Coma scale": 1, "Contusion": 1, "Coronary artery stenosis": 1, "Cushing's syndrome": 1, "Cyanosis": 1, "Deafness": 1, "Decreased activity": 1, "Dehydration": 1, "Depressed mood": 1, "Dermatitis bullous": 1, "Disease recurrence": 1, "Disseminated intravascular coagulation": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dizziness postural": 1, "Dyschezia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Ear swelling": 1, "Eczema": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Endocarditis": 1, "Endoscopy": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count": 1, "Facial paralysis": 1, "Feeling hot": 1, "Flushing": 1, "Fractional exhaled nitric oxide": 1, "Fracture": 1, "Frequent bowel movements": 1, "Gamma-glutamyltransferase increased": 1, "Gastritis": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haemophagocytic lymphohistiocytosis": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hepatic enzyme increased": 1, "Hepatic function abnormal": 1, "Hepatitis acute": 1, "Herpes zoster": 1, "Histology": 1, "Hyperaesthesia": 1, "Hypertension": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Imaging procedure": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Immune-mediated neuropathy": 1, "Impaired work ability": 1, "Inflammation": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Large intestine erosion": 1, "Laryngeal discomfort": 1, "Laryngeal oedema": 1, "Laryngoscopy": 1, "Larynx irritation": 1, "Limb discomfort": 1, "Limb injury": 1, "Liver function test increased": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Marasmus": 1, "Memory impairment": 1, "Mental impairment": 1, "Motor dysfunction": 1, "Muscle atrophy": 1, "Muscle haemorrhage": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myasthenia gravis": 1, "Myocardial necrosis marker": 1, "Myositis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal congestion": 1, "Nasal obstruction": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Obstructive airways disorder": 1, "Oral discomfort": 1, "Organising pneumonia": 1, "Pancreatitis acute": 1, "Panniculitis": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral motor neuropathy": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Prothrombin time": 1, "Prothrombin time prolonged": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Purpura": 1, "Pyelonephritis": 1, "QRS axis abnormal": 1, "Renal function test": 1, "Respiratory failure": 1, "Respiratory symptom": 1, "Rheumatoid arthritis": 1, "Rotator cuff syndrome": 1, "Sarcoidosis": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Sinus rhythm": 1, "Skin weeping": 1, "Speech disorder": 1, "Staphylococcus test": 1, "Status migrainosus": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Tachycardia": 1, "Tachycardia paroxysmal": 1, "Tachypnoea": 1, "Thalamus haemorrhage": 1, "Thrombocytopenic purpura": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Tremor": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Urinary tract infection staphylococcal": 1, "Urine analysis": 1, "Uterine cancer": 1, "Vaccination site bruising": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Ventricular fibrillation": 1, "Vertebral artery dissection": 1, "Vertigo": 1, "Vertigo positional": 1, "Vision blurred": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "Wrist deformity": 1, "X-ray": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5929", "histograms": [{"histogram": {"Body temperature": 98, "SARS-CoV-2 test": 32, "Pyrexia": 27, "Drug ineffective": 25, "Immunisation": 23, "Oxygen saturation": 22, "Blood pressure measurement": 21, "COVID-19": 21, "Heart rate": 18, "Anaphylactic reaction": 17, "Malaise": 16, "Nausea": 15, "Dyspnoea": 13, "Headache": 12, "COVID-19 pneumonia": 10, "Erythema": 10, "Palpitations": 10, "Vomiting": 10, "C-reactive protein": 9, "Cough": 8, "Electrocardiogram": 8, "Feeling abnormal": 8, "Blood test": 7, "Pruritus": 7, "Asthma": 6, "Blood pressure increased": 6, "Chest pain": 6, "Chills": 6, "Hypoaesthesia": 6, "Investigation": 6, "Oropharyngeal discomfort": 6, "Arrhythmia": 5, "Aspartate aminotransferase": 5, "Fall": 5, "Muscular weakness": 5, "Myocarditis": 5, "Oxygen saturation decreased": 5, "Pain": 5, "Urticaria": 5, "Vaccination failure": 5, "White blood cell count": 5, "Abdominal pain": 4, "Arthralgia": 4, "Blood creatine phosphokinase": 4, "Blood pressure decreased": 4, "Cardio-respiratory arrest": 4, "Death": 4, "Diarrhoea": 4, "Echocardiogram": 4, "Loss of consciousness": 4, "Myalgia": 4, "Pallor": 4, "Pericarditis": 4, "Presyncope": 4, "Vaccination site pain": 4, "Vital signs measurement": 4, "Alanine aminotransferase": 3, "Asthenia": 3, "C-reactive protein increased": 3, "Cardiac failure": 3, "Cerebral haemorrhage": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Dysphonia": 3, "Face oedema": 3, "Feeling cold": 3, "Gamma-glutamyltransferase": 3, "Hot flush": 3, "Hypersensitivity": 3, "Liver disorder": 3, "Magnetic resonance imaging": 3, "Pain in extremity": 3, "Rash": 3, "Seizure": 3, "Wheezing": 3, "Abdominal discomfort": 2, "Acute myocardial infarction": 2, "Angioedema": 2, "Aspartate aminotransferase increased": 2, "Atrial fibrillation": 2, "Back pain": 2, "Biopsy skin": 2, "Bradycardia": 2, "Cardiomegaly": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Depressed level of consciousness": 2, "Discomfort": 2, "Dysphoria": 2, "Ear discomfort": 2, "Gait disturbance": 2, "Haematochezia": 2, "Interstitial lung disease": 2, "Joint swelling": 2, "Liver function test": 2, "Musculoskeletal discomfort": 2, "Nucleic acid test": 2, "Oedema peripheral": 2, "Pancreatitis": 2, "Pollakiuria": 2, "Productive cough": 2, "Renal failure": 2, "Respiratory arrest": 2, "Respiratory rate": 2, "Rhabdomyolysis": 2, "Somnolence": 2, "Sudden death": 2, "Swelling": 2, "Syncope": 2, "Throat irritation": 2, "Throat tightness": 2, "Thrombosis": 2, "Troponin": 2, "Type I hypersensitivity": 2, "Ultrasound scan": 2, "Abortion spontaneous": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Acute respiratory failure": 1, "Affect lability": 1, "Alanine aminotransferase increased": 1, "Alopecia": 1, "Alopecia areata": 1, "Angiocardiogram": 1, "Arrhythmia supraventricular": 1, "Asthenopia": 1, "Autonomic nervous system imbalance": 1, "Autophony": 1, "Autopsy": 1, "Axillary pain": 1, "Bacterial test": 1, "Bedridden": 1, "Biopsy bone marrow": 1, "Biopsy lymph gland": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood immunoglobulin E": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Bone marrow oedema": 1, "Brain natriuretic peptide": 1, "Breath sounds abnormal": 1, "Bronchoscopy": 1, "Bronchostenosis": 1, "Bursitis": 1, "CD4/CD8 ratio": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiac failure congestive": 1, "Cardiothoracic ratio increased": 1, "Cardiovascular disorder": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral infarction": 1, "Cerebral ventricular rupture": 1, "Cerebrovascular disorder": 1, "Choreoathetosis": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Coma scale": 1, "Contusion": 1, "Coronary artery stenosis": 1, "Cushing's syndrome": 1, "Cyanosis": 1, "Deafness": 1, "Decreased activity": 1, "Dehydration": 1, "Depressed mood": 1, "Dermatitis bullous": 1, "Disease recurrence": 1, "Disseminated intravascular coagulation": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dizziness postural": 1, "Dyschezia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Ear swelling": 1, "Eczema": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram ambulatory": 1, "Endocarditis": 1, "Endoscopy": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count": 1, "Facial paralysis": 1, "Feeling hot": 1, "Flushing": 1, "Fractional exhaled nitric oxide": 1, "Fracture": 1, "Frequent bowel movements": 1, "Gamma-glutamyltransferase increased": 1, "Gastritis": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haemophagocytic lymphohistiocytosis": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hepatic enzyme increased": 1, "Hepatic function abnormal": 1, "Hepatitis acute": 1, "Herpes zoster": 1, "Histology": 1, "Hyperaesthesia": 1, "Hypertension": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Imaging procedure": 1, "Immobile": 1, "Immune thrombocytopenia": 1, "Immune-mediated neuropathy": 1, "Impaired work ability": 1, "Inflammation": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Large intestine erosion": 1, "Laryngeal discomfort": 1, "Laryngeal oedema": 1, "Laryngoscopy": 1, "Larynx irritation": 1, "Limb discomfort": 1, "Limb injury": 1, "Liver function test increased": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte count decreased": 1, "Marasmus": 1, "Memory impairment": 1, "Mental impairment": 1, "Motor dysfunction": 1, "Muscle atrophy": 1, "Muscle haemorrhage": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myasthenia gravis": 1, "Myocardial necrosis marker": 1, "Myositis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal congestion": 1, "Nasal obstruction": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil count decreased": 1, "Obstructive airways disorder": 1, "Oral discomfort": 1, "Organising pneumonia": 1, "Pancreatitis acute": 1, "Panniculitis": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Peripheral motor neuropathy": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Prothrombin time": 1, "Prothrombin time prolonged": 1, "Pulse abnormal": 1, "Pulse absent": 1, "Purpura": 1, "Pyelonephritis": 1, "QRS axis abnormal": 1, "Renal function test": 1, "Respiratory failure": 1, "Respiratory symptom": 1, "Rheumatoid arthritis": 1, "Rotator cuff syndrome": 1, "Sarcoidosis": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Sinus rhythm": 1, "Skin weeping": 1, "Speech disorder": 1, "Staphylococcus test": 1, "Status migrainosus": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Swelling face": 1, "Tachycardia": 1, "Tachycardia paroxysmal": 1, "Tachypnoea": 1, "Thalamus haemorrhage": 1, "Thrombocytopenic purpura": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Tremor": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Urinary tract infection staphylococcal": 1, "Urine analysis": 1, "Uterine cancer": 1, "Vaccination site bruising": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Ventricular fibrillation": 1, "Vertebral artery dissection": 1, "Vertigo": 1, "Vertigo positional": 1, "Vision blurred": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "Wrist deformity": 1, "X-ray": 1, "Yawning": 1}, "batchcodes": ["FJ5929"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FJ7489.json b/docs/data/histograms/Japan/FJ7489.json
index 1f925d45a61..56c9dd6657d 100644
--- a/docs/data/histograms/Japan/FJ7489.json
+++ b/docs/data/histograms/Japan/FJ7489.json
@@ -1 +1 @@
-{"batchcode": "FJ7489", "histograms": [{"batchcodes": ["FJ7489"], "histogram": {"Body temperature": 80, "Blood pressure measurement": 34, "Heart rate": 24, "Oxygen saturation": 22, "Pyrexia": 22, "Dyspnoea": 18, "Blood pressure decreased": 17, "Anaphylactic reaction": 16, "Presyncope": 15, "Electrocardiogram": 13, "Headache": 12, "Nausea": 12, "Chest pain": 11, "Malaise": 11, "Blood test": 10, "Dizziness": 10, "Pallor": 10, "Feeling abnormal": 9, "Blood pressure increased": 8, "Cold sweat": 8, "Cough": 8, "Myocarditis": 8, "Decreased appetite": 7, "Hypoaesthesia": 7, "Investigation": 7, "Loss of consciousness": 7, "Palpitations": 7, "Depressed level of consciousness": 6, "Echocardiogram": 6, "Electrocardiogram ST segment elevation": 6, "Erythema": 6, "Fall": 6, "Pruritus": 6, "Vomiting": 6, "C-reactive protein": 5, "Computerised tomogram": 5, "Dysphoria": 5, "Oropharyngeal discomfort": 5, "Blood creatine phosphokinase MB": 4, "Neuropathy peripheral": 4, "Pain": 4, "Rash": 4, "Seizure": 4, "Urticaria": 4, "Vaccination site pain": 4, "Anaphylactic shock": 3, "Asthenia": 3, "Blood creatine phosphokinase": 3, "Bradycardia": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Diarrhoea": 3, "Dizziness postural": 3, "Paraesthesia": 3, "Physical deconditioning": 3, "Respiratory rate": 3, "Throat irritation": 3, "Tremor": 3, "Abdominal pain": 2, "Acute myocardial infarction": 2, "Altered state of consciousness": 2, "Asthma": 2, "Atrial fibrillation": 2, "Back pain": 2, "Blood glucose": 2, "Blood pressure systolic": 2, "Brain natriuretic peptide": 2, "CSF cell count": 2, "CSF protein": 2, "CSF test": 2, "Coma scale": 2, "Contusion": 2, "Dehydration": 2, "Discomfort": 2, "Dysstasia": 2, "Electrocardiogram ST segment": 2, "Encephalopathy": 2, "Fatigue": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Haemorrhage": 2, "Heart rate decreased": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hyperthermia": 2, "Hyperventilation": 2, "Hyporeflexia": 2, "Immunisation": 2, "Laryngeal discomfort": 2, "Limb discomfort": 2, "Magnetic resonance imaging head": 2, "Meningitis aseptic": 2, "Mobility decreased": 2, "Myalgia": 2, "Neck pain": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Pharyngeal oedema": 2, "Pulse absent": 2, "SARS-CoV-2 test": 2, "Sensory disturbance": 2, "Syncope": 2, "Tachycardia": 2, "Tension": 2, "Troponin I": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vital signs measurement": 2, "White blood cell count": 2, "X-ray": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Activated protein C resistance": 1, "Acute disseminated encephalomyelitis": 1, "Acute respiratory distress syndrome": 1, "Alopecia": 1, "Alopecia areata": 1, "Amylase": 1, "Amylase increased": 1, "Angiocardiogram": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Anxiety": 1, "Apnoeic attack": 1, "Atopy": 1, "Atrophy": 1, "Autoantibody test": 1, "Autonomic dysreflexia": 1, "Autonomic nervous system imbalance": 1, "Biopsy skin": 1, "Blepharospasm": 1, "Blood creatine phosphokinase MB increased": 1, "Blood gases": 1, "Blood glucose decreased": 1, "Blood lactic acid": 1, "Blood lactic acid increased": 1, "Blood pressure diastolic decreased": 1, "Blood test abnormal": 1, "Body temperature increased": 1, "Brain natriuretic peptide increased": 1, "Brain stem haemorrhage": 1, "Butterfly rash": 1, "C-reactive protein abnormal": 1, "C-reactive protein increased": 1, "CSF cell count increased": 1, "CSF glucose": 1, "Capillary leak syndrome": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Carpal tunnel syndrome": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Colitis ischaemic": 1, "Colitis ulcerative": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conversion disorder": 1, "Cutaneous lupus erythematosus": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Demyelination": 1, "Diffuse alveolar damage": 1, "Dry mouth": 1, "Duodenal ulcer": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram abnormal": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Encephalitis": 1, "Enteritis": 1, "Epigastric discomfort": 1, "Epiglottitis": 1, "Epilepsy": 1, "Epstein-Barr virus antibody": 1, "Epstein-Barr virus infection reactivation": 1, "Erythema multiforme": 1, "Expired product administered": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Faeces soft": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Fraction of inspired oxygen": 1, "Generalised oedema": 1, "Genital haemorrhage": 1, "Graft versus host disease": 1, "Grip strength decreased": 1, "Haematochezia": 1, "Haemoglobin increased": 1, "Hair colour changes": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate increased": 1, "Heart sounds": 1, "Hypersensitivity vasculitis": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypoalbuminaemia": 1, "Hypoglycaemia": 1, "Hypophagia": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Influenza virus test": 1, "Injury associated with device": 1, "Internal haemorrhage": 1, "Intrapericardial thrombosis": 1, "Jugular vein distension": 1, "Kawasaki's disease": 1, "Listless": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Madarosis": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abnormal": 1, "Monoplegia": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myositis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nerve conduction studies": 1, "Nerve conduction studies abnormal": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "Neurotoxicity": 1, "Neutrophil count": 1, "Night sweats": 1, "Nuchal rigidity": 1, "Off label use": 1, "Ophthalmological examination": 1, "Optic disc haemorrhage": 1, "Oropharyngeal pain": 1, "Overwork": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pancreatitis acute": 1, "Paraparesis": 1, "Pericardial drainage": 1, "Pericardial haemorrhage": 1, "Peripheral circulatory failure": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumonia": 1, "Polyneuropathy": 1, "Portal vein thrombosis": 1, "Prostate cancer": 1, "Protein S": 1, "Protein total": 1, "Pulmonary embolism": 1, "Rash papular": 1, "Rhinalgia": 1, "Sensation of foreign body": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Skin fragility": 1, "Somatic symptom disorder": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Swelling face": 1, "Tachypnoea": 1, "Tension headache": 1, "Tetany": 1, "Thirst": 1, "Thrombocytopenia": 1, "Tinel's sign": 1, "Tracheal stenosis": 1, "Troponin": 1, "Troponin T": 1, "Upper respiratory tract inflammation": 1, "Urinary incontinence": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site swelling": 1, "Venous thrombosis limb": 1, "Ventricular extrasystoles": 1, "Viral infection": 1, "Visual impairment": 1, "White matter lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ7489", "histograms": [{"histogram": {"Body temperature": 80, "Blood pressure measurement": 34, "Heart rate": 24, "Oxygen saturation": 22, "Pyrexia": 22, "Dyspnoea": 18, "Blood pressure decreased": 17, "Anaphylactic reaction": 16, "Presyncope": 15, "Electrocardiogram": 13, "Headache": 12, "Nausea": 12, "Chest pain": 11, "Malaise": 11, "Blood test": 10, "Dizziness": 10, "Pallor": 10, "Feeling abnormal": 9, "Blood pressure increased": 8, "Cold sweat": 8, "Cough": 8, "Myocarditis": 8, "Decreased appetite": 7, "Hypoaesthesia": 7, "Investigation": 7, "Loss of consciousness": 7, "Palpitations": 7, "Depressed level of consciousness": 6, "Echocardiogram": 6, "Electrocardiogram ST segment elevation": 6, "Erythema": 6, "Fall": 6, "Pruritus": 6, "Vomiting": 6, "C-reactive protein": 5, "Computerised tomogram": 5, "Dysphoria": 5, "Oropharyngeal discomfort": 5, "Blood creatine phosphokinase MB": 4, "Neuropathy peripheral": 4, "Pain": 4, "Rash": 4, "Seizure": 4, "Urticaria": 4, "Vaccination site pain": 4, "Anaphylactic shock": 3, "Asthenia": 3, "Blood creatine phosphokinase": 3, "Bradycardia": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Diarrhoea": 3, "Dizziness postural": 3, "Paraesthesia": 3, "Physical deconditioning": 3, "Respiratory rate": 3, "Throat irritation": 3, "Tremor": 3, "Abdominal pain": 2, "Acute myocardial infarction": 2, "Altered state of consciousness": 2, "Asthma": 2, "Atrial fibrillation": 2, "Back pain": 2, "Blood glucose": 2, "Blood pressure systolic": 2, "Brain natriuretic peptide": 2, "CSF cell count": 2, "CSF protein": 2, "CSF test": 2, "Coma scale": 2, "Contusion": 2, "Dehydration": 2, "Discomfort": 2, "Dysstasia": 2, "Electrocardiogram ST segment": 2, "Encephalopathy": 2, "Fatigue": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Haemorrhage": 2, "Heart rate decreased": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hyperthermia": 2, "Hyperventilation": 2, "Hyporeflexia": 2, "Immunisation": 2, "Laryngeal discomfort": 2, "Limb discomfort": 2, "Magnetic resonance imaging head": 2, "Meningitis aseptic": 2, "Mobility decreased": 2, "Myalgia": 2, "Neck pain": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Pharyngeal oedema": 2, "Pulse absent": 2, "SARS-CoV-2 test": 2, "Sensory disturbance": 2, "Syncope": 2, "Tachycardia": 2, "Tension": 2, "Troponin I": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vital signs measurement": 2, "White blood cell count": 2, "X-ray": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Activated protein C resistance": 1, "Acute disseminated encephalomyelitis": 1, "Acute respiratory distress syndrome": 1, "Alopecia": 1, "Alopecia areata": 1, "Amylase": 1, "Amylase increased": 1, "Angiocardiogram": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Anxiety": 1, "Apnoeic attack": 1, "Atopy": 1, "Atrophy": 1, "Autoantibody test": 1, "Autonomic dysreflexia": 1, "Autonomic nervous system imbalance": 1, "Biopsy skin": 1, "Blepharospasm": 1, "Blood creatine phosphokinase MB increased": 1, "Blood gases": 1, "Blood glucose decreased": 1, "Blood lactic acid": 1, "Blood lactic acid increased": 1, "Blood pressure diastolic decreased": 1, "Blood test abnormal": 1, "Body temperature increased": 1, "Brain natriuretic peptide increased": 1, "Brain stem haemorrhage": 1, "Butterfly rash": 1, "C-reactive protein abnormal": 1, "C-reactive protein increased": 1, "CSF cell count increased": 1, "CSF glucose": 1, "Capillary leak syndrome": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Carpal tunnel syndrome": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Colitis ischaemic": 1, "Colitis ulcerative": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conversion disorder": 1, "Cutaneous lupus erythematosus": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Demyelination": 1, "Diffuse alveolar damage": 1, "Dry mouth": 1, "Duodenal ulcer": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram abnormal": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Encephalitis": 1, "Enteritis": 1, "Epigastric discomfort": 1, "Epiglottitis": 1, "Epilepsy": 1, "Epstein-Barr virus antibody": 1, "Epstein-Barr virus infection reactivation": 1, "Erythema multiforme": 1, "Expired product administered": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Faeces soft": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Fraction of inspired oxygen": 1, "Generalised oedema": 1, "Genital haemorrhage": 1, "Graft versus host disease": 1, "Grip strength decreased": 1, "Haematochezia": 1, "Haemoglobin increased": 1, "Hair colour changes": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate increased": 1, "Heart sounds": 1, "Hypersensitivity vasculitis": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypoalbuminaemia": 1, "Hypoglycaemia": 1, "Hypophagia": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Influenza virus test": 1, "Injury associated with device": 1, "Internal haemorrhage": 1, "Intrapericardial thrombosis": 1, "Jugular vein distension": 1, "Kawasaki's disease": 1, "Listless": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Madarosis": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abnormal": 1, "Monoplegia": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myositis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nerve conduction studies": 1, "Nerve conduction studies abnormal": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "Neurotoxicity": 1, "Neutrophil count": 1, "Night sweats": 1, "Nuchal rigidity": 1, "Off label use": 1, "Ophthalmological examination": 1, "Optic disc haemorrhage": 1, "Oropharyngeal pain": 1, "Overwork": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Pancreatitis acute": 1, "Paraparesis": 1, "Pericardial drainage": 1, "Pericardial haemorrhage": 1, "Peripheral circulatory failure": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumonia": 1, "Polyneuropathy": 1, "Portal vein thrombosis": 1, "Prostate cancer": 1, "Protein S": 1, "Protein total": 1, "Pulmonary embolism": 1, "Rash papular": 1, "Rhinalgia": 1, "Sensation of foreign body": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Skin fragility": 1, "Somatic symptom disorder": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Supraventricular extrasystoles": 1, "Swelling": 1, "Swelling face": 1, "Tachypnoea": 1, "Tension headache": 1, "Tetany": 1, "Thirst": 1, "Thrombocytopenia": 1, "Tinel's sign": 1, "Tracheal stenosis": 1, "Troponin": 1, "Troponin T": 1, "Upper respiratory tract inflammation": 1, "Urinary incontinence": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site swelling": 1, "Venous thrombosis limb": 1, "Ventricular extrasystoles": 1, "Viral infection": 1, "Visual impairment": 1, "White matter lesion": 1}, "batchcodes": ["FJ7489"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FJI763.json b/docs/data/histograms/Japan/FJI763.json
index ae74365c769..a33688f0693 100644
--- a/docs/data/histograms/Japan/FJI763.json
+++ b/docs/data/histograms/Japan/FJI763.json
@@ -1 +1 @@
-{"batchcode": "FJI763", "histograms": [{"batchcodes": ["FJI763"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "FJI763", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}, "batchcodes": ["FJI763"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK 6302.json b/docs/data/histograms/Japan/FK 6302.json
index f312f84140c..4aa3a028cbd 100644
--- a/docs/data/histograms/Japan/FK 6302.json
+++ b/docs/data/histograms/Japan/FK 6302.json
@@ -1 +1 @@
-{"batchcode": "FK 6302", "histograms": [{"batchcodes": ["FK 6302"], "histogram": {"Body temperature": 1, "Colitis ischaemic": 1, "Melaena": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FK 6302", "histograms": [{"histogram": {"Body temperature": 1, "Colitis ischaemic": 1, "Melaena": 1, "Pyrexia": 1}, "batchcodes": ["FK 6302"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK 8562.json b/docs/data/histograms/Japan/FK 8562.json
index 6d319343aaf..f208fe33c5a 100644
--- a/docs/data/histograms/Japan/FK 8562.json
+++ b/docs/data/histograms/Japan/FK 8562.json
@@ -1 +1 @@
-{"batchcode": "FK 8562", "histograms": [{"batchcodes": ["3002540", "FK 8562"], "histogram": {"Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Aspiration bone marrow": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood bilirubin": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood smear test": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Cold agglutinins": 1, "Cold type haemolytic anaemia": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram neck": 1, "Computerised tomogram thorax": 1, "Coombs direct test": 1, "Cytomegalovirus test": 1, "Electrophoresis protein": 1, "Endoscopy upper gastrointestinal tract": 1, "Epstein-Barr virus test": 1, "Flow cytometry": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haptoglobin": 1, "Headache": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Interchange of vaccine products": 1, "Mean cell volume": 1, "Mycoplasma test": 1, "Parvovirus B19 test": 1, "Platelet count": 1, "Pyrexia": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Total complement activity test": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FK 8562", "histograms": [{"histogram": {"Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Aspiration bone marrow": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood bilirubin": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood smear test": 1, "Blood test": 1, "COVID-19 immunisation": 1, "Cold agglutinins": 1, "Cold type haemolytic anaemia": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram neck": 1, "Computerised tomogram thorax": 1, "Coombs direct test": 1, "Cytomegalovirus test": 1, "Electrophoresis protein": 1, "Endoscopy upper gastrointestinal tract": 1, "Epstein-Barr virus test": 1, "Flow cytometry": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haptoglobin": 1, "Headache": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Interchange of vaccine products": 1, "Mean cell volume": 1, "Mycoplasma test": 1, "Parvovirus B19 test": 1, "Platelet count": 1, "Pyrexia": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Total complement activity test": 1, "White blood cell count": 1}, "batchcodes": ["3002540", "FK 8562"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK0100.json b/docs/data/histograms/Japan/FK0100.json
index fef10b8a9bf..e8a04f01c33 100644
--- a/docs/data/histograms/Japan/FK0100.json
+++ b/docs/data/histograms/Japan/FK0100.json
@@ -1 +1 @@
-{"batchcode": "FK0100", "histograms": [{"batchcodes": ["FK0100"], "histogram": {"Blood test": 1, "Body temperature": 1, "CSF test": 1, "Grip strength decreased": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Neuralgic amyotrophy": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0100", "histograms": [{"histogram": {"Blood test": 1, "Body temperature": 1, "CSF test": 1, "Grip strength decreased": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Neuralgic amyotrophy": 1, "Swelling": 1}, "batchcodes": ["FK0100"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK0108.json b/docs/data/histograms/Japan/FK0108.json
index dc464b05ae1..eb28027cdf5 100644
--- a/docs/data/histograms/Japan/FK0108.json
+++ b/docs/data/histograms/Japan/FK0108.json
@@ -1 +1 @@
-{"batchcode": "FK0108", "histograms": [{"batchcodes": ["FK0108"], "histogram": {"Body temperature": 63, "Blood pressure measurement": 30, "Oxygen saturation": 26, "Heart rate": 25, "Pyrexia": 24, "Presyncope": 18, "Blood pressure decreased": 15, "Feeling abnormal": 14, "Malaise": 13, "Loss of consciousness": 12, "Heart rate decreased": 10, "Nausea": 10, "Anaphylactic reaction": 9, "Arthralgia": 9, "Chest pain": 9, "Dyspnoea": 9, "Cold sweat": 8, "Electrocardiogram": 8, "Headache": 8, "Pain in extremity": 8, "Vital signs measurement": 8, "Blood test": 7, "Cough": 7, "Fall": 7, "Hypoaesthesia": 7, "Myocarditis": 7, "Pallor": 7, "Seizure": 7, "Blood pressure increased": 6, "Depressed level of consciousness": 5, "Electrocardiogram ST segment elevation": 5, "Oxygen saturation decreased": 5, "Pericarditis": 5, "Bradycardia": 4, "Decreased appetite": 4, "Dizziness": 4, "Erythema": 4, "Hyperhidrosis": 4, "Oropharyngeal discomfort": 4, "Palpitations": 4, "Platelet count": 4, "Pruritus": 4, "Tremor": 4, "Abdominal pain": 3, "Asthma": 3, "Back pain": 3, "Blood glucose": 3, "CSF protein": 3, "CSF test": 3, "Cardio-respiratory arrest": 3, "Computerised tomogram": 3, "Dysphoria": 3, "Echocardiogram": 3, "Feeling cold": 3, "Immunisation": 3, "Magnetic resonance imaging": 3, "Neck pain": 3, "Nerve conduction studies": 3, "Neuropathy peripheral": 3, "Rash": 3, "Urticaria": 3, "Vaccination site pain": 3, "Alanine aminotransferase": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Blood creatine phosphokinase increased": 2, "Blood glucose increased": 2, "Blood immunoglobulin E": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "CSF cell count": 2, "CSF protein increased": 2, "Chills": 2, "Circulatory collapse": 2, "Condition aggravated": 2, "Contusion": 2, "Drug ineffective": 2, "Dysstasia": 2, "Ear discomfort": 2, "Eczema": 2, "Electroencephalogram": 2, "Epilepsy": 2, "Gait disturbance": 2, "Gamma-glutamyltransferase": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "Haematuria": 2, "Hepatic function abnormal": 2, "Hyperventilation": 2, "Inflammation": 2, "Insomnia": 2, "Investigation": 2, "Magnetic resonance imaging head": 2, "Mobility decreased": 2, "Muscular weakness": 2, "Myelitis": 2, "Nasal congestion": 2, "Neutrophil count": 2, "Oedema": 2, "Pain": 2, "Peripheral swelling": 2, "Pharyngeal erythema": 2, "Platelet count decreased": 2, "Pleural effusion": 2, "Positron emission tomogram": 2, "Proteinuria": 2, "Respiratory disorder": 2, "Sensory disturbance": 2, "Syncope": 2, "Tachycardia": 2, "Throat tightness": 2, "Thrombocytopenic purpura": 2, "Troponin": 2, "Troponin T increased": 2, "Urine analysis": 2, "Vomiting": 2, "White blood cell count": 2, "Acidosis": 1, "Acute respiratory distress syndrome": 1, "Alanine aminotransferase increased": 1, "Anaphylactic shock": 1, "Anti-GAD antibody": 1, "Anti-GAD antibody positive": 1, "Anti-aquaporin-4 antibody": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Arthropod bite": 1, "Aspartate aminotransferase increased": 1, "Atrioventricular block second degree": 1, "Atypical mycobacterial infection": 1, "Autoimmune disorder": 1, "Autonomic nervous system imbalance": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Biopsy bone marrow": 1, "Bladder dysfunction": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin M": 1, "Blood immunoglobulin M increased": 1, "Blood lactate dehydrogenase increased": 1, "Blood pH": 1, "Blood pressure diastolic decreased": 1, "Blood triglycerides": 1, "Body temperature abnormal": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Brown-Sequard syndrome": 1, "COVID-19": 1, "CSF cell count increased": 1, "CSF glucose": 1, "Cardiac disorder": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Cardiopulmonary exercise test": 1, "Catheterisation cardiac": 1, "Central nervous system vasculitis": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Collagen disorder": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Conversion disorder": 1, "Dehydration": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Drowning": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Eating disorder": 1, "Ejection fraction decreased": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram abnormal": 1, "Encephalitis": 1, "Encephalopathy": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Eyelid oedema": 1, "Facial paralysis": 1, "Feeling hot": 1, "Fibromyalgia": 1, "Flushing": 1, "Food allergy": 1, "Functional gastrointestinal disorder": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head injury": 1, "Heart rate increased": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis viral test": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Ileus paralytic": 1, "Imaging procedure": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Joint swelling": 1, "KL-6": 1, "Lacunar infarction": 1, "Left ventricular dysfunction": 1, "Leukaemia": 1, "Liver function test": 1, "Liver function test increased": 1, "Lymphocyte count": 1, "Lymphoma": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Morphoea": 1, "Movement disorder": 1, "Mucosal disorder": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Mycoplasma test": 1, "Myelitis transverse": 1, "Myocardial rupture": 1, "Myoclonic epilepsy": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nephritis": 1, "Neuritis cranial": 1, "Neutrophil count increased": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PO2": 1, "PO2 increased": 1, "Paraesthesia": 1, "Parvovirus infection": 1, "Pericardial haemorrhage": 1, "Peripheral vascular disorder": 1, "Petechiae": 1, "Pharyngeal stenosis": 1, "Pneumonia": 1, "Pneumonia bacterial": 1, "Polydipsia": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Polyuria": 1, "Poor quality sleep": 1, "Postictal paralysis": 1, "Product use issue": 1, "Productive cough": 1, "Protein total": 1, "Psychogenic seizure": 1, "Pulse abnormal": 1, "Purpura": 1, "Red blood cell count": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Scleroderma": 1, "Shock": 1, "Sluggishness": 1, "Sneezing": 1, "Somnolence": 1, "Spinal cord disorder": 1, "Sputum retention": 1, "Streptococcus test": 1, "Stress": 1, "Stridor": 1, "Suffocation feeling": 1, "Surfactant protein": 1, "Suspected COVID-19": 1, "Swelling": 1, "Systemic inflammatory response syndrome": 1, "Systemic lupus erythematosus": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Troponin abnormal": 1, "Troponin increased": 1, "Type 1 diabetes mellitus": 1, "Ultrasound scan": 1, "Urinary occult blood": 1, "Vasculitis": 1, "Ventricular hypokinesia": 1, "Viral myocarditis": 1, "Viral pericarditis": 1, "Vision blurred": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1, "X-ray limb": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0108", "histograms": [{"histogram": {"Body temperature": 63, "Blood pressure measurement": 30, "Oxygen saturation": 26, "Heart rate": 25, "Pyrexia": 24, "Presyncope": 18, "Blood pressure decreased": 15, "Feeling abnormal": 14, "Malaise": 13, "Loss of consciousness": 12, "Heart rate decreased": 10, "Nausea": 10, "Anaphylactic reaction": 9, "Arthralgia": 9, "Chest pain": 9, "Dyspnoea": 9, "Cold sweat": 8, "Electrocardiogram": 8, "Headache": 8, "Pain in extremity": 8, "Vital signs measurement": 8, "Blood test": 7, "Cough": 7, "Fall": 7, "Hypoaesthesia": 7, "Myocarditis": 7, "Pallor": 7, "Seizure": 7, "Blood pressure increased": 6, "Depressed level of consciousness": 5, "Electrocardiogram ST segment elevation": 5, "Oxygen saturation decreased": 5, "Pericarditis": 5, "Bradycardia": 4, "Decreased appetite": 4, "Dizziness": 4, "Erythema": 4, "Hyperhidrosis": 4, "Oropharyngeal discomfort": 4, "Palpitations": 4, "Platelet count": 4, "Pruritus": 4, "Tremor": 4, "Abdominal pain": 3, "Asthma": 3, "Back pain": 3, "Blood glucose": 3, "CSF protein": 3, "CSF test": 3, "Cardio-respiratory arrest": 3, "Computerised tomogram": 3, "Dysphoria": 3, "Echocardiogram": 3, "Feeling cold": 3, "Immunisation": 3, "Magnetic resonance imaging": 3, "Neck pain": 3, "Nerve conduction studies": 3, "Neuropathy peripheral": 3, "Rash": 3, "Urticaria": 3, "Vaccination site pain": 3, "Alanine aminotransferase": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Blood creatine phosphokinase increased": 2, "Blood glucose increased": 2, "Blood immunoglobulin E": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "CSF cell count": 2, "CSF protein increased": 2, "Chills": 2, "Circulatory collapse": 2, "Condition aggravated": 2, "Contusion": 2, "Drug ineffective": 2, "Dysstasia": 2, "Ear discomfort": 2, "Eczema": 2, "Electroencephalogram": 2, "Epilepsy": 2, "Gait disturbance": 2, "Gamma-glutamyltransferase": 2, "Glycosylated haemoglobin": 2, "Guillain-Barre syndrome": 2, "Haematuria": 2, "Hepatic function abnormal": 2, "Hyperventilation": 2, "Inflammation": 2, "Insomnia": 2, "Investigation": 2, "Magnetic resonance imaging head": 2, "Mobility decreased": 2, "Muscular weakness": 2, "Myelitis": 2, "Nasal congestion": 2, "Neutrophil count": 2, "Oedema": 2, "Pain": 2, "Peripheral swelling": 2, "Pharyngeal erythema": 2, "Platelet count decreased": 2, "Pleural effusion": 2, "Positron emission tomogram": 2, "Proteinuria": 2, "Respiratory disorder": 2, "Sensory disturbance": 2, "Syncope": 2, "Tachycardia": 2, "Throat tightness": 2, "Thrombocytopenic purpura": 2, "Troponin": 2, "Troponin T increased": 2, "Urine analysis": 2, "Vomiting": 2, "White blood cell count": 2, "Acidosis": 1, "Acute respiratory distress syndrome": 1, "Alanine aminotransferase increased": 1, "Anaphylactic shock": 1, "Anti-GAD antibody": 1, "Anti-GAD antibody positive": 1, "Anti-aquaporin-4 antibody": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Arthropod bite": 1, "Aspartate aminotransferase increased": 1, "Atrioventricular block second degree": 1, "Atypical mycobacterial infection": 1, "Autoimmune disorder": 1, "Autonomic nervous system imbalance": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Biopsy bone marrow": 1, "Bladder dysfunction": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin M": 1, "Blood immunoglobulin M increased": 1, "Blood lactate dehydrogenase increased": 1, "Blood pH": 1, "Blood pressure diastolic decreased": 1, "Blood triglycerides": 1, "Body temperature abnormal": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Brown-Sequard syndrome": 1, "COVID-19": 1, "CSF cell count increased": 1, "CSF glucose": 1, "Cardiac disorder": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Cardiopulmonary exercise test": 1, "Catheterisation cardiac": 1, "Central nervous system vasculitis": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Collagen disorder": 1, "Complex regional pain syndrome": 1, "Computerised tomogram head": 1, "Conversion disorder": 1, "Dehydration": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Drowning": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Eating disorder": 1, "Ejection fraction decreased": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram abnormal": 1, "Encephalitis": 1, "Encephalopathy": 1, "Enterocolitis": 1, "Eosinophil count": 1, "Erythema multiforme": 1, "Eyelid oedema": 1, "Facial paralysis": 1, "Feeling hot": 1, "Fibromyalgia": 1, "Flushing": 1, "Food allergy": 1, "Functional gastrointestinal disorder": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Head injury": 1, "Heart rate increased": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis viral test": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Ileus paralytic": 1, "Imaging procedure": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Joint swelling": 1, "KL-6": 1, "Lacunar infarction": 1, "Left ventricular dysfunction": 1, "Leukaemia": 1, "Liver function test": 1, "Liver function test increased": 1, "Lymphocyte count": 1, "Lymphoma": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Morphoea": 1, "Movement disorder": 1, "Mucosal disorder": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Mycoplasma test": 1, "Myelitis transverse": 1, "Myocardial rupture": 1, "Myoclonic epilepsy": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nephritis": 1, "Neuritis cranial": 1, "Neutrophil count increased": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PO2": 1, "PO2 increased": 1, "Paraesthesia": 1, "Parvovirus infection": 1, "Pericardial haemorrhage": 1, "Peripheral vascular disorder": 1, "Petechiae": 1, "Pharyngeal stenosis": 1, "Pneumonia": 1, "Pneumonia bacterial": 1, "Polydipsia": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Polyuria": 1, "Poor quality sleep": 1, "Postictal paralysis": 1, "Product use issue": 1, "Productive cough": 1, "Protein total": 1, "Psychogenic seizure": 1, "Pulse abnormal": 1, "Purpura": 1, "Red blood cell count": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Scleroderma": 1, "Shock": 1, "Sluggishness": 1, "Sneezing": 1, "Somnolence": 1, "Spinal cord disorder": 1, "Sputum retention": 1, "Streptococcus test": 1, "Stress": 1, "Stridor": 1, "Suffocation feeling": 1, "Surfactant protein": 1, "Suspected COVID-19": 1, "Swelling": 1, "Systemic inflammatory response syndrome": 1, "Systemic lupus erythematosus": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Troponin I": 1, "Troponin I increased": 1, "Troponin T": 1, "Troponin abnormal": 1, "Troponin increased": 1, "Type 1 diabetes mellitus": 1, "Ultrasound scan": 1, "Urinary occult blood": 1, "Vasculitis": 1, "Ventricular hypokinesia": 1, "Viral myocarditis": 1, "Viral pericarditis": 1, "Vision blurred": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1, "X-ray limb": 1}, "batchcodes": ["FK0108"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK0595.json b/docs/data/histograms/Japan/FK0595.json
index 198f3c88f7b..6b6303c1c32 100644
--- a/docs/data/histograms/Japan/FK0595.json
+++ b/docs/data/histograms/Japan/FK0595.json
@@ -1 +1 @@
-{"batchcode": "FK0595", "histograms": [{"batchcodes": ["FK0595"], "histogram": {"Body temperature": 38, "Pyrexia": 12, "Dizziness": 8, "Anaphylactic reaction": 7, "Nausea": 7, "Dyspnoea": 6, "Malaise": 6, "Oxygen saturation": 6, "Blood pressure measurement": 4, "Headache": 4, "Heart rate": 4, "Rash": 4, "Arrhythmia": 3, "Blood pressure increased": 3, "Cerebral infarction": 3, "Chest pain": 3, "Cough": 3, "Drug ineffective": 3, "Erythema": 3, "Gait disturbance": 3, "Loss of consciousness": 3, "Magnetic resonance imaging": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Pain in extremity": 3, "Peripheral coldness": 3, "SARS-CoV-2 test": 3, "Seizure": 3, "Altered state of consciousness": 2, "Arthralgia": 2, "Asthenia": 2, "Auscultation": 2, "Blood test": 2, "COVID-19": 2, "Cardio-respiratory arrest": 2, "Coma scale": 2, "Death": 2, "Guillain-Barre syndrome": 2, "Hypersensitivity": 2, "Joint range of motion decreased": 2, "Lymphadenopathy": 2, "Pain": 2, "Physical deconditioning": 2, "Pneumonia aspiration": 2, "Productive cough": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Tremor": 2, "Urticaria": 2, "Vital signs measurement": 2, "Vomiting": 2, "Abdominal distension": 1, "Abdominal mass": 1, "Abdominal pain upper": 1, "Abscess": 1, "Anaphylactic shock": 1, "Ankle brachial index": 1, "Axillary pain": 1, "Back pain": 1, "Bacterial infection": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy": 1, "Blister": 1, "Blood glucose": 1, "Blood pressure management": 1, "COVID-19 pneumonia": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac failure": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Deafness": 1, "Decreased immune responsiveness": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Drug eruption": 1, "Dyspraxia": 1, "Dysstasia": 1, "Electroencephalogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Enteritis infectious": 1, "Epilepsy": 1, "Erysipelas": 1, "Extremity necrosis": 1, "Facial paralysis": 1, "Fall": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Flushing": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Hernia": 1, "Hernia pain": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hyporeflexia": 1, "Hypothermia": 1, "IIIrd nerve paralysis": 1, "Immune thrombocytopenia": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Intention tremor": 1, "Internal haemorrhage": 1, "Intracerebral haematoma evacuation": 1, "Investigation": 1, "Limb discomfort": 1, "Lung opacity": 1, "Metastases to lung": 1, "Moaning": 1, "Monoplegia": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Nasal congestion": 1, "Near drowning": 1, "Neoplasm malignant": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Oxygenation index": 1, "Pallor": 1, "Palpitations": 1, "Parkinson's disease": 1, "Periarthritis": 1, "Peripheral arterial occlusive disease": 1, "Peripheral artery thrombosis": 1, "Peripheral circulatory failure": 1, "Pneumonia": 1, "Presyncope": 1, "Pruritus": 1, "Pulmonary function test": 1, "Pulmonary tuberculosis": 1, "Rash erythematous": 1, "Respiratory arrest": 1, "Rhabdomyolysis": 1, "Scrotal cancer": 1, "Seasonal allergy": 1, "Skin discolouration": 1, "Skin erosion": 1, "Skin ulcer": 1, "Slow speech": 1, "Stenosis": 1, "Stomatitis": 1, "Swelling": 1, "Taste disorder": 1, "Thirst": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Type 1 diabetes mellitus": 1, "Ultrasound scan": 1, "Urine ketone body": 1, "Vaccination site pain": 1, "Vibration test abnormal": 1, "X-ray": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0595", "histograms": [{"histogram": {"Body temperature": 38, "Pyrexia": 12, "Dizziness": 8, "Anaphylactic reaction": 7, "Nausea": 7, "Dyspnoea": 6, "Malaise": 6, "Oxygen saturation": 6, "Blood pressure measurement": 4, "Headache": 4, "Heart rate": 4, "Rash": 4, "Arrhythmia": 3, "Blood pressure increased": 3, "Cerebral infarction": 3, "Chest pain": 3, "Cough": 3, "Drug ineffective": 3, "Erythema": 3, "Gait disturbance": 3, "Loss of consciousness": 3, "Magnetic resonance imaging": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Pain in extremity": 3, "Peripheral coldness": 3, "SARS-CoV-2 test": 3, "Seizure": 3, "Altered state of consciousness": 2, "Arthralgia": 2, "Asthenia": 2, "Auscultation": 2, "Blood test": 2, "COVID-19": 2, "Cardio-respiratory arrest": 2, "Coma scale": 2, "Death": 2, "Guillain-Barre syndrome": 2, "Hypersensitivity": 2, "Joint range of motion decreased": 2, "Lymphadenopathy": 2, "Pain": 2, "Physical deconditioning": 2, "Pneumonia aspiration": 2, "Productive cough": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Tremor": 2, "Urticaria": 2, "Vital signs measurement": 2, "Vomiting": 2, "Abdominal distension": 1, "Abdominal mass": 1, "Abdominal pain upper": 1, "Abscess": 1, "Anaphylactic shock": 1, "Ankle brachial index": 1, "Axillary pain": 1, "Back pain": 1, "Bacterial infection": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy": 1, "Blister": 1, "Blood glucose": 1, "Blood pressure management": 1, "COVID-19 pneumonia": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac failure": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Deafness": 1, "Decreased immune responsiveness": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Drug eruption": 1, "Dyspraxia": 1, "Dysstasia": 1, "Electroencephalogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Enteritis infectious": 1, "Epilepsy": 1, "Erysipelas": 1, "Extremity necrosis": 1, "Facial paralysis": 1, "Fall": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Flushing": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Hernia": 1, "Hernia pain": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hyporeflexia": 1, "Hypothermia": 1, "IIIrd nerve paralysis": 1, "Immune thrombocytopenia": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Intention tremor": 1, "Internal haemorrhage": 1, "Intracerebral haematoma evacuation": 1, "Investigation": 1, "Limb discomfort": 1, "Lung opacity": 1, "Metastases to lung": 1, "Moaning": 1, "Monoplegia": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Nasal congestion": 1, "Near drowning": 1, "Neoplasm malignant": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Oxygenation index": 1, "Pallor": 1, "Palpitations": 1, "Parkinson's disease": 1, "Periarthritis": 1, "Peripheral arterial occlusive disease": 1, "Peripheral artery thrombosis": 1, "Peripheral circulatory failure": 1, "Pneumonia": 1, "Presyncope": 1, "Pruritus": 1, "Pulmonary function test": 1, "Pulmonary tuberculosis": 1, "Rash erythematous": 1, "Respiratory arrest": 1, "Rhabdomyolysis": 1, "Scrotal cancer": 1, "Seasonal allergy": 1, "Skin discolouration": 1, "Skin erosion": 1, "Skin ulcer": 1, "Slow speech": 1, "Stenosis": 1, "Stomatitis": 1, "Swelling": 1, "Taste disorder": 1, "Thirst": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Type 1 diabetes mellitus": 1, "Ultrasound scan": 1, "Urine ketone body": 1, "Vaccination site pain": 1, "Vibration test abnormal": 1, "X-ray": 1, "Yellow skin": 1}, "batchcodes": ["FK0595"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK6302.json b/docs/data/histograms/Japan/FK6302.json
index 7d6a8ab8e2b..8ea268f8833 100644
--- a/docs/data/histograms/Japan/FK6302.json
+++ b/docs/data/histograms/Japan/FK6302.json
@@ -1 +1 @@
-{"batchcode": "FK6302", "histograms": [{"batchcodes": ["FK6302"], "histogram": {"Body temperature": 65, "Blood pressure measurement": 21, "Heart rate": 19, "Oxygen saturation": 17, "Pyrexia": 17, "Electrocardiogram": 12, "Dizziness": 11, "Echocardiogram": 11, "Myocarditis": 11, "Anaphylactic reaction": 10, "Blood pressure increased": 10, "Chest pain": 9, "Cough": 9, "Feeling abnormal": 9, "Headache": 8, "Loss of consciousness": 8, "Malaise": 8, "Nausea": 8, "Blood creatine phosphokinase": 7, "C-reactive protein": 7, "Dyspnoea": 7, "Erythema": 7, "Hypoaesthesia": 7, "Immunisation": 7, "Urticaria": 7, "Blood creatine phosphokinase MB": 6, "Blood test": 6, "Magnetic resonance imaging head": 6, "Palpitations": 6, "Presyncope": 6, "Pruritus": 6, "Electrocardiogram ST segment elevation": 5, "Rash": 5, "Seizure": 5, "Troponin T": 5, "Vaccination site pain": 5, "Vomiting": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "Blood pressure decreased": 4, "Magnetic resonance imaging": 4, "Pain": 4, "Pain in extremity": 4, "Pallor": 4, "SARS-CoV-2 test": 4, "Arthralgia": 3, "Biopsy heart": 3, "Blood bilirubin": 3, "Blood creatine phosphokinase MB increased": 3, "Bradycardia": 3, "C-reactive protein increased": 3, "Catheterisation cardiac": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Computerised tomogram head": 3, "Condition aggravated": 3, "Decreased appetite": 3, "Depressed level of consciousness": 3, "Dyskinesia": 3, "Ejection fraction": 3, "Fibrin D dimer": 3, "Heart rate increased": 3, "Inappropriate schedule of product administration": 3, "Investigation": 3, "Magnetic resonance imaging heart": 3, "Muscular weakness": 3, "Oxygen saturation decreased": 3, "Peripheral coldness": 3, "Physical deconditioning": 3, "Thrombosis with thrombocytopenia syndrome": 3, "Troponin I": 3, "Troponin T increased": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Angiocardiogram": 2, "Back pain": 2, "Bilirubin conjugated": 2, "Biopsy kidney": 2, "Blood creatine phosphokinase increased": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Contusion": 2, "Death": 2, "Dehydration": 2, "Drug ineffective": 2, "Eczema": 2, "Epilepsy": 2, "Eye pruritus": 2, "Facial paralysis": 2, "Fall": 2, "Feeding disorder": 2, "Gamma-glutamyltransferase": 2, "Haematuria": 2, "Head circumference": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Herpes zoster": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "Hypoacusis": 2, "Insomnia": 2, "Laboratory test": 2, "Macular oedema": 2, "Malnutrition": 2, "Maternal exposure during pregnancy": 2, "Myocardial infarction": 2, "Nephrotic syndrome": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "Pericarditis": 2, "Protein urine": 2, "Rhinorrhoea": 2, "Sensory disturbance": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Tenderness": 2, "Thrombosis": 2, "Transient ischaemic attack": 2, "Tremor": 2, "Ultrasound scan": 2, "Vision blurred": 2, "Visual impairment": 2, "Vital signs measurement": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Acoustic stimulation tests": 1, "Acute disseminated encephalomyelitis": 1, "Acute hepatic failure": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Akinesia": 1, "Alanine aminotransferase increased": 1, "Alopecia areata": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Anti-platelet antibody": 1, "Antibody test": 1, "Aortic dissection": 1, "Aplastic anaemia": 1, "Arrhythmia supraventricular": 1, "Aspartate aminotransferase increased": 1, "Aspiration": 1, "Asthenia": 1, "Asthma": 1, "Atrial fibrillation": 1, "Atypical mycobacterial infection": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Autonomic neuropathy": 1, "Balance disorder": 1, "Biopsy bone marrow": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Body temperature increased": 1, "COVID-19": 1, "CSF oligoclonal band": 1, "CSF test": 1, "CSF test normal": 1, "CSF white blood cell count": 1, "Cardiac failure": 1, "Cardiac tamponade": 1, "Cardiac ventriculogram left": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Central nervous system lesion": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricle dilatation": 1, "Cerebral ventricular rupture": 1, "Chills": 1, "Chromaturia": 1, "Chronic respiratory failure": 1, "Colitis ischaemic": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Complex regional pain syndrome": 1, "Computerised tomogram thorax": 1, "Constipation": 1, "Coronavirus test": 1, "Craniotomy": 1, "Cytopenia": 1, "Deafness": 1, "Demyelination": 1, "Diabetes mellitus": 1, "Diffusion-weighted brain MRI": 1, "Disease recurrence": 1, "Disorganised speech": 1, "Dopamine transporter scintigraphy": 1, "Drug hypersensitivity": 1, "Dumping syndrome": 1, "Dyshidrotic eczema": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Eosinophilic oesophagitis": 1, "Erythema multiforme": 1, "Exercise electrocardiogram": 1, "Facial pain": 1, "Fatigue": 1, "Fundoscopy": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematoma": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Henoch-Schonlein purpura": 1, "Henoch-Schonlein purpura nephritis": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Histology": 1, "Hyperaesthesia": 1, "Hypertension": 1, "Hypotension": 1, "Hypozincaemia": 1, "Illness": 1, "Imaging procedure": 1, "Incontinence": 1, "Incorrect route of product administration": 1, "Injury": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Joint range of motion decreased": 1, "Lack of spontaneous speech": 1, "Laryngeal oedema": 1, "Left ventricular dysfunction": 1, "Limb mass": 1, "Lip blister": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Magnetic resonance imaging spinal": 1, "Marasmus": 1, "Mental impairment": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Myocardial oedema": 1, "Myocardial rupture": 1, "Obstructive airways disorder": 1, "Ocular hyperaemia": 1, "Ocular icterus": 1, "Oedema": 1, "Oedema peripheral": 1, "Optical coherence tomography": 1, "Oral mucosal erythema": 1, "Oropharyngeal discomfort": 1, "Orthostatic intolerance": 1, "Pain in jaw": 1, "Pancytopenia": 1, "Paralysis": 1, "Parkinson's disease": 1, "Parotid gland enlargement": 1, "Peripheral swelling": 1, "Petechiae": 1, "Phlebitis": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Positron emission tomogram": 1, "Postmenopausal haemorrhage": 1, "Premature baby": 1, "Premature labour": 1, "Prinzmetal angina": 1, "Protein urine present": 1, "Pulmonary arterial wedge pressure increased": 1, "Pulmonary infarction": 1, "Pulmonary pain": 1, "Red blood cell sedimentation rate": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Restlessness": 1, "Retinal vein occlusion": 1, "Scan adrenal gland": 1, "Sciatica": 1, "Sensation of foreign body": 1, "Shock": 1, "Shoulder injury related to vaccine administration": 1, "Slit-lamp examination": 1, "Somatic symptom disorder": 1, "Spinal X-ray": 1, "Stertor": 1, "Stridor": 1, "Sudden death": 1, "Swelling": 1, "Syncope": 1, "Talipes": 1, "Tension": 1, "Thalamus haemorrhage": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombophlebitis": 1, "Tinnitus": 1, "Tooth injury": 1, "Tooth loss": 1, "Troponin": 1, "Troponin increased": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Urinary occult blood": 1, "Urine abnormality": 1, "Vaccination complication": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site irritation": 1, "Vaccination site joint movement impairment": 1, "Vaccination site movement impairment": 1, "Vaccination site warmth": 1, "Varicella zoster virus infection": 1, "Vascular purpura": 1, "Ventricular arrhythmia": 1, "Ventricular dyskinesia": 1, "Ventricular hypokinesia": 1, "Viral myocarditis": 1, "Visual acuity reduced": 1, "Wall motion score index abnormal": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6302", "histograms": [{"histogram": {"Body temperature": 65, "Blood pressure measurement": 21, "Heart rate": 19, "Oxygen saturation": 17, "Pyrexia": 17, "Electrocardiogram": 12, "Dizziness": 11, "Echocardiogram": 11, "Myocarditis": 11, "Anaphylactic reaction": 10, "Blood pressure increased": 10, "Chest pain": 9, "Cough": 9, "Feeling abnormal": 9, "Headache": 8, "Loss of consciousness": 8, "Malaise": 8, "Nausea": 8, "Blood creatine phosphokinase": 7, "C-reactive protein": 7, "Dyspnoea": 7, "Erythema": 7, "Hypoaesthesia": 7, "Immunisation": 7, "Urticaria": 7, "Blood creatine phosphokinase MB": 6, "Blood test": 6, "Magnetic resonance imaging head": 6, "Palpitations": 6, "Presyncope": 6, "Pruritus": 6, "Electrocardiogram ST segment elevation": 5, "Rash": 5, "Seizure": 5, "Troponin T": 5, "Vaccination site pain": 5, "Vomiting": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "Blood pressure decreased": 4, "Magnetic resonance imaging": 4, "Pain": 4, "Pain in extremity": 4, "Pallor": 4, "SARS-CoV-2 test": 4, "Arthralgia": 3, "Biopsy heart": 3, "Blood bilirubin": 3, "Blood creatine phosphokinase MB increased": 3, "Bradycardia": 3, "C-reactive protein increased": 3, "Catheterisation cardiac": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Computerised tomogram head": 3, "Condition aggravated": 3, "Decreased appetite": 3, "Depressed level of consciousness": 3, "Dyskinesia": 3, "Ejection fraction": 3, "Fibrin D dimer": 3, "Heart rate increased": 3, "Inappropriate schedule of product administration": 3, "Investigation": 3, "Magnetic resonance imaging heart": 3, "Muscular weakness": 3, "Oxygen saturation decreased": 3, "Peripheral coldness": 3, "Physical deconditioning": 3, "Thrombosis with thrombocytopenia syndrome": 3, "Troponin I": 3, "Troponin T increased": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Angiocardiogram": 2, "Back pain": 2, "Bilirubin conjugated": 2, "Biopsy kidney": 2, "Blood creatine phosphokinase increased": 2, "CSF cell count": 2, "CSF glucose": 2, "CSF protein": 2, "Cardio-respiratory arrest": 2, "Cerebral infarction": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Contusion": 2, "Death": 2, "Dehydration": 2, "Drug ineffective": 2, "Eczema": 2, "Epilepsy": 2, "Eye pruritus": 2, "Facial paralysis": 2, "Fall": 2, "Feeding disorder": 2, "Gamma-glutamyltransferase": 2, "Haematuria": 2, "Head circumference": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hepatic function abnormal": 2, "Herpes zoster": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hyperventilation": 2, "Hypoacusis": 2, "Insomnia": 2, "Laboratory test": 2, "Macular oedema": 2, "Malnutrition": 2, "Maternal exposure during pregnancy": 2, "Myocardial infarction": 2, "Nephrotic syndrome": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "Pericarditis": 2, "Protein urine": 2, "Rhinorrhoea": 2, "Sensory disturbance": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Tenderness": 2, "Thrombosis": 2, "Transient ischaemic attack": 2, "Tremor": 2, "Ultrasound scan": 2, "Vision blurred": 2, "Visual impairment": 2, "Vital signs measurement": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Acoustic stimulation tests": 1, "Acute disseminated encephalomyelitis": 1, "Acute hepatic failure": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Akinesia": 1, "Alanine aminotransferase increased": 1, "Alopecia areata": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Anti-platelet antibody": 1, "Antibody test": 1, "Aortic dissection": 1, "Aplastic anaemia": 1, "Arrhythmia supraventricular": 1, "Aspartate aminotransferase increased": 1, "Aspiration": 1, "Asthenia": 1, "Asthma": 1, "Atrial fibrillation": 1, "Atypical mycobacterial infection": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Autonomic neuropathy": 1, "Balance disorder": 1, "Biopsy bone marrow": 1, "Biopsy liver": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Body temperature increased": 1, "COVID-19": 1, "CSF oligoclonal band": 1, "CSF test": 1, "CSF test normal": 1, "CSF white blood cell count": 1, "Cardiac failure": 1, "Cardiac tamponade": 1, "Cardiac ventriculogram left": 1, "Cardiomegaly": 1, "Cardiomyopathy": 1, "Central nervous system lesion": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricle dilatation": 1, "Cerebral ventricular rupture": 1, "Chills": 1, "Chromaturia": 1, "Chronic respiratory failure": 1, "Colitis ischaemic": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Complex regional pain syndrome": 1, "Computerised tomogram thorax": 1, "Constipation": 1, "Coronavirus test": 1, "Craniotomy": 1, "Cytopenia": 1, "Deafness": 1, "Demyelination": 1, "Diabetes mellitus": 1, "Diffusion-weighted brain MRI": 1, "Disease recurrence": 1, "Disorganised speech": 1, "Dopamine transporter scintigraphy": 1, "Drug hypersensitivity": 1, "Dumping syndrome": 1, "Dyshidrotic eczema": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Eosinophilic oesophagitis": 1, "Erythema multiforme": 1, "Exercise electrocardiogram": 1, "Facial pain": 1, "Fatigue": 1, "Fundoscopy": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematoma": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Henoch-Schonlein purpura": 1, "Henoch-Schonlein purpura nephritis": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Histology": 1, "Hyperaesthesia": 1, "Hypertension": 1, "Hypotension": 1, "Hypozincaemia": 1, "Illness": 1, "Imaging procedure": 1, "Incontinence": 1, "Incorrect route of product administration": 1, "Injury": 1, "Intermenstrual bleeding": 1, "Internal haemorrhage": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Joint range of motion decreased": 1, "Lack of spontaneous speech": 1, "Laryngeal oedema": 1, "Left ventricular dysfunction": 1, "Limb mass": 1, "Lip blister": 1, "Liver disorder": 1, "Liver function test abnormal": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Magnetic resonance imaging spinal": 1, "Marasmus": 1, "Mental impairment": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Myocardial oedema": 1, "Myocardial rupture": 1, "Obstructive airways disorder": 1, "Ocular hyperaemia": 1, "Ocular icterus": 1, "Oedema": 1, "Oedema peripheral": 1, "Optical coherence tomography": 1, "Oral mucosal erythema": 1, "Oropharyngeal discomfort": 1, "Orthostatic intolerance": 1, "Pain in jaw": 1, "Pancytopenia": 1, "Paralysis": 1, "Parkinson's disease": 1, "Parotid gland enlargement": 1, "Peripheral swelling": 1, "Petechiae": 1, "Phlebitis": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Positron emission tomogram": 1, "Postmenopausal haemorrhage": 1, "Premature baby": 1, "Premature labour": 1, "Prinzmetal angina": 1, "Protein urine present": 1, "Pulmonary arterial wedge pressure increased": 1, "Pulmonary infarction": 1, "Pulmonary pain": 1, "Red blood cell sedimentation rate": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Restlessness": 1, "Retinal vein occlusion": 1, "Scan adrenal gland": 1, "Sciatica": 1, "Sensation of foreign body": 1, "Shock": 1, "Shoulder injury related to vaccine administration": 1, "Slit-lamp examination": 1, "Somatic symptom disorder": 1, "Spinal X-ray": 1, "Stertor": 1, "Stridor": 1, "Sudden death": 1, "Swelling": 1, "Syncope": 1, "Talipes": 1, "Tension": 1, "Thalamus haemorrhage": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombophlebitis": 1, "Tinnitus": 1, "Tooth injury": 1, "Tooth loss": 1, "Troponin": 1, "Troponin increased": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Urinary occult blood": 1, "Urine abnormality": 1, "Vaccination complication": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site irritation": 1, "Vaccination site joint movement impairment": 1, "Vaccination site movement impairment": 1, "Vaccination site warmth": 1, "Varicella zoster virus infection": 1, "Vascular purpura": 1, "Ventricular arrhythmia": 1, "Ventricular dyskinesia": 1, "Ventricular hypokinesia": 1, "Viral myocarditis": 1, "Visual acuity reduced": 1, "Wall motion score index abnormal": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["FK6302"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK7441.json b/docs/data/histograms/Japan/FK7441.json
index 2b2730b7c7d..6e393ab9229 100644
--- a/docs/data/histograms/Japan/FK7441.json
+++ b/docs/data/histograms/Japan/FK7441.json
@@ -1 +1 @@
-{"batchcode": "FK7441", "histograms": [{"batchcodes": ["FK7441"], "histogram": {"Body temperature": 70, "Blood pressure measurement": 23, "Pyrexia": 21, "Oxygen saturation": 17, "Heart rate": 16, "SARS-CoV-2 test": 16, "Anaphylactic reaction": 15, "COVID-19": 15, "Dyspnoea": 14, "Vaccination failure": 13, "Electrocardiogram": 11, "C-reactive protein": 10, "Headache": 10, "Malaise": 10, "Echocardiogram": 9, "Hypoaesthesia": 9, "Myocarditis": 9, "Nausea": 9, "Chest pain": 8, "Immunisation": 8, "Presyncope": 8, "Blood pressure increased": 7, "Loss of consciousness": 7, "Blood creatine phosphokinase": 6, "Blood pressure decreased": 6, "Depressed level of consciousness": 6, "Fibrin D dimer": 6, "Investigation": 6, "Pallor": 6, "Palpitations": 6, "Pruritus": 6, "Chest discomfort": 5, "Coma scale": 5, "Computerised tomogram thorax": 5, "Cough": 5, "Dizziness": 5, "Feeling abnormal": 5, "Pain in extremity": 5, "Seizure": 5, "Arthralgia": 4, "Blood creatine phosphokinase MB": 4, "Blood test": 4, "Chills": 4, "Computerised tomogram": 4, "Drug ineffective": 4, "Oropharyngeal discomfort": 4, "Troponin I": 4, "Troponin T": 4, "Wheezing": 4, "White blood cell count": 4, "Abdominal pain": 3, "Anaphylactic shock": 3, "Auscultation": 3, "Blood creatinine": 3, "Brain natriuretic peptide": 3, "Chest X-ray": 3, "Dysphonia": 3, "Ejection fraction": 3, "Electrocardiogram ST segment elevation": 3, "Erythema": 3, "Fall": 3, "Feeling cold": 3, "Generalised tonic-clonic seizure": 3, "Hypersensitivity": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Oropharyngeal pain": 3, "Platelet count": 3, "Stress cardiomyopathy": 3, "Throat irritation": 3, "Tremor": 3, "Urticaria": 3, "Vital signs measurement": 3, "Abdominal pain upper": 2, "Angina pectoris": 2, "Angiocardiogram": 2, "Angiogram": 2, "Antibody test": 2, "Arrhythmia": 2, "Blood creatine phosphokinase MB increased": 2, "Blood creatine phosphokinase increased": 2, "Blood pressure systolic": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "CSF test": 2, "Cardio-respiratory arrest": 2, "Condition aggravated": 2, "Cyanosis": 2, "Deep vein thrombosis": 2, "Diarrhoea": 2, "Dysphagia": 2, "Electrocardiogram ST segment": 2, "Epilepsy": 2, "Haematochezia": 2, "Haemoglobin": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Magnetic resonance imaging head": 2, "Maternal exposure during pregnancy": 2, "N-terminal prohormone brain natriuretic peptide": 2, "N-terminal prohormone brain natriuretic peptide increased": 2, "Off label use": 2, "Pain": 2, "Pericarditis": 2, "Polymerase chain reaction": 2, "Respiratory rate": 2, "Suspected COVID-19": 2, "Syncope": 2, "Tachycardia": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Troponin": 2, "Troponin T increased": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Visual acuity reduced": 2, "Visual impairment": 2, "Vomiting": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abortion spontaneous": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Angiopathy": 1, "Anion gap": 1, "Anti-GAD antibody": 1, "Anti-IA2 antibody": 1, "Anti-insulin antibody": 1, "Anti-zinc transporter 8 antibody": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Areflexia": 1, "Arteriovenous fistula": 1, "Arteriovenous fistula site haemorrhage": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Blindness": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic decreased": 1, "Blood urea": 1, "Brain natriuretic peptide increased": 1, "Bronchoscopy": 1, "Cardiac failure": 1, "Cerebellar ataxia": 1, "Circulatory collapse": 1, "Coagulation test abnormal": 1, "Cold sweat": 1, "Colitis ischaemic": 1, "Colonoscopy": 1, "Coma scale abnormal": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Convulsions local": 1, "Decreased appetite": 1, "Defaecation urgency": 1, "Dermatitis allergic": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Dissociative disorder": 1, "Disturbance in attention": 1, "Diverticulum intestinal": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Drug-induced liver injury": 1, "Dysaesthesia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Electrocardiogram ambulatory": 1, "Embolism": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial paralysis": 1, "Fasting": 1, "Fatigue": 1, "Feeling hot": 1, "Flushing": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Genital haemorrhage": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemorrhage": 1, "Head discomfort": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatic function abnormal": 1, "Herpes zoster": 1, "Hunger": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Imaging procedure": 1, "Impaired driving ability": 1, "Infection": 1, "Inflammation": 1, "Influenza virus test": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Judgement impaired": 1, "Lip pruritus": 1, "Liver disorder": 1, "Macular oedema": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging spinal": 1, "Memory impairment": 1, "Menstrual discomfort": 1, "Migraine": 1, "Miller Fisher syndrome": 1, "Muscle twitching": 1, "Myalgia": 1, "Myelitis": 1, "Neck pain": 1, "Nephrolithiasis": 1, "Nephrotic syndrome": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Occult blood": 1, "Occult blood positive": 1, "Oculogyric crisis": 1, "Oedema": 1, "Oral pruritus": 1, "Otitis media": 1, "Otitis media acute": 1, "Otorrhoea": 1, "Oxygen saturation abnormal": 1, "PO2 decreased": 1, "Paraesthesia": 1, "Paraplegia": 1, "Penile oedema": 1, "Pericardial effusion": 1, "Peripheral circulatory failure": 1, "Peripheral coldness": 1, "Photopsia": 1, "Platelet count decreased": 1, "Platelet function test": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Post herpetic neuralgia": 1, "Pregnancy test": 1, "Premature labour": 1, "Protein urine": 1, "Prothrombin time": 1, "Pulseless electrical activity": 1, "Pyelonephritis": 1, "Quality of life decreased": 1, "Radiculitis brachial": 1, "Rash": 1, "Red blood cell count": 1, "Renal disorder": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory symptom": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Salpingogram": 1, "Sneezing": 1, "Somnolence": 1, "Speech disorder": 1, "Splenic infarction": 1, "Supine position": 1, "Swelling": 1, "Swelling face": 1, "Systemic lupus erythematosus": 1, "Tachypnoea": 1, "Tenderness": 1, "Throat tightness": 1, "Tonic convulsion": 1, "Troponin increased": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Upper airway obstruction": 1, "Upper respiratory tract inflammation": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Vaccination site swelling": 1, "Velopharyngeal incompetence": 1, "Ventricular arrhythmia": 1, "Ventricular extrasystoles": 1, "Ventricular septal defect": 1, "Viral myocarditis": 1, "Weight decreased": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FK7441", "histograms": [{"histogram": {"Body temperature": 70, "Blood pressure measurement": 23, "Pyrexia": 21, "Oxygen saturation": 17, "Heart rate": 16, "SARS-CoV-2 test": 16, "Anaphylactic reaction": 15, "COVID-19": 15, "Dyspnoea": 14, "Vaccination failure": 13, "Electrocardiogram": 11, "C-reactive protein": 10, "Headache": 10, "Malaise": 10, "Echocardiogram": 9, "Hypoaesthesia": 9, "Myocarditis": 9, "Nausea": 9, "Chest pain": 8, "Immunisation": 8, "Presyncope": 8, "Blood pressure increased": 7, "Loss of consciousness": 7, "Blood creatine phosphokinase": 6, "Blood pressure decreased": 6, "Depressed level of consciousness": 6, "Fibrin D dimer": 6, "Investigation": 6, "Pallor": 6, "Palpitations": 6, "Pruritus": 6, "Chest discomfort": 5, "Coma scale": 5, "Computerised tomogram thorax": 5, "Cough": 5, "Dizziness": 5, "Feeling abnormal": 5, "Pain in extremity": 5, "Seizure": 5, "Arthralgia": 4, "Blood creatine phosphokinase MB": 4, "Blood test": 4, "Chills": 4, "Computerised tomogram": 4, "Drug ineffective": 4, "Oropharyngeal discomfort": 4, "Troponin I": 4, "Troponin T": 4, "Wheezing": 4, "White blood cell count": 4, "Abdominal pain": 3, "Anaphylactic shock": 3, "Auscultation": 3, "Blood creatinine": 3, "Brain natriuretic peptide": 3, "Chest X-ray": 3, "Dysphonia": 3, "Ejection fraction": 3, "Electrocardiogram ST segment elevation": 3, "Erythema": 3, "Fall": 3, "Feeling cold": 3, "Generalised tonic-clonic seizure": 3, "Hypersensitivity": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Oropharyngeal pain": 3, "Platelet count": 3, "Stress cardiomyopathy": 3, "Throat irritation": 3, "Tremor": 3, "Urticaria": 3, "Vital signs measurement": 3, "Abdominal pain upper": 2, "Angina pectoris": 2, "Angiocardiogram": 2, "Angiogram": 2, "Antibody test": 2, "Arrhythmia": 2, "Blood creatine phosphokinase MB increased": 2, "Blood creatine phosphokinase increased": 2, "Blood pressure systolic": 2, "Bradycardia": 2, "C-reactive protein increased": 2, "CSF test": 2, "Cardio-respiratory arrest": 2, "Condition aggravated": 2, "Cyanosis": 2, "Deep vein thrombosis": 2, "Diarrhoea": 2, "Dysphagia": 2, "Electrocardiogram ST segment": 2, "Epilepsy": 2, "Haematochezia": 2, "Haemoglobin": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Magnetic resonance imaging head": 2, "Maternal exposure during pregnancy": 2, "N-terminal prohormone brain natriuretic peptide": 2, "N-terminal prohormone brain natriuretic peptide increased": 2, "Off label use": 2, "Pain": 2, "Pericarditis": 2, "Polymerase chain reaction": 2, "Respiratory rate": 2, "Suspected COVID-19": 2, "Syncope": 2, "Tachycardia": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Troponin": 2, "Troponin T increased": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Visual acuity reduced": 2, "Visual impairment": 2, "Vomiting": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abortion spontaneous": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Angiopathy": 1, "Anion gap": 1, "Anti-GAD antibody": 1, "Anti-IA2 antibody": 1, "Anti-insulin antibody": 1, "Anti-zinc transporter 8 antibody": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Areflexia": 1, "Arteriovenous fistula": 1, "Arteriovenous fistula site haemorrhage": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Blindness": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure diastolic decreased": 1, "Blood pressure systolic decreased": 1, "Blood urea": 1, "Brain natriuretic peptide increased": 1, "Bronchoscopy": 1, "Cardiac failure": 1, "Cerebellar ataxia": 1, "Circulatory collapse": 1, "Coagulation test abnormal": 1, "Cold sweat": 1, "Colitis ischaemic": 1, "Colonoscopy": 1, "Coma scale abnormal": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "Convulsions local": 1, "Decreased appetite": 1, "Defaecation urgency": 1, "Dermatitis allergic": 1, "Diabetes mellitus": 1, "Diabetic ketoacidosis": 1, "Dissociative disorder": 1, "Disturbance in attention": 1, "Diverticulum intestinal": 1, "Drug eruption": 1, "Drug hypersensitivity": 1, "Drug-induced liver injury": 1, "Dysaesthesia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Electrocardiogram ambulatory": 1, "Embolism": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial paralysis": 1, "Fasting": 1, "Fatigue": 1, "Feeling hot": 1, "Flushing": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Genital haemorrhage": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemorrhage": 1, "Head discomfort": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatic function abnormal": 1, "Herpes zoster": 1, "Hunger": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Imaging procedure": 1, "Impaired driving ability": 1, "Infection": 1, "Inflammation": 1, "Influenza virus test": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Judgement impaired": 1, "Lip pruritus": 1, "Liver disorder": 1, "Macular oedema": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging spinal": 1, "Memory impairment": 1, "Menstrual discomfort": 1, "Migraine": 1, "Miller Fisher syndrome": 1, "Muscle twitching": 1, "Myalgia": 1, "Myelitis": 1, "Neck pain": 1, "Nephrolithiasis": 1, "Nephrotic syndrome": 1, "Neurological examination": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Occult blood": 1, "Occult blood positive": 1, "Oculogyric crisis": 1, "Oedema": 1, "Oral pruritus": 1, "Otitis media": 1, "Otitis media acute": 1, "Otorrhoea": 1, "Oxygen saturation abnormal": 1, "PO2 decreased": 1, "Paraesthesia": 1, "Paraplegia": 1, "Penile oedema": 1, "Pericardial effusion": 1, "Peripheral circulatory failure": 1, "Peripheral coldness": 1, "Photopsia": 1, "Platelet count decreased": 1, "Platelet function test": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Post herpetic neuralgia": 1, "Pregnancy test": 1, "Premature labour": 1, "Protein urine": 1, "Prothrombin time": 1, "Pulseless electrical activity": 1, "Pyelonephritis": 1, "Quality of life decreased": 1, "Radiculitis brachial": 1, "Rash": 1, "Red blood cell count": 1, "Renal disorder": 1, "Respiratory arrest": 1, "Respiratory distress": 1, "Respiratory symptom": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Salpingogram": 1, "Sneezing": 1, "Somnolence": 1, "Speech disorder": 1, "Splenic infarction": 1, "Supine position": 1, "Swelling": 1, "Swelling face": 1, "Systemic lupus erythematosus": 1, "Tachypnoea": 1, "Tenderness": 1, "Throat tightness": 1, "Tonic convulsion": 1, "Troponin increased": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Upper airway obstruction": 1, "Upper respiratory tract inflammation": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Vaccination site swelling": 1, "Velopharyngeal incompetence": 1, "Ventricular arrhythmia": 1, "Ventricular extrasystoles": 1, "Ventricular septal defect": 1, "Viral myocarditis": 1, "Weight decreased": 1, "pH body fluid": 1}, "batchcodes": ["FK7441"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FK8562.json b/docs/data/histograms/Japan/FK8562.json
index 64b5dd5643a..4e140eac4a3 100644
--- a/docs/data/histograms/Japan/FK8562.json
+++ b/docs/data/histograms/Japan/FK8562.json
@@ -1 +1 @@
-{"batchcode": "FK8562", "histograms": [{"batchcodes": ["FK8562"], "histogram": {"Body temperature": 76, "Blood pressure measurement": 34, "Oxygen saturation": 30, "Heart rate": 27, "Presyncope": 18, "Pyrexia": 15, "Nausea": 13, "Anaphylactic reaction": 12, "Blood pressure decreased": 11, "Chest pain": 11, "Feeling abnormal": 11, "Hypoaesthesia": 11, "Dizziness": 10, "Dyspnoea": 10, "Loss of consciousness": 10, "Immunisation": 9, "Blood pressure increased": 8, "Electrocardiogram": 8, "Blood test": 7, "Echocardiogram": 7, "Fall": 7, "Headache": 7, "Malaise": 7, "Chest X-ray": 6, "Computerised tomogram": 6, "Myocarditis": 6, "Oxygen saturation decreased": 6, "Investigation": 5, "Muscular weakness": 5, "Pallor": 5, "Pruritus": 5, "Aspartate aminotransferase": 4, "Chest discomfort": 4, "Chills": 4, "Cold sweat": 4, "Computerised tomogram head": 4, "Heart rate decreased": 4, "Heart rate increased": 4, "Hepatic function abnormal": 4, "Movement disorder": 4, "Neuropathy peripheral": 4, "Pain in extremity": 4, "Sensory disturbance": 4, "Troponin I": 4, "Anaphylactic shock": 3, "Blood creatine phosphokinase": 3, "Blood creatine phosphokinase MB": 3, "Blood lactate dehydrogenase": 3, "Blood pressure systolic": 3, "C-reactive protein": 3, "COVID-19": 3, "Coma scale": 3, "Depressed level of consciousness": 3, "Drug ineffective": 3, "Ejection fraction": 3, "Feeling cold": 3, "Fibrin D dimer": 3, "Guillain-Barre syndrome": 3, "Hot flush": 3, "Hyperventilation": 3, "Magnetic resonance imaging head": 3, "Pain": 3, "Palpitations": 3, "Rash": 3, "Seizure": 3, "Tachycardia": 3, "Activated partial thromboplastin time": 2, "Acute disseminated encephalomyelitis": 2, "Alanine aminotransferase": 2, "Alanine aminotransferase increased": 2, "Anti-cyclic citrullinated peptide antibody": 2, "Antibody test": 2, "Anxiety": 2, "Arthralgia": 2, "Aspartate aminotransferase increased": 2, "Asthma": 2, "Autoimmune haemolytic anaemia": 2, "Blood glucose": 2, "Cardio-respiratory arrest": 2, "Cough": 2, "Death": 2, "Decreased appetite": 2, "Dysstasia": 2, "Dysuria": 2, "Electrocardiogram ST segment": 2, "Electrocardiogram ST segment elevation": 2, "Erythema": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Gait inability": 2, "Gamma-glutamyltransferase": 2, "Gamma-glutamyltransferase increased": 2, "Haematocrit": 2, "Haemoglobin": 2, "Haptoglobin": 2, "Hyperhidrosis": 2, "Hypertension": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging heart": 2, "Magnetic resonance imaging spinal": 2, "Myalgia": 2, "Myocardial infarction": 2, "Myocardial necrosis marker": 2, "Neuromyelitis optica spectrum disorder": 2, "Off label use": 2, "Orthostatic hypotension": 2, "Peripheral coldness": 2, "Peripheral swelling": 2, "Radioisotope scan": 2, "Red blood cell count": 2, "Rheumatoid factor": 2, "SARS-CoV-2 test": 2, "Serum ferritin": 2, "Suspected COVID-19": 2, "Syncope": 2, "Thirst": 2, "Throat irritation": 2, "Tremor": 2, "Urticaria": 2, "Vaccination failure": 2, "Vomiting": 2, "Wheezing": 2, "X-ray": 2, "Abdominal distension": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Anaemia macrocytic": 1, "Angiogram": 1, "Anti-GAD antibody": 1, "Aortic dissection": 1, "Areflexia": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Back pain": 1, "Bell's palsy": 1, "Bile duct stone": 1, "Biopsy bone marrow": 1, "Biopsy salivary gland": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin unconjugated increased": 1, "Blood creatine phosphokinase MB increased": 1, "Blood creatine phosphokinase increased": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin G increased": 1, "Blood iron": 1, "Blood lactate dehydrogenase increased": 1, "Blood smear test": 1, "Breath sounds": 1, "Bronchitis": 1, "Bronchospasm": 1, "Bundle branch block right": 1, "C-reactive protein increased": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiomyopathy": 1, "Cerebral haemorrhage": 1, "Choking sensation": 1, "Chromaturia": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Coagulation factor deficiency": 1, "Coagulation test": 1, "Coagulation test abnormal": 1, "Cognitive test": 1, "Cold agglutinins": 1, "Cold type haemolytic anaemia": 1, "Communication disorder": 1, "Condition aggravated": 1, "Contusion": 1, "Coombs direct test": 1, "Coombs test": 1, "Coombs test positive": 1, "Cytomegalovirus test": 1, "Deafness unilateral": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disease risk factor": 1, "Drowning": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysphoria": 1, "Ejection fraction decreased": 1, "Electrocardiogram T wave inversion": 1, "Electroneurography": 1, "Encephalitis": 1, "Endoscopy upper gastrointestinal tract": 1, "Enlarged uvula": 1, "Enterocolitis": 1, "Enthesopathy": 1, "Epilepsy": 1, "Epstein-Barr virus antibody": 1, "Exercise tolerance decreased": 1, "Extradural haematoma": 1, "Fatigue": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "HIV antibody": 1, "Haematuria": 1, "Haptoglobin decreased": 1, "Hemiparesis": 1, "Hepatic steatosis": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hiccups": 1, "Hypersensitivity": 1, "Hypotension": 1, "Hypoxia": 1, "Imaging procedure": 1, "Immune system disorder": 1, "Inflammation": 1, "Influenza virus test": 1, "Insomnia": 1, "Internal capsule infarction": 1, "Jaundice": 1, "Jaw fracture": 1, "Limb discomfort": 1, "Lip swelling": 1, "Logorrhoea": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Micturition urgency": 1, "Mobility decreased": 1, "Motor dysfunction": 1, "Multisystem inflammatory syndrome": 1, "Multisystem inflammatory syndrome in adults": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Mycoplasma test": 1, "Myocardial oedema": 1, "Myoglobin blood": 1, "Myoglobin blood increased": 1, "Nerve conduction studies": 1, "Nervousness": 1, "Neurological examination": 1, "Normocytic anaemia": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Oxygen consumption decreased": 1, "Painful respiration": 1, "Panic attack": 1, "Panic disorder": 1, "Paraesthesia": 1, "Paraplegia": 1, "Paresis": 1, "Paroxysmal sympathetic hyperactivity": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical examination": 1, "Plasmacytoma": 1, "Platelet count": 1, "Pleurisy": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Pollakiuria": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Postural orthostatic tachycardia syndrome": 1, "Prostatitis": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Reticulocyte count": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "Rosacea": 1, "Sarcoidosis": 1, "Serum ferritin increased": 1, "Sinus bradycardia": 1, "Skin test": 1, "Skin test positive": 1, "Spinal osteoarthritis": 1, "Stiff person syndrome": 1, "Strabismus": 1, "Stress": 1, "Stupor": 1, "Sudden death": 1, "Sudden hearing loss": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Swollen tongue": 1, "Tachyarrhythmia": 1, "Tachypnoea": 1, "Telangiectasia": 1, "Tension": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Troponin": 1, "Troponin I increased": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vasodilatation": 1, "Venous thrombosis": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Viral test": 1, "Visual field defect": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8562", "histograms": [{"histogram": {"Body temperature": 76, "Blood pressure measurement": 34, "Oxygen saturation": 30, "Heart rate": 27, "Presyncope": 18, "Pyrexia": 15, "Nausea": 13, "Anaphylactic reaction": 12, "Blood pressure decreased": 11, "Chest pain": 11, "Feeling abnormal": 11, "Hypoaesthesia": 11, "Dizziness": 10, "Dyspnoea": 10, "Loss of consciousness": 10, "Immunisation": 9, "Blood pressure increased": 8, "Electrocardiogram": 8, "Blood test": 7, "Echocardiogram": 7, "Fall": 7, "Headache": 7, "Malaise": 7, "Chest X-ray": 6, "Computerised tomogram": 6, "Myocarditis": 6, "Oxygen saturation decreased": 6, "Investigation": 5, "Muscular weakness": 5, "Pallor": 5, "Pruritus": 5, "Aspartate aminotransferase": 4, "Chest discomfort": 4, "Chills": 4, "Cold sweat": 4, "Computerised tomogram head": 4, "Heart rate decreased": 4, "Heart rate increased": 4, "Hepatic function abnormal": 4, "Movement disorder": 4, "Neuropathy peripheral": 4, "Pain in extremity": 4, "Sensory disturbance": 4, "Troponin I": 4, "Anaphylactic shock": 3, "Blood creatine phosphokinase": 3, "Blood creatine phosphokinase MB": 3, "Blood lactate dehydrogenase": 3, "Blood pressure systolic": 3, "C-reactive protein": 3, "COVID-19": 3, "Coma scale": 3, "Depressed level of consciousness": 3, "Drug ineffective": 3, "Ejection fraction": 3, "Feeling cold": 3, "Fibrin D dimer": 3, "Guillain-Barre syndrome": 3, "Hot flush": 3, "Hyperventilation": 3, "Magnetic resonance imaging head": 3, "Pain": 3, "Palpitations": 3, "Rash": 3, "Seizure": 3, "Tachycardia": 3, "Activated partial thromboplastin time": 2, "Acute disseminated encephalomyelitis": 2, "Alanine aminotransferase": 2, "Alanine aminotransferase increased": 2, "Anti-cyclic citrullinated peptide antibody": 2, "Antibody test": 2, "Anxiety": 2, "Arthralgia": 2, "Aspartate aminotransferase increased": 2, "Asthma": 2, "Autoimmune haemolytic anaemia": 2, "Blood glucose": 2, "Cardio-respiratory arrest": 2, "Cough": 2, "Death": 2, "Decreased appetite": 2, "Dysstasia": 2, "Dysuria": 2, "Electrocardiogram ST segment": 2, "Electrocardiogram ST segment elevation": 2, "Erythema": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Gait inability": 2, "Gamma-glutamyltransferase": 2, "Gamma-glutamyltransferase increased": 2, "Haematocrit": 2, "Haemoglobin": 2, "Haptoglobin": 2, "Hyperhidrosis": 2, "Hypertension": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging heart": 2, "Magnetic resonance imaging spinal": 2, "Myalgia": 2, "Myocardial infarction": 2, "Myocardial necrosis marker": 2, "Neuromyelitis optica spectrum disorder": 2, "Off label use": 2, "Orthostatic hypotension": 2, "Peripheral coldness": 2, "Peripheral swelling": 2, "Radioisotope scan": 2, "Red blood cell count": 2, "Rheumatoid factor": 2, "SARS-CoV-2 test": 2, "Serum ferritin": 2, "Suspected COVID-19": 2, "Syncope": 2, "Thirst": 2, "Throat irritation": 2, "Tremor": 2, "Urticaria": 2, "Vaccination failure": 2, "Vomiting": 2, "Wheezing": 2, "X-ray": 2, "Abdominal distension": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Anaemia macrocytic": 1, "Angiogram": 1, "Anti-GAD antibody": 1, "Aortic dissection": 1, "Areflexia": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Back pain": 1, "Bell's palsy": 1, "Bile duct stone": 1, "Biopsy bone marrow": 1, "Biopsy salivary gland": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin unconjugated increased": 1, "Blood creatine phosphokinase MB increased": 1, "Blood creatine phosphokinase increased": 1, "Blood fibrinogen": 1, "Blood glucose increased": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin G increased": 1, "Blood iron": 1, "Blood lactate dehydrogenase increased": 1, "Blood smear test": 1, "Breath sounds": 1, "Bronchitis": 1, "Bronchospasm": 1, "Bundle branch block right": 1, "C-reactive protein increased": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac dysfunction": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiomyopathy": 1, "Cerebral haemorrhage": 1, "Choking sensation": 1, "Chromaturia": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Coagulation factor deficiency": 1, "Coagulation test": 1, "Coagulation test abnormal": 1, "Cognitive test": 1, "Cold agglutinins": 1, "Cold type haemolytic anaemia": 1, "Communication disorder": 1, "Condition aggravated": 1, "Contusion": 1, "Coombs direct test": 1, "Coombs test": 1, "Coombs test positive": 1, "Cytomegalovirus test": 1, "Deafness unilateral": 1, "Diplopia": 1, "Discomfort": 1, "Disease recurrence": 1, "Disease risk factor": 1, "Drowning": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysphoria": 1, "Ejection fraction decreased": 1, "Electrocardiogram T wave inversion": 1, "Electroneurography": 1, "Encephalitis": 1, "Endoscopy upper gastrointestinal tract": 1, "Enlarged uvula": 1, "Enterocolitis": 1, "Enthesopathy": 1, "Epilepsy": 1, "Epstein-Barr virus antibody": 1, "Exercise tolerance decreased": 1, "Extradural haematoma": 1, "Fatigue": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Glucose urine": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "HIV antibody": 1, "Haematuria": 1, "Haptoglobin decreased": 1, "Hemiparesis": 1, "Hepatic steatosis": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hiccups": 1, "Hypersensitivity": 1, "Hypotension": 1, "Hypoxia": 1, "Imaging procedure": 1, "Immune system disorder": 1, "Inflammation": 1, "Influenza virus test": 1, "Insomnia": 1, "Internal capsule infarction": 1, "Jaundice": 1, "Jaw fracture": 1, "Limb discomfort": 1, "Lip swelling": 1, "Logorrhoea": 1, "Mean cell volume": 1, "Meningitis aseptic": 1, "Micturition urgency": 1, "Mobility decreased": 1, "Motor dysfunction": 1, "Multisystem inflammatory syndrome": 1, "Multisystem inflammatory syndrome in adults": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Mycoplasma test": 1, "Myocardial oedema": 1, "Myoglobin blood": 1, "Myoglobin blood increased": 1, "Nerve conduction studies": 1, "Nervousness": 1, "Neurological examination": 1, "Normocytic anaemia": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Oxygen consumption decreased": 1, "Painful respiration": 1, "Panic attack": 1, "Panic disorder": 1, "Paraesthesia": 1, "Paraplegia": 1, "Paresis": 1, "Paroxysmal sympathetic hyperactivity": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical examination": 1, "Plasmacytoma": 1, "Platelet count": 1, "Pleurisy": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Pollakiuria": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Postural orthostatic tachycardia syndrome": 1, "Prostatitis": 1, "Prothrombin level": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Reticulocyte count": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "Rosacea": 1, "Sarcoidosis": 1, "Serum ferritin increased": 1, "Sinus bradycardia": 1, "Skin test": 1, "Skin test positive": 1, "Spinal osteoarthritis": 1, "Stiff person syndrome": 1, "Strabismus": 1, "Stress": 1, "Stupor": 1, "Sudden death": 1, "Sudden hearing loss": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Swollen tongue": 1, "Tachyarrhythmia": 1, "Tachypnoea": 1, "Telangiectasia": 1, "Tension": 1, "Throat tightness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Troponin": 1, "Troponin I increased": 1, "Type 1 diabetes mellitus": 1, "Type I hypersensitivity": 1, "Ultrasound scan": 1, "Urinary retention": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vasodilatation": 1, "Venous thrombosis": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Viral test": 1, "Visual field defect": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["FK8562"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FL1116.json b/docs/data/histograms/Japan/FL1116.json
index 0bd52a80d41..08e5b488b47 100644
--- a/docs/data/histograms/Japan/FL1116.json
+++ b/docs/data/histograms/Japan/FL1116.json
@@ -1 +1 @@
-{"batchcode": "FL1116", "histograms": [{"batchcodes": ["FL1116"], "histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Blood test": 2, "Malaise": 2, "Muscular weakness": 2, "Pyrexia": 2, "Altered state of consciousness": 1, "Aspirin-exacerbated respiratory disease": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Chromaturia": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Cough": 1, "Decreased activity": 1, "Dizziness": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Guillain-Barre syndrome": 1, "Hepatic function abnormal": 1, "Hypophagia": 1, "Jaundice": 1, "Myalgia": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1116", "histograms": [{"histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Blood test": 2, "Malaise": 2, "Muscular weakness": 2, "Pyrexia": 2, "Altered state of consciousness": 1, "Aspirin-exacerbated respiratory disease": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Chromaturia": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Cough": 1, "Decreased activity": 1, "Dizziness": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Guillain-Barre syndrome": 1, "Hepatic function abnormal": 1, "Hypophagia": 1, "Jaundice": 1, "Myalgia": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain": 1, "Weight decreased": 1}, "batchcodes": ["FL1116"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FL1839.json b/docs/data/histograms/Japan/FL1839.json
index f17a5421525..d710b980ef2 100644
--- a/docs/data/histograms/Japan/FL1839.json
+++ b/docs/data/histograms/Japan/FL1839.json
@@ -1 +1 @@
-{"batchcode": "FL1839", "histograms": [{"batchcodes": ["FL1839"], "histogram": {"Body temperature": 55, "Blood pressure measurement": 20, "Oxygen saturation": 16, "Pyrexia": 15, "Heart rate": 14, "Anaphylactic reaction": 12, "Dyspnoea": 12, "Nausea": 12, "Malaise": 10, "Dizziness": 9, "Pruritus": 8, "Blood pressure decreased": 7, "Electrocardiogram": 7, "Feeling abnormal": 7, "Blood test": 6, "Chest discomfort": 6, "Erythema": 6, "Pain": 6, "SARS-CoV-2 test": 6, "Seizure": 6, "Altered state of consciousness": 5, "Arthralgia": 5, "Asthenia": 5, "Blood creatine phosphokinase": 5, "Blood pressure increased": 5, "C-reactive protein": 5, "Echocardiogram": 5, "Immunisation": 5, "Inflammation": 5, "Loss of consciousness": 5, "Magnetic resonance imaging": 5, "Troponin T": 5, "Urticaria": 5, "Vomiting": 5, "White blood cell count": 5, "Asthma": 4, "Cerebral infarction": 4, "Chest X-ray": 4, "Computerised tomogram": 4, "Computerised tomogram head": 4, "Cough": 4, "Fibrin D dimer": 4, "Magnetic resonance imaging head": 4, "Myocarditis": 4, "Oropharyngeal discomfort": 4, "Presyncope": 4, "Rash": 4, "C-reactive protein increased": 3, "COVID-19": 3, "Cardio-respiratory arrest": 3, "Cerebral haemorrhage": 3, "Cerebrovascular accident": 3, "Chest pain": 3, "Decreased appetite": 3, "Gait disturbance": 3, "Haematuria": 3, "Hyperhidrosis": 3, "Investigation": 3, "Muscular weakness": 3, "Pain in extremity": 3, "Palpitations": 3, "Platelet count": 3, "Protein urine": 3, "Respiratory arrest": 3, "Respiratory rate": 3, "Somnolence": 3, "Thrombosis": 3, "Vaccination failure": 3, "Anaphylactic shock": 2, "Angiocardiogram": 2, "Arthritis": 2, "Blood creatine phosphokinase MB": 2, "Bradycardia": 2, "Cardiac arrest": 2, "Cardiac failure": 2, "Coma scale": 2, "Computerised tomogram coronary artery": 2, "Disorientation": 2, "Drug ineffective": 2, "Dysstasia": 2, "Fall": 2, "Feeling hot": 2, "Haemoglobin": 2, "Hypoaesthesia": 2, "Hypokinesia": 2, "IgA nephropathy": 2, "Insomnia": 2, "Internal haemorrhage": 2, "Memory impairment": 2, "Mitral valve incompetence": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Pericarditis": 2, "Petechiae": 2, "Physical deconditioning": 2, "Pneumonia": 2, "Pneumonia aspiration": 2, "Pollakiuria": 2, "Red blood cell count": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Urinary retention": 2, "Vital signs measurement": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Abortion spontaneous": 1, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Adverse reaction": 1, "Anaemia": 1, "Angina pectoris": 1, "Anuria": 1, "Anxiety": 1, "Aortic dissection": 1, "Aphasia": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspiration": 1, "Atonic seizures": 1, "Atrial fibrillation": 1, "Autoantibody test": 1, "Autopsy": 1, "Back pain": 1, "Bedridden": 1, "Biopsy heart": 1, "Blindness unilateral": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood pressure fluctuation": 1, "Blood smear test": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Bursitis": 1, "Cardiac disorder": 1, "Cardiac failure chronic": 1, "Chills": 1, "Chromaturia": 1, "Colitis ischaemic": 1, "Coma": 1, "Communication disorder": 1, "Complement factor": 1, "Complement factor increased": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Corneal disorder": 1, "Cystitis": 1, "Cytokine release syndrome": 1, "Cytokine storm": 1, "Death": 1, "Dementia with Lewy bodies": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Dizziness postural": 1, "Drooling": 1, "Drug hypersensitivity": 1, "Dysphemia": 1, "Dysphoria": 1, "Dysuria": 1, "Eczema": 1, "Ejection fraction": 1, "Embolism": 1, "Encephalopathy": 1, "Eye pain": 1, "Eye symptom": 1, "Face oedema": 1, "Facial paralysis": 1, "Fibrin D dimer increased": 1, "Fibrin degradation products": 1, "Flushing": 1, "Gait inability": 1, "Gastric fluid analysis": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage subcutaneous": 1, "Haemorrhagic cerebral infarction": 1, "Head discomfort": 1, "Headache": 1, "Heart rate abnormal": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hepatosplenomegaly": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Hypersensitivity": 1, "Hypophagia": 1, "Hypotension": 1, "Immobile": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Incontinence": 1, "Increased viscosity of bronchial secretion": 1, "Injection site pain": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Joint range of motion decreased": 1, "Keratitis": 1, "Laryngeal discomfort": 1, "Lip swelling": 1, "Liver function test": 1, "Lymphadenopathy": 1, "Lymphoma": 1, "Magnetic resonance imaging heart": 1, "Mobility decreased": 1, "Monoparesis": 1, "Movement disorder": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Mydriasis": 1, "Myopia": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nervous system disorder": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular icterus": 1, "Oculogyric crisis": 1, "Off label use": 1, "Oxygenation index": 1, "Pancytopenia": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Polymerase chain reaction": 1, "Polymyositis": 1, "Prinzmetal angina": 1, "Product use issue": 1, "Prolonged expiration": 1, "Pulse abnormal": 1, "Pulseless electrical activity": 1, "Purulent discharge": 1, "Pyelonephritis": 1, "Rash macular": 1, "Red blood cell poikilocytes": 1, "Red blood cells urine": 1, "Renal failure": 1, "Renal hypertrophy": 1, "Respiration abnormal": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Scan myocardial perfusion": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Shoulder injury related to vaccine administration": 1, "Skin cancer": 1, "Smear test": 1, "Spinal cord injury": 1, "Spinal pain": 1, "Sputum test": 1, "Stress": 1, "Stridor": 1, "Subcutaneous haematoma": 1, "Suicidal ideation": 1, "Swelling": 1, "Tachypnoea": 1, "Throat irritation": 1, "Thrombocytopenic purpura": 1, "Thyroid function test": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Urinary occult blood": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site necrosis": 1, "Vaccination site pain": 1, "Vasculitis": 1, "Vasodilatation": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Wheezing": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1839", "histograms": [{"histogram": {"Body temperature": 55, "Blood pressure measurement": 20, "Oxygen saturation": 16, "Pyrexia": 15, "Heart rate": 14, "Anaphylactic reaction": 12, "Dyspnoea": 12, "Nausea": 12, "Malaise": 10, "Dizziness": 9, "Pruritus": 8, "Blood pressure decreased": 7, "Electrocardiogram": 7, "Feeling abnormal": 7, "Blood test": 6, "Chest discomfort": 6, "Erythema": 6, "Pain": 6, "SARS-CoV-2 test": 6, "Seizure": 6, "Altered state of consciousness": 5, "Arthralgia": 5, "Asthenia": 5, "Blood creatine phosphokinase": 5, "Blood pressure increased": 5, "C-reactive protein": 5, "Echocardiogram": 5, "Immunisation": 5, "Inflammation": 5, "Loss of consciousness": 5, "Magnetic resonance imaging": 5, "Troponin T": 5, "Urticaria": 5, "Vomiting": 5, "White blood cell count": 5, "Asthma": 4, "Cerebral infarction": 4, "Chest X-ray": 4, "Computerised tomogram": 4, "Computerised tomogram head": 4, "Cough": 4, "Fibrin D dimer": 4, "Magnetic resonance imaging head": 4, "Myocarditis": 4, "Oropharyngeal discomfort": 4, "Presyncope": 4, "Rash": 4, "C-reactive protein increased": 3, "COVID-19": 3, "Cardio-respiratory arrest": 3, "Cerebral haemorrhage": 3, "Cerebrovascular accident": 3, "Chest pain": 3, "Decreased appetite": 3, "Gait disturbance": 3, "Haematuria": 3, "Hyperhidrosis": 3, "Investigation": 3, "Muscular weakness": 3, "Pain in extremity": 3, "Palpitations": 3, "Platelet count": 3, "Protein urine": 3, "Respiratory arrest": 3, "Respiratory rate": 3, "Somnolence": 3, "Thrombosis": 3, "Vaccination failure": 3, "Anaphylactic shock": 2, "Angiocardiogram": 2, "Arthritis": 2, "Blood creatine phosphokinase MB": 2, "Bradycardia": 2, "Cardiac arrest": 2, "Cardiac failure": 2, "Coma scale": 2, "Computerised tomogram coronary artery": 2, "Disorientation": 2, "Drug ineffective": 2, "Dysstasia": 2, "Fall": 2, "Feeling hot": 2, "Haemoglobin": 2, "Hypoaesthesia": 2, "Hypokinesia": 2, "IgA nephropathy": 2, "Insomnia": 2, "Internal haemorrhage": 2, "Memory impairment": 2, "Mitral valve incompetence": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Pericarditis": 2, "Petechiae": 2, "Physical deconditioning": 2, "Pneumonia": 2, "Pneumonia aspiration": 2, "Pollakiuria": 2, "Red blood cell count": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Urinary retention": 2, "Vital signs measurement": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Abortion spontaneous": 1, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Adverse reaction": 1, "Anaemia": 1, "Angina pectoris": 1, "Anuria": 1, "Anxiety": 1, "Aortic dissection": 1, "Aphasia": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspiration": 1, "Atonic seizures": 1, "Atrial fibrillation": 1, "Autoantibody test": 1, "Autopsy": 1, "Back pain": 1, "Bedridden": 1, "Biopsy heart": 1, "Blindness unilateral": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood pressure fluctuation": 1, "Blood smear test": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "Bursitis": 1, "Cardiac disorder": 1, "Cardiac failure chronic": 1, "Chills": 1, "Chromaturia": 1, "Colitis ischaemic": 1, "Coma": 1, "Communication disorder": 1, "Complement factor": 1, "Complement factor increased": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Corneal disorder": 1, "Cystitis": 1, "Cytokine release syndrome": 1, "Cytokine storm": 1, "Death": 1, "Dementia with Lewy bodies": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Discomfort": 1, "Disseminated intravascular coagulation": 1, "Dizziness postural": 1, "Drooling": 1, "Drug hypersensitivity": 1, "Dysphemia": 1, "Dysphoria": 1, "Dysuria": 1, "Eczema": 1, "Ejection fraction": 1, "Embolism": 1, "Encephalopathy": 1, "Eye pain": 1, "Eye symptom": 1, "Face oedema": 1, "Facial paralysis": 1, "Fibrin D dimer increased": 1, "Fibrin degradation products": 1, "Flushing": 1, "Gait inability": 1, "Gastric fluid analysis": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage subcutaneous": 1, "Haemorrhagic cerebral infarction": 1, "Head discomfort": 1, "Headache": 1, "Heart rate abnormal": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hepatosplenomegaly": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Hypersensitivity": 1, "Hypophagia": 1, "Hypotension": 1, "Immobile": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Incontinence": 1, "Increased viscosity of bronchial secretion": 1, "Injection site pain": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Joint range of motion decreased": 1, "Keratitis": 1, "Laryngeal discomfort": 1, "Lip swelling": 1, "Liver function test": 1, "Lymphadenopathy": 1, "Lymphoma": 1, "Magnetic resonance imaging heart": 1, "Mobility decreased": 1, "Monoparesis": 1, "Movement disorder": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Mydriasis": 1, "Myopia": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nervous system disorder": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Obstructive airways disorder": 1, "Occult blood": 1, "Ocular icterus": 1, "Oculogyric crisis": 1, "Off label use": 1, "Oxygenation index": 1, "Pancytopenia": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Polymerase chain reaction": 1, "Polymyositis": 1, "Prinzmetal angina": 1, "Product use issue": 1, "Prolonged expiration": 1, "Pulse abnormal": 1, "Pulseless electrical activity": 1, "Purulent discharge": 1, "Pyelonephritis": 1, "Rash macular": 1, "Red blood cell poikilocytes": 1, "Red blood cells urine": 1, "Renal failure": 1, "Renal hypertrophy": 1, "Respiration abnormal": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Scan myocardial perfusion": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Shoulder injury related to vaccine administration": 1, "Skin cancer": 1, "Smear test": 1, "Spinal cord injury": 1, "Spinal pain": 1, "Sputum test": 1, "Stress": 1, "Stridor": 1, "Subcutaneous haematoma": 1, "Suicidal ideation": 1, "Swelling": 1, "Tachypnoea": 1, "Throat irritation": 1, "Thrombocytopenic purpura": 1, "Thyroid function test": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Urinary occult blood": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site necrosis": 1, "Vaccination site pain": 1, "Vasculitis": 1, "Vasodilatation": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Wheezing": 1, "White blood cell count increased": 1, "White blood cells urine": 1, "Yawning": 1}, "batchcodes": ["FL1839"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FL7646.json b/docs/data/histograms/Japan/FL7646.json
index bb6cad73847..afee2f84a09 100644
--- a/docs/data/histograms/Japan/FL7646.json
+++ b/docs/data/histograms/Japan/FL7646.json
@@ -1 +1 @@
-{"batchcode": "FL7646", "histograms": [{"batchcodes": ["FL7646"], "histogram": {"Body temperature": 45, "Blood pressure measurement": 11, "Oxygen saturation": 11, "Pyrexia": 9, "Aspartate aminotransferase": 7, "Blood test": 7, "Computerised tomogram": 7, "Heart rate": 7, "Alanine aminotransferase": 6, "Platelet count": 6, "Blood creatine phosphokinase": 5, "Blood lactate dehydrogenase": 5, "Blood pressure increased": 5, "Decreased appetite": 5, "Dizziness": 5, "Fall": 5, "Hypoaesthesia": 5, "Nausea": 5, "Oxygen saturation decreased": 5, "White blood cell count": 5, "Altered state of consciousness": 4, "Anaphylactic reaction": 4, "Asthenia": 4, "Blood urea": 4, "Cerebral infarction": 4, "Computerised tomogram head": 4, "Cough": 4, "Dyspnoea": 4, "Electrocardiogram": 4, "Headache": 4, "Muscular weakness": 4, "Pain in extremity": 4, "Abdominal pain upper": 3, "Asthma": 3, "Back pain": 3, "Blood alkaline phosphatase": 3, "Blood calcium": 3, "Blood chloride": 3, "Blood creatinine": 3, "Blood glucose": 3, "Blood potassium": 3, "Blood pressure decreased": 3, "Blood sodium": 3, "Chest X-ray": 3, "Condition aggravated": 3, "Death": 3, "Electroencephalogram": 3, "Encephalitis": 3, "Erythema": 3, "Facial paralysis": 3, "Gait disturbance": 3, "Gamma-glutamyltransferase": 3, "Glycosylated haemoglobin": 3, "Haemoglobin": 3, "Hepatic function abnormal": 3, "High density lipoprotein": 3, "Hypersensitivity": 3, "Low density lipoprotein": 3, "Magnetic resonance imaging": 3, "Protein urine": 3, "Shock": 3, "Tachycardia": 3, "Thrombosis": 3, "Vomiting": 3, "X-ray": 3, "Abdominal pain": 2, "Anaphylactic shock": 2, "Auscultation": 2, "Blood creatine phosphokinase increased": 2, "Blood triglycerides": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Cardiovascular disorder": 2, "Chest discomfort": 2, "Chest pain": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram thorax": 2, "Delirium": 2, "Depressed level of consciousness": 2, "Disseminated intravascular coagulation": 2, "Drug ineffective": 2, "Echocardiogram": 2, "Encephalopathy": 2, "Endoscopy upper gastrointestinal tract": 2, "Feeding disorder": 2, "Flushing": 2, "Gait inability": 2, "Hepatitis B surface antigen": 2, "Hepatitis C antibody": 2, "Immunology test": 2, "Inflammation": 2, "Investigation": 2, "Loss of consciousness": 2, "Lymphocyte count": 2, "Lymphocyte count decreased": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Mean cell haemoglobin": 2, "Mean cell volume": 2, "Mobility decreased": 2, "Movement disorder": 2, "Myocardial infarction": 2, "Neuralgic amyotrophy": 2, "Neuropathy peripheral": 2, "Oedema": 2, "Oropharyngeal discomfort": 2, "Paralysis": 2, "Pericarditis": 2, "Peripheral coldness": 2, "Pneumonia": 2, "Presyncope": 2, "Respiratory failure": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Suspected COVID-19": 2, "Tachypnoea": 2, "Tremor": 2, "Treponema test": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Acute coronary syndrome": 1, "Acute myeloid leukaemia": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Adjusted calcium": 1, "Albumin globulin ratio": 1, "Alopecia areata": 1, "Anaemia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Aphasia": 1, "Apnoea": 1, "Apraxia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arteriosclerosis coronary artery": 1, "Arthralgia": 1, "Arthritis": 1, "Audiogram": 1, "Bell's palsy": 1, "Biopsy": 1, "Blood 25-hydroxycholecalciferol": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood chloride increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood copper": 1, "Blood creatine phosphokinase MB": 1, "Blood folate": 1, "Blood folate decreased": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium increased": 1, "Blood thyroid stimulating hormone": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Blood zinc": 1, "Bone marrow oedema syndrome": 1, "Bradyphrenia": 1, "Bronchostenosis": 1, "Bruxism": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiac failure chronic": 1, "Cardiac failure congestive": 1, "Cardiomegaly": 1, "Catheterisation cardiac": 1, "Cerebral atrophy": 1, "Chills": 1, "Chorea": 1, "Circulatory collapse": 1, "Clinical dementia rating scale": 1, "Coagulation time": 1, "Cognitive disorder": 1, "Coma": 1, "Coma scale": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Compression fracture": 1, "Concomitant disease aggravated": 1, "Conjunctival hyperaemia": 1, "Constipation": 1, "Coronary artery occlusion": 1, "Creatinine renal clearance": 1, "Crying": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Dermatitis": 1, "Dermatitis atopic": 1, "Diarrhoea": 1, "Diet refusal": 1, "Disease progression": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dysaesthesia": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment elevation": 1, "Embolic cerebral infarction": 1, "Endoscopy": 1, "Eosinophilic colitis": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Gastric disorder": 1, "Gastric hypomotility": 1, "Gastric ulcer": 1, "Gastric ulcer haemorrhage": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal oedema": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematocrit": 1, "Haematuria": 1, "Head injury": 1, "Heart rate increased": 1, "Hemiataxia": 1, "Hemiplegia": 1, "Herpes virus infection": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Illness": 1, "Imaging procedure": 1, "Immobile": 1, "Immunisation": 1, "Immunoglobulins": 1, "Interstitial lung disease": 1, "Intestinal ischaemia": 1, "LDL/HDL ratio": 1, "Laboratory test": 1, "Left ventricular failure": 1, "Light chain analysis": 1, "Liver function test": 1, "Liver function test increased": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein increased": 1, "Lung infiltration": 1, "Mean cell haemoglobin concentration": 1, "Mean platelet volume": 1, "Memory impairment": 1, "Metabolic encephalopathy": 1, "Microbiology test": 1, "Monocyte count": 1, "Montreal cognitive assessment": 1, "Mucosal necrosis": 1, "Multi-organ disorder": 1, "Muscle disorder": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Nephrotic syndrome": 1, "Neurological examination": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Non-high-density lipoprotein cholesterol": 1, "Occipital neuralgia": 1, "Oedema peripheral": 1, "Organising pneumonia": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Panic attack": 1, "Paranasal cyst": 1, "Parkinson's disease": 1, "Parkinsonism": 1, "Pericardial effusion": 1, "Peripheral nerve palsy": 1, "Pharyngeal disorder": 1, "Physical deconditioning": 1, "Platelet count decreased": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Pleural effusion": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Portal venous gas": 1, "Portogram": 1, "Postural tremor": 1, "Prostatic specific antigen": 1, "Protein total": 1, "Protein urine present": 1, "Pruritus": 1, "Psychiatric evaluation": 1, "Pulmonary congestion": 1, "Pulmonary function test": 1, "Purpura": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal haemorrhage": 1, "Respiration abnormal": 1, "Respiratory arrest": 1, "Respiratory tract oedema": 1, "Retinal vein occlusion": 1, "Retroperitoneal abscess": 1, "Right ventricular failure": 1, "Scan": 1, "Scan brain": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Skin ulcer": 1, "Somnolence": 1, "Stress fracture": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Suffocation feeling": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroxine free": 1, "Total complement activity test": 1, "Tracheal stenosis": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "Upper respiratory tract infection": 1, "Urinary occult blood": 1, "Urinary occult blood positive": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Ventricular tachyarrhythmia": 1, "Ventricular tachycardia": 1, "Vestibular neuronitis": 1, "Viral infection": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Vitamin B12": 1, "Vitamin B2": 1, "Weight": 1, "Weight decreased": 1, "White blood cells urine": 1, "White blood cells urine positive": 1}}]}
\ No newline at end of file
+{"batchcode": "FL7646", "histograms": [{"histogram": {"Body temperature": 45, "Blood pressure measurement": 11, "Oxygen saturation": 11, "Pyrexia": 9, "Aspartate aminotransferase": 7, "Blood test": 7, "Computerised tomogram": 7, "Heart rate": 7, "Alanine aminotransferase": 6, "Platelet count": 6, "Blood creatine phosphokinase": 5, "Blood lactate dehydrogenase": 5, "Blood pressure increased": 5, "Decreased appetite": 5, "Dizziness": 5, "Fall": 5, "Hypoaesthesia": 5, "Nausea": 5, "Oxygen saturation decreased": 5, "White blood cell count": 5, "Altered state of consciousness": 4, "Anaphylactic reaction": 4, "Asthenia": 4, "Blood urea": 4, "Cerebral infarction": 4, "Computerised tomogram head": 4, "Cough": 4, "Dyspnoea": 4, "Electrocardiogram": 4, "Headache": 4, "Muscular weakness": 4, "Pain in extremity": 4, "Abdominal pain upper": 3, "Asthma": 3, "Back pain": 3, "Blood alkaline phosphatase": 3, "Blood calcium": 3, "Blood chloride": 3, "Blood creatinine": 3, "Blood glucose": 3, "Blood potassium": 3, "Blood pressure decreased": 3, "Blood sodium": 3, "Chest X-ray": 3, "Condition aggravated": 3, "Death": 3, "Electroencephalogram": 3, "Encephalitis": 3, "Erythema": 3, "Facial paralysis": 3, "Gait disturbance": 3, "Gamma-glutamyltransferase": 3, "Glycosylated haemoglobin": 3, "Haemoglobin": 3, "Hepatic function abnormal": 3, "High density lipoprotein": 3, "Hypersensitivity": 3, "Low density lipoprotein": 3, "Magnetic resonance imaging": 3, "Protein urine": 3, "Shock": 3, "Tachycardia": 3, "Thrombosis": 3, "Vomiting": 3, "X-ray": 3, "Abdominal pain": 2, "Anaphylactic shock": 2, "Auscultation": 2, "Blood creatine phosphokinase increased": 2, "Blood triglycerides": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Cardio-respiratory arrest": 2, "Cardiovascular disorder": 2, "Chest discomfort": 2, "Chest pain": 2, "Computerised tomogram abdomen": 2, "Computerised tomogram thorax": 2, "Delirium": 2, "Depressed level of consciousness": 2, "Disseminated intravascular coagulation": 2, "Drug ineffective": 2, "Echocardiogram": 2, "Encephalopathy": 2, "Endoscopy upper gastrointestinal tract": 2, "Feeding disorder": 2, "Flushing": 2, "Gait inability": 2, "Hepatitis B surface antigen": 2, "Hepatitis C antibody": 2, "Immunology test": 2, "Inflammation": 2, "Investigation": 2, "Loss of consciousness": 2, "Lymphocyte count": 2, "Lymphocyte count decreased": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Mean cell haemoglobin": 2, "Mean cell volume": 2, "Mobility decreased": 2, "Movement disorder": 2, "Myocardial infarction": 2, "Neuralgic amyotrophy": 2, "Neuropathy peripheral": 2, "Oedema": 2, "Oropharyngeal discomfort": 2, "Paralysis": 2, "Pericarditis": 2, "Peripheral coldness": 2, "Pneumonia": 2, "Presyncope": 2, "Respiratory failure": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Suspected COVID-19": 2, "Tachypnoea": 2, "Tremor": 2, "Treponema test": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Acute coronary syndrome": 1, "Acute myeloid leukaemia": 1, "Acute myocardial infarction": 1, "Acute respiratory distress syndrome": 1, "Adjusted calcium": 1, "Albumin globulin ratio": 1, "Alopecia areata": 1, "Anaemia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Aortic dissection": 1, "Aphasia": 1, "Apnoea": 1, "Apraxia": 1, "Areflexia": 1, "Arrhythmia": 1, "Arteriosclerosis coronary artery": 1, "Arthralgia": 1, "Arthritis": 1, "Audiogram": 1, "Bell's palsy": 1, "Biopsy": 1, "Blood 25-hydroxycholecalciferol": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood chloride increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood copper": 1, "Blood creatine phosphokinase MB": 1, "Blood folate": 1, "Blood folate decreased": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium increased": 1, "Blood thyroid stimulating hormone": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Blood zinc": 1, "Bone marrow oedema syndrome": 1, "Bradyphrenia": 1, "Bronchostenosis": 1, "Bruxism": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiac failure chronic": 1, "Cardiac failure congestive": 1, "Cardiomegaly": 1, "Catheterisation cardiac": 1, "Cerebral atrophy": 1, "Chills": 1, "Chorea": 1, "Circulatory collapse": 1, "Clinical dementia rating scale": 1, "Coagulation time": 1, "Cognitive disorder": 1, "Coma": 1, "Coma scale": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Compression fracture": 1, "Concomitant disease aggravated": 1, "Conjunctival hyperaemia": 1, "Constipation": 1, "Coronary artery occlusion": 1, "Creatinine renal clearance": 1, "Crying": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Dermatitis": 1, "Dermatitis atopic": 1, "Diarrhoea": 1, "Diet refusal": 1, "Disease progression": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dysaesthesia": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment elevation": 1, "Embolic cerebral infarction": 1, "Endoscopy": 1, "Eosinophilic colitis": 1, "Epilepsy": 1, "Erythema multiforme": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Faeces discoloured": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Gastric disorder": 1, "Gastric hypomotility": 1, "Gastric ulcer": 1, "Gastric ulcer haemorrhage": 1, "Gastrointestinal necrosis": 1, "Gastrointestinal oedema": 1, "Generalised tonic-clonic seizure": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin increased": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematocrit": 1, "Haematuria": 1, "Head injury": 1, "Heart rate increased": 1, "Hemiataxia": 1, "Hemiplegia": 1, "Herpes virus infection": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Illness": 1, "Imaging procedure": 1, "Immobile": 1, "Immunisation": 1, "Immunoglobulins": 1, "Interstitial lung disease": 1, "Intestinal ischaemia": 1, "LDL/HDL ratio": 1, "Laboratory test": 1, "Left ventricular failure": 1, "Light chain analysis": 1, "Liver function test": 1, "Liver function test increased": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein increased": 1, "Lung infiltration": 1, "Mean cell haemoglobin concentration": 1, "Mean platelet volume": 1, "Memory impairment": 1, "Metabolic encephalopathy": 1, "Microbiology test": 1, "Monocyte count": 1, "Montreal cognitive assessment": 1, "Mucosal necrosis": 1, "Multi-organ disorder": 1, "Muscle disorder": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Nephrotic syndrome": 1, "Neurological examination": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Non-high-density lipoprotein cholesterol": 1, "Occipital neuralgia": 1, "Oedema peripheral": 1, "Organising pneumonia": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Panic attack": 1, "Paranasal cyst": 1, "Parkinson's disease": 1, "Parkinsonism": 1, "Pericardial effusion": 1, "Peripheral nerve palsy": 1, "Pharyngeal disorder": 1, "Physical deconditioning": 1, "Platelet count decreased": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Pleural effusion": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Portal venous gas": 1, "Portogram": 1, "Postural tremor": 1, "Prostatic specific antigen": 1, "Protein total": 1, "Protein urine present": 1, "Pruritus": 1, "Psychiatric evaluation": 1, "Pulmonary congestion": 1, "Pulmonary function test": 1, "Purpura": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal haemorrhage": 1, "Respiration abnormal": 1, "Respiratory arrest": 1, "Respiratory tract oedema": 1, "Retinal vein occlusion": 1, "Retroperitoneal abscess": 1, "Right ventricular failure": 1, "Scan": 1, "Scan brain": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Sepsis": 1, "Skin ulcer": 1, "Somnolence": 1, "Stress fracture": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Suffocation feeling": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroxine free": 1, "Total complement activity test": 1, "Tracheal stenosis": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "Upper respiratory tract infection": 1, "Urinary occult blood": 1, "Urinary occult blood positive": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Ventricular fibrillation": 1, "Ventricular tachyarrhythmia": 1, "Ventricular tachycardia": 1, "Vestibular neuronitis": 1, "Viral infection": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Vitamin B12": 1, "Vitamin B2": 1, "Weight": 1, "Weight decreased": 1, "White blood cells urine": 1, "White blood cells urine positive": 1}, "batchcodes": ["FL7646"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FM 7534.json b/docs/data/histograms/Japan/FM 7534.json
index 105b99caff8..311bd7c175d 100644
--- a/docs/data/histograms/Japan/FM 7534.json
+++ b/docs/data/histograms/Japan/FM 7534.json
@@ -1 +1 @@
-{"batchcode": "FM 7534", "histograms": [{"batchcodes": ["FM 7534"], "histogram": {"Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bronchospasm": 1, "Dyspnoea": 1, "Heart rate": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FM 7534", "histograms": [{"histogram": {"Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bronchospasm": 1, "Dyspnoea": 1, "Heart rate": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1}, "batchcodes": ["FM 7534"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FM3092.json b/docs/data/histograms/Japan/FM3092.json
index d9b99e35324..a5447704bcf 100644
--- a/docs/data/histograms/Japan/FM3092.json
+++ b/docs/data/histograms/Japan/FM3092.json
@@ -1 +1 @@
-{"batchcode": "FM3092", "histograms": [{"batchcodes": ["FM3092"], "histogram": {"Body temperature": 2, "Computerised tomogram": 2, "Pruritus": 2, "Pyrexia": 2, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Mental impairment": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Pulmonary infarction": 1, "Pulmonary oedema": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Thrombosis": 1, "Tremor": 1, "Ultrasound scan": 1, "Urticaria": 1, "Venous thrombosis limb": 1, "Vital signs measurement": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3092", "histograms": [{"histogram": {"Body temperature": 2, "Computerised tomogram": 2, "Pruritus": 2, "Pyrexia": 2, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Mental impairment": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Pulmonary infarction": 1, "Pulmonary oedema": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Thrombosis": 1, "Tremor": 1, "Ultrasound scan": 1, "Urticaria": 1, "Venous thrombosis limb": 1, "Vital signs measurement": 1, "Vomiting": 1}, "batchcodes": ["FM3092"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FM3289.json b/docs/data/histograms/Japan/FM3289.json
index 68cf8e0e359..14f5ee21a87 100644
--- a/docs/data/histograms/Japan/FM3289.json
+++ b/docs/data/histograms/Japan/FM3289.json
@@ -1 +1 @@
-{"batchcode": "FM3289", "histograms": [{"batchcodes": ["FM3289"], "histogram": {"Body temperature": 53, "Oxygen saturation": 20, "Pyrexia": 19, "Blood pressure measurement": 15, "Heart rate": 11, "Headache": 10, "Dizziness": 8, "Nausea": 8, "Blood pressure decreased": 7, "C-reactive protein": 7, "Dyspnoea": 7, "Malaise": 7, "SARS-CoV-2 test": 7, "Anaphylactic reaction": 6, "Blood test": 6, "Arthralgia": 5, "Hypoaesthesia": 5, "Neuropathy peripheral": 5, "Oxygen saturation decreased": 5, "White blood cell count": 5, "Chest X-ray": 4, "Computerised tomogram thorax": 4, "Condition aggravated": 4, "Decreased appetite": 4, "Electrocardiogram": 4, "Erythema": 4, "Feeling abnormal": 4, "Pain": 4, "Pain in extremity": 4, "Pruritus": 4, "Rash": 4, "Blood creatine phosphokinase": 3, "Blood pressure increased": 3, "Chest pain": 3, "Dehydration": 3, "Depressed level of consciousness": 3, "Disease recurrence": 3, "Feeling cold": 3, "Hypoxia": 3, "Magnetic resonance imaging": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Myocarditis": 3, "Oropharyngeal discomfort": 3, "Pallor": 3, "Respiratory arrest": 3, "Seizure": 3, "Thrombosis": 3, "Tremor": 3, "Vomiting": 3, "Apnoea": 2, "Arrhythmia": 2, "Arthritis": 2, "Asthenia": 2, "Blood phosphorus": 2, "C-reactive protein increased": 2, "Cardiac failure acute": 2, "Cardiomegaly": 2, "Chest discomfort": 2, "Chills": 2, "Chronic fatigue syndrome": 2, "Cold sweat": 2, "Coma scale": 2, "Cyanosis": 2, "Drug ineffective": 2, "Eosinophil count increased": 2, "Eye pain": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Interstitial lung disease": 2, "Muscle spasms": 2, "Palpitations": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Peripheral swelling": 2, "Respiratory failure": 2, "Sepsis": 2, "Shock": 2, "Urticaria": 2, "Wheezing": 2, "White blood cell count increased": 2, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Acalculia": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Agnosia": 1, "Altered state of consciousness": 1, "Amaurosis fugax": 1, "Angina pectoris": 1, "Angiogram": 1, "Anti-thyroid antibody": 1, "Anti-thyroid antibody increased": 1, "Anxiety": 1, "Aphasia": 1, "Arteriosclerosis": 1, "Asphyxia": 1, "Aspiration": 1, "Asthma": 1, "Atrial fibrillation": 1, "Autoantibody test": 1, "Autoimmune inner ear disease": 1, "Axillary mass": 1, "Axillary pain": 1, "Basedow's disease": 1, "Beta 2 microglobulin": 1, "Beta 2 microglobulin increased": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Brain oedema": 1, "Breath sounds": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiac hypertrophy": 1, "Cardiac monitoring": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Concomitant disease progression": 1, "Coronary artery stenosis": 1, "Coronavirus infection": 1, "Cough": 1, "Depression": 1, "Depressive symptom": 1, "Dermatitis": 1, "Diarrhoea": 1, "Discomfort": 1, "Disorientation": 1, "Disseminated intravascular coagulation": 1, "Dizziness postural": 1, "Drowning": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Electrocardiogram ST segment": 1, "Endoscopy gastrointestinal": 1, "Eosinophil count": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Fall": 1, "Feeding disorder": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gait disturbance": 1, "Gait inability": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Grip strength": 1, "Haematoma muscle": 1, "Hemiplegia": 1, "Hepatic enzyme abnormal": 1, "Herpes ophthalmic": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Imaging procedure": 1, "Induration": 1, "Infection": 1, "Inflammation": 1, "Influenza virus test": 1, "Investigation": 1, "Joint effusion": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head abnormal": 1, "Marasmus": 1, "Memory impairment": 1, "Monoplegia": 1, "Movement disorder": 1, "Myocardial hypoxia": 1, "Myocardial ischaemia": 1, "Neoplasm malignant": 1, "Nerve conduction studies": 1, "Neuralgic amyotrophy": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal pain": 1, "Otoscopy": 1, "Pain of skin": 1, "Paraesthesia": 1, "Peptostreptococcus infection": 1, "Peripheral circulatory failure": 1, "Peripheral coldness": 1, "Phlebitis superficial": 1, "Physical deconditioning": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia viral": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Procalcitonin": 1, "Renal impairment": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Skin laceration": 1, "Sluggishness": 1, "Speech disorder": 1, "Still's disease": 1, "Suspected COVID-19": 1, "Swelling": 1, "Tachycardia": 1, "Tachypnoea": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroid hormones test": 1, "Thyroxine free": 1, "Thyroxine free increased": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine free": 1, "Tri-iodothyronine free increased": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Varicose vein": 1, "Vasculitis": 1, "Venous thrombosis": 1, "Ventricular arrhythmia": 1, "Viral test": 1, "Viral test positive": 1, "Visual acuity reduced": 1, "Visual impairment": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3289", "histograms": [{"histogram": {"Body temperature": 53, "Oxygen saturation": 20, "Pyrexia": 19, "Blood pressure measurement": 15, "Heart rate": 11, "Headache": 10, "Dizziness": 8, "Nausea": 8, "Blood pressure decreased": 7, "C-reactive protein": 7, "Dyspnoea": 7, "Malaise": 7, "SARS-CoV-2 test": 7, "Anaphylactic reaction": 6, "Blood test": 6, "Arthralgia": 5, "Hypoaesthesia": 5, "Neuropathy peripheral": 5, "Oxygen saturation decreased": 5, "White blood cell count": 5, "Chest X-ray": 4, "Computerised tomogram thorax": 4, "Condition aggravated": 4, "Decreased appetite": 4, "Electrocardiogram": 4, "Erythema": 4, "Feeling abnormal": 4, "Pain": 4, "Pain in extremity": 4, "Pruritus": 4, "Rash": 4, "Blood creatine phosphokinase": 3, "Blood pressure increased": 3, "Chest pain": 3, "Dehydration": 3, "Depressed level of consciousness": 3, "Disease recurrence": 3, "Feeling cold": 3, "Hypoxia": 3, "Magnetic resonance imaging": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Myocarditis": 3, "Oropharyngeal discomfort": 3, "Pallor": 3, "Respiratory arrest": 3, "Seizure": 3, "Thrombosis": 3, "Tremor": 3, "Vomiting": 3, "Apnoea": 2, "Arrhythmia": 2, "Arthritis": 2, "Asthenia": 2, "Blood phosphorus": 2, "C-reactive protein increased": 2, "Cardiac failure acute": 2, "Cardiomegaly": 2, "Chest discomfort": 2, "Chills": 2, "Chronic fatigue syndrome": 2, "Cold sweat": 2, "Coma scale": 2, "Cyanosis": 2, "Drug ineffective": 2, "Eosinophil count increased": 2, "Eye pain": 2, "Heart rate decreased": 2, "Heart rate increased": 2, "Interstitial lung disease": 2, "Muscle spasms": 2, "Palpitations": 2, "Pericardial effusion": 2, "Pericarditis": 2, "Peripheral swelling": 2, "Respiratory failure": 2, "Sepsis": 2, "Shock": 2, "Urticaria": 2, "Wheezing": 2, "White blood cell count increased": 2, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Acalculia": 1, "Acute disseminated encephalomyelitis": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Agnosia": 1, "Altered state of consciousness": 1, "Amaurosis fugax": 1, "Angina pectoris": 1, "Angiogram": 1, "Anti-thyroid antibody": 1, "Anti-thyroid antibody increased": 1, "Anxiety": 1, "Aphasia": 1, "Arteriosclerosis": 1, "Asphyxia": 1, "Aspiration": 1, "Asthma": 1, "Atrial fibrillation": 1, "Autoantibody test": 1, "Autoimmune inner ear disease": 1, "Axillary mass": 1, "Axillary pain": 1, "Basedow's disease": 1, "Beta 2 microglobulin": 1, "Beta 2 microglobulin increased": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Brain oedema": 1, "Breath sounds": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac death": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac failure chronic": 1, "Cardiac hypertrophy": 1, "Cardiac monitoring": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Concomitant disease progression": 1, "Coronary artery stenosis": 1, "Coronavirus infection": 1, "Cough": 1, "Depression": 1, "Depressive symptom": 1, "Dermatitis": 1, "Diarrhoea": 1, "Discomfort": 1, "Disorientation": 1, "Disseminated intravascular coagulation": 1, "Dizziness postural": 1, "Drowning": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Electrocardiogram ST segment": 1, "Endoscopy gastrointestinal": 1, "Eosinophil count": 1, "Eosinophilic granulomatosis with polyangiitis": 1, "Fall": 1, "Feeding disorder": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gait disturbance": 1, "Gait inability": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Grip strength": 1, "Haematoma muscle": 1, "Hemiplegia": 1, "Hepatic enzyme abnormal": 1, "Herpes ophthalmic": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Imaging procedure": 1, "Induration": 1, "Infection": 1, "Inflammation": 1, "Influenza virus test": 1, "Investigation": 1, "Joint effusion": 1, "Joint swelling": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head abnormal": 1, "Marasmus": 1, "Memory impairment": 1, "Monoplegia": 1, "Movement disorder": 1, "Myocardial hypoxia": 1, "Myocardial ischaemia": 1, "Neoplasm malignant": 1, "Nerve conduction studies": 1, "Neuralgic amyotrophy": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Ocular hyperaemia": 1, "Oculomucocutaneous syndrome": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal pain": 1, "Otoscopy": 1, "Pain of skin": 1, "Paraesthesia": 1, "Peptostreptococcus infection": 1, "Peripheral circulatory failure": 1, "Peripheral coldness": 1, "Phlebitis superficial": 1, "Physical deconditioning": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia viral": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Procalcitonin": 1, "Renal impairment": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Skin laceration": 1, "Sluggishness": 1, "Speech disorder": 1, "Still's disease": 1, "Suspected COVID-19": 1, "Swelling": 1, "Tachycardia": 1, "Tachypnoea": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroid hormones test": 1, "Thyroxine free": 1, "Thyroxine free increased": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine free": 1, "Tri-iodothyronine free increased": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Varicose vein": 1, "Vasculitis": 1, "Venous thrombosis": 1, "Ventricular arrhythmia": 1, "Viral test": 1, "Viral test positive": 1, "Visual acuity reduced": 1, "Visual impairment": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1}, "batchcodes": ["FM3289"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FM7534.json b/docs/data/histograms/Japan/FM7534.json
index ded67498d5d..ec03cbc1556 100644
--- a/docs/data/histograms/Japan/FM7534.json
+++ b/docs/data/histograms/Japan/FM7534.json
@@ -1 +1 @@
-{"batchcode": "FM7534", "histograms": [{"batchcodes": ["FM7534"], "histogram": {"Body temperature": 35, "Pyrexia": 16, "Blood pressure measurement": 8, "Hypoaesthesia": 8, "Malaise": 8, "Oxygen saturation": 8, "Muscular weakness": 7, "Vomiting": 7, "Anaphylactic reaction": 6, "Blood test": 6, "Blood pressure decreased": 5, "C-reactive protein": 5, "Headache": 5, "Loss of consciousness": 5, "Magnetic resonance imaging head": 5, "Myalgia": 5, "White blood cell count": 5, "Chest pain": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Electrocardiogram": 4, "Heart rate": 4, "Chest X-ray": 3, "Dizziness": 3, "Echocardiogram": 3, "Gait disturbance": 3, "Investigation": 3, "Magnetic resonance imaging": 3, "Nausea": 3, "Nerve conduction studies": 3, "Pain": 3, "Platelet count": 3, "Urticaria": 3, "Acute disseminated encephalomyelitis": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Back pain": 2, "Bladder disorder": 2, "Blood alkaline phosphatase": 2, "Blood creatine phosphokinase": 2, "Blood creatine phosphokinase MB": 2, "Blood glucose": 2, "Blood lactate dehydrogenase": 2, "Blood pressure increased": 2, "CSF test": 2, "Coma scale": 2, "Depressed level of consciousness": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Dyspnoea": 2, "Facial paralysis": 2, "Fall": 2, "Fatigue": 2, "Feeling abnormal": 2, "Gait inability": 2, "Gamma-glutamyltransferase": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemoglobin": 2, "Liver disorder": 2, "Memory impairment": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Neuropathy peripheral": 2, "Oxygen saturation decreased": 2, "Paraesthesia": 2, "Presyncope": 2, "Protein total": 2, "Red blood cell count": 2, "SARS-CoV-2 test": 2, "Sensory disturbance": 2, "Serum ferritin": 2, "Shock": 2, "Sleep disorder": 2, "Suspected COVID-19": 2, "Taste disorder": 2, "Tremor": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Activated partial thromboplastin time": 1, "Albumin globulin ratio": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Aneurysm": 1, "Angiogram": 1, "Anorectal disorder": 1, "Anti-GAD antibody": 1, "Anti-platelet factor 4 antibody test": 1, "Antibody test": 1, "Arthralgia": 1, "Autoantibody test": 1, "Axillary pain": 1, "Band neutrophil count": 1, "Basophil percentage": 1, "Bell's palsy": 1, "Beta 2 globulin": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood cortisol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood iron": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test abnormal": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Bradykinesia": 1, "COVID-19": 1, "CSF cell count": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac ventricular thrombosis": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cavernous sinus syndrome": 1, "Cavernous sinus thrombosis": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral venous thrombosis": 1, "Cerebrovascular disorder": 1, "Chest discomfort": 1, "Chills": 1, "Choking sensation": 1, "Chronic fatigue syndrome": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Coronary artery stenosis": 1, "Cortisol decreased": 1, "Cytomegalovirus test": 1, "Deafness transitory": 1, "Diabetic ketosis": 1, "Diarrhoea": 1, "Diplegia": 1, "Diplopia": 1, "Discomfort": 1, "Drug-induced liver injury": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Eating disorder": 1, "Ejection fraction": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram change": 1, "Electroencephalogram": 1, "Embolism": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophil percentage": 1, "Epstein-Barr virus test": 1, "Erythema": 1, "Eyelid ptosis": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Glomerular filtration rate": 1, "Granulocyte count": 1, "Granulocyte count decreased": 1, "Granulocytopenia": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematuria": 1, "Haemorrhage subcutaneous": 1, "Heart rate decreased": 1, "Hepatic function abnormal": 1, "Hepatic steatosis": 1, "Hepatitis acute": 1, "Hepatitis viral test": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hyperreflexia": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Hypopnoea": 1, "Immunoglobulins": 1, "Incontinence": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Iron binding capacity unsaturated": 1, "Lagophthalmos": 1, "Leg amputation": 1, "Low density lipoprotein": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mesenteric artery thrombosis": 1, "Migraine": 1, "Monocyte percentage": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myelitis transverse": 1, "Myocarditis": 1, "Neck pain": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Ocular discomfort": 1, "Orthostatic intolerance": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Pericarditis": 1, "Peripheral artery occlusion": 1, "Peripheral artery thrombosis": 1, "Peripheral coldness": 1, "Peripheral embolism": 1, "Peripheral ischaemia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Post viral fatigue syndrome": 1, "Proteinuria": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary embolism": 1, "Pupil dilation procedure": 1, "Purpura": 1, "Respiratory rate": 1, "Reticulocyte count": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Serum ferritin increased": 1, "Somnolence": 1, "Stress": 1, "Swelling": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Troponin I": 1, "Troponin I increased": 1, "Type 1 diabetes mellitus": 1, "Type IV hypersensitivity reaction": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Ventricular fibrillation": 1, "Vision blurred": 1, "Vitamin B12": 1, "Wheezing": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7534", "histograms": [{"histogram": {"Body temperature": 35, "Pyrexia": 16, "Blood pressure measurement": 8, "Hypoaesthesia": 8, "Malaise": 8, "Oxygen saturation": 8, "Muscular weakness": 7, "Vomiting": 7, "Anaphylactic reaction": 6, "Blood test": 6, "Blood pressure decreased": 5, "C-reactive protein": 5, "Headache": 5, "Loss of consciousness": 5, "Magnetic resonance imaging head": 5, "Myalgia": 5, "White blood cell count": 5, "Chest pain": 4, "Computerised tomogram": 4, "Decreased appetite": 4, "Electrocardiogram": 4, "Heart rate": 4, "Chest X-ray": 3, "Dizziness": 3, "Echocardiogram": 3, "Gait disturbance": 3, "Investigation": 3, "Magnetic resonance imaging": 3, "Nausea": 3, "Nerve conduction studies": 3, "Pain": 3, "Platelet count": 3, "Urticaria": 3, "Acute disseminated encephalomyelitis": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Back pain": 2, "Bladder disorder": 2, "Blood alkaline phosphatase": 2, "Blood creatine phosphokinase": 2, "Blood creatine phosphokinase MB": 2, "Blood glucose": 2, "Blood lactate dehydrogenase": 2, "Blood pressure increased": 2, "CSF test": 2, "Coma scale": 2, "Depressed level of consciousness": 2, "Drug ineffective": 2, "Dysaesthesia": 2, "Dyspnoea": 2, "Facial paralysis": 2, "Fall": 2, "Fatigue": 2, "Feeling abnormal": 2, "Gait inability": 2, "Gamma-glutamyltransferase": 2, "Guillain-Barre syndrome": 2, "Haematocrit": 2, "Haemoglobin": 2, "Liver disorder": 2, "Memory impairment": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Neuropathy peripheral": 2, "Oxygen saturation decreased": 2, "Paraesthesia": 2, "Presyncope": 2, "Protein total": 2, "Red blood cell count": 2, "SARS-CoV-2 test": 2, "Sensory disturbance": 2, "Serum ferritin": 2, "Shock": 2, "Sleep disorder": 2, "Suspected COVID-19": 2, "Taste disorder": 2, "Tremor": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Activated partial thromboplastin time": 1, "Albumin globulin ratio": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Aneurysm": 1, "Angiogram": 1, "Anorectal disorder": 1, "Anti-GAD antibody": 1, "Anti-platelet factor 4 antibody test": 1, "Antibody test": 1, "Arthralgia": 1, "Autoantibody test": 1, "Axillary pain": 1, "Band neutrophil count": 1, "Basophil percentage": 1, "Bell's palsy": 1, "Beta 2 globulin": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood cortisol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood iron": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test abnormal": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Bradykinesia": 1, "COVID-19": 1, "CSF cell count": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cardiac electrophysiologic study": 1, "Cardiac ventricular thrombosis": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cavernous sinus syndrome": 1, "Cavernous sinus thrombosis": 1, "Cerebral haemorrhage": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral venous thrombosis": 1, "Cerebrovascular disorder": 1, "Chest discomfort": 1, "Chills": 1, "Choking sensation": 1, "Chronic fatigue syndrome": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Coronary artery stenosis": 1, "Cortisol decreased": 1, "Cytomegalovirus test": 1, "Deafness transitory": 1, "Diabetic ketosis": 1, "Diarrhoea": 1, "Diplegia": 1, "Diplopia": 1, "Discomfort": 1, "Drug-induced liver injury": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Eating disorder": 1, "Ejection fraction": 1, "Electrocardiogram ST segment elevation": 1, "Electrocardiogram change": 1, "Electroencephalogram": 1, "Embolism": 1, "Encephalitis": 1, "Encephalopathy": 1, "Eosinophil percentage": 1, "Epstein-Barr virus test": 1, "Erythema": 1, "Eyelid ptosis": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Glomerular filtration rate": 1, "Granulocyte count": 1, "Granulocyte count decreased": 1, "Granulocytopenia": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematuria": 1, "Haemorrhage subcutaneous": 1, "Heart rate decreased": 1, "Hepatic function abnormal": 1, "Hepatic steatosis": 1, "Hepatitis acute": 1, "Hepatitis viral test": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hyperreflexia": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Hypopnoea": 1, "Immunoglobulins": 1, "Incontinence": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Iron binding capacity unsaturated": 1, "Lagophthalmos": 1, "Leg amputation": 1, "Low density lipoprotein": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mesenteric artery thrombosis": 1, "Migraine": 1, "Monocyte percentage": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myelitis transverse": 1, "Myocarditis": 1, "Neck pain": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Ocular discomfort": 1, "Orthostatic intolerance": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Pericarditis": 1, "Peripheral artery occlusion": 1, "Peripheral artery thrombosis": 1, "Peripheral coldness": 1, "Peripheral embolism": 1, "Peripheral ischaemia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Post viral fatigue syndrome": 1, "Proteinuria": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary embolism": 1, "Pupil dilation procedure": 1, "Purpura": 1, "Respiratory rate": 1, "Reticulocyte count": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Serum ferritin increased": 1, "Somnolence": 1, "Stress": 1, "Swelling": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Troponin I": 1, "Troponin I increased": 1, "Type 1 diabetes mellitus": 1, "Type IV hypersensitivity reaction": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Ventricular fibrillation": 1, "Vision blurred": 1, "Vitamin B12": 1, "Wheezing": 1, "White blood cell count decreased": 1}, "batchcodes": ["FM7534"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FM9088.json b/docs/data/histograms/Japan/FM9088.json
index cd6a02f683f..5c31cbdd70a 100644
--- a/docs/data/histograms/Japan/FM9088.json
+++ b/docs/data/histograms/Japan/FM9088.json
@@ -1 +1 @@
-{"batchcode": "FM9088", "histograms": [{"batchcodes": ["FM9088"], "histogram": {"Body temperature": 2, "Interchange of vaccine products": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Bedridden": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urea": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "C-reactive protein": 1, "Colitis ischaemic": 1, "Condition aggravated": 1, "Cough": 1, "Ear discomfort": 1, "Erythema": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Granulocyte count": 1, "Granulocyte percentage": 1, "Haematocrit": 1, "Headache": 1, "High density lipoprotein": 1, "Joint range of motion decreased": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Mononuclear cell percentage": 1, "Movement disorder": 1, "Multiple system atrophy": 1, "Nausea": 1, "Neurogenic bladder": 1, "Oropharyngeal discomfort": 1, "Platelet count": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Pruritus": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Urinary retention": 1, "Urticaria": 1, "Vomiting": 1, "Weight decreased": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FM9088", "histograms": [{"histogram": {"Body temperature": 2, "Interchange of vaccine products": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Bedridden": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urea": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "C-reactive protein": 1, "Colitis ischaemic": 1, "Condition aggravated": 1, "Cough": 1, "Ear discomfort": 1, "Erythema": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Granulocyte count": 1, "Granulocyte percentage": 1, "Haematocrit": 1, "Headache": 1, "High density lipoprotein": 1, "Joint range of motion decreased": 1, "Loss of personal independence in daily activities": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Mononuclear cell percentage": 1, "Movement disorder": 1, "Multiple system atrophy": 1, "Nausea": 1, "Neurogenic bladder": 1, "Oropharyngeal discomfort": 1, "Platelet count": 1, "Platelet distribution width": 1, "Plateletcrit": 1, "Pruritus": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Urinary retention": 1, "Urticaria": 1, "Vomiting": 1, "Weight decreased": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["FM9088"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FM9281.json b/docs/data/histograms/Japan/FM9281.json
index 28dbfb9b029..e4628dbc22e 100644
--- a/docs/data/histograms/Japan/FM9281.json
+++ b/docs/data/histograms/Japan/FM9281.json
@@ -1 +1 @@
-{"batchcode": "FM9281", "histograms": [{"batchcodes": ["FM9281"], "histogram": {"Anaphylactic reaction": 1, "Body temperature": 1, "Conjunctival hyperaemia": 1, "Feeling abnormal": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "FM9281", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Body temperature": 1, "Conjunctival hyperaemia": 1, "Feeling abnormal": 1, "Nausea": 1}, "batchcodes": ["FM9281"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN2716.json b/docs/data/histograms/Japan/FN2716.json
index 205627e23b7..69e5db6d22b 100644
--- a/docs/data/histograms/Japan/FN2716.json
+++ b/docs/data/histograms/Japan/FN2716.json
@@ -1 +1 @@
-{"batchcode": "FN2716", "histograms": [{"batchcodes": ["FN2716"], "histogram": {"Body temperature": 8, "SARS-CoV-2 test": 8, "Drug ineffective": 6, "COVID-19": 5, "Pyrexia": 4, "COVID-19 pneumonia": 3, "Cough": 3, "Computerised tomogram": 2, "Magnetic resonance imaging": 2, "Productive cough": 2, "Seizure": 2, "Allergy test": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Asthenia": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blood culture": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "CSF test": 1, "Cerebral infarction": 1, "Coma scale": 1, "Discomfort": 1, "Dizziness": 1, "Echocardiogram": 1, "Echoencephalogram": 1, "Eczema": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Encephalopathy": 1, "Erythema": 1, "Headache": 1, "Heart rate": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Immunology test": 1, "Inflammation": 1, "Loss of consciousness": 1, "Memory impairment": 1, "Migraine": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Positron emission tomogram": 1, "Presyncope": 1, "Rash": 1, "Rhinorrhoea": 1, "Snoring": 1, "Sputum discoloured": 1, "Swelling face": 1, "Urticaria": 1, "Vaccination site movement impairment": 1, "Vasculitis": 1, "Visual impairment": 1, "Weight increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2716", "histograms": [{"histogram": {"Body temperature": 8, "SARS-CoV-2 test": 8, "Drug ineffective": 6, "COVID-19": 5, "Pyrexia": 4, "COVID-19 pneumonia": 3, "Cough": 3, "Computerised tomogram": 2, "Magnetic resonance imaging": 2, "Productive cough": 2, "Seizure": 2, "Allergy test": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Asthenia": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blood culture": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "CSF test": 1, "Cerebral infarction": 1, "Coma scale": 1, "Discomfort": 1, "Dizziness": 1, "Echocardiogram": 1, "Echoencephalogram": 1, "Eczema": 1, "Encephalitis": 1, "Encephalitis autoimmune": 1, "Encephalopathy": 1, "Erythema": 1, "Headache": 1, "Heart rate": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Immunology test": 1, "Inflammation": 1, "Loss of consciousness": 1, "Memory impairment": 1, "Migraine": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Physical deconditioning": 1, "Positron emission tomogram": 1, "Presyncope": 1, "Rash": 1, "Rhinorrhoea": 1, "Snoring": 1, "Sputum discoloured": 1, "Swelling face": 1, "Urticaria": 1, "Vaccination site movement impairment": 1, "Vasculitis": 1, "Visual impairment": 1, "Weight increased": 1, "X-ray": 1}, "batchcodes": ["FN2716"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN2723.json b/docs/data/histograms/Japan/FN2723.json
index d1af501d115..cf4f9fe9c2f 100644
--- a/docs/data/histograms/Japan/FN2723.json
+++ b/docs/data/histograms/Japan/FN2723.json
@@ -1 +1 @@
-{"batchcode": "FN2723", "histograms": [{"batchcodes": ["FN2723"], "histogram": {"Body temperature": 35, "Pyrexia": 11, "Oxygen saturation": 10, "Blood pressure measurement": 8, "Electrocardiogram": 7, "Blood creatine phosphokinase": 6, "Heart rate": 6, "Hypoaesthesia": 6, "Arthralgia": 5, "Blood creatine phosphokinase MB": 5, "C-reactive protein": 5, "Myocarditis": 5, "Alanine aminotransferase": 4, "Anaphylactic reaction": 4, "Aspartate aminotransferase": 4, "Chest pain": 4, "Echocardiogram": 4, "Feeling abnormal": 4, "Gamma-glutamyltransferase": 4, "Investigation": 4, "Magnetic resonance imaging": 4, "Movement disorder": 4, "Muscular weakness": 4, "Blood pressure decreased": 3, "Blood pressure increased": 3, "Blood test": 3, "C-reactive protein increased": 3, "Electrocardiogram ST segment elevation": 3, "Erythema": 3, "Hepatic function abnormal": 3, "Nerve conduction studies": 3, "Pain in extremity": 3, "Presyncope": 3, "Sensory disturbance": 3, "Troponin T": 3, "Viral myocarditis": 3, "Alanine aminotransferase increased": 2, "Aspartate aminotransferase increased": 2, "Blood creatine phosphokinase increased": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Cough": 2, "Facial paralysis": 2, "Fall": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Headache": 2, "Insomnia": 2, "Joint range of motion decreased": 2, "Limb discomfort": 2, "Loss of consciousness": 2, "Lymphadenopathy": 2, "Malaise": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nausea": 2, "Neck pain": 2, "Neuropathy peripheral": 2, "Oedema peripheral": 2, "Pruritus": 2, "Rash": 2, "Rhabdomyolysis": 2, "Troponin": 2, "Vital signs measurement": 2, "Weight": 2, "Abdominal discomfort": 1, "Abdominal tenderness": 1, "Acute respiratory failure": 1, "Albumin globulin ratio": 1, "Anaphylactoid reaction": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Antisynthetase syndrome": 1, "Asthenia": 1, "Asthma": 1, "Autoantibody test": 1, "Axillary pain": 1, "Back pain": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure management": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Bradycardia": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac hypertrophy": 1, "Cardiac pacemaker insertion": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cardiothoracic ratio": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Death": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dermatitis allergic": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysmenorrhoea": 1, "Dyspepsia": 1, "Dysphoria": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "EGFR status assay": 1, "Ear discomfort": 1, "Ejection fraction": 1, "Electrocardiogram abnormal": 1, "Eosinophil count": 1, "Faeces soft": 1, "Fatigue": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase increased": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Herpes zoster": 1, "Hypotension": 1, "Immunoglobulins abnormal": 1, "Immunology test": 1, "Injected limb mobility decreased": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Judgement impaired": 1, "Limb immobilisation": 1, "Lipase": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Lymphoedema": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Malnutrition": 1, "Marasmus": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Metamyelocyte count": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myelocyte count": 1, "Nerve injury": 1, "Neutrophil count": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Pain": 1, "Pallor": 1, "Paraesthesia": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral nerve lesion": 1, "Physical examination": 1, "Platelet count": 1, "Polyarthritis": 1, "Polymyalgia rheumatica": 1, "Protein total": 1, "Radial pulse": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "Retinal detachment": 1, "Seronegative arthritis": 1, "Shoulder injury related to vaccine administration": 1, "Skin wrinkling": 1, "Spinal X-ray": 1, "Spinal compression fracture": 1, "Spinal osteoarthritis": 1, "Subclavian vein thrombosis": 1, "Sudden death": 1, "Tenderness": 1, "Throat irritation": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Troponin I": 1, "Troponin T increased": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Urticaria": 1, "Uveitis": 1, "Vaccination site discolouration": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Visual acuity reduced": 1, "Vogt-Koyanagi-Harada disease": 1, "Weight decreased": 1, "White blood cell count": 1, "X-ray": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2723", "histograms": [{"histogram": {"Body temperature": 35, "Pyrexia": 11, "Oxygen saturation": 10, "Blood pressure measurement": 8, "Electrocardiogram": 7, "Blood creatine phosphokinase": 6, "Heart rate": 6, "Hypoaesthesia": 6, "Arthralgia": 5, "Blood creatine phosphokinase MB": 5, "C-reactive protein": 5, "Myocarditis": 5, "Alanine aminotransferase": 4, "Anaphylactic reaction": 4, "Aspartate aminotransferase": 4, "Chest pain": 4, "Echocardiogram": 4, "Feeling abnormal": 4, "Gamma-glutamyltransferase": 4, "Investigation": 4, "Magnetic resonance imaging": 4, "Movement disorder": 4, "Muscular weakness": 4, "Blood pressure decreased": 3, "Blood pressure increased": 3, "Blood test": 3, "C-reactive protein increased": 3, "Electrocardiogram ST segment elevation": 3, "Erythema": 3, "Hepatic function abnormal": 3, "Nerve conduction studies": 3, "Pain in extremity": 3, "Presyncope": 3, "Sensory disturbance": 3, "Troponin T": 3, "Viral myocarditis": 3, "Alanine aminotransferase increased": 2, "Aspartate aminotransferase increased": 2, "Blood creatine phosphokinase increased": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Cough": 2, "Facial paralysis": 2, "Fall": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Headache": 2, "Insomnia": 2, "Joint range of motion decreased": 2, "Limb discomfort": 2, "Loss of consciousness": 2, "Lymphadenopathy": 2, "Malaise": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nausea": 2, "Neck pain": 2, "Neuropathy peripheral": 2, "Oedema peripheral": 2, "Pruritus": 2, "Rash": 2, "Rhabdomyolysis": 2, "Troponin": 2, "Vital signs measurement": 2, "Weight": 2, "Abdominal discomfort": 1, "Abdominal tenderness": 1, "Acute respiratory failure": 1, "Albumin globulin ratio": 1, "Anaphylactoid reaction": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Antisynthetase syndrome": 1, "Asthenia": 1, "Asthma": 1, "Autoantibody test": 1, "Axillary pain": 1, "Back pain": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure management": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Bradycardia": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac hypertrophy": 1, "Cardiac pacemaker insertion": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cardiothoracic ratio": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Death": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dermatitis allergic": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysmenorrhoea": 1, "Dyspepsia": 1, "Dysphoria": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "EGFR status assay": 1, "Ear discomfort": 1, "Ejection fraction": 1, "Electrocardiogram abnormal": 1, "Eosinophil count": 1, "Faeces soft": 1, "Fatigue": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase increased": 1, "Grip strength": 1, "Grip strength decreased": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Herpes zoster": 1, "Hypotension": 1, "Immunoglobulins abnormal": 1, "Immunology test": 1, "Injected limb mobility decreased": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Judgement impaired": 1, "Limb immobilisation": 1, "Lipase": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lymphocyte count": 1, "Lymphocyte morphology abnormal": 1, "Lymphoedema": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Malnutrition": 1, "Marasmus": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Metamyelocyte count": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myelocyte count": 1, "Nerve injury": 1, "Neutrophil count": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Pain": 1, "Pallor": 1, "Paraesthesia": 1, "Paresis": 1, "Periarthritis": 1, "Peripheral nerve lesion": 1, "Physical examination": 1, "Platelet count": 1, "Polyarthritis": 1, "Polymyalgia rheumatica": 1, "Protein total": 1, "Radial pulse": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "Retinal detachment": 1, "Seronegative arthritis": 1, "Shoulder injury related to vaccine administration": 1, "Skin wrinkling": 1, "Spinal X-ray": 1, "Spinal compression fracture": 1, "Spinal osteoarthritis": 1, "Subclavian vein thrombosis": 1, "Sudden death": 1, "Tenderness": 1, "Throat irritation": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Troponin I": 1, "Troponin T increased": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Urticaria": 1, "Uveitis": 1, "Vaccination site discolouration": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Visual acuity reduced": 1, "Vogt-Koyanagi-Harada disease": 1, "Weight decreased": 1, "White blood cell count": 1, "X-ray": 1, "pH body fluid": 1}, "batchcodes": ["FN2723"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN2726.json b/docs/data/histograms/Japan/FN2726.json
index f96211f49c8..5d04ba53a9b 100644
--- a/docs/data/histograms/Japan/FN2726.json
+++ b/docs/data/histograms/Japan/FN2726.json
@@ -1 +1 @@
-{"batchcode": "FN2726", "histograms": [{"batchcodes": ["FN2726"], "histogram": {"Body temperature": 19, "Pyrexia": 9, "Blood pressure measurement": 7, "Chest pain": 5, "Dyspnoea": 5, "Electrocardiogram": 5, "Heart rate": 5, "Oxygen saturation": 5, "Anaphylactic reaction": 4, "Blood pressure decreased": 4, "C-reactive protein": 4, "Headache": 4, "Myocarditis": 4, "Urticaria": 4, "Altered state of consciousness": 3, "Blood creatine phosphokinase": 3, "Blood test": 3, "Feeling abnormal": 3, "Hypoaesthesia": 3, "Loss of consciousness": 3, "Nausea": 3, "Pruritus": 3, "White blood cell count": 3, "Blood pressure increased": 2, "C-reactive protein increased": 2, "Condition aggravated": 2, "Erythema": 2, "Generalised oedema": 2, "Haematocrit": 2, "Haemoglobin": 2, "Investigation": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Neuropathy peripheral": 2, "Off label use": 2, "Pain": 2, "Palpitations": 2, "Paraesthesia": 2, "Pericarditis": 2, "Platelet count": 2, "Rash": 2, "Red blood cell count": 2, "Vasculitis": 2, "Vomiting": 2, "Abdominal pain": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Aphasia": 1, "Arterial thrombosis": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Auscultation": 1, "Axillary pain": 1, "Basedow's disease": 1, "Basophil count": 1, "Biopsy": 1, "Biopsy skin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood electrolytes": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF immunoglobulin increased": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF protein increased": 1, "CSF test": 1, "Cardiomyopathy": 1, "Castleman's disease": 1, "Cellulitis": 1, "Cerebral infarction": 1, "Cerebrovascular disorder": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Computerised tomogram head": 1, "Cough": 1, "Death": 1, "Decreased appetite": 1, "Dermatitis allergic": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysphonia": 1, "Echocardiogram": 1, "Encephalopathy": 1, "Endotracheal intubation": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Erythema of eyelid": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gastrostomy": 1, "Glomerular filtration rate": 1, "Guillain-Barre syndrome": 1, "Haemorrhage subcutaneous": 1, "Hashimoto's encephalopathy": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Immunisation": 1, "Infection": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Ketosis": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Monocyte count": 1, "Muscle rigidity": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "Nephropathy": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nucleic acid test": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Pain in extremity": 1, "Paralysis": 1, "Pharyngeal oedema": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Primitive reflex test": 1, "Protein total": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Quadriplegia": 1, "Reflexes abnormal": 1, "Renal impairment": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Skin necrosis": 1, "Skin ulcer": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroid hormones test": 1, "Ulcer": 1, "Urine ketone body": 1, "Vascular occlusion": 1, "Vascular stenosis": 1, "Wheezing": 1, "White matter lesion": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2726", "histograms": [{"histogram": {"Body temperature": 19, "Pyrexia": 9, "Blood pressure measurement": 7, "Chest pain": 5, "Dyspnoea": 5, "Electrocardiogram": 5, "Heart rate": 5, "Oxygen saturation": 5, "Anaphylactic reaction": 4, "Blood pressure decreased": 4, "C-reactive protein": 4, "Headache": 4, "Myocarditis": 4, "Urticaria": 4, "Altered state of consciousness": 3, "Blood creatine phosphokinase": 3, "Blood test": 3, "Feeling abnormal": 3, "Hypoaesthesia": 3, "Loss of consciousness": 3, "Nausea": 3, "Pruritus": 3, "White blood cell count": 3, "Blood pressure increased": 2, "C-reactive protein increased": 2, "Condition aggravated": 2, "Erythema": 2, "Generalised oedema": 2, "Haematocrit": 2, "Haemoglobin": 2, "Investigation": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Neuropathy peripheral": 2, "Off label use": 2, "Pain": 2, "Palpitations": 2, "Paraesthesia": 2, "Pericarditis": 2, "Platelet count": 2, "Rash": 2, "Red blood cell count": 2, "Vasculitis": 2, "Vomiting": 2, "Abdominal pain": 1, "Activated partial thromboplastin time": 1, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Aphasia": 1, "Arterial thrombosis": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Auscultation": 1, "Axillary pain": 1, "Basedow's disease": 1, "Basophil count": 1, "Biopsy": 1, "Biopsy skin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood electrolytes": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF immunoglobulin increased": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF protein increased": 1, "CSF test": 1, "Cardiomyopathy": 1, "Castleman's disease": 1, "Cellulitis": 1, "Cerebral infarction": 1, "Cerebrovascular disorder": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Computerised tomogram head": 1, "Cough": 1, "Death": 1, "Decreased appetite": 1, "Dermatitis allergic": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysphonia": 1, "Echocardiogram": 1, "Encephalopathy": 1, "Endotracheal intubation": 1, "Eosinophil count": 1, "Eosinophil count increased": 1, "Erythema of eyelid": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gastrostomy": 1, "Glomerular filtration rate": 1, "Guillain-Barre syndrome": 1, "Haemorrhage subcutaneous": 1, "Hashimoto's encephalopathy": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Immunisation": 1, "Infection": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Ketosis": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Monocyte count": 1, "Muscle rigidity": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "Nephropathy": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nucleic acid test": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Pain in extremity": 1, "Paralysis": 1, "Pharyngeal oedema": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Primitive reflex test": 1, "Protein total": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Quadriplegia": 1, "Reflexes abnormal": 1, "Renal impairment": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Skin necrosis": 1, "Skin ulcer": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroid hormones test": 1, "Ulcer": 1, "Urine ketone body": 1, "Vascular occlusion": 1, "Vascular stenosis": 1, "Wheezing": 1, "White matter lesion": 1, "X-ray": 1}, "batchcodes": ["FN2726"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN2727.json b/docs/data/histograms/Japan/FN2727.json
index 8e66aa5fea5..dd9aa107a25 100644
--- a/docs/data/histograms/Japan/FN2727.json
+++ b/docs/data/histograms/Japan/FN2727.json
@@ -1 +1 @@
-{"batchcode": "FN2727", "histograms": [{"batchcodes": ["FN2727"], "histogram": {"Body temperature": 5, "Pyrexia": 3, "Anaphylactic reaction": 2, "Asthenia": 2, "Blood pressure measurement": 2, "Dyspnoea": 2, "Heart rate": 2, "Oxygen saturation": 2, "Somnolence": 2, "Abdominal distension": 1, "Arthralgia": 1, "Biopsy muscle": 1, "Blood pressure increased": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram abdomen": 1, "Conjunctival hyperaemia": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypophagia": 1, "Ileus": 1, "Intestinal perforation": 1, "Malaise": 1, "Mobility decreased": 1, "Neuropathy peripheral": 1, "Oedema": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Peripheral swelling": 1, "Respiratory rate increased": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "Sluggishness": 1, "Sudden hearing loss": 1, "Throat irritation": 1, "Vaccination site pain": 1, "Vomiting": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2727", "histograms": [{"histogram": {"Body temperature": 5, "Pyrexia": 3, "Anaphylactic reaction": 2, "Asthenia": 2, "Blood pressure measurement": 2, "Dyspnoea": 2, "Heart rate": 2, "Oxygen saturation": 2, "Somnolence": 2, "Abdominal distension": 1, "Arthralgia": 1, "Biopsy muscle": 1, "Blood pressure increased": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram abdomen": 1, "Conjunctival hyperaemia": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypophagia": 1, "Ileus": 1, "Intestinal perforation": 1, "Malaise": 1, "Mobility decreased": 1, "Neuropathy peripheral": 1, "Oedema": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Peripheral swelling": 1, "Respiratory rate increased": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "Sluggishness": 1, "Sudden hearing loss": 1, "Throat irritation": 1, "Vaccination site pain": 1, "Vomiting": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["FN2727"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN2897.json b/docs/data/histograms/Japan/FN2897.json
index 744032614ca..5a0ec4e6087 100644
--- a/docs/data/histograms/Japan/FN2897.json
+++ b/docs/data/histograms/Japan/FN2897.json
@@ -1 +1 @@
-{"batchcode": "FN2897", "histograms": [{"batchcodes": ["FN2897"], "histogram": {"Body temperature": 3, "Headache": 2, "Pyrexia": 2, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Electrocardiogram repolarisation abnormality": 1, "Grip strength decreased": 1, "Heart rate": 1, "Hyperaesthesia": 1, "Hypoaesthesia": 1, "Joint contracture": 1, "Joint range of motion decreased": 1, "Loss of consciousness": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Neuropathy peripheral": 1, "Oedema": 1, "Office visit": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Troponin": 1, "Troponin T": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2897", "histograms": [{"histogram": {"Body temperature": 3, "Headache": 2, "Pyrexia": 2, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Electrocardiogram repolarisation abnormality": 1, "Grip strength decreased": 1, "Heart rate": 1, "Hyperaesthesia": 1, "Hypoaesthesia": 1, "Joint contracture": 1, "Joint range of motion decreased": 1, "Loss of consciousness": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Neuropathy peripheral": 1, "Oedema": 1, "Office visit": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Troponin": 1, "Troponin T": 1, "Ultrasound scan": 1}, "batchcodes": ["FN2897"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN5988.json b/docs/data/histograms/Japan/FN5988.json
index aac02630f1c..fc2577b68a1 100644
--- a/docs/data/histograms/Japan/FN5988.json
+++ b/docs/data/histograms/Japan/FN5988.json
@@ -1 +1 @@
-{"batchcode": "FN5988", "histograms": [{"batchcodes": ["FN5988"], "histogram": {"Body temperature": 43, "Pyrexia": 19, "Blood pressure measurement": 18, "Vomiting": 13, "Heart rate": 12, "Seizure": 12, "Blood pressure decreased": 11, "Blood test": 11, "Drug ineffective": 10, "Electrocardiogram": 10, "Oxygen saturation": 10, "Pallor": 9, "C-reactive protein": 8, "Abdominal pain": 7, "COVID-19": 7, "Depressed level of consciousness": 7, "Headache": 7, "Nausea": 7, "SARS-CoV-2 test": 7, "White blood cell count": 7, "Anaphylactic reaction": 6, "Echocardiogram": 6, "Presyncope": 6, "Suspected COVID-19": 6, "Asthenia": 5, "Heart rate decreased": 5, "Loss of consciousness": 5, "Malaise": 5, "Myocarditis": 5, "Aspartate aminotransferase": 4, "Blood creatine phosphokinase": 4, "Bradycardia": 4, "Chest pain": 4, "Computerised tomogram": 4, "Computerised tomogram head": 4, "Cough": 4, "Erythema": 4, "Fall": 4, "Fatigue": 4, "Magnetic resonance imaging": 4, "Pain": 4, "Troponin I": 4, "Alanine aminotransferase": 3, "Altered state of consciousness": 3, "Anaphylactic shock": 3, "Blood glucose": 3, "Blood lactate dehydrogenase": 3, "Brain natriuretic peptide": 3, "Decreased appetite": 3, "Dehydration": 3, "Epilepsy": 3, "Febrile convulsion": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Investigation": 3, "Muscle spasms": 3, "Swelling": 3, "Arthralgia": 2, "Arthritis": 2, "Asthma": 2, "Blood glucose decreased": 2, "Breath sounds": 2, "Cardiomegaly": 2, "Chest X-ray": 2, "Clonic convulsion": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Epstein-Barr virus test": 2, "Gastroenteritis": 2, "Guillain-Barre syndrome": 2, "Hepatic enzyme": 2, "Hepatic enzyme increased": 2, "Hepatic function abnormal": 2, "Hepatitis": 2, "Muscular weakness": 2, "Neutrophil count": 2, "Neutrophil count decreased": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Parotid gland enlargement": 2, "Platelet count": 2, "Pruritus": 2, "Tenderness": 2, "Ultrasound abdomen": 2, "Urticaria": 2, "Vital signs measurement": 2, "White blood cell count decreased": 2, "X-ray": 2, "Acute abdomen": 1, "Aldolase": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antibody test": 1, "Ascites": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Atrioventricular block second degree": 1, "Auscultation": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase increased": 1, "Blood potassium": 1, "Blood pressure ambulatory decreased": 1, "Blood pressure immeasurable": 1, "Blood sodium": 1, "Blood urea": 1, "CSF test": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cellulitis": 1, "Cerebral calcification": 1, "Chills": 1, "Cholangitis": 1, "Cold sweat": 1, "Collagen disorder": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Computerised tomogram neck": 1, "Conjunctival hyperaemia": 1, "Conjunctivitis": 1, "Contusion": 1, "Crying": 1, "Cyanosis": 1, "Cytomegalovirus test": 1, "Dermatitis exfoliative generalised": 1, "Discomfort": 1, "Dizziness": 1, "Dizziness postural": 1, "Drug eruption": 1, "Ejection fraction": 1, "Electroencephalogram": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Eye pain": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Gastrointestinal hypomotility": 1, "Gaze palsy": 1, "Gingivitis": 1, "Grip strength decreased": 1, "Heart rate increased": 1, "Heart sounds": 1, "Histiocytic necrotising lymphadenitis": 1, "Hunger": 1, "Hyperpyrexia": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypoglycaemia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Idiopathic urticaria": 1, "Immune thrombocytopenia": 1, "Induration": 1, "Kawasaki's disease": 1, "Keratitis": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Meningitis aseptic": 1, "Mouth haemorrhage": 1, "Mumps": 1, "Myelopathy": 1, "Nerve conduction studies": 1, "Neuropathy peripheral": 1, "Neutrophil percentage": 1, "Oedema": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Parotitis": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Petechiae": 1, "Pharyngeal erythema": 1, "Photophobia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pulse abnormal": 1, "Rash": 1, "Reduced facial expression": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "Scan myocardial perfusion": 1, "Scratch": 1, "Sedation": 1, "Sensation of foreign body": 1, "Skin laceration": 1, "Sluggishness": 1, "Somnolence": 1, "Staphylococcal abscess": 1, "Status epilepticus": 1, "Supine position": 1, "Tachycardia": 1, "Thrombocytopenic purpura": 1, "Tonic convulsion": 1, "Tooth injury": 1, "Transient ischaemic attack": 1, "Troponin I increased": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Weight": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FN5988", "histograms": [{"histogram": {"Body temperature": 43, "Pyrexia": 19, "Blood pressure measurement": 18, "Vomiting": 13, "Heart rate": 12, "Seizure": 12, "Blood pressure decreased": 11, "Blood test": 11, "Drug ineffective": 10, "Electrocardiogram": 10, "Oxygen saturation": 10, "Pallor": 9, "C-reactive protein": 8, "Abdominal pain": 7, "COVID-19": 7, "Depressed level of consciousness": 7, "Headache": 7, "Nausea": 7, "SARS-CoV-2 test": 7, "White blood cell count": 7, "Anaphylactic reaction": 6, "Echocardiogram": 6, "Presyncope": 6, "Suspected COVID-19": 6, "Asthenia": 5, "Heart rate decreased": 5, "Loss of consciousness": 5, "Malaise": 5, "Myocarditis": 5, "Aspartate aminotransferase": 4, "Blood creatine phosphokinase": 4, "Bradycardia": 4, "Chest pain": 4, "Computerised tomogram": 4, "Computerised tomogram head": 4, "Cough": 4, "Erythema": 4, "Fall": 4, "Fatigue": 4, "Magnetic resonance imaging": 4, "Pain": 4, "Troponin I": 4, "Alanine aminotransferase": 3, "Altered state of consciousness": 3, "Anaphylactic shock": 3, "Blood glucose": 3, "Blood lactate dehydrogenase": 3, "Brain natriuretic peptide": 3, "Decreased appetite": 3, "Dehydration": 3, "Epilepsy": 3, "Febrile convulsion": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Investigation": 3, "Muscle spasms": 3, "Swelling": 3, "Arthralgia": 2, "Arthritis": 2, "Asthma": 2, "Blood glucose decreased": 2, "Breath sounds": 2, "Cardiomegaly": 2, "Chest X-ray": 2, "Clonic convulsion": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Epstein-Barr virus test": 2, "Gastroenteritis": 2, "Guillain-Barre syndrome": 2, "Hepatic enzyme": 2, "Hepatic enzyme increased": 2, "Hepatic function abnormal": 2, "Hepatitis": 2, "Muscular weakness": 2, "Neutrophil count": 2, "Neutrophil count decreased": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Parotid gland enlargement": 2, "Platelet count": 2, "Pruritus": 2, "Tenderness": 2, "Ultrasound abdomen": 2, "Urticaria": 2, "Vital signs measurement": 2, "White blood cell count decreased": 2, "X-ray": 2, "Acute abdomen": 1, "Aldolase": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antibody test": 1, "Ascites": 1, "Atrioventricular block": 1, "Atrioventricular block complete": 1, "Atrioventricular block second degree": 1, "Auscultation": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase increased": 1, "Blood potassium": 1, "Blood pressure ambulatory decreased": 1, "Blood pressure immeasurable": 1, "Blood sodium": 1, "Blood urea": 1, "CSF test": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Cardiomyopathy": 1, "Cellulitis": 1, "Cerebral calcification": 1, "Chills": 1, "Cholangitis": 1, "Cold sweat": 1, "Collagen disorder": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Computerised tomogram neck": 1, "Conjunctival hyperaemia": 1, "Conjunctivitis": 1, "Contusion": 1, "Crying": 1, "Cyanosis": 1, "Cytomegalovirus test": 1, "Dermatitis exfoliative generalised": 1, "Discomfort": 1, "Dizziness": 1, "Dizziness postural": 1, "Drug eruption": 1, "Ejection fraction": 1, "Electroencephalogram": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Eye pain": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Flushing": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Gastrointestinal hypomotility": 1, "Gaze palsy": 1, "Gingivitis": 1, "Grip strength decreased": 1, "Heart rate increased": 1, "Heart sounds": 1, "Histiocytic necrotising lymphadenitis": 1, "Hunger": 1, "Hyperpyrexia": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypoglycaemia": 1, "Hyporeflexia": 1, "Hypotension": 1, "Idiopathic urticaria": 1, "Immune thrombocytopenia": 1, "Induration": 1, "Kawasaki's disease": 1, "Keratitis": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Meningitis aseptic": 1, "Mouth haemorrhage": 1, "Mumps": 1, "Myelopathy": 1, "Nerve conduction studies": 1, "Neuropathy peripheral": 1, "Neutrophil percentage": 1, "Oedema": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Parotitis": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Petechiae": 1, "Pharyngeal erythema": 1, "Photophobia": 1, "Physical deconditioning": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pulse abnormal": 1, "Rash": 1, "Reduced facial expression": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "Scan myocardial perfusion": 1, "Scratch": 1, "Sedation": 1, "Sensation of foreign body": 1, "Skin laceration": 1, "Sluggishness": 1, "Somnolence": 1, "Staphylococcal abscess": 1, "Status epilepticus": 1, "Supine position": 1, "Tachycardia": 1, "Thrombocytopenic purpura": 1, "Tonic convulsion": 1, "Tooth injury": 1, "Transient ischaemic attack": 1, "Troponin I increased": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Weight": 1, "White blood cell count increased": 1}, "batchcodes": ["FN5988"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN9605.json b/docs/data/histograms/Japan/FN9605.json
index 4b70381cc2d..f06cb46ea7f 100644
--- a/docs/data/histograms/Japan/FN9605.json
+++ b/docs/data/histograms/Japan/FN9605.json
@@ -1 +1 @@
-{"batchcode": "FN9605", "histograms": [{"batchcodes": ["FN9605"], "histogram": {"Body temperature": 37, "Pyrexia": 17, "Blood pressure measurement": 14, "Oxygen saturation": 12, "Heart rate": 10, "Blood pressure decreased": 7, "Electrocardiogram": 7, "Headache": 7, "Myocarditis": 7, "Pallor": 6, "Blood creatine phosphokinase": 5, "Dyspnoea": 5, "Echocardiogram": 5, "Feeling abnormal": 5, "Hypoaesthesia": 5, "Loss of consciousness": 5, "Malaise": 5, "Presyncope": 5, "Seizure": 5, "Tremor": 5, "Asthenia": 4, "Blood creatine phosphokinase MB": 4, "Blood pressure increased": 4, "Blood test": 4, "C-reactive protein": 4, "Chest pain": 4, "Investigation": 4, "Magnetic resonance imaging head": 4, "Nausea": 4, "Syncope": 4, "Urticaria": 4, "Anaphylactic reaction": 3, "Cough": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Fatigue": 3, "Muscular weakness": 3, "Neuropathy peripheral": 3, "Peripheral coldness": 3, "Rash": 3, "SARS-CoV-2 test": 3, "Troponin I": 3, "Vomiting": 3, "Alanine aminotransferase": 2, "Anaphylactic shock": 2, "Aspartate aminotransferase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "COVID-19": 2, "CSF test": 2, "Chest discomfort": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Computerised tomogram head": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Discomfort": 2, "Drug ineffective": 2, "Erythema": 2, "Feeling cold": 2, "Gait disturbance": 2, "Haematuria": 2, "Heart rate increased": 2, "Hyperthermia": 2, "Interstitial lung disease": 2, "Magnetic resonance imaging": 2, "Pain": 2, "Pruritus": 2, "Sudden death": 2, "Tension": 2, "Troponin T": 2, "AST/ALT ratio": 1, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Ammonia": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoantibody test": 1, "Autopsy": 1, "Back pain": 1, "Bilirubin conjugated": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood creatine": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood urea": 1, "Bradycardia": 1, "Brain neoplasm": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Cardiothoracic ratio": 1, "Chest X-ray": 1, "Chills": 1, "Clonic convulsion": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Conjunctival hyperaemia": 1, "Coronary artery stenosis": 1, "Cystoscopy": 1, "Death": 1, "Dermatitis": 1, "Disease recurrence": 1, "Dyskinesia": 1, "Dysphoria": 1, "Dysuria": 1, "Ejection fraction": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Fall": 1, "Febrile convulsion": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Food allergy": 1, "Food refusal": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Glioma": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Hepatic function abnormal": 1, "Hernia": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Hyponatraemia": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incontinence": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Jaundice": 1, "Kawasaki's disease": 1, "Lip oedema": 1, "Lip swelling": 1, "Logorrhoea": 1, "Lymph node pain": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Multisystem inflammatory syndrome in children": 1, "Mycoplasma infection": 1, "Myelitis": 1, "Nasal congestion": 1, "Nerve conduction studies": 1, "Neurological examination": 1, "Neutrophil count": 1, "Nystagmus": 1, "Oculomotor study abnormal": 1, "Oculomucocutaneous syndrome": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Palpitations": 1, "Papule": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Productive cough": 1, "Protein urine": 1, "Pulse abnormal": 1, "Rash macular": 1, "Red blood cell sedimentation rate increased": 1, "Renal impairment": 1, "Respiratory rate": 1, "Romberg test": 1, "SARS-CoV-2 antibody test": 1, "Scratch": 1, "Sedation": 1, "Sensory disturbance": 1, "Stupor": 1, "Swelling": 1, "Tachypnoea": 1, "Transient ischaemic attack": 1, "Trigeminal nerve disorder": 1, "Urinary occult blood": 1, "Urinary sediment": 1, "Urine abnormality": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Weight": 1, "Wheezing": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FN9605", "histograms": [{"histogram": {"Body temperature": 37, "Pyrexia": 17, "Blood pressure measurement": 14, "Oxygen saturation": 12, "Heart rate": 10, "Blood pressure decreased": 7, "Electrocardiogram": 7, "Headache": 7, "Myocarditis": 7, "Pallor": 6, "Blood creatine phosphokinase": 5, "Dyspnoea": 5, "Echocardiogram": 5, "Feeling abnormal": 5, "Hypoaesthesia": 5, "Loss of consciousness": 5, "Malaise": 5, "Presyncope": 5, "Seizure": 5, "Tremor": 5, "Asthenia": 4, "Blood creatine phosphokinase MB": 4, "Blood pressure increased": 4, "Blood test": 4, "C-reactive protein": 4, "Chest pain": 4, "Investigation": 4, "Magnetic resonance imaging head": 4, "Nausea": 4, "Syncope": 4, "Urticaria": 4, "Anaphylactic reaction": 3, "Cough": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Fatigue": 3, "Muscular weakness": 3, "Neuropathy peripheral": 3, "Peripheral coldness": 3, "Rash": 3, "SARS-CoV-2 test": 3, "Troponin I": 3, "Vomiting": 3, "Alanine aminotransferase": 2, "Anaphylactic shock": 2, "Aspartate aminotransferase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure systolic": 2, "COVID-19": 2, "CSF test": 2, "Chest discomfort": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Computerised tomogram head": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Discomfort": 2, "Drug ineffective": 2, "Erythema": 2, "Feeling cold": 2, "Gait disturbance": 2, "Haematuria": 2, "Heart rate increased": 2, "Hyperthermia": 2, "Interstitial lung disease": 2, "Magnetic resonance imaging": 2, "Pain": 2, "Pruritus": 2, "Sudden death": 2, "Tension": 2, "Troponin T": 2, "AST/ALT ratio": 1, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Ammonia": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Autoantibody test": 1, "Autopsy": 1, "Back pain": 1, "Bilirubin conjugated": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood creatine": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood urea": 1, "Bradycardia": 1, "Brain neoplasm": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Cardiothoracic ratio": 1, "Chest X-ray": 1, "Chills": 1, "Clonic convulsion": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Conjunctival hyperaemia": 1, "Coronary artery stenosis": 1, "Cystoscopy": 1, "Death": 1, "Dermatitis": 1, "Disease recurrence": 1, "Dyskinesia": 1, "Dysphoria": 1, "Dysuria": 1, "Ejection fraction": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Fall": 1, "Febrile convulsion": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Food allergy": 1, "Food refusal": 1, "Gamma-glutamyltransferase": 1, "Gastroenteritis": 1, "Gaze palsy": 1, "Glioma": 1, "Glycosylated haemoglobin": 1, "Guillain-Barre syndrome": 1, "Hepatic function abnormal": 1, "Hernia": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Hyponatraemia": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incontinence": 1, "Injected limb mobility decreased": 1, "Insomnia": 1, "Jaundice": 1, "Kawasaki's disease": 1, "Lip oedema": 1, "Lip swelling": 1, "Logorrhoea": 1, "Lymph node pain": 1, "Lymphoma": 1, "Magnetic resonance imaging neck": 1, "Maternal exposure during pregnancy": 1, "Multisystem inflammatory syndrome in children": 1, "Mycoplasma infection": 1, "Myelitis": 1, "Nasal congestion": 1, "Nerve conduction studies": 1, "Neurological examination": 1, "Neutrophil count": 1, "Nystagmus": 1, "Oculomotor study abnormal": 1, "Oculomucocutaneous syndrome": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Palpitations": 1, "Papule": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Productive cough": 1, "Protein urine": 1, "Pulse abnormal": 1, "Rash macular": 1, "Red blood cell sedimentation rate increased": 1, "Renal impairment": 1, "Respiratory rate": 1, "Romberg test": 1, "SARS-CoV-2 antibody test": 1, "Scratch": 1, "Sedation": 1, "Sensory disturbance": 1, "Stupor": 1, "Swelling": 1, "Tachypnoea": 1, "Transient ischaemic attack": 1, "Trigeminal nerve disorder": 1, "Urinary occult blood": 1, "Urinary sediment": 1, "Urine abnormality": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Weight": 1, "Wheezing": 1, "White blood cell count": 1}, "batchcodes": ["FN9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FN9607.json b/docs/data/histograms/Japan/FN9607.json
index ec90f005c8b..7069ffaef83 100644
--- a/docs/data/histograms/Japan/FN9607.json
+++ b/docs/data/histograms/Japan/FN9607.json
@@ -1 +1 @@
-{"batchcode": "FN9607", "histograms": [{"batchcodes": ["FN9607"], "histogram": {"Body temperature": 2, "Angiogram": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Diplopia": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Head discomfort": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "FN9607", "histograms": [{"histogram": {"Body temperature": 2, "Angiogram": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Diplopia": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Head discomfort": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Troponin I": 1}, "batchcodes": ["FN9607"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FO0348.json b/docs/data/histograms/Japan/FO0348.json
index bc96c371613..2ba761278cf 100644
--- a/docs/data/histograms/Japan/FO0348.json
+++ b/docs/data/histograms/Japan/FO0348.json
@@ -1 +1 @@
-{"batchcode": "FO0348", "histograms": [{"batchcodes": ["FO0348"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cold sweat": 1, "Feeling abnormal": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FO0348", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cold sweat": 1, "Feeling abnormal": 1, "Presyncope": 1}, "batchcodes": ["FO0348"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FP0362.json b/docs/data/histograms/Japan/FP0362.json
index 8b746512960..cdb53f02a50 100644
--- a/docs/data/histograms/Japan/FP0362.json
+++ b/docs/data/histograms/Japan/FP0362.json
@@ -1 +1 @@
-{"batchcode": "FP0362", "histograms": [{"batchcodes": ["FP0362"], "histogram": {"Body temperature": 11, "Pyrexia": 6, "Anaphylactic reaction": 3, "Blood pressure measurement": 3, "Cough": 2, "Heart rate": 2, "Oxygen saturation": 2, "Presyncope": 2, "Tonic convulsion": 2, "White blood cell count": 2, "Apraxia": 1, "Bacterial infection": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "Computerised tomogram head": 1, "Convulsion in childhood": 1, "Cubital tunnel syndrome": 1, "Dehydration": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Ear discomfort": 1, "Extremity contracture": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling hot": 1, "Food allergy": 1, "Gastroenteritis": 1, "Haematology test": 1, "Haemophagocytic lymphohistiocytosis": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal congestion": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pallor": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Thirst": 1, "Throat tightness": 1, "Troponin I": 1, "Urticaria": 1, "Vital signs measurement": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FP0362", "histograms": [{"histogram": {"Body temperature": 11, "Pyrexia": 6, "Anaphylactic reaction": 3, "Blood pressure measurement": 3, "Cough": 2, "Heart rate": 2, "Oxygen saturation": 2, "Presyncope": 2, "Tonic convulsion": 2, "White blood cell count": 2, "Apraxia": 1, "Bacterial infection": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "Computerised tomogram head": 1, "Convulsion in childhood": 1, "Cubital tunnel syndrome": 1, "Dehydration": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Ear discomfort": 1, "Extremity contracture": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling hot": 1, "Food allergy": 1, "Gastroenteritis": 1, "Haematology test": 1, "Haemophagocytic lymphohistiocytosis": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal congestion": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pallor": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Thirst": 1, "Throat tightness": 1, "Troponin I": 1, "Urticaria": 1, "Vital signs measurement": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["FP0362"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FP2163.json b/docs/data/histograms/Japan/FP2163.json
index 64d014e59e2..b2c5758df87 100644
--- a/docs/data/histograms/Japan/FP2163.json
+++ b/docs/data/histograms/Japan/FP2163.json
@@ -1 +1 @@
-{"batchcode": "FP2163", "histograms": [{"batchcodes": ["FP2163"], "histogram": {"Computerised tomogram abdomen": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Ovarian cyst": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FP2163", "histograms": [{"histogram": {"Computerised tomogram abdomen": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Ovarian cyst": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FP2163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FP8544.json b/docs/data/histograms/Japan/FP8544.json
index 625d1b33652..c476a4afd73 100644
--- a/docs/data/histograms/Japan/FP8544.json
+++ b/docs/data/histograms/Japan/FP8544.json
@@ -1 +1 @@
-{"batchcode": "FP8544", "histograms": [{"batchcodes": ["FP8544"], "histogram": {"Body temperature": 8, "Pyrexia": 3, "Blood lactate dehydrogenase": 2, "Cardio-respiratory arrest": 2, "Rash": 2, "Acute respiratory failure": 1, "Blood alkaline phosphatase": 1, "Bronchiectasis": 1, "C-reactive protein": 1, "Cardiomyopathy": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Diffuse alveolar damage": 1, "Disease recurrence": 1, "Heart rate": 1, "Herpes ophthalmic": 1, "Histiocytic necrotising lymphadenitis": 1, "Immune thrombocytopenia": 1, "Interleukin-2 receptor assay": 1, "Interstitial lung disease": 1, "Intra-abdominal haemangioma": 1, "Investigation": 1, "KL-6": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Moaning": 1, "Myocarditis": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Platelet count": 1, "Rales": 1, "Red blood cell sedimentation rate": 1, "Sarcoidosis": 1, "Scab": 1, "Serum ferritin": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Ultrasound scan": 1, "Urticaria chronic": 1, "Vasculitis": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8544", "histograms": [{"histogram": {"Body temperature": 8, "Pyrexia": 3, "Blood lactate dehydrogenase": 2, "Cardio-respiratory arrest": 2, "Rash": 2, "Acute respiratory failure": 1, "Blood alkaline phosphatase": 1, "Bronchiectasis": 1, "C-reactive protein": 1, "Cardiomyopathy": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Diffuse alveolar damage": 1, "Disease recurrence": 1, "Heart rate": 1, "Herpes ophthalmic": 1, "Histiocytic necrotising lymphadenitis": 1, "Immune thrombocytopenia": 1, "Interleukin-2 receptor assay": 1, "Interstitial lung disease": 1, "Intra-abdominal haemangioma": 1, "Investigation": 1, "KL-6": 1, "Lung opacity": 1, "Lymphadenopathy": 1, "Moaning": 1, "Myocarditis": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Platelet count": 1, "Rales": 1, "Red blood cell sedimentation rate": 1, "Sarcoidosis": 1, "Scab": 1, "Serum ferritin": 1, "Swelling": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Ultrasound scan": 1, "Urticaria chronic": 1, "Vasculitis": 1, "White blood cell count": 1}, "batchcodes": ["FP8544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FP8795.json b/docs/data/histograms/Japan/FP8795.json
index e66f5b6936c..200f7188347 100644
--- a/docs/data/histograms/Japan/FP8795.json
+++ b/docs/data/histograms/Japan/FP8795.json
@@ -1 +1 @@
-{"batchcode": "FP8795", "histograms": [{"batchcodes": ["FP8795"], "histogram": {"Body temperature": 15, "Pyrexia": 5, "Anaphylactic reaction": 4, "C-reactive protein": 4, "Cough": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Feeling abnormal": 3, "Investigation": 3, "Pruritus": 3, "White blood cell count": 3, "Arthralgia": 2, "Blood creatine phosphokinase": 2, "Blood test": 2, "Computerised tomogram": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Erythema": 2, "Feeling cold": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Oedema peripheral": 2, "Pain in extremity": 2, "Presyncope": 2, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Angiotensin converting enzyme": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Autoimmune encephalopathy": 1, "Axillary pain": 1, "Back pain": 1, "Barre test": 1, "Biopsy lung": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram head": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Drug ineffective": 1, "Dysphagia": 1, "Dysphoria": 1, "Encephalopathy": 1, "Eyelid ptosis": 1, "Fall": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "Grip strength decreased": 1, "Hashimoto's encephalopathy": 1, "Headache": 1, "Heart rate": 1, "Histiocytic necrotising lymphadenitis": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inflammation": 1, "Interstitial lung disease": 1, "KL-6": 1, "Kawasaki's disease": 1, "Liver disorder": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Malaise": 1, "Muscle tightness": 1, "Myalgia": 1, "Myasthenia gravis crisis": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nausea": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Photopsia": 1, "Platelet count": 1, "Pollakiuria": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test": 1, "Sensory disturbance": 1, "Skin laceration": 1, "Swelling of eyelid": 1, "Troponin T": 1, "Urinary retention": 1, "Urine output decreased": 1, "Urticaria": 1, "Vaccination site pain": 1, "Ventricular hypokinesia": 1, "Vital signs measurement": 1, "Wheezing": 1, "Yersinia infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8795", "histograms": [{"histogram": {"Body temperature": 15, "Pyrexia": 5, "Anaphylactic reaction": 4, "C-reactive protein": 4, "Cough": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Feeling abnormal": 3, "Investigation": 3, "Pruritus": 3, "White blood cell count": 3, "Arthralgia": 2, "Blood creatine phosphokinase": 2, "Blood test": 2, "Computerised tomogram": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Erythema": 2, "Feeling cold": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Oedema peripheral": 2, "Pain in extremity": 2, "Presyncope": 2, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Angiotensin converting enzyme": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Autoimmune encephalopathy": 1, "Axillary pain": 1, "Back pain": 1, "Barre test": 1, "Biopsy lung": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram head": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Drug ineffective": 1, "Dysphagia": 1, "Dysphoria": 1, "Encephalopathy": 1, "Eyelid ptosis": 1, "Fall": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "Grip strength decreased": 1, "Hashimoto's encephalopathy": 1, "Headache": 1, "Heart rate": 1, "Histiocytic necrotising lymphadenitis": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inflammation": 1, "Interstitial lung disease": 1, "KL-6": 1, "Kawasaki's disease": 1, "Liver disorder": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Malaise": 1, "Muscle tightness": 1, "Myalgia": 1, "Myasthenia gravis crisis": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nausea": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Photopsia": 1, "Platelet count": 1, "Pollakiuria": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test": 1, "Sensory disturbance": 1, "Skin laceration": 1, "Swelling of eyelid": 1, "Troponin T": 1, "Urinary retention": 1, "Urine output decreased": 1, "Urticaria": 1, "Vaccination site pain": 1, "Ventricular hypokinesia": 1, "Vital signs measurement": 1, "Wheezing": 1, "Yersinia infection": 1}, "batchcodes": ["FP8795"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FP9647.json b/docs/data/histograms/Japan/FP9647.json
index 44b6800d921..d3c84d656a3 100644
--- a/docs/data/histograms/Japan/FP9647.json
+++ b/docs/data/histograms/Japan/FP9647.json
@@ -1 +1 @@
-{"batchcode": "FP9647", "histograms": [{"batchcodes": ["FP9647"], "histogram": {"Body temperature": 38, "Pyrexia": 20, "Blood pressure measurement": 18, "Heart rate": 11, "Nausea": 11, "C-reactive protein": 10, "Oxygen saturation": 10, "Dizziness": 9, "Hypoaesthesia": 8, "Investigation": 8, "Myocarditis": 7, "White blood cell count": 7, "Blood pressure decreased": 6, "Depressed level of consciousness": 6, "Headache": 6, "Magnetic resonance imaging head": 6, "Muscular weakness": 6, "Pain in extremity": 6, "Blood creatine phosphokinase": 5, "Blood test": 5, "Chest X-ray": 5, "Chest pain": 5, "Coma scale": 5, "Echocardiogram": 5, "Neurological examination": 5, "SARS-CoV-2 test": 5, "Seizure": 5, "Abdominal pain": 4, "Alanine aminotransferase": 4, "Anaphylactic reaction": 4, "Aspartate aminotransferase": 4, "Asthenia": 4, "Blood lactate dehydrogenase": 4, "Computerised tomogram head": 4, "Electrocardiogram": 4, "Loss of consciousness": 4, "Vaccination site pain": 4, "Altered state of consciousness": 3, "Back pain": 3, "C-reactive protein increased": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Dyspnoea": 3, "Inflammation": 3, "Interchange of vaccine products": 3, "Magnetic resonance imaging": 3, "Malaise": 3, "Mobility decreased": 3, "Movement disorder": 3, "Paraesthesia": 3, "Pericarditis": 3, "Presyncope": 3, "Vomiting": 3, "Abnormal behaviour": 2, "Activated partial thromboplastin time": 2, "Arthralgia": 2, "Blood creatine phosphokinase MB": 2, "Blood pressure increased": 2, "Blood urea": 2, "Cardiac dysfunction": 2, "Cardio-respiratory arrest": 2, "Cerebral haemorrhage": 2, "Circulatory collapse": 2, "Coagulation test": 2, "Cold sweat": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Cough": 2, "Disorientation": 2, "Dysaesthesia": 2, "Dysphoria": 2, "Encephalopathy": 2, "Facial paralysis": 2, "Fall": 2, "Feeding disorder": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "Fibrin degradation products": 2, "Guillain-Barre syndrome": 2, "Haemoglobin": 2, "Hepatic function abnormal": 2, "Hypertension": 2, "IIIrd nerve paralysis": 2, "Incontinence": 2, "Limb discomfort": 2, "Liver disorder": 2, "Monoplegia": 2, "Neuropathy peripheral": 2, "Pallor": 2, "Platelet count": 2, "Respiratory arrest": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Somnolence": 2, "Sudden death": 2, "Troponin T": 2, "Urine analysis": 2, "Vision blurred": 2, "Visual impairment": 2, "Vital signs measurement": 2, "Acoustic stimulation tests": 1, "Adrenocortical insufficiency acute": 1, "Alanine aminotransferase increased": 1, "Alpha 1 foetoprotein": 1, "Alpha 1 foetoprotein increased": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Angiopathy": 1, "Anorectal disorder": 1, "Antibody test": 1, "Anxiety": 1, "Apnoea": 1, "Arteritis": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Auscultation": 1, "Autoantibody test": 1, "Autopsy": 1, "Barre test": 1, "Bilirubin conjugated": 1, "Bladder disorder": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood corticotrophin": 1, "Blood cortisol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood lactate dehydrogenase increased": 1, "Blood osmolarity": 1, "Blood potassium": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Bone marrow disorder": 1, "Bradyphrenia": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Breast swelling": 1, "C-reactive protein abnormal": 1, "CSF protein": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricle dilatation": 1, "Chills": 1, "Cholangitis": 1, "Chromaturia": 1, "Cognitive disorder": 1, "Complement factor increased": 1, "Computerised tomogram abdomen": 1, "Contrast-enhanced magnetic resonance venography": 1, "Contusion": 1, "Cranial nerve palsies multiple": 1, "Creatinine renal clearance": 1, "Cyanosis": 1, "Deafness": 1, "Death": 1, "Decreased activity": 1, "Dehydration": 1, "Delirium": 1, "Diarrhoea": 1, "Diplopia": 1, "Disease progression": 1, "Ear discomfort": 1, "Eating disorder": 1, "Electrocardiogram ST segment elevation": 1, "Encephalitis": 1, "Endolymphatic hydrops": 1, "Epilepsy": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flank pain": 1, "Full blood count": 1, "Gait disturbance": 1, "Gastric haemorrhage": 1, "Gastrointestinal haemorrhage": 1, "General physical condition abnormal": 1, "General physical health deterioration": 1, "Glomerulonephritis chronic": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemodynamic instability": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhagic infarction": 1, "Heart rate decreased": 1, "Hemiplegia": 1, "Hepatitis acute": 1, "Hyperaesthesia": 1, "Hyperhidrosis": 1, "Hyperreflexia": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Hypopnoea": 1, "Hypoxia": 1, "Immune-mediated encephalitis": 1, "Immune-mediated encephalopathy": 1, "Insomnia": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Judgement impaired": 1, "KL-6": 1, "KL-6 increased": 1, "Laboratory test": 1, "Lung disorder": 1, "Lung infiltration": 1, "Lung opacity": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging heart": 1, "Malnutrition": 1, "Maternal exposure timing unspecified": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Meniere's disease": 1, "Mental impairment": 1, "Moaning": 1, "Motor dysfunction": 1, "Mouth breathing": 1, "Multiple organ dysfunction syndrome": 1, "Muscle contracture": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Mydriasis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker increased": 1, "Neurologic neglect syndrome": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Occult blood": 1, "Oropharyngeal pain": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Paralysis recurrent laryngeal nerve": 1, "Paraplegia": 1, "Paresis": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleurisy": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Portogram": 1, "Postresuscitation encephalopathy": 1, "Product administered to patient of inappropriate age": 1, "Protein total": 1, "Protein urine": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary fibrosis": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pupillary reflex impaired": 1, "Rales": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal disorder": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Retinal haemorrhage": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Rhinorrhoea": 1, "Sedation": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Shock haemorrhagic": 1, "Speech disorder": 1, "Spinal stenosis": 1, "Sudden hearing loss": 1, "Superior sagittal sinus thrombosis": 1, "Surfactant protein": 1, "Surfactant protein increased": 1, "Syncope": 1, "Tachycardia": 1, "Temperature intolerance": 1, "Therapy non-responder": 1, "Thrombocytopenic purpura": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroxine free": 1, "Tinnitus": 1, "Toxic encephalopathy": 1, "Tremor": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Urinary incontinence": 1, "Urine osmolarity": 1, "Urine sodium": 1, "VIth nerve paralysis": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Venous thrombosis": 1, "Ventilation/perfusion scan": 1, "Ventricular hypokinesia": 1, "Walking disability": 1, "White blood cell count increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FP9647", "histograms": [{"histogram": {"Body temperature": 38, "Pyrexia": 20, "Blood pressure measurement": 18, "Heart rate": 11, "Nausea": 11, "C-reactive protein": 10, "Oxygen saturation": 10, "Dizziness": 9, "Hypoaesthesia": 8, "Investigation": 8, "Myocarditis": 7, "White blood cell count": 7, "Blood pressure decreased": 6, "Depressed level of consciousness": 6, "Headache": 6, "Magnetic resonance imaging head": 6, "Muscular weakness": 6, "Pain in extremity": 6, "Blood creatine phosphokinase": 5, "Blood test": 5, "Chest X-ray": 5, "Chest pain": 5, "Coma scale": 5, "Echocardiogram": 5, "Neurological examination": 5, "SARS-CoV-2 test": 5, "Seizure": 5, "Abdominal pain": 4, "Alanine aminotransferase": 4, "Anaphylactic reaction": 4, "Aspartate aminotransferase": 4, "Asthenia": 4, "Blood lactate dehydrogenase": 4, "Computerised tomogram head": 4, "Electrocardiogram": 4, "Loss of consciousness": 4, "Vaccination site pain": 4, "Altered state of consciousness": 3, "Back pain": 3, "C-reactive protein increased": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Dyspnoea": 3, "Inflammation": 3, "Interchange of vaccine products": 3, "Magnetic resonance imaging": 3, "Malaise": 3, "Mobility decreased": 3, "Movement disorder": 3, "Paraesthesia": 3, "Pericarditis": 3, "Presyncope": 3, "Vomiting": 3, "Abnormal behaviour": 2, "Activated partial thromboplastin time": 2, "Arthralgia": 2, "Blood creatine phosphokinase MB": 2, "Blood pressure increased": 2, "Blood urea": 2, "Cardiac dysfunction": 2, "Cardio-respiratory arrest": 2, "Cerebral haemorrhage": 2, "Circulatory collapse": 2, "Coagulation test": 2, "Cold sweat": 2, "Computerised tomogram thorax": 2, "Condition aggravated": 2, "Cough": 2, "Disorientation": 2, "Dysaesthesia": 2, "Dysphoria": 2, "Encephalopathy": 2, "Facial paralysis": 2, "Fall": 2, "Feeding disorder": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "Fibrin degradation products": 2, "Guillain-Barre syndrome": 2, "Haemoglobin": 2, "Hepatic function abnormal": 2, "Hypertension": 2, "IIIrd nerve paralysis": 2, "Incontinence": 2, "Limb discomfort": 2, "Liver disorder": 2, "Monoplegia": 2, "Neuropathy peripheral": 2, "Pallor": 2, "Platelet count": 2, "Respiratory arrest": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Somnolence": 2, "Sudden death": 2, "Troponin T": 2, "Urine analysis": 2, "Vision blurred": 2, "Visual impairment": 2, "Vital signs measurement": 2, "Acoustic stimulation tests": 1, "Adrenocortical insufficiency acute": 1, "Alanine aminotransferase increased": 1, "Alpha 1 foetoprotein": 1, "Alpha 1 foetoprotein increased": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Angiopathy": 1, "Anorectal disorder": 1, "Antibody test": 1, "Anxiety": 1, "Apnoea": 1, "Arteritis": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Auscultation": 1, "Autoantibody test": 1, "Autopsy": 1, "Barre test": 1, "Bilirubin conjugated": 1, "Bladder disorder": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood corticotrophin": 1, "Blood cortisol": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood glucose": 1, "Blood lactate dehydrogenase increased": 1, "Blood osmolarity": 1, "Blood potassium": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Bone marrow disorder": 1, "Bradyphrenia": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Breast swelling": 1, "C-reactive protein abnormal": 1, "CSF protein": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cerebral venous sinus thrombosis": 1, "Cerebral ventricle dilatation": 1, "Chills": 1, "Cholangitis": 1, "Chromaturia": 1, "Cognitive disorder": 1, "Complement factor increased": 1, "Computerised tomogram abdomen": 1, "Contrast-enhanced magnetic resonance venography": 1, "Contusion": 1, "Cranial nerve palsies multiple": 1, "Creatinine renal clearance": 1, "Cyanosis": 1, "Deafness": 1, "Death": 1, "Decreased activity": 1, "Dehydration": 1, "Delirium": 1, "Diarrhoea": 1, "Diplopia": 1, "Disease progression": 1, "Ear discomfort": 1, "Eating disorder": 1, "Electrocardiogram ST segment elevation": 1, "Encephalitis": 1, "Endolymphatic hydrops": 1, "Epilepsy": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flank pain": 1, "Full blood count": 1, "Gait disturbance": 1, "Gastric haemorrhage": 1, "Gastrointestinal haemorrhage": 1, "General physical condition abnormal": 1, "General physical health deterioration": 1, "Glomerulonephritis chronic": 1, "Glycosylated haemoglobin": 1, "Grip strength": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemodynamic instability": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhagic infarction": 1, "Heart rate decreased": 1, "Hemiplegia": 1, "Hepatitis acute": 1, "Hyperaesthesia": 1, "Hyperhidrosis": 1, "Hyperreflexia": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Hypopnoea": 1, "Hypoxia": 1, "Immune-mediated encephalitis": 1, "Immune-mediated encephalopathy": 1, "Insomnia": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Judgement impaired": 1, "KL-6": 1, "KL-6 increased": 1, "Laboratory test": 1, "Lung disorder": 1, "Lung infiltration": 1, "Lung opacity": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging heart": 1, "Malnutrition": 1, "Maternal exposure timing unspecified": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Meniere's disease": 1, "Mental impairment": 1, "Moaning": 1, "Motor dysfunction": 1, "Mouth breathing": 1, "Multiple organ dysfunction syndrome": 1, "Muscle contracture": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Mydriasis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker increased": 1, "Neurologic neglect syndrome": 1, "Neuromyelitis optica spectrum disorder": 1, "Neutrophil count": 1, "Occult blood": 1, "Oropharyngeal pain": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Paralysis recurrent laryngeal nerve": 1, "Paraplegia": 1, "Paresis": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleurisy": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Portogram": 1, "Postresuscitation encephalopathy": 1, "Product administered to patient of inappropriate age": 1, "Protein total": 1, "Protein urine": 1, "Proteinuria": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary fibrosis": 1, "Pulse abnormal": 1, "Pupillary light reflex tests": 1, "Pupillary reflex impaired": 1, "Rales": 1, "Rash": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal disorder": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Retinal haemorrhage": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Rhinorrhoea": 1, "Sedation": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Shock haemorrhagic": 1, "Speech disorder": 1, "Spinal stenosis": 1, "Sudden hearing loss": 1, "Superior sagittal sinus thrombosis": 1, "Surfactant protein": 1, "Surfactant protein increased": 1, "Syncope": 1, "Tachycardia": 1, "Temperature intolerance": 1, "Therapy non-responder": 1, "Thrombocytopenic purpura": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroxine free": 1, "Tinnitus": 1, "Toxic encephalopathy": 1, "Tremor": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Urinary incontinence": 1, "Urine osmolarity": 1, "Urine sodium": 1, "VIth nerve paralysis": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Venous thrombosis": 1, "Ventilation/perfusion scan": 1, "Ventricular hypokinesia": 1, "Walking disability": 1, "White blood cell count increased": 1, "X-ray": 1}, "batchcodes": ["FP9647"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FP9654.json b/docs/data/histograms/Japan/FP9654.json
index 234f1be4cb0..8d2b4696a9f 100644
--- a/docs/data/histograms/Japan/FP9654.json
+++ b/docs/data/histograms/Japan/FP9654.json
@@ -1 +1 @@
-{"batchcode": "FP9654", "histograms": [{"batchcodes": ["FP9654"], "histogram": {"Body temperature": 30, "Pyrexia": 11, "Oxygen saturation": 6, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Blood pressure decreased": 4, "C-reactive protein": 4, "Dyspnoea": 4, "Heart rate": 4, "Magnetic resonance imaging": 4, "Malaise": 4, "Arrhythmia": 3, "Cardio-respiratory arrest": 3, "Computerised tomogram": 3, "Cough": 3, "Electrocardiogram": 3, "Interchange of vaccine products": 3, "Interstitial lung disease": 3, "Myalgia": 3, "Pain": 3, "Wrong product administered": 3, "X-ray": 3, "Anaphylactic shock": 2, "Blood test": 2, "COVID-19": 2, "Cerebral infarction": 2, "Chest pain": 2, "Condition aggravated": 2, "Depressed level of consciousness": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Fibrin D dimer": 2, "Haemorrhage": 2, "Internal haemorrhage": 2, "Jugular vein thrombosis": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Neck pain": 2, "Neuropathy peripheral": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Pharyngeal oedema": 2, "Productive cough": 2, "Respiratory failure": 2, "Syncope": 2, "Ultrasound scan": 2, "Urticaria": 2, "Vaccination site swelling": 2, "Vomiting": 2, "White blood cell count": 2, "AST/ALT ratio": 1, "Abnormal behaviour": 1, "Acute disseminated encephalomyelitis": 1, "Akathisia": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Amylase": 1, "Anti-aquaporin-4 antibody": 1, "Aphasia": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Axillary vein thrombosis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood immunoglobulin G": 1, "Bradycardia": 1, "Bronchitis": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Central nervous system lesion": 1, "Chest discomfort": 1, "Choking sensation": 1, "Chronic obstructive pulmonary disease": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram coronary artery": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Coronavirus test": 1, "Crepitations": 1, "Death": 1, "Disseminated intravascular coagulation": 1, "Dyslalia": 1, "Dysstasia": 1, "Echocardiogram": 1, "Eczema": 1, "Embolic stroke": 1, "Fixed eruption": 1, "General physical health deterioration": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Heart rate decreased": 1, "Hemiplegia": 1, "Histiocytic necrotising lymphadenitis": 1, "Hypercapnia": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoxia": 1, "Idiopathic pulmonary fibrosis": 1, "Inflammation": 1, "Insomnia": 1, "Joint stiffness": 1, "Liver disorder": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nausea": 1, "Neck mass": 1, "Nephrotic syndrome": 1, "Ocular hyperaemia": 1, "Orthopnoea": 1, "PCO2": 1, "PO2": 1, "Palpitations": 1, "Pancreatitis": 1, "Paroxysmal arrhythmia": 1, "Photophobia": 1, "Physical deconditioning": 1, "Platelet count": 1, "Presyncope": 1, "Protein urine": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Skin discolouration": 1, "Skin oedema": 1, "Subclavian vein thrombosis": 1, "Sudden death": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Thrombotic cerebral infarction": 1, "Transverse sinus thrombosis": 1, "Tremor": 1, "Troponin I": 1, "Uveitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Ventricular extrasystoles": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FP9654", "histograms": [{"histogram": {"Body temperature": 30, "Pyrexia": 11, "Oxygen saturation": 6, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Blood pressure decreased": 4, "C-reactive protein": 4, "Dyspnoea": 4, "Heart rate": 4, "Magnetic resonance imaging": 4, "Malaise": 4, "Arrhythmia": 3, "Cardio-respiratory arrest": 3, "Computerised tomogram": 3, "Cough": 3, "Electrocardiogram": 3, "Interchange of vaccine products": 3, "Interstitial lung disease": 3, "Myalgia": 3, "Pain": 3, "Wrong product administered": 3, "X-ray": 3, "Anaphylactic shock": 2, "Blood test": 2, "COVID-19": 2, "Cerebral infarction": 2, "Chest pain": 2, "Condition aggravated": 2, "Depressed level of consciousness": 2, "Disease recurrence": 2, "Drug ineffective": 2, "Fibrin D dimer": 2, "Haemorrhage": 2, "Internal haemorrhage": 2, "Jugular vein thrombosis": 2, "Loss of consciousness": 2, "Myocarditis": 2, "Neck pain": 2, "Neuropathy peripheral": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Pharyngeal oedema": 2, "Productive cough": 2, "Respiratory failure": 2, "Syncope": 2, "Ultrasound scan": 2, "Urticaria": 2, "Vaccination site swelling": 2, "Vomiting": 2, "White blood cell count": 2, "AST/ALT ratio": 1, "Abnormal behaviour": 1, "Acute disseminated encephalomyelitis": 1, "Akathisia": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Amylase": 1, "Anti-aquaporin-4 antibody": 1, "Aphasia": 1, "Aspartate aminotransferase increased": 1, "Asthma": 1, "Atrioventricular block complete": 1, "Axillary vein thrombosis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood immunoglobulin G": 1, "Bradycardia": 1, "Bronchitis": 1, "COVID-19 immunisation": 1, "CSF cell count": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF protein": 1, "CSF protein increased": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Central nervous system lesion": 1, "Chest discomfort": 1, "Choking sensation": 1, "Chronic obstructive pulmonary disease": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram coronary artery": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Coronavirus test": 1, "Crepitations": 1, "Death": 1, "Disseminated intravascular coagulation": 1, "Dyslalia": 1, "Dysstasia": 1, "Echocardiogram": 1, "Eczema": 1, "Embolic stroke": 1, "Fixed eruption": 1, "General physical health deterioration": 1, "Guillain-Barre syndrome": 1, "Haemoglobin": 1, "Haemorrhage subcutaneous": 1, "Headache": 1, "Heart rate decreased": 1, "Hemiplegia": 1, "Histiocytic necrotising lymphadenitis": 1, "Hypercapnia": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoxia": 1, "Idiopathic pulmonary fibrosis": 1, "Inflammation": 1, "Insomnia": 1, "Joint stiffness": 1, "Liver disorder": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Movement disorder": 1, "Multiple organ dysfunction syndrome": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nausea": 1, "Neck mass": 1, "Nephrotic syndrome": 1, "Ocular hyperaemia": 1, "Orthopnoea": 1, "PCO2": 1, "PO2": 1, "Palpitations": 1, "Pancreatitis": 1, "Paroxysmal arrhythmia": 1, "Photophobia": 1, "Physical deconditioning": 1, "Platelet count": 1, "Presyncope": 1, "Protein urine": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Skin discolouration": 1, "Skin oedema": 1, "Subclavian vein thrombosis": 1, "Sudden death": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Thrombotic cerebral infarction": 1, "Transverse sinus thrombosis": 1, "Tremor": 1, "Troponin I": 1, "Uveitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Ventricular extrasystoles": 1, "Wheezing": 1}, "batchcodes": ["FP9654"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FR1790.json b/docs/data/histograms/Japan/FR1790.json
index 5b3a40aa2b4..e44369c4fc8 100644
--- a/docs/data/histograms/Japan/FR1790.json
+++ b/docs/data/histograms/Japan/FR1790.json
@@ -1 +1 @@
-{"batchcode": "FR1790", "histograms": [{"batchcodes": ["FR1790"], "histogram": {"Body temperature": 15, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Dyspnoea": 4, "Erythema": 4, "Feeling abnormal": 4, "Blood test": 3, "Computerised tomogram": 3, "Death": 3, "Heart rate": 3, "Malaise": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Pyrexia": 3, "Abdominal pain": 2, "C-reactive protein": 2, "Chest pain": 2, "Electrocardiogram": 2, "Inflammation": 2, "Investigation": 2, "Muscular weakness": 2, "Myocarditis": 2, "Nausea": 2, "Palpitations": 2, "Pleural effusion": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Ultrasound scan": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Alopecia": 1, "Anal incontinence": 1, "Arthralgia": 1, "Ascites": 1, "Asphyxia": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Biopsy liver": 1, "Biopsy skin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Breath sounds": 1, "Breath sounds abnormal": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF test": 1, "Cachexia": 1, "Cardiac arrest": 1, "Cellulitis": 1, "Chest X-ray": 1, "Clonic convulsion": 1, "Computerised tomogram coronary artery": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Decreased appetite": 1, "Dedifferentiated liposarcoma": 1, "Deep vein thrombosis": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Drug ineffective": 1, "Ear pain": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Gait disturbance": 1, "Gout": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate increased": 1, "Hepatitis acute": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoxia": 1, "Interchange of vaccine products": 1, "Internal haemorrhage": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Mydriasis": 1, "Neoplasm malignant": 1, "Oedema": 1, "Oedema peripheral": 1, "Oxygen saturation immeasurable": 1, "Pallor": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pleural fluid analysis": 1, "Pulse absent": 1, "Pupillary reflex impaired": 1, "Red blood cell count": 1, "Respiration abnormal": 1, "Respiratory arrest": 1, "Rhinorrhoea": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Soliloquy": 1, "Swelling": 1, "Tenderness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroiditis acute": 1, "Toxic skin eruption": 1, "Toxicity to various agents": 1, "Troponin I": 1, "Vaccination site pain": 1, "Vital signs measurement": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FR1790", "histograms": [{"histogram": {"Body temperature": 15, "Blood pressure measurement": 5, "Anaphylactic reaction": 4, "Dyspnoea": 4, "Erythema": 4, "Feeling abnormal": 4, "Blood test": 3, "Computerised tomogram": 3, "Death": 3, "Heart rate": 3, "Malaise": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Pyrexia": 3, "Abdominal pain": 2, "C-reactive protein": 2, "Chest pain": 2, "Electrocardiogram": 2, "Inflammation": 2, "Investigation": 2, "Muscular weakness": 2, "Myocarditis": 2, "Nausea": 2, "Palpitations": 2, "Pleural effusion": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Ultrasound scan": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Alopecia": 1, "Anal incontinence": 1, "Arthralgia": 1, "Ascites": 1, "Asphyxia": 1, "Auscultation": 1, "Autoimmune hepatitis": 1, "Biopsy liver": 1, "Biopsy skin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Breath sounds": 1, "Breath sounds abnormal": 1, "C-reactive protein increased": 1, "COVID-19": 1, "CSF test": 1, "Cachexia": 1, "Cardiac arrest": 1, "Cellulitis": 1, "Chest X-ray": 1, "Clonic convulsion": 1, "Computerised tomogram coronary artery": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Decreased appetite": 1, "Dedifferentiated liposarcoma": 1, "Deep vein thrombosis": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Drug ineffective": 1, "Ear pain": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Gait disturbance": 1, "Gout": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Heart rate increased": 1, "Hepatitis acute": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoxia": 1, "Interchange of vaccine products": 1, "Internal haemorrhage": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Mydriasis": 1, "Neoplasm malignant": 1, "Oedema": 1, "Oedema peripheral": 1, "Oxygen saturation immeasurable": 1, "Pallor": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pleural fluid analysis": 1, "Pulse absent": 1, "Pupillary reflex impaired": 1, "Red blood cell count": 1, "Respiration abnormal": 1, "Respiratory arrest": 1, "Rhinorrhoea": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Soliloquy": 1, "Swelling": 1, "Tenderness": 1, "Thrombosis": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Thyroiditis acute": 1, "Toxic skin eruption": 1, "Toxicity to various agents": 1, "Troponin I": 1, "Vaccination site pain": 1, "Vital signs measurement": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "Wrong product administered": 1}, "batchcodes": ["FR1790"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FR4267.json b/docs/data/histograms/Japan/FR4267.json
index 344a7b581a8..a46b57b7548 100644
--- a/docs/data/histograms/Japan/FR4267.json
+++ b/docs/data/histograms/Japan/FR4267.json
@@ -1 +1 @@
-{"batchcode": "FR4267", "histograms": [{"batchcodes": ["FR4267"], "histogram": {"Body temperature": 4, "Pyrexia": 3, "COVID-19": 2, "Drug ineffective": 2, "Seizure": 2, "Altered state of consciousness": 1, "Auscultation": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Cardiac failure acute": 1, "Computerised tomogram head": 1, "Convulsion in childhood": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Epilepsy": 1, "Febrile convulsion": 1, "Gait disturbance": 1, "Haemodialysis": 1, "Hepatorenal syndrome": 1, "Hyperpyrexia": 1, "Hypophagia": 1, "Intracranial hypotension": 1, "Investigation": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Myalgia": 1, "Mydriasis": 1, "Nervous system disorder": 1, "Pain": 1, "Pupillary reflex impaired": 1, "Renal disorder": 1, "Sepsis": 1, "Shock": 1, "Tachycardia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FR4267", "histograms": [{"histogram": {"Body temperature": 4, "Pyrexia": 3, "COVID-19": 2, "Drug ineffective": 2, "Seizure": 2, "Altered state of consciousness": 1, "Auscultation": 1, "Brain herniation": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Cardiac failure acute": 1, "Computerised tomogram head": 1, "Convulsion in childhood": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Encephalitis": 1, "Encephalopathy": 1, "Epilepsy": 1, "Febrile convulsion": 1, "Gait disturbance": 1, "Haemodialysis": 1, "Hepatorenal syndrome": 1, "Hyperpyrexia": 1, "Hypophagia": 1, "Intracranial hypotension": 1, "Investigation": 1, "Multiple organ dysfunction syndrome": 1, "Muscle spasms": 1, "Myalgia": 1, "Mydriasis": 1, "Nervous system disorder": 1, "Pain": 1, "Pupillary reflex impaired": 1, "Renal disorder": 1, "Sepsis": 1, "Shock": 1, "Tachycardia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FR4267"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FR4768.json b/docs/data/histograms/Japan/FR4768.json
index 3de5ce79376..4d01a3e1ac2 100644
--- a/docs/data/histograms/Japan/FR4768.json
+++ b/docs/data/histograms/Japan/FR4768.json
@@ -1 +1 @@
-{"batchcode": "FR4768", "histograms": [{"batchcodes": ["3005288", "FR4768"], "histogram": {"Collagen disorder": 1, "Depression": 1, "Grip strength decreased": 1, "Illusion": 1, "Impaired work ability": 1, "Musculoskeletal stiffness": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nodal osteoarthritis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sensory disturbance": 1}}, {"batchcodes": ["FR4768"], "histogram": {"Body temperature": 31, "Oxygen saturation": 12, "Blood pressure measurement": 11, "Heart rate": 10, "Pyrexia": 9, "Arthralgia": 7, "Computerised tomogram": 6, "Magnetic resonance imaging": 6, "Nausea": 6, "Blood test": 5, "Cerebral infarction": 5, "Dyspnoea": 5, "Investigation": 5, "Loss of consciousness": 5, "Malaise": 5, "Muscular weakness": 5, "Vaccination site pain": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "C-reactive protein": 4, "Condition aggravated": 4, "Gait disturbance": 4, "Gamma-glutamyltransferase": 4, "Magnetic resonance imaging head": 4, "Sensory disturbance": 4, "Anaphylactic reaction": 3, "Autopsy": 3, "Blood creatine phosphokinase": 3, "Chest pain": 3, "Decreased appetite": 3, "Echocardiogram": 3, "Headache": 3, "Heart rate decreased": 3, "Hypoaesthesia": 3, "Pallor": 3, "Tremor": 3, "White blood cell count": 3, "Abdominal discomfort": 2, "Altered state of consciousness": 2, "Antibody test": 2, "Back pain": 2, "Blood alkaline phosphatase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure increased": 2, "C-reactive protein increased": 2, "CSF cell count": 2, "Cold sweat": 2, "Cough": 2, "Diarrhoea": 2, "Dizziness": 2, "Ear pain": 2, "Ear swelling": 2, "Electrocardiogram": 2, "Erythema": 2, "Fall": 2, "Feeling abnormal": 2, "Heart rate increased": 2, "Hemiplegia": 2, "Hepatic function abnormal": 2, "Loss of personal independence in daily activities": 2, "Neck pain": 2, "Nerve conduction studies": 2, "Neuropathy peripheral": 2, "Oxygen saturation decreased": 2, "Pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Presyncope": 2, "Rhabdomyolysis": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Ultrasound scan": 2, "Urinary retention": 2, "Urine analysis": 2, "Vomiting": 2, "Wheezing": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Amylase": 1, "Amyloidosis senile": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Anorectal disorder": 1, "Anosmia": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Antithrombin III": 1, "Aortic dissection": 1, "Arrhythmia": 1, "Arteriosclerosis coronary artery": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Asthma": 1, "Ataxia": 1, "Atrial pressure": 1, "Auscultation": 1, "Basophil count": 1, "Bedridden": 1, "Bilirubin urine": 1, "Biopsy kidney": 1, "Bladder cancer": 1, "Bladder disorder": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood calcitonin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood cortisol": 1, "Blood creatine": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood gases": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body height": 1, "Body surface area": 1, "COVID-19": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF protein": 1, "Carcinoembryonic antigen": 1, "Cardiac arrest": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiac output": 1, "Cardio-respiratory arrest": 1, "Cardiogenic shock": 1, "Cardiolipin antibody": 1, "Cerebral artery stenosis": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chest X-ray": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Cognitive disorder": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Contusion": 1, "Cortisol decreased": 1, "Cough variant asthma": 1, "Creatinine urine": 1, "DNA antibody": 1, "Death": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Diplegia": 1, "Disease recurrence": 1, "Double stranded DNA antibody": 1, "Dysarthria": 1, "Dyschezia": 1, "Dysphagia": 1, "Dysuria": 1, "EGFR status assay": 1, "Ear discomfort": 1, "Electric shock sensation": 1, "Encephalopathy": 1, "Endoscopy": 1, "Eosinophil count": 1, "Epilepsy": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Fibrosis": 1, "Foaming at mouth": 1, "Gastritis": 1, "Gastroenteritis": 1, "General physical health deterioration": 1, "Glucose urine": 1, "Goitre": 1, "Guillain-Barre syndrome": 1, "HTLV test": 1, "Haematocrit": 1, "Haematology test": 1, "Haemoglobin": 1, "Hand fracture": 1, "Hepatic fibrosis": 1, "Hepatic steatosis": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hypoxia": 1, "Immune system disorder": 1, "Immunoelectrophoresis": 1, "Inflammatory bowel disease": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Interleukin-2 receptor assay": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Irritable bowel syndrome": 1, "Joint range of motion measurement": 1, "Joint stiffness": 1, "Laboratory test": 1, "Lactate pyruvate ratio": 1, "Lacunar infarction": 1, "Left atrial enlargement": 1, "Left ventricular dysfunction": 1, "Left ventricular enlargement": 1, "Light chain analysis": 1, "Limb discomfort": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lung opacity": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mental impairment": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Muscle contracture": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Nasopharyngitis": 1, "Neurologic neglect syndrome": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Occult blood": 1, "Oliguria": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Osteoporosis": 1, "Oxygen consumption": 1, "Palpitations": 1, "Paralysis": 1, "Paresis": 1, "Parotid abscess": 1, "Parotitis": 1, "Pathology test": 1, "Pericarditis": 1, "Peripheral vascular disorder": 1, "Platelet count": 1, "Platelet distribution width": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Post viral fatigue syndrome": 1, "Prealbumin": 1, "Prinzmetal angina": 1, "Procalcitonin": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin time": 1, "Pruritus": 1, "Radioisotope scan": 1, "Rash macular": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Respiratory depression": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Retinal vein occlusion": 1, "Retrograde amnesia": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Rheumatoid factor quantitative": 1, "Road traffic accident": 1, "Romberg test": 1, "Romberg test positive": 1, "Serum amyloid A protein": 1, "Shock": 1, "Shoulder injury related to vaccine administration": 1, "Sleep disorder": 1, "Sluggishness": 1, "Specific gravity urine": 1, "Spinal cord disorder": 1, "Squamous cell carcinoma antigen": 1, "Stertor": 1, "Strabismus": 1, "Streptococcal abscess": 1, "Subendocardial ischaemia": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Tachypnoea": 1, "Thyroglobulin": 1, "Thyroid cyst": 1, "Tinnitus": 1, "Total cholesterol/HDL ratio": 1, "Tracheal obstruction": 1, "Treponema test": 1, "Trismus": 1, "Tubulointerstitial nephritis": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound thyroid": 1, "Urinary casts": 1, "Urinary tract infection": 1, "Urine chloride": 1, "Urine ketone body": 1, "Urine nitrogen": 1, "Urine potassium": 1, "Urine protein/creatinine ratio": 1, "Urine sodium": 1, "Urobilinogen urine": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site abscess": 1, "Valsalva maneuver": 1, "Ventricular internal diameter": 1, "Visual acuity reduced": 1, "Vital signs measurement": 1, "Weight": 1, "Wheelchair user": 1, "White blood cells urine": 1, "X-ray": 1, "X-ray limb": 1, "pH body fluid": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "FR4768", "histograms": [{"histogram": {"Collagen disorder": 1, "Depression": 1, "Grip strength decreased": 1, "Illusion": 1, "Impaired work ability": 1, "Musculoskeletal stiffness": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nodal osteoarthritis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sensory disturbance": 1}, "batchcodes": ["3005288", "FR4768"]}, {"histogram": {"Body temperature": 31, "Oxygen saturation": 12, "Blood pressure measurement": 11, "Heart rate": 10, "Pyrexia": 9, "Arthralgia": 7, "Computerised tomogram": 6, "Magnetic resonance imaging": 6, "Nausea": 6, "Blood test": 5, "Cerebral infarction": 5, "Dyspnoea": 5, "Investigation": 5, "Loss of consciousness": 5, "Malaise": 5, "Muscular weakness": 5, "Vaccination site pain": 5, "Alanine aminotransferase": 4, "Aspartate aminotransferase": 4, "C-reactive protein": 4, "Condition aggravated": 4, "Gait disturbance": 4, "Gamma-glutamyltransferase": 4, "Magnetic resonance imaging head": 4, "Sensory disturbance": 4, "Anaphylactic reaction": 3, "Autopsy": 3, "Blood creatine phosphokinase": 3, "Chest pain": 3, "Decreased appetite": 3, "Echocardiogram": 3, "Headache": 3, "Heart rate decreased": 3, "Hypoaesthesia": 3, "Pallor": 3, "Tremor": 3, "White blood cell count": 3, "Abdominal discomfort": 2, "Altered state of consciousness": 2, "Antibody test": 2, "Back pain": 2, "Blood alkaline phosphatase": 2, "Blood lactate dehydrogenase": 2, "Blood pressure increased": 2, "C-reactive protein increased": 2, "CSF cell count": 2, "Cold sweat": 2, "Cough": 2, "Diarrhoea": 2, "Dizziness": 2, "Ear pain": 2, "Ear swelling": 2, "Electrocardiogram": 2, "Erythema": 2, "Fall": 2, "Feeling abnormal": 2, "Heart rate increased": 2, "Hemiplegia": 2, "Hepatic function abnormal": 2, "Loss of personal independence in daily activities": 2, "Neck pain": 2, "Nerve conduction studies": 2, "Neuropathy peripheral": 2, "Oxygen saturation decreased": 2, "Pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Presyncope": 2, "Rhabdomyolysis": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Thrombosis with thrombocytopenia syndrome": 2, "Ultrasound scan": 2, "Urinary retention": 2, "Urine analysis": 2, "Vomiting": 2, "Wheezing": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Amylase": 1, "Amyloidosis senile": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Anorectal disorder": 1, "Anosmia": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Antithrombin III": 1, "Aortic dissection": 1, "Arrhythmia": 1, "Arteriosclerosis coronary artery": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Asthma": 1, "Ataxia": 1, "Atrial pressure": 1, "Auscultation": 1, "Basophil count": 1, "Bedridden": 1, "Bilirubin urine": 1, "Biopsy kidney": 1, "Bladder cancer": 1, "Bladder disorder": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood calcitonin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholinesterase": 1, "Blood cortisol": 1, "Blood creatine": 1, "Blood creatine phosphokinase increased": 1, "Blood culture": 1, "Blood fibrinogen": 1, "Blood folate": 1, "Blood gases": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood lactate dehydrogenase increased": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body height": 1, "Body surface area": 1, "COVID-19": 1, "CSF cell count increased": 1, "CSF glucose": 1, "CSF protein": 1, "Carcinoembryonic antigen": 1, "Cardiac arrest": 1, "Cardiac electrophysiologic study": 1, "Cardiac failure": 1, "Cardiac failure acute": 1, "Cardiac output": 1, "Cardio-respiratory arrest": 1, "Cardiogenic shock": 1, "Cardiolipin antibody": 1, "Cerebral artery stenosis": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chest X-ray": 1, "Chills": 1, "Chronic fatigue syndrome": 1, "Cognitive disorder": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Contusion": 1, "Cortisol decreased": 1, "Cough variant asthma": 1, "Creatinine urine": 1, "DNA antibody": 1, "Death": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Diplegia": 1, "Disease recurrence": 1, "Double stranded DNA antibody": 1, "Dysarthria": 1, "Dyschezia": 1, "Dysphagia": 1, "Dysuria": 1, "EGFR status assay": 1, "Ear discomfort": 1, "Electric shock sensation": 1, "Encephalopathy": 1, "Endoscopy": 1, "Eosinophil count": 1, "Epilepsy": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Fibrosis": 1, "Foaming at mouth": 1, "Gastritis": 1, "Gastroenteritis": 1, "General physical health deterioration": 1, "Glucose urine": 1, "Goitre": 1, "Guillain-Barre syndrome": 1, "HTLV test": 1, "Haematocrit": 1, "Haematology test": 1, "Haemoglobin": 1, "Hand fracture": 1, "Hepatic fibrosis": 1, "Hepatic steatosis": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Herpes zoster": 1, "Herpes zoster oticus": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hyperthermia": 1, "Hyperventilation": 1, "Hypophagia": 1, "Hyporeflexia": 1, "Hypoxia": 1, "Immune system disorder": 1, "Immunoelectrophoresis": 1, "Inflammatory bowel disease": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Interleukin-2 receptor assay": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Irritable bowel syndrome": 1, "Joint range of motion measurement": 1, "Joint stiffness": 1, "Laboratory test": 1, "Lactate pyruvate ratio": 1, "Lacunar infarction": 1, "Left atrial enlargement": 1, "Left ventricular dysfunction": 1, "Left ventricular enlargement": 1, "Light chain analysis": 1, "Limb discomfort": 1, "Liver disorder": 1, "Low density lipoprotein": 1, "Lung opacity": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging spinal": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Mental impairment": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Muscle contracture": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myelitis": 1, "Myocardial ischaemia": 1, "Nasopharyngitis": 1, "Neurologic neglect syndrome": 1, "Neutrophil count": 1, "Nitrite urine": 1, "Occult blood": 1, "Oliguria": 1, "Oropharyngeal pain": 1, "Orthostatic intolerance": 1, "Osteoporosis": 1, "Oxygen consumption": 1, "Palpitations": 1, "Paralysis": 1, "Paresis": 1, "Parotid abscess": 1, "Parotitis": 1, "Pathology test": 1, "Pericarditis": 1, "Peripheral vascular disorder": 1, "Platelet count": 1, "Platelet distribution width": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Post viral fatigue syndrome": 1, "Prealbumin": 1, "Prinzmetal angina": 1, "Procalcitonin": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin time": 1, "Pruritus": 1, "Radioisotope scan": 1, "Rash macular": 1, "Red blood cell count": 1, "Red blood cells urine": 1, "Red cell distribution width": 1, "Respiratory depression": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Retinal vein occlusion": 1, "Retrograde amnesia": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rheumatoid factor increased": 1, "Rheumatoid factor quantitative": 1, "Road traffic accident": 1, "Romberg test": 1, "Romberg test positive": 1, "Serum amyloid A protein": 1, "Shock": 1, "Shoulder injury related to vaccine administration": 1, "Sleep disorder": 1, "Sluggishness": 1, "Specific gravity urine": 1, "Spinal cord disorder": 1, "Squamous cell carcinoma antigen": 1, "Stertor": 1, "Strabismus": 1, "Streptococcal abscess": 1, "Subendocardial ischaemia": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Tachypnoea": 1, "Thyroglobulin": 1, "Thyroid cyst": 1, "Tinnitus": 1, "Total cholesterol/HDL ratio": 1, "Tracheal obstruction": 1, "Treponema test": 1, "Trismus": 1, "Tubulointerstitial nephritis": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound thyroid": 1, "Urinary casts": 1, "Urinary tract infection": 1, "Urine chloride": 1, "Urine ketone body": 1, "Urine nitrogen": 1, "Urine potassium": 1, "Urine protein/creatinine ratio": 1, "Urine sodium": 1, "Urobilinogen urine": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site abscess": 1, "Valsalva maneuver": 1, "Ventricular internal diameter": 1, "Visual acuity reduced": 1, "Vital signs measurement": 1, "Weight": 1, "Wheelchair user": 1, "White blood cells urine": 1, "X-ray": 1, "X-ray limb": 1, "pH body fluid": 1, "pH urine": 1}, "batchcodes": ["FR4768"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FT7280.json b/docs/data/histograms/Japan/FT7280.json
index d6d5b76a2f3..f54a0aced3a 100644
--- a/docs/data/histograms/Japan/FT7280.json
+++ b/docs/data/histograms/Japan/FT7280.json
@@ -1 +1 @@
-{"batchcode": "FT7280", "histograms": [{"batchcodes": ["FT7280"], "histogram": {"Body temperature": 2, "Apraxia": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Breath sounds": 1, "Carotid artery disease": 1, "Dysphonia": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "IIIrd nerve paralysis": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Pain in extremity": 1, "Tolosa-Hunt syndrome": 1, "Vaccination site pain": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FT7280", "histograms": [{"histogram": {"Body temperature": 2, "Apraxia": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Breath sounds": 1, "Carotid artery disease": 1, "Dysphonia": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "IIIrd nerve paralysis": 1, "Magnetic resonance imaging head": 1, "Nausea": 1, "Pain in extremity": 1, "Tolosa-Hunt syndrome": 1, "Vaccination site pain": 1, "Wrong product administered": 1}, "batchcodes": ["FT7280"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FT8584.json b/docs/data/histograms/Japan/FT8584.json
index bb8842aaf07..3b90dc59849 100644
--- a/docs/data/histograms/Japan/FT8584.json
+++ b/docs/data/histograms/Japan/FT8584.json
@@ -1 +1 @@
-{"batchcode": "FT8584", "histograms": [{"batchcodes": ["FT8584"], "histogram": {"Body temperature": 26, "Pyrexia": 11, "Blood pressure measurement": 8, "Hypoaesthesia": 7, "Oxygen saturation": 7, "Blood test": 5, "Diarrhoea": 5, "Nausea": 5, "Pain in extremity": 5, "Headache": 4, "Heart rate": 4, "Investigation": 4, "Malaise": 4, "Neuropathy peripheral": 4, "Urticaria": 4, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Blood creatine phosphokinase": 3, "Blood pressure increased": 3, "Chest pain": 3, "Computerised tomogram": 3, "Dyspnoea": 3, "Electrocardiogram": 3, "Platelet count": 3, "Anaphylactic reaction": 2, "Autoimmune haemolytic anaemia": 2, "Biopsy bone marrow": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood pressure decreased": 2, "C-reactive protein": 2, "Chest discomfort": 2, "Coma scale": 2, "Cough": 2, "Decreased appetite": 2, "Dizziness": 2, "Echocardiogram": 2, "Erythema": 2, "Feeling abnormal": 2, "Gamma-glutamyltransferase": 2, "General physical condition abnormal": 2, "Haemoglobin": 2, "Hepatic function abnormal": 2, "Injected limb mobility decreased": 2, "Lymphadenopathy": 2, "Magnetic resonance imaging head": 2, "Myocarditis": 2, "Pericarditis": 2, "Peripheral swelling": 2, "Platelet count decreased": 2, "Renal impairment": 2, "Throat irritation": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Acute disseminated encephalomyelitis": 1, "Adjusted calcium": 1, "Alanine aminotransferase increased": 1, "Allergy test": 1, "Altered state of consciousness": 1, "Amylase": 1, "Anaemia macrocytic": 1, "Anal incontinence": 1, "Angiocardiogram": 1, "Antibody test": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase increased": 1, "Autoantibody test": 1, "Base excess": 1, "Basophil percentage": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood osmolarity": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Calcium ionised": 1, "Carbon dioxide": 1, "Cervicobrachial syndrome": 1, "Cholelithiasis": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Conjunctival haemorrhage": 1, "Coombs direct test": 1, "Coombs indirect test": 1, "Coronavirus test": 1, "Death": 1, "Defaecation urgency": 1, "Demyelinating polyneuropathy": 1, "Dyskinesia": 1, "Dysuria": 1, "EGFR status assay": 1, "Encephalitis": 1, "Eosinophil percentage": 1, "Epistaxis": 1, "Extremity contracture": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Fibrin D dimer": 1, "Glomerular filtration rate": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemophagocytic lymphohistiocytosis": 1, "Haemorrhage subcutaneous": 1, "Hepatitis B antigen": 1, "Hepatitis C virus test": 1, "Hiatus hernia": 1, "High density lipoprotein": 1, "Hypertension": 1, "Hypothermia": 1, "Illusion": 1, "Immune thrombocytopenia": 1, "Injection site pain": 1, "Interstitial lung disease": 1, "KL-6": 1, "Low density lipoprotein": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasopharyngeal swab": 1, "Neck pain": 1, "Nerve compression": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Pallor": 1, "Palpitations": 1, "Periarthritis": 1, "Physical deconditioning": 1, "Pneumopericardium": 1, "Product preparation error": 1, "Protein total": 1, "Pruritus": 1, "Pulmonary hypertension": 1, "Pulseless electrical activity": 1, "Red blood cell count": 1, "Renal cyst": 1, "Rhinorrhoea": 1, "Somatic symptom disorder": 1, "Somnolence": 1, "Sudden death": 1, "Syncope": 1, "Thrombosis": 1, "Toxic skin eruption": 1, "Tremor": 1, "Treponema test": 1, "Tricuspid valve incompetence": 1, "Trigeminal nerve disorder": 1, "Troponin": 1, "Troponin I": 1, "Unresponsive to stimuli": 1, "Vaccination site haemorrhage": 1, "Vaccination site swelling": 1, "Weight": 1, "White blood cell count": 1, "X-ray limb": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FT8584", "histograms": [{"histogram": {"Body temperature": 26, "Pyrexia": 11, "Blood pressure measurement": 8, "Hypoaesthesia": 7, "Oxygen saturation": 7, "Blood test": 5, "Diarrhoea": 5, "Nausea": 5, "Pain in extremity": 5, "Headache": 4, "Heart rate": 4, "Investigation": 4, "Malaise": 4, "Neuropathy peripheral": 4, "Urticaria": 4, "Alanine aminotransferase": 3, "Aspartate aminotransferase": 3, "Blood creatine phosphokinase": 3, "Blood pressure increased": 3, "Chest pain": 3, "Computerised tomogram": 3, "Dyspnoea": 3, "Electrocardiogram": 3, "Platelet count": 3, "Anaphylactic reaction": 2, "Autoimmune haemolytic anaemia": 2, "Biopsy bone marrow": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood pressure decreased": 2, "C-reactive protein": 2, "Chest discomfort": 2, "Coma scale": 2, "Cough": 2, "Decreased appetite": 2, "Dizziness": 2, "Echocardiogram": 2, "Erythema": 2, "Feeling abnormal": 2, "Gamma-glutamyltransferase": 2, "General physical condition abnormal": 2, "Haemoglobin": 2, "Hepatic function abnormal": 2, "Injected limb mobility decreased": 2, "Lymphadenopathy": 2, "Magnetic resonance imaging head": 2, "Myocarditis": 2, "Pericarditis": 2, "Peripheral swelling": 2, "Platelet count decreased": 2, "Renal impairment": 2, "Throat irritation": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Acute disseminated encephalomyelitis": 1, "Adjusted calcium": 1, "Alanine aminotransferase increased": 1, "Allergy test": 1, "Altered state of consciousness": 1, "Amylase": 1, "Anaemia macrocytic": 1, "Anal incontinence": 1, "Angiocardiogram": 1, "Antibody test": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase increased": 1, "Autoantibody test": 1, "Base excess": 1, "Basophil percentage": 1, "Blood albumin": 1, "Blood bicarbonate": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholinesterase": 1, "Blood creatine": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood osmolarity": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Body temperature increased": 1, "Brain natriuretic peptide": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "Calcium ionised": 1, "Carbon dioxide": 1, "Cervicobrachial syndrome": 1, "Cholelithiasis": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Conjunctival haemorrhage": 1, "Coombs direct test": 1, "Coombs indirect test": 1, "Coronavirus test": 1, "Death": 1, "Defaecation urgency": 1, "Demyelinating polyneuropathy": 1, "Dyskinesia": 1, "Dysuria": 1, "EGFR status assay": 1, "Encephalitis": 1, "Eosinophil percentage": 1, "Epistaxis": 1, "Extremity contracture": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Fibrin D dimer": 1, "Glomerular filtration rate": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haemophagocytic lymphohistiocytosis": 1, "Haemorrhage subcutaneous": 1, "Hepatitis B antigen": 1, "Hepatitis C virus test": 1, "Hiatus hernia": 1, "High density lipoprotein": 1, "Hypertension": 1, "Hypothermia": 1, "Illusion": 1, "Immune thrombocytopenia": 1, "Injection site pain": 1, "Interstitial lung disease": 1, "KL-6": 1, "Low density lipoprotein": 1, "Lung opacity": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Migraine": 1, "Mobility decreased": 1, "Monocyte percentage": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasopharyngeal swab": 1, "Neck pain": 1, "Nerve compression": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Pallor": 1, "Palpitations": 1, "Periarthritis": 1, "Physical deconditioning": 1, "Pneumopericardium": 1, "Product preparation error": 1, "Protein total": 1, "Pruritus": 1, "Pulmonary hypertension": 1, "Pulseless electrical activity": 1, "Red blood cell count": 1, "Renal cyst": 1, "Rhinorrhoea": 1, "Somatic symptom disorder": 1, "Somnolence": 1, "Sudden death": 1, "Syncope": 1, "Thrombosis": 1, "Toxic skin eruption": 1, "Tremor": 1, "Treponema test": 1, "Tricuspid valve incompetence": 1, "Trigeminal nerve disorder": 1, "Troponin": 1, "Troponin I": 1, "Unresponsive to stimuli": 1, "Vaccination site haemorrhage": 1, "Vaccination site swelling": 1, "Weight": 1, "White blood cell count": 1, "X-ray limb": 1, "pH body fluid": 1}, "batchcodes": ["FT8584"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FT9319.json b/docs/data/histograms/Japan/FT9319.json
index 0dc4eeaedc0..36276f87d20 100644
--- a/docs/data/histograms/Japan/FT9319.json
+++ b/docs/data/histograms/Japan/FT9319.json
@@ -1 +1 @@
-{"batchcode": "FT9319", "histograms": [{"batchcodes": ["FT9319"], "histogram": {"Body temperature": 22, "Pyrexia": 9, "Electrocardiogram": 5, "Oxygen saturation": 4, "Presyncope": 4, "Anaphylactic reaction": 3, "Blood pressure measurement": 3, "Blood test": 3, "Chest discomfort": 3, "Computerised tomogram head": 3, "Cough": 3, "Headache": 3, "Heart rate": 3, "Malaise": 3, "Syncope": 3, "Bradycardia": 2, "Cardiac arrest": 2, "Chest X-ray": 2, "Dizziness": 2, "Dysphoria": 2, "Dyspnoea": 2, "Echocardiogram": 2, "Hypoglycaemia": 2, "Joint range of motion decreased": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pain in extremity": 2, "Pallor": 2, "Pruritus": 2, "Seizure": 2, "Urticaria": 2, "Acoustic stimulation tests": 1, "Altered state of consciousness": 1, "Angioedema": 1, "Antibody test": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Autoantibody test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cancer screening": 1, "Cardiomegaly": 1, "Cerebral venous thrombosis": 1, "Chest pain": 1, "Coagulation test": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Diplopia": 1, "Dizziness postural": 1, "Dyspepsia": 1, "Electromyogram": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid irritation": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Haematuria": 1, "Hallucination, auditory": 1, "Hepatic function abnormal": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hyperkalaemia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "IIIrd nerve paralysis": 1, "Immune thrombocytopenia": 1, "Immunology test": 1, "Inflammation": 1, "Initial insomnia": 1, "Intracardiac thrombus": 1, "Investigation": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Meniere's disease": 1, "Mouth ulceration": 1, "Myelitis": 1, "Myocarditis": 1, "Nystagmus": 1, "Oedema": 1, "Ophthalmoplegia": 1, "Opticokinetic nystagmus tests": 1, "Oropharyngeal discomfort": 1, "Orthostatic hypotension": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Palatal disorder": 1, "Paralysis": 1, "Paraplegia": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Peripheral venous disease": 1, "Petechiae": 1, "Platelet count": 1, "Pleural effusion": 1, "Protein C": 1, "Protein S": 1, "Pulmonary function test": 1, "Pulmonary thrombosis": 1, "Purpura": 1, "Rash": 1, "Retinal vascular disorder": 1, "Retinal vein occlusion": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Troponin T": 1, "Tympanometry": 1, "Vertigo": 1, "Visual acuity reduced": 1, "Vital capacity": 1, "Vital signs measurement": 1, "Vomiting": 1, "Wheezing": 1, "White blood cell count": 1, "Wrong product administered": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FT9319", "histograms": [{"histogram": {"Body temperature": 22, "Pyrexia": 9, "Electrocardiogram": 5, "Oxygen saturation": 4, "Presyncope": 4, "Anaphylactic reaction": 3, "Blood pressure measurement": 3, "Blood test": 3, "Chest discomfort": 3, "Computerised tomogram head": 3, "Cough": 3, "Headache": 3, "Heart rate": 3, "Malaise": 3, "Syncope": 3, "Bradycardia": 2, "Cardiac arrest": 2, "Chest X-ray": 2, "Dizziness": 2, "Dysphoria": 2, "Dyspnoea": 2, "Echocardiogram": 2, "Hypoglycaemia": 2, "Joint range of motion decreased": 2, "Nausea": 2, "Neuropathy peripheral": 2, "Pain in extremity": 2, "Pallor": 2, "Pruritus": 2, "Seizure": 2, "Urticaria": 2, "Acoustic stimulation tests": 1, "Altered state of consciousness": 1, "Angioedema": 1, "Antibody test": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Autoantibody test": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cancer screening": 1, "Cardiomegaly": 1, "Cerebral venous thrombosis": 1, "Chest pain": 1, "Coagulation test": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Diplopia": 1, "Dizziness postural": 1, "Dyspepsia": 1, "Electromyogram": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid irritation": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Haematuria": 1, "Hallucination, auditory": 1, "Hepatic function abnormal": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hyperkalaemia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoxia": 1, "Hypoxic-ischaemic encephalopathy": 1, "IIIrd nerve paralysis": 1, "Immune thrombocytopenia": 1, "Immunology test": 1, "Inflammation": 1, "Initial insomnia": 1, "Intracardiac thrombus": 1, "Investigation": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Meniere's disease": 1, "Mouth ulceration": 1, "Myelitis": 1, "Myocarditis": 1, "Nystagmus": 1, "Oedema": 1, "Ophthalmoplegia": 1, "Opticokinetic nystagmus tests": 1, "Oropharyngeal discomfort": 1, "Orthostatic hypotension": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Palatal disorder": 1, "Paralysis": 1, "Paraplegia": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Peripheral venous disease": 1, "Petechiae": 1, "Platelet count": 1, "Pleural effusion": 1, "Protein C": 1, "Protein S": 1, "Pulmonary function test": 1, "Pulmonary thrombosis": 1, "Purpura": 1, "Rash": 1, "Retinal vascular disorder": 1, "Retinal vein occlusion": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Troponin T": 1, "Tympanometry": 1, "Vertigo": 1, "Visual acuity reduced": 1, "Vital capacity": 1, "Vital signs measurement": 1, "Vomiting": 1, "Wheezing": 1, "White blood cell count": 1, "Wrong product administered": 1, "X-ray": 1}, "batchcodes": ["FT9319"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FW0547.json b/docs/data/histograms/Japan/FW0547.json
index f9c98ea5e88..71f17f7dcca 100644
--- a/docs/data/histograms/Japan/FW0547.json
+++ b/docs/data/histograms/Japan/FW0547.json
@@ -1 +1 @@
-{"batchcode": "FW0547", "histograms": [{"batchcodes": ["FW0547"], "histogram": {"Body temperature": 16, "Pyrexia": 7, "Oxygen saturation": 6, "Heart rate": 5, "Blood pressure measurement": 3, "SARS-CoV-2 test": 3, "Acute pulmonary oedema": 2, "Anaemia": 2, "Anaphylactic reaction": 2, "Blood test": 2, "Coma scale": 2, "Haemoglobin": 2, "Haemoglobin decreased": 2, "Headache": 2, "Hypokinesia": 2, "Oxygen saturation decreased": 2, "Vomiting": 2, "Wrong product administered": 2, "X-ray": 2, "Arthralgia": 1, "Asthenia": 1, "Blood phosphorus": 1, "Blood pressure decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cerebral haemorrhage": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Coma scale abnormal": 1, "Death": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Escherichia bacteraemia": 1, "Faeces discoloured": 1, "Fall": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Investigation": 1, "Loss of consciousness": 1, "Malaise": 1, "Marasmus": 1, "Myalgia": 1, "Myelocyte count": 1, "Myocardial infarction": 1, "Nausea": 1, "Nystagmus": 1, "Pyelonephritis": 1, "Radial pulse abnormal": 1, "Respiratory arrest": 1, "Skin abrasion": 1, "Somnolence": 1, "Stress cardiomyopathy": 1, "Throat tightness": 1, "Urinary tract infection": 1, "Vital signs measurement": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FW0547", "histograms": [{"histogram": {"Body temperature": 16, "Pyrexia": 7, "Oxygen saturation": 6, "Heart rate": 5, "Blood pressure measurement": 3, "SARS-CoV-2 test": 3, "Acute pulmonary oedema": 2, "Anaemia": 2, "Anaphylactic reaction": 2, "Blood test": 2, "Coma scale": 2, "Haemoglobin": 2, "Haemoglobin decreased": 2, "Headache": 2, "Hypokinesia": 2, "Oxygen saturation decreased": 2, "Vomiting": 2, "Wrong product administered": 2, "X-ray": 2, "Arthralgia": 1, "Asthenia": 1, "Blood phosphorus": 1, "Blood pressure decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardiac dysfunction": 1, "Cerebral haemorrhage": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Coma scale abnormal": 1, "Death": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Escherichia bacteraemia": 1, "Faeces discoloured": 1, "Fall": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Investigation": 1, "Loss of consciousness": 1, "Malaise": 1, "Marasmus": 1, "Myalgia": 1, "Myelocyte count": 1, "Myocardial infarction": 1, "Nausea": 1, "Nystagmus": 1, "Pyelonephritis": 1, "Radial pulse abnormal": 1, "Respiratory arrest": 1, "Skin abrasion": 1, "Somnolence": 1, "Stress cardiomyopathy": 1, "Throat tightness": 1, "Urinary tract infection": 1, "Vital signs measurement": 1, "White blood cell count": 1}, "batchcodes": ["FW0547"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/FW5101.json b/docs/data/histograms/Japan/FW5101.json
index 8f40b7d4795..ceda58172f8 100644
--- a/docs/data/histograms/Japan/FW5101.json
+++ b/docs/data/histograms/Japan/FW5101.json
@@ -1 +1 @@
-{"batchcode": "FW5101", "histograms": [{"batchcodes": ["FW5101"], "histogram": {"Body temperature": 2, "Agitation": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cough": 1, "Decreased appetite": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hypersensitivity": 1, "Mastitis": 1, "Oxygen saturation": 1, "Pulseless electrical activity": 1, "Restlessness": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101", "histograms": [{"histogram": {"Body temperature": 2, "Agitation": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cough": 1, "Decreased appetite": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hypersensitivity": 1, "Mastitis": 1, "Oxygen saturation": 1, "Pulseless electrical activity": 1, "Restlessness": 1, "Tremor": 1}, "batchcodes": ["FW5101"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GD9135.json b/docs/data/histograms/Japan/GD9135.json
index 44f312b2962..92357581aaf 100644
--- a/docs/data/histograms/Japan/GD9135.json
+++ b/docs/data/histograms/Japan/GD9135.json
@@ -1 +1 @@
-{"batchcode": "GD9135", "histograms": [{"batchcodes": ["GD9135"], "histogram": {"Body temperature": 9, "Blood pressure measurement": 5, "Oxygen saturation": 4, "Heart rate": 3, "Anaphylactic reaction": 2, "Chills": 2, "Cold sweat": 2, "Coma scale": 2, "Depressed level of consciousness": 2, "Dysstasia": 2, "Facial paralysis": 2, "Hyperventilation": 2, "Oxygen saturation decreased": 2, "PO2": 2, "Presyncope": 2, "Seizure": 2, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Blood pressure decreased": 1, "Cough": 1, "Diabetic complication neurological": 1, "Dizziness": 1, "Dyspnoea": 1, "Epilepsy": 1, "Fall": 1, "Feeling abnormal": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Hepatic function abnormal": 1, "Hyporeflexia": 1, "Hypoxia": 1, "Loss of consciousness": 1, "Malaise": 1, "Mobility decreased": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Pallor": 1, "Pyrexia": 1, "Somnolence": 1, "Speech disorder": 1, "Syncope": 1, "Tetany": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "GD9135", "histograms": [{"histogram": {"Body temperature": 9, "Blood pressure measurement": 5, "Oxygen saturation": 4, "Heart rate": 3, "Anaphylactic reaction": 2, "Chills": 2, "Cold sweat": 2, "Coma scale": 2, "Depressed level of consciousness": 2, "Dysstasia": 2, "Facial paralysis": 2, "Hyperventilation": 2, "Oxygen saturation decreased": 2, "PO2": 2, "Presyncope": 2, "Seizure": 2, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Blood pressure decreased": 1, "Cough": 1, "Diabetic complication neurological": 1, "Dizziness": 1, "Dyspnoea": 1, "Epilepsy": 1, "Fall": 1, "Feeling abnormal": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Hepatic function abnormal": 1, "Hyporeflexia": 1, "Hypoxia": 1, "Loss of consciousness": 1, "Malaise": 1, "Mobility decreased": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Pain in extremity": 1, "Pallor": 1, "Pyrexia": 1, "Somnolence": 1, "Speech disorder": 1, "Syncope": 1, "Tetany": 1, "Throat tightness": 1}, "batchcodes": ["GD9135"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GD9136.json b/docs/data/histograms/Japan/GD9136.json
index 2ad341ae955..d87f707f018 100644
--- a/docs/data/histograms/Japan/GD9136.json
+++ b/docs/data/histograms/Japan/GD9136.json
@@ -1 +1 @@
-{"batchcode": "GD9136", "histograms": [{"batchcodes": ["GD9136"], "histogram": {"Body temperature": 8, "Blood test": 3, "Aphasia": 2, "Blood pressure measurement": 2, "C-reactive protein": 2, "Dizziness": 2, "Heart rate": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging head": 2, "Oxygen saturation": 2, "Pallor": 2, "Palpitations": 2, "Vital signs measurement": 2, "Acalculia": 1, "Agraphia": 1, "Anaphylactic reaction": 1, "Apraxia": 1, "Arrhythmia": 1, "Blindness unilateral": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctival haemorrhage": 1, "Diplopia": 1, "Dysarthria": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Enophthalmos": 1, "Eye movement disorder": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Hemianopia homonymous": 1, "Hyperkalaemia": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Influenza virus test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nasopharyngeal swab": 1, "Nausea": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Physical examination": 1, "Platelet count": 1, "Presyncope": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary hypertension": 1, "Quadriplegia": 1, "Rash": 1, "Respiratory arrest": 1, "SARS-CoV-2 antibody test": 1, "Sensory disturbance": 1, "Sputum retention": 1, "Syncope": 1, "Tachycardia": 1, "Troponin I": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Visual field defect": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "GD9136", "histograms": [{"histogram": {"Body temperature": 8, "Blood test": 3, "Aphasia": 2, "Blood pressure measurement": 2, "C-reactive protein": 2, "Dizziness": 2, "Heart rate": 2, "Interchange of vaccine products": 2, "Magnetic resonance imaging head": 2, "Oxygen saturation": 2, "Pallor": 2, "Palpitations": 2, "Vital signs measurement": 2, "Acalculia": 1, "Agraphia": 1, "Anaphylactic reaction": 1, "Apraxia": 1, "Arrhythmia": 1, "Blindness unilateral": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure increased": 1, "C-reactive protein increased": 1, "CSF test": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctival haemorrhage": 1, "Diplopia": 1, "Dysarthria": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Enophthalmos": 1, "Eye movement disorder": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Hemianopia homonymous": 1, "Hyperkalaemia": 1, "Hypoaesthesia": 1, "Imaging procedure": 1, "Influenza virus test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nasopharyngeal swab": 1, "Nausea": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Physical examination": 1, "Platelet count": 1, "Presyncope": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary hypertension": 1, "Quadriplegia": 1, "Rash": 1, "Respiratory arrest": 1, "SARS-CoV-2 antibody test": 1, "Sensory disturbance": 1, "Sputum retention": 1, "Syncope": 1, "Tachycardia": 1, "Troponin I": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Visual field defect": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["GD9136"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GD9568.json b/docs/data/histograms/Japan/GD9568.json
index 65ee583fa8e..981408d3699 100644
--- a/docs/data/histograms/Japan/GD9568.json
+++ b/docs/data/histograms/Japan/GD9568.json
@@ -1 +1 @@
-{"batchcode": "GD9568", "histograms": [{"batchcodes": ["GD9568"], "histogram": {"Body temperature": 14, "Blood pressure measurement": 10, "Oxygen saturation": 8, "Heart rate": 5, "Seizure": 5, "Nausea": 4, "Pyrexia": 4, "Urticaria": 4, "Blood pressure increased": 3, "Dyspnoea": 3, "Malaise": 3, "Pruritus": 3, "Anaphylactic reaction": 2, "Antinuclear antibody": 2, "Blood pressure decreased": 2, "Blood test": 2, "Cough": 2, "Dysstasia": 2, "Electrocardiogram": 2, "Feeling abnormal": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Investigation": 2, "Magnetic resonance imaging head": 2, "Muscular weakness": 2, "Myocarditis": 2, "Throat irritation": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Angiotensin converting enzyme": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antimitochondrial antibody": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Biopsy heart": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactic acid": 1, "Blood pyruvic acid": 1, "Blood thyroid stimulating hormone": 1, "Bronchostenosis": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Coagulation factor": 1, "Cold sweat": 1, "Coma scale": 1, "Complement factor": 1, "Complex regional pain syndrome": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Double stranded DNA antibody": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Eosinophilic myocarditis": 1, "Erythema": 1, "Full blood count": 1, "Gait inability": 1, "Grip strength decreased": 1, "Haemorrhage subcutaneous": 1, "Hallucination, visual": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Hypertension": 1, "Immune thrombocytopenia": 1, "Inflammation": 1, "Laboratory test": 1, "Microangiopathy": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Nerve block": 1, "Nerve conduction studies": 1, "Neuropathy peripheral": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Somnolence": 1, "Spinal X-ray": 1, "Suffocation feeling": 1, "Thrombocytopenic purpura": 1, "Thyroxine free": 1, "Tongue pruritus": 1, "Tremor": 1, "Troponin I": 1, "Ultrasound scan": 1, "Urine analysis": 1, "VIth nerve paralysis": 1, "Ventricular fibrillation": 1, "Vitamin B1": 1, "Vitamin B12": 1, "Weight": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "GD9568", "histograms": [{"histogram": {"Body temperature": 14, "Blood pressure measurement": 10, "Oxygen saturation": 8, "Heart rate": 5, "Seizure": 5, "Nausea": 4, "Pyrexia": 4, "Urticaria": 4, "Blood pressure increased": 3, "Dyspnoea": 3, "Malaise": 3, "Pruritus": 3, "Anaphylactic reaction": 2, "Antinuclear antibody": 2, "Blood pressure decreased": 2, "Blood test": 2, "Cough": 2, "Dysstasia": 2, "Electrocardiogram": 2, "Feeling abnormal": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Investigation": 2, "Magnetic resonance imaging head": 2, "Muscular weakness": 2, "Myocarditis": 2, "Throat irritation": 2, "Abdominal discomfort": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Angiotensin converting enzyme": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antimitochondrial antibody": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenia": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Biopsy heart": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood folate": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactic acid": 1, "Blood pyruvic acid": 1, "Blood thyroid stimulating hormone": 1, "Bronchostenosis": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Coagulation factor": 1, "Cold sweat": 1, "Coma scale": 1, "Complement factor": 1, "Complex regional pain syndrome": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Double stranded DNA antibody": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Eosinophilic myocarditis": 1, "Erythema": 1, "Full blood count": 1, "Gait inability": 1, "Grip strength decreased": 1, "Haemorrhage subcutaneous": 1, "Hallucination, visual": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic function abnormal": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Hypertension": 1, "Immune thrombocytopenia": 1, "Inflammation": 1, "Laboratory test": 1, "Microangiopathy": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Nerve block": 1, "Nerve conduction studies": 1, "Neuropathy peripheral": 1, "Nystagmus": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Somnolence": 1, "Spinal X-ray": 1, "Suffocation feeling": 1, "Thrombocytopenic purpura": 1, "Thyroxine free": 1, "Tongue pruritus": 1, "Tremor": 1, "Troponin I": 1, "Ultrasound scan": 1, "Urine analysis": 1, "VIth nerve paralysis": 1, "Ventricular fibrillation": 1, "Vitamin B1": 1, "Vitamin B12": 1, "Weight": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["GD9568"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GD9571.json b/docs/data/histograms/Japan/GD9571.json
index 325baabb3ec..5b6b5acdb8f 100644
--- a/docs/data/histograms/Japan/GD9571.json
+++ b/docs/data/histograms/Japan/GD9571.json
@@ -1 +1 @@
-{"batchcode": "GD9571", "histograms": [{"batchcodes": ["GD9571"], "histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Heart rate": 2, "Malaise": 2, "Oxygen saturation": 2, "Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Decreased appetite": 1, "Fall": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Hypersensitivity": 1, "Internal haemorrhage": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Oedema": 1, "Orthostatic intolerance": 1, "Pain in extremity": 1, "Pallor": 1, "Post lumbar puncture syndrome": 1, "Presyncope": 1, "Pruritus": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site pain": 1, "Wrong product administered": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "GD9571", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Heart rate": 2, "Malaise": 2, "Oxygen saturation": 2, "Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Decreased appetite": 1, "Fall": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Hypersensitivity": 1, "Internal haemorrhage": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Oedema": 1, "Orthostatic intolerance": 1, "Pain in extremity": 1, "Pallor": 1, "Post lumbar puncture syndrome": 1, "Presyncope": 1, "Pruritus": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site pain": 1, "Wrong product administered": 1, "Yawning": 1}, "batchcodes": ["GD9571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GD9572.json b/docs/data/histograms/Japan/GD9572.json
index 2557a636a96..ecfe0f01ae2 100644
--- a/docs/data/histograms/Japan/GD9572.json
+++ b/docs/data/histograms/Japan/GD9572.json
@@ -1 +1 @@
-{"batchcode": "GD9572", "histograms": [{"batchcodes": ["GD9572"], "histogram": {"Body temperature": 4, "Heart rate": 4, "Blood pressure measurement": 3, "Oxygen saturation": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Cardiovascular disorder": 1, "Conjunctival hyperaemia": 1, "Cutaneous symptom": 1, "Dysphonia": 1, "Dysphoria": 1, "Feeling abnormal": 1, "Gastrointestinal disorder": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Muscle tightness": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Panic attack": 1, "Pruritus": 1, "Rash": 1, "Seizure": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "GD9572", "histograms": [{"histogram": {"Body temperature": 4, "Heart rate": 4, "Blood pressure measurement": 3, "Oxygen saturation": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Cardiovascular disorder": 1, "Conjunctival hyperaemia": 1, "Cutaneous symptom": 1, "Dysphonia": 1, "Dysphoria": 1, "Feeling abnormal": 1, "Gastrointestinal disorder": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Muscle tightness": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Panic attack": 1, "Pruritus": 1, "Rash": 1, "Seizure": 1, "Tachycardia": 1}, "batchcodes": ["GD9572"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GD9574.json b/docs/data/histograms/Japan/GD9574.json
index 28cff19c821..30242cc4b01 100644
--- a/docs/data/histograms/Japan/GD9574.json
+++ b/docs/data/histograms/Japan/GD9574.json
@@ -1 +1 @@
-{"batchcode": "GD9574", "histograms": [{"batchcodes": ["GD9574"], "histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Coma scale": 2, "Heart rate": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Abdominal distension": 1, "Antibody test": 1, "Asthenia": 1, "Back pain": 1, "CSF cell count": 1, "Cardio-respiratory arrest": 1, "Coma": 1, "Computerised tomogram": 1, "Contusion": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Flatulence": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Immunisation": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Mental impairment": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral coldness": 1, "Platelet count": 1, "Presyncope": 1, "Respiratory arrest": 1, "Somnolence": 1, "Stool analysis": 1, "Thirst": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Transient ischaemic attack": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "GD9574", "histograms": [{"histogram": {"Body temperature": 3, "Blood pressure measurement": 2, "Coma scale": 2, "Heart rate": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Abdominal distension": 1, "Antibody test": 1, "Asthenia": 1, "Back pain": 1, "CSF cell count": 1, "Cardio-respiratory arrest": 1, "Coma": 1, "Computerised tomogram": 1, "Contusion": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin degradation products": 1, "Flatulence": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Immunisation": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Mental impairment": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral coldness": 1, "Platelet count": 1, "Presyncope": 1, "Respiratory arrest": 1, "Somnolence": 1, "Stool analysis": 1, "Thirst": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Transient ischaemic attack": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["GD9574"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GE0695.json b/docs/data/histograms/Japan/GE0695.json
index ce58ee0ceb7..7dd7983f932 100644
--- a/docs/data/histograms/Japan/GE0695.json
+++ b/docs/data/histograms/Japan/GE0695.json
@@ -1 +1 @@
-{"batchcode": "GE0695", "histograms": [{"batchcodes": ["GE0695"], "histogram": {"Body temperature": 4, "SARS-CoV-2 test": 4, "COVID-19": 2, "Drug ineffective": 2, "Febrile convulsion": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Asthma": 1, "Blood test": 1, "Bronchitis": 1, "C-reactive protein": 1, "Coma scale": 1, "Convulsion in childhood": 1, "Crying": 1, "Dyspnoea": 1, "Feeling hot": 1, "Human metapneumovirus test": 1, "Influenza virus test": 1, "Investigation": 1, "Lymphadenopathy": 1, "Otitis media": 1, "Pallor": 1, "Pharyngeal erythema": 1, "Pneumonia": 1, "Pneumonia viral": 1, "Rales": 1, "Rhinorrhoea": 1, "Seizure": 1, "Status epilepticus": 1, "Tonic convulsion": 1, "Tonsillar hypertrophy": 1, "Use of accessory respiratory muscles": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "GE0695", "histograms": [{"histogram": {"Body temperature": 4, "SARS-CoV-2 test": 4, "COVID-19": 2, "Drug ineffective": 2, "Febrile convulsion": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Asthma": 1, "Blood test": 1, "Bronchitis": 1, "C-reactive protein": 1, "Coma scale": 1, "Convulsion in childhood": 1, "Crying": 1, "Dyspnoea": 1, "Feeling hot": 1, "Human metapneumovirus test": 1, "Influenza virus test": 1, "Investigation": 1, "Lymphadenopathy": 1, "Otitis media": 1, "Pallor": 1, "Pharyngeal erythema": 1, "Pneumonia": 1, "Pneumonia viral": 1, "Rales": 1, "Rhinorrhoea": 1, "Seizure": 1, "Status epilepticus": 1, "Tonic convulsion": 1, "Tonsillar hypertrophy": 1, "Use of accessory respiratory muscles": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["GE0695"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GE0905.json b/docs/data/histograms/Japan/GE0905.json
index d47c90d9d5e..4fcb51f1aee 100644
--- a/docs/data/histograms/Japan/GE0905.json
+++ b/docs/data/histograms/Japan/GE0905.json
@@ -1 +1 @@
-{"batchcode": "GE0905", "histograms": [{"batchcodes": ["GE0905"], "histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Blood uric acid": 1, "C-reactive protein": 1, "Eczema": 1, "Eosinophil count": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Investigation": 1, "Ligase chain reaction test": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Platelet count": 1, "Platelet distribution width": 1, "Platelet-large cell ratio": 1, "Protein total": 1, "Pruritus": 1, "Rash": 1, "Red blood cell count": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "GE0905", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Blood uric acid": 1, "C-reactive protein": 1, "Eczema": 1, "Eosinophil count": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Investigation": 1, "Ligase chain reaction test": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Platelet count": 1, "Platelet distribution width": 1, "Platelet-large cell ratio": 1, "Protein total": 1, "Pruritus": 1, "Rash": 1, "Red blood cell count": 1, "White blood cell count": 1}, "batchcodes": ["GE0905"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GE6396.json b/docs/data/histograms/Japan/GE6396.json
index 94b93b9e030..d1efdfd26e9 100644
--- a/docs/data/histograms/Japan/GE6396.json
+++ b/docs/data/histograms/Japan/GE6396.json
@@ -1 +1 @@
-{"batchcode": "GE6396", "histograms": [{"batchcodes": ["GE6396"], "histogram": {"Body temperature": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "GE6396", "histograms": [{"histogram": {"Body temperature": 1, "Hypoaesthesia": 1}, "batchcodes": ["GE6396"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ1836.json b/docs/data/histograms/Japan/GJ1836.json
index e0776eb0b67..6c6cc863c93 100644
--- a/docs/data/histograms/Japan/GJ1836.json
+++ b/docs/data/histograms/Japan/GJ1836.json
@@ -1 +1 @@
-{"batchcode": "GJ1836", "histograms": [{"batchcodes": ["000241A", "GJ1836"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1}}, {"batchcodes": ["GJ1836"], "histogram": {"Body temperature": 14, "Pyrexia": 8, "Interchange of vaccine products": 7, "Blood pressure measurement": 4, "Dyspnoea": 4, "C-reactive protein": 3, "Fall": 3, "Feeling abnormal": 3, "Headache": 3, "Heart rate": 3, "Nausea": 3, "Neuropathy peripheral": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Anaphylactic reaction": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood pressure increased": 2, "Blood test": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Hypoaesthesia": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Muscular weakness": 2, "Pain": 2, "Pallor": 2, "Paralysis": 2, "Presyncope": 2, "Pruritus": 2, "Syncope": 2, "Vaccination site pain": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Acute motor axonal neuropathy": 1, "Angiocardiogram": 1, "Angiopathy": 1, "Anxiety": 1, "Anxiety disorder": 1, "Arthralgia": 1, "Asthenia": 1, "Autoantibody test": 1, "Biopsy heart": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure management": 1, "Body temperature decreased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF white blood cell count": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Cardiotoxicity": 1, "Cardiovascular autonomic function test abnormal": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cerebrovascular arteriovenous malformation": 1, "Chest X-ray": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Condition aggravated": 1, "Coxsackie viral infection": 1, "Coxsackie virus test": 1, "Decreased appetite": 1, "Dermatitis allergic": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Eosinophilic myocarditis": 1, "Erythema": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Heart rate decreased": 1, "Hepatic function abnormal": 1, "Herpes simplex": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Investigation": 1, "Lip pruritus": 1, "Loss of consciousness": 1, "Macular oedema": 1, "Magnetic resonance imaging heart": 1, "Middle insomnia": 1, "Mobility decreased": 1, "Muscle rigidity": 1, "Myalgia": 1, "Mydriasis": 1, "Myocardial oedema": 1, "Myocarditis": 1, "Nerve conduction studies": 1, "Oral herpes": 1, "Oropharyngeal discomfort": 1, "Pancytopenia": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Pupillary reflex impaired": 1, "Purpura": 1, "Quadriplegia": 1, "Rash": 1, "Respiratory rate": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Sensory disturbance": 1, "Small fibre neuropathy": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Swelling": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tonic convulsion": 1, "Toxicity to various agents": 1, "Transaminases": 1, "Troponin": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ1836", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1}, "batchcodes": ["000241A", "GJ1836"]}, {"histogram": {"Body temperature": 14, "Pyrexia": 8, "Interchange of vaccine products": 7, "Blood pressure measurement": 4, "Dyspnoea": 4, "C-reactive protein": 3, "Fall": 3, "Feeling abnormal": 3, "Headache": 3, "Heart rate": 3, "Nausea": 3, "Neuropathy peripheral": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Anaphylactic reaction": 2, "Blood creatine phosphokinase": 2, "Blood glucose": 2, "Blood pressure increased": 2, "Blood test": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Fibrin D dimer": 2, "Guillain-Barre syndrome": 2, "Hypoaesthesia": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Muscular weakness": 2, "Pain": 2, "Pallor": 2, "Paralysis": 2, "Presyncope": 2, "Pruritus": 2, "Syncope": 2, "Vaccination site pain": 2, "Abdominal X-ray": 1, "Abdominal discomfort": 1, "Acute motor axonal neuropathy": 1, "Angiocardiogram": 1, "Angiopathy": 1, "Anxiety": 1, "Anxiety disorder": 1, "Arthralgia": 1, "Asthenia": 1, "Autoantibody test": 1, "Biopsy heart": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure management": 1, "Body temperature decreased": 1, "COVID-19": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF white blood cell count": 1, "Cardiac electrophysiologic study": 1, "Cardio-respiratory arrest": 1, "Cardiotoxicity": 1, "Cardiovascular autonomic function test abnormal": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cerebrovascular arteriovenous malformation": 1, "Chest X-ray": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Condition aggravated": 1, "Coxsackie viral infection": 1, "Coxsackie virus test": 1, "Decreased appetite": 1, "Dermatitis allergic": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Eosinophilic myocarditis": 1, "Erythema": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Heart rate decreased": 1, "Hepatic function abnormal": 1, "Herpes simplex": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Investigation": 1, "Lip pruritus": 1, "Loss of consciousness": 1, "Macular oedema": 1, "Magnetic resonance imaging heart": 1, "Middle insomnia": 1, "Mobility decreased": 1, "Muscle rigidity": 1, "Myalgia": 1, "Mydriasis": 1, "Myocardial oedema": 1, "Myocarditis": 1, "Nerve conduction studies": 1, "Oral herpes": 1, "Oropharyngeal discomfort": 1, "Pancytopenia": 1, "Pericardial effusion": 1, "Peripheral coldness": 1, "Platelet count": 1, "Pneumonia aspiration": 1, "Polymerase chain reaction": 1, "Pupillary reflex impaired": 1, "Purpura": 1, "Quadriplegia": 1, "Rash": 1, "Respiratory rate": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Sensory disturbance": 1, "Small fibre neuropathy": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Swelling": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tonic convulsion": 1, "Toxicity to various agents": 1, "Transaminases": 1, "Troponin": 1, "Troponin I": 1, "Ulnar nerve palsy": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["GJ1836"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ1842.json b/docs/data/histograms/Japan/GJ1842.json
index 8b80cb6ed1a..fe98610dd46 100644
--- a/docs/data/histograms/Japan/GJ1842.json
+++ b/docs/data/histograms/Japan/GJ1842.json
@@ -1 +1 @@
-{"batchcode": "GJ1842", "histograms": [{"batchcodes": ["GJ1842"], "histogram": {"Body temperature": 19, "Oxygen saturation": 6, "Pyrexia": 6, "Anaphylactic reaction": 5, "Blood pressure measurement": 4, "Cardio-respiratory arrest": 4, "Heart rate": 4, "Malaise": 4, "Peripheral coldness": 4, "Vomiting": 4, "Cough": 3, "Dyspnoea": 3, "Interchange of vaccine products": 3, "Nausea": 3, "Rash": 3, "Sudden death": 3, "Vital signs measurement": 3, "Abdominal pain": 2, "Blood creatine phosphokinase": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "C-reactive protein": 2, "Circulatory collapse": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Erythema": 2, "Feeling abnormal": 2, "Guillain-Barre syndrome": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation decreased": 2, "Pneumonia": 2, "Presyncope": 2, "Pruritus": 2, "Tremor": 2, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Aspartate aminotransferase": 1, "Autopsy": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Brain stem haemorrhage": 1, "Bronchospasm": 1, "C-reactive protein increased": 1, "Cardiac death": 1, "Cardiovascular disorder": 1, "Catheterisation cardiac": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chest X-ray": 1, "Chest X-ray abnormal": 1, "Chest pain": 1, "Chest scan": 1, "Clonic convulsion": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Death": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dysarthria": 1, "Dysphoria": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Epistaxis": 1, "Erythema of eyelid": 1, "Eyelid disorder": 1, "Eyelid rash": 1, "Face oedema": 1, "Feeding disorder": 1, "Feeling hot": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Haematemesis": 1, "Haematuria": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hyperhidrosis": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypothermia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Investigation": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lip oedema": 1, "Liver function test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Microbiology test": 1, "Movement disorder": 1, "Muscular weakness": 1, "Myocarditis": 1, "Myoglobin urine": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Pericarditis": 1, "Pneumonia aspiration": 1, "Pneumonia bacterial": 1, "Productive cough": 1, "Pulmonary alveolar haemorrhage": 1, "Pulse pressure decreased": 1, "Putamen haemorrhage": 1, "Radial pulse": 1, "Rash erythematous": 1, "Renal function test": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Rhabdomyolysis": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Shock": 1, "Snoring": 1, "Sputum increased": 1, "Troponin": 1, "Troponin T": 1, "Vasculitis": 1, "Ventricular hypokinesia": 1, "Wheezing": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ1842", "histograms": [{"histogram": {"Body temperature": 19, "Oxygen saturation": 6, "Pyrexia": 6, "Anaphylactic reaction": 5, "Blood pressure measurement": 4, "Cardio-respiratory arrest": 4, "Heart rate": 4, "Malaise": 4, "Peripheral coldness": 4, "Vomiting": 4, "Cough": 3, "Dyspnoea": 3, "Interchange of vaccine products": 3, "Nausea": 3, "Rash": 3, "Sudden death": 3, "Vital signs measurement": 3, "Abdominal pain": 2, "Blood creatine phosphokinase": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "C-reactive protein": 2, "Circulatory collapse": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Depressed level of consciousness": 2, "Dizziness": 2, "Erythema": 2, "Feeling abnormal": 2, "Guillain-Barre syndrome": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation decreased": 2, "Pneumonia": 2, "Presyncope": 2, "Pruritus": 2, "Tremor": 2, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Aspartate aminotransferase": 1, "Autopsy": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Brain stem haemorrhage": 1, "Bronchospasm": 1, "C-reactive protein increased": 1, "Cardiac death": 1, "Cardiovascular disorder": 1, "Catheterisation cardiac": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chest X-ray": 1, "Chest X-ray abnormal": 1, "Chest pain": 1, "Chest scan": 1, "Clonic convulsion": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Death": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dysarthria": 1, "Dysphoria": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Epistaxis": 1, "Erythema of eyelid": 1, "Eyelid disorder": 1, "Eyelid rash": 1, "Face oedema": 1, "Feeding disorder": 1, "Feeling hot": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Gamma-glutamyltransferase": 1, "Gaze palsy": 1, "Haematemesis": 1, "Haematuria": 1, "Headache": 1, "Hepatic function abnormal": 1, "Hyperhidrosis": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Hypothermia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Investigation": 1, "Laryngeal oedema": 1, "Limb discomfort": 1, "Lip oedema": 1, "Liver function test": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Microbiology test": 1, "Movement disorder": 1, "Muscular weakness": 1, "Myocarditis": 1, "Myoglobin urine": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Pericarditis": 1, "Pneumonia aspiration": 1, "Pneumonia bacterial": 1, "Productive cough": 1, "Pulmonary alveolar haemorrhage": 1, "Pulse pressure decreased": 1, "Putamen haemorrhage": 1, "Radial pulse": 1, "Rash erythematous": 1, "Renal function test": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Rhabdomyolysis": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Shock": 1, "Snoring": 1, "Sputum increased": 1, "Troponin": 1, "Troponin T": 1, "Vasculitis": 1, "Ventricular hypokinesia": 1, "Wheezing": 1, "Wrong product administered": 1}, "batchcodes": ["GJ1842"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ1852.json b/docs/data/histograms/Japan/GJ1852.json
index cb9fbd1a6c2..8ed2aee854b 100644
--- a/docs/data/histograms/Japan/GJ1852.json
+++ b/docs/data/histograms/Japan/GJ1852.json
@@ -1 +1 @@
-{"batchcode": "GJ1852", "histograms": [{"batchcodes": ["GJ1852"], "histogram": {"Body temperature": 22, "Anaphylactic reaction": 10, "Blood pressure measurement": 10, "Heart rate": 9, "Oxygen saturation": 9, "Malaise": 7, "Dyspnoea": 6, "Nausea": 6, "Pyrexia": 6, "Cough": 5, "Erythema": 5, "Headache": 5, "Muscular weakness": 5, "Chest pain": 4, "Investigation": 4, "Vital signs measurement": 4, "Asthenia": 3, "Blood creatine phosphokinase": 3, "Electrocardiogram": 3, "Hypersensitivity": 3, "Apnoea": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "Blood test": 2, "C-reactive protein": 2, "COVID-19": 2, "Cardio-respiratory arrest": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Death": 2, "Dizziness": 2, "Dysphoria": 2, "Dysstasia": 2, "Feeling hot": 2, "Flushing": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Pain in extremity": 2, "Palpitations": 2, "Pericarditis": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Troponin T": 2, "Vomiting": 2, "Wheezing": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Agitation": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Angiogram": 1, "Antinuclear antibody": 1, "Antinuclear antibody increased": 1, "Anxiety": 1, "Arthralgia": 1, "Auscultation": 1, "Back pain": 1, "Blood pressure diastolic": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Breath sounds": 1, "CSF test": 1, "Cardiac failure acute": 1, "Cardiac murmur": 1, "Cerebral haemorrhage": 1, "Chills": 1, "Cold sweat": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Conversion disorder": 1, "Cyanosis": 1, "Decreased appetite": 1, "Defaecation urgency": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Echocardiogram": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST segment elevation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial paralysis": 1, "Fall": 1, "Fibrin D dimer": 1, "Frequent bowel movements": 1, "Grip strength": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Hypoxia": 1, "IIIrd nerve paralysis": 1, "Internal haemorrhage": 1, "Liver disorder": 1, "Locomotive syndrome": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mobility decreased": 1, "Mydriasis": 1, "Myocardial infarction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Peripheral coldness": 1, "Peripheral pulse decreased": 1, "Phlebitis": 1, "Pneumonia aspiration": 1, "Presyncope": 1, "Rash": 1, "Reflex test": 1, "Respiratory rate decreased": 1, "Rhinorrhoea": 1, "Shock": 1, "Sneezing": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Swelling": 1, "Tachycardia": 1, "Tolosa-Hunt syndrome": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ1852", "histograms": [{"histogram": {"Body temperature": 22, "Anaphylactic reaction": 10, "Blood pressure measurement": 10, "Heart rate": 9, "Oxygen saturation": 9, "Malaise": 7, "Dyspnoea": 6, "Nausea": 6, "Pyrexia": 6, "Cough": 5, "Erythema": 5, "Headache": 5, "Muscular weakness": 5, "Chest pain": 4, "Investigation": 4, "Vital signs measurement": 4, "Asthenia": 3, "Blood creatine phosphokinase": 3, "Electrocardiogram": 3, "Hypersensitivity": 3, "Apnoea": 2, "Blood pressure decreased": 2, "Blood pressure increased": 2, "Blood test": 2, "C-reactive protein": 2, "COVID-19": 2, "Cardio-respiratory arrest": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Death": 2, "Dizziness": 2, "Dysphoria": 2, "Dysstasia": 2, "Feeling hot": 2, "Flushing": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Pain in extremity": 2, "Palpitations": 2, "Pericarditis": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Troponin T": 2, "Vomiting": 2, "Wheezing": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Agitation": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Angiogram": 1, "Antinuclear antibody": 1, "Antinuclear antibody increased": 1, "Anxiety": 1, "Arthralgia": 1, "Auscultation": 1, "Back pain": 1, "Blood pressure diastolic": 1, "Blood pressure immeasurable": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Breath sounds": 1, "CSF test": 1, "Cardiac failure acute": 1, "Cardiac murmur": 1, "Cerebral haemorrhage": 1, "Chills": 1, "Cold sweat": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Conjunctival hyperaemia": 1, "Conversion disorder": 1, "Cyanosis": 1, "Decreased appetite": 1, "Defaecation urgency": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Echocardiogram": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST segment elevation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial paralysis": 1, "Fall": 1, "Fibrin D dimer": 1, "Frequent bowel movements": 1, "Grip strength": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Hypoxia": 1, "IIIrd nerve paralysis": 1, "Internal haemorrhage": 1, "Liver disorder": 1, "Locomotive syndrome": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mobility decreased": 1, "Mydriasis": 1, "Myocardial infarction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Peripheral coldness": 1, "Peripheral pulse decreased": 1, "Phlebitis": 1, "Pneumonia aspiration": 1, "Presyncope": 1, "Rash": 1, "Reflex test": 1, "Respiratory rate decreased": 1, "Rhinorrhoea": 1, "Shock": 1, "Sneezing": 1, "Subarachnoid haemorrhage": 1, "Sudden death": 1, "Swelling": 1, "Tachycardia": 1, "Tolosa-Hunt syndrome": 1, "Vaccination failure": 1}, "batchcodes": ["GJ1852"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ1857.json b/docs/data/histograms/Japan/GJ1857.json
index b058f9a84c9..4c24037bcf6 100644
--- a/docs/data/histograms/Japan/GJ1857.json
+++ b/docs/data/histograms/Japan/GJ1857.json
@@ -1 +1 @@
-{"batchcode": "GJ1857", "histograms": [{"batchcodes": ["GJ1857"], "histogram": {"Body temperature": 28, "Blood pressure measurement": 15, "Heart rate": 10, "Pyrexia": 10, "Oxygen saturation": 9, "Dyspnoea": 7, "Anaphylactic reaction": 6, "Loss of consciousness": 6, "Blood pressure decreased": 5, "Blood pressure increased": 5, "Cardio-respiratory arrest": 5, "SARS-CoV-2 test": 5, "C-reactive protein": 4, "Computerised tomogram": 4, "Altered state of consciousness": 3, "Dizziness": 3, "Headache": 3, "Heart rate increased": 3, "Interchange of vaccine products": 3, "Investigation": 3, "Magnetic resonance imaging": 3, "Oxygen saturation decreased": 3, "Peripheral swelling": 3, "Abnormal sensation in eye": 2, "Arthralgia": 2, "COVID-19": 2, "CSF test": 2, "Cardiac failure acute": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Depressed level of consciousness": 2, "Drug ineffective": 2, "Electrocardiogram": 2, "Malaise": 2, "Myocarditis": 2, "Nausea": 2, "Pain in extremity": 2, "Pallor": 2, "Palpitations": 2, "Pneumonia": 2, "Polymerase chain reaction": 2, "Renal function test": 2, "Renal impairment": 2, "Respiratory arrest": 2, "Somnolence": 2, "Speech disorder": 2, "Vaccination site pain": 2, "Vital signs measurement": 2, "Vomiting": 2, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Agitation": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Anuria": 1, "Anxiety": 1, "Aortic dissection": 1, "Arterial disorder": 1, "Asthenia": 1, "Auscultation": 1, "Autonomic dysreflexia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Bloody discharge": 1, "C-reactive protein increased": 1, "Capillary permeability increased": 1, "Cardiac arrest": 1, "Cardiomegaly": 1, "Cardiothoracic ratio": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Chronic kidney disease": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Cough": 1, "Coxsackie virus test": 1, "Deep vein thrombosis": 1, "Drug eruption": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Eating disorder": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment depression": 1, "Embolism": 1, "Enterocolitis haemorrhagic": 1, "Epilepsy": 1, "Erythema": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gait inability": 1, "General physical health deterioration": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Immunisation": 1, "Immunisation reaction": 1, "Interstitial lung disease": 1, "Irregular breathing": 1, "Joint swelling": 1, "Lung disorder": 1, "Melaena": 1, "Meningitis": 1, "Meningitis bacterial": 1, "Miller Fisher syndrome": 1, "Mood altered": 1, "Muscle haemorrhage": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal obstruction": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmoplegia": 1, "Oropharyngeal discomfort": 1, "PO2": 1, "Physical deconditioning": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Pneumonia bacterial": 1, "Poor venous access": 1, "Presyncope": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary embolism": 1, "Pulse absent": 1, "Pulseless electrical activity": 1, "Pupillary reflex impaired": 1, "Putamen haemorrhage": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Restlessness": 1, "Rhabdomyolysis": 1, "Salivary hypersecretion": 1, "Scan with contrast": 1, "Seizure": 1, "Septic shock": 1, "Somatic symptom disorder": 1, "Sputum abnormal": 1, "Subcutaneous haematoma": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Troponin I": 1, "Ultrasound scan": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Vaccination failure": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ1857", "histograms": [{"histogram": {"Body temperature": 28, "Blood pressure measurement": 15, "Heart rate": 10, "Pyrexia": 10, "Oxygen saturation": 9, "Dyspnoea": 7, "Anaphylactic reaction": 6, "Loss of consciousness": 6, "Blood pressure decreased": 5, "Blood pressure increased": 5, "Cardio-respiratory arrest": 5, "SARS-CoV-2 test": 5, "C-reactive protein": 4, "Computerised tomogram": 4, "Altered state of consciousness": 3, "Dizziness": 3, "Headache": 3, "Heart rate increased": 3, "Interchange of vaccine products": 3, "Investigation": 3, "Magnetic resonance imaging": 3, "Oxygen saturation decreased": 3, "Peripheral swelling": 3, "Abnormal sensation in eye": 2, "Arthralgia": 2, "COVID-19": 2, "CSF test": 2, "Cardiac failure acute": 2, "Cerebral infarction": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Depressed level of consciousness": 2, "Drug ineffective": 2, "Electrocardiogram": 2, "Malaise": 2, "Myocarditis": 2, "Nausea": 2, "Pain in extremity": 2, "Pallor": 2, "Palpitations": 2, "Pneumonia": 2, "Polymerase chain reaction": 2, "Renal function test": 2, "Renal impairment": 2, "Respiratory arrest": 2, "Somnolence": 2, "Speech disorder": 2, "Vaccination site pain": 2, "Vital signs measurement": 2, "Vomiting": 2, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Agitation": 1, "Anaphylactic shock": 1, "Angiogram": 1, "Anuria": 1, "Anxiety": 1, "Aortic dissection": 1, "Arterial disorder": 1, "Asthenia": 1, "Auscultation": 1, "Autonomic dysreflexia": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Bloody discharge": 1, "C-reactive protein increased": 1, "Capillary permeability increased": 1, "Cardiac arrest": 1, "Cardiomegaly": 1, "Cardiothoracic ratio": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Chronic kidney disease": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Cough": 1, "Coxsackie virus test": 1, "Deep vein thrombosis": 1, "Drug eruption": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Eating disorder": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Ejection fraction decreased": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment depression": 1, "Embolism": 1, "Enterocolitis haemorrhagic": 1, "Epilepsy": 1, "Erythema": 1, "Eye movement disorder": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gait inability": 1, "General physical health deterioration": 1, "Grip strength decreased": 1, "Guillain-Barre syndrome": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Immunisation": 1, "Immunisation reaction": 1, "Interstitial lung disease": 1, "Irregular breathing": 1, "Joint swelling": 1, "Lung disorder": 1, "Melaena": 1, "Meningitis": 1, "Meningitis bacterial": 1, "Miller Fisher syndrome": 1, "Mood altered": 1, "Muscle haemorrhage": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal obstruction": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmoplegia": 1, "Oropharyngeal discomfort": 1, "PO2": 1, "Physical deconditioning": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Pneumonia bacterial": 1, "Poor venous access": 1, "Presyncope": 1, "Pulmonary alveolar haemorrhage": 1, "Pulmonary embolism": 1, "Pulse absent": 1, "Pulseless electrical activity": 1, "Pupillary reflex impaired": 1, "Putamen haemorrhage": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Respiratory rate": 1, "Restlessness": 1, "Rhabdomyolysis": 1, "Salivary hypersecretion": 1, "Scan with contrast": 1, "Seizure": 1, "Septic shock": 1, "Somatic symptom disorder": 1, "Sputum abnormal": 1, "Subcutaneous haematoma": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Troponin I": 1, "Ultrasound scan": 1, "Urticaria": 1, "VIth nerve paralysis": 1, "Vaccination failure": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1}, "batchcodes": ["GJ1857"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ2674.json b/docs/data/histograms/Japan/GJ2674.json
index cfec8b425fd..82286fa65f8 100644
--- a/docs/data/histograms/Japan/GJ2674.json
+++ b/docs/data/histograms/Japan/GJ2674.json
@@ -1 +1 @@
-{"batchcode": "GJ2674", "histograms": [{"batchcodes": ["GJ2674"], "histogram": {"Body temperature": 21, "Blood pressure measurement": 11, "Oxygen saturation": 11, "Heart rate": 8, "Dyspnoea": 7, "Anaphylactic reaction": 6, "Nausea": 6, "Blood pressure increased": 5, "Anaphylactic shock": 3, "Blood pressure decreased": 3, "Coma scale": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Feeling abnormal": 3, "Interchange of vaccine products": 3, "Loss of consciousness": 3, "Oropharyngeal discomfort": 3, "Pruritus": 3, "Tachycardia": 3, "Altered state of consciousness": 2, "Chest discomfort": 2, "Cold sweat": 2, "Headache": 2, "Hypoaesthesia": 2, "Malaise": 2, "Oxygen saturation decreased": 2, "Palpitations": 2, "Physical deconditioning": 2, "Pyrexia": 2, "Respiratory arrest": 2, "Seizure": 2, "Vital signs measurement": 2, "Vomiting": 2, "Anterior chamber inflammation": 1, "Aortic aneurysm": 1, "Aortic dissection rupture": 1, "Arthritis infective": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure abnormal": 1, "Body temperature decreased": 1, "Breath sounds": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular disorder": 1, "Chest pain": 1, "Computerised tomogram": 1, "Corneal striae": 1, "Cough": 1, "Cyanosis": 1, "Decreased activity": 1, "Drowning": 1, "Dysphagia": 1, "Dysphoria": 1, "Electrocardiogram": 1, "Erythema": 1, "Eye disorder": 1, "Eye pain": 1, "Face oedema": 1, "Fall": 1, "Feeling hot": 1, "Haemothorax": 1, "Hypotension": 1, "Incontinence": 1, "Laryngeal oedema": 1, "Mediastinal haematoma": 1, "Moaning": 1, "Myocardial ischaemia": 1, "Nystagmus": 1, "Pain": 1, "Pallor": 1, "Peripheral coldness": 1, "Physical examination": 1, "Presyncope": 1, "Pulmonary hypertension": 1, "Respiratory disorder": 1, "Right ventricular failure": 1, "Shock": 1, "Somnolence": 1, "Speech disorder": 1, "Sudden death": 1, "Supraventricular tachycardia": 1, "Tachycardia paroxysmal": 1, "Toxic skin eruption": 1, "Uveitis": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ2674", "histograms": [{"histogram": {"Body temperature": 21, "Blood pressure measurement": 11, "Oxygen saturation": 11, "Heart rate": 8, "Dyspnoea": 7, "Anaphylactic reaction": 6, "Nausea": 6, "Blood pressure increased": 5, "Anaphylactic shock": 3, "Blood pressure decreased": 3, "Coma scale": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Feeling abnormal": 3, "Interchange of vaccine products": 3, "Loss of consciousness": 3, "Oropharyngeal discomfort": 3, "Pruritus": 3, "Tachycardia": 3, "Altered state of consciousness": 2, "Chest discomfort": 2, "Cold sweat": 2, "Headache": 2, "Hypoaesthesia": 2, "Malaise": 2, "Oxygen saturation decreased": 2, "Palpitations": 2, "Physical deconditioning": 2, "Pyrexia": 2, "Respiratory arrest": 2, "Seizure": 2, "Vital signs measurement": 2, "Vomiting": 2, "Anterior chamber inflammation": 1, "Aortic aneurysm": 1, "Aortic dissection rupture": 1, "Arthritis infective": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure abnormal": 1, "Body temperature decreased": 1, "Breath sounds": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular disorder": 1, "Chest pain": 1, "Computerised tomogram": 1, "Corneal striae": 1, "Cough": 1, "Cyanosis": 1, "Decreased activity": 1, "Drowning": 1, "Dysphagia": 1, "Dysphoria": 1, "Electrocardiogram": 1, "Erythema": 1, "Eye disorder": 1, "Eye pain": 1, "Face oedema": 1, "Fall": 1, "Feeling hot": 1, "Haemothorax": 1, "Hypotension": 1, "Incontinence": 1, "Laryngeal oedema": 1, "Mediastinal haematoma": 1, "Moaning": 1, "Myocardial ischaemia": 1, "Nystagmus": 1, "Pain": 1, "Pallor": 1, "Peripheral coldness": 1, "Physical examination": 1, "Presyncope": 1, "Pulmonary hypertension": 1, "Respiratory disorder": 1, "Right ventricular failure": 1, "Shock": 1, "Somnolence": 1, "Speech disorder": 1, "Sudden death": 1, "Supraventricular tachycardia": 1, "Tachycardia paroxysmal": 1, "Toxic skin eruption": 1, "Uveitis": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Visual acuity tests": 1, "Wheezing": 1}, "batchcodes": ["GJ2674"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ2675.json b/docs/data/histograms/Japan/GJ2675.json
index fc871698659..64520227d4e 100644
--- a/docs/data/histograms/Japan/GJ2675.json
+++ b/docs/data/histograms/Japan/GJ2675.json
@@ -1 +1 @@
-{"batchcode": "GJ2675", "histograms": [{"batchcodes": ["GJ2675"], "histogram": {"Body temperature": 12, "Anaphylactic reaction": 5, "Blood pressure measurement": 5, "Dyspnoea": 4, "Blood pressure increased": 3, "Feeling abnormal": 3, "Heart rate": 3, "Chest pain": 2, "Electrocardiogram": 2, "Extrasystoles": 2, "Nausea": 2, "Pallor": 2, "Palpitations": 2, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Aneurysm": 1, "Aphasia": 1, "Articular calcification": 1, "Atrioventricular block complete": 1, "Balance disorder": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Chest discomfort": 1, "Dizziness": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Heart rate decreased": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Loss of consciousness": 1, "Movement disorder": 1, "Myalgia": 1, "Myocarditis": 1, "Oral discomfort": 1, "Oxygen saturation": 1, "Pain": 1, "Physical examination": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Seizure": 1, "Shock": 1, "Speech disorder": 1, "Sputum retention": 1, "Troponin I": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ2675", "histograms": [{"histogram": {"Body temperature": 12, "Anaphylactic reaction": 5, "Blood pressure measurement": 5, "Dyspnoea": 4, "Blood pressure increased": 3, "Feeling abnormal": 3, "Heart rate": 3, "Chest pain": 2, "Electrocardiogram": 2, "Extrasystoles": 2, "Nausea": 2, "Pallor": 2, "Palpitations": 2, "Acute coronary syndrome": 1, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Aneurysm": 1, "Aphasia": 1, "Articular calcification": 1, "Atrioventricular block complete": 1, "Balance disorder": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "Cardiac failure chronic": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Chest discomfort": 1, "Dizziness": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Heart rate decreased": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Loss of consciousness": 1, "Movement disorder": 1, "Myalgia": 1, "Myocarditis": 1, "Oral discomfort": 1, "Oxygen saturation": 1, "Pain": 1, "Physical examination": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Seizure": 1, "Shock": 1, "Speech disorder": 1, "Sputum retention": 1, "Troponin I": 1, "Vomiting": 1}, "batchcodes": ["GJ2675"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ5751.json b/docs/data/histograms/Japan/GJ5751.json
index 83f8c27b14c..4a95585740e 100644
--- a/docs/data/histograms/Japan/GJ5751.json
+++ b/docs/data/histograms/Japan/GJ5751.json
@@ -1 +1 @@
-{"batchcode": "GJ5751", "histograms": [{"batchcodes": ["GJ5751"], "histogram": {"Body temperature": 10, "Blood pressure measurement": 6, "Heart rate": 6, "Oxygen saturation": 4, "Blood pressure decreased": 3, "Heart rate decreased": 3, "Anaphylactic reaction": 2, "Depressed level of consciousness": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Nausea": 2, "Oropharyngeal discomfort": 2, "Pallor": 2, "Pruritus": 2, "Vital signs measurement": 2, "Bed rest": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Cough": 1, "Deafness": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Hot flush": 1, "Hypersensitivity": 1, "Malaise": 1, "Oxygen saturation decreased": 1, "Palmar erythema": 1, "Presyncope": 1, "Pulse absent": 1, "Pyrexia": 1, "Respiratory arrest": 1, "Seizure": 1, "Throat tightness": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ5751", "histograms": [{"histogram": {"Body temperature": 10, "Blood pressure measurement": 6, "Heart rate": 6, "Oxygen saturation": 4, "Blood pressure decreased": 3, "Heart rate decreased": 3, "Anaphylactic reaction": 2, "Depressed level of consciousness": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Nausea": 2, "Oropharyngeal discomfort": 2, "Pallor": 2, "Pruritus": 2, "Vital signs measurement": 2, "Bed rest": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Cough": 1, "Deafness": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Hot flush": 1, "Hypersensitivity": 1, "Malaise": 1, "Oxygen saturation decreased": 1, "Palmar erythema": 1, "Presyncope": 1, "Pulse absent": 1, "Pyrexia": 1, "Respiratory arrest": 1, "Seizure": 1, "Throat tightness": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["GJ5751"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ7139.json b/docs/data/histograms/Japan/GJ7139.json
index 3b9ddba1b80..b646c8c80a8 100644
--- a/docs/data/histograms/Japan/GJ7139.json
+++ b/docs/data/histograms/Japan/GJ7139.json
@@ -1 +1 @@
-{"batchcode": "GJ7139", "histograms": [{"batchcodes": ["EY2173", "GJ7139"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["GJ7139"], "histogram": {"Body temperature": 25, "Blood pressure measurement": 15, "Heart rate": 11, "Oxygen saturation": 10, "Anaphylactic reaction": 7, "Blood pressure increased": 7, "Hypoaesthesia": 6, "Nausea": 6, "Pyrexia": 6, "Blood pressure decreased": 4, "Dyspnoea": 4, "Loss of consciousness": 4, "Malaise": 4, "Blood test": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Interchange of vaccine products": 3, "Muscular weakness": 3, "Oxygen saturation decreased": 3, "Peripheral coldness": 3, "SARS-CoV-2 test": 3, "Vomiting": 3, "Back pain": 2, "Blood pressure systolic increased": 2, "Coma scale": 2, "Computerised tomogram": 2, "Cough": 2, "Decreased appetite": 2, "Dysphoria": 2, "Dysstasia": 2, "Electrocardiogram": 2, "Erythema": 2, "Fall": 2, "Feeling abnormal": 2, "Flushing": 2, "Heart rate decreased": 2, "Incontinence": 2, "Investigation": 2, "Pain in extremity": 2, "Palpitations": 2, "Physical examination": 2, "Presyncope": 2, "Rash": 2, "Sensory disturbance": 2, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Anal examination": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspiration bone marrow": 1, "Asthma": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Blood disorder": 1, "Blood lactate dehydrogenase": 1, "Bradycardia": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Cerebral venous sinus thrombosis": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Clostridium test": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Culture stool": 1, "Diarrhoea": 1, "Diverticulitis intestinal haemorrhagic": 1, "Drug ineffective": 1, "Dysarthria": 1, "Endoscopy gastrointestinal": 1, "Epilepsy": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling hot": 1, "Gait disturbance": 1, "Gastric haemorrhage": 1, "Gastroenteritis": 1, "Guillain-Barre syndrome": 1, "Haemophagocytic lymphohistiocytosis": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Immobile": 1, "Intraocular pressure test": 1, "Joint ankylosis": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Musculoskeletal stiffness": 1, "Neoplasm malignant": 1, "Nervous system disorder": 1, "Oesophageal haemorrhage": 1, "Oropharyngeal discomfort": 1, "Pallor": 1, "Peripheral vascular disorder": 1, "Physical deconditioning": 1, "Platelet count": 1, "Product use issue": 1, "Pupil dilation procedure": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Seizure": 1, "Serum ferritin": 1, "Shock": 1, "Skin discolouration": 1, "Slit-lamp examination": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Tachypnoea": 1, "Thrombosis": 1, "Uterine pain": 1, "Uveitis": 1, "Vaccination site pain": 1, "Visual acuity tests": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ7139", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EY2173", "GJ7139"]}, {"histogram": {"Body temperature": 25, "Blood pressure measurement": 15, "Heart rate": 11, "Oxygen saturation": 10, "Anaphylactic reaction": 7, "Blood pressure increased": 7, "Hypoaesthesia": 6, "Nausea": 6, "Pyrexia": 6, "Blood pressure decreased": 4, "Dyspnoea": 4, "Loss of consciousness": 4, "Malaise": 4, "Blood test": 3, "Depressed level of consciousness": 3, "Dizziness": 3, "Interchange of vaccine products": 3, "Muscular weakness": 3, "Oxygen saturation decreased": 3, "Peripheral coldness": 3, "SARS-CoV-2 test": 3, "Vomiting": 3, "Back pain": 2, "Blood pressure systolic increased": 2, "Coma scale": 2, "Computerised tomogram": 2, "Cough": 2, "Decreased appetite": 2, "Dysphoria": 2, "Dysstasia": 2, "Electrocardiogram": 2, "Erythema": 2, "Fall": 2, "Feeling abnormal": 2, "Flushing": 2, "Heart rate decreased": 2, "Incontinence": 2, "Investigation": 2, "Pain in extremity": 2, "Palpitations": 2, "Physical examination": 2, "Presyncope": 2, "Rash": 2, "Sensory disturbance": 2, "Abdominal discomfort": 1, "Acute coronary syndrome": 1, "Acute disseminated encephalomyelitis": 1, "Alanine aminotransferase": 1, "Anal examination": 1, "Anal incontinence": 1, "Anaphylactic shock": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspiration bone marrow": 1, "Asthma": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Blood disorder": 1, "Blood lactate dehydrogenase": 1, "Bradycardia": 1, "C-reactive protein": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cardio-respiratory arrest": 1, "Cerebral infarction": 1, "Cerebral venous sinus thrombosis": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Clostridium test": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Culture stool": 1, "Diarrhoea": 1, "Diverticulitis intestinal haemorrhagic": 1, "Drug ineffective": 1, "Dysarthria": 1, "Endoscopy gastrointestinal": 1, "Epilepsy": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling hot": 1, "Gait disturbance": 1, "Gastric haemorrhage": 1, "Gastroenteritis": 1, "Guillain-Barre syndrome": 1, "Haemophagocytic lymphohistiocytosis": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Immobile": 1, "Intraocular pressure test": 1, "Joint ankylosis": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Musculoskeletal stiffness": 1, "Neoplasm malignant": 1, "Nervous system disorder": 1, "Oesophageal haemorrhage": 1, "Oropharyngeal discomfort": 1, "Pallor": 1, "Peripheral vascular disorder": 1, "Physical deconditioning": 1, "Platelet count": 1, "Product use issue": 1, "Pupil dilation procedure": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Seizure": 1, "Serum ferritin": 1, "Shock": 1, "Skin discolouration": 1, "Slit-lamp examination": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Tachypnoea": 1, "Thrombosis": 1, "Uterine pain": 1, "Uveitis": 1, "Vaccination site pain": 1, "Visual acuity tests": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["GJ7139"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ7140.json b/docs/data/histograms/Japan/GJ7140.json
index 3c30e5b015c..f10073add27 100644
--- a/docs/data/histograms/Japan/GJ7140.json
+++ b/docs/data/histograms/Japan/GJ7140.json
@@ -1 +1 @@
-{"batchcode": "GJ7140", "histograms": [{"batchcodes": ["GJ7140"], "histogram": {"Body temperature": 7, "Blood pressure measurement": 6, "Anaphylactic reaction": 4, "Blood pressure decreased": 3, "Hypoaesthesia": 3, "Loss of consciousness": 3, "Oxygen saturation": 3, "Anaphylactic shock": 2, "Dyspnoea": 2, "Feeling abnormal": 2, "Heart rate": 2, "Nausea": 2, "Presyncope": 2, "Pyrexia": 2, "Activated partial thromboplastin time": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Asthenopia": 1, "Autopsy": 1, "Blood pressure increased": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Confusional state": 1, "Coronary artery stenosis": 1, "Cough": 1, "Death": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Head discomfort": 1, "Headache": 1, "Incorrect dose administered": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle haemorrhage": 1, "Muscle rigidity": 1, "Muscular weakness": 1, "Myocardial ischaemia": 1, "Neurological examination": 1, "Nystagmus": 1, "Oropharyngeal discomfort": 1, "Pallor": 1, "Peripheral coldness": 1, "Platelet count": 1, "Prothrombin time ratio": 1, "Respiratory disorder": 1, "Rheumatoid arthritis": 1, "Seizure": 1, "Somnolence": 1, "Speech disorder": 1, "Sudden death": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vital signs measurement": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ7140", "histograms": [{"histogram": {"Body temperature": 7, "Blood pressure measurement": 6, "Anaphylactic reaction": 4, "Blood pressure decreased": 3, "Hypoaesthesia": 3, "Loss of consciousness": 3, "Oxygen saturation": 3, "Anaphylactic shock": 2, "Dyspnoea": 2, "Feeling abnormal": 2, "Heart rate": 2, "Nausea": 2, "Presyncope": 2, "Pyrexia": 2, "Activated partial thromboplastin time": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Asthenopia": 1, "Autopsy": 1, "Blood pressure increased": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Confusional state": 1, "Coronary artery stenosis": 1, "Cough": 1, "Death": 1, "Discomfort": 1, "Disease recurrence": 1, "Dizziness": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysphoria": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Head discomfort": 1, "Headache": 1, "Incorrect dose administered": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle haemorrhage": 1, "Muscle rigidity": 1, "Muscular weakness": 1, "Myocardial ischaemia": 1, "Neurological examination": 1, "Nystagmus": 1, "Oropharyngeal discomfort": 1, "Pallor": 1, "Peripheral coldness": 1, "Platelet count": 1, "Prothrombin time ratio": 1, "Respiratory disorder": 1, "Rheumatoid arthritis": 1, "Seizure": 1, "Somnolence": 1, "Speech disorder": 1, "Sudden death": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vital signs measurement": 1, "Wrong product administered": 1}, "batchcodes": ["GJ7140"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ7141.json b/docs/data/histograms/Japan/GJ7141.json
index 17597b145d1..772597f0b34 100644
--- a/docs/data/histograms/Japan/GJ7141.json
+++ b/docs/data/histograms/Japan/GJ7141.json
@@ -1 +1 @@
-{"batchcode": "GJ7141", "histograms": [{"batchcodes": ["GJ7141"], "histogram": {"Body temperature": 14, "Blood pressure measurement": 8, "Nausea": 6, "Oxygen saturation": 6, "Anaphylactic reaction": 5, "Heart rate": 5, "Pruritus": 4, "Abdominal pain": 3, "Blood pressure increased": 3, "C-reactive protein": 3, "Erythema": 3, "Pallor": 3, "Urticaria": 3, "Vomiting": 3, "White blood cell count": 3, "Aspartate aminotransferase": 2, "Aspartate aminotransferase increased": 2, "Blood pressure decreased": 2, "Chills": 2, "Cold sweat": 2, "Cyanosis": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Feeling abnormal": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Vital signs measurement": 2, "White blood cell count increased": 2, "Abdominal pain upper": 1, "Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Anterior chamber cell": 1, "Aortic dissection": 1, "Ataxia": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood test": 1, "Brain death": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Coma": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Death": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Dizziness": 1, "Electrocardiogram": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Fatigue": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hot flush": 1, "Hypersensitivity": 1, "Immunisation": 1, "Influenza virus test": 1, "International normalised ratio": 1, "Investigation": 1, "Liver function test": 1, "Liver function test increased": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Myoclonic epilepsy": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Off label use": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Platelet count": 1, "Prothrombin time ratio": 1, "Psychiatric symptom": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell count": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Seizure": 1, "Septic shock": 1, "Shock": 1, "Skin discolouration": 1, "Swelling": 1, "Tenderness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tremor": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Uveitis": 1, "Visual acuity tests": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ7141", "histograms": [{"histogram": {"Body temperature": 14, "Blood pressure measurement": 8, "Nausea": 6, "Oxygen saturation": 6, "Anaphylactic reaction": 5, "Heart rate": 5, "Pruritus": 4, "Abdominal pain": 3, "Blood pressure increased": 3, "C-reactive protein": 3, "Erythema": 3, "Pallor": 3, "Urticaria": 3, "Vomiting": 3, "White blood cell count": 3, "Aspartate aminotransferase": 2, "Aspartate aminotransferase increased": 2, "Blood pressure decreased": 2, "Chills": 2, "Cold sweat": 2, "Cyanosis": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Feeling abnormal": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Vital signs measurement": 2, "White blood cell count increased": 2, "Abdominal pain upper": 1, "Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Anterior chamber cell": 1, "Aortic dissection": 1, "Ataxia": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood test": 1, "Brain death": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Coma": 1, "Computerised tomogram head": 1, "Conjunctival hyperaemia": 1, "Death": 1, "Depressed level of consciousness": 1, "Disseminated intravascular coagulation": 1, "Dizziness": 1, "Electrocardiogram": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Fatigue": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Gastroenteritis": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hot flush": 1, "Hypersensitivity": 1, "Immunisation": 1, "Influenza virus test": 1, "International normalised ratio": 1, "Investigation": 1, "Liver function test": 1, "Liver function test increased": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Myoclonic epilepsy": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Off label use": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Platelet count": 1, "Prothrombin time ratio": 1, "Psychiatric symptom": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell count": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Seizure": 1, "Septic shock": 1, "Shock": 1, "Skin discolouration": 1, "Swelling": 1, "Tenderness": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Tremor": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Uveitis": 1, "Visual acuity tests": 1}, "batchcodes": ["GJ7141"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ9258.json b/docs/data/histograms/Japan/GJ9258.json
index 8ca9a2193a8..71b1de56c6b 100644
--- a/docs/data/histograms/Japan/GJ9258.json
+++ b/docs/data/histograms/Japan/GJ9258.json
@@ -1 +1 @@
-{"batchcode": "GJ9258", "histograms": [{"batchcodes": ["GJ9258"], "histogram": {"Body temperature": 5, "Heart rate": 5, "Nausea": 4, "Blood pressure measurement": 3, "Electrocardiogram": 3, "Oxygen saturation": 3, "Activated partial thromboplastin time": 2, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Blood alkaline phosphatase": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood chromium": 2, "Blood creatine phosphokinase": 2, "Blood creatinine": 2, "Blood glucagon": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood triglycerides": 2, "Blood urea": 2, "C-reactive protein": 2, "Computerised tomogram": 2, "Electrocardiogram ambulatory": 2, "Fibrin degradation products": 2, "Glycosylated haemoglobin": 2, "Haemoglobin": 2, "Heart rate increased": 2, "High density lipoprotein": 2, "Investigation": 2, "Low density lipoprotein": 2, "Magnetic resonance imaging head": 2, "Platelet count": 2, "Urine analysis": 2, "White blood cell count": 2, "Abdominal pain": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aortic valve incompetence": 1, "Blood pressure decreased": 1, "Breast cancer": 1, "Bundle branch block left": 1, "Cardiac failure congestive": 1, "Cyanosis": 1, "Dermal cyst": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Embolic stroke": 1, "Epilepsy": 1, "Erythema": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypoaesthesia": 1, "Infection": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Malaise": 1, "Metabolic encephalopathy": 1, "Mitral valve incompetence": 1, "Myoclonus": 1, "Neoplasm malignant": 1, "Orthostatic hypotension": 1, "Pain": 1, "Partial seizures": 1, "Physical examination": 1, "Pleural effusion": 1, "Polymyalgia rheumatica": 1, "Pyrexia": 1, "Rheumatoid arthritis": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ9258", "histograms": [{"histogram": {"Body temperature": 5, "Heart rate": 5, "Nausea": 4, "Blood pressure measurement": 3, "Electrocardiogram": 3, "Oxygen saturation": 3, "Activated partial thromboplastin time": 2, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Blood alkaline phosphatase": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood chromium": 2, "Blood creatine phosphokinase": 2, "Blood creatinine": 2, "Blood glucagon": 2, "Blood lactate dehydrogenase": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood triglycerides": 2, "Blood urea": 2, "C-reactive protein": 2, "Computerised tomogram": 2, "Electrocardiogram ambulatory": 2, "Fibrin degradation products": 2, "Glycosylated haemoglobin": 2, "Haemoglobin": 2, "Heart rate increased": 2, "High density lipoprotein": 2, "Investigation": 2, "Low density lipoprotein": 2, "Magnetic resonance imaging head": 2, "Platelet count": 2, "Urine analysis": 2, "White blood cell count": 2, "Abdominal pain": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aortic valve incompetence": 1, "Blood pressure decreased": 1, "Breast cancer": 1, "Bundle branch block left": 1, "Cardiac failure congestive": 1, "Cyanosis": 1, "Dermal cyst": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Embolic stroke": 1, "Epilepsy": 1, "Erythema": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypoaesthesia": 1, "Infection": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Malaise": 1, "Metabolic encephalopathy": 1, "Mitral valve incompetence": 1, "Myoclonus": 1, "Neoplasm malignant": 1, "Orthostatic hypotension": 1, "Pain": 1, "Partial seizures": 1, "Physical examination": 1, "Pleural effusion": 1, "Polymyalgia rheumatica": 1, "Pyrexia": 1, "Rheumatoid arthritis": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Vision blurred": 1}, "batchcodes": ["GJ9258"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GJ9259.json b/docs/data/histograms/Japan/GJ9259.json
index 4370a037c41..2a38e1a2a7c 100644
--- a/docs/data/histograms/Japan/GJ9259.json
+++ b/docs/data/histograms/Japan/GJ9259.json
@@ -1 +1 @@
-{"batchcode": "GJ9259", "histograms": [{"batchcodes": ["GJ9259"], "histogram": {"Body temperature": 7, "Oxygen saturation": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Asthenia": 2, "Electrocardiogram": 2, "Fall": 2, "Feeling abnormal": 2, "Heart rate": 2, "Seizure": 2, "Acute respiratory failure": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Aspartate aminotransferase": 1, "Biopsy kidney": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Chest pain": 1, "Chromaturia": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Cyanosis": 1, "Cytokine storm": 1, "Dehydration": 1, "Dizziness": 1, "Drooling": 1, "Dysphoria": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "General physical health deterioration": 1, "Hypertension": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Infection": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Investigation": 1, "KL-6": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Myocarditis": 1, "Oculogyric crisis": 1, "Oxygen saturation decreased": 1, "Pneumonia": 1, "Presyncope": 1, "Protein urine": 1, "Pulse absent": 1, "Tremor": 1, "Troponin T": 1, "Urinary occult blood": 1}}]}
\ No newline at end of file
+{"batchcode": "GJ9259", "histograms": [{"histogram": {"Body temperature": 7, "Oxygen saturation": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Asthenia": 2, "Electrocardiogram": 2, "Fall": 2, "Feeling abnormal": 2, "Heart rate": 2, "Seizure": 2, "Acute respiratory failure": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Aspartate aminotransferase": 1, "Biopsy kidney": 1, "Blood creatine phosphokinase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Chest pain": 1, "Chromaturia": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Cyanosis": 1, "Cytokine storm": 1, "Dehydration": 1, "Dizziness": 1, "Drooling": 1, "Dysphoria": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "General physical health deterioration": 1, "Hypertension": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Infection": 1, "Interchange of vaccine products": 1, "Interstitial lung disease": 1, "Investigation": 1, "KL-6": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Myocarditis": 1, "Oculogyric crisis": 1, "Oxygen saturation decreased": 1, "Pneumonia": 1, "Presyncope": 1, "Protein urine": 1, "Pulse absent": 1, "Tremor": 1, "Troponin T": 1, "Urinary occult blood": 1}, "batchcodes": ["GJ9259"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GK1328.json b/docs/data/histograms/Japan/GK1328.json
index 96dc3f0c86b..8203430c9db 100644
--- a/docs/data/histograms/Japan/GK1328.json
+++ b/docs/data/histograms/Japan/GK1328.json
@@ -1 +1 @@
-{"batchcode": "GK1328", "histograms": [{"batchcodes": ["GK1328"], "histogram": {"Pyrexia": 4, "Body temperature": 3, "SARS-CoV-2 test": 2, "Constipation": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Febrile convulsion": 1, "Haemorrhage subcutaneous": 1, "Incorrect route of product administration": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Malaise": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Papule": 1, "Product administered to patient of inappropriate age": 1, "Seizure": 1, "Suspected COVID-19": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "GK1328", "histograms": [{"histogram": {"Pyrexia": 4, "Body temperature": 3, "SARS-CoV-2 test": 2, "Constipation": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Febrile convulsion": 1, "Haemorrhage subcutaneous": 1, "Incorrect route of product administration": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Malaise": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Papule": 1, "Product administered to patient of inappropriate age": 1, "Seizure": 1, "Suspected COVID-19": 1, "Wrong product administered": 1}, "batchcodes": ["GK1328"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GK7844.json b/docs/data/histograms/Japan/GK7844.json
index e35fe57ae61..120b89ca552 100644
--- a/docs/data/histograms/Japan/GK7844.json
+++ b/docs/data/histograms/Japan/GK7844.json
@@ -1 +1 @@
-{"batchcode": "GK7844", "histograms": [{"batchcodes": ["GK7844"], "histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Depressed level of consciousness": 2, "Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Chest X-ray": 1, "Cough": 1, "Disease recurrence": 1, "Dysphoria": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Generalised tonic-clonic seizure": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Palpitations": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "GK7844", "histograms": [{"histogram": {"Body temperature": 4, "Blood pressure measurement": 2, "Depressed level of consciousness": 2, "Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Chest X-ray": 1, "Cough": 1, "Disease recurrence": 1, "Dysphoria": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Generalised tonic-clonic seizure": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Palpitations": 1, "Seizure": 1}, "batchcodes": ["GK7844"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GL1585.json b/docs/data/histograms/Japan/GL1585.json
index 2b9a4fbff79..c5d871b69bf 100644
--- a/docs/data/histograms/Japan/GL1585.json
+++ b/docs/data/histograms/Japan/GL1585.json
@@ -1 +1 @@
-{"batchcode": "GL1585", "histograms": [{"batchcodes": ["GL1585"], "histogram": {"Body temperature": 11, "Blood pressure measurement": 8, "Anaphylactic reaction": 6, "Blood pressure increased": 6, "Dyspnoea": 5, "Heart rate": 5, "Oxygen saturation": 5, "Pallor": 3, "Vital signs measurement": 3, "Cold sweat": 2, "Dizziness": 2, "Erythema": 2, "Feeling abnormal": 2, "Flushing": 2, "Headache": 2, "Hyperhidrosis": 2, "Loss of consciousness": 2, "Malaise": 2, "Oxygen saturation decreased": 2, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Condition aggravated": 1, "Coronavirus test": 1, "Cough": 1, "Cyanosis": 1, "Death": 1, "Decubitus ulcer": 1, "Defaecation urgency": 1, "Diarrhoea": 1, "Dysphoria": 1, "Electrocardiogram": 1, "Face oedema": 1, "Fall": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Haematuria": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Insomnia": 1, "Investigation": 1, "Laryngeal discomfort": 1, "Mobility decreased": 1, "Nausea": 1, "Nephrotic syndrome": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pharyngeal swelling": 1, "Presyncope": 1, "Pruritus": 1, "Pulse abnormal": 1, "Pyrexia": 1, "Red blood cell count": 1, "Somnolence": 1, "Subcutaneous haematoma": 1, "Tachycardia": 1, "Urine analysis": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "GL1585", "histograms": [{"histogram": {"Body temperature": 11, "Blood pressure measurement": 8, "Anaphylactic reaction": 6, "Blood pressure increased": 6, "Dyspnoea": 5, "Heart rate": 5, "Oxygen saturation": 5, "Pallor": 3, "Vital signs measurement": 3, "Cold sweat": 2, "Dizziness": 2, "Erythema": 2, "Feeling abnormal": 2, "Flushing": 2, "Headache": 2, "Hyperhidrosis": 2, "Loss of consciousness": 2, "Malaise": 2, "Oxygen saturation decreased": 2, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic decreased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardio-respiratory arrest": 1, "Chest pain": 1, "Condition aggravated": 1, "Coronavirus test": 1, "Cough": 1, "Cyanosis": 1, "Death": 1, "Decubitus ulcer": 1, "Defaecation urgency": 1, "Diarrhoea": 1, "Dysphoria": 1, "Electrocardiogram": 1, "Face oedema": 1, "Fall": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Haematuria": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Insomnia": 1, "Investigation": 1, "Laryngeal discomfort": 1, "Mobility decreased": 1, "Nausea": 1, "Nephrotic syndrome": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pharyngeal swelling": 1, "Presyncope": 1, "Pruritus": 1, "Pulse abnormal": 1, "Pyrexia": 1, "Red blood cell count": 1, "Somnolence": 1, "Subcutaneous haematoma": 1, "Tachycardia": 1, "Urine analysis": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["GL1585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/GL8592.json b/docs/data/histograms/Japan/GL8592.json
index d842b76039e..a8459e9dca0 100644
--- a/docs/data/histograms/Japan/GL8592.json
+++ b/docs/data/histograms/Japan/GL8592.json
@@ -1 +1 @@
-{"batchcode": "GL8592", "histograms": [{"batchcodes": ["GL8592"], "histogram": {"Body temperature": 8, "Blood pressure measurement": 5, "Oxygen saturation": 4, "Anaphylactic reaction": 3, "Dizziness": 3, "Heart rate": 3, "Loss of consciousness": 3, "Dyspnoea": 2, "Heart rate increased": 2, "Nausea": 2, "Urticaria": 2, "Vaccination site pain": 2, "Vital signs measurement": 2, "Arrhythmia": 1, "Auscultation": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure systolic increased": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Death": 1, "Dizziness postural": 1, "Dysphoria": 1, "Ear pain": 1, "Erythema": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Headache": 1, "Hot flush": 1, "Investigation": 1, "Laryngeal oedema": 1, "Laryngoscopy": 1, "Lip swelling": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Palmar erythema": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Presyncope": 1, "Pyrexia": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Salivary hypersecretion": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "GL8592", "histograms": [{"histogram": {"Body temperature": 8, "Blood pressure measurement": 5, "Oxygen saturation": 4, "Anaphylactic reaction": 3, "Dizziness": 3, "Heart rate": 3, "Loss of consciousness": 3, "Dyspnoea": 2, "Heart rate increased": 2, "Nausea": 2, "Urticaria": 2, "Vaccination site pain": 2, "Vital signs measurement": 2, "Arrhythmia": 1, "Auscultation": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure systolic increased": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Death": 1, "Dizziness postural": 1, "Dysphoria": 1, "Ear pain": 1, "Erythema": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Headache": 1, "Hot flush": 1, "Investigation": 1, "Laryngeal oedema": 1, "Laryngoscopy": 1, "Lip swelling": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Palmar erythema": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Presyncope": 1, "Pyrexia": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Salivary hypersecretion": 1, "Vaccination site reaction": 1}, "batchcodes": ["GL8592"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/NP001.json b/docs/data/histograms/Japan/NP001.json
index 408651da75c..11cb57d7815 100644
--- a/docs/data/histograms/Japan/NP001.json
+++ b/docs/data/histograms/Japan/NP001.json
@@ -1 +1 @@
-{"batchcode": "NP001", "histograms": [{"batchcodes": ["NP001"], "histogram": {"Body temperature": 5, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Anaphylactic shock": 2, "Cough": 2, "Anaphylactoid reaction": 1, "Arrhythmia": 1, "Auscultation": 1, "Bradycardia": 1, "Coma scale": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Fall": 1, "Heart rate": 1, "Hypersensitivity": 1, "Presyncope": 1, "Respiratory rate": 1, "Swelling of eyelid": 1, "Syncope": 1, "Type I hypersensitivity": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "NP001", "histograms": [{"histogram": {"Body temperature": 5, "Blood pressure measurement": 3, "Oxygen saturation": 3, "Anaphylactic shock": 2, "Cough": 2, "Anaphylactoid reaction": 1, "Arrhythmia": 1, "Auscultation": 1, "Bradycardia": 1, "Coma scale": 1, "Contusion": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Fall": 1, "Heart rate": 1, "Hypersensitivity": 1, "Presyncope": 1, "Respiratory rate": 1, "Swelling of eyelid": 1, "Syncope": 1, "Type I hypersensitivity": 1, "Wheezing": 1}, "batchcodes": ["NP001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/NP004.json b/docs/data/histograms/Japan/NP004.json
index c876b02f390..20d423b4bc2 100644
--- a/docs/data/histograms/Japan/NP004.json
+++ b/docs/data/histograms/Japan/NP004.json
@@ -1 +1 @@
-{"batchcode": "NP004", "histograms": [{"batchcodes": ["NP004"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "NP004", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["NP004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/NP007.json b/docs/data/histograms/Japan/NP007.json
index 8da59f05f34..e83e62f9e8d 100644
--- a/docs/data/histograms/Japan/NP007.json
+++ b/docs/data/histograms/Japan/NP007.json
@@ -1 +1 @@
-{"batchcode": "NP007", "histograms": [{"batchcodes": ["NP007"], "histogram": {"Body temperature": 3, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Coma scale": 2, "Heart rate": 2, "Oxygen saturation": 2, "Anaphylactic shock": 1, "Vaccination site discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "NP007", "histograms": [{"histogram": {"Body temperature": 3, "Anaphylactic reaction": 2, "Blood pressure measurement": 2, "Coma scale": 2, "Heart rate": 2, "Oxygen saturation": 2, "Anaphylactic shock": 1, "Vaccination site discomfort": 1}, "batchcodes": ["NP007"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/PC9880.json b/docs/data/histograms/Japan/PC9880.json
index 46d17d82113..7d0fc601ecc 100644
--- a/docs/data/histograms/Japan/PC9880.json
+++ b/docs/data/histograms/Japan/PC9880.json
@@ -1 +1 @@
-{"batchcode": "PC9880", "histograms": [{"batchcodes": ["PC9880"], "histogram": {"Intellectual disability": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PC9880", "histograms": [{"histogram": {"Intellectual disability": 1, "Pyrexia": 1}, "batchcodes": ["PC9880"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/PF4204.json b/docs/data/histograms/Japan/PF4204.json
index 18306642169..d4b853b5d8d 100644
--- a/docs/data/histograms/Japan/PF4204.json
+++ b/docs/data/histograms/Japan/PF4204.json
@@ -1 +1 @@
-{"batchcode": "PF4204", "histograms": [{"batchcodes": ["PF4204"], "histogram": {"Intellectual disability": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PF4204", "histograms": [{"histogram": {"Intellectual disability": 1, "Pyrexia": 1}, "batchcodes": ["PF4204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/RA7338.json b/docs/data/histograms/Japan/RA7338.json
index dfbb391fd17..003403aa538 100644
--- a/docs/data/histograms/Japan/RA7338.json
+++ b/docs/data/histograms/Japan/RA7338.json
@@ -1 +1 @@
-{"batchcode": "RA7338", "histograms": [{"batchcodes": ["RA7338"], "histogram": {"Body temperature": 1, "Macular oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "RA7338", "histograms": [{"histogram": {"Body temperature": 1, "Macular oedema": 1}, "batchcodes": ["RA7338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/UNKNWON.json b/docs/data/histograms/Japan/UNKNWON.json
index 06ee61fe2f6..6fcd6489259 100644
--- a/docs/data/histograms/Japan/UNKNWON.json
+++ b/docs/data/histograms/Japan/UNKNWON.json
@@ -1 +1 @@
-{"batchcode": "UNKNWON", "histograms": [{"batchcodes": ["UNKNWON"], "histogram": {"Altered state of consciousness": 1, "Amnesia": 1, "Arthralgia": 1, "Dizziness": 1, "Headache": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "UNKNWON", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Amnesia": 1, "Arthralgia": 1, "Dizziness": 1, "Headache": 1, "Malaise": 1}, "batchcodes": ["UNKNWON"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Japan/WE4811.json b/docs/data/histograms/Japan/WE4811.json
index 72867cf4b9f..048137991f7 100644
--- a/docs/data/histograms/Japan/WE4811.json
+++ b/docs/data/histograms/Japan/WE4811.json
@@ -1 +1 @@
-{"batchcode": "WE4811", "histograms": [{"batchcodes": ["WE4811"], "histogram": {"Asthma": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "WE4811", "histograms": [{"histogram": {"Asthma": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["WE4811"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Jordan/EY4825.json b/docs/data/histograms/Jordan/EY4825.json
index 838c6e7d00e..e05d66caefe 100644
--- a/docs/data/histograms/Jordan/EY4825.json
+++ b/docs/data/histograms/Jordan/EY4825.json
@@ -1 +1 @@
-{"batchcode": "EY4825", "histograms": [{"batchcodes": ["EY4825"], "histogram": {"Dermatitis allergic": 1, "Dyspnoea": 1, "Emotional disorder": 1, "Mental disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4825", "histograms": [{"histogram": {"Dermatitis allergic": 1, "Dyspnoea": 1, "Emotional disorder": 1, "Mental disorder": 1}, "batchcodes": ["EY4825"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Jordan/FA5843.json b/docs/data/histograms/Jordan/FA5843.json
index 6120301b12b..5b48d8b67d8 100644
--- a/docs/data/histograms/Jordan/FA5843.json
+++ b/docs/data/histograms/Jordan/FA5843.json
@@ -1 +1 @@
-{"batchcode": "FA5843", "histograms": [{"batchcodes": ["FA5843"], "histogram": {"Intermenstrual bleeding": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5843", "histograms": [{"histogram": {"Intermenstrual bleeding": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FA5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Jordan/FF2154.json b/docs/data/histograms/Jordan/FF2154.json
index 553bc569316..3f9f5352e81 100644
--- a/docs/data/histograms/Jordan/FF2154.json
+++ b/docs/data/histograms/Jordan/FF2154.json
@@ -1 +1 @@
-{"batchcode": "FF2154", "histograms": [{"batchcodes": ["FF2154"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2154", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["FF2154"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Jordan/FF8845.json b/docs/data/histograms/Jordan/FF8845.json
index 6a3618d2eec..ab39df6a5a7 100644
--- a/docs/data/histograms/Jordan/FF8845.json
+++ b/docs/data/histograms/Jordan/FF8845.json
@@ -1 +1 @@
-{"batchcode": "FF8845", "histograms": [{"batchcodes": ["FF8845"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Hypertensive crisis": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8845", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Hypertensive crisis": 1}, "batchcodes": ["FF8845"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kenya/217D21A.json b/docs/data/histograms/Kenya/217D21A.json
index 1f9ab75c849..77ed13f40a5 100644
--- a/docs/data/histograms/Kenya/217D21A.json
+++ b/docs/data/histograms/Kenya/217D21A.json
@@ -1 +1 @@
-{"batchcode": "217D21A", "histograms": [{"batchcodes": ["217D21A"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "217D21A", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["217D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kenya/ACB6958.json b/docs/data/histograms/Kenya/ACB6958.json
index 4b32c19a618..e845d583e50 100644
--- a/docs/data/histograms/Kenya/ACB6958.json
+++ b/docs/data/histograms/Kenya/ACB6958.json
@@ -1 +1 @@
-{"batchcode": "ACB6958", "histograms": [{"batchcodes": ["ACB6958"], "histogram": {"Angioedema": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB6958", "histograms": [{"histogram": {"Angioedema": 1}, "batchcodes": ["ACB6958"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kenya/XE436.json b/docs/data/histograms/Kenya/XE436.json
index 02b0ece0731..aa7b96c77b5 100644
--- a/docs/data/histograms/Kenya/XE436.json
+++ b/docs/data/histograms/Kenya/XE436.json
@@ -1 +1 @@
-{"batchcode": "XE436", "histograms": [{"batchcodes": ["XE436"], "histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Chills": 1, "Headache": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "XE436", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Chills": 1, "Headache": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["XE436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kenya/XE442.json b/docs/data/histograms/Kenya/XE442.json
index 2f6bdf69b81..4898e9f7b0f 100644
--- a/docs/data/histograms/Kenya/XE442.json
+++ b/docs/data/histograms/Kenya/XE442.json
@@ -1 +1 @@
-{"batchcode": "XE442", "histograms": [{"batchcodes": ["XE442"], "histogram": {"Chest pain": 1, "Erectile dysfunction": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "XE442", "histograms": [{"histogram": {"Chest pain": 1, "Erectile dysfunction": 1, "Headache": 1}, "batchcodes": ["XE442"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kenya/XE443.json b/docs/data/histograms/Kenya/XE443.json
index 7d9f91beac9..3893c29c6ae 100644
--- a/docs/data/histograms/Kenya/XE443.json
+++ b/docs/data/histograms/Kenya/XE443.json
@@ -1 +1 @@
-{"batchcode": "XE443", "histograms": [{"batchcodes": ["XE443"], "histogram": {"Chills": 2, "Headache": 2, "Malaise": 2, "Anaphylactic reaction": 1, "Dizziness": 1, "Febrile convulsion": 1, "Haematemesis": 1, "Nausea": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "XE443", "histograms": [{"histogram": {"Chills": 2, "Headache": 2, "Malaise": 2, "Anaphylactic reaction": 1, "Dizziness": 1, "Febrile convulsion": 1, "Haematemesis": 1, "Nausea": 1, "Pruritus": 1}, "batchcodes": ["XE443"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kenya/XE44Z.json b/docs/data/histograms/Kenya/XE44Z.json
index 6520e9f15f4..c92575fd6f0 100644
--- a/docs/data/histograms/Kenya/XE44Z.json
+++ b/docs/data/histograms/Kenya/XE44Z.json
@@ -1 +1 @@
-{"batchcode": "XE44Z", "histograms": [{"batchcodes": ["XE44Z"], "histogram": {"Headache": 1, "Ocular hyperaemia": 1, "Swelling face": 1, "Swelling of eyelid": 1}}]}
\ No newline at end of file
+{"batchcode": "XE44Z", "histograms": [{"histogram": {"Headache": 1, "Ocular hyperaemia": 1, "Swelling face": 1, "Swelling of eyelid": 1}, "batchcodes": ["XE44Z"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kenya/XE528.json b/docs/data/histograms/Kenya/XE528.json
index 6249110f974..b3991529734 100644
--- a/docs/data/histograms/Kenya/XE528.json
+++ b/docs/data/histograms/Kenya/XE528.json
@@ -1 +1 @@
-{"batchcode": "XE528", "histograms": [{"batchcodes": ["XE528"], "histogram": {"Fatigue": 1, "Headache": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "XE528", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Syncope": 1}, "batchcodes": ["XE528"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/1816024.json b/docs/data/histograms/Korea, Republic of/1816024.json
index 5e6a40ded1d..43ed058dfd1 100644
--- a/docs/data/histograms/Korea, Republic of/1816024.json
+++ b/docs/data/histograms/Korea, Republic of/1816024.json
@@ -1 +1 @@
-{"batchcode": "1816024", "histograms": [{"batchcodes": ["1816024"], "histogram": {"Adverse event": 57, "Headache": 29, "Dizziness": 19, "Myalgia": 19, "Cellulitis": 17, "Pyrexia": 12, "Nausea": 11, "Chills": 8, "Anaphylactic reaction": 7, "Injection site erythema": 6, "Injection site pain": 6, "Injection site swelling": 6, "Paralysis": 6, "Encephalitis": 5, "Abdominal pain upper": 4, "Vomiting": 4, "Anaphylactoid reaction": 3, "Arthritis": 3, "Diarrhoea": 3, "Guillain-Barre syndrome": 3, "Adverse drug reaction": 2, "Hypersensitivity": 2, "Thrombocytopenic purpura": 2, "Body temperature": 1, "Chest pain": 1, "Dyspnoea": 1, "Generalised oedema": 1, "Lymphadenitis": 1, "Overdose": 1, "Pericarditis": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "1816024", "histograms": [{"histogram": {"Adverse event": 57, "Headache": 29, "Dizziness": 19, "Myalgia": 19, "Cellulitis": 17, "Pyrexia": 12, "Nausea": 11, "Chills": 8, "Anaphylactic reaction": 7, "Injection site erythema": 6, "Injection site pain": 6, "Injection site swelling": 6, "Paralysis": 6, "Encephalitis": 5, "Abdominal pain upper": 4, "Vomiting": 4, "Anaphylactoid reaction": 3, "Arthritis": 3, "Diarrhoea": 3, "Guillain-Barre syndrome": 3, "Adverse drug reaction": 2, "Hypersensitivity": 2, "Thrombocytopenic purpura": 2, "Body temperature": 1, "Chest pain": 1, "Dyspnoea": 1, "Generalised oedema": 1, "Lymphadenitis": 1, "Overdose": 1, "Pericarditis": 1, "Seizure": 1}, "batchcodes": ["1816024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/1816027.json b/docs/data/histograms/Korea, Republic of/1816027.json
index d444f1541a4..803befe4d76 100644
--- a/docs/data/histograms/Korea, Republic of/1816027.json
+++ b/docs/data/histograms/Korea, Republic of/1816027.json
@@ -1 +1 @@
-{"batchcode": "1816027", "histograms": [{"batchcodes": ["1816027"], "histogram": {"Cellulitis": 10, "Adverse event": 8, "Myalgia": 8, "Chills": 4, "Dizziness": 4, "Headache": 4, "Pyrexia": 4, "Anaphylactoid reaction": 3, "Hypersensitivity": 3, "Nausea": 3, "Paralysis": 3, "Abdominal pain upper": 2, "Anaphylactic reaction": 2, "Diarrhoea": 2, "Encephalitis": 2, "Injection site erythema": 2, "Injection site pain": 2, "Injection site swelling": 2, "Cardiovascular disorder": 1, "Guillain-Barre syndrome": 1, "Lymphadenitis": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1816027", "histograms": [{"histogram": {"Cellulitis": 10, "Adverse event": 8, "Myalgia": 8, "Chills": 4, "Dizziness": 4, "Headache": 4, "Pyrexia": 4, "Anaphylactoid reaction": 3, "Hypersensitivity": 3, "Nausea": 3, "Paralysis": 3, "Abdominal pain upper": 2, "Anaphylactic reaction": 2, "Diarrhoea": 2, "Encephalitis": 2, "Injection site erythema": 2, "Injection site pain": 2, "Injection site swelling": 2, "Cardiovascular disorder": 1, "Guillain-Barre syndrome": 1, "Lymphadenitis": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["1816027"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/1820095.json b/docs/data/histograms/Korea, Republic of/1820095.json
index 3c06b9334b3..4ce000ab7a8 100644
--- a/docs/data/histograms/Korea, Republic of/1820095.json
+++ b/docs/data/histograms/Korea, Republic of/1820095.json
@@ -1 +1 @@
-{"batchcode": "1820095", "histograms": [{"batchcodes": ["1820095"], "histogram": {"Adverse event": 51, "Headache": 31, "Dizziness": 26, "Myalgia": 24, "Cellulitis": 17, "Chills": 15, "Pyrexia": 13, "Nausea": 12, "Paralysis": 11, "Vomiting": 10, "Injection site erythema": 7, "Injection site pain": 7, "Injection site swelling": 7, "Anaphylactoid reaction": 6, "Diarrhoea": 4, "Encephalitis": 4, "Hypersensitivity": 4, "Thrombocytopenic purpura": 4, "Abdominal pain upper": 3, "Seizure": 3, "Adverse drug reaction": 2, "Arthritis": 2, "Dyspnoea": 2, "Guillain-Barre syndrome": 2, "Anaphylactic reaction": 1, "Body temperature": 1, "Lymphadenitis": 1, "Vaccine associated enhanced disease": 1}}]}
\ No newline at end of file
+{"batchcode": "1820095", "histograms": [{"histogram": {"Adverse event": 51, "Headache": 31, "Dizziness": 26, "Myalgia": 24, "Cellulitis": 17, "Chills": 15, "Pyrexia": 13, "Nausea": 12, "Paralysis": 11, "Vomiting": 10, "Injection site erythema": 7, "Injection site pain": 7, "Injection site swelling": 7, "Anaphylactoid reaction": 6, "Diarrhoea": 4, "Encephalitis": 4, "Hypersensitivity": 4, "Thrombocytopenic purpura": 4, "Abdominal pain upper": 3, "Seizure": 3, "Adverse drug reaction": 2, "Arthritis": 2, "Dyspnoea": 2, "Guillain-Barre syndrome": 2, "Anaphylactic reaction": 1, "Body temperature": 1, "Lymphadenitis": 1, "Vaccine associated enhanced disease": 1}, "batchcodes": ["1820095"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/204A21A.json b/docs/data/histograms/Korea, Republic of/204A21A.json
index 65d16a54470..f7d21ba6c97 100644
--- a/docs/data/histograms/Korea, Republic of/204A21A.json
+++ b/docs/data/histograms/Korea, Republic of/204A21A.json
@@ -1 +1 @@
-{"batchcode": "204A21A", "histograms": [{"batchcodes": ["204A21A"], "histogram": {"Adverse event": 44, "Headache": 23, "Dizziness": 16, "Myalgia": 12, "Nausea": 12, "Cellulitis": 11, "Chills": 9, "Pyrexia": 9, "Anaphylactic reaction": 8, "Anaphylactoid reaction": 6, "Paralysis": 5, "Seizure": 5, "Vomiting": 5, "Abdominal pain upper": 4, "Encephalitis": 4, "Hypersensitivity": 4, "Diarrhoea": 3, "Injection site erythema": 3, "Injection site pain": 3, "Injection site swelling": 3, "Guillain-Barre syndrome": 2, "Arthritis": 1, "Chest pain": 1, "Lymphadenitis": 1, "Skin lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "204A21A", "histograms": [{"histogram": {"Adverse event": 44, "Headache": 23, "Dizziness": 16, "Myalgia": 12, "Nausea": 12, "Cellulitis": 11, "Chills": 9, "Pyrexia": 9, "Anaphylactic reaction": 8, "Anaphylactoid reaction": 6, "Paralysis": 5, "Seizure": 5, "Vomiting": 5, "Abdominal pain upper": 4, "Encephalitis": 4, "Hypersensitivity": 4, "Diarrhoea": 3, "Injection site erythema": 3, "Injection site pain": 3, "Injection site swelling": 3, "Guillain-Barre syndrome": 2, "Arthritis": 1, "Chest pain": 1, "Lymphadenitis": 1, "Skin lesion": 1}, "batchcodes": ["204A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/204B21A.json b/docs/data/histograms/Korea, Republic of/204B21A.json
index 2495acd3d4b..e02fecb6e3c 100644
--- a/docs/data/histograms/Korea, Republic of/204B21A.json
+++ b/docs/data/histograms/Korea, Republic of/204B21A.json
@@ -1 +1 @@
-{"batchcode": "204B21A", "histograms": [{"batchcodes": ["204B21A"], "histogram": {"Headache": 4, "Adverse event": 3, "Dizziness": 2, "Myalgia": 2, "Paralysis": 2, "Diarrhoea": 1, "Guillain-Barre syndrome": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "204B21A", "histograms": [{"histogram": {"Headache": 4, "Adverse event": 3, "Dizziness": 2, "Myalgia": 2, "Paralysis": 2, "Diarrhoea": 1, "Guillain-Barre syndrome": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["204B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/207A21A.json b/docs/data/histograms/Korea, Republic of/207A21A.json
index b5560d2f132..3cc36d9e34f 100644
--- a/docs/data/histograms/Korea, Republic of/207A21A.json
+++ b/docs/data/histograms/Korea, Republic of/207A21A.json
@@ -1 +1 @@
-{"batchcode": "207A21A", "histograms": [{"batchcodes": ["207A21A", "FK9413"], "histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}}, {"batchcodes": ["207A21A"], "histogram": {"Adverse event": 76, "Headache": 35, "Myalgia": 33, "Dizziness": 29, "Cellulitis": 21, "Paralysis": 17, "Pyrexia": 15, "Injection site erythema": 13, "Injection site pain": 13, "Injection site swelling": 13, "Nausea": 12, "Anaphylactic reaction": 10, "Chills": 10, "Encephalitis": 6, "Guillain-Barre syndrome": 6, "Hypersensitivity": 6, "Seizure": 5, "Vomiting": 5, "Abdominal pain upper": 4, "Anaphylactoid reaction": 3, "Diarrhoea": 3, "Adverse drug reaction": 2, "Abnormal uterine bleeding": 1, "Arthritis": 1, "Chest pain": 1, "Facial paralysis": 1, "Osteomyelitis": 1, "Thrombocytopenic purpura": 1}}]}
\ No newline at end of file
+{"batchcode": "207A21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}, "batchcodes": ["207A21A", "FK9413"]}, {"histogram": {"Adverse event": 76, "Headache": 35, "Myalgia": 33, "Dizziness": 29, "Cellulitis": 21, "Paralysis": 17, "Pyrexia": 15, "Injection site erythema": 13, "Injection site pain": 13, "Injection site swelling": 13, "Nausea": 12, "Anaphylactic reaction": 10, "Chills": 10, "Encephalitis": 6, "Guillain-Barre syndrome": 6, "Hypersensitivity": 6, "Seizure": 5, "Vomiting": 5, "Abdominal pain upper": 4, "Anaphylactoid reaction": 3, "Diarrhoea": 3, "Adverse drug reaction": 2, "Abnormal uterine bleeding": 1, "Arthritis": 1, "Chest pain": 1, "Facial paralysis": 1, "Osteomyelitis": 1, "Thrombocytopenic purpura": 1}, "batchcodes": ["207A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/211A21A.json b/docs/data/histograms/Korea, Republic of/211A21A.json
index 9d927c1648e..ae3c693db80 100644
--- a/docs/data/histograms/Korea, Republic of/211A21A.json
+++ b/docs/data/histograms/Korea, Republic of/211A21A.json
@@ -1 +1 @@
-{"batchcode": "211A21A", "histograms": [{"batchcodes": ["211A21A"], "histogram": {"Adverse event": 6, "Dizziness": 3, "Guillain-Barre syndrome": 2, "Nausea": 2, "Cellulitis": 1, "Encephalitis": 1, "Headache": 1, "Hypersensitivity": 1, "Myalgia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "211A21A", "histograms": [{"histogram": {"Adverse event": 6, "Dizziness": 3, "Guillain-Barre syndrome": 2, "Nausea": 2, "Cellulitis": 1, "Encephalitis": 1, "Headache": 1, "Hypersensitivity": 1, "Myalgia": 1, "Vomiting": 1}, "batchcodes": ["211A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/212A21A.json b/docs/data/histograms/Korea, Republic of/212A21A.json
index d7b0e17ac06..75fddf8c3f8 100644
--- a/docs/data/histograms/Korea, Republic of/212A21A.json
+++ b/docs/data/histograms/Korea, Republic of/212A21A.json
@@ -1 +1 @@
-{"batchcode": "212A21A", "histograms": [{"batchcodes": ["212A21A"], "histogram": {"Dizziness": 7, "Adverse event": 6, "Headache": 5, "Cellulitis": 4, "Myalgia": 3, "Paralysis": 2, "Vomiting": 2, "Adverse drug reaction": 1, "Anaphylactoid reaction": 1, "Inappropriate schedule of product administration": 1, "Nausea": 1, "Off label use": 1, "Pyrexia": 1, "Seizure": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "212A21A", "histograms": [{"histogram": {"Dizziness": 7, "Adverse event": 6, "Headache": 5, "Cellulitis": 4, "Myalgia": 3, "Paralysis": 2, "Vomiting": 2, "Adverse drug reaction": 1, "Anaphylactoid reaction": 1, "Inappropriate schedule of product administration": 1, "Nausea": 1, "Off label use": 1, "Pyrexia": 1, "Seizure": 1, "Thrombocytopenia": 1}, "batchcodes": ["212A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/213A21A.json b/docs/data/histograms/Korea, Republic of/213A21A.json
index 5b5d7e41070..15d87caaa2b 100644
--- a/docs/data/histograms/Korea, Republic of/213A21A.json
+++ b/docs/data/histograms/Korea, Republic of/213A21A.json
@@ -1 +1 @@
-{"batchcode": "213A21A", "histograms": [{"batchcodes": ["213A21A"], "histogram": {"Adverse event": 2, "Anaphylactic reaction": 2, "Anaphylactoid reaction": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Skin lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "213A21A", "histograms": [{"histogram": {"Adverse event": 2, "Anaphylactic reaction": 2, "Anaphylactoid reaction": 1, "Inappropriate schedule of product administration": 1, "Off label use": 1, "Skin lesion": 1}, "batchcodes": ["213A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/282370-210929-2.json b/docs/data/histograms/Korea, Republic of/282370-210929-2.json
index 3c7c5581baa..4a49ef43eef 100644
--- a/docs/data/histograms/Korea, Republic of/282370-210929-2.json
+++ b/docs/data/histograms/Korea, Republic of/282370-210929-2.json
@@ -1 +1 @@
-{"batchcode": "282370-210929-2", "histograms": [{"batchcodes": ["282370-210929-2"], "histogram": {"Arthralgia": 1, "Asthma": 1, "Fatigue": 1, "Insomnia": 1, "Pain": 1, "Pneumonia": 1, "Pyrexia": 1, "Somnolence": 1, "Speech disorder": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "282370-210929-2", "histograms": [{"histogram": {"Arthralgia": 1, "Asthma": 1, "Fatigue": 1, "Insomnia": 1, "Pain": 1, "Pneumonia": 1, "Pyrexia": 1, "Somnolence": 1, "Speech disorder": 1, "Vaccination site pain": 1}, "batchcodes": ["282370-210929-2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/816024.json b/docs/data/histograms/Korea, Republic of/816024.json
index 3a5a1d5b888..d9dbaee895f 100644
--- a/docs/data/histograms/Korea, Republic of/816024.json
+++ b/docs/data/histograms/Korea, Republic of/816024.json
@@ -1 +1 @@
-{"batchcode": "816024", "histograms": [{"batchcodes": ["816024"], "histogram": {"Abdominal pain upper": 1, "Adverse event": 1, "Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "816024", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Adverse event": 1, "Diarrhoea": 1}, "batchcodes": ["816024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/EW3344.json b/docs/data/histograms/Korea, Republic of/EW3344.json
index 5003f1a70db..ab1ef13ca7f 100644
--- a/docs/data/histograms/Korea, Republic of/EW3344.json
+++ b/docs/data/histograms/Korea, Republic of/EW3344.json
@@ -1 +1 @@
-{"batchcode": "EW3344", "histograms": [{"batchcodes": ["EW3344"], "histogram": {"Anxiety": 1, "Asthenia": 1, "Burning sensation": 1, "Hypoaesthesia": 1, "Malaise": 1, "Paraesthesia": 1, "Tremor": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "EW3344", "histograms": [{"histogram": {"Anxiety": 1, "Asthenia": 1, "Burning sensation": 1, "Hypoaesthesia": 1, "Malaise": 1, "Paraesthesia": 1, "Tremor": 1, "Vaccination site warmth": 1}, "batchcodes": ["EW3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FE3430.json b/docs/data/histograms/Korea, Republic of/FE3430.json
index 246b40e7554..4336f4cd6e6 100644
--- a/docs/data/histograms/Korea, Republic of/FE3430.json
+++ b/docs/data/histograms/Korea, Republic of/FE3430.json
@@ -1 +1 @@
-{"batchcode": "FE3430", "histograms": [{"batchcodes": ["FE3430"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Drug ineffective": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3430", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Drug ineffective": 1, "Vaccination failure": 1}, "batchcodes": ["FE3430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FF4222.json b/docs/data/histograms/Korea, Republic of/FF4222.json
index e4ad863873a..9f57fae2b87 100644
--- a/docs/data/histograms/Korea, Republic of/FF4222.json
+++ b/docs/data/histograms/Korea, Republic of/FF4222.json
@@ -1 +1 @@
-{"batchcode": "FF4222", "histograms": [{"batchcodes": ["FF4222"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4222", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FF4222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FF8279.json b/docs/data/histograms/Korea, Republic of/FF8279.json
index ffa6415782e..e228a7860a2 100644
--- a/docs/data/histograms/Korea, Republic of/FF8279.json
+++ b/docs/data/histograms/Korea, Republic of/FF8279.json
@@ -1 +1 @@
-{"batchcode": "FF8279", "histograms": [{"batchcodes": ["FF8279"], "histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8279", "histograms": [{"histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FF8279"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FG1807.json b/docs/data/histograms/Korea, Republic of/FG1807.json
index cb0f6cb2b79..b81d75adfd2 100644
--- a/docs/data/histograms/Korea, Republic of/FG1807.json
+++ b/docs/data/histograms/Korea, Republic of/FG1807.json
@@ -1 +1 @@
-{"batchcode": "FG1807", "histograms": [{"batchcodes": ["FG1807"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FG1807", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["FG1807"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FG2975.json b/docs/data/histograms/Korea, Republic of/FG2975.json
index 1b16e1e840d..0bfd150dc27 100644
--- a/docs/data/histograms/Korea, Republic of/FG2975.json
+++ b/docs/data/histograms/Korea, Republic of/FG2975.json
@@ -1 +1 @@
-{"batchcode": "FG2975", "histograms": [{"batchcodes": ["FG2975"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2975", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FG2975"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FG7369.json b/docs/data/histograms/Korea, Republic of/FG7369.json
index 84e30dd0143..b41c473cc6d 100644
--- a/docs/data/histograms/Korea, Republic of/FG7369.json
+++ b/docs/data/histograms/Korea, Republic of/FG7369.json
@@ -1 +1 @@
-{"batchcode": "FG7369", "histograms": [{"batchcodes": ["FG7369"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7369", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FG7369"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FK6303.json b/docs/data/histograms/Korea, Republic of/FK6303.json
index fd14a2bd85f..ce191c28b1d 100644
--- a/docs/data/histograms/Korea, Republic of/FK6303.json
+++ b/docs/data/histograms/Korea, Republic of/FK6303.json
@@ -1 +1 @@
-{"batchcode": "FK6303", "histograms": [{"batchcodes": ["FK6303"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}}]}
\ No newline at end of file
+{"batchcode": "FK6303", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}, "batchcodes": ["FK6303"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FK9413.json b/docs/data/histograms/Korea, Republic of/FK9413.json
index bb895638155..23fa003068c 100644
--- a/docs/data/histograms/Korea, Republic of/FK9413.json
+++ b/docs/data/histograms/Korea, Republic of/FK9413.json
@@ -1 +1 @@
-{"batchcode": "FK9413", "histograms": [{"batchcodes": ["207A21A", "FK9413"], "histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}}, {"batchcodes": ["FK9413"], "histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Drug ineffective": 2, "Vaccination failure": 2, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9413", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}, "batchcodes": ["207A21A", "FK9413"]}, {"histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Drug ineffective": 2, "Vaccination failure": 2, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["FK9413"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FL1940.json b/docs/data/histograms/Korea, Republic of/FL1940.json
index d3b797b4440..f453c24114b 100644
--- a/docs/data/histograms/Korea, Republic of/FL1940.json
+++ b/docs/data/histograms/Korea, Republic of/FL1940.json
@@ -1 +1 @@
-{"batchcode": "FL1940", "histograms": [{"batchcodes": ["FL1940"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1940", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["FL1940"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FL4209.json b/docs/data/histograms/Korea, Republic of/FL4209.json
index 8d62e5d53ed..899bf920984 100644
--- a/docs/data/histograms/Korea, Republic of/FL4209.json
+++ b/docs/data/histograms/Korea, Republic of/FL4209.json
@@ -1 +1 @@
-{"batchcode": "FL4209", "histograms": [{"batchcodes": ["FL4209"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "FL4209", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}, "batchcodes": ["FL4209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FL4574.json b/docs/data/histograms/Korea, Republic of/FL4574.json
index 3422d7e1552..612709f778b 100644
--- a/docs/data/histograms/Korea, Republic of/FL4574.json
+++ b/docs/data/histograms/Korea, Republic of/FL4574.json
@@ -1 +1 @@
-{"batchcode": "FL4574", "histograms": [{"batchcodes": ["FL4574"], "histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Drug ineffective": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "FL4574", "histograms": [{"histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Drug ineffective": 2, "Vaccination failure": 2}, "batchcodes": ["FL4574"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FL7645.json b/docs/data/histograms/Korea, Republic of/FL7645.json
index 3ed27f51b5c..1bdeb384ae8 100644
--- a/docs/data/histograms/Korea, Republic of/FL7645.json
+++ b/docs/data/histograms/Korea, Republic of/FL7645.json
@@ -1 +1 @@
-{"batchcode": "FL7645", "histograms": [{"batchcodes": ["FL7645"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FL7645", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["FL7645"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FN0987.json b/docs/data/histograms/Korea, Republic of/FN0987.json
index 01254215ca4..32a89823dbd 100644
--- a/docs/data/histograms/Korea, Republic of/FN0987.json
+++ b/docs/data/histograms/Korea, Republic of/FN0987.json
@@ -1 +1 @@
-{"batchcode": "FN0987", "histograms": [{"batchcodes": ["FN0987"], "histogram": {"SARS-CoV-2 test": 9, "COVID-19": 8, "Vaccination failure": 6, "Drug ineffective": 3, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FN0987", "histograms": [{"histogram": {"SARS-CoV-2 test": 9, "COVID-19": 8, "Vaccination failure": 6, "Drug ineffective": 3, "Suspected COVID-19": 1}, "batchcodes": ["FN0987"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FN2717.json b/docs/data/histograms/Korea, Republic of/FN2717.json
index 328d91d7b2a..8b642cafbe8 100644
--- a/docs/data/histograms/Korea, Republic of/FN2717.json
+++ b/docs/data/histograms/Korea, Republic of/FN2717.json
@@ -1 +1 @@
-{"batchcode": "FN2717", "histograms": [{"batchcodes": ["FN2717"], "histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Vaccination failure": 3, "Drug ineffective": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2717", "histograms": [{"histogram": {"COVID-19": 4, "SARS-CoV-2 test": 4, "Vaccination failure": 3, "Drug ineffective": 1, "Polymerase chain reaction": 1}, "batchcodes": ["FN2717"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FN2727.json b/docs/data/histograms/Korea, Republic of/FN2727.json
index b394775c6d5..ec7a80f27d5 100644
--- a/docs/data/histograms/Korea, Republic of/FN2727.json
+++ b/docs/data/histograms/Korea, Republic of/FN2727.json
@@ -1 +1 @@
-{"batchcode": "FN2727", "histograms": [{"batchcodes": ["FN2727"], "histogram": {"COVID-19": 4, "Vaccination failure": 4, "SARS-CoV-2 test": 3}}]}
\ No newline at end of file
+{"batchcode": "FN2727", "histograms": [{"histogram": {"COVID-19": 4, "Vaccination failure": 4, "SARS-CoV-2 test": 3}, "batchcodes": ["FN2727"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FN5430.json b/docs/data/histograms/Korea, Republic of/FN5430.json
index cada779d0e8..2cff6548c51 100644
--- a/docs/data/histograms/Korea, Republic of/FN5430.json
+++ b/docs/data/histograms/Korea, Republic of/FN5430.json
@@ -1 +1 @@
-{"batchcode": "FN5430", "histograms": [{"batchcodes": ["FN5430"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FN5430", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FN5430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FN987.json b/docs/data/histograms/Korea, Republic of/FN987.json
index 7b564898800..1beddb9695e 100644
--- a/docs/data/histograms/Korea, Republic of/FN987.json
+++ b/docs/data/histograms/Korea, Republic of/FN987.json
@@ -1 +1 @@
-{"batchcode": "FN987", "histograms": [{"batchcodes": ["FN987"], "histogram": {"Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FN987", "histograms": [{"histogram": {"Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Suspected COVID-19": 1}, "batchcodes": ["FN987"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FP7070.json b/docs/data/histograms/Korea, Republic of/FP7070.json
index 296ec1b9539..2889144f4f2 100644
--- a/docs/data/histograms/Korea, Republic of/FP7070.json
+++ b/docs/data/histograms/Korea, Republic of/FP7070.json
@@ -1 +1 @@
-{"batchcode": "FP7070", "histograms": [{"batchcodes": ["FP7070"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FP7070", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FP7070"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FP8290.json b/docs/data/histograms/Korea, Republic of/FP8290.json
index 346b6561d84..3eadde71491 100644
--- a/docs/data/histograms/Korea, Republic of/FP8290.json
+++ b/docs/data/histograms/Korea, Republic of/FP8290.json
@@ -1 +1 @@
-{"batchcode": "FP8290", "histograms": [{"batchcodes": ["FP8290"], "histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8290", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FP8290"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/FP8795.json b/docs/data/histograms/Korea, Republic of/FP8795.json
index 964a30fa9bd..a680c2201ce 100644
--- a/docs/data/histograms/Korea, Republic of/FP8795.json
+++ b/docs/data/histograms/Korea, Republic of/FP8795.json
@@ -1 +1 @@
-{"batchcode": "FP8795", "histograms": [{"batchcodes": ["FP8795"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8795", "histograms": [{"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["FP8795"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/GE3044.json b/docs/data/histograms/Korea, Republic of/GE3044.json
index 0bef42a98f3..c33bc8d9381 100644
--- a/docs/data/histograms/Korea, Republic of/GE3044.json
+++ b/docs/data/histograms/Korea, Republic of/GE3044.json
@@ -1 +1 @@
-{"batchcode": "GE3044", "histograms": [{"batchcodes": ["GE3044"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "GE3044", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["GE3044"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Korea, Republic of/XE395.json b/docs/data/histograms/Korea, Republic of/XE395.json
index 7ca43dcd8a6..bbcef3af58b 100644
--- a/docs/data/histograms/Korea, Republic of/XE395.json
+++ b/docs/data/histograms/Korea, Republic of/XE395.json
@@ -1 +1 @@
-{"batchcode": "XE395", "histograms": [{"batchcodes": ["XE395"], "histogram": {"Body temperature": 2, "Myalgia": 2, "Pyrexia": 2, "Abdominal pain": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Facial paralysis": 1, "Headache": 1, "Nausea": 1, "Paralysis": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "XE395", "histograms": [{"histogram": {"Body temperature": 2, "Myalgia": 2, "Pyrexia": 2, "Abdominal pain": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Facial paralysis": 1, "Headache": 1, "Nausea": 1, "Paralysis": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["XE395"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kuwait/EN1196.json b/docs/data/histograms/Kuwait/EN1196.json
index 86176c0a591..bc282d1d316 100644
--- a/docs/data/histograms/Kuwait/EN1196.json
+++ b/docs/data/histograms/Kuwait/EN1196.json
@@ -1 +1 @@
-{"batchcode": "EN1196", "histograms": [{"batchcodes": ["EN1196"], "histogram": {"Blood creatine phosphokinase": 1, "COVID-19": 1, "Chest X-ray": 1, "Guillain-Barre syndrome": 1, "Investigation": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1196", "histograms": [{"histogram": {"Blood creatine phosphokinase": 1, "COVID-19": 1, "Chest X-ray": 1, "Guillain-Barre syndrome": 1, "Investigation": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Nerve conduction studies": 1, "Nervous system disorder": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EN1196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kuwait/FF7416.json b/docs/data/histograms/Kuwait/FF7416.json
index 4e1526ae888..aeca930cced 100644
--- a/docs/data/histograms/Kuwait/FF7416.json
+++ b/docs/data/histograms/Kuwait/FF7416.json
@@ -1 +1 @@
-{"batchcode": "FF7416", "histograms": [{"batchcodes": ["FF7416"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Burning sensation": 1, "Chest pain": 1, "Echocardiogram": 1, "Feeling hot": 1, "Headache": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Tendon pain": 1, "Tremor": 1, "Urticaria": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FF7416", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Burning sensation": 1, "Chest pain": 1, "Echocardiogram": 1, "Feeling hot": 1, "Headache": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Tendon pain": 1, "Tremor": 1, "Urticaria": 1, "Vertigo": 1}, "batchcodes": ["FF7416"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Kuwait/FF8199.json b/docs/data/histograms/Kuwait/FF8199.json
index c98ea3a284e..1e3ea7808f1 100644
--- a/docs/data/histograms/Kuwait/FF8199.json
+++ b/docs/data/histograms/Kuwait/FF8199.json
@@ -1 +1 @@
-{"batchcode": "FF8199", "histograms": [{"batchcodes": ["FF8199"], "histogram": {"Arthralgia": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Cough": 1, "Dry mouth": 1, "Dysphagia": 1, "Dyspnoea": 1, "Epistaxis": 1, "Erythema": 1, "Headache": 1, "Heart rate decreased": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Nasal dryness": 1, "Neck pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Swelling face": 1, "Toothache": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8199", "histograms": [{"histogram": {"Arthralgia": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Cough": 1, "Dry mouth": 1, "Dysphagia": 1, "Dyspnoea": 1, "Epistaxis": 1, "Erythema": 1, "Headache": 1, "Heart rate decreased": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Nasal dryness": 1, "Neck pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Swelling face": 1, "Toothache": 1, "Tremor": 1}, "batchcodes": ["FF8199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Lao People's Democratic Republic/205C21A.json b/docs/data/histograms/Lao People's Democratic Republic/205C21A.json
index 696a45bfb80..65cf4457bfe 100644
--- a/docs/data/histograms/Lao People's Democratic Republic/205C21A.json
+++ b/docs/data/histograms/Lao People's Democratic Republic/205C21A.json
@@ -1 +1 @@
-{"batchcode": "205C21A", "histograms": [{"batchcodes": ["205C21A"], "histogram": {"Blood pressure measurement": 6, "Dizziness": 5, "Syncope": 5, "Dyspnoea": 4, "Fatigue": 4, "Chest discomfort": 3, "Heart rate": 3, "Loss of consciousness": 3, "Body temperature": 2, "Muscle spasms": 2, "Nausea": 2, "Pallor": 2, "Peripheral coldness": 2, "Abdominal rigidity": 1, "Acute myocardial infarction": 1, "Anxiety": 1, "Blood pressure decreased": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Death": 1, "Fall": 1, "Head injury": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Respiratory rate": 1, "Shock": 1, "Tremor": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "205C21A", "histograms": [{"histogram": {"Blood pressure measurement": 6, "Dizziness": 5, "Syncope": 5, "Dyspnoea": 4, "Fatigue": 4, "Chest discomfort": 3, "Heart rate": 3, "Loss of consciousness": 3, "Body temperature": 2, "Muscle spasms": 2, "Nausea": 2, "Pallor": 2, "Peripheral coldness": 2, "Abdominal rigidity": 1, "Acute myocardial infarction": 1, "Anxiety": 1, "Blood pressure decreased": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Death": 1, "Fall": 1, "Head injury": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Respiratory rate": 1, "Shock": 1, "Tremor": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["205C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Lao People's Democratic Republic/EW0177.json b/docs/data/histograms/Lao People's Democratic Republic/EW0177.json
index d2da7464320..f6f1b5d3886 100644
--- a/docs/data/histograms/Lao People's Democratic Republic/EW0177.json
+++ b/docs/data/histograms/Lao People's Democratic Republic/EW0177.json
@@ -1 +1 @@
-{"batchcode": "EW0177", "histograms": [{"batchcodes": ["EW0177"], "histogram": {"Chills": 1, "Dyspnoea": 1, "Nausea": 1, "Tremor": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0177", "histograms": [{"histogram": {"Chills": 1, "Dyspnoea": 1, "Nausea": 1, "Tremor": 1, "Urticaria": 1}, "batchcodes": ["EW0177"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Lebanon/ER6166.json b/docs/data/histograms/Lebanon/ER6166.json
index c964bd042b2..faf8952f3ac 100644
--- a/docs/data/histograms/Lebanon/ER6166.json
+++ b/docs/data/histograms/Lebanon/ER6166.json
@@ -1 +1 @@
-{"batchcode": "ER6166", "histograms": [{"batchcodes": ["ER6166"], "histogram": {"Body temperature": 1, "Chills": 1, "Hypertension": 1, "Hypoxia": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Rash": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ER6166", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Hypertension": 1, "Hypoxia": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Rash": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ER6166"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Lebanon/EX 3546.json b/docs/data/histograms/Lebanon/EX 3546.json
index c8d55dc4376..e3c08c18e4c 100644
--- a/docs/data/histograms/Lebanon/EX 3546.json
+++ b/docs/data/histograms/Lebanon/EX 3546.json
@@ -1 +1 @@
-{"batchcode": "EX 3546", "histograms": [{"batchcodes": ["EX 3546"], "histogram": {"Inappropriate schedule of product administration": 1, "Ultrasound Doppler": 1, "Venous thrombosis limb": 1}}]}
\ No newline at end of file
+{"batchcode": "EX 3546", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Ultrasound Doppler": 1, "Venous thrombosis limb": 1}, "batchcodes": ["EX 3546"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Lebanon/FE8087.json b/docs/data/histograms/Lebanon/FE8087.json
index de21ae4fe1d..aa25402f355 100644
--- a/docs/data/histograms/Lebanon/FE8087.json
+++ b/docs/data/histograms/Lebanon/FE8087.json
@@ -1 +1 @@
-{"batchcode": "FE8087", "histograms": [{"batchcodes": ["FE8087"], "histogram": {"Chills": 1, "Dyspnoea": 1, "Eye haemorrhage": 1, "Haemorrhage": 1, "Hypersensitivity": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8087", "histograms": [{"histogram": {"Chills": 1, "Dyspnoea": 1, "Eye haemorrhage": 1, "Haemorrhage": 1, "Hypersensitivity": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["FE8087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Lebanon/FF8111.json b/docs/data/histograms/Lebanon/FF8111.json
index 7d76f91e4e4..71fa2f699b5 100644
--- a/docs/data/histograms/Lebanon/FF8111.json
+++ b/docs/data/histograms/Lebanon/FF8111.json
@@ -1 +1 @@
-{"batchcode": "FF8111", "histograms": [{"batchcodes": ["FF8111"], "histogram": {"Hypotension": 3, "Presyncope": 3, "Blood pressure measurement": 2, "Bradycardia": 1, "Cyanosis": 1, "Eye movement disorder": 1, "Face injury": 1, "Fall": 1, "Heart rate": 1, "Urinary incontinence": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8111", "histograms": [{"histogram": {"Hypotension": 3, "Presyncope": 3, "Blood pressure measurement": 2, "Bradycardia": 1, "Cyanosis": 1, "Eye movement disorder": 1, "Face injury": 1, "Fall": 1, "Heart rate": 1, "Urinary incontinence": 1}, "batchcodes": ["FF8111"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Lebanon/FF8846.json b/docs/data/histograms/Lebanon/FF8846.json
index 47467b19902..8a589e796e6 100644
--- a/docs/data/histograms/Lebanon/FF8846.json
+++ b/docs/data/histograms/Lebanon/FF8846.json
@@ -1 +1 @@
-{"batchcode": "FF8846", "histograms": [{"batchcodes": ["FF8846"], "histogram": {"COVID-19": 1, "Immunisation": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8846", "histograms": [{"histogram": {"COVID-19": 1, "Immunisation": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Vaccination failure": 1}, "batchcodes": ["FF8846"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/00027911.json b/docs/data/histograms/Macao/00027911.json
index ec7757d4e29..a5d02c9f228 100644
--- a/docs/data/histograms/Macao/00027911.json
+++ b/docs/data/histograms/Macao/00027911.json
@@ -1 +1 @@
-{"batchcode": "00027911", "histograms": [{"batchcodes": ["00027911"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "00027911", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1}, "batchcodes": ["00027911"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/001B21A.json b/docs/data/histograms/Macao/001B21A.json
index 5989201b9df..28e07cf99f0 100644
--- a/docs/data/histograms/Macao/001B21A.json
+++ b/docs/data/histograms/Macao/001B21A.json
@@ -1 +1 @@
-{"batchcode": "001B21A", "histograms": [{"batchcodes": ["001B21A"], "histogram": {"Chills": 2, "Hypersomnia": 2, "Pyrexia": 2, "Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Fall": 1, "Hyperhidrosis": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21A", "histograms": [{"histogram": {"Chills": 2, "Hypersomnia": 2, "Pyrexia": 2, "Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Fall": 1, "Hyperhidrosis": 1, "Pain": 1}, "batchcodes": ["001B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/001C21A.json b/docs/data/histograms/Macao/001C21A.json
index f1f5aeffc8f..e828bb1e1d6 100644
--- a/docs/data/histograms/Macao/001C21A.json
+++ b/docs/data/histograms/Macao/001C21A.json
@@ -1 +1 @@
-{"batchcode": "001C21A", "histograms": [{"batchcodes": ["001C21A", "030B21A"], "histogram": {"Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Asthenopia": 1, "Balance disorder": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram head normal": 1, "Confusional state": 1, "Costochondritis": 1, "Decreased appetite": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear inflammation": 1, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoaesthesia teeth": 1, "Magnetic resonance imaging abnormal": 1, "Memory impairment": 1, "Muscle disorder": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain of skin": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Photophobia": 1, "SARS-CoV-2 test negative": 1, "Sensory disturbance": 1, "Somnolence": 1, "Vertigo": 1, "Visual impairment": 1, "X-ray normal": 1}}]}
\ No newline at end of file
+{"batchcode": "001C21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Asthenopia": 1, "Balance disorder": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram head normal": 1, "Confusional state": 1, "Costochondritis": 1, "Decreased appetite": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear inflammation": 1, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoaesthesia teeth": 1, "Magnetic resonance imaging abnormal": 1, "Memory impairment": 1, "Muscle disorder": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain of skin": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Photophobia": 1, "SARS-CoV-2 test negative": 1, "Sensory disturbance": 1, "Somnolence": 1, "Vertigo": 1, "Visual impairment": 1, "X-ray normal": 1}, "batchcodes": ["001C21A", "030B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/001M21A.json b/docs/data/histograms/Macao/001M21A.json
index 10f882848da..3d4fcab8c70 100644
--- a/docs/data/histograms/Macao/001M21A.json
+++ b/docs/data/histograms/Macao/001M21A.json
@@ -1 +1 @@
-{"batchcode": "001M21A", "histograms": [{"batchcodes": ["001M21A"], "histogram": {"Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "001M21A", "histograms": [{"histogram": {"Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["001M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/002A21A.json b/docs/data/histograms/Macao/002A21A.json
index 789461d2754..1f71c4c4f91 100644
--- a/docs/data/histograms/Macao/002A21A.json
+++ b/docs/data/histograms/Macao/002A21A.json
@@ -1 +1 @@
-{"batchcode": "002A21A", "histograms": [{"batchcodes": ["002A21A"], "histogram": {"Headache": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "002A21A", "histograms": [{"histogram": {"Headache": 1, "Vaccination site pain": 1}, "batchcodes": ["002A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/006C2114.json b/docs/data/histograms/Macao/006C2114.json
index 5ee5d646443..c7dcfb93331 100644
--- a/docs/data/histograms/Macao/006C2114.json
+++ b/docs/data/histograms/Macao/006C2114.json
@@ -1 +1 @@
-{"batchcode": "006C2114", "histograms": [{"batchcodes": ["006C2114"], "histogram": {"Feeling hot": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "006C2114", "histograms": [{"histogram": {"Feeling hot": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["006C2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/007M20A.json b/docs/data/histograms/Macao/007M20A.json
index 0985cf559df..44c400fad50 100644
--- a/docs/data/histograms/Macao/007M20A.json
+++ b/docs/data/histograms/Macao/007M20A.json
@@ -1 +1 @@
-{"batchcode": "007M20A", "histograms": [{"batchcodes": ["007M20A"], "histogram": {"Fatigue": 2, "Headache": 2, "Pain": 2, "Arthralgia": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Dyspepsia": 1, "Feeling abnormal": 1, "Gait inability": 1, "Hepatic cancer": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Joint swelling": 1, "Lethargy": 1, "Mobility decreased": 1, "Tachycardia": 1, "Walking aid user": 1, "X-ray limb normal": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Pain": 2, "Arthralgia": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Dyspepsia": 1, "Feeling abnormal": 1, "Gait inability": 1, "Hepatic cancer": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Joint swelling": 1, "Lethargy": 1, "Mobility decreased": 1, "Tachycardia": 1, "Walking aid user": 1, "X-ray limb normal": 1}, "batchcodes": ["007M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/008C21A.json b/docs/data/histograms/Macao/008C21A.json
index f8cf1317b16..173da74e1b8 100644
--- a/docs/data/histograms/Macao/008C21A.json
+++ b/docs/data/histograms/Macao/008C21A.json
@@ -1 +1 @@
-{"batchcode": "008C21A", "histograms": [{"batchcodes": ["008C21A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "008C21A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["008C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/010A21A.json b/docs/data/histograms/Macao/010A21A.json
index 672be1aa076..e94f9ac40b9 100644
--- a/docs/data/histograms/Macao/010A21A.json
+++ b/docs/data/histograms/Macao/010A21A.json
@@ -1 +1 @@
-{"batchcode": "010A21A", "histograms": [{"batchcodes": ["010A21A"], "histogram": {"Vaccination site pain": 2, "Blood glucose": 1, "Injection site pain": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Sexually transmitted disease test": 1, "Streptococcus test": 1, "Ultrasound abdomen": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "010A21A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Blood glucose": 1, "Injection site pain": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Sexually transmitted disease test": 1, "Streptococcus test": 1, "Ultrasound abdomen": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["010A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/011A21A.json b/docs/data/histograms/Macao/011A21A.json
index dd9fd4bf1b6..54e61c95be2 100644
--- a/docs/data/histograms/Macao/011A21A.json
+++ b/docs/data/histograms/Macao/011A21A.json
@@ -1 +1 @@
-{"batchcode": "011A21A", "histograms": [{"batchcodes": ["011A21A"], "histogram": {"Expired product administered": 20, "Product storage error": 2, "Arthralgia": 1, "Headache": 1, "Incorrect dose administered": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21A", "histograms": [{"histogram": {"Expired product administered": 20, "Product storage error": 2, "Arthralgia": 1, "Headache": 1, "Incorrect dose administered": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1}, "batchcodes": ["011A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/011J20A.json b/docs/data/histograms/Macao/011J20A.json
index 990a2b82f29..af02240e175 100644
--- a/docs/data/histograms/Macao/011J20A.json
+++ b/docs/data/histograms/Macao/011J20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A", "histograms": [{"batchcodes": ["011J20A"], "histogram": {"Vaccination site warmth": 2, "Coronavirus test": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "SARS-CoV-2 test positive": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A", "histograms": [{"histogram": {"Vaccination site warmth": 2, "Coronavirus test": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "SARS-CoV-2 test positive": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}, "batchcodes": ["011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/011JQ0A.json b/docs/data/histograms/Macao/011JQ0A.json
index 97c624d3d26..797fa54d59c 100644
--- a/docs/data/histograms/Macao/011JQ0A.json
+++ b/docs/data/histograms/Macao/011JQ0A.json
@@ -1 +1 @@
-{"batchcode": "011JQ0A", "histograms": [{"batchcodes": ["011JQ0A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "011JQ0A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["011JQ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/011L20A.json b/docs/data/histograms/Macao/011L20A.json
index ea6ba256dca..12732c763a8 100644
--- a/docs/data/histograms/Macao/011L20A.json
+++ b/docs/data/histograms/Macao/011L20A.json
@@ -1 +1 @@
-{"batchcode": "011L20A", "histograms": [{"batchcodes": ["011L20A"], "histogram": {"Fatigue": 4, "Nausea": 3, "Pain in extremity": 3, "Headache": 2, "Administration site bruise": 1, "Allergic sinusitis": 1, "Arthralgia": 1, "Asthenia": 1, "Dehydration": 1, "Dizziness": 1, "Dysgeusia": 1, "Ear discomfort": 1, "Eye pruritus": 1, "Feeling hot": 1, "Heart rate": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Influenza like illness": 1, "Malaise": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Pain": 1, "Parosmia": 1, "Pyrexia": 1, "Rash macular": 1, "Rash pruritic": 1, "Swelling": 1, "Throat irritation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011L20A", "histograms": [{"histogram": {"Fatigue": 4, "Nausea": 3, "Pain in extremity": 3, "Headache": 2, "Administration site bruise": 1, "Allergic sinusitis": 1, "Arthralgia": 1, "Asthenia": 1, "Dehydration": 1, "Dizziness": 1, "Dysgeusia": 1, "Ear discomfort": 1, "Eye pruritus": 1, "Feeling hot": 1, "Heart rate": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Influenza like illness": 1, "Malaise": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Pain": 1, "Parosmia": 1, "Pyrexia": 1, "Rash macular": 1, "Rash pruritic": 1, "Swelling": 1, "Throat irritation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["011L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/011M20A.json b/docs/data/histograms/Macao/011M20A.json
index be08f230ece..c185ffb9886 100644
--- a/docs/data/histograms/Macao/011M20A.json
+++ b/docs/data/histograms/Macao/011M20A.json
@@ -1 +1 @@
-{"batchcode": "011M20A", "histograms": [{"batchcodes": ["011M20A"], "histogram": {"Dysphonia": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011M20A", "histograms": [{"histogram": {"Dysphonia": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Rash": 1}, "batchcodes": ["011M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/012A21A.json b/docs/data/histograms/Macao/012A21A.json
index bd056328f2f..2b8a3adbf11 100644
--- a/docs/data/histograms/Macao/012A21A.json
+++ b/docs/data/histograms/Macao/012A21A.json
@@ -1 +1 @@
-{"batchcode": "012A21A", "histograms": [{"batchcodes": ["012A21A"], "histogram": {"Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "012A21A", "histograms": [{"histogram": {"Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["012A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/012L20A.json b/docs/data/histograms/Macao/012L20A.json
index 41ace594a4f..44618b48d6d 100644
--- a/docs/data/histograms/Macao/012L20A.json
+++ b/docs/data/histograms/Macao/012L20A.json
@@ -1 +1 @@
-{"batchcode": "012L20A", "histograms": [{"batchcodes": ["012L20A"], "histogram": {"Maternal exposure during pregnancy": 3, "Pain in extremity": 3, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Heart rate": 1, "Limb discomfort": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pregnancy test": 1, "Presyncope": 1, "Pyrexia": 1, "Ultrasound abdomen": 1, "Vaccination site irritation": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20A", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 3, "Pain in extremity": 3, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Heart rate": 1, "Limb discomfort": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pregnancy test": 1, "Presyncope": 1, "Pyrexia": 1, "Ultrasound abdomen": 1, "Vaccination site irritation": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["012L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/012M20A.json b/docs/data/histograms/Macao/012M20A.json
index 8d3c74c6413..0e9652d259d 100644
--- a/docs/data/histograms/Macao/012M20A.json
+++ b/docs/data/histograms/Macao/012M20A.json
@@ -1 +1 @@
-{"batchcode": "012M20A", "histograms": [{"batchcodes": ["012M20A"], "histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["012M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/013L20A.json b/docs/data/histograms/Macao/013L20A.json
index 902141b3166..1e04443953c 100644
--- a/docs/data/histograms/Macao/013L20A.json
+++ b/docs/data/histograms/Macao/013L20A.json
@@ -1 +1 @@
-{"batchcode": "013L20A", "histograms": [{"batchcodes": ["013L20A"], "histogram": {"Injection site pain": 2, "Body temperature": 1, "Dizziness": 1, "Feeling cold": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersomnia": 1, "Injection site bruising": 1, "Injection site erythema": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20A", "histograms": [{"histogram": {"Injection site pain": 2, "Body temperature": 1, "Dizziness": 1, "Feeling cold": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersomnia": 1, "Injection site bruising": 1, "Injection site erythema": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1}, "batchcodes": ["013L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/013M20A.json b/docs/data/histograms/Macao/013M20A.json
index e4ab9400570..ea7889b9079 100644
--- a/docs/data/histograms/Macao/013M20A.json
+++ b/docs/data/histograms/Macao/013M20A.json
@@ -1 +1 @@
-{"batchcode": "013M20A", "histograms": [{"batchcodes": ["013M20A"], "histogram": {"Arrhythmia": 1, "Balance disorder": 1, "Chest pain": 1, "Fatigue": 1, "Influenza like illness": 1, "Palpitations": 1, "Pruritus": 1, "Tremor": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A", "histograms": [{"histogram": {"Arrhythmia": 1, "Balance disorder": 1, "Chest pain": 1, "Fatigue": 1, "Influenza like illness": 1, "Palpitations": 1, "Pruritus": 1, "Tremor": 1, "Vaccination site rash": 1}, "batchcodes": ["013M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/015M20A.json b/docs/data/histograms/Macao/015M20A.json
index 7921a995de8..2474b291bea 100644
--- a/docs/data/histograms/Macao/015M20A.json
+++ b/docs/data/histograms/Macao/015M20A.json
@@ -1 +1 @@
-{"batchcode": "015M20A", "histograms": [{"batchcodes": ["015M20A"], "histogram": {"Dry skin": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20A", "histograms": [{"histogram": {"Dry skin": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Peripheral swelling": 1}, "batchcodes": ["015M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/016M20A.json b/docs/data/histograms/Macao/016M20A.json
index 2cc6c5d4083..294a993ac87 100644
--- a/docs/data/histograms/Macao/016M20A.json
+++ b/docs/data/histograms/Macao/016M20A.json
@@ -1 +1 @@
-{"batchcode": "016M20A", "histograms": [{"batchcodes": ["016M20A"], "histogram": {"Euphoric mood": 1, "Feeling of relaxation": 1, "Pain": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20A", "histograms": [{"histogram": {"Euphoric mood": 1, "Feeling of relaxation": 1, "Pain": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}, "batchcodes": ["016M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/017B21A.json b/docs/data/histograms/Macao/017B21A.json
index 61c1662ec82..3cae2df19b0 100644
--- a/docs/data/histograms/Macao/017B21A.json
+++ b/docs/data/histograms/Macao/017B21A.json
@@ -1 +1 @@
-{"batchcode": "017B21A", "histograms": [{"batchcodes": ["017B21A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "017B21A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["017B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/0183214.json b/docs/data/histograms/Macao/0183214.json
index 241070ab107..f2d764dd583 100644
--- a/docs/data/histograms/Macao/0183214.json
+++ b/docs/data/histograms/Macao/0183214.json
@@ -1 +1 @@
-{"batchcode": "0183214", "histograms": [{"batchcodes": ["0183214"], "histogram": {"Eye symptom": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "0183214", "histograms": [{"histogram": {"Eye symptom": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["0183214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/018B21A.json b/docs/data/histograms/Macao/018B21A.json
index cc60771443a..b450cc5ed53 100644
--- a/docs/data/histograms/Macao/018B21A.json
+++ b/docs/data/histograms/Macao/018B21A.json
@@ -1 +1 @@
-{"batchcode": "018B21A", "histograms": [{"batchcodes": ["018B21A"], "histogram": {"Dizziness": 2, "Electrocardiogram normal": 1, "Feeling abnormal": 1, "Immediate post-injection reaction": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "018B21A", "histograms": [{"histogram": {"Dizziness": 2, "Electrocardiogram normal": 1, "Feeling abnormal": 1, "Immediate post-injection reaction": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Tinnitus": 1}, "batchcodes": ["018B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/019B21A.json b/docs/data/histograms/Macao/019B21A.json
index b36e180fd28..274d3c09b83 100644
--- a/docs/data/histograms/Macao/019B21A.json
+++ b/docs/data/histograms/Macao/019B21A.json
@@ -1 +1 @@
-{"batchcode": "019B21A", "histograms": [{"batchcodes": ["019B21A"], "histogram": {"Headache": 2, "Asthenia": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Eye pain": 1, "Fatigue": 1, "Heart rate": 1, "Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "019B21A", "histograms": [{"histogram": {"Headache": 2, "Asthenia": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Eye pain": 1, "Fatigue": 1, "Heart rate": 1, "Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["019B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/022M20A.json b/docs/data/histograms/Macao/022M20A.json
index 31f870ae221..5e71d696e8d 100644
--- a/docs/data/histograms/Macao/022M20A.json
+++ b/docs/data/histograms/Macao/022M20A.json
@@ -1 +1 @@
-{"batchcode": "022M20A", "histograms": [{"batchcodes": ["022M20A"], "histogram": {"Blister": 1, "Discomfort": 1, "Erythema": 1, "Nodule": 1, "Pruritus": 1, "Skin lesion inflammation": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "022M20A", "histograms": [{"histogram": {"Blister": 1, "Discomfort": 1, "Erythema": 1, "Nodule": 1, "Pruritus": 1, "Skin lesion inflammation": 1, "Urticaria": 1}, "batchcodes": ["022M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/023M20A.json b/docs/data/histograms/Macao/023M20A.json
index e2757cf875d..b4ae7a65394 100644
--- a/docs/data/histograms/Macao/023M20A.json
+++ b/docs/data/histograms/Macao/023M20A.json
@@ -1 +1 @@
-{"batchcode": "023M20A", "histograms": [{"batchcodes": ["023M20A"], "histogram": {"Full blood count": 1, "Immune thrombocytopenia": 1, "Platelet count": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20A", "histograms": [{"histogram": {"Full blood count": 1, "Immune thrombocytopenia": 1, "Platelet count": 1}, "batchcodes": ["023M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/024M20A.json b/docs/data/histograms/Macao/024M20A.json
index ee9c70d8c95..298c3444e19 100644
--- a/docs/data/histograms/Macao/024M20A.json
+++ b/docs/data/histograms/Macao/024M20A.json
@@ -1 +1 @@
-{"batchcode": "024M20A", "histograms": [{"batchcodes": ["024M20A"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "024M20A", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Vomiting": 1}, "batchcodes": ["024M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/025A20A.json b/docs/data/histograms/Macao/025A20A.json
index 3a23e09fb50..210bd5fc411 100644
--- a/docs/data/histograms/Macao/025A20A.json
+++ b/docs/data/histograms/Macao/025A20A.json
@@ -1 +1 @@
-{"batchcode": "025A20A", "histograms": [{"batchcodes": ["025A20A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025A20A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["025A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/025L20A.json b/docs/data/histograms/Macao/025L20A.json
index 09a7c4b106f..7563c3388ec 100644
--- a/docs/data/histograms/Macao/025L20A.json
+++ b/docs/data/histograms/Macao/025L20A.json
@@ -1 +1 @@
-{"batchcode": "025L20A", "histograms": [{"batchcodes": ["025L20A"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025L20A", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["025L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/026L20A.json b/docs/data/histograms/Macao/026L20A.json
index c245e14e96f..74c389ac08c 100644
--- a/docs/data/histograms/Macao/026L20A.json
+++ b/docs/data/histograms/Macao/026L20A.json
@@ -1 +1 @@
-{"batchcode": "026L20A", "histograms": [{"batchcodes": ["026L20A"], "histogram": {"Pyrexia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Chills": 1, "Headache": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Poor quality sleep": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20A", "histograms": [{"histogram": {"Pyrexia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Chills": 1, "Headache": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Poor quality sleep": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1}, "batchcodes": ["026L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/027A21A.json b/docs/data/histograms/Macao/027A21A.json
index 5e803d37cf5..9eae547db69 100644
--- a/docs/data/histograms/Macao/027A21A.json
+++ b/docs/data/histograms/Macao/027A21A.json
@@ -1 +1 @@
-{"batchcode": "027A21A", "histograms": [{"batchcodes": ["027A21A"], "histogram": {"Arthralgia": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1}, "batchcodes": ["027A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/027L20A.json b/docs/data/histograms/Macao/027L20A.json
index bb6fe17dbd9..80e6800e85b 100644
--- a/docs/data/histograms/Macao/027L20A.json
+++ b/docs/data/histograms/Macao/027L20A.json
@@ -1 +1 @@
-{"batchcode": "027L20A", "histograms": [{"batchcodes": ["027L20A"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "027L20A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1}, "batchcodes": ["027L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/028L20A.json b/docs/data/histograms/Macao/028L20A.json
index b46cf5e98b8..6afd9594709 100644
--- a/docs/data/histograms/Macao/028L20A.json
+++ b/docs/data/histograms/Macao/028L20A.json
@@ -1 +1 @@
-{"batchcode": "028L20A", "histograms": [{"batchcodes": ["028L20A"], "histogram": {"Pruritus": 2, "Rash": 2, "Vaccination site pain": 2, "Back pain": 1, "Blood glucose increased": 1, "Body temperature increased": 1, "Burning sensation": 1, "Ear discomfort": 1, "Eosinophil count": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Monocyte count": 1, "Myalgia": 1, "Nausea": 1, "Platelet count": 1, "Platelet count decreased": 1, "Rash vesicular": 1, "SARS-CoV-2 antibody test": 1, "Urinary incontinence": 1}}]}
\ No newline at end of file
+{"batchcode": "028L20A", "histograms": [{"histogram": {"Pruritus": 2, "Rash": 2, "Vaccination site pain": 2, "Back pain": 1, "Blood glucose increased": 1, "Body temperature increased": 1, "Burning sensation": 1, "Ear discomfort": 1, "Eosinophil count": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Monocyte count": 1, "Myalgia": 1, "Nausea": 1, "Platelet count": 1, "Platelet count decreased": 1, "Rash vesicular": 1, "SARS-CoV-2 antibody test": 1, "Urinary incontinence": 1}, "batchcodes": ["028L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/029K20A.json b/docs/data/histograms/Macao/029K20A.json
index 42b29bb506d..df8b3c40084 100644
--- a/docs/data/histograms/Macao/029K20A.json
+++ b/docs/data/histograms/Macao/029K20A.json
@@ -1 +1 @@
-{"batchcode": "029K20A", "histograms": [{"batchcodes": ["029K20A"], "histogram": {"Anger": 1, "Chest discomfort": 1, "Pain in extremity": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "029K20A", "histograms": [{"histogram": {"Anger": 1, "Chest discomfort": 1, "Pain in extremity": 1, "Vaccination site erythema": 1}, "batchcodes": ["029K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/029L20A.json b/docs/data/histograms/Macao/029L20A.json
index 7fe40482d1d..235db4183d6 100644
--- a/docs/data/histograms/Macao/029L20A.json
+++ b/docs/data/histograms/Macao/029L20A.json
@@ -1 +1 @@
-{"batchcode": "029L20A", "histograms": [{"batchcodes": ["029L20A"], "histogram": {"Headache": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Appetite disorder": 1, "Decreased appetite": 1, "Fatigue": 1, "Pain": 1, "Rash": 1, "Rash pruritic": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20A", "histograms": [{"histogram": {"Headache": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Appetite disorder": 1, "Decreased appetite": 1, "Fatigue": 1, "Pain": 1, "Rash": 1, "Rash pruritic": 1, "Vomiting": 1}, "batchcodes": ["029L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/030B21A.json b/docs/data/histograms/Macao/030B21A.json
index fe8418c08a6..6cb3398440f 100644
--- a/docs/data/histograms/Macao/030B21A.json
+++ b/docs/data/histograms/Macao/030B21A.json
@@ -1 +1 @@
-{"batchcode": "030B21A", "histograms": [{"batchcodes": ["001C21A", "030B21A"], "histogram": {"Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Asthenopia": 1, "Balance disorder": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram head normal": 1, "Confusional state": 1, "Costochondritis": 1, "Decreased appetite": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear inflammation": 1, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoaesthesia teeth": 1, "Magnetic resonance imaging abnormal": 1, "Memory impairment": 1, "Muscle disorder": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain of skin": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Photophobia": 1, "SARS-CoV-2 test negative": 1, "Sensory disturbance": 1, "Somnolence": 1, "Vertigo": 1, "Visual impairment": 1, "X-ray normal": 1}}]}
\ No newline at end of file
+{"batchcode": "030B21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Acute disseminated encephalomyelitis": 1, "Asthenopia": 1, "Balance disorder": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram head normal": 1, "Confusional state": 1, "Costochondritis": 1, "Decreased appetite": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear inflammation": 1, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoaesthesia teeth": 1, "Magnetic resonance imaging abnormal": 1, "Memory impairment": 1, "Muscle disorder": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain of skin": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Photophobia": 1, "SARS-CoV-2 test negative": 1, "Sensory disturbance": 1, "Somnolence": 1, "Vertigo": 1, "Visual impairment": 1, "X-ray normal": 1}, "batchcodes": ["001C21A", "030B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/030L20A.json b/docs/data/histograms/Macao/030L20A.json
index 6be7fcc143d..3e08a69bb5c 100644
--- a/docs/data/histograms/Macao/030L20A.json
+++ b/docs/data/histograms/Macao/030L20A.json
@@ -1 +1 @@
-{"batchcode": "030L20A", "histograms": [{"batchcodes": ["030L20A"], "histogram": {"Chills": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Pain": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20A", "histograms": [{"histogram": {"Chills": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Pain": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["030L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/031B21A.json b/docs/data/histograms/Macao/031B21A.json
index 1ff1b8cfbaf..c80ac6f600b 100644
--- a/docs/data/histograms/Macao/031B21A.json
+++ b/docs/data/histograms/Macao/031B21A.json
@@ -1 +1 @@
-{"batchcode": "031B21A", "histograms": [{"batchcodes": ["031B21A"], "histogram": {"Expired product administered": 2, "Abnormal dreams": 1, "Cough": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Incorrect route of product administration": 1, "No adverse event": 1, "Pain in extremity": 1, "Puncture site haemorrhage": 1, "Underdose": 1, "Vein rupture": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21A", "histograms": [{"histogram": {"Expired product administered": 2, "Abnormal dreams": 1, "Cough": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Incorrect route of product administration": 1, "No adverse event": 1, "Pain in extremity": 1, "Puncture site haemorrhage": 1, "Underdose": 1, "Vein rupture": 1}, "batchcodes": ["031B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/031L20A.json b/docs/data/histograms/Macao/031L20A.json
index be02aeae838..d34f9e23e43 100644
--- a/docs/data/histograms/Macao/031L20A.json
+++ b/docs/data/histograms/Macao/031L20A.json
@@ -1 +1 @@
-{"batchcode": "031L20A", "histograms": [{"batchcodes": ["031L20A"], "histogram": {"Echocardiogram": 2, "Headache": 2, "Hypoxia": 2, "Pleuritic pain": 2, "Pyrexia": 2, "Brain natriuretic peptide": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Lethargy": 1, "Nausea": 1, "Ocular discomfort": 1, "Pain": 1, "Pulmonary hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20A", "histograms": [{"histogram": {"Echocardiogram": 2, "Headache": 2, "Hypoxia": 2, "Pleuritic pain": 2, "Pyrexia": 2, "Brain natriuretic peptide": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Lethargy": 1, "Nausea": 1, "Ocular discomfort": 1, "Pain": 1, "Pulmonary hypertension": 1}, "batchcodes": ["031L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/031M20A.json b/docs/data/histograms/Macao/031M20A.json
index c57a333f3f7..ec55b575968 100644
--- a/docs/data/histograms/Macao/031M20A.json
+++ b/docs/data/histograms/Macao/031M20A.json
@@ -1 +1 @@
-{"batchcode": "031M20A", "histograms": [{"batchcodes": ["031M20A"], "histogram": {"Contusion": 1, "Eye irritation": 1, "Fatigue": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Somnolence": 1, "Taste disorder": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A", "histograms": [{"histogram": {"Contusion": 1, "Eye irritation": 1, "Fatigue": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Somnolence": 1, "Taste disorder": 1, "Vaccination site pain": 1}, "batchcodes": ["031M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/032 L20A.json b/docs/data/histograms/Macao/032 L20A.json
index b7fbdb64254..3545e363126 100644
--- a/docs/data/histograms/Macao/032 L20A.json
+++ b/docs/data/histograms/Macao/032 L20A.json
@@ -1 +1 @@
-{"batchcode": "032 L20A", "histograms": [{"batchcodes": ["032 L20A"], "histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Heart rate": 1, "Hypertension": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "032 L20A", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Heart rate": 1, "Hypertension": 1, "Tachycardia": 1}, "batchcodes": ["032 L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/032L20A.json b/docs/data/histograms/Macao/032L20A.json
index 402e413e854..92def8e3e9c 100644
--- a/docs/data/histograms/Macao/032L20A.json
+++ b/docs/data/histograms/Macao/032L20A.json
@@ -1 +1 @@
-{"batchcode": "032L20A", "histograms": [{"batchcodes": ["032L20A"], "histogram": {"Erythema": 1, "Fatigue": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin warm": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20A", "histograms": [{"histogram": {"Erythema": 1, "Fatigue": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin warm": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["032L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/033F21A.json b/docs/data/histograms/Macao/033F21A.json
index 6c01dd618a7..f45577115c5 100644
--- a/docs/data/histograms/Macao/033F21A.json
+++ b/docs/data/histograms/Macao/033F21A.json
@@ -1 +1 @@
-{"batchcode": "033F21A", "histograms": [{"batchcodes": ["033F21A"], "histogram": {"Asthenia": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Mobility decreased": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "033F21A", "histograms": [{"histogram": {"Asthenia": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Mobility decreased": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["033F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/035C21A.json b/docs/data/histograms/Macao/035C21A.json
index 8e1b9e47154..af6851787a5 100644
--- a/docs/data/histograms/Macao/035C21A.json
+++ b/docs/data/histograms/Macao/035C21A.json
@@ -1 +1 @@
-{"batchcode": "035C21A", "histograms": [{"batchcodes": ["035C21A"], "histogram": {"Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "035C21A", "histograms": [{"histogram": {"Product storage error": 1}, "batchcodes": ["035C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/036B21A.json b/docs/data/histograms/Macao/036B21A.json
index 8f6db2a5da7..00de215034d 100644
--- a/docs/data/histograms/Macao/036B21A.json
+++ b/docs/data/histograms/Macao/036B21A.json
@@ -1 +1 @@
-{"batchcode": "036B21A", "histograms": [{"batchcodes": ["036B21A"], "histogram": {"Feeling hot": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "036B21A", "histograms": [{"histogram": {"Feeling hot": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1}, "batchcodes": ["036B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/037B21A.json b/docs/data/histograms/Macao/037B21A.json
index 0c929210b88..9dc9596f4e9 100644
--- a/docs/data/histograms/Macao/037B21A.json
+++ b/docs/data/histograms/Macao/037B21A.json
@@ -1 +1 @@
-{"batchcode": "037B21A", "histograms": [{"batchcodes": ["037B21A"], "histogram": {"Expired product administered": 3, "Unevaluable event": 1}}]}
\ No newline at end of file
+{"batchcode": "037B21A", "histograms": [{"histogram": {"Expired product administered": 3, "Unevaluable event": 1}, "batchcodes": ["037B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/037K20A.json b/docs/data/histograms/Macao/037K20A.json
index b07cd9a6fac..f28ccd9193f 100644
--- a/docs/data/histograms/Macao/037K20A.json
+++ b/docs/data/histograms/Macao/037K20A.json
@@ -1 +1 @@
-{"batchcode": "037K20A", "histograms": [{"batchcodes": ["037K20A"], "histogram": {"Dizziness": 1, "Eye swelling": 1, "Hypertension": 1, "Paraesthesia oral": 1}}]}
\ No newline at end of file
+{"batchcode": "037K20A", "histograms": [{"histogram": {"Dizziness": 1, "Eye swelling": 1, "Hypertension": 1, "Paraesthesia oral": 1}, "batchcodes": ["037K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/038K20A.json b/docs/data/histograms/Macao/038K20A.json
index 243972fa4f0..f9fc2538a20 100644
--- a/docs/data/histograms/Macao/038K20A.json
+++ b/docs/data/histograms/Macao/038K20A.json
@@ -1 +1 @@
-{"batchcode": "038K20A", "histograms": [{"batchcodes": ["038K20A"], "histogram": {"Peripheral swelling": 2, "Dyspnoea": 1, "Erythema": 1, "Injection site erythema": 1, "Injection site warmth": 1, "Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "038K20A", "histograms": [{"histogram": {"Peripheral swelling": 2, "Dyspnoea": 1, "Erythema": 1, "Injection site erythema": 1, "Injection site warmth": 1, "Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["038K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/039K20-2A.json b/docs/data/histograms/Macao/039K20-2A.json
index abab1657c37..1f8c956b325 100644
--- a/docs/data/histograms/Macao/039K20-2A.json
+++ b/docs/data/histograms/Macao/039K20-2A.json
@@ -1 +1 @@
-{"batchcode": "039K20-2A", "histograms": [{"batchcodes": ["039K20-2A"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Joint range of motion decreased": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Restlessness": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "039K20-2A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Joint range of motion decreased": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Restlessness": 1, "Tremor": 1}, "batchcodes": ["039K20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/039K20A.json b/docs/data/histograms/Macao/039K20A.json
index 34d3ad6bcb5..f920555ff14 100644
--- a/docs/data/histograms/Macao/039K20A.json
+++ b/docs/data/histograms/Macao/039K20A.json
@@ -1 +1 @@
-{"batchcode": "039K20A", "histograms": [{"batchcodes": ["039K20A"], "histogram": {"Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash pruritic": 1, "Stomatitis": 1, "Tongue disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "039K20A", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash pruritic": 1, "Stomatitis": 1, "Tongue disorder": 1}, "batchcodes": ["039K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/040A21A-1.json b/docs/data/histograms/Macao/040A21A-1.json
index d5454334271..03e7c45b9c0 100644
--- a/docs/data/histograms/Macao/040A21A-1.json
+++ b/docs/data/histograms/Macao/040A21A-1.json
@@ -1 +1 @@
-{"batchcode": "040A21A-1", "histograms": [{"batchcodes": ["040A21A-1"], "histogram": {"Back pain": 1, "Chills": 1, "Dysuria": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "040A21A-1", "histograms": [{"histogram": {"Back pain": 1, "Chills": 1, "Dysuria": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["040A21A-1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/040A21A.json b/docs/data/histograms/Macao/040A21A.json
index b8793461a22..2d9793c856b 100644
--- a/docs/data/histograms/Macao/040A21A.json
+++ b/docs/data/histograms/Macao/040A21A.json
@@ -1 +1 @@
-{"batchcode": "040A21A", "histograms": [{"batchcodes": ["040A21A"], "histogram": {"Myelitis transverse": 1, "Paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "040A21A", "histograms": [{"histogram": {"Myelitis transverse": 1, "Paralysis": 1}, "batchcodes": ["040A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/040B21A.json b/docs/data/histograms/Macao/040B21A.json
index f1cc146ed35..91ad56ed6ef 100644
--- a/docs/data/histograms/Macao/040B21A.json
+++ b/docs/data/histograms/Macao/040B21A.json
@@ -1 +1 @@
-{"batchcode": "040B21A", "histograms": [{"batchcodes": ["040B21A"], "histogram": {"Fatigue": 1, "Headache": 1, "Insomnia": 1, "Nightmare": 1, "Pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "040B21A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Insomnia": 1, "Nightmare": 1, "Pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["040B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/041J21A.json b/docs/data/histograms/Macao/041J21A.json
index 2857d0d554b..acad6db2bec 100644
--- a/docs/data/histograms/Macao/041J21A.json
+++ b/docs/data/histograms/Macao/041J21A.json
@@ -1 +1 @@
-{"batchcode": "041J21A", "histograms": [{"batchcodes": ["041J21A"], "histogram": {"Burning sensation": 1, "Pruritus": 1, "Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "041J21A", "histograms": [{"histogram": {"Burning sensation": 1, "Pruritus": 1, "Rash": 1, "Urticaria": 1}, "batchcodes": ["041J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/041L20A.json b/docs/data/histograms/Macao/041L20A.json
index bb4a82ab26a..1019c90b5e4 100644
--- a/docs/data/histograms/Macao/041L20A.json
+++ b/docs/data/histograms/Macao/041L20A.json
@@ -1 +1 @@
-{"batchcode": "041L20A", "histograms": [{"batchcodes": ["041L20A"], "histogram": {"Arthralgia": 1, "COVID-19": 1, "Cough": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "041L20A", "histograms": [{"histogram": {"Arthralgia": 1, "COVID-19": 1, "Cough": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}, "batchcodes": ["041L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/042C20A.json b/docs/data/histograms/Macao/042C20A.json
index 8745f62aae6..31d48efd1e6 100644
--- a/docs/data/histograms/Macao/042C20A.json
+++ b/docs/data/histograms/Macao/042C20A.json
@@ -1 +1 @@
-{"batchcode": "042C20A", "histograms": [{"batchcodes": ["042C20A"], "histogram": {"Exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "042C20A", "histograms": [{"histogram": {"Exposure during pregnancy": 1}, "batchcodes": ["042C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/042L20A.json b/docs/data/histograms/Macao/042L20A.json
index 936e04ef455..c3030a2d3ff 100644
--- a/docs/data/histograms/Macao/042L20A.json
+++ b/docs/data/histograms/Macao/042L20A.json
@@ -1 +1 @@
-{"batchcode": "042L20A", "histograms": [{"batchcodes": ["042L20A"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Fatigue": 1, "Gait disturbance": 1, "Gait inability": 1, "Mobility decreased": 1, "Myalgia": 1, "Pain": 1, "Walking aid user": 1, "X-ray of pelvis and hip abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "042L20A", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Fatigue": 1, "Gait disturbance": 1, "Gait inability": 1, "Mobility decreased": 1, "Myalgia": 1, "Pain": 1, "Walking aid user": 1, "X-ray of pelvis and hip abnormal": 1}, "batchcodes": ["042L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/043B21A.json b/docs/data/histograms/Macao/043B21A.json
index 85d077d3a14..f1d363580b6 100644
--- a/docs/data/histograms/Macao/043B21A.json
+++ b/docs/data/histograms/Macao/043B21A.json
@@ -1 +1 @@
-{"batchcode": "043B21A", "histograms": [{"batchcodes": ["043B21A"], "histogram": {"Carcinoembryonic antigen increased": 1}}]}
\ No newline at end of file
+{"batchcode": "043B21A", "histograms": [{"histogram": {"Carcinoembryonic antigen increased": 1}, "batchcodes": ["043B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/043L20A.json b/docs/data/histograms/Macao/043L20A.json
index 283cdf3f4a7..9a01cbec07a 100644
--- a/docs/data/histograms/Macao/043L20A.json
+++ b/docs/data/histograms/Macao/043L20A.json
@@ -1 +1 @@
-{"batchcode": "043L20A", "histograms": [{"batchcodes": ["043L20A"], "histogram": {"Arthralgia": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "043L20A", "histograms": [{"histogram": {"Arthralgia": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Tenderness": 1}, "batchcodes": ["043L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/046A21A.json b/docs/data/histograms/Macao/046A21A.json
index ca825f4a2b8..c2dec6bb1e8 100644
--- a/docs/data/histograms/Macao/046A21A.json
+++ b/docs/data/histograms/Macao/046A21A.json
@@ -1 +1 @@
-{"batchcode": "046A21A", "histograms": [{"batchcodes": ["046A21A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "046A21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["046A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/046B21A.json b/docs/data/histograms/Macao/046B21A.json
index e3f9bb5252d..63f380a3866 100644
--- a/docs/data/histograms/Macao/046B21A.json
+++ b/docs/data/histograms/Macao/046B21A.json
@@ -1 +1 @@
-{"batchcode": "046B21A", "histograms": [{"batchcodes": ["046B21A"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "046B21A", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["046B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/047A21A.json b/docs/data/histograms/Macao/047A21A.json
index 35b13dd97b1..de241372c1a 100644
--- a/docs/data/histograms/Macao/047A21A.json
+++ b/docs/data/histograms/Macao/047A21A.json
@@ -1 +1 @@
-{"batchcode": "047A21A", "histograms": [{"batchcodes": ["047A21A"], "histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "047A21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["047A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/058A22.json b/docs/data/histograms/Macao/058A22.json
index 6101ad1e4bd..d00a415faf8 100644
--- a/docs/data/histograms/Macao/058A22.json
+++ b/docs/data/histograms/Macao/058A22.json
@@ -1 +1 @@
-{"batchcode": "058A22", "histograms": [{"batchcodes": ["058A22"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "058A22", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["058A22"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/059A21A.json b/docs/data/histograms/Macao/059A21A.json
index cf3395655e1..89ccd8e8c7e 100644
--- a/docs/data/histograms/Macao/059A21A.json
+++ b/docs/data/histograms/Macao/059A21A.json
@@ -1 +1 @@
-{"batchcode": "059A21A", "histograms": [{"batchcodes": ["059A21A"], "histogram": {"Arthralgia": 1, "Death": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "059A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Death": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["059A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/064A22A.json b/docs/data/histograms/Macao/064A22A.json
index 7244056d2d6..16c556a50b2 100644
--- a/docs/data/histograms/Macao/064A22A.json
+++ b/docs/data/histograms/Macao/064A22A.json
@@ -1 +1 @@
-{"batchcode": "064A22A", "histograms": [{"batchcodes": ["064A22A"], "histogram": {"Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "064A22A", "histograms": [{"histogram": {"Incorrect dose administered": 1}, "batchcodes": ["064A22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/AR4504B.json b/docs/data/histograms/Macao/AR4504B.json
index cce59e26db2..203a8df737b 100644
--- a/docs/data/histograms/Macao/AR4504B.json
+++ b/docs/data/histograms/Macao/AR4504B.json
@@ -1 +1 @@
-{"batchcode": "AR4504B", "histograms": [{"batchcodes": ["AR4504B"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "AR4504B", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["AR4504B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/EAU.json b/docs/data/histograms/Macao/EAU.json
index fc62ec52098..baa4f4c3627 100644
--- a/docs/data/histograms/Macao/EAU.json
+++ b/docs/data/histograms/Macao/EAU.json
@@ -1 +1 @@
-{"batchcode": "EAU", "histograms": [{"batchcodes": ["EAU"], "histogram": {"Condition aggravated": 1, "Gout": 1}}]}
\ No newline at end of file
+{"batchcode": "EAU", "histograms": [{"histogram": {"Condition aggravated": 1, "Gout": 1}, "batchcodes": ["EAU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/M0D004M20A.json b/docs/data/histograms/Macao/M0D004M20A.json
index 31f105396ba..df50ab67fd2 100644
--- a/docs/data/histograms/Macao/M0D004M20A.json
+++ b/docs/data/histograms/Macao/M0D004M20A.json
@@ -1 +1 @@
-{"batchcode": "M0D004M20A", "histograms": [{"batchcodes": ["M0D004M20A"], "histogram": {"Erythema": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "M0D004M20A", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["M0D004M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/MOD028L20A.json b/docs/data/histograms/Macao/MOD028L20A.json
index 28bfccf748b..095bfeb62a4 100644
--- a/docs/data/histograms/Macao/MOD028L20A.json
+++ b/docs/data/histograms/Macao/MOD028L20A.json
@@ -1 +1 @@
-{"batchcode": "MOD028L20A", "histograms": [{"batchcodes": ["MOD028L20A"], "histogram": {"Erythema": 1, "Headache": 1, "Pruritus": 1, "Skin warm": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "MOD028L20A", "histograms": [{"histogram": {"Erythema": 1, "Headache": 1, "Pruritus": 1, "Skin warm": 1, "Swelling": 1}, "batchcodes": ["MOD028L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/MODERNA COVID-1.json b/docs/data/histograms/Macao/MODERNA COVID-1.json
index 402bc277c7d..819a5afa66c 100644
--- a/docs/data/histograms/Macao/MODERNA COVID-1.json
+++ b/docs/data/histograms/Macao/MODERNA COVID-1.json
@@ -1 +1 @@
-{"batchcode": "MODERNA COVID-1", "histograms": [{"batchcodes": ["MODERNA COVID-1"], "histogram": {"Nausea": 1, "Pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "MODERNA COVID-1", "histograms": [{"histogram": {"Nausea": 1, "Pain": 1, "Vomiting": 1}, "batchcodes": ["MODERNA COVID-1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/O13M20A.json b/docs/data/histograms/Macao/O13M20A.json
index 2cf3e7f887e..c06f670a0a7 100644
--- a/docs/data/histograms/Macao/O13M20A.json
+++ b/docs/data/histograms/Macao/O13M20A.json
@@ -1 +1 @@
-{"batchcode": "O13M20A", "histograms": [{"batchcodes": ["O13M20A"], "histogram": {"Back pain": 1, "Fatigue": 1, "Listless": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "O13M20A", "histograms": [{"histogram": {"Back pain": 1, "Fatigue": 1, "Listless": 1, "Pain in extremity": 1}, "batchcodes": ["O13M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Macao/OJ20A.json b/docs/data/histograms/Macao/OJ20A.json
index c48fbbf29b6..a4544ed9048 100644
--- a/docs/data/histograms/Macao/OJ20A.json
+++ b/docs/data/histograms/Macao/OJ20A.json
@@ -1 +1 @@
-{"batchcode": "OJ20A", "histograms": [{"batchcodes": ["OJ20A"], "histogram": {"Axillary pain": 1, "Chills": 1, "Inflammation": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "OJ20A", "histograms": [{"histogram": {"Axillary pain": 1, "Chills": 1, "Inflammation": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["OJ20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Madagascar/029K20A.json b/docs/data/histograms/Madagascar/029K20A.json
index 2dbb4f85131..cf249a44844 100644
--- a/docs/data/histograms/Madagascar/029K20A.json
+++ b/docs/data/histograms/Madagascar/029K20A.json
@@ -1 +1 @@
-{"batchcode": "029K20A", "histograms": [{"batchcodes": ["029K20A"], "histogram": {"Body temperature increased": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "029K20A", "histograms": [{"histogram": {"Body temperature increased": 1, "Lymphadenopathy": 1}, "batchcodes": ["029K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/1F1044A.json b/docs/data/histograms/Malaysia/1F1044A.json
index 4eb8bcc9408..afb79544497 100644
--- a/docs/data/histograms/Malaysia/1F1044A.json
+++ b/docs/data/histograms/Malaysia/1F1044A.json
@@ -1 +1 @@
-{"batchcode": "1F1044A", "histograms": [{"batchcodes": ["1F1044A"], "histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1044A", "histograms": [{"histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["1F1044A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/1K077-1A.json b/docs/data/histograms/Malaysia/1K077-1A.json
index 87ee5824a8c..1e44c9e0254 100644
--- a/docs/data/histograms/Malaysia/1K077-1A.json
+++ b/docs/data/histograms/Malaysia/1K077-1A.json
@@ -1 +1 @@
-{"batchcode": "1K077-1A", "histograms": [{"batchcodes": ["1K077-1A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "1K077-1A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["1K077-1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/35559TB.json b/docs/data/histograms/Malaysia/35559TB.json
index 8755f956b01..e1af6e20541 100644
--- a/docs/data/histograms/Malaysia/35559TB.json
+++ b/docs/data/histograms/Malaysia/35559TB.json
@@ -1 +1 @@
-{"batchcode": "35559TB", "histograms": [{"batchcodes": ["35559TB"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "35559TB", "histograms": [{"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["35559TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/A1085.json b/docs/data/histograms/Malaysia/A1085.json
index f47515c9812..a31008f0009 100644
--- a/docs/data/histograms/Malaysia/A1085.json
+++ b/docs/data/histograms/Malaysia/A1085.json
@@ -1 +1 @@
-{"batchcode": "A1085", "histograms": [{"batchcodes": ["A1085"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "A1085", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["A1085"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/EP2163.json b/docs/data/histograms/Malaysia/EP2163.json
index 3c5bada6aeb..3b7c148e459 100644
--- a/docs/data/histograms/Malaysia/EP2163.json
+++ b/docs/data/histograms/Malaysia/EP2163.json
@@ -1 +1 @@
-{"batchcode": "EP2163", "histograms": [{"batchcodes": ["EP2163"], "histogram": {"Activated partial thromboplastin time": 1, "Blood test": 1, "Body mass index": 1, "C-reactive protein": 1, "COVID-19": 1, "Cerebral venous sinus thrombosis": 1, "Coagulation test": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Cough": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Incorrect route of product administration": 1, "Influenza": 1, "International normalised ratio": 1, "Investigation": 1, "Liver function test": 1, "Myalgia": 1, "Neurological examination": 1, "Pain": 1, "Physical examination": 1, "Platelet count": 1, "Prothrombin time": 1, "Pyrexia": 1, "Renal function test": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination failure": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EP2163", "histograms": [{"histogram": {"Activated partial thromboplastin time": 1, "Blood test": 1, "Body mass index": 1, "C-reactive protein": 1, "COVID-19": 1, "Cerebral venous sinus thrombosis": 1, "Coagulation test": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Cough": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Incorrect route of product administration": 1, "Influenza": 1, "International normalised ratio": 1, "Investigation": 1, "Liver function test": 1, "Myalgia": 1, "Neurological examination": 1, "Pain": 1, "Physical examination": 1, "Platelet count": 1, "Prothrombin time": 1, "Pyrexia": 1, "Renal function test": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination failure": 1, "Vaccination site pain": 1}, "batchcodes": ["EP2163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/EP9605.json b/docs/data/histograms/Malaysia/EP9605.json
index e341721e861..6a003ebffb6 100644
--- a/docs/data/histograms/Malaysia/EP9605.json
+++ b/docs/data/histograms/Malaysia/EP9605.json
@@ -1 +1 @@
-{"batchcode": "EP9605", "histograms": [{"batchcodes": ["EP9605"], "histogram": {"Abortion spontaneous": 1, "Activated partial thromboplastin time": 1, "Blood homocysteine": 1, "Body mass index": 1, "C-reactive protein": 1, "Cerebral venous sinus thrombosis": 1, "Coagulation test": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Imaging procedure": 1, "Immunology test": 1, "Inappropriate schedule of product administration": 1, "International normalised ratio": 1, "Liver function test": 1, "Neurological examination": 1, "Overdose": 1, "Platelet count": 1, "Prothrombin time": 1, "Renal function test": 1, "Ultrasound scan": 1, "Venogram": 1}}]}
\ No newline at end of file
+{"batchcode": "EP9605", "histograms": [{"histogram": {"Abortion spontaneous": 1, "Activated partial thromboplastin time": 1, "Blood homocysteine": 1, "Body mass index": 1, "C-reactive protein": 1, "Cerebral venous sinus thrombosis": 1, "Coagulation test": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Imaging procedure": 1, "Immunology test": 1, "Inappropriate schedule of product administration": 1, "International normalised ratio": 1, "Liver function test": 1, "Neurological examination": 1, "Overdose": 1, "Platelet count": 1, "Prothrombin time": 1, "Renal function test": 1, "Ultrasound scan": 1, "Venogram": 1}, "batchcodes": ["EP9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/ET9096.json b/docs/data/histograms/Malaysia/ET9096.json
index 93478010b1c..a76ce6c98ea 100644
--- a/docs/data/histograms/Malaysia/ET9096.json
+++ b/docs/data/histograms/Malaysia/ET9096.json
@@ -1 +1 @@
-{"batchcode": "ET9096", "histograms": [{"batchcodes": ["ET9096"], "histogram": {"Haemorrhagic stroke": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ET9096", "histograms": [{"histogram": {"Haemorrhagic stroke": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ET9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/EW0198.json b/docs/data/histograms/Malaysia/EW0198.json
index d0c34ddb29d..6b04dff5ba6 100644
--- a/docs/data/histograms/Malaysia/EW0198.json
+++ b/docs/data/histograms/Malaysia/EW0198.json
@@ -1 +1 @@
-{"batchcode": "EW0198", "histograms": [{"batchcodes": ["EW0198"], "histogram": {"COVID-19": 1, "Cough": 1, "Facial paralysis": 1, "Headache": 1, "Influenza": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0198", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Facial paralysis": 1, "Headache": 1, "Influenza": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EW0198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/EY0584.json b/docs/data/histograms/Malaysia/EY0584.json
index 92a216e023d..4ef2e03a493 100644
--- a/docs/data/histograms/Malaysia/EY0584.json
+++ b/docs/data/histograms/Malaysia/EY0584.json
@@ -1 +1 @@
-{"batchcode": "EY0584", "histograms": [{"batchcodes": ["EY0584"], "histogram": {"COVID-19": 1, "Influenza": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0584", "histograms": [{"histogram": {"COVID-19": 1, "Influenza": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EY0584"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FC2083.json b/docs/data/histograms/Malaysia/FC2083.json
index 55e96d3da6e..474ba64933d 100644
--- a/docs/data/histograms/Malaysia/FC2083.json
+++ b/docs/data/histograms/Malaysia/FC2083.json
@@ -1 +1 @@
-{"batchcode": "FC2083", "histograms": [{"batchcodes": ["FC2083"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2083", "histograms": [{"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["FC2083"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FE8163.json b/docs/data/histograms/Malaysia/FE8163.json
index 40485b9da67..1427cb40be0 100644
--- a/docs/data/histograms/Malaysia/FE8163.json
+++ b/docs/data/histograms/Malaysia/FE8163.json
@@ -1 +1 @@
-{"batchcode": "FE8163", "histograms": [{"batchcodes": ["FE8163"], "histogram": {"Eczema": 1, "Erythema": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Skin lesion": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8163", "histograms": [{"histogram": {"Eczema": 1, "Erythema": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Skin lesion": 1, "Urticaria": 1}, "batchcodes": ["FE8163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FG1807.json b/docs/data/histograms/Malaysia/FG1807.json
index 0ff02e55803..a1be92c4898 100644
--- a/docs/data/histograms/Malaysia/FG1807.json
+++ b/docs/data/histograms/Malaysia/FG1807.json
@@ -1 +1 @@
-{"batchcode": "FG1807", "histograms": [{"batchcodes": ["FG1807"], "histogram": {"Asthenia": 1, "Atrioventricular block second degree": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Costochondritis": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram ambulatory": 1, "Fall": 1, "Headache": 1, "Hemiparesis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Loss of personal independence in daily activities": 1, "Palpitations": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Transient ischaemic attack": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FG1807", "histograms": [{"histogram": {"Asthenia": 1, "Atrioventricular block second degree": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Costochondritis": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram ambulatory": 1, "Fall": 1, "Headache": 1, "Hemiparesis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Loss of personal independence in daily activities": 1, "Palpitations": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Transient ischaemic attack": 1, "Urticaria": 1}, "batchcodes": ["FG1807"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FH4752.json b/docs/data/histograms/Malaysia/FH4752.json
index b428b8d2585..ec1e48c0499 100644
--- a/docs/data/histograms/Malaysia/FH4752.json
+++ b/docs/data/histograms/Malaysia/FH4752.json
@@ -1 +1 @@
-{"batchcode": "FH4752", "histograms": [{"batchcodes": ["FH4752"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FH4752", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FH4752"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FH8773.json b/docs/data/histograms/Malaysia/FH8773.json
index 91b6b922da3..dac26dc7738 100644
--- a/docs/data/histograms/Malaysia/FH8773.json
+++ b/docs/data/histograms/Malaysia/FH8773.json
@@ -1 +1 @@
-{"batchcode": "FH8773", "histograms": [{"batchcodes": ["FH8773"], "histogram": {"Epilepsy": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8773", "histograms": [{"histogram": {"Epilepsy": 1}, "batchcodes": ["FH8773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FJ1926.json b/docs/data/histograms/Malaysia/FJ1926.json
index 54b5a78e3ea..d679869beb6 100644
--- a/docs/data/histograms/Malaysia/FJ1926.json
+++ b/docs/data/histograms/Malaysia/FJ1926.json
@@ -1 +1 @@
-{"batchcode": "FJ1926", "histograms": [{"batchcodes": ["FJ1926"], "histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1926", "histograms": [{"histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}, "batchcodes": ["FJ1926"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FK6858.json b/docs/data/histograms/Malaysia/FK6858.json
index 11d9beff3e4..86cdd8cc55f 100644
--- a/docs/data/histograms/Malaysia/FK6858.json
+++ b/docs/data/histograms/Malaysia/FK6858.json
@@ -1 +1 @@
-{"batchcode": "FK6858", "histograms": [{"batchcodes": ["FK6858"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6858", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FK6858"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FM3809.json b/docs/data/histograms/Malaysia/FM3809.json
index f5ff0c0542a..d11fe6fe41b 100644
--- a/docs/data/histograms/Malaysia/FM3809.json
+++ b/docs/data/histograms/Malaysia/FM3809.json
@@ -1 +1 @@
-{"batchcode": "FM3809", "histograms": [{"batchcodes": ["FM3809"], "histogram": {"COVID-19": 1, "Cough": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3809", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FM3809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FM9281.json b/docs/data/histograms/Malaysia/FM9281.json
index 6b2bfc3a799..0b55cb4ff42 100644
--- a/docs/data/histograms/Malaysia/FM9281.json
+++ b/docs/data/histograms/Malaysia/FM9281.json
@@ -1 +1 @@
-{"batchcode": "FM9281", "histograms": [{"batchcodes": ["FM9281"], "histogram": {"COVID-19": 6, "SARS-CoV-2 test": 5, "Vaccination failure": 4, "Drug ineffective": 3, "Interchange of vaccine products": 2, "Cough": 1, "Headache": 1, "Lethargy": 1, "Malaise": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FM9281", "histograms": [{"histogram": {"COVID-19": 6, "SARS-CoV-2 test": 5, "Vaccination failure": 4, "Drug ineffective": 3, "Interchange of vaccine products": 2, "Cough": 1, "Headache": 1, "Lethargy": 1, "Malaise": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Suspected COVID-19": 1}, "batchcodes": ["FM9281"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FN4075.json b/docs/data/histograms/Malaysia/FN4075.json
index a5cd6881630..651bf8921c2 100644
--- a/docs/data/histograms/Malaysia/FN4075.json
+++ b/docs/data/histograms/Malaysia/FN4075.json
@@ -1 +1 @@
-{"batchcode": "FN4075", "histograms": [{"batchcodes": ["FN4075"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4075", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["FN4075"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malaysia/FP8233.json b/docs/data/histograms/Malaysia/FP8233.json
index faa22417f1b..46f0fbdb735 100644
--- a/docs/data/histograms/Malaysia/FP8233.json
+++ b/docs/data/histograms/Malaysia/FP8233.json
@@ -1 +1 @@
-{"batchcode": "FP8233", "histograms": [{"batchcodes": ["FP8233"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8233", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FP8233"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mali/EJ1685.json b/docs/data/histograms/Mali/EJ1685.json
index 618be49d21b..d561f1802a3 100644
--- a/docs/data/histograms/Mali/EJ1685.json
+++ b/docs/data/histograms/Mali/EJ1685.json
@@ -1 +1 @@
-{"batchcode": "EJ1685", "histograms": [{"batchcodes": ["EJ1685"], "histogram": {"Nausea": 1, "Sensory disturbance": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ1685", "histograms": [{"histogram": {"Nausea": 1, "Sensory disturbance": 1}, "batchcodes": ["EJ1685"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Malta/FK5618.json b/docs/data/histograms/Malta/FK5618.json
index 68d569ae8c0..6ddde81a3f1 100644
--- a/docs/data/histograms/Malta/FK5618.json
+++ b/docs/data/histograms/Malta/FK5618.json
@@ -1 +1 @@
-{"batchcode": "FK5618", "histograms": [{"batchcodes": ["FK5618"], "histogram": {"Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "FK5618", "histograms": [{"histogram": {"Underdose": 1}, "batchcodes": ["FK5618"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mauritania/012L20A.json b/docs/data/histograms/Mauritania/012L20A.json
index 5c7c7d4e7b6..978b1dc8dff 100644
--- a/docs/data/histograms/Mauritania/012L20A.json
+++ b/docs/data/histograms/Mauritania/012L20A.json
@@ -1 +1 @@
-{"batchcode": "012L20A", "histograms": [{"batchcodes": ["012L20A"], "histogram": {"Blood test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20A", "histograms": [{"histogram": {"Blood test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Injection site pain": 1}, "batchcodes": ["012L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mauritania/1805020.json b/docs/data/histograms/Mauritania/1805020.json
index ce059fcd660..961e0541b60 100644
--- a/docs/data/histograms/Mauritania/1805020.json
+++ b/docs/data/histograms/Mauritania/1805020.json
@@ -1 +1 @@
-{"batchcode": "1805020", "histograms": [{"batchcodes": ["1805020"], "histogram": {"Palpitations": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "1805020", "histograms": [{"histogram": {"Palpitations": 1, "Swelling": 1}, "batchcodes": ["1805020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mauritania/EL9262.json b/docs/data/histograms/Mauritania/EL9262.json
index f8eeebc457a..796a196b6af 100644
--- a/docs/data/histograms/Mauritania/EL9262.json
+++ b/docs/data/histograms/Mauritania/EL9262.json
@@ -1 +1 @@
-{"batchcode": "EL9262", "histograms": [{"batchcodes": ["EL9262"], "histogram": {"Injection site erythema": 1, "Injection site mass": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9262", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site mass": 1, "Injection site warmth": 1}, "batchcodes": ["EL9262"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mauritania/MR3337243.json b/docs/data/histograms/Mauritania/MR3337243.json
index d068d98521b..a56744db14c 100644
--- a/docs/data/histograms/Mauritania/MR3337243.json
+++ b/docs/data/histograms/Mauritania/MR3337243.json
@@ -1 +1 @@
-{"batchcode": "MR3337243", "histograms": [{"batchcodes": ["MR3337243"], "histogram": {"Haemorrhage": 1, "Inflammation": 1, "Peripheral swelling": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "MR3337243", "histograms": [{"histogram": {"Haemorrhage": 1, "Inflammation": 1, "Peripheral swelling": 1, "X-ray": 1}, "batchcodes": ["MR3337243"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/04321A.json b/docs/data/histograms/Mexico/04321A.json
index f1376becb32..42525248b33 100644
--- a/docs/data/histograms/Mexico/04321A.json
+++ b/docs/data/histograms/Mexico/04321A.json
@@ -1 +1 @@
-{"batchcode": "04321A", "histograms": [{"batchcodes": ["04321A"], "histogram": {"Back pain": 1, "Blood test": 1, "Dysgeusia": 1, "Ecchymosis": 1, "Feeling abnormal": 1, "Groin pain": 1, "Injection site pain": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "Therapy non-responder": 1}}]}
\ No newline at end of file
+{"batchcode": "04321A", "histograms": [{"histogram": {"Back pain": 1, "Blood test": 1, "Dysgeusia": 1, "Ecchymosis": 1, "Feeling abnormal": 1, "Groin pain": 1, "Injection site pain": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "SARS-CoV-2 antibody test": 1, "Therapy non-responder": 1}, "batchcodes": ["04321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/043A21A.json b/docs/data/histograms/Mexico/043A21A.json
index 5ba75764426..1cacf34aeaf 100644
--- a/docs/data/histograms/Mexico/043A21A.json
+++ b/docs/data/histograms/Mexico/043A21A.json
@@ -1 +1 @@
-{"batchcode": "043A21A", "histograms": [{"batchcodes": ["043A21A"], "histogram": {"Blood test": 1, "Haemorrhage": 1, "Petechiae": 1, "Platelet count": 1, "Sepsis": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "043A21A", "histograms": [{"histogram": {"Blood test": 1, "Haemorrhage": 1, "Petechiae": 1, "Platelet count": 1, "Sepsis": 1, "Thrombocytopenia": 1}, "batchcodes": ["043A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/068H21A.json b/docs/data/histograms/Mexico/068H21A.json
index f52d1fd3ce4..aca452bb644 100644
--- a/docs/data/histograms/Mexico/068H21A.json
+++ b/docs/data/histograms/Mexico/068H21A.json
@@ -1 +1 @@
-{"batchcode": "068H21A", "histograms": [{"batchcodes": ["068H21A"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "068H21A", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["068H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/1198.json b/docs/data/histograms/Mexico/1198.json
index c3b54e64f3b..b78cf7a8759 100644
--- a/docs/data/histograms/Mexico/1198.json
+++ b/docs/data/histograms/Mexico/1198.json
@@ -1 +1 @@
-{"batchcode": "1198", "histograms": [{"batchcodes": ["1198"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Joint range of motion decreased": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1198", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Joint range of motion decreased": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Vaccination site pain": 1}, "batchcodes": ["1198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/1742.json b/docs/data/histograms/Mexico/1742.json
index 71fcb9b81be..b9522d5ee11 100644
--- a/docs/data/histograms/Mexico/1742.json
+++ b/docs/data/histograms/Mexico/1742.json
@@ -1 +1 @@
-{"batchcode": "1742", "histograms": [{"batchcodes": ["1742"], "histogram": {"Asthenia": 1, "Dermatitis exfoliative generalised": 1, "Dermatosis": 1, "Erythema": 1, "Fatigue": 1, "Inflammation": 1, "Irritability": 1, "Oedema": 1, "Pruritus": 1, "Purpura": 1, "Rash": 1, "Rash maculo-papular": 1}}]}
\ No newline at end of file
+{"batchcode": "1742", "histograms": [{"histogram": {"Asthenia": 1, "Dermatitis exfoliative generalised": 1, "Dermatosis": 1, "Erythema": 1, "Fatigue": 1, "Inflammation": 1, "Irritability": 1, "Oedema": 1, "Pruritus": 1, "Purpura": 1, "Rash": 1, "Rash maculo-papular": 1}, "batchcodes": ["1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/1820096.json b/docs/data/histograms/Mexico/1820096.json
index 443584edee2..0326ae3a9d8 100644
--- a/docs/data/histograms/Mexico/1820096.json
+++ b/docs/data/histograms/Mexico/1820096.json
@@ -1 +1 @@
-{"batchcode": "1820096", "histograms": [{"batchcodes": ["1820096"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Blindness transient": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "1820096", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Blindness transient": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["1820096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/1821282.json b/docs/data/histograms/Mexico/1821282.json
index fe6be36e0d5..c101fa76038 100644
--- a/docs/data/histograms/Mexico/1821282.json
+++ b/docs/data/histograms/Mexico/1821282.json
@@ -1 +1 @@
-{"batchcode": "1821282", "histograms": [{"batchcodes": ["1821282"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Crying": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "1821282", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Crying": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1}, "batchcodes": ["1821282"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/1821286.json b/docs/data/histograms/Mexico/1821286.json
index b07b9458850..856e5bebaae 100644
--- a/docs/data/histograms/Mexico/1821286.json
+++ b/docs/data/histograms/Mexico/1821286.json
@@ -1 +1 @@
-{"batchcode": "1821286", "histograms": [{"batchcodes": ["1821286"], "histogram": {"Thrombotic thrombocytopenic purpura": 1}}]}
\ No newline at end of file
+{"batchcode": "1821286", "histograms": [{"histogram": {"Thrombotic thrombocytopenic purpura": 1}, "batchcodes": ["1821286"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/202106106K.json b/docs/data/histograms/Mexico/202106106K.json
index ecfc88d5764..e421cc80721 100644
--- a/docs/data/histograms/Mexico/202106106K.json
+++ b/docs/data/histograms/Mexico/202106106K.json
@@ -1 +1 @@
-{"batchcode": "202106106K", "histograms": [{"batchcodes": ["202106106K"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "202106106K", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["202106106K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/203A21A.json b/docs/data/histograms/Mexico/203A21A.json
index 25cc47d21d5..d55f461bae2 100644
--- a/docs/data/histograms/Mexico/203A21A.json
+++ b/docs/data/histograms/Mexico/203A21A.json
@@ -1 +1 @@
-{"batchcode": "203A21A", "histograms": [{"batchcodes": ["203A21A"], "histogram": {"Antibody test": 1, "Therapy non-responder": 1}}]}
\ No newline at end of file
+{"batchcode": "203A21A", "histograms": [{"histogram": {"Antibody test": 1, "Therapy non-responder": 1}, "batchcodes": ["203A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/205A21A.json b/docs/data/histograms/Mexico/205A21A.json
index f875c5daa8c..726f13e8160 100644
--- a/docs/data/histograms/Mexico/205A21A.json
+++ b/docs/data/histograms/Mexico/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Burning sensation": 1, "Chest pain": 1, "Headache": 1, "Hot flush": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Burning sensation": 1, "Chest pain": 1, "Headache": 1, "Hot flush": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Thrombosis": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/22125BA.json b/docs/data/histograms/Mexico/22125BA.json
index 1b0bace0013..c5e865528ac 100644
--- a/docs/data/histograms/Mexico/22125BA.json
+++ b/docs/data/histograms/Mexico/22125BA.json
@@ -1 +1 @@
-{"batchcode": "22125BA", "histograms": [{"batchcodes": ["22125BA"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Limb discomfort": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "22125BA", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Limb discomfort": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["22125BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/229125BA.json b/docs/data/histograms/Mexico/229125BA.json
index 5e32f3c12bb..7d230ec21ab 100644
--- a/docs/data/histograms/Mexico/229125BA.json
+++ b/docs/data/histograms/Mexico/229125BA.json
@@ -1 +1 @@
-{"batchcode": "229125BA", "histograms": [{"batchcodes": ["229125BA"], "histogram": {"Asthenia": 1, "Deafness": 1, "Dizziness": 1, "Fatigue": 1, "Hemiparaesthesia": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "229125BA", "histograms": [{"histogram": {"Asthenia": 1, "Deafness": 1, "Dizziness": 1, "Fatigue": 1, "Hemiparaesthesia": 1, "Throat tightness": 1}, "batchcodes": ["229125BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/29/25 BA.json b/docs/data/histograms/Mexico/29/25 BA.json
index b844215e507..5adf8520047 100644
--- a/docs/data/histograms/Mexico/29/25 BA.json
+++ b/docs/data/histograms/Mexico/29/25 BA.json
@@ -1 +1 @@
-{"batchcode": "29/25 BA", "histograms": [{"batchcodes": ["29/25 BA"], "histogram": {"Guillain-Barre syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "29/25 BA", "histograms": [{"histogram": {"Guillain-Barre syndrome": 1}, "batchcodes": ["29/25 BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/291225BA.json b/docs/data/histograms/Mexico/291225BA.json
index 131f0b3445e..6f4f922511f 100644
--- a/docs/data/histograms/Mexico/291225BA.json
+++ b/docs/data/histograms/Mexico/291225BA.json
@@ -1 +1 @@
-{"batchcode": "291225BA", "histograms": [{"batchcodes": ["291225BA"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pharyngitis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "291225BA", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pharyngitis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["291225BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/29125 BA.json b/docs/data/histograms/Mexico/29125 BA.json
index 2be349069b9..6878340fcd6 100644
--- a/docs/data/histograms/Mexico/29125 BA.json
+++ b/docs/data/histograms/Mexico/29125 BA.json
@@ -1 +1 @@
-{"batchcode": "29125 BA", "histograms": [{"batchcodes": ["29125 BA"], "histogram": {"Asthenia": 1, "Cold sweat": 1, "Cough": 1, "Feeling abnormal": 1, "Hypoacusis": 1, "Limb discomfort": 1, "Pallor": 1, "Paraesthesia": 1, "Presyncope": 1, "Throat irritation": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "29125 BA", "histograms": [{"histogram": {"Asthenia": 1, "Cold sweat": 1, "Cough": 1, "Feeling abnormal": 1, "Hypoacusis": 1, "Limb discomfort": 1, "Pallor": 1, "Paraesthesia": 1, "Presyncope": 1, "Throat irritation": 1, "Visual impairment": 1}, "batchcodes": ["29125 BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/291258-A.json b/docs/data/histograms/Mexico/291258-A.json
index 44000d99da8..bf4d288c74c 100644
--- a/docs/data/histograms/Mexico/291258-A.json
+++ b/docs/data/histograms/Mexico/291258-A.json
@@ -1 +1 @@
-{"batchcode": "291258-A", "histograms": [{"batchcodes": ["291258-A"], "histogram": {"Facial paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "291258-A", "histograms": [{"histogram": {"Facial paralysis": 1}, "batchcodes": ["291258-A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/291258A.json b/docs/data/histograms/Mexico/291258A.json
index 76efd2551e1..00a415bd568 100644
--- a/docs/data/histograms/Mexico/291258A.json
+++ b/docs/data/histograms/Mexico/291258A.json
@@ -1 +1 @@
-{"batchcode": "291258A", "histograms": [{"batchcodes": ["291258A"], "histogram": {"Pain": 6, "Sensitive skin": 6, "Asthenia": 3, "Pruritus": 3, "Body temperature": 2, "Erythema": 2, "Fatigue": 2, "Gait disturbance": 2, "Headache": 2, "Hypoaesthesia": 2, "Oedema": 2, "Pain in extremity": 2, "Vaccination error": 2, "Arthralgia": 1, "Body temperature increased": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Dizziness": 1, "Inflammation": 1, "Lip oedema": 1, "Meningitis": 1, "Myalgia": 1, "Nausea": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "291258A", "histograms": [{"histogram": {"Pain": 6, "Sensitive skin": 6, "Asthenia": 3, "Pruritus": 3, "Body temperature": 2, "Erythema": 2, "Fatigue": 2, "Gait disturbance": 2, "Headache": 2, "Hypoaesthesia": 2, "Oedema": 2, "Pain in extremity": 2, "Vaccination error": 2, "Arthralgia": 1, "Body temperature increased": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Dizziness": 1, "Inflammation": 1, "Lip oedema": 1, "Meningitis": 1, "Myalgia": 1, "Nausea": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Vaccination failure": 1}, "batchcodes": ["291258A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/291258CI.json b/docs/data/histograms/Mexico/291258CI.json
index 5bac409b457..954ebb24a46 100644
--- a/docs/data/histograms/Mexico/291258CI.json
+++ b/docs/data/histograms/Mexico/291258CI.json
@@ -1 +1 @@
-{"batchcode": "291258CI", "histograms": [{"batchcodes": ["291258CI"], "histogram": {"Dizziness": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "291258CI", "histograms": [{"histogram": {"Dizziness": 1, "Seizure": 1}, "batchcodes": ["291258CI"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/29125B-A.json b/docs/data/histograms/Mexico/29125B-A.json
index 3a90434433c..49bb59f625d 100644
--- a/docs/data/histograms/Mexico/29125B-A.json
+++ b/docs/data/histograms/Mexico/29125B-A.json
@@ -1 +1 @@
-{"batchcode": "29125B-A", "histograms": [{"batchcodes": ["29125B-A"], "histogram": {"Arthralgia": 1, "COVID-19": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Productive cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "29125B-A", "histograms": [{"histogram": {"Arthralgia": 1, "COVID-19": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Productive cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination failure": 1}, "batchcodes": ["29125B-A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/29125BA.json b/docs/data/histograms/Mexico/29125BA.json
index ea24c5558ee..89c3a329669 100644
--- a/docs/data/histograms/Mexico/29125BA.json
+++ b/docs/data/histograms/Mexico/29125BA.json
@@ -1 +1 @@
-{"batchcode": "29125BA", "histograms": [{"batchcodes": ["29125BA"], "histogram": {"COVID-19": 33, "SARS-CoV-2 test": 31, "Vaccination failure": 27, "Fatigue": 15, "Headache": 14, "Cough": 9, "Drug ineffective": 9, "Pyrexia": 9, "Arthralgia": 8, "Asthenia": 8, "Body temperature": 8, "Myalgia": 8, "Nausea": 8, "Pain": 8, "Respiratory distress": 8, "Dizziness": 7, "Vomiting": 7, "Dyspnoea": 6, "Paraesthesia": 6, "Sensitive skin": 6, "Chills": 5, "Diarrhoea": 5, "Malaise": 5, "Pruritus": 5, "Tachycardia": 5, "Blood pressure measurement": 4, "Chest pain": 4, "Muscular weakness": 4, "Oxygen saturation": 4, "Pain in extremity": 4, "Rash": 4, "Erythema": 3, "Hypotension": 3, "Irritability": 3, "Oropharyngeal pain": 3, "Polymerase chain reaction": 3, "Rhinorrhoea": 3, "Suspected COVID-19": 3, "Back pain": 2, "Body temperature increased": 2, "Condition aggravated": 2, "Glossitis": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Induration": 2, "Inflammation": 2, "Lymphadenopathy": 2, "Nasal congestion": 2, "Nodule": 2, "Oedema": 2, "Oxygen saturation decreased": 2, "Pneumonitis": 2, "Respiratory rate": 2, "Seizure": 2, "Somnolence": 2, "Throat irritation": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Ageusia": 1, "Anosmia": 1, "Bacterial infection": 1, "Bradycardia": 1, "Cardiac disorder": 1, "Cardiac infection": 1, "Cellulitis": 1, "Cheilitis": 1, "Chest discomfort": 1, "Contusion": 1, "Crying": 1, "Decreased appetite": 1, "Dyskinesia": 1, "Dyslalia": 1, "Epistaxis": 1, "Expired product administered": 1, "Eye pain": 1, "Facial paralysis": 1, "Flatulence": 1, "Generalised tonic-clonic seizure": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Lacrimation increased": 1, "Lip oedema": 1, "Maternal exposure during pregnancy": 1, "Miosis": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Neck deformity": 1, "Nervous system disorder": 1, "Neurological decompensation": 1, "Ophthalmoplegia": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Periorbital pain": 1, "Peristalsis visible": 1, "Pharyngitis": 1, "Physical examination": 1, "Productive cough": 1, "Sensation of foreign body": 1, "Sensitisation": 1, "Syncope": 1, "Tongue oedema": 1, "Vaccination site mass": 1, "Vaccination site oedema": 1, "Vaccination site pruritus": 1, "Varicose vein": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "29125BA", "histograms": [{"histogram": {"COVID-19": 33, "SARS-CoV-2 test": 31, "Vaccination failure": 27, "Fatigue": 15, "Headache": 14, "Cough": 9, "Drug ineffective": 9, "Pyrexia": 9, "Arthralgia": 8, "Asthenia": 8, "Body temperature": 8, "Myalgia": 8, "Nausea": 8, "Pain": 8, "Respiratory distress": 8, "Dizziness": 7, "Vomiting": 7, "Dyspnoea": 6, "Paraesthesia": 6, "Sensitive skin": 6, "Chills": 5, "Diarrhoea": 5, "Malaise": 5, "Pruritus": 5, "Tachycardia": 5, "Blood pressure measurement": 4, "Chest pain": 4, "Muscular weakness": 4, "Oxygen saturation": 4, "Pain in extremity": 4, "Rash": 4, "Erythema": 3, "Hypotension": 3, "Irritability": 3, "Oropharyngeal pain": 3, "Polymerase chain reaction": 3, "Rhinorrhoea": 3, "Suspected COVID-19": 3, "Back pain": 2, "Body temperature increased": 2, "Condition aggravated": 2, "Glossitis": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Induration": 2, "Inflammation": 2, "Lymphadenopathy": 2, "Nasal congestion": 2, "Nodule": 2, "Oedema": 2, "Oxygen saturation decreased": 2, "Pneumonitis": 2, "Respiratory rate": 2, "Seizure": 2, "Somnolence": 2, "Throat irritation": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Ageusia": 1, "Anosmia": 1, "Bacterial infection": 1, "Bradycardia": 1, "Cardiac disorder": 1, "Cardiac infection": 1, "Cellulitis": 1, "Cheilitis": 1, "Chest discomfort": 1, "Contusion": 1, "Crying": 1, "Decreased appetite": 1, "Dyskinesia": 1, "Dyslalia": 1, "Epistaxis": 1, "Expired product administered": 1, "Eye pain": 1, "Facial paralysis": 1, "Flatulence": 1, "Generalised tonic-clonic seizure": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Lacrimation increased": 1, "Lip oedema": 1, "Maternal exposure during pregnancy": 1, "Miosis": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Neck deformity": 1, "Nervous system disorder": 1, "Neurological decompensation": 1, "Ophthalmoplegia": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Periorbital pain": 1, "Peristalsis visible": 1, "Pharyngitis": 1, "Physical examination": 1, "Productive cough": 1, "Sensation of foreign body": 1, "Sensitisation": 1, "Syncope": 1, "Tongue oedema": 1, "Vaccination site mass": 1, "Vaccination site oedema": 1, "Vaccination site pruritus": 1, "Varicose vein": 1, "Vertigo": 1}, "batchcodes": ["29125BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/2912BA.json b/docs/data/histograms/Mexico/2912BA.json
index 7e1e46619c3..a9b956d2a1a 100644
--- a/docs/data/histograms/Mexico/2912BA.json
+++ b/docs/data/histograms/Mexico/2912BA.json
@@ -1 +1 @@
-{"batchcode": "2912BA", "histograms": [{"batchcodes": ["2912BA"], "histogram": {"Asthenia": 1, "Dysstasia": 1, "Gait disturbance": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Nausea": 1, "Paraesthesia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "2912BA", "histograms": [{"histogram": {"Asthenia": 1, "Dysstasia": 1, "Gait disturbance": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Nausea": 1, "Paraesthesia": 1, "Pyrexia": 1}, "batchcodes": ["2912BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/291558A.json b/docs/data/histograms/Mexico/291558A.json
index d1d0c69cc46..ec3a1a72c2d 100644
--- a/docs/data/histograms/Mexico/291558A.json
+++ b/docs/data/histograms/Mexico/291558A.json
@@ -1 +1 @@
-{"batchcode": "291558A", "histograms": [{"batchcodes": ["291558A"], "histogram": {"Body temperature": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "291558A", "histograms": [{"histogram": {"Body temperature": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}, "batchcodes": ["291558A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/29185BA.json b/docs/data/histograms/Mexico/29185BA.json
index c1d1bd0ed22..ebb719a1bcf 100644
--- a/docs/data/histograms/Mexico/29185BA.json
+++ b/docs/data/histograms/Mexico/29185BA.json
@@ -1 +1 @@
-{"batchcode": "29185BA", "histograms": [{"batchcodes": ["29185BA"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Cough": 1, "Diarrhoea": 1, "Eye inflammation": 1, "Eye irritation": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Induration": 1, "Irritability": 1, "Lacrimation increased": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "29185BA", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Cough": 1, "Diarrhoea": 1, "Eye inflammation": 1, "Eye irritation": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Induration": 1, "Irritability": 1, "Lacrimation increased": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Vomiting": 1}, "batchcodes": ["29185BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3002.json b/docs/data/histograms/Mexico/3002.json
index 26e472a4bcc..b788deec18f 100644
--- a/docs/data/histograms/Mexico/3002.json
+++ b/docs/data/histograms/Mexico/3002.json
@@ -1 +1 @@
-{"batchcode": "3002", "histograms": [{"batchcodes": ["3002"], "histogram": {"Anxiety": 2, "Bronchospasm": 2, "Dyspnoea": 2, "Respiratory failure": 2, "Syncope": 2, "Tachycardia": 2, "Tachypnoea": 2, "Wheezing": 2, "Anaphylactic shock": 1, "Bradycardia": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "3002", "histograms": [{"histogram": {"Anxiety": 2, "Bronchospasm": 2, "Dyspnoea": 2, "Respiratory failure": 2, "Syncope": 2, "Tachycardia": 2, "Tachypnoea": 2, "Wheezing": 2, "Anaphylactic shock": 1, "Bradycardia": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Respiratory distress": 1}, "batchcodes": ["3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/30150817.json b/docs/data/histograms/Mexico/30150817.json
index 06ea2c154f8..db448af9f54 100644
--- a/docs/data/histograms/Mexico/30150817.json
+++ b/docs/data/histograms/Mexico/30150817.json
@@ -1 +1 @@
-{"batchcode": "30150817", "histograms": [{"batchcodes": ["30150817"], "histogram": {"Bradycardia": 1, "Dizziness": 1, "Headache": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "30150817", "histograms": [{"histogram": {"Bradycardia": 1, "Dizziness": 1, "Headache": 1, "Loss of consciousness": 1}, "batchcodes": ["30150817"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/301508A.json b/docs/data/histograms/Mexico/301508A.json
index a45a90f9845..49c65854a74 100644
--- a/docs/data/histograms/Mexico/301508A.json
+++ b/docs/data/histograms/Mexico/301508A.json
@@ -1 +1 @@
-{"batchcode": "301508A", "histograms": [{"batchcodes": ["301508A"], "histogram": {"Headache": 5, "Asthenia": 4, "Dizziness": 4, "Fatigue": 4, "Blood pressure measurement": 3, "Nausea": 3, "Arthralgia": 2, "Blood pressure increased": 2, "Body temperature": 2, "Bronchospasm": 2, "Chills": 2, "Cough": 2, "Dyspnoea": 2, "Heart rate": 2, "Hypokinesia": 2, "Malaise": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2, "Respiratory distress": 2, "Seizure": 2, "Tachycardia": 2, "Vomiting": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anosmia": 1, "Anxiety": 1, "Blood glucose": 1, "Chest pain": 1, "Crying": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Expired product administered": 1, "Febrile convulsion": 1, "Generalised tonic-clonic seizure": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Indifference": 1, "Induration": 1, "Inflammation": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Nodule": 1, "Odynophagia": 1, "Oedema": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Rash": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Sensitisation": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "301508A", "histograms": [{"histogram": {"Headache": 5, "Asthenia": 4, "Dizziness": 4, "Fatigue": 4, "Blood pressure measurement": 3, "Nausea": 3, "Arthralgia": 2, "Blood pressure increased": 2, "Body temperature": 2, "Bronchospasm": 2, "Chills": 2, "Cough": 2, "Dyspnoea": 2, "Heart rate": 2, "Hypokinesia": 2, "Malaise": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2, "Respiratory distress": 2, "Seizure": 2, "Tachycardia": 2, "Vomiting": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anosmia": 1, "Anxiety": 1, "Blood glucose": 1, "Chest pain": 1, "Crying": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Expired product administered": 1, "Febrile convulsion": 1, "Generalised tonic-clonic seizure": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Indifference": 1, "Induration": 1, "Inflammation": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Nodule": 1, "Odynophagia": 1, "Oedema": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Rash": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Sensitisation": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual analogue scale": 1}, "batchcodes": ["301508A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/30150BA.json b/docs/data/histograms/Mexico/30150BA.json
index 6463f9546f9..c875a48b859 100644
--- a/docs/data/histograms/Mexico/30150BA.json
+++ b/docs/data/histograms/Mexico/30150BA.json
@@ -1 +1 @@
-{"batchcode": "30150BA", "histograms": [{"batchcodes": ["30150BA"], "histogram": {"Headache": 7, "Dizziness": 5, "Nausea": 5, "Erythema": 4, "Pain": 4, "Pruritus": 3, "Rash": 3, "Sensitive skin": 3, "Syncope": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Chills": 2, "Expired product administered": 2, "Hypotension": 2, "Myalgia": 2, "Pyrexia": 2, "Abdominal pain": 1, "Abscess": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure systolic decreased": 1, "Body temperature increased": 1, "Bradycardia": 1, "Condition aggravated": 1, "Cough": 1, "Dermatosis": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Epilepsy": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Inflammation": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Oedema": 1, "Pallor": 1, "Partial seizures": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sensitisation": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "30150BA", "histograms": [{"histogram": {"Headache": 7, "Dizziness": 5, "Nausea": 5, "Erythema": 4, "Pain": 4, "Pruritus": 3, "Rash": 3, "Sensitive skin": 3, "Syncope": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Chills": 2, "Expired product administered": 2, "Hypotension": 2, "Myalgia": 2, "Pyrexia": 2, "Abdominal pain": 1, "Abscess": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure systolic decreased": 1, "Body temperature increased": 1, "Bradycardia": 1, "Condition aggravated": 1, "Cough": 1, "Dermatosis": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Epilepsy": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Inflammation": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Oedema": 1, "Pallor": 1, "Partial seizures": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sensitisation": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["30150BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/30150BR.json b/docs/data/histograms/Mexico/30150BR.json
index 7ff5adf1661..084188c449d 100644
--- a/docs/data/histograms/Mexico/30150BR.json
+++ b/docs/data/histograms/Mexico/30150BR.json
@@ -1 +1 @@
-{"batchcode": "30150BR", "histograms": [{"batchcodes": ["30150BR"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Induration": 1, "Inflammation": 1, "Irritability": 1, "Myalgia": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "30150BR", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Induration": 1, "Inflammation": 1, "Irritability": 1, "Myalgia": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Vaccination site pain": 1}, "batchcodes": ["30150BR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3015BA.json b/docs/data/histograms/Mexico/3015BA.json
index 7cf3752a24e..06fccfcf40b 100644
--- a/docs/data/histograms/Mexico/3015BA.json
+++ b/docs/data/histograms/Mexico/3015BA.json
@@ -1 +1 @@
-{"batchcode": "3015BA", "histograms": [{"batchcodes": ["3015BA"], "histogram": {"Anal sphincter atony": 1, "Bladder sphincter atony": 1, "Blood pressure measurement": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Crepitations": 1, "Cyanosis": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Jugular vein distension": 1, "Nervous system disorder": 1, "Oxygen saturation immeasurable": 1, "Postictal state": 1, "Pupils unequal": 1, "Seizure": 1, "Syncope": 1, "Ventricular fibrillation": 1}}]}
\ No newline at end of file
+{"batchcode": "3015BA", "histograms": [{"histogram": {"Anal sphincter atony": 1, "Bladder sphincter atony": 1, "Blood pressure measurement": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Crepitations": 1, "Cyanosis": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Jugular vein distension": 1, "Nervous system disorder": 1, "Oxygen saturation immeasurable": 1, "Postictal state": 1, "Pupils unequal": 1, "Seizure": 1, "Syncope": 1, "Ventricular fibrillation": 1}, "batchcodes": ["3015BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/303020BD.json b/docs/data/histograms/Mexico/303020BD.json
index 613445a0a62..d9ae1c18913 100644
--- a/docs/data/histograms/Mexico/303020BD.json
+++ b/docs/data/histograms/Mexico/303020BD.json
@@ -1 +1 @@
-{"batchcode": "303020BD", "histograms": [{"batchcodes": ["303020BD"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Hypothermia": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "303020BD", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Hypothermia": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Tachycardia": 1}, "batchcodes": ["303020BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/30450BA.json b/docs/data/histograms/Mexico/30450BA.json
index 8d0567cb923..cc0cec66c23 100644
--- a/docs/data/histograms/Mexico/30450BA.json
+++ b/docs/data/histograms/Mexico/30450BA.json
@@ -1 +1 @@
-{"batchcode": "30450BA", "histograms": [{"batchcodes": ["30450BA"], "histogram": {"Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Erythema": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "30450BA", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Erythema": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Sensitive skin": 1}, "batchcodes": ["30450BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/31025BD.json b/docs/data/histograms/Mexico/31025BD.json
index 9466478bd1f..700267489f8 100644
--- a/docs/data/histograms/Mexico/31025BD.json
+++ b/docs/data/histograms/Mexico/31025BD.json
@@ -1 +1 @@
-{"batchcode": "31025BD", "histograms": [{"batchcodes": ["31025BD"], "histogram": {"Asthmatic crisis": 1, "Bronchospasm": 1, "Dyspnoea": 1, "Expired product administered": 1, "General physical health deterioration": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Nausea": 1, "Pain": 1, "Presyncope": 1, "Respiratory distress": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "31025BD", "histograms": [{"histogram": {"Asthmatic crisis": 1, "Bronchospasm": 1, "Dyspnoea": 1, "Expired product administered": 1, "General physical health deterioration": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Nausea": 1, "Pain": 1, "Presyncope": 1, "Respiratory distress": 1, "Sensitive skin": 1}, "batchcodes": ["31025BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/311308A.json b/docs/data/histograms/Mexico/311308A.json
index d432b1133ef..dc3c6d27681 100644
--- a/docs/data/histograms/Mexico/311308A.json
+++ b/docs/data/histograms/Mexico/311308A.json
@@ -1 +1 @@
-{"batchcode": "311308A", "histograms": [{"batchcodes": ["311308A"], "histogram": {"Asthenia": 1, "Bronchospasm": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Respiratory tract oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "311308A", "histograms": [{"histogram": {"Asthenia": 1, "Bronchospasm": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Respiratory tract oedema": 1}, "batchcodes": ["311308A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/31130BA.json b/docs/data/histograms/Mexico/31130BA.json
index f507cd8a07e..38929b7398a 100644
--- a/docs/data/histograms/Mexico/31130BA.json
+++ b/docs/data/histograms/Mexico/31130BA.json
@@ -1 +1 @@
-{"batchcode": "31130BA", "histograms": [{"batchcodes": ["31130BA"], "histogram": {"Dizziness": 7, "Headache": 4, "Loss of consciousness": 4, "Asthenia": 3, "Blood pressure measurement": 3, "Chills": 3, "Fatigue": 3, "Syncope": 3, "Body temperature": 2, "Diarrhoea": 2, "Heart rate": 2, "Nausea": 2, "Pyrexia": 2, "Seizure": 2, "Tremor": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Blood pressure increased": 1, "Bradycardia": 1, "COVID-19": 1, "Coma scale": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Haemorrhagic disorder": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Lip haemorrhage": 1, "Malaise": 1, "Myalgia": 1, "Odynophagia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Petechiae": 1, "Purpura": 1, "Rash": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Testicular pain": 1, "Thrombocytopenic purpura": 1, "Vaccination failure": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "31130BA", "histograms": [{"histogram": {"Dizziness": 7, "Headache": 4, "Loss of consciousness": 4, "Asthenia": 3, "Blood pressure measurement": 3, "Chills": 3, "Fatigue": 3, "Syncope": 3, "Body temperature": 2, "Diarrhoea": 2, "Heart rate": 2, "Nausea": 2, "Pyrexia": 2, "Seizure": 2, "Tremor": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Blood pressure increased": 1, "Bradycardia": 1, "COVID-19": 1, "Coma scale": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Haemorrhagic disorder": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Lip haemorrhage": 1, "Malaise": 1, "Myalgia": 1, "Odynophagia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Petechiae": 1, "Purpura": 1, "Rash": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Testicular pain": 1, "Thrombocytopenic purpura": 1, "Vaccination failure": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["31130BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/31130VA.json b/docs/data/histograms/Mexico/31130VA.json
index 9c0cd1dc1c7..9bfdc500625 100644
--- a/docs/data/histograms/Mexico/31130VA.json
+++ b/docs/data/histograms/Mexico/31130VA.json
@@ -1 +1 @@
-{"batchcode": "31130VA", "histograms": [{"batchcodes": ["31130VA"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Contusion": 1, "Dizziness": 1, "Heart rate": 1, "Heart rate decreased": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "31130VA", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Contusion": 1, "Dizziness": 1, "Heart rate": 1, "Heart rate decreased": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Wound": 1}, "batchcodes": ["31130VA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/320308D.json b/docs/data/histograms/Mexico/320308D.json
index f3e8d1a8e30..6165b5d5236 100644
--- a/docs/data/histograms/Mexico/320308D.json
+++ b/docs/data/histograms/Mexico/320308D.json
@@ -1 +1 @@
-{"batchcode": "320308D", "histograms": [{"batchcodes": ["320308D"], "histogram": {"Blister": 1, "Eye oedema": 1, "Haemorrhagic disorder": 1, "Oedema mouth": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Rash maculo-papular": 1, "Sensitive skin": 1, "Stevens-Johnson syndrome": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "320308D", "histograms": [{"histogram": {"Blister": 1, "Eye oedema": 1, "Haemorrhagic disorder": 1, "Oedema mouth": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Rash maculo-papular": 1, "Sensitive skin": 1, "Stevens-Johnson syndrome": 1, "Vaccination site pain": 1}, "batchcodes": ["320308D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/330208D.json b/docs/data/histograms/Mexico/330208D.json
index 1c26ea89e16..bf954d6633f 100644
--- a/docs/data/histograms/Mexico/330208D.json
+++ b/docs/data/histograms/Mexico/330208D.json
@@ -1 +1 @@
-{"batchcode": "330208D", "histograms": [{"batchcodes": ["330208D"], "histogram": {"Headache": 10, "Blood pressure measurement": 8, "Dizziness": 8, "Nausea": 8, "Hypotension": 6, "Tachycardia": 6, "Abdominal discomfort": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Body temperature": 1, "Conversion disorder": 1, "Disorientation": 1, "Foreign body in throat": 1, "Gait spastic": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Lethargy": 1, "Myalgia": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Rash": 1, "Respiratory rate": 1, "Seizure": 1, "Syncope": 1, "Tinnitus": 1, "Tremor": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "330208D", "histograms": [{"histogram": {"Headache": 10, "Blood pressure measurement": 8, "Dizziness": 8, "Nausea": 8, "Hypotension": 6, "Tachycardia": 6, "Abdominal discomfort": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Body temperature": 1, "Conversion disorder": 1, "Disorientation": 1, "Foreign body in throat": 1, "Gait spastic": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Lethargy": 1, "Myalgia": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Rash": 1, "Respiratory rate": 1, "Seizure": 1, "Syncope": 1, "Tinnitus": 1, "Tremor": 1, "Vomiting": 1}, "batchcodes": ["330208D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/33020BD.json b/docs/data/histograms/Mexico/33020BD.json
index b6c89af733c..72cb001e7e0 100644
--- a/docs/data/histograms/Mexico/33020BD.json
+++ b/docs/data/histograms/Mexico/33020BD.json
@@ -1 +1 @@
-{"batchcode": "33020BD", "histograms": [{"batchcodes": ["33020BD"], "histogram": {"Dizziness": 2, "Headache": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthenia": 1, "Body temperature": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Chills": 1, "Dyspnoea": 1, "Eyelid oedema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Inflammation": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pyrexia": 1, "Respiratory distress": 1, "Seizure": 1, "Sensitive skin": 1, "Syncope": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "33020BD", "histograms": [{"histogram": {"Dizziness": 2, "Headache": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthenia": 1, "Body temperature": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Chills": 1, "Dyspnoea": 1, "Eyelid oedema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Inflammation": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pyrexia": 1, "Respiratory distress": 1, "Seizure": 1, "Sensitive skin": 1, "Syncope": 1, "Tachycardia": 1}, "batchcodes": ["33020BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3302B0.json b/docs/data/histograms/Mexico/3302B0.json
index c0d8c4dabaf..7154ba56a9f 100644
--- a/docs/data/histograms/Mexico/3302B0.json
+++ b/docs/data/histograms/Mexico/3302B0.json
@@ -1 +1 @@
-{"batchcode": "3302B0", "histograms": [{"batchcodes": ["3302B0"], "histogram": {"Dizziness": 2, "Headache": 2, "Arthralgia": 1, "Asthenia": 1, "Chest discomfort": 1, "Chills": 1, "Diplopia": 1, "Dyspnoea": 1, "Fatigue": 1, "Induration": 1, "Inflammation": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Sleep paralysis": 1, "Visual field defect": 1}}]}
\ No newline at end of file
+{"batchcode": "3302B0", "histograms": [{"histogram": {"Dizziness": 2, "Headache": 2, "Arthralgia": 1, "Asthenia": 1, "Chest discomfort": 1, "Chills": 1, "Diplopia": 1, "Dyspnoea": 1, "Fatigue": 1, "Induration": 1, "Inflammation": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Sleep paralysis": 1, "Visual field defect": 1}, "batchcodes": ["3302B0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3311.json b/docs/data/histograms/Mexico/3311.json
index 224e281e892..ec59832a438 100644
--- a/docs/data/histograms/Mexico/3311.json
+++ b/docs/data/histograms/Mexico/3311.json
@@ -1 +1 @@
-{"batchcode": "3311", "histograms": [{"batchcodes": ["3311"], "histogram": {"Dizziness": 1, "Headache": 1, "Syncope": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "3311", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Syncope": 1, "Vaccination error": 1}, "batchcodes": ["3311"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/331308A.json b/docs/data/histograms/Mexico/331308A.json
index 425d78084ec..cac4eee0494 100644
--- a/docs/data/histograms/Mexico/331308A.json
+++ b/docs/data/histograms/Mexico/331308A.json
@@ -1 +1 @@
-{"batchcode": "331308A", "histograms": [{"batchcodes": ["331308A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "331308A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["331308A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3400308D.json b/docs/data/histograms/Mexico/3400308D.json
index 7c0067f20dd..d23319ed8cd 100644
--- a/docs/data/histograms/Mexico/3400308D.json
+++ b/docs/data/histograms/Mexico/3400308D.json
@@ -1 +1 @@
-{"batchcode": "3400308D", "histograms": [{"batchcodes": ["3400308D"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Paralysis": 1, "Pyrexia": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "3400308D", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Paralysis": 1, "Pyrexia": 1, "Vaccination error": 1}, "batchcodes": ["3400308D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3403080.json b/docs/data/histograms/Mexico/3403080.json
index 5f2f846a4e4..2a9ef724221 100644
--- a/docs/data/histograms/Mexico/3403080.json
+++ b/docs/data/histograms/Mexico/3403080.json
@@ -1 +1 @@
-{"batchcode": "3403080", "histograms": [{"batchcodes": ["3403080"], "histogram": {"COVID-19": 1, "Chest pain": 1, "Dyspnoea": 1, "Pneumothorax spontaneous": 1, "Respiratory distress": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "3403080", "histograms": [{"histogram": {"COVID-19": 1, "Chest pain": 1, "Dyspnoea": 1, "Pneumothorax spontaneous": 1, "Respiratory distress": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["3403080"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/340308D.json b/docs/data/histograms/Mexico/340308D.json
index c36636981f6..da3de9a227d 100644
--- a/docs/data/histograms/Mexico/340308D.json
+++ b/docs/data/histograms/Mexico/340308D.json
@@ -1 +1 @@
-{"batchcode": "340308D", "histograms": [{"batchcodes": ["340308D"], "histogram": {"Vaccination error": 4, "Syncope": 3, "Dizziness": 2, "Arthralgia": 1, "Asthenia": 1, "Haemorrhage": 1, "Head injury": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Peripheral swelling": 1, "Seizure": 1, "Sensitive skin": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "340308D", "histograms": [{"histogram": {"Vaccination error": 4, "Syncope": 3, "Dizziness": 2, "Arthralgia": 1, "Asthenia": 1, "Haemorrhage": 1, "Head injury": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Peripheral swelling": 1, "Seizure": 1, "Sensitive skin": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["340308D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/34030BD.json b/docs/data/histograms/Mexico/34030BD.json
index 3aa3e477a72..cd7ba0ce252 100644
--- a/docs/data/histograms/Mexico/34030BD.json
+++ b/docs/data/histograms/Mexico/34030BD.json
@@ -1 +1 @@
-{"batchcode": "34030BD", "histograms": [{"batchcodes": ["34030BD"], "histogram": {"Vaccination error": 5, "Dizziness": 3, "Headache": 3, "Asthenia": 2, "Dyspnoea": 2, "Pruritus": 2, "Rash": 2, "Respiratory distress": 2, "Syncope": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Erythema": 1, "Eye injury": 1, "Face oedema": 1, "Fall": 1, "Fatigue": 1, "Feeling hot": 1, "Flushing": 1, "Foreign body in respiratory tract": 1, "Haemorrhagic disorder": 1, "Heart rate": 1, "Irritability": 1, "Laryngospasm": 1, "Loss of consciousness": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pelvic pain": 1, "Pyrexia": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "34030BD", "histograms": [{"histogram": {"Vaccination error": 5, "Dizziness": 3, "Headache": 3, "Asthenia": 2, "Dyspnoea": 2, "Pruritus": 2, "Rash": 2, "Respiratory distress": 2, "Syncope": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Erythema": 1, "Eye injury": 1, "Face oedema": 1, "Fall": 1, "Fatigue": 1, "Feeling hot": 1, "Flushing": 1, "Foreign body in respiratory tract": 1, "Haemorrhagic disorder": 1, "Heart rate": 1, "Irritability": 1, "Laryngospasm": 1, "Loss of consciousness": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pelvic pain": 1, "Pyrexia": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["34030BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/35035-BD.json b/docs/data/histograms/Mexico/35035-BD.json
index 597fd27de34..c5b01315f69 100644
--- a/docs/data/histograms/Mexico/35035-BD.json
+++ b/docs/data/histograms/Mexico/35035-BD.json
@@ -1 +1 @@
-{"batchcode": "35035-BD", "histograms": [{"batchcodes": ["35035-BD"], "histogram": {"Depressed level of consciousness": 1, "Dizziness": 1, "Dyspnoea": 1, "Generalised tonic-clonic seizure": 1, "Respiratory distress": 1, "Seizure": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "35035-BD", "histograms": [{"histogram": {"Depressed level of consciousness": 1, "Dizziness": 1, "Dyspnoea": 1, "Generalised tonic-clonic seizure": 1, "Respiratory distress": 1, "Seizure": 1, "Vaccination error": 1}, "batchcodes": ["35035-BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3503513D.json b/docs/data/histograms/Mexico/3503513D.json
index 8cf297deaa2..65e07aeb2bb 100644
--- a/docs/data/histograms/Mexico/3503513D.json
+++ b/docs/data/histograms/Mexico/3503513D.json
@@ -1 +1 @@
-{"batchcode": "3503513D", "histograms": [{"batchcodes": ["3503513D"], "histogram": {"Asthenia": 1, "Ataxia": 1, "Ataxia assessment scale": 1, "Dizziness": 1, "Fall": 1, "Fatigue": 1, "Gait disturbance": 1, "Muscular weakness": 1, "Poverty of speech": 1, "Romberg test": 1, "Romberg test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "3503513D", "histograms": [{"histogram": {"Asthenia": 1, "Ataxia": 1, "Ataxia assessment scale": 1, "Dizziness": 1, "Fall": 1, "Fatigue": 1, "Gait disturbance": 1, "Muscular weakness": 1, "Poverty of speech": 1, "Romberg test": 1, "Romberg test positive": 1}, "batchcodes": ["3503513D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/350358-D.json b/docs/data/histograms/Mexico/350358-D.json
index cd18ce9f979..711ac1e8639 100644
--- a/docs/data/histograms/Mexico/350358-D.json
+++ b/docs/data/histograms/Mexico/350358-D.json
@@ -1 +1 @@
-{"batchcode": "350358-D", "histograms": [{"batchcodes": ["350358-D"], "histogram": {"Asthenia": 1, "Cerebral ischaemia": 1, "Computerised tomogram": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Limb immobilisation": 1, "Myalgia": 1, "Vaccination error": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "350358-D", "histograms": [{"histogram": {"Asthenia": 1, "Cerebral ischaemia": 1, "Computerised tomogram": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Limb immobilisation": 1, "Myalgia": 1, "Vaccination error": 1, "Vomiting": 1}, "batchcodes": ["350358-D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/350358D.json b/docs/data/histograms/Mexico/350358D.json
index 31e8e60cc09..36abfe9e7af 100644
--- a/docs/data/histograms/Mexico/350358D.json
+++ b/docs/data/histograms/Mexico/350358D.json
@@ -1 +1 @@
-{"batchcode": "350358D", "histograms": [{"batchcodes": ["350358D"], "histogram": {"Headache": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthenia": 1, "Clonus": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dyslalia": 1, "Fatigue": 1, "Febrile convulsion": 1, "Hypotonia": 1, "Muscle strength abnormal": 1, "Nausea": 1, "Oxygen saturation": 1, "Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "350358D", "histograms": [{"histogram": {"Headache": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthenia": 1, "Clonus": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dyslalia": 1, "Fatigue": 1, "Febrile convulsion": 1, "Hypotonia": 1, "Muscle strength abnormal": 1, "Nausea": 1, "Oxygen saturation": 1, "Syncope": 1, "Tremor": 1}, "batchcodes": ["350358D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/35035BD.json b/docs/data/histograms/Mexico/35035BD.json
index eff721a32d1..bf3df141a05 100644
--- a/docs/data/histograms/Mexico/35035BD.json
+++ b/docs/data/histograms/Mexico/35035BD.json
@@ -1 +1 @@
-{"batchcode": "35035BD", "histograms": [{"batchcodes": ["35035BD"], "histogram": {"Dizziness": 10, "Vaccination error": 8, "Syncope": 6, "Blood pressure abnormal": 5, "Blood pressure measurement": 5, "Headache": 4, "Oxygen saturation": 4, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Blood glucose": 3, "Fatigue": 3, "Nausea": 3, "Depressed level of consciousness": 2, "Dyspnoea": 2, "Febrile convulsion": 2, "Generalised tonic-clonic seizure": 2, "Investigation": 2, "Myalgia": 2, "Respiratory distress": 2, "Seizure": 2, "Altered state of consciousness": 1, "Arthralgia": 1, "Blood glucose abnormal": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Dermatologic examination": 1, "Haematoma": 1, "Heart rate": 1, "Laboratory test": 1, "Malaise": 1, "Muscle spasticity": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paralysis": 1, "Physical examination": 1, "Pruritus": 1, "Rash": 1, "Skin injury": 1, "Tinnitus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "35035BD", "histograms": [{"histogram": {"Dizziness": 10, "Vaccination error": 8, "Syncope": 6, "Blood pressure abnormal": 5, "Blood pressure measurement": 5, "Headache": 4, "Oxygen saturation": 4, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Blood glucose": 3, "Fatigue": 3, "Nausea": 3, "Depressed level of consciousness": 2, "Dyspnoea": 2, "Febrile convulsion": 2, "Generalised tonic-clonic seizure": 2, "Investigation": 2, "Myalgia": 2, "Respiratory distress": 2, "Seizure": 2, "Altered state of consciousness": 1, "Arthralgia": 1, "Blood glucose abnormal": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Dermatologic examination": 1, "Haematoma": 1, "Heart rate": 1, "Laboratory test": 1, "Malaise": 1, "Muscle spasticity": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paralysis": 1, "Physical examination": 1, "Pruritus": 1, "Rash": 1, "Skin injury": 1, "Tinnitus": 1, "Urticaria": 1}, "batchcodes": ["35035BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3504080.json b/docs/data/histograms/Mexico/3504080.json
index 6408ea7c984..853098ea5bb 100644
--- a/docs/data/histograms/Mexico/3504080.json
+++ b/docs/data/histograms/Mexico/3504080.json
@@ -1 +1 @@
-{"batchcode": "3504080", "histograms": [{"batchcodes": ["3504080"], "histogram": {"Pruritus": 2, "Conjunctival hyperaemia": 1, "Diplopia": 1, "Eye injury": 1, "Eye pain": 1, "Face oedema": 1, "Facial paralysis": 1, "Headache": 1, "Oedema": 1, "Pain": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination error": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "3504080", "histograms": [{"histogram": {"Pruritus": 2, "Conjunctival hyperaemia": 1, "Diplopia": 1, "Eye injury": 1, "Eye pain": 1, "Face oedema": 1, "Facial paralysis": 1, "Headache": 1, "Oedema": 1, "Pain": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination error": 1, "Vertigo": 1}, "batchcodes": ["3504080"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/350408B.json b/docs/data/histograms/Mexico/350408B.json
index bd192939902..0d4bdcf5516 100644
--- a/docs/data/histograms/Mexico/350408B.json
+++ b/docs/data/histograms/Mexico/350408B.json
@@ -1 +1 @@
-{"batchcode": "350408B", "histograms": [{"batchcodes": ["350408B"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "350408B", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination error": 1}, "batchcodes": ["350408B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/350408D.json b/docs/data/histograms/Mexico/350408D.json
index 062bf1ef7ed..0f0d8db1e43 100644
--- a/docs/data/histograms/Mexico/350408D.json
+++ b/docs/data/histograms/Mexico/350408D.json
@@ -1 +1 @@
-{"batchcode": "350408D", "histograms": [{"batchcodes": ["350408D"], "histogram": {"Dyspnoea": 2, "Respiratory distress": 2, "Vaccination error": 2, "Abdominal pain": 1, "Aphasia": 1, "Asthenia": 1, "Body temperature": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hemiparesis": 1, "Hypokinesia": 1, "Hypotension": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nausea": 1, "Paralysis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "350408D", "histograms": [{"histogram": {"Dyspnoea": 2, "Respiratory distress": 2, "Vaccination error": 2, "Abdominal pain": 1, "Aphasia": 1, "Asthenia": 1, "Body temperature": 1, "Cough": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hemiparesis": 1, "Hypokinesia": 1, "Hypotension": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nausea": 1, "Paralysis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Vomiting": 1}, "batchcodes": ["350408D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/35040B0.json b/docs/data/histograms/Mexico/35040B0.json
index 923dd66feb3..ae771650768 100644
--- a/docs/data/histograms/Mexico/35040B0.json
+++ b/docs/data/histograms/Mexico/35040B0.json
@@ -1 +1 @@
-{"batchcode": "35040B0", "histograms": [{"batchcodes": ["35040B0"], "histogram": {"Depressed level of consciousness": 1, "Dizziness": 1, "Eye injury": 1, "Off label use": 1, "Seizure": 1, "Somnolence": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "35040B0", "histograms": [{"histogram": {"Depressed level of consciousness": 1, "Dizziness": 1, "Eye injury": 1, "Off label use": 1, "Seizure": 1, "Somnolence": 1, "Syncope": 1}, "batchcodes": ["35040B0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/35040BD.json b/docs/data/histograms/Mexico/35040BD.json
index eb9def34a82..107c4c79f4e 100644
--- a/docs/data/histograms/Mexico/35040BD.json
+++ b/docs/data/histograms/Mexico/35040BD.json
@@ -1 +1 @@
-{"batchcode": "35040BD", "histograms": [{"batchcodes": ["35040BD"], "histogram": {"Vaccination error": 12, "Dizziness": 9, "Blood pressure measurement": 5, "Headache": 5, "Nausea": 5, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Heart rate": 3, "Oxygen saturation": 3, "Respiratory rate": 3, "Syncope": 3, "Anxiety": 2, "Chills": 2, "Dyspnoea": 2, "Erythema": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Loss of consciousness": 2, "Pyrexia": 2, "Respiratory distress": 2, "Vision blurred": 2, "Abdominal pain": 1, "Arthralgia": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Body temperature": 1, "Bronchospasm": 1, "COVID-19": 1, "Crying": 1, "Dehydration": 1, "Expired product administered": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Hypothermia": 1, "Inflammation": 1, "Irritability": 1, "Lethargy": 1, "Myalgia": 1, "Oedema": 1, "Pain in extremity": 1, "Pallor": 1, "Paralysis": 1, "Product administration error": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "35040BD", "histograms": [{"histogram": {"Vaccination error": 12, "Dizziness": 9, "Blood pressure measurement": 5, "Headache": 5, "Nausea": 5, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Heart rate": 3, "Oxygen saturation": 3, "Respiratory rate": 3, "Syncope": 3, "Anxiety": 2, "Chills": 2, "Dyspnoea": 2, "Erythema": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Loss of consciousness": 2, "Pyrexia": 2, "Respiratory distress": 2, "Vision blurred": 2, "Abdominal pain": 1, "Arthralgia": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Body temperature": 1, "Bronchospasm": 1, "COVID-19": 1, "Crying": 1, "Dehydration": 1, "Expired product administered": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Guillain-Barre syndrome": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Hypothermia": 1, "Inflammation": 1, "Irritability": 1, "Lethargy": 1, "Myalgia": 1, "Oedema": 1, "Pain in extremity": 1, "Pallor": 1, "Paralysis": 1, "Product administration error": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["35040BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3504OBD.json b/docs/data/histograms/Mexico/3504OBD.json
index bb0b8bd527c..659931579c1 100644
--- a/docs/data/histograms/Mexico/3504OBD.json
+++ b/docs/data/histograms/Mexico/3504OBD.json
@@ -1 +1 @@
-{"batchcode": "3504OBD", "histograms": [{"batchcodes": ["3504OBD"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Headache": 1, "Oedema": 1, "Pain": 1, "Seizure": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "3504OBD", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Headache": 1, "Oedema": 1, "Pain": 1, "Seizure": 1, "Sensitive skin": 1}, "batchcodes": ["3504OBD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/3540BD.json b/docs/data/histograms/Mexico/3540BD.json
index 5492544a3ed..1a699391a8b 100644
--- a/docs/data/histograms/Mexico/3540BD.json
+++ b/docs/data/histograms/Mexico/3540BD.json
@@ -1 +1 @@
-{"batchcode": "3540BD", "histograms": [{"batchcodes": ["3540BD"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Crying": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Irritability": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "3540BD", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Crying": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Irritability": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vaccination error": 1}, "batchcodes": ["3540BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/4102023.json b/docs/data/histograms/Mexico/4102023.json
index b1aca843ea8..2097dc07888 100644
--- a/docs/data/histograms/Mexico/4102023.json
+++ b/docs/data/histograms/Mexico/4102023.json
@@ -1 +1 @@
-{"batchcode": "4102023", "histograms": [{"batchcodes": ["4102023"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "4102023", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}, "batchcodes": ["4102023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/41621.json b/docs/data/histograms/Mexico/41621.json
index 2223d51cf04..fceb6c00fc5 100644
--- a/docs/data/histograms/Mexico/41621.json
+++ b/docs/data/histograms/Mexico/41621.json
@@ -1 +1 @@
-{"batchcode": "41621", "histograms": [{"batchcodes": ["41621"], "histogram": {"Asthenia": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Oxygen saturation": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "41621", "histograms": [{"histogram": {"Asthenia": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Oxygen saturation": 1, "Respiratory distress": 1}, "batchcodes": ["41621"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/6775.json b/docs/data/histograms/Mexico/6775.json
index 2be4af4528a..4847fdb7f1d 100644
--- a/docs/data/histograms/Mexico/6775.json
+++ b/docs/data/histograms/Mexico/6775.json
@@ -1 +1 @@
-{"batchcode": "6775", "histograms": [{"batchcodes": ["6775"], "histogram": {"Ear pain": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1}}]}
\ No newline at end of file
+{"batchcode": "6775", "histograms": [{"histogram": {"Ear pain": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1}, "batchcodes": ["6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/7478.json b/docs/data/histograms/Mexico/7478.json
index d08ad61a64f..14f0db95c07 100644
--- a/docs/data/histograms/Mexico/7478.json
+++ b/docs/data/histograms/Mexico/7478.json
@@ -1 +1 @@
-{"batchcode": "7478", "histograms": [{"batchcodes": ["7478"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Respiratory distress": 1, "Vaccination error": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "7478", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Respiratory distress": 1, "Vaccination error": 1, "Vertigo": 1}, "batchcodes": ["7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/77672.json b/docs/data/histograms/Mexico/77672.json
index 1b6bdc3f683..c320fbf27e2 100644
--- a/docs/data/histograms/Mexico/77672.json
+++ b/docs/data/histograms/Mexico/77672.json
@@ -1 +1 @@
-{"batchcode": "77672", "histograms": [{"batchcodes": ["77672"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Crying": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Seizure": 1, "Sensitive skin": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "77672", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Crying": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Seizure": 1, "Sensitive skin": 1, "Vaccination site pain": 1}, "batchcodes": ["77672"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/78186.json b/docs/data/histograms/Mexico/78186.json
index 55393c55f18..398439c4d38 100644
--- a/docs/data/histograms/Mexico/78186.json
+++ b/docs/data/histograms/Mexico/78186.json
@@ -1 +1 @@
-{"batchcode": "78186", "histograms": [{"batchcodes": ["78186"], "histogram": {"Arthralgia": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "78186", "histograms": [{"histogram": {"Arthralgia": 1, "Myalgia": 1}, "batchcodes": ["78186"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/A3086274057.json b/docs/data/histograms/Mexico/A3086274057.json
index 0ed1028cb5b..bf87d5e787c 100644
--- a/docs/data/histograms/Mexico/A3086274057.json
+++ b/docs/data/histograms/Mexico/A3086274057.json
@@ -1 +1 @@
-{"batchcode": "A3086274057", "histograms": [{"batchcodes": ["A3086274057"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypokinesia": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Urinary retention": 1}}]}
\ No newline at end of file
+{"batchcode": "A3086274057", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Hypokinesia": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Urinary retention": 1}, "batchcodes": ["A3086274057"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/A50-30648428.json b/docs/data/histograms/Mexico/A50-30648428.json
index 98340bdc8f4..70cece85c80 100644
--- a/docs/data/histograms/Mexico/A50-30648428.json
+++ b/docs/data/histograms/Mexico/A50-30648428.json
@@ -1 +1 @@
-{"batchcode": "A50-30648428", "histograms": [{"batchcodes": ["A50-30648428"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "A50-30648428", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["A50-30648428"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/AW0198.json b/docs/data/histograms/Mexico/AW0198.json
index 6942cd281df..8305f3fe7b7 100644
--- a/docs/data/histograms/Mexico/AW0198.json
+++ b/docs/data/histograms/Mexico/AW0198.json
@@ -1 +1 @@
-{"batchcode": "AW0198", "histograms": [{"batchcodes": ["AW0198", "I-570821"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["AW0198"], "histogram": {"Chills": 1, "Discomfort": 1, "Fatigue": 1, "Feeling hot": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "AW0198", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["AW0198", "I-570821"]}, {"histogram": {"Chills": 1, "Discomfort": 1, "Fatigue": 1, "Feeling hot": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["AW0198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/B202104036.json b/docs/data/histograms/Mexico/B202104036.json
index e78e5e342db..21891927f91 100644
--- a/docs/data/histograms/Mexico/B202104036.json
+++ b/docs/data/histograms/Mexico/B202104036.json
@@ -1 +1 @@
-{"batchcode": "B202104036", "histograms": [{"batchcodes": ["B202104036"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Thirst": 1}}]}
\ No newline at end of file
+{"batchcode": "B202104036", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Thirst": 1}, "batchcodes": ["B202104036"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/BNT162B2P.json b/docs/data/histograms/Mexico/BNT162B2P.json
index d6740b4f55e..ad283753f7c 100644
--- a/docs/data/histograms/Mexico/BNT162B2P.json
+++ b/docs/data/histograms/Mexico/BNT162B2P.json
@@ -1 +1 @@
-{"batchcode": "BNT162B2P", "histograms": [{"batchcodes": ["BNT162B2P"], "histogram": {"Asthenia": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "BNT162B2P", "histograms": [{"histogram": {"Asthenia": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Syncope": 1}, "batchcodes": ["BNT162B2P"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/CR7934.json b/docs/data/histograms/Mexico/CR7934.json
index 809fe8b1175..7f8d57fa29a 100644
--- a/docs/data/histograms/Mexico/CR7934.json
+++ b/docs/data/histograms/Mexico/CR7934.json
@@ -1 +1 @@
-{"batchcode": "CR7934", "histograms": [{"batchcodes": ["CR7934"], "histogram": {"Anaphylactic shock": 1, "Angioedema": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "CR7934", "histograms": [{"histogram": {"Anaphylactic shock": 1, "Angioedema": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1}, "batchcodes": ["CR7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/DF8813.json b/docs/data/histograms/Mexico/DF8813.json
index a2096296f03..53c27a85e23 100644
--- a/docs/data/histograms/Mexico/DF8813.json
+++ b/docs/data/histograms/Mexico/DF8813.json
@@ -1 +1 @@
-{"batchcode": "DF8813", "histograms": [{"batchcodes": ["DF8813"], "histogram": {"Headache": 1, "Inappropriate schedule of product administration": 1, "Monoplegia": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "DF8813", "histograms": [{"histogram": {"Headache": 1, "Inappropriate schedule of product administration": 1, "Monoplegia": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["DF8813"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/E10579.json b/docs/data/histograms/Mexico/E10579.json
index 81cdd44ddd1..279ee6caa5c 100644
--- a/docs/data/histograms/Mexico/E10579.json
+++ b/docs/data/histograms/Mexico/E10579.json
@@ -1 +1 @@
-{"batchcode": "E10579", "histograms": [{"batchcodes": ["E10579"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Cellulitis": 1, "Dizziness": 1, "Erythema": 1, "Local reaction": 1, "Lymphadenopathy": 1, "Physical examination": 1, "Purpura": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "E10579", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Cellulitis": 1, "Dizziness": 1, "Erythema": 1, "Local reaction": 1, "Lymphadenopathy": 1, "Physical examination": 1, "Purpura": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["E10579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/E10585.json b/docs/data/histograms/Mexico/E10585.json
index b152d51a2c2..dfbd1650985 100644
--- a/docs/data/histograms/Mexico/E10585.json
+++ b/docs/data/histograms/Mexico/E10585.json
@@ -1 +1 @@
-{"batchcode": "E10585", "histograms": [{"batchcodes": ["E10585"], "histogram": {"Angiogram pulmonary": 1, "Blood pressure measurement": 1, "Cough": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypotension": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Presyncope": 1, "Pulmonary embolism": 1, "Respiratory distress": 1, "Syncope": 1, "Tachycardia": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "E10585", "histograms": [{"histogram": {"Angiogram pulmonary": 1, "Blood pressure measurement": 1, "Cough": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypotension": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Presyncope": 1, "Pulmonary embolism": 1, "Respiratory distress": 1, "Syncope": 1, "Tachycardia": 1, "Visual acuity reduced": 1}, "batchcodes": ["E10585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/E1618.json b/docs/data/histograms/Mexico/E1618.json
index 6c405e3d71b..a09601d1a9b 100644
--- a/docs/data/histograms/Mexico/E1618.json
+++ b/docs/data/histograms/Mexico/E1618.json
@@ -1 +1 @@
-{"batchcode": "E1618", "histograms": [{"batchcodes": ["E1618"], "histogram": {"Blood pressure measurement": 1, "Hypertension": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "E1618", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Hypertension": 1, "Nausea": 1}, "batchcodes": ["E1618"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/E21742.json b/docs/data/histograms/Mexico/E21742.json
index b1f9a7f92f7..dde45b36709 100644
--- a/docs/data/histograms/Mexico/E21742.json
+++ b/docs/data/histograms/Mexico/E21742.json
@@ -1 +1 @@
-{"batchcode": "E21742", "histograms": [{"batchcodes": ["E21742"], "histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Hypertension": 1, "Nausea": 1, "Nervousness": 1}}]}
\ No newline at end of file
+{"batchcode": "E21742", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Hypertension": 1, "Nausea": 1, "Nervousness": 1}, "batchcodes": ["E21742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/E40579.json b/docs/data/histograms/Mexico/E40579.json
index 398d41db6cd..d2c0cbe7815 100644
--- a/docs/data/histograms/Mexico/E40579.json
+++ b/docs/data/histograms/Mexico/E40579.json
@@ -1 +1 @@
-{"batchcode": "E40579", "histograms": [{"batchcodes": ["E40579"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypovolaemic shock": 1, "Influenza": 1, "Myalgia": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "E40579", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypovolaemic shock": 1, "Influenza": 1, "Myalgia": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["E40579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/E40585.json b/docs/data/histograms/Mexico/E40585.json
index e9f693c6734..90aec5f31f9 100644
--- a/docs/data/histograms/Mexico/E40585.json
+++ b/docs/data/histograms/Mexico/E40585.json
@@ -1 +1 @@
-{"batchcode": "E40585", "histograms": [{"batchcodes": ["E40585"], "histogram": {"Abdominal pain upper": 1, "Chills": 1, "Condition aggravated": 1, "Cough": 1, "Dysphagia": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Respiratory distress": 1, "Seizure": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "E40585", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Chills": 1, "Condition aggravated": 1, "Cough": 1, "Dysphagia": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Respiratory distress": 1, "Seizure": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["E40585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ECU4105.json b/docs/data/histograms/Mexico/ECU4105.json
index 617084c33cc..953d6f308c5 100644
--- a/docs/data/histograms/Mexico/ECU4105.json
+++ b/docs/data/histograms/Mexico/ECU4105.json
@@ -1 +1 @@
-{"batchcode": "ECU4105", "histograms": [{"batchcodes": ["ECU4105"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Bronchospasm": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Haematochezia": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Purpura": 1, "Rash": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ECU4105", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Bronchospasm": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Haematochezia": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Purpura": 1, "Rash": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["ECU4105"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ED6775.json b/docs/data/histograms/Mexico/ED6775.json
index 8ab381661ae..021290bc071 100644
--- a/docs/data/histograms/Mexico/ED6775.json
+++ b/docs/data/histograms/Mexico/ED6775.json
@@ -1 +1 @@
-{"batchcode": "ED6775", "histograms": [{"batchcodes": ["ED6775"], "histogram": {"Balance disorder": 1, "Dizziness": 1, "Gait disturbance": 1, "Hypotonia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "ED6775", "histograms": [{"histogram": {"Balance disorder": 1, "Dizziness": 1, "Gait disturbance": 1, "Hypotonia": 1, "Paraesthesia": 1}, "batchcodes": ["ED6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EEW0913.json b/docs/data/histograms/Mexico/EEW0913.json
index a82c91602de..899e6bc41d1 100644
--- a/docs/data/histograms/Mexico/EEW0913.json
+++ b/docs/data/histograms/Mexico/EEW0913.json
@@ -1 +1 @@
-{"batchcode": "EEW0913", "histograms": [{"batchcodes": ["EEW0913"], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "EEW0913", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["EEW0913"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EI0579.json b/docs/data/histograms/Mexico/EI0579.json
index fe3056928b3..42df9c2d40b 100644
--- a/docs/data/histograms/Mexico/EI0579.json
+++ b/docs/data/histograms/Mexico/EI0579.json
@@ -1 +1 @@
-{"batchcode": "EI0579", "histograms": [{"batchcodes": ["EI0579"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "EI0579", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["EI0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ 3007.json b/docs/data/histograms/Mexico/EJ 3007.json
index dde04009f60..ba94762d0af 100644
--- a/docs/data/histograms/Mexico/EJ 3007.json
+++ b/docs/data/histograms/Mexico/EJ 3007.json
@@ -1 +1 @@
-{"batchcode": "EJ 3007", "histograms": [{"batchcodes": ["EJ 3007"], "histogram": {"COVID-19": 1, "Computerised tomogram": 1, "Inappropriate schedule of product administration": 1, "Overdose": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ 3007", "histograms": [{"histogram": {"COVID-19": 1, "Computerised tomogram": 1, "Inappropriate schedule of product administration": 1, "Overdose": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EJ 3007"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ-3002.json b/docs/data/histograms/Mexico/EJ-3002.json
index 418a8039cb5..08f54d0fb1c 100644
--- a/docs/data/histograms/Mexico/EJ-3002.json
+++ b/docs/data/histograms/Mexico/EJ-3002.json
@@ -1 +1 @@
-{"batchcode": "EJ-3002", "histograms": [{"batchcodes": ["EJ-3002"], "histogram": {"Headache": 4, "Dizziness": 3, "Oropharyngeal pain": 3, "Pain": 3, "Sensitive skin": 3, "Asthenia": 2, "Fatigue": 2, "Arthralgia": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Eye pain": 1, "Malaise": 1, "Myalgia": 1, "Nasal pruritus": 1, "Nausea": 1, "Pneumonia": 1, "Pruritus": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ-3002", "histograms": [{"histogram": {"Headache": 4, "Dizziness": 3, "Oropharyngeal pain": 3, "Pain": 3, "Sensitive skin": 3, "Asthenia": 2, "Fatigue": 2, "Arthralgia": 1, "Dysaesthesia": 1, "Dyspnoea": 1, "Eye pain": 1, "Malaise": 1, "Myalgia": 1, "Nasal pruritus": 1, "Nausea": 1, "Pneumonia": 1, "Pruritus": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["EJ-3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ2003.json b/docs/data/histograms/Mexico/EJ2003.json
index 719fc7c8cbd..4c2b698338d 100644
--- a/docs/data/histograms/Mexico/EJ2003.json
+++ b/docs/data/histograms/Mexico/EJ2003.json
@@ -1 +1 @@
-{"batchcode": "EJ2003", "histograms": [{"batchcodes": ["EJ2003"], "histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Sensitive skin": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ2003", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Sensitive skin": 1, "Syncope": 1}, "batchcodes": ["EJ2003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ30-02.json b/docs/data/histograms/Mexico/EJ30-02.json
index c110b3896dc..20b4a11d0ed 100644
--- a/docs/data/histograms/Mexico/EJ30-02.json
+++ b/docs/data/histograms/Mexico/EJ30-02.json
@@ -1 +1 @@
-{"batchcode": "EJ30-02", "histograms": [{"batchcodes": ["EJ30-02"], "histogram": {"Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Respiratory distress": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ30-02", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Respiratory distress": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["EJ30-02"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ30002.json b/docs/data/histograms/Mexico/EJ30002.json
index e6b1aa1b411..8d6d33a542d 100644
--- a/docs/data/histograms/Mexico/EJ30002.json
+++ b/docs/data/histograms/Mexico/EJ30002.json
@@ -1 +1 @@
-{"batchcode": "EJ30002", "histograms": [{"batchcodes": ["EJ30002"], "histogram": {"Arthralgia": 1, "Myalgia": 1, "Nausea": 1, "Seizure": 1, "Tachycardia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ30002", "histograms": [{"histogram": {"Arthralgia": 1, "Myalgia": 1, "Nausea": 1, "Seizure": 1, "Tachycardia": 1, "Tinnitus": 1}, "batchcodes": ["EJ30002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ3001.json b/docs/data/histograms/Mexico/EJ3001.json
index be0a7502f4c..b67b0c92444 100644
--- a/docs/data/histograms/Mexico/EJ3001.json
+++ b/docs/data/histograms/Mexico/EJ3001.json
@@ -1 +1 @@
-{"batchcode": "EJ3001", "histograms": [{"batchcodes": ["EJ3001"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain of skin": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ3001", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain of skin": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1}, "batchcodes": ["EJ3001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ3002.json b/docs/data/histograms/Mexico/EJ3002.json
index 3b0ef339a87..7122b635753 100644
--- a/docs/data/histograms/Mexico/EJ3002.json
+++ b/docs/data/histograms/Mexico/EJ3002.json
@@ -1 +1 @@
-{"batchcode": "EJ3002", "histograms": [{"batchcodes": ["EJ3002"], "histogram": {"Headache": 219, "Dizziness": 163, "Asthenia": 162, "Respiratory distress": 159, "Dyspnoea": 157, "Pain": 148, "Myalgia": 129, "Nausea": 126, "Fatigue": 122, "Tachycardia": 117, "Sensitive skin": 115, "Chills": 113, "Arthralgia": 97, "Body temperature": 89, "Pyrexia": 85, "Oropharyngeal pain": 79, "Blood pressure measurement": 69, "Cough": 69, "Rhinorrhoea": 59, "Hypertension": 53, "Oedema": 48, "Rash": 45, "Vaccination site pain": 40, "Erythema": 39, "Pruritus": 38, "Vomiting": 38, "Oxygen saturation": 34, "Nodule": 33, "Abdominal pain": 31, "Inflammation": 31, "Body temperature increased": 29, "Induration": 28, "Diarrhoea": 26, "Heart rate": 26, "Chest pain": 23, "Paraesthesia": 23, "Irritability": 22, "Bronchospasm": 21, "Syncope": 21, "Blood pressure increased": 20, "Hypertensive crisis": 18, "Malaise": 17, "Hypoaesthesia": 16, "Local reaction": 15, "Oxygen saturation decreased": 15, "Anxiety": 14, "Hypotension": 12, "Decreased appetite": 11, "Hyperhidrosis": 11, "Cellulitis": 10, "Muscular weakness": 10, "Seizure": 10, "Vaccination site induration": 10, "Vision blurred": 10, "Anaphylactic shock": 9, "Bradycardia": 9, "Tremor": 9, "Heart rate increased": 8, "Vertigo": 8, "Anaphylactic reaction": 7, "Discomfort": 7, "Eye injury": 7, "Lymphadenopathy": 7, "Neck pain": 7, "Odynophagia": 7, "Palpitations": 7, "Paralysis": 7, "Pneumonia": 7, "SARS-CoV-2 test": 7, "Sensation of foreign body": 7, "Vaccination site hypersensitivity": 7, "Anosmia": 6, "Chest discomfort": 6, "Dysgeusia": 6, "Flushing": 6, "Respiratory rate": 6, "Vaccination error": 6, "Vaccination site warmth": 6, "Back pain": 5, "Crying": 5, "Dry mouth": 5, "Feeling hot": 5, "Hypersensitivity": 5, "Hypothermia": 5, "Investigation": 5, "Off label use": 5, "Pain assessment": 5, "Physical examination": 5, "Product use issue": 5, "Tachypnoea": 5, "Vaccination site erythema": 5, "Abdominal pain upper": 4, "COVID-19": 4, "Facial paralysis": 4, "Febrile convulsion": 4, "Hypokinesia": 4, "Loss of consciousness": 4, "Muscle contractions involuntary": 4, "Vaccination site oedema": 4, "Visual analogue scale": 4, "Blood glucose": 3, "Blood pressure abnormal": 3, "Coma scale": 3, "Conjunctivitis": 3, "Hyperthermia": 3, "Hypovolaemic shock": 3, "Nasopharyngitis": 3, "Oxygen saturation abnormal": 3, "Pain in extremity": 3, "Pallor": 3, "Peripheral coldness": 3, "Pharyngeal paraesthesia": 3, "Photophobia": 3, "Shock": 3, "Urticaria": 3, "Vaccination site cellulitis": 3, "Vaccination site nodule": 3, "Vaccination site reaction": 3, "Vital signs measurement": 3, "Agitation": 2, "Bone pain": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Confusional state": 2, "Depressed level of consciousness": 2, "Dysarthria": 2, "Dysphonia": 2, "Dyspnoea exertional": 2, "Ear pain": 2, "Electrocardiogram": 2, "Eye pain": 2, "Face oedema": 2, "Gait disturbance": 2, "General physical health deterioration": 2, "Heart rate abnormal": 2, "Hemiparaesthesia": 2, "Hemiparesis": 2, "Hypoaesthesia oral": 2, "Hypoventilation": 2, "Laryngeal oedema": 2, "Lip oedema": 2, "Musculoskeletal stiffness": 2, "Nasal congestion": 2, "Oropharyngeal discomfort": 2, "Paraesthesia oral": 2, "Pharyngeal oedema": 2, "Photopsia": 2, "Presyncope": 2, "Sinus tachycardia": 2, "Somnolence": 2, "Suspected COVID-19": 2, "Tension headache": 2, "Throat irritation": 2, "Urinary incontinence": 2, "Vaccination site inflammation": 2, "Abdominal pain lower": 1, "Abnormal faeces": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Aphasia": 1, "Arrhythmia": 1, "Arthropathy": 1, "Asthmatic crisis": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Atypical pneumonia": 1, "Auscultation": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blepharitis": 1, "Blepharospasm": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Body temperature fluctuation": 1, "Bruxism": 1, "Capillary permeability": 1, "Cardiac monitoring": 1, "Chest X-ray normal": 1, "Choking sensation": 1, "Cold sweat": 1, "Conjunctival disorder": 1, "Conjunctival hyperaemia": 1, "Deafness bilateral": 1, "Deafness unilateral": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Epistaxis": 1, "Eye irritation": 1, "Eyelid oedema": 1, "Fall": 1, "Full blood count": 1, "Gastrointestinal hypermotility": 1, "Gastrointestinal motility disorder": 1, "General symptom": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Genital tract inflammation": 1, "Haemorrhagic disorder": 1, "Heart rate irregular": 1, "Hemiplegia": 1, "Hyperaemia": 1, "Hyperaesthesia": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Insomnia": 1, "Intussusception": 1, "Irritability postvaccinal": 1, "Laboratory test normal": 1, "Leukopenia": 1, "Lymphangitis": 1, "Lymphocyte count": 1, "Mobility decreased": 1, "Mucous stools": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Nervousness": 1, "Oral administration complication": 1, "Pain of skin": 1, "Patient elopement": 1, "Pelvic discomfort": 1, "Periorbital oedema": 1, "Persistent depressive disorder": 1, "Pharyngeal erythema": 1, "Pharyngeal hypoaesthesia": 1, "Photosensitivity reaction": 1, "Pigmentation disorder": 1, "Polydipsia": 1, "Productive cough": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Rash maculo-papular": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Respiratory tract infection viral": 1, "Restlessness": 1, "Rhinitis": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Sensitisation": 1, "Sensory loss": 1, "Skin discolouration": 1, "Speech disorder": 1, "Sputum purulent": 1, "Stevens-Johnson syndrome": 1, "Suffocation feeling": 1, "Sweating fever": 1, "Swelling": 1, "Tachyarrhythmia": 1, "Thirst": 1, "Tinnitus": 1, "Traumatic lung injury": 1, "Upper airway obstruction": 1, "Vaccination failure": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Visual acuity reduced": 1, "Visual impairment": 1, "White blood cell agglutination present": 1, "Xerophthalmia": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ3002", "histograms": [{"histogram": {"Headache": 219, "Dizziness": 163, "Asthenia": 162, "Respiratory distress": 159, "Dyspnoea": 157, "Pain": 148, "Myalgia": 129, "Nausea": 126, "Fatigue": 122, "Tachycardia": 117, "Sensitive skin": 115, "Chills": 113, "Arthralgia": 97, "Body temperature": 89, "Pyrexia": 85, "Oropharyngeal pain": 79, "Blood pressure measurement": 69, "Cough": 69, "Rhinorrhoea": 59, "Hypertension": 53, "Oedema": 48, "Rash": 45, "Vaccination site pain": 40, "Erythema": 39, "Pruritus": 38, "Vomiting": 38, "Oxygen saturation": 34, "Nodule": 33, "Abdominal pain": 31, "Inflammation": 31, "Body temperature increased": 29, "Induration": 28, "Diarrhoea": 26, "Heart rate": 26, "Chest pain": 23, "Paraesthesia": 23, "Irritability": 22, "Bronchospasm": 21, "Syncope": 21, "Blood pressure increased": 20, "Hypertensive crisis": 18, "Malaise": 17, "Hypoaesthesia": 16, "Local reaction": 15, "Oxygen saturation decreased": 15, "Anxiety": 14, "Hypotension": 12, "Decreased appetite": 11, "Hyperhidrosis": 11, "Cellulitis": 10, "Muscular weakness": 10, "Seizure": 10, "Vaccination site induration": 10, "Vision blurred": 10, "Anaphylactic shock": 9, "Bradycardia": 9, "Tremor": 9, "Heart rate increased": 8, "Vertigo": 8, "Anaphylactic reaction": 7, "Discomfort": 7, "Eye injury": 7, "Lymphadenopathy": 7, "Neck pain": 7, "Odynophagia": 7, "Palpitations": 7, "Paralysis": 7, "Pneumonia": 7, "SARS-CoV-2 test": 7, "Sensation of foreign body": 7, "Vaccination site hypersensitivity": 7, "Anosmia": 6, "Chest discomfort": 6, "Dysgeusia": 6, "Flushing": 6, "Respiratory rate": 6, "Vaccination error": 6, "Vaccination site warmth": 6, "Back pain": 5, "Crying": 5, "Dry mouth": 5, "Feeling hot": 5, "Hypersensitivity": 5, "Hypothermia": 5, "Investigation": 5, "Off label use": 5, "Pain assessment": 5, "Physical examination": 5, "Product use issue": 5, "Tachypnoea": 5, "Vaccination site erythema": 5, "Abdominal pain upper": 4, "COVID-19": 4, "Facial paralysis": 4, "Febrile convulsion": 4, "Hypokinesia": 4, "Loss of consciousness": 4, "Muscle contractions involuntary": 4, "Vaccination site oedema": 4, "Visual analogue scale": 4, "Blood glucose": 3, "Blood pressure abnormal": 3, "Coma scale": 3, "Conjunctivitis": 3, "Hyperthermia": 3, "Hypovolaemic shock": 3, "Nasopharyngitis": 3, "Oxygen saturation abnormal": 3, "Pain in extremity": 3, "Pallor": 3, "Peripheral coldness": 3, "Pharyngeal paraesthesia": 3, "Photophobia": 3, "Shock": 3, "Urticaria": 3, "Vaccination site cellulitis": 3, "Vaccination site nodule": 3, "Vaccination site reaction": 3, "Vital signs measurement": 3, "Agitation": 2, "Bone pain": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Confusional state": 2, "Depressed level of consciousness": 2, "Dysarthria": 2, "Dysphonia": 2, "Dyspnoea exertional": 2, "Ear pain": 2, "Electrocardiogram": 2, "Eye pain": 2, "Face oedema": 2, "Gait disturbance": 2, "General physical health deterioration": 2, "Heart rate abnormal": 2, "Hemiparaesthesia": 2, "Hemiparesis": 2, "Hypoaesthesia oral": 2, "Hypoventilation": 2, "Laryngeal oedema": 2, "Lip oedema": 2, "Musculoskeletal stiffness": 2, "Nasal congestion": 2, "Oropharyngeal discomfort": 2, "Paraesthesia oral": 2, "Pharyngeal oedema": 2, "Photopsia": 2, "Presyncope": 2, "Sinus tachycardia": 2, "Somnolence": 2, "Suspected COVID-19": 2, "Tension headache": 2, "Throat irritation": 2, "Urinary incontinence": 2, "Vaccination site inflammation": 2, "Abdominal pain lower": 1, "Abnormal faeces": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Aphasia": 1, "Arrhythmia": 1, "Arthropathy": 1, "Asthmatic crisis": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Atypical pneumonia": 1, "Auscultation": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blepharitis": 1, "Blepharospasm": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Body temperature fluctuation": 1, "Bruxism": 1, "Capillary permeability": 1, "Cardiac monitoring": 1, "Chest X-ray normal": 1, "Choking sensation": 1, "Cold sweat": 1, "Conjunctival disorder": 1, "Conjunctival hyperaemia": 1, "Deafness bilateral": 1, "Deafness unilateral": 1, "Dizziness postural": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Epistaxis": 1, "Eye irritation": 1, "Eyelid oedema": 1, "Fall": 1, "Full blood count": 1, "Gastrointestinal hypermotility": 1, "Gastrointestinal motility disorder": 1, "General symptom": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Genital tract inflammation": 1, "Haemorrhagic disorder": 1, "Heart rate irregular": 1, "Hemiplegia": 1, "Hyperaemia": 1, "Hyperaesthesia": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Insomnia": 1, "Intussusception": 1, "Irritability postvaccinal": 1, "Laboratory test normal": 1, "Leukopenia": 1, "Lymphangitis": 1, "Lymphocyte count": 1, "Mobility decreased": 1, "Mucous stools": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Nervousness": 1, "Oral administration complication": 1, "Pain of skin": 1, "Patient elopement": 1, "Pelvic discomfort": 1, "Periorbital oedema": 1, "Persistent depressive disorder": 1, "Pharyngeal erythema": 1, "Pharyngeal hypoaesthesia": 1, "Photosensitivity reaction": 1, "Pigmentation disorder": 1, "Polydipsia": 1, "Productive cough": 1, "Pupillary light reflex tests": 1, "Purpura": 1, "Rash maculo-papular": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Respiratory tract infection viral": 1, "Restlessness": 1, "Rhinitis": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Sensitisation": 1, "Sensory loss": 1, "Skin discolouration": 1, "Speech disorder": 1, "Sputum purulent": 1, "Stevens-Johnson syndrome": 1, "Suffocation feeling": 1, "Sweating fever": 1, "Swelling": 1, "Tachyarrhythmia": 1, "Thirst": 1, "Tinnitus": 1, "Traumatic lung injury": 1, "Upper airway obstruction": 1, "Vaccination failure": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Visual acuity reduced": 1, "Visual impairment": 1, "White blood cell agglutination present": 1, "Xerophthalmia": 1}, "batchcodes": ["EJ3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ3002042021.json b/docs/data/histograms/Mexico/EJ3002042021.json
index 1568decbb0f..673ca0bfc6f 100644
--- a/docs/data/histograms/Mexico/EJ3002042021.json
+++ b/docs/data/histograms/Mexico/EJ3002042021.json
@@ -1 +1 @@
-{"batchcode": "EJ3002042021", "histograms": [{"batchcodes": ["EJ3002042021"], "histogram": {"Akathisia": 1, "Angina pectoris": 1, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Muscle contracture": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Slow response to stimuli": 1, "Vaccination site pain": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ3002042021", "histograms": [{"histogram": {"Akathisia": 1, "Angina pectoris": 1, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Muscle contracture": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Slow response to stimuli": 1, "Vaccination site pain": 1, "Visual analogue scale": 1}, "batchcodes": ["EJ3002042021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ30021.json b/docs/data/histograms/Mexico/EJ30021.json
index 1329208b009..15caf402f50 100644
--- a/docs/data/histograms/Mexico/EJ30021.json
+++ b/docs/data/histograms/Mexico/EJ30021.json
@@ -1 +1 @@
-{"batchcode": "EJ30021", "histograms": [{"batchcodes": ["EJ30021"], "histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypertensive crisis": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ30021", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypertensive crisis": 1}, "batchcodes": ["EJ30021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ3003.json b/docs/data/histograms/Mexico/EJ3003.json
index 63f3b8b622d..0a26eb2902f 100644
--- a/docs/data/histograms/Mexico/EJ3003.json
+++ b/docs/data/histograms/Mexico/EJ3003.json
@@ -1 +1 @@
-{"batchcode": "EJ3003", "histograms": [{"batchcodes": ["EJ3003"], "histogram": {"Dyspnoea": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "Respiratory distress": 2, "Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Irritability": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ3003", "histograms": [{"histogram": {"Dyspnoea": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "Respiratory distress": 2, "Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Irritability": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}, "batchcodes": ["EJ3003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ302.json b/docs/data/histograms/Mexico/EJ302.json
index 265245259f9..275f53be50c 100644
--- a/docs/data/histograms/Mexico/EJ302.json
+++ b/docs/data/histograms/Mexico/EJ302.json
@@ -1 +1 @@
-{"batchcode": "EJ302", "histograms": [{"batchcodes": ["EJ302"], "histogram": {"Headache": 3, "Pain": 2, "Pruritus": 2, "Respiratory distress": 2, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Chills": 1, "Coma scale": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Heart rate": 1, "Hypertension": 1, "Hypothermia": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Physical examination": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate": 1, "Tachycardia": 1, "Tachypnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ302", "histograms": [{"histogram": {"Headache": 3, "Pain": 2, "Pruritus": 2, "Respiratory distress": 2, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Chills": 1, "Coma scale": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Heart rate": 1, "Hypertension": 1, "Hypothermia": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Physical examination": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate": 1, "Tachycardia": 1, "Tachypnoea": 1}, "batchcodes": ["EJ302"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ32002.json b/docs/data/histograms/Mexico/EJ32002.json
index d48e9eed3bb..016b987ce2d 100644
--- a/docs/data/histograms/Mexico/EJ32002.json
+++ b/docs/data/histograms/Mexico/EJ32002.json
@@ -1 +1 @@
-{"batchcode": "EJ32002", "histograms": [{"batchcodes": ["EJ32002"], "histogram": {"Arthralgia": 1, "Joint swelling": 1, "Leukopenia": 1, "Mobility decreased": 1, "Oedema": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ32002", "histograms": [{"histogram": {"Arthralgia": 1, "Joint swelling": 1, "Leukopenia": 1, "Mobility decreased": 1, "Oedema": 1, "White blood cell count": 1}, "batchcodes": ["EJ32002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ5002.json b/docs/data/histograms/Mexico/EJ5002.json
index 326581da726..8589a5b21a1 100644
--- a/docs/data/histograms/Mexico/EJ5002.json
+++ b/docs/data/histograms/Mexico/EJ5002.json
@@ -1 +1 @@
-{"batchcode": "EJ5002", "histograms": [{"batchcodes": ["EJ5002"], "histogram": {"Pruritus": 2, "Cellulitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Inflammation": 1, "Nausea": 1, "Oedema": 1, "Pain": 1, "Rash": 1, "Respiratory distress": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ5002", "histograms": [{"histogram": {"Pruritus": 2, "Cellulitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Inflammation": 1, "Nausea": 1, "Oedema": 1, "Pain": 1, "Rash": 1, "Respiratory distress": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["EJ5002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EJ8765.json b/docs/data/histograms/Mexico/EJ8765.json
index 525aa7a7c10..1467dab099c 100644
--- a/docs/data/histograms/Mexico/EJ8765.json
+++ b/docs/data/histograms/Mexico/EJ8765.json
@@ -1 +1 @@
-{"batchcode": "EJ8765", "histograms": [{"batchcodes": ["EJ8765"], "histogram": {"Chills": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Nausea": 1, "Syncope": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ8765", "histograms": [{"histogram": {"Chills": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Nausea": 1, "Syncope": 1, "Vaccination error": 1}, "batchcodes": ["EJ8765"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EK4241.json b/docs/data/histograms/Mexico/EK4241.json
index 19e606e92e6..1d2f4ff08d1 100644
--- a/docs/data/histograms/Mexico/EK4241.json
+++ b/docs/data/histograms/Mexico/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"Headache": 33, "Asthenia": 26, "Chills": 19, "Dyspnoea": 19, "Dizziness": 18, "Fatigue": 18, "Myalgia": 18, "Arthralgia": 17, "Body temperature": 17, "Pain": 17, "Pyrexia": 16, "Respiratory distress": 16, "Tachycardia": 16, "Cough": 15, "Rhinorrhoea": 14, "Nausea": 12, "Diarrhoea": 11, "Sensitive skin": 9, "Oropharyngeal pain": 8, "Vaccination site pain": 8, "Nodule": 7, "Syncope": 7, "Abdominal pain": 6, "Blood pressure measurement": 6, "Hypertensive crisis": 6, "Rash": 6, "SARS-CoV-2 test": 6, "Seizure": 6, "Induration": 5, "Body temperature increased": 4, "COVID-19": 4, "Heart rate": 4, "Malaise": 4, "Odynophagia": 4, "Oedema": 4, "Oxygen saturation": 4, "Paraesthesia": 4, "Vomiting": 4, "Discomfort": 3, "Eye injury": 3, "SARS-CoV-2 antibody test": 3, "Anaphylactic shock": 2, "Angioedema": 2, "Bronchospasm": 2, "Cyanosis": 2, "Disorientation": 2, "Dysphagia": 2, "Eye pain": 2, "Febrile convulsion": 2, "General physical health deterioration": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Inflammation": 2, "Irritability": 2, "Paraesthesia oral": 2, "Polymerase chain reaction": 2, "Vaccination site hypersensitivity": 2, "Vaccination site reaction": 2, "Aphonia": 1, "Blood pressure increased": 1, "Bronchial disorder": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Discharge": 1, "Drug ineffective": 1, "Dystonia": 1, "Erythema": 1, "Facial paralysis": 1, "Full blood count": 1, "Generalised tonic-clonic seizure": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hyposmia": 1, "Hypothermia": 1, "Hypotonia": 1, "Leukopenia": 1, "Lymphadenopathy": 1, "Lymphopenia": 1, "Pain assessment": 1, "Pharyngeal oedema": 1, "Pneumonia": 1, "Rales": 1, "Swelling": 1, "Vaccination failure": 1, "Vaccination site discomfort": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"Headache": 33, "Asthenia": 26, "Chills": 19, "Dyspnoea": 19, "Dizziness": 18, "Fatigue": 18, "Myalgia": 18, "Arthralgia": 17, "Body temperature": 17, "Pain": 17, "Pyrexia": 16, "Respiratory distress": 16, "Tachycardia": 16, "Cough": 15, "Rhinorrhoea": 14, "Nausea": 12, "Diarrhoea": 11, "Sensitive skin": 9, "Oropharyngeal pain": 8, "Vaccination site pain": 8, "Nodule": 7, "Syncope": 7, "Abdominal pain": 6, "Blood pressure measurement": 6, "Hypertensive crisis": 6, "Rash": 6, "SARS-CoV-2 test": 6, "Seizure": 6, "Induration": 5, "Body temperature increased": 4, "COVID-19": 4, "Heart rate": 4, "Malaise": 4, "Odynophagia": 4, "Oedema": 4, "Oxygen saturation": 4, "Paraesthesia": 4, "Vomiting": 4, "Discomfort": 3, "Eye injury": 3, "SARS-CoV-2 antibody test": 3, "Anaphylactic shock": 2, "Angioedema": 2, "Bronchospasm": 2, "Cyanosis": 2, "Disorientation": 2, "Dysphagia": 2, "Eye pain": 2, "Febrile convulsion": 2, "General physical health deterioration": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Inflammation": 2, "Irritability": 2, "Paraesthesia oral": 2, "Polymerase chain reaction": 2, "Vaccination site hypersensitivity": 2, "Vaccination site reaction": 2, "Aphonia": 1, "Blood pressure increased": 1, "Bronchial disorder": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Discharge": 1, "Drug ineffective": 1, "Dystonia": 1, "Erythema": 1, "Facial paralysis": 1, "Full blood count": 1, "Generalised tonic-clonic seizure": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Hyposmia": 1, "Hypothermia": 1, "Hypotonia": 1, "Leukopenia": 1, "Lymphadenopathy": 1, "Lymphopenia": 1, "Pain assessment": 1, "Pharyngeal oedema": 1, "Pneumonia": 1, "Rales": 1, "Swelling": 1, "Vaccination failure": 1, "Vaccination site discomfort": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EK42412.json b/docs/data/histograms/Mexico/EK42412.json
index 1a853a53ce8..9c540f80b03 100644
--- a/docs/data/histograms/Mexico/EK42412.json
+++ b/docs/data/histograms/Mexico/EK42412.json
@@ -1 +1 @@
-{"batchcode": "EK42412", "histograms": [{"batchcodes": ["EK42412"], "histogram": {"Dizziness": 3, "Headache": 3, "Abdominal pain": 2, "Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Chills": 2, "Cough": 2, "Diarrhoea": 2, "Fatigue": 2, "Irritability": 2, "Myalgia": 2, "Oxygen saturation": 2, "Pain": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Abnormal faeces": 1, "Bradycardia": 1, "Bronchospasm": 1, "Chest pain": 1, "Computerised tomogram": 1, "Crying": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Feeling hot": 1, "General physical condition abnormal": 1, "Heart rate": 1, "Hypersensitivity": 1, "Nausea": 1, "Oedema": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Petechiae": 1, "Pneumonia": 1, "Sensitive skin": 1, "Thirst": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EK42412", "histograms": [{"histogram": {"Dizziness": 3, "Headache": 3, "Abdominal pain": 2, "Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Chills": 2, "Cough": 2, "Diarrhoea": 2, "Fatigue": 2, "Irritability": 2, "Myalgia": 2, "Oxygen saturation": 2, "Pain": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Abnormal faeces": 1, "Bradycardia": 1, "Bronchospasm": 1, "Chest pain": 1, "Computerised tomogram": 1, "Crying": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Feeling hot": 1, "General physical condition abnormal": 1, "Heart rate": 1, "Hypersensitivity": 1, "Nausea": 1, "Oedema": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Petechiae": 1, "Pneumonia": 1, "Sensitive skin": 1, "Thirst": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["EK42412"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EK4245.json b/docs/data/histograms/Mexico/EK4245.json
index c26999a792f..9c8c961613a 100644
--- a/docs/data/histograms/Mexico/EK4245.json
+++ b/docs/data/histograms/Mexico/EK4245.json
@@ -1 +1 @@
-{"batchcode": "EK4245", "histograms": [{"batchcodes": ["EK4245"], "histogram": {"Headache": 35, "Asthenia": 29, "Fatigue": 24, "Pain": 24, "Nausea": 20, "Dizziness": 19, "Dyspnoea": 19, "Respiratory distress": 18, "Myalgia": 17, "Arthralgia": 16, "Chills": 15, "Cough": 15, "Oropharyngeal pain": 15, "Rhinorrhoea": 14, "Tachycardia": 14, "Body temperature": 12, "Oedema": 11, "Blood pressure measurement": 10, "Erythema": 9, "Inflammation": 9, "Oxygen saturation": 9, "Pyrexia": 9, "Sensitive skin": 9, "Diarrhoea": 8, "Vaccination site pain": 8, "Body temperature increased": 7, "Induration": 7, "Nodule": 7, "Vomiting": 7, "Oxygen saturation decreased": 6, "Abdominal pain": 5, "Blood pressure increased": 5, "Decreased appetite": 5, "Heart rate": 5, "Local reaction": 5, "Lymphadenopathy": 5, "Odynophagia": 5, "Rash": 5, "Hypersensitivity": 4, "Paraesthesia": 4, "Pruritus": 4, "Syncope": 4, "Chest pain": 3, "Hemiparesis": 3, "SARS-CoV-2 antibody test": 3, "Vaccination site hypersensitivity": 3, "COVID-19": 2, "Cellulitis": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Generalised tonic-clonic seizure": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Mobility decreased": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Tinnitus": 2, "Urticaria": 2, "Vertigo": 2, "Abnormal faeces": 1, "Anaphylactic shock": 1, "Anosmia": 1, "Anxiety": 1, "Asthmatic crisis": 1, "Aura": 1, "Axillary pain": 1, "Blood pressure ambulatory abnormal": 1, "Blood pressure decreased": 1, "Bowel movement irregularity": 1, "Bradycardia": 1, "Breast pain": 1, "Bronchospasm": 1, "Chest X-ray": 1, "Computerised tomogram thorax": 1, "Conjunctival haemorrhage": 1, "Deafness unilateral": 1, "Discomfort": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyspnoea exertional": 1, "Ear disorder": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Eye discharge": 1, "Eye irritation": 1, "Eye pain": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Feeling hot": 1, "General physical health deterioration": 1, "Haemorrhage": 1, "Hemiparaesthesia": 1, "Hepatic pain": 1, "Hyperpyrexia": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Hypothermia": 1, "Lip disorder": 1, "Malaise": 1, "Metrorrhagia": 1, "Muscle contractions involuntary": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Oedema peripheral": 1, "Otitis media acute": 1, "Oxygen saturation abnormal": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pelvic pain": 1, "Pharyngeal disorder": 1, "Photopsia": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Prurigo": 1, "Rash maculo-papular": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Sinusitis": 1, "Skin disorder": 1, "Skin sensitisation": 1, "Somnolence": 1, "Systemic lupus erythematosus": 1, "Tongue oedema": 1, "Tongue paralysis": 1, "Toothache": 1, "Vaccination failure": 1, "Vaccination site inflammation": 1, "Vaccination site reaction": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4245", "histograms": [{"histogram": {"Headache": 35, "Asthenia": 29, "Fatigue": 24, "Pain": 24, "Nausea": 20, "Dizziness": 19, "Dyspnoea": 19, "Respiratory distress": 18, "Myalgia": 17, "Arthralgia": 16, "Chills": 15, "Cough": 15, "Oropharyngeal pain": 15, "Rhinorrhoea": 14, "Tachycardia": 14, "Body temperature": 12, "Oedema": 11, "Blood pressure measurement": 10, "Erythema": 9, "Inflammation": 9, "Oxygen saturation": 9, "Pyrexia": 9, "Sensitive skin": 9, "Diarrhoea": 8, "Vaccination site pain": 8, "Body temperature increased": 7, "Induration": 7, "Nodule": 7, "Vomiting": 7, "Oxygen saturation decreased": 6, "Abdominal pain": 5, "Blood pressure increased": 5, "Decreased appetite": 5, "Heart rate": 5, "Local reaction": 5, "Lymphadenopathy": 5, "Odynophagia": 5, "Rash": 5, "Hypersensitivity": 4, "Paraesthesia": 4, "Pruritus": 4, "Syncope": 4, "Chest pain": 3, "Hemiparesis": 3, "SARS-CoV-2 antibody test": 3, "Vaccination site hypersensitivity": 3, "COVID-19": 2, "Cellulitis": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Generalised tonic-clonic seizure": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Mobility decreased": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Tinnitus": 2, "Urticaria": 2, "Vertigo": 2, "Abnormal faeces": 1, "Anaphylactic shock": 1, "Anosmia": 1, "Anxiety": 1, "Asthmatic crisis": 1, "Aura": 1, "Axillary pain": 1, "Blood pressure ambulatory abnormal": 1, "Blood pressure decreased": 1, "Bowel movement irregularity": 1, "Bradycardia": 1, "Breast pain": 1, "Bronchospasm": 1, "Chest X-ray": 1, "Computerised tomogram thorax": 1, "Conjunctival haemorrhage": 1, "Deafness unilateral": 1, "Discomfort": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dyspnoea exertional": 1, "Ear disorder": 1, "Epistaxis": 1, "Erythema multiforme": 1, "Eye discharge": 1, "Eye irritation": 1, "Eye pain": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Feeling hot": 1, "General physical health deterioration": 1, "Haemorrhage": 1, "Hemiparaesthesia": 1, "Hepatic pain": 1, "Hyperpyrexia": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Hypothermia": 1, "Lip disorder": 1, "Malaise": 1, "Metrorrhagia": 1, "Muscle contractions involuntary": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Oedema peripheral": 1, "Otitis media acute": 1, "Oxygen saturation abnormal": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pelvic pain": 1, "Pharyngeal disorder": 1, "Photopsia": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Prurigo": 1, "Rash maculo-papular": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Sinusitis": 1, "Skin disorder": 1, "Skin sensitisation": 1, "Somnolence": 1, "Systemic lupus erythematosus": 1, "Tongue oedema": 1, "Tongue paralysis": 1, "Toothache": 1, "Vaccination failure": 1, "Vaccination site inflammation": 1, "Vaccination site reaction": 1, "Vital signs measurement": 1}, "batchcodes": ["EK4245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EK9449.json b/docs/data/histograms/Mexico/EK9449.json
index 89c96d54369..12d6cb2d462 100644
--- a/docs/data/histograms/Mexico/EK9449.json
+++ b/docs/data/histograms/Mexico/EK9449.json
@@ -1 +1 @@
-{"batchcode": "EK9449", "histograms": [{"batchcodes": ["EK9449"], "histogram": {"Eye haemorrhage": 1, "Eye pain": 1, "Headache": 1, "Hypokinesia": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "EK9449", "histograms": [{"histogram": {"Eye haemorrhage": 1, "Eye pain": 1, "Headache": 1, "Hypokinesia": 1, "Lymphadenopathy": 1}, "batchcodes": ["EK9449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL 1406.json b/docs/data/histograms/Mexico/EL 1406.json
index 12b0b3c32d4..41e60411e85 100644
--- a/docs/data/histograms/Mexico/EL 1406.json
+++ b/docs/data/histograms/Mexico/EL 1406.json
@@ -1 +1 @@
-{"batchcode": "EL 1406", "histograms": [{"batchcodes": ["EL 1406"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EL 1406", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["EL 1406"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1401.json b/docs/data/histograms/Mexico/EL1401.json
index 859fe5def07..133acc4b56e 100644
--- a/docs/data/histograms/Mexico/EL1401.json
+++ b/docs/data/histograms/Mexico/EL1401.json
@@ -1 +1 @@
-{"batchcode": "EL1401", "histograms": [{"batchcodes": ["EL1401"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Fatigue": 1, "Irritability": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1401", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Fatigue": 1, "Irritability": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["EL1401"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1406.json b/docs/data/histograms/Mexico/EL1406.json
index 311e2a885dc..a9e8e3bd9cb 100644
--- a/docs/data/histograms/Mexico/EL1406.json
+++ b/docs/data/histograms/Mexico/EL1406.json
@@ -1 +1 @@
-{"batchcode": "EL1406", "histograms": [{"batchcodes": ["EL1406"], "histogram": {"Headache": 37, "Asthenia": 29, "Respiratory distress": 28, "Dyspnoea": 27, "Fatigue": 23, "Dizziness": 22, "Myalgia": 22, "Pain": 22, "Sensitive skin": 22, "Nausea": 21, "Arthralgia": 19, "Chills": 17, "Body temperature": 16, "Oropharyngeal pain": 16, "Cough": 15, "Pyrexia": 15, "Rhinorrhoea": 14, "Tachycardia": 12, "Diarrhoea": 10, "Blood pressure measurement": 7, "Oedema": 7, "Rash": 7, "Vomiting": 7, "Abdominal pain": 6, "Body temperature increased": 6, "Pruritus": 6, "Vaccination site pain": 6, "Blood pressure increased": 5, "Bronchospasm": 5, "Inflammation": 5, "Malaise": 5, "Back pain": 4, "Hyperhidrosis": 4, "Paraesthesia": 4, "Chest discomfort": 3, "Chest pain": 3, "Haematochezia": 3, "Heart rate": 3, "Hypertension": 3, "Induration": 3, "Irritability": 3, "Nodule": 3, "Oxygen saturation": 3, "Anaphylactic reaction": 2, "Anaphylactic shock": 2, "Anxiety": 2, "Decreased appetite": 2, "Dry throat": 2, "Erythema": 2, "Hypersensitivity": 2, "Lacrimation increased": 2, "Lymphadenopathy": 2, "Mobility decreased": 2, "Nasal congestion": 2, "Pain in extremity": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Somnolence": 2, "Syncope": 2, "Abdominal pain upper": 1, "Ageusia": 1, "Aphonia": 1, "Blood test": 1, "Bradycardia": 1, "COVID-19": 1, "Crying": 1, "Cyanosis": 1, "Dehydration": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Epilepsy": 1, "Eye irritation": 1, "Feeling hot": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Hyperthermia": 1, "Hypokinesia": 1, "Hypotension": 1, "Hypotonia": 1, "Laryngeal oedema": 1, "Livedo reticularis": 1, "Local reaction": 1, "Loss of consciousness": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Nystagmus": 1, "Odynophagia": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Painful respiration": 1, "Palpitations": 1, "Radiculopathy": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Sensation of foreign body": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Thermal burns of eye": 1, "Vaccination error": 1, "Vaccination site cellulitis": 1, "Vaccination site movement impairment": 1, "Vaccination site warmth": 1, "Vasodilatation": 1, "Vestibular function test": 1, "Vestibular function test abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1406", "histograms": [{"histogram": {"Headache": 37, "Asthenia": 29, "Respiratory distress": 28, "Dyspnoea": 27, "Fatigue": 23, "Dizziness": 22, "Myalgia": 22, "Pain": 22, "Sensitive skin": 22, "Nausea": 21, "Arthralgia": 19, "Chills": 17, "Body temperature": 16, "Oropharyngeal pain": 16, "Cough": 15, "Pyrexia": 15, "Rhinorrhoea": 14, "Tachycardia": 12, "Diarrhoea": 10, "Blood pressure measurement": 7, "Oedema": 7, "Rash": 7, "Vomiting": 7, "Abdominal pain": 6, "Body temperature increased": 6, "Pruritus": 6, "Vaccination site pain": 6, "Blood pressure increased": 5, "Bronchospasm": 5, "Inflammation": 5, "Malaise": 5, "Back pain": 4, "Hyperhidrosis": 4, "Paraesthesia": 4, "Chest discomfort": 3, "Chest pain": 3, "Haematochezia": 3, "Heart rate": 3, "Hypertension": 3, "Induration": 3, "Irritability": 3, "Nodule": 3, "Oxygen saturation": 3, "Anaphylactic reaction": 2, "Anaphylactic shock": 2, "Anxiety": 2, "Decreased appetite": 2, "Dry throat": 2, "Erythema": 2, "Hypersensitivity": 2, "Lacrimation increased": 2, "Lymphadenopathy": 2, "Mobility decreased": 2, "Nasal congestion": 2, "Pain in extremity": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Somnolence": 2, "Syncope": 2, "Abdominal pain upper": 1, "Ageusia": 1, "Aphonia": 1, "Blood test": 1, "Bradycardia": 1, "COVID-19": 1, "Crying": 1, "Cyanosis": 1, "Dehydration": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Epilepsy": 1, "Eye irritation": 1, "Feeling hot": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Hyperthermia": 1, "Hypokinesia": 1, "Hypotension": 1, "Hypotonia": 1, "Laryngeal oedema": 1, "Livedo reticularis": 1, "Local reaction": 1, "Loss of consciousness": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Nystagmus": 1, "Odynophagia": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Painful respiration": 1, "Palpitations": 1, "Radiculopathy": 1, "Respiratory disorder": 1, "Respiratory failure": 1, "Sensation of foreign body": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Thermal burns of eye": 1, "Vaccination error": 1, "Vaccination site cellulitis": 1, "Vaccination site movement impairment": 1, "Vaccination site warmth": 1, "Vasodilatation": 1, "Vestibular function test": 1, "Vestibular function test abnormal": 1}, "batchcodes": ["EL1406"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1415.json b/docs/data/histograms/Mexico/EL1415.json
index bea77763f4d..25452725a83 100644
--- a/docs/data/histograms/Mexico/EL1415.json
+++ b/docs/data/histograms/Mexico/EL1415.json
@@ -1 +1 @@
-{"batchcode": "EL1415", "histograms": [{"batchcodes": ["EL1415"], "histogram": {"Arthralgia": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate": 1, "Myalgia": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pain": 1, "Pain in extremity": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1415", "histograms": [{"histogram": {"Arthralgia": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate": 1, "Myalgia": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pain": 1, "Pain in extremity": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1, "Throat tightness": 1}, "batchcodes": ["EL1415"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1422.json b/docs/data/histograms/Mexico/EL1422.json
index 53b8cbbfa2c..73e9ef31382 100644
--- a/docs/data/histograms/Mexico/EL1422.json
+++ b/docs/data/histograms/Mexico/EL1422.json
@@ -1 +1 @@
-{"batchcode": "EL1422", "histograms": [{"batchcodes": ["EL1422"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1422", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Respiratory distress": 1}, "batchcodes": ["EL1422"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1425.json b/docs/data/histograms/Mexico/EL1425.json
index 12e663c2897..87382e8cc68 100644
--- a/docs/data/histograms/Mexico/EL1425.json
+++ b/docs/data/histograms/Mexico/EL1425.json
@@ -1 +1 @@
-{"batchcode": "EL1425", "histograms": [{"batchcodes": ["EL1425"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1425", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Respiratory distress": 1}, "batchcodes": ["EL1425"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1446.json b/docs/data/histograms/Mexico/EL1446.json
index dc479d4616b..de2cde2c9ec 100644
--- a/docs/data/histograms/Mexico/EL1446.json
+++ b/docs/data/histograms/Mexico/EL1446.json
@@ -1 +1 @@
-{"batchcode": "EL1446", "histograms": [{"batchcodes": ["EL1446"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1446", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Respiratory distress": 1}, "batchcodes": ["EL1446"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1448.json b/docs/data/histograms/Mexico/EL1448.json
index 3a20414e7a3..5487b8a0f90 100644
--- a/docs/data/histograms/Mexico/EL1448.json
+++ b/docs/data/histograms/Mexico/EL1448.json
@@ -1 +1 @@
-{"batchcode": "EL1448", "histograms": [{"batchcodes": ["EL1448"], "histogram": {"Dyspnoea": 1, "Respiratory distress": 1, "Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1448", "histograms": [{"histogram": {"Dyspnoea": 1, "Respiratory distress": 1, "Syncope": 1, "Tremor": 1}, "batchcodes": ["EL1448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1460.json b/docs/data/histograms/Mexico/EL1460.json
index 32a0e923f74..3e244c2dca9 100644
--- a/docs/data/histograms/Mexico/EL1460.json
+++ b/docs/data/histograms/Mexico/EL1460.json
@@ -1 +1 @@
-{"batchcode": "EL1460", "histograms": [{"batchcodes": ["EL1460"], "histogram": {"Dyspnoea": 5, "Respiratory distress": 5, "Tachycardia": 5, "Dizziness": 4, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Fatigue": 3, "Headache": 3, "Oedema": 3, "Body temperature": 2, "Chest pain": 2, "Eye pain": 2, "Inflammation": 2, "Nausea": 2, "Pruritus": 2, "Pyrexia": 2, "Rash": 2, "Vaccination site pain": 2, "Vomiting": 2, "Anxiety": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Cellulitis": 1, "Chills": 1, "Decreased appetite": 1, "Eye injury": 1, "Eyelid rash": 1, "Febrile convulsion": 1, "Induration": 1, "Irritability": 1, "Lacrimation increased": 1, "Local reaction": 1, "Malaise": 1, "Myalgia": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1460", "histograms": [{"histogram": {"Dyspnoea": 5, "Respiratory distress": 5, "Tachycardia": 5, "Dizziness": 4, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Fatigue": 3, "Headache": 3, "Oedema": 3, "Body temperature": 2, "Chest pain": 2, "Eye pain": 2, "Inflammation": 2, "Nausea": 2, "Pruritus": 2, "Pyrexia": 2, "Rash": 2, "Vaccination site pain": 2, "Vomiting": 2, "Anxiety": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Cellulitis": 1, "Chills": 1, "Decreased appetite": 1, "Eye injury": 1, "Eyelid rash": 1, "Febrile convulsion": 1, "Induration": 1, "Irritability": 1, "Lacrimation increased": 1, "Local reaction": 1, "Malaise": 1, "Myalgia": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Syncope": 1}, "batchcodes": ["EL1460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EL1604.json b/docs/data/histograms/Mexico/EL1604.json
index 860254f7587..e39fd85b5d9 100644
--- a/docs/data/histograms/Mexico/EL1604.json
+++ b/docs/data/histograms/Mexico/EL1604.json
@@ -1 +1 @@
-{"batchcode": "EL1604", "histograms": [{"batchcodes": ["EL1604"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "General physical health deterioration": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Purpura": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1604", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "General physical health deterioration": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Purpura": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["EL1604"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ELI406.json b/docs/data/histograms/Mexico/ELI406.json
index 5c54c41cdd7..333f69cc72d 100644
--- a/docs/data/histograms/Mexico/ELI406.json
+++ b/docs/data/histograms/Mexico/ELI406.json
@@ -1 +1 @@
-{"batchcode": "ELI406", "histograms": [{"batchcodes": ["ELI406"], "histogram": {"Headache": 3, "Blood pressure measurement": 2, "Dizziness": 2, "Dyspnoea": 2, "Paraesthesia": 2, "Respiratory distress": 2, "Arthralgia": 1, "Asthenia": 1, "Bell's palsy": 1, "Blood pressure increased": 1, "Coma scale": 1, "Decreased appetite": 1, "Fatigue": 1, "Heart rate": 1, "Lacrimation increased": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia oral": 1, "Rash": 1, "Respiratory rate": 1, "Sensitive skin": 1, "Skin lesion": 1, "Tachycardia": 1, "Tachypnoea": 1, "Throat irritation": 1, "Tinnitus": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "ELI406", "histograms": [{"histogram": {"Headache": 3, "Blood pressure measurement": 2, "Dizziness": 2, "Dyspnoea": 2, "Paraesthesia": 2, "Respiratory distress": 2, "Arthralgia": 1, "Asthenia": 1, "Bell's palsy": 1, "Blood pressure increased": 1, "Coma scale": 1, "Decreased appetite": 1, "Fatigue": 1, "Heart rate": 1, "Lacrimation increased": 1, "Oxygen saturation": 1, "Pain": 1, "Paraesthesia oral": 1, "Rash": 1, "Respiratory rate": 1, "Sensitive skin": 1, "Skin lesion": 1, "Tachycardia": 1, "Tachypnoea": 1, "Throat irritation": 1, "Tinnitus": 1, "Vision blurred": 1}, "batchcodes": ["ELI406"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ELUC217.json b/docs/data/histograms/Mexico/ELUC217.json
index ab14e43b40f..417e6aff95f 100644
--- a/docs/data/histograms/Mexico/ELUC217.json
+++ b/docs/data/histograms/Mexico/ELUC217.json
@@ -1 +1 @@
-{"batchcode": "ELUC217", "histograms": [{"batchcodes": ["ELUC217"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Generalised tonic-clonic seizure": 1, "Headache": 1, "Inflammation": 1, "Loss of consciousness": 1, "Oedema": 1, "Pain": 1, "Seizure": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "ELUC217", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Generalised tonic-clonic seizure": 1, "Headache": 1, "Inflammation": 1, "Loss of consciousness": 1, "Oedema": 1, "Pain": 1, "Seizure": 1, "Sensitive skin": 1}, "batchcodes": ["ELUC217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EMMR.json b/docs/data/histograms/Mexico/EMMR.json
index c1433bc330f..50a2abd355c 100644
--- a/docs/data/histograms/Mexico/EMMR.json
+++ b/docs/data/histograms/Mexico/EMMR.json
@@ -1 +1 @@
-{"batchcode": "EMMR", "histograms": [{"batchcodes": ["EMMR"], "histogram": {"Back pain": 1, "Dizziness": 1, "Eyelid oedema": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1, "Tachycardia": 1, "Vaccination error": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EMMR", "histograms": [{"histogram": {"Back pain": 1, "Dizziness": 1, "Eyelid oedema": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1, "Tachycardia": 1, "Vaccination error": 1, "Vomiting": 1}, "batchcodes": ["EMMR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EMN1198.json b/docs/data/histograms/Mexico/EMN1198.json
index 393ae3991f0..170f9f5ca51 100644
--- a/docs/data/histograms/Mexico/EMN1198.json
+++ b/docs/data/histograms/Mexico/EMN1198.json
@@ -1 +1 @@
-{"batchcode": "EMN1198", "histograms": [{"batchcodes": ["EMN1198"], "histogram": {"Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "EMN1198", "histograms": [{"histogram": {"Diarrhoea": 1}, "batchcodes": ["EMN1198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EN 1194.json b/docs/data/histograms/Mexico/EN 1194.json
index d98c02b8e8e..d9538e81b23 100644
--- a/docs/data/histograms/Mexico/EN 1194.json
+++ b/docs/data/histograms/Mexico/EN 1194.json
@@ -1 +1 @@
-{"batchcode": "EN 1194", "histograms": [{"batchcodes": ["EN 1194"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain assessment": 1, "Pruritus": 1, "Sensitive skin": 1, "Vaccination error": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EN 1194", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain assessment": 1, "Pruritus": 1, "Sensitive skin": 1, "Vaccination error": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["EN 1194"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EN-1194.json b/docs/data/histograms/Mexico/EN-1194.json
index 8a82f83eeb5..bf900da5fb1 100644
--- a/docs/data/histograms/Mexico/EN-1194.json
+++ b/docs/data/histograms/Mexico/EN-1194.json
@@ -1 +1 @@
-{"batchcode": "EN-1194", "histograms": [{"batchcodes": ["EN-1194"], "histogram": {"Asthenia": 1, "Bronchospasm": 1, "Cough": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Lethargy": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Periorbital oedema": 1, "Petechiae": 1, "Pruritus": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EN-1194", "histograms": [{"histogram": {"Asthenia": 1, "Bronchospasm": 1, "Cough": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Lethargy": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Periorbital oedema": 1, "Petechiae": 1, "Pruritus": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["EN-1194"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EN1194.json b/docs/data/histograms/Mexico/EN1194.json
index 9c1983f80b7..b87a249ef27 100644
--- a/docs/data/histograms/Mexico/EN1194.json
+++ b/docs/data/histograms/Mexico/EN1194.json
@@ -1 +1 @@
-{"batchcode": "EN1194", "histograms": [{"batchcodes": ["EN1194"], "histogram": {"Headache": 67, "Asthenia": 54, "Dizziness": 49, "Myalgia": 44, "Fatigue": 42, "Arthralgia": 41, "Sensitive skin": 39, "Pain": 38, "Body temperature": 33, "Nausea": 33, "Pyrexia": 33, "Tachycardia": 28, "Chills": 25, "Dyspnoea": 25, "Respiratory distress": 25, "Pruritus": 21, "Vomiting": 20, "Vaccination site pain": 18, "Blood pressure measurement": 17, "Rash": 17, "Cough": 15, "Irritability": 14, "Oedema": 14, "Rhinorrhoea": 14, "Oropharyngeal pain": 13, "Bronchospasm": 11, "Diarrhoea": 11, "Erythema": 10, "Inflammation": 10, "Paraesthesia": 10, "Nodule": 9, "Blood pressure increased": 8, "Induration": 8, "Syncope": 8, "Body temperature increased": 7, "Heart rate": 7, "Hypotension": 7, "Oxygen saturation": 7, "Seizure": 7, "Abdominal pain": 6, "Hypertension": 6, "Vaccination error": 6, "Anaphylactic shock": 5, "Crying": 5, "Decreased appetite": 5, "Hypovolaemic shock": 5, "Pain in extremity": 5, "Angioedema": 4, "Anxiety": 4, "Back pain": 4, "Chest discomfort": 4, "Lymphadenopathy": 4, "Malaise": 4, "Oxygen saturation decreased": 4, "Palpitations": 4, "SARS-CoV-2 test": 4, "Chest pain": 3, "Febrile convulsion": 3, "Feeling hot": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypertensive crisis": 3, "Laryngeal oedema": 3, "Pain assessment": 3, "Paralysis": 3, "Vaccination site inflammation": 3, "Vaccination site oedema": 3, "Anaphylactic reaction": 2, "Anosmia": 2, "Cellulitis": 2, "Depressed level of consciousness": 2, "Disseminated Bacillus Calmette-Guerin infection": 2, "Dysgeusia": 2, "Ear pain": 2, "Eye injury": 2, "Flushing": 2, "Haemorrhage": 2, "Haemorrhagic disorder": 2, "Hypoaesthesia": 2, "Investigation": 2, "Loss of consciousness": 2, "Ocular hyperaemia": 2, "Respiratory rate": 2, "Sensation of foreign body": 2, "Stridor": 2, "Throat irritation": 2, "Vaccination site erythema": 2, "Vaccination site induration": 2, "Visual analogue scale": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Abscess": 1, "Acute myocardial infarction": 1, "Anti-NMDA antibody": 1, "Antinuclear antibody": 1, "Balance disorder": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Brain stem ischaemia": 1, "Burning sensation": 1, "Cheilitis": 1, "Coma scale": 1, "Computerised tomogram": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "DNA antibody": 1, "Dehydration": 1, "Discomfort": 1, "Disease recurrence": 1, "Dry mouth": 1, "Dysarthria": 1, "Dyspnoea exertional": 1, "Dystonia": 1, "Embolism": 1, "Enterococcal infection": 1, "Epistaxis": 1, "Eye irritation": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial paralysis": 1, "Foreign body in throat": 1, "Gastroenteritis": 1, "Gastrointestinal hypomotility": 1, "Guillain-Barre syndrome": 1, "Hallucination, visual": 1, "Hemiparesis": 1, "Hunt and Hess scale": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoxia": 1, "Influenza": 1, "Intracranial aneurysm": 1, "Intussusception": 1, "Ischaemic stroke": 1, "Joint injury": 1, "Lacrimation increased": 1, "Laryngeal inflammation": 1, "Lethargy": 1, "Livedo reticularis": 1, "Local reaction": 1, "Lymph node pain": 1, "Movement disorder": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Narcolepsy": 1, "Nystagmus": 1, "Optic neuritis": 1, "Paraesthesia mucosal": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Pharyngeal erythema": 1, "Physical examination": 1, "Productive cough": 1, "Rash maculo-papular": 1, "Raynaud's phenomenon": 1, "Skeletal injury": 1, "Somnolence": 1, "Subarachnoid haemorrhage": 1, "Suspected COVID-19": 1, "Systemic lupus erythematosus": 1, "Urticaria": 1, "Vaccination site discomfort": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vasodilatation": 1, "Vertigo": 1, "Vision blurred": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1194", "histograms": [{"histogram": {"Headache": 67, "Asthenia": 54, "Dizziness": 49, "Myalgia": 44, "Fatigue": 42, "Arthralgia": 41, "Sensitive skin": 39, "Pain": 38, "Body temperature": 33, "Nausea": 33, "Pyrexia": 33, "Tachycardia": 28, "Chills": 25, "Dyspnoea": 25, "Respiratory distress": 25, "Pruritus": 21, "Vomiting": 20, "Vaccination site pain": 18, "Blood pressure measurement": 17, "Rash": 17, "Cough": 15, "Irritability": 14, "Oedema": 14, "Rhinorrhoea": 14, "Oropharyngeal pain": 13, "Bronchospasm": 11, "Diarrhoea": 11, "Erythema": 10, "Inflammation": 10, "Paraesthesia": 10, "Nodule": 9, "Blood pressure increased": 8, "Induration": 8, "Syncope": 8, "Body temperature increased": 7, "Heart rate": 7, "Hypotension": 7, "Oxygen saturation": 7, "Seizure": 7, "Abdominal pain": 6, "Hypertension": 6, "Vaccination error": 6, "Anaphylactic shock": 5, "Crying": 5, "Decreased appetite": 5, "Hypovolaemic shock": 5, "Pain in extremity": 5, "Angioedema": 4, "Anxiety": 4, "Back pain": 4, "Chest discomfort": 4, "Lymphadenopathy": 4, "Malaise": 4, "Oxygen saturation decreased": 4, "Palpitations": 4, "SARS-CoV-2 test": 4, "Chest pain": 3, "Febrile convulsion": 3, "Feeling hot": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypertensive crisis": 3, "Laryngeal oedema": 3, "Pain assessment": 3, "Paralysis": 3, "Vaccination site inflammation": 3, "Vaccination site oedema": 3, "Anaphylactic reaction": 2, "Anosmia": 2, "Cellulitis": 2, "Depressed level of consciousness": 2, "Disseminated Bacillus Calmette-Guerin infection": 2, "Dysgeusia": 2, "Ear pain": 2, "Eye injury": 2, "Flushing": 2, "Haemorrhage": 2, "Haemorrhagic disorder": 2, "Hypoaesthesia": 2, "Investigation": 2, "Loss of consciousness": 2, "Ocular hyperaemia": 2, "Respiratory rate": 2, "Sensation of foreign body": 2, "Stridor": 2, "Throat irritation": 2, "Vaccination site erythema": 2, "Vaccination site induration": 2, "Visual analogue scale": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Abscess": 1, "Acute myocardial infarction": 1, "Anti-NMDA antibody": 1, "Antinuclear antibody": 1, "Balance disorder": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Brain stem ischaemia": 1, "Burning sensation": 1, "Cheilitis": 1, "Coma scale": 1, "Computerised tomogram": 1, "Conjunctival hyperaemia": 1, "Contusion": 1, "DNA antibody": 1, "Dehydration": 1, "Discomfort": 1, "Disease recurrence": 1, "Dry mouth": 1, "Dysarthria": 1, "Dyspnoea exertional": 1, "Dystonia": 1, "Embolism": 1, "Enterococcal infection": 1, "Epistaxis": 1, "Eye irritation": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial paralysis": 1, "Foreign body in throat": 1, "Gastroenteritis": 1, "Gastrointestinal hypomotility": 1, "Guillain-Barre syndrome": 1, "Hallucination, visual": 1, "Hemiparesis": 1, "Hunt and Hess scale": 1, "Hypertensive emergency": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoxia": 1, "Influenza": 1, "Intracranial aneurysm": 1, "Intussusception": 1, "Ischaemic stroke": 1, "Joint injury": 1, "Lacrimation increased": 1, "Laryngeal inflammation": 1, "Lethargy": 1, "Livedo reticularis": 1, "Local reaction": 1, "Lymph node pain": 1, "Movement disorder": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Narcolepsy": 1, "Nystagmus": 1, "Optic neuritis": 1, "Paraesthesia mucosal": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Pharyngeal erythema": 1, "Physical examination": 1, "Productive cough": 1, "Rash maculo-papular": 1, "Raynaud's phenomenon": 1, "Skeletal injury": 1, "Somnolence": 1, "Subarachnoid haemorrhage": 1, "Suspected COVID-19": 1, "Systemic lupus erythematosus": 1, "Urticaria": 1, "Vaccination site discomfort": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vasodilatation": 1, "Vertigo": 1, "Vision blurred": 1, "Visual acuity reduced": 1}, "batchcodes": ["EN1194"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EN1198.json b/docs/data/histograms/Mexico/EN1198.json
index f404ec9f02b..373bf8e874d 100644
--- a/docs/data/histograms/Mexico/EN1198.json
+++ b/docs/data/histograms/Mexico/EN1198.json
@@ -1 +1 @@
-{"batchcode": "EN1198", "histograms": [{"batchcodes": ["EN1198"], "histogram": {"Headache": 35, "Asthenia": 29, "Sensitive skin": 24, "Pain": 23, "Body temperature": 21, "Dizziness": 21, "Fatigue": 21, "Nausea": 20, "Pyrexia": 20, "Myalgia": 19, "Dyspnoea": 18, "Respiratory distress": 17, "Arthralgia": 15, "Tachycardia": 14, "Chills": 11, "Cough": 11, "Bronchospasm": 10, "Vaccination site pain": 9, "Vomiting": 9, "Oropharyngeal pain": 8, "Body temperature increased": 7, "Pruritus": 7, "Abdominal pain": 5, "Diarrhoea": 5, "Erythema": 5, "Irritability": 5, "Oedema": 5, "Cellulitis": 4, "Chest pain": 4, "Inflammation": 4, "Malaise": 4, "Odynophagia": 4, "Rash": 4, "SARS-CoV-2 test": 4, "Wrong technique in product usage process": 4, "Anaphylactic reaction": 3, "Anaphylactic shock": 3, "Blood pressure measurement": 3, "COVID-19": 3, "Hypertension": 3, "Hypovolaemic shock": 3, "Rhinorrhoea": 3, "Facial paralysis": 2, "Haematochezia": 2, "Haemorrhage": 2, "Hyperhidrosis": 2, "Hypertensive crisis": 2, "Hypoaesthesia oral": 2, "Lymphadenopathy": 2, "Pain in extremity": 2, "Physical examination": 2, "Pneumonia": 2, "SARS-CoV-2 test positive": 2, "Seizure": 2, "Sensation of foreign body": 2, "Syncope": 2, "Vaccination site erythema": 2, "Vertigo": 2, "Visual analogue scale": 2, "Abdominal symptom": 1, "Acute myocardial infarction": 1, "Ageusia": 1, "Areflexia": 1, "Asterixis": 1, "Axillary pain": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Burning sensation": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Conjunctivitis": 1, "Crying": 1, "Decreased appetite": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysphonia": 1, "Epistaxis": 1, "Eye disorder": 1, "Eye pain": 1, "Gastroenteritis": 1, "General physical health deterioration": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Induration": 1, "Intussusception": 1, "Laryngospasm": 1, "Mechanical urticaria": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscular weakness": 1, "Neck pain": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Pharyngeal hypoaesthesia": 1, "Poor quality product administered": 1, "Productive cough": 1, "Sensory loss": 1, "Shock": 1, "Somnolence": 1, "Stevens-Johnson syndrome": 1, "Thermal burns of eye": 1, "Vaccination error": 1, "Vaccination site cellulitis": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site joint movement impairment": 1, "Vaccination site movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site pruritus": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1198", "histograms": [{"histogram": {"Headache": 35, "Asthenia": 29, "Sensitive skin": 24, "Pain": 23, "Body temperature": 21, "Dizziness": 21, "Fatigue": 21, "Nausea": 20, "Pyrexia": 20, "Myalgia": 19, "Dyspnoea": 18, "Respiratory distress": 17, "Arthralgia": 15, "Tachycardia": 14, "Chills": 11, "Cough": 11, "Bronchospasm": 10, "Vaccination site pain": 9, "Vomiting": 9, "Oropharyngeal pain": 8, "Body temperature increased": 7, "Pruritus": 7, "Abdominal pain": 5, "Diarrhoea": 5, "Erythema": 5, "Irritability": 5, "Oedema": 5, "Cellulitis": 4, "Chest pain": 4, "Inflammation": 4, "Malaise": 4, "Odynophagia": 4, "Rash": 4, "SARS-CoV-2 test": 4, "Wrong technique in product usage process": 4, "Anaphylactic reaction": 3, "Anaphylactic shock": 3, "Blood pressure measurement": 3, "COVID-19": 3, "Hypertension": 3, "Hypovolaemic shock": 3, "Rhinorrhoea": 3, "Facial paralysis": 2, "Haematochezia": 2, "Haemorrhage": 2, "Hyperhidrosis": 2, "Hypertensive crisis": 2, "Hypoaesthesia oral": 2, "Lymphadenopathy": 2, "Pain in extremity": 2, "Physical examination": 2, "Pneumonia": 2, "SARS-CoV-2 test positive": 2, "Seizure": 2, "Sensation of foreign body": 2, "Syncope": 2, "Vaccination site erythema": 2, "Vertigo": 2, "Visual analogue scale": 2, "Abdominal symptom": 1, "Acute myocardial infarction": 1, "Ageusia": 1, "Areflexia": 1, "Asterixis": 1, "Axillary pain": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Burning sensation": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Conjunctivitis": 1, "Crying": 1, "Decreased appetite": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysphonia": 1, "Epistaxis": 1, "Eye disorder": 1, "Eye pain": 1, "Gastroenteritis": 1, "General physical health deterioration": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Induration": 1, "Intussusception": 1, "Laryngospasm": 1, "Mechanical urticaria": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscular weakness": 1, "Neck pain": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Pharyngeal hypoaesthesia": 1, "Poor quality product administered": 1, "Productive cough": 1, "Sensory loss": 1, "Shock": 1, "Somnolence": 1, "Stevens-Johnson syndrome": 1, "Thermal burns of eye": 1, "Vaccination error": 1, "Vaccination site cellulitis": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site joint movement impairment": 1, "Vaccination site movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site pruritus": 1, "Wheezing": 1}, "batchcodes": ["EN1198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EN11980.json b/docs/data/histograms/Mexico/EN11980.json
index 59b11cb6b3f..73033460eba 100644
--- a/docs/data/histograms/Mexico/EN11980.json
+++ b/docs/data/histograms/Mexico/EN11980.json
@@ -1 +1 @@
-{"batchcode": "EN11980", "histograms": [{"batchcodes": ["EN11980"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Irritability": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EN11980", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Irritability": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sensitive skin": 1}, "batchcodes": ["EN11980"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EN198062021.json b/docs/data/histograms/Mexico/EN198062021.json
index c6d4413759f..515a3275842 100644
--- a/docs/data/histograms/Mexico/EN198062021.json
+++ b/docs/data/histograms/Mexico/EN198062021.json
@@ -1 +1 @@
-{"batchcode": "EN198062021", "histograms": [{"batchcodes": ["EN198062021"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature increased": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EN198062021", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature increased": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["EN198062021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EN2245.json b/docs/data/histograms/Mexico/EN2245.json
index f175cf9d24a..1bbfd47503e 100644
--- a/docs/data/histograms/Mexico/EN2245.json
+++ b/docs/data/histograms/Mexico/EN2245.json
@@ -1 +1 @@
-{"batchcode": "EN2245", "histograms": [{"batchcodes": ["EN2245"], "histogram": {"Blood pressure measurement": 2, "Asthenia": 1, "Blood pressure increased": 1, "Decreased activity": 1, "Dyskinesia": 1, "Fatigue": 1, "Febrile convulsion": 1, "Guillain-Barre syndrome": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Photopsia": 1, "Seizure": 1, "Vertigo": 1, "Vital signs measurement": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EN2245", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Asthenia": 1, "Blood pressure increased": 1, "Decreased activity": 1, "Dyskinesia": 1, "Fatigue": 1, "Febrile convulsion": 1, "Guillain-Barre syndrome": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Photopsia": 1, "Seizure": 1, "Vertigo": 1, "Vital signs measurement": 1, "Vomiting": 1}, "batchcodes": ["EN2245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EP6675.json b/docs/data/histograms/Mexico/EP6675.json
index 26feb7dad0c..167105c63bb 100644
--- a/docs/data/histograms/Mexico/EP6675.json
+++ b/docs/data/histograms/Mexico/EP6675.json
@@ -1 +1 @@
-{"batchcode": "EP6675", "histograms": [{"batchcodes": ["EP6675"], "histogram": {"Bronchospasm": 1, "Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6675", "histograms": [{"histogram": {"Bronchospasm": 1, "Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Sensitive skin": 1}, "batchcodes": ["EP6675"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EP675.json b/docs/data/histograms/Mexico/EP675.json
index b3a9bae048b..eb65567ccc9 100644
--- a/docs/data/histograms/Mexico/EP675.json
+++ b/docs/data/histograms/Mexico/EP675.json
@@ -1 +1 @@
-{"batchcode": "EP675", "histograms": [{"batchcodes": ["EP675"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Genital discomfort": 1, "Headache": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "EP675", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Genital discomfort": 1, "Headache": 1, "Respiratory distress": 1}, "batchcodes": ["EP675"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EP6771.json b/docs/data/histograms/Mexico/EP6771.json
index 391de36de72..7bd166e1383 100644
--- a/docs/data/histograms/Mexico/EP6771.json
+++ b/docs/data/histograms/Mexico/EP6771.json
@@ -1 +1 @@
-{"batchcode": "EP6771", "histograms": [{"batchcodes": ["EP6771"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Induration": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pain": 1, "Pneumonia": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6771", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Induration": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Pain": 1, "Pneumonia": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["EP6771"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EP6775.json b/docs/data/histograms/Mexico/EP6775.json
index ae50999dc83..2a74b7f9513 100644
--- a/docs/data/histograms/Mexico/EP6775.json
+++ b/docs/data/histograms/Mexico/EP6775.json
@@ -1 +1 @@
-{"batchcode": "EP6775", "histograms": [{"batchcodes": ["EP6775"], "histogram": {"Headache": 85, "Asthenia": 83, "Dizziness": 59, "Pain": 57, "Fatigue": 56, "Myalgia": 55, "Sensitive skin": 52, "Pyrexia": 45, "Arthralgia": 44, "Nausea": 44, "Body temperature": 41, "Dyspnoea": 41, "Respiratory distress": 38, "Tachycardia": 35, "Blood pressure measurement": 32, "Chills": 32, "Vaccination site pain": 32, "Induration": 24, "Nodule": 24, "Vomiting": 23, "Rhinorrhoea": 22, "Cough": 19, "Diarrhoea": 19, "Oropharyngeal pain": 19, "Body temperature increased": 18, "Rash": 18, "Abdominal pain": 17, "Irritability": 17, "Hypertension": 15, "Pruritus": 15, "Erythema": 14, "Haemorrhage": 13, "Lymphadenopathy": 13, "Decreased appetite": 12, "Hypovolaemic shock": 12, "Oedema": 12, "Blood pressure increased": 11, "Cellulitis": 10, "Heart rate": 10, "Oxygen saturation": 8, "Pain in extremity": 8, "Inflammation": 7, "Intussusception": 7, "Paraesthesia oral": 7, "Chest pain": 6, "Hypertensive crisis": 6, "Local reaction": 6, "Odynophagia": 6, "Oedema peripheral": 6, "Abscess": 5, "Back pain": 5, "Crying": 5, "Facial paralysis": 5, "Haematochezia": 5, "Hypotension": 5, "Palpitations": 5, "Paraesthesia": 5, "Bronchospasm": 4, "Feeling hot": 4, "Haemorrhagic disorder": 4, "Heart rate increased": 4, "Hyperhidrosis": 4, "Hypoaesthesia": 4, "Hypoaesthesia oral": 4, "Malaise": 4, "Muscular weakness": 4, "Pain assessment": 4, "Seizure": 4, "Anosmia": 3, "Disseminated Bacillus Calmette-Guerin infection": 3, "Dry mouth": 3, "Eye pain": 3, "Guillain-Barre syndrome": 3, "Hypokinesia": 3, "Oral discomfort": 3, "Respiratory rate": 3, "Syncope": 3, "Tremor": 3, "Vaccination site reaction": 3, "Vertigo": 3, "Anxiety": 2, "Axillary pain": 2, "Bell's palsy": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Dysgeusia": 2, "Eye irritation": 2, "Gait disturbance": 2, "Hyperthermia": 2, "Investigation": 2, "Movement disorder": 2, "Neck pain": 2, "Ocular hyperaemia": 2, "Oral disorder": 2, "Photopsia": 2, "Pneumonia": 2, "Respiratory arrest": 2, "Somnolence": 2, "Tinnitus": 2, "Vaccination error": 2, "Vaccination site cellulitis": 2, "Vaccination site erythema": 2, "Visual analogue scale": 2, "Vital signs measurement": 2, "Wrong technique in product usage process": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Accidental overdose": 1, "Ageusia": 1, "Aggression": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aphonia": 1, "Arrhythmia": 1, "Asthma": 1, "Autoimmune haemolytic anaemia": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "Body mass index": 1, "Bradycardia": 1, "Cardio-respiratory arrest": 1, "Choking": 1, "Choluria": 1, "Colitis": 1, "Conjunctival haemorrhage": 1, "Coombs test": 1, "Dehydration": 1, "Diabetes mellitus management": 1, "Discomfort": 1, "Disturbance in attention": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ear infection": 1, "Ecchymosis": 1, "Electrocardiogram": 1, "End stage renal disease": 1, "Eye discharge": 1, "Eye injury": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial spasm": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling of despair": 1, "Gait inability": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin": 1, "Haemolytic anaemia": 1, "Hallucination": 1, "Heart rate abnormal": 1, "Hemiparesis": 1, "Hot flush": 1, "Hyperaemia": 1, "Hyperglycaemia": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoxia": 1, "Influenza like illness": 1, "Insomnia": 1, "Jaundice": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Muscle strength normal": 1, "Myoclonic epilepsy": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Nervous system disorder": 1, "Normochromic anaemia": 1, "Normocytic anaemia": 1, "Off label use": 1, "Optic neuritis": 1, "Oxygen saturation decreased": 1, "Paralysis": 1, "Pelvic pain": 1, "Peripheral swelling": 1, "Peripheral vascular disorder": 1, "Petechiae": 1, "Pharyngeal disorder": 1, "Pharyngeal ulceration": 1, "Photophobia": 1, "Physical examination": 1, "Presyncope": 1, "Product use issue": 1, "Respiratory disorder": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Sensitisation": 1, "Sensory loss": 1, "Sepsis": 1, "Septic shock": 1, "Skin lesion": 1, "Skin mass": 1, "Slow speech": 1, "Stevens-Johnson syndrome": 1, "Suspected COVID-19": 1, "Synovial cyst": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site pruritus": 1, "Vision blurred": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6775", "histograms": [{"histogram": {"Headache": 85, "Asthenia": 83, "Dizziness": 59, "Pain": 57, "Fatigue": 56, "Myalgia": 55, "Sensitive skin": 52, "Pyrexia": 45, "Arthralgia": 44, "Nausea": 44, "Body temperature": 41, "Dyspnoea": 41, "Respiratory distress": 38, "Tachycardia": 35, "Blood pressure measurement": 32, "Chills": 32, "Vaccination site pain": 32, "Induration": 24, "Nodule": 24, "Vomiting": 23, "Rhinorrhoea": 22, "Cough": 19, "Diarrhoea": 19, "Oropharyngeal pain": 19, "Body temperature increased": 18, "Rash": 18, "Abdominal pain": 17, "Irritability": 17, "Hypertension": 15, "Pruritus": 15, "Erythema": 14, "Haemorrhage": 13, "Lymphadenopathy": 13, "Decreased appetite": 12, "Hypovolaemic shock": 12, "Oedema": 12, "Blood pressure increased": 11, "Cellulitis": 10, "Heart rate": 10, "Oxygen saturation": 8, "Pain in extremity": 8, "Inflammation": 7, "Intussusception": 7, "Paraesthesia oral": 7, "Chest pain": 6, "Hypertensive crisis": 6, "Local reaction": 6, "Odynophagia": 6, "Oedema peripheral": 6, "Abscess": 5, "Back pain": 5, "Crying": 5, "Facial paralysis": 5, "Haematochezia": 5, "Hypotension": 5, "Palpitations": 5, "Paraesthesia": 5, "Bronchospasm": 4, "Feeling hot": 4, "Haemorrhagic disorder": 4, "Heart rate increased": 4, "Hyperhidrosis": 4, "Hypoaesthesia": 4, "Hypoaesthesia oral": 4, "Malaise": 4, "Muscular weakness": 4, "Pain assessment": 4, "Seizure": 4, "Anosmia": 3, "Disseminated Bacillus Calmette-Guerin infection": 3, "Dry mouth": 3, "Eye pain": 3, "Guillain-Barre syndrome": 3, "Hypokinesia": 3, "Oral discomfort": 3, "Respiratory rate": 3, "Syncope": 3, "Tremor": 3, "Vaccination site reaction": 3, "Vertigo": 3, "Anxiety": 2, "Axillary pain": 2, "Bell's palsy": 2, "Blood glucose": 2, "Blood pressure systolic increased": 2, "Dysgeusia": 2, "Eye irritation": 2, "Gait disturbance": 2, "Hyperthermia": 2, "Investigation": 2, "Movement disorder": 2, "Neck pain": 2, "Ocular hyperaemia": 2, "Oral disorder": 2, "Photopsia": 2, "Pneumonia": 2, "Respiratory arrest": 2, "Somnolence": 2, "Tinnitus": 2, "Vaccination error": 2, "Vaccination site cellulitis": 2, "Vaccination site erythema": 2, "Visual analogue scale": 2, "Vital signs measurement": 2, "Wrong technique in product usage process": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Accidental overdose": 1, "Ageusia": 1, "Aggression": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aphonia": 1, "Arrhythmia": 1, "Asthma": 1, "Autoimmune haemolytic anaemia": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "Body mass index": 1, "Bradycardia": 1, "Cardio-respiratory arrest": 1, "Choking": 1, "Choluria": 1, "Colitis": 1, "Conjunctival haemorrhage": 1, "Coombs test": 1, "Dehydration": 1, "Diabetes mellitus management": 1, "Discomfort": 1, "Disturbance in attention": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ear infection": 1, "Ecchymosis": 1, "Electrocardiogram": 1, "End stage renal disease": 1, "Eye discharge": 1, "Eye injury": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Facial spasm": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling of despair": 1, "Gait inability": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin": 1, "Haemolytic anaemia": 1, "Hallucination": 1, "Heart rate abnormal": 1, "Hemiparesis": 1, "Hot flush": 1, "Hyperaemia": 1, "Hyperglycaemia": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoxia": 1, "Influenza like illness": 1, "Insomnia": 1, "Jaundice": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Muscle strength normal": 1, "Myoclonic epilepsy": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Nervous system disorder": 1, "Normochromic anaemia": 1, "Normocytic anaemia": 1, "Off label use": 1, "Optic neuritis": 1, "Oxygen saturation decreased": 1, "Paralysis": 1, "Pelvic pain": 1, "Peripheral swelling": 1, "Peripheral vascular disorder": 1, "Petechiae": 1, "Pharyngeal disorder": 1, "Pharyngeal ulceration": 1, "Photophobia": 1, "Physical examination": 1, "Presyncope": 1, "Product use issue": 1, "Respiratory disorder": 1, "Salivary hypersecretion": 1, "Sensation of foreign body": 1, "Sensitisation": 1, "Sensory loss": 1, "Sepsis": 1, "Septic shock": 1, "Skin lesion": 1, "Skin mass": 1, "Slow speech": 1, "Stevens-Johnson syndrome": 1, "Suspected COVID-19": 1, "Synovial cyst": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Thrombocytopenic purpura": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site pruritus": 1, "Vision blurred": 1, "Visual acuity reduced": 1}, "batchcodes": ["EP6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EP6955.json b/docs/data/histograms/Mexico/EP6955.json
index 3009dd6416d..5c06c760d22 100644
--- a/docs/data/histograms/Mexico/EP6955.json
+++ b/docs/data/histograms/Mexico/EP6955.json
@@ -1 +1 @@
-{"batchcode": "EP6955", "histograms": [{"batchcodes": ["EP6955"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6955", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Polymerase chain reaction": 1}, "batchcodes": ["EP6955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EP7533.json b/docs/data/histograms/Mexico/EP7533.json
index faa1fd13118..950d743eab8 100644
--- a/docs/data/histograms/Mexico/EP7533.json
+++ b/docs/data/histograms/Mexico/EP7533.json
@@ -1 +1 @@
-{"batchcode": "EP7533", "histograms": [{"batchcodes": ["EP7533"], "histogram": {"COVID-19": 1, "Lung disorder": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "EP7533", "histograms": [{"histogram": {"COVID-19": 1, "Lung disorder": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["EP7533"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EPE6775.json b/docs/data/histograms/Mexico/EPE6775.json
index 5d4fe0d0a99..b379b96b083 100644
--- a/docs/data/histograms/Mexico/EPE6775.json
+++ b/docs/data/histograms/Mexico/EPE6775.json
@@ -1 +1 @@
-{"batchcode": "EPE6775", "histograms": [{"batchcodes": ["EPE6775"], "histogram": {"COVID-19 pneumonia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EPE6775", "histograms": [{"histogram": {"COVID-19 pneumonia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EPE6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EPG775.json b/docs/data/histograms/Mexico/EPG775.json
index 763a5da5815..2c65a076781 100644
--- a/docs/data/histograms/Mexico/EPG775.json
+++ b/docs/data/histograms/Mexico/EPG775.json
@@ -1 +1 @@
-{"batchcode": "EPG775", "histograms": [{"batchcodes": ["EPG775"], "histogram": {"Anxiety": 1, "Chills": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Paraesthesia": 1, "Seizure": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EPG775", "histograms": [{"histogram": {"Anxiety": 1, "Chills": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1, "Paraesthesia": 1, "Seizure": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["EPG775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER 7934.json b/docs/data/histograms/Mexico/ER 7934.json
index 905395d1b54..c85e45131e7 100644
--- a/docs/data/histograms/Mexico/ER 7934.json
+++ b/docs/data/histograms/Mexico/ER 7934.json
@@ -1 +1 @@
-{"batchcode": "ER 7934", "histograms": [{"batchcodes": ["ER 7934"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Body temperature increased": 1, "Diarrhoea": 1, "Headache": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ER 7934", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Body temperature increased": 1, "Diarrhoea": 1, "Headache": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Vomiting": 1}, "batchcodes": ["ER 7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER-7939.json b/docs/data/histograms/Mexico/ER-7939.json
index c98d50a6679..585ae813d2c 100644
--- a/docs/data/histograms/Mexico/ER-7939.json
+++ b/docs/data/histograms/Mexico/ER-7939.json
@@ -1 +1 @@
-{"batchcode": "ER-7939", "histograms": [{"batchcodes": ["ER-7939"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Ear pain": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "ER-7939", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Ear pain": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["ER-7939"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER-9449.json b/docs/data/histograms/Mexico/ER-9449.json
index 7f9727aa395..8aac9f7059e 100644
--- a/docs/data/histograms/Mexico/ER-9449.json
+++ b/docs/data/histograms/Mexico/ER-9449.json
@@ -1 +1 @@
-{"batchcode": "ER-9449", "histograms": [{"batchcodes": ["ER-9449"], "histogram": {"Babinski reflex test": 1, "Chorea": 1, "Dysarthria": 1, "Extensor plantar response": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Ischaemic stroke": 1, "Pain": 1, "Physical examination": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "ER-9449", "histograms": [{"histogram": {"Babinski reflex test": 1, "Chorea": 1, "Dysarthria": 1, "Extensor plantar response": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Ischaemic stroke": 1, "Pain": 1, "Physical examination": 1, "Sensitive skin": 1}, "batchcodes": ["ER-9449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER1742.json b/docs/data/histograms/Mexico/ER1742.json
index adc31986b87..022b9e7118f 100644
--- a/docs/data/histograms/Mexico/ER1742.json
+++ b/docs/data/histograms/Mexico/ER1742.json
@@ -1 +1 @@
-{"batchcode": "ER1742", "histograms": [{"batchcodes": ["ER1742"], "histogram": {"Headache": 26, "Asthenia": 19, "Body temperature": 19, "Dizziness": 19, "Pyrexia": 17, "Fatigue": 14, "Pain": 13, "Dyspnoea": 11, "Myalgia": 11, "Nausea": 11, "Respiratory distress": 11, "Sensitive skin": 10, "Arthralgia": 9, "Blood pressure measurement": 9, "Body temperature increased": 9, "Chills": 8, "Vaccination site pain": 8, "Diarrhoea": 7, "Hypertension": 7, "Rhinorrhoea": 7, "Erythema": 6, "Bronchospasm": 5, "Cough": 5, "Oedema": 5, "Vomiting": 5, "Haemorrhage": 4, "Induration": 4, "Inflammation": 4, "Nodule": 4, "Oxygen saturation": 4, "Pruritus": 4, "Rash": 4, "Abdominal pain": 3, "Haemorrhagic disorder": 3, "Oropharyngeal pain": 3, "SARS-CoV-2 test": 3, "Tachycardia": 3, "Blood immunoglobulin G": 2, "Blood immunoglobulin M": 2, "Blood pressure increased": 2, "COVID-19": 2, "Cellulitis": 2, "Disseminated Bacillus Calmette-Guerin infection": 2, "Gait disturbance": 2, "Hyperhidrosis": 2, "Irritability": 2, "Lymphadenopathy": 2, "Malaise": 2, "Seizure": 2, "Vaccination error": 2, "Visual analogue scale": 2, "Abdominal discomfort": 1, "Abnormal faeces": 1, "Apnoeic attack": 1, "Auscultation": 1, "Balance disorder": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "COVID-19 pneumonia": 1, "Computerised tomogram": 1, "Death": 1, "Decreased appetite": 1, "Discomfort": 1, "Diverticulum intestinal": 1, "Drug ineffective": 1, "Dysphonia": 1, "Ear pain": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Feeling hot": 1, "Gastrointestinal haemorrhage": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Glossitis": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperaesthesia": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Hypovolaemic shock": 1, "Hypoxia": 1, "Lip oedema": 1, "Local reaction": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenitis": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle strength abnormal": 1, "Nasal obstruction": 1, "Neuralgia": 1, "Obstructive airways disorder": 1, "Oral pruritus": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Physical examination": 1, "Platelet count": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulse absent": 1, "Respiratory rate": 1, "Sensation of foreign body": 1, "Somnolence": 1, "Sudden infant death syndrome": 1, "Suspected COVID-19": 1, "Synovial cyst": 1, "Tachypnoea": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Tinnitus": 1, "Tympanic membrane perforation": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site cellulitis": 1, "Vaccination site movement impairment": 1, "Vertigo": 1, "Wheezing": 1, "White blood cell scan": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "ER1742", "histograms": [{"histogram": {"Headache": 26, "Asthenia": 19, "Body temperature": 19, "Dizziness": 19, "Pyrexia": 17, "Fatigue": 14, "Pain": 13, "Dyspnoea": 11, "Myalgia": 11, "Nausea": 11, "Respiratory distress": 11, "Sensitive skin": 10, "Arthralgia": 9, "Blood pressure measurement": 9, "Body temperature increased": 9, "Chills": 8, "Vaccination site pain": 8, "Diarrhoea": 7, "Hypertension": 7, "Rhinorrhoea": 7, "Erythema": 6, "Bronchospasm": 5, "Cough": 5, "Oedema": 5, "Vomiting": 5, "Haemorrhage": 4, "Induration": 4, "Inflammation": 4, "Nodule": 4, "Oxygen saturation": 4, "Pruritus": 4, "Rash": 4, "Abdominal pain": 3, "Haemorrhagic disorder": 3, "Oropharyngeal pain": 3, "SARS-CoV-2 test": 3, "Tachycardia": 3, "Blood immunoglobulin G": 2, "Blood immunoglobulin M": 2, "Blood pressure increased": 2, "COVID-19": 2, "Cellulitis": 2, "Disseminated Bacillus Calmette-Guerin infection": 2, "Gait disturbance": 2, "Hyperhidrosis": 2, "Irritability": 2, "Lymphadenopathy": 2, "Malaise": 2, "Seizure": 2, "Vaccination error": 2, "Visual analogue scale": 2, "Abdominal discomfort": 1, "Abnormal faeces": 1, "Apnoeic attack": 1, "Auscultation": 1, "Balance disorder": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood pressure abnormal": 1, "COVID-19 pneumonia": 1, "Computerised tomogram": 1, "Death": 1, "Decreased appetite": 1, "Discomfort": 1, "Diverticulum intestinal": 1, "Drug ineffective": 1, "Dysphonia": 1, "Ear pain": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Feeling hot": 1, "Gastrointestinal haemorrhage": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Glossitis": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperaesthesia": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Hypovolaemic shock": 1, "Hypoxia": 1, "Lip oedema": 1, "Local reaction": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenitis": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle strength abnormal": 1, "Nasal obstruction": 1, "Neuralgia": 1, "Obstructive airways disorder": 1, "Oral pruritus": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Physical examination": 1, "Platelet count": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulse absent": 1, "Respiratory rate": 1, "Sensation of foreign body": 1, "Somnolence": 1, "Sudden infant death syndrome": 1, "Suspected COVID-19": 1, "Synovial cyst": 1, "Tachypnoea": 1, "Throat tightness": 1, "Thrombocytopenic purpura": 1, "Tinnitus": 1, "Tympanic membrane perforation": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site cellulitis": 1, "Vaccination site movement impairment": 1, "Vertigo": 1, "Wheezing": 1, "White blood cell scan": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["ER1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER3449.json b/docs/data/histograms/Mexico/ER3449.json
index b01d1d14e15..ca9f5ab43a0 100644
--- a/docs/data/histograms/Mexico/ER3449.json
+++ b/docs/data/histograms/Mexico/ER3449.json
@@ -1 +1 @@
-{"batchcode": "ER3449", "histograms": [{"batchcodes": ["ER3449"], "histogram": {"Headache": 2, "Myalgia": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "ER3449", "histograms": [{"histogram": {"Headache": 2, "Myalgia": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Nausea": 1}, "batchcodes": ["ER3449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER4449.json b/docs/data/histograms/Mexico/ER4449.json
index 180b51a0a01..9902c79dc9f 100644
--- a/docs/data/histograms/Mexico/ER4449.json
+++ b/docs/data/histograms/Mexico/ER4449.json
@@ -1 +1 @@
-{"batchcode": "ER4449", "histograms": [{"batchcodes": ["ER4449"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Febrile convulsion": 1, "Guillain-Barre syndrome": 1, "Pain": 1, "Paralysis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "ER4449", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Febrile convulsion": 1, "Guillain-Barre syndrome": 1, "Pain": 1, "Paralysis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}, "batchcodes": ["ER4449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER7934.json b/docs/data/histograms/Mexico/ER7934.json
index 50b9f6ae513..bad4ad0e4d2 100644
--- a/docs/data/histograms/Mexico/ER7934.json
+++ b/docs/data/histograms/Mexico/ER7934.json
@@ -1 +1 @@
-{"batchcode": "ER7934", "histograms": [{"batchcodes": ["ER7934"], "histogram": {"Headache": 77, "Asthenia": 61, "Dizziness": 50, "Pain": 46, "Fatigue": 44, "Sensitive skin": 43, "Myalgia": 41, "Nausea": 41, "Body temperature": 36, "Dyspnoea": 36, "Pyrexia": 36, "Blood pressure measurement": 34, "Arthralgia": 33, "Respiratory distress": 32, "Chills": 25, "Tachycardia": 25, "Diarrhoea": 18, "Blood pressure increased": 15, "Cough": 15, "Oxygen saturation": 15, "Vaccination site pain": 14, "Vomiting": 14, "Abdominal pain": 13, "Oropharyngeal pain": 13, "Paraesthesia": 12, "Rhinorrhoea": 12, "Hypertension": 11, "Oedema": 11, "Erythema": 9, "Heart rate": 8, "Hyperhidrosis": 8, "Oxygen saturation decreased": 8, "Pruritus": 8, "Chest pain": 7, "Decreased appetite": 7, "Induration": 7, "Inflammation": 7, "Nodule": 7, "Physical examination": 7, "Syncope": 7, "Body temperature increased": 6, "Hypertensive crisis": 6, "Malaise": 6, "Irritability": 5, "Lymphadenopathy": 5, "Pain assessment": 5, "Pain in extremity": 5, "Rash": 5, "Blood pressure abnormal": 4, "COVID-19": 4, "Dysphagia": 4, "Pneumonia": 4, "SARS-CoV-2 test": 4, "Tachypnoea": 4, "Vision blurred": 4, "Visual analogue scale": 4, "Blood glucose": 3, "Depressed level of consciousness": 3, "Febrile convulsion": 3, "Hypotension": 3, "Insomnia": 3, "Vertigo": 3, "Back pain": 2, "Blood pressure decreased": 2, "Cellulitis": 2, "Discomfort": 2, "Dyslalia": 2, "Haemodynamic test": 2, "Hemiparaesthesia": 2, "Hypersensitivity": 2, "Hyperthermia": 2, "Hypoaesthesia": 2, "Hypokinesia": 2, "Investigation": 2, "Loss of consciousness": 2, "Muscular weakness": 2, "Nasal congestion": 2, "Neck pain": 2, "Neurological examination": 2, "Odynophagia": 2, "Oedema peripheral": 2, "Panic attack": 2, "Paralysis": 2, "Polymerase chain reaction": 2, "Tinnitus": 2, "Vaccination site oedema": 2, "Vaginal haemorrhage": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Ageusia": 1, "Aggression": 1, "Altered state of consciousness": 1, "Amnesia": 1, "Analgesic therapy": 1, "Arrhythmia": 1, "Arthritis": 1, "Auscultation": 1, "Bedridden": 1, "Blood glucose increased": 1, "Bradycardia": 1, "Breast pain": 1, "Bronchospasm": 1, "Cardiomegaly": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Conjunctival hyperaemia": 1, "Cyanosis": 1, "Decreased activity": 1, "Delirium": 1, "Diabetes mellitus": 1, "Diffuse large B-cell lymphoma": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysphonia": 1, "Dysstasia": 1, "Ecchymosis": 1, "Encephalitis": 1, "Eye oedema": 1, "Eye pain": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Fall": 1, "Feeling cold": 1, "Feeling hot": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haemorrhagic disorder": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hyperaemia": 1, "Hyperglycaemia": 1, "Hypertensive urgency": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Laboratory test": 1, "Lip oedema": 1, "Localised oedema": 1, "Migraine": 1, "Mobility decreased": 1, "Monoparesis": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle strength abnormal": 1, "Myocardial infarction": 1, "Myocardial necrosis marker increased": 1, "Nasal turbinate hypertrophy": 1, "Nasopharyngitis": 1, "Off label use": 1, "Oral candidiasis": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paraparesis": 1, "Partial seizures": 1, "Peripheral swelling": 1, "Pharyngeal paraesthesia": 1, "Photopsia": 1, "Product use issue": 1, "Productive cough": 1, "Pulmonary pain": 1, "Rales": 1, "Respiratory rate": 1, "Rhinitis": 1, "Screaming": 1, "Seizure": 1, "Skin burning sensation": 1, "Sleep disorder": 1, "Spinal pain": 1, "Stool analysis": 1, "Tonsillar hypertrophy": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site dermatitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypersensitivity": 1, "Vaccination site inflammation": 1, "Vaccination site paraesthesia": 1, "Walking disability": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7934", "histograms": [{"histogram": {"Headache": 77, "Asthenia": 61, "Dizziness": 50, "Pain": 46, "Fatigue": 44, "Sensitive skin": 43, "Myalgia": 41, "Nausea": 41, "Body temperature": 36, "Dyspnoea": 36, "Pyrexia": 36, "Blood pressure measurement": 34, "Arthralgia": 33, "Respiratory distress": 32, "Chills": 25, "Tachycardia": 25, "Diarrhoea": 18, "Blood pressure increased": 15, "Cough": 15, "Oxygen saturation": 15, "Vaccination site pain": 14, "Vomiting": 14, "Abdominal pain": 13, "Oropharyngeal pain": 13, "Paraesthesia": 12, "Rhinorrhoea": 12, "Hypertension": 11, "Oedema": 11, "Erythema": 9, "Heart rate": 8, "Hyperhidrosis": 8, "Oxygen saturation decreased": 8, "Pruritus": 8, "Chest pain": 7, "Decreased appetite": 7, "Induration": 7, "Inflammation": 7, "Nodule": 7, "Physical examination": 7, "Syncope": 7, "Body temperature increased": 6, "Hypertensive crisis": 6, "Malaise": 6, "Irritability": 5, "Lymphadenopathy": 5, "Pain assessment": 5, "Pain in extremity": 5, "Rash": 5, "Blood pressure abnormal": 4, "COVID-19": 4, "Dysphagia": 4, "Pneumonia": 4, "SARS-CoV-2 test": 4, "Tachypnoea": 4, "Vision blurred": 4, "Visual analogue scale": 4, "Blood glucose": 3, "Depressed level of consciousness": 3, "Febrile convulsion": 3, "Hypotension": 3, "Insomnia": 3, "Vertigo": 3, "Back pain": 2, "Blood pressure decreased": 2, "Cellulitis": 2, "Discomfort": 2, "Dyslalia": 2, "Haemodynamic test": 2, "Hemiparaesthesia": 2, "Hypersensitivity": 2, "Hyperthermia": 2, "Hypoaesthesia": 2, "Hypokinesia": 2, "Investigation": 2, "Loss of consciousness": 2, "Muscular weakness": 2, "Nasal congestion": 2, "Neck pain": 2, "Neurological examination": 2, "Odynophagia": 2, "Oedema peripheral": 2, "Panic attack": 2, "Paralysis": 2, "Polymerase chain reaction": 2, "Tinnitus": 2, "Vaccination site oedema": 2, "Vaginal haemorrhage": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Ageusia": 1, "Aggression": 1, "Altered state of consciousness": 1, "Amnesia": 1, "Analgesic therapy": 1, "Arrhythmia": 1, "Arthritis": 1, "Auscultation": 1, "Bedridden": 1, "Blood glucose increased": 1, "Bradycardia": 1, "Breast pain": 1, "Bronchospasm": 1, "Cardiomegaly": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Conjunctival hyperaemia": 1, "Cyanosis": 1, "Decreased activity": 1, "Delirium": 1, "Diabetes mellitus": 1, "Diffuse large B-cell lymphoma": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysphonia": 1, "Dysstasia": 1, "Ecchymosis": 1, "Encephalitis": 1, "Eye oedema": 1, "Eye pain": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Fall": 1, "Feeling cold": 1, "Feeling hot": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Haemorrhagic disorder": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hyperaemia": 1, "Hyperglycaemia": 1, "Hypertensive urgency": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Laboratory test": 1, "Lip oedema": 1, "Localised oedema": 1, "Migraine": 1, "Mobility decreased": 1, "Monoparesis": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle strength abnormal": 1, "Myocardial infarction": 1, "Myocardial necrosis marker increased": 1, "Nasal turbinate hypertrophy": 1, "Nasopharyngitis": 1, "Off label use": 1, "Oral candidiasis": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paraparesis": 1, "Partial seizures": 1, "Peripheral swelling": 1, "Pharyngeal paraesthesia": 1, "Photopsia": 1, "Product use issue": 1, "Productive cough": 1, "Pulmonary pain": 1, "Rales": 1, "Respiratory rate": 1, "Rhinitis": 1, "Screaming": 1, "Seizure": 1, "Skin burning sensation": 1, "Sleep disorder": 1, "Spinal pain": 1, "Stool analysis": 1, "Tonsillar hypertrophy": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site dermatitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypersensitivity": 1, "Vaccination site inflammation": 1, "Vaccination site paraesthesia": 1, "Walking disability": 1}, "batchcodes": ["ER7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER7935.json b/docs/data/histograms/Mexico/ER7935.json
index fa3155baf5e..f5e1bb7ff45 100644
--- a/docs/data/histograms/Mexico/ER7935.json
+++ b/docs/data/histograms/Mexico/ER7935.json
@@ -1 +1 @@
-{"batchcode": "ER7935", "histograms": [{"batchcodes": ["ER7935"], "histogram": {"Body temperature": 1, "Diarrhoea": 1, "Headache": 1, "Inflammation": 1, "Local reaction": 1, "Nausea": 1, "Oedema": 1, "Pyrexia": 1, "Tremor": 1, "Urinary retention": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7935", "histograms": [{"histogram": {"Body temperature": 1, "Diarrhoea": 1, "Headache": 1, "Inflammation": 1, "Local reaction": 1, "Nausea": 1, "Oedema": 1, "Pyrexia": 1, "Tremor": 1, "Urinary retention": 1, "Vomiting": 1}, "batchcodes": ["ER7935"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER7A34-R2OJ19.json b/docs/data/histograms/Mexico/ER7A34-R2OJ19.json
index 373a4d93264..8fd15ef08ce 100644
--- a/docs/data/histograms/Mexico/ER7A34-R2OJ19.json
+++ b/docs/data/histograms/Mexico/ER7A34-R2OJ19.json
@@ -1 +1 @@
-{"batchcode": "ER7A34-R2OJ19", "histograms": [{"batchcodes": ["ER7A34-R2OJ19"], "histogram": {"Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Listless": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7A34-R2OJ19", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Listless": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["ER7A34-R2OJ19"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER8731.json b/docs/data/histograms/Mexico/ER8731.json
index 0bf3a88fdcb..dfb37412e9b 100644
--- a/docs/data/histograms/Mexico/ER8731.json
+++ b/docs/data/histograms/Mexico/ER8731.json
@@ -1 +1 @@
-{"batchcode": "ER8731", "histograms": [{"batchcodes": ["ER8731"], "histogram": {"Angina pectoris": 1, "Chest pain": 1, "Electrocardiogram": 1, "Fatigue": 1, "Movement disorder": 1, "Pain": 1, "Pyrexia": 1, "Sensation of foreign body": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8731", "histograms": [{"histogram": {"Angina pectoris": 1, "Chest pain": 1, "Electrocardiogram": 1, "Fatigue": 1, "Movement disorder": 1, "Pain": 1, "Pyrexia": 1, "Sensation of foreign body": 1}, "batchcodes": ["ER8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER8735.json b/docs/data/histograms/Mexico/ER8735.json
index 335250b33b2..3c35ec3e1dd 100644
--- a/docs/data/histograms/Mexico/ER8735.json
+++ b/docs/data/histograms/Mexico/ER8735.json
@@ -1 +1 @@
-{"batchcode": "ER8735", "histograms": [{"batchcodes": ["ER8735"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8735", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["ER8735"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER8736.json b/docs/data/histograms/Mexico/ER8736.json
index a05571a2252..63a16f12a0b 100644
--- a/docs/data/histograms/Mexico/ER8736.json
+++ b/docs/data/histograms/Mexico/ER8736.json
@@ -1 +1 @@
-{"batchcode": "ER8736", "histograms": [{"batchcodes": ["ER8736"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8736", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ER8736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER934.json b/docs/data/histograms/Mexico/ER934.json
index 73b509ee0c1..dcb89d05d4f 100644
--- a/docs/data/histograms/Mexico/ER934.json
+++ b/docs/data/histograms/Mexico/ER934.json
@@ -1 +1 @@
-{"batchcode": "ER934", "histograms": [{"batchcodes": ["ER934"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "ER934", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["ER934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER9446.json b/docs/data/histograms/Mexico/ER9446.json
index 4d3a12edc1b..ff4866bfe35 100644
--- a/docs/data/histograms/Mexico/ER9446.json
+++ b/docs/data/histograms/Mexico/ER9446.json
@@ -1 +1 @@
-{"batchcode": "ER9446", "histograms": [{"batchcodes": ["ER9446"], "histogram": {"Dyspnoea": 3, "Respiratory distress": 3, "Arthralgia": 2, "Body temperature": 2, "Cough": 2, "Headache": 2, "Myalgia": 2, "Pneumonia": 2, "Pyrexia": 2, "Anosmia": 1, "Bronchospasm": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Crying": 1, "Dizziness": 1, "Dysgeusia": 1, "Dyspnoea exertional": 1, "Induration": 1, "Inflammation": 1, "Irritability": 1, "Malaise": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9446", "histograms": [{"histogram": {"Dyspnoea": 3, "Respiratory distress": 3, "Arthralgia": 2, "Body temperature": 2, "Cough": 2, "Headache": 2, "Myalgia": 2, "Pneumonia": 2, "Pyrexia": 2, "Anosmia": 1, "Bronchospasm": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Crying": 1, "Dizziness": 1, "Dysgeusia": 1, "Dyspnoea exertional": 1, "Induration": 1, "Inflammation": 1, "Irritability": 1, "Malaise": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1}, "batchcodes": ["ER9446"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ER9449.json b/docs/data/histograms/Mexico/ER9449.json
index 8d1c20da31c..09da8159c19 100644
--- a/docs/data/histograms/Mexico/ER9449.json
+++ b/docs/data/histograms/Mexico/ER9449.json
@@ -1 +1 @@
-{"batchcode": "ER9449", "histograms": [{"batchcodes": ["ER9449"], "histogram": {"Headache": 43, "Asthenia": 36, "Sensitive skin": 35, "Fatigue": 32, "Pain": 31, "Myalgia": 29, "Nausea": 28, "Arthralgia": 22, "Body temperature": 22, "Pyrexia": 22, "Chills": 20, "Dizziness": 20, "Tachycardia": 19, "Pruritus": 15, "Dyspnoea": 14, "Oedema": 13, "Respiratory distress": 12, "Blood pressure measurement": 11, "Inflammation": 10, "Rash": 10, "Vaccination site pain": 10, "Vomiting": 10, "Rhinorrhoea": 9, "Erythema": 8, "Hypertension": 8, "Diarrhoea": 7, "Oropharyngeal pain": 7, "Abdominal pain": 6, "Cough": 6, "Chest pain": 5, "Decreased appetite": 5, "Hyperhidrosis": 5, "Malaise": 5, "Nodule": 5, "Cellulitis": 4, "Induration": 4, "Pain in extremity": 4, "Paraesthesia": 4, "Blood pressure increased": 3, "Discomfort": 3, "Eyelid oedema": 3, "Guillain-Barre syndrome": 3, "Hypertensive crisis": 3, "Hypovolaemic shock": 3, "Lip oedema": 3, "Lymphadenopathy": 3, "Movement disorder": 3, "Sensation of foreign body": 3, "Syncope": 3, "Vaccination error": 3, "Vaccination site oedema": 3, "Anaphylactic shock": 2, "Axillary pain": 2, "Back pain": 2, "Body temperature increased": 2, "Bronchospasm": 2, "Chest discomfort": 2, "Crying": 2, "Disorientation": 2, "Gait disturbance": 2, "Hemiparesis": 2, "Hypoaesthesia": 2, "Irritability": 2, "Muscular weakness": 2, "Paraesthesia oral": 2, "Physical examination": 2, "Pneumonia": 2, "Seizure": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Angina unstable": 1, "Bell's palsy": 1, "Blood pressure abnormal": 1, "Bradykinesia": 1, "Cardio-respiratory arrest": 1, "Cerebral small vessel ischaemic disease": 1, "Conjunctival hyperaemia": 1, "Conjunctivitis": 1, "Constipation": 1, "Deep vein thrombosis": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Feeling hot": 1, "Generalised oedema": 1, "Haemorrhagic disorder": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hyperaemia": 1, "Hypertensive emergency": 1, "Hypotension": 1, "Hypoxia": 1, "Insomnia": 1, "Joint injury": 1, "Joint stiffness": 1, "Lacrimation increased": 1, "Lacunar stroke": 1, "Lethargy": 1, "Loss of consciousness": 1, "Mastication disorder": 1, "Mechanical urticaria": 1, "Memory impairment": 1, "Meningioma": 1, "Muscle strength abnormal": 1, "Nasal congestion": 1, "Nasal pruritus": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pallor": 1, "Palpitations": 1, "Pharyngeal paraesthesia": 1, "Polydipsia": 1, "Productive cough": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Sneezing": 1, "Suspected COVID-19": 1, "Tachypnoea": 1, "Thrombosis": 1, "Tongue paralysis": 1, "Tremor": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site pruritus": 1, "Varicophlebitis": 1, "Vertigo": 1, "Visual analogue scale": 1, "Wheezing": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9449", "histograms": [{"histogram": {"Headache": 43, "Asthenia": 36, "Sensitive skin": 35, "Fatigue": 32, "Pain": 31, "Myalgia": 29, "Nausea": 28, "Arthralgia": 22, "Body temperature": 22, "Pyrexia": 22, "Chills": 20, "Dizziness": 20, "Tachycardia": 19, "Pruritus": 15, "Dyspnoea": 14, "Oedema": 13, "Respiratory distress": 12, "Blood pressure measurement": 11, "Inflammation": 10, "Rash": 10, "Vaccination site pain": 10, "Vomiting": 10, "Rhinorrhoea": 9, "Erythema": 8, "Hypertension": 8, "Diarrhoea": 7, "Oropharyngeal pain": 7, "Abdominal pain": 6, "Cough": 6, "Chest pain": 5, "Decreased appetite": 5, "Hyperhidrosis": 5, "Malaise": 5, "Nodule": 5, "Cellulitis": 4, "Induration": 4, "Pain in extremity": 4, "Paraesthesia": 4, "Blood pressure increased": 3, "Discomfort": 3, "Eyelid oedema": 3, "Guillain-Barre syndrome": 3, "Hypertensive crisis": 3, "Hypovolaemic shock": 3, "Lip oedema": 3, "Lymphadenopathy": 3, "Movement disorder": 3, "Sensation of foreign body": 3, "Syncope": 3, "Vaccination error": 3, "Vaccination site oedema": 3, "Anaphylactic shock": 2, "Axillary pain": 2, "Back pain": 2, "Body temperature increased": 2, "Bronchospasm": 2, "Chest discomfort": 2, "Crying": 2, "Disorientation": 2, "Gait disturbance": 2, "Hemiparesis": 2, "Hypoaesthesia": 2, "Irritability": 2, "Muscular weakness": 2, "Paraesthesia oral": 2, "Physical examination": 2, "Pneumonia": 2, "Seizure": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Amnesia": 1, "Anaphylactic reaction": 1, "Angina unstable": 1, "Bell's palsy": 1, "Blood pressure abnormal": 1, "Bradykinesia": 1, "Cardio-respiratory arrest": 1, "Cerebral small vessel ischaemic disease": 1, "Conjunctival hyperaemia": 1, "Conjunctivitis": 1, "Constipation": 1, "Deep vein thrombosis": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Feeling hot": 1, "Generalised oedema": 1, "Haemorrhagic disorder": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hyperaemia": 1, "Hypertensive emergency": 1, "Hypotension": 1, "Hypoxia": 1, "Insomnia": 1, "Joint injury": 1, "Joint stiffness": 1, "Lacrimation increased": 1, "Lacunar stroke": 1, "Lethargy": 1, "Loss of consciousness": 1, "Mastication disorder": 1, "Mechanical urticaria": 1, "Memory impairment": 1, "Meningioma": 1, "Muscle strength abnormal": 1, "Nasal congestion": 1, "Nasal pruritus": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pallor": 1, "Palpitations": 1, "Pharyngeal paraesthesia": 1, "Polydipsia": 1, "Productive cough": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Sneezing": 1, "Suspected COVID-19": 1, "Tachypnoea": 1, "Thrombosis": 1, "Tongue paralysis": 1, "Tremor": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site pruritus": 1, "Varicophlebitis": 1, "Vertigo": 1, "Visual analogue scale": 1, "Wheezing": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["ER9449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ERI742.json b/docs/data/histograms/Mexico/ERI742.json
index 2bc8ebfb419..978d6143ba6 100644
--- a/docs/data/histograms/Mexico/ERI742.json
+++ b/docs/data/histograms/Mexico/ERI742.json
@@ -1 +1 @@
-{"batchcode": "ERI742", "histograms": [{"batchcodes": ["ERI742"], "histogram": {"Dizziness": 5, "Headache": 4, "Irritability": 4, "Chills": 3, "Nausea": 3, "Hypoaesthesia": 2, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Burning sensation": 1, "Cough": 1, "Dyspnoea": 1, "Flushing": 1, "Hypertension": 1, "Lymphadenopathy": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "ERI742", "histograms": [{"histogram": {"Dizziness": 5, "Headache": 4, "Irritability": 4, "Chills": 3, "Nausea": 3, "Hypoaesthesia": 2, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Burning sensation": 1, "Cough": 1, "Dyspnoea": 1, "Flushing": 1, "Hypertension": 1, "Lymphadenopathy": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["ERI742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ES3002.json b/docs/data/histograms/Mexico/ES3002.json
index a9f310868d2..6a00258b20a 100644
--- a/docs/data/histograms/Mexico/ES3002.json
+++ b/docs/data/histograms/Mexico/ES3002.json
@@ -1 +1 @@
-{"batchcode": "ES3002", "histograms": [{"batchcodes": ["ES3002"], "histogram": {"Dizziness": 3, "Dyspnoea": 2, "Respiratory distress": 2, "Depressed level of consciousness": 1, "Headache": 1, "Hunger": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pain": 1, "Seizure": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "ES3002", "histograms": [{"histogram": {"Dizziness": 3, "Dyspnoea": 2, "Respiratory distress": 2, "Depressed level of consciousness": 1, "Headache": 1, "Hunger": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pain": 1, "Seizure": 1, "Sensitive skin": 1}, "batchcodes": ["ES3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ET-6924.json b/docs/data/histograms/Mexico/ET-6924.json
index 8dffb290160..71a10643969 100644
--- a/docs/data/histograms/Mexico/ET-6924.json
+++ b/docs/data/histograms/Mexico/ET-6924.json
@@ -1 +1 @@
-{"batchcode": "ET-6924", "histograms": [{"batchcodes": ["ET-6924"], "histogram": {"Blood disorder": 1, "Investigation": 1, "Leukopenia": 1, "Platelet production decreased": 1, "Skin discolouration": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "ET-6924", "histograms": [{"histogram": {"Blood disorder": 1, "Investigation": 1, "Leukopenia": 1, "Platelet production decreased": 1, "Skin discolouration": 1, "Urticaria": 1}, "batchcodes": ["ET-6924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ET4109.json b/docs/data/histograms/Mexico/ET4109.json
index 4bb0623f98b..bee3cc968ae 100644
--- a/docs/data/histograms/Mexico/ET4109.json
+++ b/docs/data/histograms/Mexico/ET4109.json
@@ -1 +1 @@
-{"batchcode": "ET4109", "histograms": [{"batchcodes": ["ET4109"], "histogram": {"Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Headache": 1, "Hypertension": 1, "Hypotension": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ET4109", "histograms": [{"histogram": {"Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Headache": 1, "Hypertension": 1, "Hypotension": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vomiting": 1}, "batchcodes": ["ET4109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ET6775.json b/docs/data/histograms/Mexico/ET6775.json
index 1f8923aecf8..34de97dc943 100644
--- a/docs/data/histograms/Mexico/ET6775.json
+++ b/docs/data/histograms/Mexico/ET6775.json
@@ -1 +1 @@
-{"batchcode": "ET6775", "histograms": [{"batchcodes": ["ET6775"], "histogram": {"Asthenia": 1, "Gait disturbance": 1, "Hemiparaesthesia": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6775", "histograms": [{"histogram": {"Asthenia": 1, "Gait disturbance": 1, "Hemiparaesthesia": 1, "Muscular weakness": 1}, "batchcodes": ["ET6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ET6924.json b/docs/data/histograms/Mexico/ET6924.json
index 184d515ca3e..75a5aa730dc 100644
--- a/docs/data/histograms/Mexico/ET6924.json
+++ b/docs/data/histograms/Mexico/ET6924.json
@@ -1 +1 @@
-{"batchcode": "ET6924", "histograms": [{"batchcodes": ["ET6924"], "histogram": {"Headache": 36, "Arthralgia": 25, "Asthenia": 24, "Fatigue": 24, "Myalgia": 24, "Dizziness": 22, "Sensitive skin": 22, "Body temperature": 21, "Pyrexia": 20, "Nausea": 18, "Pain": 18, "Vaccination site pain": 13, "Chills": 12, "Cough": 12, "Respiratory distress": 11, "Blood pressure measurement": 10, "Dyspnoea": 10, "Oedema": 10, "Hypertension": 9, "Pruritus": 9, "Vomiting": 9, "Rash": 8, "Tachycardia": 8, "Body temperature increased": 7, "Diarrhoea": 7, "Inflammation": 7, "Abdominal pain": 6, "Erythema": 5, "Hypertensive crisis": 5, "Induration": 5, "Oropharyngeal pain": 5, "Rhinorrhoea": 5, "Chest pain": 4, "Hypotension": 4, "Irritability": 4, "Nodule": 4, "Pain in extremity": 4, "COVID-19": 3, "Crying": 3, "Decreased appetite": 3, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Muscular weakness": 3, "Oxygen saturation": 3, "Paraesthesia": 3, "SARS-CoV-2 test": 3, "Back pain": 2, "Bronchospasm": 2, "Circumoral oedema": 2, "Drug ineffective": 2, "Eye pain": 2, "Facial paralysis": 2, "Lymphadenopathy": 2, "Malaise": 2, "Odynophagia": 2, "Oxygen saturation decreased": 2, "Pain assessment": 2, "Paralysis": 2, "Sensation of foreign body": 2, "Vision blurred": 2, "Anal sphincter atony": 1, "Anosmia": 1, "Aphonia": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Bone pain": 1, "Cellulitis": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Discomfort": 1, "Dry throat": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyslipidaemia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear pain": 1, "Eye injury": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hyperthermia": 1, "Hypokinesia": 1, "Hypothermia": 1, "Hypotonia": 1, "Insomnia": 1, "Investigation": 1, "Lipids": 1, "Maternal exposure during pregnancy": 1, "Muscle contractions involuntary": 1, "Muscle strength abnormal": 1, "Musculoskeletal stiffness": 1, "Oedema mouth": 1, "Oedema peripheral": 1, "Placental disorder": 1, "Pneumonia": 1, "Polydipsia": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Pruritus genital": 1, "Seizure": 1, "Skin warm": 1, "Somnolence": 1, "Tinnitus": 1, "Tonic convulsion": 1, "Tonsillar hypertrophy": 1, "Tremor": 1, "Uterine dilation and curettage": 1, "Uterine spasm": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site nodule": 1, "Vaginal haemorrhage": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6924", "histograms": [{"histogram": {"Headache": 36, "Arthralgia": 25, "Asthenia": 24, "Fatigue": 24, "Myalgia": 24, "Dizziness": 22, "Sensitive skin": 22, "Body temperature": 21, "Pyrexia": 20, "Nausea": 18, "Pain": 18, "Vaccination site pain": 13, "Chills": 12, "Cough": 12, "Respiratory distress": 11, "Blood pressure measurement": 10, "Dyspnoea": 10, "Oedema": 10, "Hypertension": 9, "Pruritus": 9, "Vomiting": 9, "Rash": 8, "Tachycardia": 8, "Body temperature increased": 7, "Diarrhoea": 7, "Inflammation": 7, "Abdominal pain": 6, "Erythema": 5, "Hypertensive crisis": 5, "Induration": 5, "Oropharyngeal pain": 5, "Rhinorrhoea": 5, "Chest pain": 4, "Hypotension": 4, "Irritability": 4, "Nodule": 4, "Pain in extremity": 4, "COVID-19": 3, "Crying": 3, "Decreased appetite": 3, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Muscular weakness": 3, "Oxygen saturation": 3, "Paraesthesia": 3, "SARS-CoV-2 test": 3, "Back pain": 2, "Bronchospasm": 2, "Circumoral oedema": 2, "Drug ineffective": 2, "Eye pain": 2, "Facial paralysis": 2, "Lymphadenopathy": 2, "Malaise": 2, "Odynophagia": 2, "Oxygen saturation decreased": 2, "Pain assessment": 2, "Paralysis": 2, "Sensation of foreign body": 2, "Vision blurred": 2, "Anal sphincter atony": 1, "Anosmia": 1, "Aphonia": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Bone pain": 1, "Cellulitis": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Discomfort": 1, "Dry throat": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyslipidaemia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear pain": 1, "Eye injury": 1, "Eyelid oedema": 1, "Eyelid ptosis": 1, "Face oedema": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hyperthermia": 1, "Hypokinesia": 1, "Hypothermia": 1, "Hypotonia": 1, "Insomnia": 1, "Investigation": 1, "Lipids": 1, "Maternal exposure during pregnancy": 1, "Muscle contractions involuntary": 1, "Muscle strength abnormal": 1, "Musculoskeletal stiffness": 1, "Oedema mouth": 1, "Oedema peripheral": 1, "Placental disorder": 1, "Pneumonia": 1, "Polydipsia": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Pruritus genital": 1, "Seizure": 1, "Skin warm": 1, "Somnolence": 1, "Tinnitus": 1, "Tonic convulsion": 1, "Tonsillar hypertrophy": 1, "Tremor": 1, "Uterine dilation and curettage": 1, "Uterine spasm": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site nodule": 1, "Vaginal haemorrhage": 1, "Vertigo": 1}, "batchcodes": ["ET6924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ET6924/FC2495.json b/docs/data/histograms/Mexico/ET6924/FC2495.json
index 020fbf79212..5f6e48c2ee8 100644
--- a/docs/data/histograms/Mexico/ET6924/FC2495.json
+++ b/docs/data/histograms/Mexico/ET6924/FC2495.json
@@ -1 +1 @@
-{"batchcode": "ET6924/FC2495", "histograms": [{"batchcodes": ["ET6924/FC2495"], "histogram": {"Decreased activity": 1, "Hypotonia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6924/FC2495", "histograms": [{"histogram": {"Decreased activity": 1, "Hypotonia": 1, "Pain in extremity": 1}, "batchcodes": ["ET6924/FC2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/ETP6924.json b/docs/data/histograms/Mexico/ETP6924.json
index fd889a68c1d..ba588a7ca0d 100644
--- a/docs/data/histograms/Mexico/ETP6924.json
+++ b/docs/data/histograms/Mexico/ETP6924.json
@@ -1 +1 @@
-{"batchcode": "ETP6924", "histograms": [{"batchcodes": ["ETP6924"], "histogram": {"Headache": 1, "Hypertension": 1, "Irritability": 1, "Tinnitus": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "ETP6924", "histograms": [{"histogram": {"Headache": 1, "Hypertension": 1, "Irritability": 1, "Tinnitus": 1, "Vision blurred": 1}, "batchcodes": ["ETP6924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EU3002.json b/docs/data/histograms/Mexico/EU3002.json
index 2a79afbd9b2..dfabe43c6e2 100644
--- a/docs/data/histograms/Mexico/EU3002.json
+++ b/docs/data/histograms/Mexico/EU3002.json
@@ -1 +1 @@
-{"batchcode": "EU3002", "histograms": [{"batchcodes": ["EU3002"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Cellulitis": 1, "Chills": 1, "Crying": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Headache": 1, "Inflammation": 1, "Irritability": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EU3002", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Cellulitis": 1, "Chills": 1, "Crying": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Headache": 1, "Inflammation": 1, "Irritability": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["EU3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EVV0191.json b/docs/data/histograms/Mexico/EVV0191.json
index 6282e8fd5fc..19a0b04d01d 100644
--- a/docs/data/histograms/Mexico/EVV0191.json
+++ b/docs/data/histograms/Mexico/EVV0191.json
@@ -1 +1 @@
-{"batchcode": "EVV0191", "histograms": [{"batchcodes": ["EVV0191"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EVV0191", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EVV0191"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW 0195.json b/docs/data/histograms/Mexico/EW 0195.json
index ed847c5d2f4..ee82f715300 100644
--- a/docs/data/histograms/Mexico/EW 0195.json
+++ b/docs/data/histograms/Mexico/EW 0195.json
@@ -1 +1 @@
-{"batchcode": "EW 0195", "histograms": [{"batchcodes": ["EW 0195"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW 0195", "histograms": [{"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["EW 0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW 2245.json b/docs/data/histograms/Mexico/EW 2245.json
index 9aaaa3630e6..a59cd7fa277 100644
--- a/docs/data/histograms/Mexico/EW 2245.json
+++ b/docs/data/histograms/Mexico/EW 2245.json
@@ -1 +1 @@
-{"batchcode": "EW 2245", "histograms": [{"batchcodes": ["EW 2245"], "histogram": {"Extraocular muscle paresis": 1, "Ophthalmological examination": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EW 2245", "histograms": [{"histogram": {"Extraocular muscle paresis": 1, "Ophthalmological examination": 1, "Visual impairment": 1}, "batchcodes": ["EW 2245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW-0193.json b/docs/data/histograms/Mexico/EW-0193.json
index 42047945ac5..ea59c886030 100644
--- a/docs/data/histograms/Mexico/EW-0193.json
+++ b/docs/data/histograms/Mexico/EW-0193.json
@@ -1 +1 @@
-{"batchcode": "EW-0193", "histograms": [{"batchcodes": ["EW-0193"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Pyrexia": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "EW-0193", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Pyrexia": 1, "Respiratory distress": 1}, "batchcodes": ["EW-0193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW-0206.json b/docs/data/histograms/Mexico/EW-0206.json
index 56d3f3f12a6..67d7b41256e 100644
--- a/docs/data/histograms/Mexico/EW-0206.json
+++ b/docs/data/histograms/Mexico/EW-0206.json
@@ -1 +1 @@
-{"batchcode": "EW-0206", "histograms": [{"batchcodes": ["EW-0206"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dysarthria": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Nausea": 1, "Tachycardia": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW-0206", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dysarthria": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Nausea": 1, "Tachycardia": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["EW-0206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW-0221.json b/docs/data/histograms/Mexico/EW-0221.json
index ecc4484c5f8..5e391c2b500 100644
--- a/docs/data/histograms/Mexico/EW-0221.json
+++ b/docs/data/histograms/Mexico/EW-0221.json
@@ -1 +1 @@
-{"batchcode": "EW-0221", "histograms": [{"batchcodes": ["EW-0221"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW-0221", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Vomiting": 1}, "batchcodes": ["EW-0221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW-2245(8).json b/docs/data/histograms/Mexico/EW-2245(8).json
index d46cdb4d6b5..11d5372b4f4 100644
--- a/docs/data/histograms/Mexico/EW-2245(8).json
+++ b/docs/data/histograms/Mexico/EW-2245(8).json
@@ -1 +1 @@
-{"batchcode": "EW-2245(8)", "histograms": [{"batchcodes": ["EW-2245(8)"], "histogram": {"Aggression": 1, "Angiogram": 1, "Dementia Alzheimer's type": 1, "Electroencephalogram": 1, "Investigation": 1, "Memory impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EW-2245(8)", "histograms": [{"histogram": {"Aggression": 1, "Angiogram": 1, "Dementia Alzheimer's type": 1, "Electroencephalogram": 1, "Investigation": 1, "Memory impairment": 1}, "batchcodes": ["EW-2245(8)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW-2245.json b/docs/data/histograms/Mexico/EW-2245.json
index a5fbb051cc5..cc9c1dd3b34 100644
--- a/docs/data/histograms/Mexico/EW-2245.json
+++ b/docs/data/histograms/Mexico/EW-2245.json
@@ -1 +1 @@
-{"batchcode": "EW-2245", "histograms": [{"batchcodes": ["EW-2245"], "histogram": {"Body temperature": 2, "Pyrexia": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Chest scan": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Salmonellosis": 1, "Temperature regulation disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW-2245", "histograms": [{"histogram": {"Body temperature": 2, "Pyrexia": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Chest scan": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Salmonellosis": 1, "Temperature regulation disorder": 1, "Vomiting": 1}, "batchcodes": ["EW-2245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0122.json b/docs/data/histograms/Mexico/EW0122.json
index dbb3bfe488f..640705a06c9 100644
--- a/docs/data/histograms/Mexico/EW0122.json
+++ b/docs/data/histograms/Mexico/EW0122.json
@@ -1 +1 @@
-{"batchcode": "EW0122", "histograms": [{"batchcodes": ["EW0122"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0122", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}, "batchcodes": ["EW0122"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0159.json b/docs/data/histograms/Mexico/EW0159.json
index ff762961c09..dc34851962e 100644
--- a/docs/data/histograms/Mexico/EW0159.json
+++ b/docs/data/histograms/Mexico/EW0159.json
@@ -1 +1 @@
-{"batchcode": "EW0159", "histograms": [{"batchcodes": ["EW0159"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Myalgia": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0159", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Myalgia": 1, "Nausea": 1}, "batchcodes": ["EW0159"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0161.json b/docs/data/histograms/Mexico/EW0161.json
index 104f2e150ac..929590e1e52 100644
--- a/docs/data/histograms/Mexico/EW0161.json
+++ b/docs/data/histograms/Mexico/EW0161.json
@@ -1 +1 @@
-{"batchcode": "EW0161", "histograms": [{"batchcodes": ["EW0161"], "histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0161", "histograms": [{"histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}, "batchcodes": ["EW0161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0164.json b/docs/data/histograms/Mexico/EW0164.json
index a68bcce48e3..2d14e39e4ea 100644
--- a/docs/data/histograms/Mexico/EW0164.json
+++ b/docs/data/histograms/Mexico/EW0164.json
@@ -1 +1 @@
-{"batchcode": "EW0164", "histograms": [{"batchcodes": ["EW0164"], "histogram": {"Drug ineffective": 1, "Hypokinesia": 1, "Muscular dystrophy": 1, "Myalgia": 1, "Myositis": 1, "Skin atrophy": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0164", "histograms": [{"histogram": {"Drug ineffective": 1, "Hypokinesia": 1, "Muscular dystrophy": 1, "Myalgia": 1, "Myositis": 1, "Skin atrophy": 1, "Suspected COVID-19": 1}, "batchcodes": ["EW0164"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0171.json b/docs/data/histograms/Mexico/EW0171.json
index 201e72add42..4ed268b8c00 100644
--- a/docs/data/histograms/Mexico/EW0171.json
+++ b/docs/data/histograms/Mexico/EW0171.json
@@ -1 +1 @@
-{"batchcode": "EW0171", "histograms": [{"batchcodes": ["EW0171"], "histogram": {"Antibody test": 1, "Arthralgia": 1, "Blood test": 1, "Computerised tomogram": 1, "Constipation": 1, "Ear swelling": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Hyperaesthesia": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Nerve injury": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pain in extremity": 1, "Pancreatic calcification": 1, "Pancreatic pseudocyst": 1, "Pancreatitis chronic": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0171", "histograms": [{"histogram": {"Antibody test": 1, "Arthralgia": 1, "Blood test": 1, "Computerised tomogram": 1, "Constipation": 1, "Ear swelling": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Hyperaesthesia": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Nerve injury": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pain in extremity": 1, "Pancreatic calcification": 1, "Pancreatic pseudocyst": 1, "Pancreatitis chronic": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["EW0171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0173.json b/docs/data/histograms/Mexico/EW0173.json
index 9749544a490..15f283a453c 100644
--- a/docs/data/histograms/Mexico/EW0173.json
+++ b/docs/data/histograms/Mexico/EW0173.json
@@ -1 +1 @@
-{"batchcode": "EW0173", "histograms": [{"batchcodes": ["EW0173"], "histogram": {"Cough": 1, "Lung disorder": 1, "Respiratory disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0173", "histograms": [{"histogram": {"Cough": 1, "Lung disorder": 1, "Respiratory disorder": 1}, "batchcodes": ["EW0173"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0175.json b/docs/data/histograms/Mexico/EW0175.json
index a6136faded4..685078e2aee 100644
--- a/docs/data/histograms/Mexico/EW0175.json
+++ b/docs/data/histograms/Mexico/EW0175.json
@@ -1 +1 @@
-{"batchcode": "EW0175", "histograms": [{"batchcodes": ["EW0175"], "histogram": {"Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Myalgia": 1, "Pain of skin": 1, "Pyrexia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0175", "histograms": [{"histogram": {"Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Myalgia": 1, "Pain of skin": 1, "Pyrexia": 1, "Urticaria": 1}, "batchcodes": ["EW0175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0177.json b/docs/data/histograms/Mexico/EW0177.json
index dfe8b3932aa..64ef15e9204 100644
--- a/docs/data/histograms/Mexico/EW0177.json
+++ b/docs/data/histograms/Mexico/EW0177.json
@@ -1 +1 @@
-{"batchcode": "EW0177", "histograms": [{"batchcodes": ["EW0177"], "histogram": {"Heart injury": 1, "Heart rate irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0177", "histograms": [{"histogram": {"Heart injury": 1, "Heart rate irregular": 1}, "batchcodes": ["EW0177"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0178.json b/docs/data/histograms/Mexico/EW0178.json
index 8d15295c859..219c75a5bdb 100644
--- a/docs/data/histograms/Mexico/EW0178.json
+++ b/docs/data/histograms/Mexico/EW0178.json
@@ -1 +1 @@
-{"batchcode": "EW0178", "histograms": [{"batchcodes": ["EW0178"], "histogram": {"Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0178", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0178"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0179.json b/docs/data/histograms/Mexico/EW0179.json
index 6e5f461df5d..5580d2c13e7 100644
--- a/docs/data/histograms/Mexico/EW0179.json
+++ b/docs/data/histograms/Mexico/EW0179.json
@@ -1 +1 @@
-{"batchcode": "EW0179", "histograms": [{"batchcodes": ["EW0179"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0179", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EW0179"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0181.json b/docs/data/histograms/Mexico/EW0181.json
index ff43cb6ce88..1094d714bf0 100644
--- a/docs/data/histograms/Mexico/EW0181.json
+++ b/docs/data/histograms/Mexico/EW0181.json
@@ -1 +1 @@
-{"batchcode": "EW0181", "histograms": [{"batchcodes": ["EW0181"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0181", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0182.json b/docs/data/histograms/Mexico/EW0182.json
index 738580fb9bc..45357e73f2e 100644
--- a/docs/data/histograms/Mexico/EW0182.json
+++ b/docs/data/histograms/Mexico/EW0182.json
@@ -1 +1 @@
-{"batchcode": "EW0182", "histograms": [{"batchcodes": ["EW0182"], "histogram": {"Asthenia": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dry mouth": 1, "Generalised tonic-clonic seizure": 1, "Nausea": 1, "Photopsia": 1, "Postictal state": 1, "Seizure": 1, "Tinnitus": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0182", "histograms": [{"histogram": {"Asthenia": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Dry mouth": 1, "Generalised tonic-clonic seizure": 1, "Nausea": 1, "Photopsia": 1, "Postictal state": 1, "Seizure": 1, "Tinnitus": 1, "Vision blurred": 1}, "batchcodes": ["EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0185.json b/docs/data/histograms/Mexico/EW0185.json
index 85d712f139c..66f0ac7db91 100644
--- a/docs/data/histograms/Mexico/EW0185.json
+++ b/docs/data/histograms/Mexico/EW0185.json
@@ -1 +1 @@
-{"batchcode": "EW0185", "histograms": [{"batchcodes": ["EW0185"], "histogram": {"Headache": 1, "Pain": 1, "Pyrexia": 1, "Skin burning sensation": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0185", "histograms": [{"histogram": {"Headache": 1, "Pain": 1, "Pyrexia": 1, "Skin burning sensation": 1}, "batchcodes": ["EW0185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0193.json b/docs/data/histograms/Mexico/EW0193.json
index cd7cfeb4570..2f1e239cc84 100644
--- a/docs/data/histograms/Mexico/EW0193.json
+++ b/docs/data/histograms/Mexico/EW0193.json
@@ -1 +1 @@
-{"batchcode": "EW0193", "histograms": [{"batchcodes": ["EW0193"], "histogram": {"Headache": 31, "Asthenia": 26, "Dizziness": 25, "Fatigue": 23, "Dyspnoea": 22, "Myalgia": 21, "Respiratory distress": 21, "Pain": 20, "Sensitive skin": 20, "Arthralgia": 18, "Body temperature": 18, "Chills": 17, "Pyrexia": 17, "Nausea": 16, "Oropharyngeal pain": 14, "Cough": 13, "Diarrhoea": 10, "Blood pressure measurement": 9, "Rhinorrhoea": 9, "Tachycardia": 8, "Vomiting": 8, "Abdominal pain": 7, "Induration": 6, "Nodule": 6, "Odynophagia": 6, "Hypertension": 5, "Malaise": 5, "Blood pressure increased": 4, "Heart rate": 4, "Hyperhidrosis": 4, "Hypokinesia": 4, "Paralysis": 4, "Vaccination site pain": 4, "Erythema": 3, "Hypertensive crisis": 3, "Oedema": 3, "Paraesthesia": 3, "Pruritus": 3, "Blood glucose": 2, "Blood glucose increased": 2, "Body temperature increased": 2, "Chest pain": 2, "Dry mouth": 2, "Dysarthria": 2, "Guillain-Barre syndrome": 2, "Heart rate decreased": 2, "Hyperaesthesia": 2, "Hyperthermia": 2, "Inflammation": 2, "Lymphadenopathy": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Sinus tachycardia": 2, "Vital signs measurement": 2, "Altered state of consciousness": 1, "Anaesthesia": 1, "Angina pectoris": 1, "Anxiety": 1, "Aphasia": 1, "Back pain": 1, "Blood pressure abnormal": 1, "Bradykinesia": 1, "Bronchitis": 1, "Burning sensation": 1, "Cellulitis": 1, "Cerebral ischaemia": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chronic kidney disease": 1, "Coma scale": 1, "Computerised tomogram": 1, "Conjunctivitis": 1, "Cyanosis": 1, "Decreased appetite": 1, "Diabetes mellitus": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Encephalitis viral": 1, "Endocarditis": 1, "Facial pain": 1, "Feeling cold": 1, "Hand deformity": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hyperreflexia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Irritability": 1, "Local reaction": 1, "Loss of consciousness": 1, "Lung disorder": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Neurological examination": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pallor": 1, "Palpitations": 1, "Physical examination": 1, "Pleural effusion": 1, "Pneumonia": 1, "Presyncope": 1, "Product administration error": 1, "Productive cough": 1, "Rales": 1, "Rash": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Seizure": 1, "Sensitisation": 1, "Sepsis": 1, "Sneezing": 1, "Somnolence": 1, "Speech disorder": 1, "Throat irritation": 1, "Tinnitus": 1, "Tremor": 1, "Tricuspid valve incompetence": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Wrong technique in product usage process": 1, "Xerophthalmia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0193", "histograms": [{"histogram": {"Headache": 31, "Asthenia": 26, "Dizziness": 25, "Fatigue": 23, "Dyspnoea": 22, "Myalgia": 21, "Respiratory distress": 21, "Pain": 20, "Sensitive skin": 20, "Arthralgia": 18, "Body temperature": 18, "Chills": 17, "Pyrexia": 17, "Nausea": 16, "Oropharyngeal pain": 14, "Cough": 13, "Diarrhoea": 10, "Blood pressure measurement": 9, "Rhinorrhoea": 9, "Tachycardia": 8, "Vomiting": 8, "Abdominal pain": 7, "Induration": 6, "Nodule": 6, "Odynophagia": 6, "Hypertension": 5, "Malaise": 5, "Blood pressure increased": 4, "Heart rate": 4, "Hyperhidrosis": 4, "Hypokinesia": 4, "Paralysis": 4, "Vaccination site pain": 4, "Erythema": 3, "Hypertensive crisis": 3, "Oedema": 3, "Paraesthesia": 3, "Pruritus": 3, "Blood glucose": 2, "Blood glucose increased": 2, "Body temperature increased": 2, "Chest pain": 2, "Dry mouth": 2, "Dysarthria": 2, "Guillain-Barre syndrome": 2, "Heart rate decreased": 2, "Hyperaesthesia": 2, "Hyperthermia": 2, "Inflammation": 2, "Lymphadenopathy": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Sinus tachycardia": 2, "Vital signs measurement": 2, "Altered state of consciousness": 1, "Anaesthesia": 1, "Angina pectoris": 1, "Anxiety": 1, "Aphasia": 1, "Back pain": 1, "Blood pressure abnormal": 1, "Bradykinesia": 1, "Bronchitis": 1, "Burning sensation": 1, "Cellulitis": 1, "Cerebral ischaemia": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chronic kidney disease": 1, "Coma scale": 1, "Computerised tomogram": 1, "Conjunctivitis": 1, "Cyanosis": 1, "Decreased appetite": 1, "Diabetes mellitus": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Encephalitis viral": 1, "Endocarditis": 1, "Facial pain": 1, "Feeling cold": 1, "Hand deformity": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hyperreflexia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hyporeflexia": 1, "Irritability": 1, "Local reaction": 1, "Loss of consciousness": 1, "Lung disorder": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Neurological examination": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pallor": 1, "Palpitations": 1, "Physical examination": 1, "Pleural effusion": 1, "Pneumonia": 1, "Presyncope": 1, "Product administration error": 1, "Productive cough": 1, "Rales": 1, "Rash": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Seizure": 1, "Sensitisation": 1, "Sepsis": 1, "Sneezing": 1, "Somnolence": 1, "Speech disorder": 1, "Throat irritation": 1, "Tinnitus": 1, "Tremor": 1, "Tricuspid valve incompetence": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Wrong technique in product usage process": 1, "Xerophthalmia": 1}, "batchcodes": ["EW0193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0195.json b/docs/data/histograms/Mexico/EW0195.json
index 51555b713aa..fef2ed862c6 100644
--- a/docs/data/histograms/Mexico/EW0195.json
+++ b/docs/data/histograms/Mexico/EW0195.json
@@ -1 +1 @@
-{"batchcode": "EW0195", "histograms": [{"batchcodes": ["EW0195"], "histogram": {"Dizziness": 14, "Asthenia": 13, "Fatigue": 13, "Headache": 12, "Dyspnoea": 11, "Pain": 11, "Sensitive skin": 11, "Respiratory distress": 10, "Nausea": 9, "Cough": 8, "Tachycardia": 8, "Chills": 7, "Vomiting": 7, "Arthralgia": 5, "Blood pressure measurement": 5, "Myalgia": 5, "Rhinorrhoea": 5, "Syncope": 5, "Body temperature": 4, "Erythema": 4, "Oropharyngeal pain": 4, "Pyrexia": 4, "Chest pain": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Hypertension": 3, "Induration": 3, "Pruritus": 3, "Rash": 3, "Abdominal pain": 2, "Anxiety": 2, "Dysphagia": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Irritability": 2, "Maternal exposure during pregnancy": 2, "Myocarditis": 2, "Nodule": 2, "Oedema": 2, "Palpitations": 2, "SARS-CoV-2 test": 2, "Stridor": 2, "Tinnitus": 2, "Vaccination site pain": 2, "Agitation": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Back pain": 1, "Blood electrolytes normal": 1, "Blood glucose": 1, "Blood prolactin": 1, "Blood prolactin increased": 1, "COVID-19": 1, "Crying": 1, "Death": 1, "Disease recurrence": 1, "Dry mouth": 1, "Dysphonia": 1, "Electrocardiogram ambulatory": 1, "Eyelid oedema": 1, "Fear": 1, "Flushing": 1, "Foreign body in throat": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Hyperglycaemia": 1, "Hypertensive crisis": 1, "Hyponatraemia": 1, "Hypovolaemic shock": 1, "Inflammation": 1, "Intussusception": 1, "Lip oedema": 1, "Malaise": 1, "Moaning": 1, "Muscular weakness": 1, "Nasal inflammation": 1, "Odynophagia": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pharyngeal inflammation": 1, "Presyncope": 1, "Supraventricular extrasystoles": 1, "Throat tightness": 1, "Thyroid disorder": 1, "Tremor": 1, "Ultrasound thyroid": 1, "Vaccination failure": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vertigo": 1, "Visual analogue scale": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0195", "histograms": [{"histogram": {"Dizziness": 14, "Asthenia": 13, "Fatigue": 13, "Headache": 12, "Dyspnoea": 11, "Pain": 11, "Sensitive skin": 11, "Respiratory distress": 10, "Nausea": 9, "Cough": 8, "Tachycardia": 8, "Chills": 7, "Vomiting": 7, "Arthralgia": 5, "Blood pressure measurement": 5, "Myalgia": 5, "Rhinorrhoea": 5, "Syncope": 5, "Body temperature": 4, "Erythema": 4, "Oropharyngeal pain": 4, "Pyrexia": 4, "Chest pain": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Hypertension": 3, "Induration": 3, "Pruritus": 3, "Rash": 3, "Abdominal pain": 2, "Anxiety": 2, "Dysphagia": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Irritability": 2, "Maternal exposure during pregnancy": 2, "Myocarditis": 2, "Nodule": 2, "Oedema": 2, "Palpitations": 2, "SARS-CoV-2 test": 2, "Stridor": 2, "Tinnitus": 2, "Vaccination site pain": 2, "Agitation": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Back pain": 1, "Blood electrolytes normal": 1, "Blood glucose": 1, "Blood prolactin": 1, "Blood prolactin increased": 1, "COVID-19": 1, "Crying": 1, "Death": 1, "Disease recurrence": 1, "Dry mouth": 1, "Dysphonia": 1, "Electrocardiogram ambulatory": 1, "Eyelid oedema": 1, "Fear": 1, "Flushing": 1, "Foreign body in throat": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Hyperglycaemia": 1, "Hypertensive crisis": 1, "Hyponatraemia": 1, "Hypovolaemic shock": 1, "Inflammation": 1, "Intussusception": 1, "Lip oedema": 1, "Malaise": 1, "Moaning": 1, "Muscular weakness": 1, "Nasal inflammation": 1, "Odynophagia": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pharyngeal inflammation": 1, "Presyncope": 1, "Supraventricular extrasystoles": 1, "Throat tightness": 1, "Thyroid disorder": 1, "Tremor": 1, "Ultrasound thyroid": 1, "Vaccination failure": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vertigo": 1, "Visual analogue scale": 1, "Wound": 1}, "batchcodes": ["EW0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0196.json b/docs/data/histograms/Mexico/EW0196.json
index eb852362509..1d8921e3672 100644
--- a/docs/data/histograms/Mexico/EW0196.json
+++ b/docs/data/histograms/Mexico/EW0196.json
@@ -1 +1 @@
-{"batchcode": "EW0196", "histograms": [{"batchcodes": ["EW0196"], "histogram": {"Arthralgia": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Vomiting": 2, "Asthenia": 1, "Body temperature": 1, "Burning sensation": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Inflammation": 1, "Insomnia": 1, "Oedema": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0196", "histograms": [{"histogram": {"Arthralgia": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Vomiting": 2, "Asthenia": 1, "Body temperature": 1, "Burning sensation": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Inflammation": 1, "Insomnia": 1, "Oedema": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tremor": 1}, "batchcodes": ["EW0196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0198.json b/docs/data/histograms/Mexico/EW0198.json
index 17f2093eb6b..2b13847a43a 100644
--- a/docs/data/histograms/Mexico/EW0198.json
+++ b/docs/data/histograms/Mexico/EW0198.json
@@ -1 +1 @@
-{"batchcode": "EW0198", "histograms": [{"batchcodes": ["EW0198"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0198", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Vaccination site pain": 1}, "batchcodes": ["EW0198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0199.json b/docs/data/histograms/Mexico/EW0199.json
index 93b0cfe5087..188ef805c8e 100644
--- a/docs/data/histograms/Mexico/EW0199.json
+++ b/docs/data/histograms/Mexico/EW0199.json
@@ -1 +1 @@
-{"batchcode": "EW0199", "histograms": [{"batchcodes": ["EW0199"], "histogram": {"Headache": 16, "Asthenia": 10, "Body temperature": 9, "Dizziness": 9, "Arthralgia": 8, "Fatigue": 8, "Myalgia": 8, "Nausea": 8, "Pyrexia": 8, "Abdominal pain": 6, "Chills": 6, "Dyspnoea": 6, "Oropharyngeal pain": 6, "Pruritus": 6, "Pain": 5, "Respiratory distress": 5, "Sensitive skin": 5, "Cough": 4, "Diarrhoea": 4, "Paraesthesia": 4, "Rash": 4, "Vomiting": 4, "Blood pressure measurement": 3, "Erythema": 3, "Hypertension": 3, "Lymphadenopathy": 3, "Malaise": 3, "Oxygen saturation": 3, "Rhinorrhoea": 3, "Tachycardia": 3, "Body temperature increased": 2, "Eyelid oedema": 2, "Facial paralysis": 2, "Heart rate": 2, "Irritability": 2, "Loss of consciousness": 2, "Oedema": 2, "Abdominal distension": 1, "Axillary pain": 1, "Base excess": 1, "Base excess decreased": 1, "Blood bicarbonate": 1, "Blood pH decreased": 1, "Bronchospasm": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Decreased appetite": 1, "Discomfort": 1, "Dysphonia": 1, "Ear pain": 1, "Feeling hot": 1, "Haematochezia": 1, "Haemoglobin": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Induration": 1, "Inflammation": 1, "Maternal exposure during pregnancy": 1, "Nodule": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "Pain assessment": 1, "Respiratory rate": 1, "Sensation of foreign body": 1, "Subcutaneous abscess": 1, "Throat irritation": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vital signs measurement": 1, "White blood cell count": 1, "White blood cell count increased": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0199", "histograms": [{"histogram": {"Headache": 16, "Asthenia": 10, "Body temperature": 9, "Dizziness": 9, "Arthralgia": 8, "Fatigue": 8, "Myalgia": 8, "Nausea": 8, "Pyrexia": 8, "Abdominal pain": 6, "Chills": 6, "Dyspnoea": 6, "Oropharyngeal pain": 6, "Pruritus": 6, "Pain": 5, "Respiratory distress": 5, "Sensitive skin": 5, "Cough": 4, "Diarrhoea": 4, "Paraesthesia": 4, "Rash": 4, "Vomiting": 4, "Blood pressure measurement": 3, "Erythema": 3, "Hypertension": 3, "Lymphadenopathy": 3, "Malaise": 3, "Oxygen saturation": 3, "Rhinorrhoea": 3, "Tachycardia": 3, "Body temperature increased": 2, "Eyelid oedema": 2, "Facial paralysis": 2, "Heart rate": 2, "Irritability": 2, "Loss of consciousness": 2, "Oedema": 2, "Abdominal distension": 1, "Axillary pain": 1, "Base excess": 1, "Base excess decreased": 1, "Blood bicarbonate": 1, "Blood pH decreased": 1, "Bronchospasm": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Decreased appetite": 1, "Discomfort": 1, "Dysphonia": 1, "Ear pain": 1, "Feeling hot": 1, "Haematochezia": 1, "Haemoglobin": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Induration": 1, "Inflammation": 1, "Maternal exposure during pregnancy": 1, "Nodule": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "Pain assessment": 1, "Respiratory rate": 1, "Sensation of foreign body": 1, "Subcutaneous abscess": 1, "Throat irritation": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vital signs measurement": 1, "White blood cell count": 1, "White blood cell count increased": 1, "pH body fluid": 1}, "batchcodes": ["EW0199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0202.json b/docs/data/histograms/Mexico/EW0202.json
index 7268a6a4a0a..a49b07a2b52 100644
--- a/docs/data/histograms/Mexico/EW0202.json
+++ b/docs/data/histograms/Mexico/EW0202.json
@@ -1 +1 @@
-{"batchcode": "EW0202", "histograms": [{"batchcodes": ["EW0202"], "histogram": {"Oropharyngeal discomfort": 1, "Poisoning": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0202", "histograms": [{"histogram": {"Oropharyngeal discomfort": 1, "Poisoning": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}, "batchcodes": ["EW0202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0206.json b/docs/data/histograms/Mexico/EW0206.json
index 6cabf90e097..1e69468a174 100644
--- a/docs/data/histograms/Mexico/EW0206.json
+++ b/docs/data/histograms/Mexico/EW0206.json
@@ -1 +1 @@
-{"batchcode": "EW0206", "histograms": [{"batchcodes": ["EW0206"], "histogram": {"Headache": 34, "Asthenia": 23, "Fatigue": 23, "Dizziness": 21, "Myalgia": 20, "Arthralgia": 17, "Pain": 16, "Sensitive skin": 16, "Blood pressure measurement": 14, "Body temperature": 13, "Dyspnoea": 11, "Nausea": 11, "Respiratory distress": 11, "Pyrexia": 10, "Chills": 9, "Diarrhoea": 8, "Heart rate": 8, "Malaise": 8, "Oedema": 8, "Tachycardia": 8, "Cough": 7, "Erythema": 7, "Oropharyngeal pain": 7, "Vaccination site pain": 7, "Vomiting": 7, "Inflammation": 6, "Oxygen saturation": 6, "Pruritus": 6, "SARS-CoV-2 test": 6, "Body temperature increased": 5, "COVID-19": 5, "Hypertension": 5, "Abdominal pain": 4, "Blood pressure increased": 4, "Hypokinesia": 4, "Chest pain": 3, "Decreased appetite": 3, "Oxygen saturation decreased": 3, "Rash": 3, "Respiratory rate": 3, "Rhinorrhoea": 3, "Abdominal pain upper": 2, "Anosmia": 2, "Asphyxia": 2, "Blood glucose": 2, "Body height": 2, "Cellulitis": 2, "Discomfort": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Hypotension": 2, "Muscular weakness": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Seizure": 2, "Somnolence": 2, "Vital signs measurement": 2, "Weight": 2, "Abnormal faeces": 1, "Acute myocardial infarction": 1, "Angina pectoris": 1, "Anxiety": 1, "Atopy": 1, "Auscultation": 1, "Back pain": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Body mass index": 1, "Bradycardia": 1, "Confusional state": 1, "Conjunctivitis": 1, "Depressed level of consciousness": 1, "Diabetes mellitus management": 1, "Disease recurrence": 1, "Dry throat": 1, "Dysaesthesia": 1, "Dyslipidaemia": 1, "Dyspnoea at rest": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial paralysis": 1, "Flushing": 1, "Gallbladder disorder": 1, "Gastric infection": 1, "General physical health deterioration": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hyperglycaemia": 1, "Hypertensive crisis": 1, "Investigation": 1, "Lacrimation increased": 1, "Lip oedema": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Myocarditis": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Parasite stool test negative": 1, "Pharyngitis": 1, "Physical examination": 1, "Pneumonia": 1, "Polyarthritis": 1, "SARS-CoV-2 test positive": 1, "Tachypnoea": 1, "Thirst": 1, "Thrombocytopenia": 1, "Troponin": 1, "Troponin increased": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site warmth": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0206", "histograms": [{"histogram": {"Headache": 34, "Asthenia": 23, "Fatigue": 23, "Dizziness": 21, "Myalgia": 20, "Arthralgia": 17, "Pain": 16, "Sensitive skin": 16, "Blood pressure measurement": 14, "Body temperature": 13, "Dyspnoea": 11, "Nausea": 11, "Respiratory distress": 11, "Pyrexia": 10, "Chills": 9, "Diarrhoea": 8, "Heart rate": 8, "Malaise": 8, "Oedema": 8, "Tachycardia": 8, "Cough": 7, "Erythema": 7, "Oropharyngeal pain": 7, "Vaccination site pain": 7, "Vomiting": 7, "Inflammation": 6, "Oxygen saturation": 6, "Pruritus": 6, "SARS-CoV-2 test": 6, "Body temperature increased": 5, "COVID-19": 5, "Hypertension": 5, "Abdominal pain": 4, "Blood pressure increased": 4, "Hypokinesia": 4, "Chest pain": 3, "Decreased appetite": 3, "Oxygen saturation decreased": 3, "Rash": 3, "Respiratory rate": 3, "Rhinorrhoea": 3, "Abdominal pain upper": 2, "Anosmia": 2, "Asphyxia": 2, "Blood glucose": 2, "Body height": 2, "Cellulitis": 2, "Discomfort": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Hypotension": 2, "Muscular weakness": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Seizure": 2, "Somnolence": 2, "Vital signs measurement": 2, "Weight": 2, "Abnormal faeces": 1, "Acute myocardial infarction": 1, "Angina pectoris": 1, "Anxiety": 1, "Atopy": 1, "Auscultation": 1, "Back pain": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Body mass index": 1, "Bradycardia": 1, "Confusional state": 1, "Conjunctivitis": 1, "Depressed level of consciousness": 1, "Diabetes mellitus management": 1, "Disease recurrence": 1, "Dry throat": 1, "Dysaesthesia": 1, "Dyslipidaemia": 1, "Dyspnoea at rest": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial paralysis": 1, "Flushing": 1, "Gallbladder disorder": 1, "Gastric infection": 1, "General physical health deterioration": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hyperglycaemia": 1, "Hypertensive crisis": 1, "Investigation": 1, "Lacrimation increased": 1, "Lip oedema": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Myocarditis": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Parasite stool test negative": 1, "Pharyngitis": 1, "Physical examination": 1, "Pneumonia": 1, "Polyarthritis": 1, "SARS-CoV-2 test positive": 1, "Tachypnoea": 1, "Thirst": 1, "Thrombocytopenia": 1, "Troponin": 1, "Troponin increased": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site warmth": 1, "Vertigo": 1}, "batchcodes": ["EW0206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0217.json b/docs/data/histograms/Mexico/EW0217.json
index c08b2e6f498..d920db00387 100644
--- a/docs/data/histograms/Mexico/EW0217.json
+++ b/docs/data/histograms/Mexico/EW0217.json
@@ -1 +1 @@
-{"batchcode": "EW0217", "histograms": [{"batchcodes": ["EW0217"], "histogram": {"Breast discharge": 1, "Hypoaesthesia oral": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0217", "histograms": [{"histogram": {"Breast discharge": 1, "Hypoaesthesia oral": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0221.json b/docs/data/histograms/Mexico/EW0221.json
index 42c0970530b..6e4e73167ac 100644
--- a/docs/data/histograms/Mexico/EW0221.json
+++ b/docs/data/histograms/Mexico/EW0221.json
@@ -1 +1 @@
-{"batchcode": "EW0221", "histograms": [{"batchcodes": ["EW0221"], "histogram": {"Headache": 22, "Arthralgia": 16, "Pain": 16, "Myalgia": 15, "Nausea": 15, "Sensitive skin": 15, "Asthenia": 14, "Dizziness": 13, "Fatigue": 13, "Body temperature": 12, "Pyrexia": 9, "Inflammation": 8, "Oedema": 8, "Abdominal pain": 7, "Chills": 7, "Pruritus": 7, "Tachycardia": 7, "Blood pressure measurement": 6, "Body temperature increased": 6, "Erythema": 6, "Oropharyngeal pain": 5, "Respiratory distress": 5, "Vomiting": 5, "Decreased appetite": 4, "Diarrhoea": 4, "Dyspnoea": 4, "Hypertension": 4, "Nodule": 4, "Paraesthesia": 4, "Seizure": 4, "Hypertensive crisis": 3, "Induration": 3, "Malaise": 3, "Pain in extremity": 3, "Rash": 3, "Vaccination site pain": 3, "Vision blurred": 3, "Back pain": 2, "Bradycardia": 2, "Cellulitis": 2, "Cough": 2, "Face oedema": 2, "Haemorrhage": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Hypovolaemic shock": 2, "Lymphadenopathy": 2, "Movement disorder": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Thirst": 2, "Tinnitus": 2, "Vaccination site induration": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Abscess": 1, "Anxiety": 1, "Bell's palsy": 1, "Burning sensation": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Conjunctival haemorrhage": 1, "Dehydration": 1, "Disorientation": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Encephalitis": 1, "Eye injury": 1, "Eye pruritus": 1, "Facial paralysis": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling of despair": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Hemiparesis": 1, "Hyperaemia": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Irritability": 1, "Lymphadenitis": 1, "Muscle contractions involuntary": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Neuralgia": 1, "Oedema peripheral": 1, "Pain assessment": 1, "Paralysis": 1, "Peripheral swelling": 1, "Photopsia": 1, "Rash macular": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Sensory loss": 1, "Skin lesion": 1, "Stupor": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Ultrasound scan": 1, "Urine abnormality": 1, "Vaccination failure": 1, "Vaccination site inflammation": 1, "Vaccination site oedema": 1, "Visual acuity reduced": 1, "Visual analogue scale": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0221", "histograms": [{"histogram": {"Headache": 22, "Arthralgia": 16, "Pain": 16, "Myalgia": 15, "Nausea": 15, "Sensitive skin": 15, "Asthenia": 14, "Dizziness": 13, "Fatigue": 13, "Body temperature": 12, "Pyrexia": 9, "Inflammation": 8, "Oedema": 8, "Abdominal pain": 7, "Chills": 7, "Pruritus": 7, "Tachycardia": 7, "Blood pressure measurement": 6, "Body temperature increased": 6, "Erythema": 6, "Oropharyngeal pain": 5, "Respiratory distress": 5, "Vomiting": 5, "Decreased appetite": 4, "Diarrhoea": 4, "Dyspnoea": 4, "Hypertension": 4, "Nodule": 4, "Paraesthesia": 4, "Seizure": 4, "Hypertensive crisis": 3, "Induration": 3, "Malaise": 3, "Pain in extremity": 3, "Rash": 3, "Vaccination site pain": 3, "Vision blurred": 3, "Back pain": 2, "Bradycardia": 2, "Cellulitis": 2, "Cough": 2, "Face oedema": 2, "Haemorrhage": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Hypovolaemic shock": 2, "Lymphadenopathy": 2, "Movement disorder": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Thirst": 2, "Tinnitus": 2, "Vaccination site induration": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Abscess": 1, "Anxiety": 1, "Bell's palsy": 1, "Burning sensation": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Conjunctival haemorrhage": 1, "Dehydration": 1, "Disorientation": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Encephalitis": 1, "Eye injury": 1, "Eye pruritus": 1, "Facial paralysis": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling of despair": 1, "Guillain-Barre syndrome": 1, "Haematochezia": 1, "Hemiparesis": 1, "Hyperaemia": 1, "Hyperthermia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Irritability": 1, "Lymphadenitis": 1, "Muscle contractions involuntary": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Neuralgia": 1, "Oedema peripheral": 1, "Pain assessment": 1, "Paralysis": 1, "Peripheral swelling": 1, "Photopsia": 1, "Rash macular": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Sensory loss": 1, "Skin lesion": 1, "Stupor": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Ultrasound scan": 1, "Urine abnormality": 1, "Vaccination failure": 1, "Vaccination site inflammation": 1, "Vaccination site oedema": 1, "Visual acuity reduced": 1, "Visual analogue scale": 1, "Weight": 1, "Weight decreased": 1, "X-ray": 1}, "batchcodes": ["EW0221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0225.json b/docs/data/histograms/Mexico/EW0225.json
index 2a5eab1d770..bf610e902b0 100644
--- a/docs/data/histograms/Mexico/EW0225.json
+++ b/docs/data/histograms/Mexico/EW0225.json
@@ -1 +1 @@
-{"batchcode": "EW0225", "histograms": [{"batchcodes": ["EW0225"], "histogram": {"Dehydration": 1, "Diarrhoea": 1, "Headache": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0225", "histograms": [{"histogram": {"Dehydration": 1, "Diarrhoea": 1, "Headache": 1, "Vomiting": 1}, "batchcodes": ["EW0225"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW0395.json b/docs/data/histograms/Mexico/EW0395.json
index 71e7d8400ca..26ee691a3d3 100644
--- a/docs/data/histograms/Mexico/EW0395.json
+++ b/docs/data/histograms/Mexico/EW0395.json
@@ -1 +1 @@
-{"batchcode": "EW0395", "histograms": [{"batchcodes": ["EW0395"], "histogram": {"Anxiety": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Nausea": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0395", "histograms": [{"histogram": {"Anxiety": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Nausea": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0395"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW1067.json b/docs/data/histograms/Mexico/EW1067.json
index a7f36cdcc43..2de55ea2d5a 100644
--- a/docs/data/histograms/Mexico/EW1067.json
+++ b/docs/data/histograms/Mexico/EW1067.json
@@ -1 +1 @@
-{"batchcode": "EW1067", "histograms": [{"batchcodes": ["EW1067"], "histogram": {"Asymptomatic COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW1067", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EW1067"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW109.json b/docs/data/histograms/Mexico/EW109.json
index 4762fbf5b63..8c856be58e2 100644
--- a/docs/data/histograms/Mexico/EW109.json
+++ b/docs/data/histograms/Mexico/EW109.json
@@ -1 +1 @@
-{"batchcode": "EW109", "histograms": [{"batchcodes": ["EW109"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EW109", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1}, "batchcodes": ["EW109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW1095.json b/docs/data/histograms/Mexico/EW1095.json
index 5f147e47d76..0412bffeac1 100644
--- a/docs/data/histograms/Mexico/EW1095.json
+++ b/docs/data/histograms/Mexico/EW1095.json
@@ -1 +1 @@
-{"batchcode": "EW1095", "histograms": [{"batchcodes": ["EW1095"], "histogram": {"Body temperature": 1, "Chills": 1, "Hyperhidrosis": 1, "Hyperpyrexia": 1, "Irritability": 1, "Loss of consciousness": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "EW1095", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Hyperhidrosis": 1, "Hyperpyrexia": 1, "Irritability": 1, "Loss of consciousness": 1, "Vaccination error": 1}, "batchcodes": ["EW1095"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW199.json b/docs/data/histograms/Mexico/EW199.json
index 56a382c8ecb..7e72eaa270f 100644
--- a/docs/data/histograms/Mexico/EW199.json
+++ b/docs/data/histograms/Mexico/EW199.json
@@ -1 +1 @@
-{"batchcode": "EW199", "histograms": [{"batchcodes": ["EW199"], "histogram": {"Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Asthenia": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW199", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Arthralgia": 1, "Asthenia": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["EW199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW2215.json b/docs/data/histograms/Mexico/EW2215.json
index 0ba37886cb4..cdb2e919f85 100644
--- a/docs/data/histograms/Mexico/EW2215.json
+++ b/docs/data/histograms/Mexico/EW2215.json
@@ -1 +1 @@
-{"batchcode": "EW2215", "histograms": [{"batchcodes": ["EW2215"], "histogram": {"Conjunctival hyperaemia": 1, "Eye injury": 1, "Eye pain": 1, "Photophobia": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2215", "histograms": [{"histogram": {"Conjunctival hyperaemia": 1, "Eye injury": 1, "Eye pain": 1, "Photophobia": 1, "Visual analogue scale": 1}, "batchcodes": ["EW2215"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW22245.json b/docs/data/histograms/Mexico/EW22245.json
index f5b3057a49c..bcf6abec176 100644
--- a/docs/data/histograms/Mexico/EW22245.json
+++ b/docs/data/histograms/Mexico/EW22245.json
@@ -1 +1 @@
-{"batchcode": "EW22245", "histograms": [{"batchcodes": ["EW22245"], "histogram": {"Body temperature": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EW22245", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "Sensitive skin": 1}, "batchcodes": ["EW22245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW2242.json b/docs/data/histograms/Mexico/EW2242.json
index da9148652a3..451235a893e 100644
--- a/docs/data/histograms/Mexico/EW2242.json
+++ b/docs/data/histograms/Mexico/EW2242.json
@@ -1 +1 @@
-{"batchcode": "EW2242", "histograms": [{"batchcodes": ["EW2242"], "histogram": {"Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2242", "histograms": [{"histogram": {"Pruritus": 1}, "batchcodes": ["EW2242"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW2245.json b/docs/data/histograms/Mexico/EW2245.json
index 1c40d510936..d09433d2da0 100644
--- a/docs/data/histograms/Mexico/EW2245.json
+++ b/docs/data/histograms/Mexico/EW2245.json
@@ -1 +1 @@
-{"batchcode": "EW2245", "histograms": [{"batchcodes": ["EW2245", "NA0224"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}}, {"batchcodes": ["EW2245"], "histogram": {"Headache": 99, "Asthenia": 72, "Fatigue": 69, "Dizziness": 65, "Sensitive skin": 55, "Pain": 54, "Nausea": 50, "Myalgia": 46, "Dyspnoea": 43, "Respiratory distress": 41, "Body temperature": 38, "Arthralgia": 37, "Pyrexia": 36, "Chills": 35, "Blood pressure measurement": 32, "Tachycardia": 30, "Cough": 27, "Vomiting": 27, "Vaccination site pain": 24, "Hypertension": 21, "Pruritus": 19, "Oedema": 16, "Oropharyngeal pain": 15, "Paraesthesia": 15, "Body temperature increased": 14, "Erythema": 14, "Inflammation": 14, "Rash": 13, "Diarrhoea": 12, "Irritability": 11, "Decreased appetite": 10, "Malaise": 10, "Rhinorrhoea": 10, "Abdominal pain": 9, "Oxygen saturation": 9, "Muscular weakness": 8, "Nodule": 8, "Pain in extremity": 8, "Hyperhidrosis": 7, "Syncope": 7, "Anxiety": 6, "Chest pain": 6, "Hypokinesia": 6, "Lymphadenopathy": 6, "Sensation of foreign body": 6, "Vision blurred": 6, "Blood pressure increased": 5, "Bronchospasm": 5, "Heart rate": 5, "Induration": 5, "Oedema peripheral": 5, "Paralysis": 5, "Seizure": 5, "Anaphylactic shock": 4, "Drug ineffective": 4, "Dysphagia": 4, "Dysphonia": 4, "Guillain-Barre syndrome": 4, "Photophobia": 4, "Somnolence": 4, "Tremor": 4, "Vaccination site oedema": 4, "Anaphylactic reaction": 3, "COVID-19": 3, "Chest discomfort": 3, "Conjunctivitis": 3, "Disorientation": 3, "Eye pain": 3, "Eyelid oedema": 3, "Generalised tonic-clonic seizure": 3, "Hypotension": 3, "Mobility decreased": 3, "Neck pain": 3, "Oxygen saturation decreased": 3, "Pain assessment": 3, "Pallor": 3, "Palpitations": 3, "Paraesthesia oral": 3, "Suspected COVID-19": 3, "Vaccination error": 3, "Vaccination site pruritus": 3, "Vaccination site warmth": 3, "Visual impairment": 3, "Anosmia": 2, "Back pain": 2, "Cellulitis": 2, "Crying": 2, "Facial paralysis": 2, "Fall": 2, "Gait disturbance": 2, "Hemiparaesthesia": 2, "Hypertensive crisis": 2, "Hypoxia": 2, "Investigation": 2, "Laboratory test": 2, "Local reaction": 2, "Neuropathy peripheral": 2, "Odynophagia": 2, "Photopsia": 2, "Polymerase chain reaction": 2, "SARS-CoV-2 test": 2, "Sneezing": 2, "Speech disorder": 2, "Throat irritation": 2, "Tinnitus": 2, "Vaccination failure": 2, "Vaccination site induration": 2, "Visual analogue scale": 2, "Affect lability": 1, "Agitation": 1, "Albumin urine": 1, "Albuminuria": 1, "Amaurosis": 1, "Amnesia": 1, "Angina pectoris": 1, "Aphonia": 1, "Ascites": 1, "Asphyxia": 1, "Auscultation": 1, "Autonomic nervous system imbalance": 1, "Balance disorder": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood iron": 1, "Blood pressure abnormal": 1, "Bone pain": 1, "Bradycardia": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Circumoral oedema": 1, "Computerised tomogram head": 1, "Constipation": 1, "Cyanosis": 1, "Death": 1, "Depressed level of consciousness": 1, "Diabetes mellitus": 1, "Diplopia": 1, "Dry mouth": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dyslalia": 1, "Ear pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Expired product administered": 1, "Eye disorder": 1, "Eye injury": 1, "Eyelid pain": 1, "Feeling cold": 1, "Flushing": 1, "Foreign body in throat": 1, "Glomerular filtration rate decreased": 1, "Glomerulonephritis rapidly progressive": 1, "Glossitis": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Hemiplegia": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperresponsive to stimuli": 1, "Hypertensive urgency": 1, "Hyperthermia": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoventilation": 1, "Hypovolaemic shock": 1, "IIIrd nerve paralysis": 1, "Incorrect route of product administration": 1, "Joint injury": 1, "Large intestinal obstruction": 1, "Lethargy": 1, "Lymphadenopathy mediastinal": 1, "Maternal exposure during pregnancy": 1, "Metastasis": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Myoclonus": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neurological decompensation": 1, "Ocular discomfort": 1, "Oesophagitis": 1, "Oral administration complication": 1, "Oral pruritus": 1, "Oxygen saturation abnormal": 1, "Petechiae": 1, "Pharyngeal oedema": 1, "Phonophobia": 1, "Physical examination": 1, "Pneumonia": 1, "Poor peripheral circulation": 1, "Proteinuria": 1, "Pupils unequal": 1, "Purpura": 1, "Rales": 1, "Rash macular": 1, "Rash vesicular": 1, "Red blood cell count increased": 1, "Respiratory acidosis": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Slow speech": 1, "Swollen tongue": 1, "Tachypnoea": 1, "Temperature regulation disorder": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Tunnel vision": 1, "Type I hypersensitivity": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Urticaria": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Varicose vein": 1, "Venous thrombosis": 1, "Visual acuity reduced": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2245", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}, "batchcodes": ["EW2245", "NA0224"]}, {"histogram": {"Headache": 99, "Asthenia": 72, "Fatigue": 69, "Dizziness": 65, "Sensitive skin": 55, "Pain": 54, "Nausea": 50, "Myalgia": 46, "Dyspnoea": 43, "Respiratory distress": 41, "Body temperature": 38, "Arthralgia": 37, "Pyrexia": 36, "Chills": 35, "Blood pressure measurement": 32, "Tachycardia": 30, "Cough": 27, "Vomiting": 27, "Vaccination site pain": 24, "Hypertension": 21, "Pruritus": 19, "Oedema": 16, "Oropharyngeal pain": 15, "Paraesthesia": 15, "Body temperature increased": 14, "Erythema": 14, "Inflammation": 14, "Rash": 13, "Diarrhoea": 12, "Irritability": 11, "Decreased appetite": 10, "Malaise": 10, "Rhinorrhoea": 10, "Abdominal pain": 9, "Oxygen saturation": 9, "Muscular weakness": 8, "Nodule": 8, "Pain in extremity": 8, "Hyperhidrosis": 7, "Syncope": 7, "Anxiety": 6, "Chest pain": 6, "Hypokinesia": 6, "Lymphadenopathy": 6, "Sensation of foreign body": 6, "Vision blurred": 6, "Blood pressure increased": 5, "Bronchospasm": 5, "Heart rate": 5, "Induration": 5, "Oedema peripheral": 5, "Paralysis": 5, "Seizure": 5, "Anaphylactic shock": 4, "Drug ineffective": 4, "Dysphagia": 4, "Dysphonia": 4, "Guillain-Barre syndrome": 4, "Photophobia": 4, "Somnolence": 4, "Tremor": 4, "Vaccination site oedema": 4, "Anaphylactic reaction": 3, "COVID-19": 3, "Chest discomfort": 3, "Conjunctivitis": 3, "Disorientation": 3, "Eye pain": 3, "Eyelid oedema": 3, "Generalised tonic-clonic seizure": 3, "Hypotension": 3, "Mobility decreased": 3, "Neck pain": 3, "Oxygen saturation decreased": 3, "Pain assessment": 3, "Pallor": 3, "Palpitations": 3, "Paraesthesia oral": 3, "Suspected COVID-19": 3, "Vaccination error": 3, "Vaccination site pruritus": 3, "Vaccination site warmth": 3, "Visual impairment": 3, "Anosmia": 2, "Back pain": 2, "Cellulitis": 2, "Crying": 2, "Facial paralysis": 2, "Fall": 2, "Gait disturbance": 2, "Hemiparaesthesia": 2, "Hypertensive crisis": 2, "Hypoxia": 2, "Investigation": 2, "Laboratory test": 2, "Local reaction": 2, "Neuropathy peripheral": 2, "Odynophagia": 2, "Photopsia": 2, "Polymerase chain reaction": 2, "SARS-CoV-2 test": 2, "Sneezing": 2, "Speech disorder": 2, "Throat irritation": 2, "Tinnitus": 2, "Vaccination failure": 2, "Vaccination site induration": 2, "Visual analogue scale": 2, "Affect lability": 1, "Agitation": 1, "Albumin urine": 1, "Albuminuria": 1, "Amaurosis": 1, "Amnesia": 1, "Angina pectoris": 1, "Aphonia": 1, "Ascites": 1, "Asphyxia": 1, "Auscultation": 1, "Autonomic nervous system imbalance": 1, "Balance disorder": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood immunoglobulin A": 1, "Blood iron": 1, "Blood pressure abnormal": 1, "Bone pain": 1, "Bradycardia": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Circumoral oedema": 1, "Computerised tomogram head": 1, "Constipation": 1, "Cyanosis": 1, "Death": 1, "Depressed level of consciousness": 1, "Diabetes mellitus": 1, "Diplopia": 1, "Dry mouth": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dyslalia": 1, "Ear pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Expired product administered": 1, "Eye disorder": 1, "Eye injury": 1, "Eyelid pain": 1, "Feeling cold": 1, "Flushing": 1, "Foreign body in throat": 1, "Glomerular filtration rate decreased": 1, "Glomerulonephritis rapidly progressive": 1, "Glossitis": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Hemiplegia": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperresponsive to stimuli": 1, "Hypertensive urgency": 1, "Hyperthermia": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoventilation": 1, "Hypovolaemic shock": 1, "IIIrd nerve paralysis": 1, "Incorrect route of product administration": 1, "Joint injury": 1, "Large intestinal obstruction": 1, "Lethargy": 1, "Lymphadenopathy mediastinal": 1, "Maternal exposure during pregnancy": 1, "Metastasis": 1, "Motor dysfunction": 1, "Muscle spasms": 1, "Myoclonus": 1, "Nephrotic syndrome": 1, "Nervous system disorder": 1, "Neurological decompensation": 1, "Ocular discomfort": 1, "Oesophagitis": 1, "Oral administration complication": 1, "Oral pruritus": 1, "Oxygen saturation abnormal": 1, "Petechiae": 1, "Pharyngeal oedema": 1, "Phonophobia": 1, "Physical examination": 1, "Pneumonia": 1, "Poor peripheral circulation": 1, "Proteinuria": 1, "Pupils unequal": 1, "Purpura": 1, "Rales": 1, "Rash macular": 1, "Rash vesicular": 1, "Red blood cell count increased": 1, "Respiratory acidosis": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Slow speech": 1, "Swollen tongue": 1, "Tachypnoea": 1, "Temperature regulation disorder": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Tunnel vision": 1, "Type I hypersensitivity": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Urticaria": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Varicose vein": 1, "Venous thrombosis": 1, "Visual acuity reduced": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["EW2245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW2295.json b/docs/data/histograms/Mexico/EW2295.json
index 9dc032e814d..d449319ad70 100644
--- a/docs/data/histograms/Mexico/EW2295.json
+++ b/docs/data/histograms/Mexico/EW2295.json
@@ -1 +1 @@
-{"batchcode": "EW2295", "histograms": [{"batchcodes": ["EW2295"], "histogram": {"Arthralgia": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2295", "histograms": [{"histogram": {"Arthralgia": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["EW2295"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW2544.json b/docs/data/histograms/Mexico/EW2544.json
index e6cd072351f..2701517143a 100644
--- a/docs/data/histograms/Mexico/EW2544.json
+++ b/docs/data/histograms/Mexico/EW2544.json
@@ -1 +1 @@
-{"batchcode": "EW2544", "histograms": [{"batchcodes": ["EW2544"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Malaise": 1, "Myalgia": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Productive cough": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2544", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Malaise": 1, "Myalgia": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Productive cough": 1}, "batchcodes": ["EW2544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW3344.json b/docs/data/histograms/Mexico/EW3344.json
index be35934c175..26f54f2ee99 100644
--- a/docs/data/histograms/Mexico/EW3344.json
+++ b/docs/data/histograms/Mexico/EW3344.json
@@ -1 +1 @@
-{"batchcode": "EW3344", "histograms": [{"batchcodes": ["EW3344"], "histogram": {"Asthenia": 4, "Dizziness": 4, "Fatigue": 4, "Arthralgia": 3, "Body temperature": 3, "Headache": 3, "Myalgia": 3, "Oedema": 3, "Pyrexia": 3, "Syncope": 3, "Vomiting": 3, "Hyperhidrosis": 2, "Nausea": 2, "Pain": 2, "Abdominal pain": 1, "Body temperature increased": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Disorientation": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Haematemesis": 1, "Induration": 1, "Inflammation": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Neck pain": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pallor": 1, "Respiratory distress": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "EW3344", "histograms": [{"histogram": {"Asthenia": 4, "Dizziness": 4, "Fatigue": 4, "Arthralgia": 3, "Body temperature": 3, "Headache": 3, "Myalgia": 3, "Oedema": 3, "Pyrexia": 3, "Syncope": 3, "Vomiting": 3, "Hyperhidrosis": 2, "Nausea": 2, "Pain": 2, "Abdominal pain": 1, "Body temperature increased": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Disorientation": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Haematemesis": 1, "Induration": 1, "Inflammation": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Neck pain": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pallor": 1, "Respiratory distress": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Visual analogue scale": 1}, "batchcodes": ["EW3344"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW4041.json b/docs/data/histograms/Mexico/EW4041.json
index cea289b183a..484ed161963 100644
--- a/docs/data/histograms/Mexico/EW4041.json
+++ b/docs/data/histograms/Mexico/EW4041.json
@@ -1 +1 @@
-{"batchcode": "EW4041", "histograms": [{"batchcodes": ["EW4041"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "EW4041", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Irritability": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1}, "batchcodes": ["EW4041"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW4101.json b/docs/data/histograms/Mexico/EW4101.json
index 966f58714f9..9ac27b1b787 100644
--- a/docs/data/histograms/Mexico/EW4101.json
+++ b/docs/data/histograms/Mexico/EW4101.json
@@ -1 +1 @@
-{"batchcode": "EW4101", "histograms": [{"batchcodes": ["EW4101"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Respiratory distress": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW4101", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Respiratory distress": 1, "Vomiting": 1}, "batchcodes": ["EW4101"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW4104.json b/docs/data/histograms/Mexico/EW4104.json
index 5ceda6d02d4..7199047511a 100644
--- a/docs/data/histograms/Mexico/EW4104.json
+++ b/docs/data/histograms/Mexico/EW4104.json
@@ -1 +1 @@
-{"batchcode": "EW4104", "histograms": [{"batchcodes": ["EW4104"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW4104", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["EW4104"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EW4109.json b/docs/data/histograms/Mexico/EW4109.json
index c7df1521966..61c27f576c1 100644
--- a/docs/data/histograms/Mexico/EW4109.json
+++ b/docs/data/histograms/Mexico/EW4109.json
@@ -1 +1 @@
-{"batchcode": "EW4109", "histograms": [{"batchcodes": ["EW4109"], "histogram": {"Headache": 41, "Asthenia": 37, "Fatigue": 34, "Sensitive skin": 31, "Pain": 29, "Myalgia": 26, "Nausea": 26, "Arthralgia": 23, "Dizziness": 23, "Respiratory distress": 21, "Dyspnoea": 20, "Chills": 18, "Rhinorrhoea": 18, "Blood pressure measurement": 17, "Tachycardia": 17, "Body temperature": 15, "Cough": 14, "Pyrexia": 13, "Diarrhoea": 12, "Oropharyngeal pain": 12, "Pruritus": 12, "Vaccination site pain": 12, "Abdominal pain": 9, "Hypertension": 9, "Heart rate": 8, "Nodule": 8, "Induration": 7, "Irritability": 7, "Oedema": 7, "Rash": 7, "Vomiting": 7, "Body temperature increased": 6, "Malaise": 6, "Oxygen saturation": 6, "Seizure": 5, "Blood pressure increased": 4, "Chest pain": 4, "Erythema": 4, "Inflammation": 4, "Respiratory rate": 4, "Bronchospasm": 3, "Eye pain": 3, "Hypoaesthesia": 3, "Hypotension": 3, "Oxygen saturation decreased": 3, "Vaccination site erythema": 3, "Vision blurred": 3, "Anxiety": 2, "Back pain": 2, "Cellulitis": 2, "Crying": 2, "Decreased appetite": 2, "Discomfort": 2, "Hypertensive crisis": 2, "Odynophagia": 2, "Pain in extremity": 2, "Syncope": 2, "Tachypnoea": 2, "Vaccination site haemorrhage": 2, "Vaccination site induration": 2, "Vaccination site inflammation": 2, "Vertigo": 2, "Wrong technique in product usage process": 2, "Amenorrhoea": 1, "Anosmia": 1, "Atrial fibrillation": 1, "Blood glucose": 1, "Blood test": 1, "Chest discomfort": 1, "Coma scale": 1, "Conjunctivitis": 1, "Cyst": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dysgeusia": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Faecaloma": 1, "Feeling cold": 1, "Full blood count": 1, "General physical health deterioration": 1, "Haematochezia": 1, "Haemorrhage": 1, "Heavy menstrual bleeding": 1, "Hypoaesthesia oral": 1, "Incorrect dose administered": 1, "Influenza": 1, "Injection site erythema": 1, "Intussusception": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Menstruation irregular": 1, "Migraine": 1, "Movement disorder": 1, "Muscular weakness": 1, "Nasal obstruction": 1, "Neck pain": 1, "Pain assessment": 1, "Palpitations": 1, "Paraesthesia": 1, "Pelvic inflammatory disease": 1, "Pharyngotonsillitis": 1, "Photophobia": 1, "Physical examination": 1, "Productive cough": 1, "Rash pruritic": 1, "Sensation of foreign body": 1, "Skin plaque": 1, "Somnolence": 1, "Stridor": 1, "Suffocation feeling": 1, "Underdose": 1, "Vaccination site haematoma": 1, "Vaccination site hypersensitivity": 1, "Vaccination site nodule": 1, "Vaccination site warmth": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "EW4109", "histograms": [{"histogram": {"Headache": 41, "Asthenia": 37, "Fatigue": 34, "Sensitive skin": 31, "Pain": 29, "Myalgia": 26, "Nausea": 26, "Arthralgia": 23, "Dizziness": 23, "Respiratory distress": 21, "Dyspnoea": 20, "Chills": 18, "Rhinorrhoea": 18, "Blood pressure measurement": 17, "Tachycardia": 17, "Body temperature": 15, "Cough": 14, "Pyrexia": 13, "Diarrhoea": 12, "Oropharyngeal pain": 12, "Pruritus": 12, "Vaccination site pain": 12, "Abdominal pain": 9, "Hypertension": 9, "Heart rate": 8, "Nodule": 8, "Induration": 7, "Irritability": 7, "Oedema": 7, "Rash": 7, "Vomiting": 7, "Body temperature increased": 6, "Malaise": 6, "Oxygen saturation": 6, "Seizure": 5, "Blood pressure increased": 4, "Chest pain": 4, "Erythema": 4, "Inflammation": 4, "Respiratory rate": 4, "Bronchospasm": 3, "Eye pain": 3, "Hypoaesthesia": 3, "Hypotension": 3, "Oxygen saturation decreased": 3, "Vaccination site erythema": 3, "Vision blurred": 3, "Anxiety": 2, "Back pain": 2, "Cellulitis": 2, "Crying": 2, "Decreased appetite": 2, "Discomfort": 2, "Hypertensive crisis": 2, "Odynophagia": 2, "Pain in extremity": 2, "Syncope": 2, "Tachypnoea": 2, "Vaccination site haemorrhage": 2, "Vaccination site induration": 2, "Vaccination site inflammation": 2, "Vertigo": 2, "Wrong technique in product usage process": 2, "Amenorrhoea": 1, "Anosmia": 1, "Atrial fibrillation": 1, "Blood glucose": 1, "Blood test": 1, "Chest discomfort": 1, "Coma scale": 1, "Conjunctivitis": 1, "Cyst": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dysgeusia": 1, "Dyslalia": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Electrocardiogram": 1, "Faecaloma": 1, "Feeling cold": 1, "Full blood count": 1, "General physical health deterioration": 1, "Haematochezia": 1, "Haemorrhage": 1, "Heavy menstrual bleeding": 1, "Hypoaesthesia oral": 1, "Incorrect dose administered": 1, "Influenza": 1, "Injection site erythema": 1, "Intussusception": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Menstruation irregular": 1, "Migraine": 1, "Movement disorder": 1, "Muscular weakness": 1, "Nasal obstruction": 1, "Neck pain": 1, "Pain assessment": 1, "Palpitations": 1, "Paraesthesia": 1, "Pelvic inflammatory disease": 1, "Pharyngotonsillitis": 1, "Photophobia": 1, "Physical examination": 1, "Productive cough": 1, "Rash pruritic": 1, "Sensation of foreign body": 1, "Skin plaque": 1, "Somnolence": 1, "Stridor": 1, "Suffocation feeling": 1, "Underdose": 1, "Vaccination site haematoma": 1, "Vaccination site hypersensitivity": 1, "Vaccination site nodule": 1, "Vaccination site warmth": 1, "Visual analogue scale": 1}, "batchcodes": ["EW4109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EWO169/ EWO177.json b/docs/data/histograms/Mexico/EWO169/ EWO177.json
index 8021be3c659..76cd3dd2f63 100644
--- a/docs/data/histograms/Mexico/EWO169/ EWO177.json
+++ b/docs/data/histograms/Mexico/EWO169/ EWO177.json
@@ -1 +1 @@
-{"batchcode": "EWO169/ EWO177", "histograms": [{"batchcodes": ["EWO169/ EWO177"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO169/ EWO177", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EWO169/ EWO177"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EWO181.json b/docs/data/histograms/Mexico/EWO181.json
index 3611e0d235f..cb9e17c5182 100644
--- a/docs/data/histograms/Mexico/EWO181.json
+++ b/docs/data/histograms/Mexico/EWO181.json
@@ -1 +1 @@
-{"batchcode": "EWO181", "histograms": [{"batchcodes": ["EWO181"], "histogram": {"Anger": 1, "Body temperature": 1, "Cardiomyopathy": 1, "Computerised tomogram thorax": 1, "Diarrhoea": 1, "Discomfort": 1, "Dyspnoea": 1, "Dysuria": 1, "Haematuria": 1, "Haemodynamic rebound": 1, "Myocarditis": 1, "Nausea": 1, "Pneumonia": 1, "Pyelonephritis": 1, "Pyrexia": 1, "Renal abscess": 1, "Renal lithiasis prophylaxis": 1, "Renal pain": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Septic shock": 1, "Urinary tract infection": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO181", "histograms": [{"histogram": {"Anger": 1, "Body temperature": 1, "Cardiomyopathy": 1, "Computerised tomogram thorax": 1, "Diarrhoea": 1, "Discomfort": 1, "Dyspnoea": 1, "Dysuria": 1, "Haematuria": 1, "Haemodynamic rebound": 1, "Myocarditis": 1, "Nausea": 1, "Pneumonia": 1, "Pyelonephritis": 1, "Pyrexia": 1, "Renal abscess": 1, "Renal lithiasis prophylaxis": 1, "Renal pain": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Septic shock": 1, "Urinary tract infection": 1, "Vomiting": 1}, "batchcodes": ["EWO181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EWO193.json b/docs/data/histograms/Mexico/EWO193.json
index 5d9b66dc462..f111c3b90b2 100644
--- a/docs/data/histograms/Mexico/EWO193.json
+++ b/docs/data/histograms/Mexico/EWO193.json
@@ -1 +1 @@
-{"batchcode": "EWO193", "histograms": [{"batchcodes": ["EWO193"], "histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature decreased": 1, "Dizziness": 1, "Extremity contracture": 1, "Heart rate": 1, "Hypertension": 1, "Nausea": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO193", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature decreased": 1, "Dizziness": 1, "Extremity contracture": 1, "Heart rate": 1, "Hypertension": 1, "Nausea": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Tremor": 1}, "batchcodes": ["EWO193"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EWO195.json b/docs/data/histograms/Mexico/EWO195.json
index dc65b9fb532..2131eaeff32 100644
--- a/docs/data/histograms/Mexico/EWO195.json
+++ b/docs/data/histograms/Mexico/EWO195.json
@@ -1 +1 @@
-{"batchcode": "EWO195", "histograms": [{"batchcodes": ["EWO195"], "histogram": {"Body temperature": 2, "Headache": 2, "Pain": 2, "Pyrexia": 2, "Sensitive skin": 2, "Arthralgia": 1, "Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fall": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pneumonia": 1, "Respiratory distress": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO195", "histograms": [{"histogram": {"Body temperature": 2, "Headache": 2, "Pain": 2, "Pyrexia": 2, "Sensitive skin": 2, "Arthralgia": 1, "Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fall": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pneumonia": 1, "Respiratory distress": 1, "Syncope": 1}, "batchcodes": ["EWO195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EWO199.json b/docs/data/histograms/Mexico/EWO199.json
index b4d9226f698..553a2891d15 100644
--- a/docs/data/histograms/Mexico/EWO199.json
+++ b/docs/data/histograms/Mexico/EWO199.json
@@ -1 +1 @@
-{"batchcode": "EWO199", "histograms": [{"batchcodes": ["EWO199"], "histogram": {"Anal pruritus": 1, "Haemorrhoids thrombosed": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO199", "histograms": [{"histogram": {"Anal pruritus": 1, "Haemorrhoids thrombosed": 1}, "batchcodes": ["EWO199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EWO206.json b/docs/data/histograms/Mexico/EWO206.json
index 68f181fa25a..e4c9f867aa2 100644
--- a/docs/data/histograms/Mexico/EWO206.json
+++ b/docs/data/histograms/Mexico/EWO206.json
@@ -1 +1 @@
-{"batchcode": "EWO206", "histograms": [{"batchcodes": ["EWO206"], "histogram": {"Diarrhoea": 1, "Headache": 1, "Induration": 1, "Nodule": 1, "Pain": 1, "Pain in extremity": 1, "Sensitive skin": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO206", "histograms": [{"histogram": {"Diarrhoea": 1, "Headache": 1, "Induration": 1, "Nodule": 1, "Pain": 1, "Pain in extremity": 1, "Sensitive skin": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["EWO206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EWW4109.json b/docs/data/histograms/Mexico/EWW4109.json
index 8e5332c5034..c497ee309d2 100644
--- a/docs/data/histograms/Mexico/EWW4109.json
+++ b/docs/data/histograms/Mexico/EWW4109.json
@@ -1 +1 @@
-{"batchcode": "EWW4109", "histograms": [{"batchcodes": ["EWW4109"], "histogram": {"Arthralgia": 1, "Body temperature fluctuation": 1, "Headache": 1, "Myalgia": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EWW4109", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature fluctuation": 1, "Headache": 1, "Myalgia": 1, "Pain": 1}, "batchcodes": ["EWW4109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY 05 85.json b/docs/data/histograms/Mexico/EY 05 85.json
index 0858c086ec9..2a330f0f8d0 100644
--- a/docs/data/histograms/Mexico/EY 05 85.json
+++ b/docs/data/histograms/Mexico/EY 05 85.json
@@ -1 +1 @@
-{"batchcode": "EY 05 85", "histograms": [{"batchcodes": ["EY 05 85"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Fatigue": 1, "Induration": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "EY 05 85", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Fatigue": 1, "Induration": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["EY 05 85"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY-0579.json b/docs/data/histograms/Mexico/EY-0579.json
index fd0e5a105cf..36ad8b46ea6 100644
--- a/docs/data/histograms/Mexico/EY-0579.json
+++ b/docs/data/histograms/Mexico/EY-0579.json
@@ -1 +1 @@
-{"batchcode": "EY-0579", "histograms": [{"batchcodes": ["EY-0579"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Febrile convulsion": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EY-0579", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Febrile convulsion": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}, "batchcodes": ["EY-0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY0575.json b/docs/data/histograms/Mexico/EY0575.json
index 4587b28b8dc..33ae52eebed 100644
--- a/docs/data/histograms/Mexico/EY0575.json
+++ b/docs/data/histograms/Mexico/EY0575.json
@@ -1 +1 @@
-{"batchcode": "EY0575", "histograms": [{"batchcodes": ["EY0575"], "histogram": {"Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2, "Sensitive skin": 2, "Abdominal pain": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Hypovolaemic shock": 1, "Inflammation": 1, "Local reaction": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0575", "histograms": [{"histogram": {"Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2, "Sensitive skin": 2, "Abdominal pain": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Hypovolaemic shock": 1, "Inflammation": 1, "Local reaction": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Vomiting": 1}, "batchcodes": ["EY0575"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY0578.json b/docs/data/histograms/Mexico/EY0578.json
index 06f3098c038..d71008b7a1c 100644
--- a/docs/data/histograms/Mexico/EY0578.json
+++ b/docs/data/histograms/Mexico/EY0578.json
@@ -1 +1 @@
-{"batchcode": "EY0578", "histograms": [{"batchcodes": ["EY0578"], "histogram": {"Headache": 24, "Asthenia": 16, "Arthralgia": 14, "Fatigue": 14, "Myalgia": 14, "Pain": 14, "Sensitive skin": 14, "Body temperature": 11, "Pyrexia": 10, "Dizziness": 9, "Dyspnoea": 8, "Nausea": 8, "Respiratory distress": 8, "Blood pressure measurement": 6, "Chills": 6, "Inflammation": 5, "Oedema": 5, "Tachycardia": 5, "Body temperature increased": 4, "Cough": 4, "Facial paralysis": 4, "Vomiting": 4, "Diarrhoea": 3, "Erythema": 3, "Generalised tonic-clonic seizure": 3, "Hypertension": 3, "Hypovolaemic shock": 3, "Induration": 3, "Nodule": 3, "Pruritus": 3, "Rash": 3, "SARS-CoV-2 test": 3, "Syncope": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "Blood pressure increased": 2, "COVID-19": 2, "Haemorrhage": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Hypoaesthesia oral": 2, "Irritability": 2, "Local reaction": 2, "Loss of consciousness": 2, "Maternal exposure during pregnancy": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Rhinorrhoea": 2, "Seizure": 2, "Sensation of foreign body": 2, "Tremor": 2, "Urticaria": 2, "Vaccination failure": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Areflexia": 1, "Autonomic nervous system imbalance": 1, "Axillary pain": 1, "Blood glucose": 1, "Blood pressure systolic increased": 1, "Bone pain": 1, "Chest pain": 1, "Coma scale": 1, "Crying": 1, "Decreased appetite": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Ear pain": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypokinesia": 1, "Infected cyst": 1, "Lip oedema": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Monoparesis": 1, "Muscular weakness": 1, "Neck pain": 1, "Nerve injury": 1, "Nervous system disorder": 1, "Odynophagia": 1, "Pain in extremity": 1, "Pallor": 1, "Physical examination": 1, "Pneumonia": 1, "Rash pruritic": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Tachypnoea": 1, "Thrombosis": 1, "Type 2 diabetes mellitus": 1, "Ultrasound Doppler": 1, "Vaccination error": 1, "Vaccination site haematoma": 1, "Vaccination site hypersensitivity": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0578", "histograms": [{"histogram": {"Headache": 24, "Asthenia": 16, "Arthralgia": 14, "Fatigue": 14, "Myalgia": 14, "Pain": 14, "Sensitive skin": 14, "Body temperature": 11, "Pyrexia": 10, "Dizziness": 9, "Dyspnoea": 8, "Nausea": 8, "Respiratory distress": 8, "Blood pressure measurement": 6, "Chills": 6, "Inflammation": 5, "Oedema": 5, "Tachycardia": 5, "Body temperature increased": 4, "Cough": 4, "Facial paralysis": 4, "Vomiting": 4, "Diarrhoea": 3, "Erythema": 3, "Generalised tonic-clonic seizure": 3, "Hypertension": 3, "Hypovolaemic shock": 3, "Induration": 3, "Nodule": 3, "Pruritus": 3, "Rash": 3, "SARS-CoV-2 test": 3, "Syncope": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "Blood pressure increased": 2, "COVID-19": 2, "Haemorrhage": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Hypoaesthesia oral": 2, "Irritability": 2, "Local reaction": 2, "Loss of consciousness": 2, "Maternal exposure during pregnancy": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Rhinorrhoea": 2, "Seizure": 2, "Sensation of foreign body": 2, "Tremor": 2, "Urticaria": 2, "Vaccination failure": 2, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Areflexia": 1, "Autonomic nervous system imbalance": 1, "Axillary pain": 1, "Blood glucose": 1, "Blood pressure systolic increased": 1, "Bone pain": 1, "Chest pain": 1, "Coma scale": 1, "Crying": 1, "Decreased appetite": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Ear pain": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "Hypokinesia": 1, "Infected cyst": 1, "Lip oedema": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Monoparesis": 1, "Muscular weakness": 1, "Neck pain": 1, "Nerve injury": 1, "Nervous system disorder": 1, "Odynophagia": 1, "Pain in extremity": 1, "Pallor": 1, "Physical examination": 1, "Pneumonia": 1, "Rash pruritic": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Tachypnoea": 1, "Thrombosis": 1, "Type 2 diabetes mellitus": 1, "Ultrasound Doppler": 1, "Vaccination error": 1, "Vaccination site haematoma": 1, "Vaccination site hypersensitivity": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vision blurred": 1}, "batchcodes": ["EY0578"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY0579.json b/docs/data/histograms/Mexico/EY0579.json
index 0717dd078c1..a7e9212a8fd 100644
--- a/docs/data/histograms/Mexico/EY0579.json
+++ b/docs/data/histograms/Mexico/EY0579.json
@@ -1 +1 @@
-{"batchcode": "EY0579", "histograms": [{"batchcodes": ["EY0579"], "histogram": {"Headache": 21, "Asthenia": 20, "Fatigue": 20, "Pain": 16, "Myalgia": 15, "Sensitive skin": 12, "Dizziness": 11, "Nausea": 11, "Arthralgia": 10, "Pyrexia": 9, "Chills": 8, "Body temperature": 7, "Cough": 7, "SARS-CoV-2 test": 7, "COVID-19": 6, "Chest pain": 6, "Dyspnoea": 6, "Abdominal pain": 5, "Oropharyngeal pain": 5, "Respiratory distress": 5, "Vomiting": 5, "Diarrhoea": 4, "Drug ineffective": 4, "Hypovolaemic shock": 4, "Induration": 4, "Lymphadenopathy": 4, "Nodule": 4, "Rhinorrhoea": 4, "Tachycardia": 4, "Vaccination site pain": 4, "Hyperhidrosis": 3, "Inflammation": 3, "Malaise": 3, "Oedema": 3, "Rash": 3, "Blood pressure measurement": 2, "Body temperature increased": 2, "Cellulitis": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Dehydration": 2, "Disseminated Bacillus Calmette-Guerin infection": 2, "Erythema": 2, "Haemorrhage": 2, "Hypoaesthesia": 2, "Hypotension": 2, "Influenza": 2, "Irritability": 2, "Maternal exposure during pregnancy": 2, "Odynophagia": 2, "Oxygen saturation": 2, "Paraesthesia": 2, "Physical examination": 2, "Pruritus": 2, "Vaccination failure": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Anal sphincter atony": 1, "Anosmia": 1, "Aphasia": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Bronchospasm": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram head": 1, "Conjunctivitis": 1, "Depressed level of consciousness": 1, "Diplopia": 1, "Ear pain": 1, "Encephalitis": 1, "Eye discharge": 1, "Eye injury": 1, "Eye pain": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Haematochezia": 1, "Haemorrhagic disorder": 1, "Heart rate": 1, "Hemiplegia": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "International normalised ratio": 1, "Intussusception": 1, "Local reaction": 1, "Magnetic resonance imaging": 1, "Movement disorder": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Pneumonia": 1, "Postictal state": 1, "Premature baby": 1, "Prothrombin time": 1, "Seizure": 1, "Sensitisation": 1, "Speech disorder": 1, "Supraventricular tachycardia": 1, "Syncope": 1, "Traumatic lung injury": 1, "Tremor": 1, "Vertigo": 1, "Vital signs measurement": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0579", "histograms": [{"histogram": {"Headache": 21, "Asthenia": 20, "Fatigue": 20, "Pain": 16, "Myalgia": 15, "Sensitive skin": 12, "Dizziness": 11, "Nausea": 11, "Arthralgia": 10, "Pyrexia": 9, "Chills": 8, "Body temperature": 7, "Cough": 7, "SARS-CoV-2 test": 7, "COVID-19": 6, "Chest pain": 6, "Dyspnoea": 6, "Abdominal pain": 5, "Oropharyngeal pain": 5, "Respiratory distress": 5, "Vomiting": 5, "Diarrhoea": 4, "Drug ineffective": 4, "Hypovolaemic shock": 4, "Induration": 4, "Lymphadenopathy": 4, "Nodule": 4, "Rhinorrhoea": 4, "Tachycardia": 4, "Vaccination site pain": 4, "Hyperhidrosis": 3, "Inflammation": 3, "Malaise": 3, "Oedema": 3, "Rash": 3, "Blood pressure measurement": 2, "Body temperature increased": 2, "Cellulitis": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Dehydration": 2, "Disseminated Bacillus Calmette-Guerin infection": 2, "Erythema": 2, "Haemorrhage": 2, "Hypoaesthesia": 2, "Hypotension": 2, "Influenza": 2, "Irritability": 2, "Maternal exposure during pregnancy": 2, "Odynophagia": 2, "Oxygen saturation": 2, "Paraesthesia": 2, "Physical examination": 2, "Pruritus": 2, "Vaccination failure": 2, "Activated partial thromboplastin time": 1, "Acute myocardial infarction": 1, "Anal sphincter atony": 1, "Anosmia": 1, "Aphasia": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Bronchospasm": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram head": 1, "Conjunctivitis": 1, "Depressed level of consciousness": 1, "Diplopia": 1, "Ear pain": 1, "Encephalitis": 1, "Eye discharge": 1, "Eye injury": 1, "Eye pain": 1, "Generalised tonic-clonic seizure": 1, "Gingival bleeding": 1, "Haematochezia": 1, "Haemorrhagic disorder": 1, "Heart rate": 1, "Hemiplegia": 1, "Hypersensitivity": 1, "Hyperthermia": 1, "International normalised ratio": 1, "Intussusception": 1, "Local reaction": 1, "Magnetic resonance imaging": 1, "Movement disorder": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Pneumonia": 1, "Postictal state": 1, "Premature baby": 1, "Prothrombin time": 1, "Seizure": 1, "Sensitisation": 1, "Speech disorder": 1, "Supraventricular tachycardia": 1, "Syncope": 1, "Traumatic lung injury": 1, "Tremor": 1, "Vertigo": 1, "Vital signs measurement": 1, "X-ray": 1}, "batchcodes": ["EY0579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY057A.json b/docs/data/histograms/Mexico/EY057A.json
index 145e0d54d4e..29e9a1088b8 100644
--- a/docs/data/histograms/Mexico/EY057A.json
+++ b/docs/data/histograms/Mexico/EY057A.json
@@ -1 +1 @@
-{"batchcode": "EY057A", "histograms": [{"batchcodes": ["EY057A"], "histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Respiratory distress": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "EY057A", "histograms": [{"histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Respiratory distress": 1, "Somnolence": 1}, "batchcodes": ["EY057A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY0581.json b/docs/data/histograms/Mexico/EY0581.json
index 04e6608ab28..4c50d84d4af 100644
--- a/docs/data/histograms/Mexico/EY0581.json
+++ b/docs/data/histograms/Mexico/EY0581.json
@@ -1 +1 @@
-{"batchcode": "EY0581", "histograms": [{"batchcodes": ["EY0581"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0581", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["EY0581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY0582.json b/docs/data/histograms/Mexico/EY0582.json
index 898338f3c3b..68d15f26ad2 100644
--- a/docs/data/histograms/Mexico/EY0582.json
+++ b/docs/data/histograms/Mexico/EY0582.json
@@ -1 +1 @@
-{"batchcode": "EY0582", "histograms": [{"batchcodes": ["EY0582"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0582", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["EY0582"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY0585.json b/docs/data/histograms/Mexico/EY0585.json
index cffb4550ce0..092c9ccce4b 100644
--- a/docs/data/histograms/Mexico/EY0585.json
+++ b/docs/data/histograms/Mexico/EY0585.json
@@ -1 +1 @@
-{"batchcode": "EY0585", "histograms": [{"batchcodes": ["EY0585"], "histogram": {"Headache": 12, "Asthenia": 10, "Chills": 9, "Dizziness": 9, "Sensitive skin": 9, "Arthralgia": 8, "Myalgia": 8, "Pain": 8, "Fatigue": 7, "Pyrexia": 7, "Body temperature": 6, "Abdominal pain": 5, "Cough": 5, "Nausea": 5, "Oropharyngeal pain": 5, "Vaccination site pain": 5, "Vomiting": 5, "Diarrhoea": 4, "Decreased appetite": 3, "Oxygen saturation": 3, "Rhinorrhoea": 3, "Body temperature increased": 2, "Eye pain": 2, "Irritability": 2, "Rash": 2, "Respiratory distress": 2, "Seizure": 2, "Tachycardia": 2, "Unresponsive to stimuli": 2, "Acute myocardial infarction": 1, "Adenoma benign": 1, "Aphasia": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Bronchospasm": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paresis": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypokinesia": 1, "Hyporeflexia": 1, "Illness": 1, "Jaw disorder": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mammogram": 1, "Mastication disorder": 1, "Muscle contracture": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "NIH stroke scale": 1, "Neck pain": 1, "Odynophagia": 1, "Oedema": 1, "Pain assessment": 1, "Pruritus": 1, "Rash erythematous": 1, "Rash maculo-papular": 1, "Skin disorder": 1, "Snoring": 1, "Somnolence": 1, "Speech disorder": 1, "Throat irritation": 1, "Ultrasound breast": 1, "Vaccination failure": 1, "Vaccination site reaction": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0585", "histograms": [{"histogram": {"Headache": 12, "Asthenia": 10, "Chills": 9, "Dizziness": 9, "Sensitive skin": 9, "Arthralgia": 8, "Myalgia": 8, "Pain": 8, "Fatigue": 7, "Pyrexia": 7, "Body temperature": 6, "Abdominal pain": 5, "Cough": 5, "Nausea": 5, "Oropharyngeal pain": 5, "Vaccination site pain": 5, "Vomiting": 5, "Diarrhoea": 4, "Decreased appetite": 3, "Oxygen saturation": 3, "Rhinorrhoea": 3, "Body temperature increased": 2, "Eye pain": 2, "Irritability": 2, "Rash": 2, "Respiratory distress": 2, "Seizure": 2, "Tachycardia": 2, "Unresponsive to stimuli": 2, "Acute myocardial infarction": 1, "Adenoma benign": 1, "Aphasia": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Bronchospasm": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paresis": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypokinesia": 1, "Hyporeflexia": 1, "Illness": 1, "Jaw disorder": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mammogram": 1, "Mastication disorder": 1, "Muscle contracture": 1, "Muscle rigidity": 1, "Muscle tightness": 1, "NIH stroke scale": 1, "Neck pain": 1, "Odynophagia": 1, "Oedema": 1, "Pain assessment": 1, "Pruritus": 1, "Rash erythematous": 1, "Rash maculo-papular": 1, "Skin disorder": 1, "Snoring": 1, "Somnolence": 1, "Speech disorder": 1, "Throat irritation": 1, "Ultrasound breast": 1, "Vaccination failure": 1, "Vaccination site reaction": 1, "Vertigo": 1}, "batchcodes": ["EY0585"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY2579.json b/docs/data/histograms/Mexico/EY2579.json
index 5f5730081d8..3bb94806b36 100644
--- a/docs/data/histograms/Mexico/EY2579.json
+++ b/docs/data/histograms/Mexico/EY2579.json
@@ -1 +1 @@
-{"batchcode": "EY2579", "histograms": [{"batchcodes": ["EY2579"], "histogram": {"Body temperature": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EY2579", "histograms": [{"histogram": {"Body temperature": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1}, "batchcodes": ["EY2579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EY578.json b/docs/data/histograms/Mexico/EY578.json
index 23d65ca30de..6bc60ffbc03 100644
--- a/docs/data/histograms/Mexico/EY578.json
+++ b/docs/data/histograms/Mexico/EY578.json
@@ -1 +1 @@
-{"batchcode": "EY578", "histograms": [{"batchcodes": ["EY578"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Body temperature": 1, "Decreased appetite": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EY578", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Body temperature": 1, "Decreased appetite": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["EY578"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EYO579.json b/docs/data/histograms/Mexico/EYO579.json
index 7fcf4ca6069..475c957da7f 100644
--- a/docs/data/histograms/Mexico/EYO579.json
+++ b/docs/data/histograms/Mexico/EYO579.json
@@ -1 +1 @@
-{"batchcode": "EYO579", "histograms": [{"batchcodes": ["EYO579"], "histogram": {"Rhinorrhoea": 2, "Abdominal pain": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Haematochezia": 1, "Headache": 1, "Induration": 1, "Intussusception": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Parosmia": 1, "Pruritus": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tachycardia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO579", "histograms": [{"histogram": {"Rhinorrhoea": 2, "Abdominal pain": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Haematochezia": 1, "Headache": 1, "Induration": 1, "Intussusception": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oropharyngeal pain": 1, "Parosmia": 1, "Pruritus": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tachycardia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1}, "batchcodes": ["EYO579"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/EYO585-R21M43.json b/docs/data/histograms/Mexico/EYO585-R21M43.json
index 0ea54704f04..ba46eb156d1 100644
--- a/docs/data/histograms/Mexico/EYO585-R21M43.json
+++ b/docs/data/histograms/Mexico/EYO585-R21M43.json
@@ -1 +1 @@
-{"batchcode": "EYO585-R21M43", "histograms": [{"batchcodes": ["EYO585-R21M43"], "histogram": {"Abdominal pain": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Seizure": 1, "Somnolence": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EYO585-R21M43", "histograms": [{"histogram": {"Abdominal pain": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Seizure": 1, "Somnolence": 1, "Syncope": 1}, "batchcodes": ["EYO585-R21M43"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/F13205.json b/docs/data/histograms/Mexico/F13205.json
index 5aa19769172..5acba92e516 100644
--- a/docs/data/histograms/Mexico/F13205.json
+++ b/docs/data/histograms/Mexico/F13205.json
@@ -1 +1 @@
-{"batchcode": "F13205", "histograms": [{"batchcodes": ["F13205"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Paraesthesia": 1, "Respiratory distress": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "F13205", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Paraesthesia": 1, "Respiratory distress": 1, "Vomiting": 1}, "batchcodes": ["F13205"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/F13211.json b/docs/data/histograms/Mexico/F13211.json
index b09f646828a..7c6929f0a68 100644
--- a/docs/data/histograms/Mexico/F13211.json
+++ b/docs/data/histograms/Mexico/F13211.json
@@ -1 +1 @@
-{"batchcode": "F13211", "histograms": [{"batchcodes": ["F13211"], "histogram": {"Paralysis": 2, "Dizziness": 1, "Febrile convulsion": 1, "Headache": 1, "Nausea": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "F13211", "histograms": [{"histogram": {"Paralysis": 2, "Dizziness": 1, "Febrile convulsion": 1, "Headache": 1, "Nausea": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["F13211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/F38765.json b/docs/data/histograms/Mexico/F38765.json
index 144c098831d..10af21efb50 100644
--- a/docs/data/histograms/Mexico/F38765.json
+++ b/docs/data/histograms/Mexico/F38765.json
@@ -1 +1 @@
-{"batchcode": "F38765", "histograms": [{"batchcodes": ["F38765"], "histogram": {"Chest pain": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Eyelid oedema": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "F38765", "histograms": [{"histogram": {"Chest pain": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Eyelid oedema": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["F38765"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/F58765.json b/docs/data/histograms/Mexico/F58765.json
index 5d67ed832b8..50449964287 100644
--- a/docs/data/histograms/Mexico/F58765.json
+++ b/docs/data/histograms/Mexico/F58765.json
@@ -1 +1 @@
-{"batchcode": "F58765", "histograms": [{"batchcodes": ["F58765"], "histogram": {"Chills": 3, "Body temperature": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Diarrhoea": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dizziness": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Myalgia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1, "Temporomandibular joint syndrome": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "F58765", "histograms": [{"histogram": {"Chills": 3, "Body temperature": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Diarrhoea": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dizziness": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Myalgia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Tachycardia": 1, "Temporomandibular joint syndrome": 1, "Vertigo": 1}, "batchcodes": ["F58765"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/F6765.json b/docs/data/histograms/Mexico/F6765.json
index ab66f9f449e..4cf1c9165c1 100644
--- a/docs/data/histograms/Mexico/F6765.json
+++ b/docs/data/histograms/Mexico/F6765.json
@@ -1 +1 @@
-{"batchcode": "F6765", "histograms": [{"batchcodes": ["F6765"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Headache": 1, "Inflammation": 1, "Nausea": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "F6765", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Headache": 1, "Inflammation": 1, "Nausea": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination site rash": 1}, "batchcodes": ["F6765"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA 7478.json b/docs/data/histograms/Mexico/FA 7478.json
index d5a01e50295..aad0d59a1e3 100644
--- a/docs/data/histograms/Mexico/FA 7478.json
+++ b/docs/data/histograms/Mexico/FA 7478.json
@@ -1 +1 @@
-{"batchcode": "FA 7478", "histograms": [{"batchcodes": ["FA 7478"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Inflammation": 1, "Localised oedema": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 7478", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Inflammation": 1, "Localised oedema": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["FA 7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA 9090.json b/docs/data/histograms/Mexico/FA 9090.json
index b1b9c733284..70b7f6c855a 100644
--- a/docs/data/histograms/Mexico/FA 9090.json
+++ b/docs/data/histograms/Mexico/FA 9090.json
@@ -1 +1 @@
-{"batchcode": "FA 9090", "histograms": [{"batchcodes": ["FA 9090"], "histogram": {"Asthenia": 5, "Fatigue": 4, "Headache": 4, "Body temperature increased": 3, "Dizziness": 3, "Myalgia": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Chills": 2, "Dyspnoea": 2, "Haemorrhage": 2, "Heart rate": 2, "Hypovolaemic shock": 2, "Oxygen saturation": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Abdominal rigidity": 1, "Blood glucose": 1, "Body temperature": 1, "COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Diarrhoea": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Facial paralysis": 1, "Feeling hot": 1, "Haemorrhagic disorder": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Induration": 1, "Inflammation": 1, "Intussusception": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Paraesthesia": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sneezing": 1, "Syncope": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 9090", "histograms": [{"histogram": {"Asthenia": 5, "Fatigue": 4, "Headache": 4, "Body temperature increased": 3, "Dizziness": 3, "Myalgia": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Chills": 2, "Dyspnoea": 2, "Haemorrhage": 2, "Heart rate": 2, "Hypovolaemic shock": 2, "Oxygen saturation": 2, "Rhinorrhoea": 2, "Tachycardia": 2, "Abdominal rigidity": 1, "Blood glucose": 1, "Body temperature": 1, "COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Diarrhoea": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Drug ineffective": 1, "Facial paralysis": 1, "Feeling hot": 1, "Haemorrhagic disorder": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Induration": 1, "Inflammation": 1, "Intussusception": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Paraesthesia": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sneezing": 1, "Syncope": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["FA 9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA 9100.json b/docs/data/histograms/Mexico/FA 9100.json
index 0078c37c0d7..c3f61385689 100644
--- a/docs/data/histograms/Mexico/FA 9100.json
+++ b/docs/data/histograms/Mexico/FA 9100.json
@@ -1 +1 @@
-{"batchcode": "FA 9100", "histograms": [{"batchcodes": ["FA 9100"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "COVID-19": 1, "Chills": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Myalgia": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 9100", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "COVID-19": 1, "Chills": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Myalgia": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["FA 9100"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA-7478.json b/docs/data/histograms/Mexico/FA-7478.json
index 61643aca90a..e6bc82fdc07 100644
--- a/docs/data/histograms/Mexico/FA-7478.json
+++ b/docs/data/histograms/Mexico/FA-7478.json
@@ -1 +1 @@
-{"batchcode": "FA-7478", "histograms": [{"batchcodes": ["FA-7478"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Feeling cold": 1, "Headache": 1, "Induration": 1, "Intussusception": 1, "Irritability": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Respiration abnormal": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FA-7478", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Feeling cold": 1, "Headache": 1, "Induration": 1, "Intussusception": 1, "Irritability": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Respiration abnormal": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Visual impairment": 1}, "batchcodes": ["FA-7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA-9090.json b/docs/data/histograms/Mexico/FA-9090.json
index dfb574eb080..34a9ab4dbeb 100644
--- a/docs/data/histograms/Mexico/FA-9090.json
+++ b/docs/data/histograms/Mexico/FA-9090.json
@@ -1 +1 @@
-{"batchcode": "FA-9090", "histograms": [{"batchcodes": ["FA-9090"], "histogram": {"COVID-19": 1, "Chills": 1, "Headache": 1, "Hypovolaemic shock": 1, "Irritability": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FA-9090", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Headache": 1, "Hypovolaemic shock": 1, "Irritability": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tachycardia": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FA-9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA-9094.json b/docs/data/histograms/Mexico/FA-9094.json
index a161df37755..cb9d36deb40 100644
--- a/docs/data/histograms/Mexico/FA-9094.json
+++ b/docs/data/histograms/Mexico/FA-9094.json
@@ -1 +1 @@
-{"batchcode": "FA-9094", "histograms": [{"batchcodes": ["FA-9094"], "histogram": {"Asthenia": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Neuropathy peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "FA-9094", "histograms": [{"histogram": {"Asthenia": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Neuropathy peripheral": 1}, "batchcodes": ["FA-9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA1478.json b/docs/data/histograms/Mexico/FA1478.json
index dea250c6cab..b22ad74f9aa 100644
--- a/docs/data/histograms/Mexico/FA1478.json
+++ b/docs/data/histograms/Mexico/FA1478.json
@@ -1 +1 @@
-{"batchcode": "FA1478", "histograms": [{"batchcodes": ["FA1478"], "histogram": {"Abdominal distension": 1, "Arrhythmia": 1, "Arthralgia": 1, "Chest discomfort": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Fluid retention": 1, "Gastritis": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FA1478", "histograms": [{"histogram": {"Abdominal distension": 1, "Arrhythmia": 1, "Arthralgia": 1, "Chest discomfort": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Fluid retention": 1, "Gastritis": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1}, "batchcodes": ["FA1478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA6780.json b/docs/data/histograms/Mexico/FA6780.json
index 6daef08d0c4..098d94ef097 100644
--- a/docs/data/histograms/Mexico/FA6780.json
+++ b/docs/data/histograms/Mexico/FA6780.json
@@ -1 +1 @@
-{"batchcode": "FA6780", "histograms": [{"batchcodes": ["FA6780"], "histogram": {"Clonic convulsion": 1, "Diarrhoea": 1, "Generalised tonic-clonic seizure": 1, "Partial seizures": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "FA6780", "histograms": [{"histogram": {"Clonic convulsion": 1, "Diarrhoea": 1, "Generalised tonic-clonic seizure": 1, "Partial seizures": 1, "Seizure": 1}, "batchcodes": ["FA6780"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA7091.json b/docs/data/histograms/Mexico/FA7091.json
index 38612a87798..fd136d6e1e4 100644
--- a/docs/data/histograms/Mexico/FA7091.json
+++ b/docs/data/histograms/Mexico/FA7091.json
@@ -1 +1 @@
-{"batchcode": "FA7091", "histograms": [{"batchcodes": ["FA7091"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Vaccination site induration": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7091", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Vaccination site induration": 1}, "batchcodes": ["FA7091"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA7478.json b/docs/data/histograms/Mexico/FA7478.json
index cfab98a04b8..a0d4cecb798 100644
--- a/docs/data/histograms/Mexico/FA7478.json
+++ b/docs/data/histograms/Mexico/FA7478.json
@@ -1 +1 @@
-{"batchcode": "FA7478", "histograms": [{"batchcodes": ["FA7478"], "histogram": {"Headache": 35, "Fatigue": 32, "Asthenia": 29, "Myalgia": 22, "Dizziness": 21, "Sensitive skin": 20, "Arthralgia": 18, "Dyspnoea": 18, "Pain": 18, "Nausea": 17, "Respiratory distress": 14, "Tachycardia": 14, "Blood pressure measurement": 13, "Body temperature": 12, "Inflammation": 12, "Oropharyngeal pain": 12, "Oedema": 11, "Cough": 10, "Oxygen saturation": 10, "Pruritus": 10, "Vomiting": 10, "Diarrhoea": 8, "Pyrexia": 8, "Vaccination site pain": 8, "Abdominal pain": 7, "Body temperature increased": 7, "Chills": 7, "Oxygen saturation decreased": 7, "Rash": 7, "Hypertension": 6, "COVID-19": 5, "Chest pain": 5, "Erythema": 5, "Heart rate": 5, "Malaise": 5, "SARS-CoV-2 test": 5, "Chest discomfort": 4, "Decreased appetite": 4, "Hypoaesthesia oral": 4, "Pain in extremity": 4, "Rhinorrhoea": 4, "Bronchospasm": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Irritability": 3, "Nodule": 3, "Respiratory rate": 3, "Somnolence": 3, "Syncope": 3, "Vaccination error": 3, "Vaccination failure": 3, "Vaccination site induration": 3, "Blood pressure increased": 2, "Eye pain": 2, "Febrile convulsion": 2, "Herpes zoster": 2, "Hypokinesia": 2, "Induration": 2, "Loss of consciousness": 2, "Nasal congestion": 2, "Pain assessment": 2, "Paraesthesia": 2, "Polymerase chain reaction": 2, "Seizure": 2, "Sensation of foreign body": 2, "Tinnitus": 2, "Vaccination site warmth": 2, "Arthritis": 1, "Bell's palsy": 1, "Blepharitis": 1, "Bradycardia": 1, "Bronchial hyperreactivity": 1, "Cellulitis": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Disorientation": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dysphonia": 1, "Encephalitis": 1, "Eye pruritus": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial asymmetry": 1, "Facial pain": 1, "Facial paralysis": 1, "Feeling hot": 1, "General physical health deterioration": 1, "Haemorrhage": 1, "Hemiparesis": 1, "Hyperpyrexia": 1, "Hypotension": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Migraine": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Odynophagia": 1, "Oropharyngeal discomfort": 1, "Paraesthesia oral": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngitis": 1, "Photophobia": 1, "Physical examination": 1, "Respiratory tract infection": 1, "Restlessness": 1, "Speech disorder": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Throat tightness": 1, "Thrombosis": 1, "Upper respiratory tract inflammation": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7478", "histograms": [{"histogram": {"Headache": 35, "Fatigue": 32, "Asthenia": 29, "Myalgia": 22, "Dizziness": 21, "Sensitive skin": 20, "Arthralgia": 18, "Dyspnoea": 18, "Pain": 18, "Nausea": 17, "Respiratory distress": 14, "Tachycardia": 14, "Blood pressure measurement": 13, "Body temperature": 12, "Inflammation": 12, "Oropharyngeal pain": 12, "Oedema": 11, "Cough": 10, "Oxygen saturation": 10, "Pruritus": 10, "Vomiting": 10, "Diarrhoea": 8, "Pyrexia": 8, "Vaccination site pain": 8, "Abdominal pain": 7, "Body temperature increased": 7, "Chills": 7, "Oxygen saturation decreased": 7, "Rash": 7, "Hypertension": 6, "COVID-19": 5, "Chest pain": 5, "Erythema": 5, "Heart rate": 5, "Malaise": 5, "SARS-CoV-2 test": 5, "Chest discomfort": 4, "Decreased appetite": 4, "Hypoaesthesia oral": 4, "Pain in extremity": 4, "Rhinorrhoea": 4, "Bronchospasm": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Irritability": 3, "Nodule": 3, "Respiratory rate": 3, "Somnolence": 3, "Syncope": 3, "Vaccination error": 3, "Vaccination failure": 3, "Vaccination site induration": 3, "Blood pressure increased": 2, "Eye pain": 2, "Febrile convulsion": 2, "Herpes zoster": 2, "Hypokinesia": 2, "Induration": 2, "Loss of consciousness": 2, "Nasal congestion": 2, "Pain assessment": 2, "Paraesthesia": 2, "Polymerase chain reaction": 2, "Seizure": 2, "Sensation of foreign body": 2, "Tinnitus": 2, "Vaccination site warmth": 2, "Arthritis": 1, "Bell's palsy": 1, "Blepharitis": 1, "Bradycardia": 1, "Bronchial hyperreactivity": 1, "Cellulitis": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Disorientation": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dysphonia": 1, "Encephalitis": 1, "Eye pruritus": 1, "Eyelid oedema": 1, "Face oedema": 1, "Facial asymmetry": 1, "Facial pain": 1, "Facial paralysis": 1, "Feeling hot": 1, "General physical health deterioration": 1, "Haemorrhage": 1, "Hemiparesis": 1, "Hyperpyrexia": 1, "Hypotension": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Migraine": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Odynophagia": 1, "Oropharyngeal discomfort": 1, "Paraesthesia oral": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngitis": 1, "Photophobia": 1, "Physical examination": 1, "Respiratory tract infection": 1, "Restlessness": 1, "Speech disorder": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Throat tightness": 1, "Thrombosis": 1, "Upper respiratory tract inflammation": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vertigo": 1}, "batchcodes": ["FA7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA7484.json b/docs/data/histograms/Mexico/FA7484.json
index ee509d9e08b..f96960498bc 100644
--- a/docs/data/histograms/Mexico/FA7484.json
+++ b/docs/data/histograms/Mexico/FA7484.json
@@ -1 +1 @@
-{"batchcode": "FA7484", "histograms": [{"batchcodes": ["FA7484"], "histogram": {"COVID-19": 1, "Decreased appetite": 1, "Dysmenorrhoea": 1, "Feeling cold": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7484", "histograms": [{"histogram": {"COVID-19": 1, "Decreased appetite": 1, "Dysmenorrhoea": 1, "Feeling cold": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FA7484"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA7485.json b/docs/data/histograms/Mexico/FA7485.json
index 7b00fa3a21d..aa4f45b9c55 100644
--- a/docs/data/histograms/Mexico/FA7485.json
+++ b/docs/data/histograms/Mexico/FA7485.json
@@ -1 +1 @@
-{"batchcode": "FA7485", "histograms": [{"batchcodes": ["FA7485"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "FA7485", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}, "batchcodes": ["FA7485"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA7874.json b/docs/data/histograms/Mexico/FA7874.json
index dad1f287a24..303bdbbce17 100644
--- a/docs/data/histograms/Mexico/FA7874.json
+++ b/docs/data/histograms/Mexico/FA7874.json
@@ -1 +1 @@
-{"batchcode": "FA7874", "histograms": [{"batchcodes": ["FA7874"], "histogram": {"Coordination abnormal": 1, "Neck pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7874", "histograms": [{"histogram": {"Coordination abnormal": 1, "Neck pain": 1, "Pain in extremity": 1}, "batchcodes": ["FA7874"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA9090.json b/docs/data/histograms/Mexico/FA9090.json
index 0af8d3cd68e..5ebaff9b608 100644
--- a/docs/data/histograms/Mexico/FA9090.json
+++ b/docs/data/histograms/Mexico/FA9090.json
@@ -1 +1 @@
-{"batchcode": "FA9090", "histograms": [{"batchcodes": ["FA9090"], "histogram": {"COVID-19": 33, "SARS-CoV-2 test": 30, "Vaccination failure": 30, "Headache": 28, "Asthenia": 17, "Nausea": 17, "Body temperature": 15, "Dizziness": 15, "Fatigue": 15, "Pyrexia": 15, "Arthralgia": 14, "Myalgia": 13, "Pain": 12, "Disseminated Bacillus Calmette-Guerin infection": 11, "Hypovolaemic shock": 11, "Vomiting": 11, "Chills": 10, "Pruritus": 8, "Rash": 8, "Lymphadenopathy": 7, "Blood pressure measurement": 6, "Body temperature increased": 6, "Haemorrhagic disorder": 6, "Sensitive skin": 6, "Tachycardia": 6, "Diarrhoea": 5, "Induration": 5, "Nodule": 5, "Oedema": 5, "Respiratory distress": 5, "Vaccination site pain": 5, "Drug ineffective": 4, "Dyspnoea": 4, "Erythema": 4, "Haemorrhage": 4, "Hypertension": 4, "Intussusception": 4, "Irritability": 4, "Oropharyngeal pain": 4, "Pain in extremity": 4, "Heart rate": 3, "Hyperhidrosis": 3, "Inflammation": 3, "Rhinorrhoea": 3, "Blood pressure increased": 2, "Chest pain": 2, "Hypokinesia": 2, "Maternal exposure during pregnancy": 2, "Oxygen saturation": 2, "Polymerase chain reaction": 2, "Seizure": 2, "Syncope": 2, "Wrong technique in product usage process": 2, "Abdominal pain": 1, "Angioedema": 1, "Anxiety": 1, "Aphasia": 1, "Back pain": 1, "Bradycardia": 1, "Burning sensation": 1, "Condition aggravated": 1, "Contusion": 1, "Cough": 1, "Discomfort": 1, "Dysphagia": 1, "Face oedema": 1, "Feeling hot": 1, "Haematochezia": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Insomnia": 1, "Language disorder": 1, "Loss of consciousness": 1, "Malaise": 1, "Mouth swelling": 1, "Movement disorder": 1, "Odynophagia": 1, "Oxygen saturation decreased": 1, "Paraesthesia oral": 1, "Pelvic pain": 1, "Pharyngeal inflammation": 1, "Purpura": 1, "Respiratory failure": 1, "Sneezing": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Thrombosis": 1, "Tongue pruritus": 1, "Transient ischaemic attack": 1, "Vascular test": 1, "Vertigo": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9090", "histograms": [{"histogram": {"COVID-19": 33, "SARS-CoV-2 test": 30, "Vaccination failure": 30, "Headache": 28, "Asthenia": 17, "Nausea": 17, "Body temperature": 15, "Dizziness": 15, "Fatigue": 15, "Pyrexia": 15, "Arthralgia": 14, "Myalgia": 13, "Pain": 12, "Disseminated Bacillus Calmette-Guerin infection": 11, "Hypovolaemic shock": 11, "Vomiting": 11, "Chills": 10, "Pruritus": 8, "Rash": 8, "Lymphadenopathy": 7, "Blood pressure measurement": 6, "Body temperature increased": 6, "Haemorrhagic disorder": 6, "Sensitive skin": 6, "Tachycardia": 6, "Diarrhoea": 5, "Induration": 5, "Nodule": 5, "Oedema": 5, "Respiratory distress": 5, "Vaccination site pain": 5, "Drug ineffective": 4, "Dyspnoea": 4, "Erythema": 4, "Haemorrhage": 4, "Hypertension": 4, "Intussusception": 4, "Irritability": 4, "Oropharyngeal pain": 4, "Pain in extremity": 4, "Heart rate": 3, "Hyperhidrosis": 3, "Inflammation": 3, "Rhinorrhoea": 3, "Blood pressure increased": 2, "Chest pain": 2, "Hypokinesia": 2, "Maternal exposure during pregnancy": 2, "Oxygen saturation": 2, "Polymerase chain reaction": 2, "Seizure": 2, "Syncope": 2, "Wrong technique in product usage process": 2, "Abdominal pain": 1, "Angioedema": 1, "Anxiety": 1, "Aphasia": 1, "Back pain": 1, "Bradycardia": 1, "Burning sensation": 1, "Condition aggravated": 1, "Contusion": 1, "Cough": 1, "Discomfort": 1, "Dysphagia": 1, "Face oedema": 1, "Feeling hot": 1, "Haematochezia": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Insomnia": 1, "Language disorder": 1, "Loss of consciousness": 1, "Malaise": 1, "Mouth swelling": 1, "Movement disorder": 1, "Odynophagia": 1, "Oxygen saturation decreased": 1, "Paraesthesia oral": 1, "Pelvic pain": 1, "Pharyngeal inflammation": 1, "Purpura": 1, "Respiratory failure": 1, "Sneezing": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Thrombosis": 1, "Tongue pruritus": 1, "Transient ischaemic attack": 1, "Vascular test": 1, "Vertigo": 1, "Vision blurred": 1}, "batchcodes": ["FA9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA909010.json b/docs/data/histograms/Mexico/FA909010.json
index 91cfd5351bf..cdb58de2ff5 100644
--- a/docs/data/histograms/Mexico/FA909010.json
+++ b/docs/data/histograms/Mexico/FA909010.json
@@ -1 +1 @@
-{"batchcode": "FA909010", "histograms": [{"batchcodes": ["FA909010"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Erythema": 1, "Fatigue": 1, "Haemorrhage": 1, "Headache": 1, "Hypovolaemic shock": 1, "Induration": 1, "Irritability": 1, "Lymphadenopathy": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FA909010", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Erythema": 1, "Fatigue": 1, "Haemorrhage": 1, "Headache": 1, "Hypovolaemic shock": 1, "Induration": 1, "Irritability": 1, "Lymphadenopathy": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vomiting": 1}, "batchcodes": ["FA909010"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA9091.json b/docs/data/histograms/Mexico/FA9091.json
index 564bbcf93d2..e1479813522 100644
--- a/docs/data/histograms/Mexico/FA9091.json
+++ b/docs/data/histograms/Mexico/FA9091.json
@@ -1 +1 @@
-{"batchcode": "FA9091", "histograms": [{"batchcodes": ["FA9091"], "histogram": {"Headache": 12, "Arthralgia": 10, "Asthenia": 10, "Fatigue": 9, "Myalgia": 9, "Nausea": 8, "Pain": 8, "Body temperature": 7, "Cough": 7, "Pyrexia": 7, "Sensitive skin": 7, "Chills": 6, "Dizziness": 6, "Rhinorrhoea": 6, "Induration": 5, "Nodule": 5, "Oropharyngeal pain": 5, "Pruritus": 5, "Oedema": 4, "Rash": 4, "Respiratory distress": 4, "Abdominal pain": 3, "Dyspnoea": 3, "Erythema": 3, "Vaccination site pain": 3, "Vomiting": 3, "Cellulitis": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Hypokinesia": 2, "Inflammation": 2, "Lymphadenopathy": 2, "Odynophagia": 2, "Anal incontinence": 1, "Arthritis": 1, "Body temperature increased": 1, "Chest pain": 1, "Crying": 1, "Facial paralysis": 1, "Haemorrhage": 1, "Malaise": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Petit mal epilepsy": 1, "Productive cough": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sneezing": 1, "Tachycardia": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site nodule": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9091", "histograms": [{"histogram": {"Headache": 12, "Arthralgia": 10, "Asthenia": 10, "Fatigue": 9, "Myalgia": 9, "Nausea": 8, "Pain": 8, "Body temperature": 7, "Cough": 7, "Pyrexia": 7, "Sensitive skin": 7, "Chills": 6, "Dizziness": 6, "Rhinorrhoea": 6, "Induration": 5, "Nodule": 5, "Oropharyngeal pain": 5, "Pruritus": 5, "Oedema": 4, "Rash": 4, "Respiratory distress": 4, "Abdominal pain": 3, "Dyspnoea": 3, "Erythema": 3, "Vaccination site pain": 3, "Vomiting": 3, "Cellulitis": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Hypokinesia": 2, "Inflammation": 2, "Lymphadenopathy": 2, "Odynophagia": 2, "Anal incontinence": 1, "Arthritis": 1, "Body temperature increased": 1, "Chest pain": 1, "Crying": 1, "Facial paralysis": 1, "Haemorrhage": 1, "Malaise": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Petit mal epilepsy": 1, "Productive cough": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sneezing": 1, "Tachycardia": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site nodule": 1, "Vaccination site rash": 1}, "batchcodes": ["FA9091"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA9094.json b/docs/data/histograms/Mexico/FA9094.json
index dd17c5d508f..9a1a4c0a59b 100644
--- a/docs/data/histograms/Mexico/FA9094.json
+++ b/docs/data/histograms/Mexico/FA9094.json
@@ -1 +1 @@
-{"batchcode": "FA9094", "histograms": [{"batchcodes": ["FA9094"], "histogram": {"Asthenia": 2, "COVID-19": 2, "Dizziness": 2, "Fatigue": 2, "SARS-CoV-2 test": 2, "Crying": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Erythema": 1, "Headache": 1, "Paraesthesia": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Tremor": 1, "Vaccination failure": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9094", "histograms": [{"histogram": {"Asthenia": 2, "COVID-19": 2, "Dizziness": 2, "Fatigue": 2, "SARS-CoV-2 test": 2, "Crying": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Erythema": 1, "Headache": 1, "Paraesthesia": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Tremor": 1, "Vaccination failure": 1, "Vertigo": 1}, "batchcodes": ["FA9094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA9096.json b/docs/data/histograms/Mexico/FA9096.json
index cef775de305..aa12e4f3a0b 100644
--- a/docs/data/histograms/Mexico/FA9096.json
+++ b/docs/data/histograms/Mexico/FA9096.json
@@ -1 +1 @@
-{"batchcode": "FA9096", "histograms": [{"batchcodes": ["FA9096"], "histogram": {"Dizziness": 2, "Generalised tonic-clonic seizure": 2, "Malaise": 2, "Myalgia": 2, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bronchospasm": 1, "COVID-19": 1, "Cough": 1, "Diarrhoea": 1, "Discomfort": 1, "Dyspnoea": 1, "Ear pruritus": 1, "Erythema": 1, "Face oedema": 1, "Headache": 1, "Hypertension": 1, "Inflammation": 1, "Irritability postvaccinal": 1, "Nausea": 1, "Oedema": 1, "Oedema peripheral": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sneezing": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9096", "histograms": [{"histogram": {"Dizziness": 2, "Generalised tonic-clonic seizure": 2, "Malaise": 2, "Myalgia": 2, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bronchospasm": 1, "COVID-19": 1, "Cough": 1, "Diarrhoea": 1, "Discomfort": 1, "Dyspnoea": 1, "Ear pruritus": 1, "Erythema": 1, "Face oedema": 1, "Headache": 1, "Hypertension": 1, "Inflammation": 1, "Irritability postvaccinal": 1, "Nausea": 1, "Oedema": 1, "Oedema peripheral": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sneezing": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["FA9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FA9100.json b/docs/data/histograms/Mexico/FA9100.json
index 20c41b25f56..2ddb2997bd8 100644
--- a/docs/data/histograms/Mexico/FA9100.json
+++ b/docs/data/histograms/Mexico/FA9100.json
@@ -1 +1 @@
-{"batchcode": "FA9100", "histograms": [{"batchcodes": ["FA9100"], "histogram": {"Dizziness": 21, "Headache": 20, "Asthenia": 17, "Myalgia": 15, "Fatigue": 14, "Arthralgia": 13, "Body temperature": 12, "Pyrexia": 12, "Cough": 11, "Nausea": 11, "Sensitive skin": 11, "Pain": 10, "Dyspnoea": 9, "Respiratory distress": 9, "Blood pressure measurement": 7, "Chills": 7, "Oropharyngeal pain": 7, "Vaccination site pain": 6, "Abdominal pain": 5, "Odynophagia": 5, "Seizure": 5, "Tachycardia": 5, "Chest pain": 4, "Decreased appetite": 4, "Pruritus": 4, "COVID-19": 3, "Diarrhoea": 3, "Hypertension": 3, "Induration": 3, "Nodule": 3, "Rhinorrhoea": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Fall": 2, "Heart rate": 2, "Hypotension": 2, "Malaise": 2, "Oedema": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Rash": 2, "Vision blurred": 2, "Vomiting": 2, "Ageusia": 1, "Anosmia": 1, "Anxiety": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Bronchospasm": 1, "Depressed level of consciousness": 1, "Dermatitis allergic": 1, "Erythema": 1, "Eye injury": 1, "Eye pain": 1, "Eye pruritus": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Illness": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Muscular weakness": 1, "Neurological decompensation": 1, "Off label use": 1, "Oropharyngeal blistering": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pallor": 1, "Physical examination": 1, "Presyncope": 1, "Rash pruritic": 1, "Scleral haemorrhage": 1, "Sensation of foreign body": 1, "Syncope": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site oedema": 1, "Vertigo": 1, "Visual acuity reduced": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9100", "histograms": [{"histogram": {"Dizziness": 21, "Headache": 20, "Asthenia": 17, "Myalgia": 15, "Fatigue": 14, "Arthralgia": 13, "Body temperature": 12, "Pyrexia": 12, "Cough": 11, "Nausea": 11, "Sensitive skin": 11, "Pain": 10, "Dyspnoea": 9, "Respiratory distress": 9, "Blood pressure measurement": 7, "Chills": 7, "Oropharyngeal pain": 7, "Vaccination site pain": 6, "Abdominal pain": 5, "Odynophagia": 5, "Seizure": 5, "Tachycardia": 5, "Chest pain": 4, "Decreased appetite": 4, "Pruritus": 4, "COVID-19": 3, "Diarrhoea": 3, "Hypertension": 3, "Induration": 3, "Nodule": 3, "Rhinorrhoea": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Fall": 2, "Heart rate": 2, "Hypotension": 2, "Malaise": 2, "Oedema": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Rash": 2, "Vision blurred": 2, "Vomiting": 2, "Ageusia": 1, "Anosmia": 1, "Anxiety": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Bronchospasm": 1, "Depressed level of consciousness": 1, "Dermatitis allergic": 1, "Erythema": 1, "Eye injury": 1, "Eye pain": 1, "Eye pruritus": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Hypoxic-ischaemic encephalopathy": 1, "Illness": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Muscular weakness": 1, "Neurological decompensation": 1, "Off label use": 1, "Oropharyngeal blistering": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pallor": 1, "Physical examination": 1, "Presyncope": 1, "Rash pruritic": 1, "Scleral haemorrhage": 1, "Sensation of foreign body": 1, "Syncope": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site oedema": 1, "Vertigo": 1, "Visual acuity reduced": 1, "Vital signs measurement": 1}, "batchcodes": ["FA9100"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FAQ9100.json b/docs/data/histograms/Mexico/FAQ9100.json
index 81661a439dd..e473a3f4533 100644
--- a/docs/data/histograms/Mexico/FAQ9100.json
+++ b/docs/data/histograms/Mexico/FAQ9100.json
@@ -1 +1 @@
-{"batchcode": "FAQ9100", "histograms": [{"batchcodes": ["FAQ9100"], "histogram": {"Headache": 1, "Myalgia": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "FAQ9100", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1}, "batchcodes": ["FAQ9100"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FC 2495.json b/docs/data/histograms/Mexico/FC 2495.json
index fc11081f96e..9c2729d059a 100644
--- a/docs/data/histograms/Mexico/FC 2495.json
+++ b/docs/data/histograms/Mexico/FC 2495.json
@@ -1 +1 @@
-{"batchcode": "FC 2495", "histograms": [{"batchcodes": ["FC 2495"], "histogram": {"Anal sphincter atony": 1, "Dizziness": 1, "Loss of consciousness": 1, "Postictal state": 1, "Seizure": 1, "Tachycardia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FC 2495", "histograms": [{"histogram": {"Anal sphincter atony": 1, "Dizziness": 1, "Loss of consciousness": 1, "Postictal state": 1, "Seizure": 1, "Tachycardia": 1, "Tremor": 1}, "batchcodes": ["FC 2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FC-2495.json b/docs/data/histograms/Mexico/FC-2495.json
index f242448c2cf..dd6f39f0f40 100644
--- a/docs/data/histograms/Mexico/FC-2495.json
+++ b/docs/data/histograms/Mexico/FC-2495.json
@@ -1 +1 @@
-{"batchcode": "FC-2495", "histograms": [{"batchcodes": ["FC-2495"], "histogram": {"Arrhythmia": 1, "Chest discomfort": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FC-2495", "histograms": [{"histogram": {"Arrhythmia": 1, "Chest discomfort": 1, "Palpitations": 1}, "batchcodes": ["FC-2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FC2495.json b/docs/data/histograms/Mexico/FC2495.json
index 51d1f49c9d4..b93eabb4c7c 100644
--- a/docs/data/histograms/Mexico/FC2495.json
+++ b/docs/data/histograms/Mexico/FC2495.json
@@ -1 +1 @@
-{"batchcode": "FC2495", "histograms": [{"batchcodes": ["FC2495"], "histogram": {"Headache": 31, "Asthenia": 28, "Fatigue": 24, "Dizziness": 20, "Myalgia": 17, "Arthralgia": 16, "Dyspnoea": 16, "Chills": 15, "Nausea": 15, "Sensitive skin": 15, "Pain": 14, "Respiratory distress": 13, "Cough": 12, "Pyrexia": 12, "Body temperature": 11, "COVID-19": 9, "Oropharyngeal pain": 9, "Rash": 9, "SARS-CoV-2 test": 8, "Diarrhoea": 7, "Vaccination failure": 7, "Blood pressure measurement": 6, "Pruritus": 6, "Tachycardia": 6, "Chest pain": 5, "Rhinorrhoea": 5, "Vomiting": 5, "Abdominal pain": 4, "Body temperature increased": 4, "Chest discomfort": 4, "Maternal exposure during pregnancy": 4, "Paraesthesia": 4, "Sensation of foreign body": 4, "Vaccination site pain": 4, "Anaphylactic shock": 3, "Erythema": 3, "Hypertension": 3, "Inflammation": 3, "Irritability": 3, "Oedema": 3, "Oxygen saturation": 3, "Pain assessment": 3, "Syncope": 3, "Throat tightness": 3, "Vertigo": 3, "Vision blurred": 3, "Blood pressure increased": 2, "Bronchospasm": 2, "Burning sensation": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Ear pain": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Malaise": 2, "Pain in extremity": 2, "Vaccination error": 2, "Visual analogue scale": 2, "Agitation": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Back pain": 1, "Bell's palsy": 1, "Breast pain": 1, "Cardio-respiratory arrest": 1, "Crying": 1, "Depressed level of consciousness": 1, "Discomfort": 1, "Dry mouth": 1, "Dysgeusia": 1, "Eye irritation": 1, "Facial discomfort": 1, "Facial paresis": 1, "Foetal heart rate": 1, "Foetal heart rate increased": 1, "Gait disturbance": 1, "Generalised oedema": 1, "Guillain-Barre syndrome": 1, "Haemodynamic instability": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypovolaemic shock": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Interchange of vaccine products": 1, "Larynx irritation": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Oxygen saturation decreased": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pharyngeal erythema": 1, "Pharyngeal oedema": 1, "Photophobia": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Skin exfoliation": 1, "Somnolence": 1, "Swelling": 1, "Swelling face": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria": 1, "Weight increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2495", "histograms": [{"histogram": {"Headache": 31, "Asthenia": 28, "Fatigue": 24, "Dizziness": 20, "Myalgia": 17, "Arthralgia": 16, "Dyspnoea": 16, "Chills": 15, "Nausea": 15, "Sensitive skin": 15, "Pain": 14, "Respiratory distress": 13, "Cough": 12, "Pyrexia": 12, "Body temperature": 11, "COVID-19": 9, "Oropharyngeal pain": 9, "Rash": 9, "SARS-CoV-2 test": 8, "Diarrhoea": 7, "Vaccination failure": 7, "Blood pressure measurement": 6, "Pruritus": 6, "Tachycardia": 6, "Chest pain": 5, "Rhinorrhoea": 5, "Vomiting": 5, "Abdominal pain": 4, "Body temperature increased": 4, "Chest discomfort": 4, "Maternal exposure during pregnancy": 4, "Paraesthesia": 4, "Sensation of foreign body": 4, "Vaccination site pain": 4, "Anaphylactic shock": 3, "Erythema": 3, "Hypertension": 3, "Inflammation": 3, "Irritability": 3, "Oedema": 3, "Oxygen saturation": 3, "Pain assessment": 3, "Syncope": 3, "Throat tightness": 3, "Vertigo": 3, "Vision blurred": 3, "Blood pressure increased": 2, "Bronchospasm": 2, "Burning sensation": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Ear pain": 2, "Hyperhidrosis": 2, "Hypotension": 2, "Malaise": 2, "Pain in extremity": 2, "Vaccination error": 2, "Visual analogue scale": 2, "Agitation": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Back pain": 1, "Bell's palsy": 1, "Breast pain": 1, "Cardio-respiratory arrest": 1, "Crying": 1, "Depressed level of consciousness": 1, "Discomfort": 1, "Dry mouth": 1, "Dysgeusia": 1, "Eye irritation": 1, "Facial discomfort": 1, "Facial paresis": 1, "Foetal heart rate": 1, "Foetal heart rate increased": 1, "Gait disturbance": 1, "Generalised oedema": 1, "Guillain-Barre syndrome": 1, "Haemodynamic instability": 1, "Head discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypovolaemic shock": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Interchange of vaccine products": 1, "Larynx irritation": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Oxygen saturation decreased": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pharyngeal erythema": 1, "Pharyngeal oedema": 1, "Photophobia": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Skin exfoliation": 1, "Somnolence": 1, "Swelling": 1, "Swelling face": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria": 1, "Weight increased": 1}, "batchcodes": ["FC2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FC24950921.json b/docs/data/histograms/Mexico/FC24950921.json
index c9a040c82e5..09e74e4dc58 100644
--- a/docs/data/histograms/Mexico/FC24950921.json
+++ b/docs/data/histograms/Mexico/FC24950921.json
@@ -1 +1 @@
-{"batchcode": "FC24950921", "histograms": [{"batchcodes": ["FC24950921"], "histogram": {"Depressed level of consciousness": 1, "Dizziness": 1, "Eye pain": 1, "Headache": 1, "Muscular weakness": 1, "Scan brain": 1, "Speech disorder": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FC24950921", "histograms": [{"histogram": {"Depressed level of consciousness": 1, "Dizziness": 1, "Eye pain": 1, "Headache": 1, "Muscular weakness": 1, "Scan brain": 1, "Speech disorder": 1, "Syncope": 1}, "batchcodes": ["FC24950921"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FC24995.json b/docs/data/histograms/Mexico/FC24995.json
index b3e11473d35..5c6c8783c5b 100644
--- a/docs/data/histograms/Mexico/FC24995.json
+++ b/docs/data/histograms/Mexico/FC24995.json
@@ -1 +1 @@
-{"batchcode": "FC24995", "histograms": [{"batchcodes": ["FC24995"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Erythema": 1, "Headache": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Sensitive skin": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FC24995", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Erythema": 1, "Headache": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Sensitive skin": 1, "Urticaria": 1}, "batchcodes": ["FC24995"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FC3002.json b/docs/data/histograms/Mexico/FC3002.json
index ee7e5eb77d7..8777191bf42 100644
--- a/docs/data/histograms/Mexico/FC3002.json
+++ b/docs/data/histograms/Mexico/FC3002.json
@@ -1 +1 @@
-{"batchcode": "FC3002", "histograms": [{"batchcodes": ["FC3002"], "histogram": {"Electromyogram": 1, "Fatigue": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Motor neurone disease": 1, "Pelvic floor muscle weakness": 1, "Polyneuropathy": 1, "Pyelonephritis": 1, "Radiculopathy": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3002", "histograms": [{"histogram": {"Electromyogram": 1, "Fatigue": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Motor neurone disease": 1, "Pelvic floor muscle weakness": 1, "Polyneuropathy": 1, "Pyelonephritis": 1, "Radiculopathy": 1, "Vertigo": 1}, "batchcodes": ["FC3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FC9090.json b/docs/data/histograms/Mexico/FC9090.json
index e0281ccf10e..5e1734befa7 100644
--- a/docs/data/histograms/Mexico/FC9090.json
+++ b/docs/data/histograms/Mexico/FC9090.json
@@ -1 +1 @@
-{"batchcode": "FC9090", "histograms": [{"batchcodes": ["FC9090"], "histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9090", "histograms": [{"histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["FC9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FCZ2495.json b/docs/data/histograms/Mexico/FCZ2495.json
index 004818daada..433d5ea3b26 100644
--- a/docs/data/histograms/Mexico/FCZ2495.json
+++ b/docs/data/histograms/Mexico/FCZ2495.json
@@ -1 +1 @@
-{"batchcode": "FCZ2495", "histograms": [{"batchcodes": ["FCZ2495"], "histogram": {"Body temperature": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FCZ2495", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["FCZ2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FD7121.json b/docs/data/histograms/Mexico/FD7121.json
index 1ad543cbb1b..10accf6a5a6 100644
--- a/docs/data/histograms/Mexico/FD7121.json
+++ b/docs/data/histograms/Mexico/FD7121.json
@@ -1 +1 @@
-{"batchcode": "FD7121", "histograms": [{"batchcodes": ["FD7121"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7121", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FD7121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FD8813.json b/docs/data/histograms/Mexico/FD8813.json
index 045a71a7e93..b4254485619 100644
--- a/docs/data/histograms/Mexico/FD8813.json
+++ b/docs/data/histograms/Mexico/FD8813.json
@@ -1 +1 @@
-{"batchcode": "FD8813", "histograms": [{"batchcodes": ["FD8813"], "histogram": {"Diarrhoea": 2, "Headache": 2, "Abdominal pain": 1, "Angina pectoris": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Aura": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Hemiparaesthesia": 1, "Hypertensive crisis": 1, "Joint swelling": 1, "Lethargy": 1, "Muscular weakness": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paralysis": 1, "Pyrexia": 1, "Seizure": 1, "Somnolence": 1, "Tachycardia": 1, "Tongue discomfort": 1, "Vaccination error": 1, "Vaccination site pain": 1, "Vein disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8813", "histograms": [{"histogram": {"Diarrhoea": 2, "Headache": 2, "Abdominal pain": 1, "Angina pectoris": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Aura": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Hemiparaesthesia": 1, "Hypertensive crisis": 1, "Joint swelling": 1, "Lethargy": 1, "Muscular weakness": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paralysis": 1, "Pyrexia": 1, "Seizure": 1, "Somnolence": 1, "Tachycardia": 1, "Tongue discomfort": 1, "Vaccination error": 1, "Vaccination site pain": 1, "Vein disorder": 1, "Vomiting": 1}, "batchcodes": ["FD8813"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FE-8087.json b/docs/data/histograms/Mexico/FE-8087.json
index 5f147dfb490..599e17f4647 100644
--- a/docs/data/histograms/Mexico/FE-8087.json
+++ b/docs/data/histograms/Mexico/FE-8087.json
@@ -1 +1 @@
-{"batchcode": "FE-8087", "histograms": [{"batchcodes": ["FE-8087"], "histogram": {"Dizziness": 1, "Headache": 1, "Nausea": 1, "Pruritus": 1, "Seizure": 1, "Tachycardia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FE-8087", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Nausea": 1, "Pruritus": 1, "Seizure": 1, "Tachycardia": 1, "Vision blurred": 1}, "batchcodes": ["FE-8087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FE3593.json b/docs/data/histograms/Mexico/FE3593.json
index 79a410c7ba2..8f239d6401f 100644
--- a/docs/data/histograms/Mexico/FE3593.json
+++ b/docs/data/histograms/Mexico/FE3593.json
@@ -1 +1 @@
-{"batchcode": "FE3593", "histograms": [{"batchcodes": ["FE3593"], "histogram": {"Headache": 5, "Asthenia": 4, "Body temperature": 4, "Dizziness": 4, "Chills": 3, "Fatigue": 3, "Nausea": 3, "Pyrexia": 3, "Hypokinesia": 2, "Pruritus": 2, "Seizure": 2, "Vomiting": 2, "Abdominal pain": 1, "Body temperature increased": 1, "Chest discomfort": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysstasia": 1, "Erythema": 1, "Expired product administered": 1, "Generalised tonic-clonic seizure": 1, "Hyperthermia": 1, "Irritability": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Paraesthesia": 1, "Photophobia": 1, "Rash": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Syncope": 1, "Vaccination site paraesthesia": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3593", "histograms": [{"histogram": {"Headache": 5, "Asthenia": 4, "Body temperature": 4, "Dizziness": 4, "Chills": 3, "Fatigue": 3, "Nausea": 3, "Pyrexia": 3, "Hypokinesia": 2, "Pruritus": 2, "Seizure": 2, "Vomiting": 2, "Abdominal pain": 1, "Body temperature increased": 1, "Chest discomfort": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysstasia": 1, "Erythema": 1, "Expired product administered": 1, "Generalised tonic-clonic seizure": 1, "Hyperthermia": 1, "Irritability": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Paraesthesia": 1, "Photophobia": 1, "Rash": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Syncope": 1, "Vaccination site paraesthesia": 1, "Vital signs measurement": 1}, "batchcodes": ["FE3593"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FE7478.json b/docs/data/histograms/Mexico/FE7478.json
index b0b84cf3aa3..c1fd01ecbb8 100644
--- a/docs/data/histograms/Mexico/FE7478.json
+++ b/docs/data/histograms/Mexico/FE7478.json
@@ -1 +1 @@
-{"batchcode": "FE7478", "histograms": [{"batchcodes": ["FE7478"], "histogram": {"Arthralgia": 2, "Asthenia": 2, "Chills": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "SARS-CoV-2 antibody test": 2}}]}
\ No newline at end of file
+{"batchcode": "FE7478", "histograms": [{"histogram": {"Arthralgia": 2, "Asthenia": 2, "Chills": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "SARS-CoV-2 antibody test": 2}, "batchcodes": ["FE7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FE8087.json b/docs/data/histograms/Mexico/FE8087.json
index aef88f03c97..fedd235fa2d 100644
--- a/docs/data/histograms/Mexico/FE8087.json
+++ b/docs/data/histograms/Mexico/FE8087.json
@@ -1 +1 @@
-{"batchcode": "FE8087", "histograms": [{"batchcodes": ["FE8087"], "histogram": {"Asthenia": 3, "COVID-19": 3, "Fatigue": 3, "SARS-CoV-2 test": 3, "Dizziness": 2, "Headache": 2, "Hemiparesis": 2, "Muscular weakness": 2, "Myalgia": 2, "Pain": 2, "Pruritus": 2, "Tachycardia": 2, "Vaccination failure": 2, "Arthralgia": 1, "Bladder sphincter atony": 1, "Body temperature": 1, "Bronchospasm": 1, "Chest pain": 1, "Cough": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Facial paralysis": 1, "Inflammation": 1, "Limb discomfort": 1, "Meningitis": 1, "Nausea": 1, "Oedema": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Physical examination": 1, "Pyrexia": 1, "Sensitive skin": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8087", "histograms": [{"histogram": {"Asthenia": 3, "COVID-19": 3, "Fatigue": 3, "SARS-CoV-2 test": 3, "Dizziness": 2, "Headache": 2, "Hemiparesis": 2, "Muscular weakness": 2, "Myalgia": 2, "Pain": 2, "Pruritus": 2, "Tachycardia": 2, "Vaccination failure": 2, "Arthralgia": 1, "Bladder sphincter atony": 1, "Body temperature": 1, "Bronchospasm": 1, "Chest pain": 1, "Cough": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Facial paralysis": 1, "Inflammation": 1, "Limb discomfort": 1, "Meningitis": 1, "Nausea": 1, "Oedema": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Physical examination": 1, "Pyrexia": 1, "Sensitive skin": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["FE8087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FF2589.json b/docs/data/histograms/Mexico/FF2589.json
index 0b320d1d2da..ad4fc0e9c15 100644
--- a/docs/data/histograms/Mexico/FF2589.json
+++ b/docs/data/histograms/Mexico/FF2589.json
@@ -1 +1 @@
-{"batchcode": "FF2589", "histograms": [{"batchcodes": ["FF2589"], "histogram": {"Breast pain": 1, "Lymphadenopathy": 1, "Menstruation delayed": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2589", "histograms": [{"histogram": {"Breast pain": 1, "Lymphadenopathy": 1, "Menstruation delayed": 1}, "batchcodes": ["FF2589"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FF2593.json b/docs/data/histograms/Mexico/FF2593.json
index 6328986b683..948e97e5bb8 100644
--- a/docs/data/histograms/Mexico/FF2593.json
+++ b/docs/data/histograms/Mexico/FF2593.json
@@ -1 +1 @@
-{"batchcode": "FF2593", "histograms": [{"batchcodes": ["FF2593"], "histogram": {"Induration": 2, "Lymphadenopathy": 2, "Nodule": 2, "Arthralgia": 1, "Axillary pain": 1, "Body temperature": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Hypokinesia": 1, "Immunisation": 1, "Inflammation": 1, "Joint injury": 1, "Malaise": 1, "Myalgia": 1, "Myoclonus": 1, "Oedema": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sensitive skin": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2593", "histograms": [{"histogram": {"Induration": 2, "Lymphadenopathy": 2, "Nodule": 2, "Arthralgia": 1, "Axillary pain": 1, "Body temperature": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Hypokinesia": 1, "Immunisation": 1, "Inflammation": 1, "Joint injury": 1, "Malaise": 1, "Myalgia": 1, "Myoclonus": 1, "Oedema": 1, "Off label use": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sensitive skin": 1, "Visual analogue scale": 1}, "batchcodes": ["FF2593"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FF2595.json b/docs/data/histograms/Mexico/FF2595.json
index 41003e4393e..9b19c2b091c 100644
--- a/docs/data/histograms/Mexico/FF2595.json
+++ b/docs/data/histograms/Mexico/FF2595.json
@@ -1 +1 @@
-{"batchcode": "FF2595", "histograms": [{"batchcodes": ["FF2595"], "histogram": {"Body temperature": 3, "Dizziness": 3, "Erythema": 3, "Headache": 3, "Nausea": 3, "Pain": 3, "Sensitive skin": 3, "Arthralgia": 2, "Fatigue": 2, "Myalgia": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Tachycardia": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "Bronchospasm": 1, "COVID-19": 1, "Decreased immune responsiveness": 1, "Dyspnoea": 1, "Exposure to SARS-CoV-2": 1, "Eyelid oedema": 1, "Face oedema": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Hypertension": 1, "Hyperthermia": 1, "Inflammation": 1, "Lip oedema": 1, "Maternal exposure during pregnancy": 1, "Nasal congestion": 1, "Oedema": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sensation of foreign body": 1, "Sinusitis": 1, "Syphilis": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2595", "histograms": [{"histogram": {"Body temperature": 3, "Dizziness": 3, "Erythema": 3, "Headache": 3, "Nausea": 3, "Pain": 3, "Sensitive skin": 3, "Arthralgia": 2, "Fatigue": 2, "Myalgia": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Tachycardia": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "Bronchospasm": 1, "COVID-19": 1, "Decreased immune responsiveness": 1, "Dyspnoea": 1, "Exposure to SARS-CoV-2": 1, "Eyelid oedema": 1, "Face oedema": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Hypertension": 1, "Hyperthermia": 1, "Inflammation": 1, "Lip oedema": 1, "Maternal exposure during pregnancy": 1, "Nasal congestion": 1, "Oedema": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sensation of foreign body": 1, "Sinusitis": 1, "Syphilis": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["FF2595"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FF8338.json b/docs/data/histograms/Mexico/FF8338.json
index 574d2aa8763..345b8a93330 100644
--- a/docs/data/histograms/Mexico/FF8338.json
+++ b/docs/data/histograms/Mexico/FF8338.json
@@ -1 +1 @@
-{"batchcode": "FF8338", "histograms": [{"batchcodes": ["FF8338"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Eyelid oedema": 1, "Fatigue": 1, "Lip oedema": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Paraesthesia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8338", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Eyelid oedema": 1, "Fatigue": 1, "Lip oedema": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Paraesthesia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["FF8338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FF8835.json b/docs/data/histograms/Mexico/FF8835.json
index e94de8de34c..c537a73fd02 100644
--- a/docs/data/histograms/Mexico/FF8835.json
+++ b/docs/data/histograms/Mexico/FF8835.json
@@ -1 +1 @@
-{"batchcode": "FF8835", "histograms": [{"batchcodes": ["FF8835"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Discomfort": 1, "Dizziness": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8835", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Discomfort": 1, "Dizziness": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1}, "batchcodes": ["FF8835"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FF8838.json b/docs/data/histograms/Mexico/FF8838.json
index 55938ac547f..bfa1c7b3edf 100644
--- a/docs/data/histograms/Mexico/FF8838.json
+++ b/docs/data/histograms/Mexico/FF8838.json
@@ -1 +1 @@
-{"batchcode": "FF8838", "histograms": [{"batchcodes": ["FF8838"], "histogram": {"Headache": 10, "Dizziness": 8, "Asthenia": 7, "Fatigue": 7, "Chills": 6, "Pain": 6, "Nausea": 5, "Sensitive skin": 5, "Body temperature": 4, "Pyrexia": 4, "Vaccination site pain": 4, "Dyspnoea": 3, "Irritability": 3, "Oropharyngeal pain": 3, "Respiratory distress": 3, "Syncope": 3, "Arthralgia": 2, "Back pain": 2, "Muscular weakness": 2, "Myalgia": 2, "Paraesthesia": 2, "Vital signs measurement": 2, "Vomiting": 2, "Amnesia": 1, "Anosmia": 1, "Anxiety disorder": 1, "Arthritis": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Erythema": 1, "Eye pain": 1, "Facial paralysis": 1, "Haematochezia": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperaesthesia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Laryngeal oedema": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Panic reaction": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Seizure": 1, "Somnolence": 1, "Speech disorder": 1, "Tachycardia": 1, "Vaccination site discomfort": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8838", "histograms": [{"histogram": {"Headache": 10, "Dizziness": 8, "Asthenia": 7, "Fatigue": 7, "Chills": 6, "Pain": 6, "Nausea": 5, "Sensitive skin": 5, "Body temperature": 4, "Pyrexia": 4, "Vaccination site pain": 4, "Dyspnoea": 3, "Irritability": 3, "Oropharyngeal pain": 3, "Respiratory distress": 3, "Syncope": 3, "Arthralgia": 2, "Back pain": 2, "Muscular weakness": 2, "Myalgia": 2, "Paraesthesia": 2, "Vital signs measurement": 2, "Vomiting": 2, "Amnesia": 1, "Anosmia": 1, "Anxiety disorder": 1, "Arthritis": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Erythema": 1, "Eye pain": 1, "Facial paralysis": 1, "Haematochezia": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperaesthesia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hyperthermia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Laryngeal oedema": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Panic reaction": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Seizure": 1, "Somnolence": 1, "Speech disorder": 1, "Tachycardia": 1, "Vaccination site discomfort": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Wrong product administered": 1}, "batchcodes": ["FF8838"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FH8021.json b/docs/data/histograms/Mexico/FH8021.json
index 34dfd12f254..42fd43df397 100644
--- a/docs/data/histograms/Mexico/FH8021.json
+++ b/docs/data/histograms/Mexico/FH8021.json
@@ -1 +1 @@
-{"batchcode": "FH8021", "histograms": [{"batchcodes": ["FH8021"], "histogram": {"Dizziness": 9, "Headache": 8, "Asthenia": 6, "Syncope": 6, "Fatigue": 5, "Dyspnoea": 4, "Myalgia": 4, "Nausea": 4, "Paraesthesia": 4, "Arthralgia": 3, "Body temperature": 3, "Pyrexia": 3, "Respiratory distress": 3, "Tachycardia": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "Hypotension": 2, "Loss of consciousness": 2, "Oropharyngeal pain": 2, "Rhinorrhoea": 2, "Anxiety": 1, "Ataxia": 1, "Bedridden": 1, "Body temperature increased": 1, "Bradyphrenia": 1, "Conversion disorder": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dysarthria": 1, "Heart rate": 1, "Hypokinesia": 1, "Irritability": 1, "Joint hyperextension": 1, "Joint stiffness": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Muscle strength abnormal": 1, "Muscular weakness": 1, "Pain": 1, "Pallor": 1, "Postictal state": 1, "Pruritus": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Salivary hypersecretion": 1, "Seizure": 1, "Sensitive skin": 1, "Slow speech": 1, "Urinary incontinence": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8021", "histograms": [{"histogram": {"Dizziness": 9, "Headache": 8, "Asthenia": 6, "Syncope": 6, "Fatigue": 5, "Dyspnoea": 4, "Myalgia": 4, "Nausea": 4, "Paraesthesia": 4, "Arthralgia": 3, "Body temperature": 3, "Pyrexia": 3, "Respiratory distress": 3, "Tachycardia": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "Hypotension": 2, "Loss of consciousness": 2, "Oropharyngeal pain": 2, "Rhinorrhoea": 2, "Anxiety": 1, "Ataxia": 1, "Bedridden": 1, "Body temperature increased": 1, "Bradyphrenia": 1, "Conversion disorder": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dysarthria": 1, "Heart rate": 1, "Hypokinesia": 1, "Irritability": 1, "Joint hyperextension": 1, "Joint stiffness": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Muscle strength abnormal": 1, "Muscular weakness": 1, "Pain": 1, "Pallor": 1, "Postictal state": 1, "Pruritus": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Salivary hypersecretion": 1, "Seizure": 1, "Sensitive skin": 1, "Slow speech": 1, "Urinary incontinence": 1, "Vomiting": 1}, "batchcodes": ["FH8021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FH8024.json b/docs/data/histograms/Mexico/FH8024.json
index 34eb3bfe09d..b87d586ecac 100644
--- a/docs/data/histograms/Mexico/FH8024.json
+++ b/docs/data/histograms/Mexico/FH8024.json
@@ -1 +1 @@
-{"batchcode": "FH8024", "histograms": [{"batchcodes": ["FH8024"], "histogram": {"Headache": 9, "Pain": 7, "Sensitive skin": 7, "Body temperature": 5, "Pyrexia": 5, "Dyspnoea": 4, "Myalgia": 4, "Respiratory distress": 4, "Tachycardia": 4, "Chills": 3, "Oropharyngeal pain": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Cough": 2, "Diarrhoea": 2, "Dizziness": 2, "Lymphadenopathy": 2, "Rash": 2, "Rhinorrhoea": 2, "Abdominal pain": 1, "Bronchospasm": 1, "Dry throat": 1, "Erythema": 1, "Eye irritation": 1, "Inflammation": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nodule": 1, "Odynophagia": 1, "Oedema": 1, "Palpitations": 1, "Physical examination": 1, "Pruritus": 1, "Seizure": 1, "Tonsillar hypertrophy": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8024", "histograms": [{"histogram": {"Headache": 9, "Pain": 7, "Sensitive skin": 7, "Body temperature": 5, "Pyrexia": 5, "Dyspnoea": 4, "Myalgia": 4, "Respiratory distress": 4, "Tachycardia": 4, "Chills": 3, "Oropharyngeal pain": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Cough": 2, "Diarrhoea": 2, "Dizziness": 2, "Lymphadenopathy": 2, "Rash": 2, "Rhinorrhoea": 2, "Abdominal pain": 1, "Bronchospasm": 1, "Dry throat": 1, "Erythema": 1, "Eye irritation": 1, "Inflammation": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nodule": 1, "Odynophagia": 1, "Oedema": 1, "Palpitations": 1, "Physical examination": 1, "Pruritus": 1, "Seizure": 1, "Tonsillar hypertrophy": 1, "Vomiting": 1}, "batchcodes": ["FH8024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FH8026.json b/docs/data/histograms/Mexico/FH8026.json
index 2edb7f40051..c6dc33b277c 100644
--- a/docs/data/histograms/Mexico/FH8026.json
+++ b/docs/data/histograms/Mexico/FH8026.json
@@ -1 +1 @@
-{"batchcode": "FH8026", "histograms": [{"batchcodes": ["FH8026"], "histogram": {"Dizziness": 18, "Blood pressure measurement": 11, "Headache": 10, "Heart rate": 9, "Nausea": 9, "Oxygen saturation": 9, "Hypotension": 8, "Pain": 7, "Sensitive skin": 7, "Asthenia": 6, "Dyspnoea": 6, "Respiratory distress": 6, "Vision blurred": 4, "Abdominal pain": 3, "Body temperature": 3, "Chest pain": 3, "Fatigue": 3, "Hyperhidrosis": 3, "Inflammation": 3, "Pyrexia": 3, "Seizure": 3, "Syncope": 3, "Tachycardia": 3, "Arthralgia": 2, "Chills": 2, "Dehydration": 2, "Diplopia": 2, "Myalgia": 2, "Oedema": 2, "Paraesthesia": 2, "Photopsia": 2, "Tinnitus": 2, "Abnormal faeces": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Body temperature increased": 1, "Cheilitis": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Electromyogram": 1, "Eye inflammation": 1, "Eyelid ptosis": 1, "Febrile convulsion": 1, "Feeling hot": 1, "Generalised tonic-clonic seizure": 1, "Glossitis": 1, "Guillain-Barre syndrome": 1, "Hyperglycaemia": 1, "Hypertension": 1, "Hypoaesthesia eye": 1, "Hypoaesthesia oral": 1, "Induration": 1, "Irritability": 1, "Juvenile idiopathic arthritis": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Musculoskeletal pain": 1, "Nerve conduction studies": 1, "Nodule": 1, "Odynophagia": 1, "Off label use": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Product use issue": 1, "Pruritus": 1, "Respiratory tract infection": 1, "Rhinorrhoea": 1, "Stridor": 1, "Sudden infant death syndrome": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1, "Visual analogue scale": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8026", "histograms": [{"histogram": {"Dizziness": 18, "Blood pressure measurement": 11, "Headache": 10, "Heart rate": 9, "Nausea": 9, "Oxygen saturation": 9, "Hypotension": 8, "Pain": 7, "Sensitive skin": 7, "Asthenia": 6, "Dyspnoea": 6, "Respiratory distress": 6, "Vision blurred": 4, "Abdominal pain": 3, "Body temperature": 3, "Chest pain": 3, "Fatigue": 3, "Hyperhidrosis": 3, "Inflammation": 3, "Pyrexia": 3, "Seizure": 3, "Syncope": 3, "Tachycardia": 3, "Arthralgia": 2, "Chills": 2, "Dehydration": 2, "Diplopia": 2, "Myalgia": 2, "Oedema": 2, "Paraesthesia": 2, "Photopsia": 2, "Tinnitus": 2, "Abnormal faeces": 1, "Blood glucose": 1, "Blood pressure abnormal": 1, "Body temperature increased": 1, "Cheilitis": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Electromyogram": 1, "Eye inflammation": 1, "Eyelid ptosis": 1, "Febrile convulsion": 1, "Feeling hot": 1, "Generalised tonic-clonic seizure": 1, "Glossitis": 1, "Guillain-Barre syndrome": 1, "Hyperglycaemia": 1, "Hypertension": 1, "Hypoaesthesia eye": 1, "Hypoaesthesia oral": 1, "Induration": 1, "Irritability": 1, "Juvenile idiopathic arthritis": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Musculoskeletal pain": 1, "Nerve conduction studies": 1, "Nodule": 1, "Odynophagia": 1, "Off label use": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Product use issue": 1, "Pruritus": 1, "Respiratory tract infection": 1, "Rhinorrhoea": 1, "Stridor": 1, "Sudden infant death syndrome": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1, "Visual analogue scale": 1, "Vomiting": 1}, "batchcodes": ["FH8026"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FI0007.json b/docs/data/histograms/Mexico/FI0007.json
index 07451da0239..146a060978d 100644
--- a/docs/data/histograms/Mexico/FI0007.json
+++ b/docs/data/histograms/Mexico/FI0007.json
@@ -1 +1 @@
-{"batchcode": "FI0007", "histograms": [{"batchcodes": ["FI0007"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FI0007", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FI0007"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ1613.json b/docs/data/histograms/Mexico/FJ1613.json
index 6d2fe181a7b..77ab339294d 100644
--- a/docs/data/histograms/Mexico/FJ1613.json
+++ b/docs/data/histograms/Mexico/FJ1613.json
@@ -1 +1 @@
-{"batchcode": "FJ1613", "histograms": [{"batchcodes": ["FJ1613"], "histogram": {"Dizziness": 9, "Headache": 9, "Nausea": 6, "Respiratory distress": 6, "Dyspnoea": 5, "Asthenia": 4, "Hypertension": 4, "Blood pressure measurement": 3, "Fatigue": 3, "Tachycardia": 3, "Arthralgia": 2, "Cough": 2, "Decreased appetite": 2, "Hypotension": 2, "Myalgia": 2, "Pain": 2, "Pallor": 2, "Paraesthesia": 2, "Pruritus": 2, "Pyrexia": 2, "Sensitive skin": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Body temperature": 1, "Bradycardia": 1, "Bronchospasm": 1, "Cardiac telemetry": 1, "Chest pain": 1, "Chills": 1, "Cyanosis": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dystonia": 1, "Erythema": 1, "Febrile convulsion": 1, "Gross motor delay": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hypoventilation": 1, "Increased bronchial secretion": 1, "Inflammation": 1, "Injury": 1, "Irritability": 1, "Malaise": 1, "Mean arterial pressure": 1, "Mean arterial pressure increased": 1, "Medulloblastoma": 1, "Motor dysfunction": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Photopsia": 1, "Rash": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Rhinitis": 1, "Sensation of foreign body": 1, "Septic shock": 1, "Sinus tachycardia": 1, "Tachypnoea": 1, "Urticaria": 1, "Vaccination error": 1, "Vaccination site paraesthesia": 1, "Weight decreased": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1613", "histograms": [{"histogram": {"Dizziness": 9, "Headache": 9, "Nausea": 6, "Respiratory distress": 6, "Dyspnoea": 5, "Asthenia": 4, "Hypertension": 4, "Blood pressure measurement": 3, "Fatigue": 3, "Tachycardia": 3, "Arthralgia": 2, "Cough": 2, "Decreased appetite": 2, "Hypotension": 2, "Myalgia": 2, "Pain": 2, "Pallor": 2, "Paraesthesia": 2, "Pruritus": 2, "Pyrexia": 2, "Sensitive skin": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Body temperature": 1, "Bradycardia": 1, "Bronchospasm": 1, "Cardiac telemetry": 1, "Chest pain": 1, "Chills": 1, "Cyanosis": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dystonia": 1, "Erythema": 1, "Febrile convulsion": 1, "Gross motor delay": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Hypoventilation": 1, "Increased bronchial secretion": 1, "Inflammation": 1, "Injury": 1, "Irritability": 1, "Malaise": 1, "Mean arterial pressure": 1, "Mean arterial pressure increased": 1, "Medulloblastoma": 1, "Motor dysfunction": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Photopsia": 1, "Rash": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Rhinitis": 1, "Sensation of foreign body": 1, "Septic shock": 1, "Sinus tachycardia": 1, "Tachypnoea": 1, "Urticaria": 1, "Vaccination error": 1, "Vaccination site paraesthesia": 1, "Weight decreased": 1, "Wheezing": 1}, "batchcodes": ["FJ1613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ1618.json b/docs/data/histograms/Mexico/FJ1618.json
index f791a3c64e8..57a5f4e673e 100644
--- a/docs/data/histograms/Mexico/FJ1618.json
+++ b/docs/data/histograms/Mexico/FJ1618.json
@@ -1 +1 @@
-{"batchcode": "FJ1618", "histograms": [{"batchcodes": ["FJ1618"], "histogram": {"Pruritus": 2, "Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Induration": 1, "Inflammation": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site abscess": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1618", "histograms": [{"histogram": {"Pruritus": 2, "Abdominal pain": 1, "Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Induration": 1, "Inflammation": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Syncope": 1, "Vaccination site abscess": 1, "Vaccination site pain": 1}, "batchcodes": ["FJ1618"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ1620.json b/docs/data/histograms/Mexico/FJ1620.json
index ae811cdc646..de8fd7f3861 100644
--- a/docs/data/histograms/Mexico/FJ1620.json
+++ b/docs/data/histograms/Mexico/FJ1620.json
@@ -1 +1 @@
-{"batchcode": "FJ1620", "histograms": [{"batchcodes": ["FJ1620"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Immunisation": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1620", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Immunisation": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FJ1620"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ3002.json b/docs/data/histograms/Mexico/FJ3002.json
index 888c963b556..2667b6fdd77 100644
--- a/docs/data/histograms/Mexico/FJ3002.json
+++ b/docs/data/histograms/Mexico/FJ3002.json
@@ -1 +1 @@
-{"batchcode": "FJ3002", "histograms": [{"batchcodes": ["FJ3002"], "histogram": {"Chills": 1, "Crying": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Irritability": 1, "Oropharyngeal pain": 1, "Respiratory distress": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ3002", "histograms": [{"histogram": {"Chills": 1, "Crying": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Irritability": 1, "Oropharyngeal pain": 1, "Respiratory distress": 1, "Tachycardia": 1}, "batchcodes": ["FJ3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ5682.json b/docs/data/histograms/Mexico/FJ5682.json
index 124b641bb0b..e78668bfdf3 100644
--- a/docs/data/histograms/Mexico/FJ5682.json
+++ b/docs/data/histograms/Mexico/FJ5682.json
@@ -1 +1 @@
-{"batchcode": "FJ5682", "histograms": [{"batchcodes": ["FJ5682"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5682", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FJ5682"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ8705.json b/docs/data/histograms/Mexico/FJ8705.json
index 4be2a7dd1e1..9a64b739dcb 100644
--- a/docs/data/histograms/Mexico/FJ8705.json
+++ b/docs/data/histograms/Mexico/FJ8705.json
@@ -1 +1 @@
-{"batchcode": "FJ8705", "histograms": [{"batchcodes": ["FJ8705"], "histogram": {"Syncope": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8705", "histograms": [{"histogram": {"Syncope": 1, "Vaccination error": 1}, "batchcodes": ["FJ8705"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ8763.json b/docs/data/histograms/Mexico/FJ8763.json
index 04588e2defb..151c6cabd24 100644
--- a/docs/data/histograms/Mexico/FJ8763.json
+++ b/docs/data/histograms/Mexico/FJ8763.json
@@ -1 +1 @@
-{"batchcode": "FJ8763", "histograms": [{"batchcodes": ["FJ8763"], "histogram": {"Dizziness": 4, "Blood pressure measurement": 2, "Dyspnoea": 2, "Febrile convulsion": 2, "Respiratory distress": 2, "Seizure": 2, "Syncope": 2, "Tonic clonic movements": 2, "Body temperature": 1, "Clonus": 1, "Cognitive disorder": 1, "Coprolalia": 1, "Dysphonia": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Gallbladder injury": 1, "Gaze palsy": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Headache": 1, "Heart rate": 1, "Heat stroke": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Insomnia": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Rash vesicular": 1, "Tachycardia": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8763", "histograms": [{"histogram": {"Dizziness": 4, "Blood pressure measurement": 2, "Dyspnoea": 2, "Febrile convulsion": 2, "Respiratory distress": 2, "Seizure": 2, "Syncope": 2, "Tonic clonic movements": 2, "Body temperature": 1, "Clonus": 1, "Cognitive disorder": 1, "Coprolalia": 1, "Dysphonia": 1, "Eye movement disorder": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Gallbladder injury": 1, "Gaze palsy": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Headache": 1, "Heart rate": 1, "Heat stroke": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Insomnia": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Rash vesicular": 1, "Tachycardia": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Vomiting": 1}, "batchcodes": ["FJ8763"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ8765.json b/docs/data/histograms/Mexico/FJ8765.json
index 61f181ee1f5..bc80737edf0 100644
--- a/docs/data/histograms/Mexico/FJ8765.json
+++ b/docs/data/histograms/Mexico/FJ8765.json
@@ -1 +1 @@
-{"batchcode": "FJ8765", "histograms": [{"batchcodes": ["FJ8765"], "histogram": {"Dizziness": 13, "Asthenia": 7, "Fatigue": 7, "Arthralgia": 6, "Headache": 6, "Myalgia": 6, "Pain": 6, "Sensitive skin": 6, "Syncope": 6, "Body temperature": 4, "Dyspnoea": 4, "Nausea": 4, "Respiratory distress": 4, "Vision blurred": 3, "COVID-19": 2, "Chest pain": 2, "Drug ineffective": 2, "Hyperhidrosis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Accidental overdose": 1, "Asphyxia": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Cough": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Electrocardiogram": 1, "Erythema": 1, "Heart rate": 1, "Lymphadenopathy": 1, "Nervousness": 1, "Neurological examination": 1, "Off label use": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pericarditis": 1, "Pharyngitis": 1, "Respiratory rate": 1, "SARS-CoV-2 test negative": 1, "Tonsillar hypertrophy": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8765", "histograms": [{"histogram": {"Dizziness": 13, "Asthenia": 7, "Fatigue": 7, "Arthralgia": 6, "Headache": 6, "Myalgia": 6, "Pain": 6, "Sensitive skin": 6, "Syncope": 6, "Body temperature": 4, "Dyspnoea": 4, "Nausea": 4, "Respiratory distress": 4, "Vision blurred": 3, "COVID-19": 2, "Chest pain": 2, "Drug ineffective": 2, "Hyperhidrosis": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Accidental overdose": 1, "Asphyxia": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Cough": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Electrocardiogram": 1, "Erythema": 1, "Heart rate": 1, "Lymphadenopathy": 1, "Nervousness": 1, "Neurological examination": 1, "Off label use": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pericarditis": 1, "Pharyngitis": 1, "Respiratory rate": 1, "SARS-CoV-2 test negative": 1, "Tonsillar hypertrophy": 1, "Visual analogue scale": 1}, "batchcodes": ["FJ8765"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FJ9943.json b/docs/data/histograms/Mexico/FJ9943.json
index 10d94668d36..cf506fcd61a 100644
--- a/docs/data/histograms/Mexico/FJ9943.json
+++ b/docs/data/histograms/Mexico/FJ9943.json
@@ -1 +1 @@
-{"batchcode": "FJ9943", "histograms": [{"batchcodes": ["FJ9943"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ9943", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FJ9943"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FL3197.json b/docs/data/histograms/Mexico/FL3197.json
index e2479ab7c91..c60ae59679e 100644
--- a/docs/data/histograms/Mexico/FL3197.json
+++ b/docs/data/histograms/Mexico/FL3197.json
@@ -1 +1 @@
-{"batchcode": "FL3197", "histograms": [{"batchcodes": ["FL3197"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3197", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["FL3197"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FL3198.json b/docs/data/histograms/Mexico/FL3198.json
index cddfd498c93..b300973468d 100644
--- a/docs/data/histograms/Mexico/FL3198.json
+++ b/docs/data/histograms/Mexico/FL3198.json
@@ -1 +1 @@
-{"batchcode": "FL3198", "histograms": [{"batchcodes": ["FL3198"], "histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Irritability": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3198", "histograms": [{"histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Irritability": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["FL3198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FL3202.json b/docs/data/histograms/Mexico/FL3202.json
index 1436b038e04..08b3905a939 100644
--- a/docs/data/histograms/Mexico/FL3202.json
+++ b/docs/data/histograms/Mexico/FL3202.json
@@ -1 +1 @@
-{"batchcode": "FL3202", "histograms": [{"batchcodes": ["FL3202"], "histogram": {"Dizziness": 16, "Sensitive skin": 10, "Pain": 9, "Nausea": 8, "Asthenia": 7, "Fatigue": 7, "Headache": 7, "Tachycardia": 7, "Oropharyngeal pain": 5, "Respiratory distress": 5, "Seizure": 5, "Vomiting": 5, "Chills": 4, "Dyspnoea": 4, "Paraesthesia": 4, "Syncope": 4, "Vaccination site pain": 4, "Arthralgia": 3, "Chest pain": 3, "Crying": 3, "Myalgia": 3, "Oedema": 3, "Pruritus": 3, "Pyrexia": 3, "Vaccination site erythema": 3, "Anxiety": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Heart rate": 2, "Hypertension": 2, "Oxygen saturation": 2, "Pallor": 2, "Photopsia": 2, "Rash": 2, "Tinnitus": 2, "Vaccination error": 2, "Abdominal pain": 1, "Amaurosis": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aneurysm": 1, "Blood glucose": 1, "Blood grouping": 1, "Body temperature increased": 1, "Brain oedema": 1, "Capillary nail refill test": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Cough": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Dermatitis acneiform": 1, "Discomfort": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eyelids pruritus": 1, "Foetal movement disorder": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "Hypothermia": 1, "Incontinence": 1, "Inflammation": 1, "Investigation": 1, "Irritability": 1, "Lip oedema": 1, "Loss of consciousness": 1, "Meningitis": 1, "Micturition urgency": 1, "Musculoskeletal stiffness": 1, "Nystagmus": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Palpitations": 1, "Paralysis": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Urinary incontinence": 1, "Vascular purpura": 1, "Vision blurred": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3202", "histograms": [{"histogram": {"Dizziness": 16, "Sensitive skin": 10, "Pain": 9, "Nausea": 8, "Asthenia": 7, "Fatigue": 7, "Headache": 7, "Tachycardia": 7, "Oropharyngeal pain": 5, "Respiratory distress": 5, "Seizure": 5, "Vomiting": 5, "Chills": 4, "Dyspnoea": 4, "Paraesthesia": 4, "Syncope": 4, "Vaccination site pain": 4, "Arthralgia": 3, "Chest pain": 3, "Crying": 3, "Myalgia": 3, "Oedema": 3, "Pruritus": 3, "Pyrexia": 3, "Vaccination site erythema": 3, "Anxiety": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Heart rate": 2, "Hypertension": 2, "Oxygen saturation": 2, "Pallor": 2, "Photopsia": 2, "Rash": 2, "Tinnitus": 2, "Vaccination error": 2, "Abdominal pain": 1, "Amaurosis": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aneurysm": 1, "Blood glucose": 1, "Blood grouping": 1, "Body temperature increased": 1, "Brain oedema": 1, "Capillary nail refill test": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Cough": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Dermatitis acneiform": 1, "Discomfort": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eyelids pruritus": 1, "Foetal movement disorder": 1, "Generalised tonic-clonic seizure": 1, "Guillain-Barre syndrome": 1, "Hypothermia": 1, "Incontinence": 1, "Inflammation": 1, "Investigation": 1, "Irritability": 1, "Lip oedema": 1, "Loss of consciousness": 1, "Meningitis": 1, "Micturition urgency": 1, "Musculoskeletal stiffness": 1, "Nystagmus": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Palpitations": 1, "Paralysis": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Urinary incontinence": 1, "Vascular purpura": 1, "Vision blurred": 1, "Weight": 1}, "batchcodes": ["FL3202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FL3205.json b/docs/data/histograms/Mexico/FL3205.json
index dd804f1e067..e9e1de52f28 100644
--- a/docs/data/histograms/Mexico/FL3205.json
+++ b/docs/data/histograms/Mexico/FL3205.json
@@ -1 +1 @@
-{"batchcode": "FL3205", "histograms": [{"batchcodes": ["FL3205"], "histogram": {"Headache": 8, "Chills": 4, "Oedema": 4, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Body temperature": 3, "Dizziness": 3, "Fatigue": 3, "Inflammation": 3, "Lymphadenopathy": 3, "Nausea": 3, "Pruritus": 3, "Axillary mass": 2, "Axillary pain": 2, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Rash": 2, "Respiratory rate": 2, "Urticaria": 2, "Abdominal pain": 1, "Anal incontinence": 1, "Arthralgia": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "COVID-19": 1, "Confusional state": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Encephalitis": 1, "Erythema": 1, "Expired product administered": 1, "Exposure during pregnancy": 1, "Fall": 1, "Hepatitis": 1, "Immunisation": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1, "Off label use": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pigmentation disorder": 1, "Psychomotor hyperactivity": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sleep disorder": 1, "Syncope": 1, "Tachycardia": 1, "Urinary incontinence": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Visual analogue scale": 1, "Vomiting": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3205", "histograms": [{"histogram": {"Headache": 8, "Chills": 4, "Oedema": 4, "Pain": 4, "Sensitive skin": 4, "Asthenia": 3, "Body temperature": 3, "Dizziness": 3, "Fatigue": 3, "Inflammation": 3, "Lymphadenopathy": 3, "Nausea": 3, "Pruritus": 3, "Axillary mass": 2, "Axillary pain": 2, "Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Rash": 2, "Respiratory rate": 2, "Urticaria": 2, "Abdominal pain": 1, "Anal incontinence": 1, "Arthralgia": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "COVID-19": 1, "Confusional state": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Encephalitis": 1, "Erythema": 1, "Expired product administered": 1, "Exposure during pregnancy": 1, "Fall": 1, "Hepatitis": 1, "Immunisation": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1, "Off label use": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pigmentation disorder": 1, "Psychomotor hyperactivity": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sleep disorder": 1, "Syncope": 1, "Tachycardia": 1, "Urinary incontinence": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Visual analogue scale": 1, "Vomiting": 1, "Yellow skin": 1}, "batchcodes": ["FL3205"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FL3211.json b/docs/data/histograms/Mexico/FL3211.json
index e7acac3ba90..5c570819a33 100644
--- a/docs/data/histograms/Mexico/FL3211.json
+++ b/docs/data/histograms/Mexico/FL3211.json
@@ -1 +1 @@
-{"batchcode": "FL3211", "histograms": [{"batchcodes": ["FL3211"], "histogram": {"Vaccination error": 9, "Asthenia": 6, "Fatigue": 6, "Dizziness": 5, "Pyrexia": 4, "Body temperature": 3, "Headache": 3, "Oropharyngeal pain": 3, "Pain": 3, "Rash": 3, "Respiratory distress": 3, "Syncope": 3, "Blood pressure measurement": 2, "Dyspnoea": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Seizure": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Chills": 1, "Coma scale": 1, "Conversion disorder": 1, "Cough": 1, "Depressed level of consciousness": 1, "Erythema": 1, "Expired product administered": 1, "Facial paralysis": 1, "Generalised tonic-clonic seizure": 1, "Hyperaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Irritability": 1, "Laboratory test": 1, "Lethargy": 1, "Loss of consciousness": 1, "Myalgia": 1, "Nausea": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Pallor": 1, "Pancytopenia": 1, "Postictal state": 1, "Pruritus": 1, "Rash erythematous": 1, "Respiratory rate decreased": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Skin lesion": 1, "Somnolence": 1, "Tonic convulsion": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3211", "histograms": [{"histogram": {"Vaccination error": 9, "Asthenia": 6, "Fatigue": 6, "Dizziness": 5, "Pyrexia": 4, "Body temperature": 3, "Headache": 3, "Oropharyngeal pain": 3, "Pain": 3, "Rash": 3, "Respiratory distress": 3, "Syncope": 3, "Blood pressure measurement": 2, "Dyspnoea": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Seizure": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Chills": 1, "Coma scale": 1, "Conversion disorder": 1, "Cough": 1, "Depressed level of consciousness": 1, "Erythema": 1, "Expired product administered": 1, "Facial paralysis": 1, "Generalised tonic-clonic seizure": 1, "Hyperaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Irritability": 1, "Laboratory test": 1, "Lethargy": 1, "Loss of consciousness": 1, "Myalgia": 1, "Nausea": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Pallor": 1, "Pancytopenia": 1, "Postictal state": 1, "Pruritus": 1, "Rash erythematous": 1, "Respiratory rate decreased": 1, "Rhinorrhoea": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Skin lesion": 1, "Somnolence": 1, "Tonic convulsion": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["FL3211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FL8094.json b/docs/data/histograms/Mexico/FL8094.json
index b9aea3c8f25..10ce5086a77 100644
--- a/docs/data/histograms/Mexico/FL8094.json
+++ b/docs/data/histograms/Mexico/FL8094.json
@@ -1 +1 @@
-{"batchcode": "FL8094", "histograms": [{"batchcodes": ["FL8094"], "histogram": {"Back pain": 1, "Headache": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8094", "histograms": [{"histogram": {"Back pain": 1, "Headache": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["FL8094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FL8095.json b/docs/data/histograms/Mexico/FL8095.json
index 547a3bb292b..9e31ea1c9ee 100644
--- a/docs/data/histograms/Mexico/FL8095.json
+++ b/docs/data/histograms/Mexico/FL8095.json
@@ -1 +1 @@
-{"batchcode": "FL8095", "histograms": [{"batchcodes": ["FL8095"], "histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8095", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["FL8095"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM2934.json b/docs/data/histograms/Mexico/FM2934.json
index 77c332a33fb..6cc0a4c8631 100644
--- a/docs/data/histograms/Mexico/FM2934.json
+++ b/docs/data/histograms/Mexico/FM2934.json
@@ -1 +1 @@
-{"batchcode": "FM2934", "histograms": [{"batchcodes": ["FM2934"], "histogram": {"Body temperature increased": 1, "Dizziness": 1, "Erythema": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2934", "histograms": [{"histogram": {"Body temperature increased": 1, "Dizziness": 1, "Erythema": 1, "Inflammation": 1, "Oedema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Sensitive skin": 1, "Vaccination site haemorrhage": 1}, "batchcodes": ["FM2934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM2951.json b/docs/data/histograms/Mexico/FM2951.json
index 65a93cb517f..8778e6880d4 100644
--- a/docs/data/histograms/Mexico/FM2951.json
+++ b/docs/data/histograms/Mexico/FM2951.json
@@ -1 +1 @@
-{"batchcode": "FM2951", "histograms": [{"batchcodes": ["FM2951"], "histogram": {"Bronchospasm": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Inflammation": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Seizure": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2951", "histograms": [{"histogram": {"Bronchospasm": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Inflammation": 1, "Myalgia": 1, "Nausea": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Respiratory distress": 1, "Seizure": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["FM2951"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM2954.json b/docs/data/histograms/Mexico/FM2954.json
index ef7aa8241a4..4ace6a3c029 100644
--- a/docs/data/histograms/Mexico/FM2954.json
+++ b/docs/data/histograms/Mexico/FM2954.json
@@ -1 +1 @@
-{"batchcode": "FM2954", "histograms": [{"batchcodes": ["FM2954"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Head injury": 1, "Headache": 1, "Hypokinesia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Syncope": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2954", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Head injury": 1, "Headache": 1, "Hypokinesia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Syncope": 1, "Vaccination error": 1}, "batchcodes": ["FM2954"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM2963.json b/docs/data/histograms/Mexico/FM2963.json
index 69b39b43163..2c3c9975600 100644
--- a/docs/data/histograms/Mexico/FM2963.json
+++ b/docs/data/histograms/Mexico/FM2963.json
@@ -1 +1 @@
-{"batchcode": "FM2963", "histograms": [{"batchcodes": ["FM2963"], "histogram": {"Vaccination error": 18, "Dizziness": 12, "Asthenia": 8, "Nausea": 7, "Pain": 7, "Sensitive skin": 7, "Body temperature": 6, "Chills": 6, "Fatigue": 6, "Headache": 6, "Pyrexia": 6, "Pallor": 5, "Syncope": 5, "Vomiting": 5, "Cough": 3, "Erythema": 3, "Heart rate": 3, "Hyperhidrosis": 3, "Myalgia": 3, "Oxygen saturation": 3, "Pruritus": 3, "Seizure": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "Arthralgia": 2, "Blood pressure measurement": 2, "Body temperature increased": 2, "Depressed level of consciousness": 2, "Hypokinesia": 2, "Inflammation": 2, "Irritability": 2, "Loss of consciousness": 2, "Oedema": 2, "Oropharyngeal pain": 2, "Palmar-plantar erythrodysaesthesia syndrome": 2, "Paraesthesia": 2, "Paralysis": 2, "Rash": 2, "Tachycardia": 2, "Vertigo": 2, "Vital signs measurement": 2, "Bladder sphincterectomy": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Choluria": 1, "Contusion": 1, "Cranial nerve paralysis": 1, "Crying": 1, "Cyanosis": 1, "Decreased appetite": 1, "Deficiency of bile secretion": 1, "Diarrhoea": 1, "Diplopia": 1, "Dyspnoea": 1, "Eye contusion": 1, "Eye pain": 1, "Eyelid oedema": 1, "Fall": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Heart rate decreased": 1, "Hyperreflexia": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Jaundice": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Millard-Gubler syndrome": 1, "Muscle strength abnormal": 1, "Odynophagia": 1, "Oxygen saturation abnormal": 1, "Pain assessment": 1, "Partial seizures": 1, "Pharyngeal disorder": 1, "Pharyngitis": 1, "Physical examination": 1, "Presyncope": 1, "Respiratory rate": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 test": 1, "Skull X-ray": 1, "Somnolence": 1, "Strabismus": 1, "Tonic clonic movements": 1, "Vaccination site swelling": 1, "Visual analogue scale": 1, "Visual field defect": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2963", "histograms": [{"histogram": {"Vaccination error": 18, "Dizziness": 12, "Asthenia": 8, "Nausea": 7, "Pain": 7, "Sensitive skin": 7, "Body temperature": 6, "Chills": 6, "Fatigue": 6, "Headache": 6, "Pyrexia": 6, "Pallor": 5, "Syncope": 5, "Vomiting": 5, "Cough": 3, "Erythema": 3, "Heart rate": 3, "Hyperhidrosis": 3, "Myalgia": 3, "Oxygen saturation": 3, "Pruritus": 3, "Seizure": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "Arthralgia": 2, "Blood pressure measurement": 2, "Body temperature increased": 2, "Depressed level of consciousness": 2, "Hypokinesia": 2, "Inflammation": 2, "Irritability": 2, "Loss of consciousness": 2, "Oedema": 2, "Oropharyngeal pain": 2, "Palmar-plantar erythrodysaesthesia syndrome": 2, "Paraesthesia": 2, "Paralysis": 2, "Rash": 2, "Tachycardia": 2, "Vertigo": 2, "Vital signs measurement": 2, "Bladder sphincterectomy": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Choluria": 1, "Contusion": 1, "Cranial nerve paralysis": 1, "Crying": 1, "Cyanosis": 1, "Decreased appetite": 1, "Deficiency of bile secretion": 1, "Diarrhoea": 1, "Diplopia": 1, "Dyspnoea": 1, "Eye contusion": 1, "Eye pain": 1, "Eyelid oedema": 1, "Fall": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Guillain-Barre syndrome": 1, "Heart rate decreased": 1, "Hyperreflexia": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Jaundice": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Millard-Gubler syndrome": 1, "Muscle strength abnormal": 1, "Odynophagia": 1, "Oxygen saturation abnormal": 1, "Pain assessment": 1, "Partial seizures": 1, "Pharyngeal disorder": 1, "Pharyngitis": 1, "Physical examination": 1, "Presyncope": 1, "Respiratory rate": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 test": 1, "Skull X-ray": 1, "Somnolence": 1, "Strabismus": 1, "Tonic clonic movements": 1, "Vaccination site swelling": 1, "Visual analogue scale": 1, "Visual field defect": 1}, "batchcodes": ["FM2963"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM2967.json b/docs/data/histograms/Mexico/FM2967.json
index 440bc1cefd2..84f2461365d 100644
--- a/docs/data/histograms/Mexico/FM2967.json
+++ b/docs/data/histograms/Mexico/FM2967.json
@@ -1 +1 @@
-{"batchcode": "FM2967", "histograms": [{"batchcodes": ["FM2967"], "histogram": {"Dizziness": 5, "Vaccination error": 4, "Bronchospasm": 3, "Headache": 3, "Nausea": 3, "Syncope": 3, "Asthenia": 2, "Tachycardia": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Depressed level of consciousness": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dysstasia": 1, "Gait inability": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Mouth haemorrhage": 1, "Oxygen saturation": 1, "Photopsia": 1, "Pyrexia": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Tinnitus": 1, "Vital signs measurement": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2967", "histograms": [{"histogram": {"Dizziness": 5, "Vaccination error": 4, "Bronchospasm": 3, "Headache": 3, "Nausea": 3, "Syncope": 3, "Asthenia": 2, "Tachycardia": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Depressed level of consciousness": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dysstasia": 1, "Gait inability": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Mouth haemorrhage": 1, "Oxygen saturation": 1, "Photopsia": 1, "Pyrexia": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Tinnitus": 1, "Vital signs measurement": 1, "Vomiting": 1}, "batchcodes": ["FM2967"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM7374.json b/docs/data/histograms/Mexico/FM7374.json
index 4966e3bdeb8..dc42728ee4f 100644
--- a/docs/data/histograms/Mexico/FM7374.json
+++ b/docs/data/histograms/Mexico/FM7374.json
@@ -1 +1 @@
-{"batchcode": "FM7374", "histograms": [{"batchcodes": ["FM7374"], "histogram": {"Vaccination error": 10, "Fatigue": 6, "Headache": 6, "Asthenia": 5, "Body temperature": 5, "Dizziness": 5, "Pyrexia": 5, "Arthralgia": 4, "Diarrhoea": 4, "Myalgia": 4, "Nausea": 4, "Oropharyngeal pain": 4, "Vomiting": 4, "Hyperhidrosis": 3, "Pallor": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "Chills": 2, "Cough": 2, "Eye pain": 2, "Odynophagia": 2, "Pain": 2, "Respiratory distress": 2, "Rhinorrhoea": 2, "Seizure": 2, "Sensitive skin": 2, "Syncope": 2, "Anosmia": 1, "Ataxia": 1, "Blood glucose": 1, "Bradycardia": 1, "Bradyphrenia": 1, "Chest pain": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Faeces discoloured": 1, "Fall": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Herpes simplex": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypotension": 1, "Investigation": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mobility decreased": 1, "Nasal congestion": 1, "Nystagmus": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Paralysis": 1, "Perioral dermatitis": 1, "Slow speech": 1, "Sneezing": 1, "Somnolence": 1, "Tachycardia": 1, "Tonic clonic movements": 1, "Urinary tract infection": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7374", "histograms": [{"histogram": {"Vaccination error": 10, "Fatigue": 6, "Headache": 6, "Asthenia": 5, "Body temperature": 5, "Dizziness": 5, "Pyrexia": 5, "Arthralgia": 4, "Diarrhoea": 4, "Myalgia": 4, "Nausea": 4, "Oropharyngeal pain": 4, "Vomiting": 4, "Hyperhidrosis": 3, "Pallor": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "Chills": 2, "Cough": 2, "Eye pain": 2, "Odynophagia": 2, "Pain": 2, "Respiratory distress": 2, "Rhinorrhoea": 2, "Seizure": 2, "Sensitive skin": 2, "Syncope": 2, "Anosmia": 1, "Ataxia": 1, "Blood glucose": 1, "Bradycardia": 1, "Bradyphrenia": 1, "Chest pain": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Faeces discoloured": 1, "Fall": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Herpes simplex": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypotension": 1, "Investigation": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mobility decreased": 1, "Nasal congestion": 1, "Nystagmus": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Paralysis": 1, "Perioral dermatitis": 1, "Slow speech": 1, "Sneezing": 1, "Somnolence": 1, "Tachycardia": 1, "Tonic clonic movements": 1, "Urinary tract infection": 1, "Vision blurred": 1}, "batchcodes": ["FM7374"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM9936.json b/docs/data/histograms/Mexico/FM9936.json
index 806e9ece983..3973d2c6bb7 100644
--- a/docs/data/histograms/Mexico/FM9936.json
+++ b/docs/data/histograms/Mexico/FM9936.json
@@ -1 +1 @@
-{"batchcode": "FM9936", "histograms": [{"batchcodes": ["FM9936"], "histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Heart rate": 1, "Hypotension": 1, "Oxygen saturation": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "FM9936", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Heart rate": 1, "Hypotension": 1, "Oxygen saturation": 1, "Vaccination error": 1}, "batchcodes": ["FM9936"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FM9992.json b/docs/data/histograms/Mexico/FM9992.json
index bb3edba0748..39449664966 100644
--- a/docs/data/histograms/Mexico/FM9992.json
+++ b/docs/data/histograms/Mexico/FM9992.json
@@ -1 +1 @@
-{"batchcode": "FM9992", "histograms": [{"batchcodes": ["FM9992"], "histogram": {"COVID-19": 2, "Drug ineffective": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FM9992", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 1, "Vaccination failure": 1}, "batchcodes": ["FM9992"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FR7934.json b/docs/data/histograms/Mexico/FR7934.json
index 0c339cfae59..f5086cfc162 100644
--- a/docs/data/histograms/Mexico/FR7934.json
+++ b/docs/data/histograms/Mexico/FR7934.json
@@ -1 +1 @@
-{"batchcode": "FR7934", "histograms": [{"batchcodes": ["FR7934"], "histogram": {"Paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FR7934", "histograms": [{"histogram": {"Paralysis": 1}, "batchcodes": ["FR7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FR9896.json b/docs/data/histograms/Mexico/FR9896.json
index 18520354275..4ee6272ac50 100644
--- a/docs/data/histograms/Mexico/FR9896.json
+++ b/docs/data/histograms/Mexico/FR9896.json
@@ -1 +1 @@
-{"batchcode": "FR9896", "histograms": [{"batchcodes": ["FR9896"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FR9896", "histograms": [{"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["FR9896"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FS1613.json b/docs/data/histograms/Mexico/FS1613.json
index 8d8a5ee8175..2f0ff73dd97 100644
--- a/docs/data/histograms/Mexico/FS1613.json
+++ b/docs/data/histograms/Mexico/FS1613.json
@@ -1 +1 @@
-{"batchcode": "FS1613", "histograms": [{"batchcodes": ["FS1613"], "histogram": {"Dizziness": 1, "Febrile convulsion": 1, "Generalised tonic-clonic seizure": 1, "Incontinence": 1, "Paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FS1613", "histograms": [{"histogram": {"Dizziness": 1, "Febrile convulsion": 1, "Generalised tonic-clonic seizure": 1, "Incontinence": 1, "Paralysis": 1}, "batchcodes": ["FS1613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FT3002.json b/docs/data/histograms/Mexico/FT3002.json
index 4e271024d52..e7895f33db6 100644
--- a/docs/data/histograms/Mexico/FT3002.json
+++ b/docs/data/histograms/Mexico/FT3002.json
@@ -1 +1 @@
-{"batchcode": "FT3002", "histograms": [{"batchcodes": ["FT3002"], "histogram": {"Vaccination error": 11, "Dizziness": 6, "Headache": 6, "Heart rate": 5, "Rash": 5, "Respiratory rate": 4, "Syncope": 4, "Oxygen saturation": 3, "Asthenia": 2, "Blood pressure measurement": 2, "Febrile convulsion": 2, "Pruritus": 2, "Seizure": 2, "Tachycardia": 2, "Abdominal pain": 1, "Ataxia": 1, "Body temperature": 1, "Craniocerebral injury": 1, "Depressed level of consciousness": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid oedema": 1, "Fall": 1, "Fatigue": 1, "Flushing": 1, "Heart rate abnormal": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Hypertonia": 1, "Hypotonia": 1, "Inflammation": 1, "Irritability": 1, "Loss of consciousness": 1, "Nausea": 1, "Odynophagia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pallor": 1, "Photopsia": 1, "Rash maculo-papular": 1, "Sensitive skin": 1, "Skin lesion": 1, "Tonic convulsion": 1, "Urticaria": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FT3002", "histograms": [{"histogram": {"Vaccination error": 11, "Dizziness": 6, "Headache": 6, "Heart rate": 5, "Rash": 5, "Respiratory rate": 4, "Syncope": 4, "Oxygen saturation": 3, "Asthenia": 2, "Blood pressure measurement": 2, "Febrile convulsion": 2, "Pruritus": 2, "Seizure": 2, "Tachycardia": 2, "Abdominal pain": 1, "Ataxia": 1, "Body temperature": 1, "Craniocerebral injury": 1, "Depressed level of consciousness": 1, "Eye movement disorder": 1, "Eye pain": 1, "Eyelid oedema": 1, "Fall": 1, "Fatigue": 1, "Flushing": 1, "Heart rate abnormal": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Hypertonia": 1, "Hypotonia": 1, "Inflammation": 1, "Irritability": 1, "Loss of consciousness": 1, "Nausea": 1, "Odynophagia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pallor": 1, "Photopsia": 1, "Rash maculo-papular": 1, "Sensitive skin": 1, "Skin lesion": 1, "Tonic convulsion": 1, "Urticaria": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["FT3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FT7276.json b/docs/data/histograms/Mexico/FT7276.json
index f094bd36704..ac83e45aaca 100644
--- a/docs/data/histograms/Mexico/FT7276.json
+++ b/docs/data/histograms/Mexico/FT7276.json
@@ -1 +1 @@
-{"batchcode": "FT7276", "histograms": [{"batchcodes": ["FT7276"], "histogram": {"Off label use": 2, "Facial paralysis": 1, "Hypertension": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Ventricular extrasystoles": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FT7276", "histograms": [{"histogram": {"Off label use": 2, "Facial paralysis": 1, "Hypertension": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Ventricular extrasystoles": 1, "Vertigo": 1}, "batchcodes": ["FT7276"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FT8838.json b/docs/data/histograms/Mexico/FT8838.json
index 7cc156fcc95..5c5b436853e 100644
--- a/docs/data/histograms/Mexico/FT8838.json
+++ b/docs/data/histograms/Mexico/FT8838.json
@@ -1 +1 @@
-{"batchcode": "FT8838", "histograms": [{"batchcodes": ["FT8838"], "histogram": {"Dizziness": 2, "Dyspnoea": 2, "Respiratory distress": 2, "Chills": 1, "Headache": 1, "Hypoaesthesia": 1, "Maternal exposure during pregnancy": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FT8838", "histograms": [{"histogram": {"Dizziness": 2, "Dyspnoea": 2, "Respiratory distress": 2, "Chills": 1, "Headache": 1, "Hypoaesthesia": 1, "Maternal exposure during pregnancy": 1, "Tachycardia": 1}, "batchcodes": ["FT8838"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FW4109.json b/docs/data/histograms/Mexico/FW4109.json
index ae696717ab2..a8d9662e221 100644
--- a/docs/data/histograms/Mexico/FW4109.json
+++ b/docs/data/histograms/Mexico/FW4109.json
@@ -1 +1 @@
-{"batchcode": "FW4109", "histograms": [{"batchcodes": ["FW4109"], "histogram": {"Crying": 1, "Eye injury": 1, "Eye pain": 1, "Ocular vasculitis": 1, "Pain": 1, "Sensitisation": 1}}]}
\ No newline at end of file
+{"batchcode": "FW4109", "histograms": [{"histogram": {"Crying": 1, "Eye injury": 1, "Eye pain": 1, "Ocular vasculitis": 1, "Pain": 1, "Sensitisation": 1}, "batchcodes": ["FW4109"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/FX5096.json b/docs/data/histograms/Mexico/FX5096.json
index aadd32aac84..8e06ad21646 100644
--- a/docs/data/histograms/Mexico/FX5096.json
+++ b/docs/data/histograms/Mexico/FX5096.json
@@ -1 +1 @@
-{"batchcode": "FX5096", "histograms": [{"batchcodes": ["FX5096"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "FX5096", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Rhinorrhoea": 1}, "batchcodes": ["FX5096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/GA6772.json b/docs/data/histograms/Mexico/GA6772.json
index 19093e83d96..d02beaf488c 100644
--- a/docs/data/histograms/Mexico/GA6772.json
+++ b/docs/data/histograms/Mexico/GA6772.json
@@ -1 +1 @@
-{"batchcode": "GA6772", "histograms": [{"batchcodes": ["GA6772"], "histogram": {"Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Hyperpyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "GA6772", "histograms": [{"histogram": {"Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Hyperpyrexia": 1}, "batchcodes": ["GA6772"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/GH9702.json b/docs/data/histograms/Mexico/GH9702.json
index b3b5974dd2f..b3353b81d38 100644
--- a/docs/data/histograms/Mexico/GH9702.json
+++ b/docs/data/histograms/Mexico/GH9702.json
@@ -1 +1 @@
-{"batchcode": "GH9702", "histograms": [{"batchcodes": ["GH9702"], "histogram": {"Deep vein thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "GH9702", "histograms": [{"histogram": {"Deep vein thrombosis": 1}, "batchcodes": ["GH9702"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/GV6203.json b/docs/data/histograms/Mexico/GV6203.json
index 419b6ac8b9a..b7e80b68aee 100644
--- a/docs/data/histograms/Mexico/GV6203.json
+++ b/docs/data/histograms/Mexico/GV6203.json
@@ -1 +1 @@
-{"batchcode": "GV6203", "histograms": [{"batchcodes": ["GV6203"], "histogram": {"Bacterial infection": 1, "Ear infection": 1, "Herpes virus infection": 1}}]}
\ No newline at end of file
+{"batchcode": "GV6203", "histograms": [{"histogram": {"Bacterial infection": 1, "Ear infection": 1, "Herpes virus infection": 1}, "batchcodes": ["GV6203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/I-570821.json b/docs/data/histograms/Mexico/I-570821.json
index 18dc4b95ef2..8f685fc5462 100644
--- a/docs/data/histograms/Mexico/I-570821.json
+++ b/docs/data/histograms/Mexico/I-570821.json
@@ -1 +1 @@
-{"batchcode": "I-570821", "histograms": [{"batchcodes": ["AW0198", "I-570821"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "I-570821", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["AW0198", "I-570821"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/J3002.json b/docs/data/histograms/Mexico/J3002.json
index 07824a7526b..5e85d927710 100644
--- a/docs/data/histograms/Mexico/J3002.json
+++ b/docs/data/histograms/Mexico/J3002.json
@@ -1 +1 @@
-{"batchcode": "J3002", "histograms": [{"batchcodes": ["J3002"], "histogram": {"Body temperature": 2, "Headache": 2, "Oropharyngeal pain": 2, "Pain": 2, "Tachycardia": 2, "Asthenia": 1, "Body temperature increased": 1, "Chills": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypothermia": 1, "Loss of consciousness": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "J3002", "histograms": [{"histogram": {"Body temperature": 2, "Headache": 2, "Oropharyngeal pain": 2, "Pain": 2, "Tachycardia": 2, "Asthenia": 1, "Body temperature increased": 1, "Chills": 1, "Conjunctival hyperaemia": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypothermia": 1, "Loss of consciousness": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Rash": 1, "Respiratory distress": 1, "Rhinorrhoea": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Vomiting": 1}, "batchcodes": ["J3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/J3032.json b/docs/data/histograms/Mexico/J3032.json
index d083de25b2e..26d6a6515fd 100644
--- a/docs/data/histograms/Mexico/J3032.json
+++ b/docs/data/histograms/Mexico/J3032.json
@@ -1 +1 @@
-{"batchcode": "J3032", "histograms": [{"batchcodes": ["J3032"], "histogram": {"Cough": 1, "Inflammation": 1, "Oedema": 1, "Pharyngeal paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "J3032", "histograms": [{"histogram": {"Cough": 1, "Inflammation": 1, "Oedema": 1, "Pharyngeal paraesthesia": 1}, "batchcodes": ["J3032"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/JE3002.json b/docs/data/histograms/Mexico/JE3002.json
index cbebfce5ec7..73d6351824a 100644
--- a/docs/data/histograms/Mexico/JE3002.json
+++ b/docs/data/histograms/Mexico/JE3002.json
@@ -1 +1 @@
-{"batchcode": "JE3002", "histograms": [{"batchcodes": ["JE3002"], "histogram": {"Anxiety": 1, "Bronchospasm": 1, "Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Nervousness": 1, "Respiratory distress": 1, "Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "JE3002", "histograms": [{"histogram": {"Anxiety": 1, "Bronchospasm": 1, "Dizziness": 1, "Dyspnoea": 1, "Nausea": 1, "Nervousness": 1, "Respiratory distress": 1, "Speech disorder": 1}, "batchcodes": ["JE3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/JW3002.json b/docs/data/histograms/Mexico/JW3002.json
index 8124d14291c..7fc01e2d045 100644
--- a/docs/data/histograms/Mexico/JW3002.json
+++ b/docs/data/histograms/Mexico/JW3002.json
@@ -1 +1 @@
-{"batchcode": "JW3002", "histograms": [{"batchcodes": ["JW3002"], "histogram": {"Chills": 1, "Dizziness": 1, "Facial paralysis": 1, "Headache": 1, "Inflammation": 1, "Myalgia": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "JW3002", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Facial paralysis": 1, "Headache": 1, "Inflammation": 1, "Myalgia": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1}, "batchcodes": ["JW3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/K202102002.json b/docs/data/histograms/Mexico/K202102002.json
index 2c9d91b8d54..53a3b8d8ae0 100644
--- a/docs/data/histograms/Mexico/K202102002.json
+++ b/docs/data/histograms/Mexico/K202102002.json
@@ -1 +1 @@
-{"batchcode": "K202102002", "histograms": [{"batchcodes": ["K202102002"], "histogram": {"Abscess": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "General physical health deterioration": 1, "Headache": 1, "Inflammation": 1, "Myalgia": 1, "Oedema": 1, "Pain": 1, "Pneumonia": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory distress": 1, "SARS-CoV-2 antibody test": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "K202102002", "histograms": [{"histogram": {"Abscess": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "General physical health deterioration": 1, "Headache": 1, "Inflammation": 1, "Myalgia": 1, "Oedema": 1, "Pain": 1, "Pneumonia": 1, "Pruritus": 1, "Pyrexia": 1, "Respiratory distress": 1, "SARS-CoV-2 antibody test": 1, "Sensitive skin": 1}, "batchcodes": ["K202102002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/LEP6775.json b/docs/data/histograms/Mexico/LEP6775.json
index 645cb0963a6..8c7303a95b3 100644
--- a/docs/data/histograms/Mexico/LEP6775.json
+++ b/docs/data/histograms/Mexico/LEP6775.json
@@ -1 +1 @@
-{"batchcode": "LEP6775", "histograms": [{"batchcodes": ["LEP6775"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "LEP6775", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}, "batchcodes": ["LEP6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/MJ389.json b/docs/data/histograms/Mexico/MJ389.json
index 3ded84a9ed1..9d5c602f485 100644
--- a/docs/data/histograms/Mexico/MJ389.json
+++ b/docs/data/histograms/Mexico/MJ389.json
@@ -1 +1 @@
-{"batchcode": "MJ389", "histograms": [{"batchcodes": ["MJ389"], "histogram": {"Abscess": 1, "Erythema": 1, "Induration": 1, "Inflammation": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "MJ389", "histograms": [{"histogram": {"Abscess": 1, "Erythema": 1, "Induration": 1, "Inflammation": 1, "Nodule": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["MJ389"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/NA0224.json b/docs/data/histograms/Mexico/NA0224.json
index 90744b046bd..e437e68426d 100644
--- a/docs/data/histograms/Mexico/NA0224.json
+++ b/docs/data/histograms/Mexico/NA0224.json
@@ -1 +1 @@
-{"batchcode": "NA0224", "histograms": [{"batchcodes": ["EW2245", "NA0224"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "NA0224", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}, "batchcodes": ["EW2245", "NA0224"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/NE1198.json b/docs/data/histograms/Mexico/NE1198.json
index 0ac6bc06a2e..d7bbf241c73 100644
--- a/docs/data/histograms/Mexico/NE1198.json
+++ b/docs/data/histograms/Mexico/NE1198.json
@@ -1 +1 @@
-{"batchcode": "NE1198", "histograms": [{"batchcodes": ["NE1198"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Induration": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Pyrexia": 1, "Seizure": 1, "Sensitive skin": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "NE1198", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Induration": 1, "Nausea": 1, "Nodule": 1, "Pain": 1, "Pyrexia": 1, "Seizure": 1, "Sensitive skin": 1, "Vomiting": 1}, "batchcodes": ["NE1198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/NP0099.json b/docs/data/histograms/Mexico/NP0099.json
index ef7363db11e..09eda4f2080 100644
--- a/docs/data/histograms/Mexico/NP0099.json
+++ b/docs/data/histograms/Mexico/NP0099.json
@@ -1 +1 @@
-{"batchcode": "NP0099", "histograms": [{"batchcodes": ["NP0099"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "NP0099", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["NP0099"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/OWO206.json b/docs/data/histograms/Mexico/OWO206.json
index 33d005629ff..80e71335185 100644
--- a/docs/data/histograms/Mexico/OWO206.json
+++ b/docs/data/histograms/Mexico/OWO206.json
@@ -1 +1 @@
-{"batchcode": "OWO206", "histograms": [{"batchcodes": ["OWO206"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Body temperature": 1, "Bronchospasm": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Odynophagia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tachycardia": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "OWO206", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Body temperature": 1, "Bronchospasm": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Odynophagia": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tachycardia": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["OWO206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PA6571.json b/docs/data/histograms/Mexico/PA6571.json
index 5c82f89fc5a..19a4767d7af 100644
--- a/docs/data/histograms/Mexico/PA6571.json
+++ b/docs/data/histograms/Mexico/PA6571.json
@@ -1 +1 @@
-{"batchcode": "PA6571", "histograms": [{"batchcodes": ["PA6571"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Respiratory distress": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "PA6571", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Respiratory distress": 1, "Vaccination site reaction": 1}, "batchcodes": ["PA6571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PA9090.json b/docs/data/histograms/Mexico/PA9090.json
index 69692af2786..44b28d67d83 100644
--- a/docs/data/histograms/Mexico/PA9090.json
+++ b/docs/data/histograms/Mexico/PA9090.json
@@ -1 +1 @@
-{"batchcode": "PA9090", "histograms": [{"batchcodes": ["PA9090"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypovolaemic shock": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "PA9090", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypovolaemic shock": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Sensitive skin": 1}, "batchcodes": ["PA9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PAA156571.json b/docs/data/histograms/Mexico/PAA156571.json
index dc65f8d3e5e..227612f0c58 100644
--- a/docs/data/histograms/Mexico/PAA156571.json
+++ b/docs/data/histograms/Mexico/PAA156571.json
@@ -1 +1 @@
-{"batchcode": "PAA156571", "histograms": [{"batchcodes": ["PAA156571"], "histogram": {"Headache": 3, "Myalgia": 3, "Pain": 3, "Sensitive skin": 3, "Arthralgia": 2, "Body temperature": 2, "Nausea": 2, "Pyrexia": 2, "Anxiety": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Head discomfort": 1, "Hypotension": 1, "Inflammation": 1, "Malaise": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain assessment": 1, "Respiratory distress": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA156571", "histograms": [{"histogram": {"Headache": 3, "Myalgia": 3, "Pain": 3, "Sensitive skin": 3, "Arthralgia": 2, "Body temperature": 2, "Nausea": 2, "Pyrexia": 2, "Anxiety": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Head discomfort": 1, "Hypotension": 1, "Inflammation": 1, "Malaise": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Pain assessment": 1, "Respiratory distress": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}, "batchcodes": ["PAA156571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PAA165969.json b/docs/data/histograms/Mexico/PAA165969.json
index ead38455310..1073678693c 100644
--- a/docs/data/histograms/Mexico/PAA165969.json
+++ b/docs/data/histograms/Mexico/PAA165969.json
@@ -1 +1 @@
-{"batchcode": "PAA165969", "histograms": [{"batchcodes": ["PAA165969"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA165969", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1}, "batchcodes": ["PAA165969"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PAA173696.json b/docs/data/histograms/Mexico/PAA173696.json
index 987fc1a3012..c174f262f22 100644
--- a/docs/data/histograms/Mexico/PAA173696.json
+++ b/docs/data/histograms/Mexico/PAA173696.json
@@ -1 +1 @@
-{"batchcode": "PAA173696", "histograms": [{"batchcodes": ["PAA173696"], "histogram": {"Blood pressure measurement": 5, "Dizziness": 5, "Heart rate": 4, "Hypotension": 4, "Oxygen saturation": 4, "Nausea": 3, "Pain": 3, "Sensitive skin": 3, "Syncope": 3, "Headache": 2, "Paraesthesia": 2, "Vision blurred": 2, "Asthenia": 1, "Chills": 1, "Dehydration": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Respiratory distress": 1, "Tachycardia": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Vital signs measurement": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA173696", "histograms": [{"histogram": {"Blood pressure measurement": 5, "Dizziness": 5, "Heart rate": 4, "Hypotension": 4, "Oxygen saturation": 4, "Nausea": 3, "Pain": 3, "Sensitive skin": 3, "Syncope": 3, "Headache": 2, "Paraesthesia": 2, "Vision blurred": 2, "Asthenia": 1, "Chills": 1, "Dehydration": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Respiratory distress": 1, "Tachycardia": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Vital signs measurement": 1, "Vomiting": 1}, "batchcodes": ["PAA173696"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PAA17696.json b/docs/data/histograms/Mexico/PAA17696.json
index 779345865ef..bea343c8119 100644
--- a/docs/data/histograms/Mexico/PAA17696.json
+++ b/docs/data/histograms/Mexico/PAA17696.json
@@ -1 +1 @@
-{"batchcode": "PAA17696", "histograms": [{"batchcodes": ["PAA17696"], "histogram": {"Dizziness": 1, "Headache": 1, "Syncope": 1, "Vision blurred": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA17696", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Syncope": 1, "Vision blurred": 1, "Vital signs measurement": 1}, "batchcodes": ["PAA17696"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PAA6571.json b/docs/data/histograms/Mexico/PAA6571.json
index d630a0564fb..099d50125af 100644
--- a/docs/data/histograms/Mexico/PAA6571.json
+++ b/docs/data/histograms/Mexico/PAA6571.json
@@ -1 +1 @@
-{"batchcode": "PAA6571", "histograms": [{"batchcodes": ["PAA6571"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA6571", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Respiratory distress": 1}, "batchcodes": ["PAA6571"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PC2495.json b/docs/data/histograms/Mexico/PC2495.json
index 8e3140ffe51..854bc377194 100644
--- a/docs/data/histograms/Mexico/PC2495.json
+++ b/docs/data/histograms/Mexico/PC2495.json
@@ -1 +1 @@
-{"batchcode": "PC2495", "histograms": [{"batchcodes": ["PC2495"], "histogram": {"Inflammation": 1, "Irritability": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PC2495", "histograms": [{"histogram": {"Inflammation": 1, "Irritability": 1, "Oedema": 1, "Pain": 1, "Sensitive skin": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1}, "batchcodes": ["PC2495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PH8026.json b/docs/data/histograms/Mexico/PH8026.json
index c045b27f1b8..605f6480c10 100644
--- a/docs/data/histograms/Mexico/PH8026.json
+++ b/docs/data/histograms/Mexico/PH8026.json
@@ -1 +1 @@
-{"batchcode": "PH8026", "histograms": [{"batchcodes": ["PH8026"], "histogram": {"Asthenia": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "PH8026", "histograms": [{"histogram": {"Asthenia": 1, "Disseminated Bacillus Calmette-Guerin infection": 1, "Dizziness": 1, "Headache": 1, "Nausea": 1}, "batchcodes": ["PH8026"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/PJ8763.json b/docs/data/histograms/Mexico/PJ8763.json
index e250ec08e9e..744ffb22589 100644
--- a/docs/data/histograms/Mexico/PJ8763.json
+++ b/docs/data/histograms/Mexico/PJ8763.json
@@ -1 +1 @@
-{"batchcode": "PJ8763", "histograms": [{"batchcodes": ["PJ8763"], "histogram": {"Body temperature": 1, "Brain oedema": 1, "Computerised tomogram head": 1, "Cough": 1, "Encephalitis": 1, "Eye injury": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Pyrexia": 1, "Seizure": 1, "Status epilepticus": 1}}]}
\ No newline at end of file
+{"batchcode": "PJ8763", "histograms": [{"histogram": {"Body temperature": 1, "Brain oedema": 1, "Computerised tomogram head": 1, "Cough": 1, "Encephalitis": 1, "Eye injury": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Pyrexia": 1, "Seizure": 1, "Status epilepticus": 1}, "batchcodes": ["PJ8763"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/R21M41.json b/docs/data/histograms/Mexico/R21M41.json
index 472f676f679..ab35026438b 100644
--- a/docs/data/histograms/Mexico/R21M41.json
+++ b/docs/data/histograms/Mexico/R21M41.json
@@ -1 +1 @@
-{"batchcode": "R21M41", "histograms": [{"batchcodes": ["R21M41"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "R21M41", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["R21M41"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/R21M49.json b/docs/data/histograms/Mexico/R21M49.json
index e1349b278c9..5655eaca769 100644
--- a/docs/data/histograms/Mexico/R21M49.json
+++ b/docs/data/histograms/Mexico/R21M49.json
@@ -1 +1 @@
-{"batchcode": "R21M49", "histograms": [{"batchcodes": ["R21M49"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Gingival bleeding": 1, "Haemorrhagic disorder": 1, "Menstrual disorder": 1, "Pain": 1, "Sensitive skin": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "R21M49", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Gingival bleeding": 1, "Haemorrhagic disorder": 1, "Menstrual disorder": 1, "Pain": 1, "Sensitive skin": 1, "Vaccination error": 1}, "batchcodes": ["R21M49"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/R2OJ17.json b/docs/data/histograms/Mexico/R2OJ17.json
index 9025e12382b..e34a609c342 100644
--- a/docs/data/histograms/Mexico/R2OJ17.json
+++ b/docs/data/histograms/Mexico/R2OJ17.json
@@ -1 +1 @@
-{"batchcode": "R2OJ17", "histograms": [{"batchcodes": ["R2OJ17"], "histogram": {"Febrile convulsion": 1}}]}
\ No newline at end of file
+{"batchcode": "R2OJ17", "histograms": [{"histogram": {"Febrile convulsion": 1}, "batchcodes": ["R2OJ17"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/R9449.json b/docs/data/histograms/Mexico/R9449.json
index 6c24d5a7cc8..d60876c5df2 100644
--- a/docs/data/histograms/Mexico/R9449.json
+++ b/docs/data/histograms/Mexico/R9449.json
@@ -1 +1 @@
-{"batchcode": "R9449", "histograms": [{"batchcodes": ["R9449"], "histogram": {"Dizziness": 1, "Eye oedema": 1, "Haemorrhagic disorder": 1, "Inflammation": 1, "Livedo reticularis": 1, "Nausea": 1, "Oedema": 1, "Respiratory distress": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "R9449", "histograms": [{"histogram": {"Dizziness": 1, "Eye oedema": 1, "Haemorrhagic disorder": 1, "Inflammation": 1, "Livedo reticularis": 1, "Nausea": 1, "Oedema": 1, "Respiratory distress": 1, "Syncope": 1}, "batchcodes": ["R9449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/RA7478.json b/docs/data/histograms/Mexico/RA7478.json
index 41bd5a8c5d2..2a7f302def8 100644
--- a/docs/data/histograms/Mexico/RA7478.json
+++ b/docs/data/histograms/Mexico/RA7478.json
@@ -1 +1 @@
-{"batchcode": "RA7478", "histograms": [{"batchcodes": ["RA7478"], "histogram": {"Dizziness": 2, "Headache": 2, "Tachycardia": 2, "Chest pain": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Photopsia": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "RA7478", "histograms": [{"histogram": {"Dizziness": 2, "Headache": 2, "Tachycardia": 2, "Chest pain": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Photopsia": 1, "Sensitive skin": 1}, "batchcodes": ["RA7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/RW0195.json b/docs/data/histograms/Mexico/RW0195.json
index 2bb188c17b0..4ff6de979a4 100644
--- a/docs/data/histograms/Mexico/RW0195.json
+++ b/docs/data/histograms/Mexico/RW0195.json
@@ -1 +1 @@
-{"batchcode": "RW0195", "histograms": [{"batchcodes": ["RW0195"], "histogram": {"Dyspnoea": 1, "Erythema": 1, "Foreign body in throat": 1, "Hypertension": 1, "Rash": 1, "Respiratory distress": 1, "Sensation of foreign body": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "RW0195", "histograms": [{"histogram": {"Dyspnoea": 1, "Erythema": 1, "Foreign body in throat": 1, "Hypertension": 1, "Rash": 1, "Respiratory distress": 1, "Sensation of foreign body": 1, "Tachycardia": 1}, "batchcodes": ["RW0195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/SAQ100.json b/docs/data/histograms/Mexico/SAQ100.json
index 7e81192fe9e..a40efd94307 100644
--- a/docs/data/histograms/Mexico/SAQ100.json
+++ b/docs/data/histograms/Mexico/SAQ100.json
@@ -1 +1 @@
-{"batchcode": "SAQ100", "histograms": [{"batchcodes": ["SAQ100"], "histogram": {"Arthralgia": 3, "Asthenia": 3, "Body temperature": 3, "Chills": 3, "Fatigue": 3, "Headache": 3, "Malaise": 3, "Myalgia": 3, "Nausea": 3, "Pain": 3, "Pyrexia": 3, "Sensitive skin": 3, "Dizziness": 2, "Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "SAQ100", "histograms": [{"histogram": {"Arthralgia": 3, "Asthenia": 3, "Body temperature": 3, "Chills": 3, "Fatigue": 3, "Headache": 3, "Malaise": 3, "Myalgia": 3, "Nausea": 3, "Pain": 3, "Pyrexia": 3, "Sensitive skin": 3, "Dizziness": 2, "Diarrhoea": 1}, "batchcodes": ["SAQ100"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/SH8026.json b/docs/data/histograms/Mexico/SH8026.json
index ddd1c37deeb..95e74434b5a 100644
--- a/docs/data/histograms/Mexico/SH8026.json
+++ b/docs/data/histograms/Mexico/SH8026.json
@@ -1 +1 @@
-{"batchcode": "SH8026", "histograms": [{"batchcodes": ["SH8026"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "SH8026", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["SH8026"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/W2245.json b/docs/data/histograms/Mexico/W2245.json
index cd972af6284..9f921f063e3 100644
--- a/docs/data/histograms/Mexico/W2245.json
+++ b/docs/data/histograms/Mexico/W2245.json
@@ -1 +1 @@
-{"batchcode": "W2245", "histograms": [{"batchcodes": ["W2245"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "W2245", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Respiratory distress": 1, "Sensitive skin": 1, "Tachycardia": 1}, "batchcodes": ["W2245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Mexico/WE0206.json b/docs/data/histograms/Mexico/WE0206.json
index 0065afc15f4..c27e4f57db6 100644
--- a/docs/data/histograms/Mexico/WE0206.json
+++ b/docs/data/histograms/Mexico/WE0206.json
@@ -1 +1 @@
-{"batchcode": "WE0206", "histograms": [{"batchcodes": ["WE0206"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Hypertensive crisis": 1, "Hypotension": 1, "Monoplegia": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "WE0206", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Hypertensive crisis": 1, "Hypotension": 1, "Monoplegia": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site pain": 1}, "batchcodes": ["WE0206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Micronesia, Federated States of/FM7380.json b/docs/data/histograms/Micronesia, Federated States of/FM7380.json
index 9ccc443a53a..ebe52f0cf1d 100644
--- a/docs/data/histograms/Micronesia, Federated States of/FM7380.json
+++ b/docs/data/histograms/Micronesia, Federated States of/FM7380.json
@@ -1 +1 @@
-{"batchcode": "FM7380", "histograms": [{"batchcodes": ["FM7380"], "histogram": {"Haematochezia": 1, "Malaise": 1, "Sudden death": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7380", "histograms": [{"histogram": {"Haematochezia": 1, "Malaise": 1, "Sudden death": 1, "Vomiting": 1}, "batchcodes": ["FM7380"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/1808609.json b/docs/data/histograms/Moldova, Republic of/1808609.json
index 086942acc88..52f2bbb8b11 100644
--- a/docs/data/histograms/Moldova, Republic of/1808609.json
+++ b/docs/data/histograms/Moldova, Republic of/1808609.json
@@ -1 +1 @@
-{"batchcode": "1808609", "histograms": [{"batchcodes": ["1808609"], "histogram": {"Allergy to vaccine": 1}}]}
\ No newline at end of file
+{"batchcode": "1808609", "histograms": [{"histogram": {"Allergy to vaccine": 1}, "batchcodes": ["1808609"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/206C21A.json b/docs/data/histograms/Moldova, Republic of/206C21A.json
index b846396f9f2..5d99fdc880a 100644
--- a/docs/data/histograms/Moldova, Republic of/206C21A.json
+++ b/docs/data/histograms/Moldova, Republic of/206C21A.json
@@ -1 +1 @@
-{"batchcode": "206C21A", "histograms": [{"batchcodes": ["206C21A"], "histogram": {"Bradycardia": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "206C21A", "histograms": [{"histogram": {"Bradycardia": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["206C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/940882.json b/docs/data/histograms/Moldova, Republic of/940882.json
index 5f600a5c947..1c7f016efcd 100644
--- a/docs/data/histograms/Moldova, Republic of/940882.json
+++ b/docs/data/histograms/Moldova, Republic of/940882.json
@@ -1 +1 @@
-{"batchcode": "940882", "histograms": [{"batchcodes": ["940882"], "histogram": {"Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Laryngospasm": 1, "Myalgia": 1, "Nausea": 1, "Pruritus": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "940882", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Laryngospasm": 1, "Myalgia": 1, "Nausea": 1, "Pruritus": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site pain": 1}, "batchcodes": ["940882"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/EK9788.json b/docs/data/histograms/Moldova, Republic of/EK9788.json
index 1607fa9f4a5..f74c97bd818 100644
--- a/docs/data/histograms/Moldova, Republic of/EK9788.json
+++ b/docs/data/histograms/Moldova, Republic of/EK9788.json
@@ -1 +1 @@
-{"batchcode": "EK9788", "histograms": [{"batchcodes": ["EK9788"], "histogram": {"Anaphylactic shock": 1, "Angioedema": 1, "Peripheral swelling": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Urticaria": 1, "Urticaria chronic": 1}}]}
\ No newline at end of file
+{"batchcode": "EK9788", "histograms": [{"histogram": {"Anaphylactic shock": 1, "Angioedema": 1, "Peripheral swelling": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Urticaria": 1, "Urticaria chronic": 1}, "batchcodes": ["EK9788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/ER7440.json b/docs/data/histograms/Moldova, Republic of/ER7440.json
index 527adbec2b1..6756a86d377 100644
--- a/docs/data/histograms/Moldova, Republic of/ER7440.json
+++ b/docs/data/histograms/Moldova, Republic of/ER7440.json
@@ -1 +1 @@
-{"batchcode": "ER7440", "histograms": [{"batchcodes": ["ER7440"], "histogram": {"Death": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7440", "histograms": [{"histogram": {"Death": 1, "Loss of consciousness": 1}, "batchcodes": ["ER7440"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/ER7449.json b/docs/data/histograms/Moldova, Republic of/ER7449.json
index e5e2077b3aa..7e6f8f1bc50 100644
--- a/docs/data/histograms/Moldova, Republic of/ER7449.json
+++ b/docs/data/histograms/Moldova, Republic of/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Altered state of consciousness": 1, "Asthenia": 1, "Body temperature": 1, "Confusional state": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Nausea": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Asthenia": 1, "Body temperature": 1, "Confusional state": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Nausea": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/FA4632.json b/docs/data/histograms/Moldova, Republic of/FA4632.json
index 9097647845f..1e687600fdf 100644
--- a/docs/data/histograms/Moldova, Republic of/FA4632.json
+++ b/docs/data/histograms/Moldova, Republic of/FA4632.json
@@ -1 +1 @@
-{"batchcode": "FA4632", "histograms": [{"batchcodes": ["FA4632"], "histogram": {"Cardiac failure": 1, "Disease progression": 1, "Dizziness": 1, "Myocardial fibrosis": 1, "Myocardial ischaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "FA4632", "histograms": [{"histogram": {"Cardiac failure": 1, "Disease progression": 1, "Dizziness": 1, "Myocardial fibrosis": 1, "Myocardial ischaemia": 1}, "batchcodes": ["FA4632"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/FA7812.json b/docs/data/histograms/Moldova, Republic of/FA7812.json
index 3eafcef5976..8426570ac6d 100644
--- a/docs/data/histograms/Moldova, Republic of/FA7812.json
+++ b/docs/data/histograms/Moldova, Republic of/FA7812.json
@@ -1 +1 @@
-{"batchcode": "FA7812", "histograms": [{"batchcodes": ["FA7812"], "histogram": {"Angina pectoris": 1, "Asthenia": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood pressure measurement": 1, "Brain oedema": 1, "Cardiovascular insufficiency": 1, "Computerised tomogram": 1, "Confusional state": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Guillain-Barre syndrome": 1, "Hypertension": 1, "International normalised ratio": 1, "Investigation": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myocardial ischaemia": 1, "Neurological examination": 1, "Polyneuropathy": 1, "Pulmonary artery thrombosis": 1, "Pulmonary oedema": 1, "Quadriparesis": 1, "Renal colic": 1, "Sudden death": 1, "Urinary retention": 1, "Vertigo": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7812", "histograms": [{"histogram": {"Angina pectoris": 1, "Asthenia": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood pressure measurement": 1, "Brain oedema": 1, "Cardiovascular insufficiency": 1, "Computerised tomogram": 1, "Confusional state": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Guillain-Barre syndrome": 1, "Hypertension": 1, "International normalised ratio": 1, "Investigation": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myocardial ischaemia": 1, "Neurological examination": 1, "Polyneuropathy": 1, "Pulmonary artery thrombosis": 1, "Pulmonary oedema": 1, "Quadriparesis": 1, "Renal colic": 1, "Sudden death": 1, "Urinary retention": 1, "Vertigo": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["FA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/FG6270.json b/docs/data/histograms/Moldova, Republic of/FG6270.json
index 1be023a481a..37b669626b8 100644
--- a/docs/data/histograms/Moldova, Republic of/FG6270.json
+++ b/docs/data/histograms/Moldova, Republic of/FG6270.json
@@ -1 +1 @@
-{"batchcode": "FG6270", "histograms": [{"batchcodes": ["FG6270"], "histogram": {"Arthralgia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FG6270", "histograms": [{"histogram": {"Arthralgia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["FG6270"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Moldova, Republic of/FM3802.json b/docs/data/histograms/Moldova, Republic of/FM3802.json
index 795f0675b58..2c7ee904827 100644
--- a/docs/data/histograms/Moldova, Republic of/FM3802.json
+++ b/docs/data/histograms/Moldova, Republic of/FM3802.json
@@ -1 +1 @@
-{"batchcode": "FM3802", "histograms": [{"batchcodes": ["FM3802"], "histogram": {"Body temperature": 1, "Hyperpyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3802", "histograms": [{"histogram": {"Body temperature": 1, "Hyperpyrexia": 1}, "batchcodes": ["FM3802"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Monaco/031L20A.json b/docs/data/histograms/Monaco/031L20A.json
index be17b99ccd6..cd086d4c4a8 100644
--- a/docs/data/histograms/Monaco/031L20A.json
+++ b/docs/data/histograms/Monaco/031L20A.json
@@ -1 +1 @@
-{"batchcode": "031L20A", "histograms": [{"batchcodes": ["031L20A"], "histogram": {"Asthenia": 1, "Blood test abnormal": 1, "Chills": 1, "Cognitive disorder": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Malaise": 1, "Migraine": 1, "Nausea": 1, "Night sweats": 1, "Pain": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20A", "histograms": [{"histogram": {"Asthenia": 1, "Blood test abnormal": 1, "Chills": 1, "Cognitive disorder": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Malaise": 1, "Migraine": 1, "Nausea": 1, "Night sweats": 1, "Pain": 1, "White blood cell count increased": 1}, "batchcodes": ["031L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Monaco/EL1284.json b/docs/data/histograms/Monaco/EL1284.json
index 3989a62c9cb..585eb29476c 100644
--- a/docs/data/histograms/Monaco/EL1284.json
+++ b/docs/data/histograms/Monaco/EL1284.json
@@ -1 +1 @@
-{"batchcode": "EL1284", "histograms": [{"batchcodes": ["EL1284"], "histogram": {"Dizziness": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1284", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1}, "batchcodes": ["EL1284"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montenegro/048CZIA.json b/docs/data/histograms/Montenegro/048CZIA.json
index 699bc5de9e9..538bc83a1ea 100644
--- a/docs/data/histograms/Montenegro/048CZIA.json
+++ b/docs/data/histograms/Montenegro/048CZIA.json
@@ -1 +1 @@
-{"batchcode": "048CZIA", "histograms": [{"batchcodes": ["048CZIA"], "histogram": {"Axillary pain": 1, "Oedema peripheral": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "048CZIA", "histograms": [{"histogram": {"Axillary pain": 1, "Oedema peripheral": 1, "Pain in extremity": 1}, "batchcodes": ["048CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montenegro/050E21A.json b/docs/data/histograms/Montenegro/050E21A.json
index 8aa6883de95..89b11a0af60 100644
--- a/docs/data/histograms/Montenegro/050E21A.json
+++ b/docs/data/histograms/Montenegro/050E21A.json
@@ -1 +1 @@
-{"batchcode": "050E21A", "histograms": [{"batchcodes": ["050E21A"], "histogram": {"Cold sweat": 1, "Dizziness": 1, "Flushing": 1, "Hyperhidrosis": 1, "Tunnel vision": 1}}]}
\ No newline at end of file
+{"batchcode": "050E21A", "histograms": [{"histogram": {"Cold sweat": 1, "Dizziness": 1, "Flushing": 1, "Hyperhidrosis": 1, "Tunnel vision": 1}, "batchcodes": ["050E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montenegro/FH8469.json b/docs/data/histograms/Montenegro/FH8469.json
index 956e62bbcfa..895342bbf5e 100644
--- a/docs/data/histograms/Montenegro/FH8469.json
+++ b/docs/data/histograms/Montenegro/FH8469.json
@@ -1 +1 @@
-{"batchcode": "FH8469", "histograms": [{"batchcodes": ["FH8469"], "histogram": {"Blood pressure measurement": 1, "Hypertension": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8469", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Hypertension": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["FH8469"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montenegro/FJ5782.json b/docs/data/histograms/Montenegro/FJ5782.json
index ee1db503333..6508cfcdb26 100644
--- a/docs/data/histograms/Montenegro/FJ5782.json
+++ b/docs/data/histograms/Montenegro/FJ5782.json
@@ -1 +1 @@
-{"batchcode": "FJ5782", "histograms": [{"batchcodes": ["FJ5782"], "histogram": {"Anxiety": 1, "Blood pressure measurement": 1, "Hypotonia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5782", "histograms": [{"histogram": {"Anxiety": 1, "Blood pressure measurement": 1, "Hypotonia": 1, "Syncope": 1}, "batchcodes": ["FJ5782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montenegro/PCB0001.json b/docs/data/histograms/Montenegro/PCB0001.json
index 949bf1d059d..c27a7f07440 100644
--- a/docs/data/histograms/Montenegro/PCB0001.json
+++ b/docs/data/histograms/Montenegro/PCB0001.json
@@ -1 +1 @@
-{"batchcode": "PCB0001", "histograms": [{"batchcodes": ["PCB0001"], "histogram": {"Bronchospasm": 1, "Choking": 1, "Cough": 1, "Hyperhidrosis": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0001", "histograms": [{"histogram": {"Bronchospasm": 1, "Choking": 1, "Cough": 1, "Hyperhidrosis": 1}, "batchcodes": ["PCB0001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/001B21A.json b/docs/data/histograms/Montserrat/001B21A.json
index 307004985aa..016c65e5e97 100644
--- a/docs/data/histograms/Montserrat/001B21A.json
+++ b/docs/data/histograms/Montserrat/001B21A.json
@@ -1 +1 @@
-{"batchcode": "001B21A", "histograms": [{"batchcodes": ["001B21A"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21A", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["001B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/003B21A.json b/docs/data/histograms/Montserrat/003B21A.json
index bc53933d76c..0894d009f5c 100644
--- a/docs/data/histograms/Montserrat/003B21A.json
+++ b/docs/data/histograms/Montserrat/003B21A.json
@@ -1 +1 @@
-{"batchcode": "003B21A", "histograms": [{"batchcodes": ["003B21A"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "003B21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["003B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/007M20A.json b/docs/data/histograms/Montserrat/007M20A.json
index b807e2069c9..60128021d73 100644
--- a/docs/data/histograms/Montserrat/007M20A.json
+++ b/docs/data/histograms/Montserrat/007M20A.json
@@ -1 +1 @@
-{"batchcode": "007M20A", "histograms": [{"batchcodes": ["007M20A"], "histogram": {"Anxiety": 1, "Blood pressure increased": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A", "histograms": [{"histogram": {"Anxiety": 1, "Blood pressure increased": 1, "Headache": 1}, "batchcodes": ["007M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/012M20A.json b/docs/data/histograms/Montserrat/012M20A.json
index c3c7a23ca97..34b805647ac 100644
--- a/docs/data/histograms/Montserrat/012M20A.json
+++ b/docs/data/histograms/Montserrat/012M20A.json
@@ -1 +1 @@
-{"batchcode": "012M20A", "histograms": [{"batchcodes": ["012M20A"], "histogram": {"Cardiac monitoring": 1, "Eye irritation": 1, "Feeling jittery": 1, "Heart rate increased": 1, "Ocular hyperaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20A", "histograms": [{"histogram": {"Cardiac monitoring": 1, "Eye irritation": 1, "Feeling jittery": 1, "Heart rate increased": 1, "Ocular hyperaemia": 1}, "batchcodes": ["012M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/013M20A.json b/docs/data/histograms/Montserrat/013M20A.json
index e79255af5a9..9484f500c2b 100644
--- a/docs/data/histograms/Montserrat/013M20A.json
+++ b/docs/data/histograms/Montserrat/013M20A.json
@@ -1 +1 @@
-{"batchcode": "013M20A", "histograms": [{"batchcodes": ["013M20A"], "histogram": {"Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1}, "batchcodes": ["013M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/016B21A.json b/docs/data/histograms/Montserrat/016B21A.json
index 304e17f257d..f971ddaedf3 100644
--- a/docs/data/histograms/Montserrat/016B21A.json
+++ b/docs/data/histograms/Montserrat/016B21A.json
@@ -1 +1 @@
-{"batchcode": "016B21A", "histograms": [{"batchcodes": ["016B21A"], "histogram": {"Extra dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "016B21A", "histograms": [{"histogram": {"Extra dose administered": 1}, "batchcodes": ["016B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/019B21A.json b/docs/data/histograms/Montserrat/019B21A.json
index 3650c3f90cf..d094c8c99b2 100644
--- a/docs/data/histograms/Montserrat/019B21A.json
+++ b/docs/data/histograms/Montserrat/019B21A.json
@@ -1 +1 @@
-{"batchcode": "019B21A", "histograms": [{"batchcodes": ["019B21A"], "histogram": {"Erythema": 1, "Immediate post-injection reaction": 1, "Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "019B21A", "histograms": [{"histogram": {"Erythema": 1, "Immediate post-injection reaction": 1, "Rash": 1, "Urticaria": 1}, "batchcodes": ["019B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/020B21A.json b/docs/data/histograms/Montserrat/020B21A.json
index 4946eea7f81..22240888c26 100644
--- a/docs/data/histograms/Montserrat/020B21A.json
+++ b/docs/data/histograms/Montserrat/020B21A.json
@@ -1 +1 @@
-{"batchcode": "020B21A", "histograms": [{"batchcodes": ["020B21A"], "histogram": {"Chest pain": 1, "Oropharyngeal discomfort": 1, "Pruritus": 1, "Rash erythematous": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "020B21A", "histograms": [{"histogram": {"Chest pain": 1, "Oropharyngeal discomfort": 1, "Pruritus": 1, "Rash erythematous": 1, "Urticaria": 1}, "batchcodes": ["020B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/025L20A.json b/docs/data/histograms/Montserrat/025L20A.json
index ce9844d29de..123af172799 100644
--- a/docs/data/histograms/Montserrat/025L20A.json
+++ b/docs/data/histograms/Montserrat/025L20A.json
@@ -1 +1 @@
-{"batchcode": "025L20A", "histograms": [{"batchcodes": ["025L20A"], "histogram": {"Dysarthria": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Nausea": 1, "Neurological symptom": 1, "Pain of skin": 1, "Tongue paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "025L20A", "histograms": [{"histogram": {"Dysarthria": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Nausea": 1, "Neurological symptom": 1, "Pain of skin": 1, "Tongue paralysis": 1}, "batchcodes": ["025L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/026B21A.json b/docs/data/histograms/Montserrat/026B21A.json
index e3762e5b855..74cbe6bc2e5 100644
--- a/docs/data/histograms/Montserrat/026B21A.json
+++ b/docs/data/histograms/Montserrat/026B21A.json
@@ -1 +1 @@
-{"batchcode": "026B21A", "histograms": [{"batchcodes": ["026B21A"], "histogram": {"Hypoaesthesia oral": 1, "Paraesthesia": 1, "Pharyngeal hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "026B21A", "histograms": [{"histogram": {"Hypoaesthesia oral": 1, "Paraesthesia": 1, "Pharyngeal hypoaesthesia": 1}, "batchcodes": ["026B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/031B21A.json b/docs/data/histograms/Montserrat/031B21A.json
index 12cf3180d9c..54826a6775b 100644
--- a/docs/data/histograms/Montserrat/031B21A.json
+++ b/docs/data/histograms/Montserrat/031B21A.json
@@ -1 +1 @@
-{"batchcode": "031B21A", "histograms": [{"batchcodes": ["031B21A"], "histogram": {"Dizziness": 2, "Pallor": 2, "Anxiety": 1, "Erythema": 1, "Feeling abnormal": 1, "Hypertension": 1, "Hypoacusis": 1, "Immediate post-injection reaction": 1, "Injection site paraesthesia": 1, "Paraesthesia": 1, "Pulse abnormal": 1, "Tremor": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21A", "histograms": [{"histogram": {"Dizziness": 2, "Pallor": 2, "Anxiety": 1, "Erythema": 1, "Feeling abnormal": 1, "Hypertension": 1, "Hypoacusis": 1, "Immediate post-injection reaction": 1, "Injection site paraesthesia": 1, "Paraesthesia": 1, "Pulse abnormal": 1, "Tremor": 1, "Vital signs measurement": 1}, "batchcodes": ["031B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/031L20A.json b/docs/data/histograms/Montserrat/031L20A.json
index 7ac71aae3bf..062cef9f5b9 100644
--- a/docs/data/histograms/Montserrat/031L20A.json
+++ b/docs/data/histograms/Montserrat/031L20A.json
@@ -1 +1 @@
-{"batchcode": "031L20A", "histograms": [{"batchcodes": ["031L20A"], "histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Paraesthesia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Paraesthesia": 1, "Vision blurred": 1}, "batchcodes": ["031L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/031M00A.json b/docs/data/histograms/Montserrat/031M00A.json
index 633f46e97fb..acbbec5a15c 100644
--- a/docs/data/histograms/Montserrat/031M00A.json
+++ b/docs/data/histograms/Montserrat/031M00A.json
@@ -1 +1 @@
-{"batchcode": "031M00A", "histograms": [{"batchcodes": ["031M00A"], "histogram": {"Eye swelling": 1, "Flushing": 1}}]}
\ No newline at end of file
+{"batchcode": "031M00A", "histograms": [{"histogram": {"Eye swelling": 1, "Flushing": 1}, "batchcodes": ["031M00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/031M20A.json b/docs/data/histograms/Montserrat/031M20A.json
index ac7fa512b7f..8f74dc7eacd 100644
--- a/docs/data/histograms/Montserrat/031M20A.json
+++ b/docs/data/histograms/Montserrat/031M20A.json
@@ -1 +1 @@
-{"batchcode": "031M20A", "histograms": [{"batchcodes": ["031M20A"], "histogram": {"Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A", "histograms": [{"histogram": {"Palpitations": 1}, "batchcodes": ["031M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/032L20A.json b/docs/data/histograms/Montserrat/032L20A.json
index a7f26a1b100..b8e9ed8bddc 100644
--- a/docs/data/histograms/Montserrat/032L20A.json
+++ b/docs/data/histograms/Montserrat/032L20A.json
@@ -1 +1 @@
-{"batchcode": "032L20A", "histograms": [{"batchcodes": ["032L20A"], "histogram": {"Cardiac arrest": 1, "Death": 1, "Pulseless electrical activity": 1, "Resuscitation": 1, "Syncope": 1, "Ventricular fibrillation": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20A", "histograms": [{"histogram": {"Cardiac arrest": 1, "Death": 1, "Pulseless electrical activity": 1, "Resuscitation": 1, "Syncope": 1, "Ventricular fibrillation": 1}, "batchcodes": ["032L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/036A21A.json b/docs/data/histograms/Montserrat/036A21A.json
index acf39c9050b..4ad49bed607 100644
--- a/docs/data/histograms/Montserrat/036A21A.json
+++ b/docs/data/histograms/Montserrat/036A21A.json
@@ -1 +1 @@
-{"batchcode": "036A21A", "histograms": [{"batchcodes": ["036A21A"], "histogram": {"Anxiety": 1, "Chest pain": 1, "Dysphemia": 1, "Headache": 1, "Tremor": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "036A21A", "histograms": [{"histogram": {"Anxiety": 1, "Chest pain": 1, "Dysphemia": 1, "Headache": 1, "Tremor": 1, "Vital signs measurement": 1}, "batchcodes": ["036A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/037K20A.json b/docs/data/histograms/Montserrat/037K20A.json
index 263a20a403d..5a9576fc270 100644
--- a/docs/data/histograms/Montserrat/037K20A.json
+++ b/docs/data/histograms/Montserrat/037K20A.json
@@ -1 +1 @@
-{"batchcode": "037K20A", "histograms": [{"batchcodes": ["037K20A"], "histogram": {"Erythema": 1, "Hot flush": 1, "Nervousness": 1}}]}
\ No newline at end of file
+{"batchcode": "037K20A", "histograms": [{"histogram": {"Erythema": 1, "Hot flush": 1, "Nervousness": 1}, "batchcodes": ["037K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/041420A.json b/docs/data/histograms/Montserrat/041420A.json
index d09a74f1356..e2bf86738fb 100644
--- a/docs/data/histograms/Montserrat/041420A.json
+++ b/docs/data/histograms/Montserrat/041420A.json
@@ -1 +1 @@
-{"batchcode": "041420A", "histograms": [{"batchcodes": ["041420A"], "histogram": {"Chest discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "041420A", "histograms": [{"histogram": {"Chest discomfort": 1}, "batchcodes": ["041420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/041L20A.json b/docs/data/histograms/Montserrat/041L20A.json
index ce1c2d54844..c33655beab7 100644
--- a/docs/data/histograms/Montserrat/041L20A.json
+++ b/docs/data/histograms/Montserrat/041L20A.json
@@ -1 +1 @@
-{"batchcode": "041L20A", "histograms": [{"batchcodes": ["041L20A"], "histogram": {"Dyspnoea": 2, "Anxiety": 1, "Breath sounds abnormal": 1, "Cough": 1, "Cyanosis": 1, "Death": 1, "Dizziness": 1, "Fall": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myocardial infarction": 1, "Nausea": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "041L20A", "histograms": [{"histogram": {"Dyspnoea": 2, "Anxiety": 1, "Breath sounds abnormal": 1, "Cough": 1, "Cyanosis": 1, "Death": 1, "Dizziness": 1, "Fall": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myocardial infarction": 1, "Nausea": 1, "No adverse event": 1}, "batchcodes": ["041L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/042L20A.json b/docs/data/histograms/Montserrat/042L20A.json
index dc35bcd3418..9836b5aa0ec 100644
--- a/docs/data/histograms/Montserrat/042L20A.json
+++ b/docs/data/histograms/Montserrat/042L20A.json
@@ -1 +1 @@
-{"batchcode": "042L20A", "histograms": [{"batchcodes": ["042L20A"], "histogram": {"Rash": 1, "Rash erythematous": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "042L20A", "histograms": [{"histogram": {"Rash": 1, "Rash erythematous": 1, "Skin warm": 1}, "batchcodes": ["042L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/044A21A.json b/docs/data/histograms/Montserrat/044A21A.json
index f7dfb33ae88..a99796403ee 100644
--- a/docs/data/histograms/Montserrat/044A21A.json
+++ b/docs/data/histograms/Montserrat/044A21A.json
@@ -1 +1 @@
-{"batchcode": "044A21A", "histograms": [{"batchcodes": ["044A21A"], "histogram": {"Cold sweat": 1, "Fatigue": 1, "Headache": 1, "Musculoskeletal stiffness": 1, "Nervousness": 1}}]}
\ No newline at end of file
+{"batchcode": "044A21A", "histograms": [{"histogram": {"Cold sweat": 1, "Fatigue": 1, "Headache": 1, "Musculoskeletal stiffness": 1, "Nervousness": 1}, "batchcodes": ["044A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/045A21A.json b/docs/data/histograms/Montserrat/045A21A.json
index 821054faceb..a55197d1ec7 100644
--- a/docs/data/histograms/Montserrat/045A21A.json
+++ b/docs/data/histograms/Montserrat/045A21A.json
@@ -1 +1 @@
-{"batchcode": "045A21A", "histograms": [{"batchcodes": ["045A21A"], "histogram": {"Sensation of foreign body": 1, "Vaccine positive rechallenge": 1}}]}
\ No newline at end of file
+{"batchcode": "045A21A", "histograms": [{"histogram": {"Sensation of foreign body": 1, "Vaccine positive rechallenge": 1}, "batchcodes": ["045A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/051L209.json b/docs/data/histograms/Montserrat/051L209.json
index 06fc31a49db..9b11ffafebe 100644
--- a/docs/data/histograms/Montserrat/051L209.json
+++ b/docs/data/histograms/Montserrat/051L209.json
@@ -1 +1 @@
-{"batchcode": "051L209", "histograms": [{"batchcodes": ["051L209"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "051L209", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["051L209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/1805020.json b/docs/data/histograms/Montserrat/1805020.json
index 4a0a1cf79f8..d8ff7ffd099 100644
--- a/docs/data/histograms/Montserrat/1805020.json
+++ b/docs/data/histograms/Montserrat/1805020.json
@@ -1 +1 @@
-{"batchcode": "1805020", "histograms": [{"batchcodes": ["1805020"], "histogram": {"Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "1805020", "histograms": [{"histogram": {"Somnolence": 1}, "batchcodes": ["1805020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EL 9269.json b/docs/data/histograms/Montserrat/EL 9269.json
index 610338d5d47..b731060f852 100644
--- a/docs/data/histograms/Montserrat/EL 9269.json
+++ b/docs/data/histograms/Montserrat/EL 9269.json
@@ -1 +1 @@
-{"batchcode": "EL 9269", "histograms": [{"batchcodes": ["EL 9269"], "histogram": {"Heart rate increased": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EL 9269", "histograms": [{"histogram": {"Heart rate increased": 1, "Vertigo": 1}, "batchcodes": ["EL 9269"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EL7269.json b/docs/data/histograms/Montserrat/EL7269.json
index b053d9dd0db..0277352985b 100644
--- a/docs/data/histograms/Montserrat/EL7269.json
+++ b/docs/data/histograms/Montserrat/EL7269.json
@@ -1 +1 @@
-{"batchcode": "EL7269", "histograms": [{"batchcodes": ["EL7269"], "histogram": {"Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "EL7269", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["EL7269"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EL8982.json b/docs/data/histograms/Montserrat/EL8982.json
index 2b6f7b230e6..5d5d4c5b499 100644
--- a/docs/data/histograms/Montserrat/EL8982.json
+++ b/docs/data/histograms/Montserrat/EL8982.json
@@ -1 +1 @@
-{"batchcode": "EL8982", "histograms": [{"batchcodes": ["EL8982"], "histogram": {"Feeling hot": 2, "Tremor": 2, "Burning sensation": 1, "Dizziness": 1, "Erythema": 1, "Flushing": 1, "Hypoaesthesia oral": 1, "Nausea": 1, "Nervousness": 1, "Paraesthesia": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "EL8982", "histograms": [{"histogram": {"Feeling hot": 2, "Tremor": 2, "Burning sensation": 1, "Dizziness": 1, "Erythema": 1, "Flushing": 1, "Hypoaesthesia oral": 1, "Nausea": 1, "Nervousness": 1, "Paraesthesia": 1, "Rash pruritic": 1}, "batchcodes": ["EL8982"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EL9265.json b/docs/data/histograms/Montserrat/EL9265.json
index cccf1898925..4df72d29d82 100644
--- a/docs/data/histograms/Montserrat/EL9265.json
+++ b/docs/data/histograms/Montserrat/EL9265.json
@@ -1 +1 @@
-{"batchcode": "EL9265", "histograms": [{"batchcodes": ["EL9265"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9265", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["EL9265"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EL9266.json b/docs/data/histograms/Montserrat/EL9266.json
index 1755390e84d..50aa71befa5 100644
--- a/docs/data/histograms/Montserrat/EL9266.json
+++ b/docs/data/histograms/Montserrat/EL9266.json
@@ -1 +1 @@
-{"batchcode": "EL9266", "histograms": [{"batchcodes": ["EL9266"], "histogram": {"Dyspnoea": 2, "Chest discomfort": 1, "Hypoaesthesia oral": 1, "Paraesthesia oral": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9266", "histograms": [{"histogram": {"Dyspnoea": 2, "Chest discomfort": 1, "Hypoaesthesia oral": 1, "Paraesthesia oral": 1, "Swollen tongue": 1}, "batchcodes": ["EL9266"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EL9269.json b/docs/data/histograms/Montserrat/EL9269.json
index bef9239b60a..15293ef5b53 100644
--- a/docs/data/histograms/Montserrat/EL9269.json
+++ b/docs/data/histograms/Montserrat/EL9269.json
@@ -1 +1 @@
-{"batchcode": "EL9269", "histograms": [{"batchcodes": ["EL9269"], "histogram": {"Palpitations": 2, "Anxiety": 1, "Dyspnoea": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9269", "histograms": [{"histogram": {"Palpitations": 2, "Anxiety": 1, "Dyspnoea": 1, "Tremor": 1}, "batchcodes": ["EL9269"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EM9810.json b/docs/data/histograms/Montserrat/EM9810.json
index a506ebe8d21..7f492efc469 100644
--- a/docs/data/histograms/Montserrat/EM9810.json
+++ b/docs/data/histograms/Montserrat/EM9810.json
@@ -1 +1 @@
-{"batchcode": "EM9810", "histograms": [{"batchcodes": ["EM9810"], "histogram": {"Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9810", "histograms": [{"histogram": {"Pruritus": 1}, "batchcodes": ["EM9810"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN0171.json b/docs/data/histograms/Montserrat/EN0171.json
index 5cfea4c4c19..53cedde8dac 100644
--- a/docs/data/histograms/Montserrat/EN0171.json
+++ b/docs/data/histograms/Montserrat/EN0171.json
@@ -1 +1 @@
-{"batchcode": "EN0171", "histograms": [{"batchcodes": ["EN0171"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EN0171", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["EN0171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN5318.json b/docs/data/histograms/Montserrat/EN5318.json
index 91b149d46fe..40cfc216c98 100644
--- a/docs/data/histograms/Montserrat/EN5318.json
+++ b/docs/data/histograms/Montserrat/EN5318.json
@@ -1 +1 @@
-{"batchcode": "EN5318", "histograms": [{"batchcodes": ["EN5318"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "EN5318", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["EN5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN6198.json b/docs/data/histograms/Montserrat/EN6198.json
index ec5f33f53f9..3218b284266 100644
--- a/docs/data/histograms/Montserrat/EN6198.json
+++ b/docs/data/histograms/Montserrat/EN6198.json
@@ -1 +1 @@
-{"batchcode": "EN6198", "histograms": [{"batchcodes": ["EN6198"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6198", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["EN6198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN6201.json b/docs/data/histograms/Montserrat/EN6201.json
index 985d2a9013c..3fe67c3d615 100644
--- a/docs/data/histograms/Montserrat/EN6201.json
+++ b/docs/data/histograms/Montserrat/EN6201.json
@@ -1 +1 @@
-{"batchcode": "EN6201", "histograms": [{"batchcodes": ["EN6201"], "histogram": {"Anxiety": 1, "Dizziness": 1, "Dysgeusia": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6201", "histograms": [{"histogram": {"Anxiety": 1, "Dizziness": 1, "Dysgeusia": 1}, "batchcodes": ["EN6201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN6205.json b/docs/data/histograms/Montserrat/EN6205.json
index ef86bb93344..516e488a831 100644
--- a/docs/data/histograms/Montserrat/EN6205.json
+++ b/docs/data/histograms/Montserrat/EN6205.json
@@ -1 +1 @@
-{"batchcode": "EN6205", "histograms": [{"batchcodes": ["EN6205"], "histogram": {"Hypoaesthesia oral": 1, "Lip swelling": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6205", "histograms": [{"histogram": {"Hypoaesthesia oral": 1, "Lip swelling": 1, "Throat tightness": 1}, "batchcodes": ["EN6205"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN6207.json b/docs/data/histograms/Montserrat/EN6207.json
index 72af7db5ca6..94f1bed64f1 100644
--- a/docs/data/histograms/Montserrat/EN6207.json
+++ b/docs/data/histograms/Montserrat/EN6207.json
@@ -1 +1 @@
-{"batchcode": "EN6207", "histograms": [{"batchcodes": ["EN6207"], "histogram": {"Dizziness": 2, "Feeling abnormal": 2, "Paraesthesia oral": 2, "Chest discomfort": 1, "Loss of consciousness": 1, "Musculoskeletal discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6207", "histograms": [{"histogram": {"Dizziness": 2, "Feeling abnormal": 2, "Paraesthesia oral": 2, "Chest discomfort": 1, "Loss of consciousness": 1, "Musculoskeletal discomfort": 1}, "batchcodes": ["EN6207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN6208.json b/docs/data/histograms/Montserrat/EN6208.json
index eb0915d7f13..828ba366bfc 100644
--- a/docs/data/histograms/Montserrat/EN6208.json
+++ b/docs/data/histograms/Montserrat/EN6208.json
@@ -1 +1 @@
-{"batchcode": "EN6208", "histograms": [{"batchcodes": ["EN6208"], "histogram": {"Aphasia": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Flushing": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6208", "histograms": [{"histogram": {"Aphasia": 1, "Depressed level of consciousness": 1, "Dyspnoea": 1, "Flushing": 1}, "batchcodes": ["EN6208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN6808.json b/docs/data/histograms/Montserrat/EN6808.json
index 195f1e413b3..70e9eb21515 100644
--- a/docs/data/histograms/Montserrat/EN6808.json
+++ b/docs/data/histograms/Montserrat/EN6808.json
@@ -1 +1 @@
-{"batchcode": "EN6808", "histograms": [{"batchcodes": ["EN6808"], "histogram": {"Dysphagia": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6808", "histograms": [{"histogram": {"Dysphagia": 1, "Throat tightness": 1}, "batchcodes": ["EN6808"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN8731.json b/docs/data/histograms/Montserrat/EN8731.json
index e8b4af591dc..a56d1fc4066 100644
--- a/docs/data/histograms/Montserrat/EN8731.json
+++ b/docs/data/histograms/Montserrat/EN8731.json
@@ -1 +1 @@
-{"batchcode": "EN8731", "histograms": [{"batchcodes": ["EN8731"], "histogram": {"Injection site reaction": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EN8731", "histograms": [{"histogram": {"Injection site reaction": 1, "Urticaria": 1}, "batchcodes": ["EN8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EN9581.json b/docs/data/histograms/Montserrat/EN9581.json
index a5d7e6458ad..7e77eaafd94 100644
--- a/docs/data/histograms/Montserrat/EN9581.json
+++ b/docs/data/histograms/Montserrat/EN9581.json
@@ -1 +1 @@
-{"batchcode": "EN9581", "histograms": [{"batchcodes": ["EN9581"], "histogram": {"Feeling abnormal": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "EN9581", "histograms": [{"histogram": {"Feeling abnormal": 1, "Nausea": 1}, "batchcodes": ["EN9581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/ENC6198.json b/docs/data/histograms/Montserrat/ENC6198.json
index 4b017efd3f3..4f2041db676 100644
--- a/docs/data/histograms/Montserrat/ENC6198.json
+++ b/docs/data/histograms/Montserrat/ENC6198.json
@@ -1 +1 @@
-{"batchcode": "ENC6198", "histograms": [{"batchcodes": ["ENC6198"], "histogram": {"Chest discomfort": 1, "Cough": 1}}]}
\ No newline at end of file
+{"batchcode": "ENC6198", "histograms": [{"histogram": {"Chest discomfort": 1, "Cough": 1}, "batchcodes": ["ENC6198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EP6955.json b/docs/data/histograms/Montserrat/EP6955.json
index dedf2ad7822..18a9106564d 100644
--- a/docs/data/histograms/Montserrat/EP6955.json
+++ b/docs/data/histograms/Montserrat/EP6955.json
@@ -1 +1 @@
-{"batchcode": "EP6955", "histograms": [{"batchcodes": ["EP6955"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6955", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["EP6955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EP7534.json b/docs/data/histograms/Montserrat/EP7534.json
index 5c902aa49bd..d151f4d0c5a 100644
--- a/docs/data/histograms/Montserrat/EP7534.json
+++ b/docs/data/histograms/Montserrat/EP7534.json
@@ -1 +1 @@
-{"batchcode": "EP7534", "histograms": [{"batchcodes": ["EP7534"], "histogram": {"Asthenia": 1, "Confusional state": 1, "Disorientation": 1, "Dizziness": 1, "Electrocardiogram": 1, "Flushing": 1, "Hyperhidrosis": 1, "Nausea": 1, "Palpitations": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EP7534", "histograms": [{"histogram": {"Asthenia": 1, "Confusional state": 1, "Disorientation": 1, "Dizziness": 1, "Electrocardiogram": 1, "Flushing": 1, "Hyperhidrosis": 1, "Nausea": 1, "Palpitations": 1, "Tremor": 1}, "batchcodes": ["EP7534"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/ER8731.json b/docs/data/histograms/Montserrat/ER8731.json
index c24c0b4fc1a..c0a929ff82f 100644
--- a/docs/data/histograms/Montserrat/ER8731.json
+++ b/docs/data/histograms/Montserrat/ER8731.json
@@ -1 +1 @@
-{"batchcode": "ER8731", "histograms": [{"batchcodes": ["ER8731"], "histogram": {"Injection site urticaria": 1, "Interchange of vaccine products": 1, "No adverse event": 1, "Panic attack": 1, "Paraesthesia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8731", "histograms": [{"histogram": {"Injection site urticaria": 1, "Interchange of vaccine products": 1, "No adverse event": 1, "Panic attack": 1, "Paraesthesia": 1, "Urticaria": 1}, "batchcodes": ["ER8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/ER8732.json b/docs/data/histograms/Montserrat/ER8732.json
index bddeb6393ca..4069390a0e6 100644
--- a/docs/data/histograms/Montserrat/ER8732.json
+++ b/docs/data/histograms/Montserrat/ER8732.json
@@ -1 +1 @@
-{"batchcode": "ER8732", "histograms": [{"batchcodes": ["ER8732"], "histogram": {"Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Intercepted product dispensing error": 1, "Laboratory test": 1, "Nervousness": 1, "Pallor": 1, "Scan": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8732", "histograms": [{"histogram": {"Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Intercepted product dispensing error": 1, "Laboratory test": 1, "Nervousness": 1, "Pallor": 1, "Scan": 1}, "batchcodes": ["ER8732"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/ER8733.json b/docs/data/histograms/Montserrat/ER8733.json
index dd18679d102..15d533e775b 100644
--- a/docs/data/histograms/Montserrat/ER8733.json
+++ b/docs/data/histograms/Montserrat/ER8733.json
@@ -1 +1 @@
-{"batchcode": "ER8733", "histograms": [{"batchcodes": ["ER8733"], "histogram": {"Blood test": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Injection site haemorrhage": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Panic attack": 1, "Panic reaction": 1, "Paraesthesia": 1, "Swelling face": 1, "Throat clearing": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8733", "histograms": [{"histogram": {"Blood test": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Injection site haemorrhage": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Panic attack": 1, "Panic reaction": 1, "Paraesthesia": 1, "Swelling face": 1, "Throat clearing": 1, "Urine analysis": 1}, "batchcodes": ["ER8733"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EW01161.json b/docs/data/histograms/Montserrat/EW01161.json
index 762c92cc98d..0ee2c06ae11 100644
--- a/docs/data/histograms/Montserrat/EW01161.json
+++ b/docs/data/histograms/Montserrat/EW01161.json
@@ -1 +1 @@
-{"batchcode": "EW01161", "histograms": [{"batchcodes": ["EW01161"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "EW01161", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["EW01161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EW0151.json b/docs/data/histograms/Montserrat/EW0151.json
index a11dc1b847c..b41498e50f9 100644
--- a/docs/data/histograms/Montserrat/EW0151.json
+++ b/docs/data/histograms/Montserrat/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood glucose normal": 1, "Cough": 1, "Fall": 1, "Fear": 1, "Feeling jittery": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Blood glucose normal": 1, "Cough": 1, "Fall": 1, "Fear": 1, "Feeling jittery": 1, "Neck pain": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EW0153.json b/docs/data/histograms/Montserrat/EW0153.json
index 537faf78895..14e1f59ea1e 100644
--- a/docs/data/histograms/Montserrat/EW0153.json
+++ b/docs/data/histograms/Montserrat/EW0153.json
@@ -1 +1 @@
-{"batchcode": "EW0153", "histograms": [{"batchcodes": ["EW0153"], "histogram": {"Cold sweat": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0153", "histograms": [{"histogram": {"Cold sweat": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Nausea": 1}, "batchcodes": ["EW0153"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EW0161.json b/docs/data/histograms/Montserrat/EW0161.json
index 978a762591b..3e96595340b 100644
--- a/docs/data/histograms/Montserrat/EW0161.json
+++ b/docs/data/histograms/Montserrat/EW0161.json
@@ -1 +1 @@
-{"batchcode": "EW0161", "histograms": [{"batchcodes": ["EW0161"], "histogram": {"Anxiety": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Headache": 1, "Immediate post-injection reaction": 1, "Photophobia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0161", "histograms": [{"histogram": {"Anxiety": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Headache": 1, "Immediate post-injection reaction": 1, "Photophobia": 1}, "batchcodes": ["EW0161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EW0175.json b/docs/data/histograms/Montserrat/EW0175.json
index df428886fab..1e17623fb05 100644
--- a/docs/data/histograms/Montserrat/EW0175.json
+++ b/docs/data/histograms/Montserrat/EW0175.json
@@ -1 +1 @@
-{"batchcode": "EW0175", "histograms": [{"batchcodes": ["EW0175"], "histogram": {"Product preparation issue": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0175", "histograms": [{"histogram": {"Product preparation issue": 1}, "batchcodes": ["EW0175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/EW0187.json b/docs/data/histograms/Montserrat/EW0187.json
index 44f4af810d7..fb76de45a9b 100644
--- a/docs/data/histograms/Montserrat/EW0187.json
+++ b/docs/data/histograms/Montserrat/EW0187.json
@@ -1 +1 @@
-{"batchcode": "EW0187", "histograms": [{"batchcodes": ["EW0187"], "histogram": {"Blood urea decreased": 1, "Chest pain": 1, "Echocardiogram normal": 1, "Electrocardiogram normal": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0187", "histograms": [{"histogram": {"Blood urea decreased": 1, "Chest pain": 1, "Echocardiogram normal": 1, "Electrocardiogram normal": 1, "Troponin": 1}, "batchcodes": ["EW0187"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/FA6780.json b/docs/data/histograms/Montserrat/FA6780.json
index 06716137b6d..4e108705943 100644
--- a/docs/data/histograms/Montserrat/FA6780.json
+++ b/docs/data/histograms/Montserrat/FA6780.json
@@ -1 +1 @@
-{"batchcode": "FA6780", "histograms": [{"batchcodes": ["FA6780"], "histogram": {"Cardioversion": 1, "Chest X-ray abnormal": 1, "Death": 1, "Endotracheal intubation": 1, "Heart rate irregular": 1, "Hyperkalaemia": 1, "Influenza": 1, "Mental status changes": 1, "Pneumonia": 1, "Pulse absent": 1, "Respiratory rate decreased": 1, "Sepsis": 1, "Unresponsive to stimuli": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FA6780", "histograms": [{"histogram": {"Cardioversion": 1, "Chest X-ray abnormal": 1, "Death": 1, "Endotracheal intubation": 1, "Heart rate irregular": 1, "Hyperkalaemia": 1, "Influenza": 1, "Mental status changes": 1, "Pneumonia": 1, "Pulse absent": 1, "Respiratory rate decreased": 1, "Sepsis": 1, "Unresponsive to stimuli": 1, "White blood cell count increased": 1}, "batchcodes": ["FA6780"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/FD0809.json b/docs/data/histograms/Montserrat/FD0809.json
index f58e4caf60b..e78e6099119 100644
--- a/docs/data/histograms/Montserrat/FD0809.json
+++ b/docs/data/histograms/Montserrat/FD0809.json
@@ -1 +1 @@
-{"batchcode": "FD0809", "histograms": [{"batchcodes": ["FD0809"], "histogram": {"Interchange of vaccine products": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0809", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "No adverse event": 1}, "batchcodes": ["FD0809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Montserrat/FE3594.json b/docs/data/histograms/Montserrat/FE3594.json
index ba49fa1d4c0..7e583baa4c6 100644
--- a/docs/data/histograms/Montserrat/FE3594.json
+++ b/docs/data/histograms/Montserrat/FE3594.json
@@ -1 +1 @@
-{"batchcode": "FE3594", "histograms": [{"batchcodes": ["FE3594"], "histogram": {"Chest discomfort": 1, "Dysphagia": 1, "Oropharyngeal discomfort": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3594", "histograms": [{"histogram": {"Chest discomfort": 1, "Dysphagia": 1, "Oropharyngeal discomfort": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["FE3594"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Morocco/019B21A.json b/docs/data/histograms/Morocco/019B21A.json
index 93c8bd3a602..04d5a2e6a9d 100644
--- a/docs/data/histograms/Morocco/019B21A.json
+++ b/docs/data/histograms/Morocco/019B21A.json
@@ -1 +1 @@
-{"batchcode": "019B21A", "histograms": [{"batchcodes": ["019B21A"], "histogram": {"Pain": 1, "Pruritus": 1, "Rash": 1, "Rash vesicular": 1, "Scab": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "019B21A", "histograms": [{"histogram": {"Pain": 1, "Pruritus": 1, "Rash": 1, "Rash vesicular": 1, "Scab": 1, "Sleep disorder": 1}, "batchcodes": ["019B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Morocco/FE1573.json b/docs/data/histograms/Morocco/FE1573.json
index c1e5cda579f..d86c47ff43b 100644
--- a/docs/data/histograms/Morocco/FE1573.json
+++ b/docs/data/histograms/Morocco/FE1573.json
@@ -1 +1 @@
-{"batchcode": "FE1573", "histograms": [{"batchcodes": ["FE1573"], "histogram": {"SARS-CoV-2 test": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FE1573", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Thrombosis": 1}, "batchcodes": ["FE1573"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/022C21A.json b/docs/data/histograms/Namibia/022C21A.json
index 983b9c1c03b..73e7f4ea559 100644
--- a/docs/data/histograms/Namibia/022C21A.json
+++ b/docs/data/histograms/Namibia/022C21A.json
@@ -1 +1 @@
-{"batchcode": "022C21A", "histograms": [{"batchcodes": ["022C21A"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Muscle discomfort": 1, "Pyrexia": 1, "Sensitive skin": 1}}]}
\ No newline at end of file
+{"batchcode": "022C21A", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Muscle discomfort": 1, "Pyrexia": 1, "Sensitive skin": 1}, "batchcodes": ["022C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/023M20A.json b/docs/data/histograms/Namibia/023M20A.json
index 26f2cf7e140..2a25a245dcb 100644
--- a/docs/data/histograms/Namibia/023M20A.json
+++ b/docs/data/histograms/Namibia/023M20A.json
@@ -1 +1 @@
-{"batchcode": "023M20A", "histograms": [{"batchcodes": ["023M20A"], "histogram": {"Abdominal discomfort": 1, "Autopsy": 1, "Death": 1, "Headache": 1, "Hot flush": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Sudden death": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Autopsy": 1, "Death": 1, "Headache": 1, "Hot flush": 1, "Rash": 1, "Rash erythematous": 1, "Rash macular": 1, "Sudden death": 1}, "batchcodes": ["023M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/025J20-2A.json b/docs/data/histograms/Namibia/025J20-2A.json
index a7e8415476b..8d7cafe806f 100644
--- a/docs/data/histograms/Namibia/025J20-2A.json
+++ b/docs/data/histograms/Namibia/025J20-2A.json
@@ -1 +1 @@
-{"batchcode": "025J20-2A", "histograms": [{"batchcodes": ["025J20-2A"], "histogram": {"Arthralgia": 1, "Body temperature increased": 1, "C-reactive protein increased": 1, "Fatigue": 1, "Full blood count normal": 1, "Joint stiffness": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Pain": 1, "Red blood cell sedimentation rate normal": 1, "Swelling face": 1, "Visual impairment": 1, "X-ray limb abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-2A", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature increased": 1, "C-reactive protein increased": 1, "Fatigue": 1, "Full blood count normal": 1, "Joint stiffness": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Pain": 1, "Red blood cell sedimentation rate normal": 1, "Swelling face": 1, "Visual impairment": 1, "X-ray limb abnormal": 1}, "batchcodes": ["025J20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/051C21A.json b/docs/data/histograms/Namibia/051C21A.json
index a1396b74998..62a5e171c92 100644
--- a/docs/data/histograms/Namibia/051C21A.json
+++ b/docs/data/histograms/Namibia/051C21A.json
@@ -1 +1 @@
-{"batchcode": "051C21A", "histograms": [{"batchcodes": ["051C21A"], "histogram": {"Dizziness": 1, "Extra dose administered": 1, "Hospitalisation": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "051C21A", "histograms": [{"histogram": {"Dizziness": 1, "Extra dose administered": 1, "Hospitalisation": 1, "Syncope": 1}, "batchcodes": ["051C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/205A21A.json b/docs/data/histograms/Namibia/205A21A.json
index ce714e27ef9..ce6a753f0c0 100644
--- a/docs/data/histograms/Namibia/205A21A.json
+++ b/docs/data/histograms/Namibia/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/EK9231.json b/docs/data/histograms/Namibia/EK9231.json
index 9db215c50b3..04118f0cece 100644
--- a/docs/data/histograms/Namibia/EK9231.json
+++ b/docs/data/histograms/Namibia/EK9231.json
@@ -1 +1 @@
-{"batchcode": "EK9231", "histograms": [{"batchcodes": ["EK9231"], "histogram": {"Arthralgia": 1, "Chills": 1, "Ear pain": 1, "Headache": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EK9231", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Ear pain": 1, "Headache": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Swelling": 1}, "batchcodes": ["EK9231"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/EL3246.json b/docs/data/histograms/Namibia/EL3246.json
index 6aba02f27bb..b1d8ca65a76 100644
--- a/docs/data/histograms/Namibia/EL3246.json
+++ b/docs/data/histograms/Namibia/EL3246.json
@@ -1 +1 @@
-{"batchcode": "EL3246", "histograms": [{"batchcodes": ["EL3246"], "histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Cough": 1, "Lethargy": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3246", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Cough": 1, "Lethargy": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["EL3246"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/EN5318.json b/docs/data/histograms/Namibia/EN5318.json
index 73c7c68e556..78e690460d2 100644
--- a/docs/data/histograms/Namibia/EN5318.json
+++ b/docs/data/histograms/Namibia/EN5318.json
@@ -1 +1 @@
-{"batchcode": "EN5318", "histograms": [{"batchcodes": ["EN5318"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "EN5318", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["EN5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/ER8734.json b/docs/data/histograms/Namibia/ER8734.json
index 758a1df3a6b..6f874bbc6c5 100644
--- a/docs/data/histograms/Namibia/ER8734.json
+++ b/docs/data/histograms/Namibia/ER8734.json
@@ -1 +1 @@
-{"batchcode": "ER8734", "histograms": [{"batchcodes": ["ER8734"], "histogram": {"Cough": 1, "Dysphonia": 1, "Headache": 1, "Hyperhidrosis": 1, "Retching": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8734", "histograms": [{"histogram": {"Cough": 1, "Dysphonia": 1, "Headache": 1, "Hyperhidrosis": 1, "Retching": 1, "Throat irritation": 1}, "batchcodes": ["ER8734"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/EW0169.json b/docs/data/histograms/Namibia/EW0169.json
index 68b92dafb75..f4fb88fd97d 100644
--- a/docs/data/histograms/Namibia/EW0169.json
+++ b/docs/data/histograms/Namibia/EW0169.json
@@ -1 +1 @@
-{"batchcode": "EW0169", "histograms": [{"batchcodes": ["EW0169"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0169", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["EW0169"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/EW0186.json b/docs/data/histograms/Namibia/EW0186.json
index 57c2948ff07..19f8ab9ae2c 100644
--- a/docs/data/histograms/Namibia/EW0186.json
+++ b/docs/data/histograms/Namibia/EW0186.json
@@ -1 +1 @@
-{"batchcode": "EW0186", "histograms": [{"batchcodes": ["EW0186"], "histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Feeling cold": 1, "Hyperhidrosis": 1, "Pallor": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0186", "histograms": [{"histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Feeling cold": 1, "Hyperhidrosis": 1, "Pallor": 1, "Throat irritation": 1}, "batchcodes": ["EW0186"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/EW0191.json b/docs/data/histograms/Namibia/EW0191.json
index 32528a15d01..e0cebba4953 100644
--- a/docs/data/histograms/Namibia/EW0191.json
+++ b/docs/data/histograms/Namibia/EW0191.json
@@ -1 +1 @@
-{"batchcode": "EW0191", "histograms": [{"batchcodes": ["EW0191"], "histogram": {"Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0191", "histograms": [{"histogram": {"Incorrect dose administered": 1}, "batchcodes": ["EW0191"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/XE437.json b/docs/data/histograms/Namibia/XE437.json
index 05470440d1e..9455a266d03 100644
--- a/docs/data/histograms/Namibia/XE437.json
+++ b/docs/data/histograms/Namibia/XE437.json
@@ -1 +1 @@
-{"batchcode": "XE437", "histograms": [{"batchcodes": ["XE437"], "histogram": {"Dyspnoea": 1, "Feeling cold": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "XE437", "histograms": [{"histogram": {"Dyspnoea": 1, "Feeling cold": 1, "Oropharyngeal pain": 1}, "batchcodes": ["XE437"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Namibia/XE495.json b/docs/data/histograms/Namibia/XE495.json
index 3d6dbdd14c3..e022f44d100 100644
--- a/docs/data/histograms/Namibia/XE495.json
+++ b/docs/data/histograms/Namibia/XE495.json
@@ -1 +1 @@
-{"batchcode": "XE495", "histograms": [{"batchcodes": ["XE495"], "histogram": {"Erectile dysfunction": 1, "Headache": 1, "Hemiparesis": 1}}]}
\ No newline at end of file
+{"batchcode": "XE495", "histograms": [{"histogram": {"Erectile dysfunction": 1, "Headache": 1, "Hemiparesis": 1}, "batchcodes": ["XE495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Nauru/FK5127.json b/docs/data/histograms/Nauru/FK5127.json
index 72e48134e9e..981882fcbec 100644
--- a/docs/data/histograms/Nauru/FK5127.json
+++ b/docs/data/histograms/Nauru/FK5127.json
@@ -1 +1 @@
-{"batchcode": "FK5127", "histograms": [{"batchcodes": ["FK5127"], "histogram": {"No adverse event": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "FK5127", "histograms": [{"histogram": {"No adverse event": 1, "Underdose": 1}, "batchcodes": ["FK5127"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Nepal/FJ1612.json b/docs/data/histograms/Nepal/FJ1612.json
index 650bfb06e79..a08552907c6 100644
--- a/docs/data/histograms/Nepal/FJ1612.json
+++ b/docs/data/histograms/Nepal/FJ1612.json
@@ -1 +1 @@
-{"batchcode": "FJ1612", "histograms": [{"batchcodes": ["FJ1612"], "histogram": {"Asthenia": 2, "Headache": 2, "Tremor": 2, "Antinuclear antibody": 1, "B-lymphocyte count": 1, "Balance disorder": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood calcium": 1, "Blood copper": 1, "Blood copper decreased": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood immunoglobulin G": 1, "Blood test": 1, "Blood urea": 1, "Blood urea decreased": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF glucose increased": 1, "CSF protein": 1, "CSF protein decreased": 1, "CSF test": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gastritis": 1, "Investigation": 1, "Liver function test": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration increased": 1, "Migraine": 1, "Myocarditis": 1, "Nervous system disorder": 1, "Polymerase chain reaction": 1, "Renal function test": 1, "Respiratory disorder": 1, "Salivary hypersecretion": 1, "Thyroid function test": 1, "Ultrasound scan": 1, "Urine output": 1, "Venogram": 1, "Vitamin B12": 1, "Vitamin D": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1612", "histograms": [{"histogram": {"Asthenia": 2, "Headache": 2, "Tremor": 2, "Antinuclear antibody": 1, "B-lymphocyte count": 1, "Balance disorder": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood calcium": 1, "Blood copper": 1, "Blood copper decreased": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood immunoglobulin G": 1, "Blood test": 1, "Blood urea": 1, "Blood urea decreased": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF glucose increased": 1, "CSF protein": 1, "CSF protein decreased": 1, "CSF test": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gastritis": 1, "Investigation": 1, "Liver function test": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging neck": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration increased": 1, "Migraine": 1, "Myocarditis": 1, "Nervous system disorder": 1, "Polymerase chain reaction": 1, "Renal function test": 1, "Respiratory disorder": 1, "Salivary hypersecretion": 1, "Thyroid function test": 1, "Ultrasound scan": 1, "Urine output": 1, "Venogram": 1, "Vitamin B12": 1, "Vitamin D": 1}, "batchcodes": ["FJ1612"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Caledonia/33030BD.json b/docs/data/histograms/New Caledonia/33030BD.json
index c342309d7fc..4adc4276b8c 100644
--- a/docs/data/histograms/New Caledonia/33030BD.json
+++ b/docs/data/histograms/New Caledonia/33030BD.json
@@ -1 +1 @@
-{"batchcode": "33030BD", "histograms": [{"batchcodes": ["33030BD"], "histogram": {"Incorrect dose administered": 2, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "33030BD", "histograms": [{"histogram": {"Incorrect dose administered": 2, "No adverse event": 1}, "batchcodes": ["33030BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Caledonia/FG2975.json b/docs/data/histograms/New Caledonia/FG2975.json
index 0eed16714c3..c48f473a39b 100644
--- a/docs/data/histograms/New Caledonia/FG2975.json
+++ b/docs/data/histograms/New Caledonia/FG2975.json
@@ -1 +1 @@
-{"batchcode": "FG2975", "histograms": [{"batchcodes": ["FG2975"], "histogram": {"Aggression": 1, "Angioimmunoblastic T-cell lymphoma": 1, "Biopsy": 1, "Blood lactate dehydrogenase": 1, "Erectile dysfunction": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Paraesthesia": 1, "Photosensitivity reaction": 1, "Pruritus": 1, "Scan": 1, "Temperature regulation disorder": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2975", "histograms": [{"histogram": {"Aggression": 1, "Angioimmunoblastic T-cell lymphoma": 1, "Biopsy": 1, "Blood lactate dehydrogenase": 1, "Erectile dysfunction": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Paraesthesia": 1, "Photosensitivity reaction": 1, "Pruritus": 1, "Scan": 1, "Temperature regulation disorder": 1, "Weight decreased": 1}, "batchcodes": ["FG2975"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Caledonia/FL0007.json b/docs/data/histograms/New Caledonia/FL0007.json
index 415c69a9521..2f597ba8aa3 100644
--- a/docs/data/histograms/New Caledonia/FL0007.json
+++ b/docs/data/histograms/New Caledonia/FL0007.json
@@ -1 +1 @@
-{"batchcode": "FL0007", "histograms": [{"batchcodes": ["FL0007"], "histogram": {"No adverse event": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FL0007", "histograms": [{"histogram": {"No adverse event": 1, "Wrong product administered": 1}, "batchcodes": ["FL0007"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/0040211.json b/docs/data/histograms/New Zealand/0040211.json
index a3297a8c818..63ee1d94711 100644
--- a/docs/data/histograms/New Zealand/0040211.json
+++ b/docs/data/histograms/New Zealand/0040211.json
@@ -1 +1 @@
-{"batchcode": "0040211", "histograms": [{"batchcodes": ["0040211"], "histogram": {"Abdominal pain": 1, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Dyspnoea": 1, "Nausea": 1, "Pallor": 1, "Respiratory disorder": 1, "Somnolence": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "0040211", "histograms": [{"histogram": {"Abdominal pain": 1, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Cold sweat": 1, "Dyspnoea": 1, "Nausea": 1, "Pallor": 1, "Respiratory disorder": 1, "Somnolence": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["0040211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/1F1028A.json b/docs/data/histograms/New Zealand/1F1028A.json
index 0f4705f793e..c995428fb16 100644
--- a/docs/data/histograms/New Zealand/1F1028A.json
+++ b/docs/data/histograms/New Zealand/1F1028A.json
@@ -1 +1 @@
-{"batchcode": "1F1028A", "histograms": [{"batchcodes": ["1F1028A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1028A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["1F1028A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/1F1057A.json b/docs/data/histograms/New Zealand/1F1057A.json
index 2b546733781..9af4a2b490f 100644
--- a/docs/data/histograms/New Zealand/1F1057A.json
+++ b/docs/data/histograms/New Zealand/1F1057A.json
@@ -1 +1 @@
-{"batchcode": "1F1057A", "histograms": [{"batchcodes": ["1F1057A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1057A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["1F1057A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/ER7449-024.json b/docs/data/histograms/New Zealand/ER7449-024.json
index 5f50e43e6cb..4bd17697074 100644
--- a/docs/data/histograms/New Zealand/ER7449-024.json
+++ b/docs/data/histograms/New Zealand/ER7449-024.json
@@ -1 +1 @@
-{"batchcode": "ER7449-024", "histograms": [{"batchcodes": ["ER7449-024"], "histogram": {"Abnormal dreams": 1, "Acoustic stimulation tests": 1, "Anxiety": 1, "Blood test": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Essential tremor": 1, "Facial discomfort": 1, "Feeling abnormal": 1, "Hypoaesthesia oral": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1, "Pulmonary function test": 1, "Pulmonary pain": 1, "Tinnitus": 1, "Typical aura without headache": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449-024", "histograms": [{"histogram": {"Abnormal dreams": 1, "Acoustic stimulation tests": 1, "Anxiety": 1, "Blood test": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Essential tremor": 1, "Facial discomfort": 1, "Feeling abnormal": 1, "Hypoaesthesia oral": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Paraesthesia": 1, "Pulmonary function test": 1, "Pulmonary pain": 1, "Tinnitus": 1, "Typical aura without headache": 1}, "batchcodes": ["ER7449-024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/ET 9096.json b/docs/data/histograms/New Zealand/ET 9096.json
index 65d7f18eeb6..9381e24d8bf 100644
--- a/docs/data/histograms/New Zealand/ET 9096.json
+++ b/docs/data/histograms/New Zealand/ET 9096.json
@@ -1 +1 @@
-{"batchcode": "ET 9096", "histograms": [{"batchcodes": ["ET 9096"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Genitourinary symptom": 1, "Headache": 1, "Influenza like illness": 1, "Lethargy": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ET 9096", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Genitourinary symptom": 1, "Headache": 1, "Influenza like illness": 1, "Lethargy": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["ET 9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/ET9096.json b/docs/data/histograms/New Zealand/ET9096.json
index 7538f0f8206..10c7fedc49a 100644
--- a/docs/data/histograms/New Zealand/ET9096.json
+++ b/docs/data/histograms/New Zealand/ET9096.json
@@ -1 +1 @@
-{"batchcode": "ET9096", "histograms": [{"batchcodes": ["ET9096"], "histogram": {"Atrial fibrillation": 1, "Chest pain": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Syncope": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "ET9096", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Chest pain": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Syncope": 1, "Vertigo": 1}, "batchcodes": ["ET9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/EX2405.json b/docs/data/histograms/New Zealand/EX2405.json
index 9581bc16922..7adba5e9b6b 100644
--- a/docs/data/histograms/New Zealand/EX2405.json
+++ b/docs/data/histograms/New Zealand/EX2405.json
@@ -1 +1 @@
-{"batchcode": "EX2405", "histograms": [{"batchcodes": ["EX2405"], "histogram": {"Anaphylactic reaction": 2}}]}
\ No newline at end of file
+{"batchcode": "EX2405", "histograms": [{"histogram": {"Anaphylactic reaction": 2}, "batchcodes": ["EX2405"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/F2382-002.json b/docs/data/histograms/New Zealand/F2382-002.json
index cc746265d1c..9fa1bb8831d 100644
--- a/docs/data/histograms/New Zealand/F2382-002.json
+++ b/docs/data/histograms/New Zealand/F2382-002.json
@@ -1 +1 @@
-{"batchcode": "F2382-002", "histograms": [{"batchcodes": ["F2382-002"], "histogram": {"Breast tenderness": 1, "Dyspnoea": 1, "Epistaxis": 1, "Exercise tolerance decreased": 1, "Fatigue": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Malaise": 1, "Myocardial infarction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "F2382-002", "histograms": [{"histogram": {"Breast tenderness": 1, "Dyspnoea": 1, "Epistaxis": 1, "Exercise tolerance decreased": 1, "Fatigue": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Malaise": 1, "Myocardial infarction": 1, "Vomiting": 1}, "batchcodes": ["F2382-002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FC3558-003.json b/docs/data/histograms/New Zealand/FC3558-003.json
index 12731bb723c..fdf0b08d6a1 100644
--- a/docs/data/histograms/New Zealand/FC3558-003.json
+++ b/docs/data/histograms/New Zealand/FC3558-003.json
@@ -1 +1 @@
-{"batchcode": "FC3558-003", "histograms": [{"batchcodes": ["FC3558-003"], "histogram": {"Asthenia": 1, "Breath sounds abnormal": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Haemoglobin": 1, "International normalised ratio": 1, "Joint swelling": 1, "Myocarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3558-003", "histograms": [{"histogram": {"Asthenia": 1, "Breath sounds abnormal": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Haemoglobin": 1, "International normalised ratio": 1, "Joint swelling": 1, "Myocarditis": 1}, "batchcodes": ["FC3558-003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FC5029-005.json b/docs/data/histograms/New Zealand/FC5029-005.json
index 4a87585ae79..e2f10ba20a1 100644
--- a/docs/data/histograms/New Zealand/FC5029-005.json
+++ b/docs/data/histograms/New Zealand/FC5029-005.json
@@ -1 +1 @@
-{"batchcode": "FC5029-005", "histograms": [{"batchcodes": ["FC5029-005"], "histogram": {"Chest pain": 1, "Costochondritis": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5029-005", "histograms": [{"histogram": {"Chest pain": 1, "Costochondritis": 1, "Pericarditis": 1}, "batchcodes": ["FC5029-005"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FD9234.001.json b/docs/data/histograms/New Zealand/FD9234.001.json
index 7c8049e65f9..6dbe6d3d7c5 100644
--- a/docs/data/histograms/New Zealand/FD9234.001.json
+++ b/docs/data/histograms/New Zealand/FD9234.001.json
@@ -1 +1 @@
-{"batchcode": "FD9234.001", "histograms": [{"batchcodes": ["FD9234.001"], "histogram": {"Ischaemic stroke": 1}}]}
\ No newline at end of file
+{"batchcode": "FD9234.001", "histograms": [{"histogram": {"Ischaemic stroke": 1}, "batchcodes": ["FD9234.001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FE8163.json b/docs/data/histograms/New Zealand/FE8163.json
index 41ff574ffb8..3fb59a4320c 100644
--- a/docs/data/histograms/New Zealand/FE8163.json
+++ b/docs/data/histograms/New Zealand/FE8163.json
@@ -1 +1 @@
-{"batchcode": "FE8163", "histograms": [{"batchcodes": ["FE8163"], "histogram": {"Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Menstrual disorder": 1, "Palpitations": 1, "Pericarditis": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8163", "histograms": [{"histogram": {"Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Menstrual disorder": 1, "Palpitations": 1, "Pericarditis": 1, "Tachycardia": 1}, "batchcodes": ["FE8163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FF4206-004.json b/docs/data/histograms/New Zealand/FF4206-004.json
index 58bc004d74e..0f4d6615ea0 100644
--- a/docs/data/histograms/New Zealand/FF4206-004.json
+++ b/docs/data/histograms/New Zealand/FF4206-004.json
@@ -1 +1 @@
-{"batchcode": "FF4206-004", "histograms": [{"batchcodes": ["FF4206-004"], "histogram": {"Back pain": 1, "Chest pain": 1, "Concussion": 1, "Confusional state": 1, "Disease recurrence": 1, "Dyskinesia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hallucination": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Muscle twitching": 1, "Pain": 1, "Paraesthesia": 1, "Postmenopause": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4206-004", "histograms": [{"histogram": {"Back pain": 1, "Chest pain": 1, "Concussion": 1, "Confusional state": 1, "Disease recurrence": 1, "Dyskinesia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hallucination": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Muscle twitching": 1, "Pain": 1, "Paraesthesia": 1, "Postmenopause": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Visual impairment": 1}, "batchcodes": ["FF4206-004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FF4206-013.json b/docs/data/histograms/New Zealand/FF4206-013.json
index 67bf62165c8..d621637ce69 100644
--- a/docs/data/histograms/New Zealand/FF4206-013.json
+++ b/docs/data/histograms/New Zealand/FF4206-013.json
@@ -1 +1 @@
-{"batchcode": "FF4206-013", "histograms": [{"batchcodes": ["FF4206-013"], "histogram": {"Abdominal pain": 1, "Confusional state": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Ear discomfort": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Head discomfort": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Joint warmth": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Palpitations": 1, "Paraesthesia": 1, "Paranasal sinus discomfort": 1, "Photophobia": 1, "Restlessness": 1, "SARS-CoV-2 test": 1, "Speech disorder": 1, "Spinal disorder": 1, "Spinal pain": 1, "Tinnitus": 1, "Vision blurred": 1, "Vitreous floaters": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4206-013", "histograms": [{"histogram": {"Abdominal pain": 1, "Confusional state": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Ear discomfort": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Head discomfort": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Joint warmth": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Palpitations": 1, "Paraesthesia": 1, "Paranasal sinus discomfort": 1, "Photophobia": 1, "Restlessness": 1, "SARS-CoV-2 test": 1, "Speech disorder": 1, "Spinal disorder": 1, "Spinal pain": 1, "Tinnitus": 1, "Vision blurred": 1, "Vitreous floaters": 1}, "batchcodes": ["FF4206-013"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FF4222-011|20PG.json b/docs/data/histograms/New Zealand/FF4222-011|20PG.json
index 702d4132c10..a2ff3a487c3 100644
--- a/docs/data/histograms/New Zealand/FF4222-011|20PG.json
+++ b/docs/data/histograms/New Zealand/FF4222-011|20PG.json
@@ -1 +1 @@
-{"batchcode": "FF4222-011|20PG", "histograms": [{"batchcodes": ["FF4222-011|20PG"], "histogram": {"Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aura": 1, "Blood calcium": 1, "Blood folate": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram pelvis": 1, "Computerised tomogram thorax": 1, "Culture urine": 1, "Cytomegalovirus test": 1, "Electrophoresis protein": 1, "Epstein-Barr virus test": 1, "Full blood count": 1, "Glycosylated haemoglobin": 1, "HIV test": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Immunoglobulins": 1, "Laboratory test": 1, "Light chain analysis": 1, "Liver function test": 1, "Memory impairment": 1, "Migraine": 1, "Pericarditis": 1, "Photophobia": 1, "Protein urine": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Speech disorder": 1, "Toxoplasma serology": 1, "Urine analysis": 1, "Vision blurred": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4222-011|20PG", "histograms": [{"histogram": {"Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aura": 1, "Blood calcium": 1, "Blood folate": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram pelvis": 1, "Computerised tomogram thorax": 1, "Culture urine": 1, "Cytomegalovirus test": 1, "Electrophoresis protein": 1, "Epstein-Barr virus test": 1, "Full blood count": 1, "Glycosylated haemoglobin": 1, "HIV test": 1, "Headache": 1, "Hyperacusis": 1, "Hypoaesthesia": 1, "Immunoglobulins": 1, "Laboratory test": 1, "Light chain analysis": 1, "Liver function test": 1, "Memory impairment": 1, "Migraine": 1, "Pericarditis": 1, "Photophobia": 1, "Protein urine": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Speech disorder": 1, "Toxoplasma serology": 1, "Urine analysis": 1, "Vision blurred": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vomiting": 1}, "batchcodes": ["FF4222-011|20PG"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FF4222.json b/docs/data/histograms/New Zealand/FF4222.json
index 09a0646d0a6..b1f14c8e006 100644
--- a/docs/data/histograms/New Zealand/FF4222.json
+++ b/docs/data/histograms/New Zealand/FF4222.json
@@ -1 +1 @@
-{"batchcode": "FF4222", "histograms": [{"batchcodes": ["FF4222"], "histogram": {"Breast swelling": 1, "Dysmenorrhoea": 1, "Insomnia": 1, "Menstrual disorder": 1, "Polymyalgia rheumatica": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4222", "histograms": [{"histogram": {"Breast swelling": 1, "Dysmenorrhoea": 1, "Insomnia": 1, "Menstrual disorder": 1, "Polymyalgia rheumatica": 1}, "batchcodes": ["FF4222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FG0050-006.json b/docs/data/histograms/New Zealand/FG0050-006.json
index 46bca4366c5..13a1d76a2a3 100644
--- a/docs/data/histograms/New Zealand/FG0050-006.json
+++ b/docs/data/histograms/New Zealand/FG0050-006.json
@@ -1 +1 @@
-{"batchcode": "FG0050-006", "histograms": [{"batchcodes": ["FG0050-006"], "histogram": {"Polymyalgia rheumatica": 1}}]}
\ No newline at end of file
+{"batchcode": "FG0050-006", "histograms": [{"histogram": {"Polymyalgia rheumatica": 1}, "batchcodes": ["FG0050-006"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FG0050.json b/docs/data/histograms/New Zealand/FG0050.json
index 6088060dda0..6d7207355d6 100644
--- a/docs/data/histograms/New Zealand/FG0050.json
+++ b/docs/data/histograms/New Zealand/FG0050.json
@@ -1 +1 @@
-{"batchcode": "FG0050", "histograms": [{"batchcodes": ["FG0050"], "histogram": {"Acoustic stimulation tests": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Hypoacusis": 1, "Palpitations": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FG0050", "histograms": [{"histogram": {"Acoustic stimulation tests": 1, "Ear discomfort": 1, "Electrocardiogram": 1, "Hypoacusis": 1, "Palpitations": 1, "Tinnitus": 1}, "batchcodes": ["FG0050"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FG7372-00054.json b/docs/data/histograms/New Zealand/FG7372-00054.json
index a334cb68088..d7daf8a2869 100644
--- a/docs/data/histograms/New Zealand/FG7372-00054.json
+++ b/docs/data/histograms/New Zealand/FG7372-00054.json
@@ -1 +1 @@
-{"batchcode": "FG7372-00054", "histograms": [{"batchcodes": ["FG7372-00054"], "histogram": {"Autoimmune hepatitis": 1, "Jaundice": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7372-00054", "histograms": [{"histogram": {"Autoimmune hepatitis": 1, "Jaundice": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FG7372-00054"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FG7372-D0052.json b/docs/data/histograms/New Zealand/FG7372-D0052.json
index 5df07e24032..0c876354541 100644
--- a/docs/data/histograms/New Zealand/FG7372-D0052.json
+++ b/docs/data/histograms/New Zealand/FG7372-D0052.json
@@ -1 +1 @@
-{"batchcode": "FG7372-D0052", "histograms": [{"batchcodes": ["FG7372-D0052"], "histogram": {"Cold sweat": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Headache": 1, "Mental impairment": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Suicidal ideation": 1, "Syncope": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7372-D0052", "histograms": [{"histogram": {"Cold sweat": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Headache": 1, "Mental impairment": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Suicidal ideation": 1, "Syncope": 1, "Tinnitus": 1}, "batchcodes": ["FG7372-D0052"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FG7373-001.json b/docs/data/histograms/New Zealand/FG7373-001.json
index a163ea36b68..6c4ae7642e9 100644
--- a/docs/data/histograms/New Zealand/FG7373-001.json
+++ b/docs/data/histograms/New Zealand/FG7373-001.json
@@ -1 +1 @@
-{"batchcode": "FG7373-001", "histograms": [{"batchcodes": ["FG7373-001"], "histogram": {"Asthenia": 1, "Burning sensation": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Headache": 1, "Lethargy": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain": 1, "Somnolence": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7373-001", "histograms": [{"histogram": {"Asthenia": 1, "Burning sensation": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Headache": 1, "Lethargy": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain": 1, "Somnolence": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["FG7373-001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FH3219.json b/docs/data/histograms/New Zealand/FH3219.json
index f2d793a56b4..107be45d9a2 100644
--- a/docs/data/histograms/New Zealand/FH3219.json
+++ b/docs/data/histograms/New Zealand/FH3219.json
@@ -1 +1 @@
-{"batchcode": "FH3219", "histograms": [{"batchcodes": ["FH3219"], "histogram": {"Arrhythmia": 1, "Computerised tomogram": 1, "Dysaesthesia": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Ovarian rupture": 1, "Pallor": 1, "Poor peripheral circulation": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3219", "histograms": [{"histogram": {"Arrhythmia": 1, "Computerised tomogram": 1, "Dysaesthesia": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Muscle spasms": 1, "Ovarian rupture": 1, "Pallor": 1, "Poor peripheral circulation": 1}, "batchcodes": ["FH3219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FH9678.json b/docs/data/histograms/New Zealand/FH9678.json
index 5ba2ccf35bf..d61ce5adc68 100644
--- a/docs/data/histograms/New Zealand/FH9678.json
+++ b/docs/data/histograms/New Zealand/FH9678.json
@@ -1 +1 @@
-{"batchcode": "FH9678", "histograms": [{"batchcodes": ["FH9678"], "histogram": {"Myocarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "FH9678", "histograms": [{"histogram": {"Myocarditis": 1}, "batchcodes": ["FH9678"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FJ8372-003.json b/docs/data/histograms/New Zealand/FJ8372-003.json
index 737606a1bb8..0856b0f5d45 100644
--- a/docs/data/histograms/New Zealand/FJ8372-003.json
+++ b/docs/data/histograms/New Zealand/FJ8372-003.json
@@ -1 +1 @@
-{"batchcode": "FJ8372-003", "histograms": [{"batchcodes": ["FJ8372-003"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck pain": 1, "Palpitations": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8372-003", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck pain": 1, "Palpitations": 1, "Pyrexia": 1}, "batchcodes": ["FJ8372-003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FK0115-0100105.json b/docs/data/histograms/New Zealand/FK0115-0100105.json
index 5229c2f4692..9eea313573e 100644
--- a/docs/data/histograms/New Zealand/FK0115-0100105.json
+++ b/docs/data/histograms/New Zealand/FK0115-0100105.json
@@ -1 +1 @@
-{"batchcode": "FK0115-0100105", "histograms": [{"batchcodes": ["FK0115-0100105"], "histogram": {"Bedridden": 1, "Blood uric acid increased": 1, "Contusion": 1, "Costochondritis": 1, "Dyspnoea": 1, "Epistaxis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Mobility decreased": 1, "Neurological symptom": 1, "Paraesthesia": 1, "Tinnitus": 1, "Vascular pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0115-0100105", "histograms": [{"histogram": {"Bedridden": 1, "Blood uric acid increased": 1, "Contusion": 1, "Costochondritis": 1, "Dyspnoea": 1, "Epistaxis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Mobility decreased": 1, "Neurological symptom": 1, "Paraesthesia": 1, "Tinnitus": 1, "Vascular pain": 1}, "batchcodes": ["FK0115-0100105"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FK9414.json b/docs/data/histograms/New Zealand/FK9414.json
index 282dd440a63..ee9daca6897 100644
--- a/docs/data/histograms/New Zealand/FK9414.json
+++ b/docs/data/histograms/New Zealand/FK9414.json
@@ -1 +1 @@
-{"batchcode": "FK9414", "histograms": [{"batchcodes": ["FK9414"], "histogram": {"Arrhythmia": 1, "Coeliac disease": 1, "Computerised tomogram": 1, "Hyperventilation": 1, "Magnetic resonance imaging": 1, "Pulmonary thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9414", "histograms": [{"histogram": {"Arrhythmia": 1, "Coeliac disease": 1, "Computerised tomogram": 1, "Hyperventilation": 1, "Magnetic resonance imaging": 1, "Pulmonary thrombosis": 1}, "batchcodes": ["FK9414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FL072.json b/docs/data/histograms/New Zealand/FL072.json
index 4a2eecc80da..3580edc7dcf 100644
--- a/docs/data/histograms/New Zealand/FL072.json
+++ b/docs/data/histograms/New Zealand/FL072.json
@@ -1 +1 @@
-{"batchcode": "FL072", "histograms": [{"batchcodes": ["FL072"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FL072", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FL072"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FL1072-002.json b/docs/data/histograms/New Zealand/FL1072-002.json
index 0935d6053ac..d573b7e90f1 100644
--- a/docs/data/histograms/New Zealand/FL1072-002.json
+++ b/docs/data/histograms/New Zealand/FL1072-002.json
@@ -1 +1 @@
-{"batchcode": "FL1072-002", "histograms": [{"batchcodes": ["FL1072-002"], "histogram": {"Cognitive disorder": 1, "Endothelial dysfunction": 1, "Fatigue": 1, "Feeling abnormal": 1, "Trigeminal neuralgia": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1072-002", "histograms": [{"histogram": {"Cognitive disorder": 1, "Endothelial dysfunction": 1, "Fatigue": 1, "Feeling abnormal": 1, "Trigeminal neuralgia": 1}, "batchcodes": ["FL1072-002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FL1072-003.json b/docs/data/histograms/New Zealand/FL1072-003.json
index 9934138f35b..101e4218a72 100644
--- a/docs/data/histograms/New Zealand/FL1072-003.json
+++ b/docs/data/histograms/New Zealand/FL1072-003.json
@@ -1 +1 @@
-{"batchcode": "FL1072-003", "histograms": [{"batchcodes": ["FL1072-003"], "histogram": {"Asthenia": 1, "Chest pain": 1, "Confusional state": 1, "Headache": 1, "Lethargy": 1, "Mobility decreased": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1072-003", "histograms": [{"histogram": {"Asthenia": 1, "Chest pain": 1, "Confusional state": 1, "Headache": 1, "Lethargy": 1, "Mobility decreased": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1}, "batchcodes": ["FL1072-003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FL1072.json b/docs/data/histograms/New Zealand/FL1072.json
index 0d45a8ecddd..2ca958720d4 100644
--- a/docs/data/histograms/New Zealand/FL1072.json
+++ b/docs/data/histograms/New Zealand/FL1072.json
@@ -1 +1 @@
-{"batchcode": "FL1072", "histograms": [{"batchcodes": ["FL1072"], "histogram": {"Acoustic stimulation tests": 1, "COVID-19": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1072", "histograms": [{"histogram": {"Acoustic stimulation tests": 1, "COVID-19": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}, "batchcodes": ["FL1072"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/New Zealand/FL4210.json b/docs/data/histograms/New Zealand/FL4210.json
index 25d99d6cd9e..a24a2e5f967 100644
--- a/docs/data/histograms/New Zealand/FL4210.json
+++ b/docs/data/histograms/New Zealand/FL4210.json
@@ -1 +1 @@
-{"batchcode": "FL4210", "histograms": [{"batchcodes": ["FL4210"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FL4210", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FL4210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Nicaragua/EW0161.json b/docs/data/histograms/Nicaragua/EW0161.json
index d916dd27019..da86870d6b6 100644
--- a/docs/data/histograms/Nicaragua/EW0161.json
+++ b/docs/data/histograms/Nicaragua/EW0161.json
@@ -1 +1 @@
-{"batchcode": "EW0161", "histograms": [{"batchcodes": ["EW0161"], "histogram": {"Fatigue": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Swelling face": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0161", "histograms": [{"histogram": {"Fatigue": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Swelling face": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Nicaragua/FJ1618.json b/docs/data/histograms/Nicaragua/FJ1618.json
index 39f2f5ab657..686bde05ca8 100644
--- a/docs/data/histograms/Nicaragua/FJ1618.json
+++ b/docs/data/histograms/Nicaragua/FJ1618.json
@@ -1 +1 @@
-{"batchcode": "FJ1618", "histograms": [{"batchcodes": ["FJ1618"], "histogram": {"Basedow's disease": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1618", "histograms": [{"histogram": {"Basedow's disease": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FJ1618"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Niger/FG3527.json b/docs/data/histograms/Niger/FG3527.json
index b0678a986ed..b5bef5182e2 100644
--- a/docs/data/histograms/Niger/FG3527.json
+++ b/docs/data/histograms/Niger/FG3527.json
@@ -1 +1 @@
-{"batchcode": "FG3527", "histograms": [{"batchcodes": ["FG3527"], "histogram": {"Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3527", "histograms": [{"histogram": {"Peripheral swelling": 1}, "batchcodes": ["FG3527"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/North Macedonia/EL-0200.json b/docs/data/histograms/North Macedonia/EL-0200.json
index d6a97637df0..108884e2a88 100644
--- a/docs/data/histograms/North Macedonia/EL-0200.json
+++ b/docs/data/histograms/North Macedonia/EL-0200.json
@@ -1 +1 @@
-{"batchcode": "EL-0200", "histograms": [{"batchcodes": ["EL-0200"], "histogram": {"Deep vein thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EL-0200", "histograms": [{"histogram": {"Deep vein thrombosis": 1}, "batchcodes": ["EL-0200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/North Macedonia/EL2000.json b/docs/data/histograms/North Macedonia/EL2000.json
index 55e3efbf545..3516a958c6e 100644
--- a/docs/data/histograms/North Macedonia/EL2000.json
+++ b/docs/data/histograms/North Macedonia/EL2000.json
@@ -1 +1 @@
-{"batchcode": "EL2000", "histograms": [{"batchcodes": ["EL2000"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "EL2000", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["EL2000"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/North Macedonia/F8871.json b/docs/data/histograms/North Macedonia/F8871.json
index 576e6110445..87de4b0a0d0 100644
--- a/docs/data/histograms/North Macedonia/F8871.json
+++ b/docs/data/histograms/North Macedonia/F8871.json
@@ -1 +1 @@
-{"batchcode": "F8871", "histograms": [{"batchcodes": ["F8871"], "histogram": {"Blood pressure measurement": 1, "Blood test": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Paraesthesia": 1, "Pyrexia": 1, "Tremor": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "F8871", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood test": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Paraesthesia": 1, "Pyrexia": 1, "Tremor": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1}, "batchcodes": ["F8871"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/North Macedonia/FC5029.json b/docs/data/histograms/North Macedonia/FC5029.json
index 249e9429c59..12fa159d5ae 100644
--- a/docs/data/histograms/North Macedonia/FC5029.json
+++ b/docs/data/histograms/North Macedonia/FC5029.json
@@ -1 +1 @@
-{"batchcode": "FC5029", "histograms": [{"batchcodes": ["FC5029"], "histogram": {"Blood thyroid stimulating hormone": 1, "Heavy menstrual bleeding": 1, "Hypothyroidism": 1, "Malaise": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5029", "histograms": [{"histogram": {"Blood thyroid stimulating hormone": 1, "Heavy menstrual bleeding": 1, "Hypothyroidism": 1, "Malaise": 1, "Tachycardia": 1}, "batchcodes": ["FC5029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/North Macedonia/FD0932.json b/docs/data/histograms/North Macedonia/FD0932.json
index 358d256ee28..c28e79ea4d1 100644
--- a/docs/data/histograms/North Macedonia/FD0932.json
+++ b/docs/data/histograms/North Macedonia/FD0932.json
@@ -1 +1 @@
-{"batchcode": "FD0932", "histograms": [{"batchcodes": ["FD0932"], "histogram": {"Dysmenorrhoea": 1, "Menstruation irregular": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0932", "histograms": [{"histogram": {"Dysmenorrhoea": 1, "Menstruation irregular": 1, "Syncope": 1}, "batchcodes": ["FD0932"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/North Macedonia/FJ5782.json b/docs/data/histograms/North Macedonia/FJ5782.json
index 793edc58d3c..8d2caac574e 100644
--- a/docs/data/histograms/North Macedonia/FJ5782.json
+++ b/docs/data/histograms/North Macedonia/FJ5782.json
@@ -1 +1 @@
-{"batchcode": "FJ5782", "histograms": [{"batchcodes": ["FJ5782"], "histogram": {"Angina pectoris": 1, "Chest discomfort": 1, "Chest pain": 1, "Immunisation": 1, "Testicular pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5782", "histograms": [{"histogram": {"Angina pectoris": 1, "Chest discomfort": 1, "Chest pain": 1, "Immunisation": 1, "Testicular pain": 1}, "batchcodes": ["FJ5782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Northern Mariana Islands/FH8020.json b/docs/data/histograms/Northern Mariana Islands/FH8020.json
index 6983eeef4e0..5486e1fc881 100644
--- a/docs/data/histograms/Northern Mariana Islands/FH8020.json
+++ b/docs/data/histograms/Northern Mariana Islands/FH8020.json
@@ -1 +1 @@
-{"batchcode": "FH8020", "histograms": [{"batchcodes": ["FH8020"], "histogram": {"Pruritus": 1, "Rash": 1, "Rash macular": 1, "Rash papular": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8020", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1, "Rash macular": 1, "Rash papular": 1}, "batchcodes": ["FH8020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Northern Mariana Islands/PFREH9899.json b/docs/data/histograms/Northern Mariana Islands/PFREH9899.json
index 1bf84782b62..978bc768b72 100644
--- a/docs/data/histograms/Northern Mariana Islands/PFREH9899.json
+++ b/docs/data/histograms/Northern Mariana Islands/PFREH9899.json
@@ -1 +1 @@
-{"batchcode": "PFREH9899", "histograms": [{"batchcodes": ["PFREH9899"], "histogram": {"Arthralgia": 1, "Chest discomfort": 1, "Disorientation": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "PFREH9899", "histograms": [{"histogram": {"Arthralgia": 1, "Chest discomfort": 1, "Disorientation": 1, "Dizziness": 1}, "batchcodes": ["PFREH9899"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/001A21A.json b/docs/data/histograms/Norway/001A21A.json
index 1f404ffb9d4..ab41d85c7eb 100644
--- a/docs/data/histograms/Norway/001A21A.json
+++ b/docs/data/histograms/Norway/001A21A.json
@@ -1 +1 @@
-{"batchcode": "001A21A", "histograms": [{"batchcodes": ["001A21A"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "001A21A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1}, "batchcodes": ["001A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/005C21A.json b/docs/data/histograms/Norway/005C21A.json
index e613334e101..39d7a842e0a 100644
--- a/docs/data/histograms/Norway/005C21A.json
+++ b/docs/data/histograms/Norway/005C21A.json
@@ -1 +1 @@
-{"batchcode": "005C21A", "histograms": [{"batchcodes": ["005C21A"], "histogram": {"Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "005C21A", "histograms": [{"histogram": {"Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pain": 1}, "batchcodes": ["005C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/007B21A.json b/docs/data/histograms/Norway/007B21A.json
index 05c66525824..36158b4d2c3 100644
--- a/docs/data/histograms/Norway/007B21A.json
+++ b/docs/data/histograms/Norway/007B21A.json
@@ -1 +1 @@
-{"batchcode": "007B21A", "histograms": [{"batchcodes": ["007B21A"], "histogram": {"Anxiety": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "007B21A", "histograms": [{"histogram": {"Anxiety": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["007B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/007M20A.json b/docs/data/histograms/Norway/007M20A.json
index bcec20a5c7e..d5fec430de8 100644
--- a/docs/data/histograms/Norway/007M20A.json
+++ b/docs/data/histograms/Norway/007M20A.json
@@ -1 +1 @@
-{"batchcode": "007M20A", "histograms": [{"batchcodes": ["007M20A"], "histogram": {"Contusion": 1, "Injection site mass": 1, "Pain in extremity": 1, "Rash papular": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A", "histograms": [{"histogram": {"Contusion": 1, "Injection site mass": 1, "Pain in extremity": 1, "Rash papular": 1, "Skin warm": 1}, "batchcodes": ["007M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/008B21A.json b/docs/data/histograms/Norway/008B21A.json
index 8fb1eac319a..f53f98878ae 100644
--- a/docs/data/histograms/Norway/008B21A.json
+++ b/docs/data/histograms/Norway/008B21A.json
@@ -1 +1 @@
-{"batchcode": "008B21A", "histograms": [{"batchcodes": ["008B21A"], "histogram": {"Immediate post-injection reaction": 1, "Pharyngeal swelling": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21A", "histograms": [{"histogram": {"Immediate post-injection reaction": 1, "Pharyngeal swelling": 1, "Pruritus": 1}, "batchcodes": ["008B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/010A21A.json b/docs/data/histograms/Norway/010A21A.json
index 68d01c0de16..a27ed6982a6 100644
--- a/docs/data/histograms/Norway/010A21A.json
+++ b/docs/data/histograms/Norway/010A21A.json
@@ -1 +1 @@
-{"batchcode": "010A21A", "histograms": [{"batchcodes": ["010A21A"], "histogram": {"Fall": 1, "Head injury": 1, "Syncope": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "010A21A", "histograms": [{"histogram": {"Fall": 1, "Head injury": 1, "Syncope": 1, "Visual impairment": 1}, "batchcodes": ["010A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/011J20A.json b/docs/data/histograms/Norway/011J20A.json
index 172b5dff756..849e8d2298f 100644
--- a/docs/data/histograms/Norway/011J20A.json
+++ b/docs/data/histograms/Norway/011J20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A", "histograms": [{"batchcodes": ["011J20A", "011J20A", "011J20A"], "histogram": {"Chills": 1, "Headache": 1, "Injection site reaction": 1, "Nausea": 1, "Pyrexia": 1, "Urticaria": 1, "Vomiting": 1}}, {"batchcodes": ["011J20A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Feeling abnormal": 1, "Neck pain": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Injection site reaction": 1, "Nausea": 1, "Pyrexia": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["011J20A", "011J20A", "011J20A"]}, {"histogram": {"Chills": 1, "Headache": 1, "Injection site reaction": 1, "Nausea": 1, "Pyrexia": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["011J20A", "011J20A", "011J20A"]}, {"histogram": {"Chills": 1, "Headache": 1, "Injection site reaction": 1, "Nausea": 1, "Pyrexia": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["011J20A", "011J20A", "011J20A"]}, {"histogram": {"Arthralgia": 1, "Asthenia": 1, "Feeling abnormal": 1, "Neck pain": 1, "Paraesthesia": 1}, "batchcodes": ["011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/014M20A.json b/docs/data/histograms/Norway/014M20A.json
index 51cef4db10a..bccb28c854a 100644
--- a/docs/data/histograms/Norway/014M20A.json
+++ b/docs/data/histograms/Norway/014M20A.json
@@ -1 +1 @@
-{"batchcode": "014M20A", "histograms": [{"batchcodes": ["014M20A"], "histogram": {"Eye pain": 1, "Ophthalmological examination": 1, "Photopsia": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "014M20A", "histograms": [{"histogram": {"Eye pain": 1, "Ophthalmological examination": 1, "Photopsia": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["014M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/021821A.json b/docs/data/histograms/Norway/021821A.json
index 445bc09f17f..fb420df135d 100644
--- a/docs/data/histograms/Norway/021821A.json
+++ b/docs/data/histograms/Norway/021821A.json
@@ -1 +1 @@
-{"batchcode": "021821A", "histograms": [{"batchcodes": ["021821A"], "histogram": {"Erythema": 1, "Fatigue": 1, "Headache": 1, "Pain of skin": 1, "Peripheral swelling": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "021821A", "histograms": [{"histogram": {"Erythema": 1, "Fatigue": 1, "Headache": 1, "Pain of skin": 1, "Peripheral swelling": 1, "Pruritus": 1}, "batchcodes": ["021821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/022B1A.json b/docs/data/histograms/Norway/022B1A.json
index c0672216a90..f5209f21797 100644
--- a/docs/data/histograms/Norway/022B1A.json
+++ b/docs/data/histograms/Norway/022B1A.json
@@ -1 +1 @@
-{"batchcode": "022B1A", "histograms": [{"batchcodes": ["022B1A"], "histogram": {"Abdominal pain upper": 1, "Axillary pain": 1, "Carpal tunnel syndrome": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site rash": 1, "Injection site swelling": 1, "Mobility decreased": 1, "Nausea": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Ultrasound scan normal": 1, "Urine analysis normal": 1}}]}
\ No newline at end of file
+{"batchcode": "022B1A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Axillary pain": 1, "Carpal tunnel syndrome": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site rash": 1, "Injection site swelling": 1, "Mobility decreased": 1, "Nausea": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Ultrasound scan normal": 1, "Urine analysis normal": 1}, "batchcodes": ["022B1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/025A21A.json b/docs/data/histograms/Norway/025A21A.json
index 999ce08b578..11730212949 100644
--- a/docs/data/histograms/Norway/025A21A.json
+++ b/docs/data/histograms/Norway/025A21A.json
@@ -1 +1 @@
-{"batchcode": "025A21A", "histograms": [{"batchcodes": ["025A21A"], "histogram": {"Arthralgia": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "025A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Somnolence": 1}, "batchcodes": ["025A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/025J20-2A.json b/docs/data/histograms/Norway/025J20-2A.json
index 05cf94efebd..fd51ed62b34 100644
--- a/docs/data/histograms/Norway/025J20-2A.json
+++ b/docs/data/histograms/Norway/025J20-2A.json
@@ -1 +1 @@
-{"batchcode": "025J20-2A", "histograms": [{"batchcodes": ["025J20-2A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Head discomfort": 1, "Headache": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Malaise": 1, "Neck pain": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Urticaria": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-2A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Head discomfort": 1, "Headache": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Malaise": 1, "Neck pain": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Urticaria": 1, "Vision blurred": 1}, "batchcodes": ["025J20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/025J20A.json b/docs/data/histograms/Norway/025J20A.json
index aa602a3d923..cf70918cb64 100644
--- a/docs/data/histograms/Norway/025J20A.json
+++ b/docs/data/histograms/Norway/025J20A.json
@@ -1 +1 @@
-{"batchcode": "025J20A", "histograms": [{"batchcodes": ["025J20A"], "histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A", "histograms": [{"histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1}, "batchcodes": ["025J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/028A21A.json b/docs/data/histograms/Norway/028A21A.json
index 5b3b9264537..6dd99e73625 100644
--- a/docs/data/histograms/Norway/028A21A.json
+++ b/docs/data/histograms/Norway/028A21A.json
@@ -1 +1 @@
-{"batchcode": "028A21A", "histograms": [{"batchcodes": ["028A21A"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Headache": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "028A21A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Headache": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1}, "batchcodes": ["028A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/030M20A.json b/docs/data/histograms/Norway/030M20A.json
index b6b3babc4b7..fffbd91d0a2 100644
--- a/docs/data/histograms/Norway/030M20A.json
+++ b/docs/data/histograms/Norway/030M20A.json
@@ -1 +1 @@
-{"batchcode": "030M20A", "histograms": [{"batchcodes": ["030M20A"], "histogram": {"Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["030M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/036A21A.json b/docs/data/histograms/Norway/036A21A.json
index f5bb7ca0f57..fb30a948848 100644
--- a/docs/data/histograms/Norway/036A21A.json
+++ b/docs/data/histograms/Norway/036A21A.json
@@ -1 +1 @@
-{"batchcode": "036A21A", "histograms": [{"batchcodes": ["036A21A", "036A21A"], "histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}}, {"batchcodes": ["036A21A"], "histogram": {"Chest discomfort": 1, "Dizziness": 1, "Dry throat": 1, "Headache": 1, "Hot flush": 1, "Injection site pain": 1, "Injection site rash": 1, "Rash macular": 1}}]}
\ No newline at end of file
+{"batchcode": "036A21A", "histograms": [{"histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["036A21A", "036A21A"]}, {"histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["036A21A", "036A21A"]}, {"histogram": {"Chest discomfort": 1, "Dizziness": 1, "Dry throat": 1, "Headache": 1, "Hot flush": 1, "Injection site pain": 1, "Injection site rash": 1, "Rash macular": 1}, "batchcodes": ["036A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/037B21A.json b/docs/data/histograms/Norway/037B21A.json
index 1f50a7cea76..924d355a60d 100644
--- a/docs/data/histograms/Norway/037B21A.json
+++ b/docs/data/histograms/Norway/037B21A.json
@@ -1 +1 @@
-{"batchcode": "037B21A", "histograms": [{"batchcodes": ["037B21A"], "histogram": {"Asthenia": 1, "Headache": 1, "Impaired work ability": 1, "Peripheral coldness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "037B21A", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Impaired work ability": 1, "Peripheral coldness": 1, "Pyrexia": 1}, "batchcodes": ["037B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/039B21A.json b/docs/data/histograms/Norway/039B21A.json
index c3b12e699fc..f5633592498 100644
--- a/docs/data/histograms/Norway/039B21A.json
+++ b/docs/data/histograms/Norway/039B21A.json
@@ -1 +1 @@
-{"batchcode": "039B21A", "histograms": [{"batchcodes": ["039B21A"], "histogram": {"Chills": 1, "Fatigue": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "039B21A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["039B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/040A21A.json b/docs/data/histograms/Norway/040A21A.json
index 604164fd354..bbb221166c0 100644
--- a/docs/data/histograms/Norway/040A21A.json
+++ b/docs/data/histograms/Norway/040A21A.json
@@ -1 +1 @@
-{"batchcode": "040A21A", "histograms": [{"batchcodes": ["040A21A"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1, "X-ray normal": 1}}]}
\ No newline at end of file
+{"batchcode": "040A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1, "X-ray normal": 1}, "batchcodes": ["040A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/040C21A.json b/docs/data/histograms/Norway/040C21A.json
index 10c93ec26a2..203502a0218 100644
--- a/docs/data/histograms/Norway/040C21A.json
+++ b/docs/data/histograms/Norway/040C21A.json
@@ -1 +1 @@
-{"batchcode": "040C21A", "histograms": [{"batchcodes": ["040C21A"], "histogram": {"Exposure during pregnancy": 1, "No adverse event": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "040C21A", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "No adverse event": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["040C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/041A21A.json b/docs/data/histograms/Norway/041A21A.json
index 2fbf8b0447f..520d3f9da56 100644
--- a/docs/data/histograms/Norway/041A21A.json
+++ b/docs/data/histograms/Norway/041A21A.json
@@ -1 +1 @@
-{"batchcode": "041A21A", "histograms": [{"batchcodes": ["041A21A"], "histogram": {"Blindness": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Pulmonary hypertension": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "041A21A", "histograms": [{"histogram": {"Blindness": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Pulmonary hypertension": 1, "X-ray": 1}, "batchcodes": ["041A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/041L20A.json b/docs/data/histograms/Norway/041L20A.json
index 6b990cb991a..21d9e7fb078 100644
--- a/docs/data/histograms/Norway/041L20A.json
+++ b/docs/data/histograms/Norway/041L20A.json
@@ -1 +1 @@
-{"batchcode": "041L20A", "histograms": [{"batchcodes": ["041L20A"], "histogram": {"Body temperature increased": 1, "Chills": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Pain": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "041L20A", "histograms": [{"histogram": {"Body temperature increased": 1, "Chills": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Pain": 1, "Throat irritation": 1}, "batchcodes": ["041L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/043A21A.json b/docs/data/histograms/Norway/043A21A.json
index e3ddf3685eb..0dea8abd6e9 100644
--- a/docs/data/histograms/Norway/043A21A.json
+++ b/docs/data/histograms/Norway/043A21A.json
@@ -1 +1 @@
-{"batchcode": "043A21A", "histograms": [{"batchcodes": ["043A21A"], "histogram": {"Dizziness": 1, "Feeling hot": 1, "Hot flush": 1}}]}
\ No newline at end of file
+{"batchcode": "043A21A", "histograms": [{"histogram": {"Dizziness": 1, "Feeling hot": 1, "Hot flush": 1}, "batchcodes": ["043A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/044A21A.json b/docs/data/histograms/Norway/044A21A.json
index 632773c32fc..f891fdbc569 100644
--- a/docs/data/histograms/Norway/044A21A.json
+++ b/docs/data/histograms/Norway/044A21A.json
@@ -1 +1 @@
-{"batchcode": "044A21A", "histograms": [{"batchcodes": ["044A21A"], "histogram": {"Bell's palsy": 1, "Facial paralysis": 1, "Headache": 1, "Hypoaesthesia": 1, "Malaise": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "044A21A", "histograms": [{"histogram": {"Bell's palsy": 1, "Facial paralysis": 1, "Headache": 1, "Hypoaesthesia": 1, "Malaise": 1, "Tinnitus": 1}, "batchcodes": ["044A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/045L21A.json b/docs/data/histograms/Norway/045L21A.json
index e1abcf9733c..1c5baf6e7dc 100644
--- a/docs/data/histograms/Norway/045L21A.json
+++ b/docs/data/histograms/Norway/045L21A.json
@@ -1 +1 @@
-{"batchcode": "045L21A", "histograms": [{"batchcodes": ["045L21A"], "histogram": {"Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "045L21A", "histograms": [{"histogram": {"Wrong product administered": 1}, "batchcodes": ["045L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/050C21A.json b/docs/data/histograms/Norway/050C21A.json
index 2b31aa321bc..84eff9e5824 100644
--- a/docs/data/histograms/Norway/050C21A.json
+++ b/docs/data/histograms/Norway/050C21A.json
@@ -1 +1 @@
-{"batchcode": "050C21A", "histograms": [{"batchcodes": ["050C21A", "078C21A"], "histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Malaise": 1, "Pain": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "Rash": 1, "Skin disorder": 1, "Sleep disorder": 1, "Swelling": 1, "Swelling face": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "050C21A", "histograms": [{"histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Malaise": 1, "Pain": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "Rash": 1, "Skin disorder": 1, "Sleep disorder": 1, "Swelling": 1, "Swelling face": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["050C21A", "078C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/054C21A.json b/docs/data/histograms/Norway/054C21A.json
index 62528a269ee..ea24f580442 100644
--- a/docs/data/histograms/Norway/054C21A.json
+++ b/docs/data/histograms/Norway/054C21A.json
@@ -1 +1 @@
-{"batchcode": "054C21A", "histograms": [{"batchcodes": ["054C21A"], "histogram": {"Dizziness": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "054C21A", "histograms": [{"histogram": {"Dizziness": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["054C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/063B22A.json b/docs/data/histograms/Norway/063B22A.json
index 4a10a3f9d65..b3c1619c58a 100644
--- a/docs/data/histograms/Norway/063B22A.json
+++ b/docs/data/histograms/Norway/063B22A.json
@@ -1 +1 @@
-{"batchcode": "063B22A", "histograms": [{"batchcodes": ["063B22A"], "histogram": {"Incorrect product formulation administered": 1}}]}
\ No newline at end of file
+{"batchcode": "063B22A", "histograms": [{"histogram": {"Incorrect product formulation administered": 1}, "batchcodes": ["063B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/076C21A.json b/docs/data/histograms/Norway/076C21A.json
index fa3fcbfd5d1..77f9ce112f6 100644
--- a/docs/data/histograms/Norway/076C21A.json
+++ b/docs/data/histograms/Norway/076C21A.json
@@ -1 +1 @@
-{"batchcode": "076C21A", "histograms": [{"batchcodes": ["076C21A"], "histogram": {"Back pain": 1, "Computerised tomogram normal": 1, "Dysgeusia": 1, "Gait disturbance": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging normal": 1, "Raynaud's phenomenon": 1}}]}
\ No newline at end of file
+{"batchcode": "076C21A", "histograms": [{"histogram": {"Back pain": 1, "Computerised tomogram normal": 1, "Dysgeusia": 1, "Gait disturbance": 1, "Hypoaesthesia": 1, "Magnetic resonance imaging normal": 1, "Raynaud's phenomenon": 1}, "batchcodes": ["076C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/078C21A.json b/docs/data/histograms/Norway/078C21A.json
index 7f1d84c38b1..202e947abea 100644
--- a/docs/data/histograms/Norway/078C21A.json
+++ b/docs/data/histograms/Norway/078C21A.json
@@ -1 +1 @@
-{"batchcode": "078C21A", "histograms": [{"batchcodes": ["050C21A", "078C21A"], "histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Malaise": 1, "Pain": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "Rash": 1, "Skin disorder": 1, "Sleep disorder": 1, "Swelling": 1, "Swelling face": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "078C21A", "histograms": [{"histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Inflammation": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Malaise": 1, "Pain": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "Rash": 1, "Skin disorder": 1, "Sleep disorder": 1, "Swelling": 1, "Swelling face": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["050C21A", "078C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/088DZIIA.json b/docs/data/histograms/Norway/088DZIIA.json
index b42ac196fa3..693f1b6e81a 100644
--- a/docs/data/histograms/Norway/088DZIIA.json
+++ b/docs/data/histograms/Norway/088DZIIA.json
@@ -1 +1 @@
-{"batchcode": "088DZIIA", "histograms": [{"batchcodes": ["088DZIIA"], "histogram": {"Blood test": 1, "Cardiac monitoring abnormal": 1, "Cardiac pacemaker insertion": 1, "Computerised tomogram": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea": 1, "Echocardiogram normal": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Nasal discomfort": 1, "Nervous system disorder": 1, "Sinus arrest": 1, "Surgery": 1}}]}
\ No newline at end of file
+{"batchcode": "088DZIIA", "histograms": [{"histogram": {"Blood test": 1, "Cardiac monitoring abnormal": 1, "Cardiac pacemaker insertion": 1, "Computerised tomogram": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea": 1, "Echocardiogram normal": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Nasal discomfort": 1, "Nervous system disorder": 1, "Sinus arrest": 1, "Surgery": 1}, "batchcodes": ["088DZIIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/1805020.json b/docs/data/histograms/Norway/1805020.json
index d834c09ae2b..800d2deda12 100644
--- a/docs/data/histograms/Norway/1805020.json
+++ b/docs/data/histograms/Norway/1805020.json
@@ -1 +1 @@
-{"batchcode": "1805020", "histograms": [{"batchcodes": ["1805020"], "histogram": {"Arthralgia": 1, "Constipation": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Joint stiffness": 1, "Lethargy": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "1805020", "histograms": [{"histogram": {"Arthralgia": 1, "Constipation": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Joint stiffness": 1, "Lethargy": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Tremor": 1}, "batchcodes": ["1805020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/1808982.json b/docs/data/histograms/Norway/1808982.json
index f061519ee1b..d53bb38b2c3 100644
--- a/docs/data/histograms/Norway/1808982.json
+++ b/docs/data/histograms/Norway/1808982.json
@@ -1 +1 @@
-{"batchcode": "1808982", "histograms": [{"batchcodes": ["1808982"], "histogram": {"Asthenia": 1, "Chest X-ray normal": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Electrocardiogram normal": 1, "Fatigue": 1, "Fibrin D dimer normal": 1, "Headache": 1, "Influenza like illness": 1, "Metabolic function test": 1, "Nausea": 1, "Pyrexia": 1, "Respiratory tract congestion": 1, "Troponin normal": 1, "Ventricular extrasystoles": 1}}]}
\ No newline at end of file
+{"batchcode": "1808982", "histograms": [{"histogram": {"Asthenia": 1, "Chest X-ray normal": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Electrocardiogram normal": 1, "Fatigue": 1, "Fibrin D dimer normal": 1, "Headache": 1, "Influenza like illness": 1, "Metabolic function test": 1, "Nausea": 1, "Pyrexia": 1, "Respiratory tract congestion": 1, "Troponin normal": 1, "Ventricular extrasystoles": 1}, "batchcodes": ["1808982"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/204A21A.json b/docs/data/histograms/Norway/204A21A.json
index 68eba9d1e05..7a5b93c2743 100644
--- a/docs/data/histograms/Norway/204A21A.json
+++ b/docs/data/histograms/Norway/204A21A.json
@@ -1 +1 @@
-{"batchcode": "204A21A", "histograms": [{"batchcodes": ["204A21A"], "histogram": {"Burning sensation": 1, "Headache": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "204A21A", "histograms": [{"histogram": {"Burning sensation": 1, "Headache": 1, "Rash": 1}, "batchcodes": ["204A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/211D21A.json b/docs/data/histograms/Norway/211D21A.json
index c00bb9759cc..279c92c053f 100644
--- a/docs/data/histograms/Norway/211D21A.json
+++ b/docs/data/histograms/Norway/211D21A.json
@@ -1 +1 @@
-{"batchcode": "211D21A", "histograms": [{"batchcodes": ["211D21A"], "histogram": {"Arthralgia": 1, "Blood test": 1, "Bronchitis": 1, "Cough": 1, "Crying": 1, "Dry throat": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Insomnia": 1, "Lacrimation increased": 1, "Lethargy": 1, "Malaise": 1, "Mouth breathing": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "SARS-CoV-2 antibody test negative": 1, "Sinus congestion": 1, "Sinusitis": 1, "Somnolence": 1, "Speech disorder": 1, "Sputum discoloured": 1, "Throat irritation": 1, "Throat tightness": 1, "Vaccination complication": 1, "Vein disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "211D21A", "histograms": [{"histogram": {"Arthralgia": 1, "Blood test": 1, "Bronchitis": 1, "Cough": 1, "Crying": 1, "Dry throat": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Insomnia": 1, "Lacrimation increased": 1, "Lethargy": 1, "Malaise": 1, "Mouth breathing": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "SARS-CoV-2 antibody test negative": 1, "Sinus congestion": 1, "Sinusitis": 1, "Somnolence": 1, "Speech disorder": 1, "Sputum discoloured": 1, "Throat irritation": 1, "Throat tightness": 1, "Vaccination complication": 1, "Vein disorder": 1, "Vomiting": 1}, "batchcodes": ["211D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/59267-1000-01.json b/docs/data/histograms/Norway/59267-1000-01.json
index ef43bb6ce5b..468ad66daf8 100644
--- a/docs/data/histograms/Norway/59267-1000-01.json
+++ b/docs/data/histograms/Norway/59267-1000-01.json
@@ -1 +1 @@
-{"batchcode": "59267-1000-01", "histograms": [{"batchcodes": ["59267-1000-01"], "histogram": {"Rash papular": 1, "Rash pruritic": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "59267-1000-01", "histograms": [{"histogram": {"Rash papular": 1, "Rash pruritic": 1, "Urticaria": 1}, "batchcodes": ["59267-1000-01"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/6199.json b/docs/data/histograms/Norway/6199.json
index fbb3496a1a4..04752e42fc7 100644
--- a/docs/data/histograms/Norway/6199.json
+++ b/docs/data/histograms/Norway/6199.json
@@ -1 +1 @@
-{"batchcode": "6199", "histograms": [{"batchcodes": ["6199"], "histogram": {"Dyspnoea": 1, "Hot flush": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "6199", "histograms": [{"histogram": {"Dyspnoea": 1, "Hot flush": 1, "Palpitations": 1}, "batchcodes": ["6199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/? 012M209.json b/docs/data/histograms/Norway/? 012M209.json
index a754db9b203..87f84ae38ea 100644
--- a/docs/data/histograms/Norway/? 012M209.json
+++ b/docs/data/histograms/Norway/? 012M209.json
@@ -1 +1 @@
-{"batchcode": "? 012M209", "histograms": [{"batchcodes": ["? 012M209"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "? 012M209", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1}, "batchcodes": ["? 012M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/AB75320.json b/docs/data/histograms/Norway/AB75320.json
index 6f667d51500..ac39341c67f 100644
--- a/docs/data/histograms/Norway/AB75320.json
+++ b/docs/data/histograms/Norway/AB75320.json
@@ -1 +1 @@
-{"batchcode": "AB75320", "histograms": [{"batchcodes": ["AB75320"], "histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Lung disorder": 1, "Malaise": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Sneezing": 1, "Tinnitus": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "AB75320", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Lung disorder": 1, "Malaise": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Sneezing": 1, "Tinnitus": 1, "Tremor": 1}, "batchcodes": ["AB75320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EK5730.json b/docs/data/histograms/Norway/EK5730.json
index 8ddf5f06200..4e05f516452 100644
--- a/docs/data/histograms/Norway/EK5730.json
+++ b/docs/data/histograms/Norway/EK5730.json
@@ -1 +1 @@
-{"batchcode": "EK5730", "histograms": [{"batchcodes": ["EK5730"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Impaired work ability": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EK5730", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Impaired work ability": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Sleep disorder": 1}, "batchcodes": ["EK5730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EL3249.json b/docs/data/histograms/Norway/EL3249.json
index bd1551f70b4..de02f800682 100644
--- a/docs/data/histograms/Norway/EL3249.json
+++ b/docs/data/histograms/Norway/EL3249.json
@@ -1 +1 @@
-{"batchcode": "EL3249", "histograms": [{"batchcodes": ["EL3249"], "histogram": {"Arthralgia": 1, "Bone pain": 1, "Erythema": 1, "Mobility decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3249", "histograms": [{"histogram": {"Arthralgia": 1, "Bone pain": 1, "Erythema": 1, "Mobility decreased": 1}, "batchcodes": ["EL3249"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EL3302.json b/docs/data/histograms/Norway/EL3302.json
index a31d086c1dc..c4463b7d840 100644
--- a/docs/data/histograms/Norway/EL3302.json
+++ b/docs/data/histograms/Norway/EL3302.json
@@ -1 +1 @@
-{"batchcode": "EL3302", "histograms": [{"batchcodes": ["EL3302"], "histogram": {"Cardiac monitoring": 1, "Chills": 1, "Dizziness": 1, "Dysphagia": 1, "Headache": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Palpitations": 1, "Paraesthesia": 1, "Ventricular extrasystoles": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3302", "histograms": [{"histogram": {"Cardiac monitoring": 1, "Chills": 1, "Dizziness": 1, "Dysphagia": 1, "Headache": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Palpitations": 1, "Paraesthesia": 1, "Ventricular extrasystoles": 1, "Vertigo": 1}, "batchcodes": ["EL3302"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EL9262.json b/docs/data/histograms/Norway/EL9262.json
index 385040d5474..83224b6b137 100644
--- a/docs/data/histograms/Norway/EL9262.json
+++ b/docs/data/histograms/Norway/EL9262.json
@@ -1 +1 @@
-{"batchcode": "EL9262", "histograms": [{"batchcodes": ["EL9262"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Impaired work ability": 1, "Inflammation": 1, "Musculoskeletal stiffness": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9262", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Impaired work ability": 1, "Inflammation": 1, "Musculoskeletal stiffness": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["EL9262"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EN6203.json b/docs/data/histograms/Norway/EN6203.json
index 0db2256594a..b8dc284382b 100644
--- a/docs/data/histograms/Norway/EN6203.json
+++ b/docs/data/histograms/Norway/EN6203.json
@@ -1 +1 @@
-{"batchcode": "EN6203", "histograms": [{"batchcodes": ["EN6203"], "histogram": {"Dizziness": 1, "Flushing": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6203", "histograms": [{"histogram": {"Dizziness": 1, "Flushing": 1}, "batchcodes": ["EN6203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EW0168.json b/docs/data/histograms/Norway/EW0168.json
index 6b92cee8f71..3374132c21a 100644
--- a/docs/data/histograms/Norway/EW0168.json
+++ b/docs/data/histograms/Norway/EW0168.json
@@ -1 +1 @@
-{"batchcode": "EW0168", "histograms": [{"batchcodes": ["EW0168"], "histogram": {"Cough": 1, "Dysphonia": 1, "Dyspnoea": 1, "Pharyngeal swelling": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0168", "histograms": [{"histogram": {"Cough": 1, "Dysphonia": 1, "Dyspnoea": 1, "Pharyngeal swelling": 1, "Pruritus": 1}, "batchcodes": ["EW0168"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EW0171.json b/docs/data/histograms/Norway/EW0171.json
index f58f53972d7..2ac43e24fba 100644
--- a/docs/data/histograms/Norway/EW0171.json
+++ b/docs/data/histograms/Norway/EW0171.json
@@ -1 +1 @@
-{"batchcode": "EW0171", "histograms": [{"batchcodes": ["EW0171", "EW0182"], "histogram": {"Blood test": 1, "Ovarian cyst": 1, "Pain": 1, "Ultrasound scan abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0171", "histograms": [{"histogram": {"Blood test": 1, "Ovarian cyst": 1, "Pain": 1, "Ultrasound scan abnormal": 1}, "batchcodes": ["EW0171", "EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EW0182.json b/docs/data/histograms/Norway/EW0182.json
index a16d5b4169a..68b369921e5 100644
--- a/docs/data/histograms/Norway/EW0182.json
+++ b/docs/data/histograms/Norway/EW0182.json
@@ -1 +1 @@
-{"batchcode": "EW0182", "histograms": [{"batchcodes": ["EW0171", "EW0182"], "histogram": {"Blood test": 1, "Ovarian cyst": 1, "Pain": 1, "Ultrasound scan abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0182", "histograms": [{"histogram": {"Blood test": 1, "Ovarian cyst": 1, "Pain": 1, "Ultrasound scan abnormal": 1}, "batchcodes": ["EW0171", "EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/EW0183.json b/docs/data/histograms/Norway/EW0183.json
index 3eb83e85277..a72e5c8baed 100644
--- a/docs/data/histograms/Norway/EW0183.json
+++ b/docs/data/histograms/Norway/EW0183.json
@@ -1 +1 @@
-{"batchcode": "EW0183", "histograms": [{"batchcodes": ["EW0183"], "histogram": {"Epistaxis": 1, "Mouth haemorrhage": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0183", "histograms": [{"histogram": {"Epistaxis": 1, "Mouth haemorrhage": 1, "Pain": 1}, "batchcodes": ["EW0183"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/LOT#EN6206.json b/docs/data/histograms/Norway/LOT#EN6206.json
index 4cfdaa86b61..61ceaf46370 100644
--- a/docs/data/histograms/Norway/LOT#EN6206.json
+++ b/docs/data/histograms/Norway/LOT#EN6206.json
@@ -1 +1 @@
-{"batchcode": "LOT#EN6206", "histograms": [{"batchcodes": ["LOT#EN6206"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT#EN6206", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["LOT#EN6206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Norway/UK.json b/docs/data/histograms/Norway/UK.json
index d2010f651fb..edd1fa4b318 100644
--- a/docs/data/histograms/Norway/UK.json
+++ b/docs/data/histograms/Norway/UK.json
@@ -1 +1 @@
-{"batchcode": "UK", "histograms": [{"batchcodes": ["UK"], "histogram": {"Unevaluable event": 1}}]}
\ No newline at end of file
+{"batchcode": "UK", "histograms": [{"histogram": {"Unevaluable event": 1}, "batchcodes": ["UK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Pakistan/014E21A.json b/docs/data/histograms/Pakistan/014E21A.json
index 9429d1b205f..ff282fcf4fd 100644
--- a/docs/data/histograms/Pakistan/014E21A.json
+++ b/docs/data/histograms/Pakistan/014E21A.json
@@ -1 +1 @@
-{"batchcode": "014E21A", "histograms": [{"batchcodes": ["014E21A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "014E21A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["014E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/014M20A.json b/docs/data/histograms/Panama/014M20A.json
index 3d628a6aca2..14f72217c86 100644
--- a/docs/data/histograms/Panama/014M20A.json
+++ b/docs/data/histograms/Panama/014M20A.json
@@ -1 +1 @@
-{"batchcode": "014M20A", "histograms": [{"batchcodes": ["014M20A"], "histogram": {"Balance disorder": 1, "Blood glucose abnormal": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Dizziness": 1, "Gait disturbance": 1, "Magnetic resonance imaging": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "014M20A", "histograms": [{"histogram": {"Balance disorder": 1, "Blood glucose abnormal": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Dizziness": 1, "Gait disturbance": 1, "Magnetic resonance imaging": 1, "Urine analysis": 1}, "batchcodes": ["014M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/025J20A.json b/docs/data/histograms/Panama/025J20A.json
index 3ea40f51d3e..9b7ab7bf382 100644
--- a/docs/data/histograms/Panama/025J20A.json
+++ b/docs/data/histograms/Panama/025J20A.json
@@ -1 +1 @@
-{"batchcode": "025J20A", "histograms": [{"batchcodes": ["025J20A"], "histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Injection site warmth": 1}, "batchcodes": ["025J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/039K20A.json b/docs/data/histograms/Panama/039K20A.json
index 63ae8a9688a..9aea2e1f48b 100644
--- a/docs/data/histograms/Panama/039K20A.json
+++ b/docs/data/histograms/Panama/039K20A.json
@@ -1 +1 @@
-{"batchcode": "039K20A", "histograms": [{"batchcodes": ["039K20A"], "histogram": {"Dizziness": 1, "Flushing": 1}}]}
\ No newline at end of file
+{"batchcode": "039K20A", "histograms": [{"histogram": {"Dizziness": 1, "Flushing": 1}, "batchcodes": ["039K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/204A21A.json b/docs/data/histograms/Panama/204A21A.json
index 214488e5575..d6513107160 100644
--- a/docs/data/histograms/Panama/204A21A.json
+++ b/docs/data/histograms/Panama/204A21A.json
@@ -1 +1 @@
-{"batchcode": "204A21A", "histograms": [{"batchcodes": ["204A21A"], "histogram": {"Blood test": 1, "COVID-19": 1, "SARS-CoV-2 test": 1, "Type 1 diabetes mellitus": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "204A21A", "histograms": [{"histogram": {"Blood test": 1, "COVID-19": 1, "SARS-CoV-2 test": 1, "Type 1 diabetes mellitus": 1, "Vaccination failure": 1}, "batchcodes": ["204A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/206A21A.json b/docs/data/histograms/Panama/206A21A.json
index b6f567c09a7..3a3b595e782 100644
--- a/docs/data/histograms/Panama/206A21A.json
+++ b/docs/data/histograms/Panama/206A21A.json
@@ -1 +1 @@
-{"batchcode": "206A21A", "histograms": [{"batchcodes": ["206A21A"], "histogram": {"Abnormal dreams": 1, "Contusion": 1, "Epistaxis": 1, "Eye haemorrhage": 1, "Fatigue": 1, "Headache": 1, "Injection site reaction": 1, "Nervousness": 1, "Pyrexia": 1, "Rash": 1, "Skin haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "206A21A", "histograms": [{"histogram": {"Abnormal dreams": 1, "Contusion": 1, "Epistaxis": 1, "Eye haemorrhage": 1, "Fatigue": 1, "Headache": 1, "Injection site reaction": 1, "Nervousness": 1, "Pyrexia": 1, "Rash": 1, "Skin haemorrhage": 1}, "batchcodes": ["206A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/31025BD.json b/docs/data/histograms/Panama/31025BD.json
index f1795563849..ae50cca2053 100644
--- a/docs/data/histograms/Panama/31025BD.json
+++ b/docs/data/histograms/Panama/31025BD.json
@@ -1 +1 @@
-{"batchcode": "31025BD", "histograms": [{"batchcodes": ["31025BD"], "histogram": {"Epiglottic oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "31025BD", "histograms": [{"histogram": {"Epiglottic oedema": 1}, "batchcodes": ["31025BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/BD31025.json b/docs/data/histograms/Panama/BD31025.json
index 0c3872f801a..954c99f9d78 100644
--- a/docs/data/histograms/Panama/BD31025.json
+++ b/docs/data/histograms/Panama/BD31025.json
@@ -1 +1 @@
-{"batchcode": "BD31025", "histograms": [{"batchcodes": ["BD31025"], "histogram": {"Chest pain": 1, "Hypertensive crisis": 1}}]}
\ No newline at end of file
+{"batchcode": "BD31025", "histograms": [{"histogram": {"Chest pain": 1, "Hypertensive crisis": 1}, "batchcodes": ["BD31025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EL 9261.json b/docs/data/histograms/Panama/EL 9261.json
index df903fb22d8..4681090440f 100644
--- a/docs/data/histograms/Panama/EL 9261.json
+++ b/docs/data/histograms/Panama/EL 9261.json
@@ -1 +1 @@
-{"batchcode": "EL 9261", "histograms": [{"batchcodes": ["EL 9261"], "histogram": {"Diarrhoea": 1, "Metamorphopsia": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "EL 9261", "histograms": [{"histogram": {"Diarrhoea": 1, "Metamorphopsia": 1, "Urinary tract infection": 1}, "batchcodes": ["EL 9261"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EL1404.json b/docs/data/histograms/Panama/EL1404.json
index 86345b26059..21e1816bf34 100644
--- a/docs/data/histograms/Panama/EL1404.json
+++ b/docs/data/histograms/Panama/EL1404.json
@@ -1 +1 @@
-{"batchcode": "EL1404", "histograms": [{"batchcodes": ["EL1404"], "histogram": {"Allergy to vaccine": 3, "Angioedema": 2, "Dysphagia": 2, "Foreign body in throat": 2, "Hypersensitivity": 2, "Hypotonic-hyporesponsive episode": 2, "Nausea": 2, "Presyncope": 2, "Pyrexia": 2, "Salivary hypersecretion": 2, "Syncope": 2, "Vomiting": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Asthenia": 1, "Body temperature": 1, "Bradycardia": 1, "COVID-19": 1, "Chills": 1, "Drug ineffective": 1, "Incorrect route of product administration": 1, "Irritability": 1, "Local reaction": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Pharyngitis": 1, "Polymerase chain reaction": 1, "Rhinorrhoea": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1404", "histograms": [{"histogram": {"Allergy to vaccine": 3, "Angioedema": 2, "Dysphagia": 2, "Foreign body in throat": 2, "Hypersensitivity": 2, "Hypotonic-hyporesponsive episode": 2, "Nausea": 2, "Presyncope": 2, "Pyrexia": 2, "Salivary hypersecretion": 2, "Syncope": 2, "Vomiting": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Asthenia": 1, "Body temperature": 1, "Bradycardia": 1, "COVID-19": 1, "Chills": 1, "Drug ineffective": 1, "Incorrect route of product administration": 1, "Irritability": 1, "Local reaction": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Pharyngitis": 1, "Polymerase chain reaction": 1, "Rhinorrhoea": 1, "Vaccination site reaction": 1}, "batchcodes": ["EL1404"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EM9809.json b/docs/data/histograms/Panama/EM9809.json
index a14b62ad604..a28cfa25a22 100644
--- a/docs/data/histograms/Panama/EM9809.json
+++ b/docs/data/histograms/Panama/EM9809.json
@@ -1 +1 @@
-{"batchcode": "EM9809", "histograms": [{"batchcodes": ["EM9809"], "histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Fatigue": 1, "Frequent bowel movements": 1, "Hyperhidrosis": 1, "Pain in extremity": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9809", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Fatigue": 1, "Frequent bowel movements": 1, "Hyperhidrosis": 1, "Pain in extremity": 1, "Vomiting": 1}, "batchcodes": ["EM9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EP6017.json b/docs/data/histograms/Panama/EP6017.json
index 2e36544eec7..2b985186094 100644
--- a/docs/data/histograms/Panama/EP6017.json
+++ b/docs/data/histograms/Panama/EP6017.json
@@ -1 +1 @@
-{"batchcode": "EP6017", "histograms": [{"batchcodes": ["EP6017"], "histogram": {"Pruritus": 12, "Rash": 12, "Headache": 6, "Allergy to vaccine": 5, "Rash pruritic": 5, "Hypertensive crisis": 4, "Paraesthesia": 4, "Dizziness": 3, "Dyspnoea": 3, "Gait disturbance": 3, "Hemiparesis": 3, "Hypoaesthesia oral": 3, "Pulmonary pain": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Asthenia": 2, "Hypertension": 2, "Hypotonic-hyporesponsive episode": 2, "Nausea": 2, "Agitation": 1, "Anaphylactic reaction": 1, "Asthmatic crisis": 1, "Back pain": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood pressure measurement": 1, "Cough": 1, "Diarrhoea": 1, "Dysphagia": 1, "Feeling hot": 1, "Guillain-Barre syndrome": 1, "Hypersensitivity": 1, "Hypertensive emergency": 1, "Hypotonia": 1, "Local reaction": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pallor": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "Urinary incontinence": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6017", "histograms": [{"histogram": {"Pruritus": 12, "Rash": 12, "Headache": 6, "Allergy to vaccine": 5, "Rash pruritic": 5, "Hypertensive crisis": 4, "Paraesthesia": 4, "Dizziness": 3, "Dyspnoea": 3, "Gait disturbance": 3, "Hemiparesis": 3, "Hypoaesthesia oral": 3, "Pulmonary pain": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Asthenia": 2, "Hypertension": 2, "Hypotonic-hyporesponsive episode": 2, "Nausea": 2, "Agitation": 1, "Anaphylactic reaction": 1, "Asthmatic crisis": 1, "Back pain": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood pressure measurement": 1, "Cough": 1, "Diarrhoea": 1, "Dysphagia": 1, "Feeling hot": 1, "Guillain-Barre syndrome": 1, "Hypersensitivity": 1, "Hypertensive emergency": 1, "Hypotonia": 1, "Local reaction": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pallor": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "Urinary incontinence": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["EP6017"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EP6019.json b/docs/data/histograms/Panama/EP6019.json
index 4fc7b6d0d1c..c4cc65f3225 100644
--- a/docs/data/histograms/Panama/EP6019.json
+++ b/docs/data/histograms/Panama/EP6019.json
@@ -1 +1 @@
-{"batchcode": "EP6019", "histograms": [{"batchcodes": ["EP6019"], "histogram": {"Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Polymerase chain reaction": 1, "Rash erythematous": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6019", "histograms": [{"histogram": {"Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Polymerase chain reaction": 1, "Rash erythematous": 1, "Rash pruritic": 1}, "batchcodes": ["EP6019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EP6775.json b/docs/data/histograms/Panama/EP6775.json
index c5e0b64e031..956dc472a3d 100644
--- a/docs/data/histograms/Panama/EP6775.json
+++ b/docs/data/histograms/Panama/EP6775.json
@@ -1 +1 @@
-{"batchcode": "EP6775", "histograms": [{"batchcodes": ["EP6775"], "histogram": {"Dyspnoea": 4, "Hypertensive crisis": 4, "Bronchospasm": 2, "Hyperglycaemia": 2, "Pyrexia": 2, "Seizure": 2, "Tachycardia": 2, "Arthralgia": 1, "Asthenia": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Death": 1, "Dermatitis": 1, "Disease recurrence": 1, "Dysphonia": 1, "Dysuria": 1, "Ear pain": 1, "Hypertension": 1, "Local reaction": 1, "Myalgia": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Renal disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6775", "histograms": [{"histogram": {"Dyspnoea": 4, "Hypertensive crisis": 4, "Bronchospasm": 2, "Hyperglycaemia": 2, "Pyrexia": 2, "Seizure": 2, "Tachycardia": 2, "Arthralgia": 1, "Asthenia": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Death": 1, "Dermatitis": 1, "Disease recurrence": 1, "Dysphonia": 1, "Dysuria": 1, "Ear pain": 1, "Hypertension": 1, "Local reaction": 1, "Myalgia": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Renal disorder": 1}, "batchcodes": ["EP6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/ER1742.json b/docs/data/histograms/Panama/ER1742.json
index f45a55a974e..7ef5d1ee5c8 100644
--- a/docs/data/histograms/Panama/ER1742.json
+++ b/docs/data/histograms/Panama/ER1742.json
@@ -1 +1 @@
-{"batchcode": "ER1742", "histograms": [{"batchcodes": ["ER1742"], "histogram": {"Dysarthria": 3, "Hemiparesis": 3, "Cerebral ischaemia": 2, "Cough": 2, "Headache": 2, "Arrhythmia": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Cerebral atrophy": 1, "Cerebral small vessel ischaemic disease": 1, "Cerebrovascular accident": 1, "Computerised tomogram head": 1, "Depressed mood": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "ER1742", "histograms": [{"histogram": {"Dysarthria": 3, "Hemiparesis": 3, "Cerebral ischaemia": 2, "Cough": 2, "Headache": 2, "Arrhythmia": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Cerebral atrophy": 1, "Cerebral small vessel ischaemic disease": 1, "Cerebrovascular accident": 1, "Computerised tomogram head": 1, "Depressed mood": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1}, "batchcodes": ["ER1742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/ER7934.json b/docs/data/histograms/Panama/ER7934.json
index b8f59da9793..45e712b10d5 100644
--- a/docs/data/histograms/Panama/ER7934.json
+++ b/docs/data/histograms/Panama/ER7934.json
@@ -1 +1 @@
-{"batchcode": "ER7934", "histograms": [{"batchcodes": ["ER7934"], "histogram": {"Asthenia": 4, "Dysarthria": 2, "Hemiparesis": 2, "Hypoglycaemia": 2, "Agnosia": 1, "Blood glucose": 1, "Cough": 1, "Depressed mood": 1, "Dizziness": 1, "Dyspnoea": 1, "Hypertension": 1, "Hypertensive emergency": 1, "Pulmonary embolism": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7934", "histograms": [{"histogram": {"Asthenia": 4, "Dysarthria": 2, "Hemiparesis": 2, "Hypoglycaemia": 2, "Agnosia": 1, "Blood glucose": 1, "Cough": 1, "Depressed mood": 1, "Dizziness": 1, "Dyspnoea": 1, "Hypertension": 1, "Hypertensive emergency": 1, "Pulmonary embolism": 1, "Pyrexia": 1}, "batchcodes": ["ER7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/ER8732 & ER8731.json b/docs/data/histograms/Panama/ER8732 & ER8731.json
index efffc0dead2..ba49a43a5ee 100644
--- a/docs/data/histograms/Panama/ER8732 & ER8731.json
+++ b/docs/data/histograms/Panama/ER8732 & ER8731.json
@@ -1 +1 @@
-{"batchcode": "ER8732 & ER8731", "histograms": [{"batchcodes": ["ER8732 & ER8731"], "histogram": {"Herpes zoster": 1, "Rash": 1, "Rash pustular": 1, "Urticaria": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8732 & ER8731", "histograms": [{"histogram": {"Herpes zoster": 1, "Rash": 1, "Rash pustular": 1, "Urticaria": 1, "Vaccination complication": 1}, "batchcodes": ["ER8732 & ER8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/ET-0384.json b/docs/data/histograms/Panama/ET-0384.json
index 0f4bba4226a..b7dc03ff9f4 100644
--- a/docs/data/histograms/Panama/ET-0384.json
+++ b/docs/data/histograms/Panama/ET-0384.json
@@ -1 +1 @@
-{"batchcode": "ET-0384", "histograms": [{"batchcodes": ["ET-0384"], "histogram": {"Blood pressure measurement": 1, "Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "ET-0384", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Hypertension": 1}, "batchcodes": ["ET-0384"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/ET0384.json b/docs/data/histograms/Panama/ET0384.json
index 19c5405eb80..83b454c55f5 100644
--- a/docs/data/histograms/Panama/ET0384.json
+++ b/docs/data/histograms/Panama/ET0384.json
@@ -1 +1 @@
-{"batchcode": "ET0384", "histograms": [{"batchcodes": ["ET0384"], "histogram": {"Angioedema": 1, "Blood pressure measurement": 1, "Cough": 1, "Hypertension": 1, "Paraesthesia": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "ET0384", "histograms": [{"histogram": {"Angioedema": 1, "Blood pressure measurement": 1, "Cough": 1, "Hypertension": 1, "Paraesthesia": 1, "Pruritus": 1}, "batchcodes": ["ET0384"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/ET0386.json b/docs/data/histograms/Panama/ET0386.json
index 4fbf8b001f9..ce7dd57f7e7 100644
--- a/docs/data/histograms/Panama/ET0386.json
+++ b/docs/data/histograms/Panama/ET0386.json
@@ -1 +1 @@
-{"batchcode": "ET0386", "histograms": [{"batchcodes": ["ET0386"], "histogram": {"Vaccination site abscess": 1}}]}
\ No newline at end of file
+{"batchcode": "ET0386", "histograms": [{"histogram": {"Vaccination site abscess": 1}, "batchcodes": ["ET0386"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EW0172.json b/docs/data/histograms/Panama/EW0172.json
index 757d820d6b5..591da535909 100644
--- a/docs/data/histograms/Panama/EW0172.json
+++ b/docs/data/histograms/Panama/EW0172.json
@@ -1 +1 @@
-{"batchcode": "EW0172", "histograms": [{"batchcodes": ["EW0172"], "histogram": {"Syncope": 2, "Aphasia": 1, "Blindness": 1, "Blindness transient": 1, "Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Bradycardia": 1, "Confusional state": 1, "Dysarthria": 1, "Heart rate": 1, "Heart rate decreased": 1, "Investigation": 1, "Malaise": 1, "Oxygen consumption": 1, "Oxygen consumption decreased": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0172", "histograms": [{"histogram": {"Syncope": 2, "Aphasia": 1, "Blindness": 1, "Blindness transient": 1, "Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Bradycardia": 1, "Confusional state": 1, "Dysarthria": 1, "Heart rate": 1, "Heart rate decreased": 1, "Investigation": 1, "Malaise": 1, "Oxygen consumption": 1, "Oxygen consumption decreased": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0172"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EW0176.json b/docs/data/histograms/Panama/EW0176.json
index cc3ac1f5880..b11b7f5b3a6 100644
--- a/docs/data/histograms/Panama/EW0176.json
+++ b/docs/data/histograms/Panama/EW0176.json
@@ -1 +1 @@
-{"batchcode": "EW0176", "histograms": [{"batchcodes": ["EW0176"], "histogram": {"Body temperature": 1, "Headache": 1, "Malaise": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site joint movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0176", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Malaise": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site joint movement impairment": 1}, "batchcodes": ["EW0176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EX0438.json b/docs/data/histograms/Panama/EX0438.json
index daddaad535b..297a3d6a226 100644
--- a/docs/data/histograms/Panama/EX0438.json
+++ b/docs/data/histograms/Panama/EX0438.json
@@ -1 +1 @@
-{"batchcode": "EX0438", "histograms": [{"batchcodes": ["EX0438"], "histogram": {"Hypoglycaemia": 1, "Hypotonia": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EX0438", "histograms": [{"histogram": {"Hypoglycaemia": 1, "Hypotonia": 1, "Presyncope": 1}, "batchcodes": ["EX0438"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EY0575.json b/docs/data/histograms/Panama/EY0575.json
index cf5d722fdf3..2a55bcc9d26 100644
--- a/docs/data/histograms/Panama/EY0575.json
+++ b/docs/data/histograms/Panama/EY0575.json
@@ -1 +1 @@
-{"batchcode": "EY0575", "histograms": [{"batchcodes": ["EY0575"], "histogram": {"Polyneuropathy chronic": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0575", "histograms": [{"histogram": {"Polyneuropathy chronic": 1}, "batchcodes": ["EY0575"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EY0580.json b/docs/data/histograms/Panama/EY0580.json
index 8793b37d778..fb665cee71d 100644
--- a/docs/data/histograms/Panama/EY0580.json
+++ b/docs/data/histograms/Panama/EY0580.json
@@ -1 +1 @@
-{"batchcode": "EY0580", "histograms": [{"batchcodes": ["EY0580"], "histogram": {"Syncope": 3, "Dizziness": 1, "Hyperhidrosis": 1, "Hypotension": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0580", "histograms": [{"histogram": {"Syncope": 3, "Dizziness": 1, "Hyperhidrosis": 1, "Hypotension": 1}, "batchcodes": ["EY0580"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EY0581.json b/docs/data/histograms/Panama/EY0581.json
index 96459e2960d..69d4106ca7e 100644
--- a/docs/data/histograms/Panama/EY0581.json
+++ b/docs/data/histograms/Panama/EY0581.json
@@ -1 +1 @@
-{"batchcode": "EY0581", "histograms": [{"batchcodes": ["EY0581"], "histogram": {"Presyncope": 2, "Anaphylactic reaction": 1, "Angina unstable": 1, "Chest pain": 1, "Hypertensive crisis": 1, "Nausea": 1, "Pallor": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0581", "histograms": [{"histogram": {"Presyncope": 2, "Anaphylactic reaction": 1, "Angina unstable": 1, "Chest pain": 1, "Hypertensive crisis": 1, "Nausea": 1, "Pallor": 1, "Seizure": 1}, "batchcodes": ["EY0581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/EY4825.json b/docs/data/histograms/Panama/EY4825.json
index 80c8519e896..631b2fb7dfd 100644
--- a/docs/data/histograms/Panama/EY4825.json
+++ b/docs/data/histograms/Panama/EY4825.json
@@ -1 +1 @@
-{"batchcode": "EY4825", "histograms": [{"batchcodes": ["EY4825"], "histogram": {"Dysarthria": 1, "Hemiparesis": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4825", "histograms": [{"histogram": {"Dysarthria": 1, "Hemiparesis": 1}, "batchcodes": ["EY4825"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FA7478.json b/docs/data/histograms/Panama/FA7478.json
index ceb4fd4dbf4..b843939c9ea 100644
--- a/docs/data/histograms/Panama/FA7478.json
+++ b/docs/data/histograms/Panama/FA7478.json
@@ -1 +1 @@
-{"batchcode": "FA7478", "histograms": [{"batchcodes": ["FA7478"], "histogram": {"Cerebral ischaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7478", "histograms": [{"histogram": {"Cerebral ischaemia": 1}, "batchcodes": ["FA7478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FA9096.json b/docs/data/histograms/Panama/FA9096.json
index 610c18602a7..48906c61202 100644
--- a/docs/data/histograms/Panama/FA9096.json
+++ b/docs/data/histograms/Panama/FA9096.json
@@ -1 +1 @@
-{"batchcode": "FA9096", "histograms": [{"batchcodes": ["FA9096"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9096", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["FA9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FD7208.json b/docs/data/histograms/Panama/FD7208.json
index 9dead6b7d79..10819fcaa7f 100644
--- a/docs/data/histograms/Panama/FD7208.json
+++ b/docs/data/histograms/Panama/FD7208.json
@@ -1 +1 @@
-{"batchcode": "FD7208", "histograms": [{"batchcodes": ["FD7208"], "histogram": {"Endoscopy": 1, "Full blood count": 1, "Laboratory test": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Thrombocytopenia": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7208", "histograms": [{"histogram": {"Endoscopy": 1, "Full blood count": 1, "Laboratory test": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Thrombocytopenia": 1, "Urine analysis": 1}, "batchcodes": ["FD7208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FF2591.json b/docs/data/histograms/Panama/FF2591.json
index fa5af58adfe..d9382cdddcc 100644
--- a/docs/data/histograms/Panama/FF2591.json
+++ b/docs/data/histograms/Panama/FF2591.json
@@ -1 +1 @@
-{"batchcode": "FF2591", "histograms": [{"batchcodes": ["FF2591"], "histogram": {"Chest pain": 1, "Presyncope": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2591", "histograms": [{"histogram": {"Chest pain": 1, "Presyncope": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["FF2591"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FF5106.json b/docs/data/histograms/Panama/FF5106.json
index 9de9e22a2bf..c87151d9652 100644
--- a/docs/data/histograms/Panama/FF5106.json
+++ b/docs/data/histograms/Panama/FF5106.json
@@ -1 +1 @@
-{"batchcode": "FF5106", "histograms": [{"batchcodes": ["FF5106"], "histogram": {"Disease recurrence": 1, "Hypertensive crisis": 1, "Hypotension": 1, "Presyncope": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5106", "histograms": [{"histogram": {"Disease recurrence": 1, "Hypertensive crisis": 1, "Hypotension": 1, "Presyncope": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["FF5106"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FH 8021.json b/docs/data/histograms/Panama/FH 8021.json
index 74afe4b69aa..2348228e4d8 100644
--- a/docs/data/histograms/Panama/FH 8021.json
+++ b/docs/data/histograms/Panama/FH 8021.json
@@ -1 +1 @@
-{"batchcode": "FH 8021", "histograms": [{"batchcodes": ["FH 8021"], "histogram": {"Back pain": 1, "Blood test": 1, "Breast discomfort": 1, "Breast inflammation": 1, "Breast pain": 1, "Chest pain": 1, "Facial discomfort": 1, "Headache": 1, "Inflammation": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Pain in extremity": 1, "Product administered at inappropriate site": 1, "Pruritus": 1, "Quality of life decreased": 1, "Swelling": 1, "Ultrasound breast": 1, "Vaccination site pain": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FH 8021", "histograms": [{"histogram": {"Back pain": 1, "Blood test": 1, "Breast discomfort": 1, "Breast inflammation": 1, "Breast pain": 1, "Chest pain": 1, "Facial discomfort": 1, "Headache": 1, "Inflammation": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Pain in extremity": 1, "Product administered at inappropriate site": 1, "Pruritus": 1, "Quality of life decreased": 1, "Swelling": 1, "Ultrasound breast": 1, "Vaccination site pain": 1, "X-ray": 1}, "batchcodes": ["FH 8021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FJ1620.json b/docs/data/histograms/Panama/FJ1620.json
index 1fec4e8497c..0a80efaddb1 100644
--- a/docs/data/histograms/Panama/FJ1620.json
+++ b/docs/data/histograms/Panama/FJ1620.json
@@ -1 +1 @@
-{"batchcode": "FJ1620", "histograms": [{"batchcodes": ["FJ1620"], "histogram": {"Back pain": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test positive": 1, "Throat irritation": 1, "Vaccine breakthrough infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1620", "histograms": [{"histogram": {"Back pain": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test positive": 1, "Throat irritation": 1, "Vaccine breakthrough infection": 1}, "batchcodes": ["FJ1620"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FM3457.json b/docs/data/histograms/Panama/FM3457.json
index 587b6c15fc8..da67ff7bf04 100644
--- a/docs/data/histograms/Panama/FM3457.json
+++ b/docs/data/histograms/Panama/FM3457.json
@@ -1 +1 @@
-{"batchcode": "FM3457", "histograms": [{"batchcodes": ["FM3457"], "histogram": {"Bacterial test": 1, "Blood immunoglobulin E": 1, "Condition aggravated": 1, "Dermatosis": 1, "Eczema nummular": 1, "Eosinophil count": 1, "Fungal test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Investigation": 1, "Lymphocyte count": 1, "Macrocytosis": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Platelet count": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Rash vesicular": 1, "Reaction to excipient": 1, "Red blood cell scan": 1, "Scab": 1, "Secretion discharge": 1, "Skin abrasion": 1, "Skin exfoliation": 1, "Skin hyperpigmentation": 1, "Skin injury": 1, "Skin plaque": 1, "Thrombocytopenia": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FM3457", "histograms": [{"histogram": {"Bacterial test": 1, "Blood immunoglobulin E": 1, "Condition aggravated": 1, "Dermatosis": 1, "Eczema nummular": 1, "Eosinophil count": 1, "Fungal test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Investigation": 1, "Lymphocyte count": 1, "Macrocytosis": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Platelet count": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Rash vesicular": 1, "Reaction to excipient": 1, "Red blood cell scan": 1, "Scab": 1, "Secretion discharge": 1, "Skin abrasion": 1, "Skin exfoliation": 1, "Skin hyperpigmentation": 1, "Skin injury": 1, "Skin plaque": 1, "Thrombocytopenia": 1, "White blood cell count": 1}, "batchcodes": ["FM3457"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/FR7934.json b/docs/data/histograms/Panama/FR7934.json
index 0c339cfae59..f5086cfc162 100644
--- a/docs/data/histograms/Panama/FR7934.json
+++ b/docs/data/histograms/Panama/FR7934.json
@@ -1 +1 @@
-{"batchcode": "FR7934", "histograms": [{"batchcodes": ["FR7934"], "histogram": {"Paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FR7934", "histograms": [{"histogram": {"Paralysis": 1}, "batchcodes": ["FR7934"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/O16C21A.json b/docs/data/histograms/Panama/O16C21A.json
index d6f7edc106e..d9f6464caf4 100644
--- a/docs/data/histograms/Panama/O16C21A.json
+++ b/docs/data/histograms/Panama/O16C21A.json
@@ -1 +1 @@
-{"batchcode": "O16C21A", "histograms": [{"batchcodes": ["O16C21A"], "histogram": {"Asthenia": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "O16C21A", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["O16C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Panama/Q1404.json b/docs/data/histograms/Panama/Q1404.json
index 573b86095c1..93b0d017237 100644
--- a/docs/data/histograms/Panama/Q1404.json
+++ b/docs/data/histograms/Panama/Q1404.json
@@ -1 +1 @@
-{"batchcode": "Q1404", "histograms": [{"batchcodes": ["Q1404"], "histogram": {"Hypotonia": 1, "Hypotonic-hyporesponsive episode": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "Q1404", "histograms": [{"histogram": {"Hypotonia": 1, "Hypotonic-hyporesponsive episode": 1, "Syncope": 1}, "batchcodes": ["Q1404"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Paraguay/EG0584.json b/docs/data/histograms/Paraguay/EG0584.json
index fc86fef84d3..ce824409fab 100644
--- a/docs/data/histograms/Paraguay/EG0584.json
+++ b/docs/data/histograms/Paraguay/EG0584.json
@@ -1 +1 @@
-{"batchcode": "EG0584", "histograms": [{"batchcodes": ["EG0584"], "histogram": {"Choking": 1, "Extrasystoles": 1, "Headache": 1, "Tachycardia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EG0584", "histograms": [{"histogram": {"Choking": 1, "Extrasystoles": 1, "Headache": 1, "Tachycardia": 1, "Tremor": 1}, "batchcodes": ["EG0584"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Paraguay/EY0584.json b/docs/data/histograms/Paraguay/EY0584.json
index e9e8619753d..ef2bd5e23a9 100644
--- a/docs/data/histograms/Paraguay/EY0584.json
+++ b/docs/data/histograms/Paraguay/EY0584.json
@@ -1 +1 @@
-{"batchcode": "EY0584", "histograms": [{"batchcodes": ["EY0584"], "histogram": {"Abdominal pain": 1, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Blood test": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest scan": 1, "Feeling cold": 1, "Hypotension": 1, "Lacrimation increased": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0584", "histograms": [{"histogram": {"Abdominal pain": 1, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Blood test": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest scan": 1, "Feeling cold": 1, "Hypotension": 1, "Lacrimation increased": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1, "Tremor": 1}, "batchcodes": ["EY0584"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/000353A.json b/docs/data/histograms/Peru/000353A.json
index e04822e2674..3e92765f6df 100644
--- a/docs/data/histograms/Peru/000353A.json
+++ b/docs/data/histograms/Peru/000353A.json
@@ -1 +1 @@
-{"batchcode": "000353A", "histograms": [{"batchcodes": ["000353A"], "histogram": {"Chills": 2, "Arrhythmia": 1, "Asphyxia": 1, "Headache": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "000353A", "histograms": [{"histogram": {"Chills": 2, "Arrhythmia": 1, "Asphyxia": 1, "Headache": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["000353A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/000356A.json b/docs/data/histograms/Peru/000356A.json
index 7edcf60ede5..80ac42d4873 100644
--- a/docs/data/histograms/Peru/000356A.json
+++ b/docs/data/histograms/Peru/000356A.json
@@ -1 +1 @@
-{"batchcode": "000356A", "histograms": [{"batchcodes": ["000356A"], "histogram": {"Dizziness": 1, "Hot flush": 1, "Malaise": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "000356A", "histograms": [{"histogram": {"Dizziness": 1, "Hot flush": 1, "Malaise": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1}, "batchcodes": ["000356A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/000360A.json b/docs/data/histograms/Peru/000360A.json
index f012b395494..b7ffe7d9f94 100644
--- a/docs/data/histograms/Peru/000360A.json
+++ b/docs/data/histograms/Peru/000360A.json
@@ -1 +1 @@
-{"batchcode": "000360A", "histograms": [{"batchcodes": ["000360A"], "histogram": {"Deafness": 1, "Poor quality sleep": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "000360A", "histograms": [{"histogram": {"Deafness": 1, "Poor quality sleep": 1, "Pyrexia": 1}, "batchcodes": ["000360A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/041A21A.json b/docs/data/histograms/Peru/041A21A.json
index aeca202dec9..e4665b68c01 100644
--- a/docs/data/histograms/Peru/041A21A.json
+++ b/docs/data/histograms/Peru/041A21A.json
@@ -1 +1 @@
-{"batchcode": "041A21A", "histograms": [{"batchcodes": ["041A21A"], "histogram": {"SARS-CoV-2 antibody test": 1, "Therapy non-responder": 1}}]}
\ No newline at end of file
+{"batchcode": "041A21A", "histograms": [{"histogram": {"SARS-CoV-2 antibody test": 1, "Therapy non-responder": 1}, "batchcodes": ["041A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/204A21A.json b/docs/data/histograms/Peru/204A21A.json
index 3b5740932a5..fd82d569705 100644
--- a/docs/data/histograms/Peru/204A21A.json
+++ b/docs/data/histograms/Peru/204A21A.json
@@ -1 +1 @@
-{"batchcode": "204A21A", "histograms": [{"batchcodes": ["204A21A"], "histogram": {"Guillain-Barre syndrome": 1, "Sensory loss": 1}}]}
\ No newline at end of file
+{"batchcode": "204A21A", "histograms": [{"histogram": {"Guillain-Barre syndrome": 1, "Sensory loss": 1}, "batchcodes": ["204A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/34030BD.json b/docs/data/histograms/Peru/34030BD.json
index 5b5cbb90045..b1fa793b344 100644
--- a/docs/data/histograms/Peru/34030BD.json
+++ b/docs/data/histograms/Peru/34030BD.json
@@ -1 +1 @@
-{"batchcode": "34030BD", "histograms": [{"batchcodes": ["34030BD"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "34030BD", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["34030BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/87663.json b/docs/data/histograms/Peru/87663.json
index b5ceb8f8fa3..44f7033a241 100644
--- a/docs/data/histograms/Peru/87663.json
+++ b/docs/data/histograms/Peru/87663.json
@@ -1 +1 @@
-{"batchcode": "87663", "histograms": [{"batchcodes": ["87663"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Heart rate": 1, "Immunisation": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "87663", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Heart rate": 1, "Immunisation": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["87663"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EQ0168.json b/docs/data/histograms/Peru/EQ0168.json
index ae7d2f06a17..23c432a1c63 100644
--- a/docs/data/histograms/Peru/EQ0168.json
+++ b/docs/data/histograms/Peru/EQ0168.json
@@ -1 +1 @@
-{"batchcode": "EQ0168", "histograms": [{"batchcodes": ["EQ0168"], "histogram": {"Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "EQ0168", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1}, "batchcodes": ["EQ0168"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/ER2659.json b/docs/data/histograms/Peru/ER2659.json
index 1c61bc9222a..8744177cc5b 100644
--- a/docs/data/histograms/Peru/ER2659.json
+++ b/docs/data/histograms/Peru/ER2659.json
@@ -1 +1 @@
-{"batchcode": "ER2659", "histograms": [{"batchcodes": ["ER2659"], "histogram": {"Angioedema": 1, "Bronchial disorder": 1, "Epistaxis": 1, "General physical health deterioration": 1, "Helicobacter test": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Platelet count": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2659", "histograms": [{"histogram": {"Angioedema": 1, "Bronchial disorder": 1, "Epistaxis": 1, "General physical health deterioration": 1, "Helicobacter test": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Platelet count": 1}, "batchcodes": ["ER2659"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/ER7449.json b/docs/data/histograms/Peru/ER7449.json
index f7e2320a5d7..4dde2fe400c 100644
--- a/docs/data/histograms/Peru/ER7449.json
+++ b/docs/data/histograms/Peru/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Angioedema": 1, "Fatigue": 1, "Helicobacter test": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Platelet count": 1, "Platelet count decreased": 1, "Ultrasound abdomen": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Angioedema": 1, "Fatigue": 1, "Helicobacter test": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Platelet count": 1, "Platelet count decreased": 1, "Ultrasound abdomen": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/ER8729.json b/docs/data/histograms/Peru/ER8729.json
index 489452ad82a..f8f508bf666 100644
--- a/docs/data/histograms/Peru/ER8729.json
+++ b/docs/data/histograms/Peru/ER8729.json
@@ -1 +1 @@
-{"batchcode": "ER8729", "histograms": [{"batchcodes": ["ER8729"], "histogram": {"Biopsy": 1, "Ocular lymphoma": 1, "SARS-CoV-2 test": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8729", "histograms": [{"histogram": {"Biopsy": 1, "Ocular lymphoma": 1, "SARS-CoV-2 test": 1, "Visual impairment": 1}, "batchcodes": ["ER8729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/ET9096.json b/docs/data/histograms/Peru/ET9096.json
index 8b5e17761c1..2c63f55c6fb 100644
--- a/docs/data/histograms/Peru/ET9096.json
+++ b/docs/data/histograms/Peru/ET9096.json
@@ -1 +1 @@
-{"batchcode": "ET9096", "histograms": [{"batchcodes": ["ET9096"], "histogram": {"Body temperature": 1, "Facial paralysis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "ET9096", "histograms": [{"histogram": {"Body temperature": 1, "Facial paralysis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["ET9096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EW0151.json b/docs/data/histograms/Peru/EW0151.json
index 598ab21e60a..93901411788 100644
--- a/docs/data/histograms/Peru/EW0151.json
+++ b/docs/data/histograms/Peru/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Arthralgia": 1, "COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Arthralgia": 1, "COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EW0171.json b/docs/data/histograms/Peru/EW0171.json
index 993b18f09e6..2abf788a50f 100644
--- a/docs/data/histograms/Peru/EW0171.json
+++ b/docs/data/histograms/Peru/EW0171.json
@@ -1 +1 @@
-{"batchcode": "EW0171", "histograms": [{"batchcodes": ["EW0171"], "histogram": {"Anxiety": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Ultrasound breast": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0171", "histograms": [{"histogram": {"Anxiety": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Ultrasound breast": 1, "Ultrasound scan": 1}, "batchcodes": ["EW0171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EW0178.json b/docs/data/histograms/Peru/EW0178.json
index 6249c594967..0dd51686050 100644
--- a/docs/data/histograms/Peru/EW0178.json
+++ b/docs/data/histograms/Peru/EW0178.json
@@ -1 +1 @@
-{"batchcode": "EW0178", "histograms": [{"batchcodes": ["EW0178"], "histogram": {"Bradycardia": 1, "Bundle branch block left": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Head discomfort": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Ultrasound Doppler": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0178", "histograms": [{"histogram": {"Bradycardia": 1, "Bundle branch block left": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Head discomfort": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Ultrasound Doppler": 1, "Visual impairment": 1}, "batchcodes": ["EW0178"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EW0182.json b/docs/data/histograms/Peru/EW0182.json
index 2a489a5f2c8..b67b5947448 100644
--- a/docs/data/histograms/Peru/EW0182.json
+++ b/docs/data/histograms/Peru/EW0182.json
@@ -1 +1 @@
-{"batchcode": "EW0182", "histograms": [{"batchcodes": ["EW0182"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0182", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EW0182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EW0216.json b/docs/data/histograms/Peru/EW0216.json
index 03e749f3fb2..24999300f00 100644
--- a/docs/data/histograms/Peru/EW0216.json
+++ b/docs/data/histograms/Peru/EW0216.json
@@ -1 +1 @@
-{"batchcode": "EW0216", "histograms": [{"batchcodes": ["EW0216"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Gait inability": 1, "Loss of personal independence in daily activities": 1, "Pneumonia": 1, "Scan": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0216", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Gait inability": 1, "Loss of personal independence in daily activities": 1, "Pneumonia": 1, "Scan": 1, "White blood cell count": 1}, "batchcodes": ["EW0216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EWO175.json b/docs/data/histograms/Peru/EWO175.json
index b83c703e523..367cc862d21 100644
--- a/docs/data/histograms/Peru/EWO175.json
+++ b/docs/data/histograms/Peru/EWO175.json
@@ -1 +1 @@
-{"batchcode": "EWO175", "histograms": [{"batchcodes": ["EWO175"], "histogram": {"Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO175", "histograms": [{"histogram": {"Tachycardia": 1}, "batchcodes": ["EWO175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/EX2405.json b/docs/data/histograms/Peru/EX2405.json
index b0a5a0c139f..22a6779042f 100644
--- a/docs/data/histograms/Peru/EX2405.json
+++ b/docs/data/histograms/Peru/EX2405.json
@@ -1 +1 @@
-{"batchcode": "EX2405", "histograms": [{"batchcodes": ["EX2405"], "histogram": {"Facial paralysis": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EX2405", "histograms": [{"histogram": {"Facial paralysis": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EX2405"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FA4597.json b/docs/data/histograms/Peru/FA4597.json
index 5250ce50cbf..bcaffaf2fcb 100644
--- a/docs/data/histograms/Peru/FA4597.json
+++ b/docs/data/histograms/Peru/FA4597.json
@@ -1 +1 @@
-{"batchcode": "FA4597", "histograms": [{"batchcodes": ["FA4597"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 2, "Body temperature": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "FA4597", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 2, "Body temperature": 1, "Drug ineffective": 1}, "batchcodes": ["FA4597"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FA7483.json b/docs/data/histograms/Peru/FA7483.json
index 506f7bcf09c..82bf0e449b8 100644
--- a/docs/data/histograms/Peru/FA7483.json
+++ b/docs/data/histograms/Peru/FA7483.json
@@ -1 +1 @@
-{"batchcode": "FA7483", "histograms": [{"batchcodes": ["FA7483"], "histogram": {"Arthralgia": 3, "Headache": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Chills": 2, "Fatigue": 2, "Myalgia": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Tension headache": 2, "Blood pressure increased": 1, "Cold sweat": 1, "Feeling cold": 1, "Gastritis": 1, "Head discomfort": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Malaise": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neuralgia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7483", "histograms": [{"histogram": {"Arthralgia": 3, "Headache": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Chills": 2, "Fatigue": 2, "Myalgia": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Tension headache": 2, "Blood pressure increased": 1, "Cold sweat": 1, "Feeling cold": 1, "Gastritis": 1, "Head discomfort": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Malaise": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neuralgia": 1, "Paraesthesia": 1}, "batchcodes": ["FA7483"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FD7207.json b/docs/data/histograms/Peru/FD7207.json
index c3238b405af..b77c78de658 100644
--- a/docs/data/histograms/Peru/FD7207.json
+++ b/docs/data/histograms/Peru/FD7207.json
@@ -1 +1 @@
-{"batchcode": "FD7207", "histograms": [{"batchcodes": ["FD7207"], "histogram": {"Anaesthesia": 1, "Asthenia": 1, "Discomfort": 1, "Dysarthria": 1, "Eye irritation": 1, "Eye pruritus": 1, "Facial paralysis": 1, "Facial paresis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Paresis": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7207", "histograms": [{"histogram": {"Anaesthesia": 1, "Asthenia": 1, "Discomfort": 1, "Dysarthria": 1, "Eye irritation": 1, "Eye pruritus": 1, "Facial paralysis": 1, "Facial paresis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Paresis": 1}, "batchcodes": ["FD7207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FD7209.json b/docs/data/histograms/Peru/FD7209.json
index f504c9453d6..cd0da314342 100644
--- a/docs/data/histograms/Peru/FD7209.json
+++ b/docs/data/histograms/Peru/FD7209.json
@@ -1 +1 @@
-{"batchcode": "FD7209", "histograms": [{"batchcodes": ["FD7209"], "histogram": {"Pancreatic disorder": 1, "Pancreatitis": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7209", "histograms": [{"histogram": {"Pancreatic disorder": 1, "Pancreatitis": 1}, "batchcodes": ["FD7209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FH8021.json b/docs/data/histograms/Peru/FH8021.json
index c383cb62dd6..a05134ebc50 100644
--- a/docs/data/histograms/Peru/FH8021.json
+++ b/docs/data/histograms/Peru/FH8021.json
@@ -1 +1 @@
-{"batchcode": "FH8021", "histograms": [{"batchcodes": ["FH8021"], "histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Diarrhoea haemorrhagic": 1, "Flatulence": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8021", "histograms": [{"histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Diarrhoea haemorrhagic": 1, "Flatulence": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Off label use": 1}, "batchcodes": ["FH8021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FH8030.json b/docs/data/histograms/Peru/FH8030.json
index 6901b005ce5..7ec7b1f2850 100644
--- a/docs/data/histograms/Peru/FH8030.json
+++ b/docs/data/histograms/Peru/FH8030.json
@@ -1 +1 @@
-{"batchcode": "FH8030", "histograms": [{"batchcodes": ["FH8030"], "histogram": {"COVID-19": 1, "Headache": 1, "Malaise": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8030", "histograms": [{"histogram": {"COVID-19": 1, "Headache": 1, "Malaise": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FH8030"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FM2954.json b/docs/data/histograms/Peru/FM2954.json
index e94b7d64a10..3b0bd8beda2 100644
--- a/docs/data/histograms/Peru/FM2954.json
+++ b/docs/data/histograms/Peru/FM2954.json
@@ -1 +1 @@
-{"batchcode": "FM2954", "histograms": [{"batchcodes": ["FM2954"], "histogram": {"Aphonia": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Dysphonia": 1, "Ear pain": 1, "Ear swelling": 1, "Eating disorder": 1, "Immunisation": 1, "Malaise": 1, "Neck pain": 1, "Pancreatic disorder": 1, "Pancreatitis": 1, "Pruritus": 1, "Psoriasis": 1, "SARS-CoV-2 test": 1, "Skin lesion": 1, "Swelling": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2954", "histograms": [{"histogram": {"Aphonia": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Dysphonia": 1, "Ear pain": 1, "Ear swelling": 1, "Eating disorder": 1, "Immunisation": 1, "Malaise": 1, "Neck pain": 1, "Pancreatic disorder": 1, "Pancreatitis": 1, "Pruritus": 1, "Psoriasis": 1, "SARS-CoV-2 test": 1, "Skin lesion": 1, "Swelling": 1, "Throat tightness": 1}, "batchcodes": ["FM2954"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FM2964.json b/docs/data/histograms/Peru/FM2964.json
index baddebfa5c7..706092f828d 100644
--- a/docs/data/histograms/Peru/FM2964.json
+++ b/docs/data/histograms/Peru/FM2964.json
@@ -1 +1 @@
-{"batchcode": "FM2964", "histograms": [{"batchcodes": ["FM2964"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2964", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FM2964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FM9091.json b/docs/data/histograms/Peru/FM9091.json
index 10099aa905b..fc0d3012616 100644
--- a/docs/data/histograms/Peru/FM9091.json
+++ b/docs/data/histograms/Peru/FM9091.json
@@ -1 +1 @@
-{"batchcode": "FM9091", "histograms": [{"batchcodes": ["FM9091"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}}]}
\ No newline at end of file
+{"batchcode": "FM9091", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2}, "batchcodes": ["FM9091"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/FP8290.json b/docs/data/histograms/Peru/FP8290.json
index cb05cd4a3a3..1198b73d8f9 100644
--- a/docs/data/histograms/Peru/FP8290.json
+++ b/docs/data/histograms/Peru/FP8290.json
@@ -1 +1 @@
-{"batchcode": "FP8290", "histograms": [{"batchcodes": ["FP8290"], "histogram": {"Acquired phimosis": 1, "Keratitis": 1, "Phimosis": 1, "Stevens-Johnson syndrome": 1, "Toxic epidermal necrolysis": 1, "Vision blurred": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8290", "histograms": [{"histogram": {"Acquired phimosis": 1, "Keratitis": 1, "Phimosis": 1, "Stevens-Johnson syndrome": 1, "Toxic epidermal necrolysis": 1, "Vision blurred": 1, "Visual acuity reduced": 1}, "batchcodes": ["FP8290"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Peru/XD985.json b/docs/data/histograms/Peru/XD985.json
index 10428ed22bf..f9a7b342425 100644
--- a/docs/data/histograms/Peru/XD985.json
+++ b/docs/data/histograms/Peru/XD985.json
@@ -1 +1 @@
-{"batchcode": "XD985", "histograms": [{"batchcodes": ["XD985"], "histogram": {"Arthritis reactive": 1, "Back pain": 1, "Bedridden": 1, "Conjunctivitis": 1, "Eye irritation": 1, "Gait inability": 1, "HLA marker study": 1, "Impaired work ability": 1, "Injection site pain": 1, "Insomnia": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "XD985", "histograms": [{"histogram": {"Arthritis reactive": 1, "Back pain": 1, "Bedridden": 1, "Conjunctivitis": 1, "Eye irritation": 1, "Gait inability": 1, "HLA marker study": 1, "Impaired work ability": 1, "Injection site pain": 1, "Insomnia": 1, "X-ray": 1}, "batchcodes": ["XD985"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/000104A.json b/docs/data/histograms/Philippines/000104A.json
index ee3a9216742..e7b03086a9c 100644
--- a/docs/data/histograms/Philippines/000104A.json
+++ b/docs/data/histograms/Philippines/000104A.json
@@ -1 +1 @@
-{"batchcode": "000104A", "histograms": [{"batchcodes": ["000104A", "C202109123", "C202109123"], "histogram": {"Dyspnoea": 1, "Rash": 1}}, {"batchcodes": ["000104A"], "histogram": {"Hypersensitivity": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "000104A", "histograms": [{"histogram": {"Dyspnoea": 1, "Rash": 1}, "batchcodes": ["000104A", "C202109123", "C202109123"]}, {"histogram": {"Hypersensitivity": 1, "Rash": 1}, "batchcodes": ["000104A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/00012917.json b/docs/data/histograms/Philippines/00012917.json
index ecbed7aa9d9..44de12dfa85 100644
--- a/docs/data/histograms/Philippines/00012917.json
+++ b/docs/data/histograms/Philippines/00012917.json
@@ -1 +1 @@
-{"batchcode": "00012917", "histograms": [{"batchcodes": ["00012917"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "00012917", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["00012917"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/000129A.json b/docs/data/histograms/Philippines/000129A.json
index 4e17e0a7be5..0232655f026 100644
--- a/docs/data/histograms/Philippines/000129A.json
+++ b/docs/data/histograms/Philippines/000129A.json
@@ -1 +1 @@
-{"batchcode": "000129A", "histograms": [{"batchcodes": ["000129A"], "histogram": {"Dyspnoea": 2, "Back pain": 1, "Chills": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "000129A", "histograms": [{"histogram": {"Dyspnoea": 2, "Back pain": 1, "Chills": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Pyrexia": 1}, "batchcodes": ["000129A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/000139A.json b/docs/data/histograms/Philippines/000139A.json
index f4e4bb874af..5c54b867ed3 100644
--- a/docs/data/histograms/Philippines/000139A.json
+++ b/docs/data/histograms/Philippines/000139A.json
@@ -1 +1 @@
-{"batchcode": "000139A", "histograms": [{"batchcodes": ["000139A"], "histogram": {"Headache": 2, "Malaise": 2, "Pyrexia": 2}}]}
\ No newline at end of file
+{"batchcode": "000139A", "histograms": [{"histogram": {"Headache": 2, "Malaise": 2, "Pyrexia": 2}, "batchcodes": ["000139A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0002121A.json b/docs/data/histograms/Philippines/0002121A.json
index 0392626158c..0f5fc836a80 100644
--- a/docs/data/histograms/Philippines/0002121A.json
+++ b/docs/data/histograms/Philippines/0002121A.json
@@ -1 +1 @@
-{"batchcode": "0002121A", "histograms": [{"batchcodes": ["0002121A"], "histogram": {"Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0002121A", "histograms": [{"histogram": {"Vomiting": 1}, "batchcodes": ["0002121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/00107A.json b/docs/data/histograms/Philippines/00107A.json
index 6be050ec658..f5c21cb4df8 100644
--- a/docs/data/histograms/Philippines/00107A.json
+++ b/docs/data/histograms/Philippines/00107A.json
@@ -1 +1 @@
-{"batchcode": "00107A", "histograms": [{"batchcodes": ["00107A"], "histogram": {"Muscular weakness": 2}}]}
\ No newline at end of file
+{"batchcode": "00107A", "histograms": [{"histogram": {"Muscular weakness": 2}, "batchcodes": ["00107A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0021221A.json b/docs/data/histograms/Philippines/0021221A.json
index 10464949065..6f808a94440 100644
--- a/docs/data/histograms/Philippines/0021221A.json
+++ b/docs/data/histograms/Philippines/0021221A.json
@@ -1 +1 @@
-{"batchcode": "0021221A", "histograms": [{"batchcodes": ["0021221A", "213021A"], "histogram": {"Vaccination site reaction": 1}}, {"batchcodes": ["0021221A", "21B121A"], "histogram": {"Abdominal pain": 1, "Intestinal obstruction": 1}}]}
\ No newline at end of file
+{"batchcode": "0021221A", "histograms": [{"histogram": {"Vaccination site reaction": 1}, "batchcodes": ["0021221A", "213021A"]}, {"histogram": {"Abdominal pain": 1, "Intestinal obstruction": 1}, "batchcodes": ["0021221A", "21B121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0021G21A.json b/docs/data/histograms/Philippines/0021G21A.json
index 9b4cebf478e..d9b0669f291 100644
--- a/docs/data/histograms/Philippines/0021G21A.json
+++ b/docs/data/histograms/Philippines/0021G21A.json
@@ -1 +1 @@
-{"batchcode": "0021G21A", "histograms": [{"batchcodes": ["0021G21A"], "histogram": {"Labour pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0021G21A", "histograms": [{"histogram": {"Labour pain": 1}, "batchcodes": ["0021G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/002821A.json b/docs/data/histograms/Philippines/002821A.json
index 7dbb11f6876..ba2d3553cdb 100644
--- a/docs/data/histograms/Philippines/002821A.json
+++ b/docs/data/histograms/Philippines/002821A.json
@@ -1 +1 @@
-{"batchcode": "002821A", "histograms": [{"batchcodes": ["002821A"], "histogram": {"Abdominal pain": 2, "Abdominal pain upper": 2, "Diarrhoea": 2, "Vaccination site pain": 2, "Vomiting": 2, "Labour pain": 1}}]}
\ No newline at end of file
+{"batchcode": "002821A", "histograms": [{"histogram": {"Abdominal pain": 2, "Abdominal pain upper": 2, "Diarrhoea": 2, "Vaccination site pain": 2, "Vomiting": 2, "Labour pain": 1}, "batchcodes": ["002821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/002K219.json b/docs/data/histograms/Philippines/002K219.json
index a53c9f925fe..0e09de8618d 100644
--- a/docs/data/histograms/Philippines/002K219.json
+++ b/docs/data/histograms/Philippines/002K219.json
@@ -1 +1 @@
-{"batchcode": "002K219", "histograms": [{"batchcodes": ["002K219"], "histogram": {"Abdominal pain upper": 1}}]}
\ No newline at end of file
+{"batchcode": "002K219", "histograms": [{"histogram": {"Abdominal pain upper": 1}, "batchcodes": ["002K219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/002K21A.json b/docs/data/histograms/Philippines/002K21A.json
index 0869bc1b567..0df105fe87d 100644
--- a/docs/data/histograms/Philippines/002K21A.json
+++ b/docs/data/histograms/Philippines/002K21A.json
@@ -1 +1 @@
-{"batchcode": "002K21A", "histograms": [{"batchcodes": ["002K21A", "210182", "210182"], "histogram": {"Acute coronary syndrome": 1}}, {"batchcodes": ["002K21A", "23K21A"], "histogram": {"Diarrhoea": 2, "Vomiting": 2}}, {"batchcodes": ["002K21A", "C202109177", "J202107048"], "histogram": {"Vomiting": 1}}, {"batchcodes": ["002K21A"], "histogram": {"Dyspnoea": 3, "Haemoptysis": 3, "Chest pain": 2, "Haematemesis": 2, "Abdominal distension": 1, "Acute myeloid leukaemia": 1, "Acute respiratory failure": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "HIV test": 1, "Haematochezia": 1, "Head injury": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Obstructive airways disorder": 1, "Oedema": 1, "Rash": 1, "Seizure": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "002K21A", "histograms": [{"histogram": {"Acute coronary syndrome": 1}, "batchcodes": ["002K21A", "210182", "210182"]}, {"histogram": {"Diarrhoea": 2, "Vomiting": 2}, "batchcodes": ["002K21A", "23K21A"]}, {"histogram": {"Vomiting": 1}, "batchcodes": ["002K21A", "C202109177", "J202107048"]}, {"histogram": {"Dyspnoea": 3, "Haemoptysis": 3, "Chest pain": 2, "Haematemesis": 2, "Abdominal distension": 1, "Acute myeloid leukaemia": 1, "Acute respiratory failure": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "HIV test": 1, "Haematochezia": 1, "Head injury": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Obstructive airways disorder": 1, "Oedema": 1, "Rash": 1, "Seizure": 1, "Urticaria": 1}, "batchcodes": ["002K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/002L21A.json b/docs/data/histograms/Philippines/002L21A.json
index 4092682ee09..625f1d01789 100644
--- a/docs/data/histograms/Philippines/002L21A.json
+++ b/docs/data/histograms/Philippines/002L21A.json
@@ -1 +1 @@
-{"batchcode": "002L21A", "histograms": [{"batchcodes": ["002L21A"], "histogram": {"Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "002L21A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["002L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0033.json b/docs/data/histograms/Philippines/0033.json
index 22eb3aa7458..9b81193f513 100644
--- a/docs/data/histograms/Philippines/0033.json
+++ b/docs/data/histograms/Philippines/0033.json
@@ -1 +1 @@
-{"batchcode": "0033", "histograms": [{"batchcodes": ["0033", "068F21A", "K003B"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "0033", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["0033", "068F21A", "K003B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/00380777.json b/docs/data/histograms/Philippines/00380777.json
index 95659e4d1e2..b1e4450d7bf 100644
--- a/docs/data/histograms/Philippines/00380777.json
+++ b/docs/data/histograms/Philippines/00380777.json
@@ -1 +1 @@
-{"batchcode": "00380777", "histograms": [{"batchcodes": ["00380777"], "histogram": {"Decreased appetite": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "00380777", "histograms": [{"histogram": {"Decreased appetite": 1, "Swelling face": 1}, "batchcodes": ["00380777"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/005C21A.json b/docs/data/histograms/Philippines/005C21A.json
index d1d3cee8784..3a7ec1cfdce 100644
--- a/docs/data/histograms/Philippines/005C21A.json
+++ b/docs/data/histograms/Philippines/005C21A.json
@@ -1 +1 @@
-{"batchcode": "005C21A", "histograms": [{"batchcodes": ["005C21A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "005C21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["005C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/005H21A.json b/docs/data/histograms/Philippines/005H21A.json
index 12d16ade857..1499f91269d 100644
--- a/docs/data/histograms/Philippines/005H21A.json
+++ b/docs/data/histograms/Philippines/005H21A.json
@@ -1 +1 @@
-{"batchcode": "005H21A", "histograms": [{"batchcodes": ["005H21A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "005H21A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["005H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/005K21A.json b/docs/data/histograms/Philippines/005K21A.json
index 3baa07c0632..046b337081e 100644
--- a/docs/data/histograms/Philippines/005K21A.json
+++ b/docs/data/histograms/Philippines/005K21A.json
@@ -1 +1 @@
-{"batchcode": "005K21A", "histograms": [{"batchcodes": ["005K21A"], "histogram": {"Abdominal pain upper": 1, "Back pain": 1, "Chest pain": 1, "Cold sweat": 1, "Death": 1, "Epigastric discomfort": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Oedema peripheral": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "005K21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Back pain": 1, "Chest pain": 1, "Cold sweat": 1, "Death": 1, "Epigastric discomfort": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Oedema peripheral": 1, "Pyrexia": 1, "Rash": 1, "Seizure": 1, "Vaccination site pain": 1}, "batchcodes": ["005K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/005KIA.json b/docs/data/histograms/Philippines/005KIA.json
index 72bc41eab63..1a853fe4f72 100644
--- a/docs/data/histograms/Philippines/005KIA.json
+++ b/docs/data/histograms/Philippines/005KIA.json
@@ -1 +1 @@
-{"batchcode": "005KIA", "histograms": [{"batchcodes": ["005KIA"], "histogram": {"Asthenia": 1, "Dyspnoea": 1, "Headache": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "005KIA", "histograms": [{"histogram": {"Asthenia": 1, "Dyspnoea": 1, "Headache": 1, "Vomiting": 1}, "batchcodes": ["005KIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0071214.json b/docs/data/histograms/Philippines/0071214.json
index afcf42cbfc2..bc6b201956d 100644
--- a/docs/data/histograms/Philippines/0071214.json
+++ b/docs/data/histograms/Philippines/0071214.json
@@ -1 +1 @@
-{"batchcode": "0071214", "histograms": [{"batchcodes": ["0071214"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "0071214", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["0071214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/007B21A.json b/docs/data/histograms/Philippines/007B21A.json
index 441aadef262..da4fdd4035b 100644
--- a/docs/data/histograms/Philippines/007B21A.json
+++ b/docs/data/histograms/Philippines/007B21A.json
@@ -1 +1 @@
-{"batchcode": "007B21A", "histograms": [{"batchcodes": ["007B21A"], "histogram": {"Abdominal discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "007B21A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Sleep disorder": 1}, "batchcodes": ["007B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/007H21A.json b/docs/data/histograms/Philippines/007H21A.json
index 8e7ee1a4884..9a28df0c423 100644
--- a/docs/data/histograms/Philippines/007H21A.json
+++ b/docs/data/histograms/Philippines/007H21A.json
@@ -1 +1 @@
-{"batchcode": "007H21A", "histograms": [{"batchcodes": ["007H21A"], "histogram": {"Cold sweat": 3, "Chest pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain": 1, "Constipation": 1, "Headache": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Nausea": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "007H21A", "histograms": [{"histogram": {"Cold sweat": 3, "Chest pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain": 1, "Constipation": 1, "Headache": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Nausea": 1, "Pallor": 1, "Palpitations": 1, "Paralysis": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["007H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/007H2IA.json b/docs/data/histograms/Philippines/007H2IA.json
index 6bf78ad3793..108b65d67aa 100644
--- a/docs/data/histograms/Philippines/007H2IA.json
+++ b/docs/data/histograms/Philippines/007H2IA.json
@@ -1 +1 @@
-{"batchcode": "007H2IA", "histograms": [{"batchcodes": ["007H2IA"], "histogram": {"Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "007H2IA", "histograms": [{"histogram": {"Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["007H2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/008H21A.json b/docs/data/histograms/Philippines/008H21A.json
index e4baf987920..f0b034b4e0e 100644
--- a/docs/data/histograms/Philippines/008H21A.json
+++ b/docs/data/histograms/Philippines/008H21A.json
@@ -1 +1 @@
-{"batchcode": "008H21A", "histograms": [{"batchcodes": ["008H21A", "ACB3221"], "histogram": {"Chest pain": 2, "Dyspnoea": 2}}]}
\ No newline at end of file
+{"batchcode": "008H21A", "histograms": [{"histogram": {"Chest pain": 2, "Dyspnoea": 2}, "batchcodes": ["008H21A", "ACB3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/00K21A.json b/docs/data/histograms/Philippines/00K21A.json
index 1ebb011f0f5..fd8aabc5dc0 100644
--- a/docs/data/histograms/Philippines/00K21A.json
+++ b/docs/data/histograms/Philippines/00K21A.json
@@ -1 +1 @@
-{"batchcode": "00K21A", "histograms": [{"batchcodes": ["00K21A"], "histogram": {"Chills": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00K21A", "histograms": [{"histogram": {"Chills": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["00K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/010612B.json b/docs/data/histograms/Philippines/010612B.json
index 6f336983264..db9c272a7a4 100644
--- a/docs/data/histograms/Philippines/010612B.json
+++ b/docs/data/histograms/Philippines/010612B.json
@@ -1 +1 @@
-{"batchcode": "010612B", "histograms": [{"batchcodes": ["010612B"], "histogram": {"Fracture displacement": 1}}]}
\ No newline at end of file
+{"batchcode": "010612B", "histograms": [{"histogram": {"Fracture displacement": 1}, "batchcodes": ["010612B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0106213.json b/docs/data/histograms/Philippines/0106213.json
index 241324fa9d6..7852576b549 100644
--- a/docs/data/histograms/Philippines/0106213.json
+++ b/docs/data/histograms/Philippines/0106213.json
@@ -1 +1 @@
-{"batchcode": "0106213", "histograms": [{"batchcodes": ["0106213"], "histogram": {"Open fracture": 1}}]}
\ No newline at end of file
+{"batchcode": "0106213", "histograms": [{"histogram": {"Open fracture": 1}, "batchcodes": ["0106213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0106218.json b/docs/data/histograms/Philippines/0106218.json
index 522aca09c2d..14bf8d7f51e 100644
--- a/docs/data/histograms/Philippines/0106218.json
+++ b/docs/data/histograms/Philippines/0106218.json
@@ -1 +1 @@
-{"batchcode": "0106218", "histograms": [{"batchcodes": ["0106218"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0106218", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Rash": 1}, "batchcodes": ["0106218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/010621B.json b/docs/data/histograms/Philippines/010621B.json
index 3142d7bb783..83a27627670 100644
--- a/docs/data/histograms/Philippines/010621B.json
+++ b/docs/data/histograms/Philippines/010621B.json
@@ -1 +1 @@
-{"batchcode": "010621B", "histograms": [{"batchcodes": ["010621B"], "histogram": {"Eye swelling": 2, "Heart rate increased": 2, "Oxygen saturation decreased": 2, "Abdominal pain": 1, "Chest pain": 1, "Cold sweat": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Pyrexia": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "010621B", "histograms": [{"histogram": {"Eye swelling": 2, "Heart rate increased": 2, "Oxygen saturation decreased": 2, "Abdominal pain": 1, "Chest pain": 1, "Cold sweat": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Pyrexia": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["010621B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/010G21.json b/docs/data/histograms/Philippines/010G21.json
index 53e59964e14..fab61ea451b 100644
--- a/docs/data/histograms/Philippines/010G21.json
+++ b/docs/data/histograms/Philippines/010G21.json
@@ -1 +1 @@
-{"batchcode": "010G21", "histograms": [{"batchcodes": ["010G21"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "010G21", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["010G21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/010G211.json b/docs/data/histograms/Philippines/010G211.json
index ac9fcad08d7..84588e651be 100644
--- a/docs/data/histograms/Philippines/010G211.json
+++ b/docs/data/histograms/Philippines/010G211.json
@@ -1 +1 @@
-{"batchcode": "010G211", "histograms": [{"batchcodes": ["010G211"], "histogram": {"Back pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010G211", "histograms": [{"histogram": {"Back pain": 1}, "batchcodes": ["010G211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/010G21A.json b/docs/data/histograms/Philippines/010G21A.json
index bf71331b6d6..35afcbf4439 100644
--- a/docs/data/histograms/Philippines/010G21A.json
+++ b/docs/data/histograms/Philippines/010G21A.json
@@ -1 +1 @@
-{"batchcode": "010G21A", "histograms": [{"batchcodes": ["010G21A"], "histogram": {"Platelet count decreased": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "010G21A", "histograms": [{"histogram": {"Platelet count decreased": 1, "Pyrexia": 1}, "batchcodes": ["010G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/010G21B.json b/docs/data/histograms/Philippines/010G21B.json
index a5907b94aa1..8ee0678f50b 100644
--- a/docs/data/histograms/Philippines/010G21B.json
+++ b/docs/data/histograms/Philippines/010G21B.json
@@ -1 +1 @@
-{"batchcode": "010G21B", "histograms": [{"batchcodes": ["010G21B"], "histogram": {"Pyrexia": 9, "Headache": 7, "Vaccination site pain": 5, "Chest pain": 3, "Rash": 3, "Urticaria": 3, "Arthralgia": 2, "Chills": 2, "Chromaturia": 2, "Dizziness": 2, "Hypersensitivity": 2, "Pain": 2, "Pallor": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Asymptomatic COVID-19": 1, "Autoimmune haemolytic anaemia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Caesarean section": 1, "Cardiogenic shock": 1, "Chest discomfort": 1, "Death": 1, "Disorientation": 1, "Dysarthria": 1, "Dyspnoea": 1, "Eczema": 1, "Erythema": 1, "Haematemesis": 1, "Haemolytic anaemia": 1, "Hepatocellular carcinoma": 1, "Hypoaesthesia": 1, "Hypovolaemic shock": 1, "Incorrect route of product administration": 1, "Inflammation": 1, "Injection site swelling": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Maternal exposure timing unspecified": 1, "Muscular weakness": 1, "Myalgia": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Palpitations": 1, "Periorbital swelling": 1, "Postpartum haemorrhage": 1, "Pruritus": 1, "Respiratory failure": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Syncope": 1, "Uterine atony": 1}}]}
\ No newline at end of file
+{"batchcode": "010G21B", "histograms": [{"histogram": {"Pyrexia": 9, "Headache": 7, "Vaccination site pain": 5, "Chest pain": 3, "Rash": 3, "Urticaria": 3, "Arthralgia": 2, "Chills": 2, "Chromaturia": 2, "Dizziness": 2, "Hypersensitivity": 2, "Pain": 2, "Pallor": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Asymptomatic COVID-19": 1, "Autoimmune haemolytic anaemia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Caesarean section": 1, "Cardiogenic shock": 1, "Chest discomfort": 1, "Death": 1, "Disorientation": 1, "Dysarthria": 1, "Dyspnoea": 1, "Eczema": 1, "Erythema": 1, "Haematemesis": 1, "Haemolytic anaemia": 1, "Hepatocellular carcinoma": 1, "Hypoaesthesia": 1, "Hypovolaemic shock": 1, "Incorrect route of product administration": 1, "Inflammation": 1, "Injection site swelling": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Maternal exposure timing unspecified": 1, "Muscular weakness": 1, "Myalgia": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Palpitations": 1, "Periorbital swelling": 1, "Postpartum haemorrhage": 1, "Pruritus": 1, "Respiratory failure": 1, "Rhabdomyolysis": 1, "Seizure": 1, "Syncope": 1, "Uterine atony": 1}, "batchcodes": ["010G21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/010GZ1B.json b/docs/data/histograms/Philippines/010GZ1B.json
index da2c331eb4a..d69db959e7b 100644
--- a/docs/data/histograms/Philippines/010GZ1B.json
+++ b/docs/data/histograms/Philippines/010GZ1B.json
@@ -1 +1 @@
-{"batchcode": "010GZ1B", "histograms": [{"batchcodes": ["010GZ1B"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "010GZ1B", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["010GZ1B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/012F21A.json b/docs/data/histograms/Philippines/012F21A.json
index 300d2cd22de..642bda8c2a3 100644
--- a/docs/data/histograms/Philippines/012F21A.json
+++ b/docs/data/histograms/Philippines/012F21A.json
@@ -1 +1 @@
-{"batchcode": "012F21A", "histograms": [{"batchcodes": ["012F21A", "FF8871"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Heart rate": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["012F21A", "J202106033"], "histogram": {"Asthma": 1, "COVID-19": 1, "Cough": 1, "Dyspnoea": 1}}, {"batchcodes": ["012F21A"], "histogram": {"Blood pressure increased": 2, "Vomiting": 2, "Anaphylactic shock": 1, "Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Generalised anxiety disorder": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Pneumonia aspiration": 1, "Pyrexia": 1, "Small intestinal obstruction reduction": 1, "Systemic lupus erythematosus": 1}}]}
\ No newline at end of file
+{"batchcode": "012F21A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Heart rate": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["012F21A", "FF8871"]}, {"histogram": {"Asthma": 1, "COVID-19": 1, "Cough": 1, "Dyspnoea": 1}, "batchcodes": ["012F21A", "J202106033"]}, {"histogram": {"Blood pressure increased": 2, "Vomiting": 2, "Anaphylactic shock": 1, "Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Generalised anxiety disorder": 1, "Headache": 1, "Loss of consciousness": 1, "Nausea": 1, "Pneumonia aspiration": 1, "Pyrexia": 1, "Small intestinal obstruction reduction": 1, "Systemic lupus erythematosus": 1}, "batchcodes": ["012F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/014E21A.json b/docs/data/histograms/Philippines/014E21A.json
index fb3e038765f..28e8b2d7456 100644
--- a/docs/data/histograms/Philippines/014E21A.json
+++ b/docs/data/histograms/Philippines/014E21A.json
@@ -1 +1 @@
-{"batchcode": "014E21A", "histograms": [{"batchcodes": ["014E21A"], "histogram": {"Cough": 2, "Pyrexia": 2, "Arthralgia": 1, "Decreased appetite": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "014E21A", "histograms": [{"histogram": {"Cough": 2, "Pyrexia": 2, "Arthralgia": 1, "Decreased appetite": 1, "Malaise": 1}, "batchcodes": ["014E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0169W038.json b/docs/data/histograms/Philippines/0169W038.json
index 7ccf36b9765..b07d1e495df 100644
--- a/docs/data/histograms/Philippines/0169W038.json
+++ b/docs/data/histograms/Philippines/0169W038.json
@@ -1 +1 @@
-{"batchcode": "0169W038", "histograms": [{"batchcodes": ["0169W038"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "0169W038", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["0169W038"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/017K21A.json b/docs/data/histograms/Philippines/017K21A.json
index 985095c7f04..222c1c867e0 100644
--- a/docs/data/histograms/Philippines/017K21A.json
+++ b/docs/data/histograms/Philippines/017K21A.json
@@ -1 +1 @@
-{"batchcode": "017K21A", "histograms": [{"batchcodes": ["017K21A"], "histogram": {"Asthenia": 1, "Dysarthria": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "017K21A", "histograms": [{"histogram": {"Asthenia": 1, "Dysarthria": 1, "Seizure": 1}, "batchcodes": ["017K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/019521A.json b/docs/data/histograms/Philippines/019521A.json
index 1dc41b8278a..97fcf64bc39 100644
--- a/docs/data/histograms/Philippines/019521A.json
+++ b/docs/data/histograms/Philippines/019521A.json
@@ -1 +1 @@
-{"batchcode": "019521A", "histograms": [{"batchcodes": ["019521A"], "histogram": {"Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "019521A", "histograms": [{"histogram": {"Diarrhoea": 1}, "batchcodes": ["019521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/020321A.json b/docs/data/histograms/Philippines/020321A.json
index 394f90e6380..bac11e0389f 100644
--- a/docs/data/histograms/Philippines/020321A.json
+++ b/docs/data/histograms/Philippines/020321A.json
@@ -1 +1 @@
-{"batchcode": "020321A", "histograms": [{"batchcodes": ["020321A"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Pruritus": 1, "Rhinitis": 1}}]}
\ No newline at end of file
+{"batchcode": "020321A", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Pruritus": 1, "Rhinitis": 1}, "batchcodes": ["020321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/020621A.json b/docs/data/histograms/Philippines/020621A.json
index 75d993a155c..ffad028b5f5 100644
--- a/docs/data/histograms/Philippines/020621A.json
+++ b/docs/data/histograms/Philippines/020621A.json
@@ -1 +1 @@
-{"batchcode": "020621A", "histograms": [{"batchcodes": ["020621A"], "histogram": {"Pyrexia": 5, "Vomiting": 4, "Headache": 3, "Dengue virus test positive": 2, "Diarrhoea": 2, "Platelet count decreased": 2, "Abortion incomplete": 1, "Decreased appetite": 1, "Dengue virus test": 1, "Fatigue": 1, "Platelet count": 1, "Road traffic accident": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "020621A", "histograms": [{"histogram": {"Pyrexia": 5, "Vomiting": 4, "Headache": 3, "Dengue virus test positive": 2, "Diarrhoea": 2, "Platelet count decreased": 2, "Abortion incomplete": 1, "Decreased appetite": 1, "Dengue virus test": 1, "Fatigue": 1, "Platelet count": 1, "Road traffic accident": 1, "Seizure": 1}, "batchcodes": ["020621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0206266.json b/docs/data/histograms/Philippines/0206266.json
index be4abfa87a3..1daaf1f87fe 100644
--- a/docs/data/histograms/Philippines/0206266.json
+++ b/docs/data/histograms/Philippines/0206266.json
@@ -1 +1 @@
-{"batchcode": "0206266", "histograms": [{"batchcodes": ["0206266"], "histogram": {"Dizziness": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "0206266", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1}, "batchcodes": ["0206266"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/02062A1.json b/docs/data/histograms/Philippines/02062A1.json
index cc73f8848b6..ffb7a231c6a 100644
--- a/docs/data/histograms/Philippines/02062A1.json
+++ b/docs/data/histograms/Philippines/02062A1.json
@@ -1 +1 @@
-{"batchcode": "02062A1", "histograms": [{"batchcodes": ["02062A1"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Palpitations": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "02062A1", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Palpitations": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["02062A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/020821A.json b/docs/data/histograms/Philippines/020821A.json
index d1af93cee42..554f3d32f81 100644
--- a/docs/data/histograms/Philippines/020821A.json
+++ b/docs/data/histograms/Philippines/020821A.json
@@ -1 +1 @@
-{"batchcode": "020821A", "histograms": [{"batchcodes": ["020821A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "020821A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["020821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/020G218.json b/docs/data/histograms/Philippines/020G218.json
index 30aa1980d7a..22c8e0dba06 100644
--- a/docs/data/histograms/Philippines/020G218.json
+++ b/docs/data/histograms/Philippines/020G218.json
@@ -1 +1 @@
-{"batchcode": "020G218", "histograms": [{"batchcodes": ["020G218"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "020G218", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["020G218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/020G21A.json b/docs/data/histograms/Philippines/020G21A.json
index 2e18c636b00..67fb0bbdc69 100644
--- a/docs/data/histograms/Philippines/020G21A.json
+++ b/docs/data/histograms/Philippines/020G21A.json
@@ -1 +1 @@
-{"batchcode": "020G21A", "histograms": [{"batchcodes": ["020G21A"], "histogram": {"Dizziness": 6, "Pyrexia": 5, "Dyspnoea": 3, "Nausea": 3, "Syncope": 3, "Vaccination site pain": 3, "Blood pressure increased": 2, "Chest pain": 2, "Chills": 2, "Headache": 2, "Hypotension": 2, "Rash": 2, "Vomiting": 2, "Abdominal pain": 1, "Ageusia": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "Bradycardia": 1, "Confusional state": 1, "Cough": 1, "Dengue virus test": 1, "Diarrhoea": 1, "Dry throat": 1, "Dysarthria": 1, "Facial paralysis": 1, "Haematemesis": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Palpitations": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pruritus": 1, "Rash erythematous": 1, "Sleep disorder": 1, "Sudden death": 1, "Vision blurred": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "020G21A", "histograms": [{"histogram": {"Dizziness": 6, "Pyrexia": 5, "Dyspnoea": 3, "Nausea": 3, "Syncope": 3, "Vaccination site pain": 3, "Blood pressure increased": 2, "Chest pain": 2, "Chills": 2, "Headache": 2, "Hypotension": 2, "Rash": 2, "Vomiting": 2, "Abdominal pain": 1, "Ageusia": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "Bradycardia": 1, "Confusional state": 1, "Cough": 1, "Dengue virus test": 1, "Diarrhoea": 1, "Dry throat": 1, "Dysarthria": 1, "Facial paralysis": 1, "Haematemesis": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Palpitations": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pruritus": 1, "Rash erythematous": 1, "Sleep disorder": 1, "Sudden death": 1, "Vision blurred": 1, "Wheezing": 1}, "batchcodes": ["020G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0212564.json b/docs/data/histograms/Philippines/0212564.json
index 9ad626d02d3..9cb7e3696d3 100644
--- a/docs/data/histograms/Philippines/0212564.json
+++ b/docs/data/histograms/Philippines/0212564.json
@@ -1 +1 @@
-{"batchcode": "0212564", "histograms": [{"batchcodes": ["0212564"], "histogram": {"Headache": 1, "Hypertension": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0212564", "histograms": [{"histogram": {"Headache": 1, "Hypertension": 1, "Vomiting": 1}, "batchcodes": ["0212564"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/023004A.json b/docs/data/histograms/Philippines/023004A.json
index 420861c294e..6bfc5139aae 100644
--- a/docs/data/histograms/Philippines/023004A.json
+++ b/docs/data/histograms/Philippines/023004A.json
@@ -1 +1 @@
-{"batchcode": "023004A", "histograms": [{"batchcodes": ["023004A"], "histogram": {"Asthenia": 1, "Dysarthria": 1}}]}
\ No newline at end of file
+{"batchcode": "023004A", "histograms": [{"histogram": {"Asthenia": 1, "Dysarthria": 1}, "batchcodes": ["023004A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/025J20.json b/docs/data/histograms/Philippines/025J20.json
index 69f51a0a42b..7357e1ff911 100644
--- a/docs/data/histograms/Philippines/025J20.json
+++ b/docs/data/histograms/Philippines/025J20.json
@@ -1 +1 @@
-{"batchcode": "025J20", "histograms": [{"batchcodes": ["025J20", "FF2589"], "histogram": {"Breakthrough COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20", "histograms": [{"histogram": {"Breakthrough COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025J20", "FF2589"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/029K- NOT CLEAR.json b/docs/data/histograms/Philippines/029K- NOT CLEAR.json
index 5ba5f567628..35e87619da3 100644
--- a/docs/data/histograms/Philippines/029K- NOT CLEAR.json
+++ b/docs/data/histograms/Philippines/029K- NOT CLEAR.json
@@ -1 +1 @@
-{"batchcode": "029K- NOT CLEAR", "histograms": [{"batchcodes": ["029K- NOT CLEAR"], "histogram": {"Angioedema": 1, "Flushing": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "029K- NOT CLEAR", "histograms": [{"histogram": {"Angioedema": 1, "Flushing": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["029K- NOT CLEAR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/029K21A.json b/docs/data/histograms/Philippines/029K21A.json
index 03401ee3c7c..f04aa154104 100644
--- a/docs/data/histograms/Philippines/029K21A.json
+++ b/docs/data/histograms/Philippines/029K21A.json
@@ -1 +1 @@
-{"batchcode": "029K21A", "histograms": [{"batchcodes": ["029K21A"], "histogram": {"Dyspnoea": 2, "Abdominal pain upper": 1, "Chest pain": 1, "Cough": 1, "Headache": 1, "Muscular weakness": 1, "Oedema peripheral": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "029K21A", "histograms": [{"histogram": {"Dyspnoea": 2, "Abdominal pain upper": 1, "Chest pain": 1, "Cough": 1, "Headache": 1, "Muscular weakness": 1, "Oedema peripheral": 1, "Pyrexia": 1}, "batchcodes": ["029K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/030K21A.json b/docs/data/histograms/Philippines/030K21A.json
index 153ac7419c8..0a791513e94 100644
--- a/docs/data/histograms/Philippines/030K21A.json
+++ b/docs/data/histograms/Philippines/030K21A.json
@@ -1 +1 @@
-{"batchcode": "030K21A", "histograms": [{"batchcodes": ["030K21A"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "030K21A", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["030K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/031209C21A.json b/docs/data/histograms/Philippines/031209C21A.json
index 4addf3caf69..51fabd659c2 100644
--- a/docs/data/histograms/Philippines/031209C21A.json
+++ b/docs/data/histograms/Philippines/031209C21A.json
@@ -1 +1 @@
-{"batchcode": "031209C21A", "histograms": [{"batchcodes": ["031209C21A"], "histogram": {"Cough": 1, "Pneumonia": 1, "Pulmonary tuberculosis": 1}}]}
\ No newline at end of file
+{"batchcode": "031209C21A", "histograms": [{"histogram": {"Cough": 1, "Pneumonia": 1, "Pulmonary tuberculosis": 1}, "batchcodes": ["031209C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0320218D.json b/docs/data/histograms/Philippines/0320218D.json
index f9d076ce423..b2a01c24c59 100644
--- a/docs/data/histograms/Philippines/0320218D.json
+++ b/docs/data/histograms/Philippines/0320218D.json
@@ -1 +1 @@
-{"batchcode": "0320218D", "histograms": [{"batchcodes": ["0320218D"], "histogram": {"Blood pressure increased": 5, "Blood pressure measurement": 5}}]}
\ No newline at end of file
+{"batchcode": "0320218D", "histograms": [{"histogram": {"Blood pressure increased": 5, "Blood pressure measurement": 5}, "batchcodes": ["0320218D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0325BD.json b/docs/data/histograms/Philippines/0325BD.json
index f3ecf52eb6a..1813bf32af0 100644
--- a/docs/data/histograms/Philippines/0325BD.json
+++ b/docs/data/histograms/Philippines/0325BD.json
@@ -1 +1 @@
-{"batchcode": "0325BD", "histograms": [{"batchcodes": ["0325BD"], "histogram": {"Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0325BD", "histograms": [{"histogram": {"Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["0325BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/032621A.json b/docs/data/histograms/Philippines/032621A.json
index 377be69b82d..22f185cc880 100644
--- a/docs/data/histograms/Philippines/032621A.json
+++ b/docs/data/histograms/Philippines/032621A.json
@@ -1 +1 @@
-{"batchcode": "032621A", "histograms": [{"batchcodes": ["032621A"], "histogram": {"Immunisation": 2, "Off label use": 2, "Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dysarthria": 1, "Hemiparesis": 1, "Hypovolaemic shock": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "032621A", "histograms": [{"histogram": {"Immunisation": 2, "Off label use": 2, "Asthenia": 1, "Cough": 1, "Dizziness": 1, "Dysarthria": 1, "Hemiparesis": 1, "Hypovolaemic shock": 1, "Rash": 1}, "batchcodes": ["032621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0326G21A.json b/docs/data/histograms/Philippines/0326G21A.json
index 70ca215b1bd..b869e2b34ed 100644
--- a/docs/data/histograms/Philippines/0326G21A.json
+++ b/docs/data/histograms/Philippines/0326G21A.json
@@ -1 +1 @@
-{"batchcode": "0326G21A", "histograms": [{"batchcodes": ["0326G21A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0326G21A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["0326G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/032C219.json b/docs/data/histograms/Philippines/032C219.json
index 5603f59effb..3493cb449b1 100644
--- a/docs/data/histograms/Philippines/032C219.json
+++ b/docs/data/histograms/Philippines/032C219.json
@@ -1 +1 @@
-{"batchcode": "032C219", "histograms": [{"batchcodes": ["032C219"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "032C219", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["032C219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/032G21A.json b/docs/data/histograms/Philippines/032G21A.json
index f40ddce9d7d..3ca0712004d 100644
--- a/docs/data/histograms/Philippines/032G21A.json
+++ b/docs/data/histograms/Philippines/032G21A.json
@@ -1 +1 @@
-{"batchcode": "032G21A", "histograms": [{"batchcodes": ["032G21A"], "histogram": {"Diarrhoea": 1, "Dizziness": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "032G21A", "histograms": [{"histogram": {"Diarrhoea": 1, "Dizziness": 1, "Vomiting": 1}, "batchcodes": ["032G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/038F21B.json b/docs/data/histograms/Philippines/038F21B.json
index ecfa65135d9..d36bfbc2198 100644
--- a/docs/data/histograms/Philippines/038F21B.json
+++ b/docs/data/histograms/Philippines/038F21B.json
@@ -1 +1 @@
-{"batchcode": "038F21B", "histograms": [{"batchcodes": ["038F21B"], "histogram": {"Dysuria": 1, "Flank pain": 1, "Urinary retention": 1}}]}
\ No newline at end of file
+{"batchcode": "038F21B", "histograms": [{"histogram": {"Dysuria": 1, "Flank pain": 1, "Urinary retention": 1}, "batchcodes": ["038F21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/039F21A.json b/docs/data/histograms/Philippines/039F21A.json
index 768337e87b4..a8a489c8d26 100644
--- a/docs/data/histograms/Philippines/039F21A.json
+++ b/docs/data/histograms/Philippines/039F21A.json
@@ -1 +1 @@
-{"batchcode": "039F21A", "histograms": [{"batchcodes": ["039F21A"], "histogram": {"Abdominal pain": 1, "Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "039F21A", "histograms": [{"histogram": {"Abdominal pain": 1, "Cough": 1, "Dyspnoea": 1}, "batchcodes": ["039F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/039J21A.json b/docs/data/histograms/Philippines/039J21A.json
index 1389e527cbf..4a5b1c3ffdd 100644
--- a/docs/data/histograms/Philippines/039J21A.json
+++ b/docs/data/histograms/Philippines/039J21A.json
@@ -1 +1 @@
-{"batchcode": "039J21A", "histograms": [{"batchcodes": ["039J21A"], "histogram": {"Blister": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "039J21A", "histograms": [{"histogram": {"Blister": 1, "Rash": 1}, "batchcodes": ["039J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/042A21A.json b/docs/data/histograms/Philippines/042A21A.json
index e31fdf61b3e..698a78bdef7 100644
--- a/docs/data/histograms/Philippines/042A21A.json
+++ b/docs/data/histograms/Philippines/042A21A.json
@@ -1 +1 @@
-{"batchcode": "042A21A", "histograms": [{"batchcodes": ["042A21A"], "histogram": {"Fatigue": 1, "Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Malaise": 1, "Palpitations": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "042A21A", "histograms": [{"histogram": {"Fatigue": 1, "Guillain-Barre syndrome": 1, "Hypoaesthesia": 1, "Malaise": 1, "Palpitations": 1, "Pyrexia": 1}, "batchcodes": ["042A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/046 G21A.json b/docs/data/histograms/Philippines/046 G21A.json
index 3de8fd2c71b..975d378aceb 100644
--- a/docs/data/histograms/Philippines/046 G21A.json
+++ b/docs/data/histograms/Philippines/046 G21A.json
@@ -1 +1 @@
-{"batchcode": "046 G21A", "histograms": [{"batchcodes": ["046 G21A"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Embolic stroke": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "046 G21A", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Embolic stroke": 1, "Seizure": 1}, "batchcodes": ["046 G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/046621A.json b/docs/data/histograms/Philippines/046621A.json
index 891a2698786..a615671db21 100644
--- a/docs/data/histograms/Philippines/046621A.json
+++ b/docs/data/histograms/Philippines/046621A.json
@@ -1 +1 @@
-{"batchcode": "046621A", "histograms": [{"batchcodes": ["046621A"], "histogram": {"Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "046621A", "histograms": [{"histogram": {"Syncope": 1, "Vomiting": 1}, "batchcodes": ["046621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/046C21A.json b/docs/data/histograms/Philippines/046C21A.json
index a1df84098a0..1592fa5db00 100644
--- a/docs/data/histograms/Philippines/046C21A.json
+++ b/docs/data/histograms/Philippines/046C21A.json
@@ -1 +1 @@
-{"batchcode": "046C21A", "histograms": [{"batchcodes": ["046C21A"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "046C21A", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["046C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/046G1A.json b/docs/data/histograms/Philippines/046G1A.json
index eda3cfd2fe8..bf0675f9a14 100644
--- a/docs/data/histograms/Philippines/046G1A.json
+++ b/docs/data/histograms/Philippines/046G1A.json
@@ -1 +1 @@
-{"batchcode": "046G1A", "histograms": [{"batchcodes": ["046G1A"], "histogram": {"Blood pressure increased": 1, "Chest pain": 1, "Erythema": 1, "Palpitations": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "046G1A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Chest pain": 1, "Erythema": 1, "Palpitations": 1, "Rash": 1}, "batchcodes": ["046G1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/046G218.json b/docs/data/histograms/Philippines/046G218.json
index 6c20016a785..0a189d077f6 100644
--- a/docs/data/histograms/Philippines/046G218.json
+++ b/docs/data/histograms/Philippines/046G218.json
@@ -1 +1 @@
-{"batchcode": "046G218", "histograms": [{"batchcodes": ["046G218", "212C21A"], "histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "046G218", "histograms": [{"histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["046G218", "212C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/046G21A.json b/docs/data/histograms/Philippines/046G21A.json
index 8aa2a3d7306..a2a78705440 100644
--- a/docs/data/histograms/Philippines/046G21A.json
+++ b/docs/data/histograms/Philippines/046G21A.json
@@ -1 +1 @@
-{"batchcode": "046G21A", "histograms": [{"batchcodes": ["046G21A", "A1026"], "histogram": {"Acoustic stimulation tests": 1, "Foetal exposure during pregnancy": 1, "Heart rate variability test": 1, "Umbilical cord around neck": 1}}, {"batchcodes": ["046G21A"], "histogram": {"Dizziness": 4, "Chills": 3, "Pyrexia": 3, "Vomiting": 3, "Asthenia": 2, "Seizure": 2, "Abdominal pain": 1, "Chest pain": 1, "Headache": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Malaise": 1, "Monoplegia": 1, "Nausea": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "046G21A", "histograms": [{"histogram": {"Acoustic stimulation tests": 1, "Foetal exposure during pregnancy": 1, "Heart rate variability test": 1, "Umbilical cord around neck": 1}, "batchcodes": ["046G21A", "A1026"]}, {"histogram": {"Dizziness": 4, "Chills": 3, "Pyrexia": 3, "Vomiting": 3, "Asthenia": 2, "Seizure": 2, "Abdominal pain": 1, "Chest pain": 1, "Headache": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Malaise": 1, "Monoplegia": 1, "Nausea": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["046G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/04G21A.json b/docs/data/histograms/Philippines/04G21A.json
index 56a5a3840a5..81dc354b3a2 100644
--- a/docs/data/histograms/Philippines/04G21A.json
+++ b/docs/data/histograms/Philippines/04G21A.json
@@ -1 +1 @@
-{"batchcode": "04G21A", "histograms": [{"batchcodes": ["04G21A"], "histogram": {"Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "04G21A", "histograms": [{"histogram": {"Muscular weakness": 1}, "batchcodes": ["04G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/055221A.json b/docs/data/histograms/Philippines/055221A.json
index e9732ecb599..719c18ef4ea 100644
--- a/docs/data/histograms/Philippines/055221A.json
+++ b/docs/data/histograms/Philippines/055221A.json
@@ -1 +1 @@
-{"batchcode": "055221A", "histograms": [{"batchcodes": ["055221A"], "histogram": {"Pyrexia": 1, "Rash": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "055221A", "histograms": [{"histogram": {"Pyrexia": 1, "Rash": 1, "Thrombocytopenia": 1}, "batchcodes": ["055221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/055E21A.json b/docs/data/histograms/Philippines/055E21A.json
index 8d7c0e9a11d..18de4875a4a 100644
--- a/docs/data/histograms/Philippines/055E21A.json
+++ b/docs/data/histograms/Philippines/055E21A.json
@@ -1 +1 @@
-{"batchcode": "055E21A", "histograms": [{"batchcodes": ["055E21A", "34300BD"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["055E21A"], "histogram": {"Death": 2, "Dizziness": 2, "Dyspnoea": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Asthenia": 1, "Carbuncle": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Electrolyte imbalance": 1, "Headache": 1, "Hypersensitivity": 1, "Myalgia": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "055E21A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["055E21A", "34300BD"]}, {"histogram": {"Death": 2, "Dizziness": 2, "Dyspnoea": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Asthenia": 1, "Carbuncle": 1, "Cellulitis": 1, "Chills": 1, "Cough": 1, "Electrolyte imbalance": 1, "Headache": 1, "Hypersensitivity": 1, "Myalgia": 1, "Palpitations": 1}, "batchcodes": ["055E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/055E2IA.json b/docs/data/histograms/Philippines/055E2IA.json
index 2ff3e995f84..6a2f3868649 100644
--- a/docs/data/histograms/Philippines/055E2IA.json
+++ b/docs/data/histograms/Philippines/055E2IA.json
@@ -1 +1 @@
-{"batchcode": "055E2IA", "histograms": [{"batchcodes": ["055E2IA"], "histogram": {"Cardiac murmur": 1, "Cyanosis": 1, "Pallor": 1, "Pulse abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "055E2IA", "histograms": [{"histogram": {"Cardiac murmur": 1, "Cyanosis": 1, "Pallor": 1, "Pulse abnormal": 1}, "batchcodes": ["055E2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/055EZ1A.json b/docs/data/histograms/Philippines/055EZ1A.json
index ecf19f7937c..e24e886268a 100644
--- a/docs/data/histograms/Philippines/055EZ1A.json
+++ b/docs/data/histograms/Philippines/055EZ1A.json
@@ -1 +1 @@
-{"batchcode": "055EZ1A", "histograms": [{"batchcodes": ["055EZ1A", "FE3430"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "055EZ1A", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["055EZ1A", "FE3430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/056021A.json b/docs/data/histograms/Philippines/056021A.json
index 2a266a70b9f..6899ed3cded 100644
--- a/docs/data/histograms/Philippines/056021A.json
+++ b/docs/data/histograms/Philippines/056021A.json
@@ -1 +1 @@
-{"batchcode": "056021A", "histograms": [{"batchcodes": ["056021A"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Haematoma": 1, "Headache": 1, "Nausea": 1, "Petechiae": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "056021A", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Haematoma": 1, "Headache": 1, "Nausea": 1, "Petechiae": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["056021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/05602A.json b/docs/data/histograms/Philippines/05602A.json
index 769f8928c47..9603803af67 100644
--- a/docs/data/histograms/Philippines/05602A.json
+++ b/docs/data/histograms/Philippines/05602A.json
@@ -1 +1 @@
-{"batchcode": "05602A", "histograms": [{"batchcodes": ["05602A"], "histogram": {"COVID-19": 1, "Cough": 1, "Headache": 1, "Oxygen saturation": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "05602A", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Headache": 1, "Oxygen saturation": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["05602A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0561021A.json b/docs/data/histograms/Philippines/0561021A.json
index 6d349ad69fd..42ffe3634e2 100644
--- a/docs/data/histograms/Philippines/0561021A.json
+++ b/docs/data/histograms/Philippines/0561021A.json
@@ -1 +1 @@
-{"batchcode": "0561021A", "histograms": [{"batchcodes": ["0561021A"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0561021A", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["0561021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/05621A.json b/docs/data/histograms/Philippines/05621A.json
index d14662e4417..847dc8bc45e 100644
--- a/docs/data/histograms/Philippines/05621A.json
+++ b/docs/data/histograms/Philippines/05621A.json
@@ -1 +1 @@
-{"batchcode": "05621A", "histograms": [{"batchcodes": ["05621A"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "05621A", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["05621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/056D21A.json b/docs/data/histograms/Philippines/056D21A.json
index 0ab296816ad..aca043c3e2a 100644
--- a/docs/data/histograms/Philippines/056D21A.json
+++ b/docs/data/histograms/Philippines/056D21A.json
@@ -1 +1 @@
-{"batchcode": "056D21A", "histograms": [{"batchcodes": ["056D21A"], "histogram": {"Cough": 1, "Death": 1, "Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "056D21A", "histograms": [{"histogram": {"Cough": 1, "Death": 1, "Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["056D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/056D21AQ.json b/docs/data/histograms/Philippines/056D21AQ.json
index 2e5347992be..e8d205458ff 100644
--- a/docs/data/histograms/Philippines/056D21AQ.json
+++ b/docs/data/histograms/Philippines/056D21AQ.json
@@ -1 +1 @@
-{"batchcode": "056D21AQ", "histograms": [{"batchcodes": ["056D21AQ"], "histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "056D21AQ", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["056D21AQ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/056DA.json b/docs/data/histograms/Philippines/056DA.json
index 4c77eb62db6..b39af9a56e4 100644
--- a/docs/data/histograms/Philippines/056DA.json
+++ b/docs/data/histograms/Philippines/056DA.json
@@ -1 +1 @@
-{"batchcode": "056DA", "histograms": [{"batchcodes": ["056DA"], "histogram": {"Anosmia": 1, "Blood potassium decreased": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Dysgeusia": 1, "Malaise": 1, "Pyrexia": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "056DA", "histograms": [{"histogram": {"Anosmia": 1, "Blood potassium decreased": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Dysgeusia": 1, "Malaise": 1, "Pyrexia": 1, "Thrombosis": 1}, "batchcodes": ["056DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/056DLIA.json b/docs/data/histograms/Philippines/056DLIA.json
index 96676769ae8..6f5c9cbfa8d 100644
--- a/docs/data/histograms/Philippines/056DLIA.json
+++ b/docs/data/histograms/Philippines/056DLIA.json
@@ -1 +1 @@
-{"batchcode": "056DLIA", "histograms": [{"batchcodes": ["056DLIA"], "histogram": {"Abdominal pain": 1, "Melaena": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "056DLIA", "histograms": [{"histogram": {"Abdominal pain": 1, "Melaena": 1, "Vaccination site pain": 1}, "batchcodes": ["056DLIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/057D21A.json b/docs/data/histograms/Philippines/057D21A.json
index 5da5eb95675..8a9a3af0397 100644
--- a/docs/data/histograms/Philippines/057D21A.json
+++ b/docs/data/histograms/Philippines/057D21A.json
@@ -1 +1 @@
-{"batchcode": "057D21A", "histograms": [{"batchcodes": ["057D21A"], "histogram": {"Dizziness": 2, "Loss of consciousness": 2, "Muscle twitching": 2, "Pyrexia": 2, "Seizure": 2, "Asthenia": 1, "Caesarean section": 1, "Dyspnoea": 1, "Headache": 1, "Lymphadenopathy": 1, "Muscular weakness": 1, "Neuralgia": 1, "Palpitations": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "057D21A", "histograms": [{"histogram": {"Dizziness": 2, "Loss of consciousness": 2, "Muscle twitching": 2, "Pyrexia": 2, "Seizure": 2, "Asthenia": 1, "Caesarean section": 1, "Dyspnoea": 1, "Headache": 1, "Lymphadenopathy": 1, "Muscular weakness": 1, "Neuralgia": 1, "Palpitations": 1, "Presyncope": 1}, "batchcodes": ["057D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0590217.json b/docs/data/histograms/Philippines/0590217.json
index d34a6690b9c..f5780d1be41 100644
--- a/docs/data/histograms/Philippines/0590217.json
+++ b/docs/data/histograms/Philippines/0590217.json
@@ -1 +1 @@
-{"batchcode": "0590217", "histograms": [{"batchcodes": ["0590217"], "histogram": {"Asthenia": 1, "Neonatal dyspnoea": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "0590217", "histograms": [{"histogram": {"Asthenia": 1, "Neonatal dyspnoea": 1, "Palpitations": 1}, "batchcodes": ["0590217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0590218.json b/docs/data/histograms/Philippines/0590218.json
index a76fcabf106..2e601826fa2 100644
--- a/docs/data/histograms/Philippines/0590218.json
+++ b/docs/data/histograms/Philippines/0590218.json
@@ -1 +1 @@
-{"batchcode": "0590218", "histograms": [{"batchcodes": ["0590218"], "histogram": {"Heavy menstrual bleeding": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0590218", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1, "Vaccination site pain": 1}, "batchcodes": ["0590218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/059021A.json b/docs/data/histograms/Philippines/059021A.json
index 9f8248c85e1..32e51dba434 100644
--- a/docs/data/histograms/Philippines/059021A.json
+++ b/docs/data/histograms/Philippines/059021A.json
@@ -1 +1 @@
-{"batchcode": "059021A", "histograms": [{"batchcodes": ["059021A"], "histogram": {"Cerebrovascular accident": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "059021A", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Dizziness": 1}, "batchcodes": ["059021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/059D21A.json b/docs/data/histograms/Philippines/059D21A.json
index 7d7499bf686..1f733a81c46 100644
--- a/docs/data/histograms/Philippines/059D21A.json
+++ b/docs/data/histograms/Philippines/059D21A.json
@@ -1 +1 @@
-{"batchcode": "059D21A", "histograms": [{"batchcodes": ["059D21A"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Decreased appetite": 1, "Limb discomfort": 1, "Shoulder injury related to vaccine administration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "059D21A", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Decreased appetite": 1, "Limb discomfort": 1, "Shoulder injury related to vaccine administration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["059D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/059D2A.json b/docs/data/histograms/Philippines/059D2A.json
index d9a33423567..997a67d8c5c 100644
--- a/docs/data/histograms/Philippines/059D2A.json
+++ b/docs/data/histograms/Philippines/059D2A.json
@@ -1 +1 @@
-{"batchcode": "059D2A", "histograms": [{"batchcodes": ["059D2A"], "histogram": {"Gastric infection": 1}}]}
\ No newline at end of file
+{"batchcode": "059D2A", "histograms": [{"histogram": {"Gastric infection": 1}, "batchcodes": ["059D2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0611G21A.json b/docs/data/histograms/Philippines/0611G21A.json
index c724cc89767..4fe09a1e1cb 100644
--- a/docs/data/histograms/Philippines/0611G21A.json
+++ b/docs/data/histograms/Philippines/0611G21A.json
@@ -1 +1 @@
-{"batchcode": "0611G21A", "histograms": [{"batchcodes": ["0611G21A"], "histogram": {"Asthenia": 1, "Disorientation": 1}}]}
\ No newline at end of file
+{"batchcode": "0611G21A", "histograms": [{"histogram": {"Asthenia": 1, "Disorientation": 1}, "batchcodes": ["0611G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/061321A.json b/docs/data/histograms/Philippines/061321A.json
index b639f4b9773..cecf48b2e15 100644
--- a/docs/data/histograms/Philippines/061321A.json
+++ b/docs/data/histograms/Philippines/061321A.json
@@ -1 +1 @@
-{"batchcode": "061321A", "histograms": [{"batchcodes": ["061321A"], "histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "061321A", "histograms": [{"histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Vaccination site pain": 1}, "batchcodes": ["061321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/061621A.json b/docs/data/histograms/Philippines/061621A.json
index af3ca61e7c6..3e1eeef5de5 100644
--- a/docs/data/histograms/Philippines/061621A.json
+++ b/docs/data/histograms/Philippines/061621A.json
@@ -1 +1 @@
-{"batchcode": "061621A", "histograms": [{"batchcodes": ["061621A", "FG8643"], "histogram": {"Gun shot wound": 1}}, {"batchcodes": ["061621A"], "histogram": {"Death": 2, "Asthenia": 1, "Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "061621A", "histograms": [{"histogram": {"Gun shot wound": 1}, "batchcodes": ["061621A", "FG8643"]}, {"histogram": {"Death": 2, "Asthenia": 1, "Diarrhoea": 1}, "batchcodes": ["061621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/061G214.json b/docs/data/histograms/Philippines/061G214.json
index e5e514aee4b..350cf33bce9 100644
--- a/docs/data/histograms/Philippines/061G214.json
+++ b/docs/data/histograms/Philippines/061G214.json
@@ -1 +1 @@
-{"batchcode": "061G214", "histograms": [{"batchcodes": ["061G214"], "histogram": {"Dyspnoea": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "061G214", "histograms": [{"histogram": {"Dyspnoea": 1, "Loss of consciousness": 1}, "batchcodes": ["061G214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/061G21A.json b/docs/data/histograms/Philippines/061G21A.json
index 08fa97e0f20..b369e1f8325 100644
--- a/docs/data/histograms/Philippines/061G21A.json
+++ b/docs/data/histograms/Philippines/061G21A.json
@@ -1 +1 @@
-{"batchcode": "061G21A", "histograms": [{"batchcodes": ["061G21A", "202108101"], "histogram": {"Osteomyelitis": 1}}, {"batchcodes": ["061G21A"], "histogram": {"Asthenia": 1, "Back pain": 1, "Death": 1, "Depressed level of consciousness": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "061G21A", "histograms": [{"histogram": {"Osteomyelitis": 1}, "batchcodes": ["061G21A", "202108101"]}, {"histogram": {"Asthenia": 1, "Back pain": 1, "Death": 1, "Depressed level of consciousness": 1, "Fatigue": 1}, "batchcodes": ["061G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/065K21A.json b/docs/data/histograms/Philippines/065K21A.json
index c7991f7b7c3..d2b5e95461c 100644
--- a/docs/data/histograms/Philippines/065K21A.json
+++ b/docs/data/histograms/Philippines/065K21A.json
@@ -1 +1 @@
-{"batchcode": "065K21A", "histograms": [{"batchcodes": ["065K21A"], "histogram": {"Myalgia": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "065K21A", "histograms": [{"histogram": {"Myalgia": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["065K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/06621A.json b/docs/data/histograms/Philippines/06621A.json
index 38b8cb0c495..81bcc477547 100644
--- a/docs/data/histograms/Philippines/06621A.json
+++ b/docs/data/histograms/Philippines/06621A.json
@@ -1 +1 @@
-{"batchcode": "06621A", "histograms": [{"batchcodes": ["06621A"], "histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "06621A", "histograms": [{"histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["06621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/068721A.json b/docs/data/histograms/Philippines/068721A.json
index a929524e38f..395ba5d15f5 100644
--- a/docs/data/histograms/Philippines/068721A.json
+++ b/docs/data/histograms/Philippines/068721A.json
@@ -1 +1 @@
-{"batchcode": "068721A", "histograms": [{"batchcodes": ["068721A"], "histogram": {"Labour pain": 1}}]}
\ No newline at end of file
+{"batchcode": "068721A", "histograms": [{"histogram": {"Labour pain": 1}, "batchcodes": ["068721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/068F2 A.json b/docs/data/histograms/Philippines/068F2 A.json
index 3f8cc4a6711..4064d7279a0 100644
--- a/docs/data/histograms/Philippines/068F2 A.json
+++ b/docs/data/histograms/Philippines/068F2 A.json
@@ -1 +1 @@
-{"batchcode": "068F2 A", "histograms": [{"batchcodes": ["068F2 A"], "histogram": {"Haematemesis": 1}}]}
\ No newline at end of file
+{"batchcode": "068F2 A", "histograms": [{"histogram": {"Haematemesis": 1}, "batchcodes": ["068F2 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/068F21A.json b/docs/data/histograms/Philippines/068F21A.json
index 2c3ffce6a5c..6e026ae8f76 100644
--- a/docs/data/histograms/Philippines/068F21A.json
+++ b/docs/data/histograms/Philippines/068F21A.json
@@ -1 +1 @@
-{"batchcode": "068F21A", "histograms": [{"batchcodes": ["0033", "068F21A", "K003B"], "histogram": {"Death": 1}}, {"batchcodes": ["068F21A", "213C21A"], "histogram": {"Open globe injury": 1, "Pulmonary tuberculosis": 1}}, {"batchcodes": ["068F21A", "ABV7279", "CTMAV503"], "histogram": {"Abortion incomplete": 1}}, {"batchcodes": ["068F21A", "C202104058"], "histogram": {"Diabetes mellitus": 1, "Electrolyte imbalance": 1, "Hypertension": 1, "Nephrolithiasis": 1}}, {"batchcodes": ["068F21A", "C202105093", "L202106033"], "histogram": {"Hypoaesthesia": 1}}, {"batchcodes": ["068F21A"], "histogram": {"Vaccination site pain": 6, "Asthenia": 4, "Pyrexia": 3, "Back pain": 2, "Chest pain": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Headache": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Chills": 1, "Death": 1, "Dizziness": 1, "Dysarthria": 1, "Labour pain": 1, "Loss of consciousness": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Vaginal haemorrhage": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "068F21A", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["0033", "068F21A", "K003B"]}, {"histogram": {"Open globe injury": 1, "Pulmonary tuberculosis": 1}, "batchcodes": ["068F21A", "213C21A"]}, {"histogram": {"Abortion incomplete": 1}, "batchcodes": ["068F21A", "ABV7279", "CTMAV503"]}, {"histogram": {"Diabetes mellitus": 1, "Electrolyte imbalance": 1, "Hypertension": 1, "Nephrolithiasis": 1}, "batchcodes": ["068F21A", "C202104058"]}, {"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["068F21A", "C202105093", "L202106033"]}, {"histogram": {"Vaccination site pain": 6, "Asthenia": 4, "Pyrexia": 3, "Back pain": 2, "Chest pain": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Headache": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Chills": 1, "Death": 1, "Dizziness": 1, "Dysarthria": 1, "Labour pain": 1, "Loss of consciousness": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Vaginal haemorrhage": 1, "Vomiting": 1}, "batchcodes": ["068F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/068F2IA.json b/docs/data/histograms/Philippines/068F2IA.json
index cf3bac33d46..70d5d599bb3 100644
--- a/docs/data/histograms/Philippines/068F2IA.json
+++ b/docs/data/histograms/Philippines/068F2IA.json
@@ -1 +1 @@
-{"batchcode": "068F2IA", "histograms": [{"batchcodes": ["068F2IA"], "histogram": {"Balance disorder": 1, "Blood pressure increased": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "068F2IA", "histograms": [{"histogram": {"Balance disorder": 1, "Blood pressure increased": 1, "Dizziness": 1}, "batchcodes": ["068F2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/069F21A.json b/docs/data/histograms/Philippines/069F21A.json
index a3c7911caa8..8488554c41b 100644
--- a/docs/data/histograms/Philippines/069F21A.json
+++ b/docs/data/histograms/Philippines/069F21A.json
@@ -1 +1 @@
-{"batchcode": "069F21A", "histograms": [{"batchcodes": ["069F21A"], "histogram": {"Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "069F21A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["069F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/06BF21A.json b/docs/data/histograms/Philippines/06BF21A.json
index 55048579b1d..39741613aa9 100644
--- a/docs/data/histograms/Philippines/06BF21A.json
+++ b/docs/data/histograms/Philippines/06BF21A.json
@@ -1 +1 @@
-{"batchcode": "06BF21A", "histograms": [{"batchcodes": ["06BF21A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "06BF21A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["06BF21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/06F289.json b/docs/data/histograms/Philippines/06F289.json
index 625cce8e709..75643a63145 100644
--- a/docs/data/histograms/Philippines/06F289.json
+++ b/docs/data/histograms/Philippines/06F289.json
@@ -1 +1 @@
-{"batchcode": "06F289", "histograms": [{"batchcodes": ["06F289"], "histogram": {"Dyspnoea": 1, "Headache": 1, "Loss of consciousness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "06F289", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1, "Loss of consciousness": 1, "Pyrexia": 1}, "batchcodes": ["06F289"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/06IG21A.json b/docs/data/histograms/Philippines/06IG21A.json
index dc2957f21ed..763f483e802 100644
--- a/docs/data/histograms/Philippines/06IG21A.json
+++ b/docs/data/histograms/Philippines/06IG21A.json
@@ -1 +1 @@
-{"batchcode": "06IG21A", "histograms": [{"batchcodes": ["06IG21A"], "histogram": {"Epilepsy": 1}}]}
\ No newline at end of file
+{"batchcode": "06IG21A", "histograms": [{"histogram": {"Epilepsy": 1}, "batchcodes": ["06IG21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/08/28/2021/FK94.json b/docs/data/histograms/Philippines/08/28/2021/FK94.json
index 98c7bbb0781..58f467b404e 100644
--- a/docs/data/histograms/Philippines/08/28/2021/FK94.json
+++ b/docs/data/histograms/Philippines/08/28/2021/FK94.json
@@ -1 +1 @@
-{"batchcode": "08/28/2021/FK94", "histograms": [{"batchcodes": ["08/28/2021/FK94"], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "08/28/2021/FK94", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["08/28/2021/FK94"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/080312A.json b/docs/data/histograms/Philippines/080312A.json
index ef95ce11dcd..02e19f0b927 100644
--- a/docs/data/histograms/Philippines/080312A.json
+++ b/docs/data/histograms/Philippines/080312A.json
@@ -1 +1 @@
-{"batchcode": "080312A", "histograms": [{"batchcodes": ["080312A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "080312A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Pain": 1}, "batchcodes": ["080312A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0831218.json b/docs/data/histograms/Philippines/0831218.json
index 54f759541f9..bae02c12bb7 100644
--- a/docs/data/histograms/Philippines/0831218.json
+++ b/docs/data/histograms/Philippines/0831218.json
@@ -1 +1 @@
-{"batchcode": "0831218", "histograms": [{"batchcodes": ["0831218"], "histogram": {"Papule": 1, "Skin plaque": 1}}]}
\ No newline at end of file
+{"batchcode": "0831218", "histograms": [{"histogram": {"Papule": 1, "Skin plaque": 1}, "batchcodes": ["0831218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/08321B.json b/docs/data/histograms/Philippines/08321B.json
index f08d4998acd..e42caadadda 100644
--- a/docs/data/histograms/Philippines/08321B.json
+++ b/docs/data/histograms/Philippines/08321B.json
@@ -1 +1 @@
-{"batchcode": "08321B", "histograms": [{"batchcodes": ["08321B"], "histogram": {"Cerebrovascular accident": 1}}]}
\ No newline at end of file
+{"batchcode": "08321B", "histograms": [{"histogram": {"Cerebrovascular accident": 1}, "batchcodes": ["08321B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/083421B.json b/docs/data/histograms/Philippines/083421B.json
index 36aa86b9347..0b1d1c364c4 100644
--- a/docs/data/histograms/Philippines/083421B.json
+++ b/docs/data/histograms/Philippines/083421B.json
@@ -1 +1 @@
-{"batchcode": "083421B", "histograms": [{"batchcodes": ["083421B"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "083421B", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["083421B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/083F21B.json b/docs/data/histograms/Philippines/083F21B.json
index 33ad20529bf..61a4182ca5a 100644
--- a/docs/data/histograms/Philippines/083F21B.json
+++ b/docs/data/histograms/Philippines/083F21B.json
@@ -1 +1 @@
-{"batchcode": "083F21B", "histograms": [{"batchcodes": ["083F21B", "231C21A"], "histogram": {"Myalgia": 1}}, {"batchcodes": ["083F21B"], "histogram": {"Asthenia": 3, "Blood pressure measurement": 3, "Chest pain": 3, "Chills": 3, "Dyspnoea": 3, "Fatigue": 3, "Oxygen saturation": 3, "Palpitations": 3, "Pyrexia": 3, "Syncope": 3, "Abdominal pain": 2, "Cardiac arrest": 2, "Cerebrovascular accident": 2, "Decreased appetite": 2, "Heart rate": 2, "Respiratory rate": 2, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Ankle fracture": 1, "Body temperature": 1, "Cold sweat": 1, "Coma scale": 1, "Cough": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Headache": 1, "Hemiparesis": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "Hypoxic-ischaemic encephalopathy": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Loss of consciousness": 1, "Malaise": 1, "Metabolic acidosis": 1, "Motor dysfunction": 1, "Myalgia": 1, "Nausea": 1, "Neurogenic shock": 1, "Parkinson's disease": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Septic shock": 1, "Stomatitis": 1, "Supraventricular tachycardia": 1, "Thermal burn": 1, "Unresponsive to stimuli": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "083F21B", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["083F21B", "231C21A"]}, {"histogram": {"Asthenia": 3, "Blood pressure measurement": 3, "Chest pain": 3, "Chills": 3, "Dyspnoea": 3, "Fatigue": 3, "Oxygen saturation": 3, "Palpitations": 3, "Pyrexia": 3, "Syncope": 3, "Abdominal pain": 2, "Cardiac arrest": 2, "Cerebrovascular accident": 2, "Decreased appetite": 2, "Heart rate": 2, "Respiratory rate": 2, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Ankle fracture": 1, "Body temperature": 1, "Cold sweat": 1, "Coma scale": 1, "Cough": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Headache": 1, "Hemiparesis": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "Hypoxic-ischaemic encephalopathy": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Loss of consciousness": 1, "Malaise": 1, "Metabolic acidosis": 1, "Motor dysfunction": 1, "Myalgia": 1, "Nausea": 1, "Neurogenic shock": 1, "Parkinson's disease": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Septic shock": 1, "Stomatitis": 1, "Supraventricular tachycardia": 1, "Thermal burn": 1, "Unresponsive to stimuli": 1, "Wound": 1}, "batchcodes": ["083F21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/086521A.json b/docs/data/histograms/Philippines/086521A.json
index c6a20779b79..ae1428a4a07 100644
--- a/docs/data/histograms/Philippines/086521A.json
+++ b/docs/data/histograms/Philippines/086521A.json
@@ -1 +1 @@
-{"batchcode": "086521A", "histograms": [{"batchcodes": ["086521A", "3106023", "FJ830"], "histogram": {"Asthenia": 1, "Vaccination site pain": 1}}, {"batchcodes": ["086521A"], "histogram": {"COVID-19": 1, "Cough": 1, "Dyspnoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "086521A", "histograms": [{"histogram": {"Asthenia": 1, "Vaccination site pain": 1}, "batchcodes": ["086521A", "3106023", "FJ830"]}, {"histogram": {"COVID-19": 1, "Cough": 1, "Dyspnoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1}, "batchcodes": ["086521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/086721A.json b/docs/data/histograms/Philippines/086721A.json
index de1ba00e90d..7a3e81e71e5 100644
--- a/docs/data/histograms/Philippines/086721A.json
+++ b/docs/data/histograms/Philippines/086721A.json
@@ -1 +1 @@
-{"batchcode": "086721A", "histograms": [{"batchcodes": ["086721A"], "histogram": {"Labour pain": 1}}]}
\ No newline at end of file
+{"batchcode": "086721A", "histograms": [{"histogram": {"Labour pain": 1}, "batchcodes": ["086721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/086J21A.json b/docs/data/histograms/Philippines/086J21A.json
index 7563ff864bc..231ae74e8e0 100644
--- a/docs/data/histograms/Philippines/086J21A.json
+++ b/docs/data/histograms/Philippines/086J21A.json
@@ -1 +1 @@
-{"batchcode": "086J21A", "histograms": [{"batchcodes": ["086J21A", "J213C21A", "P0001340"], "histogram": {"Arthritis": 2, "Chills": 2, "Decreased appetite": 2, "Gastric disorder": 2, "Hyperthermia": 2, "Malaise": 2}}, {"batchcodes": ["086J21A"], "histogram": {"Pyrexia": 2, "Abdominal pain": 1, "Dyspnoea": 1, "Epistaxis": 1, "Fatigue": 1, "Headache": 1, "Platelet count": 1}}]}
\ No newline at end of file
+{"batchcode": "086J21A", "histograms": [{"histogram": {"Arthritis": 2, "Chills": 2, "Decreased appetite": 2, "Gastric disorder": 2, "Hyperthermia": 2, "Malaise": 2}, "batchcodes": ["086J21A", "J213C21A", "P0001340"]}, {"histogram": {"Pyrexia": 2, "Abdominal pain": 1, "Dyspnoea": 1, "Epistaxis": 1, "Fatigue": 1, "Headache": 1, "Platelet count": 1}, "batchcodes": ["086J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/086J21H.json b/docs/data/histograms/Philippines/086J21H.json
index c4038fcfd36..98050cae9ba 100644
--- a/docs/data/histograms/Philippines/086J21H.json
+++ b/docs/data/histograms/Philippines/086J21H.json
@@ -1 +1 @@
-{"batchcode": "086J21H", "histograms": [{"batchcodes": ["086J21H"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "086J21H", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["086J21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0883F21B.json b/docs/data/histograms/Philippines/0883F21B.json
index ac29c91b11e..af158d2a1bf 100644
--- a/docs/data/histograms/Philippines/0883F21B.json
+++ b/docs/data/histograms/Philippines/0883F21B.json
@@ -1 +1 @@
-{"batchcode": "0883F21B", "histograms": [{"batchcodes": ["0883F21B"], "histogram": {"Haematochezia": 2, "Occult blood": 2, "Abdominal pain": 1, "Amphetamines": 1, "Full blood count": 1, "Laboratory test": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0883F21B", "histograms": [{"histogram": {"Haematochezia": 2, "Occult blood": 2, "Abdominal pain": 1, "Amphetamines": 1, "Full blood count": 1, "Laboratory test": 1, "Pyrexia": 1}, "batchcodes": ["0883F21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/09631A.json b/docs/data/histograms/Philippines/09631A.json
index 45c0bd6e2bd..5d686df681c 100644
--- a/docs/data/histograms/Philippines/09631A.json
+++ b/docs/data/histograms/Philippines/09631A.json
@@ -1 +1 @@
-{"batchcode": "09631A", "histograms": [{"batchcodes": ["09631A"], "histogram": {"Arthralgia": 1, "COVID-19": 1, "Cough": 1, "Headache": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "09631A", "histograms": [{"histogram": {"Arthralgia": 1, "COVID-19": 1, "Cough": 1, "Headache": 1, "Oropharyngeal pain": 1}, "batchcodes": ["09631A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/09997409110.json b/docs/data/histograms/Philippines/09997409110.json
index f1cce7f85de..f110d596bc5 100644
--- a/docs/data/histograms/Philippines/09997409110.json
+++ b/docs/data/histograms/Philippines/09997409110.json
@@ -1 +1 @@
-{"batchcode": "09997409110", "histograms": [{"batchcodes": ["09997409110"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "09997409110", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["09997409110"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/0G8F21A.json b/docs/data/histograms/Philippines/0G8F21A.json
index 95bcf414dc8..f751bbe5fbd 100644
--- a/docs/data/histograms/Philippines/0G8F21A.json
+++ b/docs/data/histograms/Philippines/0G8F21A.json
@@ -1 +1 @@
-{"batchcode": "0G8F21A", "histograms": [{"batchcodes": ["0G8F21A"], "histogram": {"Uterine leiomyoma": 1}}]}
\ No newline at end of file
+{"batchcode": "0G8F21A", "histograms": [{"histogram": {"Uterine leiomyoma": 1}, "batchcodes": ["0G8F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1-213C21A.json b/docs/data/histograms/Philippines/1-213C21A.json
index f599361ba2a..53cb5352c64 100644
--- a/docs/data/histograms/Philippines/1-213C21A.json
+++ b/docs/data/histograms/Philippines/1-213C21A.json
@@ -1 +1 @@
-{"batchcode": "1-213C21A", "histograms": [{"batchcodes": ["1-213C21A"], "histogram": {"Decreased appetite": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "1-213C21A", "histograms": [{"histogram": {"Decreased appetite": 1, "Muscular weakness": 1}, "batchcodes": ["1-213C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/101G21B.json b/docs/data/histograms/Philippines/101G21B.json
index b6ee6fe0450..6ac6837be48 100644
--- a/docs/data/histograms/Philippines/101G21B.json
+++ b/docs/data/histograms/Philippines/101G21B.json
@@ -1 +1 @@
-{"batchcode": "101G21B", "histograms": [{"batchcodes": ["101G21B"], "histogram": {"Hypersensitivity": 1, "Pruritus": 1, "Rash": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "101G21B", "histograms": [{"histogram": {"Hypersensitivity": 1, "Pruritus": 1, "Rash": 1, "Wound": 1}, "batchcodes": ["101G21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/102D21.json b/docs/data/histograms/Philippines/102D21.json
index d6f81761324..9e92c68f36f 100644
--- a/docs/data/histograms/Philippines/102D21.json
+++ b/docs/data/histograms/Philippines/102D21.json
@@ -1 +1 @@
-{"batchcode": "102D21", "histograms": [{"batchcodes": ["102D21"], "histogram": {"Asthenia": 1, "Cough": 1, "Dyspnoea": 1, "Oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "102D21", "histograms": [{"histogram": {"Asthenia": 1, "Cough": 1, "Dyspnoea": 1, "Oedema": 1}, "batchcodes": ["102D21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1042.json b/docs/data/histograms/Philippines/1042.json
index 0cecfbdc3f8..cb896505570 100644
--- a/docs/data/histograms/Philippines/1042.json
+++ b/docs/data/histograms/Philippines/1042.json
@@ -1 +1 @@
-{"batchcode": "1042", "histograms": [{"batchcodes": ["1042"], "histogram": {"Anaphylactic reaction": 1, "Rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1042", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Rash": 1, "Vomiting": 1}, "batchcodes": ["1042"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/10CA0050.json b/docs/data/histograms/Philippines/10CA0050.json
index ab44f2d01ab..93e5f62c0b4 100644
--- a/docs/data/histograms/Philippines/10CA0050.json
+++ b/docs/data/histograms/Philippines/10CA0050.json
@@ -1 +1 @@
-{"batchcode": "10CA0050", "histograms": [{"batchcodes": ["10CA0050"], "histogram": {"Labour pain": 1, "Maternal exposure timing unspecified": 1}}]}
\ No newline at end of file
+{"batchcode": "10CA0050", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure timing unspecified": 1}, "batchcodes": ["10CA0050"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/11.json b/docs/data/histograms/Philippines/11.json
index 138796d9df7..58f1633f25f 100644
--- a/docs/data/histograms/Philippines/11.json
+++ b/docs/data/histograms/Philippines/11.json
@@ -1 +1 @@
-{"batchcode": "11", "histograms": [{"batchcodes": ["11"], "histogram": {"Chest pain": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "11", "histograms": [{"histogram": {"Chest pain": 1, "Nausea": 1}, "batchcodes": ["11"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/12 800 1.json b/docs/data/histograms/Philippines/12 800 1.json
index 6513289f099..be3cbf97f1a 100644
--- a/docs/data/histograms/Philippines/12 800 1.json
+++ b/docs/data/histograms/Philippines/12 800 1.json
@@ -1 +1 @@
-{"batchcode": "12 800 1", "histograms": [{"batchcodes": ["12 800 1"], "histogram": {"Asthenia": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Incorrect route of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "12 800 1", "histograms": [{"histogram": {"Asthenia": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Incorrect route of product administration": 1}, "batchcodes": ["12 800 1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/12002.json b/docs/data/histograms/Philippines/12002.json
index d10ada7ac45..bcccf4ebb5f 100644
--- a/docs/data/histograms/Philippines/12002.json
+++ b/docs/data/histograms/Philippines/12002.json
@@ -1 +1 @@
-{"batchcode": "12002", "histograms": [{"batchcodes": ["12002"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "12002", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["12002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1213C216.json b/docs/data/histograms/Philippines/1213C216.json
index b3476fd57b9..3abac58523e 100644
--- a/docs/data/histograms/Philippines/1213C216.json
+++ b/docs/data/histograms/Philippines/1213C216.json
@@ -1 +1 @@
-{"batchcode": "1213C216", "histograms": [{"batchcodes": ["1213C216"], "histogram": {"Breast mass": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1213C216", "histograms": [{"histogram": {"Breast mass": 1, "Vaccination site pain": 1}, "batchcodes": ["1213C216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/122001.json b/docs/data/histograms/Philippines/122001.json
index 1556a221c5d..54c98f316a7 100644
--- a/docs/data/histograms/Philippines/122001.json
+++ b/docs/data/histograms/Philippines/122001.json
@@ -1 +1 @@
-{"batchcode": "122001", "histograms": [{"batchcodes": ["122001"], "histogram": {"Chest pain": 2, "Dizziness": 2, "Body temperature": 1, "Chest discomfort": 1, "Choking sensation": 1, "Contusion": 1, "Disorientation": 1, "Dyspnoea": 1, "Gait inability": 1, "Genital rash": 1, "Genital swelling": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Nausea": 1, "Off label use": 1, "Pleural effusion": 1, "Pneumonia": 1, "Pyrexia": 1, "Rash": 1, "Speech disorder": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "122001", "histograms": [{"histogram": {"Chest pain": 2, "Dizziness": 2, "Body temperature": 1, "Chest discomfort": 1, "Choking sensation": 1, "Contusion": 1, "Disorientation": 1, "Dyspnoea": 1, "Gait inability": 1, "Genital rash": 1, "Genital swelling": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Nausea": 1, "Off label use": 1, "Pleural effusion": 1, "Pneumonia": 1, "Pyrexia": 1, "Rash": 1, "Speech disorder": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["122001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/122021.json b/docs/data/histograms/Philippines/122021.json
index f2eea4ca862..f40f41591ca 100644
--- a/docs/data/histograms/Philippines/122021.json
+++ b/docs/data/histograms/Philippines/122021.json
@@ -1 +1 @@
-{"batchcode": "122021", "histograms": [{"batchcodes": ["122021"], "histogram": {"Blood pressure measurement": 1, "Blood pressure systolic decreased": 1, "Loss of consciousness": 1, "Oxygen saturation": 1}}]}
\ No newline at end of file
+{"batchcode": "122021", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood pressure systolic decreased": 1, "Loss of consciousness": 1, "Oxygen saturation": 1}, "batchcodes": ["122021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/123001.json b/docs/data/histograms/Philippines/123001.json
index 488b16edb04..7e2f02c816b 100644
--- a/docs/data/histograms/Philippines/123001.json
+++ b/docs/data/histograms/Philippines/123001.json
@@ -1 +1 @@
-{"batchcode": "123001", "histograms": [{"batchcodes": ["123001"], "histogram": {"Syncope": 3, "Dizziness": 2, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Immunisation": 1, "Nasopharyngitis": 1, "Product use issue": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "123001", "histograms": [{"histogram": {"Syncope": 3, "Dizziness": 2, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Immunisation": 1, "Nasopharyngitis": 1, "Product use issue": 1, "Throat irritation": 1}, "batchcodes": ["123001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/12300H.json b/docs/data/histograms/Philippines/12300H.json
index b88c10a055c..e717fa8432c 100644
--- a/docs/data/histograms/Philippines/12300H.json
+++ b/docs/data/histograms/Philippines/12300H.json
@@ -1 +1 @@
-{"batchcode": "12300H", "histograms": [{"batchcodes": ["12300H"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "12300H", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["12300H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1234.json b/docs/data/histograms/Philippines/1234.json
index 0e07fec9427..b92a6de6e0c 100644
--- a/docs/data/histograms/Philippines/1234.json
+++ b/docs/data/histograms/Philippines/1234.json
@@ -1 +1 @@
-{"batchcode": "1234", "histograms": [{"batchcodes": ["1234"], "histogram": {"Dyspnoea": 1, "Incorrect route of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "1234", "histograms": [{"histogram": {"Dyspnoea": 1, "Incorrect route of product administration": 1}, "batchcodes": ["1234"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/124001.json b/docs/data/histograms/Philippines/124001.json
index dada6911c82..5fbc85e4937 100644
--- a/docs/data/histograms/Philippines/124001.json
+++ b/docs/data/histograms/Philippines/124001.json
@@ -1 +1 @@
-{"batchcode": "124001", "histograms": [{"batchcodes": ["124001"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Hypoaesthesia": 1, "Malaise": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "124001", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Hypoaesthesia": 1, "Malaise": 1, "Syncope": 1}, "batchcodes": ["124001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/125001.json b/docs/data/histograms/Philippines/125001.json
index 66c01757fa1..bb4f3f2cc58 100644
--- a/docs/data/histograms/Philippines/125001.json
+++ b/docs/data/histograms/Philippines/125001.json
@@ -1 +1 @@
-{"batchcode": "125001", "histograms": [{"batchcodes": ["125001"], "histogram": {"Dyspnoea": 1, "Pulmonary congestion": 1}}]}
\ No newline at end of file
+{"batchcode": "125001", "histograms": [{"histogram": {"Dyspnoea": 1, "Pulmonary congestion": 1}, "batchcodes": ["125001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/12563.json b/docs/data/histograms/Philippines/12563.json
index 50ff80cb670..d4d335ae953 100644
--- a/docs/data/histograms/Philippines/12563.json
+++ b/docs/data/histograms/Philippines/12563.json
@@ -1 +1 @@
-{"batchcode": "12563", "histograms": [{"batchcodes": ["12563"], "histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "12563", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["12563"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/126001.json b/docs/data/histograms/Philippines/126001.json
index 1aa55bbd6c6..e7c38829bc6 100644
--- a/docs/data/histograms/Philippines/126001.json
+++ b/docs/data/histograms/Philippines/126001.json
@@ -1 +1 @@
-{"batchcode": "126001", "histograms": [{"batchcodes": ["126001"], "histogram": {"Blood pressure increased": 57, "Blood pressure measurement": 57, "Body temperature": 38, "Heart rate": 38, "Respiratory rate": 17, "Oxygen saturation": 12, "Heart rate increased": 5, "COVID-19 screening": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Asymptomatic COVID-19": 1, "COVID-19": 1, "Death": 1, "Heart rate decreased": 1, "PO2 decreased": 1, "Pneumonia": 1, "Syncope": 1, "Tachycardia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "126001", "histograms": [{"histogram": {"Blood pressure increased": 57, "Blood pressure measurement": 57, "Body temperature": 38, "Heart rate": 38, "Respiratory rate": 17, "Oxygen saturation": 12, "Heart rate increased": 5, "COVID-19 screening": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Asymptomatic COVID-19": 1, "COVID-19": 1, "Death": 1, "Heart rate decreased": 1, "PO2 decreased": 1, "Pneumonia": 1, "Syncope": 1, "Tachycardia": 1, "Vision blurred": 1}, "batchcodes": ["126001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/12609.json b/docs/data/histograms/Philippines/12609.json
index bfd76cefd19..2bdf613d1a7 100644
--- a/docs/data/histograms/Philippines/12609.json
+++ b/docs/data/histograms/Philippines/12609.json
@@ -1 +1 @@
-{"batchcode": "12609", "histograms": [{"batchcodes": ["12609"], "histogram": {"Blood creatinine": 1, "Blood gases": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood uric acid": 1, "Body temperature": 1, "Cardiac arrest": 1, "Coma scale": 1, "Contusion": 1, "Eosinophil count": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Heart rate": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Physical examination": 1, "Platelet count": 1, "Pulse absent": 1, "Pyrexia": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Unresponsive to stimuli": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "12609", "histograms": [{"histogram": {"Blood creatinine": 1, "Blood gases": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood uric acid": 1, "Body temperature": 1, "Cardiac arrest": 1, "Coma scale": 1, "Contusion": 1, "Eosinophil count": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Heart rate": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Physical examination": 1, "Platelet count": 1, "Pulse absent": 1, "Pyrexia": 1, "Red blood cell count": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "Unresponsive to stimuli": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["12609"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/128001.json b/docs/data/histograms/Philippines/128001.json
index 82b52ac8189..560faa9de94 100644
--- a/docs/data/histograms/Philippines/128001.json
+++ b/docs/data/histograms/Philippines/128001.json
@@ -1 +1 @@
-{"batchcode": "128001", "histograms": [{"batchcodes": ["128001"], "histogram": {"Pyrexia": 15, "Syncope": 13, "Blood pressure increased": 11, "Blood pressure measurement": 11, "Cough": 10, "Dizziness": 10, "Dyspnoea": 10, "Headache": 8, "Abdominal pain": 5, "Asthenia": 5, "Chest pain": 5, "Abdominal pain lower": 4, "Abdominal pain upper": 4, "Nausea": 4, "Vaccination site pain": 4, "Back pain": 3, "Chills": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Drug ineffective": 3, "Flank pain": 3, "Hypoaesthesia": 3, "Interchange of vaccine products": 3, "Loss of consciousness": 3, "Off label use": 3, "Seizure": 3, "Arthralgia": 2, "Body temperature": 2, "COVID-19": 2, "Chest discomfort": 2, "Fatigue": 2, "Haematochezia": 2, "Hemiparesis": 2, "Malaise": 2, "Muscular weakness": 2, "Myalgia": 2, "Nasopharyngitis": 2, "Oedema": 2, "Pain": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Vision blurred": 2, "Vomiting": 2, "Acute coronary syndrome": 1, "Arrested labour": 1, "Asymptomatic COVID-19": 1, "Autoimmune anaemia": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Brain contusion": 1, "Cerebral infarction": 1, "Cholecystitis": 1, "Cyanosis": 1, "Diagnostic procedure": 1, "Dysarthria": 1, "Dyspepsia": 1, "Electrolyte imbalance": 1, "Epistaxis": 1, "Extrasystoles": 1, "Fall": 1, "Febrile convulsion": 1, "Gaze palsy": 1, "Gingival bleeding": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematoma": 1, "Heart rate irregular": 1, "Hypertension": 1, "Malnutrition": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "Nasal congestion": 1, "Neck pain": 1, "Oedema peripheral": 1, "Oliguria": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pneumonia": 1, "Productive cough": 1, "Skin abrasion": 1, "Strabismus": 1, "Unresponsive to stimuli": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "128001", "histograms": [{"histogram": {"Pyrexia": 15, "Syncope": 13, "Blood pressure increased": 11, "Blood pressure measurement": 11, "Cough": 10, "Dizziness": 10, "Dyspnoea": 10, "Headache": 8, "Abdominal pain": 5, "Asthenia": 5, "Chest pain": 5, "Abdominal pain lower": 4, "Abdominal pain upper": 4, "Nausea": 4, "Vaccination site pain": 4, "Back pain": 3, "Chills": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Drug ineffective": 3, "Flank pain": 3, "Hypoaesthesia": 3, "Interchange of vaccine products": 3, "Loss of consciousness": 3, "Off label use": 3, "Seizure": 3, "Arthralgia": 2, "Body temperature": 2, "COVID-19": 2, "Chest discomfort": 2, "Fatigue": 2, "Haematochezia": 2, "Hemiparesis": 2, "Malaise": 2, "Muscular weakness": 2, "Myalgia": 2, "Nasopharyngitis": 2, "Oedema": 2, "Pain": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Vision blurred": 2, "Vomiting": 2, "Acute coronary syndrome": 1, "Arrested labour": 1, "Asymptomatic COVID-19": 1, "Autoimmune anaemia": 1, "Blood pressure decreased": 1, "Bradycardia": 1, "Brain contusion": 1, "Cerebral infarction": 1, "Cholecystitis": 1, "Cyanosis": 1, "Diagnostic procedure": 1, "Dysarthria": 1, "Dyspepsia": 1, "Electrolyte imbalance": 1, "Epistaxis": 1, "Extrasystoles": 1, "Fall": 1, "Febrile convulsion": 1, "Gaze palsy": 1, "Gingival bleeding": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematoma": 1, "Heart rate irregular": 1, "Hypertension": 1, "Malnutrition": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "Nasal congestion": 1, "Neck pain": 1, "Oedema peripheral": 1, "Oliguria": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pneumonia": 1, "Productive cough": 1, "Skin abrasion": 1, "Strabismus": 1, "Unresponsive to stimuli": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["128001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/128002.json b/docs/data/histograms/Philippines/128002.json
index 4fb32b69740..aa57cac950d 100644
--- a/docs/data/histograms/Philippines/128002.json
+++ b/docs/data/histograms/Philippines/128002.json
@@ -1 +1 @@
-{"batchcode": "128002", "histograms": [{"batchcodes": ["128002"], "histogram": {"Rash": 2, "Abdominal pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Headache": 1, "Pyrexia": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "128002", "histograms": [{"histogram": {"Rash": 2, "Abdominal pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Headache": 1, "Pyrexia": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["128002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/12850.json b/docs/data/histograms/Philippines/12850.json
index 87e9d9dd9f8..f3465fdef68 100644
--- a/docs/data/histograms/Philippines/12850.json
+++ b/docs/data/histograms/Philippines/12850.json
@@ -1 +1 @@
-{"batchcode": "12850", "histograms": [{"batchcodes": ["12850"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "12850", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["12850"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/128901.json b/docs/data/histograms/Philippines/128901.json
index 871f19fb0f4..5c87122cceb 100644
--- a/docs/data/histograms/Philippines/128901.json
+++ b/docs/data/histograms/Philippines/128901.json
@@ -1 +1 @@
-{"batchcode": "128901", "histograms": [{"batchcodes": ["128901"], "histogram": {"Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "128901", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["128901"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/129001.json b/docs/data/histograms/Philippines/129001.json
index 7c8840a0f4c..351a58734c0 100644
--- a/docs/data/histograms/Philippines/129001.json
+++ b/docs/data/histograms/Philippines/129001.json
@@ -1 +1 @@
-{"batchcode": "129001", "histograms": [{"batchcodes": ["129001"], "histogram": {"Vaccination site pain": 7, "Syncope": 6, "Dyspnoea": 4, "Abdominal pain": 3, "Maternal exposure timing unspecified": 3, "Chest pain": 2, "Labour pain": 2, "Asthenia": 1, "COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysuria": 1, "Flank pain": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Muscular weakness": 1, "Petit mal epilepsy": 1, "Prostate cancer": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "129001", "histograms": [{"histogram": {"Vaccination site pain": 7, "Syncope": 6, "Dyspnoea": 4, "Abdominal pain": 3, "Maternal exposure timing unspecified": 3, "Chest pain": 2, "Labour pain": 2, "Asthenia": 1, "COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysuria": 1, "Flank pain": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Muscular weakness": 1, "Petit mal epilepsy": 1, "Prostate cancer": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vision blurred": 1}, "batchcodes": ["129001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/13C21A.json b/docs/data/histograms/Philippines/13C21A.json
index 7c9a5bc540c..179010d16ab 100644
--- a/docs/data/histograms/Philippines/13C21A.json
+++ b/docs/data/histograms/Philippines/13C21A.json
@@ -1 +1 @@
-{"batchcode": "13C21A", "histograms": [{"batchcodes": ["13C21A"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "13C21A", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["13C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/150724.json b/docs/data/histograms/Philippines/150724.json
index 141e5549438..2105c79ee5c 100644
--- a/docs/data/histograms/Philippines/150724.json
+++ b/docs/data/histograms/Philippines/150724.json
@@ -1 +1 @@
-{"batchcode": "150724", "histograms": [{"batchcodes": ["150724"], "histogram": {"Vaccination site pain": 2, "Back pain": 1, "Interchange of vaccine products": 1, "Maternal exposure timing unspecified": 1, "Off label use": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "150724", "histograms": [{"histogram": {"Vaccination site pain": 2, "Back pain": 1, "Interchange of vaccine products": 1, "Maternal exposure timing unspecified": 1, "Off label use": 1, "Vomiting": 1}, "batchcodes": ["150724"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/15072A.json b/docs/data/histograms/Philippines/15072A.json
index 0ed0dbd8110..3bb1396318f 100644
--- a/docs/data/histograms/Philippines/15072A.json
+++ b/docs/data/histograms/Philippines/15072A.json
@@ -1 +1 @@
-{"batchcode": "15072A", "histograms": [{"batchcodes": ["15072A"], "histogram": {"Vaccination site pain": 5, "Back pain": 3, "Maternal exposure timing unspecified": 2, "Off label use": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Asthenia": 1, "Cerebrovascular accident": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Labour pain": 1, "Maternal exposure during pregnancy": 1, "Pain": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Squamous cell carcinoma": 1}}]}
\ No newline at end of file
+{"batchcode": "15072A", "histograms": [{"histogram": {"Vaccination site pain": 5, "Back pain": 3, "Maternal exposure timing unspecified": 2, "Off label use": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Asthenia": 1, "Cerebrovascular accident": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Labour pain": 1, "Maternal exposure during pregnancy": 1, "Pain": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Squamous cell carcinoma": 1}, "batchcodes": ["15072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/15073A.json b/docs/data/histograms/Philippines/15073A.json
index a07bf094499..59687526051 100644
--- a/docs/data/histograms/Philippines/15073A.json
+++ b/docs/data/histograms/Philippines/15073A.json
@@ -1 +1 @@
-{"batchcode": "15073A", "histograms": [{"batchcodes": ["15073A"], "histogram": {"Hemiparesis": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "15073A", "histograms": [{"histogram": {"Hemiparesis": 1, "Seizure": 1}, "batchcodes": ["15073A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1507ZA.json b/docs/data/histograms/Philippines/1507ZA.json
index e818b733199..6ad91b10574 100644
--- a/docs/data/histograms/Philippines/1507ZA.json
+++ b/docs/data/histograms/Philippines/1507ZA.json
@@ -1 +1 @@
-{"batchcode": "1507ZA", "histograms": [{"batchcodes": ["1507ZA"], "histogram": {"Dyspnoea": 1, "Exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "1507ZA", "histograms": [{"histogram": {"Dyspnoea": 1, "Exposure during pregnancy": 1}, "batchcodes": ["1507ZA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/16082A.json b/docs/data/histograms/Philippines/16082A.json
index 2a2860ee524..79ce0a1a96c 100644
--- a/docs/data/histograms/Philippines/16082A.json
+++ b/docs/data/histograms/Philippines/16082A.json
@@ -1 +1 @@
-{"batchcode": "16082A", "histograms": [{"batchcodes": ["16082A"], "histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "16082A", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}, "batchcodes": ["16082A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/174601.json b/docs/data/histograms/Philippines/174601.json
index 574e5b3c266..c880efd69eb 100644
--- a/docs/data/histograms/Philippines/174601.json
+++ b/docs/data/histograms/Philippines/174601.json
@@ -1 +1 @@
-{"batchcode": "174601", "histograms": [{"batchcodes": ["174601"], "histogram": {"Abdominal pain upper": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "174601", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Vaccination site pain": 1}, "batchcodes": ["174601"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/178001.json b/docs/data/histograms/Philippines/178001.json
index 51be520fb66..89d2bb3fd91 100644
--- a/docs/data/histograms/Philippines/178001.json
+++ b/docs/data/histograms/Philippines/178001.json
@@ -1 +1 @@
-{"batchcode": "178001", "histograms": [{"batchcodes": ["178001"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "178001", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Pneumonia": 1}, "batchcodes": ["178001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/178279.json b/docs/data/histograms/Philippines/178279.json
index 9b75cf4f04e..ea92905e8fe 100644
--- a/docs/data/histograms/Philippines/178279.json
+++ b/docs/data/histograms/Philippines/178279.json
@@ -1 +1 @@
-{"batchcode": "178279", "histograms": [{"batchcodes": ["178279"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "178279", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["178279"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/18001.json b/docs/data/histograms/Philippines/18001.json
index d5bc9bc8817..b3657976da3 100644
--- a/docs/data/histograms/Philippines/18001.json
+++ b/docs/data/histograms/Philippines/18001.json
@@ -1 +1 @@
-{"batchcode": "18001", "histograms": [{"batchcodes": ["18001"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "18001", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["18001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/180724.json b/docs/data/histograms/Philippines/180724.json
index f0ba8c6340b..b893a3903e9 100644
--- a/docs/data/histograms/Philippines/180724.json
+++ b/docs/data/histograms/Philippines/180724.json
@@ -1 +1 @@
-{"batchcode": "180724", "histograms": [{"batchcodes": ["180724"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "180724", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["180724"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1F1025A.json b/docs/data/histograms/Philippines/1F1025A.json
index ead116f1b49..1cd2c8f1725 100644
--- a/docs/data/histograms/Philippines/1F1025A.json
+++ b/docs/data/histograms/Philippines/1F1025A.json
@@ -1 +1 @@
-{"batchcode": "1F1025A", "histograms": [{"batchcodes": ["1F1025A"], "histogram": {"Death": 3, "Body temperature": 2, "COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Dysarthria": 1, "Echocardiogram": 1, "Fatigue": 1, "Hemiparesis": 1, "Loss of consciousness": 1, "Mitral valve incompetence": 1, "Tricuspid valve incompetence": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1025A", "histograms": [{"histogram": {"Death": 3, "Body temperature": 2, "COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Dysarthria": 1, "Echocardiogram": 1, "Fatigue": 1, "Hemiparesis": 1, "Loss of consciousness": 1, "Mitral valve incompetence": 1, "Tricuspid valve incompetence": 1}, "batchcodes": ["1F1025A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1F1032A.json b/docs/data/histograms/Philippines/1F1032A.json
index f1fddda0904..c3664e5fdfb 100644
--- a/docs/data/histograms/Philippines/1F1032A.json
+++ b/docs/data/histograms/Philippines/1F1032A.json
@@ -1 +1 @@
-{"batchcode": "1F1032A", "histograms": [{"batchcodes": ["1F1032A"], "histogram": {"Blood pressure measurement": 21, "Blood pressure increased": 19, "Cough": 6, "Body temperature": 5, "COVID-19": 5, "Heart rate": 5, "Drug ineffective": 4, "Dyspnoea": 4, "Hypoaesthesia": 4, "Malaise": 4, "Oxygen saturation": 4, "SARS-CoV-2 test": 4, "Dizziness": 3, "Vaccination site pain": 3, "COVID-19 screening": 2, "Chest pain": 2, "Dysarthria": 2, "Electrocardiogram": 2, "Nasopharyngitis": 2, "Pyrexia": 2, "Rash": 2, "Syncope": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood ketone body": 1, "Blood potassium": 1, "Blood urea": 1, "Blood uric acid": 1, "Blood urine present": 1, "Carbon dioxide": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Depressed level of consciousness": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Fatigue": 1, "Headache": 1, "Hemiparesis": 1, "High density lipoprotein": 1, "Interchange of vaccine products": 1, "Monocyte count": 1, "Muscular weakness": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nitrite urine present": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PCO2": 1, "Platelet count": 1, "Protein total": 1, "Respiratory rate": 1, "Seizure": 1, "Specific gravity urine": 1, "Sulphur dioxide test": 1, "Troponin I": 1, "Urinary sediment present": 1, "Urine analysis": 1, "Urobilinogen urine": 1, "Weight": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1032A", "histograms": [{"histogram": {"Blood pressure measurement": 21, "Blood pressure increased": 19, "Cough": 6, "Body temperature": 5, "COVID-19": 5, "Heart rate": 5, "Drug ineffective": 4, "Dyspnoea": 4, "Hypoaesthesia": 4, "Malaise": 4, "Oxygen saturation": 4, "SARS-CoV-2 test": 4, "Dizziness": 3, "Vaccination site pain": 3, "COVID-19 screening": 2, "Chest pain": 2, "Dysarthria": 2, "Electrocardiogram": 2, "Nasopharyngitis": 2, "Pyrexia": 2, "Rash": 2, "Syncope": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood ketone body": 1, "Blood potassium": 1, "Blood urea": 1, "Blood uric acid": 1, "Blood urine present": 1, "Carbon dioxide": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Depressed level of consciousness": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Fatigue": 1, "Headache": 1, "Hemiparesis": 1, "High density lipoprotein": 1, "Interchange of vaccine products": 1, "Monocyte count": 1, "Muscular weakness": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nitrite urine present": 1, "Off label use": 1, "Oropharyngeal pain": 1, "PCO2": 1, "Platelet count": 1, "Protein total": 1, "Respiratory rate": 1, "Seizure": 1, "Specific gravity urine": 1, "Sulphur dioxide test": 1, "Troponin I": 1, "Urinary sediment present": 1, "Urine analysis": 1, "Urobilinogen urine": 1, "Weight": 1, "pH urine": 1}, "batchcodes": ["1F1032A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1F1035A.json b/docs/data/histograms/Philippines/1F1035A.json
index 070b9418887..0367a788660 100644
--- a/docs/data/histograms/Philippines/1F1035A.json
+++ b/docs/data/histograms/Philippines/1F1035A.json
@@ -1 +1 @@
-{"batchcode": "1F1035A", "histograms": [{"batchcodes": ["1F1035A"], "histogram": {"Drug ineffective": 6, "COVID-19": 5, "Syncope": 5, "COVID-19 screening": 3, "SARS-CoV-2 test": 3, "Cough": 2, "Dizziness": 2, "Dyspnoea": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Pyrexia": 2, "Asymptomatic COVID-19": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Death": 1, "Head injury": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Malaise": 1, "Nasal congestion": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1035A", "histograms": [{"histogram": {"Drug ineffective": 6, "COVID-19": 5, "Syncope": 5, "COVID-19 screening": 3, "SARS-CoV-2 test": 3, "Cough": 2, "Dizziness": 2, "Dyspnoea": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Pyrexia": 2, "Asymptomatic COVID-19": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Death": 1, "Head injury": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Malaise": 1, "Nasal congestion": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["1F1035A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1F1043A.json b/docs/data/histograms/Philippines/1F1043A.json
index 99331b99c0e..12cb112597b 100644
--- a/docs/data/histograms/Philippines/1F1043A.json
+++ b/docs/data/histograms/Philippines/1F1043A.json
@@ -1 +1 @@
-{"batchcode": "1F1043A", "histograms": [{"batchcodes": ["1F1043A"], "histogram": {"Loss of consciousness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1043A", "histograms": [{"histogram": {"Loss of consciousness": 1, "Syncope": 1}, "batchcodes": ["1F1043A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1F@1032A.json b/docs/data/histograms/Philippines/1F@1032A.json
index facfb708ea6..5f1e6410118 100644
--- a/docs/data/histograms/Philippines/1F@1032A.json
+++ b/docs/data/histograms/Philippines/1F@1032A.json
@@ -1 +1 @@
-{"batchcode": "1F@1032A", "histograms": [{"batchcodes": ["1F@1032A"], "histogram": {"Dizziness": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "1F@1032A", "histograms": [{"histogram": {"Dizziness": 1, "Loss of consciousness": 1}, "batchcodes": ["1F@1032A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1FLO30A.json b/docs/data/histograms/Philippines/1FLO30A.json
index 777bd19b5cb..e2826caf2ad 100644
--- a/docs/data/histograms/Philippines/1FLO30A.json
+++ b/docs/data/histograms/Philippines/1FLO30A.json
@@ -1 +1 @@
-{"batchcode": "1FLO30A", "histograms": [{"batchcodes": ["1FLO30A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "1FLO30A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["1FLO30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1J02A.json b/docs/data/histograms/Philippines/1J02A.json
index 626f3445961..e2ef1555a85 100644
--- a/docs/data/histograms/Philippines/1J02A.json
+++ b/docs/data/histograms/Philippines/1J02A.json
@@ -1 +1 @@
-{"batchcode": "1J02A", "histograms": [{"batchcodes": ["1J02A"], "histogram": {"Asthenia": 1, "Dengue fever": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Off label use": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1J02A", "histograms": [{"histogram": {"Asthenia": 1, "Dengue fever": 1, "Interchange of vaccine products": 1, "Nausea": 1, "Off label use": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["1J02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1J07214.json b/docs/data/histograms/Philippines/1J07214.json
index 14fa58ecc81..0d52db48187 100644
--- a/docs/data/histograms/Philippines/1J07214.json
+++ b/docs/data/histograms/Philippines/1J07214.json
@@ -1 +1 @@
-{"batchcode": "1J07214", "histograms": [{"batchcodes": ["1J07214"], "histogram": {"Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "1J07214", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1}, "batchcodes": ["1J07214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1J072A.json b/docs/data/histograms/Philippines/1J072A.json
index c5b835c19f0..1c6820aa344 100644
--- a/docs/data/histograms/Philippines/1J072A.json
+++ b/docs/data/histograms/Philippines/1J072A.json
@@ -1 +1 @@
-{"batchcode": "1J072A", "histograms": [{"batchcodes": ["1J072A"], "histogram": {"Off label use": 4, "Headache": 3, "Interchange of vaccine products": 3, "Pyrexia": 3, "Asthenia": 2, "COVID-19": 2, "Decreased appetite": 2, "Labour pain": 2, "Rash": 2, "Abdominal pain upper": 1, "Chest pain": 1, "Chills": 1, "Dengue fever": 1, "Discoloured vomit": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Ear pain": 1, "Electrolyte imbalance": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Somnolence": 1, "Twin pregnancy": 1, "Type 2 diabetes mellitus": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1J072A", "histograms": [{"histogram": {"Off label use": 4, "Headache": 3, "Interchange of vaccine products": 3, "Pyrexia": 3, "Asthenia": 2, "COVID-19": 2, "Decreased appetite": 2, "Labour pain": 2, "Rash": 2, "Abdominal pain upper": 1, "Chest pain": 1, "Chills": 1, "Dengue fever": 1, "Discoloured vomit": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Ear pain": 1, "Electrolyte imbalance": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Somnolence": 1, "Twin pregnancy": 1, "Type 2 diabetes mellitus": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["1J072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1J0734A.json b/docs/data/histograms/Philippines/1J0734A.json
index 2828f57777c..beaa491efbe 100644
--- a/docs/data/histograms/Philippines/1J0734A.json
+++ b/docs/data/histograms/Philippines/1J0734A.json
@@ -1 +1 @@
-{"batchcode": "1J0734A", "histograms": [{"batchcodes": ["1J0734A"], "histogram": {"Anaphylactic shock": 1, "Hypotension": 1}}]}
\ No newline at end of file
+{"batchcode": "1J0734A", "histograms": [{"histogram": {"Anaphylactic shock": 1, "Hypotension": 1}, "batchcodes": ["1J0734A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1J073A.json b/docs/data/histograms/Philippines/1J073A.json
index f6fbfed6447..0d9739c33cf 100644
--- a/docs/data/histograms/Philippines/1J073A.json
+++ b/docs/data/histograms/Philippines/1J073A.json
@@ -1 +1 @@
-{"batchcode": "1J073A", "histograms": [{"batchcodes": ["1J073A"], "histogram": {"Off label use": 4, "Asthenia": 3, "Death": 3, "Dizziness": 3, "Dyspnoea": 3, "Vomiting": 3, "Blood pressure increased": 2, "Chest discomfort": 2, "Headache": 2, "Immunisation": 2, "Interchange of vaccine products": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Anaphylactic shock": 1, "Blood pressure measurement": 1, "Cardiac failure acute": 1, "Chills": 1, "Colonoscopy": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Dysarthria": 1, "Dysuria": 1, "Flank pain": 1, "Glycosylated haemoglobin": 1, "Loss of consciousness": 1, "Malaise": 1, "Menstruation irregular": 1, "Oesophagogastroduodenoscopy": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "Rash": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "1J073A", "histograms": [{"histogram": {"Off label use": 4, "Asthenia": 3, "Death": 3, "Dizziness": 3, "Dyspnoea": 3, "Vomiting": 3, "Blood pressure increased": 2, "Chest discomfort": 2, "Headache": 2, "Immunisation": 2, "Interchange of vaccine products": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Anaphylactic shock": 1, "Blood pressure measurement": 1, "Cardiac failure acute": 1, "Chills": 1, "Colonoscopy": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dizziness postural": 1, "Dysarthria": 1, "Dysuria": 1, "Flank pain": 1, "Glycosylated haemoglobin": 1, "Loss of consciousness": 1, "Malaise": 1, "Menstruation irregular": 1, "Oesophagogastroduodenoscopy": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Pruritus": 1, "Rash": 1, "Seizure": 1}, "batchcodes": ["1J073A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1JO72A.json b/docs/data/histograms/Philippines/1JO72A.json
index 45f524803e2..a9d23fd5d91 100644
--- a/docs/data/histograms/Philippines/1JO72A.json
+++ b/docs/data/histograms/Philippines/1JO72A.json
@@ -1 +1 @@
-{"batchcode": "1JO72A", "histograms": [{"batchcodes": ["1JO72A"], "histogram": {"Acute myocardial infarction": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "1JO72A", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["1JO72A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/1K078A.json b/docs/data/histograms/Philippines/1K078A.json
index 62689c0e2a3..a958558b7f0 100644
--- a/docs/data/histograms/Philippines/1K078A.json
+++ b/docs/data/histograms/Philippines/1K078A.json
@@ -1 +1 @@
-{"batchcode": "1K078A", "histograms": [{"batchcodes": ["1K078A"], "histogram": {"Blood pressure increased": 3, "Blood pressure measurement": 3, "Immunisation": 3, "Off label use": 3, "Dyspnoea": 1, "Heart rate": 1, "Heart rate decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "1K078A", "histograms": [{"histogram": {"Blood pressure increased": 3, "Blood pressure measurement": 3, "Immunisation": 3, "Off label use": 3, "Dyspnoea": 1, "Heart rate": 1, "Heart rate decreased": 1}, "batchcodes": ["1K078A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/20210727.json b/docs/data/histograms/Philippines/20210727.json
index b5382a92ab8..410004b96e5 100644
--- a/docs/data/histograms/Philippines/20210727.json
+++ b/docs/data/histograms/Philippines/20210727.json
@@ -1 +1 @@
-{"batchcode": "20210727", "histograms": [{"batchcodes": ["20210727"], "histogram": {"Loss of consciousness": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "20210727", "histograms": [{"histogram": {"Loss of consciousness": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["20210727"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/202108101.json b/docs/data/histograms/Philippines/202108101.json
index 6cc0e60b616..6ca96e63a00 100644
--- a/docs/data/histograms/Philippines/202108101.json
+++ b/docs/data/histograms/Philippines/202108101.json
@@ -1 +1 @@
-{"batchcode": "202108101", "histograms": [{"batchcodes": ["061G21A", "202108101"], "histogram": {"Osteomyelitis": 1}}]}
\ No newline at end of file
+{"batchcode": "202108101", "histograms": [{"histogram": {"Osteomyelitis": 1}, "batchcodes": ["061G21A", "202108101"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/20213C21A.json b/docs/data/histograms/Philippines/20213C21A.json
index 04293769d94..19710cf070a 100644
--- a/docs/data/histograms/Philippines/20213C21A.json
+++ b/docs/data/histograms/Philippines/20213C21A.json
@@ -1 +1 @@
-{"batchcode": "20213C21A", "histograms": [{"batchcodes": ["20213C21A", "ACB3340"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "20213C21A", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["20213C21A", "ACB3340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/202386320.json b/docs/data/histograms/Philippines/202386320.json
index d7536bfb82d..28c608b6460 100644
--- a/docs/data/histograms/Philippines/202386320.json
+++ b/docs/data/histograms/Philippines/202386320.json
@@ -1 +1 @@
-{"batchcode": "202386320", "histograms": [{"batchcodes": ["202386320"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "202386320", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["202386320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/203A21A.json b/docs/data/histograms/Philippines/203A21A.json
index 275b434655a..830728bc094 100644
--- a/docs/data/histograms/Philippines/203A21A.json
+++ b/docs/data/histograms/Philippines/203A21A.json
@@ -1 +1 @@
-{"batchcode": "203A21A", "histograms": [{"batchcodes": ["203A21A"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Pyrexia": 1, "Urinary retention": 1}}]}
\ No newline at end of file
+{"batchcode": "203A21A", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Pyrexia": 1, "Urinary retention": 1}, "batchcodes": ["203A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2050214.json b/docs/data/histograms/Philippines/2050214.json
index 070ec96bf95..0d52cdd9c10 100644
--- a/docs/data/histograms/Philippines/2050214.json
+++ b/docs/data/histograms/Philippines/2050214.json
@@ -1 +1 @@
-{"batchcode": "2050214", "histograms": [{"batchcodes": ["2050214"], "histogram": {"Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "2050214", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1}, "batchcodes": ["2050214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205021A.json b/docs/data/histograms/Philippines/205021A.json
index 467d2e5ca48..c3db6be5c8d 100644
--- a/docs/data/histograms/Philippines/205021A.json
+++ b/docs/data/histograms/Philippines/205021A.json
@@ -1 +1 @@
-{"batchcode": "205021A", "histograms": [{"batchcodes": ["205021A"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "205021A", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["205021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205024.json b/docs/data/histograms/Philippines/205024.json
index 3060202eece..6d025301a5c 100644
--- a/docs/data/histograms/Philippines/205024.json
+++ b/docs/data/histograms/Philippines/205024.json
@@ -1 +1 @@
-{"batchcode": "205024", "histograms": [{"batchcodes": ["205024"], "histogram": {"COVID-19": 1, "Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "205024", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Dyspnoea": 1}, "batchcodes": ["205024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205621A.json b/docs/data/histograms/Philippines/205621A.json
index a76b04dff91..0b3940c2ad2 100644
--- a/docs/data/histograms/Philippines/205621A.json
+++ b/docs/data/histograms/Philippines/205621A.json
@@ -1 +1 @@
-{"batchcode": "205621A", "histograms": [{"batchcodes": ["205621A"], "histogram": {"COVID-19": 1, "Chest pain": 1, "Dyspnoea": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "205621A", "histograms": [{"histogram": {"COVID-19": 1, "Chest pain": 1, "Dyspnoea": 1, "Vaccination failure": 1}, "batchcodes": ["205621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205A21A.json b/docs/data/histograms/Philippines/205A21A.json
index b4e0af88501..998ca140690 100644
--- a/docs/data/histograms/Philippines/205A21A.json
+++ b/docs/data/histograms/Philippines/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"Computerised tomogram": 1, "Magnetic resonance imaging": 1, "Nervous system disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"Computerised tomogram": 1, "Magnetic resonance imaging": 1, "Nervous system disorder": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205C.json b/docs/data/histograms/Philippines/205C.json
index 0cef92d84be..49e8d5000fd 100644
--- a/docs/data/histograms/Philippines/205C.json
+++ b/docs/data/histograms/Philippines/205C.json
@@ -1 +1 @@
-{"batchcode": "205C", "histograms": [{"batchcodes": ["205C"], "histogram": {"Aphasia": 1, "Facial asymmetry": 1, "Hemiparesis": 1}}]}
\ No newline at end of file
+{"batchcode": "205C", "histograms": [{"histogram": {"Aphasia": 1, "Facial asymmetry": 1, "Hemiparesis": 1}, "batchcodes": ["205C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205C21.json b/docs/data/histograms/Philippines/205C21.json
index 75dd9a48e21..202708390f3 100644
--- a/docs/data/histograms/Philippines/205C21.json
+++ b/docs/data/histograms/Philippines/205C21.json
@@ -1 +1 @@
-{"batchcode": "205C21", "histograms": [{"batchcodes": ["205C21"], "histogram": {"Nasopharyngitis": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "205C21", "histograms": [{"histogram": {"Nasopharyngitis": 1, "Syncope": 1}, "batchcodes": ["205C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205C21A.json b/docs/data/histograms/Philippines/205C21A.json
index 7908d54c642..aa8e6f35648 100644
--- a/docs/data/histograms/Philippines/205C21A.json
+++ b/docs/data/histograms/Philippines/205C21A.json
@@ -1 +1 @@
-{"batchcode": "205C21A", "histograms": [{"batchcodes": ["205C21A"], "histogram": {"Syncope": 7, "Headache": 4, "Malaise": 4, "Pyrexia": 4, "Blood pressure increased": 3, "Cough": 3, "Dyspnoea": 3, "Blood pressure measurement": 2, "Decreased appetite": 2, "Fatigue": 2, "Loss of consciousness": 2, "Nausea": 2, "Respiratory distress": 2, "Abdominal pain": 1, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "COVID-19": 1, "Chest pain": 1, "Diarrhoea": 1, "Dysphagia": 1, "Hypoaesthesia": 1, "Nasopharyngitis": 1, "Swelling": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "205C21A", "histograms": [{"histogram": {"Syncope": 7, "Headache": 4, "Malaise": 4, "Pyrexia": 4, "Blood pressure increased": 3, "Cough": 3, "Dyspnoea": 3, "Blood pressure measurement": 2, "Decreased appetite": 2, "Fatigue": 2, "Loss of consciousness": 2, "Nausea": 2, "Respiratory distress": 2, "Abdominal pain": 1, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "COVID-19": 1, "Chest pain": 1, "Diarrhoea": 1, "Dysphagia": 1, "Hypoaesthesia": 1, "Nasopharyngitis": 1, "Swelling": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["205C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/205C81A.json b/docs/data/histograms/Philippines/205C81A.json
index 87e2ca8116d..cfecc3c56b5 100644
--- a/docs/data/histograms/Philippines/205C81A.json
+++ b/docs/data/histograms/Philippines/205C81A.json
@@ -1 +1 @@
-{"batchcode": "205C81A", "histograms": [{"batchcodes": ["205C81A"], "histogram": {"Dyspnoea": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "205C81A", "histograms": [{"histogram": {"Dyspnoea": 1, "Loss of consciousness": 1}, "batchcodes": ["205C81A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2072054.json b/docs/data/histograms/Philippines/2072054.json
index 97138821945..81641f02f25 100644
--- a/docs/data/histograms/Philippines/2072054.json
+++ b/docs/data/histograms/Philippines/2072054.json
@@ -1 +1 @@
-{"batchcode": "2072054", "histograms": [{"batchcodes": ["2072054"], "histogram": {"Chest pain": 1, "Chills": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "2072054", "histograms": [{"histogram": {"Chest pain": 1, "Chills": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["2072054"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/209021A.json b/docs/data/histograms/Philippines/209021A.json
index 5438c0be701..93cdea4072e 100644
--- a/docs/data/histograms/Philippines/209021A.json
+++ b/docs/data/histograms/Philippines/209021A.json
@@ -1 +1 @@
-{"batchcode": "209021A", "histograms": [{"batchcodes": ["209021A"], "histogram": {"COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Dysphagia": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Oropharyngeal discomfort": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "209021A", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Dysphagia": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Oropharyngeal discomfort": 1, "Pyrexia": 1}, "batchcodes": ["209021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/209C21A.json b/docs/data/histograms/Philippines/209C21A.json
index ce6d560023e..b3326164023 100644
--- a/docs/data/histograms/Philippines/209C21A.json
+++ b/docs/data/histograms/Philippines/209C21A.json
@@ -1 +1 @@
-{"batchcode": "209C21A", "histograms": [{"batchcodes": ["209C21A", "A115"], "histogram": {"Asthenia": 1, "Headache": 1, "Seizure": 1}}, {"batchcodes": ["209C21A", "D17K21A", "FM7375"], "histogram": {"Depressed level of consciousness": 1}}, {"batchcodes": ["209C21A", "D17K21A"], "histogram": {"Depressed level of consciousness": 1}}, {"batchcodes": ["209C21A"], "histogram": {"Dyspnoea": 6, "Cough": 3, "Decreased appetite": 3, "Pyrexia": 3, "Asthenia": 2, "Chest discomfort": 2, "Depressed level of consciousness": 2, "Dysphagia": 2, "Breast pain": 1, "COVID-19": 1, "Death": 1, "Headache": 1, "Hypoaesthesia": 1, "Pain": 1, "Palpitations": 1, "Rhinitis": 1, "Throat tightness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "209C21A", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Seizure": 1}, "batchcodes": ["209C21A", "A115"]}, {"histogram": {"Depressed level of consciousness": 1}, "batchcodes": ["209C21A", "D17K21A", "FM7375"]}, {"histogram": {"Depressed level of consciousness": 1}, "batchcodes": ["209C21A", "D17K21A"]}, {"histogram": {"Dyspnoea": 6, "Cough": 3, "Decreased appetite": 3, "Pyrexia": 3, "Asthenia": 2, "Chest discomfort": 2, "Depressed level of consciousness": 2, "Dysphagia": 2, "Breast pain": 1, "COVID-19": 1, "Death": 1, "Headache": 1, "Hypoaesthesia": 1, "Pain": 1, "Palpitations": 1, "Rhinitis": 1, "Throat tightness": 1, "Vaccination site pain": 1}, "batchcodes": ["209C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/209C2IA.json b/docs/data/histograms/Philippines/209C2IA.json
index 3f8188b974e..677ddbf37a0 100644
--- a/docs/data/histograms/Philippines/209C2IA.json
+++ b/docs/data/histograms/Philippines/209C2IA.json
@@ -1 +1 @@
-{"batchcode": "209C2IA", "histograms": [{"batchcodes": ["209C2IA"], "histogram": {"Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "209C2IA", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Cough": 1, "Dyspnoea": 1}, "batchcodes": ["209C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/209CZ1A 101621.json b/docs/data/histograms/Philippines/209CZ1A 101621.json
index 85e8fb37f52..5deaa434b3e 100644
--- a/docs/data/histograms/Philippines/209CZ1A 101621.json
+++ b/docs/data/histograms/Philippines/209CZ1A 101621.json
@@ -1 +1 @@
-{"batchcode": "209CZ1A 101621", "histograms": [{"batchcodes": ["209CZ1A 101621"], "histogram": {"COVID-19 pneumonia": 1, "Dyspnoea": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "209CZ1A 101621", "histograms": [{"histogram": {"COVID-19 pneumonia": 1, "Dyspnoea": 1, "Vaccination failure": 1}, "batchcodes": ["209CZ1A 101621"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/20SC21A.json b/docs/data/histograms/Philippines/20SC21A.json
index f83fd2410e8..e54839a8d60 100644
--- a/docs/data/histograms/Philippines/20SC21A.json
+++ b/docs/data/histograms/Philippines/20SC21A.json
@@ -1 +1 @@
-{"batchcode": "20SC21A", "histograms": [{"batchcodes": ["20SC21A"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "20SC21A", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["20SC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2100680.json b/docs/data/histograms/Philippines/2100680.json
index 155caa5f44d..f032b70787d 100644
--- a/docs/data/histograms/Philippines/2100680.json
+++ b/docs/data/histograms/Philippines/2100680.json
@@ -1 +1 @@
-{"batchcode": "2100680", "histograms": [{"batchcodes": ["2100680", "C202105084", "J202106033"], "histogram": {"Death": 1}}, {"batchcodes": ["2100680"], "histogram": {"Abdominal pain": 1, "Gastritis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "2100680", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["2100680", "C202105084", "J202106033"]}, {"histogram": {"Abdominal pain": 1, "Gastritis": 1, "Pyrexia": 1}, "batchcodes": ["2100680"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2100694.json b/docs/data/histograms/Philippines/2100694.json
index c4b9b159a60..c9bea522ee4 100644
--- a/docs/data/histograms/Philippines/2100694.json
+++ b/docs/data/histograms/Philippines/2100694.json
@@ -1 +1 @@
-{"batchcode": "2100694", "histograms": [{"batchcodes": ["2100694"], "histogram": {"Unresponsive to stimuli": 2}}]}
\ No newline at end of file
+{"batchcode": "2100694", "histograms": [{"histogram": {"Unresponsive to stimuli": 2}, "batchcodes": ["2100694"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/210182.json b/docs/data/histograms/Philippines/210182.json
index b9d3a05f755..3f41041bacd 100644
--- a/docs/data/histograms/Philippines/210182.json
+++ b/docs/data/histograms/Philippines/210182.json
@@ -1 +1 @@
-{"batchcode": "210182", "histograms": [{"batchcodes": ["002K21A", "210182", "210182"], "histogram": {"Acute coronary syndrome": 1}}, {"batchcodes": ["210182", "210182", "48104731"], "histogram": {"End stage renal disease": 1}}, {"batchcodes": ["210182", "ABW4731"], "histogram": {"Acute myocardial infarction": 1, "COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "210182", "histograms": [{"histogram": {"Acute coronary syndrome": 1}, "batchcodes": ["002K21A", "210182", "210182"]}, {"histogram": {"Acute coronary syndrome": 1}, "batchcodes": ["002K21A", "210182", "210182"]}, {"histogram": {"End stage renal disease": 1}, "batchcodes": ["210182", "210182", "48104731"]}, {"histogram": {"End stage renal disease": 1}, "batchcodes": ["210182", "210182", "48104731"]}, {"histogram": {"Acute myocardial infarction": 1, "COVID-19": 1}, "batchcodes": ["210182", "ABW4731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21201A.json b/docs/data/histograms/Philippines/21201A.json
index 125e33c3c6c..f3a4141127f 100644
--- a/docs/data/histograms/Philippines/21201A.json
+++ b/docs/data/histograms/Philippines/21201A.json
@@ -1 +1 @@
-{"batchcode": "21201A", "histograms": [{"batchcodes": ["21201A"], "histogram": {"Dysarthria": 1, "Headache": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "21201A", "histograms": [{"histogram": {"Dysarthria": 1, "Headache": 1, "Hypoaesthesia": 1}, "batchcodes": ["21201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212021A.json b/docs/data/histograms/Philippines/212021A.json
index c442ad4a715..cecc3eac866 100644
--- a/docs/data/histograms/Philippines/212021A.json
+++ b/docs/data/histograms/Philippines/212021A.json
@@ -1 +1 @@
-{"batchcode": "212021A", "histograms": [{"batchcodes": ["212021A"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Swelling": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "212021A", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Swelling": 1, "Tachycardia": 1}, "batchcodes": ["212021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C12A.json b/docs/data/histograms/Philippines/212C12A.json
index 69d4b1d7517..be57ee2e53e 100644
--- a/docs/data/histograms/Philippines/212C12A.json
+++ b/docs/data/histograms/Philippines/212C12A.json
@@ -1 +1 @@
-{"batchcode": "212C12A", "histograms": [{"batchcodes": ["212C12A"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "212C12A", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["212C12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C1A.json b/docs/data/histograms/Philippines/212C1A.json
index 281cc2d40e5..e708b911c10 100644
--- a/docs/data/histograms/Philippines/212C1A.json
+++ b/docs/data/histograms/Philippines/212C1A.json
@@ -1 +1 @@
-{"batchcode": "212C1A", "histograms": [{"batchcodes": ["212C1A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chest pain": 1, "Headache": 1, "Pain assessment": 1, "Pyrexia": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "212C1A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chest pain": 1, "Headache": 1, "Pain assessment": 1, "Pyrexia": 1, "Vaccination failure": 1}, "batchcodes": ["212C1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C21 A.json b/docs/data/histograms/Philippines/212C21 A.json
index e8f1a1ceff5..eccaae57e43 100644
--- a/docs/data/histograms/Philippines/212C21 A.json
+++ b/docs/data/histograms/Philippines/212C21 A.json
@@ -1 +1 @@
-{"batchcode": "212C21 A", "histograms": [{"batchcodes": ["212C21 A"], "histogram": {"Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "212C21 A", "histograms": [{"histogram": {"Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["212C21 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C214.json b/docs/data/histograms/Philippines/212C214.json
index d6472fc5cda..e01943467a1 100644
--- a/docs/data/histograms/Philippines/212C214.json
+++ b/docs/data/histograms/Philippines/212C214.json
@@ -1 +1 @@
-{"batchcode": "212C214", "histograms": [{"batchcodes": ["212C214"], "histogram": {"Abdominal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "212C214", "histograms": [{"histogram": {"Abdominal pain": 1}, "batchcodes": ["212C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C21A / 12169.json b/docs/data/histograms/Philippines/212C21A / 12169.json
index 1ec56114aee..068f011f48e 100644
--- a/docs/data/histograms/Philippines/212C21A / 12169.json
+++ b/docs/data/histograms/Philippines/212C21A / 12169.json
@@ -1 +1 @@
-{"batchcode": "212C21A / 12169", "histograms": [{"batchcodes": ["212C21A / 12169"], "histogram": {"COVID-19": 1, "Nasopharyngitis": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "212C21A / 12169", "histograms": [{"histogram": {"COVID-19": 1, "Nasopharyngitis": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["212C21A / 12169"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C21A.json b/docs/data/histograms/Philippines/212C21A.json
index 1078047ee53..e400c01f5ef 100644
--- a/docs/data/histograms/Philippines/212C21A.json
+++ b/docs/data/histograms/Philippines/212C21A.json
@@ -1 +1 @@
-{"batchcode": "212C21A", "histograms": [{"batchcodes": ["046G218", "212C21A"], "histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}, {"batchcodes": ["212C21A", "N002A"], "histogram": {"Cough": 2, "COVID-19": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Oxygen saturation decreased": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["212C21A", "PCA0008"], "histogram": {"Death": 1}}, {"batchcodes": ["212C21A", "PCA0024"], "histogram": {"Death": 1}}, {"batchcodes": ["212C21A"], "histogram": {"Dyspnoea": 32, "Cough": 30, "Pyrexia": 26, "SARS-CoV-2 test": 16, "Syncope": 13, "Blood pressure measurement": 12, "COVID-19": 12, "Malaise": 12, "Vaccination failure": 11, "Chest pain": 9, "Asthenia": 8, "Blood pressure increased": 7, "Decreased appetite": 7, "Heart rate": 7, "Nausea": 7, "Vomiting": 7, "Body temperature": 6, "Fatigue": 6, "Nasopharyngitis": 6, "Oxygen saturation": 6, "Abdominal pain": 4, "Diarrhoea": 4, "Headache": 4, "Hypoaesthesia": 4, "Loss of consciousness": 4, "Respiratory rate": 4, "Unresponsive to stimuli": 4, "Chills": 3, "Death": 3, "Dizziness": 3, "Oxygen saturation decreased": 3, "Anaphylactic reaction": 2, "Back pain": 2, "Blood glucose": 2, "Heart rate increased": 2, "Hemiplegia": 2, "Hypotension": 2, "Myalgia": 2, "Myocardial infarction": 2, "Pain": 2, "Pneumonia": 2, "Pruritus": 2, "Rash": 2, "Seizure": 2, "Tachycardia": 2, "Throat irritation": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Ageusia": 1, "Altered visual depth perception": 1, "Anosmia": 1, "Anxiety": 1, "Application site pain": 1, "Axillary pain": 1, "Blister": 1, "Blood potassium decreased": 1, "Blood test": 1, "Bradycardia": 1, "Burning sensation": 1, "COVID-19 pneumonia": 1, "Cardio-respiratory arrest": 1, "Cavernous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Constipation": 1, "Culture throat": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Eye swelling": 1, "Fall": 1, "Gastrooesophageal reflux disease": 1, "Gingival blister": 1, "Groin pain": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoptysis": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hyperventilation": 1, "Injection site pain": 1, "Intracranial aneurysm": 1, "Investigation": 1, "Multiple organ dysfunction syndrome": 1, "Musculoskeletal stiffness": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Restlessness": 1, "Secretion discharge": 1, "Speech disorder": 1, "Subarachnoid haemorrhage": 1, "Suspected COVID-19": 1, "Toothache": 1, "Urinary tract infection": 1, "Urine output": 1, "Urine output decreased": 1, "Use of accessory respiratory muscles": 1, "Vasculitis": 1, "Vision blurred": 1, "Weight": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "212C21A", "histograms": [{"histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["046G218", "212C21A"]}, {"histogram": {"Cough": 2, "COVID-19": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Oxygen saturation decreased": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["212C21A", "N002A"]}, {"histogram": {"Death": 1}, "batchcodes": ["212C21A", "PCA0008"]}, {"histogram": {"Death": 1}, "batchcodes": ["212C21A", "PCA0024"]}, {"histogram": {"Dyspnoea": 32, "Cough": 30, "Pyrexia": 26, "SARS-CoV-2 test": 16, "Syncope": 13, "Blood pressure measurement": 12, "COVID-19": 12, "Malaise": 12, "Vaccination failure": 11, "Chest pain": 9, "Asthenia": 8, "Blood pressure increased": 7, "Decreased appetite": 7, "Heart rate": 7, "Nausea": 7, "Vomiting": 7, "Body temperature": 6, "Fatigue": 6, "Nasopharyngitis": 6, "Oxygen saturation": 6, "Abdominal pain": 4, "Diarrhoea": 4, "Headache": 4, "Hypoaesthesia": 4, "Loss of consciousness": 4, "Respiratory rate": 4, "Unresponsive to stimuli": 4, "Chills": 3, "Death": 3, "Dizziness": 3, "Oxygen saturation decreased": 3, "Anaphylactic reaction": 2, "Back pain": 2, "Blood glucose": 2, "Heart rate increased": 2, "Hemiplegia": 2, "Hypotension": 2, "Myalgia": 2, "Myocardial infarction": 2, "Pain": 2, "Pneumonia": 2, "Pruritus": 2, "Rash": 2, "Seizure": 2, "Tachycardia": 2, "Throat irritation": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Ageusia": 1, "Altered visual depth perception": 1, "Anosmia": 1, "Anxiety": 1, "Application site pain": 1, "Axillary pain": 1, "Blister": 1, "Blood potassium decreased": 1, "Blood test": 1, "Bradycardia": 1, "Burning sensation": 1, "COVID-19 pneumonia": 1, "Cardio-respiratory arrest": 1, "Cavernous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Constipation": 1, "Culture throat": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Eye swelling": 1, "Fall": 1, "Gastrooesophageal reflux disease": 1, "Gingival blister": 1, "Groin pain": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematuria": 1, "Haemoptysis": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hyperventilation": 1, "Injection site pain": 1, "Intracranial aneurysm": 1, "Investigation": 1, "Multiple organ dysfunction syndrome": 1, "Musculoskeletal stiffness": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Restlessness": 1, "Secretion discharge": 1, "Speech disorder": 1, "Subarachnoid haemorrhage": 1, "Suspected COVID-19": 1, "Toothache": 1, "Urinary tract infection": 1, "Urine output": 1, "Urine output decreased": 1, "Use of accessory respiratory muscles": 1, "Vasculitis": 1, "Vision blurred": 1, "Weight": 1, "Wheezing": 1}, "batchcodes": ["212C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C221A.json b/docs/data/histograms/Philippines/212C221A.json
index 6225d54c5e2..c6dc5fa2059 100644
--- a/docs/data/histograms/Philippines/212C221A.json
+++ b/docs/data/histograms/Philippines/212C221A.json
@@ -1 +1 @@
-{"batchcode": "212C221A", "histograms": [{"batchcodes": ["212C221A"], "histogram": {"Cerebrovascular accident": 1, "Hypoaesthesia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "212C221A", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Hypoaesthesia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["212C221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212C2IA.json b/docs/data/histograms/Philippines/212C2IA.json
index c5768a54d4d..081a6a3c655 100644
--- a/docs/data/histograms/Philippines/212C2IA.json
+++ b/docs/data/histograms/Philippines/212C2IA.json
@@ -1 +1 @@
-{"batchcode": "212C2IA", "histograms": [{"batchcodes": ["212C2IA"], "histogram": {"Penile swelling": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "212C2IA", "histograms": [{"histogram": {"Penile swelling": 1, "Peripheral swelling": 1}, "batchcodes": ["212C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212CZ1A.json b/docs/data/histograms/Philippines/212CZ1A.json
index b59be4f765c..860bdc5346c 100644
--- a/docs/data/histograms/Philippines/212CZ1A.json
+++ b/docs/data/histograms/Philippines/212CZ1A.json
@@ -1 +1 @@
-{"batchcode": "212CZ1A", "histograms": [{"batchcodes": ["212CZ1A"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "212CZ1A", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["212CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/212CZ21A.json b/docs/data/histograms/Philippines/212CZ21A.json
index 249e7ee6b80..d110530afee 100644
--- a/docs/data/histograms/Philippines/212CZ21A.json
+++ b/docs/data/histograms/Philippines/212CZ21A.json
@@ -1 +1 @@
-{"batchcode": "212CZ21A", "histograms": [{"batchcodes": ["212CZ21A"], "histogram": {"Ageusia": 1, "Dysarthria": 1, "Dyspnoea": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "212CZ21A", "histograms": [{"histogram": {"Ageusia": 1, "Dysarthria": 1, "Dyspnoea": 1, "Paraesthesia": 1}, "batchcodes": ["212CZ21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213.json b/docs/data/histograms/Philippines/213.json
index 48092767701..a29e9a21b62 100644
--- a/docs/data/histograms/Philippines/213.json
+++ b/docs/data/histograms/Philippines/213.json
@@ -1 +1 @@
-{"batchcode": "213", "histograms": [{"batchcodes": ["213"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Cough": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "213", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Cough": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213001A.json b/docs/data/histograms/Philippines/213001A.json
index 4239a4a8212..66495c179ea 100644
--- a/docs/data/histograms/Philippines/213001A.json
+++ b/docs/data/histograms/Philippines/213001A.json
@@ -1 +1 @@
-{"batchcode": "213001A", "histograms": [{"batchcodes": ["213001A"], "histogram": {"Decreased appetite": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "213001A", "histograms": [{"histogram": {"Decreased appetite": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["213001A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213021A.json b/docs/data/histograms/Philippines/213021A.json
index 7e04fe90a01..e078c8d902b 100644
--- a/docs/data/histograms/Philippines/213021A.json
+++ b/docs/data/histograms/Philippines/213021A.json
@@ -1 +1 @@
-{"batchcode": "213021A", "histograms": [{"batchcodes": ["0021221A", "213021A"], "histogram": {"Vaccination site reaction": 1}}, {"batchcodes": ["213021A"], "histogram": {"COVID-19": 1, "Cough": 1, "Death": 1, "Diarrhoea": 1, "Fracture": 1, "Nasopharyngitis": 1, "Nausea": 1, "Vaccination failure": 1, "Vaccination site reaction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "213021A", "histograms": [{"histogram": {"Vaccination site reaction": 1}, "batchcodes": ["0021221A", "213021A"]}, {"histogram": {"COVID-19": 1, "Cough": 1, "Death": 1, "Diarrhoea": 1, "Fracture": 1, "Nasopharyngitis": 1, "Nausea": 1, "Vaccination failure": 1, "Vaccination site reaction": 1, "Vomiting": 1}, "batchcodes": ["213021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21321A.json b/docs/data/histograms/Philippines/21321A.json
index c38e551bcc4..e655bd2fc6f 100644
--- a/docs/data/histograms/Philippines/21321A.json
+++ b/docs/data/histograms/Philippines/21321A.json
@@ -1 +1 @@
-{"batchcode": "21321A", "histograms": [{"batchcodes": ["21321A"], "histogram": {"Fatigue": 1, "Nausea": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "21321A", "histograms": [{"histogram": {"Fatigue": 1, "Nausea": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["21321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2132A1A.json b/docs/data/histograms/Philippines/2132A1A.json
index d7d104f3bfd..76711078224 100644
--- a/docs/data/histograms/Philippines/2132A1A.json
+++ b/docs/data/histograms/Philippines/2132A1A.json
@@ -1 +1 @@
-{"batchcode": "2132A1A", "histograms": [{"batchcodes": ["2132A1A"], "histogram": {"COVID-19": 1, "Headache": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "2132A1A", "histograms": [{"histogram": {"COVID-19": 1, "Headache": 1, "Vaccination failure": 1}, "batchcodes": ["2132A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2132C21A.json b/docs/data/histograms/Philippines/2132C21A.json
index 81a4d92ff49..4d9dfd1bca3 100644
--- a/docs/data/histograms/Philippines/2132C21A.json
+++ b/docs/data/histograms/Philippines/2132C21A.json
@@ -1 +1 @@
-{"batchcode": "2132C21A", "histograms": [{"batchcodes": ["2132C21A"], "histogram": {"Diarrhoea": 1, "Dyspnoea": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "2132C21A", "histograms": [{"histogram": {"Diarrhoea": 1, "Dyspnoea": 1, "Headache": 1}, "batchcodes": ["2132C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213521A.json b/docs/data/histograms/Philippines/213521A.json
index 25469c3d30c..0d7f3417df8 100644
--- a/docs/data/histograms/Philippines/213521A.json
+++ b/docs/data/histograms/Philippines/213521A.json
@@ -1 +1 @@
-{"batchcode": "213521A", "histograms": [{"batchcodes": ["213521A"], "histogram": {"Asthenia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "213521A", "histograms": [{"histogram": {"Asthenia": 1, "Vaccination site pain": 1}, "batchcodes": ["213521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213621A.json b/docs/data/histograms/Philippines/213621A.json
index a196b1a893a..7aea14a9f5c 100644
--- a/docs/data/histograms/Philippines/213621A.json
+++ b/docs/data/histograms/Philippines/213621A.json
@@ -1 +1 @@
-{"batchcode": "213621A", "histograms": [{"batchcodes": ["213621A"], "histogram": {"Abdominal pain": 1, "Malaise": 1, "Pneumonia": 1, "Pyrexia": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "213621A", "histograms": [{"histogram": {"Abdominal pain": 1, "Malaise": 1, "Pneumonia": 1, "Pyrexia": 1, "X-ray": 1}, "batchcodes": ["213621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C 214.json b/docs/data/histograms/Philippines/213C 214.json
index 0ee6154c2de..9e8c8ce64e2 100644
--- a/docs/data/histograms/Philippines/213C 214.json
+++ b/docs/data/histograms/Philippines/213C 214.json
@@ -1 +1 @@
-{"batchcode": "213C 214", "histograms": [{"batchcodes": ["213C 214"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "213C 214", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["213C 214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C.json b/docs/data/histograms/Philippines/213C.json
index 1358486ebf4..e957178974d 100644
--- a/docs/data/histograms/Philippines/213C.json
+++ b/docs/data/histograms/Philippines/213C.json
@@ -1 +1 @@
-{"batchcode": "213C", "histograms": [{"batchcodes": ["213C"], "histogram": {"Asthenia": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "213C", "histograms": [{"histogram": {"Asthenia": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Vision blurred": 1}, "batchcodes": ["213C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C12A.json b/docs/data/histograms/Philippines/213C12A.json
index 47cb8e3c57f..adc5bcd9a17 100644
--- a/docs/data/histograms/Philippines/213C12A.json
+++ b/docs/data/histograms/Philippines/213C12A.json
@@ -1 +1 @@
-{"batchcode": "213C12A", "histograms": [{"batchcodes": ["213C12A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Headache": 1, "Throat irritation": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "213C12A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Headache": 1, "Throat irritation": 1, "Vaccination failure": 1}, "batchcodes": ["213C12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C21.json b/docs/data/histograms/Philippines/213C21.json
index 49ac796953e..24b0d9b912f 100644
--- a/docs/data/histograms/Philippines/213C21.json
+++ b/docs/data/histograms/Philippines/213C21.json
@@ -1 +1 @@
-{"batchcode": "213C21", "histograms": [{"batchcodes": ["213C21"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "213C21", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["213C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C211A.json b/docs/data/histograms/Philippines/213C211A.json
index c0e534a2bb3..e403ae581ad 100644
--- a/docs/data/histograms/Philippines/213C211A.json
+++ b/docs/data/histograms/Philippines/213C211A.json
@@ -1 +1 @@
-{"batchcode": "213C211A", "histograms": [{"batchcodes": ["213C211A"], "histogram": {"COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Nasopharyngitis": 1, "Rhinitis": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "213C211A", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Nasopharyngitis": 1, "Rhinitis": 1, "Vaccination failure": 1}, "batchcodes": ["213C211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C212.json b/docs/data/histograms/Philippines/213C212.json
index 9efcadbc722..fdceb83ca06 100644
--- a/docs/data/histograms/Philippines/213C212.json
+++ b/docs/data/histograms/Philippines/213C212.json
@@ -1 +1 @@
-{"batchcode": "213C212", "histograms": [{"batchcodes": ["213C212"], "histogram": {"Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "213C212", "histograms": [{"histogram": {"Nausea": 1}, "batchcodes": ["213C212"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C214.json b/docs/data/histograms/Philippines/213C214.json
index cbce101c110..352b3415754 100644
--- a/docs/data/histograms/Philippines/213C214.json
+++ b/docs/data/histograms/Philippines/213C214.json
@@ -1 +1 @@
-{"batchcode": "213C214", "histograms": [{"batchcodes": ["213C214"], "histogram": {"Dyspnoea": 2, "Pyrexia": 2, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Eye haemorrhage": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Malaise": 1, "Malignant pleural effusion": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "213C214", "histograms": [{"histogram": {"Dyspnoea": 2, "Pyrexia": 2, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Eye haemorrhage": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Malaise": 1, "Malignant pleural effusion": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1}, "batchcodes": ["213C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C219.json b/docs/data/histograms/Philippines/213C219.json
index 818a5db8485..6a9e9dff9be 100644
--- a/docs/data/histograms/Philippines/213C219.json
+++ b/docs/data/histograms/Philippines/213C219.json
@@ -1 +1 @@
-{"batchcode": "213C219", "histograms": [{"batchcodes": ["213C219"], "histogram": {"Diarrhoea": 1, "Exposure during pregnancy": 1, "Haematochezia": 1, "Placenta praevia": 1}}]}
\ No newline at end of file
+{"batchcode": "213C219", "histograms": [{"histogram": {"Diarrhoea": 1, "Exposure during pregnancy": 1, "Haematochezia": 1, "Placenta praevia": 1}, "batchcodes": ["213C219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C21A.json b/docs/data/histograms/Philippines/213C21A.json
index b90bc7886b4..d5a13e5cd2b 100644
--- a/docs/data/histograms/Philippines/213C21A.json
+++ b/docs/data/histograms/Philippines/213C21A.json
@@ -1 +1 @@
-{"batchcode": "213C21A", "histograms": [{"batchcodes": ["068F21A", "213C21A"], "histogram": {"Open globe injury": 1, "Pulmonary tuberculosis": 1}}, {"batchcodes": ["213C21A", "32021BD"], "histogram": {"Death": 1}}, {"batchcodes": ["213C21A", "939900"], "histogram": {"Acute respiratory distress syndrome": 2, "Asthenia": 2, "Decreased appetite": 2, "Vision blurred": 2}}, {"batchcodes": ["213C21A", "FL5324"], "histogram": {"Loss of consciousness": 1}}, {"batchcodes": ["213C21A", "FM2966"], "histogram": {"Back pain": 1}}, {"batchcodes": ["213C21A", "PN40172"], "histogram": {"COVID-19": 1, "Cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["213C21A"], "histogram": {"Blood pressure measurement": 255, "Blood pressure increased": 253, "Pyrexia": 63, "Cough": 57, "Dyspnoea": 50, "Asthenia": 30, "COVID-19": 27, "Malaise": 24, "Dizziness": 23, "Vomiting": 22, "Headache": 21, "SARS-CoV-2 test": 21, "Abdominal pain": 19, "Decreased appetite": 18, "Fatigue": 18, "Vaccination site pain": 17, "Nasopharyngitis": 16, "Vaccination failure": 14, "Death": 12, "Myalgia": 12, "Chills": 11, "Syncope": 11, "Diarrhoea": 10, "Hypoaesthesia": 9, "Chest pain": 8, "Hypertension": 8, "Loss of consciousness": 7, "Pain": 7, "Back pain": 6, "Chest discomfort": 6, "Dysarthria": 6, "Nausea": 5, "Anosmia": 4, "Arthralgia": 4, "Body temperature": 4, "Seizure": 4, "Abdominal pain upper": 3, "Ageusia": 3, "Erythema": 3, "Laboratory test": 3, "Oxygen saturation": 3, "Vaginal haemorrhage": 3, "Abdominal pain lower": 2, "Anaemia": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Depressed level of consciousness": 2, "Dyskinesia": 2, "Dysuria": 2, "Exposure during pregnancy": 2, "Flank pain": 2, "Hemiparesis": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Hypertensive emergency": 2, "Nasal congestion": 2, "Oropharyngeal pain": 2, "Oxygen saturation decreased": 2, "Pneumonia": 2, "Urinary tract infection": 2, "X-ray": 2, "Abdominal distension": 1, "Anal incontinence": 1, "Autonomic neuropathy": 1, "Balance disorder": 1, "Bedridden": 1, "Blood glucose": 1, "Breast mass": 1, "COVID-19 pneumonia": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Cerebrovascular accident": 1, "Chronic kidney disease": 1, "Craniocerebral injury": 1, "Cyanosis": 1, "Diabetes mellitus": 1, "Diagnostic procedure": 1, "Diplegia": 1, "Dysphonia": 1, "Dysstasia": 1, "Epistaxis": 1, "Eye inflammation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial asymmetry": 1, "Facial paralysis": 1, "Faecaloma": 1, "Female reproductive tract disorder": 1, "Gait disturbance": 1, "Gastritis": 1, "Gout": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematoma": 1, "Haemoptysis": 1, "Heart rate": 1, "Hepatic cirrhosis": 1, "Hypertensive heart disease": 1, "Hypertensive urgency": 1, "Hypoaesthesia oral": 1, "Ileus paralytic": 1, "Influenza like illness": 1, "Inguinal mass": 1, "Internal haemorrhage": 1, "Irritability": 1, "Labour pain": 1, "Lethargy": 1, "Limb discomfort": 1, "Monoparesis": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Occult blood": 1, "Occult blood positive": 1, "Optic neuritis": 1, "Oxygen therapy": 1, "Papillary thyroid cancer": 1, "Paralysis": 1, "Pelvic pain": 1, "Positron emission tomogram": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Respiratory failure": 1, "Respiratory symptom": 1, "Rhinitis": 1, "SARS-CoV-2 test positive": 1, "Skin abrasion": 1, "Swelling": 1, "Tachycardia": 1, "Therapy non-responder": 1, "Throat irritation": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vertigo": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "213C21A", "histograms": [{"histogram": {"Open globe injury": 1, "Pulmonary tuberculosis": 1}, "batchcodes": ["068F21A", "213C21A"]}, {"histogram": {"Death": 1}, "batchcodes": ["213C21A", "32021BD"]}, {"histogram": {"Acute respiratory distress syndrome": 2, "Asthenia": 2, "Decreased appetite": 2, "Vision blurred": 2}, "batchcodes": ["213C21A", "939900"]}, {"histogram": {"Loss of consciousness": 1}, "batchcodes": ["213C21A", "FL5324"]}, {"histogram": {"Back pain": 1}, "batchcodes": ["213C21A", "FM2966"]}, {"histogram": {"COVID-19": 1, "Cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["213C21A", "PN40172"]}, {"histogram": {"Blood pressure measurement": 255, "Blood pressure increased": 253, "Pyrexia": 63, "Cough": 57, "Dyspnoea": 50, "Asthenia": 30, "COVID-19": 27, "Malaise": 24, "Dizziness": 23, "Vomiting": 22, "Headache": 21, "SARS-CoV-2 test": 21, "Abdominal pain": 19, "Decreased appetite": 18, "Fatigue": 18, "Vaccination site pain": 17, "Nasopharyngitis": 16, "Vaccination failure": 14, "Death": 12, "Myalgia": 12, "Chills": 11, "Syncope": 11, "Diarrhoea": 10, "Hypoaesthesia": 9, "Chest pain": 8, "Hypertension": 8, "Loss of consciousness": 7, "Pain": 7, "Back pain": 6, "Chest discomfort": 6, "Dysarthria": 6, "Nausea": 5, "Anosmia": 4, "Arthralgia": 4, "Body temperature": 4, "Seizure": 4, "Abdominal pain upper": 3, "Ageusia": 3, "Erythema": 3, "Laboratory test": 3, "Oxygen saturation": 3, "Vaginal haemorrhage": 3, "Abdominal pain lower": 2, "Anaemia": 2, "Cerebral infarction": 2, "Chest X-ray": 2, "Depressed level of consciousness": 2, "Dyskinesia": 2, "Dysuria": 2, "Exposure during pregnancy": 2, "Flank pain": 2, "Hemiparesis": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Hypertensive emergency": 2, "Nasal congestion": 2, "Oropharyngeal pain": 2, "Oxygen saturation decreased": 2, "Pneumonia": 2, "Urinary tract infection": 2, "X-ray": 2, "Abdominal distension": 1, "Anal incontinence": 1, "Autonomic neuropathy": 1, "Balance disorder": 1, "Bedridden": 1, "Blood glucose": 1, "Breast mass": 1, "COVID-19 pneumonia": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Cerebrovascular accident": 1, "Chronic kidney disease": 1, "Craniocerebral injury": 1, "Cyanosis": 1, "Diabetes mellitus": 1, "Diagnostic procedure": 1, "Diplegia": 1, "Dysphonia": 1, "Dysstasia": 1, "Epistaxis": 1, "Eye inflammation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Facial asymmetry": 1, "Facial paralysis": 1, "Faecaloma": 1, "Female reproductive tract disorder": 1, "Gait disturbance": 1, "Gastritis": 1, "Gout": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematoma": 1, "Haemoptysis": 1, "Heart rate": 1, "Hepatic cirrhosis": 1, "Hypertensive heart disease": 1, "Hypertensive urgency": 1, "Hypoaesthesia oral": 1, "Ileus paralytic": 1, "Influenza like illness": 1, "Inguinal mass": 1, "Internal haemorrhage": 1, "Irritability": 1, "Labour pain": 1, "Lethargy": 1, "Limb discomfort": 1, "Monoparesis": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Occult blood": 1, "Occult blood positive": 1, "Optic neuritis": 1, "Oxygen therapy": 1, "Papillary thyroid cancer": 1, "Paralysis": 1, "Pelvic pain": 1, "Positron emission tomogram": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Respiratory failure": 1, "Respiratory symptom": 1, "Rhinitis": 1, "SARS-CoV-2 test positive": 1, "Skin abrasion": 1, "Swelling": 1, "Tachycardia": 1, "Therapy non-responder": 1, "Throat irritation": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Vertigo": 1, "Vital signs measurement": 1}, "batchcodes": ["213C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C21AL2021060.json b/docs/data/histograms/Philippines/213C21AL2021060.json
index 612734c0947..8d1f25daeb3 100644
--- a/docs/data/histograms/Philippines/213C21AL2021060.json
+++ b/docs/data/histograms/Philippines/213C21AL2021060.json
@@ -1 +1 @@
-{"batchcode": "213C21AL2021060", "histograms": [{"batchcodes": ["213C21AL2021060"], "histogram": {"Cellulitis": 1}}]}
\ No newline at end of file
+{"batchcode": "213C21AL2021060", "histograms": [{"histogram": {"Cellulitis": 1}, "batchcodes": ["213C21AL2021060"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C22A.json b/docs/data/histograms/Philippines/213C22A.json
index 652bd1fbe43..c898ac5d8d3 100644
--- a/docs/data/histograms/Philippines/213C22A.json
+++ b/docs/data/histograms/Philippines/213C22A.json
@@ -1 +1 @@
-{"batchcode": "213C22A", "histograms": [{"batchcodes": ["213C22A"], "histogram": {"Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "213C22A", "histograms": [{"histogram": {"Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["213C22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C25A.json b/docs/data/histograms/Philippines/213C25A.json
index dcd9956f793..22e10c068e8 100644
--- a/docs/data/histograms/Philippines/213C25A.json
+++ b/docs/data/histograms/Philippines/213C25A.json
@@ -1 +1 @@
-{"batchcode": "213C25A", "histograms": [{"batchcodes": ["213C25A"], "histogram": {"Vaccination site pain": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "213C25A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Wound": 1}, "batchcodes": ["213C25A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C279.json b/docs/data/histograms/Philippines/213C279.json
index 0494d185ef5..2531114192b 100644
--- a/docs/data/histograms/Philippines/213C279.json
+++ b/docs/data/histograms/Philippines/213C279.json
@@ -1 +1 @@
-{"batchcode": "213C279", "histograms": [{"batchcodes": ["213C279"], "histogram": {"Exposure during pregnancy": 1, "Labour pain": 1}}]}
\ No newline at end of file
+{"batchcode": "213C279", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "Labour pain": 1}, "batchcodes": ["213C279"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C2A.json b/docs/data/histograms/Philippines/213C2A.json
index 130e201bfc8..7cb25fe6aa7 100644
--- a/docs/data/histograms/Philippines/213C2A.json
+++ b/docs/data/histograms/Philippines/213C2A.json
@@ -1 +1 @@
-{"batchcode": "213C2A", "histograms": [{"batchcodes": ["213C2A"], "histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Malaise": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "213C2A", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Malaise": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vaccination failure": 1}, "batchcodes": ["213C2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C2A1.json b/docs/data/histograms/Philippines/213C2A1.json
index e8ad8ac4f0d..8bd1740a9ba 100644
--- a/docs/data/histograms/Philippines/213C2A1.json
+++ b/docs/data/histograms/Philippines/213C2A1.json
@@ -1 +1 @@
-{"batchcode": "213C2A1", "histograms": [{"batchcodes": ["213C2A1"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Pain": 1, "Pollakiuria": 1}}]}
\ No newline at end of file
+{"batchcode": "213C2A1", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Pain": 1, "Pollakiuria": 1}, "batchcodes": ["213C2A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C2IA.json b/docs/data/histograms/Philippines/213C2IA.json
index 39cd51fb313..d74a2eac342 100644
--- a/docs/data/histograms/Philippines/213C2IA.json
+++ b/docs/data/histograms/Philippines/213C2IA.json
@@ -1 +1 @@
-{"batchcode": "213C2IA", "histograms": [{"batchcodes": ["213C2IA"], "histogram": {"Dyspnoea": 1, "Haematemesis": 1, "Headache": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "213C2IA", "histograms": [{"histogram": {"Dyspnoea": 1, "Haematemesis": 1, "Headache": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["213C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C2KA.json b/docs/data/histograms/Philippines/213C2KA.json
index 619795b175e..b4254d8d767 100644
--- a/docs/data/histograms/Philippines/213C2KA.json
+++ b/docs/data/histograms/Philippines/213C2KA.json
@@ -1 +1 @@
-{"batchcode": "213C2KA", "histograms": [{"batchcodes": ["213C2KA"], "histogram": {"Road traffic accident": 1}}]}
\ No newline at end of file
+{"batchcode": "213C2KA", "histograms": [{"histogram": {"Road traffic accident": 1}, "batchcodes": ["213C2KA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C2LA.json b/docs/data/histograms/Philippines/213C2LA.json
index affef10c5c9..69358b07894 100644
--- a/docs/data/histograms/Philippines/213C2LA.json
+++ b/docs/data/histograms/Philippines/213C2LA.json
@@ -1 +1 @@
-{"batchcode": "213C2LA", "histograms": [{"batchcodes": ["213C2LA"], "histogram": {"COVID-19": 1, "Cough": 1, "Nasopharyngitis": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "213C2LA", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Nasopharyngitis": 1, "Vaccination failure": 1}, "batchcodes": ["213C2LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213C71A.json b/docs/data/histograms/Philippines/213C71A.json
index f072f3e7ddc..2f9db20cfda 100644
--- a/docs/data/histograms/Philippines/213C71A.json
+++ b/docs/data/histograms/Philippines/213C71A.json
@@ -1 +1 @@
-{"batchcode": "213C71A", "histograms": [{"batchcodes": ["213C71A"], "histogram": {"Exposure during pregnancy": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "213C71A", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["213C71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213CIA.json b/docs/data/histograms/Philippines/213CIA.json
index f8f8880e50d..161bdb8c714 100644
--- a/docs/data/histograms/Philippines/213CIA.json
+++ b/docs/data/histograms/Philippines/213CIA.json
@@ -1 +1 @@
-{"batchcode": "213CIA", "histograms": [{"batchcodes": ["213CIA"], "histogram": {"Dyspnoea": 2, "Altered state of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "213CIA", "histograms": [{"histogram": {"Dyspnoea": 2, "Altered state of consciousness": 1}, "batchcodes": ["213CIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/213CZ1A.json b/docs/data/histograms/Philippines/213CZ1A.json
index 52d3e1db8a5..7f07d58087d 100644
--- a/docs/data/histograms/Philippines/213CZ1A.json
+++ b/docs/data/histograms/Philippines/213CZ1A.json
@@ -1 +1 @@
-{"batchcode": "213CZ1A", "histograms": [{"batchcodes": ["213CZ1A"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "213CZ1A", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["213CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/214C21A.json b/docs/data/histograms/Philippines/214C21A.json
index f6228af146f..5a8c1e97aa4 100644
--- a/docs/data/histograms/Philippines/214C21A.json
+++ b/docs/data/histograms/Philippines/214C21A.json
@@ -1 +1 @@
-{"batchcode": "214C21A", "histograms": [{"batchcodes": ["214C21A"], "histogram": {"Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "214C21A", "histograms": [{"histogram": {"Palpitations": 1}, "batchcodes": ["214C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/218C21A.json b/docs/data/histograms/Philippines/218C21A.json
index 550a3e1723c..f44811b54f3 100644
--- a/docs/data/histograms/Philippines/218C21A.json
+++ b/docs/data/histograms/Philippines/218C21A.json
@@ -1 +1 @@
-{"batchcode": "218C21A", "histograms": [{"batchcodes": ["218C21A"], "histogram": {"Cough": 1, "Malaise": 1, "Nasopharyngitis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "218C21A", "histograms": [{"histogram": {"Cough": 1, "Malaise": 1, "Nasopharyngitis": 1, "Pyrexia": 1}, "batchcodes": ["218C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21A.json b/docs/data/histograms/Philippines/21A.json
index f37bb45353c..5ca940fa4eb 100644
--- a/docs/data/histograms/Philippines/21A.json
+++ b/docs/data/histograms/Philippines/21A.json
@@ -1 +1 @@
-{"batchcode": "21A", "histograms": [{"batchcodes": ["21A"], "histogram": {"Blood immunoglobulin E": 1, "Rash": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "21A", "histograms": [{"histogram": {"Blood immunoglobulin E": 1, "Rash": 1, "Swollen tongue": 1}, "batchcodes": ["21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21B121A.json b/docs/data/histograms/Philippines/21B121A.json
index 7910350d3b8..ac616f1550d 100644
--- a/docs/data/histograms/Philippines/21B121A.json
+++ b/docs/data/histograms/Philippines/21B121A.json
@@ -1 +1 @@
-{"batchcode": "21B121A", "histograms": [{"batchcodes": ["0021221A", "21B121A"], "histogram": {"Abdominal pain": 1, "Intestinal obstruction": 1}}]}
\ No newline at end of file
+{"batchcode": "21B121A", "histograms": [{"histogram": {"Abdominal pain": 1, "Intestinal obstruction": 1}, "batchcodes": ["0021221A", "21B121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21BC21A.json b/docs/data/histograms/Philippines/21BC21A.json
index de855301ead..46a38bfbac7 100644
--- a/docs/data/histograms/Philippines/21BC21A.json
+++ b/docs/data/histograms/Philippines/21BC21A.json
@@ -1 +1 @@
-{"batchcode": "21BC21A", "histograms": [{"batchcodes": ["21BC21A"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Nasopharyngitis": 1}}]}
\ No newline at end of file
+{"batchcode": "21BC21A", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Nasopharyngitis": 1}, "batchcodes": ["21BC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21C21A.json b/docs/data/histograms/Philippines/21C21A.json
index 904d787dcbf..aed0cd2724a 100644
--- a/docs/data/histograms/Philippines/21C21A.json
+++ b/docs/data/histograms/Philippines/21C21A.json
@@ -1 +1 @@
-{"batchcode": "21C21A", "histograms": [{"batchcodes": ["21C21A"], "histogram": {"Intestinal mass": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "21C21A", "histograms": [{"histogram": {"Intestinal mass": 1, "Vaccination site pain": 1}, "batchcodes": ["21C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21C2IA.json b/docs/data/histograms/Philippines/21C2IA.json
index 766d54f8e15..ac515851ba3 100644
--- a/docs/data/histograms/Philippines/21C2IA.json
+++ b/docs/data/histograms/Philippines/21C2IA.json
@@ -1 +1 @@
-{"batchcode": "21C2IA", "histograms": [{"batchcodes": ["21C2IA"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "21C2IA", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["21C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/21ZC21A.json b/docs/data/histograms/Philippines/21ZC21A.json
index 21b80b583e6..f26e76a488d 100644
--- a/docs/data/histograms/Philippines/21ZC21A.json
+++ b/docs/data/histograms/Philippines/21ZC21A.json
@@ -1 +1 @@
-{"batchcode": "21ZC21A", "histograms": [{"batchcodes": ["21ZC21A"], "histogram": {"Diarrhoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "21ZC21A", "histograms": [{"histogram": {"Diarrhoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1}, "batchcodes": ["21ZC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/22-077-DK.json b/docs/data/histograms/Philippines/22-077-DK.json
index 1410a4bffe2..acf81326400 100644
--- a/docs/data/histograms/Philippines/22-077-DK.json
+++ b/docs/data/histograms/Philippines/22-077-DK.json
@@ -1 +1 @@
-{"batchcode": "22-077-DK", "histograms": [{"batchcodes": ["22-077-DK"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "22-077-DK", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["22-077-DK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2212C21A.json b/docs/data/histograms/Philippines/2212C21A.json
index ffbdd14c285..b4eb52ba346 100644
--- a/docs/data/histograms/Philippines/2212C21A.json
+++ b/docs/data/histograms/Philippines/2212C21A.json
@@ -1 +1 @@
-{"batchcode": "2212C21A", "histograms": [{"batchcodes": ["2212C21A"], "histogram": {"Dizziness": 1, "Loss of consciousness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "2212C21A", "histograms": [{"histogram": {"Dizziness": 1, "Loss of consciousness": 1, "Pyrexia": 1}, "batchcodes": ["2212C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/221C21A.json b/docs/data/histograms/Philippines/221C21A.json
index 26b5939ec3c..5c5dbe49326 100644
--- a/docs/data/histograms/Philippines/221C21A.json
+++ b/docs/data/histograms/Philippines/221C21A.json
@@ -1 +1 @@
-{"batchcode": "221C21A", "histograms": [{"batchcodes": ["221C21A"], "histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "221C21A", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["221C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/222756 /PCB0002.json b/docs/data/histograms/Philippines/222756 /PCB0002.json
index dad0d1c4d45..c8203486ecc 100644
--- a/docs/data/histograms/Philippines/222756 /PCB0002.json
+++ b/docs/data/histograms/Philippines/222756 /PCB0002.json
@@ -1 +1 @@
-{"batchcode": "222756 /PCB0002", "histograms": [{"batchcodes": ["222756 /PCB0002"], "histogram": {"Bradycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "222756 /PCB0002", "histograms": [{"histogram": {"Bradycardia": 1}, "batchcodes": ["222756 /PCB0002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/222756 PCB0002.json b/docs/data/histograms/Philippines/222756 PCB0002.json
index 86f35076193..1dd6d72593f 100644
--- a/docs/data/histograms/Philippines/222756 PCB0002.json
+++ b/docs/data/histograms/Philippines/222756 PCB0002.json
@@ -1 +1 @@
-{"batchcode": "222756 PCB0002", "histograms": [{"batchcodes": ["222756 PCB0002"], "histogram": {"Blood pressure measurement": 4, "Blood pressure increased": 3, "Headache": 2, "Blood pressure decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "222756 PCB0002", "histograms": [{"histogram": {"Blood pressure measurement": 4, "Blood pressure increased": 3, "Headache": 2, "Blood pressure decreased": 1}, "batchcodes": ["222756 PCB0002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/222756 PCB0004.json b/docs/data/histograms/Philippines/222756 PCB0004.json
index 3a04dc96b65..a049f892a98 100644
--- a/docs/data/histograms/Philippines/222756 PCB0004.json
+++ b/docs/data/histograms/Philippines/222756 PCB0004.json
@@ -1 +1 @@
-{"batchcode": "222756 PCB0004", "histograms": [{"batchcodes": ["222756 PCB0004"], "histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "222756 PCB0004", "histograms": [{"histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Dyspnoea": 1}, "batchcodes": ["222756 PCB0004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/222756.json b/docs/data/histograms/Philippines/222756.json
index 96aa11b54bb..d7adb4198e1 100644
--- a/docs/data/histograms/Philippines/222756.json
+++ b/docs/data/histograms/Philippines/222756.json
@@ -1 +1 @@
-{"batchcode": "222756", "histograms": [{"batchcodes": ["222756"], "histogram": {"Chest pain": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "222756", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1}, "batchcodes": ["222756"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/222756/PCB0002.json b/docs/data/histograms/Philippines/222756/PCB0002.json
index 595f2a4e066..985402b62b4 100644
--- a/docs/data/histograms/Philippines/222756/PCB0002.json
+++ b/docs/data/histograms/Philippines/222756/PCB0002.json
@@ -1 +1 @@
-{"batchcode": "222756/PCB0002", "histograms": [{"batchcodes": ["222756/PCB0002"], "histogram": {"Bradycardia": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "222756/PCB0002", "histograms": [{"histogram": {"Bradycardia": 1, "Presyncope": 1}, "batchcodes": ["222756/PCB0002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/222763.json b/docs/data/histograms/Philippines/222763.json
index fc59051780d..34d1bfdc9a5 100644
--- a/docs/data/histograms/Philippines/222763.json
+++ b/docs/data/histograms/Philippines/222763.json
@@ -1 +1 @@
-{"batchcode": "222763", "histograms": [{"batchcodes": ["222763"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Nasopharyngitis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "222763", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Nasopharyngitis": 1, "Pyrexia": 1}, "batchcodes": ["222763"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/22756.json b/docs/data/histograms/Philippines/22756.json
index eef0ea265b3..e13b4d2a95a 100644
--- a/docs/data/histograms/Philippines/22756.json
+++ b/docs/data/histograms/Philippines/22756.json
@@ -1 +1 @@
-{"batchcode": "22756", "histograms": [{"batchcodes": ["22756"], "histogram": {"Body temperature": 1, "Chest pain": 1, "Chills": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "22756", "histograms": [{"histogram": {"Body temperature": 1, "Chest pain": 1, "Chills": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["22756"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2317218.json b/docs/data/histograms/Philippines/2317218.json
index 928ad03b7ab..8f0e93b1735 100644
--- a/docs/data/histograms/Philippines/2317218.json
+++ b/docs/data/histograms/Philippines/2317218.json
@@ -1 +1 @@
-{"batchcode": "2317218", "histograms": [{"batchcodes": ["2317218"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Dizziness": 1, "Heart rate": 1, "Respiratory rate": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "2317218", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Dizziness": 1, "Heart rate": 1, "Respiratory rate": 1, "Syncope": 1}, "batchcodes": ["2317218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/231C21A.json b/docs/data/histograms/Philippines/231C21A.json
index c6e2563b6dc..d54b7e9449b 100644
--- a/docs/data/histograms/Philippines/231C21A.json
+++ b/docs/data/histograms/Philippines/231C21A.json
@@ -1 +1 @@
-{"batchcode": "231C21A", "histograms": [{"batchcodes": ["083F21B", "231C21A"], "histogram": {"Myalgia": 1}}, {"batchcodes": ["231C21A"], "histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2, "Abdominal pain lower": 1, "Ageusia": 1, "COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Exposure during pregnancy": 1, "Hospitalisation": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "231C21A", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["083F21B", "231C21A"]}, {"histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2, "Abdominal pain lower": 1, "Ageusia": 1, "COVID-19": 1, "Cough": 1, "Decreased appetite": 1, "Exposure during pregnancy": 1, "Hospitalisation": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}, "batchcodes": ["231C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/23C21A.json b/docs/data/histograms/Philippines/23C21A.json
index 5a664e7f8db..2a73bf64614 100644
--- a/docs/data/histograms/Philippines/23C21A.json
+++ b/docs/data/histograms/Philippines/23C21A.json
@@ -1 +1 @@
-{"batchcode": "23C21A", "histograms": [{"batchcodes": ["23C21A"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "23C21A", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["23C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/23K21A.json b/docs/data/histograms/Philippines/23K21A.json
index 2fd07eef3dd..526d19c3f73 100644
--- a/docs/data/histograms/Philippines/23K21A.json
+++ b/docs/data/histograms/Philippines/23K21A.json
@@ -1 +1 @@
-{"batchcode": "23K21A", "histograms": [{"batchcodes": ["002K21A", "23K21A"], "histogram": {"Diarrhoea": 2, "Vomiting": 2}}]}
\ No newline at end of file
+{"batchcode": "23K21A", "histograms": [{"histogram": {"Diarrhoea": 2, "Vomiting": 2}, "batchcodes": ["002K21A", "23K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/28-JUL-2021.json b/docs/data/histograms/Philippines/28-JUL-2021.json
index e9847df5a7b..5bf43646717 100644
--- a/docs/data/histograms/Philippines/28-JUL-2021.json
+++ b/docs/data/histograms/Philippines/28-JUL-2021.json
@@ -1 +1 @@
-{"batchcode": "28-JUL-2021", "histograms": [{"batchcodes": ["28-JUL-2021"], "histogram": {"Abdominal pain": 1, "Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "28-JUL-2021", "histograms": [{"histogram": {"Abdominal pain": 1, "Chills": 1, "Pyrexia": 1}, "batchcodes": ["28-JUL-2021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/29001.json b/docs/data/histograms/Philippines/29001.json
index 8554c53849a..38eb472f1f2 100644
--- a/docs/data/histograms/Philippines/29001.json
+++ b/docs/data/histograms/Philippines/29001.json
@@ -1 +1 @@
-{"batchcode": "29001", "histograms": [{"batchcodes": ["29001"], "histogram": {"Dizziness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "29001", "histograms": [{"histogram": {"Dizziness": 1, "Vaccination site pain": 1}, "batchcodes": ["29001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2A3C21.json b/docs/data/histograms/Philippines/2A3C21.json
index eecd69ee878..e00a5a7e916 100644
--- a/docs/data/histograms/Philippines/2A3C21.json
+++ b/docs/data/histograms/Philippines/2A3C21.json
@@ -1 +1 @@
-{"batchcode": "2A3C21", "histograms": [{"batchcodes": ["2A3C21"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "2A3C21", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["2A3C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/2BC21A.json b/docs/data/histograms/Philippines/2BC21A.json
index bf263da3837..76e0a7f58b5 100644
--- a/docs/data/histograms/Philippines/2BC21A.json
+++ b/docs/data/histograms/Philippines/2BC21A.json
@@ -1 +1 @@
-{"batchcode": "2BC21A", "histograms": [{"batchcodes": ["2BC21A"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Road traffic accident": 1}}]}
\ No newline at end of file
+{"batchcode": "2BC21A", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Road traffic accident": 1}, "batchcodes": ["2BC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3-2021BD.json b/docs/data/histograms/Philippines/3-2021BD.json
index 883ea44ba2f..4923a605cfe 100644
--- a/docs/data/histograms/Philippines/3-2021BD.json
+++ b/docs/data/histograms/Philippines/3-2021BD.json
@@ -1 +1 @@
-{"batchcode": "3-2021BD", "histograms": [{"batchcodes": ["3-2021BD"], "histogram": {"Dyspnoea": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "3-2021BD", "histograms": [{"histogram": {"Dyspnoea": 1, "Pruritus": 1}, "batchcodes": ["3-2021BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3002538.json b/docs/data/histograms/Philippines/3002538.json
index a9a11f8e073..6d071905e08 100644
--- a/docs/data/histograms/Philippines/3002538.json
+++ b/docs/data/histograms/Philippines/3002538.json
@@ -1 +1 @@
-{"batchcode": "3002538", "histograms": [{"batchcodes": ["3002538"], "histogram": {"Dizziness": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3002538", "histograms": [{"histogram": {"Dizziness": 1, "Neck pain": 1}, "batchcodes": ["3002538"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3004222, 300472.json b/docs/data/histograms/Philippines/3004222, 300472.json
index 73c35c2de88..8d45750decd 100644
--- a/docs/data/histograms/Philippines/3004222, 300472.json
+++ b/docs/data/histograms/Philippines/3004222, 300472.json
@@ -1 +1 @@
-{"batchcode": "3004222, 300472", "histograms": [{"batchcodes": ["3004222, 300472"], "histogram": {"Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "3004222, 300472", "histograms": [{"histogram": {"Menstruation irregular": 1}, "batchcodes": ["3004222, 300472"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3004222.json b/docs/data/histograms/Philippines/3004222.json
index eb0b19187a4..32c923952a7 100644
--- a/docs/data/histograms/Philippines/3004222.json
+++ b/docs/data/histograms/Philippines/3004222.json
@@ -1 +1 @@
-{"batchcode": "3004222", "histograms": [{"batchcodes": ["3004222"], "histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Pyrexia": 4, "Chest pain": 3, "Dyspnoea": 3, "Asthenia": 2, "COVID-19": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Anxiety": 1, "Arthralgia": 1, "Bell's palsy": 1, "Body temperature": 1, "Chills": 1, "Death": 1, "Decreased appetite": 1, "Dysarthria": 1, "Eating disorder": 1, "Fall": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Malaise": 1, "Myalgia": 1, "Myocarditis": 1, "Pallor": 1, "Peripheral swelling": 1, "Respiratory failure": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vomiting": 1, "Water pollution": 1}}]}
\ No newline at end of file
+{"batchcode": "3004222", "histograms": [{"histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Pyrexia": 4, "Chest pain": 3, "Dyspnoea": 3, "Asthenia": 2, "COVID-19": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Anxiety": 1, "Arthralgia": 1, "Bell's palsy": 1, "Body temperature": 1, "Chills": 1, "Death": 1, "Decreased appetite": 1, "Dysarthria": 1, "Eating disorder": 1, "Fall": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Malaise": 1, "Myalgia": 1, "Myocarditis": 1, "Pallor": 1, "Peripheral swelling": 1, "Respiratory failure": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vomiting": 1, "Water pollution": 1}, "batchcodes": ["3004222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3004225V2.json b/docs/data/histograms/Philippines/3004225V2.json
index b741814e805..67c9f2a6f98 100644
--- a/docs/data/histograms/Philippines/3004225V2.json
+++ b/docs/data/histograms/Philippines/3004225V2.json
@@ -1 +1 @@
-{"batchcode": "3004225V2", "histograms": [{"batchcodes": ["3004225V2"], "histogram": {"Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3004225V2", "histograms": [{"histogram": {"Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["3004225V2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/30046.json b/docs/data/histograms/Philippines/30046.json
index 9b5ac579896..230bb648bef 100644
--- a/docs/data/histograms/Philippines/30046.json
+++ b/docs/data/histograms/Philippines/30046.json
@@ -1 +1 @@
-{"batchcode": "30046", "histograms": [{"batchcodes": ["30046"], "histogram": {"Headache": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "30046", "histograms": [{"histogram": {"Headache": 1, "Syncope": 1}, "batchcodes": ["30046"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3004729.json b/docs/data/histograms/Philippines/3004729.json
index 89a032856b8..0912700adc2 100644
--- a/docs/data/histograms/Philippines/3004729.json
+++ b/docs/data/histograms/Philippines/3004729.json
@@ -1 +1 @@
-{"batchcode": "3004729", "histograms": [{"batchcodes": ["3004729"], "histogram": {"Nasopharyngitis": 3, "Cough": 2, "Pyrexia": 2, "Asthenia": 1, "Bell's palsy": 1, "Choking sensation": 1, "Erythema": 1, "Fatigue": 1, "Gingival bleeding": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Malaise": 1, "Myalgia": 1, "Oedema": 1, "Pruritus": 1, "Syncope": 1, "Thrombosis": 1, "Vaccination site anaesthesia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004729", "histograms": [{"histogram": {"Nasopharyngitis": 3, "Cough": 2, "Pyrexia": 2, "Asthenia": 1, "Bell's palsy": 1, "Choking sensation": 1, "Erythema": 1, "Fatigue": 1, "Gingival bleeding": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Malaise": 1, "Myalgia": 1, "Oedema": 1, "Pruritus": 1, "Syncope": 1, "Thrombosis": 1, "Vaccination site anaesthesia": 1, "Vomiting": 1}, "batchcodes": ["3004729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3004960 & AMP;.json b/docs/data/histograms/Philippines/3004960 & AMP;.json
index 83bee958ff5..845171af4ca 100644
--- a/docs/data/histograms/Philippines/3004960 & AMP;.json
+++ b/docs/data/histograms/Philippines/3004960 & AMP;.json
@@ -1 +1 @@
-{"batchcode": "3004960 & AMP;", "histograms": [{"batchcodes": ["3004960 & AMP;"], "histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pyrexia": 1, "Somnolence": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004960 & AMP;", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pyrexia": 1, "Somnolence": 1, "Vomiting": 1}, "batchcodes": ["3004960 & AMP;"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3004960.json b/docs/data/histograms/Philippines/3004960.json
index ebfff870fd3..88ad12574cb 100644
--- a/docs/data/histograms/Philippines/3004960.json
+++ b/docs/data/histograms/Philippines/3004960.json
@@ -1 +1 @@
-{"batchcode": "3004960", "histograms": [{"batchcodes": ["3004960", "J202103011", "J20210311"], "histogram": {"Death": 1}}, {"batchcodes": ["3004960"], "histogram": {"Pyrexia": 4, "Blood pressure increased": 3, "Blood pressure measurement": 3, "Chills": 3, "Dizziness": 3, "Chest pain": 2, "Decreased appetite": 2, "Headache": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Back pain": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cough": 1, "Dysphonia": 1, "Dyspnoea": 1, "Haematemesis": 1, "Malaise": 1, "Palpitations": 1, "Rash": 1, "Syncope": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004960", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["3004960", "J202103011", "J20210311"]}, {"histogram": {"Pyrexia": 4, "Blood pressure increased": 3, "Blood pressure measurement": 3, "Chills": 3, "Dizziness": 3, "Chest pain": 2, "Decreased appetite": 2, "Headache": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Back pain": 1, "COVID-19": 1, "Cardiac arrest": 1, "Cough": 1, "Dysphonia": 1, "Dyspnoea": 1, "Haematemesis": 1, "Malaise": 1, "Palpitations": 1, "Rash": 1, "Syncope": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["3004960"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3005693.json b/docs/data/histograms/Philippines/3005693.json
index 0b93f40726f..46ca08c465c 100644
--- a/docs/data/histograms/Philippines/3005693.json
+++ b/docs/data/histograms/Philippines/3005693.json
@@ -1 +1 @@
-{"batchcode": "3005693", "histograms": [{"batchcodes": ["3005693"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "3005693", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["3005693"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3005784.json b/docs/data/histograms/Philippines/3005784.json
index 7c376d03bd5..1382b89d598 100644
--- a/docs/data/histograms/Philippines/3005784.json
+++ b/docs/data/histograms/Philippines/3005784.json
@@ -1 +1 @@
-{"batchcode": "3005784", "histograms": [{"batchcodes": ["3005784"], "histogram": {"Asthenia": 4, "Pyrexia": 4, "Dyspnoea": 3, "Abdominal pain": 2, "Chest pain": 2, "Cough": 2, "Dysarthria": 2, "Hypoaesthesia": 2, "Pain": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Anosmia": 1, "Bradycardia": 1, "COVID-19": 1, "Caesarean section": 1, "Chest discomfort": 1, "Chills": 1, "Constipation": 1, "Decreased appetite": 1, "Dizziness": 1, "Eye swelling": 1, "Haematochezia": 1, "Haemorrhagic stroke": 1, "Headache": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Hypothyroidism": 1, "Maternal exposure during breast feeding": 1, "Nausea": 1, "Neck mass": 1, "Palpitations": 1, "Rash": 1, "Swelling face": 1, "Tonsillitis": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3005784", "histograms": [{"histogram": {"Asthenia": 4, "Pyrexia": 4, "Dyspnoea": 3, "Abdominal pain": 2, "Chest pain": 2, "Cough": 2, "Dysarthria": 2, "Hypoaesthesia": 2, "Pain": 2, "Vaccination site pain": 2, "Anaphylactic reaction": 1, "Anosmia": 1, "Bradycardia": 1, "COVID-19": 1, "Caesarean section": 1, "Chest discomfort": 1, "Chills": 1, "Constipation": 1, "Decreased appetite": 1, "Dizziness": 1, "Eye swelling": 1, "Haematochezia": 1, "Haemorrhagic stroke": 1, "Headache": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Hypothyroidism": 1, "Maternal exposure during breast feeding": 1, "Nausea": 1, "Neck mass": 1, "Palpitations": 1, "Rash": 1, "Swelling face": 1, "Tonsillitis": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["3005784"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/30060182.json b/docs/data/histograms/Philippines/30060182.json
index 49bfddae604..0daa8ca8d1e 100644
--- a/docs/data/histograms/Philippines/30060182.json
+++ b/docs/data/histograms/Philippines/30060182.json
@@ -1 +1 @@
-{"batchcode": "30060182", "histograms": [{"batchcodes": ["30060182"], "histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Hypotension": 1}}]}
\ No newline at end of file
+{"batchcode": "30060182", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Hypotension": 1}, "batchcodes": ["30060182"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/300784.json b/docs/data/histograms/Philippines/300784.json
index 1baf506a385..53e8da981c1 100644
--- a/docs/data/histograms/Philippines/300784.json
+++ b/docs/data/histograms/Philippines/300784.json
@@ -1 +1 @@
-{"batchcode": "300784", "histograms": [{"batchcodes": ["300784"], "histogram": {"Haematemesis": 1}}]}
\ No newline at end of file
+{"batchcode": "300784", "histograms": [{"histogram": {"Haematemesis": 1}, "batchcodes": ["300784"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/310060BP.json b/docs/data/histograms/Philippines/310060BP.json
index aa02b054169..4ffad0662f4 100644
--- a/docs/data/histograms/Philippines/310060BP.json
+++ b/docs/data/histograms/Philippines/310060BP.json
@@ -1 +1 @@
-{"batchcode": "310060BP", "histograms": [{"batchcodes": ["310060BP"], "histogram": {"Abdominal pain lower": 1, "Ectopic pregnancy": 1, "Pregnancy test": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "310060BP", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Ectopic pregnancy": 1, "Pregnancy test": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["310060BP"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3106023.json b/docs/data/histograms/Philippines/3106023.json
index ad92ab05230..c63a4b2fc2d 100644
--- a/docs/data/histograms/Philippines/3106023.json
+++ b/docs/data/histograms/Philippines/3106023.json
@@ -1 +1 @@
-{"batchcode": "3106023", "histograms": [{"batchcodes": ["086521A", "3106023", "FJ830"], "histogram": {"Asthenia": 1, "Vaccination site pain": 1}}, {"batchcodes": ["3106023"], "histogram": {"Asthenia": 1, "Inappropriate schedule of product administration": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3106023", "histograms": [{"histogram": {"Asthenia": 1, "Vaccination site pain": 1}, "batchcodes": ["086521A", "3106023", "FJ830"]}, {"histogram": {"Asthenia": 1, "Inappropriate schedule of product administration": 1, "Vaccination site pain": 1}, "batchcodes": ["3106023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3106080.json b/docs/data/histograms/Philippines/3106080.json
index 9adf0a4c0c3..5d4eb325cd4 100644
--- a/docs/data/histograms/Philippines/3106080.json
+++ b/docs/data/histograms/Philippines/3106080.json
@@ -1 +1 @@
-{"batchcode": "3106080", "histograms": [{"batchcodes": ["3106080"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Malaise": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3106080", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Malaise": 1, "Pyrexia": 1}, "batchcodes": ["3106080"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/310608B.json b/docs/data/histograms/Philippines/310608B.json
index 0aa2f359fb6..44926833b82 100644
--- a/docs/data/histograms/Philippines/310608B.json
+++ b/docs/data/histograms/Philippines/310608B.json
@@ -1 +1 @@
-{"batchcode": "310608B", "histograms": [{"batchcodes": ["310608B"], "histogram": {"Abdominal pain lower": 2, "Appendicitis": 2, "Glomerulonephritis acute": 2, "Hypertension": 2, "Asthenia": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "310608B", "histograms": [{"histogram": {"Abdominal pain lower": 2, "Appendicitis": 2, "Glomerulonephritis acute": 2, "Hypertension": 2, "Asthenia": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["310608B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/310608D.json b/docs/data/histograms/Philippines/310608D.json
index 6c410857f10..b965a6391e2 100644
--- a/docs/data/histograms/Philippines/310608D.json
+++ b/docs/data/histograms/Philippines/310608D.json
@@ -1 +1 @@
-{"batchcode": "310608D", "histograms": [{"batchcodes": ["310608D"], "histogram": {"Blood pressure measurement": 8, "Blood pressure increased": 7, "Syncope": 5, "Dizziness": 3, "Loss of consciousness": 3, "Rash": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "Dyspnoea": 2, "Headache": 2, "Hiccups": 2, "Seizure": 2, "Back pain": 1, "Chest pain": 1, "Cough": 1, "Death": 1, "Dehydration": 1, "Dyskinesia": 1, "Flushing": 1, "Gastroenteritis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Maternal exposure timing unspecified": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Palpitations": 1, "Previous caesarean section": 1, "Pyrexia": 1, "Rash pruritic": 1, "Road traffic accident": 1, "Vision blurred": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "310608D", "histograms": [{"histogram": {"Blood pressure measurement": 8, "Blood pressure increased": 7, "Syncope": 5, "Dizziness": 3, "Loss of consciousness": 3, "Rash": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "Dyspnoea": 2, "Headache": 2, "Hiccups": 2, "Seizure": 2, "Back pain": 1, "Chest pain": 1, "Cough": 1, "Death": 1, "Dehydration": 1, "Dyskinesia": 1, "Flushing": 1, "Gastroenteritis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Maternal exposure timing unspecified": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Palpitations": 1, "Previous caesarean section": 1, "Pyrexia": 1, "Rash pruritic": 1, "Road traffic accident": 1, "Vision blurred": 1, "Vital signs measurement": 1}, "batchcodes": ["310608D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/310608P.json b/docs/data/histograms/Philippines/310608P.json
index 84f147cb93c..d73200fe9e8 100644
--- a/docs/data/histograms/Philippines/310608P.json
+++ b/docs/data/histograms/Philippines/310608P.json
@@ -1 +1 @@
-{"batchcode": "310608P", "histograms": [{"batchcodes": ["310608P"], "histogram": {"Arthralgia": 1, "Headache": 1, "Hypoaesthesia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "310608P", "histograms": [{"histogram": {"Arthralgia": 1, "Headache": 1, "Hypoaesthesia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["310608P"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/31060BD.json b/docs/data/histograms/Philippines/31060BD.json
index 7d9876d0fd5..d45a9de5385 100644
--- a/docs/data/histograms/Philippines/31060BD.json
+++ b/docs/data/histograms/Philippines/31060BD.json
@@ -1 +1 @@
-{"batchcode": "31060BD", "histograms": [{"batchcodes": ["31060BD"], "histogram": {"Blood pressure increased": 8, "Blood pressure measurement": 8, "Cough": 3, "Pyrexia": 3, "Abdominal pain": 2, "Body temperature": 2, "COVID-19": 2, "Dyspnoea": 2, "Headache": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Altered state of consciousness": 1, "Amniorrhoea": 1, "Anaemia": 1, "Asthenia": 1, "Bedridden": 1, "Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Dry eye": 1, "Dysarthria": 1, "Facial paralysis": 1, "Goitre": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Lip disorder": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure timing unspecified": 1, "Nausea": 1, "Neck mass": 1, "Off label use": 1, "Paraesthesia oral": 1, "Product use issue": 1, "Pulmonary mass": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "31060BD", "histograms": [{"histogram": {"Blood pressure increased": 8, "Blood pressure measurement": 8, "Cough": 3, "Pyrexia": 3, "Abdominal pain": 2, "Body temperature": 2, "COVID-19": 2, "Dyspnoea": 2, "Headache": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Altered state of consciousness": 1, "Amniorrhoea": 1, "Anaemia": 1, "Asthenia": 1, "Bedridden": 1, "Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Dry eye": 1, "Dysarthria": 1, "Facial paralysis": 1, "Goitre": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Lip disorder": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure timing unspecified": 1, "Nausea": 1, "Neck mass": 1, "Off label use": 1, "Paraesthesia oral": 1, "Product use issue": 1, "Pulmonary mass": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["31060BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/31060DB.json b/docs/data/histograms/Philippines/31060DB.json
index f5dd8957085..a42f674d284 100644
--- a/docs/data/histograms/Philippines/31060DB.json
+++ b/docs/data/histograms/Philippines/31060DB.json
@@ -1 +1 @@
-{"batchcode": "31060DB", "histograms": [{"batchcodes": ["31060DB"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "31060DB", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1}, "batchcodes": ["31060DB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/31060PD.json b/docs/data/histograms/Philippines/31060PD.json
index 7984366d441..f809e38492d 100644
--- a/docs/data/histograms/Philippines/31060PD.json
+++ b/docs/data/histograms/Philippines/31060PD.json
@@ -1 +1 @@
-{"batchcode": "31060PD", "histograms": [{"batchcodes": ["31060PD"], "histogram": {"Asthenia": 1, "Dysuria": 1, "Haematuria": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "31060PD", "histograms": [{"histogram": {"Asthenia": 1, "Dysuria": 1, "Haematuria": 1, "Headache": 1}, "batchcodes": ["31060PD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/310680.json b/docs/data/histograms/Philippines/310680.json
index f9e45b555ba..7f5063de86f 100644
--- a/docs/data/histograms/Philippines/310680.json
+++ b/docs/data/histograms/Philippines/310680.json
@@ -1 +1 @@
-{"batchcode": "310680", "histograms": [{"batchcodes": ["310680"], "histogram": {"Abdominal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "310680", "histograms": [{"histogram": {"Abdominal pain": 1}, "batchcodes": ["310680"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3106DBD.json b/docs/data/histograms/Philippines/3106DBD.json
index a3da0d7a70b..62d154159be 100644
--- a/docs/data/histograms/Philippines/3106DBD.json
+++ b/docs/data/histograms/Philippines/3106DBD.json
@@ -1 +1 @@
-{"batchcode": "3106DBD", "histograms": [{"batchcodes": ["3106DBD"], "histogram": {"Bradycardia": 1, "Cold sweat": 1, "Dizziness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "3106DBD", "histograms": [{"histogram": {"Bradycardia": 1, "Cold sweat": 1, "Dizziness": 1, "Malaise": 1}, "batchcodes": ["3106DBD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/310G21B.json b/docs/data/histograms/Philippines/310G21B.json
index c32a568355a..ff24da134e9 100644
--- a/docs/data/histograms/Philippines/310G21B.json
+++ b/docs/data/histograms/Philippines/310G21B.json
@@ -1 +1 @@
-{"batchcode": "310G21B", "histograms": [{"batchcodes": ["310G21B"], "histogram": {"Caesarean section": 1}}]}
\ No newline at end of file
+{"batchcode": "310G21B", "histograms": [{"histogram": {"Caesarean section": 1}, "batchcodes": ["310G21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3125B1.json b/docs/data/histograms/Philippines/3125B1.json
index 79b7d67c84b..cbe6de32dbb 100644
--- a/docs/data/histograms/Philippines/3125B1.json
+++ b/docs/data/histograms/Philippines/3125B1.json
@@ -1 +1 @@
-{"batchcode": "3125B1", "histograms": [{"batchcodes": ["3125B1"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3125B1", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["3125B1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/314V518.json b/docs/data/histograms/Philippines/314V518.json
index e9757e49140..03f403be7f7 100644
--- a/docs/data/histograms/Philippines/314V518.json
+++ b/docs/data/histograms/Philippines/314V518.json
@@ -1 +1 @@
-{"batchcode": "314V518", "histograms": [{"batchcodes": ["314V518"], "histogram": {"Asthenia": 1}}]}
\ No newline at end of file
+{"batchcode": "314V518", "histograms": [{"histogram": {"Asthenia": 1}, "batchcodes": ["314V518"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/31OUOBD.json b/docs/data/histograms/Philippines/31OUOBD.json
index 8ffa4fa942d..4f0d920e68e 100644
--- a/docs/data/histograms/Philippines/31OUOBD.json
+++ b/docs/data/histograms/Philippines/31OUOBD.json
@@ -1 +1 @@
-{"batchcode": "31OUOBD", "histograms": [{"batchcodes": ["31OUOBD"], "histogram": {"Drooling": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "31OUOBD", "histograms": [{"histogram": {"Drooling": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["31OUOBD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32020130.json b/docs/data/histograms/Philippines/32020130.json
index 0a193877e14..acddf319e91 100644
--- a/docs/data/histograms/Philippines/32020130.json
+++ b/docs/data/histograms/Philippines/32020130.json
@@ -1 +1 @@
-{"batchcode": "32020130", "histograms": [{"batchcodes": ["32020130"], "histogram": {"Loss of consciousness": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "32020130", "histograms": [{"histogram": {"Loss of consciousness": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["32020130"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32020BD.json b/docs/data/histograms/Philippines/32020BD.json
index 6b42c4045bf..8d2b63b234f 100644
--- a/docs/data/histograms/Philippines/32020BD.json
+++ b/docs/data/histograms/Philippines/32020BD.json
@@ -1 +1 @@
-{"batchcode": "32020BD", "histograms": [{"batchcodes": ["32020BD"], "histogram": {"Headache": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "32020BD", "histograms": [{"histogram": {"Headache": 1, "Vomiting": 1}, "batchcodes": ["32020BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202113D.json b/docs/data/histograms/Philippines/3202113D.json
index f74c8e8995b..a90e5326ba8 100644
--- a/docs/data/histograms/Philippines/3202113D.json
+++ b/docs/data/histograms/Philippines/3202113D.json
@@ -1 +1 @@
-{"batchcode": "3202113D", "histograms": [{"batchcodes": ["3202113D"], "histogram": {"Abdominal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3202113D", "histograms": [{"histogram": {"Abdominal pain": 1}, "batchcodes": ["3202113D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202118D.json b/docs/data/histograms/Philippines/3202118D.json
index ac64b155fd0..4807d4947d2 100644
--- a/docs/data/histograms/Philippines/3202118D.json
+++ b/docs/data/histograms/Philippines/3202118D.json
@@ -1 +1 @@
-{"batchcode": "3202118D", "histograms": [{"batchcodes": ["3202118D"], "histogram": {"Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "3202118D", "histograms": [{"histogram": {"Vaginal haemorrhage": 1}, "batchcodes": ["3202118D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202130.json b/docs/data/histograms/Philippines/3202130.json
index 99f85ad0391..19d7d874933 100644
--- a/docs/data/histograms/Philippines/3202130.json
+++ b/docs/data/histograms/Philippines/3202130.json
@@ -1 +1 @@
-{"batchcode": "3202130", "histograms": [{"batchcodes": ["3202130"], "histogram": {"Abdominal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3202130", "histograms": [{"histogram": {"Abdominal pain": 1}, "batchcodes": ["3202130"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32021380.json b/docs/data/histograms/Philippines/32021380.json
index 6ca30947292..6c5493b1733 100644
--- a/docs/data/histograms/Philippines/32021380.json
+++ b/docs/data/histograms/Philippines/32021380.json
@@ -1 +1 @@
-{"batchcode": "32021380", "histograms": [{"batchcodes": ["32021380"], "histogram": {"Caesarean section": 1, "Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "32021380", "histograms": [{"histogram": {"Caesarean section": 1, "Maternal exposure during pregnancy": 1}, "batchcodes": ["32021380"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320213D.json b/docs/data/histograms/Philippines/320213D.json
index 2d8de525226..446ba0c99fb 100644
--- a/docs/data/histograms/Philippines/320213D.json
+++ b/docs/data/histograms/Philippines/320213D.json
@@ -1 +1 @@
-{"batchcode": "320213D", "histograms": [{"batchcodes": ["320213D"], "histogram": {"Syncope": 2, "Asthenia": 1, "Back pain": 1, "Dizziness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "320213D", "histograms": [{"histogram": {"Syncope": 2, "Asthenia": 1, "Back pain": 1, "Dizziness": 1, "Malaise": 1}, "batchcodes": ["320213D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202180.json b/docs/data/histograms/Philippines/3202180.json
index f1af21b31ac..b1de6d9c7a2 100644
--- a/docs/data/histograms/Philippines/3202180.json
+++ b/docs/data/histograms/Philippines/3202180.json
@@ -1 +1 @@
-{"batchcode": "3202180", "histograms": [{"batchcodes": ["3202180"], "histogram": {"Abdominal pain lower": 1, "COVID-19": 1, "Dizziness": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3202180", "histograms": [{"histogram": {"Abdominal pain lower": 1, "COVID-19": 1, "Dizziness": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1, "Syncope": 1}, "batchcodes": ["3202180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202181.json b/docs/data/histograms/Philippines/3202181.json
index 9a605162415..d93b11de6eb 100644
--- a/docs/data/histograms/Philippines/3202181.json
+++ b/docs/data/histograms/Philippines/3202181.json
@@ -1 +1 @@
-{"batchcode": "3202181", "histograms": [{"batchcodes": ["3202181"], "histogram": {"Labour pain": 1, "Maternal exposure timing unspecified": 1}}]}
\ No newline at end of file
+{"batchcode": "3202181", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure timing unspecified": 1}, "batchcodes": ["3202181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320218D.json b/docs/data/histograms/Philippines/320218D.json
index 29b4360bf39..beefe641297 100644
--- a/docs/data/histograms/Philippines/320218D.json
+++ b/docs/data/histograms/Philippines/320218D.json
@@ -1 +1 @@
-{"batchcode": "320218D", "histograms": [{"batchcodes": ["320218D"], "histogram": {"Vaccination site pain": 4, "SARS-CoV-2 test": 3, "Abdominal pain lower": 2, "COVID-19": 2, "Drug ineffective": 2, "Oropharyngeal pain": 2, "Asthenia": 1, "Body temperature": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular accident": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Epistaxis": 1, "Fatigue": 1, "Haemorrhage intracranial": 1, "Headache": 1, "Hypoaesthesia": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "320218D", "histograms": [{"histogram": {"Vaccination site pain": 4, "SARS-CoV-2 test": 3, "Abdominal pain lower": 2, "COVID-19": 2, "Drug ineffective": 2, "Oropharyngeal pain": 2, "Asthenia": 1, "Body temperature": 1, "Cardio-respiratory arrest": 1, "Cerebrovascular accident": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Epistaxis": 1, "Fatigue": 1, "Haemorrhage intracranial": 1, "Headache": 1, "Hypoaesthesia": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1, "Syncope": 1}, "batchcodes": ["320218D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32021BB.json b/docs/data/histograms/Philippines/32021BB.json
index 414555e3dad..8e1e0a39024 100644
--- a/docs/data/histograms/Philippines/32021BB.json
+++ b/docs/data/histograms/Philippines/32021BB.json
@@ -1 +1 @@
-{"batchcode": "32021BB", "histograms": [{"batchcodes": ["32021BB"], "histogram": {"Dyspnoea": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "32021BB", "histograms": [{"histogram": {"Dyspnoea": 1, "Palpitations": 1}, "batchcodes": ["32021BB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32021BC.json b/docs/data/histograms/Philippines/32021BC.json
index 1563c6072ed..367d02d4c09 100644
--- a/docs/data/histograms/Philippines/32021BC.json
+++ b/docs/data/histograms/Philippines/32021BC.json
@@ -1 +1 @@
-{"batchcode": "32021BC", "histograms": [{"batchcodes": ["32021BC"], "histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "32021BC", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["32021BC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32021BD.json b/docs/data/histograms/Philippines/32021BD.json
index 9be4a1c2440..edb7ad9e837 100644
--- a/docs/data/histograms/Philippines/32021BD.json
+++ b/docs/data/histograms/Philippines/32021BD.json
@@ -1 +1 @@
-{"batchcode": "32021BD", "histograms": [{"batchcodes": ["213C21A", "32021BD"], "histogram": {"Death": 1}}, {"batchcodes": ["32021BD"], "histogram": {"Dizziness": 10, "Blood pressure measurement": 8, "Syncope": 8, "Blood pressure increased": 7, "Anaphylactic reaction": 6, "Dyspnoea": 5, "Loss of consciousness": 4, "Pyrexia": 4, "Vaccination site pain": 4, "Vomiting": 4, "Abdominal pain upper": 3, "Asthenia": 3, "Headache": 3, "Pallor": 3, "Urticaria": 3, "Chest pain": 2, "Cough": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Nasopharyngitis": 2, "Off label use": 2, "Pain": 2, "Rash": 2, "Abdominal pain": 1, "Arthralgia": 1, "Back pain": 1, "Blood pressure systolic increased": 1, "Body temperature": 1, "Bradycardia": 1, "COVID-19": 1, "Death": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Dysarthria": 1, "Fatigue": 1, "Gastroenteritis": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Intracranial aneurysm": 1, "Investigation": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure timing unspecified": 1, "Muscular weakness": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pharyngeal mass": 1, "Pneumonia": 1, "Pruritus": 1, "Pulmonary tuberculosis": 1, "Rash erythematous": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sepsis": 1, "Somnolence": 1, "Subarachnoid haemorrhage": 1, "Swelling face": 1, "Tachycardia": 1, "Tachypnoea": 1, "Throat irritation": 1, "Typhoid fever": 1, "Vaccination site erythema": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "32021BD", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["213C21A", "32021BD"]}, {"histogram": {"Dizziness": 10, "Blood pressure measurement": 8, "Syncope": 8, "Blood pressure increased": 7, "Anaphylactic reaction": 6, "Dyspnoea": 5, "Loss of consciousness": 4, "Pyrexia": 4, "Vaccination site pain": 4, "Vomiting": 4, "Abdominal pain upper": 3, "Asthenia": 3, "Headache": 3, "Pallor": 3, "Urticaria": 3, "Chest pain": 2, "Cough": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Nasopharyngitis": 2, "Off label use": 2, "Pain": 2, "Rash": 2, "Abdominal pain": 1, "Arthralgia": 1, "Back pain": 1, "Blood pressure systolic increased": 1, "Body temperature": 1, "Bradycardia": 1, "COVID-19": 1, "Death": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Dysarthria": 1, "Fatigue": 1, "Gastroenteritis": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Intracranial aneurysm": 1, "Investigation": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure timing unspecified": 1, "Muscular weakness": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pharyngeal mass": 1, "Pneumonia": 1, "Pruritus": 1, "Pulmonary tuberculosis": 1, "Rash erythematous": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sepsis": 1, "Somnolence": 1, "Subarachnoid haemorrhage": 1, "Swelling face": 1, "Tachycardia": 1, "Tachypnoea": 1, "Throat irritation": 1, "Typhoid fever": 1, "Vaccination site erythema": 1, "Vital signs measurement": 1}, "batchcodes": ["32021BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32021BO.json b/docs/data/histograms/Philippines/32021BO.json
index 6590a8be8e4..5e98e10006e 100644
--- a/docs/data/histograms/Philippines/32021BO.json
+++ b/docs/data/histograms/Philippines/32021BO.json
@@ -1 +1 @@
-{"batchcode": "32021BO", "histograms": [{"batchcodes": ["32021BO"], "histogram": {"Headache": 1, "Muscular weakness": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "32021BO", "histograms": [{"histogram": {"Headache": 1, "Muscular weakness": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["32021BO"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32021SD.json b/docs/data/histograms/Philippines/32021SD.json
index 51e039ddc92..7251042107c 100644
--- a/docs/data/histograms/Philippines/32021SD.json
+++ b/docs/data/histograms/Philippines/32021SD.json
@@ -1 +1 @@
-{"batchcode": "32021SD", "histograms": [{"batchcodes": ["32021SD"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "32021SD", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["32021SD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320235BD.json b/docs/data/histograms/Philippines/320235BD.json
index d007ca62ef8..9915eb75303 100644
--- a/docs/data/histograms/Philippines/320235BD.json
+++ b/docs/data/histograms/Philippines/320235BD.json
@@ -1 +1 @@
-{"batchcode": "320235BD", "histograms": [{"batchcodes": ["320235BD"], "histogram": {"Psoriasis": 1, "Pustular psoriasis": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "320235BD", "histograms": [{"histogram": {"Psoriasis": 1, "Pustular psoriasis": 1, "Rash": 1}, "batchcodes": ["320235BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32023BD.json b/docs/data/histograms/Philippines/32023BD.json
index d6db75229f1..6de08ba75e5 100644
--- a/docs/data/histograms/Philippines/32023BD.json
+++ b/docs/data/histograms/Philippines/32023BD.json
@@ -1 +1 @@
-{"batchcode": "32023BD", "histograms": [{"batchcodes": ["32023BD"], "histogram": {"Pain": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "32023BD", "histograms": [{"histogram": {"Pain": 1, "Syncope": 1}, "batchcodes": ["32023BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32025.json b/docs/data/histograms/Philippines/32025.json
index b75022e2b47..48ee7d3a439 100644
--- a/docs/data/histograms/Philippines/32025.json
+++ b/docs/data/histograms/Philippines/32025.json
@@ -1 +1 @@
-{"batchcode": "32025", "histograms": [{"batchcodes": ["32025"], "histogram": {"Haemorrhage": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "32025", "histograms": [{"histogram": {"Haemorrhage": 1, "Seizure": 1}, "batchcodes": ["32025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320253D.json b/docs/data/histograms/Philippines/320253D.json
index 27ca9447e57..758f15431b7 100644
--- a/docs/data/histograms/Philippines/320253D.json
+++ b/docs/data/histograms/Philippines/320253D.json
@@ -1 +1 @@
-{"batchcode": "320253D", "histograms": [{"batchcodes": ["320253D"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pneumonia": 1, "Respiratory rate": 1, "Stool analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "320253D", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Oxygen saturation": 1, "Paralysis": 1, "Pneumonia": 1, "Respiratory rate": 1, "Stool analysis": 1}, "batchcodes": ["320253D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320258.json b/docs/data/histograms/Philippines/320258.json
index 221ed1af31d..031c88d589e 100644
--- a/docs/data/histograms/Philippines/320258.json
+++ b/docs/data/histograms/Philippines/320258.json
@@ -1 +1 @@
-{"batchcode": "320258", "histograms": [{"batchcodes": ["320258"], "histogram": {"Dizziness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "320258", "histograms": [{"histogram": {"Dizziness": 1, "Syncope": 1}, "batchcodes": ["320258"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202580.json b/docs/data/histograms/Philippines/3202580.json
index 612b3cfad57..cbcc14d1140 100644
--- a/docs/data/histograms/Philippines/3202580.json
+++ b/docs/data/histograms/Philippines/3202580.json
@@ -1 +1 @@
-{"batchcode": "3202580", "histograms": [{"batchcodes": ["3202580"], "histogram": {"Headache": 2, "Pyrexia": 2, "Seizure": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Chest pain": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysuria": 1, "Malaise": 1, "Palpitations": 1, "Rectal cancer metastatic": 1}}]}
\ No newline at end of file
+{"batchcode": "3202580", "histograms": [{"histogram": {"Headache": 2, "Pyrexia": 2, "Seizure": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Chest pain": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysuria": 1, "Malaise": 1, "Palpitations": 1, "Rectal cancer metastatic": 1}, "batchcodes": ["3202580"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320258D.json b/docs/data/histograms/Philippines/320258D.json
index a151b376e8e..e5d55649ece 100644
--- a/docs/data/histograms/Philippines/320258D.json
+++ b/docs/data/histograms/Philippines/320258D.json
@@ -1 +1 @@
-{"batchcode": "320258D", "histograms": [{"batchcodes": ["320258D"], "histogram": {"Dizziness": 8, "Headache": 6, "Syncope": 6, "Bradycardia": 5, "Blood pressure measurement": 4, "Hypotension": 4, "Pyrexia": 3, "Abdominal pain": 2, "Arthralgia": 2, "Body temperature": 2, "Diarrhoea": 2, "Dysarthria": 2, "Dyspnoea": 2, "Heart rate": 2, "Hypertension": 2, "Malaise": 2, "Oxygen saturation": 2, "Pain assessment": 2, "Pallor": 2, "Palpitations": 2, "Respiratory rate": 2, "Vaccination site pain": 2, "Vomiting": 2, "Anaphylactic reaction": 1, "Back pain": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Cold sweat": 1, "Coma scale": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Fatigue": 1, "Febrile convulsion": 1, "Food allergy": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Lagophthalmos": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1, "Periorbital oedema": 1, "Product use issue": 1, "Seizure": 1, "Tremor": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "320258D", "histograms": [{"histogram": {"Dizziness": 8, "Headache": 6, "Syncope": 6, "Bradycardia": 5, "Blood pressure measurement": 4, "Hypotension": 4, "Pyrexia": 3, "Abdominal pain": 2, "Arthralgia": 2, "Body temperature": 2, "Diarrhoea": 2, "Dysarthria": 2, "Dyspnoea": 2, "Heart rate": 2, "Hypertension": 2, "Malaise": 2, "Oxygen saturation": 2, "Pain assessment": 2, "Pallor": 2, "Palpitations": 2, "Respiratory rate": 2, "Vaccination site pain": 2, "Vomiting": 2, "Anaphylactic reaction": 1, "Back pain": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Cold sweat": 1, "Coma scale": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Fatigue": 1, "Febrile convulsion": 1, "Food allergy": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Lagophthalmos": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1, "Periorbital oedema": 1, "Product use issue": 1, "Seizure": 1, "Tremor": 1, "Wheezing": 1}, "batchcodes": ["320258D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32025B.json b/docs/data/histograms/Philippines/32025B.json
index 9f69265e510..5a5281fd1a9 100644
--- a/docs/data/histograms/Philippines/32025B.json
+++ b/docs/data/histograms/Philippines/32025B.json
@@ -1 +1 @@
-{"batchcode": "32025B", "histograms": [{"batchcodes": ["32025B"], "histogram": {"Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "32025B", "histograms": [{"histogram": {"Unresponsive to stimuli": 1}, "batchcodes": ["32025B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32025BD.json b/docs/data/histograms/Philippines/32025BD.json
index 01304f31249..05c60a8555a 100644
--- a/docs/data/histograms/Philippines/32025BD.json
+++ b/docs/data/histograms/Philippines/32025BD.json
@@ -1 +1 @@
-{"batchcode": "32025BD", "histograms": [{"batchcodes": ["32025BD"], "histogram": {"Blood pressure measurement": 48, "Blood pressure increased": 36, "Syncope": 21, "Heart rate": 14, "Dizziness": 13, "Body temperature": 10, "COVID-19": 8, "Drug ineffective": 8, "Dyspnoea": 8, "Loss of consciousness": 8, "Pyrexia": 8, "Cough": 7, "Headache": 7, "Asthenia": 6, "Cold sweat": 6, "Hypotension": 6, "Oxygen saturation": 6, "Hyperhidrosis": 5, "SARS-CoV-2 test": 5, "Presyncope": 4, "Respiratory rate": 4, "Vaccination site pain": 4, "Vomiting": 4, "Death": 3, "Nasopharyngitis": 3, "Nausea": 3, "Seizure": 3, "Blood creatinine": 2, "Bradycardia": 2, "COVID-19 screening": 2, "Chest pain": 2, "Chills": 2, "Decreased appetite": 2, "Fall": 2, "Fatigue": 2, "Hepatitis B surface antigen": 2, "Malaise": 2, "Oxygen saturation decreased": 2, "Pain": 2, "Type 2 diabetes mellitus": 2, "Unresponsive to stimuli": 2, "Abdominal X-ray": 1, "Abdominal pain lower": 1, "Angina pectoris": 1, "Arteriosclerosis": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blister": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urea": 1, "Blood urea increased": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Body temperature decreased": 1, "Capillary nail refill test": 1, "Capillary nail refill test abnormal": 1, "Cardiac arrest": 1, "Chemical poisoning": 1, "Corticosteroid binding globulin test": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysuria": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Facial paralysis": 1, "Fear": 1, "Full blood count": 1, "Generalised tonic-clonic seizure": 1, "Groin pain": 1, "Hunger": 1, "Hypertension": 1, "Hypertensive urgency": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "International normalised ratio": 1, "Investigation": 1, "Large intestinal obstruction": 1, "Lymphadenopathy": 1, "Mass": 1, "Micturition urgency": 1, "Mouth swelling": 1, "Muscle rigidity": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Nasal oedema": 1, "Off label use": 1, "Oliguria": 1, "Oxygen therapy": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Procalcitonin": 1, "Product use issue": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "SARS-CoV-2 test negative": 1, "Swelling": 1, "Swelling face": 1, "Tachycardia": 1, "Total cholesterol/HDL ratio": 1, "Total cholesterol/HDL ratio decreased": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site hypoaesthesia": 1, "Very low density lipoprotein": 1, "Very low density lipoprotein increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "32025BD", "histograms": [{"histogram": {"Blood pressure measurement": 48, "Blood pressure increased": 36, "Syncope": 21, "Heart rate": 14, "Dizziness": 13, "Body temperature": 10, "COVID-19": 8, "Drug ineffective": 8, "Dyspnoea": 8, "Loss of consciousness": 8, "Pyrexia": 8, "Cough": 7, "Headache": 7, "Asthenia": 6, "Cold sweat": 6, "Hypotension": 6, "Oxygen saturation": 6, "Hyperhidrosis": 5, "SARS-CoV-2 test": 5, "Presyncope": 4, "Respiratory rate": 4, "Vaccination site pain": 4, "Vomiting": 4, "Death": 3, "Nasopharyngitis": 3, "Nausea": 3, "Seizure": 3, "Blood creatinine": 2, "Bradycardia": 2, "COVID-19 screening": 2, "Chest pain": 2, "Chills": 2, "Decreased appetite": 2, "Fall": 2, "Fatigue": 2, "Hepatitis B surface antigen": 2, "Malaise": 2, "Oxygen saturation decreased": 2, "Pain": 2, "Type 2 diabetes mellitus": 2, "Unresponsive to stimuli": 2, "Abdominal X-ray": 1, "Abdominal pain lower": 1, "Angina pectoris": 1, "Arteriosclerosis": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Back pain": 1, "Blister": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood creatinine increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood triglycerides increased": 1, "Blood urea": 1, "Blood urea increased": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Body temperature decreased": 1, "Capillary nail refill test": 1, "Capillary nail refill test abnormal": 1, "Cardiac arrest": 1, "Chemical poisoning": 1, "Corticosteroid binding globulin test": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysuria": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Facial paralysis": 1, "Fear": 1, "Full blood count": 1, "Generalised tonic-clonic seizure": 1, "Groin pain": 1, "Hunger": 1, "Hypertension": 1, "Hypertensive urgency": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "International normalised ratio": 1, "Investigation": 1, "Large intestinal obstruction": 1, "Lymphadenopathy": 1, "Mass": 1, "Micturition urgency": 1, "Mouth swelling": 1, "Muscle rigidity": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Nasal oedema": 1, "Off label use": 1, "Oliguria": 1, "Oxygen therapy": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Procalcitonin": 1, "Product use issue": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary oedema": 1, "Pulse abnormal": 1, "SARS-CoV-2 test negative": 1, "Swelling": 1, "Swelling face": 1, "Tachycardia": 1, "Total cholesterol/HDL ratio": 1, "Total cholesterol/HDL ratio decreased": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site hypoaesthesia": 1, "Very low density lipoprotein": 1, "Very low density lipoprotein increased": 1, "X-ray": 1}, "batchcodes": ["32025BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32025ID.json b/docs/data/histograms/Philippines/32025ID.json
index 19293a581e4..bde3ccd4e67 100644
--- a/docs/data/histograms/Philippines/32025ID.json
+++ b/docs/data/histograms/Philippines/32025ID.json
@@ -1 +1 @@
-{"batchcode": "32025ID", "histograms": [{"batchcodes": ["32025ID"], "histogram": {"Dyspnoea": 1, "Musculoskeletal stiffness": 1, "Oxygen therapy": 1}}]}
\ No newline at end of file
+{"batchcode": "32025ID", "histograms": [{"histogram": {"Dyspnoea": 1, "Musculoskeletal stiffness": 1, "Oxygen therapy": 1}, "batchcodes": ["32025ID"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320280.json b/docs/data/histograms/Philippines/320280.json
index 172f645ee9e..140733a7cda 100644
--- a/docs/data/histograms/Philippines/320280.json
+++ b/docs/data/histograms/Philippines/320280.json
@@ -1 +1 @@
-{"batchcode": "320280", "histograms": [{"batchcodes": ["320280"], "histogram": {"Dizziness": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "320280", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1}, "batchcodes": ["320280"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202BD.json b/docs/data/histograms/Philippines/3202BD.json
index 985bec2d781..9c20e067995 100644
--- a/docs/data/histograms/Philippines/3202BD.json
+++ b/docs/data/histograms/Philippines/3202BD.json
@@ -1 +1 @@
-{"batchcode": "3202BD", "histograms": [{"batchcodes": ["3202BD"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3202BD", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["3202BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3202SD.json b/docs/data/histograms/Philippines/3202SD.json
index 3476581f0cb..a47a708c72d 100644
--- a/docs/data/histograms/Philippines/3202SD.json
+++ b/docs/data/histograms/Philippines/3202SD.json
@@ -1 +1 @@
-{"batchcode": "3202SD", "histograms": [{"batchcodes": ["3202SD"], "histogram": {"Asthma": 1, "COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Mitral valve incompetence": 1, "Mitral valve prolapse": 1, "Myocarditis": 1, "Palpitations": 1, "Pyrexia": 1, "Rhinitis allergic": 1, "Sinus tachycardia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3202SD", "histograms": [{"histogram": {"Asthma": 1, "COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Mitral valve incompetence": 1, "Mitral valve prolapse": 1, "Myocarditis": 1, "Palpitations": 1, "Pyrexia": 1, "Rhinitis allergic": 1, "Sinus tachycardia": 1, "Syncope": 1}, "batchcodes": ["3202SD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3203580.json b/docs/data/histograms/Philippines/3203580.json
index 3326d6d5e11..136d184903c 100644
--- a/docs/data/histograms/Philippines/3203580.json
+++ b/docs/data/histograms/Philippines/3203580.json
@@ -1 +1 @@
-{"batchcode": "3203580", "histograms": [{"batchcodes": ["3203580"], "histogram": {"Fatigue": 1, "Headache": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3203580", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["3203580"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320483.json b/docs/data/histograms/Philippines/320483.json
index bed9c8297a3..a98555ddccc 100644
--- a/docs/data/histograms/Philippines/320483.json
+++ b/docs/data/histograms/Philippines/320483.json
@@ -1 +1 @@
-{"batchcode": "320483", "histograms": [{"batchcodes": ["320483"], "histogram": {"Pain": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "320483", "histograms": [{"histogram": {"Pain": 1, "Swelling": 1}, "batchcodes": ["320483"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320580.json b/docs/data/histograms/Philippines/320580.json
index 29b1485da8c..926bde47ee6 100644
--- a/docs/data/histograms/Philippines/320580.json
+++ b/docs/data/histograms/Philippines/320580.json
@@ -1 +1 @@
-{"batchcode": "320580", "histograms": [{"batchcodes": ["320580"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Liver injury": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "320580", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Liver injury": 1, "Rash": 1}, "batchcodes": ["320580"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3205BD.json b/docs/data/histograms/Philippines/3205BD.json
index 54523356418..b41146c6f3b 100644
--- a/docs/data/histograms/Philippines/3205BD.json
+++ b/docs/data/histograms/Philippines/3205BD.json
@@ -1 +1 @@
-{"batchcode": "3205BD", "histograms": [{"batchcodes": ["3205BD"], "histogram": {"Abdominal pain": 1, "Haematemesis": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3205BD", "histograms": [{"histogram": {"Abdominal pain": 1, "Haematemesis": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["3205BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320621A.json b/docs/data/histograms/Philippines/320621A.json
index 41604557c4d..38902366d0b 100644
--- a/docs/data/histograms/Philippines/320621A.json
+++ b/docs/data/histograms/Philippines/320621A.json
@@ -1 +1 @@
-{"batchcode": "320621A", "histograms": [{"batchcodes": ["320621A"], "histogram": {"Abdominal pain upper": 1, "Malaise": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "320621A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Malaise": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["320621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/320780.json b/docs/data/histograms/Philippines/320780.json
index e2332b83126..34859091d7e 100644
--- a/docs/data/histograms/Philippines/320780.json
+++ b/docs/data/histograms/Philippines/320780.json
@@ -1 +1 @@
-{"batchcode": "320780", "histograms": [{"batchcodes": ["320780"], "histogram": {"Arrhythmia": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "320780", "histograms": [{"histogram": {"Arrhythmia": 1, "Dizziness": 1}, "batchcodes": ["320780"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3211218A.json b/docs/data/histograms/Philippines/3211218A.json
index 34e470cc851..5002667b60a 100644
--- a/docs/data/histograms/Philippines/3211218A.json
+++ b/docs/data/histograms/Philippines/3211218A.json
@@ -1 +1 @@
-{"batchcode": "3211218A", "histograms": [{"batchcodes": ["3211218A"], "histogram": {"Dyspnoea": 1, "Loss of consciousness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3211218A", "histograms": [{"histogram": {"Dyspnoea": 1, "Loss of consciousness": 1, "Syncope": 1}, "batchcodes": ["3211218A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/321250.json b/docs/data/histograms/Philippines/321250.json
index 8e85cbe56f6..52ef10de0bd 100644
--- a/docs/data/histograms/Philippines/321250.json
+++ b/docs/data/histograms/Philippines/321250.json
@@ -1 +1 @@
-{"batchcode": "321250", "histograms": [{"batchcodes": ["321250"], "histogram": {"Abdominal pain": 1, "Gastritis": 1, "Parasitic gastroenteritis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "321250", "histograms": [{"histogram": {"Abdominal pain": 1, "Gastritis": 1, "Parasitic gastroenteritis": 1, "Vomiting": 1}, "batchcodes": ["321250"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/321258A.json b/docs/data/histograms/Philippines/321258A.json
index 097b088c959..1036ecf9f31 100644
--- a/docs/data/histograms/Philippines/321258A.json
+++ b/docs/data/histograms/Philippines/321258A.json
@@ -1 +1 @@
-{"batchcode": "321258A", "histograms": [{"batchcodes": ["321258A"], "histogram": {"Dyspnoea": 3, "Blister": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Pruritus": 2, "Pyrexia": 2, "Rash": 2, "Syncope": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Coronary artery disease": 1, "Cough": 1, "Diabetic nephropathy": 1, "Drug ineffective": 1, "Electrolyte imbalance": 1, "Erythema": 1, "Facial asymmetry": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Malaise": 1, "Off label use": 1, "Peptic ulcer": 1, "Pyelonephritis acute": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Throat irritation": 1, "Type 2 diabetes mellitus": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "321258A", "histograms": [{"histogram": {"Dyspnoea": 3, "Blister": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Pruritus": 2, "Pyrexia": 2, "Rash": 2, "Syncope": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Coronary artery disease": 1, "Cough": 1, "Diabetic nephropathy": 1, "Drug ineffective": 1, "Electrolyte imbalance": 1, "Erythema": 1, "Facial asymmetry": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Malaise": 1, "Off label use": 1, "Peptic ulcer": 1, "Pyelonephritis acute": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Throat irritation": 1, "Type 2 diabetes mellitus": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1}, "batchcodes": ["321258A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32125BA.json b/docs/data/histograms/Philippines/32125BA.json
index 0c9910bf3eb..91536456940 100644
--- a/docs/data/histograms/Philippines/32125BA.json
+++ b/docs/data/histograms/Philippines/32125BA.json
@@ -1 +1 @@
-{"batchcode": "32125BA", "histograms": [{"batchcodes": ["32125BA"], "histogram": {"Dyspnoea": 3, "Dizziness": 2, "Loss of consciousness": 2, "Syncope": 2, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Demyelinating polyneuropathy": 1, "Discharge": 1, "Drug ineffective": 1, "Electrolyte imbalance": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Malaise": 1, "Nasal polyps": 1, "Nasopharyngitis": 1, "Pruritus": 1, "Pulmonary tuberculosis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sinusitis": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "32125BA", "histograms": [{"histogram": {"Dyspnoea": 3, "Dizziness": 2, "Loss of consciousness": 2, "Syncope": 2, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Demyelinating polyneuropathy": 1, "Discharge": 1, "Drug ineffective": 1, "Electrolyte imbalance": 1, "Guillain-Barre syndrome": 1, "Headache": 1, "Malaise": 1, "Nasal polyps": 1, "Nasopharyngitis": 1, "Pruritus": 1, "Pulmonary tuberculosis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sinusitis": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["32125BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32125PA.json b/docs/data/histograms/Philippines/32125PA.json
index 389ff1b5cf7..e37b5a368c9 100644
--- a/docs/data/histograms/Philippines/32125PA.json
+++ b/docs/data/histograms/Philippines/32125PA.json
@@ -1 +1 @@
-{"batchcode": "32125PA", "histograms": [{"batchcodes": ["32125PA"], "histogram": {"Abdominal pain": 1, "Cough": 1, "Diarrhoea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "32125PA", "histograms": [{"histogram": {"Abdominal pain": 1, "Cough": 1, "Diarrhoea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["32125PA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/321288A.json b/docs/data/histograms/Philippines/321288A.json
index 066038163ca..0f5b72caced 100644
--- a/docs/data/histograms/Philippines/321288A.json
+++ b/docs/data/histograms/Philippines/321288A.json
@@ -1 +1 @@
-{"batchcode": "321288A", "histograms": [{"batchcodes": ["321288A"], "histogram": {"Chest pain": 2, "Insomnia": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "321288A", "histograms": [{"histogram": {"Chest pain": 2, "Insomnia": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["321288A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32128B9.json b/docs/data/histograms/Philippines/32128B9.json
index 543bd6d895d..f08e1e12ad4 100644
--- a/docs/data/histograms/Philippines/32128B9.json
+++ b/docs/data/histograms/Philippines/32128B9.json
@@ -1 +1 @@
-{"batchcode": "32128B9", "histograms": [{"batchcodes": ["32128B9"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "32128B9", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["32128B9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32153B.json b/docs/data/histograms/Philippines/32153B.json
index 417525e9628..e9b87bd979f 100644
--- a/docs/data/histograms/Philippines/32153B.json
+++ b/docs/data/histograms/Philippines/32153B.json
@@ -1 +1 @@
-{"batchcode": "32153B", "histograms": [{"batchcodes": ["32153B"], "histogram": {"Syncope": 2}}]}
\ No newline at end of file
+{"batchcode": "32153B", "histograms": [{"histogram": {"Syncope": 2}, "batchcodes": ["32153B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/321558A.json b/docs/data/histograms/Philippines/321558A.json
index 1ceb5db1d9c..002540eb6b3 100644
--- a/docs/data/histograms/Philippines/321558A.json
+++ b/docs/data/histograms/Philippines/321558A.json
@@ -1 +1 @@
-{"batchcode": "321558A", "histograms": [{"batchcodes": ["321558A"], "histogram": {"Blood pressure increased": 16, "Blood pressure measurement": 16, "Body temperature": 1, "Cerebellar atrophy": 1, "Cerebral arteriosclerosis": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Computerised tomogram": 1, "Demyelination": 1, "Dizziness": 1, "Gliosis": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "321558A", "histograms": [{"histogram": {"Blood pressure increased": 16, "Blood pressure measurement": 16, "Body temperature": 1, "Cerebellar atrophy": 1, "Cerebral arteriosclerosis": 1, "Cerebral infarction": 1, "Cerebral ischaemia": 1, "Computerised tomogram": 1, "Demyelination": 1, "Dizziness": 1, "Gliosis": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["321558A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32155BA.json b/docs/data/histograms/Philippines/32155BA.json
index a03975db74d..ab65fc46fed 100644
--- a/docs/data/histograms/Philippines/32155BA.json
+++ b/docs/data/histograms/Philippines/32155BA.json
@@ -1 +1 @@
-{"batchcode": "32155BA", "histograms": [{"batchcodes": ["32155BA"], "histogram": {"Blood pressure increased": 6, "Blood pressure measurement": 5, "Dizziness": 2, "Loss of consciousness": 2, "Syncope": 2, "Bradycardia": 1, "Dyspnoea": 1, "Haematemesis": 1, "Headache": 1, "Heart rate": 1, "Nausea": 1, "Pyrexia": 1, "Seizure": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "32155BA", "histograms": [{"histogram": {"Blood pressure increased": 6, "Blood pressure measurement": 5, "Dizziness": 2, "Loss of consciousness": 2, "Syncope": 2, "Bradycardia": 1, "Dyspnoea": 1, "Haematemesis": 1, "Headache": 1, "Heart rate": 1, "Nausea": 1, "Pyrexia": 1, "Seizure": 1, "Tachycardia": 1}, "batchcodes": ["32155BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32155VA.json b/docs/data/histograms/Philippines/32155VA.json
index 174c9aebe37..b199ce0cc68 100644
--- a/docs/data/histograms/Philippines/32155VA.json
+++ b/docs/data/histograms/Philippines/32155VA.json
@@ -1 +1 @@
-{"batchcode": "32155VA", "histograms": [{"batchcodes": ["32155VA"], "histogram": {"Breast cancer": 1, "Oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "32155VA", "histograms": [{"histogram": {"Breast cancer": 1, "Oedema": 1}, "batchcodes": ["32155VA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/32221BD.json b/docs/data/histograms/Philippines/32221BD.json
index cc2387bdddd..36c5bff8938 100644
--- a/docs/data/histograms/Philippines/32221BD.json
+++ b/docs/data/histograms/Philippines/32221BD.json
@@ -1 +1 @@
-{"batchcode": "32221BD", "histograms": [{"batchcodes": ["32221BD"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "32221BD", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["32221BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/330308D.json b/docs/data/histograms/Philippines/330308D.json
index f54e55f6148..dcc51ecf806 100644
--- a/docs/data/histograms/Philippines/330308D.json
+++ b/docs/data/histograms/Philippines/330308D.json
@@ -1 +1 @@
-{"batchcode": "330308D", "histograms": [{"batchcodes": ["330308D"], "histogram": {"Body height": 2, "Chills": 2, "Headache": 2, "Weight": 2, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "330308D", "histograms": [{"histogram": {"Body height": 2, "Chills": 2, "Headache": 2, "Weight": 2, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1}, "batchcodes": ["330308D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/33130BA.json b/docs/data/histograms/Philippines/33130BA.json
index 4b3f5146bb0..000e4db25c5 100644
--- a/docs/data/histograms/Philippines/33130BA.json
+++ b/docs/data/histograms/Philippines/33130BA.json
@@ -1 +1 @@
-{"batchcode": "33130BA", "histograms": [{"batchcodes": ["33130BA"], "histogram": {"Coma": 1, "Dyspnoea": 1, "Myocardial infarction": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "33130BA", "histograms": [{"histogram": {"Coma": 1, "Dyspnoea": 1, "Myocardial infarction": 1, "Nausea": 1}, "batchcodes": ["33130BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/332021BD.json b/docs/data/histograms/Philippines/332021BD.json
index 58dabaa6f79..78d6004109f 100644
--- a/docs/data/histograms/Philippines/332021BD.json
+++ b/docs/data/histograms/Philippines/332021BD.json
@@ -1 +1 @@
-{"batchcode": "332021BD", "histograms": [{"batchcodes": ["332021BD"], "histogram": {"Guillain-Barre syndrome": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "332021BD", "histograms": [{"histogram": {"Guillain-Barre syndrome": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["332021BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/33360113.json b/docs/data/histograms/Philippines/33360113.json
index 7363f042aa6..8a3c866baa5 100644
--- a/docs/data/histograms/Philippines/33360113.json
+++ b/docs/data/histograms/Philippines/33360113.json
@@ -1 +1 @@
-{"batchcode": "33360113", "histograms": [{"batchcodes": ["33360113"], "histogram": {"Back pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "33360113", "histograms": [{"histogram": {"Back pain": 1, "Vaccination site pain": 1}, "batchcodes": ["33360113"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/333601A.json b/docs/data/histograms/Philippines/333601A.json
index 42edfac909b..cf454596e39 100644
--- a/docs/data/histograms/Philippines/333601A.json
+++ b/docs/data/histograms/Philippines/333601A.json
@@ -1 +1 @@
-{"batchcode": "333601A", "histograms": [{"batchcodes": ["333601A"], "histogram": {"Abdominal pain upper": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "333601A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Vaccination site pain": 1}, "batchcodes": ["333601A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/333601B.json b/docs/data/histograms/Philippines/333601B.json
index d3bf1480b8a..6eb145b5012 100644
--- a/docs/data/histograms/Philippines/333601B.json
+++ b/docs/data/histograms/Philippines/333601B.json
@@ -1 +1 @@
-{"batchcode": "333601B", "histograms": [{"batchcodes": ["333601B"], "histogram": {"Chest pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "333601B", "histograms": [{"histogram": {"Chest pain": 1, "Vomiting": 1}, "batchcodes": ["333601B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/33360713.json b/docs/data/histograms/Philippines/33360713.json
index 2dec98f9d16..73369919567 100644
--- a/docs/data/histograms/Philippines/33360713.json
+++ b/docs/data/histograms/Philippines/33360713.json
@@ -1 +1 @@
-{"batchcode": "33360713", "histograms": [{"batchcodes": ["33360713"], "histogram": {"Dysphagia": 1}}]}
\ No newline at end of file
+{"batchcode": "33360713", "histograms": [{"histogram": {"Dysphagia": 1}, "batchcodes": ["33360713"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/333608B.json b/docs/data/histograms/Philippines/333608B.json
index 4db45fd73c4..b9e572c2c26 100644
--- a/docs/data/histograms/Philippines/333608B.json
+++ b/docs/data/histograms/Philippines/333608B.json
@@ -1 +1 @@
-{"batchcode": "333608B", "histograms": [{"batchcodes": ["333608B"], "histogram": {"Vulvovaginal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "333608B", "histograms": [{"histogram": {"Vulvovaginal pain": 1}, "batchcodes": ["333608B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/33360B.json b/docs/data/histograms/Philippines/33360B.json
index b5a77ac1d1d..98f774cd6b4 100644
--- a/docs/data/histograms/Philippines/33360B.json
+++ b/docs/data/histograms/Philippines/33360B.json
@@ -1 +1 @@
-{"batchcode": "33360B", "histograms": [{"batchcodes": ["33360B"], "histogram": {"Back pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "33360B", "histograms": [{"histogram": {"Back pain": 1, "Vaccination site pain": 1}, "batchcodes": ["33360B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/33360TB.json b/docs/data/histograms/Philippines/33360TB.json
index a645b7bf097..ffcad8f9c79 100644
--- a/docs/data/histograms/Philippines/33360TB.json
+++ b/docs/data/histograms/Philippines/33360TB.json
@@ -1 +1 @@
-{"batchcode": "33360TB", "histograms": [{"batchcodes": ["33360TB"], "histogram": {"Back pain": 7, "Vaccination site pain": 7, "Dyspnoea": 5, "Vomiting": 3, "Chest pain": 2, "Dizziness": 2, "Interchange of vaccine products": 2, "Maternal exposure during pregnancy": 2, "Maternal exposure timing unspecified": 2, "Off label use": 2, "Pyrexia": 2, "Asthenia": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Gastritis": 1, "Gastroenteritis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Labour pain": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Palpitations": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Urinary tract infection": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "33360TB", "histograms": [{"histogram": {"Back pain": 7, "Vaccination site pain": 7, "Dyspnoea": 5, "Vomiting": 3, "Chest pain": 2, "Dizziness": 2, "Interchange of vaccine products": 2, "Maternal exposure during pregnancy": 2, "Maternal exposure timing unspecified": 2, "Off label use": 2, "Pyrexia": 2, "Asthenia": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Gastritis": 1, "Gastroenteritis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Labour pain": 1, "Oedema peripheral": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Palpitations": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Urinary tract infection": 1, "Vaccination failure": 1}, "batchcodes": ["33360TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/333L00TB.json b/docs/data/histograms/Philippines/333L00TB.json
index dfa62c50615..562307b6075 100644
--- a/docs/data/histograms/Philippines/333L00TB.json
+++ b/docs/data/histograms/Philippines/333L00TB.json
@@ -1 +1 @@
-{"batchcode": "333L00TB", "histograms": [{"batchcodes": ["333L00TB"], "histogram": {"Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "333L00TB", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["333L00TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3360TB.json b/docs/data/histograms/Philippines/3360TB.json
index 7dd59ac7f75..34504e40436 100644
--- a/docs/data/histograms/Philippines/3360TB.json
+++ b/docs/data/histograms/Philippines/3360TB.json
@@ -1 +1 @@
-{"batchcode": "3360TB", "histograms": [{"batchcodes": ["3360TB"], "histogram": {"Back pain": 1, "Chronic obstructive pulmonary disease": 1, "Cough": 1, "Heavy menstrual bleeding": 1, "Inappropriate schedule of product administration": 1, "Tuberculosis": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3360TB", "histograms": [{"histogram": {"Back pain": 1, "Chronic obstructive pulmonary disease": 1, "Cough": 1, "Heavy menstrual bleeding": 1, "Inappropriate schedule of product administration": 1, "Tuberculosis": 1, "Vaccination site pain": 1}, "batchcodes": ["3360TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/340300130.json b/docs/data/histograms/Philippines/340300130.json
index ce02925eb72..a0ff4996ead 100644
--- a/docs/data/histograms/Philippines/340300130.json
+++ b/docs/data/histograms/Philippines/340300130.json
@@ -1 +1 @@
-{"batchcode": "340300130", "histograms": [{"batchcodes": ["340300130"], "histogram": {"Dizziness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "340300130", "histograms": [{"histogram": {"Dizziness": 1, "Syncope": 1}, "batchcodes": ["340300130"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/3420080.json b/docs/data/histograms/Philippines/3420080.json
index 5d170173a44..66da3d48cf6 100644
--- a/docs/data/histograms/Philippines/3420080.json
+++ b/docs/data/histograms/Philippines/3420080.json
@@ -1 +1 @@
-{"batchcode": "3420080", "histograms": [{"batchcodes": ["3420080"], "histogram": {"Immunisation": 1, "Off label use": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3420080", "histograms": [{"histogram": {"Immunisation": 1, "Off label use": 1, "Vaccination site pain": 1}, "batchcodes": ["3420080"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/343005D.json b/docs/data/histograms/Philippines/343005D.json
index 29d26d63912..fc1c1635908 100644
--- a/docs/data/histograms/Philippines/343005D.json
+++ b/docs/data/histograms/Philippines/343005D.json
@@ -1 +1 @@
-{"batchcode": "343005D", "histograms": [{"batchcodes": ["343005D"], "histogram": {"Cough": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pneumonia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "343005D", "histograms": [{"histogram": {"Cough": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pneumonia": 1, "Pyrexia": 1}, "batchcodes": ["343005D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/343008B.json b/docs/data/histograms/Philippines/343008B.json
index 1b2150c6b15..956b4352cb1 100644
--- a/docs/data/histograms/Philippines/343008B.json
+++ b/docs/data/histograms/Philippines/343008B.json
@@ -1 +1 @@
-{"batchcode": "343008B", "histograms": [{"batchcodes": ["343008B"], "histogram": {"Chest pain": 1, "Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "343008B", "histograms": [{"histogram": {"Chest pain": 1, "Chills": 1, "Pyrexia": 1}, "batchcodes": ["343008B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/343008D.json b/docs/data/histograms/Philippines/343008D.json
index c12bd6df859..b8d3e899f43 100644
--- a/docs/data/histograms/Philippines/343008D.json
+++ b/docs/data/histograms/Philippines/343008D.json
@@ -1 +1 @@
-{"batchcode": "343008D", "histograms": [{"batchcodes": ["343008D"], "histogram": {"Acute myocardial infarction": 1, "Ageusia": 1, "Asphyxia": 1, "Dizziness": 1, "Dysuria": 1, "Hypertension": 1, "Jaundice": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Nausea": 1, "Pneumonia": 1, "Pruritus": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "343008D", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Ageusia": 1, "Asphyxia": 1, "Dizziness": 1, "Dysuria": 1, "Hypertension": 1, "Jaundice": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Nausea": 1, "Pneumonia": 1, "Pruritus": 1, "Pyrexia": 1}, "batchcodes": ["343008D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/34300AD.json b/docs/data/histograms/Philippines/34300AD.json
index 67a4ea1c114..f595b446392 100644
--- a/docs/data/histograms/Philippines/34300AD.json
+++ b/docs/data/histograms/Philippines/34300AD.json
@@ -1 +1 @@
-{"batchcode": "34300AD", "histograms": [{"batchcodes": ["34300AD"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "34300AD", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["34300AD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/34300B.json b/docs/data/histograms/Philippines/34300B.json
index 7bd231533e1..925379eb77e 100644
--- a/docs/data/histograms/Philippines/34300B.json
+++ b/docs/data/histograms/Philippines/34300B.json
@@ -1 +1 @@
-{"batchcode": "34300B", "histograms": [{"batchcodes": ["34300B"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "34300B", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["34300B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/34300B0.json b/docs/data/histograms/Philippines/34300B0.json
index 4f792fc9948..48def6bf469 100644
--- a/docs/data/histograms/Philippines/34300B0.json
+++ b/docs/data/histograms/Philippines/34300B0.json
@@ -1 +1 @@
-{"batchcode": "34300B0", "histograms": [{"batchcodes": ["34300B0"], "histogram": {"Aneurysm ruptured": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Fallot's tetralogy": 1, "Haemorrhage intracranial": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Mydriasis": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pyrexia": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "34300B0", "histograms": [{"histogram": {"Aneurysm ruptured": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cyanosis": 1, "Depressed level of consciousness": 1, "Fallot's tetralogy": 1, "Haemorrhage intracranial": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Mydriasis": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pyrexia": 1, "Respiratory rate": 1}, "batchcodes": ["34300B0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/34300BD.json b/docs/data/histograms/Philippines/34300BD.json
index 2724fd40015..db7729caf95 100644
--- a/docs/data/histograms/Philippines/34300BD.json
+++ b/docs/data/histograms/Philippines/34300BD.json
@@ -1 +1 @@
-{"batchcode": "34300BD", "histograms": [{"batchcodes": ["055E21A", "34300BD"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}}, {"batchcodes": ["34300BD", "ABC6894"], "histogram": {"Cardiogenic shock": 1}}, {"batchcodes": ["34300BD"], "histogram": {"Off label use": 10, "Dyspnoea": 7, "Interchange of vaccine products": 6, "Drug ineffective": 5, "Immunisation": 5, "SARS-CoV-2 test": 5, "Body temperature": 4, "Dizziness": 4, "Loss of consciousness": 4, "Asthenia": 3, "COVID-19": 3, "Headache": 3, "Malaise": 3, "Pyrexia": 3, "Syncope": 3, "Asymptomatic COVID-19": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Cough": 2, "Depressed level of consciousness": 2, "Muscular weakness": 2, "Pruritus": 2, "Seizure": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute coronary syndrome": 1, "Arrhythmia": 1, "Cardiogenic shock": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cold sweat": 1, "Contusion": 1, "Decreased appetite": 1, "Dermatitis atopic": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dysarthria": 1, "Dyschezia": 1, "Ecchymosis": 1, "Faecaloma": 1, "Flushing": 1, "Hemiparesis": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Lymphadenopathy": 1, "Petechiae": 1, "Platelet count": 1, "Product use issue": 1, "Swelling face": 1, "Thrombocytopenia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "34300BD", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["055E21A", "34300BD"]}, {"histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}, "batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"]}, {"histogram": {"Cardiogenic shock": 1}, "batchcodes": ["34300BD", "ABC6894"]}, {"histogram": {"Off label use": 10, "Dyspnoea": 7, "Interchange of vaccine products": 6, "Drug ineffective": 5, "Immunisation": 5, "SARS-CoV-2 test": 5, "Body temperature": 4, "Dizziness": 4, "Loss of consciousness": 4, "Asthenia": 3, "COVID-19": 3, "Headache": 3, "Malaise": 3, "Pyrexia": 3, "Syncope": 3, "Asymptomatic COVID-19": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Cough": 2, "Depressed level of consciousness": 2, "Muscular weakness": 2, "Pruritus": 2, "Seizure": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Acute coronary syndrome": 1, "Arrhythmia": 1, "Cardiogenic shock": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Cold sweat": 1, "Contusion": 1, "Decreased appetite": 1, "Dermatitis atopic": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dysarthria": 1, "Dyschezia": 1, "Ecchymosis": 1, "Faecaloma": 1, "Flushing": 1, "Hemiparesis": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Lymphadenopathy": 1, "Petechiae": 1, "Platelet count": 1, "Product use issue": 1, "Swelling face": 1, "Thrombocytopenia": 1, "Urticaria": 1}, "batchcodes": ["34300BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/34300BO.json b/docs/data/histograms/Philippines/34300BO.json
index 751a498d174..db47b69fa25 100644
--- a/docs/data/histograms/Philippines/34300BO.json
+++ b/docs/data/histograms/Philippines/34300BO.json
@@ -1 +1 @@
-{"batchcode": "34300BO", "histograms": [{"batchcodes": ["34300BO"], "histogram": {"Flank pain": 1, "Musculoskeletal stiffness": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "34300BO", "histograms": [{"histogram": {"Flank pain": 1, "Musculoskeletal stiffness": 1, "Pallor": 1}, "batchcodes": ["34300BO"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/34300SD.json b/docs/data/histograms/Philippines/34300SD.json
index a666801c141..ea603b0bd99 100644
--- a/docs/data/histograms/Philippines/34300SD.json
+++ b/docs/data/histograms/Philippines/34300SD.json
@@ -1 +1 @@
-{"batchcode": "34300SD", "histograms": [{"batchcodes": ["34300SD"], "histogram": {"Abdominal pain": 1, "Anaphylactic reaction": 1, "Dyspnoea": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "34300SD", "histograms": [{"histogram": {"Abdominal pain": 1, "Anaphylactic reaction": 1, "Dyspnoea": 1, "Rash": 1}, "batchcodes": ["34300SD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/36021BD.json b/docs/data/histograms/Philippines/36021BD.json
index 324ee9104df..6ae1497d4e1 100644
--- a/docs/data/histograms/Philippines/36021BD.json
+++ b/docs/data/histograms/Philippines/36021BD.json
@@ -1 +1 @@
-{"batchcode": "36021BD", "histograms": [{"batchcodes": ["36021BD"], "histogram": {"Headache": 4, "Dyspnoea": 3, "Dizziness": 2, "Malaise": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Chromaturia": 1, "Contusion": 1, "Fatigue": 1, "Gingival bleeding": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Melaena": 1, "Nasopharyngitis": 1, "Platelet count": 1, "Rash": 1, "Skin discolouration": 1, "Thrombocytopenia": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "36021BD", "histograms": [{"histogram": {"Headache": 4, "Dyspnoea": 3, "Dizziness": 2, "Malaise": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Chromaturia": 1, "Contusion": 1, "Fatigue": 1, "Gingival bleeding": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Melaena": 1, "Nasopharyngitis": 1, "Platelet count": 1, "Rash": 1, "Skin discolouration": 1, "Thrombocytopenia": 1, "Wrong product administered": 1}, "batchcodes": ["36021BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/36022BD.json b/docs/data/histograms/Philippines/36022BD.json
index ede05f3a5bb..0a89df43c32 100644
--- a/docs/data/histograms/Philippines/36022BD.json
+++ b/docs/data/histograms/Philippines/36022BD.json
@@ -1 +1 @@
-{"batchcode": "36022BD", "histograms": [{"batchcodes": ["36022BD"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "36022BD", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["36022BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/36637TB.json b/docs/data/histograms/Philippines/36637TB.json
index f864b8656b7..41f6534b1be 100644
--- a/docs/data/histograms/Philippines/36637TB.json
+++ b/docs/data/histograms/Philippines/36637TB.json
@@ -1 +1 @@
-{"batchcode": "36637TB", "histograms": [{"batchcodes": ["36637TB"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Bradycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "36637TB", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Bradycardia": 1}, "batchcodes": ["36637TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/39300CD.json b/docs/data/histograms/Philippines/39300CD.json
index 59dc0cae2f9..dbc74ca2e60 100644
--- a/docs/data/histograms/Philippines/39300CD.json
+++ b/docs/data/histograms/Philippines/39300CD.json
@@ -1 +1 @@
-{"batchcode": "39300CD", "histograms": [{"batchcodes": ["39300CD"], "histogram": {"Cough": 1, "Nasopharyngitis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "39300CD", "histograms": [{"histogram": {"Cough": 1, "Nasopharyngitis": 1, "Pyrexia": 1}, "batchcodes": ["39300CD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/4004966.json b/docs/data/histograms/Philippines/4004966.json
index 0af35ad3c35..32664b1d408 100644
--- a/docs/data/histograms/Philippines/4004966.json
+++ b/docs/data/histograms/Philippines/4004966.json
@@ -1 +1 @@
-{"batchcode": "4004966", "histograms": [{"batchcodes": ["4004966"], "histogram": {"Diarrhoea": 1, "Nausea": 1, "Rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "4004966", "histograms": [{"histogram": {"Diarrhoea": 1, "Nausea": 1, "Rash": 1, "Vomiting": 1}, "batchcodes": ["4004966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/42.json b/docs/data/histograms/Philippines/42.json
index 7ad31fe4826..c07c8c72252 100644
--- a/docs/data/histograms/Philippines/42.json
+++ b/docs/data/histograms/Philippines/42.json
@@ -1 +1 @@
-{"batchcode": "42", "histograms": [{"batchcodes": ["42"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "42", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["42"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/43C21A.json b/docs/data/histograms/Philippines/43C21A.json
index 29a298bcbc9..cd6fea4eccd 100644
--- a/docs/data/histograms/Philippines/43C21A.json
+++ b/docs/data/histograms/Philippines/43C21A.json
@@ -1 +1 @@
-{"batchcode": "43C21A", "histograms": [{"batchcodes": ["43C21A"], "histogram": {"Cough": 1, "Nasopharyngitis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "43C21A", "histograms": [{"histogram": {"Cough": 1, "Nasopharyngitis": 1, "Pyrexia": 1}, "batchcodes": ["43C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/48104731.json b/docs/data/histograms/Philippines/48104731.json
index f97b097f64c..8c625341775 100644
--- a/docs/data/histograms/Philippines/48104731.json
+++ b/docs/data/histograms/Philippines/48104731.json
@@ -1 +1 @@
-{"batchcode": "48104731", "histograms": [{"batchcodes": ["210182", "210182", "48104731"], "histogram": {"End stage renal disease": 1}}]}
\ No newline at end of file
+{"batchcode": "48104731", "histograms": [{"histogram": {"End stage renal disease": 1}, "batchcodes": ["210182", "210182", "48104731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/52R808.json b/docs/data/histograms/Philippines/52R808.json
index 900e84a1189..4d0e29e2794 100644
--- a/docs/data/histograms/Philippines/52R808.json
+++ b/docs/data/histograms/Philippines/52R808.json
@@ -1 +1 @@
-{"batchcode": "52R808", "histograms": [{"batchcodes": ["52R808"], "histogram": {"Anaphylactic reaction": 3, "Dizziness": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Flushing": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Sneezing": 2, "Tachycardia": 2, "Wheezing": 2, "Chest discomfort": 1, "Dyspnoea": 1, "Syncope": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "52R808", "histograms": [{"histogram": {"Anaphylactic reaction": 3, "Dizziness": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Flushing": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Sneezing": 2, "Tachycardia": 2, "Wheezing": 2, "Chest discomfort": 1, "Dyspnoea": 1, "Syncope": 1, "Vital signs measurement": 1}, "batchcodes": ["52R808"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/54996.json b/docs/data/histograms/Philippines/54996.json
index c41a1a5a0d4..aecb20655e1 100644
--- a/docs/data/histograms/Philippines/54996.json
+++ b/docs/data/histograms/Philippines/54996.json
@@ -1 +1 @@
-{"batchcode": "54996", "histograms": [{"batchcodes": ["54996"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "54996", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["54996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/5501002.json b/docs/data/histograms/Philippines/5501002.json
index 454e1ea9f74..10e7b10b385 100644
--- a/docs/data/histograms/Philippines/5501002.json
+++ b/docs/data/histograms/Philippines/5501002.json
@@ -1 +1 @@
-{"batchcode": "5501002", "histograms": [{"batchcodes": ["5501002"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "5501002", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["5501002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/5501002/2100694.json b/docs/data/histograms/Philippines/5501002/2100694.json
index 6da0cc02fb9..566042c7445 100644
--- a/docs/data/histograms/Philippines/5501002/2100694.json
+++ b/docs/data/histograms/Philippines/5501002/2100694.json
@@ -1 +1 @@
-{"batchcode": "5501002/2100694", "histograms": [{"batchcodes": ["5501002/2100694"], "histogram": {"Blood pressure increased": 1, "Chest discomfort": 1, "Dizziness": 1, "Flushing": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "5501002/2100694", "histograms": [{"histogram": {"Blood pressure increased": 1, "Chest discomfort": 1, "Dizziness": 1, "Flushing": 1, "Palpitations": 1}, "batchcodes": ["5501002/2100694"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/5996.json b/docs/data/histograms/Philippines/5996.json
index 4a9ba34bbf2..fb4d508d165 100644
--- a/docs/data/histograms/Philippines/5996.json
+++ b/docs/data/histograms/Philippines/5996.json
@@ -1 +1 @@
-{"batchcode": "5996", "histograms": [{"batchcodes": ["5996"], "histogram": {"Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "5996", "histograms": [{"histogram": {"Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Hypoaesthesia": 1}, "batchcodes": ["5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/5J5973.json b/docs/data/histograms/Philippines/5J5973.json
index e2849339c58..78741c5aaf1 100644
--- a/docs/data/histograms/Philippines/5J5973.json
+++ b/docs/data/histograms/Philippines/5J5973.json
@@ -1 +1 @@
-{"batchcode": "5J5973", "histograms": [{"batchcodes": ["5J5973"], "histogram": {"Cough": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "5J5973", "histograms": [{"histogram": {"Cough": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["5J5973"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/6025018.json b/docs/data/histograms/Philippines/6025018.json
index d63c5d00b71..0ed0281564a 100644
--- a/docs/data/histograms/Philippines/6025018.json
+++ b/docs/data/histograms/Philippines/6025018.json
@@ -1 +1 @@
-{"batchcode": "6025018", "histograms": [{"batchcodes": ["6025018"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Pallor": 1, "Rash": 1, "Skin abrasion": 1}}]}
\ No newline at end of file
+{"batchcode": "6025018", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Pallor": 1, "Rash": 1, "Skin abrasion": 1}, "batchcodes": ["6025018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/621A.json b/docs/data/histograms/Philippines/621A.json
index d55fbd50151..888c6e914b0 100644
--- a/docs/data/histograms/Philippines/621A.json
+++ b/docs/data/histograms/Philippines/621A.json
@@ -1 +1 @@
-{"batchcode": "621A", "histograms": [{"batchcodes": ["621A"], "histogram": {"Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "621A", "histograms": [{"histogram": {"Pyrexia": 1, "Rash": 1}, "batchcodes": ["621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/6387.json b/docs/data/histograms/Philippines/6387.json
index 3648b26b2f5..919ad4f4417 100644
--- a/docs/data/histograms/Philippines/6387.json
+++ b/docs/data/histograms/Philippines/6387.json
@@ -1 +1 @@
-{"batchcode": "6387", "histograms": [{"batchcodes": ["6387"], "histogram": {"Abdominal pain upper": 1, "Abdominal tenderness": 1, "Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "6387", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Abdominal tenderness": 1, "Diarrhoea": 1}, "batchcodes": ["6387"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/728001.json b/docs/data/histograms/Philippines/728001.json
index 9a412ea4482..6078c531037 100644
--- a/docs/data/histograms/Philippines/728001.json
+++ b/docs/data/histograms/Philippines/728001.json
@@ -1 +1 @@
-{"batchcode": "728001", "histograms": [{"batchcodes": ["728001"], "histogram": {"Asthenia": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "728001", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1}, "batchcodes": ["728001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/813C219.json b/docs/data/histograms/Philippines/813C219.json
index f758316120e..32309fbc300 100644
--- a/docs/data/histograms/Philippines/813C219.json
+++ b/docs/data/histograms/Philippines/813C219.json
@@ -1 +1 @@
-{"batchcode": "813C219", "histograms": [{"batchcodes": ["813C219"], "histogram": {"Dizziness": 1, "Hypertensive urgency": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "813C219", "histograms": [{"histogram": {"Dizziness": 1, "Hypertensive urgency": 1, "Nausea": 1}, "batchcodes": ["813C219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/83360TB.json b/docs/data/histograms/Philippines/83360TB.json
index d5593cfcb87..3415e58a615 100644
--- a/docs/data/histograms/Philippines/83360TB.json
+++ b/docs/data/histograms/Philippines/83360TB.json
@@ -1 +1 @@
-{"batchcode": "83360TB", "histograms": [{"batchcodes": ["83360TB"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "83360TB", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["83360TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/8522E.json b/docs/data/histograms/Philippines/8522E.json
index 1bb5f6007d4..854de08972d 100644
--- a/docs/data/histograms/Philippines/8522E.json
+++ b/docs/data/histograms/Philippines/8522E.json
@@ -1 +1 @@
-{"batchcode": "8522E", "histograms": [{"batchcodes": ["8522E"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "8522E", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["8522E"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/92021-FD5996.json b/docs/data/histograms/Philippines/92021-FD5996.json
index 31b01831068..e942c82ccb7 100644
--- a/docs/data/histograms/Philippines/92021-FD5996.json
+++ b/docs/data/histograms/Philippines/92021-FD5996.json
@@ -1 +1 @@
-{"batchcode": "92021-FD5996", "histograms": [{"batchcodes": ["92021-FD5996"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "92021-FD5996", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["92021-FD5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/92990U.json b/docs/data/histograms/Philippines/92990U.json
index 82443231d07..187c25b4ea0 100644
--- a/docs/data/histograms/Philippines/92990U.json
+++ b/docs/data/histograms/Philippines/92990U.json
@@ -1 +1 @@
-{"batchcode": "92990U", "histograms": [{"batchcodes": ["92990U"], "histogram": {"Dyspnoea": 1, "Illness": 1, "Myocarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "92990U", "histograms": [{"histogram": {"Dyspnoea": 1, "Illness": 1, "Myocarditis": 1}, "batchcodes": ["92990U"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/939894.json b/docs/data/histograms/Philippines/939894.json
index 48e06ace7c9..c3af3183163 100644
--- a/docs/data/histograms/Philippines/939894.json
+++ b/docs/data/histograms/Philippines/939894.json
@@ -1 +1 @@
-{"batchcode": "939894", "histograms": [{"batchcodes": ["939894"], "histogram": {"Pyrexia": 5, "Dyspnoea": 4, "Body temperature": 3, "Cough": 3, "Dizziness": 3, "Myalgia": 3, "Syncope": 3, "Arthralgia": 2, "Chills": 2, "Death": 2, "Hypoaesthesia": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Acute coronary syndrome": 1, "Acute respiratory failure": 1, "Ageusia": 1, "Angina pectoris": 1, "Anosmia": 1, "Aphasia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Brain herniation": 1, "Breast pain": 1, "Cardiomegaly": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Eyelid rash": 1, "Fatigue": 1, "Gaze palsy": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hyperchlorhydria": 1, "Insomnia": 1, "Loss of consciousness": 1, "Malaise": 1, "Meningioma": 1, "Migraine": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Osteitis deformans": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "Unresponsive to stimuli": 1, "Vasogenic cerebral oedema": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "939894", "histograms": [{"histogram": {"Pyrexia": 5, "Dyspnoea": 4, "Body temperature": 3, "Cough": 3, "Dizziness": 3, "Myalgia": 3, "Syncope": 3, "Arthralgia": 2, "Chills": 2, "Death": 2, "Hypoaesthesia": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Acute coronary syndrome": 1, "Acute respiratory failure": 1, "Ageusia": 1, "Angina pectoris": 1, "Anosmia": 1, "Aphasia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Brain herniation": 1, "Breast pain": 1, "Cardiomegaly": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Eyelid rash": 1, "Fatigue": 1, "Gaze palsy": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hyperchlorhydria": 1, "Insomnia": 1, "Loss of consciousness": 1, "Malaise": 1, "Meningioma": 1, "Migraine": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Osteitis deformans": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "Unresponsive to stimuli": 1, "Vasogenic cerebral oedema": 1, "X-ray": 1}, "batchcodes": ["939894"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/939894/3004729.json b/docs/data/histograms/Philippines/939894/3004729.json
index 44316ce4b62..f72cf6f627d 100644
--- a/docs/data/histograms/Philippines/939894/3004729.json
+++ b/docs/data/histograms/Philippines/939894/3004729.json
@@ -1 +1 @@
-{"batchcode": "939894/3004729", "histograms": [{"batchcodes": ["939894/3004729"], "histogram": {"Abdominal pain upper": 1, "Appendicitis": 1, "Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "939894/3004729", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Appendicitis": 1, "Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}, "batchcodes": ["939894/3004729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/939900.json b/docs/data/histograms/Philippines/939900.json
index 5a65c6681ee..72cc18d0454 100644
--- a/docs/data/histograms/Philippines/939900.json
+++ b/docs/data/histograms/Philippines/939900.json
@@ -1 +1 @@
-{"batchcode": "939900", "histograms": [{"batchcodes": ["213C21A", "939900"], "histogram": {"Acute respiratory distress syndrome": 2, "Asthenia": 2, "Decreased appetite": 2, "Vision blurred": 2}}, {"batchcodes": ["939900"], "histogram": {"Death": 8, "Arthralgia": 4, "Cough": 4, "Dyspnoea": 4, "Pyrexia": 4, "Loss of consciousness": 3, "Malaise": 3, "Myalgia": 3, "Abdominal pain upper": 2, "Asthenia": 2, "Chills": 2, "Diarrhoea": 2, "Vomiting": 2, "Abdominal pain": 1, "Anosmia": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bradycardia": 1, "COVID-19": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Erythema": 1, "Headache": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Nasopharyngitis": 1, "Pain": 1, "Pneumonia": 1, "Pruritus": 1, "Rash": 1, "Seizure": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "939900", "histograms": [{"histogram": {"Acute respiratory distress syndrome": 2, "Asthenia": 2, "Decreased appetite": 2, "Vision blurred": 2}, "batchcodes": ["213C21A", "939900"]}, {"histogram": {"Death": 8, "Arthralgia": 4, "Cough": 4, "Dyspnoea": 4, "Pyrexia": 4, "Loss of consciousness": 3, "Malaise": 3, "Myalgia": 3, "Abdominal pain upper": 2, "Asthenia": 2, "Chills": 2, "Diarrhoea": 2, "Vomiting": 2, "Abdominal pain": 1, "Anosmia": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bradycardia": 1, "COVID-19": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Dizziness": 1, "Erythema": 1, "Headache": 1, "Hemiparesis": 1, "Hypersensitivity": 1, "Nasopharyngitis": 1, "Pain": 1, "Pneumonia": 1, "Pruritus": 1, "Rash": 1, "Seizure": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["939900"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/93990U.json b/docs/data/histograms/Philippines/93990U.json
index a1fd5540182..49e62663695 100644
--- a/docs/data/histograms/Philippines/93990U.json
+++ b/docs/data/histograms/Philippines/93990U.json
@@ -1 +1 @@
-{"batchcode": "93990U", "histograms": [{"batchcodes": ["93990U"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "93990U", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["93990U"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/939918.json b/docs/data/histograms/Philippines/939918.json
index 0d0b199e830..196ced36a7a 100644
--- a/docs/data/histograms/Philippines/939918.json
+++ b/docs/data/histograms/Philippines/939918.json
@@ -1 +1 @@
-{"batchcode": "939918", "histograms": [{"batchcodes": ["939918", "FD5996"], "histogram": {"Dysarthria": 1, "Hemiparesis": 1, "Pyrexia": 1}}, {"batchcodes": ["939918"], "histogram": {"Facial asymmetry": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "939918", "histograms": [{"histogram": {"Dysarthria": 1, "Hemiparesis": 1, "Pyrexia": 1}, "batchcodes": ["939918", "FD5996"]}, {"histogram": {"Facial asymmetry": 1, "Pyrexia": 1}, "batchcodes": ["939918"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/939984.json b/docs/data/histograms/Philippines/939984.json
index 9704c9d5485..11fa72058a5 100644
--- a/docs/data/histograms/Philippines/939984.json
+++ b/docs/data/histograms/Philippines/939984.json
@@ -1 +1 @@
-{"batchcode": "939984", "histograms": [{"batchcodes": ["939984"], "histogram": {"Chills": 2, "Dyspnoea": 2, "Ageusia": 1, "Aphasia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cough": 1, "Decreased appetite": 1, "Oxygen saturation": 1, "Polymerase chain reaction": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "939984", "histograms": [{"histogram": {"Chills": 2, "Dyspnoea": 2, "Ageusia": 1, "Aphasia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cough": 1, "Decreased appetite": 1, "Oxygen saturation": 1, "Polymerase chain reaction": 1, "Pyrexia": 1}, "batchcodes": ["939984"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/940067.json b/docs/data/histograms/Philippines/940067.json
index 2a68e990869..6da4f1d336f 100644
--- a/docs/data/histograms/Philippines/940067.json
+++ b/docs/data/histograms/Philippines/940067.json
@@ -1 +1 @@
-{"batchcode": "940067", "histograms": [{"batchcodes": ["940067", "C202105085", "C202105085"], "histogram": {"Swelling": 1}}, {"batchcodes": ["940067"], "histogram": {"Seizure": 2, "Dizziness": 1, "Dyspnoea": 1, "Flushing": 1, "Headache": 1, "Hyperhidrosis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "940067", "histograms": [{"histogram": {"Swelling": 1}, "batchcodes": ["940067", "C202105085", "C202105085"]}, {"histogram": {"Seizure": 2, "Dizziness": 1, "Dyspnoea": 1, "Flushing": 1, "Headache": 1, "Hyperhidrosis": 1, "Pyrexia": 1}, "batchcodes": ["940067"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/940667.json b/docs/data/histograms/Philippines/940667.json
index 20e43883751..c0f172ba7b2 100644
--- a/docs/data/histograms/Philippines/940667.json
+++ b/docs/data/histograms/Philippines/940667.json
@@ -1 +1 @@
-{"batchcode": "940667", "histograms": [{"batchcodes": ["940667"], "histogram": {"Cerebrovascular accident": 1}}]}
\ No newline at end of file
+{"batchcode": "940667", "histograms": [{"histogram": {"Cerebrovascular accident": 1}, "batchcodes": ["940667"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/986485.json b/docs/data/histograms/Philippines/986485.json
index dbb0be27ad5..ea7b5dd8558 100644
--- a/docs/data/histograms/Philippines/986485.json
+++ b/docs/data/histograms/Philippines/986485.json
@@ -1 +1 @@
-{"batchcode": "986485", "histograms": [{"batchcodes": ["986485"], "histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Sinus tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "986485", "histograms": [{"histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Sinus tachycardia": 1}, "batchcodes": ["986485"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A1026.json b/docs/data/histograms/Philippines/A1026.json
index 55a244305ca..030a96ceeac 100644
--- a/docs/data/histograms/Philippines/A1026.json
+++ b/docs/data/histograms/Philippines/A1026.json
@@ -1 +1 @@
-{"batchcode": "A1026", "histograms": [{"batchcodes": ["046G21A", "A1026"], "histogram": {"Acoustic stimulation tests": 1, "Foetal exposure during pregnancy": 1, "Heart rate variability test": 1, "Umbilical cord around neck": 1}}, {"batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "A1026", "histograms": [{"histogram": {"Acoustic stimulation tests": 1, "Foetal exposure during pregnancy": 1, "Heart rate variability test": 1, "Umbilical cord around neck": 1}, "batchcodes": ["046G21A", "A1026"]}, {"histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}, "batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A1054.json b/docs/data/histograms/Philippines/A1054.json
index 68f2578f8ef..bce87e59c61 100644
--- a/docs/data/histograms/Philippines/A1054.json
+++ b/docs/data/histograms/Philippines/A1054.json
@@ -1 +1 @@
-{"batchcode": "A1054", "histograms": [{"batchcodes": ["A1054"], "histogram": {"Cold sweat": 1, "Dizziness": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "A1054", "histograms": [{"histogram": {"Cold sweat": 1, "Dizziness": 1, "Loss of consciousness": 1}, "batchcodes": ["A1054"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A1065.json b/docs/data/histograms/Philippines/A1065.json
index aa514e2e4be..81861f24dae 100644
--- a/docs/data/histograms/Philippines/A1065.json
+++ b/docs/data/histograms/Philippines/A1065.json
@@ -1 +1 @@
-{"batchcode": "A1065", "histograms": [{"batchcodes": ["A1065", "KD02A"], "histogram": {"Chills": 1, "Decreased appetite": 1}}]}
\ No newline at end of file
+{"batchcode": "A1065", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1}, "batchcodes": ["A1065", "KD02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A1076.json b/docs/data/histograms/Philippines/A1076.json
index d517681dd33..e2411ad004e 100644
--- a/docs/data/histograms/Philippines/A1076.json
+++ b/docs/data/histograms/Philippines/A1076.json
@@ -1 +1 @@
-{"batchcode": "A1076", "histograms": [{"batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "A1076", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}, "batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A1115.json b/docs/data/histograms/Philippines/A1115.json
index 8ff4dc8fa0c..75086e42b15 100644
--- a/docs/data/histograms/Philippines/A1115.json
+++ b/docs/data/histograms/Philippines/A1115.json
@@ -1 +1 @@
-{"batchcode": "A1115", "histograms": [{"batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "A1115", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}, "batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A1140.json b/docs/data/histograms/Philippines/A1140.json
index 9fe597032aa..0d75cd758aa 100644
--- a/docs/data/histograms/Philippines/A1140.json
+++ b/docs/data/histograms/Philippines/A1140.json
@@ -1 +1 @@
-{"batchcode": "A1140", "histograms": [{"batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "A1140", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}, "batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A115.json b/docs/data/histograms/Philippines/A115.json
index 91976af6ebc..927a7064eb9 100644
--- a/docs/data/histograms/Philippines/A115.json
+++ b/docs/data/histograms/Philippines/A115.json
@@ -1 +1 @@
-{"batchcode": "A115", "histograms": [{"batchcodes": ["209C21A", "A115"], "histogram": {"Asthenia": 1, "Headache": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "A115", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Seizure": 1}, "batchcodes": ["209C21A", "A115"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A202500.json b/docs/data/histograms/Philippines/A202500.json
index e8a81afc84f..285ae7e9c06 100644
--- a/docs/data/histograms/Philippines/A202500.json
+++ b/docs/data/histograms/Philippines/A202500.json
@@ -1 +1 @@
-{"batchcode": "A202500", "histograms": [{"batchcodes": ["A202500"], "histogram": {"Inappropriate schedule of product administration": 1, "Oral mucosal scar": 1}}]}
\ No newline at end of file
+{"batchcode": "A202500", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Oral mucosal scar": 1}, "batchcodes": ["A202500"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A4DEY4834 / EY4.json b/docs/data/histograms/Philippines/A4DEY4834 / EY4.json
index ed0d16ce76d..25ee7dbd63d 100644
--- a/docs/data/histograms/Philippines/A4DEY4834 / EY4.json
+++ b/docs/data/histograms/Philippines/A4DEY4834 / EY4.json
@@ -1 +1 @@
-{"batchcode": "A4DEY4834 / EY4", "histograms": [{"batchcodes": ["A4DEY4834 / EY4"], "histogram": {"Death": 2}}]}
\ No newline at end of file
+{"batchcode": "A4DEY4834 / EY4", "histograms": [{"histogram": {"Death": 2}, "batchcodes": ["A4DEY4834 / EY4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/A93C221.json b/docs/data/histograms/Philippines/A93C221.json
index ecc361aec52..4a8c265bccf 100644
--- a/docs/data/histograms/Philippines/A93C221.json
+++ b/docs/data/histograms/Philippines/A93C221.json
@@ -1 +1 @@
-{"batchcode": "A93C221", "histograms": [{"batchcodes": ["A93C221"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "A93C221", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["A93C221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/AB7542.json b/docs/data/histograms/Philippines/AB7542.json
index bd30c06bf7a..54cfbfc9451 100644
--- a/docs/data/histograms/Philippines/AB7542.json
+++ b/docs/data/histograms/Philippines/AB7542.json
@@ -1 +1 @@
-{"batchcode": "AB7542", "histograms": [{"batchcodes": ["AB7542"], "histogram": {"Scrotal mass": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "AB7542", "histograms": [{"histogram": {"Scrotal mass": 1, "Vaccination site pain": 1}, "batchcodes": ["AB7542"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ABC6894.json b/docs/data/histograms/Philippines/ABC6894.json
index 2b62fd69be2..be9a44b792c 100644
--- a/docs/data/histograms/Philippines/ABC6894.json
+++ b/docs/data/histograms/Philippines/ABC6894.json
@@ -1 +1 @@
-{"batchcode": "ABC6894", "histograms": [{"batchcodes": ["34300BD", "ABC6894"], "histogram": {"Cardiogenic shock": 1}}]}
\ No newline at end of file
+{"batchcode": "ABC6894", "histograms": [{"histogram": {"Cardiogenic shock": 1}, "batchcodes": ["34300BD", "ABC6894"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ABV7279.json b/docs/data/histograms/Philippines/ABV7279.json
index 3859c60ba2f..e18efb9bcd6 100644
--- a/docs/data/histograms/Philippines/ABV7279.json
+++ b/docs/data/histograms/Philippines/ABV7279.json
@@ -1 +1 @@
-{"batchcode": "ABV7279", "histograms": [{"batchcodes": ["068F21A", "ABV7279", "CTMAV503"], "histogram": {"Abortion incomplete": 1}}]}
\ No newline at end of file
+{"batchcode": "ABV7279", "histograms": [{"histogram": {"Abortion incomplete": 1}, "batchcodes": ["068F21A", "ABV7279", "CTMAV503"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ABW 4731.json b/docs/data/histograms/Philippines/ABW 4731.json
index 23bcc19c0f5..15f1138f0c6 100644
--- a/docs/data/histograms/Philippines/ABW 4731.json
+++ b/docs/data/histograms/Philippines/ABW 4731.json
@@ -1 +1 @@
-{"batchcode": "ABW 4731", "histograms": [{"batchcodes": ["ABW 4731"], "histogram": {"Blood pressure measurement": 1, "Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "ABW 4731", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Hypertension": 1}, "batchcodes": ["ABW 4731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ABW4731.json b/docs/data/histograms/Philippines/ABW4731.json
index 2d9f2fe66ee..e611a7db66a 100644
--- a/docs/data/histograms/Philippines/ABW4731.json
+++ b/docs/data/histograms/Philippines/ABW4731.json
@@ -1 +1 @@
-{"batchcode": "ABW4731", "histograms": [{"batchcodes": ["210182", "ABW4731"], "histogram": {"Acute myocardial infarction": 1, "COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "ABW4731", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "COVID-19": 1}, "batchcodes": ["210182", "ABW4731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/AC133221.json b/docs/data/histograms/Philippines/AC133221.json
index c97966c4ea2..a536b92b6e2 100644
--- a/docs/data/histograms/Philippines/AC133221.json
+++ b/docs/data/histograms/Philippines/AC133221.json
@@ -1 +1 @@
-{"batchcode": "AC133221", "histograms": [{"batchcodes": ["AC133221"], "histogram": {"Chest pain": 2, "Abortion incomplete": 1, "Back pain": 1, "Exposure during pregnancy": 1, "Uterine dilation and curettage": 1}}]}
\ No newline at end of file
+{"batchcode": "AC133221", "histograms": [{"histogram": {"Chest pain": 2, "Abortion incomplete": 1, "Back pain": 1, "Exposure during pregnancy": 1, "Uterine dilation and curettage": 1}, "batchcodes": ["AC133221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB 1289.json b/docs/data/histograms/Philippines/ACB 1289.json
index 185656e3ca1..26c760bc302 100644
--- a/docs/data/histograms/Philippines/ACB 1289.json
+++ b/docs/data/histograms/Philippines/ACB 1289.json
@@ -1 +1 @@
-{"batchcode": "ACB 1289", "histograms": [{"batchcodes": ["ACB 1289"], "histogram": {"Hypoaesthesia": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB 1289", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Vaccination site reaction": 1}, "batchcodes": ["ACB 1289"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB 3221.json b/docs/data/histograms/Philippines/ACB 3221.json
index 37c37535b52..1403c65d849 100644
--- a/docs/data/histograms/Philippines/ACB 3221.json
+++ b/docs/data/histograms/Philippines/ACB 3221.json
@@ -1 +1 @@
-{"batchcode": "ACB 3221", "histograms": [{"batchcodes": ["ACB 3221"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Febrile convulsion": 1, "Nausea": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB 3221", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Febrile convulsion": 1, "Nausea": 1, "Syncope": 1}, "batchcodes": ["ACB 3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB 3321.json b/docs/data/histograms/Philippines/ACB 3321.json
index d5ddd8f941c..8f08263f56f 100644
--- a/docs/data/histograms/Philippines/ACB 3321.json
+++ b/docs/data/histograms/Philippines/ACB 3321.json
@@ -1 +1 @@
-{"batchcode": "ACB 3321", "histograms": [{"batchcodes": ["ACB 3321"], "histogram": {"Malaise": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB 3321", "histograms": [{"histogram": {"Malaise": 1, "Syncope": 1}, "batchcodes": ["ACB 3321"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB 75 42.json b/docs/data/histograms/Philippines/ACB 75 42.json
index 75fc5b8eec3..160707bda8b 100644
--- a/docs/data/histograms/Philippines/ACB 75 42.json
+++ b/docs/data/histograms/Philippines/ACB 75 42.json
@@ -1 +1 @@
-{"batchcode": "ACB 75 42", "histograms": [{"batchcodes": ["ACB 75 42"], "histogram": {"Dizziness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB 75 42", "histograms": [{"histogram": {"Dizziness": 1, "Syncope": 1}, "batchcodes": ["ACB 75 42"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB 7542.json b/docs/data/histograms/Philippines/ACB 7542.json
index 5be21e24632..0f106e83ab7 100644
--- a/docs/data/histograms/Philippines/ACB 7542.json
+++ b/docs/data/histograms/Philippines/ACB 7542.json
@@ -1 +1 @@
-{"batchcode": "ACB 7542", "histograms": [{"batchcodes": ["ACB 7542"], "histogram": {"Dyspnoea": 1, "Haemoptysis": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB 7542", "histograms": [{"histogram": {"Dyspnoea": 1, "Haemoptysis": 1, "Peripheral swelling": 1}, "batchcodes": ["ACB 7542"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB 8221.json b/docs/data/histograms/Philippines/ACB 8221.json
index dd5978b3dc2..fcdec8e0fcf 100644
--- a/docs/data/histograms/Philippines/ACB 8221.json
+++ b/docs/data/histograms/Philippines/ACB 8221.json
@@ -1 +1 @@
-{"batchcode": "ACB 8221", "histograms": [{"batchcodes": ["ACB 8221"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB 8221", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["ACB 8221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB023.json b/docs/data/histograms/Philippines/ACB023.json
index 97185d30cbc..39b1ca40f66 100644
--- a/docs/data/histograms/Philippines/ACB023.json
+++ b/docs/data/histograms/Philippines/ACB023.json
@@ -1 +1 @@
-{"batchcode": "ACB023", "histograms": [{"batchcodes": ["ACB023"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB023", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["ACB023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB0239.json b/docs/data/histograms/Philippines/ACB0239.json
index 77e547f9fb3..ce660a8cd92 100644
--- a/docs/data/histograms/Philippines/ACB0239.json
+++ b/docs/data/histograms/Philippines/ACB0239.json
@@ -1 +1 @@
-{"batchcode": "ACB0239", "histograms": [{"batchcodes": ["ACB0239"], "histogram": {"Syncope": 8, "Malaise": 2}}]}
\ No newline at end of file
+{"batchcode": "ACB0239", "histograms": [{"histogram": {"Syncope": 8, "Malaise": 2}, "batchcodes": ["ACB0239"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB0542.json b/docs/data/histograms/Philippines/ACB0542.json
index 73ad3af3de1..c62f9a919f1 100644
--- a/docs/data/histograms/Philippines/ACB0542.json
+++ b/docs/data/histograms/Philippines/ACB0542.json
@@ -1 +1 @@
-{"batchcode": "ACB0542", "histograms": [{"batchcodes": ["ACB0542"], "histogram": {"Asthenia": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB0542", "histograms": [{"histogram": {"Asthenia": 1}, "batchcodes": ["ACB0542"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB1289.json b/docs/data/histograms/Philippines/ACB1289.json
index 1f03181ecc2..66874f4439b 100644
--- a/docs/data/histograms/Philippines/ACB1289.json
+++ b/docs/data/histograms/Philippines/ACB1289.json
@@ -1 +1 @@
-{"batchcode": "ACB1289", "histograms": [{"batchcodes": ["ACB1289"], "histogram": {"Syncope": 5, "Dyspnoea": 2, "Ascites": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "Conjunctival haemorrhage": 1, "Conjunctival pallor": 1, "Death": 1, "Exposure during pregnancy": 1, "Folate deficiency": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Illness": 1, "Macroglossia": 1, "Oxygen saturation": 1, "Palpitations": 1, "Platelet count": 1, "Pulmonary oedema": 1, "Respiratory rate": 1, "Scleroderma": 1, "Systemic lupus erythematosus": 1, "Urinary tract infection": 1, "Vital signs measurement": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB1289", "histograms": [{"histogram": {"Syncope": 5, "Dyspnoea": 2, "Ascites": 1, "Blood creatinine": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "Conjunctival haemorrhage": 1, "Conjunctival pallor": 1, "Death": 1, "Exposure during pregnancy": 1, "Folate deficiency": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Illness": 1, "Macroglossia": 1, "Oxygen saturation": 1, "Palpitations": 1, "Platelet count": 1, "Pulmonary oedema": 1, "Respiratory rate": 1, "Scleroderma": 1, "Systemic lupus erythematosus": 1, "Urinary tract infection": 1, "Vital signs measurement": 1, "White blood cell count": 1}, "batchcodes": ["ACB1289"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB221.json b/docs/data/histograms/Philippines/ACB221.json
index 4ed17ca0f59..6d289354082 100644
--- a/docs/data/histograms/Philippines/ACB221.json
+++ b/docs/data/histograms/Philippines/ACB221.json
@@ -1 +1 @@
-{"batchcode": "ACB221", "histograms": [{"batchcodes": ["ACB221"], "histogram": {"Asthenia": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB221", "histograms": [{"histogram": {"Asthenia": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["ACB221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB3202.json b/docs/data/histograms/Philippines/ACB3202.json
index c66d304cce1..44e26c71474 100644
--- a/docs/data/histograms/Philippines/ACB3202.json
+++ b/docs/data/histograms/Philippines/ACB3202.json
@@ -1 +1 @@
-{"batchcode": "ACB3202", "histograms": [{"batchcodes": ["ACB3202"], "histogram": {"Depressed level of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB3202", "histograms": [{"histogram": {"Depressed level of consciousness": 1}, "batchcodes": ["ACB3202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB32121.json b/docs/data/histograms/Philippines/ACB32121.json
index e1df57fc167..6cdb307e2ac 100644
--- a/docs/data/histograms/Philippines/ACB32121.json
+++ b/docs/data/histograms/Philippines/ACB32121.json
@@ -1 +1 @@
-{"batchcode": "ACB32121", "histograms": [{"batchcodes": ["ACB32121"], "histogram": {"Abdominal discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB32121", "histograms": [{"histogram": {"Abdominal discomfort": 1}, "batchcodes": ["ACB32121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB3221.json b/docs/data/histograms/Philippines/ACB3221.json
index 7c70b13616b..97982fa4f1e 100644
--- a/docs/data/histograms/Philippines/ACB3221.json
+++ b/docs/data/histograms/Philippines/ACB3221.json
@@ -1 +1 @@
-{"batchcode": "ACB3221", "histograms": [{"batchcodes": ["008H21A", "ACB3221"], "histogram": {"Chest pain": 2, "Dyspnoea": 2}}, {"batchcodes": ["ACB3221", "FM2966"], "histogram": {"Vaccination site pain": 1}}, {"batchcodes": ["ACB3221", "PCB0018"], "histogram": {"Hypoaesthesia": 1}}, {"batchcodes": ["ACB3221"], "histogram": {"Dizziness": 14, "Syncope": 9, "Loss of consciousness": 8, "Vaccination site pain": 8, "Vomiting": 7, "Asthenia": 6, "Cough": 5, "Abdominal pain": 4, "Abdominal pain upper": 4, "Blood pressure increased": 4, "Blood pressure measurement": 4, "Dysarthria": 4, "Dyspnoea": 3, "Exposure during pregnancy": 3, "Pyrexia": 3, "Abdominal pain lower": 2, "Back pain": 2, "Facial paresis": 2, "Haematemesis": 2, "Hypoaesthesia": 2, "Labour pain": 2, "Malaise": 2, "Memory impairment": 2, "Blood glucose": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Cellulitis": 1, "Chest discomfort": 1, "Chest pain": 1, "Confusional state": 1, "Continuous glucose monitoring": 1, "Death": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diabetic foot": 1, "Diarrhoea": 1, "Disorientation": 1, "Electrocardiogram": 1, "Femur fracture": 1, "Flank pain": 1, "Gaze palsy": 1, "Haemoptysis": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperthyroidism": 1, "Hypovolaemic shock": 1, "Mass": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pallor": 1, "Peptic ulcer haemorrhage": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Somnolence": 1, "Troponin I": 1, "Unresponsive to stimuli": 1, "Upper limb fracture": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB3221", "histograms": [{"histogram": {"Chest pain": 2, "Dyspnoea": 2}, "batchcodes": ["008H21A", "ACB3221"]}, {"histogram": {"Vaccination site pain": 1}, "batchcodes": ["ACB3221", "FM2966"]}, {"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["ACB3221", "PCB0018"]}, {"histogram": {"Dizziness": 14, "Syncope": 9, "Loss of consciousness": 8, "Vaccination site pain": 8, "Vomiting": 7, "Asthenia": 6, "Cough": 5, "Abdominal pain": 4, "Abdominal pain upper": 4, "Blood pressure increased": 4, "Blood pressure measurement": 4, "Dysarthria": 4, "Dyspnoea": 3, "Exposure during pregnancy": 3, "Pyrexia": 3, "Abdominal pain lower": 2, "Back pain": 2, "Facial paresis": 2, "Haematemesis": 2, "Hypoaesthesia": 2, "Labour pain": 2, "Malaise": 2, "Memory impairment": 2, "Blood glucose": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Cellulitis": 1, "Chest discomfort": 1, "Chest pain": 1, "Confusional state": 1, "Continuous glucose monitoring": 1, "Death": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diabetic foot": 1, "Diarrhoea": 1, "Disorientation": 1, "Electrocardiogram": 1, "Femur fracture": 1, "Flank pain": 1, "Gaze palsy": 1, "Haemoptysis": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperthyroidism": 1, "Hypovolaemic shock": 1, "Mass": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pallor": 1, "Peptic ulcer haemorrhage": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Somnolence": 1, "Troponin I": 1, "Unresponsive to stimuli": 1, "Upper limb fracture": 1}, "batchcodes": ["ACB3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB32221.json b/docs/data/histograms/Philippines/ACB32221.json
index 515eeba182a..7b633d132cf 100644
--- a/docs/data/histograms/Philippines/ACB32221.json
+++ b/docs/data/histograms/Philippines/ACB32221.json
@@ -1 +1 @@
-{"batchcode": "ACB32221", "histograms": [{"batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB32221", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Malaise": 1}, "batchcodes": ["34300BD", "A1026", "A1076", "A1115", "A1140", "ACB32221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB323.json b/docs/data/histograms/Philippines/ACB323.json
index d5fbfe8c860..d4064f53d7a 100644
--- a/docs/data/histograms/Philippines/ACB323.json
+++ b/docs/data/histograms/Philippines/ACB323.json
@@ -1 +1 @@
-{"batchcode": "ACB323", "histograms": [{"batchcodes": ["ACB323"], "histogram": {"Asthenia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB323", "histograms": [{"histogram": {"Asthenia": 1, "Vaccination site pain": 1}, "batchcodes": ["ACB323"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB3231.json b/docs/data/histograms/Philippines/ACB3231.json
index 4b5fc7b0af2..3f9e0c109f0 100644
--- a/docs/data/histograms/Philippines/ACB3231.json
+++ b/docs/data/histograms/Philippines/ACB3231.json
@@ -1 +1 @@
-{"batchcode": "ACB3231", "histograms": [{"batchcodes": ["ACB3231"], "histogram": {"Skin mass": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB3231", "histograms": [{"histogram": {"Skin mass": 1}, "batchcodes": ["ACB3231"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB324.json b/docs/data/histograms/Philippines/ACB324.json
index ddf2e1b3472..b6756c85e0d 100644
--- a/docs/data/histograms/Philippines/ACB324.json
+++ b/docs/data/histograms/Philippines/ACB324.json
@@ -1 +1 @@
-{"batchcode": "ACB324", "histograms": [{"batchcodes": ["ACB324"], "histogram": {"Back pain": 2, "Vaccination site pain": 2, "Exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB324", "histograms": [{"histogram": {"Back pain": 2, "Vaccination site pain": 2, "Exposure during pregnancy": 1}, "batchcodes": ["ACB324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB3331.json b/docs/data/histograms/Philippines/ACB3331.json
index 5b5ae6e4cd5..655560937a2 100644
--- a/docs/data/histograms/Philippines/ACB3331.json
+++ b/docs/data/histograms/Philippines/ACB3331.json
@@ -1 +1 @@
-{"batchcode": "ACB3331", "histograms": [{"batchcodes": ["ACB3331"], "histogram": {"COVID-19": 1, "Death": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB3331", "histograms": [{"histogram": {"COVID-19": 1, "Death": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ACB3331"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB3340.json b/docs/data/histograms/Philippines/ACB3340.json
index e8e36459ec8..e945b0b7bba 100644
--- a/docs/data/histograms/Philippines/ACB3340.json
+++ b/docs/data/histograms/Philippines/ACB3340.json
@@ -1 +1 @@
-{"batchcode": "ACB3340", "histograms": [{"batchcodes": ["20213C21A", "ACB3340"], "histogram": {"Death": 1}}, {"batchcodes": ["ACB3340"], "histogram": {"Back pain": 1, "Exposure during pregnancy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB3340", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["20213C21A", "ACB3340"]}, {"histogram": {"Back pain": 1, "Exposure during pregnancy": 1, "Vaccination site pain": 1}, "batchcodes": ["ACB3340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB6894.json b/docs/data/histograms/Philippines/ACB6894.json
index 2703d89c790..ab5bb874296 100644
--- a/docs/data/histograms/Philippines/ACB6894.json
+++ b/docs/data/histograms/Philippines/ACB6894.json
@@ -1 +1 @@
-{"batchcode": "ACB6894", "histograms": [{"batchcodes": ["ACB6894"], "histogram": {"Pyrexia": 4, "Dizziness": 3, "Syncope": 3, "Acoustic stimulation tests": 2, "Foetal exposure during pregnancy": 2, "Loss of consciousness": 2, "Acoustic stimulation tests abnormal": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Cold sweat": 1, "Cough": 1, "Death": 1, "Delirium": 1, "Exposure during pregnancy": 1, "Fall": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Meconium stain": 1, "Neonatal infection": 1, "Pain in extremity": 1, "Pallor": 1, "SARS-CoV-2 test": 1, "Sepsis neonatal": 1, "Somnolence": 1, "Tunnel vision": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB6894", "histograms": [{"histogram": {"Pyrexia": 4, "Dizziness": 3, "Syncope": 3, "Acoustic stimulation tests": 2, "Foetal exposure during pregnancy": 2, "Loss of consciousness": 2, "Acoustic stimulation tests abnormal": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Cold sweat": 1, "Cough": 1, "Death": 1, "Delirium": 1, "Exposure during pregnancy": 1, "Fall": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Meconium stain": 1, "Neonatal infection": 1, "Pain in extremity": 1, "Pallor": 1, "SARS-CoV-2 test": 1, "Sepsis neonatal": 1, "Somnolence": 1, "Tunnel vision": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["ACB6894"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB742.json b/docs/data/histograms/Philippines/ACB742.json
index b2c169a5e25..5443e597740 100644
--- a/docs/data/histograms/Philippines/ACB742.json
+++ b/docs/data/histograms/Philippines/ACB742.json
@@ -1 +1 @@
-{"batchcode": "ACB742", "histograms": [{"batchcodes": ["ACB742"], "histogram": {"Abdominal pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB742", "histograms": [{"histogram": {"Abdominal pain": 1, "Vaccination site pain": 1}, "batchcodes": ["ACB742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB7524.json b/docs/data/histograms/Philippines/ACB7524.json
index edbc1ee1304..69ecfca52b5 100644
--- a/docs/data/histograms/Philippines/ACB7524.json
+++ b/docs/data/histograms/Philippines/ACB7524.json
@@ -1 +1 @@
-{"batchcode": "ACB7524", "histograms": [{"batchcodes": ["ACB7524"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB7524", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["ACB7524"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB7542.json b/docs/data/histograms/Philippines/ACB7542.json
index 668d31baf8d..2b823e3233a 100644
--- a/docs/data/histograms/Philippines/ACB7542.json
+++ b/docs/data/histograms/Philippines/ACB7542.json
@@ -1 +1 @@
-{"batchcode": "ACB7542", "histograms": [{"batchcodes": ["ACB7542"], "histogram": {"Vaccination site pain": 8, "Cough": 6, "Back pain": 5, "Headache": 5, "Loss of consciousness": 5, "Dizziness": 4, "Dyspnoea": 4, "Exposure during pregnancy": 4, "Chills": 3, "Pyrexia": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Asthenia": 2, "Chest pain": 2, "Fatigue": 2, "Labour pain": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Angina pectoris": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Breast mass": 1, "Cold sweat": 1, "Colostomy": 1, "Diarrhoea": 1, "Face oedema": 1, "Flank pain": 1, "Haematemesis": 1, "Haematochezia": 1, "Hypertension": 1, "Nasopharyngitis": 1, "Pain": 1, "Seizure": 1, "Type 2 diabetes mellitus": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB7542", "histograms": [{"histogram": {"Vaccination site pain": 8, "Cough": 6, "Back pain": 5, "Headache": 5, "Loss of consciousness": 5, "Dizziness": 4, "Dyspnoea": 4, "Exposure during pregnancy": 4, "Chills": 3, "Pyrexia": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Asthenia": 2, "Chest pain": 2, "Fatigue": 2, "Labour pain": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Angina pectoris": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Breast mass": 1, "Cold sweat": 1, "Colostomy": 1, "Diarrhoea": 1, "Face oedema": 1, "Flank pain": 1, "Haematemesis": 1, "Haematochezia": 1, "Hypertension": 1, "Nasopharyngitis": 1, "Pain": 1, "Seizure": 1, "Type 2 diabetes mellitus": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["ACB7542"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACB75R.json b/docs/data/histograms/Philippines/ACB75R.json
index 6319503d80a..ef916e4258c 100644
--- a/docs/data/histograms/Philippines/ACB75R.json
+++ b/docs/data/histograms/Philippines/ACB75R.json
@@ -1 +1 @@
-{"batchcode": "ACB75R", "histograms": [{"batchcodes": ["ACB75R"], "histogram": {"Loss of consciousness": 1, "Septic shock": 1}}]}
\ No newline at end of file
+{"batchcode": "ACB75R", "histograms": [{"histogram": {"Loss of consciousness": 1, "Septic shock": 1}, "batchcodes": ["ACB75R"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACBG894.json b/docs/data/histograms/Philippines/ACBG894.json
index 3283c81a806..51923ca72f4 100644
--- a/docs/data/histograms/Philippines/ACBG894.json
+++ b/docs/data/histograms/Philippines/ACBG894.json
@@ -1 +1 @@
-{"batchcode": "ACBG894", "histograms": [{"batchcodes": ["ACBG894"], "histogram": {"Diabetes mellitus": 1, "Hypertension": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ACBG894", "histograms": [{"histogram": {"Diabetes mellitus": 1, "Hypertension": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}, "batchcodes": ["ACBG894"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACC0092.json b/docs/data/histograms/Philippines/ACC0092.json
index daa041fb210..f6aef9f020d 100644
--- a/docs/data/histograms/Philippines/ACC0092.json
+++ b/docs/data/histograms/Philippines/ACC0092.json
@@ -1 +1 @@
-{"batchcode": "ACC0092", "histograms": [{"batchcodes": ["ACC0092"], "histogram": {"Headache": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ACC0092", "histograms": [{"histogram": {"Headache": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Vomiting": 1}, "batchcodes": ["ACC0092"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACC1392.json b/docs/data/histograms/Philippines/ACC1392.json
index c06af2920d0..555623a8cdd 100644
--- a/docs/data/histograms/Philippines/ACC1392.json
+++ b/docs/data/histograms/Philippines/ACC1392.json
@@ -1 +1 @@
-{"batchcode": "ACC1392", "histograms": [{"batchcodes": ["ACC1392"], "histogram": {"Aerophobia": 1, "Animal scratch": 1, "Hydrophobia": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "ACC1392", "histograms": [{"histogram": {"Aerophobia": 1, "Animal scratch": 1, "Hydrophobia": 1, "Hypoaesthesia": 1}, "batchcodes": ["ACC1392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACD3221.json b/docs/data/histograms/Philippines/ACD3221.json
index 00e7d559a5f..83d0943da5b 100644
--- a/docs/data/histograms/Philippines/ACD3221.json
+++ b/docs/data/histograms/Philippines/ACD3221.json
@@ -1 +1 @@
-{"batchcode": "ACD3221", "histograms": [{"batchcodes": ["ACD3221"], "histogram": {"Joint dislocation": 1}}]}
\ No newline at end of file
+{"batchcode": "ACD3221", "histograms": [{"histogram": {"Joint dislocation": 1}, "batchcodes": ["ACD3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACG3221.json b/docs/data/histograms/Philippines/ACG3221.json
index 21bb7f284da..7c22d16fed4 100644
--- a/docs/data/histograms/Philippines/ACG3221.json
+++ b/docs/data/histograms/Philippines/ACG3221.json
@@ -1 +1 @@
-{"batchcode": "ACG3221", "histograms": [{"batchcodes": ["ACG3221"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "ACG3221", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["ACG3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACQ3221.json b/docs/data/histograms/Philippines/ACQ3221.json
index 9ea50f89a2a..39dbdbd457f 100644
--- a/docs/data/histograms/Philippines/ACQ3221.json
+++ b/docs/data/histograms/Philippines/ACQ3221.json
@@ -1 +1 @@
-{"batchcode": "ACQ3221", "histograms": [{"batchcodes": ["ACQ3221"], "histogram": {"Adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "ACQ3221", "histograms": [{"histogram": {"Adverse event": 1}, "batchcodes": ["ACQ3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ACT3221.json b/docs/data/histograms/Philippines/ACT3221.json
index 05492b053c4..889cf909017 100644
--- a/docs/data/histograms/Philippines/ACT3221.json
+++ b/docs/data/histograms/Philippines/ACT3221.json
@@ -1 +1 @@
-{"batchcode": "ACT3221", "histograms": [{"batchcodes": ["ACT3221"], "histogram": {"Dyspnoea": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "ACT3221", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1}, "batchcodes": ["ACT3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ALB3221.json b/docs/data/histograms/Philippines/ALB3221.json
index e0e1c235955..e5551fdc0c4 100644
--- a/docs/data/histograms/Philippines/ALB3221.json
+++ b/docs/data/histograms/Philippines/ALB3221.json
@@ -1 +1 @@
-{"batchcode": "ALB3221", "histograms": [{"batchcodes": ["ALB3221"], "histogram": {"Arthralgia": 1, "Cerebral venous sinus thrombosis": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ALB3221", "histograms": [{"histogram": {"Arthralgia": 1, "Cerebral venous sinus thrombosis": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1}, "batchcodes": ["ALB3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ALB6894.json b/docs/data/histograms/Philippines/ALB6894.json
index dfbb70d7484..d5562573286 100644
--- a/docs/data/histograms/Philippines/ALB6894.json
+++ b/docs/data/histograms/Philippines/ALB6894.json
@@ -1 +1 @@
-{"batchcode": "ALB6894", "histograms": [{"batchcodes": ["ALB6894"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "ALB6894", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["ALB6894"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ALB7542.json b/docs/data/histograms/Philippines/ALB7542.json
index 7a567fe6331..e6b475ad2de 100644
--- a/docs/data/histograms/Philippines/ALB7542.json
+++ b/docs/data/histograms/Philippines/ALB7542.json
@@ -1 +1 @@
-{"batchcode": "ALB7542", "histograms": [{"batchcodes": ["ALB7542"], "histogram": {"Vaccination site pain": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "ALB7542", "histograms": [{"histogram": {"Vaccination site pain": 1, "Wound": 1}, "batchcodes": ["ALB7542"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/AW25.json b/docs/data/histograms/Philippines/AW25.json
index ac9f3215547..47f080d82bf 100644
--- a/docs/data/histograms/Philippines/AW25.json
+++ b/docs/data/histograms/Philippines/AW25.json
@@ -1 +1 @@
-{"batchcode": "AW25", "histograms": [{"batchcodes": ["AW25"], "histogram": {"Hernia": 1, "Inguinal mass": 1}}]}
\ No newline at end of file
+{"batchcode": "AW25", "histograms": [{"histogram": {"Hernia": 1, "Inguinal mass": 1}, "batchcodes": ["AW25"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/AZB3221.json b/docs/data/histograms/Philippines/AZB3221.json
index 5dfa15dc4e5..a39def3c7f9 100644
--- a/docs/data/histograms/Philippines/AZB3221.json
+++ b/docs/data/histograms/Philippines/AZB3221.json
@@ -1 +1 @@
-{"batchcode": "AZB3221", "histograms": [{"batchcodes": ["AZB3221"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "AZB3221", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["AZB3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/B#21210502#205.json b/docs/data/histograms/Philippines/B#21210502#205.json
index 61436fb7c63..c3c39b0340b 100644
--- a/docs/data/histograms/Philippines/B#21210502#205.json
+++ b/docs/data/histograms/Philippines/B#21210502#205.json
@@ -1 +1 @@
-{"batchcode": "B#21210502#205", "histograms": [{"batchcodes": ["B#21210502#205"], "histogram": {"Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "B#21210502#205", "histograms": [{"histogram": {"Hypertension": 1}, "batchcodes": ["B#21210502#205"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/B10608D.json b/docs/data/histograms/Philippines/B10608D.json
index 7019f951ea3..d908527c9f2 100644
--- a/docs/data/histograms/Philippines/B10608D.json
+++ b/docs/data/histograms/Philippines/B10608D.json
@@ -1 +1 @@
-{"batchcode": "B10608D", "histograms": [{"batchcodes": ["B10608D"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "B10608D", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Vaccination site pain": 1}, "batchcodes": ["B10608D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/B1060BD.json b/docs/data/histograms/Philippines/B1060BD.json
index e8d00ef28b1..cd5b24f4c6b 100644
--- a/docs/data/histograms/Philippines/B1060BD.json
+++ b/docs/data/histograms/Philippines/B1060BD.json
@@ -1 +1 @@
-{"batchcode": "B1060BD", "histograms": [{"batchcodes": ["B1060BD"], "histogram": {"Asthenia": 1, "Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "B1060BD", "histograms": [{"histogram": {"Asthenia": 1, "Cough": 1, "Dyspnoea": 1}, "batchcodes": ["B1060BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/B2021BD.json b/docs/data/histograms/Philippines/B2021BD.json
index 99ffb9dfa8e..3d8343d9b73 100644
--- a/docs/data/histograms/Philippines/B2021BD.json
+++ b/docs/data/histograms/Philippines/B2021BD.json
@@ -1 +1 @@
-{"batchcode": "B2021BD", "histograms": [{"batchcodes": ["B2021BD"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "B2021BD", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Dizziness": 1}, "batchcodes": ["B2021BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/B2025880.json b/docs/data/histograms/Philippines/B2025880.json
index f422c325afc..c5ff7fdf3ba 100644
--- a/docs/data/histograms/Philippines/B2025880.json
+++ b/docs/data/histograms/Philippines/B2025880.json
@@ -1 +1 @@
-{"batchcode": "B2025880", "histograms": [{"batchcodes": ["B2025880"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "B2025880", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["B2025880"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/B2025BD.json b/docs/data/histograms/Philippines/B2025BD.json
index 0ef897844e8..2a23cfe1780 100644
--- a/docs/data/histograms/Philippines/B2025BD.json
+++ b/docs/data/histograms/Philippines/B2025BD.json
@@ -1 +1 @@
-{"batchcode": "B2025BD", "histograms": [{"batchcodes": ["B2025BD"], "histogram": {"Abdominal pain": 1, "Anaemia": 1, "Fatigue": 1, "Peptic ulcer": 1, "Upper gastrointestinal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "B2025BD", "histograms": [{"histogram": {"Abdominal pain": 1, "Anaemia": 1, "Fatigue": 1, "Peptic ulcer": 1, "Upper gastrointestinal haemorrhage": 1}, "batchcodes": ["B2025BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/B2125817.json b/docs/data/histograms/Philippines/B2125817.json
index 939464af173..afc06dff02b 100644
--- a/docs/data/histograms/Philippines/B2125817.json
+++ b/docs/data/histograms/Philippines/B2125817.json
@@ -1 +1 @@
-{"batchcode": "B2125817", "histograms": [{"batchcodes": ["B2125817"], "histogram": {"Chills": 1, "Cirrhosis alcoholic": 1, "Headache": 1, "Hepatic encephalopathy": 1, "Hepatic mass": 1, "Malaise": 1, "Pneumonia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "B2125817", "histograms": [{"histogram": {"Chills": 1, "Cirrhosis alcoholic": 1, "Headache": 1, "Hepatic encephalopathy": 1, "Hepatic mass": 1, "Malaise": 1, "Pneumonia": 1, "Pyrexia": 1}, "batchcodes": ["B2125817"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/BATCH 1 23C21A.json b/docs/data/histograms/Philippines/BATCH 1 23C21A.json
index edfd2adab17..e9a2b3c4099 100644
--- a/docs/data/histograms/Philippines/BATCH 1 23C21A.json
+++ b/docs/data/histograms/Philippines/BATCH 1 23C21A.json
@@ -1 +1 @@
-{"batchcode": "BATCH 1 23C21A", "histograms": [{"batchcodes": ["BATCH 1 23C21A"], "histogram": {"Bradycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "BATCH 1 23C21A", "histograms": [{"histogram": {"Bradycardia": 1}, "batchcodes": ["BATCH 1 23C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/BATCH 10, 32021.json b/docs/data/histograms/Philippines/BATCH 10, 32021.json
index f06ed756746..5358e5634b2 100644
--- a/docs/data/histograms/Philippines/BATCH 10, 32021.json
+++ b/docs/data/histograms/Philippines/BATCH 10, 32021.json
@@ -1 +1 @@
-{"batchcode": "BATCH 10, 32021", "histograms": [{"batchcodes": ["BATCH 10, 32021"], "histogram": {"Asthenia": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "BATCH 10, 32021", "histograms": [{"histogram": {"Asthenia": 1, "Loss of consciousness": 1}, "batchcodes": ["BATCH 10, 32021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/BCB0019.json b/docs/data/histograms/Philippines/BCB0019.json
index d3dea48759c..0eedcebd403 100644
--- a/docs/data/histograms/Philippines/BCB0019.json
+++ b/docs/data/histograms/Philippines/BCB0019.json
@@ -1 +1 @@
-{"batchcode": "BCB0019", "histograms": [{"batchcodes": ["BCB0019"], "histogram": {"Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "BCB0019", "histograms": [{"histogram": {"Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1}, "batchcodes": ["BCB0019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C13C21A.json b/docs/data/histograms/Philippines/C13C21A.json
index 7c3527ffb7b..5f8606f577c 100644
--- a/docs/data/histograms/Philippines/C13C21A.json
+++ b/docs/data/histograms/Philippines/C13C21A.json
@@ -1 +1 @@
-{"batchcode": "C13C21A", "histograms": [{"batchcodes": ["C13C21A"], "histogram": {"COVID-19": 1, "Cough": 1, "Pyrexia": 1, "Rhinitis": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "C13C21A", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Pyrexia": 1, "Rhinitis": 1, "Vaccination failure": 1}, "batchcodes": ["C13C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202104058.json b/docs/data/histograms/Philippines/C202104058.json
index ac9c9440e32..d80b768304d 100644
--- a/docs/data/histograms/Philippines/C202104058.json
+++ b/docs/data/histograms/Philippines/C202104058.json
@@ -1 +1 @@
-{"batchcode": "C202104058", "histograms": [{"batchcodes": ["068F21A", "C202104058"], "histogram": {"Diabetes mellitus": 1, "Electrolyte imbalance": 1, "Hypertension": 1, "Nephrolithiasis": 1}}]}
\ No newline at end of file
+{"batchcode": "C202104058", "histograms": [{"histogram": {"Diabetes mellitus": 1, "Electrolyte imbalance": 1, "Hypertension": 1, "Nephrolithiasis": 1}, "batchcodes": ["068F21A", "C202104058"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202105063.json b/docs/data/histograms/Philippines/C202105063.json
index c2437d66d18..4674035a9c4 100644
--- a/docs/data/histograms/Philippines/C202105063.json
+++ b/docs/data/histograms/Philippines/C202105063.json
@@ -1 +1 @@
-{"batchcode": "C202105063", "histograms": [{"batchcodes": ["C202105063"], "histogram": {"Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "C202105063", "histograms": [{"histogram": {"Vaginal haemorrhage": 1}, "batchcodes": ["C202105063"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202105084.json b/docs/data/histograms/Philippines/C202105084.json
index cd81421b7cb..e40ccac48c1 100644
--- a/docs/data/histograms/Philippines/C202105084.json
+++ b/docs/data/histograms/Philippines/C202105084.json
@@ -1 +1 @@
-{"batchcode": "C202105084", "histograms": [{"batchcodes": ["2100680", "C202105084", "J202106033"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "C202105084", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["2100680", "C202105084", "J202106033"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202105085.json b/docs/data/histograms/Philippines/C202105085.json
index accd76f88e0..1d73350898c 100644
--- a/docs/data/histograms/Philippines/C202105085.json
+++ b/docs/data/histograms/Philippines/C202105085.json
@@ -1 +1 @@
-{"batchcode": "C202105085", "histograms": [{"batchcodes": ["940067", "C202105085", "C202105085"], "histogram": {"Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "C202105085", "histograms": [{"histogram": {"Swelling": 1}, "batchcodes": ["940067", "C202105085", "C202105085"]}, {"histogram": {"Swelling": 1}, "batchcodes": ["940067", "C202105085", "C202105085"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202105093.json b/docs/data/histograms/Philippines/C202105093.json
index fba8b0236e2..14633a6b1aa 100644
--- a/docs/data/histograms/Philippines/C202105093.json
+++ b/docs/data/histograms/Philippines/C202105093.json
@@ -1 +1 @@
-{"batchcode": "C202105093", "histograms": [{"batchcodes": ["068F21A", "C202105093", "L202106033"], "histogram": {"Hypoaesthesia": 1}}, {"batchcodes": ["C202105093", "L202106033"], "histogram": {"Haemorrhage": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "C202105093", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["068F21A", "C202105093", "L202106033"]}, {"histogram": {"Haemorrhage": 1, "Vaccination site pain": 1}, "batchcodes": ["C202105093", "L202106033"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202108162.json b/docs/data/histograms/Philippines/C202108162.json
index 60cc2874068..f9bec44e9f9 100644
--- a/docs/data/histograms/Philippines/C202108162.json
+++ b/docs/data/histograms/Philippines/C202108162.json
@@ -1 +1 @@
-{"batchcode": "C202108162", "histograms": [{"batchcodes": ["C202108162"], "histogram": {"Blood pressure increased": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "C202108162", "histograms": [{"histogram": {"Blood pressure increased": 1, "Headache": 1}, "batchcodes": ["C202108162"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202108170.json b/docs/data/histograms/Philippines/C202108170.json
index e062f8cd354..afbaf4e9b0b 100644
--- a/docs/data/histograms/Philippines/C202108170.json
+++ b/docs/data/histograms/Philippines/C202108170.json
@@ -1 +1 @@
-{"batchcode": "C202108170", "histograms": [{"batchcodes": ["C202108170"], "histogram": {"Dyspnoea": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "C202108170", "histograms": [{"histogram": {"Dyspnoea": 1, "Syncope": 1}, "batchcodes": ["C202108170"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202109123.json b/docs/data/histograms/Philippines/C202109123.json
index 4faf23c369b..cd96806524e 100644
--- a/docs/data/histograms/Philippines/C202109123.json
+++ b/docs/data/histograms/Philippines/C202109123.json
@@ -1 +1 @@
-{"batchcode": "C202109123", "histograms": [{"batchcodes": ["000104A", "C202109123", "C202109123"], "histogram": {"Dyspnoea": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "C202109123", "histograms": [{"histogram": {"Dyspnoea": 1, "Rash": 1}, "batchcodes": ["000104A", "C202109123", "C202109123"]}, {"histogram": {"Dyspnoea": 1, "Rash": 1}, "batchcodes": ["000104A", "C202109123", "C202109123"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202109177.json b/docs/data/histograms/Philippines/C202109177.json
index d5f38821500..ef8876592a2 100644
--- a/docs/data/histograms/Philippines/C202109177.json
+++ b/docs/data/histograms/Philippines/C202109177.json
@@ -1 +1 @@
-{"batchcode": "C202109177", "histograms": [{"batchcodes": ["002K21A", "C202109177", "J202107048"], "histogram": {"Vomiting": 1}}, {"batchcodes": ["C202109177"], "histogram": {"Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "C202109177", "histograms": [{"histogram": {"Vomiting": 1}, "batchcodes": ["002K21A", "C202109177", "J202107048"]}, {"histogram": {"Vomiting": 1}, "batchcodes": ["C202109177"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202109179.json b/docs/data/histograms/Philippines/C202109179.json
index d81df55d5a9..cf57679964a 100644
--- a/docs/data/histograms/Philippines/C202109179.json
+++ b/docs/data/histograms/Philippines/C202109179.json
@@ -1 +1 @@
-{"batchcode": "C202109179", "histograms": [{"batchcodes": ["C202109179"], "histogram": {"Haemoptysis": 1}}]}
\ No newline at end of file
+{"batchcode": "C202109179", "histograms": [{"histogram": {"Haemoptysis": 1}, "batchcodes": ["C202109179"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C202109190.json b/docs/data/histograms/Philippines/C202109190.json
index 0822221d1e1..aab5ac1dd21 100644
--- a/docs/data/histograms/Philippines/C202109190.json
+++ b/docs/data/histograms/Philippines/C202109190.json
@@ -1 +1 @@
-{"batchcode": "C202109190", "histograms": [{"batchcodes": ["C202109190"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "C202109190", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["C202109190"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/C21A.json b/docs/data/histograms/Philippines/C21A.json
index 29a6e503c75..7ae59cb20bd 100644
--- a/docs/data/histograms/Philippines/C21A.json
+++ b/docs/data/histograms/Philippines/C21A.json
@@ -1 +1 @@
-{"batchcode": "C21A", "histograms": [{"batchcodes": ["C21A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "C21A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/CB003142.json b/docs/data/histograms/Philippines/CB003142.json
index 61342013e1c..67b4179f391 100644
--- a/docs/data/histograms/Philippines/CB003142.json
+++ b/docs/data/histograms/Philippines/CB003142.json
@@ -1 +1 @@
-{"batchcode": "CB003142", "histograms": [{"batchcodes": ["CB003142"], "histogram": {"Abdominal pain": 1, "Abdominal pain lower": 1, "Cholelithiasis": 1}}]}
\ No newline at end of file
+{"batchcode": "CB003142", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain lower": 1, "Cholelithiasis": 1}, "batchcodes": ["CB003142"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/CH4752.json b/docs/data/histograms/Philippines/CH4752.json
index 7ac3ad2c01f..df8bdcb42e4 100644
--- a/docs/data/histograms/Philippines/CH4752.json
+++ b/docs/data/histograms/Philippines/CH4752.json
@@ -1 +1 @@
-{"batchcode": "CH4752", "histograms": [{"batchcodes": ["CH4752"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "CH4752", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["CH4752"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/CT MAY 5155.json b/docs/data/histograms/Philippines/CT MAY 5155.json
index addf3ba434b..abeb39a481e 100644
--- a/docs/data/histograms/Philippines/CT MAY 5155.json
+++ b/docs/data/histograms/Philippines/CT MAY 5155.json
@@ -1 +1 @@
-{"batchcode": "CT MAY 5155", "histograms": [{"batchcodes": ["CT MAY 5155"], "histogram": {"Blood pressure increased": 1, "Cellulitis": 1, "Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "CT MAY 5155", "histograms": [{"histogram": {"Blood pressure increased": 1, "Cellulitis": 1, "Chest pain": 1}, "batchcodes": ["CT MAY 5155"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/CTMAV503.json b/docs/data/histograms/Philippines/CTMAV503.json
index 41d05b57062..b8f10f13ae4 100644
--- a/docs/data/histograms/Philippines/CTMAV503.json
+++ b/docs/data/histograms/Philippines/CTMAV503.json
@@ -1 +1 @@
-{"batchcode": "CTMAV503", "histograms": [{"batchcodes": ["068F21A", "ABV7279", "CTMAV503"], "histogram": {"Abortion incomplete": 1}}]}
\ No newline at end of file
+{"batchcode": "CTMAV503", "histograms": [{"histogram": {"Abortion incomplete": 1}, "batchcodes": ["068F21A", "ABV7279", "CTMAV503"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/D17K21A.json b/docs/data/histograms/Philippines/D17K21A.json
index 49430edb1a2..d007dbdc24a 100644
--- a/docs/data/histograms/Philippines/D17K21A.json
+++ b/docs/data/histograms/Philippines/D17K21A.json
@@ -1 +1 @@
-{"batchcode": "D17K21A", "histograms": [{"batchcodes": ["209C21A", "D17K21A", "FM7375"], "histogram": {"Depressed level of consciousness": 1}}, {"batchcodes": ["209C21A", "D17K21A"], "histogram": {"Depressed level of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "D17K21A", "histograms": [{"histogram": {"Depressed level of consciousness": 1}, "batchcodes": ["209C21A", "D17K21A", "FM7375"]}, {"histogram": {"Depressed level of consciousness": 1}, "batchcodes": ["209C21A", "D17K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/D65324.json b/docs/data/histograms/Philippines/D65324.json
index 78b696128b4..85315a38e67 100644
--- a/docs/data/histograms/Philippines/D65324.json
+++ b/docs/data/histograms/Philippines/D65324.json
@@ -1 +1 @@
-{"batchcode": "D65324", "histograms": [{"batchcodes": ["D65324"], "histogram": {"Gallbladder polyp": 1}}]}
\ No newline at end of file
+{"batchcode": "D65324", "histograms": [{"histogram": {"Gallbladder polyp": 1}, "batchcodes": ["D65324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/D83F21B.json b/docs/data/histograms/Philippines/D83F21B.json
index 8cb8382ffdc..5fc79cb415e 100644
--- a/docs/data/histograms/Philippines/D83F21B.json
+++ b/docs/data/histograms/Philippines/D83F21B.json
@@ -1 +1 @@
-{"batchcode": "D83F21B", "histograms": [{"batchcodes": ["D83F21B"], "histogram": {"COVID-19": 1, "Cough": 1, "Fatigue": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "D83F21B", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Fatigue": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["D83F21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/DCB0002.json b/docs/data/histograms/Philippines/DCB0002.json
index f67f48e3bb1..f3069987e3d 100644
--- a/docs/data/histograms/Philippines/DCB0002.json
+++ b/docs/data/histograms/Philippines/DCB0002.json
@@ -1 +1 @@
-{"batchcode": "DCB0002", "histograms": [{"batchcodes": ["DCB0002"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "DCB0002", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1}, "batchcodes": ["DCB0002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ED5996.json b/docs/data/histograms/Philippines/ED5996.json
index 413dd6e95c3..7479430ce2c 100644
--- a/docs/data/histograms/Philippines/ED5996.json
+++ b/docs/data/histograms/Philippines/ED5996.json
@@ -1 +1 @@
-{"batchcode": "ED5996", "histograms": [{"batchcodes": ["ED5996"], "histogram": {"Abdominal pain": 1, "Dizziness": 1, "Headache": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ED5996", "histograms": [{"histogram": {"Abdominal pain": 1, "Dizziness": 1, "Headache": 1, "Vomiting": 1}, "batchcodes": ["ED5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EI8760.json b/docs/data/histograms/Philippines/EI8760.json
index bcc3110fbef..049fc04d68e 100644
--- a/docs/data/histograms/Philippines/EI8760.json
+++ b/docs/data/histograms/Philippines/EI8760.json
@@ -1 +1 @@
-{"batchcode": "EI8760", "histograms": [{"batchcodes": ["EI8760"], "histogram": {"Abdominal pain": 1, "Dehydration": 1, "Diarrhoea": 1, "Gastritis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EI8760", "histograms": [{"histogram": {"Abdominal pain": 1, "Dehydration": 1, "Diarrhoea": 1, "Gastritis": 1, "Vomiting": 1}, "batchcodes": ["EI8760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EJ0553.json b/docs/data/histograms/Philippines/EJ0553.json
index 453a0d82329..587aeff1e46 100644
--- a/docs/data/histograms/Philippines/EJ0553.json
+++ b/docs/data/histograms/Philippines/EJ0553.json
@@ -1 +1 @@
-{"batchcode": "EJ0553", "histograms": [{"batchcodes": ["EJ0553"], "histogram": {"Pancreatitis acute": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ0553", "histograms": [{"histogram": {"Pancreatitis acute": 1}, "batchcodes": ["EJ0553"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EK4237.json b/docs/data/histograms/Philippines/EK4237.json
index f3504d1a102..a8dc5df183e 100644
--- a/docs/data/histograms/Philippines/EK4237.json
+++ b/docs/data/histograms/Philippines/EK4237.json
@@ -1 +1 @@
-{"batchcode": "EK4237", "histograms": [{"batchcodes": ["EK4237"], "histogram": {"Gestational diabetes": 1, "Labour pain": 1, "Maternal exposure before pregnancy": 1, "Pre-eclampsia": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4237", "histograms": [{"histogram": {"Gestational diabetes": 1, "Labour pain": 1, "Maternal exposure before pregnancy": 1, "Pre-eclampsia": 1}, "batchcodes": ["EK4237"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EK4241.json b/docs/data/histograms/Philippines/EK4241.json
index 53a9103bd30..35f2ba15620 100644
--- a/docs/data/histograms/Philippines/EK4241.json
+++ b/docs/data/histograms/Philippines/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"Acute coronary syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"Acute coronary syndrome": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EK8737.json b/docs/data/histograms/Philippines/EK8737.json
index 0c61fa4bd3a..aca313c30b3 100644
--- a/docs/data/histograms/Philippines/EK8737.json
+++ b/docs/data/histograms/Philippines/EK8737.json
@@ -1 +1 @@
-{"batchcode": "EK8737", "histograms": [{"batchcodes": ["EK8737"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "EK8737", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["EK8737"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EL0092.json b/docs/data/histograms/Philippines/EL0092.json
index 4ea954631ee..c3ea6727921 100644
--- a/docs/data/histograms/Philippines/EL0092.json
+++ b/docs/data/histograms/Philippines/EL0092.json
@@ -1 +1 @@
-{"batchcode": "EL0092", "histograms": [{"batchcodes": ["EL0092"], "histogram": {"Maternal exposure timing unspecified": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0092", "histograms": [{"histogram": {"Maternal exposure timing unspecified": 1, "Myalgia": 1}, "batchcodes": ["EL0092"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EL9263.json b/docs/data/histograms/Philippines/EL9263.json
index 9423bab3415..d1759d35ac1 100644
--- a/docs/data/histograms/Philippines/EL9263.json
+++ b/docs/data/histograms/Philippines/EL9263.json
@@ -1 +1 @@
-{"batchcode": "EL9263", "histograms": [{"batchcodes": ["EL9263"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9263", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["EL9263"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ENG204.json b/docs/data/histograms/Philippines/ENG204.json
index 723db7fd69b..c8bfda33253 100644
--- a/docs/data/histograms/Philippines/ENG204.json
+++ b/docs/data/histograms/Philippines/ENG204.json
@@ -1 +1 @@
-{"batchcode": "ENG204", "histograms": [{"batchcodes": ["ENG204"], "histogram": {"Asthenia": 2, "Dyspnoea": 2}}]}
\ No newline at end of file
+{"batchcode": "ENG204", "histograms": [{"histogram": {"Asthenia": 2, "Dyspnoea": 2}, "batchcodes": ["ENG204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/ER8392.json b/docs/data/histograms/Philippines/ER8392.json
index 811337afc9b..6c0778e8432 100644
--- a/docs/data/histograms/Philippines/ER8392.json
+++ b/docs/data/histograms/Philippines/ER8392.json
@@ -1 +1 @@
-{"batchcode": "ER8392", "histograms": [{"batchcodes": ["ER8392"], "histogram": {"Dizziness": 1, "Headache": 1, "Hyperacusis": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8392", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Hyperacusis": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["ER8392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EV4834.json b/docs/data/histograms/Philippines/EV4834.json
index bd7a14f46dd..7cc942ca690 100644
--- a/docs/data/histograms/Philippines/EV4834.json
+++ b/docs/data/histograms/Philippines/EV4834.json
@@ -1 +1 @@
-{"batchcode": "EV4834", "histograms": [{"batchcodes": ["EV4834"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EV4834", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Pyrexia": 1}, "batchcodes": ["EV4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EW0158.json b/docs/data/histograms/Philippines/EW0158.json
index fcc9753940c..8b27cce19a6 100644
--- a/docs/data/histograms/Philippines/EW0158.json
+++ b/docs/data/histograms/Philippines/EW0158.json
@@ -1 +1 @@
-{"batchcode": "EW0158", "histograms": [{"batchcodes": ["EW0158"], "histogram": {"Chills": 1, "Cough": 1, "Diarrhoea": 1, "Pneumonia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0158", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Diarrhoea": 1, "Pneumonia": 1, "Pyrexia": 1}, "batchcodes": ["EW0158"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EW0162.json b/docs/data/histograms/Philippines/EW0162.json
index 5cbbaf00983..1db58925060 100644
--- a/docs/data/histograms/Philippines/EW0162.json
+++ b/docs/data/histograms/Philippines/EW0162.json
@@ -1 +1 @@
-{"batchcode": "EW0162", "histograms": [{"batchcodes": ["EW0162"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0162", "histograms": [{"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["EW0162"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EX2625.json b/docs/data/histograms/Philippines/EX2625.json
index 758406725c4..cdb478925c9 100644
--- a/docs/data/histograms/Philippines/EX2625.json
+++ b/docs/data/histograms/Philippines/EX2625.json
@@ -1 +1 @@
-{"batchcode": "EX2625", "histograms": [{"batchcodes": ["EX2625"], "histogram": {"Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EX2625", "histograms": [{"histogram": {"Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["EX2625"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EY 4834.json b/docs/data/histograms/Philippines/EY 4834.json
index d21a77e878e..81c366a5433 100644
--- a/docs/data/histograms/Philippines/EY 4834.json
+++ b/docs/data/histograms/Philippines/EY 4834.json
@@ -1 +1 @@
-{"batchcode": "EY 4834", "histograms": [{"batchcodes": ["EY 4834"], "histogram": {"Hypoaesthesia": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "EY 4834", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Loss of consciousness": 1}, "batchcodes": ["EY 4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EY4834.json b/docs/data/histograms/Philippines/EY4834.json
index 576b85ce0f4..a6f224c9349 100644
--- a/docs/data/histograms/Philippines/EY4834.json
+++ b/docs/data/histograms/Philippines/EY4834.json
@@ -1 +1 @@
-{"batchcode": "EY4834", "histograms": [{"batchcodes": ["EY4834"], "histogram": {"Blood pressure measurement": 10, "COVID-19": 9, "Drug ineffective": 8, "Dyspnoea": 7, "Pyrexia": 6, "Blood pressure increased": 5, "Cough": 5, "Diarrhoea": 4, "SARS-CoV-2 test": 4, "Chest pain": 3, "Electrocardiogram": 3, "Hypertension": 3, "Nasopharyngitis": 3, "Syncope": 3, "Vaccination site pain": 3, "Body temperature": 2, "Decreased appetite": 2, "Dizziness": 2, "Dysarthria": 2, "Fall": 2, "Hypotension": 2, "Polymerase chain reaction": 2, "Tachypnoea": 2, "Vaccination failure": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute kidney injury": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Bell's palsy": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Chronic kidney disease": 1, "Chronic myeloid leukaemia": 1, "Conjunctivitis bacterial": 1, "Corticosteroid binding globulin test": 1, "Dysuria": 1, "Electrocardiogram T wave inversion": 1, "Headache": 1, "Hemiparesis": 1, "Hypersomnia": 1, "Hypertensive crisis": 1, "Hypokalaemia": 1, "Lethargy": 1, "Loss of consciousness": 1, "Peptic ulcer": 1, "Pneumonia pneumococcal": 1, "SARS-CoV-2 test positive": 1, "Suspected COVID-19": 1, "Troponin I": 1, "Urinary tract infection": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4834", "histograms": [{"histogram": {"Blood pressure measurement": 10, "COVID-19": 9, "Drug ineffective": 8, "Dyspnoea": 7, "Pyrexia": 6, "Blood pressure increased": 5, "Cough": 5, "Diarrhoea": 4, "SARS-CoV-2 test": 4, "Chest pain": 3, "Electrocardiogram": 3, "Hypertension": 3, "Nasopharyngitis": 3, "Syncope": 3, "Vaccination site pain": 3, "Body temperature": 2, "Decreased appetite": 2, "Dizziness": 2, "Dysarthria": 2, "Fall": 2, "Hypotension": 2, "Polymerase chain reaction": 2, "Tachypnoea": 2, "Vaccination failure": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute kidney injury": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Bell's palsy": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Chronic kidney disease": 1, "Chronic myeloid leukaemia": 1, "Conjunctivitis bacterial": 1, "Corticosteroid binding globulin test": 1, "Dysuria": 1, "Electrocardiogram T wave inversion": 1, "Headache": 1, "Hemiparesis": 1, "Hypersomnia": 1, "Hypertensive crisis": 1, "Hypokalaemia": 1, "Lethargy": 1, "Loss of consciousness": 1, "Peptic ulcer": 1, "Pneumonia pneumococcal": 1, "SARS-CoV-2 test positive": 1, "Suspected COVID-19": 1, "Troponin I": 1, "Urinary tract infection": 1, "Vomiting": 1}, "batchcodes": ["EY4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EY4834/PAAW599.json b/docs/data/histograms/Philippines/EY4834/PAAW599.json
index b46a5ee9f16..039537e0339 100644
--- a/docs/data/histograms/Philippines/EY4834/PAAW599.json
+++ b/docs/data/histograms/Philippines/EY4834/PAAW599.json
@@ -1 +1 @@
-{"batchcode": "EY4834/PAAW599", "histograms": [{"batchcodes": ["EY4834/PAAW599"], "histogram": {"COVID-19": 1, "Cardiac arrest": 1, "Drug ineffective": 1, "Renal failure": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4834/PAAW599", "histograms": [{"histogram": {"COVID-19": 1, "Cardiac arrest": 1, "Drug ineffective": 1, "Renal failure": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EY4834/PAAW599"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EY4835.json b/docs/data/histograms/Philippines/EY4835.json
index 62222889d3c..d17c7fce04f 100644
--- a/docs/data/histograms/Philippines/EY4835.json
+++ b/docs/data/histograms/Philippines/EY4835.json
@@ -1 +1 @@
-{"batchcode": "EY4835", "histograms": [{"batchcodes": ["EY4835"], "histogram": {"Hypertensive urgency": 2, "Abdominal pain": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure measurement": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4835", "histograms": [{"histogram": {"Hypertensive urgency": 2, "Abdominal pain": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure measurement": 1, "Fatigue": 1, "Headache": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["EY4835"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EY834.json b/docs/data/histograms/Philippines/EY834.json
index 8b405d7cdb9..afacd0183a4 100644
--- a/docs/data/histograms/Philippines/EY834.json
+++ b/docs/data/histograms/Philippines/EY834.json
@@ -1 +1 @@
-{"batchcode": "EY834", "histograms": [{"batchcodes": ["EY834"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Hyperthyroidism": 1}}]}
\ No newline at end of file
+{"batchcode": "EY834", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Hyperthyroidism": 1}, "batchcodes": ["EY834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/EYY834.json b/docs/data/histograms/Philippines/EYY834.json
index 808f1970d47..ca5470ad5b1 100644
--- a/docs/data/histograms/Philippines/EYY834.json
+++ b/docs/data/histograms/Philippines/EYY834.json
@@ -1 +1 @@
-{"batchcode": "EYY834", "histograms": [{"batchcodes": ["EYY834"], "histogram": {"Arthralgia": 1, "Bone pain": 1, "Gaze palsy": 1, "Musculoskeletal stiffness": 1, "Seizure": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EYY834", "histograms": [{"histogram": {"Arthralgia": 1, "Bone pain": 1, "Gaze palsy": 1, "Musculoskeletal stiffness": 1, "Seizure": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["EYY834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F00350.json b/docs/data/histograms/Philippines/F00350.json
index f3f95f68de4..2b514d306d1 100644
--- a/docs/data/histograms/Philippines/F00350.json
+++ b/docs/data/histograms/Philippines/F00350.json
@@ -1 +1 @@
-{"batchcode": "F00350", "histograms": [{"batchcodes": ["F00350"], "histogram": {"Activated partial thromboplastin time shortened": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Blood calcium": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dysarthria": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Influenza like illness": 1, "Investigation": 1, "Magnetic resonance imaging head": 1, "Physical examination": 1, "Pyrexia": 1, "Urine analysis": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "F00350", "histograms": [{"histogram": {"Activated partial thromboplastin time shortened": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Blood calcium": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dysarthria": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Influenza like illness": 1, "Investigation": 1, "Magnetic resonance imaging head": 1, "Physical examination": 1, "Pyrexia": 1, "Urine analysis": 1, "Vital signs measurement": 1}, "batchcodes": ["F00350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F05726.json b/docs/data/histograms/Philippines/F05726.json
index 8c186bf5e33..7ad622d4020 100644
--- a/docs/data/histograms/Philippines/F05726.json
+++ b/docs/data/histograms/Philippines/F05726.json
@@ -1 +1 @@
-{"batchcode": "F05726", "histograms": [{"batchcodes": ["F05726"], "histogram": {"Depressed level of consciousness": 1, "Subarachnoid haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "F05726", "histograms": [{"histogram": {"Depressed level of consciousness": 1, "Subarachnoid haemorrhage": 1}, "batchcodes": ["F05726"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F05996.json b/docs/data/histograms/Philippines/F05996.json
index bd5448a8a53..e27844cc29c 100644
--- a/docs/data/histograms/Philippines/F05996.json
+++ b/docs/data/histograms/Philippines/F05996.json
@@ -1 +1 @@
-{"batchcode": "F05996", "histograms": [{"batchcodes": ["F05996"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Melaena": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "F05996", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Melaena": 1, "Pyrexia": 1}, "batchcodes": ["F05996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F1025A.json b/docs/data/histograms/Philippines/F1025A.json
index 181110265bc..121724c4ee7 100644
--- a/docs/data/histograms/Philippines/F1025A.json
+++ b/docs/data/histograms/Philippines/F1025A.json
@@ -1 +1 @@
-{"batchcode": "F1025A", "histograms": [{"batchcodes": ["F1025A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "F1025A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["F1025A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F1035A.json b/docs/data/histograms/Philippines/F1035A.json
index b4d17ae5e73..f3bd6d60e4c 100644
--- a/docs/data/histograms/Philippines/F1035A.json
+++ b/docs/data/histograms/Philippines/F1035A.json
@@ -1 +1 @@
-{"batchcode": "F1035A", "histograms": [{"batchcodes": ["F1035A"], "histogram": {"Cough": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "F1035A", "histograms": [{"histogram": {"Cough": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["F1035A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F105324.json b/docs/data/histograms/Philippines/F105324.json
index 9d4a3ba040d..23cdbdb38f2 100644
--- a/docs/data/histograms/Philippines/F105324.json
+++ b/docs/data/histograms/Philippines/F105324.json
@@ -1 +1 @@
-{"batchcode": "F105324", "histograms": [{"batchcodes": ["F105324"], "histogram": {"Chest pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "F105324", "histograms": [{"histogram": {"Chest pain": 1, "Vaccination site pain": 1}, "batchcodes": ["F105324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F11060.json b/docs/data/histograms/Philippines/F11060.json
index 52617f633cf..ae5a0a4d0d5 100644
--- a/docs/data/histograms/Philippines/F11060.json
+++ b/docs/data/histograms/Philippines/F11060.json
@@ -1 +1 @@
-{"batchcode": "F11060", "histograms": [{"batchcodes": ["F11060"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "F11060", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["F11060"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F118773.json b/docs/data/histograms/Philippines/F118773.json
index a74f0b13d40..240845901cf 100644
--- a/docs/data/histograms/Philippines/F118773.json
+++ b/docs/data/histograms/Philippines/F118773.json
@@ -1 +1 @@
-{"batchcode": "F118773", "histograms": [{"batchcodes": ["F118773"], "histogram": {"Dengue virus test positive": 1, "Diarrhoea": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "F118773", "histograms": [{"histogram": {"Dengue virus test positive": 1, "Diarrhoea": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["F118773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F15324.json b/docs/data/histograms/Philippines/F15324.json
index dd2be08f519..bff0928b6cf 100644
--- a/docs/data/histograms/Philippines/F15324.json
+++ b/docs/data/histograms/Philippines/F15324.json
@@ -1 +1 @@
-{"batchcode": "F15324", "histograms": [{"batchcodes": ["F15324"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Death": 1, "Fracture": 1, "Gait disturbance": 1, "Heart rate": 1, "Joint injury": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "F15324", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Death": 1, "Fracture": 1, "Gait disturbance": 1, "Heart rate": 1, "Joint injury": 1, "Respiratory rate": 1}, "batchcodes": ["F15324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F15729.json b/docs/data/histograms/Philippines/F15729.json
index 2bf04c5778a..8312a5d0994 100644
--- a/docs/data/histograms/Philippines/F15729.json
+++ b/docs/data/histograms/Philippines/F15729.json
@@ -1 +1 @@
-{"batchcode": "F15729", "histograms": [{"batchcodes": ["F15729"], "histogram": {"Anaphylactic reaction": 1, "Hypersensitivity": 1}}]}
\ No newline at end of file
+{"batchcode": "F15729", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Hypersensitivity": 1}, "batchcodes": ["F15729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F2A2964.json b/docs/data/histograms/Philippines/F2A2964.json
index eaf86e32fc4..2fbb0bf6083 100644
--- a/docs/data/histograms/Philippines/F2A2964.json
+++ b/docs/data/histograms/Philippines/F2A2964.json
@@ -1 +1 @@
-{"batchcode": "F2A2964", "histograms": [{"batchcodes": ["F2A2964"], "histogram": {"Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "F2A2964", "histograms": [{"histogram": {"Syncope": 1, "Tremor": 1}, "batchcodes": ["F2A2964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F4077.json b/docs/data/histograms/Philippines/F4077.json
index 1adb97d9788..9a51b757295 100644
--- a/docs/data/histograms/Philippines/F4077.json
+++ b/docs/data/histograms/Philippines/F4077.json
@@ -1 +1 @@
-{"batchcode": "F4077", "histograms": [{"batchcodes": ["F4077"], "histogram": {"Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "F4077", "histograms": [{"histogram": {"Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["F4077"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F5072A.json b/docs/data/histograms/Philippines/F5072A.json
index d2fc74059ae..ad914532f65 100644
--- a/docs/data/histograms/Philippines/F5072A.json
+++ b/docs/data/histograms/Philippines/F5072A.json
@@ -1 +1 @@
-{"batchcode": "F5072A", "histograms": [{"batchcodes": ["F5072A"], "histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "F5072A", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}, "batchcodes": ["F5072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F55973.json b/docs/data/histograms/Philippines/F55973.json
index 355ad3249c2..3ec50b5230e 100644
--- a/docs/data/histograms/Philippines/F55973.json
+++ b/docs/data/histograms/Philippines/F55973.json
@@ -1 +1 @@
-{"batchcode": "F55973", "histograms": [{"batchcodes": ["F55973"], "histogram": {"Abdominal pain upper": 1}}]}
\ No newline at end of file
+{"batchcode": "F55973", "histograms": [{"histogram": {"Abdominal pain upper": 1}, "batchcodes": ["F55973"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F58760.json b/docs/data/histograms/Philippines/F58760.json
index 724beea8bea..a9a5904c239 100644
--- a/docs/data/histograms/Philippines/F58760.json
+++ b/docs/data/histograms/Philippines/F58760.json
@@ -1 +1 @@
-{"batchcode": "F58760", "histograms": [{"batchcodes": ["F58760"], "histogram": {"Asthenia": 1, "Balance disorder": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Immobile": 1, "Incorrect route of product administration": 1, "Labour pain": 1, "Maternal exposure timing unspecified": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "F58760", "histograms": [{"histogram": {"Asthenia": 1, "Balance disorder": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Immobile": 1, "Incorrect route of product administration": 1, "Labour pain": 1, "Maternal exposure timing unspecified": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["F58760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F5B760.json b/docs/data/histograms/Philippines/F5B760.json
index 9c01090d681..6618d33bcfe 100644
--- a/docs/data/histograms/Philippines/F5B760.json
+++ b/docs/data/histograms/Philippines/F5B760.json
@@ -1 +1 @@
-{"batchcode": "F5B760", "histograms": [{"batchcodes": ["F5B760"], "histogram": {"Dizziness": 1, "Headache": 1, "Hypertensive urgency": 1}}]}
\ No newline at end of file
+{"batchcode": "F5B760", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Hypertensive urgency": 1}, "batchcodes": ["F5B760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F6524.json b/docs/data/histograms/Philippines/F6524.json
index dd124a6f8f7..58ea9346d05 100644
--- a/docs/data/histograms/Philippines/F6524.json
+++ b/docs/data/histograms/Philippines/F6524.json
@@ -1 +1 @@
-{"batchcode": "F6524", "histograms": [{"batchcodes": ["F6524"], "histogram": {"Abdominal pain lower": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "F6524", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Vaccination site pain": 1}, "batchcodes": ["F6524"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/F68643.json b/docs/data/histograms/Philippines/F68643.json
index d4b0289b3fa..01bc176cf78 100644
--- a/docs/data/histograms/Philippines/F68643.json
+++ b/docs/data/histograms/Philippines/F68643.json
@@ -1 +1 @@
-{"batchcode": "F68643", "histograms": [{"batchcodes": ["F68643"], "histogram": {"Dyspnoea": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cerebrovascular disorder": 1, "Cough": 1, "Dizziness": 1, "Dysphemia": 1, "Loss of consciousness": 1, "Nasopharyngitis": 1, "Palpitations": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "F68643", "histograms": [{"histogram": {"Dyspnoea": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cerebrovascular disorder": 1, "Cough": 1, "Dizziness": 1, "Dysphemia": 1, "Loss of consciousness": 1, "Nasopharyngitis": 1, "Palpitations": 1, "Seizure": 1}, "batchcodes": ["F68643"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FA3430.json b/docs/data/histograms/Philippines/FA3430.json
index c7cc64a29c8..3254d0cfc97 100644
--- a/docs/data/histograms/Philippines/FA3430.json
+++ b/docs/data/histograms/Philippines/FA3430.json
@@ -1 +1 @@
-{"batchcode": "FA3430", "histograms": [{"batchcodes": ["FA3430"], "histogram": {"Facial paralysis": 1, "Hypoaesthesia": 1, "Nausea": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FA3430", "histograms": [{"histogram": {"Facial paralysis": 1, "Hypoaesthesia": 1, "Nausea": 1, "Syncope": 1}, "batchcodes": ["FA3430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FA5843.json b/docs/data/histograms/Philippines/FA5843.json
index 2a28a639495..516d1751658 100644
--- a/docs/data/histograms/Philippines/FA5843.json
+++ b/docs/data/histograms/Philippines/FA5843.json
@@ -1 +1 @@
-{"batchcode": "FA5843", "histograms": [{"batchcodes": ["FA5843"], "histogram": {"Back pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5843", "histograms": [{"histogram": {"Back pain": 1, "Vaccination site pain": 1}, "batchcodes": ["FA5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FB5994.json b/docs/data/histograms/Philippines/FB5994.json
index 88a5a4bab4c..e0f56b6ac8a 100644
--- a/docs/data/histograms/Philippines/FB5994.json
+++ b/docs/data/histograms/Philippines/FB5994.json
@@ -1 +1 @@
-{"batchcode": "FB5994", "histograms": [{"batchcodes": ["FB5994"], "histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Death": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "General physical health deterioration": 1, "Hypersensitivity": 1, "Infarction": 1, "Paralysis": 1, "Pruritus": 1, "Pulse absent": 1, "Rash": 1, "Rash erythematous": 1, "Respiratory arrest": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FB5994", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Death": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "General physical health deterioration": 1, "Hypersensitivity": 1, "Infarction": 1, "Paralysis": 1, "Pruritus": 1, "Pulse absent": 1, "Rash": 1, "Rash erythematous": 1, "Respiratory arrest": 1, "Swelling": 1}, "batchcodes": ["FB5994"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FB5996.json b/docs/data/histograms/Philippines/FB5996.json
index 5bdf47ab90f..a3f1d6e91e4 100644
--- a/docs/data/histograms/Philippines/FB5996.json
+++ b/docs/data/histograms/Philippines/FB5996.json
@@ -1 +1 @@
-{"batchcode": "FB5996", "histograms": [{"batchcodes": ["FB5996"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Haematemesis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FB5996", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Haematemesis": 1, "Pyrexia": 1}, "batchcodes": ["FB5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FC3180.json b/docs/data/histograms/Philippines/FC3180.json
index bdb9e0a850c..c9122bbd67f 100644
--- a/docs/data/histograms/Philippines/FC3180.json
+++ b/docs/data/histograms/Philippines/FC3180.json
@@ -1 +1 @@
-{"batchcode": "FC3180", "histograms": [{"batchcodes": ["FC3180"], "histogram": {"Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3180", "histograms": [{"histogram": {"Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["FC3180"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FCA0025.json b/docs/data/histograms/Philippines/FCA0025.json
index 6566da2da82..e837d756827 100644
--- a/docs/data/histograms/Philippines/FCA0025.json
+++ b/docs/data/histograms/Philippines/FCA0025.json
@@ -1 +1 @@
-{"batchcode": "FCA0025", "histograms": [{"batchcodes": ["FCA0025"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FCA0025", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FCA0025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD /5996.json b/docs/data/histograms/Philippines/FD /5996.json
index e4a13906a7a..0ecb643a86d 100644
--- a/docs/data/histograms/Philippines/FD /5996.json
+++ b/docs/data/histograms/Philippines/FD /5996.json
@@ -1 +1 @@
-{"batchcode": "FD /5996", "histograms": [{"batchcodes": ["FD /5996"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FD /5996", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FD /5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD 0350.json b/docs/data/histograms/Philippines/FD 0350.json
index 00ae993bbf9..2c3df12b633 100644
--- a/docs/data/histograms/Philippines/FD 0350.json
+++ b/docs/data/histograms/Philippines/FD 0350.json
@@ -1 +1 @@
-{"batchcode": "FD 0350", "histograms": [{"batchcodes": ["FD 0350"], "histogram": {"Blood pressure measurement": 6, "Hypertension": 4, "Blood pressure increased": 2}}]}
\ No newline at end of file
+{"batchcode": "FD 0350", "histograms": [{"histogram": {"Blood pressure measurement": 6, "Hypertension": 4, "Blood pressure increased": 2}, "batchcodes": ["FD 0350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD 5990.json b/docs/data/histograms/Philippines/FD 5990.json
index 22fd6edee8f..4f793052a28 100644
--- a/docs/data/histograms/Philippines/FD 5990.json
+++ b/docs/data/histograms/Philippines/FD 5990.json
@@ -1 +1 @@
-{"batchcode": "FD 5990", "histograms": [{"batchcodes": ["FD 5990"], "histogram": {"Anaphylactic reaction": 2, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Nasopharyngitis": 1, "SARS-CoV-2 test": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FD 5990", "histograms": [{"histogram": {"Anaphylactic reaction": 2, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Nasopharyngitis": 1, "SARS-CoV-2 test": 1, "Syncope": 1}, "batchcodes": ["FD 5990"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD 5996.json b/docs/data/histograms/Philippines/FD 5996.json
index f5878647099..ee90f04314f 100644
--- a/docs/data/histograms/Philippines/FD 5996.json
+++ b/docs/data/histograms/Philippines/FD 5996.json
@@ -1 +1 @@
-{"batchcode": "FD 5996", "histograms": [{"batchcodes": ["FD 5996"], "histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "COVID-19": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Limb discomfort": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Chest discomfort": 1, "Chest pain": 1, "Conjunctival haemorrhage": 1, "Dizziness": 1, "Drowning": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate irregular": 1, "Insomnia": 1, "Middle insomnia": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Palpitations": 1, "Syncope": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "FD 5996", "histograms": [{"histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "COVID-19": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Limb discomfort": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Chest discomfort": 1, "Chest pain": 1, "Conjunctival haemorrhage": 1, "Dizziness": 1, "Drowning": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate irregular": 1, "Insomnia": 1, "Middle insomnia": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Palpitations": 1, "Syncope": 1, "Troponin": 1}, "batchcodes": ["FD 5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD-0350.json b/docs/data/histograms/Philippines/FD-0350.json
index 2e09ff1af76..2aacf981332 100644
--- a/docs/data/histograms/Philippines/FD-0350.json
+++ b/docs/data/histograms/Philippines/FD-0350.json
@@ -1 +1 @@
-{"batchcode": "FD-0350", "histograms": [{"batchcodes": ["FD-0350"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FD-0350", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FD-0350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD-5996.json b/docs/data/histograms/Philippines/FD-5996.json
index d676dfd8301..8e1ba498d2e 100644
--- a/docs/data/histograms/Philippines/FD-5996.json
+++ b/docs/data/histograms/Philippines/FD-5996.json
@@ -1 +1 @@
-{"batchcode": "FD-5996", "histograms": [{"batchcodes": ["FD-5996"], "histogram": {"Blood pressure increased": 5, "Blood pressure measurement": 5, "Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD-5996", "histograms": [{"histogram": {"Blood pressure increased": 5, "Blood pressure measurement": 5, "Pneumonia": 1}, "batchcodes": ["FD-5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD/ 5996.json b/docs/data/histograms/Philippines/FD/ 5996.json
index 7506b8de441..70bc6b4facf 100644
--- a/docs/data/histograms/Philippines/FD/ 5996.json
+++ b/docs/data/histograms/Philippines/FD/ 5996.json
@@ -1 +1 @@
-{"batchcode": "FD/ 5996", "histograms": [{"batchcodes": ["FD/ 5996"], "histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2}}]}
\ No newline at end of file
+{"batchcode": "FD/ 5996", "histograms": [{"histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2}, "batchcodes": ["FD/ 5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD/5996.json b/docs/data/histograms/Philippines/FD/5996.json
index e18702e929d..984d8812720 100644
--- a/docs/data/histograms/Philippines/FD/5996.json
+++ b/docs/data/histograms/Philippines/FD/5996.json
@@ -1 +1 @@
-{"batchcode": "FD/5996", "histograms": [{"batchcodes": ["FD/5996"], "histogram": {"Blood pressure increased": 10, "Blood pressure measurement": 10}}]}
\ No newline at end of file
+{"batchcode": "FD/5996", "histograms": [{"histogram": {"Blood pressure increased": 10, "Blood pressure measurement": 10}, "batchcodes": ["FD/5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD030.json b/docs/data/histograms/Philippines/FD030.json
index d2937dd986c..3c11f56c222 100644
--- a/docs/data/histograms/Philippines/FD030.json
+++ b/docs/data/histograms/Philippines/FD030.json
@@ -1 +1 @@
-{"batchcode": "FD030", "histograms": [{"batchcodes": ["FD030"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FD030", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FD030"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD0350.json b/docs/data/histograms/Philippines/FD0350.json
index a0270fa3ce9..58b82dce54b 100644
--- a/docs/data/histograms/Philippines/FD0350.json
+++ b/docs/data/histograms/Philippines/FD0350.json
@@ -1 +1 @@
-{"batchcode": "FD0350", "histograms": [{"batchcodes": ["FD0350"], "histogram": {"Blood pressure measurement": 97, "Blood pressure increased": 96, "Palpitations": 4, "Hypertension": 3, "Chest pain": 2, "Cough": 2, "Heart rate": 2, "Heart rate increased": 2, "Hypoaesthesia": 2, "Syncope": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Bradycardia": 1, "Bronchitis": 1, "COVID-19": 1, "Chills": 1, "Condition aggravated": 1, "Death": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Gastrooesophageal reflux disease": 1, "Hypertensive crisis": 1, "Loss of personal independence in daily activities": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Ventricular extrasystoles": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0350", "histograms": [{"histogram": {"Blood pressure measurement": 97, "Blood pressure increased": 96, "Palpitations": 4, "Hypertension": 3, "Chest pain": 2, "Cough": 2, "Heart rate": 2, "Heart rate increased": 2, "Hypoaesthesia": 2, "Syncope": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Bradycardia": 1, "Bronchitis": 1, "COVID-19": 1, "Chills": 1, "Condition aggravated": 1, "Death": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Gastrooesophageal reflux disease": 1, "Hypertensive crisis": 1, "Loss of personal independence in daily activities": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Ventricular extrasystoles": 1, "Vomiting": 1}, "batchcodes": ["FD0350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD03530.json b/docs/data/histograms/Philippines/FD03530.json
index 7cdd9e1affd..8e7e7c7f729 100644
--- a/docs/data/histograms/Philippines/FD03530.json
+++ b/docs/data/histograms/Philippines/FD03530.json
@@ -1 +1 @@
-{"batchcode": "FD03530", "histograms": [{"batchcodes": ["FD03530"], "histogram": {"Oropharyngeal pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD03530", "histograms": [{"histogram": {"Oropharyngeal pain": 1, "Pyrexia": 1}, "batchcodes": ["FD03530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD03550.json b/docs/data/histograms/Philippines/FD03550.json
index 48735b2b411..4ab43fa4d64 100644
--- a/docs/data/histograms/Philippines/FD03550.json
+++ b/docs/data/histograms/Philippines/FD03550.json
@@ -1 +1 @@
-{"batchcode": "FD03550", "histograms": [{"batchcodes": ["FD03550"], "histogram": {"Abdominal pain upper": 1, "Body temperature": 1, "Epistaxis": 1, "Pyrexia": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FD03550", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Body temperature": 1, "Epistaxis": 1, "Pyrexia": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["FD03550"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD0358.json b/docs/data/histograms/Philippines/FD0358.json
index a118e61adb6..51333589738 100644
--- a/docs/data/histograms/Philippines/FD0358.json
+++ b/docs/data/histograms/Philippines/FD0358.json
@@ -1 +1 @@
-{"batchcode": "FD0358", "histograms": [{"batchcodes": ["FD0358"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0358", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FD0358"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD035D.json b/docs/data/histograms/Philippines/FD035D.json
index af7ed0614de..9aaa6edef70 100644
--- a/docs/data/histograms/Philippines/FD035D.json
+++ b/docs/data/histograms/Philippines/FD035D.json
@@ -1 +1 @@
-{"batchcode": "FD035D", "histograms": [{"batchcodes": ["FD035D"], "histogram": {"Cough": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "FD035D", "histograms": [{"histogram": {"Cough": 1, "Malaise": 1}, "batchcodes": ["FD035D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD0559.json b/docs/data/histograms/Philippines/FD0559.json
index a1a94d1b256..b4bf6810641 100644
--- a/docs/data/histograms/Philippines/FD0559.json
+++ b/docs/data/histograms/Philippines/FD0559.json
@@ -1 +1 @@
-{"batchcode": "FD0559", "histograms": [{"batchcodes": ["FD0559"], "histogram": {"Abdominal pain": 1, "Cholecystectomy": 1, "Diarrhoea": 1, "Faeces discoloured": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0559", "histograms": [{"histogram": {"Abdominal pain": 1, "Cholecystectomy": 1, "Diarrhoea": 1, "Faeces discoloured": 1}, "batchcodes": ["FD0559"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD05996.json b/docs/data/histograms/Philippines/FD05996.json
index 7efdaeb097b..aa2ff3f3471 100644
--- a/docs/data/histograms/Philippines/FD05996.json
+++ b/docs/data/histograms/Philippines/FD05996.json
@@ -1 +1 @@
-{"batchcode": "FD05996", "histograms": [{"batchcodes": ["FD05996"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "FD05996", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1}, "batchcodes": ["FD05996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD393.json b/docs/data/histograms/Philippines/FD393.json
index a43612d01a7..05652ac517a 100644
--- a/docs/data/histograms/Philippines/FD393.json
+++ b/docs/data/histograms/Philippines/FD393.json
@@ -1 +1 @@
-{"batchcode": "FD393", "histograms": [{"batchcodes": ["FD393"], "histogram": {"Faeces discoloured": 1, "Upper gastrointestinal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FD393", "histograms": [{"histogram": {"Faeces discoloured": 1, "Upper gastrointestinal haemorrhage": 1}, "batchcodes": ["FD393"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD5006.json b/docs/data/histograms/Philippines/FD5006.json
index 6ab6fd6902a..130093fba0f 100644
--- a/docs/data/histograms/Philippines/FD5006.json
+++ b/docs/data/histograms/Philippines/FD5006.json
@@ -1 +1 @@
-{"batchcode": "FD5006", "histograms": [{"batchcodes": ["FD5006"], "histogram": {"Conjunctivitis": 1, "Decreased appetite": 1, "Oropharyngeal pain": 1, "Rash": 1, "Septic shock": 1, "Skin lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5006", "histograms": [{"histogram": {"Conjunctivitis": 1, "Decreased appetite": 1, "Oropharyngeal pain": 1, "Rash": 1, "Septic shock": 1, "Skin lesion": 1}, "batchcodes": ["FD5006"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD5669.json b/docs/data/histograms/Philippines/FD5669.json
index 2c844de7e4d..ce133c30f06 100644
--- a/docs/data/histograms/Philippines/FD5669.json
+++ b/docs/data/histograms/Philippines/FD5669.json
@@ -1 +1 @@
-{"batchcode": "FD5669", "histograms": [{"batchcodes": ["FD5669"], "histogram": {"Drug ineffective": 4, "COVID-19": 3, "Cough": 3, "Nasopharyngitis": 3, "COVID-19 screening": 2, "SARS-CoV-2 test": 2, "Asymptomatic COVID-19": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5669", "histograms": [{"histogram": {"Drug ineffective": 4, "COVID-19": 3, "Cough": 3, "Nasopharyngitis": 3, "COVID-19 screening": 2, "SARS-CoV-2 test": 2, "Asymptomatic COVID-19": 1, "Pyrexia": 1}, "batchcodes": ["FD5669"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD5966.json b/docs/data/histograms/Philippines/FD5966.json
index 80aa5d9132c..f7e751d28da 100644
--- a/docs/data/histograms/Philippines/FD5966.json
+++ b/docs/data/histograms/Philippines/FD5966.json
@@ -1 +1 @@
-{"batchcode": "FD5966", "histograms": [{"batchcodes": ["FD5966"], "histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2}}]}
\ No newline at end of file
+{"batchcode": "FD5966", "histograms": [{"histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2}, "batchcodes": ["FD5966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD5993.json b/docs/data/histograms/Philippines/FD5993.json
index 7841fdb644b..8944b78f585 100644
--- a/docs/data/histograms/Philippines/FD5993.json
+++ b/docs/data/histograms/Philippines/FD5993.json
@@ -1 +1 @@
-{"batchcode": "FD5993", "histograms": [{"batchcodes": ["FD5993"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5993", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FD5993"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD5996.json b/docs/data/histograms/Philippines/FD5996.json
index 1f840aed914..7dd85353f1e 100644
--- a/docs/data/histograms/Philippines/FD5996.json
+++ b/docs/data/histograms/Philippines/FD5996.json
@@ -1 +1 @@
-{"batchcode": "FD5996", "histograms": [{"batchcodes": ["939918", "FD5996"], "histogram": {"Dysarthria": 1, "Hemiparesis": 1, "Pyrexia": 1}}, {"batchcodes": ["FD5996"], "histogram": {"Blood pressure measurement": 256, "Blood pressure increased": 233, "Drug ineffective": 200, "COVID-19": 156, "Cough": 88, "Nasopharyngitis": 71, "Pyrexia": 66, "SARS-CoV-2 test": 62, "Asymptomatic COVID-19": 59, "Headache": 39, "COVID-19 screening": 34, "Malaise": 28, "Dyspnoea": 27, "Hypertension": 22, "Oropharyngeal pain": 22, "Vaccination failure": 16, "Asthenia": 15, "Ageusia": 13, "Decreased appetite": 12, "Diarrhoea": 12, "Dizziness": 12, "Anosmia": 10, "Syncope": 10, "Nausea": 9, "Hemiparesis": 8, "Loss of consciousness": 8, "Nasal congestion": 8, "Vaccination site pain": 8, "Vomiting": 8, "Abdominal pain": 7, "Arthralgia": 7, "Fatigue": 7, "Myalgia": 7, "Oxygen saturation": 7, "Chills": 6, "Suspected COVID-19": 6, "Abdominal pain upper": 5, "Anaphylactic reaction": 5, "Body temperature": 5, "Chest pain": 5, "Pain": 5, "Pneumonia": 5, "Death": 4, "Heart rate": 4, "Palpitations": 4, "Polymerase chain reaction": 4, "Rash": 4, "Back pain": 3, "Chest discomfort": 3, "Dysarthria": 3, "Dysphagia": 3, "Hypersensitivity": 3, "Hypertensive urgency": 3, "Hypoaesthesia": 3, "Laboratory test": 3, "Productive cough": 3, "Rhinitis": 3, "Seizure": 3, "Tachycardia": 3, "Arrhythmia": 2, "Asthma": 2, "Cerebrovascular accident": 2, "Cold sweat": 2, "Conjunctivitis": 2, "Coronary artery disease": 2, "Depressed level of consciousness": 2, "Diabetes mellitus": 2, "Faeces discoloured": 2, "Hypotension": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Platelet count": 2, "Rash maculo-papular": 2, "Respiratory rate": 2, "SARS-CoV-2 antibody test": 2, "Serology test": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "Unresponsive to stimuli": 2, "Upper gastrointestinal haemorrhage": 2, "Abdominal distension": 1, "Abdominal infection": 1, "Abdominal pain lower": 1, "Abortion spontaneous": 1, "Acute respiratory failure": 1, "Alanine aminotransferase": 1, "Anal abscess": 1, "Aortic aneurysm": 1, "Aortic stenosis": 1, "Appendicitis": 1, "Bell's palsy": 1, "Bleeding time": 1, "Blindness": 1, "Blood creatinine": 1, "Blood grouping": 1, "Blood immunoglobulin M": 1, "Blood potassium": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood uric acid": 1, "COVID-19 pneumonia": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac valve disease": 1, "Chest X-ray": 1, "Chronic kidney disease": 1, "Circulatory collapse": 1, "Coagulation time": 1, "Dehydration": 1, "Dengue fever": 1, "Diverticulum intestinal": 1, "Dry mouth": 1, "Duodenal ulcer": 1, "Dyspepsia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Electrocardiogram": 1, "Electrolyte imbalance": 1, "Epigastric discomfort": 1, "Erythema": 1, "Eye pain": 1, "Face oedema": 1, "Facial paralysis": 1, "Fall": 1, "Flushing": 1, "Food intolerance": 1, "Full blood count": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematoma": 1, "Haematuria": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Hypertensive emergency": 1, "Ileus": 1, "Immune thrombocytopenia": 1, "Increased appetite": 1, "Influenza like illness": 1, "Insomnia": 1, "International normalised ratio": 1, "Investigation": 1, "Ischaemic stroke": 1, "Labour pain": 1, "Lacrimation increased": 1, "Magnetic resonance imaging heart": 1, "Muscular weakness": 1, "Neck pain": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Peptic ulcer haemorrhage": 1, "Peripheral swelling": 1, "Prostate cancer": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary hypertension": 1, "Sepsis": 1, "Shock": 1, "Sinusitis": 1, "Skin abrasion": 1, "Skin lesion": 1, "Spinal X-ray": 1, "Sudden death": 1, "Tremor": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ultrasound liver": 1, "Urine analysis": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Wound infection": 1, "X-ray of pelvis and hip": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5996", "histograms": [{"histogram": {"Dysarthria": 1, "Hemiparesis": 1, "Pyrexia": 1}, "batchcodes": ["939918", "FD5996"]}, {"histogram": {"Blood pressure measurement": 256, "Blood pressure increased": 233, "Drug ineffective": 200, "COVID-19": 156, "Cough": 88, "Nasopharyngitis": 71, "Pyrexia": 66, "SARS-CoV-2 test": 62, "Asymptomatic COVID-19": 59, "Headache": 39, "COVID-19 screening": 34, "Malaise": 28, "Dyspnoea": 27, "Hypertension": 22, "Oropharyngeal pain": 22, "Vaccination failure": 16, "Asthenia": 15, "Ageusia": 13, "Decreased appetite": 12, "Diarrhoea": 12, "Dizziness": 12, "Anosmia": 10, "Syncope": 10, "Nausea": 9, "Hemiparesis": 8, "Loss of consciousness": 8, "Nasal congestion": 8, "Vaccination site pain": 8, "Vomiting": 8, "Abdominal pain": 7, "Arthralgia": 7, "Fatigue": 7, "Myalgia": 7, "Oxygen saturation": 7, "Chills": 6, "Suspected COVID-19": 6, "Abdominal pain upper": 5, "Anaphylactic reaction": 5, "Body temperature": 5, "Chest pain": 5, "Pain": 5, "Pneumonia": 5, "Death": 4, "Heart rate": 4, "Palpitations": 4, "Polymerase chain reaction": 4, "Rash": 4, "Back pain": 3, "Chest discomfort": 3, "Dysarthria": 3, "Dysphagia": 3, "Hypersensitivity": 3, "Hypertensive urgency": 3, "Hypoaesthesia": 3, "Laboratory test": 3, "Productive cough": 3, "Rhinitis": 3, "Seizure": 3, "Tachycardia": 3, "Arrhythmia": 2, "Asthma": 2, "Cerebrovascular accident": 2, "Cold sweat": 2, "Conjunctivitis": 2, "Coronary artery disease": 2, "Depressed level of consciousness": 2, "Diabetes mellitus": 2, "Faeces discoloured": 2, "Hypotension": 2, "Myocardial infarction": 2, "Myocarditis": 2, "Platelet count": 2, "Rash maculo-papular": 2, "Respiratory rate": 2, "SARS-CoV-2 antibody test": 2, "Serology test": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "Unresponsive to stimuli": 2, "Upper gastrointestinal haemorrhage": 2, "Abdominal distension": 1, "Abdominal infection": 1, "Abdominal pain lower": 1, "Abortion spontaneous": 1, "Acute respiratory failure": 1, "Alanine aminotransferase": 1, "Anal abscess": 1, "Aortic aneurysm": 1, "Aortic stenosis": 1, "Appendicitis": 1, "Bell's palsy": 1, "Bleeding time": 1, "Blindness": 1, "Blood creatinine": 1, "Blood grouping": 1, "Blood immunoglobulin M": 1, "Blood potassium": 1, "Blood pressure systolic increased": 1, "Blood sodium": 1, "Blood uric acid": 1, "COVID-19 pneumonia": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac valve disease": 1, "Chest X-ray": 1, "Chronic kidney disease": 1, "Circulatory collapse": 1, "Coagulation time": 1, "Dehydration": 1, "Dengue fever": 1, "Diverticulum intestinal": 1, "Dry mouth": 1, "Duodenal ulcer": 1, "Dyspepsia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Electrocardiogram": 1, "Electrolyte imbalance": 1, "Epigastric discomfort": 1, "Erythema": 1, "Eye pain": 1, "Face oedema": 1, "Facial paralysis": 1, "Fall": 1, "Flushing": 1, "Food intolerance": 1, "Full blood count": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematoma": 1, "Haematuria": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Hypertensive emergency": 1, "Ileus": 1, "Immune thrombocytopenia": 1, "Increased appetite": 1, "Influenza like illness": 1, "Insomnia": 1, "International normalised ratio": 1, "Investigation": 1, "Ischaemic stroke": 1, "Labour pain": 1, "Lacrimation increased": 1, "Magnetic resonance imaging heart": 1, "Muscular weakness": 1, "Neck pain": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Peptic ulcer haemorrhage": 1, "Peripheral swelling": 1, "Prostate cancer": 1, "Prothrombin time": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary hypertension": 1, "Sepsis": 1, "Shock": 1, "Sinusitis": 1, "Skin abrasion": 1, "Skin lesion": 1, "Spinal X-ray": 1, "Sudden death": 1, "Tremor": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ultrasound liver": 1, "Urine analysis": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Wound infection": 1, "X-ray of pelvis and hip": 1}, "batchcodes": ["FD5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD59969.json b/docs/data/histograms/Philippines/FD59969.json
index b93415ae6b9..d2eadfcedf6 100644
--- a/docs/data/histograms/Philippines/FD59969.json
+++ b/docs/data/histograms/Philippines/FD59969.json
@@ -1 +1 @@
-{"batchcode": "FD59969", "histograms": [{"batchcodes": ["FD59969"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FD59969", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FD59969"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FD5998.json b/docs/data/histograms/Philippines/FD5998.json
index f2cc939215e..60c98a29c9a 100644
--- a/docs/data/histograms/Philippines/FD5998.json
+++ b/docs/data/histograms/Philippines/FD5998.json
@@ -1 +1 @@
-{"batchcode": "FD5998", "histograms": [{"batchcodes": ["FD5998"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5998", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Loss of consciousness": 1}, "batchcodes": ["FD5998"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FDO150.json b/docs/data/histograms/Philippines/FDO150.json
index 6bbd6bee9ac..3b08ae11698 100644
--- a/docs/data/histograms/Philippines/FDO150.json
+++ b/docs/data/histograms/Philippines/FDO150.json
@@ -1 +1 @@
-{"batchcode": "FDO150", "histograms": [{"batchcodes": ["FDO150"], "histogram": {"Maternal exposure timing unspecified": 1, "Off label use": 1, "Pregnancy": 1, "Product use issue": 1}}]}
\ No newline at end of file
+{"batchcode": "FDO150", "histograms": [{"histogram": {"Maternal exposure timing unspecified": 1, "Off label use": 1, "Pregnancy": 1, "Product use issue": 1}, "batchcodes": ["FDO150"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FDO30.json b/docs/data/histograms/Philippines/FDO30.json
index 11fb09001a7..7f0ee3026dc 100644
--- a/docs/data/histograms/Philippines/FDO30.json
+++ b/docs/data/histograms/Philippines/FDO30.json
@@ -1 +1 @@
-{"batchcode": "FDO30", "histograms": [{"batchcodes": ["FDO30"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FDO30", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FDO30"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FDO350.json b/docs/data/histograms/Philippines/FDO350.json
index bcca45bc03a..1a8771b8e9b 100644
--- a/docs/data/histograms/Philippines/FDO350.json
+++ b/docs/data/histograms/Philippines/FDO350.json
@@ -1 +1 @@
-{"batchcode": "FDO350", "histograms": [{"batchcodes": ["FDO350"], "histogram": {"Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "FDO350", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1}, "batchcodes": ["FDO350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FDS996.json b/docs/data/histograms/Philippines/FDS996.json
index 562fd25e35a..a2c286fde09 100644
--- a/docs/data/histograms/Philippines/FDS996.json
+++ b/docs/data/histograms/Philippines/FDS996.json
@@ -1 +1 @@
-{"batchcode": "FDS996", "histograms": [{"batchcodes": ["FDS996"], "histogram": {"Pyrexia": 2, "Flank pain": 1, "Urine copper": 1}}]}
\ No newline at end of file
+{"batchcode": "FDS996", "histograms": [{"histogram": {"Pyrexia": 2, "Flank pain": 1, "Urine copper": 1}, "batchcodes": ["FDS996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE 3430.json b/docs/data/histograms/Philippines/FE 3430.json
index 8cdbe2a61f0..2cf10c7ce8a 100644
--- a/docs/data/histograms/Philippines/FE 3430.json
+++ b/docs/data/histograms/Philippines/FE 3430.json
@@ -1 +1 @@
-{"batchcode": "FE 3430", "histograms": [{"batchcodes": ["FE 3430"], "histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 3430", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "Drug ineffective": 1, "Pyrexia": 1}, "batchcodes": ["FE 3430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE3400.json b/docs/data/histograms/Philippines/FE3400.json
index 0772127c5ae..1584f8f3fac 100644
--- a/docs/data/histograms/Philippines/FE3400.json
+++ b/docs/data/histograms/Philippines/FE3400.json
@@ -1 +1 @@
-{"batchcode": "FE3400", "histograms": [{"batchcodes": ["FE3400"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3400", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FE3400"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE340430.json b/docs/data/histograms/Philippines/FE340430.json
index c43f935bad1..fff011ed6de 100644
--- a/docs/data/histograms/Philippines/FE340430.json
+++ b/docs/data/histograms/Philippines/FE340430.json
@@ -1 +1 @@
-{"batchcode": "FE340430", "histograms": [{"batchcodes": ["FE340430"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "FE340430", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["FE340430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE3420.json b/docs/data/histograms/Philippines/FE3420.json
index 8c8e9bd6e19..b86bd93fe43 100644
--- a/docs/data/histograms/Philippines/FE3420.json
+++ b/docs/data/histograms/Philippines/FE3420.json
@@ -1 +1 @@
-{"batchcode": "FE3420", "histograms": [{"batchcodes": ["FE3420"], "histogram": {"COVID-19": 1, "Hepatic encephalopathy": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3420", "histograms": [{"histogram": {"COVID-19": 1, "Hepatic encephalopathy": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1}, "batchcodes": ["FE3420"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE3430.json b/docs/data/histograms/Philippines/FE3430.json
index 510ef38291d..d54ac0ace68 100644
--- a/docs/data/histograms/Philippines/FE3430.json
+++ b/docs/data/histograms/Philippines/FE3430.json
@@ -1 +1 @@
-{"batchcode": "FE3430", "histograms": [{"batchcodes": ["055EZ1A", "FE3430"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1}}, {"batchcodes": ["FE3430"], "histogram": {"Blood pressure measurement": 14, "Blood pressure increased": 10, "Cough": 6, "COVID-19": 4, "Drug ineffective": 4, "Pyrexia": 4, "SARS-CoV-2 test": 4, "Syncope": 3, "Body temperature": 2, "Death": 2, "Decreased appetite": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Headache": 2, "Hypotension": 2, "Nasopharyngitis": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Throat irritation": 2, "Vomiting": 2, "Activated partial thromboplastin time": 1, "Ageusia": 1, "Anosmia": 1, "Arterial occlusive disease": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Back pain": 1, "Blood chloride": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiovascular disorder": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Dysarthria": 1, "Dysphagia": 1, "Ear infection": 1, "Ear pain": 1, "Extrapulmonary tuberculosis": 1, "Fatigue": 1, "Full blood count": 1, "Head injury": 1, "Heart rate": 1, "Heat oedema": 1, "Hemiparesis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Illiteracy": 1, "Inappropriate schedule of product administration": 1, "Infectious pleural effusion": 1, "Inflammation": 1, "Laboratory test": 1, "Limb discomfort": 1, "Memory impairment": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck pain": 1, "Petechiae": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Rash": 1, "Respiratory rate": 1, "Somnolence": 1, "Subdural haematoma": 1, "Vaccination site pain": 1, "Walking disability": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3430", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["055EZ1A", "FE3430"]}, {"histogram": {"Blood pressure measurement": 14, "Blood pressure increased": 10, "Cough": 6, "COVID-19": 4, "Drug ineffective": 4, "Pyrexia": 4, "SARS-CoV-2 test": 4, "Syncope": 3, "Body temperature": 2, "Death": 2, "Decreased appetite": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Headache": 2, "Hypotension": 2, "Nasopharyngitis": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Throat irritation": 2, "Vomiting": 2, "Activated partial thromboplastin time": 1, "Ageusia": 1, "Anosmia": 1, "Arterial occlusive disease": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Back pain": 1, "Blood chloride": 1, "Bradycardia": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiovascular disorder": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Dysarthria": 1, "Dysphagia": 1, "Ear infection": 1, "Ear pain": 1, "Extrapulmonary tuberculosis": 1, "Fatigue": 1, "Full blood count": 1, "Head injury": 1, "Heart rate": 1, "Heat oedema": 1, "Hemiparesis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Illiteracy": 1, "Inappropriate schedule of product administration": 1, "Infectious pleural effusion": 1, "Inflammation": 1, "Laboratory test": 1, "Limb discomfort": 1, "Memory impairment": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck pain": 1, "Petechiae": 1, "Pneumonia bacterial": 1, "Polymerase chain reaction": 1, "Rash": 1, "Respiratory rate": 1, "Somnolence": 1, "Subdural haematoma": 1, "Vaccination site pain": 1, "Walking disability": 1, "X-ray": 1}, "batchcodes": ["FE3430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE4222.json b/docs/data/histograms/Philippines/FE4222.json
index 41e06c25711..052515aa449 100644
--- a/docs/data/histograms/Philippines/FE4222.json
+++ b/docs/data/histograms/Philippines/FE4222.json
@@ -1 +1 @@
-{"batchcode": "FE4222", "histograms": [{"batchcodes": ["FE4222"], "histogram": {"Cough": 3, "Headache": 3, "Pyrexia": 3, "COVID-19": 2, "Drug ineffective": 2, "Pain": 2, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Upper respiratory tract infection": 1, "Vaccination site discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "FE4222", "histograms": [{"histogram": {"Cough": 3, "Headache": 3, "Pyrexia": 3, "COVID-19": 2, "Drug ineffective": 2, "Pain": 2, "Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Upper respiratory tract infection": 1, "Vaccination site discomfort": 1}, "batchcodes": ["FE4222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE5324.json b/docs/data/histograms/Philippines/FE5324.json
index ba84c437837..85eb909a8e1 100644
--- a/docs/data/histograms/Philippines/FE5324.json
+++ b/docs/data/histograms/Philippines/FE5324.json
@@ -1 +1 @@
-{"batchcode": "FE5324", "histograms": [{"batchcodes": ["FE5324"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FE5324", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Hypoaesthesia": 1}, "batchcodes": ["FE5324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE8162.json b/docs/data/histograms/Philippines/FE8162.json
index 32ecc8e6977..2258e279f0a 100644
--- a/docs/data/histograms/Philippines/FE8162.json
+++ b/docs/data/histograms/Philippines/FE8162.json
@@ -1 +1 @@
-{"batchcode": "FE8162", "histograms": [{"batchcodes": ["FE8162"], "histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Drug ineffective": 1, "Malaise": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8162", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Drug ineffective": 1, "Malaise": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FE8162"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FE8163.json b/docs/data/histograms/Philippines/FE8163.json
index 3e3e6fce82f..2e7b79d521a 100644
--- a/docs/data/histograms/Philippines/FE8163.json
+++ b/docs/data/histograms/Philippines/FE8163.json
@@ -1 +1 @@
-{"batchcode": "FE8163", "histograms": [{"batchcodes": ["FE8163"], "histogram": {"Blood pressure increased": 3, "Cough": 3, "Syncope": 3, "Blood pressure measurement": 2, "COVID-19": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Pyrexia": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "COVID-19 screening": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Malaise": 1, "Nasopharyngitis": 1, "Panic attack": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8163", "histograms": [{"histogram": {"Blood pressure increased": 3, "Cough": 3, "Syncope": 3, "Blood pressure measurement": 2, "COVID-19": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Pyrexia": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "COVID-19 screening": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Malaise": 1, "Nasopharyngitis": 1, "Panic attack": 1, "Ultrasound scan": 1}, "batchcodes": ["FE8163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF2154.json b/docs/data/histograms/Philippines/FF2154.json
index af75d4c225d..cef4988b75e 100644
--- a/docs/data/histograms/Philippines/FF2154.json
+++ b/docs/data/histograms/Philippines/FF2154.json
@@ -1 +1 @@
-{"batchcode": "FF2154", "histograms": [{"batchcodes": ["FF2154"], "histogram": {"COVID-19": 1, "Nasopharyngitis": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2154", "histograms": [{"histogram": {"COVID-19": 1, "Nasopharyngitis": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FF2154"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF2589.json b/docs/data/histograms/Philippines/FF2589.json
index 451197adcf5..114555baf66 100644
--- a/docs/data/histograms/Philippines/FF2589.json
+++ b/docs/data/histograms/Philippines/FF2589.json
@@ -1 +1 @@
-{"batchcode": "FF2589", "histograms": [{"batchcodes": ["025J20", "FF2589"], "histogram": {"Breakthrough COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["FF2589"], "histogram": {"Breakthrough COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2589", "histograms": [{"histogram": {"Breakthrough COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025J20", "FF2589"]}, {"histogram": {"Breakthrough COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FF2589"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF4222.json b/docs/data/histograms/Philippines/FF4222.json
index d6f76659020..bd4f85e9492 100644
--- a/docs/data/histograms/Philippines/FF4222.json
+++ b/docs/data/histograms/Philippines/FF4222.json
@@ -1 +1 @@
-{"batchcode": "FF4222", "histograms": [{"batchcodes": ["FF4222"], "histogram": {"Dyspnoea": 2, "Asymptomatic COVID-19": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Fatigue": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Rash": 1, "Systemic lupus erythematosus": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FF4222", "histograms": [{"histogram": {"Dyspnoea": 2, "Asymptomatic COVID-19": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Fatigue": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Rash": 1, "Systemic lupus erythematosus": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FF4222"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF773.json b/docs/data/histograms/Philippines/FF773.json
index 17f4a30dff8..a0e2df17972 100644
--- a/docs/data/histograms/Philippines/FF773.json
+++ b/docs/data/histograms/Philippines/FF773.json
@@ -1 +1 @@
-{"batchcode": "FF773", "histograms": [{"batchcodes": ["FF773"], "histogram": {"COVID-19": 1, "Cough": 1, "Nasopharyngitis": 1, "Off label use": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FF773", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Nasopharyngitis": 1, "Off label use": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "Vaccination site swelling": 1}, "batchcodes": ["FF773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF8274.json b/docs/data/histograms/Philippines/FF8274.json
index 5ba86e08614..594f98b0236 100644
--- a/docs/data/histograms/Philippines/FF8274.json
+++ b/docs/data/histograms/Philippines/FF8274.json
@@ -1 +1 @@
-{"batchcode": "FF8274", "histograms": [{"batchcodes": ["FF8274"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8274", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FF8274"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF8279.json b/docs/data/histograms/Philippines/FF8279.json
index d4c20045735..149089d2a8d 100644
--- a/docs/data/histograms/Philippines/FF8279.json
+++ b/docs/data/histograms/Philippines/FF8279.json
@@ -1 +1 @@
-{"batchcode": "FF8279", "histograms": [{"batchcodes": ["FF8279"], "histogram": {"Syncope": 2, "Abdominal distension": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8279", "histograms": [{"histogram": {"Syncope": 2, "Abdominal distension": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FF8279"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF871.json b/docs/data/histograms/Philippines/FF871.json
index 6c429e2921f..e25c2c38f8d 100644
--- a/docs/data/histograms/Philippines/FF871.json
+++ b/docs/data/histograms/Philippines/FF871.json
@@ -1 +1 @@
-{"batchcode": "FF871", "histograms": [{"batchcodes": ["FF871"], "histogram": {"Ageusia": 2, "Drug ineffective": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Anosmia": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Headache": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "FF871", "histograms": [{"histogram": {"Ageusia": 2, "Drug ineffective": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Anosmia": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Headache": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Throat irritation": 1}, "batchcodes": ["FF871"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF8846.json b/docs/data/histograms/Philippines/FF8846.json
index e6be362000c..ca93ef9e5b1 100644
--- a/docs/data/histograms/Philippines/FF8846.json
+++ b/docs/data/histograms/Philippines/FF8846.json
@@ -1 +1 @@
-{"batchcode": "FF8846", "histograms": [{"batchcodes": ["FF8846"], "histogram": {"Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8846", "histograms": [{"histogram": {"Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FF8846"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF8847.json b/docs/data/histograms/Philippines/FF8847.json
index e33aaab98d3..70d494f15c9 100644
--- a/docs/data/histograms/Philippines/FF8847.json
+++ b/docs/data/histograms/Philippines/FF8847.json
@@ -1 +1 @@
-{"batchcode": "FF8847", "histograms": [{"batchcodes": ["FF8847"], "histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Malaise": 2, "Pyrexia": 2, "Dizziness": 1, "Fatigue": 1, "Flushing": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Seizure": 1, "Unresponsive to stimuli": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8847", "histograms": [{"histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Malaise": 2, "Pyrexia": 2, "Dizziness": 1, "Fatigue": 1, "Flushing": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Seizure": 1, "Unresponsive to stimuli": 1, "Vomiting": 1}, "batchcodes": ["FF8847"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FF8871.json b/docs/data/histograms/Philippines/FF8871.json
index 866f41b9461..a370448435f 100644
--- a/docs/data/histograms/Philippines/FF8871.json
+++ b/docs/data/histograms/Philippines/FF8871.json
@@ -1 +1 @@
-{"batchcode": "FF8871", "histograms": [{"batchcodes": ["012F21A", "FF8871"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Heart rate": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["FF8871"], "histogram": {"Blood pressure increased": 40, "Blood pressure measurement": 38, "Drug ineffective": 6, "COVID-19": 5, "Cough": 5, "Heart rate": 4, "Heart rate increased": 4, "Bradycardia": 3, "Dyspnoea": 3, "Headache": 3, "Hypertension": 3, "Nasopharyngitis": 3, "Polymerase chain reaction": 3, "Pyrexia": 3, "Ageusia": 2, "Anosmia": 2, "Cold sweat": 2, "Oropharyngeal pain": 2, "Pallor": 2, "SARS-CoV-2 test": 2, "SARS-CoV-2 test positive": 2, "Throat irritation": 2, "Aneurysm ruptured": 1, "Chest pain": 1, "Chills": 1, "Cyanosis": 1, "Dysarthria": 1, "Dyskinesia": 1, "Facial asymmetry": 1, "Faeces discoloured": 1, "Hemiparesis": 1, "Hepatic cirrhosis": 1, "Hypoaesthesia": 1, "Incorrect route of product administration": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasal congestion": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Presyncope": 1, "SARS-CoV-2 test negative": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8871", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Heart rate": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["012F21A", "FF8871"]}, {"histogram": {"Blood pressure increased": 40, "Blood pressure measurement": 38, "Drug ineffective": 6, "COVID-19": 5, "Cough": 5, "Heart rate": 4, "Heart rate increased": 4, "Bradycardia": 3, "Dyspnoea": 3, "Headache": 3, "Hypertension": 3, "Nasopharyngitis": 3, "Polymerase chain reaction": 3, "Pyrexia": 3, "Ageusia": 2, "Anosmia": 2, "Cold sweat": 2, "Oropharyngeal pain": 2, "Pallor": 2, "SARS-CoV-2 test": 2, "SARS-CoV-2 test positive": 2, "Throat irritation": 2, "Aneurysm ruptured": 1, "Chest pain": 1, "Chills": 1, "Cyanosis": 1, "Dysarthria": 1, "Dyskinesia": 1, "Facial asymmetry": 1, "Faeces discoloured": 1, "Hemiparesis": 1, "Hepatic cirrhosis": 1, "Hypoaesthesia": 1, "Incorrect route of product administration": 1, "Lacrimation increased": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasal congestion": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Presyncope": 1, "SARS-CoV-2 test negative": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Vaccination failure": 1}, "batchcodes": ["FF8871"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FFF8847.json b/docs/data/histograms/Philippines/FFF8847.json
index 4a23a1510a6..c2a7a87e3ad 100644
--- a/docs/data/histograms/Philippines/FFF8847.json
+++ b/docs/data/histograms/Philippines/FFF8847.json
@@ -1 +1 @@
-{"batchcode": "FFF8847", "histograms": [{"batchcodes": ["FFF8847"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FFF8847", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FFF8847"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FG1657.json b/docs/data/histograms/Philippines/FG1657.json
index 995f3d0f437..5cb7fc0f8be 100644
--- a/docs/data/histograms/Philippines/FG1657.json
+++ b/docs/data/histograms/Philippines/FG1657.json
@@ -1 +1 @@
-{"batchcode": "FG1657", "histograms": [{"batchcodes": ["FG1657"], "histogram": {"COVID-19": 1, "Cough": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FG1657", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FG1657"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FG3739.json b/docs/data/histograms/Philippines/FG3739.json
index 84782414c64..bd0615b638d 100644
--- a/docs/data/histograms/Philippines/FG3739.json
+++ b/docs/data/histograms/Philippines/FG3739.json
@@ -1 +1 @@
-{"batchcode": "FG3739", "histograms": [{"batchcodes": ["FG3739"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3739", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["FG3739"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FG8640.json b/docs/data/histograms/Philippines/FG8640.json
index ae9b9df46d5..ae419235176 100644
--- a/docs/data/histograms/Philippines/FG8640.json
+++ b/docs/data/histograms/Philippines/FG8640.json
@@ -1 +1 @@
-{"batchcode": "FG8640", "histograms": [{"batchcodes": ["FG8640"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FG8640", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FG8640"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FG8643.json b/docs/data/histograms/Philippines/FG8643.json
index dd3ab00c2f3..3bc4988c345 100644
--- a/docs/data/histograms/Philippines/FG8643.json
+++ b/docs/data/histograms/Philippines/FG8643.json
@@ -1 +1 @@
-{"batchcode": "FG8643", "histograms": [{"batchcodes": ["061621A", "FG8643"], "histogram": {"Gun shot wound": 1}}, {"batchcodes": ["FG8643"], "histogram": {"COVID-19": 4, "Pyrexia": 4, "Vaccination failure": 4, "Cough": 3, "Dizziness": 3, "Dyspnoea": 3, "Nasopharyngitis": 3, "Loss of consciousness": 2, "SARS-CoV-2 test": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Death": 1, "Decreased appetite": 1, "Dysuria": 1, "Ear infection": 1, "Facial paralysis": 1, "Fluid intake reduced": 1, "Gastrooesophageal reflux disease": 1, "Haematochezia": 1, "Haemorrhoids": 1, "Headache": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Pertussis": 1, "Polymerase chain reaction": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Syncope": 1, "Tinnitus": 1, "Urine output decreased": 1, "Ventricular extrasystoles": 1}}]}
\ No newline at end of file
+{"batchcode": "FG8643", "histograms": [{"histogram": {"Gun shot wound": 1}, "batchcodes": ["061621A", "FG8643"]}, {"histogram": {"COVID-19": 4, "Pyrexia": 4, "Vaccination failure": 4, "Cough": 3, "Dizziness": 3, "Dyspnoea": 3, "Nasopharyngitis": 3, "Loss of consciousness": 2, "SARS-CoV-2 test": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Death": 1, "Decreased appetite": 1, "Dysuria": 1, "Ear infection": 1, "Facial paralysis": 1, "Fluid intake reduced": 1, "Gastrooesophageal reflux disease": 1, "Haematochezia": 1, "Haemorrhoids": 1, "Headache": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Pertussis": 1, "Polymerase chain reaction": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Syncope": 1, "Tinnitus": 1, "Urine output decreased": 1, "Ventricular extrasystoles": 1}, "batchcodes": ["FG8643"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH0160.json b/docs/data/histograms/Philippines/FH0160.json
index 3c5388be681..08c587950e6 100644
--- a/docs/data/histograms/Philippines/FH0160.json
+++ b/docs/data/histograms/Philippines/FH0160.json
@@ -1 +1 @@
-{"batchcode": "FH0160", "histograms": [{"batchcodes": ["FH0160"], "histogram": {"Blood pressure increased": 21, "Blood pressure measurement": 21, "Dizziness": 3, "Dyspnoea": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Chest pain": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Chest discomfort": 1, "Cough": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Immunisation": 1, "Maternal exposure during pregnancy": 1, "Musculoskeletal stiffness": 1, "Off label use": 1, "Paraesthesia": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FH0160", "histograms": [{"histogram": {"Blood pressure increased": 21, "Blood pressure measurement": 21, "Dizziness": 3, "Dyspnoea": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Chest pain": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Chest discomfort": 1, "Cough": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Immunisation": 1, "Maternal exposure during pregnancy": 1, "Musculoskeletal stiffness": 1, "Off label use": 1, "Paraesthesia": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["FH0160"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH2528.json b/docs/data/histograms/Philippines/FH2528.json
index 49434d4cade..4e39636c8fe 100644
--- a/docs/data/histograms/Philippines/FH2528.json
+++ b/docs/data/histograms/Philippines/FH2528.json
@@ -1 +1 @@
-{"batchcode": "FH2528", "histograms": [{"batchcodes": ["FH2528"], "histogram": {"Blood pressure increased": 20, "Blood pressure measurement": 14, "Asthenia": 4, "Chest pain": 3, "Dyspnoea": 3, "Body temperature": 2, "Haemorrhage": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Respiratory rate": 2, "Syncope": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Anxiety": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood glucose": 1, "Breast cancer stage IV": 1, "Breast pain": 1, "COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Dizziness": 1, "Drug ineffective": 1, "Flank pain": 1, "Haematemesis": 1, "Haematochezia": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Insomnia": 1, "Malaise": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Palpitations": 1, "Rash": 1, "Rash pruritic": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Thrombocytopenia": 1, "Type 2 diabetes mellitus": 1, "Upper gastrointestinal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FH2528", "histograms": [{"histogram": {"Blood pressure increased": 20, "Blood pressure measurement": 14, "Asthenia": 4, "Chest pain": 3, "Dyspnoea": 3, "Body temperature": 2, "Haemorrhage": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Respiratory rate": 2, "Syncope": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Anxiety": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood glucose": 1, "Breast cancer stage IV": 1, "Breast pain": 1, "COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Dizziness": 1, "Drug ineffective": 1, "Flank pain": 1, "Haematemesis": 1, "Haematochezia": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Insomnia": 1, "Malaise": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Palpitations": 1, "Rash": 1, "Rash pruritic": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Thrombocytopenia": 1, "Type 2 diabetes mellitus": 1, "Upper gastrointestinal haemorrhage": 1}, "batchcodes": ["FH2528"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH3773.json b/docs/data/histograms/Philippines/FH3773.json
index f73a6e77ddf..05460d16a5a 100644
--- a/docs/data/histograms/Philippines/FH3773.json
+++ b/docs/data/histograms/Philippines/FH3773.json
@@ -1 +1 @@
-{"batchcode": "FH3773", "histograms": [{"batchcodes": ["FH3773"], "histogram": {"Diplopia": 1, "Headache": 1, "Pain": 1, "Pain assessment": 1, "Pyrexia": 1, "VIth nerve disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3773", "histograms": [{"histogram": {"Diplopia": 1, "Headache": 1, "Pain": 1, "Pain assessment": 1, "Pyrexia": 1, "VIth nerve disorder": 1}, "batchcodes": ["FH3773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH4365.json b/docs/data/histograms/Philippines/FH4365.json
index a841646f524..709c0698890 100644
--- a/docs/data/histograms/Philippines/FH4365.json
+++ b/docs/data/histograms/Philippines/FH4365.json
@@ -1 +1 @@
-{"batchcode": "FH4365", "histograms": [{"batchcodes": ["FH4365"], "histogram": {"Abdominal pain": 1, "Abdominal pain lower": 1, "Epistaxis": 1, "Haemorrhagic diathesis": 1, "Spontaneous haematoma": 1}}]}
\ No newline at end of file
+{"batchcode": "FH4365", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain lower": 1, "Epistaxis": 1, "Haemorrhagic diathesis": 1, "Spontaneous haematoma": 1}, "batchcodes": ["FH4365"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH4742.json b/docs/data/histograms/Philippines/FH4742.json
index 4528ce119b2..f58a041ff5e 100644
--- a/docs/data/histograms/Philippines/FH4742.json
+++ b/docs/data/histograms/Philippines/FH4742.json
@@ -1 +1 @@
-{"batchcode": "FH4742", "histograms": [{"batchcodes": ["FH4742"], "histogram": {"Injury": 1, "Road traffic accident": 1}}]}
\ No newline at end of file
+{"batchcode": "FH4742", "histograms": [{"histogram": {"Injury": 1, "Road traffic accident": 1}, "batchcodes": ["FH4742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH4752.json b/docs/data/histograms/Philippines/FH4752.json
index a86cf923759..02894b9d5a3 100644
--- a/docs/data/histograms/Philippines/FH4752.json
+++ b/docs/data/histograms/Philippines/FH4752.json
@@ -1 +1 @@
-{"batchcode": "FH4752", "histograms": [{"batchcodes": ["FH4752"], "histogram": {"Syncope": 17, "Dizziness": 7, "Nausea": 7, "Dyspnoea": 3, "Headache": 3, "Hyperhidrosis": 3, "Pyrexia": 2, "Road traffic accident": 2, "Abdominal pain": 1, "Appendicitis perforated": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Cyanosis": 1, "Diabetic ketoacidosis": 1, "Flank pain": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Malaise": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Rash": 1, "Respiratory rate": 1, "Tunnel vision": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FH4752", "histograms": [{"histogram": {"Syncope": 17, "Dizziness": 7, "Nausea": 7, "Dyspnoea": 3, "Headache": 3, "Hyperhidrosis": 3, "Pyrexia": 2, "Road traffic accident": 2, "Abdominal pain": 1, "Appendicitis perforated": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Cyanosis": 1, "Diabetic ketoacidosis": 1, "Flank pain": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Malaise": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Pain": 1, "Pallor": 1, "Palpitations": 1, "Rash": 1, "Respiratory rate": 1, "Tunnel vision": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FH4752"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH4756.json b/docs/data/histograms/Philippines/FH4756.json
index 3b9e13f3a85..d0ed987e90e 100644
--- a/docs/data/histograms/Philippines/FH4756.json
+++ b/docs/data/histograms/Philippines/FH4756.json
@@ -1 +1 @@
-{"batchcode": "FH4756", "histograms": [{"batchcodes": ["FH4756"], "histogram": {"Maternal exposure during pregnancy": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FH4756", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FH4756"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH6357.json b/docs/data/histograms/Philippines/FH6357.json
index 57d5a5bebe4..2411086c3c8 100644
--- a/docs/data/histograms/Philippines/FH6357.json
+++ b/docs/data/histograms/Philippines/FH6357.json
@@ -1 +1 @@
-{"batchcode": "FH6357", "histograms": [{"batchcodes": ["FH6357"], "histogram": {"Abdominal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FH6357", "histograms": [{"histogram": {"Abdominal pain": 1}, "batchcodes": ["FH6357"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH6387.json b/docs/data/histograms/Philippines/FH6387.json
index 58d760d97f0..d9a6a0c0fda 100644
--- a/docs/data/histograms/Philippines/FH6387.json
+++ b/docs/data/histograms/Philippines/FH6387.json
@@ -1 +1 @@
-{"batchcode": "FH6387", "histograms": [{"batchcodes": ["FH6387"], "histogram": {"Heart rate": 4, "Loss of consciousness": 4, "Chest pain": 3, "Dizziness": 3, "Vomiting": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "Death": 2, "Oxygen saturation": 2, "Seizure": 2, "Abdominal pain lower": 1, "Altered state of consciousness": 1, "Deafness": 1, "Delirium": 1, "Diabetic foot": 1, "Dyspnoea": 1, "Eye movement disorder": 1, "Flank pain": 1, "Haematemesis": 1, "Headache": 1, "Heart rate increased": 1, "Hypotension": 1, "Labour pain": 1, "Limb discomfort": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Myocarditis": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Tachycardia": 1, "Urinary incontinence": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FH6387", "histograms": [{"histogram": {"Heart rate": 4, "Loss of consciousness": 4, "Chest pain": 3, "Dizziness": 3, "Vomiting": 3, "Abdominal pain": 2, "Blood pressure measurement": 2, "Death": 2, "Oxygen saturation": 2, "Seizure": 2, "Abdominal pain lower": 1, "Altered state of consciousness": 1, "Deafness": 1, "Delirium": 1, "Diabetic foot": 1, "Dyspnoea": 1, "Eye movement disorder": 1, "Flank pain": 1, "Haematemesis": 1, "Headache": 1, "Heart rate increased": 1, "Hypotension": 1, "Labour pain": 1, "Limb discomfort": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Myocarditis": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Tachycardia": 1, "Urinary incontinence": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1}, "batchcodes": ["FH6387"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH6458.json b/docs/data/histograms/Philippines/FH6458.json
index 695905cfd8a..b9031482a06 100644
--- a/docs/data/histograms/Philippines/FH6458.json
+++ b/docs/data/histograms/Philippines/FH6458.json
@@ -1 +1 @@
-{"batchcode": "FH6458", "histograms": [{"batchcodes": ["FH6458"], "histogram": {"Dizziness": 1, "Dysarthria": 1, "Hemiparesis": 1}}]}
\ No newline at end of file
+{"batchcode": "FH6458", "histograms": [{"histogram": {"Dizziness": 1, "Dysarthria": 1, "Hemiparesis": 1}, "batchcodes": ["FH6458"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH6858.json b/docs/data/histograms/Philippines/FH6858.json
index ac76180bc38..d99b39efc80 100644
--- a/docs/data/histograms/Philippines/FH6858.json
+++ b/docs/data/histograms/Philippines/FH6858.json
@@ -1 +1 @@
-{"batchcode": "FH6858", "histograms": [{"batchcodes": ["FH6858"], "histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "FH6858", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}, "batchcodes": ["FH6858"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH8473.json b/docs/data/histograms/Philippines/FH8473.json
index a3f2df61260..029741648c0 100644
--- a/docs/data/histograms/Philippines/FH8473.json
+++ b/docs/data/histograms/Philippines/FH8473.json
@@ -1 +1 @@
-{"batchcode": "FH8473", "histograms": [{"batchcodes": ["FH8473"], "histogram": {"Discharge": 1, "Dizziness": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8473", "histograms": [{"histogram": {"Discharge": 1, "Dizziness": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FH8473"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH8713.json b/docs/data/histograms/Philippines/FH8713.json
index a9072b65161..3056c7ca885 100644
--- a/docs/data/histograms/Philippines/FH8713.json
+++ b/docs/data/histograms/Philippines/FH8713.json
@@ -1 +1 @@
-{"batchcode": "FH8713", "histograms": [{"batchcodes": ["FH8713"], "histogram": {"Abdominal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8713", "histograms": [{"histogram": {"Abdominal pain": 1}, "batchcodes": ["FH8713"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH8743.json b/docs/data/histograms/Philippines/FH8743.json
index a96211ea582..b4e48a436ed 100644
--- a/docs/data/histograms/Philippines/FH8743.json
+++ b/docs/data/histograms/Philippines/FH8743.json
@@ -1 +1 @@
-{"batchcode": "FH8743", "histograms": [{"batchcodes": ["FH8743"], "histogram": {"Dyspnoea": 1, "Insomnia": 1, "Vaccination site hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8743", "histograms": [{"histogram": {"Dyspnoea": 1, "Insomnia": 1, "Vaccination site hypoaesthesia": 1}, "batchcodes": ["FH8743"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH8760.json b/docs/data/histograms/Philippines/FH8760.json
index edb76ca0c05..4c724839020 100644
--- a/docs/data/histograms/Philippines/FH8760.json
+++ b/docs/data/histograms/Philippines/FH8760.json
@@ -1 +1 @@
-{"batchcode": "FH8760", "histograms": [{"batchcodes": ["FH8760"], "histogram": {"Abdominal pain lower": 1, "Urinary tract obstruction": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8760", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Urinary tract obstruction": 1}, "batchcodes": ["FH8760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH8773 / 320218.json b/docs/data/histograms/Philippines/FH8773 / 320218.json
index eee4d0b01c4..232c14fb152 100644
--- a/docs/data/histograms/Philippines/FH8773 / 320218.json
+++ b/docs/data/histograms/Philippines/FH8773 / 320218.json
@@ -1 +1 @@
-{"batchcode": "FH8773 / 320218", "histograms": [{"batchcodes": ["FH8773 / 320218"], "histogram": {"Cholelithiasis": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8773 / 320218", "histograms": [{"histogram": {"Cholelithiasis": 1, "Urinary tract infection": 1}, "batchcodes": ["FH8773 / 320218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH8773.json b/docs/data/histograms/Philippines/FH8773.json
index 258cd660367..f8ab73073e1 100644
--- a/docs/data/histograms/Philippines/FH8773.json
+++ b/docs/data/histograms/Philippines/FH8773.json
@@ -1 +1 @@
-{"batchcode": "FH8773", "histograms": [{"batchcodes": ["FH8773"], "histogram": {"Blood pressure increased": 16, "Blood pressure measurement": 13, "Dyspnoea": 8, "Pyrexia": 7, "Syncope": 7, "Chest pain": 5, "Headache": 4, "Loss of consciousness": 4, "Seizure": 4, "Asymptomatic COVID-19": 3, "COVID-19 screening": 3, "Dizziness": 3, "Drug ineffective": 3, "Maternal exposure timing unspecified": 3, "Oxygen saturation": 3, "SARS-CoV-2 test": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "COVID-19": 2, "Death": 2, "Erythema": 2, "Labour pain": 2, "Malaise": 2, "Maternal exposure during pregnancy": 2, "Oxygen saturation decreased": 2, "Palpitations": 2, "Pruritus": 2, "Rash": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Acute kidney injury": 1, "Amniorrhoea": 1, "Amoebiasis": 1, "Anaphylactic reaction": 1, "Anaphylactoid reaction": 1, "Arthralgia": 1, "Blood glucose": 1, "Body temperature": 1, "Caesarean section": 1, "Chills": 1, "Chronic kidney disease": 1, "Cleft palate": 1, "Cold sweat": 1, "Coronary artery disease": 1, "Dehydration": 1, "Diabetic ketoacidosis": 1, "Diabetic nephropathy": 1, "Disorientation": 1, "Dysuria": 1, "Eyelid irritation": 1, "Face oedema": 1, "Flushing": 1, "Haematuria": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperemesis gravidarum": 1, "Hypertension": 1, "Hypertensive urgency": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Initial insomnia": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oedema peripheral": 1, "Orbital oedema": 1, "Pain": 1, "Periorbital oedema": 1, "Pneumonia": 1, "Septic shock": 1, "Urinary tract infection": 1, "Uterine contractions during pregnancy": 1, "Uterine spasm": 1, "Vaginal discharge": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8773", "histograms": [{"histogram": {"Blood pressure increased": 16, "Blood pressure measurement": 13, "Dyspnoea": 8, "Pyrexia": 7, "Syncope": 7, "Chest pain": 5, "Headache": 4, "Loss of consciousness": 4, "Seizure": 4, "Asymptomatic COVID-19": 3, "COVID-19 screening": 3, "Dizziness": 3, "Drug ineffective": 3, "Maternal exposure timing unspecified": 3, "Oxygen saturation": 3, "SARS-CoV-2 test": 3, "Vaccination site pain": 3, "Abdominal pain": 2, "COVID-19": 2, "Death": 2, "Erythema": 2, "Labour pain": 2, "Malaise": 2, "Maternal exposure during pregnancy": 2, "Oxygen saturation decreased": 2, "Palpitations": 2, "Pruritus": 2, "Rash": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Acute kidney injury": 1, "Amniorrhoea": 1, "Amoebiasis": 1, "Anaphylactic reaction": 1, "Anaphylactoid reaction": 1, "Arthralgia": 1, "Blood glucose": 1, "Body temperature": 1, "Caesarean section": 1, "Chills": 1, "Chronic kidney disease": 1, "Cleft palate": 1, "Cold sweat": 1, "Coronary artery disease": 1, "Dehydration": 1, "Diabetic ketoacidosis": 1, "Diabetic nephropathy": 1, "Disorientation": 1, "Dysuria": 1, "Eyelid irritation": 1, "Face oedema": 1, "Flushing": 1, "Haematuria": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperemesis gravidarum": 1, "Hypertension": 1, "Hypertensive urgency": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Initial insomnia": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oedema peripheral": 1, "Orbital oedema": 1, "Pain": 1, "Periorbital oedema": 1, "Pneumonia": 1, "Septic shock": 1, "Urinary tract infection": 1, "Uterine contractions during pregnancy": 1, "Uterine spasm": 1, "Vaginal discharge": 1, "Vital signs measurement": 1}, "batchcodes": ["FH8773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FH8847.json b/docs/data/histograms/Philippines/FH8847.json
index aaa0aba36f3..2932080ff59 100644
--- a/docs/data/histograms/Philippines/FH8847.json
+++ b/docs/data/histograms/Philippines/FH8847.json
@@ -1 +1 @@
-{"batchcode": "FH8847", "histograms": [{"batchcodes": ["FH8847"], "histogram": {"Dizziness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8847", "histograms": [{"histogram": {"Dizziness": 1, "Syncope": 1}, "batchcodes": ["FH8847"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FHE22E.json b/docs/data/histograms/Philippines/FHE22E.json
index a8841acc0ff..0898ea568ff 100644
--- a/docs/data/histograms/Philippines/FHE22E.json
+++ b/docs/data/histograms/Philippines/FHE22E.json
@@ -1 +1 @@
-{"batchcode": "FHE22E", "histograms": [{"batchcodes": ["FHE22E"], "histogram": {"Acute coronary syndrome": 1, "Hypertension": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "FHE22E", "histograms": [{"histogram": {"Acute coronary syndrome": 1, "Hypertension": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["FHE22E"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FHO160.json b/docs/data/histograms/Philippines/FHO160.json
index 89f889c7d2b..148367d1fc2 100644
--- a/docs/data/histograms/Philippines/FHO160.json
+++ b/docs/data/histograms/Philippines/FHO160.json
@@ -1 +1 @@
-{"batchcode": "FHO160", "histograms": [{"batchcodes": ["FHO160"], "histogram": {"Flank pain": 1, "Nephrolithiasis": 1}}]}
\ No newline at end of file
+{"batchcode": "FHO160", "histograms": [{"histogram": {"Flank pain": 1, "Nephrolithiasis": 1}, "batchcodes": ["FHO160"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FI8760.json b/docs/data/histograms/Philippines/FI8760.json
index a91f5e560fb..90f30cba5de 100644
--- a/docs/data/histograms/Philippines/FI8760.json
+++ b/docs/data/histograms/Philippines/FI8760.json
@@ -1 +1 @@
-{"batchcode": "FI8760", "histograms": [{"batchcodes": ["FI8760"], "histogram": {"Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FI8760", "histograms": [{"histogram": {"Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Vaccination site pain": 1}, "batchcodes": ["FI8760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FIT4752.json b/docs/data/histograms/Philippines/FIT4752.json
index dfdcea3fb09..f10de5ebb4b 100644
--- a/docs/data/histograms/Philippines/FIT4752.json
+++ b/docs/data/histograms/Philippines/FIT4752.json
@@ -1 +1 @@
-{"batchcode": "FIT4752", "histograms": [{"batchcodes": ["FIT4752"], "histogram": {"Nasopharyngitis": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FIT4752", "histograms": [{"histogram": {"Nasopharyngitis": 1, "Syncope": 1}, "batchcodes": ["FIT4752"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ0760.json b/docs/data/histograms/Philippines/FJ0760.json
index c70e03e3fac..2046b40c435 100644
--- a/docs/data/histograms/Philippines/FJ0760.json
+++ b/docs/data/histograms/Philippines/FJ0760.json
@@ -1 +1 @@
-{"batchcode": "FJ0760", "histograms": [{"batchcodes": ["FJ0760"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ0760", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FJ0760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ5923.json b/docs/data/histograms/Philippines/FJ5923.json
index 1f52804de81..60b85ed857d 100644
--- a/docs/data/histograms/Philippines/FJ5923.json
+++ b/docs/data/histograms/Philippines/FJ5923.json
@@ -1 +1 @@
-{"batchcode": "FJ5923", "histograms": [{"batchcodes": ["FJ5923"], "histogram": {"Blood urine present": 1, "Calculus urinary": 1, "Dysuria": 1, "Inappropriate schedule of product administration": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5923", "histograms": [{"histogram": {"Blood urine present": 1, "Calculus urinary": 1, "Dysuria": 1, "Inappropriate schedule of product administration": 1, "Urinary tract infection": 1}, "batchcodes": ["FJ5923"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ5953.json b/docs/data/histograms/Philippines/FJ5953.json
index 9e80075801c..1d9fbd02138 100644
--- a/docs/data/histograms/Philippines/FJ5953.json
+++ b/docs/data/histograms/Philippines/FJ5953.json
@@ -1 +1 @@
-{"batchcode": "FJ5953", "histograms": [{"batchcodes": ["FJ5953"], "histogram": {"Asthenia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5953", "histograms": [{"histogram": {"Asthenia": 1}, "batchcodes": ["FJ5953"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ5973.json b/docs/data/histograms/Philippines/FJ5973.json
index 96a6ea1ad34..a9bf83b7024 100644
--- a/docs/data/histograms/Philippines/FJ5973.json
+++ b/docs/data/histograms/Philippines/FJ5973.json
@@ -1 +1 @@
-{"batchcode": "FJ5973", "histograms": [{"batchcodes": ["FJ5973"], "histogram": {"Dizziness": 6, "Syncope": 4, "Asthenia": 3, "Blood pressure increased": 3, "Vaccination site pain": 3, "Blood pressure measurement": 2, "Cough": 2, "Pain": 2, "Seizure": 2, "Abdominal pain": 1, "Abnormal behaviour": 1, "Asthma": 1, "Bradycardia": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Chest pain": 1, "Cold sweat": 1, "Constipation": 1, "Decreased appetite": 1, "Dehydration": 1, "Dengue haemorrhagic fever": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysarthria": 1, "Facial pain": 1, "Gastroenteritis": 1, "Headache": 1, "Hypotension": 1, "Infarction": 1, "Labour pain": 1, "Loss of consciousness": 1, "Maternal exposure timing unspecified": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Oropharyngeal pain": 1, "Peptic ulcer": 1, "Pulmonary tuberculosis": 1, "Pyrexia": 1, "Radius fracture": 1, "Road traffic accident": 1, "Urinary tract infection": 1, "Vertigo positional": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5973", "histograms": [{"histogram": {"Dizziness": 6, "Syncope": 4, "Asthenia": 3, "Blood pressure increased": 3, "Vaccination site pain": 3, "Blood pressure measurement": 2, "Cough": 2, "Pain": 2, "Seizure": 2, "Abdominal pain": 1, "Abnormal behaviour": 1, "Asthma": 1, "Bradycardia": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Chest pain": 1, "Cold sweat": 1, "Constipation": 1, "Decreased appetite": 1, "Dehydration": 1, "Dengue haemorrhagic fever": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysarthria": 1, "Facial pain": 1, "Gastroenteritis": 1, "Headache": 1, "Hypotension": 1, "Infarction": 1, "Labour pain": 1, "Loss of consciousness": 1, "Maternal exposure timing unspecified": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Oropharyngeal pain": 1, "Peptic ulcer": 1, "Pulmonary tuberculosis": 1, "Pyrexia": 1, "Radius fracture": 1, "Road traffic accident": 1, "Urinary tract infection": 1, "Vertigo positional": 1, "Wound": 1}, "batchcodes": ["FJ5973"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ59731.json b/docs/data/histograms/Philippines/FJ59731.json
index 6789f475dea..e858f9f1d01 100644
--- a/docs/data/histograms/Philippines/FJ59731.json
+++ b/docs/data/histograms/Philippines/FJ59731.json
@@ -1 +1 @@
-{"batchcode": "FJ59731", "histograms": [{"batchcodes": ["FJ59731"], "histogram": {"Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ59731", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["FJ59731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ826001.json b/docs/data/histograms/Philippines/FJ826001.json
index 9ca95a41713..057399af333 100644
--- a/docs/data/histograms/Philippines/FJ826001.json
+++ b/docs/data/histograms/Philippines/FJ826001.json
@@ -1 +1 @@
-{"batchcode": "FJ826001", "histograms": [{"batchcodes": ["FJ826001"], "histogram": {"Scrotal abscess": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ826001", "histograms": [{"histogram": {"Scrotal abscess": 1}, "batchcodes": ["FJ826001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ830.json b/docs/data/histograms/Philippines/FJ830.json
index 66d1b043ac7..a51669efbdc 100644
--- a/docs/data/histograms/Philippines/FJ830.json
+++ b/docs/data/histograms/Philippines/FJ830.json
@@ -1 +1 @@
-{"batchcode": "FJ830", "histograms": [{"batchcodes": ["086521A", "3106023", "FJ830"], "histogram": {"Asthenia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ830", "histograms": [{"histogram": {"Asthenia": 1, "Vaccination site pain": 1}, "batchcodes": ["086521A", "3106023", "FJ830"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ8757.json b/docs/data/histograms/Philippines/FJ8757.json
index 14aa3153fcf..dc77a3e50eb 100644
--- a/docs/data/histograms/Philippines/FJ8757.json
+++ b/docs/data/histograms/Philippines/FJ8757.json
@@ -1 +1 @@
-{"batchcode": "FJ8757", "histograms": [{"batchcodes": ["FJ8757"], "histogram": {"Abdominal distension": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8757", "histograms": [{"histogram": {"Abdominal distension": 1}, "batchcodes": ["FJ8757"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ8760.json b/docs/data/histograms/Philippines/FJ8760.json
index edfa43a3486..182178212b2 100644
--- a/docs/data/histograms/Philippines/FJ8760.json
+++ b/docs/data/histograms/Philippines/FJ8760.json
@@ -1 +1 @@
-{"batchcode": "FJ8760", "histograms": [{"batchcodes": ["FJ8760"], "histogram": {"Vaccination site pain": 14, "Syncope": 11, "COVID-19": 8, "Cough": 8, "Headache": 8, "Dizziness": 7, "Dyspnoea": 7, "Off label use": 7, "Vomiting": 7, "Blood pressure increased": 6, "Blood pressure measurement": 6, "Interchange of vaccine products": 6, "Nasopharyngitis": 6, "SARS-CoV-2 test": 6, "Abdominal pain": 5, "Drug ineffective": 5, "Loss of consciousness": 5, "Pyrexia": 5, "Body temperature": 4, "Hemiparesis": 4, "Nausea": 4, "Vaginal haemorrhage": 4, "Abdominal pain lower": 3, "Abdominal pain upper": 3, "Back pain": 3, "Bradycardia": 3, "Cold sweat": 3, "Fatigue": 3, "Inappropriate schedule of product administration": 3, "Vaccination failure": 3, "Asthenia": 2, "Cellulitis": 2, "Cerebrovascular accident": 2, "Chills": 2, "Dehydration": 2, "Gastritis": 2, "Heart rate": 2, "Hypotension": 2, "Maternal exposure timing unspecified": 2, "Myalgia": 2, "Open fracture": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Pain in extremity": 2, "Pulmonary tuberculosis": 2, "Rash": 2, "Road traffic accident": 2, "Urinary tract infection": 2, "Abdominal injury": 1, "Anal haemorrhage": 1, "Animal scratch": 1, "Arthralgia": 1, "Blood urine present": 1, "Chest pain": 1, "Cholelithiasis": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Demyelinating polyneuropathy": 1, "Dengue virus test": 1, "Dengue virus test positive": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysuria": 1, "Eye pain": 1, "Familial periodic paralysis": 1, "Febrile convulsion": 1, "Gastroenteritis": 1, "Genital haemorrhage": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematochezia": 1, "Hepatorenal syndrome": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Immunisation": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Mass": 1, "Melaena": 1, "Myocarditis": 1, "Pain": 1, "Pelvic pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pruritus": 1, "Radius fracture": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Rhinitis allergic": 1, "Seizure": 1, "Suspected COVID-19": 1, "Systemic viral infection": 1, "Tibia fracture": 1, "Unresponsive to stimuli": 1, "Uterine dilation and curettage": 1, "Vaccination site hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8760", "histograms": [{"histogram": {"Vaccination site pain": 14, "Syncope": 11, "COVID-19": 8, "Cough": 8, "Headache": 8, "Dizziness": 7, "Dyspnoea": 7, "Off label use": 7, "Vomiting": 7, "Blood pressure increased": 6, "Blood pressure measurement": 6, "Interchange of vaccine products": 6, "Nasopharyngitis": 6, "SARS-CoV-2 test": 6, "Abdominal pain": 5, "Drug ineffective": 5, "Loss of consciousness": 5, "Pyrexia": 5, "Body temperature": 4, "Hemiparesis": 4, "Nausea": 4, "Vaginal haemorrhage": 4, "Abdominal pain lower": 3, "Abdominal pain upper": 3, "Back pain": 3, "Bradycardia": 3, "Cold sweat": 3, "Fatigue": 3, "Inappropriate schedule of product administration": 3, "Vaccination failure": 3, "Asthenia": 2, "Cellulitis": 2, "Cerebrovascular accident": 2, "Chills": 2, "Dehydration": 2, "Gastritis": 2, "Heart rate": 2, "Hypotension": 2, "Maternal exposure timing unspecified": 2, "Myalgia": 2, "Open fracture": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Pain in extremity": 2, "Pulmonary tuberculosis": 2, "Rash": 2, "Road traffic accident": 2, "Urinary tract infection": 2, "Abdominal injury": 1, "Anal haemorrhage": 1, "Animal scratch": 1, "Arthralgia": 1, "Blood urine present": 1, "Chest pain": 1, "Cholelithiasis": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Demyelinating polyneuropathy": 1, "Dengue virus test": 1, "Dengue virus test positive": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysuria": 1, "Eye pain": 1, "Familial periodic paralysis": 1, "Febrile convulsion": 1, "Gastroenteritis": 1, "Genital haemorrhage": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Haematochezia": 1, "Hepatorenal syndrome": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypoglycaemia": 1, "Immunisation": 1, "Injection site hypoaesthesia": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Mass": 1, "Melaena": 1, "Myocarditis": 1, "Pain": 1, "Pelvic pain": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pruritus": 1, "Radius fracture": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Rhinitis allergic": 1, "Seizure": 1, "Suspected COVID-19": 1, "Systemic viral infection": 1, "Tibia fracture": 1, "Unresponsive to stimuli": 1, "Uterine dilation and curettage": 1, "Vaccination site hypoaesthesia": 1}, "batchcodes": ["FJ8760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ8773.json b/docs/data/histograms/Philippines/FJ8773.json
index 4ecf506eb86..64fbef8725e 100644
--- a/docs/data/histograms/Philippines/FJ8773.json
+++ b/docs/data/histograms/Philippines/FJ8773.json
@@ -1 +1 @@
-{"batchcode": "FJ8773", "histograms": [{"batchcodes": ["FJ8773"], "histogram": {"Mass": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8773", "histograms": [{"histogram": {"Mass": 1, "Vaccination site pain": 1}, "batchcodes": ["FJ8773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJ8973.json b/docs/data/histograms/Philippines/FJ8973.json
index 4089fe6a381..c64834e8e0b 100644
--- a/docs/data/histograms/Philippines/FJ8973.json
+++ b/docs/data/histograms/Philippines/FJ8973.json
@@ -1 +1 @@
-{"batchcode": "FJ8973", "histograms": [{"batchcodes": ["FJ8973"], "histogram": {"Dyspnoea": 1, "Maternal exposure timing unspecified": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8973", "histograms": [{"histogram": {"Dyspnoea": 1, "Maternal exposure timing unspecified": 1}, "batchcodes": ["FJ8973"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FJB760.json b/docs/data/histograms/Philippines/FJB760.json
index 965908c66f9..c25fbafdd4d 100644
--- a/docs/data/histograms/Philippines/FJB760.json
+++ b/docs/data/histograms/Philippines/FJB760.json
@@ -1 +1 @@
-{"batchcode": "FJB760", "histograms": [{"batchcodes": ["FJB760"], "histogram": {"Inappropriate schedule of product administration": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FJB760", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Pain": 1}, "batchcodes": ["FJB760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FK6268.json b/docs/data/histograms/Philippines/FK6268.json
index da4eabd5c60..a53118dd785 100644
--- a/docs/data/histograms/Philippines/FK6268.json
+++ b/docs/data/histograms/Philippines/FK6268.json
@@ -1 +1 @@
-{"batchcode": "FK6268", "histograms": [{"batchcodes": ["FK6268"], "histogram": {"Demyelinating polyneuropathy": 1, "Immunisation": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6268", "histograms": [{"histogram": {"Demyelinating polyneuropathy": 1, "Immunisation": 1, "Off label use": 1}, "batchcodes": ["FK6268"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FK6858.json b/docs/data/histograms/Philippines/FK6858.json
index ea24c491094..a3bbca46dc2 100644
--- a/docs/data/histograms/Philippines/FK6858.json
+++ b/docs/data/histograms/Philippines/FK6858.json
@@ -1 +1 @@
-{"batchcode": "FK6858", "histograms": [{"batchcodes": ["FK6858"], "histogram": {"Asthenia": 2, "Caesarean section": 1, "Dysphagia": 1, "Dyspnoea": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6858", "histograms": [{"histogram": {"Asthenia": 2, "Caesarean section": 1, "Dysphagia": 1, "Dyspnoea": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FK6858"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FK9414.json b/docs/data/histograms/Philippines/FK9414.json
index 9eef1395f69..135e84b5a17 100644
--- a/docs/data/histograms/Philippines/FK9414.json
+++ b/docs/data/histograms/Philippines/FK9414.json
@@ -1 +1 @@
-{"batchcode": "FK9414", "histograms": [{"batchcodes": ["FK9414"], "histogram": {"Dyspnoea": 6, "COVID-19": 5, "Drug ineffective": 5, "SARS-CoV-2 test": 5, "Cough": 4, "COVID-19 screening": 3, "Loss of consciousness": 3, "Abdominal pain": 2, "Dizziness": 2, "Pneumonia": 2, "Pyrexia": 2, "Abortion spontaneous": 1, "Acute respiratory distress syndrome": 1, "Aortic arteriosclerosis": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest pain": 1, "Constipation": 1, "Decreased appetite": 1, "Dengue fever": 1, "Dengue virus test positive": 1, "Depressed level of consciousness": 1, "Diabetic ketoacidosis": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Fibrin D dimer": 1, "Glycosylated haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Insomnia": 1, "Lethargy": 1, "Lymphocyte count": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck mass": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Platelet count": 1, "Pollakiuria": 1, "Respiratory rate": 1, "Severe acute respiratory syndrome": 1, "Syncope": 1, "Troponin": 1, "Type 2 diabetes mellitus": 1, "Urine analysis": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9414", "histograms": [{"histogram": {"Dyspnoea": 6, "COVID-19": 5, "Drug ineffective": 5, "SARS-CoV-2 test": 5, "Cough": 4, "COVID-19 screening": 3, "Loss of consciousness": 3, "Abdominal pain": 2, "Dizziness": 2, "Pneumonia": 2, "Pyrexia": 2, "Abortion spontaneous": 1, "Acute respiratory distress syndrome": 1, "Aortic arteriosclerosis": 1, "Asthenia": 1, "Asymptomatic COVID-19": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest pain": 1, "Constipation": 1, "Decreased appetite": 1, "Dengue fever": 1, "Dengue virus test positive": 1, "Depressed level of consciousness": 1, "Diabetic ketoacidosis": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Fibrin D dimer": 1, "Glycosylated haemoglobin": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Insomnia": 1, "Lethargy": 1, "Lymphocyte count": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck mass": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pericarditis": 1, "Platelet count": 1, "Pollakiuria": 1, "Respiratory rate": 1, "Severe acute respiratory syndrome": 1, "Syncope": 1, "Troponin": 1, "Type 2 diabetes mellitus": 1, "Urine analysis": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["FK9414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FK9729.json b/docs/data/histograms/Philippines/FK9729.json
index 5c92462df2a..4f5b5e65951 100644
--- a/docs/data/histograms/Philippines/FK9729.json
+++ b/docs/data/histograms/Philippines/FK9729.json
@@ -1 +1 @@
-{"batchcode": "FK9729", "histograms": [{"batchcodes": ["FK9729"], "histogram": {"Labour pain": 1, "Maternal exposure timing unspecified": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9729", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure timing unspecified": 1}, "batchcodes": ["FK9729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL 5279.json b/docs/data/histograms/Philippines/FL 5279.json
index 56e59713b30..60ef5392ed4 100644
--- a/docs/data/histograms/Philippines/FL 5279.json
+++ b/docs/data/histograms/Philippines/FL 5279.json
@@ -1 +1 @@
-{"batchcode": "FL 5279", "histograms": [{"batchcodes": ["FL 5279"], "histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood urea": 1, "Body temperature": 1, "Death": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysarthria": 1, "Eosinophil count": 1, "Haematocrit": 1, "Heart rate": 1, "High density lipoprotein": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neurological examination": 1, "Neutrophil count": 1, "Prothrombin time": 1, "Respiratory rate": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FL 5279", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood urea": 1, "Body temperature": 1, "Death": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysarthria": 1, "Eosinophil count": 1, "Haematocrit": 1, "Heart rate": 1, "High density lipoprotein": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Monocyte count": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neurological examination": 1, "Neutrophil count": 1, "Prothrombin time": 1, "Respiratory rate": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["FL 5279"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL1420.json b/docs/data/histograms/Philippines/FL1420.json
index 3aaff7e6f07..073dfed180a 100644
--- a/docs/data/histograms/Philippines/FL1420.json
+++ b/docs/data/histograms/Philippines/FL1420.json
@@ -1 +1 @@
-{"batchcode": "FL1420", "histograms": [{"batchcodes": ["FL1420"], "histogram": {"Headache": 1, "Myalgia": 1, "Palpitations": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1420", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1, "Palpitations": 1, "Syncope": 1}, "batchcodes": ["FL1420"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL25324.json b/docs/data/histograms/Philippines/FL25324.json
index 48a4b5cbc37..7b8aba4d7f7 100644
--- a/docs/data/histograms/Philippines/FL25324.json
+++ b/docs/data/histograms/Philippines/FL25324.json
@@ -1 +1 @@
-{"batchcode": "FL25324", "histograms": [{"batchcodes": ["FL25324"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FL25324", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FL25324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL3201.json b/docs/data/histograms/Philippines/FL3201.json
index 92e5f4c91d8..fbb919ee6f7 100644
--- a/docs/data/histograms/Philippines/FL3201.json
+++ b/docs/data/histograms/Philippines/FL3201.json
@@ -1 +1 @@
-{"batchcode": "FL3201", "histograms": [{"batchcodes": ["FL3201"], "histogram": {"Vaccination site pain": 2, "Abdominal pain": 1, "Appendicitis": 1, "Blood pressure increased": 1, "Blood urine present": 1, "Breast mass": 1, "COVID-19": 1, "Dengue fever": 1, "Hemiparesis": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3201", "histograms": [{"histogram": {"Vaccination site pain": 2, "Abdominal pain": 1, "Appendicitis": 1, "Blood pressure increased": 1, "Blood urine present": 1, "Breast mass": 1, "COVID-19": 1, "Dengue fever": 1, "Hemiparesis": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["FL3201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL324.json b/docs/data/histograms/Philippines/FL324.json
index ccfd6315652..1f877065cc2 100644
--- a/docs/data/histograms/Philippines/FL324.json
+++ b/docs/data/histograms/Philippines/FL324.json
@@ -1 +1 @@
-{"batchcode": "FL324", "histograms": [{"batchcodes": ["FL324"], "histogram": {"Abortion incomplete": 1, "Maternal exposure timing unspecified": 1, "Uterine dilation and curettage": 1}}]}
\ No newline at end of file
+{"batchcode": "FL324", "histograms": [{"histogram": {"Abortion incomplete": 1, "Maternal exposure timing unspecified": 1, "Uterine dilation and curettage": 1}, "batchcodes": ["FL324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5029.json b/docs/data/histograms/Philippines/FL5029.json
index 4f2e2d35658..11440b85a28 100644
--- a/docs/data/histograms/Philippines/FL5029.json
+++ b/docs/data/histograms/Philippines/FL5029.json
@@ -1 +1 @@
-{"batchcode": "FL5029", "histograms": [{"batchcodes": ["FL5029"], "histogram": {"Dizziness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5029", "histograms": [{"histogram": {"Dizziness": 1, "Syncope": 1}, "batchcodes": ["FL5029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5234.json b/docs/data/histograms/Philippines/FL5234.json
index 0a1c86911eb..f81be61f871 100644
--- a/docs/data/histograms/Philippines/FL5234.json
+++ b/docs/data/histograms/Philippines/FL5234.json
@@ -1 +1 @@
-{"batchcode": "FL5234", "histograms": [{"batchcodes": ["FL5234"], "histogram": {"Loss of consciousness": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5234", "histograms": [{"histogram": {"Loss of consciousness": 1, "Pallor": 1}, "batchcodes": ["FL5234"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5324.json b/docs/data/histograms/Philippines/FL5324.json
index 7aef14e1815..50dd2488ba3 100644
--- a/docs/data/histograms/Philippines/FL5324.json
+++ b/docs/data/histograms/Philippines/FL5324.json
@@ -1 +1 @@
-{"batchcode": "FL5324", "histograms": [{"batchcodes": ["213C21A", "FL5324"], "histogram": {"Loss of consciousness": 1}}, {"batchcodes": ["FL5324"], "histogram": {"Vaccination site pain": 30, "Blood pressure increased": 21, "Blood pressure measurement": 21, "Abdominal pain": 14, "Dyspnoea": 11, "Off label use": 11, "Dizziness": 10, "Interchange of vaccine products": 10, "Vomiting": 10, "Drug ineffective": 9, "Pyrexia": 9, "Asthenia": 8, "COVID-19": 8, "SARS-CoV-2 test": 8, "Back pain": 7, "Maternal exposure timing unspecified": 6, "Abdominal pain lower": 5, "Body temperature": 5, "Chest pain": 5, "Chills": 5, "Cough": 5, "Headache": 5, "Loss of consciousness": 5, "Pain": 5, "Abdominal pain upper": 4, "Hypertension": 4, "Hypoaesthesia": 4, "Inappropriate schedule of product administration": 4, "Malaise": 4, "Diarrhoea": 3, "Labour pain": 3, "Mass": 3, "Nasopharyngitis": 3, "Road traffic accident": 3, "SARS-CoV-2 test positive": 3, "Syncope": 3, "Urinary tract infection": 3, "Asthma": 2, "Cardiac failure": 2, "Cellulitis": 2, "Chest discomfort": 2, "Death": 2, "Electrocardiogram": 2, "Flank pain": 2, "Oropharyngeal pain": 2, "Pneumonia": 2, "Seizure": 2, "Swelling": 2, "Urosepsis": 2, "Vaccination failure": 2, "Adjustment disorder": 1, "Adrenal mass": 1, "Alcohol poisoning": 1, "Animal bite": 1, "Aortic aneurysm": 1, "Aortitis": 1, "Arteriosclerosis": 1, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Atrioventricular block first degree": 1, "Balance disorder": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Bradycardia": 1, "Brain injury": 1, "Bronchitis": 1, "COVID-19 screening": 1, "Cardiac failure congestive": 1, "Cardiomegaly": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Cholelithiasis": 1, "Chronic obstructive pulmonary disease": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Craniocerebral injury": 1, "Deafness": 1, "Decreased appetite": 1, "Dysarthria": 1, "Dysphagia": 1, "Echocardiogram": 1, "Eye pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrosis": 1, "Furuncle": 1, "Gastroenteritis": 1, "Gastrooesophageal reflux disease": 1, "Genital haemorrhage": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hepatomegaly": 1, "High density lipoprotein": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Hypothermia": 1, "Incorrect route of product administration": 1, "Infection": 1, "Injury": 1, "Intracranial mass": 1, "Left ventricular hypertrophy": 1, "Lethargy": 1, "Livedo reticularis": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Mediastinal disorder": 1, "Melaena": 1, "Metabolic alkalosis": 1, "Multiple injuries": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Nausea": 1, "Neck pain": 1, "Oral candidiasis": 1, "Oxygen saturation": 1, "Painful respiration": 1, "Pallor": 1, "Palpitations": 1, "Peripheral swelling": 1, "Physical examination": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Poisoning": 1, "Postmenopausal haemorrhage": 1, "Procalcitonin": 1, "Productive cough": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Respiratory alkalosis": 1, "Respiratory rate": 1, "Salivary gland neoplasm": 1, "Septic encephalopathy": 1, "Skin abrasion": 1, "Snake bite": 1, "Spinal osteoarthritis": 1, "Suicide attempt": 1, "Swelling face": 1, "Syphilis": 1, "Systemic viral infection": 1, "Tachypnoea": 1, "Type 2 diabetes mellitus": 1, "Ultrasound liver": 1, "Urine analysis": 1, "Vaginal haemorrhage": 1, "Vasospasm": 1, "Vision blurred": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5324", "histograms": [{"histogram": {"Loss of consciousness": 1}, "batchcodes": ["213C21A", "FL5324"]}, {"histogram": {"Vaccination site pain": 30, "Blood pressure increased": 21, "Blood pressure measurement": 21, "Abdominal pain": 14, "Dyspnoea": 11, "Off label use": 11, "Dizziness": 10, "Interchange of vaccine products": 10, "Vomiting": 10, "Drug ineffective": 9, "Pyrexia": 9, "Asthenia": 8, "COVID-19": 8, "SARS-CoV-2 test": 8, "Back pain": 7, "Maternal exposure timing unspecified": 6, "Abdominal pain lower": 5, "Body temperature": 5, "Chest pain": 5, "Chills": 5, "Cough": 5, "Headache": 5, "Loss of consciousness": 5, "Pain": 5, "Abdominal pain upper": 4, "Hypertension": 4, "Hypoaesthesia": 4, "Inappropriate schedule of product administration": 4, "Malaise": 4, "Diarrhoea": 3, "Labour pain": 3, "Mass": 3, "Nasopharyngitis": 3, "Road traffic accident": 3, "SARS-CoV-2 test positive": 3, "Syncope": 3, "Urinary tract infection": 3, "Asthma": 2, "Cardiac failure": 2, "Cellulitis": 2, "Chest discomfort": 2, "Death": 2, "Electrocardiogram": 2, "Flank pain": 2, "Oropharyngeal pain": 2, "Pneumonia": 2, "Seizure": 2, "Swelling": 2, "Urosepsis": 2, "Vaccination failure": 2, "Adjustment disorder": 1, "Adrenal mass": 1, "Alcohol poisoning": 1, "Animal bite": 1, "Aortic aneurysm": 1, "Aortitis": 1, "Arteriosclerosis": 1, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Atrioventricular block first degree": 1, "Balance disorder": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Bradycardia": 1, "Brain injury": 1, "Bronchitis": 1, "COVID-19 screening": 1, "Cardiac failure congestive": 1, "Cardiomegaly": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Cholelithiasis": 1, "Chronic obstructive pulmonary disease": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Craniocerebral injury": 1, "Deafness": 1, "Decreased appetite": 1, "Dysarthria": 1, "Dysphagia": 1, "Echocardiogram": 1, "Eye pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrosis": 1, "Furuncle": 1, "Gastroenteritis": 1, "Gastrooesophageal reflux disease": 1, "Genital haemorrhage": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hepatomegaly": 1, "High density lipoprotein": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Hypothermia": 1, "Incorrect route of product administration": 1, "Infection": 1, "Injury": 1, "Intracranial mass": 1, "Left ventricular hypertrophy": 1, "Lethargy": 1, "Livedo reticularis": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Mediastinal disorder": 1, "Melaena": 1, "Metabolic alkalosis": 1, "Multiple injuries": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myocardial ischaemia": 1, "Nausea": 1, "Neck pain": 1, "Oral candidiasis": 1, "Oxygen saturation": 1, "Painful respiration": 1, "Pallor": 1, "Palpitations": 1, "Peripheral swelling": 1, "Physical examination": 1, "Pleural effusion": 1, "Pneumonia aspiration": 1, "Poisoning": 1, "Postmenopausal haemorrhage": 1, "Procalcitonin": 1, "Productive cough": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Respiratory alkalosis": 1, "Respiratory rate": 1, "Salivary gland neoplasm": 1, "Septic encephalopathy": 1, "Skin abrasion": 1, "Snake bite": 1, "Spinal osteoarthritis": 1, "Suicide attempt": 1, "Swelling face": 1, "Syphilis": 1, "Systemic viral infection": 1, "Tachypnoea": 1, "Type 2 diabetes mellitus": 1, "Ultrasound liver": 1, "Urine analysis": 1, "Vaginal haemorrhage": 1, "Vasospasm": 1, "Vision blurred": 1, "Wound": 1}, "batchcodes": ["FL5324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5328.json b/docs/data/histograms/Philippines/FL5328.json
index bf58eee72c3..62055af5882 100644
--- a/docs/data/histograms/Philippines/FL5328.json
+++ b/docs/data/histograms/Philippines/FL5328.json
@@ -1 +1 @@
-{"batchcode": "FL5328", "histograms": [{"batchcodes": ["FL5328"], "histogram": {"Inappropriate schedule of product administration": 1, "Labour pain": 1, "Maternal exposure timing unspecified": 1, "Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5328", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Labour pain": 1, "Maternal exposure timing unspecified": 1, "Pneumonia": 1}, "batchcodes": ["FL5328"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5333.json b/docs/data/histograms/Philippines/FL5333.json
index 801525bfada..3c5552976d9 100644
--- a/docs/data/histograms/Philippines/FL5333.json
+++ b/docs/data/histograms/Philippines/FL5333.json
@@ -1 +1 @@
-{"batchcode": "FL5333", "histograms": [{"batchcodes": ["FL5333"], "histogram": {"Loss of consciousness": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5333", "histograms": [{"histogram": {"Loss of consciousness": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["FL5333"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5341.json b/docs/data/histograms/Philippines/FL5341.json
index df31a93ca56..6f329e82852 100644
--- a/docs/data/histograms/Philippines/FL5341.json
+++ b/docs/data/histograms/Philippines/FL5341.json
@@ -1 +1 @@
-{"batchcode": "FL5341", "histograms": [{"batchcodes": ["FL5341"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5341", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FL5341"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5354.json b/docs/data/histograms/Philippines/FL5354.json
index bb5a25b70bd..d5e049c0037 100644
--- a/docs/data/histograms/Philippines/FL5354.json
+++ b/docs/data/histograms/Philippines/FL5354.json
@@ -1 +1 @@
-{"batchcode": "FL5354", "histograms": [{"batchcodes": ["FL5354"], "histogram": {"Back pain": 1, "Maternal exposure during pregnancy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5354", "histograms": [{"histogram": {"Back pain": 1, "Maternal exposure during pregnancy": 1, "Vaccination site pain": 1}, "batchcodes": ["FL5354"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL572.json b/docs/data/histograms/Philippines/FL572.json
index d4203022faa..e58e02aacd9 100644
--- a/docs/data/histograms/Philippines/FL572.json
+++ b/docs/data/histograms/Philippines/FL572.json
@@ -1 +1 @@
-{"batchcode": "FL572", "histograms": [{"batchcodes": ["FL572"], "histogram": {"Cardiac failure": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FL572", "histograms": [{"histogram": {"Cardiac failure": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Swelling": 1}, "batchcodes": ["FL572"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL5729.json b/docs/data/histograms/Philippines/FL5729.json
index 0d2a075acd5..7f40b948b9b 100644
--- a/docs/data/histograms/Philippines/FL5729.json
+++ b/docs/data/histograms/Philippines/FL5729.json
@@ -1 +1 @@
-{"batchcode": "FL5729", "histograms": [{"batchcodes": ["FL5729"], "histogram": {"Syncope": 6, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Malaise": 2, "Pyrexia": 2, "COVID-19": 1, "Chills": 1, "Depressed level of consciousness": 1, "Drug ineffective": 1, "Eye disorder": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Mastication disorder": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Presyncope": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FL5729", "histograms": [{"histogram": {"Syncope": 6, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Malaise": 2, "Pyrexia": 2, "COVID-19": 1, "Chills": 1, "Depressed level of consciousness": 1, "Drug ineffective": 1, "Eye disorder": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Mastication disorder": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Presyncope": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FL5729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL8324.json b/docs/data/histograms/Philippines/FL8324.json
index 4df038eb90a..88d76527f29 100644
--- a/docs/data/histograms/Philippines/FL8324.json
+++ b/docs/data/histograms/Philippines/FL8324.json
@@ -1 +1 @@
-{"batchcode": "FL8324", "histograms": [{"batchcodes": ["FL8324"], "histogram": {"Dizziness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8324", "histograms": [{"histogram": {"Dizziness": 1, "Vaccination site pain": 1}, "batchcodes": ["FL8324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL8392.json b/docs/data/histograms/Philippines/FL8392.json
index 3e6f4487c16..e485da9b62d 100644
--- a/docs/data/histograms/Philippines/FL8392.json
+++ b/docs/data/histograms/Philippines/FL8392.json
@@ -1 +1 @@
-{"batchcode": "FL8392", "histograms": [{"batchcodes": ["FL8392"], "histogram": {"Abdominal pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8392", "histograms": [{"histogram": {"Abdominal pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["FL8392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FL874.json b/docs/data/histograms/Philippines/FL874.json
index 2582e983e97..8e40e18d2f5 100644
--- a/docs/data/histograms/Philippines/FL874.json
+++ b/docs/data/histograms/Philippines/FL874.json
@@ -1 +1 @@
-{"batchcode": "FL874", "histograms": [{"batchcodes": ["FL874"], "histogram": {"Pain": 1, "Swelling": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FL874", "histograms": [{"histogram": {"Pain": 1, "Swelling": 1, "Vaccination site pain": 1}, "batchcodes": ["FL874"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FLC324.json b/docs/data/histograms/Philippines/FLC324.json
index 464090cca52..8120e66fc0d 100644
--- a/docs/data/histograms/Philippines/FLC324.json
+++ b/docs/data/histograms/Philippines/FLC324.json
@@ -1 +1 @@
-{"batchcode": "FLC324", "histograms": [{"batchcodes": ["FLC324"], "histogram": {"Type 2 diabetes mellitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FLC324", "histograms": [{"histogram": {"Type 2 diabetes mellitus": 1}, "batchcodes": ["FLC324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FLI324.json b/docs/data/histograms/Philippines/FLI324.json
index bc0fbde1634..e34859391db 100644
--- a/docs/data/histograms/Philippines/FLI324.json
+++ b/docs/data/histograms/Philippines/FLI324.json
@@ -1 +1 @@
-{"batchcode": "FLI324", "histograms": [{"batchcodes": ["FLI324"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FLI324", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["FLI324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FLJ324.json b/docs/data/histograms/Philippines/FLJ324.json
index df67ab85cc1..823cc8573cf 100644
--- a/docs/data/histograms/Philippines/FLJ324.json
+++ b/docs/data/histograms/Philippines/FLJ324.json
@@ -1 +1 @@
-{"batchcode": "FLJ324", "histograms": [{"batchcodes": ["FLJ324"], "histogram": {"Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FLJ324", "histograms": [{"histogram": {"Vaginal haemorrhage": 1}, "batchcodes": ["FLJ324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM-9090.json b/docs/data/histograms/Philippines/FM-9090.json
index 8411d085a25..40568d9f5b5 100644
--- a/docs/data/histograms/Philippines/FM-9090.json
+++ b/docs/data/histograms/Philippines/FM-9090.json
@@ -1 +1 @@
-{"batchcode": "FM-9090", "histograms": [{"batchcodes": ["FM-9090", "K003B"], "histogram": {"Death": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FM-9090", "histograms": [{"histogram": {"Death": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Suspected COVID-19": 1}, "batchcodes": ["FM-9090", "K003B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM2960.json b/docs/data/histograms/Philippines/FM2960.json
index 7f44122f094..e62abffb3e4 100644
--- a/docs/data/histograms/Philippines/FM2960.json
+++ b/docs/data/histograms/Philippines/FM2960.json
@@ -1 +1 @@
-{"batchcode": "FM2960", "histograms": [{"batchcodes": ["FM2960"], "histogram": {"Dizziness": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Body temperature": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Maternal exposure timing unspecified": 1, "Myocarditis": 1, "Nausea": 1, "Off label use": 1, "Pruritus": 1, "Rash": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2960", "histograms": [{"histogram": {"Dizziness": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Body temperature": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Maternal exposure timing unspecified": 1, "Myocarditis": 1, "Nausea": 1, "Off label use": 1, "Pruritus": 1, "Rash": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["FM2960"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM2961.json b/docs/data/histograms/Philippines/FM2961.json
index 10f4f027918..96a62ee0819 100644
--- a/docs/data/histograms/Philippines/FM2961.json
+++ b/docs/data/histograms/Philippines/FM2961.json
@@ -1 +1 @@
-{"batchcode": "FM2961", "histograms": [{"batchcodes": ["FM2961"], "histogram": {"Asthenia": 1, "Auscultation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart rate": 1, "Hypotension": 1, "Malaise": 1, "Nausea": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2961", "histograms": [{"histogram": {"Asthenia": 1, "Auscultation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart rate": 1, "Hypotension": 1, "Malaise": 1, "Nausea": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Wheezing": 1}, "batchcodes": ["FM2961"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM2964.json b/docs/data/histograms/Philippines/FM2964.json
index 448c0224e81..2430e33f8c4 100644
--- a/docs/data/histograms/Philippines/FM2964.json
+++ b/docs/data/histograms/Philippines/FM2964.json
@@ -1 +1 @@
-{"batchcode": "FM2964", "histograms": [{"batchcodes": ["FM2964"], "histogram": {"Syncope": 11, "Dizziness": 7, "COVID-19": 5, "Drug ineffective": 5, "SARS-CoV-2 test": 5, "Blood pressure measurement": 4, "Cough": 4, "Headache": 4, "Malaise": 4, "Pyrexia": 4, "Abdominal pain upper": 3, "Nasopharyngitis": 3, "Off label use": 3, "Rash": 3, "Blood pressure increased": 2, "Body temperature": 2, "Dyspnoea": 2, "Heart rate": 2, "Immunisation": 2, "Loss of consciousness": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Pallor": 2, "Respiratory rate": 2, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Blood potassium": 1, "Cholelithiasis": 1, "Decreased appetite": 1, "Dengue fever": 1, "Dyspnoea at rest": 1, "Epistaxis": 1, "Expired product administered": 1, "Facial asymmetry": 1, "Facial paralysis": 1, "Facial paresis": 1, "Haematemesis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Labour pain": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Nephropathy": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Periorbital oedema": 1, "Pneumonia": 1, "Rash pruritic": 1, "Streptococcus test": 1, "Thrombocytopenia": 1, "Type 2 diabetes mellitus": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2964", "histograms": [{"histogram": {"Syncope": 11, "Dizziness": 7, "COVID-19": 5, "Drug ineffective": 5, "SARS-CoV-2 test": 5, "Blood pressure measurement": 4, "Cough": 4, "Headache": 4, "Malaise": 4, "Pyrexia": 4, "Abdominal pain upper": 3, "Nasopharyngitis": 3, "Off label use": 3, "Rash": 3, "Blood pressure increased": 2, "Body temperature": 2, "Dyspnoea": 2, "Heart rate": 2, "Immunisation": 2, "Loss of consciousness": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Pallor": 2, "Respiratory rate": 2, "Arthralgia": 1, "Asymptomatic COVID-19": 1, "Blood potassium": 1, "Cholelithiasis": 1, "Decreased appetite": 1, "Dengue fever": 1, "Dyspnoea at rest": 1, "Epistaxis": 1, "Expired product administered": 1, "Facial asymmetry": 1, "Facial paralysis": 1, "Facial paresis": 1, "Haematemesis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Labour pain": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Nephropathy": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Periorbital oedema": 1, "Pneumonia": 1, "Rash pruritic": 1, "Streptococcus test": 1, "Thrombocytopenia": 1, "Type 2 diabetes mellitus": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FM2964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM2966.json b/docs/data/histograms/Philippines/FM2966.json
index c7f5bdcf11d..0acdc50f221 100644
--- a/docs/data/histograms/Philippines/FM2966.json
+++ b/docs/data/histograms/Philippines/FM2966.json
@@ -1 +1 @@
-{"batchcode": "FM2966", "histograms": [{"batchcodes": ["213C21A", "FM2966"], "histogram": {"Back pain": 1}}, {"batchcodes": ["ACB3221", "FM2966"], "histogram": {"Vaccination site pain": 1}}, {"batchcodes": ["FM2966"], "histogram": {"Off label use": 9, "Immunisation": 7, "Dyspnoea": 6, "Pyrexia": 6, "Headache": 5, "Back pain": 3, "Hypertension": 3, "Interchange of vaccine products": 3, "Loss of consciousness": 3, "Vaccination site pain": 3, "Vomiting": 3, "COVID-19": 2, "Chest pain": 2, "Cough": 2, "Drug ineffective": 2, "Dysarthria": 2, "Hypoaesthesia": 2, "Malaise": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Arthralgia": 1, "Bell's palsy": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body temperature": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chills": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysuria": 1, "Eye inflammation": 1, "Facial asymmetry": 1, "Flushing": 1, "Gouty arthritis": 1, "Haemorrhage intracranial": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "Injection site pain": 1, "Ischaemic cerebral infarction": 1, "Mitral valve incompetence": 1, "Myalgia": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Periorbital oedema": 1, "Pneumonia": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Ultrasound scan": 1, "Upper gastrointestinal haemorrhage": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "FM2966", "histograms": [{"histogram": {"Back pain": 1}, "batchcodes": ["213C21A", "FM2966"]}, {"histogram": {"Vaccination site pain": 1}, "batchcodes": ["ACB3221", "FM2966"]}, {"histogram": {"Off label use": 9, "Immunisation": 7, "Dyspnoea": 6, "Pyrexia": 6, "Headache": 5, "Back pain": 3, "Hypertension": 3, "Interchange of vaccine products": 3, "Loss of consciousness": 3, "Vaccination site pain": 3, "Vomiting": 3, "COVID-19": 2, "Chest pain": 2, "Cough": 2, "Drug ineffective": 2, "Dysarthria": 2, "Hypoaesthesia": 2, "Malaise": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Arthralgia": 1, "Bell's palsy": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body temperature": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chills": 1, "Coma scale": 1, "Coma scale abnormal": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysuria": 1, "Eye inflammation": 1, "Facial asymmetry": 1, "Flushing": 1, "Gouty arthritis": 1, "Haemorrhage intracranial": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypotension": 1, "Hypovolaemic shock": 1, "Injection site pain": 1, "Ischaemic cerebral infarction": 1, "Mitral valve incompetence": 1, "Myalgia": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Periorbital oedema": 1, "Pneumonia": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Ultrasound scan": 1, "Upper gastrointestinal haemorrhage": 1, "Vaccination site erythema": 1}, "batchcodes": ["FM2966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM4073.json b/docs/data/histograms/Philippines/FM4073.json
index 1b7ca7542f2..ccc81199ec6 100644
--- a/docs/data/histograms/Philippines/FM4073.json
+++ b/docs/data/histograms/Philippines/FM4073.json
@@ -1 +1 @@
-{"batchcode": "FM4073", "histograms": [{"batchcodes": ["FM4073"], "histogram": {"Body temperature": 1, "Cold sweat": 1, "Dizziness": 1, "Heart rate": 1, "Oxygen saturation": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "FM4073", "histograms": [{"histogram": {"Body temperature": 1, "Cold sweat": 1, "Dizziness": 1, "Heart rate": 1, "Oxygen saturation": 1, "Respiratory rate": 1}, "batchcodes": ["FM4073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM7375.json b/docs/data/histograms/Philippines/FM7375.json
index 4fd4113d497..5535719fcd6 100644
--- a/docs/data/histograms/Philippines/FM7375.json
+++ b/docs/data/histograms/Philippines/FM7375.json
@@ -1 +1 @@
-{"batchcode": "FM7375", "histograms": [{"batchcodes": ["209C21A", "D17K21A", "FM7375"], "histogram": {"Depressed level of consciousness": 1}}, {"batchcodes": ["FM7375"], "histogram": {"Immunisation": 2, "Off label use": 2, "Agitation": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chills": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Interchange of vaccine products": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7375", "histograms": [{"histogram": {"Depressed level of consciousness": 1}, "batchcodes": ["209C21A", "D17K21A", "FM7375"]}, {"histogram": {"Immunisation": 2, "Off label use": 2, "Agitation": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chills": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Interchange of vaccine products": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vital signs measurement": 1}, "batchcodes": ["FM7375"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM7783.json b/docs/data/histograms/Philippines/FM7783.json
index 11e2f56710a..e72e4f50e5a 100644
--- a/docs/data/histograms/Philippines/FM7783.json
+++ b/docs/data/histograms/Philippines/FM7783.json
@@ -1 +1 @@
-{"batchcode": "FM7783", "histograms": [{"batchcodes": ["FM7783"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7783", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["FM7783"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM7785.json b/docs/data/histograms/Philippines/FM7785.json
index eb9e8868636..db1d012a598 100644
--- a/docs/data/histograms/Philippines/FM7785.json
+++ b/docs/data/histograms/Philippines/FM7785.json
@@ -1 +1 @@
-{"batchcode": "FM7785", "histograms": [{"batchcodes": ["FM7785"], "histogram": {"Vaccination site pain": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Cerebral haemorrhage": 1, "Cerebrovascular disorder": 1, "Dysuria": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Skin laceration": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7785", "histograms": [{"histogram": {"Vaccination site pain": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Cerebral haemorrhage": 1, "Cerebrovascular disorder": 1, "Dysuria": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Skin laceration": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FM7785"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM7788.json b/docs/data/histograms/Philippines/FM7788.json
index 60932cb6834..270f8b78c3e 100644
--- a/docs/data/histograms/Philippines/FM7788.json
+++ b/docs/data/histograms/Philippines/FM7788.json
@@ -1 +1 @@
-{"batchcode": "FM7788", "histograms": [{"batchcodes": ["FM7788"], "histogram": {"Chronic kidney disease": 1, "Oedema peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "FM7788", "histograms": [{"histogram": {"Chronic kidney disease": 1, "Oedema peripheral": 1}, "batchcodes": ["FM7788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FM9090.json b/docs/data/histograms/Philippines/FM9090.json
index 0a0e1af8aed..146d82c5332 100644
--- a/docs/data/histograms/Philippines/FM9090.json
+++ b/docs/data/histograms/Philippines/FM9090.json
@@ -1 +1 @@
-{"batchcode": "FM9090", "histograms": [{"batchcodes": ["FM9090"], "histogram": {"Condition aggravated": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Panic attack": 1, "SARS-CoV-2 test": 1, "Sleep deficit": 1}}]}
\ No newline at end of file
+{"batchcode": "FM9090", "histograms": [{"histogram": {"Condition aggravated": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Panic attack": 1, "SARS-CoV-2 test": 1, "Sleep deficit": 1}, "batchcodes": ["FM9090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN 4073.json b/docs/data/histograms/Philippines/FN 4073.json
index ce581f69be0..4a02caf4ffd 100644
--- a/docs/data/histograms/Philippines/FN 4073.json
+++ b/docs/data/histograms/Philippines/FN 4073.json
@@ -1 +1 @@
-{"batchcode": "FN 4073", "histograms": [{"batchcodes": ["FN 4073"], "histogram": {"Depressed level of consciousness": 1, "Headache": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN 4073", "histograms": [{"histogram": {"Depressed level of consciousness": 1, "Headache": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["FN 4073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN 4077.json b/docs/data/histograms/Philippines/FN 4077.json
index 2bc60b0cb1e..68a0aab7a1b 100644
--- a/docs/data/histograms/Philippines/FN 4077.json
+++ b/docs/data/histograms/Philippines/FN 4077.json
@@ -1 +1 @@
-{"batchcode": "FN 4077", "histograms": [{"batchcodes": ["FN 4077"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FN 4077", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FN 4077"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN 4365.json b/docs/data/histograms/Philippines/FN 4365.json
index 74bc49bc674..ea48953f215 100644
--- a/docs/data/histograms/Philippines/FN 4365.json
+++ b/docs/data/histograms/Philippines/FN 4365.json
@@ -1 +1 @@
-{"batchcode": "FN 4365", "histograms": [{"batchcodes": ["FN 4365"], "histogram": {"Seizure": 2, "Sudden death": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Epistaxis": 1, "Generalised tonic-clonic seizure": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FN 4365", "histograms": [{"histogram": {"Seizure": 2, "Sudden death": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Epistaxis": 1, "Generalised tonic-clonic seizure": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["FN 4365"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN2966.json b/docs/data/histograms/Philippines/FN2966.json
index 11012394479..3cd7780ea4e 100644
--- a/docs/data/histograms/Philippines/FN2966.json
+++ b/docs/data/histograms/Philippines/FN2966.json
@@ -1 +1 @@
-{"batchcode": "FN2966", "histograms": [{"batchcodes": ["FN2966"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Road traffic accident": 1, "Subarachnoid haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2966", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Road traffic accident": 1, "Subarachnoid haemorrhage": 1}, "batchcodes": ["FN2966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN3465.json b/docs/data/histograms/Philippines/FN3465.json
index b73c2458b8f..113fcaa7443 100644
--- a/docs/data/histograms/Philippines/FN3465.json
+++ b/docs/data/histograms/Philippines/FN3465.json
@@ -1 +1 @@
-{"batchcode": "FN3465", "histograms": [{"batchcodes": ["FN3465"], "histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Interchange of vaccine products": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FN3465", "histograms": [{"histogram": {"Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Interchange of vaccine products": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1}, "batchcodes": ["FN3465"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN365.json b/docs/data/histograms/Philippines/FN365.json
index c82f853bcc7..0f1e02b08cb 100644
--- a/docs/data/histograms/Philippines/FN365.json
+++ b/docs/data/histograms/Philippines/FN365.json
@@ -1 +1 @@
-{"batchcode": "FN365", "histograms": [{"batchcodes": ["FN365"], "histogram": {"Abdominal pain lower": 1, "Imminent abortion": 1, "Interchange of vaccine products": 1, "Maternal exposure during pregnancy": 1, "Off label use": 1, "Pregnancy test": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FN365", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Imminent abortion": 1, "Interchange of vaccine products": 1, "Maternal exposure during pregnancy": 1, "Off label use": 1, "Pregnancy test": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FN365"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN407.json b/docs/data/histograms/Philippines/FN407.json
index f8dfe88400f..7f8574fd1f9 100644
--- a/docs/data/histograms/Philippines/FN407.json
+++ b/docs/data/histograms/Philippines/FN407.json
@@ -1 +1 @@
-{"batchcode": "FN407", "histograms": [{"batchcodes": ["FN407"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FN407", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["FN407"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4073.json b/docs/data/histograms/Philippines/FN4073.json
index c7bbd69ac70..647832ea8c3 100644
--- a/docs/data/histograms/Philippines/FN4073.json
+++ b/docs/data/histograms/Philippines/FN4073.json
@@ -1 +1 @@
-{"batchcode": "FN4073", "histograms": [{"batchcodes": ["FN4073"], "histogram": {"Syncope": 8, "Pyrexia": 7, "Dizziness": 6, "Seizure": 4, "Abdominal pain": 3, "Headache": 3, "Rash": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Nausea": 2, "Angioedema": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Conjunctival pallor": 1, "Contusion": 1, "Decreased appetite": 1, "Dengue fever": 1, "Febrile convulsion": 1, "Heart rate": 1, "Nasopharyngitis": 1, "Oxygen saturation": 1, "Pruritus": 1, "Respiratory arrest": 1, "Septic shock": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4073", "histograms": [{"histogram": {"Syncope": 8, "Pyrexia": 7, "Dizziness": 6, "Seizure": 4, "Abdominal pain": 3, "Headache": 3, "Rash": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Nausea": 2, "Angioedema": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Conjunctival pallor": 1, "Contusion": 1, "Decreased appetite": 1, "Dengue fever": 1, "Febrile convulsion": 1, "Heart rate": 1, "Nasopharyngitis": 1, "Oxygen saturation": 1, "Pruritus": 1, "Respiratory arrest": 1, "Septic shock": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["FN4073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4075.json b/docs/data/histograms/Philippines/FN4075.json
index b9c3bb5eee6..756251da2c4 100644
--- a/docs/data/histograms/Philippines/FN4075.json
+++ b/docs/data/histograms/Philippines/FN4075.json
@@ -1 +1 @@
-{"batchcode": "FN4075", "histograms": [{"batchcodes": ["FN4075"], "histogram": {"Pyrexia": 21, "Vomiting": 15, "Asthenia": 7, "Body temperature": 7, "Loss of consciousness": 7, "Dyspnoea": 6, "Headache": 6, "Malaise": 6, "Dizziness": 5, "Cough": 4, "Decreased appetite": 4, "Rash": 4, "Abdominal pain": 3, "Fatigue": 3, "Pallor": 3, "Palpitations": 3, "Platelet count": 3, "Seizure": 3, "Vaccination site pain": 3, "Abdominal pain upper": 2, "Arthralgia": 2, "COVID-19": 2, "Dengue virus test positive": 2, "Diarrhoea": 2, "Flushing": 2, "Oedema peripheral": 2, "Platelet count decreased": 2, "Syncope": 2, "Abdominal pain lower": 1, "Chest discomfort": 1, "Dengue fever": 1, "Dengue virus test": 1, "Drug ineffective": 1, "Epistaxis": 1, "Facial paralysis": 1, "Febrile convulsion": 1, "Gingival bleeding": 1, "Haematemesis": 1, "Heart rate increased": 1, "Hypoacusis": 1, "Lid sulcus deepened": 1, "Lymphadenopathy": 1, "Mucosal dryness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain in extremity": 1, "Periorbital oedema": 1, "Peripheral swelling": 1, "Petechiae": 1, "Platelet count abnormal": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Urticaria": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4075", "histograms": [{"histogram": {"Pyrexia": 21, "Vomiting": 15, "Asthenia": 7, "Body temperature": 7, "Loss of consciousness": 7, "Dyspnoea": 6, "Headache": 6, "Malaise": 6, "Dizziness": 5, "Cough": 4, "Decreased appetite": 4, "Rash": 4, "Abdominal pain": 3, "Fatigue": 3, "Pallor": 3, "Palpitations": 3, "Platelet count": 3, "Seizure": 3, "Vaccination site pain": 3, "Abdominal pain upper": 2, "Arthralgia": 2, "COVID-19": 2, "Dengue virus test positive": 2, "Diarrhoea": 2, "Flushing": 2, "Oedema peripheral": 2, "Platelet count decreased": 2, "Syncope": 2, "Abdominal pain lower": 1, "Chest discomfort": 1, "Dengue fever": 1, "Dengue virus test": 1, "Drug ineffective": 1, "Epistaxis": 1, "Facial paralysis": 1, "Febrile convulsion": 1, "Gingival bleeding": 1, "Haematemesis": 1, "Heart rate increased": 1, "Hypoacusis": 1, "Lid sulcus deepened": 1, "Lymphadenopathy": 1, "Mucosal dryness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain in extremity": 1, "Periorbital oedema": 1, "Peripheral swelling": 1, "Petechiae": 1, "Platelet count abnormal": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Urticaria": 1, "Vision blurred": 1}, "batchcodes": ["FN4075"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4077.json b/docs/data/histograms/Philippines/FN4077.json
index cf92e43c1cc..e4becca7adf 100644
--- a/docs/data/histograms/Philippines/FN4077.json
+++ b/docs/data/histograms/Philippines/FN4077.json
@@ -1 +1 @@
-{"batchcode": "FN4077", "histograms": [{"batchcodes": ["FN4077"], "histogram": {"Pyrexia": 9, "Dizziness": 5, "Blood pressure measurement": 4, "Body temperature": 4, "Headache": 4, "Vomiting": 4, "Cough": 3, "Oxygen saturation": 3, "Syncope": 3, "Drug ineffective": 2, "Heart rate": 2, "Hypotension": 2, "Respiratory rate": 2, "Seizure": 2, "Angioedema": 1, "Blood pressure increased": 1, "COVID-19": 1, "Capillary nail refill test": 1, "Capillary nail refill test abnormal": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Nasopharyngitis": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pruritus": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4077", "histograms": [{"histogram": {"Pyrexia": 9, "Dizziness": 5, "Blood pressure measurement": 4, "Body temperature": 4, "Headache": 4, "Vomiting": 4, "Cough": 3, "Oxygen saturation": 3, "Syncope": 3, "Drug ineffective": 2, "Heart rate": 2, "Hypotension": 2, "Respiratory rate": 2, "Seizure": 2, "Angioedema": 1, "Blood pressure increased": 1, "COVID-19": 1, "Capillary nail refill test": 1, "Capillary nail refill test abnormal": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Nasopharyngitis": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pruritus": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Swelling": 1}, "batchcodes": ["FN4077"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4268.json b/docs/data/histograms/Philippines/FN4268.json
index 35cbd8b1eff..bce4444441e 100644
--- a/docs/data/histograms/Philippines/FN4268.json
+++ b/docs/data/histograms/Philippines/FN4268.json
@@ -1 +1 @@
-{"batchcode": "FN4268", "histograms": [{"batchcodes": ["FN4268"], "histogram": {"Dizziness": 1, "Facial paralysis": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4268", "histograms": [{"histogram": {"Dizziness": 1, "Facial paralysis": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["FN4268"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4361.json b/docs/data/histograms/Philippines/FN4361.json
index c54013beddd..14c48f7716d 100644
--- a/docs/data/histograms/Philippines/FN4361.json
+++ b/docs/data/histograms/Philippines/FN4361.json
@@ -1 +1 @@
-{"batchcode": "FN4361", "histograms": [{"batchcodes": ["FN4361"], "histogram": {"Dehydration": 1, "Diarrhoea": 1, "Headache": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4361", "histograms": [{"histogram": {"Dehydration": 1, "Diarrhoea": 1, "Headache": 1, "Vomiting": 1}, "batchcodes": ["FN4361"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4365.json b/docs/data/histograms/Philippines/FN4365.json
index 6f0500c5c30..bb7c2c92a54 100644
--- a/docs/data/histograms/Philippines/FN4365.json
+++ b/docs/data/histograms/Philippines/FN4365.json
@@ -1 +1 @@
-{"batchcode": "FN4365", "histograms": [{"batchcodes": ["FN4365"], "histogram": {"Blood pressure measurement": 49, "Blood pressure increased": 47, "Dizziness": 6, "Dyspnoea": 6, "Seizure": 6, "Vomiting": 6, "Interchange of vaccine products": 5, "Off label use": 5, "Pyrexia": 5, "Decreased appetite": 3, "Headache": 3, "Myalgia": 3, "Nausea": 3, "Arthralgia": 2, "Asthenia": 2, "Chest pain": 2, "Cough": 2, "Fatigue": 2, "Hypertensive urgency": 2, "Loss of consciousness": 2, "Malaise": 2, "Rash": 2, "Syncope": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Appendicitis": 1, "Arrhythmia": 1, "Asymptomatic COVID-19": 1, "Body temperature": 1, "COVID-19": 1, "COVID-19 screening": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiac failure congestive": 1, "Cardiopulmonary failure": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Deafness": 1, "Delirium": 1, "Dengue fever": 1, "Depressed level of consciousness": 1, "Diabetes mellitus inadequate control": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Drowning": 1, "Drug ineffective": 1, "Dysphagia": 1, "Electroencephalogram": 1, "Encephalitis post immunisation": 1, "Faeces soft": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immunisation": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Nasopharyngitis": 1, "Pain assessment": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Skin abrasion": 1, "Vaccination failure": 1, "Vaccination site discharge": 1, "Vaccination site pain": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4365", "histograms": [{"histogram": {"Blood pressure measurement": 49, "Blood pressure increased": 47, "Dizziness": 6, "Dyspnoea": 6, "Seizure": 6, "Vomiting": 6, "Interchange of vaccine products": 5, "Off label use": 5, "Pyrexia": 5, "Decreased appetite": 3, "Headache": 3, "Myalgia": 3, "Nausea": 3, "Arthralgia": 2, "Asthenia": 2, "Chest pain": 2, "Cough": 2, "Fatigue": 2, "Hypertensive urgency": 2, "Loss of consciousness": 2, "Malaise": 2, "Rash": 2, "Syncope": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Appendicitis": 1, "Arrhythmia": 1, "Asymptomatic COVID-19": 1, "Body temperature": 1, "COVID-19": 1, "COVID-19 screening": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiac failure congestive": 1, "Cardiopulmonary failure": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Deafness": 1, "Delirium": 1, "Dengue fever": 1, "Depressed level of consciousness": 1, "Diabetes mellitus inadequate control": 1, "Diabetic ketoacidosis": 1, "Diarrhoea": 1, "Drowning": 1, "Drug ineffective": 1, "Dysphagia": 1, "Electroencephalogram": 1, "Encephalitis post immunisation": 1, "Faeces soft": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immunisation": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Nasopharyngitis": 1, "Pain assessment": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 test": 1, "Skin abrasion": 1, "Vaccination failure": 1, "Vaccination site discharge": 1, "Vaccination site pain": 1, "Visual impairment": 1}, "batchcodes": ["FN4365"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4385.json b/docs/data/histograms/Philippines/FN4385.json
index 9ae9e1da730..a5d36f69a7e 100644
--- a/docs/data/histograms/Philippines/FN4385.json
+++ b/docs/data/histograms/Philippines/FN4385.json
@@ -1 +1 @@
-{"batchcode": "FN4385", "histograms": [{"batchcodes": ["FN4385"], "histogram": {"Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4385", "histograms": [{"histogram": {"Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["FN4385"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN4Q75.json b/docs/data/histograms/Philippines/FN4Q75.json
index 0e678bdd71e..6a249fd9394 100644
--- a/docs/data/histograms/Philippines/FN4Q75.json
+++ b/docs/data/histograms/Philippines/FN4Q75.json
@@ -1 +1 @@
-{"batchcode": "FN4Q75", "histograms": [{"batchcodes": ["FN4Q75"], "histogram": {"Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4Q75", "histograms": [{"histogram": {"Tachycardia": 1}, "batchcodes": ["FN4Q75"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN5496.json b/docs/data/histograms/Philippines/FN5496.json
index 690ab91179d..432ad18b573 100644
--- a/docs/data/histograms/Philippines/FN5496.json
+++ b/docs/data/histograms/Philippines/FN5496.json
@@ -1 +1 @@
-{"batchcode": "FN5496", "histograms": [{"batchcodes": ["FN5496"], "histogram": {"Diarrhoea": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Pyrexia": 2, "Vomiting": 2, "Axillary pain": 1, "Chest pain": 1, "Cough": 1, "Decreased appetite": 1, "Incorrect dose administered": 1, "Pain": 1, "Pain in extremity": 1, "Rhinitis": 1}}]}
\ No newline at end of file
+{"batchcode": "FN5496", "histograms": [{"histogram": {"Diarrhoea": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Pyrexia": 2, "Vomiting": 2, "Axillary pain": 1, "Chest pain": 1, "Cough": 1, "Decreased appetite": 1, "Incorrect dose administered": 1, "Pain": 1, "Pain in extremity": 1, "Rhinitis": 1}, "batchcodes": ["FN5496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FN5721.json b/docs/data/histograms/Philippines/FN5721.json
index 7743c3249ca..a0038ba7192 100644
--- a/docs/data/histograms/Philippines/FN5721.json
+++ b/docs/data/histograms/Philippines/FN5721.json
@@ -1 +1 @@
-{"batchcode": "FN5721", "histograms": [{"batchcodes": ["FN5721"], "histogram": {"Body temperature": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Seizure": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FN5721", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Seizure": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FN5721"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FO5669.json b/docs/data/histograms/Philippines/FO5669.json
index c8588362974..2034b7fd155 100644
--- a/docs/data/histograms/Philippines/FO5669.json
+++ b/docs/data/histograms/Philippines/FO5669.json
@@ -1 +1 @@
-{"batchcode": "FO5669", "histograms": [{"batchcodes": ["FO5669"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "FO5669", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["FO5669"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FO5996.json b/docs/data/histograms/Philippines/FO5996.json
index 7c6f972b0d2..b98fdd65db3 100644
--- a/docs/data/histograms/Philippines/FO5996.json
+++ b/docs/data/histograms/Philippines/FO5996.json
@@ -1 +1 @@
-{"batchcode": "FO5996", "histograms": [{"batchcodes": ["FO5996"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "COVID-19 screening": 1, "Drug ineffective": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FO5996", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "COVID-19 screening": 1, "Drug ineffective": 1, "Pyrexia": 1}, "batchcodes": ["FO5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FOO350.json b/docs/data/histograms/Philippines/FOO350.json
index b835761935b..7f2d8841ada 100644
--- a/docs/data/histograms/Philippines/FOO350.json
+++ b/docs/data/histograms/Philippines/FOO350.json
@@ -1 +1 @@
-{"batchcode": "FOO350", "histograms": [{"batchcodes": ["FOO350"], "histogram": {"Transient tachypnoea of the newborn": 1}}]}
\ No newline at end of file
+{"batchcode": "FOO350", "histograms": [{"histogram": {"Transient tachypnoea of the newborn": 1}, "batchcodes": ["FOO350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FP 5996.json b/docs/data/histograms/Philippines/FP 5996.json
index 18fe5cc780b..2da49b17748 100644
--- a/docs/data/histograms/Philippines/FP 5996.json
+++ b/docs/data/histograms/Philippines/FP 5996.json
@@ -1 +1 @@
-{"batchcode": "FP 5996", "histograms": [{"batchcodes": ["FP 5996"], "histogram": {"Aphasia": 1, "Cough": 1, "Disorientation": 1, "Dysarthria": 1, "Dyspnoea": 1, "Malaise": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "FP 5996", "histograms": [{"histogram": {"Aphasia": 1, "Cough": 1, "Disorientation": 1, "Dysarthria": 1, "Dyspnoea": 1, "Malaise": 1, "Myalgia": 1}, "batchcodes": ["FP 5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FP8871.json b/docs/data/histograms/Philippines/FP8871.json
index e72581741cb..4da38c42ba0 100644
--- a/docs/data/histograms/Philippines/FP8871.json
+++ b/docs/data/histograms/Philippines/FP8871.json
@@ -1 +1 @@
-{"batchcode": "FP8871", "histograms": [{"batchcodes": ["FP8871"], "histogram": {"Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FP8871", "histograms": [{"histogram": {"Headache": 1, "Pyrexia": 1}, "batchcodes": ["FP8871"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FP9414.json b/docs/data/histograms/Philippines/FP9414.json
index 3deaf500089..a71000a7cfa 100644
--- a/docs/data/histograms/Philippines/FP9414.json
+++ b/docs/data/histograms/Philippines/FP9414.json
@@ -1 +1 @@
-{"batchcode": "FP9414", "histograms": [{"batchcodes": ["FP9414"], "histogram": {"Body temperature": 2, "COVID-19": 1, "Depressed level of consciousness": 1, "Drug ineffective": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FP9414", "histograms": [{"histogram": {"Body temperature": 2, "COVID-19": 1, "Depressed level of consciousness": 1, "Drug ineffective": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FP9414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR 8392.json b/docs/data/histograms/Philippines/FR 8392.json
index 754473a7f50..6d5cb80e392 100644
--- a/docs/data/histograms/Philippines/FR 8392.json
+++ b/docs/data/histograms/Philippines/FR 8392.json
@@ -1 +1 @@
-{"batchcode": "FR 8392", "histograms": [{"batchcodes": ["FR 8392"], "histogram": {"Asthma": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Syncope": 1, "Systemic viral infection": 1, "Upper respiratory tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FR 8392", "histograms": [{"histogram": {"Asthma": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Syncope": 1, "Systemic viral infection": 1, "Upper respiratory tract infection": 1}, "batchcodes": ["FR 8392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR08392.json b/docs/data/histograms/Philippines/FR08392.json
index f2180fb2a94..7eef9092cfe 100644
--- a/docs/data/histograms/Philippines/FR08392.json
+++ b/docs/data/histograms/Philippines/FR08392.json
@@ -1 +1 @@
-{"batchcode": "FR08392", "histograms": [{"batchcodes": ["FR08392"], "histogram": {"Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "FR08392", "histograms": [{"histogram": {"Chills": 1}, "batchcodes": ["FR08392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR24149.json b/docs/data/histograms/Philippines/FR24149.json
index 3ab15d16650..e524b134d18 100644
--- a/docs/data/histograms/Philippines/FR24149.json
+++ b/docs/data/histograms/Philippines/FR24149.json
@@ -1 +1 @@
-{"batchcode": "FR24149", "histograms": [{"batchcodes": ["FR24149"], "histogram": {"Dyspnoea": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FR24149", "histograms": [{"histogram": {"Dyspnoea": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FR24149"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR2449.json b/docs/data/histograms/Philippines/FR2449.json
index fe616d929f5..292e75d52f9 100644
--- a/docs/data/histograms/Philippines/FR2449.json
+++ b/docs/data/histograms/Philippines/FR2449.json
@@ -1 +1 @@
-{"batchcode": "FR2449", "histograms": [{"batchcodes": ["FR2449"], "histogram": {"Abdominal pain": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FR2449", "histograms": [{"histogram": {"Abdominal pain": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1}, "batchcodes": ["FR2449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR3892.json b/docs/data/histograms/Philippines/FR3892.json
index d8d63cae10f..37915e76cf5 100644
--- a/docs/data/histograms/Philippines/FR3892.json
+++ b/docs/data/histograms/Philippines/FR3892.json
@@ -1 +1 @@
-{"batchcode": "FR3892", "histograms": [{"batchcodes": ["FR3892"], "histogram": {"Pyrexia": 2, "Body temperature": 1, "Cough": 1, "Epistaxis": 1, "Nasopharyngitis": 1}}]}
\ No newline at end of file
+{"batchcode": "FR3892", "histograms": [{"histogram": {"Pyrexia": 2, "Body temperature": 1, "Cough": 1, "Epistaxis": 1, "Nasopharyngitis": 1}, "batchcodes": ["FR3892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR4267.json b/docs/data/histograms/Philippines/FR4267.json
index bf89bd0e92f..04d03af7941 100644
--- a/docs/data/histograms/Philippines/FR4267.json
+++ b/docs/data/histograms/Philippines/FR4267.json
@@ -1 +1 @@
-{"batchcode": "FR4267", "histograms": [{"batchcodes": ["FR4267"], "histogram": {"Oedema peripheral": 2, "Periorbital oedema": 2}}]}
\ No newline at end of file
+{"batchcode": "FR4267", "histograms": [{"histogram": {"Oedema peripheral": 2, "Periorbital oedema": 2}, "batchcodes": ["FR4267"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR4268.json b/docs/data/histograms/Philippines/FR4268.json
index d9d2697d369..34fb4a922fd 100644
--- a/docs/data/histograms/Philippines/FR4268.json
+++ b/docs/data/histograms/Philippines/FR4268.json
@@ -1 +1 @@
-{"batchcode": "FR4268", "histograms": [{"batchcodes": ["FR4268"], "histogram": {"Pyrexia": 12, "Vomiting": 7, "Cough": 6, "Headache": 6, "Syncope": 5, "Decreased appetite": 4, "Rash": 4, "Malaise": 3, "Abdominal pain": 2, "Body temperature": 2, "Chills": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Myalgia": 2, "Nasopharyngitis": 2, "Seizure": 2, "Vaccination site pain": 2, "Anxiety": 1, "Chest discomfort": 1, "Dizziness": 1, "Expired product administered": 1, "Febrile convulsion": 1, "Foreign body ingestion": 1, "Haemoglobin": 1, "Heart rate": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Nausea": 1, "Parasitic gastroenteritis": 1, "Periorbital swelling": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pruritus": 1, "Swelling face": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FR4268", "histograms": [{"histogram": {"Pyrexia": 12, "Vomiting": 7, "Cough": 6, "Headache": 6, "Syncope": 5, "Decreased appetite": 4, "Rash": 4, "Malaise": 3, "Abdominal pain": 2, "Body temperature": 2, "Chills": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Myalgia": 2, "Nasopharyngitis": 2, "Seizure": 2, "Vaccination site pain": 2, "Anxiety": 1, "Chest discomfort": 1, "Dizziness": 1, "Expired product administered": 1, "Febrile convulsion": 1, "Foreign body ingestion": 1, "Haemoglobin": 1, "Heart rate": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Nausea": 1, "Parasitic gastroenteritis": 1, "Periorbital swelling": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pruritus": 1, "Swelling face": 1, "Tachycardia": 1}, "batchcodes": ["FR4268"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR6858.json b/docs/data/histograms/Philippines/FR6858.json
index 5464eb35193..d83ef788c5d 100644
--- a/docs/data/histograms/Philippines/FR6858.json
+++ b/docs/data/histograms/Philippines/FR6858.json
@@ -1 +1 @@
-{"batchcode": "FR6858", "histograms": [{"batchcodes": ["FR6858"], "histogram": {"Dizziness": 1, "Febrile convulsion": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FR6858", "histograms": [{"histogram": {"Dizziness": 1, "Febrile convulsion": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["FR6858"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR83092.json b/docs/data/histograms/Philippines/FR83092.json
index 8e28d8b7549..8835b1e9863 100644
--- a/docs/data/histograms/Philippines/FR83092.json
+++ b/docs/data/histograms/Philippines/FR83092.json
@@ -1 +1 @@
-{"batchcode": "FR83092", "histograms": [{"batchcodes": ["FR83092"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FR83092", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["FR83092"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR8329.json b/docs/data/histograms/Philippines/FR8329.json
index c41fbc5326d..0e122b9a02f 100644
--- a/docs/data/histograms/Philippines/FR8329.json
+++ b/docs/data/histograms/Philippines/FR8329.json
@@ -1 +1 @@
-{"batchcode": "FR8329", "histograms": [{"batchcodes": ["FR8329"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FR8329", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FR8329"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR8392.json b/docs/data/histograms/Philippines/FR8392.json
index f92a63e7951..aecb5ed5eea 100644
--- a/docs/data/histograms/Philippines/FR8392.json
+++ b/docs/data/histograms/Philippines/FR8392.json
@@ -1 +1 @@
-{"batchcode": "FR8392", "histograms": [{"batchcodes": ["FR8392"], "histogram": {"Pyrexia": 25, "Vomiting": 13, "Syncope": 11, "Rash": 10, "Headache": 9, "Dyspnoea": 7, "Abdominal pain upper": 6, "Abdominal pain": 5, "Seizure": 5, "Body temperature": 4, "Dizziness": 4, "Anaphylactoid reaction": 3, "Chest pain": 3, "Cough": 3, "Dengue virus test positive": 3, "Heart rate": 3, "Loss of consciousness": 3, "Nasopharyngitis": 3, "Blood pressure increased": 2, "COVID-19": 2, "Chills": 2, "Diarrhoea": 2, "Drug ineffective": 2, "Guillain-Barre syndrome": 2, "Heart rate increased": 2, "Muscular weakness": 2, "Oxygen saturation": 2, "Peripheral swelling": 2, "Platelet count": 2, "Platelet count decreased": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Urine analysis": 2, "Abdominal discomfort": 1, "Anaphylactic reaction": 1, "Aplastic anaemia": 1, "Asthma": 1, "Back pain": 1, "Bell's palsy": 1, "Blood immunoglobulin G": 1, "Blood pressure measurement": 1, "Breast inflammation": 1, "Breast mass": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Constipation": 1, "Contusion": 1, "Death": 1, "Decreased appetite": 1, "Dehydration": 1, "Dengue virus test": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Electrolyte imbalance": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Groin pain": 1, "Haematemesis": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemoglobin": 1, "Hypotonia": 1, "Lymphocyte count": 1, "Monocyte count": 1, "Muscle strain": 1, "Myalgia": 1, "Myocarditis": 1, "Myoclonus": 1, "Nephrotic syndrome": 1, "Neutrophil count": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain assessment": 1, "Pallor": 1, "Pneumonia": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Red blood cell analysis": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Rheumatic heart disease": 1, "Swelling": 1, "Thrombocytopenia": 1, "Tic": 1, "Ultrasound kidney": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Vision blurred": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FR8392", "histograms": [{"histogram": {"Pyrexia": 25, "Vomiting": 13, "Syncope": 11, "Rash": 10, "Headache": 9, "Dyspnoea": 7, "Abdominal pain upper": 6, "Abdominal pain": 5, "Seizure": 5, "Body temperature": 4, "Dizziness": 4, "Anaphylactoid reaction": 3, "Chest pain": 3, "Cough": 3, "Dengue virus test positive": 3, "Heart rate": 3, "Loss of consciousness": 3, "Nasopharyngitis": 3, "Blood pressure increased": 2, "COVID-19": 2, "Chills": 2, "Diarrhoea": 2, "Drug ineffective": 2, "Guillain-Barre syndrome": 2, "Heart rate increased": 2, "Muscular weakness": 2, "Oxygen saturation": 2, "Peripheral swelling": 2, "Platelet count": 2, "Platelet count decreased": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Urine analysis": 2, "Abdominal discomfort": 1, "Anaphylactic reaction": 1, "Aplastic anaemia": 1, "Asthma": 1, "Back pain": 1, "Bell's palsy": 1, "Blood immunoglobulin G": 1, "Blood pressure measurement": 1, "Breast inflammation": 1, "Breast mass": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Constipation": 1, "Contusion": 1, "Death": 1, "Decreased appetite": 1, "Dehydration": 1, "Dengue virus test": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Electrolyte imbalance": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gait disturbance": 1, "Gaze palsy": 1, "Groin pain": 1, "Haematemesis": 1, "Haematocrit": 1, "Haematoma": 1, "Haematuria": 1, "Haemoglobin": 1, "Hypotonia": 1, "Lymphocyte count": 1, "Monocyte count": 1, "Muscle strain": 1, "Myalgia": 1, "Myocarditis": 1, "Myoclonus": 1, "Nephrotic syndrome": 1, "Neutrophil count": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain assessment": 1, "Pallor": 1, "Pneumonia": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Red blood cell analysis": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Rheumatic heart disease": 1, "Swelling": 1, "Thrombocytopenia": 1, "Tic": 1, "Ultrasound kidney": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Vision blurred": 1, "White blood cell count": 1}, "batchcodes": ["FR8392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR8892.json b/docs/data/histograms/Philippines/FR8892.json
index 73307a5101e..b28ed142150 100644
--- a/docs/data/histograms/Philippines/FR8892.json
+++ b/docs/data/histograms/Philippines/FR8892.json
@@ -1 +1 @@
-{"batchcode": "FR8892", "histograms": [{"batchcodes": ["FR8892"], "histogram": {"Abdominal pain": 1, "Headache": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "FR8892", "histograms": [{"histogram": {"Abdominal pain": 1, "Headache": 1, "Loss of consciousness": 1}, "batchcodes": ["FR8892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FR9261.json b/docs/data/histograms/Philippines/FR9261.json
index 611dd0c5f65..0695ccff98a 100644
--- a/docs/data/histograms/Philippines/FR9261.json
+++ b/docs/data/histograms/Philippines/FR9261.json
@@ -1 +1 @@
-{"batchcode": "FR9261", "histograms": [{"batchcodes": ["FR9261"], "histogram": {"Productive cough": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "FR9261", "histograms": [{"histogram": {"Productive cough": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["FR9261"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FRB392.json b/docs/data/histograms/Philippines/FRB392.json
index 2aa7cebf56f..1fc3cee021a 100644
--- a/docs/data/histograms/Philippines/FRB392.json
+++ b/docs/data/histograms/Philippines/FRB392.json
@@ -1 +1 @@
-{"batchcode": "FRB392", "histograms": [{"batchcodes": ["FRB392"], "histogram": {"Abdominal pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FRB392", "histograms": [{"histogram": {"Abdominal pain": 1, "Vaccination site pain": 1}, "batchcodes": ["FRB392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FRHZ68.json b/docs/data/histograms/Philippines/FRHZ68.json
index af679b82fee..a593f59e484 100644
--- a/docs/data/histograms/Philippines/FRHZ68.json
+++ b/docs/data/histograms/Philippines/FRHZ68.json
@@ -1 +1 @@
-{"batchcode": "FRHZ68", "histograms": [{"batchcodes": ["FRHZ68"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "FRHZ68", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["FRHZ68"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FW0201.json b/docs/data/histograms/Philippines/FW0201.json
index a6325bf06c6..f6122ea649e 100644
--- a/docs/data/histograms/Philippines/FW0201.json
+++ b/docs/data/histograms/Philippines/FW0201.json
@@ -1 +1 @@
-{"batchcode": "FW0201", "histograms": [{"batchcodes": ["FW0201"], "histogram": {"Anaphylactoid reaction": 1, "Dyskinesia": 1, "Headache": 1, "Pyrexia": 1, "Respiratory distress": 1}}]}
\ No newline at end of file
+{"batchcode": "FW0201", "histograms": [{"histogram": {"Anaphylactoid reaction": 1, "Dyskinesia": 1, "Headache": 1, "Pyrexia": 1, "Respiratory distress": 1}, "batchcodes": ["FW0201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FW4074.json b/docs/data/histograms/Philippines/FW4074.json
index 174197b24eb..3c7b7bf6f95 100644
--- a/docs/data/histograms/Philippines/FW4074.json
+++ b/docs/data/histograms/Philippines/FW4074.json
@@ -1 +1 @@
-{"batchcode": "FW4074", "histograms": [{"batchcodes": ["FW4074"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FW4074", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["FW4074"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FW45171.json b/docs/data/histograms/Philippines/FW45171.json
index d6bcbbf95b9..5a2122446f1 100644
--- a/docs/data/histograms/Philippines/FW45171.json
+++ b/docs/data/histograms/Philippines/FW45171.json
@@ -1 +1 @@
-{"batchcode": "FW45171", "histograms": [{"batchcodes": ["FW45171"], "histogram": {"Abortion incomplete": 1, "Myalgia": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FW45171", "histograms": [{"histogram": {"Abortion incomplete": 1, "Myalgia": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["FW45171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/FW5656.json b/docs/data/histograms/Philippines/FW5656.json
index 1e6e0d20210..0f00c39e5e9 100644
--- a/docs/data/histograms/Philippines/FW5656.json
+++ b/docs/data/histograms/Philippines/FW5656.json
@@ -1 +1 @@
-{"batchcode": "FW5656", "histograms": [{"batchcodes": ["FW5656"], "histogram": {"Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5656", "histograms": [{"histogram": {"Vomiting": 1}, "batchcodes": ["FW5656"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/GA6772.json b/docs/data/histograms/Philippines/GA6772.json
index b4c41197449..61e8a441667 100644
--- a/docs/data/histograms/Philippines/GA6772.json
+++ b/docs/data/histograms/Philippines/GA6772.json
@@ -1 +1 @@
-{"batchcode": "GA6772", "histograms": [{"batchcodes": ["GA6772"], "histogram": {"Cough": 1, "Dizziness": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "GA6772", "histograms": [{"histogram": {"Cough": 1, "Dizziness": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["GA6772"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/HCB3221.json b/docs/data/histograms/Philippines/HCB3221.json
index 8038904b6f7..c55d12fbf16 100644
--- a/docs/data/histograms/Philippines/HCB3221.json
+++ b/docs/data/histograms/Philippines/HCB3221.json
@@ -1 +1 @@
-{"batchcode": "HCB3221", "histograms": [{"batchcodes": ["HCB3221"], "histogram": {"Dyspnoea": 1, "Gaze palsy": 1, "Musculoskeletal stiffness": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "HCB3221", "histograms": [{"histogram": {"Dyspnoea": 1, "Gaze palsy": 1, "Musculoskeletal stiffness": 1, "Tinnitus": 1}, "batchcodes": ["HCB3221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/HKZ995.json b/docs/data/histograms/Philippines/HKZ995.json
index 9a000fa6098..662ccfef059 100644
--- a/docs/data/histograms/Philippines/HKZ995.json
+++ b/docs/data/histograms/Philippines/HKZ995.json
@@ -1 +1 @@
-{"batchcode": "HKZ995", "histograms": [{"batchcodes": ["HKZ995"], "histogram": {"Abortion spontaneous": 2, "Haemorrhage": 1, "Maternal exposure during pregnancy": 1, "Overdose": 1}}]}
\ No newline at end of file
+{"batchcode": "HKZ995", "histograms": [{"histogram": {"Abortion spontaneous": 2, "Haemorrhage": 1, "Maternal exposure during pregnancy": 1, "Overdose": 1}, "batchcodes": ["HKZ995"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/I23001.json b/docs/data/histograms/Philippines/I23001.json
index b9b51b64c89..5ede35b2412 100644
--- a/docs/data/histograms/Philippines/I23001.json
+++ b/docs/data/histograms/Philippines/I23001.json
@@ -1 +1 @@
-{"batchcode": "I23001", "histograms": [{"batchcodes": ["I23001"], "histogram": {"Blood pressure measurement": 5, "Blood pressure increased": 4, "Heart rate": 2, "Heart rate increased": 2, "Blood pressure decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "I23001", "histograms": [{"histogram": {"Blood pressure measurement": 5, "Blood pressure increased": 4, "Heart rate": 2, "Heart rate increased": 2, "Blood pressure decreased": 1}, "batchcodes": ["I23001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/I28001.json b/docs/data/histograms/Philippines/I28001.json
index 3508e42674a..ca467191ee8 100644
--- a/docs/data/histograms/Philippines/I28001.json
+++ b/docs/data/histograms/Philippines/I28001.json
@@ -1 +1 @@
-{"batchcode": "I28001", "histograms": [{"batchcodes": ["I28001"], "histogram": {"Skin laceration": 1}}]}
\ No newline at end of file
+{"batchcode": "I28001", "histograms": [{"histogram": {"Skin laceration": 1}, "batchcodes": ["I28001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/I29001.json b/docs/data/histograms/Philippines/I29001.json
index cccd10e2620..ae0bd860b74 100644
--- a/docs/data/histograms/Philippines/I29001.json
+++ b/docs/data/histograms/Philippines/I29001.json
@@ -1 +1 @@
-{"batchcode": "I29001", "histograms": [{"batchcodes": ["I29001"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Myalgia": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "I29001", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Myalgia": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["I29001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/I5073A.json b/docs/data/histograms/Philippines/I5073A.json
index 0a676ea0866..588fabad37c 100644
--- a/docs/data/histograms/Philippines/I5073A.json
+++ b/docs/data/histograms/Philippines/I5073A.json
@@ -1 +1 @@
-{"batchcode": "I5073A", "histograms": [{"batchcodes": ["I5073A"], "histogram": {"Dizziness": 1, "Headache": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "I5073A", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["I5073A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IF I035P.json b/docs/data/histograms/Philippines/IF I035P.json
index 585cb2dad90..3fc2a72b35d 100644
--- a/docs/data/histograms/Philippines/IF I035P.json
+++ b/docs/data/histograms/Philippines/IF I035P.json
@@ -1 +1 @@
-{"batchcode": "IF I035P", "histograms": [{"batchcodes": ["IF I035P"], "histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Hypotension": 1}}]}
\ No newline at end of file
+{"batchcode": "IF I035P", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Hypotension": 1}, "batchcodes": ["IF I035P"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IF1025A.json b/docs/data/histograms/Philippines/IF1025A.json
index cbe6622408c..10173511376 100644
--- a/docs/data/histograms/Philippines/IF1025A.json
+++ b/docs/data/histograms/Philippines/IF1025A.json
@@ -1 +1 @@
-{"batchcode": "IF1025A", "histograms": [{"batchcodes": ["IF1025A"], "histogram": {"Blood pressure measurement": 15, "Blood pressure increased": 14, "Asthenia": 1, "Dizziness": 1, "Headache": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "IF1025A", "histograms": [{"histogram": {"Blood pressure measurement": 15, "Blood pressure increased": 14, "Asthenia": 1, "Dizziness": 1, "Headache": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoaesthesia": 1, "Syncope": 1}, "batchcodes": ["IF1025A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IF1032A.json b/docs/data/histograms/Philippines/IF1032A.json
index bad7ee0867f..13aba234e19 100644
--- a/docs/data/histograms/Philippines/IF1032A.json
+++ b/docs/data/histograms/Philippines/IF1032A.json
@@ -1 +1 @@
-{"batchcode": "IF1032A", "histograms": [{"batchcodes": ["IF1032A"], "histogram": {"Dyspnoea exertional": 1, "Hypertensive nephropathy": 1, "Oedema": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "IF1032A", "histograms": [{"histogram": {"Dyspnoea exertional": 1, "Hypertensive nephropathy": 1, "Oedema": 1, "Syncope": 1}, "batchcodes": ["IF1032A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IF10351A.json b/docs/data/histograms/Philippines/IF10351A.json
index cebbd55e89c..b2e8ce5ded9 100644
--- a/docs/data/histograms/Philippines/IF10351A.json
+++ b/docs/data/histograms/Philippines/IF10351A.json
@@ -1 +1 @@
-{"batchcode": "IF10351A", "histograms": [{"batchcodes": ["IF10351A"], "histogram": {"Antibody test": 1, "Dengue virus test positive": 1, "Dyslipidaemia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pyrexia": 1, "Uterine leiomyoma": 1}}]}
\ No newline at end of file
+{"batchcode": "IF10351A", "histograms": [{"histogram": {"Antibody test": 1, "Dengue virus test positive": 1, "Dyslipidaemia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pyrexia": 1, "Uterine leiomyoma": 1}, "batchcodes": ["IF10351A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IF1035A.json b/docs/data/histograms/Philippines/IF1035A.json
index 9e31cef60bb..96c585129b7 100644
--- a/docs/data/histograms/Philippines/IF1035A.json
+++ b/docs/data/histograms/Philippines/IF1035A.json
@@ -1 +1 @@
-{"batchcode": "IF1035A", "histograms": [{"batchcodes": ["IF1035A"], "histogram": {"Dizziness": 1, "Pallor": 1, "Petechiae": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "IF1035A", "histograms": [{"histogram": {"Dizziness": 1, "Pallor": 1, "Petechiae": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["IF1035A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IF872A.json b/docs/data/histograms/Philippines/IF872A.json
index cba639a39bc..b3c70e2ccd5 100644
--- a/docs/data/histograms/Philippines/IF872A.json
+++ b/docs/data/histograms/Philippines/IF872A.json
@@ -1 +1 @@
-{"batchcode": "IF872A", "histograms": [{"batchcodes": ["IF872A"], "histogram": {"Aspiration bone marrow": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "IF872A", "histograms": [{"histogram": {"Aspiration bone marrow": 1, "Vaccination site pain": 1}, "batchcodes": ["IF872A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IFI032A.json b/docs/data/histograms/Philippines/IFI032A.json
index 4f0897a2bad..d00af04355d 100644
--- a/docs/data/histograms/Philippines/IFI032A.json
+++ b/docs/data/histograms/Philippines/IFI032A.json
@@ -1 +1 @@
-{"batchcode": "IFI032A", "histograms": [{"batchcodes": ["IFI032A"], "histogram": {"Blood pressure increased": 4, "Blood pressure measurement": 4, "Pyrexia": 2, "Chills": 1, "Cough": 1, "Heart rate": 1, "Malaise": 1, "Nasopharyngitis": 1}}]}
\ No newline at end of file
+{"batchcode": "IFI032A", "histograms": [{"histogram": {"Blood pressure increased": 4, "Blood pressure measurement": 4, "Pyrexia": 2, "Chills": 1, "Cough": 1, "Heart rate": 1, "Malaise": 1, "Nasopharyngitis": 1}, "batchcodes": ["IFI032A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IFI035A.json b/docs/data/histograms/Philippines/IFI035A.json
index 44938442cf9..d8e0d861e05 100644
--- a/docs/data/histograms/Philippines/IFI035A.json
+++ b/docs/data/histograms/Philippines/IFI035A.json
@@ -1 +1 @@
-{"batchcode": "IFI035A", "histograms": [{"batchcodes": ["IFI035A"], "histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "IFI035A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1, "Thrombocytopenia": 1}, "batchcodes": ["IFI035A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IFI0430A.json b/docs/data/histograms/Philippines/IFI0430A.json
index 14e68629579..ebb31e8f5d5 100644
--- a/docs/data/histograms/Philippines/IFI0430A.json
+++ b/docs/data/histograms/Philippines/IFI0430A.json
@@ -1 +1 @@
-{"batchcode": "IFI0430A", "histograms": [{"batchcodes": ["IFI0430A"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "IFI0430A", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["IFI0430A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IFI043A.json b/docs/data/histograms/Philippines/IFI043A.json
index 00a4a84707a..c8443569fb2 100644
--- a/docs/data/histograms/Philippines/IFI043A.json
+++ b/docs/data/histograms/Philippines/IFI043A.json
@@ -1 +1 @@
-{"batchcode": "IFI043A", "histograms": [{"batchcodes": ["IFI043A"], "histogram": {"Dizziness": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "IFI043A", "histograms": [{"histogram": {"Dizziness": 1, "Vision blurred": 1}, "batchcodes": ["IFI043A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJ072A.json b/docs/data/histograms/Philippines/IJ072A.json
index de8d9ce9444..af8870f1a66 100644
--- a/docs/data/histograms/Philippines/IJ072A.json
+++ b/docs/data/histograms/Philippines/IJ072A.json
@@ -1 +1 @@
-{"batchcode": "IJ072A", "histograms": [{"batchcodes": ["IJ072A"], "histogram": {"Dyspnoea": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "Off label use": 2, "Acute myocardial infarction": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chills": 1, "Death": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Eye inflammation": 1, "Eye pain": 1, "Eye swelling": 1, "Fatigue": 1, "Haematemesis": 1, "Haemoptysis": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Insulin C-peptide": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Post-traumatic epilepsy": 1, "Pulse absent": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "IJ072A", "histograms": [{"histogram": {"Dyspnoea": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "Off label use": 2, "Acute myocardial infarction": 1, "Blood pressure measurement": 1, "Cardiac arrest": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chills": 1, "Death": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Eye inflammation": 1, "Eye pain": 1, "Eye swelling": 1, "Fatigue": 1, "Haematemesis": 1, "Haemoptysis": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Insulin C-peptide": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Post-traumatic epilepsy": 1, "Pulse absent": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site pain": 1}, "batchcodes": ["IJ072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJ072A7.json b/docs/data/histograms/Philippines/IJ072A7.json
index 48ee689a40e..1d33406b446 100644
--- a/docs/data/histograms/Philippines/IJ072A7.json
+++ b/docs/data/histograms/Philippines/IJ072A7.json
@@ -1 +1 @@
-{"batchcode": "IJ072A7", "histograms": [{"batchcodes": ["IJ072A7"], "histogram": {"Back pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "IJ072A7", "histograms": [{"histogram": {"Back pain": 1, "Vaccination site pain": 1}, "batchcodes": ["IJ072A7"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJ073A.json b/docs/data/histograms/Philippines/IJ073A.json
index f880b5781e6..a5241e3c582 100644
--- a/docs/data/histograms/Philippines/IJ073A.json
+++ b/docs/data/histograms/Philippines/IJ073A.json
@@ -1 +1 @@
-{"batchcode": "IJ073A", "histograms": [{"batchcodes": ["IJ073A"], "histogram": {"Diarrhoea": 1, "Dyspnoea": 1, "Nausea": 1, "Unresponsive to stimuli": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "IJ073A", "histograms": [{"histogram": {"Diarrhoea": 1, "Dyspnoea": 1, "Nausea": 1, "Unresponsive to stimuli": 1, "Vomiting": 1}, "batchcodes": ["IJ073A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJ702A.json b/docs/data/histograms/Philippines/IJ702A.json
index 5fb8ea9f176..345ac369eb2 100644
--- a/docs/data/histograms/Philippines/IJ702A.json
+++ b/docs/data/histograms/Philippines/IJ702A.json
@@ -1 +1 @@
-{"batchcode": "IJ702A", "histograms": [{"batchcodes": ["IJ702A"], "histogram": {"Abdominal pain": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "IJ702A", "histograms": [{"histogram": {"Abdominal pain": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["IJ702A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJ72A.json b/docs/data/histograms/Philippines/IJ72A.json
index 2a000191362..5e7c93b9304 100644
--- a/docs/data/histograms/Philippines/IJ72A.json
+++ b/docs/data/histograms/Philippines/IJ72A.json
@@ -1 +1 @@
-{"batchcode": "IJ72A", "histograms": [{"batchcodes": ["IJ72A"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "IJ72A", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Pyrexia": 1}, "batchcodes": ["IJ72A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJ8760.json b/docs/data/histograms/Philippines/IJ8760.json
index e1995fb89b7..5bf710551f1 100644
--- a/docs/data/histograms/Philippines/IJ8760.json
+++ b/docs/data/histograms/Philippines/IJ8760.json
@@ -1 +1 @@
-{"batchcode": "IJ8760", "histograms": [{"batchcodes": ["IJ8760"], "histogram": {"Chest pain": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "IJ8760", "histograms": [{"histogram": {"Chest pain": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1}, "batchcodes": ["IJ8760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJC72A.json b/docs/data/histograms/Philippines/IJC72A.json
index d775fd0f179..2cbb1630210 100644
--- a/docs/data/histograms/Philippines/IJC72A.json
+++ b/docs/data/histograms/Philippines/IJC72A.json
@@ -1 +1 @@
-{"batchcode": "IJC72A", "histograms": [{"batchcodes": ["IJC72A"], "histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "IJC72A", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}, "batchcodes": ["IJC72A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IJO72A.json b/docs/data/histograms/Philippines/IJO72A.json
index 00248277afd..bde90261dff 100644
--- a/docs/data/histograms/Philippines/IJO72A.json
+++ b/docs/data/histograms/Philippines/IJO72A.json
@@ -1 +1 @@
-{"batchcode": "IJO72A", "histograms": [{"batchcodes": ["IJO72A"], "histogram": {"Angioplasty": 1, "Asthenia": 1, "Concussion": 1, "Electrolyte imbalance": 1, "Fall": 1, "Type 2 diabetes mellitus": 1}}]}
\ No newline at end of file
+{"batchcode": "IJO72A", "histograms": [{"histogram": {"Angioplasty": 1, "Asthenia": 1, "Concussion": 1, "Electrolyte imbalance": 1, "Fall": 1, "Type 2 diabetes mellitus": 1}, "batchcodes": ["IJO72A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IP1025A.json b/docs/data/histograms/Philippines/IP1025A.json
index b673c9957bb..0d612913125 100644
--- a/docs/data/histograms/Philippines/IP1025A.json
+++ b/docs/data/histograms/Philippines/IP1025A.json
@@ -1 +1 @@
-{"batchcode": "IP1025A", "histograms": [{"batchcodes": ["IP1025A"], "histogram": {"Hypersensitivity": 1, "Musculoskeletal stiffness": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "IP1025A", "histograms": [{"histogram": {"Hypersensitivity": 1, "Musculoskeletal stiffness": 1, "Palpitations": 1}, "batchcodes": ["IP1025A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IP10321A.json b/docs/data/histograms/Philippines/IP10321A.json
index 709724d5f30..421b06cdad4 100644
--- a/docs/data/histograms/Philippines/IP10321A.json
+++ b/docs/data/histograms/Philippines/IP10321A.json
@@ -1 +1 @@
-{"batchcode": "IP10321A", "histograms": [{"batchcodes": ["IP10321A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "IP10321A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["IP10321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IV0722.json b/docs/data/histograms/Philippines/IV0722.json
index 7086f54ce2a..9b135f71aa9 100644
--- a/docs/data/histograms/Philippines/IV0722.json
+++ b/docs/data/histograms/Philippines/IV0722.json
@@ -1 +1 @@
-{"batchcode": "IV0722", "histograms": [{"batchcodes": ["IV0722"], "histogram": {"Hemiparesis": 1}}]}
\ No newline at end of file
+{"batchcode": "IV0722", "histograms": [{"histogram": {"Hemiparesis": 1}, "batchcodes": ["IV0722"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/IV072A.json b/docs/data/histograms/Philippines/IV072A.json
index 216a5f1516f..73528323c69 100644
--- a/docs/data/histograms/Philippines/IV072A.json
+++ b/docs/data/histograms/Philippines/IV072A.json
@@ -1 +1 @@
-{"batchcode": "IV072A", "histograms": [{"batchcodes": ["IV072A"], "histogram": {"Pyrexia": 1, "Rash": 1, "Systemic viral infection": 1}}]}
\ No newline at end of file
+{"batchcode": "IV072A", "histograms": [{"histogram": {"Pyrexia": 1, "Rash": 1, "Systemic viral infection": 1}, "batchcodes": ["IV072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/J074A.json b/docs/data/histograms/Philippines/J074A.json
index a33ec1752a6..d058cf3ab1d 100644
--- a/docs/data/histograms/Philippines/J074A.json
+++ b/docs/data/histograms/Philippines/J074A.json
@@ -1 +1 @@
-{"batchcode": "J074A", "histograms": [{"batchcodes": ["J074A"], "histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "J074A", "histograms": [{"histogram": {"Labour pain": 1, "Maternal exposure during pregnancy": 1}, "batchcodes": ["J074A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/J07BX.json b/docs/data/histograms/Philippines/J07BX.json
index 09dd68c39db..23e3b623e00 100644
--- a/docs/data/histograms/Philippines/J07BX.json
+++ b/docs/data/histograms/Philippines/J07BX.json
@@ -1 +1 @@
-{"batchcode": "J07BX", "histograms": [{"batchcodes": ["J07BX"], "histogram": {"Haematemesis": 1}}]}
\ No newline at end of file
+{"batchcode": "J07BX", "histograms": [{"histogram": {"Haematemesis": 1}, "batchcodes": ["J07BX"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/J202103011.json b/docs/data/histograms/Philippines/J202103011.json
index 4a9d1fec0f1..b05a56ac37a 100644
--- a/docs/data/histograms/Philippines/J202103011.json
+++ b/docs/data/histograms/Philippines/J202103011.json
@@ -1 +1 @@
-{"batchcode": "J202103011", "histograms": [{"batchcodes": ["3004960", "J202103011", "J20210311"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "J202103011", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["3004960", "J202103011", "J20210311"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/J20210311.json b/docs/data/histograms/Philippines/J20210311.json
index a98613d4504..20b75e709bf 100644
--- a/docs/data/histograms/Philippines/J20210311.json
+++ b/docs/data/histograms/Philippines/J20210311.json
@@ -1 +1 @@
-{"batchcode": "J20210311", "histograms": [{"batchcodes": ["3004960", "J202103011", "J20210311"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "J20210311", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["3004960", "J202103011", "J20210311"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/J202106033.json b/docs/data/histograms/Philippines/J202106033.json
index 19d74c75122..5caa7b8b4d7 100644
--- a/docs/data/histograms/Philippines/J202106033.json
+++ b/docs/data/histograms/Philippines/J202106033.json
@@ -1 +1 @@
-{"batchcode": "J202106033", "histograms": [{"batchcodes": ["012F21A", "J202106033"], "histogram": {"Asthma": 1, "COVID-19": 1, "Cough": 1, "Dyspnoea": 1}}, {"batchcodes": ["2100680", "C202105084", "J202106033"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "J202106033", "histograms": [{"histogram": {"Asthma": 1, "COVID-19": 1, "Cough": 1, "Dyspnoea": 1}, "batchcodes": ["012F21A", "J202106033"]}, {"histogram": {"Death": 1}, "batchcodes": ["2100680", "C202105084", "J202106033"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/J202107048.json b/docs/data/histograms/Philippines/J202107048.json
index 5bd19287ab3..da477b7cc56 100644
--- a/docs/data/histograms/Philippines/J202107048.json
+++ b/docs/data/histograms/Philippines/J202107048.json
@@ -1 +1 @@
-{"batchcode": "J202107048", "histograms": [{"batchcodes": ["002K21A", "C202109177", "J202107048"], "histogram": {"Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "J202107048", "histograms": [{"histogram": {"Vomiting": 1}, "batchcodes": ["002K21A", "C202109177", "J202107048"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/J213C21A.json b/docs/data/histograms/Philippines/J213C21A.json
index 9e971a1e270..94bf997faf1 100644
--- a/docs/data/histograms/Philippines/J213C21A.json
+++ b/docs/data/histograms/Philippines/J213C21A.json
@@ -1 +1 @@
-{"batchcode": "J213C21A", "histograms": [{"batchcodes": ["086J21A", "J213C21A", "P0001340"], "histogram": {"Arthritis": 2, "Chills": 2, "Decreased appetite": 2, "Gastric disorder": 2, "Hyperthermia": 2, "Malaise": 2}}]}
\ No newline at end of file
+{"batchcode": "J213C21A", "histograms": [{"histogram": {"Arthritis": 2, "Chills": 2, "Decreased appetite": 2, "Gastric disorder": 2, "Hyperthermia": 2, "Malaise": 2}, "batchcodes": ["086J21A", "J213C21A", "P0001340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/JFSO33A.json b/docs/data/histograms/Philippines/JFSO33A.json
index 5878a7e04c0..758159be7cc 100644
--- a/docs/data/histograms/Philippines/JFSO33A.json
+++ b/docs/data/histograms/Philippines/JFSO33A.json
@@ -1 +1 @@
-{"batchcode": "JFSO33A", "histograms": [{"batchcodes": ["JFSO33A"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "JFSO33A", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["JFSO33A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/JL5996.json b/docs/data/histograms/Philippines/JL5996.json
index ccedfb6cd14..108904a0e71 100644
--- a/docs/data/histograms/Philippines/JL5996.json
+++ b/docs/data/histograms/Philippines/JL5996.json
@@ -1 +1 @@
-{"batchcode": "JL5996", "histograms": [{"batchcodes": ["JL5996"], "histogram": {"Hemiparesis": 1}}]}
\ No newline at end of file
+{"batchcode": "JL5996", "histograms": [{"histogram": {"Hemiparesis": 1}, "batchcodes": ["JL5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/K003B.json b/docs/data/histograms/Philippines/K003B.json
index c8107e7f2b7..180c2a4d735 100644
--- a/docs/data/histograms/Philippines/K003B.json
+++ b/docs/data/histograms/Philippines/K003B.json
@@ -1 +1 @@
-{"batchcode": "K003B", "histograms": [{"batchcodes": ["0033", "068F21A", "K003B"], "histogram": {"Death": 1}}, {"batchcodes": ["FM-9090", "K003B"], "histogram": {"Death": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["K003B"], "histogram": {"Back pain": 1, "COVID-19": 1, "COVID-19 screening": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "K003B", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["0033", "068F21A", "K003B"]}, {"histogram": {"Death": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Suspected COVID-19": 1}, "batchcodes": ["FM-9090", "K003B"]}, {"histogram": {"Back pain": 1, "COVID-19": 1, "COVID-19 screening": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pyrexia": 1}, "batchcodes": ["K003B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/KD02A.json b/docs/data/histograms/Philippines/KD02A.json
index 954c2a448be..9952ff002b8 100644
--- a/docs/data/histograms/Philippines/KD02A.json
+++ b/docs/data/histograms/Philippines/KD02A.json
@@ -1 +1 @@
-{"batchcode": "KD02A", "histograms": [{"batchcodes": ["A1065", "KD02A"], "histogram": {"Chills": 1, "Decreased appetite": 1}}]}
\ No newline at end of file
+{"batchcode": "KD02A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1}, "batchcodes": ["A1065", "KD02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/KDS996.json b/docs/data/histograms/Philippines/KDS996.json
index 21997ae8f61..6dfe1009b35 100644
--- a/docs/data/histograms/Philippines/KDS996.json
+++ b/docs/data/histograms/Philippines/KDS996.json
@@ -1 +1 @@
-{"batchcode": "KDS996", "histograms": [{"batchcodes": ["KDS996"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Heart rate": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "Tachypnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "KDS996", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Heart rate": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "Tachypnoea": 1}, "batchcodes": ["KDS996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/KH8773.json b/docs/data/histograms/Philippines/KH8773.json
index 833528c4db0..244c3c427ca 100644
--- a/docs/data/histograms/Philippines/KH8773.json
+++ b/docs/data/histograms/Philippines/KH8773.json
@@ -1 +1 @@
-{"batchcode": "KH8773", "histograms": [{"batchcodes": ["KH8773"], "histogram": {"Ocular neoplasm": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "KH8773", "histograms": [{"histogram": {"Ocular neoplasm": 1, "Vaccination site pain": 1}, "batchcodes": ["KH8773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/KR8392.json b/docs/data/histograms/Philippines/KR8392.json
index 240bc1fc313..2412cb95de7 100644
--- a/docs/data/histograms/Philippines/KR8392.json
+++ b/docs/data/histograms/Philippines/KR8392.json
@@ -1 +1 @@
-{"batchcode": "KR8392", "histograms": [{"batchcodes": ["KR8392"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "KR8392", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["KR8392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L201207060.json b/docs/data/histograms/Philippines/L201207060.json
index 00db9f76748..b31cfad051a 100644
--- a/docs/data/histograms/Philippines/L201207060.json
+++ b/docs/data/histograms/Philippines/L201207060.json
@@ -1 +1 @@
-{"batchcode": "L201207060", "histograms": [{"batchcodes": ["L201207060"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "L201207060", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["L201207060"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L202106033.json b/docs/data/histograms/Philippines/L202106033.json
index e238206747c..0565ecdb804 100644
--- a/docs/data/histograms/Philippines/L202106033.json
+++ b/docs/data/histograms/Philippines/L202106033.json
@@ -1 +1 @@
-{"batchcode": "L202106033", "histograms": [{"batchcodes": ["068F21A", "C202105093", "L202106033"], "histogram": {"Hypoaesthesia": 1}}, {"batchcodes": ["C202105093", "L202106033"], "histogram": {"Haemorrhage": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "L202106033", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["068F21A", "C202105093", "L202106033"]}, {"histogram": {"Haemorrhage": 1, "Vaccination site pain": 1}, "batchcodes": ["C202105093", "L202106033"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L202106036.json b/docs/data/histograms/Philippines/L202106036.json
index 6bd9deacbba..c0d9b790e42 100644
--- a/docs/data/histograms/Philippines/L202106036.json
+++ b/docs/data/histograms/Philippines/L202106036.json
@@ -1 +1 @@
-{"batchcode": "L202106036", "histograms": [{"batchcodes": ["L202106036"], "histogram": {"Chest discomfort": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "L202106036", "histograms": [{"histogram": {"Chest discomfort": 1, "Pyrexia": 1}, "batchcodes": ["L202106036"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L202108103.json b/docs/data/histograms/Philippines/L202108103.json
index a52bed63f3b..98223fd11be 100644
--- a/docs/data/histograms/Philippines/L202108103.json
+++ b/docs/data/histograms/Philippines/L202108103.json
@@ -1 +1 @@
-{"batchcode": "L202108103", "histograms": [{"batchcodes": ["L202108103"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "L202108103", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["L202108103"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L2072A.json b/docs/data/histograms/Philippines/L2072A.json
index f87febf73a3..caa21fed742 100644
--- a/docs/data/histograms/Philippines/L2072A.json
+++ b/docs/data/histograms/Philippines/L2072A.json
@@ -1 +1 @@
-{"batchcode": "L2072A", "histograms": [{"batchcodes": ["L2072A"], "histogram": {"Flank pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "L2072A", "histograms": [{"histogram": {"Flank pain": 1, "Vaccination site pain": 1}, "batchcodes": ["L2072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L209521A.json b/docs/data/histograms/Philippines/L209521A.json
index 8dbcaae5773..cc1843fc46b 100644
--- a/docs/data/histograms/Philippines/L209521A.json
+++ b/docs/data/histograms/Philippines/L209521A.json
@@ -1 +1 @@
-{"batchcode": "L209521A", "histograms": [{"batchcodes": ["L209521A"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "L209521A", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["L209521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L213C21A.json b/docs/data/histograms/Philippines/L213C21A.json
index 129564f0fd5..3febd83c9d5 100644
--- a/docs/data/histograms/Philippines/L213C21A.json
+++ b/docs/data/histograms/Philippines/L213C21A.json
@@ -1 +1 @@
-{"batchcode": "L213C21A", "histograms": [{"batchcodes": ["L213C21A"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "L213C21A", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["L213C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L2800.json b/docs/data/histograms/Philippines/L2800.json
index 6f35c3a2f5e..7e8bf20a2bc 100644
--- a/docs/data/histograms/Philippines/L2800.json
+++ b/docs/data/histograms/Philippines/L2800.json
@@ -1 +1 @@
-{"batchcode": "L2800", "histograms": [{"batchcodes": ["L2800"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "L2800", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["L2800"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L28001.json b/docs/data/histograms/Philippines/L28001.json
index 2dc3d20f423..7ba5f4880dc 100644
--- a/docs/data/histograms/Philippines/L28001.json
+++ b/docs/data/histograms/Philippines/L28001.json
@@ -1 +1 @@
-{"batchcode": "L28001", "histograms": [{"batchcodes": ["L28001"], "histogram": {"Blood pressure increased": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "L28001", "histograms": [{"histogram": {"Blood pressure increased": 1, "Syncope": 1}, "batchcodes": ["L28001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/L312021BD.json b/docs/data/histograms/Philippines/L312021BD.json
index 4aa2d0ae463..1a6e935a2f1 100644
--- a/docs/data/histograms/Philippines/L312021BD.json
+++ b/docs/data/histograms/Philippines/L312021BD.json
@@ -1 +1 @@
-{"batchcode": "L312021BD", "histograms": [{"batchcodes": ["L312021BD"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "L312021BD", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["L312021BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/LF5324.json b/docs/data/histograms/Philippines/LF5324.json
index ccf5a0b783c..47ef77c9745 100644
--- a/docs/data/histograms/Philippines/LF5324.json
+++ b/docs/data/histograms/Philippines/LF5324.json
@@ -1 +1 @@
-{"batchcode": "LF5324", "histograms": [{"batchcodes": ["LF5324"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "LF5324", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["LF5324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/LSC729.json b/docs/data/histograms/Philippines/LSC729.json
index d811af7d720..f13076f51df 100644
--- a/docs/data/histograms/Philippines/LSC729.json
+++ b/docs/data/histograms/Philippines/LSC729.json
@@ -1 +1 @@
-{"batchcode": "LSC729", "histograms": [{"batchcodes": ["LSC729"], "histogram": {"Back pain": 1, "Maternal exposure timing unspecified": 1}}]}
\ No newline at end of file
+{"batchcode": "LSC729", "histograms": [{"histogram": {"Back pain": 1, "Maternal exposure timing unspecified": 1}, "batchcodes": ["LSC729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/LT074A.json b/docs/data/histograms/Philippines/LT074A.json
index bc0c5cfbc7f..0d65720e75e 100644
--- a/docs/data/histograms/Philippines/LT074A.json
+++ b/docs/data/histograms/Philippines/LT074A.json
@@ -1 +1 @@
-{"batchcode": "LT074A", "histograms": [{"batchcodes": ["LT074A"], "histogram": {"Back pain": 1, "Maternal exposure timing unspecified": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "LT074A", "histograms": [{"histogram": {"Back pain": 1, "Maternal exposure timing unspecified": 1, "Vaccination site pain": 1}, "batchcodes": ["LT074A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/N/A.json b/docs/data/histograms/Philippines/N/A.json
index 8289a315687..9124416868f 100644
--- a/docs/data/histograms/Philippines/N/A.json
+++ b/docs/data/histograms/Philippines/N/A.json
@@ -1 +1 @@
-{"batchcode": "N/A", "histograms": [{"batchcodes": ["N/A"], "histogram": {"Epistaxis": 1, "Haemoptysis": 1}}]}
\ No newline at end of file
+{"batchcode": "N/A", "histograms": [{"histogram": {"Epistaxis": 1, "Haemoptysis": 1}, "batchcodes": ["N/A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/N002A.json b/docs/data/histograms/Philippines/N002A.json
index 3572bc646ce..29e4e988dee 100644
--- a/docs/data/histograms/Philippines/N002A.json
+++ b/docs/data/histograms/Philippines/N002A.json
@@ -1 +1 @@
-{"batchcode": "N002A", "histograms": [{"batchcodes": ["212C21A", "N002A"], "histogram": {"Cough": 2, "COVID-19": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Oxygen saturation decreased": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "N002A", "histograms": [{"histogram": {"Cough": 2, "COVID-19": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Oxygen saturation decreased": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["212C21A", "N002A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/N005A.json b/docs/data/histograms/Philippines/N005A.json
index 9dffd31a149..3c18d698d14 100644
--- a/docs/data/histograms/Philippines/N005A.json
+++ b/docs/data/histograms/Philippines/N005A.json
@@ -1 +1 @@
-{"batchcode": "N005A", "histograms": [{"batchcodes": ["N005A"], "histogram": {"Hypertension": 1, "Hypoaesthesia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "N005A", "histograms": [{"histogram": {"Hypertension": 1, "Hypoaesthesia": 1, "Seizure": 1}, "batchcodes": ["N005A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/N072A.json b/docs/data/histograms/Philippines/N072A.json
index 714797aab95..b07fe483056 100644
--- a/docs/data/histograms/Philippines/N072A.json
+++ b/docs/data/histograms/Philippines/N072A.json
@@ -1 +1 @@
-{"batchcode": "N072A", "histograms": [{"batchcodes": ["N072A"], "histogram": {"Dizziness": 1, "Hemiparesis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "N072A", "histograms": [{"histogram": {"Dizziness": 1, "Hemiparesis": 1, "Vomiting": 1}, "batchcodes": ["N072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/N5072A/ 15072A.json b/docs/data/histograms/Philippines/N5072A/ 15072A.json
index d7bd051880b..cfe1e4141a6 100644
--- a/docs/data/histograms/Philippines/N5072A/ 15072A.json
+++ b/docs/data/histograms/Philippines/N5072A/ 15072A.json
@@ -1 +1 @@
-{"batchcode": "N5072A/ 15072A", "histograms": [{"batchcodes": ["N5072A/ 15072A"], "histogram": {"Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "N5072A/ 15072A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["N5072A/ 15072A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/NCC0092.json b/docs/data/histograms/Philippines/NCC0092.json
index f703afe28c5..ce618805462 100644
--- a/docs/data/histograms/Philippines/NCC0092.json
+++ b/docs/data/histograms/Philippines/NCC0092.json
@@ -1 +1 @@
-{"batchcode": "NCC0092", "histograms": [{"batchcodes": ["NCC0092"], "histogram": {"Accident": 1}}]}
\ No newline at end of file
+{"batchcode": "NCC0092", "histograms": [{"histogram": {"Accident": 1}, "batchcodes": ["NCC0092"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/NO72A.json b/docs/data/histograms/Philippines/NO72A.json
index 8331e65310a..53a89e2236e 100644
--- a/docs/data/histograms/Philippines/NO72A.json
+++ b/docs/data/histograms/Philippines/NO72A.json
@@ -1 +1 @@
-{"batchcode": "NO72A", "histograms": [{"batchcodes": ["NO72A"], "histogram": {"Diarrhoea haemorrhagic": 1, "Gastrointestinal haemorrhage": 1, "Shock haemorrhagic": 1}}]}
\ No newline at end of file
+{"batchcode": "NO72A", "histograms": [{"histogram": {"Diarrhoea haemorrhagic": 1, "Gastrointestinal haemorrhage": 1, "Shock haemorrhagic": 1}, "batchcodes": ["NO72A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/NOT AVAILABLE.json b/docs/data/histograms/Philippines/NOT AVAILABLE.json
index 5fcad3470cb..0b33b246250 100644
--- a/docs/data/histograms/Philippines/NOT AVAILABLE.json
+++ b/docs/data/histograms/Philippines/NOT AVAILABLE.json
@@ -1 +1 @@
-{"batchcode": "NOT AVAILABLE", "histograms": [{"batchcodes": ["NOT AVAILABLE"], "histogram": {"Drug ineffective": 2, "COVID-19": 1, "COVID-19 pneumonia": 1, "Dysarthria": 1, "Fall": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "NOT AVAILABLE", "histograms": [{"histogram": {"Drug ineffective": 2, "COVID-19": 1, "COVID-19 pneumonia": 1, "Dysarthria": 1, "Fall": 1, "Somnolence": 1}, "batchcodes": ["NOT AVAILABLE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/P0001340.json b/docs/data/histograms/Philippines/P0001340.json
index dde1eebf40e..60ce8ab42a5 100644
--- a/docs/data/histograms/Philippines/P0001340.json
+++ b/docs/data/histograms/Philippines/P0001340.json
@@ -1 +1 @@
-{"batchcode": "P0001340", "histograms": [{"batchcodes": ["086J21A", "J213C21A", "P0001340"], "histogram": {"Arthritis": 2, "Chills": 2, "Decreased appetite": 2, "Gastric disorder": 2, "Hyperthermia": 2, "Malaise": 2}}, {"batchcodes": ["P0001340"], "histogram": {"Dizziness": 7, "Dyspnoea": 6, "Blood pressure measurement": 4, "Chest pain": 4, "Body temperature": 3, "Chills": 3, "Cough": 3, "Headache": 3, "Heart rate": 3, "Hypoaesthesia": 3, "Respiratory rate": 3, "Asthenia": 2, "Malaise": 2, "Rash": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Arthritis": 1, "Blood chloride": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Body height": 1, "Body mass index": 1, "Cold sweat": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dysarthria": 1, "Expired product administered": 1, "Facial paralysis": 1, "Gastric disorder": 1, "Gastritis": 1, "Gastroenteritis": 1, "Generalised tonic-clonic seizure": 1, "Hemiparesis": 1, "Hyperthermia": 1, "Interchange of vaccine products": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Neurological examination": 1, "Off label use": 1, "Pain": 1, "Paraesthesia": 1, "Prostatomegaly": 1, "Pruritus": 1, "Pyrexia": 1, "Rash pruritic": 1, "Syncope": 1, "Underweight": 1, "Urine analysis": 1, "Vertigo": 1, "Vomiting": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "P0001340", "histograms": [{"histogram": {"Arthritis": 2, "Chills": 2, "Decreased appetite": 2, "Gastric disorder": 2, "Hyperthermia": 2, "Malaise": 2}, "batchcodes": ["086J21A", "J213C21A", "P0001340"]}, {"histogram": {"Dizziness": 7, "Dyspnoea": 6, "Blood pressure measurement": 4, "Chest pain": 4, "Body temperature": 3, "Chills": 3, "Cough": 3, "Headache": 3, "Heart rate": 3, "Hypoaesthesia": 3, "Respiratory rate": 3, "Asthenia": 2, "Malaise": 2, "Rash": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Arthritis": 1, "Blood chloride": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Body height": 1, "Body mass index": 1, "Cold sweat": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dysarthria": 1, "Expired product administered": 1, "Facial paralysis": 1, "Gastric disorder": 1, "Gastritis": 1, "Gastroenteritis": 1, "Generalised tonic-clonic seizure": 1, "Hemiparesis": 1, "Hyperthermia": 1, "Interchange of vaccine products": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Neurological examination": 1, "Off label use": 1, "Pain": 1, "Paraesthesia": 1, "Prostatomegaly": 1, "Pruritus": 1, "Pyrexia": 1, "Rash pruritic": 1, "Syncope": 1, "Underweight": 1, "Urine analysis": 1, "Vertigo": 1, "Vomiting": 1, "Weight": 1}, "batchcodes": ["P0001340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/P001340.json b/docs/data/histograms/Philippines/P001340.json
index 3aca55825bc..07a2bde2078 100644
--- a/docs/data/histograms/Philippines/P001340.json
+++ b/docs/data/histograms/Philippines/P001340.json
@@ -1 +1 @@
-{"batchcode": "P001340", "histograms": [{"batchcodes": ["P001340"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "P001340", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1}, "batchcodes": ["P001340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/P00D1340.json b/docs/data/histograms/Philippines/P00D1340.json
index 515a6b62bea..538a9587364 100644
--- a/docs/data/histograms/Philippines/P00D1340.json
+++ b/docs/data/histograms/Philippines/P00D1340.json
@@ -1 +1 @@
-{"batchcode": "P00D1340", "histograms": [{"batchcodes": ["P00D1340"], "histogram": {"Dyspnoea": 1, "Swelling": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "P00D1340", "histograms": [{"histogram": {"Dyspnoea": 1, "Swelling": 1, "Urticaria": 1}, "batchcodes": ["P00D1340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/P114352.json b/docs/data/histograms/Philippines/P114352.json
index 83e136e21a8..0e3361473ae 100644
--- a/docs/data/histograms/Philippines/P114352.json
+++ b/docs/data/histograms/Philippines/P114352.json
@@ -1 +1 @@
-{"batchcode": "P114352", "histograms": [{"batchcodes": ["P114352"], "histogram": {"Cough": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "P114352", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1}, "batchcodes": ["P114352"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/P610050.json b/docs/data/histograms/Philippines/P610050.json
index 73840ee5cd8..5c398bfa791 100644
--- a/docs/data/histograms/Philippines/P610050.json
+++ b/docs/data/histograms/Philippines/P610050.json
@@ -1 +1 @@
-{"batchcode": "P610050", "histograms": [{"batchcodes": ["P610050"], "histogram": {"Anorectal disorder": 1, "Haemorrhoids": 1}}]}
\ No newline at end of file
+{"batchcode": "P610050", "histograms": [{"histogram": {"Anorectal disorder": 1, "Haemorrhoids": 1}, "batchcodes": ["P610050"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PA17398.json b/docs/data/histograms/Philippines/PA17398.json
index d4334ed6ee1..b5b52ffd24a 100644
--- a/docs/data/histograms/Philippines/PA17398.json
+++ b/docs/data/histograms/Philippines/PA17398.json
@@ -1 +1 @@
-{"batchcode": "PA17398", "histograms": [{"batchcodes": ["PA17398"], "histogram": {"Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PA17398", "histograms": [{"histogram": {"Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["PA17398"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA165394.json b/docs/data/histograms/Philippines/PAA165394.json
index 98b511483bc..3b25f9363f6 100644
--- a/docs/data/histograms/Philippines/PAA165394.json
+++ b/docs/data/histograms/Philippines/PAA165394.json
@@ -1 +1 @@
-{"batchcode": "PAA165394", "histograms": [{"batchcodes": ["PAA165394"], "histogram": {"Asthenia": 1, "Dysarthria": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA165394", "histograms": [{"histogram": {"Asthenia": 1, "Dysarthria": 1, "Headache": 1}, "batchcodes": ["PAA165394"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA165994.json b/docs/data/histograms/Philippines/PAA165994.json
index 74a3af3e0fe..a47d180e404 100644
--- a/docs/data/histograms/Philippines/PAA165994.json
+++ b/docs/data/histograms/Philippines/PAA165994.json
@@ -1 +1 @@
-{"batchcode": "PAA165994", "histograms": [{"batchcodes": ["PAA165994"], "histogram": {"Nausea": 4, "Dizziness": 3, "Headache": 3, "Malaise": 3, "Pyrexia": 3, "Arthralgia": 2, "Body temperature": 2, "Fatigue": 2, "Nasopharyngitis": 2, "Petechiae": 2, "Somnolence": 2, "Abdominal pain upper": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immune thrombocytopenia": 1, "Pain": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA165994", "histograms": [{"histogram": {"Nausea": 4, "Dizziness": 3, "Headache": 3, "Malaise": 3, "Pyrexia": 3, "Arthralgia": 2, "Body temperature": 2, "Fatigue": 2, "Nasopharyngitis": 2, "Petechiae": 2, "Somnolence": 2, "Abdominal pain upper": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immune thrombocytopenia": 1, "Pain": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["PAA165994"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA1659940.json b/docs/data/histograms/Philippines/PAA1659940.json
index 468415f6803..fb4ce5c02b5 100644
--- a/docs/data/histograms/Philippines/PAA1659940.json
+++ b/docs/data/histograms/Philippines/PAA1659940.json
@@ -1 +1 @@
-{"batchcode": "PAA1659940", "histograms": [{"batchcodes": ["PAA1659940"], "histogram": {"Dizziness": 1, "Headache": 1, "Hypotension": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA1659940", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Hypotension": 1, "Pyrexia": 1}, "batchcodes": ["PAA1659940"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA1659971 EU-4.json b/docs/data/histograms/Philippines/PAA1659971 EU-4.json
index e9d36f38a5d..5df09bc3bb0 100644
--- a/docs/data/histograms/Philippines/PAA1659971 EU-4.json
+++ b/docs/data/histograms/Philippines/PAA1659971 EU-4.json
@@ -1 +1 @@
-{"batchcode": "PAA1659971 EU-4", "histograms": [{"batchcodes": ["PAA1659971 EU-4"], "histogram": {"Abdominal pain": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA1659971 EU-4", "histograms": [{"histogram": {"Abdominal pain": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["PAA1659971 EU-4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA169340.json b/docs/data/histograms/Philippines/PAA169340.json
index a77cb6b51e7..2efc018f138 100644
--- a/docs/data/histograms/Philippines/PAA169340.json
+++ b/docs/data/histograms/Philippines/PAA169340.json
@@ -1 +1 @@
-{"batchcode": "PAA169340", "histograms": [{"batchcodes": ["PAA169340"], "histogram": {"Intestinal mass": 1, "Intestinal obstruction": 1, "Jaundice": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA169340", "histograms": [{"histogram": {"Intestinal mass": 1, "Intestinal obstruction": 1, "Jaundice": 1}, "batchcodes": ["PAA169340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA169540.json b/docs/data/histograms/Philippines/PAA169540.json
index e0ae40099a5..99a6969469d 100644
--- a/docs/data/histograms/Philippines/PAA169540.json
+++ b/docs/data/histograms/Philippines/PAA169540.json
@@ -1 +1 @@
-{"batchcode": "PAA169540", "histograms": [{"batchcodes": ["PAA169540"], "histogram": {"Cerebrovascular accident": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA169540", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["PAA169540"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA173348320218.json b/docs/data/histograms/Philippines/PAA173348320218.json
index b1984a2736f..2248fe5b4f3 100644
--- a/docs/data/histograms/Philippines/PAA173348320218.json
+++ b/docs/data/histograms/Philippines/PAA173348320218.json
@@ -1 +1 @@
-{"batchcode": "PAA173348320218", "histograms": [{"batchcodes": ["PAA173348320218"], "histogram": {"Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA173348320218", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["PAA173348320218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA173398.json b/docs/data/histograms/Philippines/PAA173398.json
index 010868975ec..c97cea35c4f 100644
--- a/docs/data/histograms/Philippines/PAA173398.json
+++ b/docs/data/histograms/Philippines/PAA173398.json
@@ -1 +1 @@
-{"batchcode": "PAA173398", "histograms": [{"batchcodes": ["PAA173398"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dysmenorrhoea": 1, "Endometrial thickening": 1, "Heavy menstrual bleeding": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA173398", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dysmenorrhoea": 1, "Endometrial thickening": 1, "Heavy menstrual bleeding": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Off label use": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Vomiting": 1}, "batchcodes": ["PAA173398"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PAA173696.json b/docs/data/histograms/Philippines/PAA173696.json
index 4938b94904e..04bdd8b77fc 100644
--- a/docs/data/histograms/Philippines/PAA173696.json
+++ b/docs/data/histograms/Philippines/PAA173696.json
@@ -1 +1 @@
-{"batchcode": "PAA173696", "histograms": [{"batchcodes": ["PAA173696"], "histogram": {"Abdominal pain": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Septic shock": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA173696", "histograms": [{"histogram": {"Abdominal pain": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Septic shock": 1}, "batchcodes": ["PAA173696"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PACI073.json b/docs/data/histograms/Philippines/PACI073.json
index 2663bb14584..a5a8eb0c57d 100644
--- a/docs/data/histograms/Philippines/PACI073.json
+++ b/docs/data/histograms/Philippines/PACI073.json
@@ -1 +1 @@
-{"batchcode": "PACI073", "histograms": [{"batchcodes": ["PACI073"], "histogram": {"Ascending flaccid paralysis": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PACI073", "histograms": [{"histogram": {"Ascending flaccid paralysis": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Pain": 1}, "batchcodes": ["PACI073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PBC0004.json b/docs/data/histograms/Philippines/PBC0004.json
index 125e04e64a5..f90de791c4a 100644
--- a/docs/data/histograms/Philippines/PBC0004.json
+++ b/docs/data/histograms/Philippines/PBC0004.json
@@ -1 +1 @@
-{"batchcode": "PBC0004", "histograms": [{"batchcodes": ["PBC0004"], "histogram": {"Dizziness": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PBC0004", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["PBC0004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PBC0008.json b/docs/data/histograms/Philippines/PBC0008.json
index dc1bafb1c6a..478d8660f18 100644
--- a/docs/data/histograms/Philippines/PBC0008.json
+++ b/docs/data/histograms/Philippines/PBC0008.json
@@ -1 +1 @@
-{"batchcode": "PBC0008", "histograms": [{"batchcodes": ["PBC0008"], "histogram": {"Asthenia": 1, "Dysarthria": 1, "Grip strength decreased": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "PBC0008", "histograms": [{"histogram": {"Asthenia": 1, "Dysarthria": 1, "Grip strength decreased": 1, "Malaise": 1}, "batchcodes": ["PBC0008"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA 0008.json b/docs/data/histograms/Philippines/PCA 0008.json
index f98942e2ff4..93cb13aff6e 100644
--- a/docs/data/histograms/Philippines/PCA 0008.json
+++ b/docs/data/histograms/Philippines/PCA 0008.json
@@ -1 +1 @@
-{"batchcode": "PCA 0008", "histograms": [{"batchcodes": ["PCA 0008"], "histogram": {"Anxiety": 1, "Dizziness": 1, "Dyskinesia": 1, "Fatigue": 1, "Gaze palsy": 1, "Palpitations": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA 0008", "histograms": [{"histogram": {"Anxiety": 1, "Dizziness": 1, "Dyskinesia": 1, "Fatigue": 1, "Gaze palsy": 1, "Palpitations": 1, "Seizure": 1}, "batchcodes": ["PCA 0008"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA 0028.json b/docs/data/histograms/Philippines/PCA 0028.json
index d6adbd27df2..1d24cd949d8 100644
--- a/docs/data/histograms/Philippines/PCA 0028.json
+++ b/docs/data/histograms/Philippines/PCA 0028.json
@@ -1 +1 @@
-{"batchcode": "PCA 0028", "histograms": [{"batchcodes": ["PCA 0028"], "histogram": {"Hypertensive urgency": 2, "Dizziness": 1, "Headache": 1, "Hypersensitivity": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA 0028", "histograms": [{"histogram": {"Hypertensive urgency": 2, "Dizziness": 1, "Headache": 1, "Hypersensitivity": 1}, "batchcodes": ["PCA 0028"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA 0031.json b/docs/data/histograms/Philippines/PCA 0031.json
index 8862fc988b4..3903ade0ccc 100644
--- a/docs/data/histograms/Philippines/PCA 0031.json
+++ b/docs/data/histograms/Philippines/PCA 0031.json
@@ -1 +1 @@
-{"batchcode": "PCA 0031", "histograms": [{"batchcodes": ["PCA 0031"], "histogram": {"Dizziness": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA 0031", "histograms": [{"histogram": {"Dizziness": 1, "Syncope": 1}, "batchcodes": ["PCA 0031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA 0050.json b/docs/data/histograms/Philippines/PCA 0050.json
index 8091ed17182..87235a1f76f 100644
--- a/docs/data/histograms/Philippines/PCA 0050.json
+++ b/docs/data/histograms/Philippines/PCA 0050.json
@@ -1 +1 @@
-{"batchcode": "PCA 0050", "histograms": [{"batchcodes": ["PCA 0050"], "histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Body temperature": 1, "Diarrhoea": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Septic shock": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA 0050", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Body temperature": 1, "Diarrhoea": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Septic shock": 1, "Vomiting": 1}, "batchcodes": ["PCA 0050"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA00024.json b/docs/data/histograms/Philippines/PCA00024.json
index 0700575efdd..c64f007aaaf 100644
--- a/docs/data/histograms/Philippines/PCA00024.json
+++ b/docs/data/histograms/Philippines/PCA00024.json
@@ -1 +1 @@
-{"batchcode": "PCA00024", "histograms": [{"batchcodes": ["PCA00024"], "histogram": {"Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA00024", "histograms": [{"histogram": {"Muscular weakness": 1}, "batchcodes": ["PCA00024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0008.json b/docs/data/histograms/Philippines/PCA0008.json
index b591094f795..f5f8f9cbe8f 100644
--- a/docs/data/histograms/Philippines/PCA0008.json
+++ b/docs/data/histograms/Philippines/PCA0008.json
@@ -1 +1 @@
-{"batchcode": "PCA0008", "histograms": [{"batchcodes": ["212C21A", "PCA0008"], "histogram": {"Death": 1}}, {"batchcodes": ["PCA0008"], "histogram": {"Syncope": 5, "Cerebral infarction": 2, "Death": 2, "Dizziness": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Palpitations": 2, "SARS-CoV-2 test": 2, "Vomiting": 2, "Altered state of consciousness": 1, "Anaemia of chronic disease": 1, "Aneurysm": 1, "Asthenia": 1, "Back pain": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Cerebellar haemorrhage": 1, "Chest pain": 1, "Chronic kidney disease": 1, "Chronic obstructive pulmonary disease": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Dehydration": 1, "Diabetes mellitus": 1, "Diabetic nephropathy": 1, "Electrolyte imbalance": 1, "Faeces discoloured": 1, "Gastric disorder": 1, "Haematemesis": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Immune thrombocytopenia": 1, "Kidney infection": 1, "Muscular weakness": 1, "Pain": 1, "Paralysis": 1, "Pneumonia": 1, "Pruritus": 1, "Respiratory tract infection": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Upper gastrointestinal haemorrhage": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0008", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["212C21A", "PCA0008"]}, {"histogram": {"Syncope": 5, "Cerebral infarction": 2, "Death": 2, "Dizziness": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Palpitations": 2, "SARS-CoV-2 test": 2, "Vomiting": 2, "Altered state of consciousness": 1, "Anaemia of chronic disease": 1, "Aneurysm": 1, "Asthenia": 1, "Back pain": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Cerebellar haemorrhage": 1, "Chest pain": 1, "Chronic kidney disease": 1, "Chronic obstructive pulmonary disease": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Dehydration": 1, "Diabetes mellitus": 1, "Diabetic nephropathy": 1, "Electrolyte imbalance": 1, "Faeces discoloured": 1, "Gastric disorder": 1, "Haematemesis": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Immune thrombocytopenia": 1, "Kidney infection": 1, "Muscular weakness": 1, "Pain": 1, "Paralysis": 1, "Pneumonia": 1, "Pruritus": 1, "Respiratory tract infection": 1, "Subarachnoid haemorrhage": 1, "Subdural haematoma": 1, "Upper gastrointestinal haemorrhage": 1, "Vaccination site pain": 1}, "batchcodes": ["PCA0008"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0009.json b/docs/data/histograms/Philippines/PCA0009.json
index 711fbe19f3d..46271e639b2 100644
--- a/docs/data/histograms/Philippines/PCA0009.json
+++ b/docs/data/histograms/Philippines/PCA0009.json
@@ -1 +1 @@
-{"batchcode": "PCA0009", "histograms": [{"batchcodes": ["PCA0009"], "histogram": {"Headache": 2, "Asthenia": 1, "Decreased appetite": 1, "Gingival bleeding": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Pain": 1, "Pyrexia": 1, "Seizure": 1, "Skin lesion": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0009", "histograms": [{"histogram": {"Headache": 2, "Asthenia": 1, "Decreased appetite": 1, "Gingival bleeding": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Pain": 1, "Pyrexia": 1, "Seizure": 1, "Skin lesion": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["PCA0009"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0024.json b/docs/data/histograms/Philippines/PCA0024.json
index a256eefd131..96f77b4281e 100644
--- a/docs/data/histograms/Philippines/PCA0024.json
+++ b/docs/data/histograms/Philippines/PCA0024.json
@@ -1 +1 @@
-{"batchcode": "PCA0024", "histograms": [{"batchcodes": ["212C21A", "PCA0024"], "histogram": {"Death": 1}}, {"batchcodes": ["PCA0024"], "histogram": {"Dizziness": 2, "Dyspnoea": 2, "Fracture": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abdominal rigidity": 1, "Arthralgia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Chills": 1, "Dysarthria": 1, "Fatigue": 1, "Gait disturbance": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Malaise": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0024", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["212C21A", "PCA0024"]}, {"histogram": {"Dizziness": 2, "Dyspnoea": 2, "Fracture": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abdominal rigidity": 1, "Arthralgia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Chills": 1, "Dysarthria": 1, "Fatigue": 1, "Gait disturbance": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Malaise": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["PCA0024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0024/222756.json b/docs/data/histograms/Philippines/PCA0024/222756.json
index fecfef27acb..d3da32521af 100644
--- a/docs/data/histograms/Philippines/PCA0024/222756.json
+++ b/docs/data/histograms/Philippines/PCA0024/222756.json
@@ -1 +1 @@
-{"batchcode": "PCA0024/222756", "histograms": [{"batchcodes": ["PCA0024/222756"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0024/222756", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1}, "batchcodes": ["PCA0024/222756"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0025.json b/docs/data/histograms/Philippines/PCA0025.json
index 48e4764a10e..2cfa2824dac 100644
--- a/docs/data/histograms/Philippines/PCA0025.json
+++ b/docs/data/histograms/Philippines/PCA0025.json
@@ -1 +1 @@
-{"batchcode": "PCA0025", "histograms": [{"batchcodes": ["PCA0025"], "histogram": {"Blood pressure measurement": 7, "Blood pressure increased": 6, "Dizziness": 2, "Loss of consciousness": 2, "Malaise": 2, "Syncope": 2, "Vision blurred": 2, "Blood pressure decreased": 1, "Bradycardia": 1, "Dysuria": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0025", "histograms": [{"histogram": {"Blood pressure measurement": 7, "Blood pressure increased": 6, "Dizziness": 2, "Loss of consciousness": 2, "Malaise": 2, "Syncope": 2, "Vision blurred": 2, "Blood pressure decreased": 1, "Bradycardia": 1, "Dysuria": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["PCA0025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0028.json b/docs/data/histograms/Philippines/PCA0028.json
index be7d7e3db3b..7c563c50bf1 100644
--- a/docs/data/histograms/Philippines/PCA0028.json
+++ b/docs/data/histograms/Philippines/PCA0028.json
@@ -1 +1 @@
-{"batchcode": "PCA0028", "histograms": [{"batchcodes": ["PCA0028"], "histogram": {"Headache": 3, "Chills": 2, "Malaise": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Basal ganglia haemorrhage": 1, "Bell's palsy": 1, "Brain herniation": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Immunisation": 1, "Loss of consciousness": 1, "Myalgia": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0028", "histograms": [{"histogram": {"Headache": 3, "Chills": 2, "Malaise": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Basal ganglia haemorrhage": 1, "Bell's palsy": 1, "Brain herniation": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Immunisation": 1, "Loss of consciousness": 1, "Myalgia": 1, "Neuropathy peripheral": 1, "Off label use": 1, "Rash": 1, "Vomiting": 1}, "batchcodes": ["PCA0028"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0029.json b/docs/data/histograms/Philippines/PCA0029.json
index ce635cffc4e..2a734321664 100644
--- a/docs/data/histograms/Philippines/PCA0029.json
+++ b/docs/data/histograms/Philippines/PCA0029.json
@@ -1 +1 @@
-{"batchcode": "PCA0029", "histograms": [{"batchcodes": ["PCA0029"], "histogram": {"Dizziness": 3, "Headache": 2, "Pyrexia": 2, "Syncope": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0029", "histograms": [{"histogram": {"Dizziness": 3, "Headache": 2, "Pyrexia": 2, "Syncope": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["PCA0029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0030.json b/docs/data/histograms/Philippines/PCA0030.json
index 520654c979a..b7229911f58 100644
--- a/docs/data/histograms/Philippines/PCA0030.json
+++ b/docs/data/histograms/Philippines/PCA0030.json
@@ -1 +1 @@
-{"batchcode": "PCA0030", "histograms": [{"batchcodes": ["PCA0030"], "histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2, "Cough": 2, "Loss of consciousness": 2, "Cyanosis": 1, "Dyspnoea": 1, "Extensive swelling of vaccinated limb": 1, "Feeling cold": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oedema": 1, "Pallor": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0030", "histograms": [{"histogram": {"Blood pressure increased": 2, "Blood pressure measurement": 2, "Cough": 2, "Loss of consciousness": 2, "Cyanosis": 1, "Dyspnoea": 1, "Extensive swelling of vaccinated limb": 1, "Feeling cold": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oedema": 1, "Pallor": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1}, "batchcodes": ["PCA0030"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0031.json b/docs/data/histograms/Philippines/PCA0031.json
index a654ce745cc..fbece55287c 100644
--- a/docs/data/histograms/Philippines/PCA0031.json
+++ b/docs/data/histograms/Philippines/PCA0031.json
@@ -1 +1 @@
-{"batchcode": "PCA0031", "histograms": [{"batchcodes": ["PCA0031"], "histogram": {"Dizziness": 3, "Syncope": 3, "Malaise": 2, "Rash": 2, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Nausea": 1, "Pain": 1, "Paralysis": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0031", "histograms": [{"histogram": {"Dizziness": 3, "Syncope": 3, "Malaise": 2, "Rash": 2, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Loss of consciousness": 1, "Nausea": 1, "Pain": 1, "Paralysis": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["PCA0031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA00328.json b/docs/data/histograms/Philippines/PCA00328.json
index e8895dca08e..b6d4b3ecba5 100644
--- a/docs/data/histograms/Philippines/PCA00328.json
+++ b/docs/data/histograms/Philippines/PCA00328.json
@@ -1 +1 @@
-{"batchcode": "PCA00328", "histograms": [{"batchcodes": ["PCA00328"], "histogram": {"Cold sweat": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA00328", "histograms": [{"histogram": {"Cold sweat": 1, "Loss of consciousness": 1}, "batchcodes": ["PCA00328"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0034.json b/docs/data/histograms/Philippines/PCA0034.json
index 897e1518ef6..1ab4fbe1d10 100644
--- a/docs/data/histograms/Philippines/PCA0034.json
+++ b/docs/data/histograms/Philippines/PCA0034.json
@@ -1 +1 @@
-{"batchcode": "PCA0034", "histograms": [{"batchcodes": ["PCA0034"], "histogram": {"Diarrhoea": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0034", "histograms": [{"histogram": {"Diarrhoea": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["PCA0034"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0037.json b/docs/data/histograms/Philippines/PCA0037.json
index 9676ac068b3..51ad24b5135 100644
--- a/docs/data/histograms/Philippines/PCA0037.json
+++ b/docs/data/histograms/Philippines/PCA0037.json
@@ -1 +1 @@
-{"batchcode": "PCA0037", "histograms": [{"batchcodes": ["PCA0037"], "histogram": {"Asthenia": 1, "COVID-19": 1, "Chronic obstructive pulmonary disease": 1, "Cold type haemolytic anaemia": 1, "Drug ineffective": 1, "Headache": 1, "Immunisation": 1, "Off label use": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Thromboangiitis obliterans": 1, "Upper gastrointestinal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0037", "histograms": [{"histogram": {"Asthenia": 1, "COVID-19": 1, "Chronic obstructive pulmonary disease": 1, "Cold type haemolytic anaemia": 1, "Drug ineffective": 1, "Headache": 1, "Immunisation": 1, "Off label use": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Thromboangiitis obliterans": 1, "Upper gastrointestinal haemorrhage": 1}, "batchcodes": ["PCA0037"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0046.json b/docs/data/histograms/Philippines/PCA0046.json
index be6a534dec0..cb99e05f778 100644
--- a/docs/data/histograms/Philippines/PCA0046.json
+++ b/docs/data/histograms/Philippines/PCA0046.json
@@ -1 +1 @@
-{"batchcode": "PCA0046", "histograms": [{"batchcodes": ["PCA0046"], "histogram": {"Off label use": 2, "Angioedema": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebrovascular disorder": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea": 1, "Embolic stroke": 1, "Expired product administered": 1, "Headache": 1, "Heart rate": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Myocardial ischaemia": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Sensory loss": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0046", "histograms": [{"histogram": {"Off label use": 2, "Angioedema": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebrovascular disorder": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea": 1, "Embolic stroke": 1, "Expired product administered": 1, "Headache": 1, "Heart rate": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Myocardial ischaemia": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Sensory loss": 1}, "batchcodes": ["PCA0046"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0050.json b/docs/data/histograms/Philippines/PCA0050.json
index 75e873fe6a1..26bfd4cf4dd 100644
--- a/docs/data/histograms/Philippines/PCA0050.json
+++ b/docs/data/histograms/Philippines/PCA0050.json
@@ -1 +1 @@
-{"batchcode": "PCA0050", "histograms": [{"batchcodes": ["PCA0050"], "histogram": {"Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Cough": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysuria": 1, "Gastroenteritis": 1, "Immunisation": 1, "Labour pain": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "Off label use": 1, "Peripheral swelling": 1, "Premature rupture of membranes": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0050", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Cough": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysuria": 1, "Gastroenteritis": 1, "Immunisation": 1, "Labour pain": 1, "Maternal exposure during pregnancy": 1, "Maternal exposure timing unspecified": 1, "Off label use": 1, "Peripheral swelling": 1, "Premature rupture of membranes": 1}, "batchcodes": ["PCA0050"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0063.json b/docs/data/histograms/Philippines/PCA0063.json
index 381f320bda7..e42b9f8d5f6 100644
--- a/docs/data/histograms/Philippines/PCA0063.json
+++ b/docs/data/histograms/Philippines/PCA0063.json
@@ -1 +1 @@
-{"batchcode": "PCA0063", "histograms": [{"batchcodes": ["PCA0063"], "histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Hemiparesis": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0063", "histograms": [{"histogram": {"Blood pressure increased": 1, "Dizziness": 1, "Hemiparesis": 1, "Malaise": 1}, "batchcodes": ["PCA0063"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA008.json b/docs/data/histograms/Philippines/PCA008.json
index 476ea2eaa73..af967163731 100644
--- a/docs/data/histograms/Philippines/PCA008.json
+++ b/docs/data/histograms/Philippines/PCA008.json
@@ -1 +1 @@
-{"batchcode": "PCA008", "histograms": [{"batchcodes": ["PCA008"], "histogram": {"Nausea": 1, "Seizure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA008", "histograms": [{"histogram": {"Nausea": 1, "Seizure": 1, "Vomiting": 1}, "batchcodes": ["PCA008"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA009.json b/docs/data/histograms/Philippines/PCA009.json
index 060b8043070..6d15c7d4ab8 100644
--- a/docs/data/histograms/Philippines/PCA009.json
+++ b/docs/data/histograms/Philippines/PCA009.json
@@ -1 +1 @@
-{"batchcode": "PCA009", "histograms": [{"batchcodes": ["PCA009"], "histogram": {"Foetal death": 2, "Cough": 1, "Dizziness": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA009", "histograms": [{"histogram": {"Foetal death": 2, "Cough": 1, "Dizziness": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["PCA009"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA0330.json b/docs/data/histograms/Philippines/PCA0330.json
index ae6b63bbb6e..249f8a44beb 100644
--- a/docs/data/histograms/Philippines/PCA0330.json
+++ b/docs/data/histograms/Philippines/PCA0330.json
@@ -1 +1 @@
-{"batchcode": "PCA0330", "histograms": [{"batchcodes": ["PCA0330"], "histogram": {"Dysarthria": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0330", "histograms": [{"histogram": {"Dysarthria": 1}, "batchcodes": ["PCA0330"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCA05D.json b/docs/data/histograms/Philippines/PCA05D.json
index 63ac70de619..7c8b8bae24a 100644
--- a/docs/data/histograms/Philippines/PCA05D.json
+++ b/docs/data/histograms/Philippines/PCA05D.json
@@ -1 +1 @@
-{"batchcode": "PCA05D", "histograms": [{"batchcodes": ["PCA05D"], "histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Pain": 1, "Swelling": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA05D", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Pain": 1, "Swelling": 1, "Vaccination site pain": 1}, "batchcodes": ["PCA05D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCADO30.json b/docs/data/histograms/Philippines/PCADO30.json
index d483bdcb3e9..a17b64cde9e 100644
--- a/docs/data/histograms/Philippines/PCADO30.json
+++ b/docs/data/histograms/Philippines/PCADO30.json
@@ -1 +1 @@
-{"batchcode": "PCADO30", "histograms": [{"batchcodes": ["PCADO30"], "histogram": {"Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PCADO30", "histograms": [{"histogram": {"Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["PCADO30"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCAOOO8.json b/docs/data/histograms/Philippines/PCAOOO8.json
index 12442659452..c59d51907cf 100644
--- a/docs/data/histograms/Philippines/PCAOOO8.json
+++ b/docs/data/histograms/Philippines/PCAOOO8.json
@@ -1 +1 @@
-{"batchcode": "PCAOOO8", "histograms": [{"batchcodes": ["PCAOOO8"], "histogram": {"Headache": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "PCAOOO8", "histograms": [{"histogram": {"Headache": 1, "Syncope": 1}, "batchcodes": ["PCAOOO8"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB 0002 / FH 8.json b/docs/data/histograms/Philippines/PCB 0002 / FH 8.json
index a790c0b8f7f..638d01c84c7 100644
--- a/docs/data/histograms/Philippines/PCB 0002 / FH 8.json
+++ b/docs/data/histograms/Philippines/PCB 0002 / FH 8.json
@@ -1 +1 @@
-{"batchcode": "PCB 0002 / FH 8", "histograms": [{"batchcodes": ["PCB 0002 / FH 8"], "histogram": {"Death": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB 0002 / FH 8", "histograms": [{"histogram": {"Death": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1}, "batchcodes": ["PCB 0002 / FH 8"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB 002.json b/docs/data/histograms/Philippines/PCB 002.json
index e50a8a100dd..a93d76057bb 100644
--- a/docs/data/histograms/Philippines/PCB 002.json
+++ b/docs/data/histograms/Philippines/PCB 002.json
@@ -1 +1 @@
-{"batchcode": "PCB 002", "histograms": [{"batchcodes": ["PCB 002"], "histogram": {"Chills": 1, "Incorrect route of product administration": 1, "Nausea": 1, "Pyrexia": 1, "Taste disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB 002", "histograms": [{"histogram": {"Chills": 1, "Incorrect route of product administration": 1, "Nausea": 1, "Pyrexia": 1, "Taste disorder": 1, "Vomiting": 1}, "batchcodes": ["PCB 002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB-002.json b/docs/data/histograms/Philippines/PCB-002.json
index 83fc45c69b7..315832734db 100644
--- a/docs/data/histograms/Philippines/PCB-002.json
+++ b/docs/data/histograms/Philippines/PCB-002.json
@@ -1 +1 @@
-{"batchcode": "PCB-002", "histograms": [{"batchcodes": ["PCB-002"], "histogram": {"Chest pain": 1, "Nausea": 1, "Sensation of foreign body": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB-002", "histograms": [{"histogram": {"Chest pain": 1, "Nausea": 1, "Sensation of foreign body": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["PCB-002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB000.json b/docs/data/histograms/Philippines/PCB000.json
index bf7634f1ad5..9aa9c90ae99 100644
--- a/docs/data/histograms/Philippines/PCB000.json
+++ b/docs/data/histograms/Philippines/PCB000.json
@@ -1 +1 @@
-{"batchcode": "PCB000", "histograms": [{"batchcodes": ["PCB000"], "histogram": {"Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB000", "histograms": [{"histogram": {"Syncope": 1, "Vomiting": 1}, "batchcodes": ["PCB000"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0002.json b/docs/data/histograms/Philippines/PCB0002.json
index 5f11c3f6122..79175f5120c 100644
--- a/docs/data/histograms/Philippines/PCB0002.json
+++ b/docs/data/histograms/Philippines/PCB0002.json
@@ -1 +1 @@
-{"batchcode": "PCB0002", "histograms": [{"batchcodes": ["PCB0002"], "histogram": {"Blood pressure measurement": 67, "Blood pressure increased": 65, "Dizziness": 11, "Dyspnoea": 11, "Syncope": 11, "Vomiting": 5, "Arthralgia": 4, "Asthenia": 4, "Chest pain": 4, "Drug ineffective": 4, "Headache": 4, "Loss of consciousness": 4, "Pyrexia": 4, "Abdominal pain": 3, "COVID-19": 3, "Cough": 3, "Hypotension": 3, "Palpitations": 3, "SARS-CoV-2 test": 3, "Seizure": 3, "Anaphylactic shock": 2, "Blood pressure decreased": 2, "Body temperature": 2, "Chest discomfort": 2, "Death": 2, "Diarrhoea": 2, "Heart rate": 2, "Hypertension": 2, "Hypokalaemia": 2, "Hypoxic-ischaemic encephalopathy": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Oxygen saturation": 2, "Pneumonia": 2, "Presyncope": 2, "Respiratory rate": 2, "Abdominal pain upper": 1, "Acute respiratory failure": 1, "Agonal respiration": 1, "Appendicitis": 1, "Asthma": 1, "COVID-19 screening": 1, "Cardiac arrest": 1, "Cardiovascular disorder": 1, "Cold sweat": 1, "Craniocerebral injury": 1, "Decreased appetite": 1, "Dengue fever": 1, "Diplopia": 1, "Dysarthria": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Fear of injection": 1, "Haematoma": 1, "Haemorrhage": 1, "Hypoglycaemia": 1, "Myalgia": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Obesity": 1, "Oropharyngeal pain": 1, "Paralysis": 1, "Peripheral coldness": 1, "Physical examination": 1, "Productive cough": 1, "Pulse abnormal": 1, "Pupil fixed": 1, "Rash": 1, "Respiratory arrest": 1, "Respiratory rate increased": 1, "Skin laceration": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Tonic convulsion": 1, "Unresponsive to stimuli": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0002", "histograms": [{"histogram": {"Blood pressure measurement": 67, "Blood pressure increased": 65, "Dizziness": 11, "Dyspnoea": 11, "Syncope": 11, "Vomiting": 5, "Arthralgia": 4, "Asthenia": 4, "Chest pain": 4, "Drug ineffective": 4, "Headache": 4, "Loss of consciousness": 4, "Pyrexia": 4, "Abdominal pain": 3, "COVID-19": 3, "Cough": 3, "Hypotension": 3, "Palpitations": 3, "SARS-CoV-2 test": 3, "Seizure": 3, "Anaphylactic shock": 2, "Blood pressure decreased": 2, "Body temperature": 2, "Chest discomfort": 2, "Death": 2, "Diarrhoea": 2, "Heart rate": 2, "Hypertension": 2, "Hypokalaemia": 2, "Hypoxic-ischaemic encephalopathy": 2, "Interchange of vaccine products": 2, "Off label use": 2, "Oxygen saturation": 2, "Pneumonia": 2, "Presyncope": 2, "Respiratory rate": 2, "Abdominal pain upper": 1, "Acute respiratory failure": 1, "Agonal respiration": 1, "Appendicitis": 1, "Asthma": 1, "COVID-19 screening": 1, "Cardiac arrest": 1, "Cardiovascular disorder": 1, "Cold sweat": 1, "Craniocerebral injury": 1, "Decreased appetite": 1, "Dengue fever": 1, "Diplopia": 1, "Dysarthria": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Fear of injection": 1, "Haematoma": 1, "Haemorrhage": 1, "Hypoglycaemia": 1, "Myalgia": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Obesity": 1, "Oropharyngeal pain": 1, "Paralysis": 1, "Peripheral coldness": 1, "Physical examination": 1, "Productive cough": 1, "Pulse abnormal": 1, "Pupil fixed": 1, "Rash": 1, "Respiratory arrest": 1, "Respiratory rate increased": 1, "Skin laceration": 1, "Suspected COVID-19": 1, "Throat irritation": 1, "Tonic convulsion": 1, "Unresponsive to stimuli": 1, "Urticaria": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Weight decreased": 1}, "batchcodes": ["PCB0002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0003.json b/docs/data/histograms/Philippines/PCB0003.json
index 41c28006fa0..6d01a8867b1 100644
--- a/docs/data/histograms/Philippines/PCB0003.json
+++ b/docs/data/histograms/Philippines/PCB0003.json
@@ -1 +1 @@
-{"batchcode": "PCB0003", "histograms": [{"batchcodes": ["PCB0003"], "histogram": {"Loss of consciousness": 2, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0003", "histograms": [{"histogram": {"Loss of consciousness": 2, "Syncope": 1}, "batchcodes": ["PCB0003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0004.json b/docs/data/histograms/Philippines/PCB0004.json
index 618d1aee963..1e7b93df81d 100644
--- a/docs/data/histograms/Philippines/PCB0004.json
+++ b/docs/data/histograms/Philippines/PCB0004.json
@@ -1 +1 @@
-{"batchcode": "PCB0004", "histograms": [{"batchcodes": ["PCB0004"], "histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Pyrexia": 6, "Dizziness": 5, "Loss of consciousness": 4, "Syncope": 4, "Chest pain": 3, "Chills": 3, "Cough": 3, "Dyspnoea": 3, "Vomiting": 3, "Arthralgia": 2, "Asthenia": 2, "Cold sweat": 2, "Myalgia": 2, "Rash": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Aortic arteriosclerosis": 1, "Blood pressure decreased": 1, "COVID-19": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysphagia": 1, "Facial asymmetry": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Meningitis meningococcal": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neisseria test negative": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Palpitations": 1, "Pruritus": 1, "Pulse absent": 1, "Purpura": 1, "Rash pruritic": 1, "Seizure": 1, "Sensation of foreign body": 1, "Septic shock": 1, "Tuberculosis": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0004", "histograms": [{"histogram": {"Blood pressure increased": 7, "Blood pressure measurement": 7, "Pyrexia": 6, "Dizziness": 5, "Loss of consciousness": 4, "Syncope": 4, "Chest pain": 3, "Chills": 3, "Cough": 3, "Dyspnoea": 3, "Vomiting": 3, "Arthralgia": 2, "Asthenia": 2, "Cold sweat": 2, "Myalgia": 2, "Rash": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Aortic arteriosclerosis": 1, "Blood pressure decreased": 1, "COVID-19": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Decreased appetite": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dysphagia": 1, "Facial asymmetry": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Meningitis meningococcal": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neisseria test negative": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Palpitations": 1, "Pruritus": 1, "Pulse absent": 1, "Purpura": 1, "Rash pruritic": 1, "Seizure": 1, "Sensation of foreign body": 1, "Septic shock": 1, "Tuberculosis": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vital signs measurement": 1}, "batchcodes": ["PCB0004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0006.json b/docs/data/histograms/Philippines/PCB0006.json
index e099366a755..f9969428905 100644
--- a/docs/data/histograms/Philippines/PCB0006.json
+++ b/docs/data/histograms/Philippines/PCB0006.json
@@ -1 +1 @@
-{"batchcode": "PCB0006", "histograms": [{"batchcodes": ["PCB0006"], "histogram": {"Blood pressure increased": 10, "Blood pressure measurement": 10, "Chest pain": 5, "Dyspnoea": 4, "COVID-19": 3, "Dizziness": 3, "Interchange of vaccine products": 3, "Off label use": 3, "Drug ineffective": 2, "Immunisation": 2, "Nausea": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthenia": 1, "COVID-19 screening": 1, "Death": 1, "Decreased appetite": 1, "Fatigue": 1, "Haematochezia": 1, "Headache": 1, "Joint swelling": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Non-pitting oedema": 1, "Pain assessment": 1, "Pain in extremity": 1, "Palpitations": 1, "Pruritus": 1, "Rash": 1, "Skin lesion": 1, "Swelling face": 1, "Tonic convulsion": 1, "Type 2 diabetes mellitus": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0006", "histograms": [{"histogram": {"Blood pressure increased": 10, "Blood pressure measurement": 10, "Chest pain": 5, "Dyspnoea": 4, "COVID-19": 3, "Dizziness": 3, "Interchange of vaccine products": 3, "Off label use": 3, "Drug ineffective": 2, "Immunisation": 2, "Nausea": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acute myocardial infarction": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthenia": 1, "COVID-19 screening": 1, "Death": 1, "Decreased appetite": 1, "Fatigue": 1, "Haematochezia": 1, "Headache": 1, "Joint swelling": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Non-pitting oedema": 1, "Pain assessment": 1, "Pain in extremity": 1, "Palpitations": 1, "Pruritus": 1, "Rash": 1, "Skin lesion": 1, "Swelling face": 1, "Tonic convulsion": 1, "Type 2 diabetes mellitus": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["PCB0006"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0014.json b/docs/data/histograms/Philippines/PCB0014.json
index 431d01c724e..b95dcfe2504 100644
--- a/docs/data/histograms/Philippines/PCB0014.json
+++ b/docs/data/histograms/Philippines/PCB0014.json
@@ -1 +1 @@
-{"batchcode": "PCB0014", "histograms": [{"batchcodes": ["PCB0014"], "histogram": {"Malaise": 3, "Arthralgia": 2, "Chills": 2, "Myalgia": 2, "Pyrexia": 2, "Rash": 2, "Abdominal distension": 1, "Asthenia": 1, "Death": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hemiplegia": 1, "Hypertensive emergency": 1, "Immunisation": 1, "Loss of consciousness": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Postmenopausal haemorrhage": 1, "Type 2 diabetes mellitus": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0014", "histograms": [{"histogram": {"Malaise": 3, "Arthralgia": 2, "Chills": 2, "Myalgia": 2, "Pyrexia": 2, "Rash": 2, "Abdominal distension": 1, "Asthenia": 1, "Death": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hemiplegia": 1, "Hypertensive emergency": 1, "Immunisation": 1, "Loss of consciousness": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Postmenopausal haemorrhage": 1, "Type 2 diabetes mellitus": 1, "Unresponsive to stimuli": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["PCB0014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0015.json b/docs/data/histograms/Philippines/PCB0015.json
index 7e60074223e..64c6e0782d8 100644
--- a/docs/data/histograms/Philippines/PCB0015.json
+++ b/docs/data/histograms/Philippines/PCB0015.json
@@ -1 +1 @@
-{"batchcode": "PCB0015", "histograms": [{"batchcodes": ["PCB0015"], "histogram": {"Dizziness": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Electrolyte imbalance": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Vaccination site pain": 2, "Weight": 2, "COVID-19": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chills": 1, "Computerised tomogram": 1, "Diabetes mellitus": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Facial asymmetry": 1, "Fall": 1, "Gaze palsy": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypokalaemia": 1, "Immunisation": 1, "Infarction": 1, "Loss of consciousness": 1, "Malaise": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Off label use": 1, "Palpitations": 1, "Post stroke seizure": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vertigo positional": 1, "Vomiting": 1, "Walking disability": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0015", "histograms": [{"histogram": {"Dizziness": 3, "Blood pressure measurement": 2, "Body temperature": 2, "Electrolyte imbalance": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Vaccination site pain": 2, "Weight": 2, "COVID-19": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Cerebrovascular disorder": 1, "Chills": 1, "Computerised tomogram": 1, "Diabetes mellitus": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Facial asymmetry": 1, "Fall": 1, "Gaze palsy": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypokalaemia": 1, "Immunisation": 1, "Infarction": 1, "Loss of consciousness": 1, "Malaise": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Off label use": 1, "Palpitations": 1, "Post stroke seizure": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Vertigo positional": 1, "Vomiting": 1, "Walking disability": 1}, "batchcodes": ["PCB0015"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0018.json b/docs/data/histograms/Philippines/PCB0018.json
index f537a25d0da..bbadd908cd7 100644
--- a/docs/data/histograms/Philippines/PCB0018.json
+++ b/docs/data/histograms/Philippines/PCB0018.json
@@ -1 +1 @@
-{"batchcode": "PCB0018", "histograms": [{"batchcodes": ["ACB3221", "PCB0018"], "histogram": {"Hypoaesthesia": 1}}, {"batchcodes": ["PCB0018"], "histogram": {"Hypoaesthesia": 1, "Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0018", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["ACB3221", "PCB0018"]}, {"histogram": {"Hypoaesthesia": 1, "Interchange of vaccine products": 1}, "batchcodes": ["PCB0018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0019.json b/docs/data/histograms/Philippines/PCB0019.json
index 2f4d56763ca..70bb974c5bc 100644
--- a/docs/data/histograms/Philippines/PCB0019.json
+++ b/docs/data/histograms/Philippines/PCB0019.json
@@ -1 +1 @@
-{"batchcode": "PCB0019", "histograms": [{"batchcodes": ["PCB0019"], "histogram": {"Hemiparesis": 1, "Immunisation": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0019", "histograms": [{"histogram": {"Hemiparesis": 1, "Immunisation": 1, "Off label use": 1}, "batchcodes": ["PCB0019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB002.json b/docs/data/histograms/Philippines/PCB002.json
index f7fe6859a33..b9b588969a7 100644
--- a/docs/data/histograms/Philippines/PCB002.json
+++ b/docs/data/histograms/Philippines/PCB002.json
@@ -1 +1 @@
-{"batchcode": "PCB002", "histograms": [{"batchcodes": ["PCB002"], "histogram": {"Blood pressure measurement": 2, "Blood pressure increased": 1, "Haemoptysis": 1, "Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB002", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Blood pressure increased": 1, "Haemoptysis": 1, "Hypertension": 1}, "batchcodes": ["PCB002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB004.json b/docs/data/histograms/Philippines/PCB004.json
index 3a5c7b4dc61..e209cadb4a9 100644
--- a/docs/data/histograms/Philippines/PCB004.json
+++ b/docs/data/histograms/Philippines/PCB004.json
@@ -1 +1 @@
-{"batchcode": "PCB004", "histograms": [{"batchcodes": ["PCB004"], "histogram": {"Dizziness": 2, "Bradycardia": 1, "Heart rate": 1, "Loss of consciousness": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB004", "histograms": [{"histogram": {"Dizziness": 2, "Bradycardia": 1, "Heart rate": 1, "Loss of consciousness": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1}, "batchcodes": ["PCB004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB004222756.json b/docs/data/histograms/Philippines/PCB004222756.json
index 1649b8f02db..7d689252cd3 100644
--- a/docs/data/histograms/Philippines/PCB004222756.json
+++ b/docs/data/histograms/Philippines/PCB004222756.json
@@ -1 +1 @@
-{"batchcode": "PCB004222756", "histograms": [{"batchcodes": ["PCB004222756"], "histogram": {"Dizziness": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB004222756", "histograms": [{"histogram": {"Dizziness": 1, "Loss of consciousness": 1}, "batchcodes": ["PCB004222756"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB006.json b/docs/data/histograms/Philippines/PCB006.json
index 8c0e3dd10fd..c853ac721bf 100644
--- a/docs/data/histograms/Philippines/PCB006.json
+++ b/docs/data/histograms/Philippines/PCB006.json
@@ -1 +1 @@
-{"batchcode": "PCB006", "histograms": [{"batchcodes": ["PCB006"], "histogram": {"Asthenia": 1, "Cerebral infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB006", "histograms": [{"histogram": {"Asthenia": 1, "Cerebral infarction": 1}, "batchcodes": ["PCB006"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCB0882.json b/docs/data/histograms/Philippines/PCB0882.json
index 1c6d5618888..7681b2c087a 100644
--- a/docs/data/histograms/Philippines/PCB0882.json
+++ b/docs/data/histograms/Philippines/PCB0882.json
@@ -1 +1 @@
-{"batchcode": "PCB0882", "histograms": [{"batchcodes": ["PCB0882"], "histogram": {"Alopecia": 1, "Anaemia": 1, "Astigmatism": 1, "Decreased appetite": 1, "Dizziness": 1, "Investigation": 1, "Leukaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "PCB0882", "histograms": [{"histogram": {"Alopecia": 1, "Anaemia": 1, "Astigmatism": 1, "Decreased appetite": 1, "Dizziness": 1, "Investigation": 1, "Leukaemia": 1}, "batchcodes": ["PCB0882"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCH0050.json b/docs/data/histograms/Philippines/PCH0050.json
index f87d4e801e5..d5868ebaed9 100644
--- a/docs/data/histograms/Philippines/PCH0050.json
+++ b/docs/data/histograms/Philippines/PCH0050.json
@@ -1 +1 @@
-{"batchcode": "PCH0050", "histograms": [{"batchcodes": ["PCH0050"], "histogram": {"Oedema peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "PCH0050", "histograms": [{"histogram": {"Oedema peripheral": 1}, "batchcodes": ["PCH0050"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PCV002.json b/docs/data/histograms/Philippines/PCV002.json
index 47a930c62b5..4515b1efb48 100644
--- a/docs/data/histograms/Philippines/PCV002.json
+++ b/docs/data/histograms/Philippines/PCV002.json
@@ -1 +1 @@
-{"batchcode": "PCV002", "histograms": [{"batchcodes": ["PCV002"], "histogram": {"Immunisation reaction": 1, "Loss of consciousness": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "PCV002", "histograms": [{"histogram": {"Immunisation reaction": 1, "Loss of consciousness": 1, "Thrombocytopenia": 1}, "batchcodes": ["PCV002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PD0359.json b/docs/data/histograms/Philippines/PD0359.json
index 67c65afc40f..4e8eec3d0e6 100644
--- a/docs/data/histograms/Philippines/PD0359.json
+++ b/docs/data/histograms/Philippines/PD0359.json
@@ -1 +1 @@
-{"batchcode": "PD0359", "histograms": [{"batchcodes": ["PD0359"], "histogram": {"Abdominal pain": 1, "Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PD0359", "histograms": [{"histogram": {"Abdominal pain": 1, "Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["PD0359"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PG40096.json b/docs/data/histograms/Philippines/PG40096.json
index 7a63cdd6a1f..53f16dd79f8 100644
--- a/docs/data/histograms/Philippines/PG40096.json
+++ b/docs/data/histograms/Philippines/PG40096.json
@@ -1 +1 @@
-{"batchcode": "PG40096", "histograms": [{"batchcodes": ["PG40096"], "histogram": {"Blood pressure increased": 1, "Hypoaesthesia": 1, "Parenteral nutrition": 1}}]}
\ No newline at end of file
+{"batchcode": "PG40096", "histograms": [{"histogram": {"Blood pressure increased": 1, "Hypoaesthesia": 1, "Parenteral nutrition": 1}, "batchcodes": ["PG40096"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PG8643.json b/docs/data/histograms/Philippines/PG8643.json
index 492cfb2d8dc..f134b695b2d 100644
--- a/docs/data/histograms/Philippines/PG8643.json
+++ b/docs/data/histograms/Philippines/PG8643.json
@@ -1 +1 @@
-{"batchcode": "PG8643", "histograms": [{"batchcodes": ["PG8643"], "histogram": {"Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "PG8643", "histograms": [{"histogram": {"Thrombocytopenia": 1}, "batchcodes": ["PG8643"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PGA0031.json b/docs/data/histograms/Philippines/PGA0031.json
index 40af2c3d94b..73c46863f0b 100644
--- a/docs/data/histograms/Philippines/PGA0031.json
+++ b/docs/data/histograms/Philippines/PGA0031.json
@@ -1 +1 @@
-{"batchcode": "PGA0031", "histograms": [{"batchcodes": ["PGA0031"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Headache": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "PGA0031", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Headache": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["PGA0031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PH2528.json b/docs/data/histograms/Philippines/PH2528.json
index 221e38483c3..637df60d7d9 100644
--- a/docs/data/histograms/Philippines/PH2528.json
+++ b/docs/data/histograms/Philippines/PH2528.json
@@ -1 +1 @@
-{"batchcode": "PH2528", "histograms": [{"batchcodes": ["PH2528"], "histogram": {"Cough": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "PH2528", "histograms": [{"histogram": {"Cough": 1, "Syncope": 1}, "batchcodes": ["PH2528"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PH5773.json b/docs/data/histograms/Philippines/PH5773.json
index 819de78f22d..4843dc52cfa 100644
--- a/docs/data/histograms/Philippines/PH5773.json
+++ b/docs/data/histograms/Philippines/PH5773.json
@@ -1 +1 @@
-{"batchcode": "PH5773", "histograms": [{"batchcodes": ["PH5773"], "histogram": {"Abdominal pain lower": 1, "Hypertensive urgency": 1}}]}
\ No newline at end of file
+{"batchcode": "PH5773", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Hypertensive urgency": 1}, "batchcodes": ["PH5773"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PIVC21B.json b/docs/data/histograms/Philippines/PIVC21B.json
index 4cdd961d676..c16b3b57652 100644
--- a/docs/data/histograms/Philippines/PIVC21B.json
+++ b/docs/data/histograms/Philippines/PIVC21B.json
@@ -1 +1 @@
-{"batchcode": "PIVC21B", "histograms": [{"batchcodes": ["PIVC21B"], "histogram": {"Arthralgia": 1, "Myalgia": 1, "Petechiae": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PIVC21B", "histograms": [{"histogram": {"Arthralgia": 1, "Myalgia": 1, "Petechiae": 1, "Pyrexia": 1}, "batchcodes": ["PIVC21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PJ8760.json b/docs/data/histograms/Philippines/PJ8760.json
index 30d67078ffa..6cfe3b7bb18 100644
--- a/docs/data/histograms/Philippines/PJ8760.json
+++ b/docs/data/histograms/Philippines/PJ8760.json
@@ -1 +1 @@
-{"batchcode": "PJ8760", "histograms": [{"batchcodes": ["PJ8760"], "histogram": {"Amnesia": 1, "Head injury": 1, "Hypokalaemia": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "PJ8760", "histograms": [{"histogram": {"Amnesia": 1, "Head injury": 1, "Hypokalaemia": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Myalgia": 1}, "batchcodes": ["PJ8760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PK6858.json b/docs/data/histograms/Philippines/PK6858.json
index a81b7206d51..97878955595 100644
--- a/docs/data/histograms/Philippines/PK6858.json
+++ b/docs/data/histograms/Philippines/PK6858.json
@@ -1 +1 @@
-{"batchcode": "PK6858", "histograms": [{"batchcodes": ["PK6858"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "PK6858", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["PK6858"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PLA031.json b/docs/data/histograms/Philippines/PLA031.json
index f86f6fec715..580a28acf0e 100644
--- a/docs/data/histograms/Philippines/PLA031.json
+++ b/docs/data/histograms/Philippines/PLA031.json
@@ -1 +1 @@
-{"batchcode": "PLA031", "histograms": [{"batchcodes": ["PLA031"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "PLA031", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Palpitations": 1}, "batchcodes": ["PLA031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PLB0014.json b/docs/data/histograms/Philippines/PLB0014.json
index a086c9402fc..4b2c6e8b208 100644
--- a/docs/data/histograms/Philippines/PLB0014.json
+++ b/docs/data/histograms/Philippines/PLB0014.json
@@ -1 +1 @@
-{"batchcode": "PLB0014", "histograms": [{"batchcodes": ["PLB0014"], "histogram": {"Bell's palsy": 1, "Computerised tomogram": 1, "Headache": 1, "Immunisation": 1, "Off label use": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "PLB0014", "histograms": [{"histogram": {"Bell's palsy": 1, "Computerised tomogram": 1, "Headache": 1, "Immunisation": 1, "Off label use": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["PLB0014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PN40172.json b/docs/data/histograms/Philippines/PN40172.json
index 0958ae9864e..6c18cda8809 100644
--- a/docs/data/histograms/Philippines/PN40172.json
+++ b/docs/data/histograms/Philippines/PN40172.json
@@ -1 +1 @@
-{"batchcode": "PN40172", "histograms": [{"batchcodes": ["213C21A", "PN40172"], "histogram": {"COVID-19": 1, "Cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "PN40172", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["213C21A", "PN40172"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PR8392.json b/docs/data/histograms/Philippines/PR8392.json
index 73b95e0792d..84b76cae5d5 100644
--- a/docs/data/histograms/Philippines/PR8392.json
+++ b/docs/data/histograms/Philippines/PR8392.json
@@ -1 +1 @@
-{"batchcode": "PR8392", "histograms": [{"batchcodes": ["PR8392"], "histogram": {"Body temperature": 1, "Generalised tonic-clonic seizure": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PR8392", "histograms": [{"histogram": {"Body temperature": 1, "Generalised tonic-clonic seizure": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["PR8392"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/PSA0008.json b/docs/data/histograms/Philippines/PSA0008.json
index f94f7e15ba6..b3739f1f07e 100644
--- a/docs/data/histograms/Philippines/PSA0008.json
+++ b/docs/data/histograms/Philippines/PSA0008.json
@@ -1 +1 @@
-{"batchcode": "PSA0008", "histograms": [{"batchcodes": ["PSA0008"], "histogram": {"Dyspnoea": 2, "Hypoaesthesia": 2, "Akinesia": 1, "Asthenia": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "PSA0008", "histograms": [{"histogram": {"Dyspnoea": 2, "Hypoaesthesia": 2, "Akinesia": 1, "Asthenia": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Pyrexia": 1}, "batchcodes": ["PSA0008"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/R12C21A.json b/docs/data/histograms/Philippines/R12C21A.json
index 6e929b6670c..222721f0efb 100644
--- a/docs/data/histograms/Philippines/R12C21A.json
+++ b/docs/data/histograms/Philippines/R12C21A.json
@@ -1 +1 @@
-{"batchcode": "R12C21A", "histograms": [{"batchcodes": ["R12C21A"], "histogram": {"Asthenia": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "R12C21A", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["R12C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/R6001.json b/docs/data/histograms/Philippines/R6001.json
index 1325aced90e..8e1a425a867 100644
--- a/docs/data/histograms/Philippines/R6001.json
+++ b/docs/data/histograms/Philippines/R6001.json
@@ -1 +1 @@
-{"batchcode": "R6001", "histograms": [{"batchcodes": ["R6001"], "histogram": {"Blood glucose increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac arrest": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Facial asymmetry": 1, "Heart rate": 1, "Hemiparesis": 1, "Hypertension": 1, "Loss of consciousness": 1, "Nystagmus": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Type 2 diabetes mellitus": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "R6001", "histograms": [{"histogram": {"Blood glucose increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac arrest": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Facial asymmetry": 1, "Heart rate": 1, "Hemiparesis": 1, "Hypertension": 1, "Loss of consciousness": 1, "Nystagmus": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Type 2 diabetes mellitus": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["R6001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/RJ8760.json b/docs/data/histograms/Philippines/RJ8760.json
index d622103ac8d..4608895b671 100644
--- a/docs/data/histograms/Philippines/RJ8760.json
+++ b/docs/data/histograms/Philippines/RJ8760.json
@@ -1 +1 @@
-{"batchcode": "RJ8760", "histograms": [{"batchcodes": ["RJ8760"], "histogram": {"Anaphylactic shock": 1, "Hypotension": 1, "Myocarditis": 1, "Shock": 1}}]}
\ No newline at end of file
+{"batchcode": "RJ8760", "histograms": [{"histogram": {"Anaphylactic shock": 1, "Hypotension": 1, "Myocarditis": 1, "Shock": 1}, "batchcodes": ["RJ8760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/SD 5996.json b/docs/data/histograms/Philippines/SD 5996.json
index acad9648eca..b6e4f2042fd 100644
--- a/docs/data/histograms/Philippines/SD 5996.json
+++ b/docs/data/histograms/Philippines/SD 5996.json
@@ -1 +1 @@
-{"batchcode": "SD 5996", "histograms": [{"batchcodes": ["SD 5996"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "COVID-19": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site discomfort": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "SD 5996", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "COVID-19": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site discomfort": 1, "Vaccination site pain": 1}, "batchcodes": ["SD 5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/SEFE8163.json b/docs/data/histograms/Philippines/SEFE8163.json
index 268541fe78a..6dca894c7ea 100644
--- a/docs/data/histograms/Philippines/SEFE8163.json
+++ b/docs/data/histograms/Philippines/SEFE8163.json
@@ -1 +1 @@
-{"batchcode": "SEFE8163", "histograms": [{"batchcodes": ["SEFE8163"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Nasopharyngitis": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "SEFE8163", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Nasopharyngitis": 1, "Polymerase chain reaction": 1}, "batchcodes": ["SEFE8163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/SL4073.json b/docs/data/histograms/Philippines/SL4073.json
index 2b33e14134c..da5c6450863 100644
--- a/docs/data/histograms/Philippines/SL4073.json
+++ b/docs/data/histograms/Philippines/SL4073.json
@@ -1 +1 @@
-{"batchcode": "SL4073", "histograms": [{"batchcodes": ["SL4073"], "histogram": {"Body temperature": 1, "Cough": 1, "Haematochezia": 1, "Nasopharyngitis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "SL4073", "histograms": [{"histogram": {"Body temperature": 1, "Cough": 1, "Haematochezia": 1, "Nasopharyngitis": 1, "Pyrexia": 1}, "batchcodes": ["SL4073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/TL5324.json b/docs/data/histograms/Philippines/TL5324.json
index f3cbbf22eae..6957e0696b7 100644
--- a/docs/data/histograms/Philippines/TL5324.json
+++ b/docs/data/histograms/Philippines/TL5324.json
@@ -1 +1 @@
-{"batchcode": "TL5324", "histograms": [{"batchcodes": ["TL5324"], "histogram": {"Dizziness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "TL5324", "histograms": [{"histogram": {"Dizziness": 1, "Malaise": 1}, "batchcodes": ["TL5324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/V4-2 FD5996.json b/docs/data/histograms/Philippines/V4-2 FD5996.json
index 002e389cb5b..65a2881a1c2 100644
--- a/docs/data/histograms/Philippines/V4-2 FD5996.json
+++ b/docs/data/histograms/Philippines/V4-2 FD5996.json
@@ -1 +1 @@
-{"batchcode": "V4-2 FD5996", "histograms": [{"batchcodes": ["V4-2 FD5996"], "histogram": {"Asymptomatic COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "V4-2 FD5996", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["V4-2 FD5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Philippines/XN4073PCB.json b/docs/data/histograms/Philippines/XN4073PCB.json
index a83b15b761c..2d8f514c66b 100644
--- a/docs/data/histograms/Philippines/XN4073PCB.json
+++ b/docs/data/histograms/Philippines/XN4073PCB.json
@@ -1 +1 @@
-{"batchcode": "XN4073PCB", "histograms": [{"batchcodes": ["XN4073PCB"], "histogram": {"Abdominal pain": 1, "Decreased appetite": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "XN4073PCB", "histograms": [{"histogram": {"Abdominal pain": 1, "Decreased appetite": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["XN4073PCB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Poland/EL1284.json b/docs/data/histograms/Poland/EL1284.json
index c60cb098a42..6462e2693b9 100644
--- a/docs/data/histograms/Poland/EL1284.json
+++ b/docs/data/histograms/Poland/EL1284.json
@@ -1 +1 @@
-{"batchcode": "EL1284", "histograms": [{"batchcodes": ["EL1284"], "histogram": {"Fatigue": 1, "Feeling hot": 1, "Hypoaesthesia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1284", "histograms": [{"histogram": {"Fatigue": 1, "Feeling hot": 1, "Hypoaesthesia": 1, "Pain in extremity": 1}, "batchcodes": ["EL1284"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Portugal/18008978.json b/docs/data/histograms/Portugal/18008978.json
index f862ddefa1c..0df294b1c5c 100644
--- a/docs/data/histograms/Portugal/18008978.json
+++ b/docs/data/histograms/Portugal/18008978.json
@@ -1 +1 @@
-{"batchcode": "18008978", "histograms": [{"batchcodes": ["18008978"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Pharyngeal swelling": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "18008978", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Pharyngeal swelling": 1, "Pruritus": 1}, "batchcodes": ["18008978"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/001J21-2A.json b/docs/data/histograms/Puerto Rico/001J21-2A.json
index aeaa8a1c0f4..f287ced1646 100644
--- a/docs/data/histograms/Puerto Rico/001J21-2A.json
+++ b/docs/data/histograms/Puerto Rico/001J21-2A.json
@@ -1 +1 @@
-{"batchcode": "001J21-2A", "histograms": [{"batchcodes": ["001J21-2A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "001J21-2A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["001J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/003K21-2A.json b/docs/data/histograms/Puerto Rico/003K21-2A.json
index d2fd7f2a461..6b8e53f8cff 100644
--- a/docs/data/histograms/Puerto Rico/003K21-2A.json
+++ b/docs/data/histograms/Puerto Rico/003K21-2A.json
@@ -1 +1 @@
-{"batchcode": "003K21-2A", "histograms": [{"batchcodes": ["003K21-2A"], "histogram": {"Expired product administered": 4, "Product storage error": 4, "No adverse event": 3, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "003K21-2A", "histograms": [{"histogram": {"Expired product administered": 4, "Product storage error": 4, "No adverse event": 3, "Underdose": 1}, "batchcodes": ["003K21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/010A21A.json b/docs/data/histograms/Puerto Rico/010A21A.json
index 658fff331b0..2ecc22373e4 100644
--- a/docs/data/histograms/Puerto Rico/010A21A.json
+++ b/docs/data/histograms/Puerto Rico/010A21A.json
@@ -1 +1 @@
-{"batchcode": "010A21A", "histograms": [{"batchcodes": ["010A21A"], "histogram": {"Dementia Alzheimer's type": 1, "Intracranial aneurysm": 1, "Mydriasis": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "010A21A", "histograms": [{"histogram": {"Dementia Alzheimer's type": 1, "Intracranial aneurysm": 1, "Mydriasis": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["010A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/011A21A.json b/docs/data/histograms/Puerto Rico/011A21A.json
index 6b16752ab63..d0fa63b9ad7 100644
--- a/docs/data/histograms/Puerto Rico/011A21A.json
+++ b/docs/data/histograms/Puerto Rico/011A21A.json
@@ -1 +1 @@
-{"batchcode": "011A21A", "histograms": [{"batchcodes": ["011A21A"], "histogram": {"Death": 2, "Expired product administered": 2, "Product storage error": 2, "Cardiac failure": 1, "Decreased appetite": 1, "Dysphagia": 1, "Gastrointestinal tube insertion": 1, "General physical health deterioration": 1, "Myocardial infarction": 1, "Respiratory arrest": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21A", "histograms": [{"histogram": {"Death": 2, "Expired product administered": 2, "Product storage error": 2, "Cardiac failure": 1, "Decreased appetite": 1, "Dysphagia": 1, "Gastrointestinal tube insertion": 1, "General physical health deterioration": 1, "Myocardial infarction": 1, "Respiratory arrest": 1}, "batchcodes": ["011A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/011J20A.json b/docs/data/histograms/Puerto Rico/011J20A.json
index 5a141d2f97f..0f54f5b5c35 100644
--- a/docs/data/histograms/Puerto Rico/011J20A.json
+++ b/docs/data/histograms/Puerto Rico/011J20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A", "histograms": [{"batchcodes": ["011J20A"], "histogram": {"Cheilitis": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A", "histograms": [{"histogram": {"Cheilitis": 1, "Headache": 1}, "batchcodes": ["011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/011L20A.json b/docs/data/histograms/Puerto Rico/011L20A.json
index 577a978f5fd..d311b0fc180 100644
--- a/docs/data/histograms/Puerto Rico/011L20A.json
+++ b/docs/data/histograms/Puerto Rico/011L20A.json
@@ -1 +1 @@
-{"batchcode": "011L20A", "histograms": [{"batchcodes": ["011L20A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "011L20A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["011L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/011M20A.json b/docs/data/histograms/Puerto Rico/011M20A.json
index f53dcee60a7..efada8178e3 100644
--- a/docs/data/histograms/Puerto Rico/011M20A.json
+++ b/docs/data/histograms/Puerto Rico/011M20A.json
@@ -1 +1 @@
-{"batchcode": "011M20A", "histograms": [{"batchcodes": ["011M20A"], "histogram": {"Death": 5, "Malaise": 2, "Respiratory disorder": 2, "Aspiration": 1, "Cardio-respiratory arrest": 1, "Chest X-ray normal": 1, "Expired product administered": 1, "Foaming at mouth": 1, "Food refusal": 1, "General physical health deterioration": 1, "Hypertension": 1, "Hypotension": 1, "Pneumonia": 1, "Product storage error": 1, "Productive cough": 1, "Vital functions abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "011M20A", "histograms": [{"histogram": {"Death": 5, "Malaise": 2, "Respiratory disorder": 2, "Aspiration": 1, "Cardio-respiratory arrest": 1, "Chest X-ray normal": 1, "Expired product administered": 1, "Foaming at mouth": 1, "Food refusal": 1, "General physical health deterioration": 1, "Hypertension": 1, "Hypotension": 1, "Pneumonia": 1, "Product storage error": 1, "Productive cough": 1, "Vital functions abnormal": 1}, "batchcodes": ["011M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/011M21A.json b/docs/data/histograms/Puerto Rico/011M21A.json
index c0d7fa8cc3a..b9329072b06 100644
--- a/docs/data/histograms/Puerto Rico/011M21A.json
+++ b/docs/data/histograms/Puerto Rico/011M21A.json
@@ -1 +1 @@
-{"batchcode": "011M21A", "histograms": [{"batchcodes": ["011M21A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "011M21A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["011M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/013F21A.json b/docs/data/histograms/Puerto Rico/013F21A.json
index f4327834f03..6345d30a77d 100644
--- a/docs/data/histograms/Puerto Rico/013F21A.json
+++ b/docs/data/histograms/Puerto Rico/013F21A.json
@@ -1 +1 @@
-{"batchcode": "013F21A", "histograms": [{"batchcodes": ["013F21A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "013F21A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["013F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/013L20A.json b/docs/data/histograms/Puerto Rico/013L20A.json
index ac1d9047316..a1761eebc4d 100644
--- a/docs/data/histograms/Puerto Rico/013L20A.json
+++ b/docs/data/histograms/Puerto Rico/013L20A.json
@@ -1 +1 @@
-{"batchcode": "013L20A", "histograms": [{"batchcodes": ["013L20A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["013L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/016C21A.json b/docs/data/histograms/Puerto Rico/016C21A.json
index c49409dd019..a9d741ffb5d 100644
--- a/docs/data/histograms/Puerto Rico/016C21A.json
+++ b/docs/data/histograms/Puerto Rico/016C21A.json
@@ -1 +1 @@
-{"batchcode": "016C21A", "histograms": [{"batchcodes": ["016C21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "016C21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["016C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/016M20A.json b/docs/data/histograms/Puerto Rico/016M20A.json
index 74220aa42e4..af23f0f6334 100644
--- a/docs/data/histograms/Puerto Rico/016M20A.json
+++ b/docs/data/histograms/Puerto Rico/016M20A.json
@@ -1 +1 @@
-{"batchcode": "016M20A", "histograms": [{"batchcodes": ["016M20A"], "histogram": {"Death": 1, "Expired product administered": 1, "No adverse event": 1, "Pneumonia aspiration": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20A", "histograms": [{"histogram": {"Death": 1, "Expired product administered": 1, "No adverse event": 1, "Pneumonia aspiration": 1, "Product storage error": 1}, "batchcodes": ["016M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/018B21A.json b/docs/data/histograms/Puerto Rico/018B21A.json
index 0bfacbaba0a..ba6fd8bb395 100644
--- a/docs/data/histograms/Puerto Rico/018B21A.json
+++ b/docs/data/histograms/Puerto Rico/018B21A.json
@@ -1 +1 @@
-{"batchcode": "018B21A", "histograms": [{"batchcodes": ["018B21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "018B21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["018B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/022C21A.json b/docs/data/histograms/Puerto Rico/022C21A.json
index bf50a7b8c5f..56eba19279b 100644
--- a/docs/data/histograms/Puerto Rico/022C21A.json
+++ b/docs/data/histograms/Puerto Rico/022C21A.json
@@ -1 +1 @@
-{"batchcode": "022C21A", "histograms": [{"batchcodes": ["022C21A"], "histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "022C21A", "histograms": [{"histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1, "Product storage error": 1}, "batchcodes": ["022C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/026AZ1A.json b/docs/data/histograms/Puerto Rico/026AZ1A.json
index dfd27d26111..25bcb70a139 100644
--- a/docs/data/histograms/Puerto Rico/026AZ1A.json
+++ b/docs/data/histograms/Puerto Rico/026AZ1A.json
@@ -1 +1 @@
-{"batchcode": "026AZ1A", "histograms": [{"batchcodes": ["026AZ1A"], "histogram": {"Abdominal pain": 1, "Aspiration": 1, "Cough": 1, "Myocardial infarction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026AZ1A", "histograms": [{"histogram": {"Abdominal pain": 1, "Aspiration": 1, "Cough": 1, "Myocardial infarction": 1, "Vomiting": 1}, "batchcodes": ["026AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/030L20A.json b/docs/data/histograms/Puerto Rico/030L20A.json
index df390cea22c..31f3de3dbd2 100644
--- a/docs/data/histograms/Puerto Rico/030L20A.json
+++ b/docs/data/histograms/Puerto Rico/030L20A.json
@@ -1 +1 @@
-{"batchcode": "030L20A", "histograms": [{"batchcodes": ["030L20A"], "histogram": {"Mobility decreased": 2, "Cardio-respiratory arrest": 1, "Chills": 1, "Dementia Alzheimer's type": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Gastrostomy": 1, "Headache": 1, "Hypotension": 1, "Impaired work ability": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Myalgia": 1, "Pyrexia": 1, "Urinary retention": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20A", "histograms": [{"histogram": {"Mobility decreased": 2, "Cardio-respiratory arrest": 1, "Chills": 1, "Dementia Alzheimer's type": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Gastrostomy": 1, "Headache": 1, "Hypotension": 1, "Impaired work ability": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Myalgia": 1, "Pyrexia": 1, "Urinary retention": 1, "Weight decreased": 1}, "batchcodes": ["030L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/031L20A.json b/docs/data/histograms/Puerto Rico/031L20A.json
index d3afd84d8fc..176da55e5d2 100644
--- a/docs/data/histograms/Puerto Rico/031L20A.json
+++ b/docs/data/histograms/Puerto Rico/031L20A.json
@@ -1 +1 @@
-{"batchcode": "031L20A", "histograms": [{"batchcodes": ["031L20A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["031L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/031M20A.json b/docs/data/histograms/Puerto Rico/031M20A.json
index 2041b34f4a9..4818fd00936 100644
--- a/docs/data/histograms/Puerto Rico/031M20A.json
+++ b/docs/data/histograms/Puerto Rico/031M20A.json
@@ -1 +1 @@
-{"batchcode": "031M20A", "histograms": [{"batchcodes": ["031M20A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["031M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/032220A.json b/docs/data/histograms/Puerto Rico/032220A.json
index c9995a611b5..3b9a6859972 100644
--- a/docs/data/histograms/Puerto Rico/032220A.json
+++ b/docs/data/histograms/Puerto Rico/032220A.json
@@ -1 +1 @@
-{"batchcode": "032220A", "histograms": [{"batchcodes": ["032220A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "032220A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["032220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/032F21A.json b/docs/data/histograms/Puerto Rico/032F21A.json
index 7676306ba28..bc1d87940e0 100644
--- a/docs/data/histograms/Puerto Rico/032F21A.json
+++ b/docs/data/histograms/Puerto Rico/032F21A.json
@@ -1 +1 @@
-{"batchcode": "032F21A", "histograms": [{"batchcodes": ["032F21A"], "histogram": {"Headache": 1, "Inflammation": 1, "Myalgia": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032F21A", "histograms": [{"histogram": {"Headache": 1, "Inflammation": 1, "Myalgia": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}, "batchcodes": ["032F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/032H20A.json b/docs/data/histograms/Puerto Rico/032H20A.json
index d20fb1c5015..1077ddf49d5 100644
--- a/docs/data/histograms/Puerto Rico/032H20A.json
+++ b/docs/data/histograms/Puerto Rico/032H20A.json
@@ -1 +1 @@
-{"batchcode": "032H20A", "histograms": [{"batchcodes": ["032H20A"], "histogram": {"Death": 8, "Expired product administered": 2, "Oxygen saturation decreased": 2, "Product storage error": 2, "Vital functions abnormal": 2, "Abdominal pain upper": 1, "Aspiration": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Condition aggravated": 1, "Cough": 1, "Cyanosis": 1, "Decreased appetite": 1, "Dementia Alzheimer's type": 1, "Diabetes mellitus": 1, "Dyspnoea": 1, "Hypotension": 1, "Infection": 1, "Malaise": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Pneumonia aspiration": 1, "Productive cough": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Ulcer": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "032H20A", "histograms": [{"histogram": {"Death": 8, "Expired product administered": 2, "Oxygen saturation decreased": 2, "Product storage error": 2, "Vital functions abnormal": 2, "Abdominal pain upper": 1, "Aspiration": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Cardiac arrest": 1, "Cardiac failure": 1, "Condition aggravated": 1, "Cough": 1, "Cyanosis": 1, "Decreased appetite": 1, "Dementia Alzheimer's type": 1, "Diabetes mellitus": 1, "Dyspnoea": 1, "Hypotension": 1, "Infection": 1, "Malaise": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Pneumonia aspiration": 1, "Productive cough": 1, "Respiratory arrest": 1, "Respiratory disorder": 1, "Respiratory distress": 1, "Respiratory failure": 1, "Ulcer": 1, "Vomiting": 1}, "batchcodes": ["032H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/035H21B.json b/docs/data/histograms/Puerto Rico/035H21B.json
index 5562786a611..24574562828 100644
--- a/docs/data/histograms/Puerto Rico/035H21B.json
+++ b/docs/data/histograms/Puerto Rico/035H21B.json
@@ -1 +1 @@
-{"batchcode": "035H21B", "histograms": [{"batchcodes": ["035H21B"], "histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Pyrexia": 1, "Sleep disorder": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "035H21B", "histograms": [{"histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Pyrexia": 1, "Sleep disorder": 1, "Tremor": 1}, "batchcodes": ["035H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/036A21A.json b/docs/data/histograms/Puerto Rico/036A21A.json
index f4030998f63..a637939dfc2 100644
--- a/docs/data/histograms/Puerto Rico/036A21A.json
+++ b/docs/data/histograms/Puerto Rico/036A21A.json
@@ -1 +1 @@
-{"batchcode": "036A21A", "histograms": [{"batchcodes": ["036A21A"], "histogram": {"Expired product administered": 4, "Product storage error": 4, "No adverse event": 2, "Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "036A21A", "histograms": [{"histogram": {"Expired product administered": 4, "Product storage error": 4, "No adverse event": 2, "Myocardial infarction": 1}, "batchcodes": ["036A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/037A21B.json b/docs/data/histograms/Puerto Rico/037A21B.json
index 393871c3ed1..4807c0c0128 100644
--- a/docs/data/histograms/Puerto Rico/037A21B.json
+++ b/docs/data/histograms/Puerto Rico/037A21B.json
@@ -1 +1 @@
-{"batchcode": "037A21B", "histograms": [{"batchcodes": ["037A21B"], "histogram": {"Expired product administered": 3, "Product storage error": 3, "No adverse event": 2}}]}
\ No newline at end of file
+{"batchcode": "037A21B", "histograms": [{"histogram": {"Expired product administered": 3, "Product storage error": 3, "No adverse event": 2}, "batchcodes": ["037A21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/037B21A.json b/docs/data/histograms/Puerto Rico/037B21A.json
index 48afe4eb825..ec917697475 100644
--- a/docs/data/histograms/Puerto Rico/037B21A.json
+++ b/docs/data/histograms/Puerto Rico/037B21A.json
@@ -1 +1 @@
-{"batchcode": "037B21A", "histograms": [{"batchcodes": ["037B21A"], "histogram": {"Computerised tomogram": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Fatigue": 1, "Inflammation": 1, "Laboratory test": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "037B21A", "histograms": [{"histogram": {"Computerised tomogram": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Fatigue": 1, "Inflammation": 1, "Laboratory test": 1, "Throat tightness": 1}, "batchcodes": ["037B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/037K20A.json b/docs/data/histograms/Puerto Rico/037K20A.json
index fd60f053ecb..f5d5088eb78 100644
--- a/docs/data/histograms/Puerto Rico/037K20A.json
+++ b/docs/data/histograms/Puerto Rico/037K20A.json
@@ -1 +1 @@
-{"batchcode": "037K20A", "histograms": [{"batchcodes": ["037K20A"], "histogram": {"Atelectasis": 1, "Axillary vein thrombosis": 1, "Chest X-ray abnormal": 1, "Death": 1, "Decreased appetite": 1, "Erythema": 1, "Pleural effusion": 1, "Pneumonia": 1, "Renal failure": 1}}]}
\ No newline at end of file
+{"batchcode": "037K20A", "histograms": [{"histogram": {"Atelectasis": 1, "Axillary vein thrombosis": 1, "Chest X-ray abnormal": 1, "Death": 1, "Decreased appetite": 1, "Erythema": 1, "Pleural effusion": 1, "Pneumonia": 1, "Renal failure": 1}, "batchcodes": ["037K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/038A21A.json b/docs/data/histograms/Puerto Rico/038A21A.json
index b1d351a6087..6a2c8ae25e6 100644
--- a/docs/data/histograms/Puerto Rico/038A21A.json
+++ b/docs/data/histograms/Puerto Rico/038A21A.json
@@ -1 +1 @@
-{"batchcode": "038A21A", "histograms": [{"batchcodes": ["038A21A"], "histogram": {"Expired product administered": 2, "Product storage error": 2}}]}
\ No newline at end of file
+{"batchcode": "038A21A", "histograms": [{"histogram": {"Expired product administered": 2, "Product storage error": 2}, "batchcodes": ["038A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/039A21A.json b/docs/data/histograms/Puerto Rico/039A21A.json
index 6aef45d27fd..193c2271f7d 100644
--- a/docs/data/histograms/Puerto Rico/039A21A.json
+++ b/docs/data/histograms/Puerto Rico/039A21A.json
@@ -1 +1 @@
-{"batchcode": "039A21A", "histograms": [{"batchcodes": ["039A21A"], "histogram": {"Expired product administered": 2, "Product storage error": 2}}]}
\ No newline at end of file
+{"batchcode": "039A21A", "histograms": [{"histogram": {"Expired product administered": 2, "Product storage error": 2}, "batchcodes": ["039A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/03L20A.json b/docs/data/histograms/Puerto Rico/03L20A.json
index 7b8dcb1b6b1..2b9b695fb7f 100644
--- a/docs/data/histograms/Puerto Rico/03L20A.json
+++ b/docs/data/histograms/Puerto Rico/03L20A.json
@@ -1 +1 @@
-{"batchcode": "03L20A", "histograms": [{"batchcodes": ["03L20A"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Decreased appetite": 1, "Fatigue": 1, "Muscle spasms": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "03L20A", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Decreased appetite": 1, "Fatigue": 1, "Muscle spasms": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["03L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/040A21A.json b/docs/data/histograms/Puerto Rico/040A21A.json
index d01b374a610..e50965b2d94 100644
--- a/docs/data/histograms/Puerto Rico/040A21A.json
+++ b/docs/data/histograms/Puerto Rico/040A21A.json
@@ -1 +1 @@
-{"batchcode": "040A21A", "histograms": [{"batchcodes": ["040A21A"], "histogram": {"Rash erythematous": 1, "Rash papular": 1}}]}
\ No newline at end of file
+{"batchcode": "040A21A", "histograms": [{"histogram": {"Rash erythematous": 1, "Rash papular": 1}, "batchcodes": ["040A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/040B21A.json b/docs/data/histograms/Puerto Rico/040B21A.json
index 64f92e0fe96..4447c65d2ff 100644
--- a/docs/data/histograms/Puerto Rico/040B21A.json
+++ b/docs/data/histograms/Puerto Rico/040B21A.json
@@ -1 +1 @@
-{"batchcode": "040B21A", "histograms": [{"batchcodes": ["040B21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "040B21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["040B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/041B21A.json b/docs/data/histograms/Puerto Rico/041B21A.json
index 30ee5684810..e4888d3cff2 100644
--- a/docs/data/histograms/Puerto Rico/041B21A.json
+++ b/docs/data/histograms/Puerto Rico/041B21A.json
@@ -1 +1 @@
-{"batchcode": "041B21A", "histograms": [{"batchcodes": ["041B21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "041B21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["041B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/042A21A.json b/docs/data/histograms/Puerto Rico/042A21A.json
index 7e2fcb69e83..03000a67b42 100644
--- a/docs/data/histograms/Puerto Rico/042A21A.json
+++ b/docs/data/histograms/Puerto Rico/042A21A.json
@@ -1 +1 @@
-{"batchcode": "042A21A", "histograms": [{"batchcodes": ["042A21A"], "histogram": {"Blood test": 1, "Burning sensation": 1, "Dizziness": 1, "Feeling cold": 1, "Gastric disorder": 1, "Gastritis": 1, "Haemoptysis": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Oligomenorrhoea": 1, "Paraesthesia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "042A21A", "histograms": [{"histogram": {"Blood test": 1, "Burning sensation": 1, "Dizziness": 1, "Feeling cold": 1, "Gastric disorder": 1, "Gastritis": 1, "Haemoptysis": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Oligomenorrhoea": 1, "Paraesthesia": 1, "Vision blurred": 1}, "batchcodes": ["042A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/04321A.json b/docs/data/histograms/Puerto Rico/04321A.json
index 6f35c91a7c4..0f4f8335a9a 100644
--- a/docs/data/histograms/Puerto Rico/04321A.json
+++ b/docs/data/histograms/Puerto Rico/04321A.json
@@ -1 +1 @@
-{"batchcode": "04321A", "histograms": [{"batchcodes": ["04321A"], "histogram": {"Blood pressure measurement": 1, "Cardiovascular evaluation": 1, "Electrocardiogram": 1, "Heart rate": 1, "Hypertension": 1, "Laboratory test": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "04321A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Cardiovascular evaluation": 1, "Electrocardiogram": 1, "Heart rate": 1, "Hypertension": 1, "Laboratory test": 1, "Tachycardia": 1}, "batchcodes": ["04321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/043220A.json b/docs/data/histograms/Puerto Rico/043220A.json
index f1b5092ea1e..2cfe43a866c 100644
--- a/docs/data/histograms/Puerto Rico/043220A.json
+++ b/docs/data/histograms/Puerto Rico/043220A.json
@@ -1 +1 @@
-{"batchcode": "043220A", "histograms": [{"batchcodes": ["043220A"], "histogram": {"Death": 2, "Hypotension": 2, "Pneumonia": 1, "Respiratory arrest": 1, "Resuscitation": 1}}]}
\ No newline at end of file
+{"batchcode": "043220A", "histograms": [{"histogram": {"Death": 2, "Hypotension": 2, "Pneumonia": 1, "Respiratory arrest": 1, "Resuscitation": 1}, "batchcodes": ["043220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/043A214.json b/docs/data/histograms/Puerto Rico/043A214.json
index cd61b97cd43..c2f99adc5c8 100644
--- a/docs/data/histograms/Puerto Rico/043A214.json
+++ b/docs/data/histograms/Puerto Rico/043A214.json
@@ -1 +1 @@
-{"batchcode": "043A214", "histograms": [{"batchcodes": ["043A214"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Depression": 1, "Disability": 1, "Hypertension": 1, "Hyporeflexia": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Pain": 1, "Reflex test": 1}}]}
\ No newline at end of file
+{"batchcode": "043A214", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Depression": 1, "Disability": 1, "Hypertension": 1, "Hyporeflexia": 1, "Laboratory test": 1, "Lumbar puncture": 1, "Pain": 1, "Reflex test": 1}, "batchcodes": ["043A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/048C21A.json b/docs/data/histograms/Puerto Rico/048C21A.json
index a7aad1fb728..ae7a7eeeb03 100644
--- a/docs/data/histograms/Puerto Rico/048C21A.json
+++ b/docs/data/histograms/Puerto Rico/048C21A.json
@@ -1 +1 @@
-{"batchcode": "048C21A", "histograms": [{"batchcodes": ["048C21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "048C21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["048C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/051F21A.json b/docs/data/histograms/Puerto Rico/051F21A.json
index b77e689f4c9..4046e313201 100644
--- a/docs/data/histograms/Puerto Rico/051F21A.json
+++ b/docs/data/histograms/Puerto Rico/051F21A.json
@@ -1 +1 @@
-{"batchcode": "051F21A", "histograms": [{"batchcodes": ["051F21A"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "051F21A", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["051F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/059F22A.json b/docs/data/histograms/Puerto Rico/059F22A.json
index 113076369ba..0dc12da4f1e 100644
--- a/docs/data/histograms/Puerto Rico/059F22A.json
+++ b/docs/data/histograms/Puerto Rico/059F22A.json
@@ -1 +1 @@
-{"batchcode": "059F22A", "histograms": [{"batchcodes": ["059F22A"], "histogram": {"Extra dose administered": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "059F22A", "histograms": [{"histogram": {"Extra dose administered": 1, "No adverse event": 1}, "batchcodes": ["059F22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/077C21B.json b/docs/data/histograms/Puerto Rico/077C21B.json
index 7ed81ea155a..5248f0c2cf8 100644
--- a/docs/data/histograms/Puerto Rico/077C21B.json
+++ b/docs/data/histograms/Puerto Rico/077C21B.json
@@ -1 +1 @@
-{"batchcode": "077C21B", "histograms": [{"batchcodes": ["077C21B"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "077C21B", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product storage error": 1}, "batchcodes": ["077C21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/1802072.json b/docs/data/histograms/Puerto Rico/1802072.json
index 3af086ac600..f44132824fb 100644
--- a/docs/data/histograms/Puerto Rico/1802072.json
+++ b/docs/data/histograms/Puerto Rico/1802072.json
@@ -1 +1 @@
-{"batchcode": "1802072", "histograms": [{"batchcodes": ["1802072"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Chest X-ray": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Insomnia": 1, "Laboratory test": 1, "Mycoplasma test": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "1802072", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Chest X-ray": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Insomnia": 1, "Laboratory test": 1, "Mycoplasma test": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["1802072"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/1805018.json b/docs/data/histograms/Puerto Rico/1805018.json
index 4094866a286..0b13f18d5a0 100644
--- a/docs/data/histograms/Puerto Rico/1805018.json
+++ b/docs/data/histograms/Puerto Rico/1805018.json
@@ -1 +1 @@
-{"batchcode": "1805018", "histograms": [{"batchcodes": ["1805018"], "histogram": {"Abdominal pain": 1, "Back pain": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Computerised tomogram normal": 1, "Heavy menstrual bleeding": 1, "Laboratory test normal": 1, "Pain": 1, "Pain in extremity": 1, "Therapy non-responder": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "1805018", "histograms": [{"histogram": {"Abdominal pain": 1, "Back pain": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Computerised tomogram normal": 1, "Heavy menstrual bleeding": 1, "Laboratory test normal": 1, "Pain": 1, "Pain in extremity": 1, "Therapy non-responder": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["1805018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/1805022.json b/docs/data/histograms/Puerto Rico/1805022.json
index 00025e091b0..94cdb493ee1 100644
--- a/docs/data/histograms/Puerto Rico/1805022.json
+++ b/docs/data/histograms/Puerto Rico/1805022.json
@@ -1 +1 @@
-{"batchcode": "1805022", "histograms": [{"batchcodes": ["1805022"], "histogram": {"Haemorrhagic stroke": 1}}]}
\ No newline at end of file
+{"batchcode": "1805022", "histograms": [{"histogram": {"Haemorrhagic stroke": 1}, "batchcodes": ["1805022"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/1805029.json b/docs/data/histograms/Puerto Rico/1805029.json
index 4a350d25293..2d960ca3974 100644
--- a/docs/data/histograms/Puerto Rico/1805029.json
+++ b/docs/data/histograms/Puerto Rico/1805029.json
@@ -1 +1 @@
-{"batchcode": "1805029", "histograms": [{"batchcodes": ["1805029"], "histogram": {"Cough": 2, "COVID-19": 1, "Condition aggravated": 1, "Death": 1, "Decreased appetite": 1, "Dysphagia": 1, "Heart rate increased": 1, "Hypotension": 1, "Lung disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "1805029", "histograms": [{"histogram": {"Cough": 2, "COVID-19": 1, "Condition aggravated": 1, "Death": 1, "Decreased appetite": 1, "Dysphagia": 1, "Heart rate increased": 1, "Hypotension": 1, "Lung disorder": 1}, "batchcodes": ["1805029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/1805031.json b/docs/data/histograms/Puerto Rico/1805031.json
index 26ed9ffbef1..1ae05576cbd 100644
--- a/docs/data/histograms/Puerto Rico/1805031.json
+++ b/docs/data/histograms/Puerto Rico/1805031.json
@@ -1 +1 @@
-{"batchcode": "1805031", "histograms": [{"batchcodes": ["1805031"], "histogram": {"Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "1805031", "histograms": [{"histogram": {"Chills": 1}, "batchcodes": ["1805031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/1816022.json b/docs/data/histograms/Puerto Rico/1816022.json
index 0aba3161c86..7a85ddbdacc 100644
--- a/docs/data/histograms/Puerto Rico/1816022.json
+++ b/docs/data/histograms/Puerto Rico/1816022.json
@@ -1 +1 @@
-{"batchcode": "1816022", "histograms": [{"batchcodes": ["1816022"], "histogram": {"Headache": 2, "Chills": 1, "Eye discharge": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Lacrimation increased": 1, "Off label use": 1, "Pain": 1, "Pain of skin": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Suspected COVID-19": 1, "Tumour flare": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "1816022", "histograms": [{"histogram": {"Headache": 2, "Chills": 1, "Eye discharge": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Lacrimation increased": 1, "Off label use": 1, "Pain": 1, "Pain of skin": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Suspected COVID-19": 1, "Tumour flare": 1, "Visual impairment": 1}, "batchcodes": ["1816022"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/203A21A.json b/docs/data/histograms/Puerto Rico/203A21A.json
index 493c36bd54f..f4a97f60ed0 100644
--- a/docs/data/histograms/Puerto Rico/203A21A.json
+++ b/docs/data/histograms/Puerto Rico/203A21A.json
@@ -1 +1 @@
-{"batchcode": "203A21A", "histograms": [{"batchcodes": ["203A21A"], "histogram": {"Blister": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Constipation": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Hypertension": 1, "Onychoclasis": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pneumonitis": 1, "Pulmonary pain": 1, "Rash": 1, "Rash papular": 1, "Tinnitus": 1, "Varicella": 1, "Vision blurred": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "203A21A", "histograms": [{"histogram": {"Blister": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Constipation": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Hypertension": 1, "Onychoclasis": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pneumonitis": 1, "Pulmonary pain": 1, "Rash": 1, "Rash papular": 1, "Tinnitus": 1, "Varicella": 1, "Vision blurred": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["203A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/211D21A.json b/docs/data/histograms/Puerto Rico/211D21A.json
index 96dcb957a0f..fd699cd6597 100644
--- a/docs/data/histograms/Puerto Rico/211D21A.json
+++ b/docs/data/histograms/Puerto Rico/211D21A.json
@@ -1 +1 @@
-{"batchcode": "211D21A", "histograms": [{"batchcodes": ["211D21A"], "histogram": {"Contusion": 1}}]}
\ No newline at end of file
+{"batchcode": "211D21A", "histograms": [{"histogram": {"Contusion": 1}, "batchcodes": ["211D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/30025BD.json b/docs/data/histograms/Puerto Rico/30025BD.json
index 3ba53f4ea84..6577f54a40e 100644
--- a/docs/data/histograms/Puerto Rico/30025BD.json
+++ b/docs/data/histograms/Puerto Rico/30025BD.json
@@ -1 +1 @@
-{"batchcode": "30025BD", "histograms": [{"batchcodes": ["30025BD"], "histogram": {"Arthralgia": 1, "Axillary pain": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "30025BD", "histograms": [{"histogram": {"Arthralgia": 1, "Axillary pain": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["30025BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/30130BA.json b/docs/data/histograms/Puerto Rico/30130BA.json
index a88a6081a06..3fe1cb0ce7c 100644
--- a/docs/data/histograms/Puerto Rico/30130BA.json
+++ b/docs/data/histograms/Puerto Rico/30130BA.json
@@ -1 +1 @@
-{"batchcode": "30130BA", "histograms": [{"batchcodes": ["30130BA"], "histogram": {"Asthenia": 1, "Diarrhoea": 1, "Ear pain": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "30130BA", "histograms": [{"histogram": {"Asthenia": 1, "Diarrhoea": 1, "Ear pain": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["30130BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/30155BA.json b/docs/data/histograms/Puerto Rico/30155BA.json
index b86813e77dc..fb6004c33a6 100644
--- a/docs/data/histograms/Puerto Rico/30155BA.json
+++ b/docs/data/histograms/Puerto Rico/30155BA.json
@@ -1 +1 @@
-{"batchcode": "30155BA", "histograms": [{"batchcodes": ["30155BA"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 2, "Amenorrhoea": 1, "Drug ineffective": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Pregnancy test": 1}}]}
\ No newline at end of file
+{"batchcode": "30155BA", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 2, "Amenorrhoea": 1, "Drug ineffective": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Pregnancy test": 1}, "batchcodes": ["30155BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/3203080.json b/docs/data/histograms/Puerto Rico/3203080.json
index 4a10619a173..23cf38eaa96 100644
--- a/docs/data/histograms/Puerto Rico/3203080.json
+++ b/docs/data/histograms/Puerto Rico/3203080.json
@@ -1 +1 @@
-{"batchcode": "3203080", "histograms": [{"batchcodes": ["3203080"], "histogram": {"Body height": 1, "Headache": 1, "Immunisation": 1, "Induration": 1, "Inflammation": 1, "Myalgia": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "3203080", "histograms": [{"histogram": {"Body height": 1, "Headache": 1, "Immunisation": 1, "Induration": 1, "Inflammation": 1, "Myalgia": 1, "Weight": 1}, "batchcodes": ["3203080"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/32030BD.json b/docs/data/histograms/Puerto Rico/32030BD.json
index 1b9638c62f6..1e1264607a5 100644
--- a/docs/data/histograms/Puerto Rico/32030BD.json
+++ b/docs/data/histograms/Puerto Rico/32030BD.json
@@ -1 +1 @@
-{"batchcode": "32030BD", "histograms": [{"batchcodes": ["32030BD"], "histogram": {"Blister": 1, "Erythema": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "32030BD", "histograms": [{"histogram": {"Blister": 1, "Erythema": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["32030BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/33030817.json b/docs/data/histograms/Puerto Rico/33030817.json
index b8634bb3e26..66d9c9f5338 100644
--- a/docs/data/histograms/Puerto Rico/33030817.json
+++ b/docs/data/histograms/Puerto Rico/33030817.json
@@ -1 +1 @@
-{"batchcode": "33030817", "histograms": [{"batchcodes": ["33030817"], "histogram": {"Immunisation": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "33030817", "histograms": [{"histogram": {"Immunisation": 1, "Vaccination site mass": 1}, "batchcodes": ["33030817"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/33030BD.json b/docs/data/histograms/Puerto Rico/33030BD.json
index 24edc99adc7..fba3cb9fb2a 100644
--- a/docs/data/histograms/Puerto Rico/33030BD.json
+++ b/docs/data/histograms/Puerto Rico/33030BD.json
@@ -1 +1 @@
-{"batchcode": "33030BD", "histograms": [{"batchcodes": ["33030BD"], "histogram": {"Immunisation": 1, "Mass": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "33030BD", "histograms": [{"histogram": {"Immunisation": 1, "Mass": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["33030BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/5130.json b/docs/data/histograms/Puerto Rico/5130.json
index aa6ae678b4c..230d20a2875 100644
--- a/docs/data/histograms/Puerto Rico/5130.json
+++ b/docs/data/histograms/Puerto Rico/5130.json
@@ -1 +1 @@
-{"batchcode": "5130", "histograms": [{"batchcodes": ["5130"], "histogram": {"Fatigue": 1, "Headache": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "5130", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["5130"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/A57162B.json b/docs/data/histograms/Puerto Rico/A57162B.json
index 3f983ba175e..fb31fe247fd 100644
--- a/docs/data/histograms/Puerto Rico/A57162B.json
+++ b/docs/data/histograms/Puerto Rico/A57162B.json
@@ -1 +1 @@
-{"batchcode": "A57162B", "histograms": [{"batchcodes": ["A57162B"], "histogram": {"No adverse event": 4, "Poor quality product administered": 4, "Product temperature excursion issue": 4}}]}
\ No newline at end of file
+{"batchcode": "A57162B", "histograms": [{"histogram": {"No adverse event": 4, "Poor quality product administered": 4, "Product temperature excursion issue": 4}, "batchcodes": ["A57162B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/A7484.json b/docs/data/histograms/Puerto Rico/A7484.json
index b6468242035..7f27e0eebf5 100644
--- a/docs/data/histograms/Puerto Rico/A7484.json
+++ b/docs/data/histograms/Puerto Rico/A7484.json
@@ -1 +1 @@
-{"batchcode": "A7484", "histograms": [{"batchcodes": ["A7484"], "histogram": {"Disease recurrence": 1, "SARS-CoV-2 test": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "A7484", "histograms": [{"histogram": {"Disease recurrence": 1, "SARS-CoV-2 test": 1, "Vertigo": 1}, "batchcodes": ["A7484"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/AR6965B.json b/docs/data/histograms/Puerto Rico/AR6965B.json
index 1b06a1f4a04..b202338f02a 100644
--- a/docs/data/histograms/Puerto Rico/AR6965B.json
+++ b/docs/data/histograms/Puerto Rico/AR6965B.json
@@ -1 +1 @@
-{"batchcode": "AR6965B", "histograms": [{"batchcodes": ["AR6965B"], "histogram": {"Expired product administered": 2, "No adverse event": 2, "Wrong product administered": 2}}]}
\ No newline at end of file
+{"batchcode": "AR6965B", "histograms": [{"histogram": {"Expired product administered": 2, "No adverse event": 2, "Wrong product administered": 2}, "batchcodes": ["AR6965B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/AS7143C.json b/docs/data/histograms/Puerto Rico/AS7143C.json
index ed48da8d899..842fa34b4f1 100644
--- a/docs/data/histograms/Puerto Rico/AS7143C.json
+++ b/docs/data/histograms/Puerto Rico/AS7143C.json
@@ -1 +1 @@
-{"batchcode": "AS7143C", "histograms": [{"batchcodes": ["AS7143C"], "histogram": {"Inappropriate schedule of product administration": 1, "Limb discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "AS7143C", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Limb discomfort": 1}, "batchcodes": ["AS7143C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/AS7162B.json b/docs/data/histograms/Puerto Rico/AS7162B.json
index c6c5260f3d1..393be1cacb0 100644
--- a/docs/data/histograms/Puerto Rico/AS7162B.json
+++ b/docs/data/histograms/Puerto Rico/AS7162B.json
@@ -1 +1 @@
-{"batchcode": "AS7162B", "histograms": [{"batchcodes": ["AS7162B"], "histogram": {"No adverse event": 8, "Poor quality product administered": 8, "Product temperature excursion issue": 8, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "AS7162B", "histograms": [{"histogram": {"No adverse event": 8, "Poor quality product administered": 8, "Product temperature excursion issue": 8, "Wrong product administered": 1}, "batchcodes": ["AS7162B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ASKU.json b/docs/data/histograms/Puerto Rico/ASKU.json
index fd1b3555a10..10d7b4c16aa 100644
--- a/docs/data/histograms/Puerto Rico/ASKU.json
+++ b/docs/data/histograms/Puerto Rico/ASKU.json
@@ -1 +1 @@
-{"batchcode": "ASKU", "histograms": [{"batchcodes": ["ASKU"], "histogram": {"Cardiac function test": 1, "Cardiac stress test": 1, "Chest pain": 1, "Laboratory test": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "ASKU", "histograms": [{"histogram": {"Cardiac function test": 1, "Cardiac stress test": 1, "Chest pain": 1, "Laboratory test": 1, "Pain in extremity": 1}, "batchcodes": ["ASKU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/BD33030.json b/docs/data/histograms/Puerto Rico/BD33030.json
index 548435546a6..b43cf1d87cb 100644
--- a/docs/data/histograms/Puerto Rico/BD33030.json
+++ b/docs/data/histograms/Puerto Rico/BD33030.json
@@ -1 +1 @@
-{"batchcode": "BD33030", "histograms": [{"batchcodes": ["BD33030"], "histogram": {"Electrocardiogram ST segment": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "BD33030", "histograms": [{"histogram": {"Electrocardiogram ST segment": 1, "Pericarditis": 1}, "batchcodes": ["BD33030"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/E19266.json b/docs/data/histograms/Puerto Rico/E19266.json
index 774cdabe682..23285d7d572 100644
--- a/docs/data/histograms/Puerto Rico/E19266.json
+++ b/docs/data/histograms/Puerto Rico/E19266.json
@@ -1 +1 @@
-{"batchcode": "E19266", "histograms": [{"batchcodes": ["E19266"], "histogram": {"Balance disorder": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Hypertension": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "E19266", "histograms": [{"histogram": {"Balance disorder": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Hypertension": 1, "Somnolence": 1}, "batchcodes": ["E19266"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/E5168.json b/docs/data/histograms/Puerto Rico/E5168.json
index b68c4c81734..dae46827974 100644
--- a/docs/data/histograms/Puerto Rico/E5168.json
+++ b/docs/data/histograms/Puerto Rico/E5168.json
@@ -1 +1 @@
-{"batchcode": "E5168", "histograms": [{"batchcodes": ["E5168"], "histogram": {"Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "E5168", "histograms": [{"histogram": {"Chills": 1}, "batchcodes": ["E5168"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EG686.json b/docs/data/histograms/Puerto Rico/EG686.json
index 68069a52268..6c6d1abd6b4 100644
--- a/docs/data/histograms/Puerto Rico/EG686.json
+++ b/docs/data/histograms/Puerto Rico/EG686.json
@@ -1 +1 @@
-{"batchcode": "EG686", "histograms": [{"batchcodes": ["EG686"], "histogram": {"Hypoaesthesia": 1, "Muscle twitching": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EG686", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Muscle twitching": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EG686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EH9899.json b/docs/data/histograms/Puerto Rico/EH9899.json
index ab915ba718e..3487a860ef8 100644
--- a/docs/data/histograms/Puerto Rico/EH9899.json
+++ b/docs/data/histograms/Puerto Rico/EH9899.json
@@ -1 +1 @@
-{"batchcode": "EH9899", "histograms": [{"batchcodes": ["EH9899"], "histogram": {"Arthralgia": 2, "Headache": 2, "Nausea": 2, "Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphonia": 1, "Fatigue": 1, "Injection site pain": 1, "Injection site swelling": 1, "Joint swelling": 1, "Myalgia": 1, "Non-tobacco user": 1, "Pain": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EH9899", "histograms": [{"histogram": {"Arthralgia": 2, "Headache": 2, "Nausea": 2, "Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphonia": 1, "Fatigue": 1, "Injection site pain": 1, "Injection site swelling": 1, "Joint swelling": 1, "Myalgia": 1, "Non-tobacco user": 1, "Pain": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}, "batchcodes": ["EH9899"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EJ1686.json b/docs/data/histograms/Puerto Rico/EJ1686.json
index 8b602cfe15e..4cbba9df34a 100644
--- a/docs/data/histograms/Puerto Rico/EJ1686.json
+++ b/docs/data/histograms/Puerto Rico/EJ1686.json
@@ -1 +1 @@
-{"batchcode": "EJ1686", "histograms": [{"batchcodes": ["EJ1686"], "histogram": {"Burning sensation": 1, "Dermatitis": 1, "Diarrhoea": 1, "Gingival bleeding": 1, "Haematoma": 1, "Headache": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Throat irritation": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ1686", "histograms": [{"histogram": {"Burning sensation": 1, "Dermatitis": 1, "Diarrhoea": 1, "Gingival bleeding": 1, "Haematoma": 1, "Headache": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Throat irritation": 1, "Urticaria": 1}, "batchcodes": ["EJ1686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EK 5730.json b/docs/data/histograms/Puerto Rico/EK 5730.json
index 7d2b34e8541..b501c105012 100644
--- a/docs/data/histograms/Puerto Rico/EK 5730.json
+++ b/docs/data/histograms/Puerto Rico/EK 5730.json
@@ -1 +1 @@
-{"batchcode": "EK 5730", "histograms": [{"batchcodes": ["EK 5730"], "histogram": {"Condition aggravated": 1, "Hypertension": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EK 5730", "histograms": [{"histogram": {"Condition aggravated": 1, "Hypertension": 1, "Tachycardia": 1}, "batchcodes": ["EK 5730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EK4176.json b/docs/data/histograms/Puerto Rico/EK4176.json
index eef95ca96ee..2ab9b8b81d5 100644
--- a/docs/data/histograms/Puerto Rico/EK4176.json
+++ b/docs/data/histograms/Puerto Rico/EK4176.json
@@ -1 +1 @@
-{"batchcode": "EK4176", "histograms": [{"batchcodes": ["EK4176"], "histogram": {"Fatigue": 3, "Headache": 3, "Alopecia": 1, "Alopecia areata": 1, "Axillary pain": 1, "Body temperature": 1, "Bone disorder": 1, "Bone pain": 1, "Cerebrovascular accident": 1, "Chills": 1, "Depression": 1, "Full blood count": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pain": 1, "Investigation": 1, "Lymphadenopathy": 1, "Madarosis": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1, "Respiration abnormal": 1, "SARS-CoV-2 test": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4176", "histograms": [{"histogram": {"Fatigue": 3, "Headache": 3, "Alopecia": 1, "Alopecia areata": 1, "Axillary pain": 1, "Body temperature": 1, "Bone disorder": 1, "Bone pain": 1, "Cerebrovascular accident": 1, "Chills": 1, "Depression": 1, "Full blood count": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pain": 1, "Investigation": 1, "Lymphadenopathy": 1, "Madarosis": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1, "Respiration abnormal": 1, "SARS-CoV-2 test": 1, "Tenderness": 1}, "batchcodes": ["EK4176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EK5730.json b/docs/data/histograms/Puerto Rico/EK5730.json
index 0412b465615..1e423d89419 100644
--- a/docs/data/histograms/Puerto Rico/EK5730.json
+++ b/docs/data/histograms/Puerto Rico/EK5730.json
@@ -1 +1 @@
-{"batchcode": "EK5730", "histograms": [{"batchcodes": ["EK5730"], "histogram": {"Pain in extremity": 2, "Condition aggravated": 1, "Facial pain": 1, "Facial paralysis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Magnetic resonance imaging": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "EK5730", "histograms": [{"histogram": {"Pain in extremity": 2, "Condition aggravated": 1, "Facial pain": 1, "Facial paralysis": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Magnetic resonance imaging": 1, "Palpitations": 1}, "batchcodes": ["EK5730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EKS730.json b/docs/data/histograms/Puerto Rico/EKS730.json
index 14e185379e5..e24d7fa2cc0 100644
--- a/docs/data/histograms/Puerto Rico/EKS730.json
+++ b/docs/data/histograms/Puerto Rico/EKS730.json
@@ -1 +1 @@
-{"batchcode": "EKS730", "histograms": [{"batchcodes": ["EKS730"], "histogram": {"Arthralgia": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EKS730", "histograms": [{"histogram": {"Arthralgia": 1, "Pain": 1}, "batchcodes": ["EKS730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL 9266.json b/docs/data/histograms/Puerto Rico/EL 9266.json
index b4402ec9e31..2e1907add83 100644
--- a/docs/data/histograms/Puerto Rico/EL 9266.json
+++ b/docs/data/histograms/Puerto Rico/EL 9266.json
@@ -1 +1 @@
-{"batchcode": "EL 9266", "histograms": [{"batchcodes": ["EL 9266"], "histogram": {"Hypoaesthesia": 1, "Muscle spasms": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "EL 9266", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Muscle spasms": 1, "Paraesthesia": 1}, "batchcodes": ["EL 9266"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL-1283.json b/docs/data/histograms/Puerto Rico/EL-1283.json
index 66476261ffd..1ea30338a0b 100644
--- a/docs/data/histograms/Puerto Rico/EL-1283.json
+++ b/docs/data/histograms/Puerto Rico/EL-1283.json
@@ -1 +1 @@
-{"batchcode": "EL-1283", "histograms": [{"batchcodes": ["EL-1283"], "histogram": {"Discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "EL-1283", "histograms": [{"histogram": {"Discomfort": 1}, "batchcodes": ["EL-1283"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL1283.json b/docs/data/histograms/Puerto Rico/EL1283.json
index ea472d104d5..87fc0b75729 100644
--- a/docs/data/histograms/Puerto Rico/EL1283.json
+++ b/docs/data/histograms/Puerto Rico/EL1283.json
@@ -1 +1 @@
-{"batchcode": "EL1283", "histograms": [{"batchcodes": ["EL1283"], "histogram": {"Headache": 2, "Abdominal discomfort": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Arthralgia": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood thyroid stimulating hormone": 1, "Fatigue": 1, "Full blood count": 1, "Loss of personal independence in daily activities": 1, "Metabolic function test": 1, "Myalgia": 1, "Pain": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test negative": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1283", "histograms": [{"histogram": {"Headache": 2, "Abdominal discomfort": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Arthralgia": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood thyroid stimulating hormone": 1, "Fatigue": 1, "Full blood count": 1, "Loss of personal independence in daily activities": 1, "Metabolic function test": 1, "Myalgia": 1, "Pain": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test negative": 1}, "batchcodes": ["EL1283"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL1284.json b/docs/data/histograms/Puerto Rico/EL1284.json
index c2f896fa598..06d2b57159f 100644
--- a/docs/data/histograms/Puerto Rico/EL1284.json
+++ b/docs/data/histograms/Puerto Rico/EL1284.json
@@ -1 +1 @@
-{"batchcode": "EL1284", "histograms": [{"batchcodes": ["EL1284"], "histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL1284", "histograms": [{"histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}, "batchcodes": ["EL1284"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL3246.json b/docs/data/histograms/Puerto Rico/EL3246.json
index 2d974fafc1d..6db9e97a86f 100644
--- a/docs/data/histograms/Puerto Rico/EL3246.json
+++ b/docs/data/histograms/Puerto Rico/EL3246.json
@@ -1 +1 @@
-{"batchcode": "EL3246", "histograms": [{"batchcodes": ["EL3246"], "histogram": {"Chills": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3246", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1}, "batchcodes": ["EL3246"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL3248.json b/docs/data/histograms/Puerto Rico/EL3248.json
index 525491c6483..36da8f9d907 100644
--- a/docs/data/histograms/Puerto Rico/EL3248.json
+++ b/docs/data/histograms/Puerto Rico/EL3248.json
@@ -1 +1 @@
-{"batchcode": "EL3248", "histograms": [{"batchcodes": ["EL3248"], "histogram": {"Body temperature": 1, "Computerised tomogram": 1, "Fatigue": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Seizure": 1, "Sensation of blood flow": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3248", "histograms": [{"histogram": {"Body temperature": 1, "Computerised tomogram": 1, "Fatigue": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Seizure": 1, "Sensation of blood flow": 1}, "batchcodes": ["EL3248"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL8982.json b/docs/data/histograms/Puerto Rico/EL8982.json
index 48e7ed93682..52b26f35738 100644
--- a/docs/data/histograms/Puerto Rico/EL8982.json
+++ b/docs/data/histograms/Puerto Rico/EL8982.json
@@ -1 +1 @@
-{"batchcode": "EL8982", "histograms": [{"batchcodes": ["EL8982"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EL8982", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EL8982"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL9261.json b/docs/data/histograms/Puerto Rico/EL9261.json
index c263052b3d3..d79ea490a2b 100644
--- a/docs/data/histograms/Puerto Rico/EL9261.json
+++ b/docs/data/histograms/Puerto Rico/EL9261.json
@@ -1 +1 @@
-{"batchcode": "EL9261", "histograms": [{"batchcodes": ["EL9261"], "histogram": {"Asthenia": 1, "Paraesthesia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9261", "histograms": [{"histogram": {"Asthenia": 1, "Paraesthesia": 1, "Swelling": 1}, "batchcodes": ["EL9261"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL9262.json b/docs/data/histograms/Puerto Rico/EL9262.json
index 4b442830f3d..27d23e69bee 100644
--- a/docs/data/histograms/Puerto Rico/EL9262.json
+++ b/docs/data/histograms/Puerto Rico/EL9262.json
@@ -1 +1 @@
-{"batchcode": "EL9262", "histograms": [{"batchcodes": ["EL9262"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9262", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1}, "batchcodes": ["EL9262"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL9264.json b/docs/data/histograms/Puerto Rico/EL9264.json
index 4be8c177efe..ec722a08a72 100644
--- a/docs/data/histograms/Puerto Rico/EL9264.json
+++ b/docs/data/histograms/Puerto Rico/EL9264.json
@@ -1 +1 @@
-{"batchcode": "EL9264", "histograms": [{"batchcodes": ["EL9264"], "histogram": {"Asthenia": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rash": 1, "Tachycardia": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9264", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rash": 1, "Tachycardia": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["EL9264"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL9265.json b/docs/data/histograms/Puerto Rico/EL9265.json
index b0ec67d3dda..bad176feea0 100644
--- a/docs/data/histograms/Puerto Rico/EL9265.json
+++ b/docs/data/histograms/Puerto Rico/EL9265.json
@@ -1 +1 @@
-{"batchcode": "EL9265", "histograms": [{"batchcodes": ["EL9265"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9265", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["EL9265"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EL9282.json b/docs/data/histograms/Puerto Rico/EL9282.json
index 7cf2e254eb4..5ed170f7cd3 100644
--- a/docs/data/histograms/Puerto Rico/EL9282.json
+++ b/docs/data/histograms/Puerto Rico/EL9282.json
@@ -1 +1 @@
-{"batchcode": "EL9282", "histograms": [{"batchcodes": ["EL9282"], "histogram": {"Abdominal discomfort": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL9282", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["EL9282"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EM5318.json b/docs/data/histograms/Puerto Rico/EM5318.json
index e1c6bd745cb..2154278e569 100644
--- a/docs/data/histograms/Puerto Rico/EM5318.json
+++ b/docs/data/histograms/Puerto Rico/EM5318.json
@@ -1 +1 @@
-{"batchcode": "EM5318", "histograms": [{"batchcodes": ["EM5318"], "histogram": {"Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EM5318", "histograms": [{"histogram": {"Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["EM5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN 5318.json b/docs/data/histograms/Puerto Rico/EN 5318.json
index 665f2671b89..68177e97dc1 100644
--- a/docs/data/histograms/Puerto Rico/EN 5318.json
+++ b/docs/data/histograms/Puerto Rico/EN 5318.json
@@ -1 +1 @@
-{"batchcode": "EN 5318", "histograms": [{"batchcodes": ["EN 5318"], "histogram": {"Abdominal pain": 1, "Chest pain": 1, "Dizziness": 1, "Myalgia": 1, "Nausea": 1, "Productive cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EN 5318", "histograms": [{"histogram": {"Abdominal pain": 1, "Chest pain": 1, "Dizziness": 1, "Myalgia": 1, "Nausea": 1, "Productive cough": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site swelling": 1}, "batchcodes": ["EN 5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN0178.json b/docs/data/histograms/Puerto Rico/EN0178.json
index 768db9ebeba..eeac8df6863 100644
--- a/docs/data/histograms/Puerto Rico/EN0178.json
+++ b/docs/data/histograms/Puerto Rico/EN0178.json
@@ -1 +1 @@
-{"batchcode": "EN0178", "histograms": [{"batchcodes": ["EN0178"], "histogram": {"Cough": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pharyngitis streptococcal": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "EN0178", "histograms": [{"histogram": {"Cough": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pharyngitis streptococcal": 1, "Somnolence": 1}, "batchcodes": ["EN0178"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN5318.json b/docs/data/histograms/Puerto Rico/EN5318.json
index d42ba57c5e9..a7ac0ee3251 100644
--- a/docs/data/histograms/Puerto Rico/EN5318.json
+++ b/docs/data/histograms/Puerto Rico/EN5318.json
@@ -1 +1 @@
-{"batchcode": "EN5318", "histograms": [{"batchcodes": ["EN5318"], "histogram": {"Eyelid oedema": 1, "Face oedema": 1, "Oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "EN5318", "histograms": [{"histogram": {"Eyelid oedema": 1, "Face oedema": 1, "Oedema": 1}, "batchcodes": ["EN5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN6062.json b/docs/data/histograms/Puerto Rico/EN6062.json
index c1cf1b7dde0..f68fa1fcf96 100644
--- a/docs/data/histograms/Puerto Rico/EN6062.json
+++ b/docs/data/histograms/Puerto Rico/EN6062.json
@@ -1 +1 @@
-{"batchcode": "EN6062", "histograms": [{"batchcodes": ["EN6062"], "histogram": {"Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Oligomenorrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6062", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Oligomenorrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["EN6062"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN6199.json b/docs/data/histograms/Puerto Rico/EN6199.json
index b0d6536657e..0b305e272ce 100644
--- a/docs/data/histograms/Puerto Rico/EN6199.json
+++ b/docs/data/histograms/Puerto Rico/EN6199.json
@@ -1 +1 @@
-{"batchcode": "EN6199", "histograms": [{"batchcodes": ["EN6199"], "histogram": {"Dizziness": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6199", "histograms": [{"histogram": {"Dizziness": 1, "Nausea": 1}, "batchcodes": ["EN6199"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN6203.json b/docs/data/histograms/Puerto Rico/EN6203.json
index b821637cd00..b3dc13962cd 100644
--- a/docs/data/histograms/Puerto Rico/EN6203.json
+++ b/docs/data/histograms/Puerto Rico/EN6203.json
@@ -1 +1 @@
-{"batchcode": "EN6203", "histograms": [{"batchcodes": ["EN6203"], "histogram": {"Dyspnoea": 1, "Illness": 1, "Pain": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Urinary tract infection": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6203", "histograms": [{"histogram": {"Dyspnoea": 1, "Illness": 1, "Pain": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Urinary tract infection": 1, "Vaccination site pain": 1}, "batchcodes": ["EN6203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN6204.json b/docs/data/histograms/Puerto Rico/EN6204.json
index 862b707ae33..5740d4b4530 100644
--- a/docs/data/histograms/Puerto Rico/EN6204.json
+++ b/docs/data/histograms/Puerto Rico/EN6204.json
@@ -1 +1 @@
-{"batchcode": "EN6204", "histograms": [{"batchcodes": ["EN6204"], "histogram": {"Hypoaesthesia": 1, "Pain in extremity": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6204", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Pain in extremity": 1, "Swelling face": 1}, "batchcodes": ["EN6204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN6205.json b/docs/data/histograms/Puerto Rico/EN6205.json
index d0e78de6340..3e8e3929d06 100644
--- a/docs/data/histograms/Puerto Rico/EN6205.json
+++ b/docs/data/histograms/Puerto Rico/EN6205.json
@@ -1 +1 @@
-{"batchcode": "EN6205", "histograms": [{"batchcodes": ["EN6205"], "histogram": {"Facial paralysis": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pruritus": 1, "Pulmonary pain": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6205", "histograms": [{"histogram": {"Facial paralysis": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pruritus": 1, "Pulmonary pain": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EN6205"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN6206.json b/docs/data/histograms/Puerto Rico/EN6206.json
index fd4aba041fb..4e9ceacd252 100644
--- a/docs/data/histograms/Puerto Rico/EN6206.json
+++ b/docs/data/histograms/Puerto Rico/EN6206.json
@@ -1 +1 @@
-{"batchcode": "EN6206", "histograms": [{"batchcodes": ["EN6206"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Laryngeal oedema": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6206", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Laryngeal oedema": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Swelling face": 1}, "batchcodes": ["EN6206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN6207.json b/docs/data/histograms/Puerto Rico/EN6207.json
index dc9620dea8b..58db6468bad 100644
--- a/docs/data/histograms/Puerto Rico/EN6207.json
+++ b/docs/data/histograms/Puerto Rico/EN6207.json
@@ -1 +1 @@
-{"batchcode": "EN6207", "histograms": [{"batchcodes": ["EN6207"], "histogram": {"Abdominal pain": 1, "Anxiety": 1, "Asthenia": 1, "Axillary pain": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac failure": 1, "Cough": 1, "Dyspnoea": 1, "Fall": 1, "Headache": 1, "Hepatic pain": 1, "Hepatomegaly": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Insomnia": 1, "Pyrexia": 1, "Seizure": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6207", "histograms": [{"histogram": {"Abdominal pain": 1, "Anxiety": 1, "Asthenia": 1, "Axillary pain": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac failure": 1, "Cough": 1, "Dyspnoea": 1, "Fall": 1, "Headache": 1, "Hepatic pain": 1, "Hepatomegaly": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Insomnia": 1, "Pyrexia": 1, "Seizure": 1, "Tremor": 1}, "batchcodes": ["EN6207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EN8784.json b/docs/data/histograms/Puerto Rico/EN8784.json
index 8676369aa27..418996a59b1 100644
--- a/docs/data/histograms/Puerto Rico/EN8784.json
+++ b/docs/data/histograms/Puerto Rico/EN8784.json
@@ -1 +1 @@
-{"batchcode": "EN8784", "histograms": [{"batchcodes": ["EN8784"], "histogram": {"Chills": 1, "Fatigue": 1, "Heavy menstrual bleeding": 1, "Nausea": 1, "Oligomenorrhoea": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "EN8784", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Heavy menstrual bleeding": 1, "Nausea": 1, "Oligomenorrhoea": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1}, "batchcodes": ["EN8784"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EP6955.json b/docs/data/histograms/Puerto Rico/EP6955.json
index e5aef0a9574..ce23b017289 100644
--- a/docs/data/histograms/Puerto Rico/EP6955.json
+++ b/docs/data/histograms/Puerto Rico/EP6955.json
@@ -1 +1 @@
-{"batchcode": "EP6955", "histograms": [{"batchcodes": ["EP6955"], "histogram": {"SARS-CoV-2 test": 3, "Asthenia": 1, "Bacterial test": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Hepatic cyst": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Pain": 1, "Pancreatic cyst": 1, "Pneumonia mycoplasmal": 1, "SARS-CoV-2 RNA": 1, "Seizure": 1, "Serology test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6955", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "Asthenia": 1, "Bacterial test": 1, "Blood pressure measurement": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Hepatic cyst": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Pain": 1, "Pancreatic cyst": 1, "Pneumonia mycoplasmal": 1, "SARS-CoV-2 RNA": 1, "Seizure": 1, "Serology test": 1, "Vaccination site pain": 1}, "batchcodes": ["EP6955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EP7534).json b/docs/data/histograms/Puerto Rico/EP7534).json
index 1048d8f73d2..5381d600047 100644
--- a/docs/data/histograms/Puerto Rico/EP7534).json
+++ b/docs/data/histograms/Puerto Rico/EP7534).json
@@ -1 +1 @@
-{"batchcode": "EP7534)", "histograms": [{"batchcodes": ["EP7534)"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Facial paralysis": 1, "Hot flush": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Pharyngeal swelling": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EP7534)", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Facial paralysis": 1, "Hot flush": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Pharyngeal swelling": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EP7534)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EP7534.json b/docs/data/histograms/Puerto Rico/EP7534.json
index dfcae701d5c..54d6419891b 100644
--- a/docs/data/histograms/Puerto Rico/EP7534.json
+++ b/docs/data/histograms/Puerto Rico/EP7534.json
@@ -1 +1 @@
-{"batchcode": "EP7534", "histograms": [{"batchcodes": ["EP7534"], "histogram": {"Asthenia": 1, "Blood immunoglobulin M": 1, "Influenza B virus test": 1, "Investigation": 1, "Nucleic acid test": 1, "Pneumonia mycoplasmal": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 RNA": 1, "SARS-CoV-2 test": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EP7534", "histograms": [{"histogram": {"Asthenia": 1, "Blood immunoglobulin M": 1, "Influenza B virus test": 1, "Investigation": 1, "Nucleic acid test": 1, "Pneumonia mycoplasmal": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 RNA": 1, "SARS-CoV-2 test": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}, "batchcodes": ["EP7534"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ER2613.json b/docs/data/histograms/Puerto Rico/ER2613.json
index ca5726c36f4..90b4ff79558 100644
--- a/docs/data/histograms/Puerto Rico/ER2613.json
+++ b/docs/data/histograms/Puerto Rico/ER2613.json
@@ -1 +1 @@
-{"batchcode": "ER2613", "histograms": [{"batchcodes": ["ER2613"], "histogram": {"Influenza": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ER2613", "histograms": [{"histogram": {"Influenza": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["ER2613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ER8730.json b/docs/data/histograms/Puerto Rico/ER8730.json
index 748ee415302..6b6078fe57f 100644
--- a/docs/data/histograms/Puerto Rico/ER8730.json
+++ b/docs/data/histograms/Puerto Rico/ER8730.json
@@ -1 +1 @@
-{"batchcode": "ER8730", "histograms": [{"batchcodes": ["ER8730"], "histogram": {"Computerised tomogram": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Full blood count": 1, "Hypersensitivity": 1, "Myocardial necrosis marker": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Rash": 1, "Tinnitus": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8730", "histograms": [{"histogram": {"Computerised tomogram": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Full blood count": 1, "Hypersensitivity": 1, "Myocardial necrosis marker": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Rash": 1, "Tinnitus": 1, "Vaccination site mass": 1}, "batchcodes": ["ER8730"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ER8731.json b/docs/data/histograms/Puerto Rico/ER8731.json
index b1af347c68a..d23a76ed3be 100644
--- a/docs/data/histograms/Puerto Rico/ER8731.json
+++ b/docs/data/histograms/Puerto Rico/ER8731.json
@@ -1 +1 @@
-{"batchcode": "ER8731", "histograms": [{"batchcodes": ["ER8731"], "histogram": {"Blood cholesterol": 1, "Electrocardiogram": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8731", "histograms": [{"histogram": {"Blood cholesterol": 1, "Electrocardiogram": 1, "Headache": 1}, "batchcodes": ["ER8731"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ER8734.json b/docs/data/histograms/Puerto Rico/ER8734.json
index 1d950acbedd..e607e86703e 100644
--- a/docs/data/histograms/Puerto Rico/ER8734.json
+++ b/docs/data/histograms/Puerto Rico/ER8734.json
@@ -1 +1 @@
-{"batchcode": "ER8734", "histograms": [{"batchcodes": ["ER8734"], "histogram": {"Arthralgia": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8734", "histograms": [{"histogram": {"Arthralgia": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ER8734"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ER8737.json b/docs/data/histograms/Puerto Rico/ER8737.json
index 200baac997e..f2f8c994fc2 100644
--- a/docs/data/histograms/Puerto Rico/ER8737.json
+++ b/docs/data/histograms/Puerto Rico/ER8737.json
@@ -1 +1 @@
-{"batchcode": "ER8737", "histograms": [{"batchcodes": ["ER8737"], "histogram": {"Dyspnoea": 1, "Headache": 1, "Hypertension": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8737", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1, "Hypertension": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ER8737"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ES1686.json b/docs/data/histograms/Puerto Rico/ES1686.json
index 5bad5bd6a19..4156fa78c1b 100644
--- a/docs/data/histograms/Puerto Rico/ES1686.json
+++ b/docs/data/histograms/Puerto Rico/ES1686.json
@@ -1 +1 @@
-{"batchcode": "ES1686", "histograms": [{"batchcodes": ["ES1686"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Dizziness": 1, "Flatulence": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ES1686", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Dizziness": 1, "Flatulence": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["ES1686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW 5318.json b/docs/data/histograms/Puerto Rico/EW 5318.json
index 5a5f65228b2..7d0ebbabb86 100644
--- a/docs/data/histograms/Puerto Rico/EW 5318.json
+++ b/docs/data/histograms/Puerto Rico/EW 5318.json
@@ -1 +1 @@
-{"batchcode": "EW 5318", "histograms": [{"batchcodes": ["EW 5318"], "histogram": {"Headache": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "EW 5318", "histograms": [{"histogram": {"Headache": 1, "Lymphadenopathy": 1}, "batchcodes": ["EW 5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0151.json b/docs/data/histograms/Puerto Rico/EW0151.json
index cebdcb04aca..be77a99c53e 100644
--- a/docs/data/histograms/Puerto Rico/EW0151.json
+++ b/docs/data/histograms/Puerto Rico/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Abdominal pain": 1, "Chest pain": 1, "Diarrhoea": 1, "Haemorrhage": 1, "Lymphadenopathy": 1, "Nausea": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Abdominal pain": 1, "Chest pain": 1, "Diarrhoea": 1, "Haemorrhage": 1, "Lymphadenopathy": 1, "Nausea": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0161.json b/docs/data/histograms/Puerto Rico/EW0161.json
index 36069fa30ea..5d11bea9ad1 100644
--- a/docs/data/histograms/Puerto Rico/EW0161.json
+++ b/docs/data/histograms/Puerto Rico/EW0161.json
@@ -1 +1 @@
-{"batchcode": "EW0161", "histograms": [{"batchcodes": ["EW0161"], "histogram": {"Menstrual disorder": 2, "COVID-19": 1, "Drug ineffective": 1, "Hypoaesthesia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0161", "histograms": [{"histogram": {"Menstrual disorder": 2, "COVID-19": 1, "Drug ineffective": 1, "Hypoaesthesia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0162.json b/docs/data/histograms/Puerto Rico/EW0162.json
index db6cf107a7b..443a8819ec1 100644
--- a/docs/data/histograms/Puerto Rico/EW0162.json
+++ b/docs/data/histograms/Puerto Rico/EW0162.json
@@ -1 +1 @@
-{"batchcode": "EW0162", "histograms": [{"batchcodes": ["EW0162"], "histogram": {"Back pain": 1, "Fatigue": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0162", "histograms": [{"histogram": {"Back pain": 1, "Fatigue": 1, "Somnolence": 1}, "batchcodes": ["EW0162"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0169.json b/docs/data/histograms/Puerto Rico/EW0169.json
index 3dfed244ccf..9d03d46b063 100644
--- a/docs/data/histograms/Puerto Rico/EW0169.json
+++ b/docs/data/histograms/Puerto Rico/EW0169.json
@@ -1 +1 @@
-{"batchcode": "EW0169", "histograms": [{"batchcodes": ["EW0169"], "histogram": {"Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0169", "histograms": [{"histogram": {"Rash": 1, "Urticaria": 1}, "batchcodes": ["EW0169"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0170.json b/docs/data/histograms/Puerto Rico/EW0170.json
index aca959e2fa0..9187367cb39 100644
--- a/docs/data/histograms/Puerto Rico/EW0170.json
+++ b/docs/data/histograms/Puerto Rico/EW0170.json
@@ -1 +1 @@
-{"batchcode": "EW0170", "histograms": [{"batchcodes": ["EW0170"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Oral herpes": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0170", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Oral herpes": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0170"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0171.json b/docs/data/histograms/Puerto Rico/EW0171.json
index 4a4e8edf98e..46c0aa7fbb8 100644
--- a/docs/data/histograms/Puerto Rico/EW0171.json
+++ b/docs/data/histograms/Puerto Rico/EW0171.json
@@ -1 +1 @@
-{"batchcode": "EW0171", "histograms": [{"batchcodes": ["EW0171"], "histogram": {"Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0171", "histograms": [{"histogram": {"Vaginal haemorrhage": 1}, "batchcodes": ["EW0171"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0175.json b/docs/data/histograms/Puerto Rico/EW0175.json
index fd87b1bd7b2..4099ce41ef2 100644
--- a/docs/data/histograms/Puerto Rico/EW0175.json
+++ b/docs/data/histograms/Puerto Rico/EW0175.json
@@ -1 +1 @@
-{"batchcode": "EW0175", "histograms": [{"batchcodes": ["EW0175"], "histogram": {"Arrhythmia": 1, "Asthma": 1, "Cough": 1, "SARS-CoV-1 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0175", "histograms": [{"histogram": {"Arrhythmia": 1, "Asthma": 1, "Cough": 1, "SARS-CoV-1 test": 1}, "batchcodes": ["EW0175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0179.json b/docs/data/histograms/Puerto Rico/EW0179.json
index 5d4de2fc0ed..695746b4a99 100644
--- a/docs/data/histograms/Puerto Rico/EW0179.json
+++ b/docs/data/histograms/Puerto Rico/EW0179.json
@@ -1 +1 @@
-{"batchcode": "EW0179", "histograms": [{"batchcodes": ["EW0179"], "histogram": {"Headache": 2, "Arthralgia": 1, "Asthenia": 1, "Head discomfort": 1, "Pain": 1, "Paraesthesia": 1, "Pruritus": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0179", "histograms": [{"histogram": {"Headache": 2, "Arthralgia": 1, "Asthenia": 1, "Head discomfort": 1, "Pain": 1, "Paraesthesia": 1, "Pruritus": 1, "Vaccination site pruritus": 1}, "batchcodes": ["EW0179"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0181.json b/docs/data/histograms/Puerto Rico/EW0181.json
index 8639fab6ed1..914f924afd6 100644
--- a/docs/data/histograms/Puerto Rico/EW0181.json
+++ b/docs/data/histograms/Puerto Rico/EW0181.json
@@ -1 +1 @@
-{"batchcode": "EW0181", "histograms": [{"batchcodes": ["EW0181"], "histogram": {"Headache": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0181", "histograms": [{"histogram": {"Headache": 1, "Thrombosis": 1}, "batchcodes": ["EW0181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0186.json b/docs/data/histograms/Puerto Rico/EW0186.json
index 97969d899a6..df0a4c1c094 100644
--- a/docs/data/histograms/Puerto Rico/EW0186.json
+++ b/docs/data/histograms/Puerto Rico/EW0186.json
@@ -1 +1 @@
-{"batchcode": "EW0186", "histograms": [{"batchcodes": ["EW0186"], "histogram": {"Clinodactyly": 1, "Dyspnoea": 1, "Gait inability": 1, "Headache": 1, "Pyrexia": 1, "Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0186", "histograms": [{"histogram": {"Clinodactyly": 1, "Dyspnoea": 1, "Gait inability": 1, "Headache": 1, "Pyrexia": 1, "Speech disorder": 1}, "batchcodes": ["EW0186"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0196.json b/docs/data/histograms/Puerto Rico/EW0196.json
index 264a0a647f7..bfce922c5a9 100644
--- a/docs/data/histograms/Puerto Rico/EW0196.json
+++ b/docs/data/histograms/Puerto Rico/EW0196.json
@@ -1 +1 @@
-{"batchcode": "EW0196", "histograms": [{"batchcodes": ["EW0196"], "histogram": {"Chills": 1, "Feeling abnormal": 1, "Immunisation": 1, "Nausea": 1, "Off label use": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0196", "histograms": [{"histogram": {"Chills": 1, "Feeling abnormal": 1, "Immunisation": 1, "Nausea": 1, "Off label use": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["EW0196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0198.json b/docs/data/histograms/Puerto Rico/EW0198.json
index a24e1993c5a..17dcc554519 100644
--- a/docs/data/histograms/Puerto Rico/EW0198.json
+++ b/docs/data/histograms/Puerto Rico/EW0198.json
@@ -1 +1 @@
-{"batchcode": "EW0198", "histograms": [{"batchcodes": ["EW0198"], "histogram": {"Axillary pain": 1, "Chest pain": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Injection site pruritus": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0198", "histograms": [{"histogram": {"Axillary pain": 1, "Chest pain": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Injection site pruritus": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["EW0198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EW0217.json b/docs/data/histograms/Puerto Rico/EW0217.json
index 4b11cfcc396..e967b17ac10 100644
--- a/docs/data/histograms/Puerto Rico/EW0217.json
+++ b/docs/data/histograms/Puerto Rico/EW0217.json
@@ -1 +1 @@
-{"batchcode": "EW0217", "histograms": [{"batchcodes": ["EW0217"], "histogram": {"Chest pain": 1, "Heart rate": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0217", "histograms": [{"histogram": {"Chest pain": 1, "Heart rate": 1}, "batchcodes": ["EW0217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/EWO196.json b/docs/data/histograms/Puerto Rico/EWO196.json
index b4760dd6ad1..0e7eea273d8 100644
--- a/docs/data/histograms/Puerto Rico/EWO196.json
+++ b/docs/data/histograms/Puerto Rico/EWO196.json
@@ -1 +1 @@
-{"batchcode": "EWO196", "histograms": [{"batchcodes": ["EWO196"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO196", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["EWO196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FA 7484.json b/docs/data/histograms/Puerto Rico/FA 7484.json
index 47af5344f8b..2fe3bdecb04 100644
--- a/docs/data/histograms/Puerto Rico/FA 7484.json
+++ b/docs/data/histograms/Puerto Rico/FA 7484.json
@@ -1 +1 @@
-{"batchcode": "FA 7484", "histograms": [{"batchcodes": ["FA 7484"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Eye swelling": 1, "Eyelids pruritus": 1, "Speech disorder": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FA 7484", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Eye swelling": 1, "Eyelids pruritus": 1, "Speech disorder": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Vision blurred": 1}, "batchcodes": ["FA 7484"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FA7484.json b/docs/data/histograms/Puerto Rico/FA7484.json
index 17cb1def6e4..16f08c3bd70 100644
--- a/docs/data/histograms/Puerto Rico/FA7484.json
+++ b/docs/data/histograms/Puerto Rico/FA7484.json
@@ -1 +1 @@
-{"batchcode": "FA7484", "histograms": [{"batchcodes": ["FA7484"], "histogram": {"Cellulitis": 1, "Facial paralysis": 1, "Hypersomnia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7484", "histograms": [{"histogram": {"Cellulitis": 1, "Facial paralysis": 1, "Hypersomnia": 1, "Somnolence": 1}, "batchcodes": ["FA7484"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FC3181.json b/docs/data/histograms/Puerto Rico/FC3181.json
index 8d8a59d4be6..b6e3bd5a227 100644
--- a/docs/data/histograms/Puerto Rico/FC3181.json
+++ b/docs/data/histograms/Puerto Rico/FC3181.json
@@ -1 +1 @@
-{"batchcode": "FC3181", "histograms": [{"batchcodes": ["FC3181"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3181", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["FC3181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FC3183.json b/docs/data/histograms/Puerto Rico/FC3183.json
index d7b85546baf..881f4bbbc19 100644
--- a/docs/data/histograms/Puerto Rico/FC3183.json
+++ b/docs/data/histograms/Puerto Rico/FC3183.json
@@ -1 +1 @@
-{"batchcode": "FC3183", "histograms": [{"batchcodes": ["FC3183"], "histogram": {"Abdominal distension": 1, "Back pain": 1, "Constipation": 1, "Diarrhoea": 1, "Dizziness": 1, "Fall": 1, "Gait inability": 1, "Hernia": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Liver injury": 1, "Magnetic resonance imaging": 1, "Nipple swelling": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Renal impairment": 1, "SARS-CoV-2 test": 1, "Testicular pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3183", "histograms": [{"histogram": {"Abdominal distension": 1, "Back pain": 1, "Constipation": 1, "Diarrhoea": 1, "Dizziness": 1, "Fall": 1, "Gait inability": 1, "Hernia": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Liver injury": 1, "Magnetic resonance imaging": 1, "Nipple swelling": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Renal impairment": 1, "SARS-CoV-2 test": 1, "Testicular pain": 1}, "batchcodes": ["FC3183"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FC3184.json b/docs/data/histograms/Puerto Rico/FC3184.json
index 4d94310f613..0195a7cabc4 100644
--- a/docs/data/histograms/Puerto Rico/FC3184.json
+++ b/docs/data/histograms/Puerto Rico/FC3184.json
@@ -1 +1 @@
-{"batchcode": "FC3184", "histograms": [{"batchcodes": ["FC3184"], "histogram": {"Chest pain": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3184", "histograms": [{"histogram": {"Chest pain": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypoaesthesia": 1}, "batchcodes": ["FC3184"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FC381.json b/docs/data/histograms/Puerto Rico/FC381.json
index 43f75c919e3..4c24345e9f2 100644
--- a/docs/data/histograms/Puerto Rico/FC381.json
+++ b/docs/data/histograms/Puerto Rico/FC381.json
@@ -1 +1 @@
-{"batchcode": "FC381", "histograms": [{"batchcodes": ["FC381"], "histogram": {"Asthenia": 1, "Dehydration": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Insomnia": 1, "Micturition disorder": 1, "Pyrexia": 1, "Renal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FC381", "histograms": [{"histogram": {"Asthenia": 1, "Dehydration": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Insomnia": 1, "Micturition disorder": 1, "Pyrexia": 1, "Renal pain": 1}, "batchcodes": ["FC381"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FD0809.json b/docs/data/histograms/Puerto Rico/FD0809.json
index e34e55f7bc0..820f6ee1d66 100644
--- a/docs/data/histograms/Puerto Rico/FD0809.json
+++ b/docs/data/histograms/Puerto Rico/FD0809.json
@@ -1 +1 @@
-{"batchcode": "FD0809", "histograms": [{"batchcodes": ["FD0809"], "histogram": {"Feeling hot": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pain": 1, "Swelling": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0809", "histograms": [{"histogram": {"Feeling hot": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pain": 1, "Swelling": 1, "Vaccination site swelling": 1}, "batchcodes": ["FD0809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FD8448.json b/docs/data/histograms/Puerto Rico/FD8448.json
index ed1c643ac20..56066416107 100644
--- a/docs/data/histograms/Puerto Rico/FD8448.json
+++ b/docs/data/histograms/Puerto Rico/FD8448.json
@@ -1 +1 @@
-{"batchcode": "FD8448", "histograms": [{"batchcodes": ["FD8448"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site scar": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FD8448", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site scar": 1, "Vaccination site swelling": 1}, "batchcodes": ["FD8448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FE3594.json b/docs/data/histograms/Puerto Rico/FE3594.json
index 280c6b9db99..d5f7b308e17 100644
--- a/docs/data/histograms/Puerto Rico/FE3594.json
+++ b/docs/data/histograms/Puerto Rico/FE3594.json
@@ -1 +1 @@
-{"batchcode": "FE3594", "histograms": [{"batchcodes": ["FE3594"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3594", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FE3594"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FF2588.json b/docs/data/histograms/Puerto Rico/FF2588.json
index ae1fdba20b8..b3873e749e8 100644
--- a/docs/data/histograms/Puerto Rico/FF2588.json
+++ b/docs/data/histograms/Puerto Rico/FF2588.json
@@ -1 +1 @@
-{"batchcode": "FF2588", "histograms": [{"batchcodes": ["FF2588"], "histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2}}]}
\ No newline at end of file
+{"batchcode": "FF2588", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2}, "batchcodes": ["FF2588"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FF2589.json b/docs/data/histograms/Puerto Rico/FF2589.json
index f2808004a7e..c826b1526f3 100644
--- a/docs/data/histograms/Puerto Rico/FF2589.json
+++ b/docs/data/histograms/Puerto Rico/FF2589.json
@@ -1 +1 @@
-{"batchcode": "FF2589", "histograms": [{"batchcodes": ["FF2589"], "histogram": {"Axillary pain": 1, "COVID-19": 1, "Condition aggravated": 1, "Inflammation": 1, "Lymphadenitis": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Thrombocytopenia": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2589", "histograms": [{"histogram": {"Axillary pain": 1, "COVID-19": 1, "Condition aggravated": 1, "Inflammation": 1, "Lymphadenitis": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Thrombocytopenia": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["FF2589"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FF8841.json b/docs/data/histograms/Puerto Rico/FF8841.json
index 680e53a4a22..78d9fa95f42 100644
--- a/docs/data/histograms/Puerto Rico/FF8841.json
+++ b/docs/data/histograms/Puerto Rico/FF8841.json
@@ -1 +1 @@
-{"batchcode": "FF8841", "histograms": [{"batchcodes": ["FF8841"], "histogram": {"Body temperature increased": 1, "Burning sensation": 1, "Discomfort": 1, "Facial pain": 1, "Feeling hot": 1, "Hypoaesthesia": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Limb discomfort": 1, "Muscular weakness": 1, "Myalgia": 1, "Paraesthesia": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8841", "histograms": [{"histogram": {"Body temperature increased": 1, "Burning sensation": 1, "Discomfort": 1, "Facial pain": 1, "Feeling hot": 1, "Hypoaesthesia": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Limb discomfort": 1, "Muscular weakness": 1, "Myalgia": 1, "Paraesthesia": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["FF8841"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FK5127.json b/docs/data/histograms/Puerto Rico/FK5127.json
index ac24bacb984..51b370a9239 100644
--- a/docs/data/histograms/Puerto Rico/FK5127.json
+++ b/docs/data/histograms/Puerto Rico/FK5127.json
@@ -1 +1 @@
-{"batchcode": "FK5127", "histograms": [{"batchcodes": ["FK5127"], "histogram": {"Respiratory disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "FK5127", "histograms": [{"histogram": {"Respiratory disorder": 1}, "batchcodes": ["FK5127"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FK9229.json b/docs/data/histograms/Puerto Rico/FK9229.json
index 7da4997cf2b..f8f0b6d3f34 100644
--- a/docs/data/histograms/Puerto Rico/FK9229.json
+++ b/docs/data/histograms/Puerto Rico/FK9229.json
@@ -1 +1 @@
-{"batchcode": "FK9229", "histograms": [{"batchcodes": ["FK9229"], "histogram": {"Axillary mass": 1, "Pain": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9229", "histograms": [{"histogram": {"Axillary mass": 1, "Pain": 1, "Tenderness": 1}, "batchcodes": ["FK9229"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FK9729.json b/docs/data/histograms/Puerto Rico/FK9729.json
index 587acb59229..c0cc509a458 100644
--- a/docs/data/histograms/Puerto Rico/FK9729.json
+++ b/docs/data/histograms/Puerto Rico/FK9729.json
@@ -1 +1 @@
-{"batchcode": "FK9729", "histograms": [{"batchcodes": ["FK9729"], "histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Arthralgia": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dry skin": 1, "Dysuria": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Scab": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9729", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Arthralgia": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dry skin": 1, "Dysuria": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Scab": 1}, "batchcodes": ["FK9729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FK9894.json b/docs/data/histograms/Puerto Rico/FK9894.json
index f89f2a9a904..f14d9f49f6d 100644
--- a/docs/data/histograms/Puerto Rico/FK9894.json
+++ b/docs/data/histograms/Puerto Rico/FK9894.json
@@ -1 +1 @@
-{"batchcode": "FK9894", "histograms": [{"batchcodes": ["FK9894"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9894", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FK9894"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FK9896.json b/docs/data/histograms/Puerto Rico/FK9896.json
index 31ecd3a6627..d304c6c9f00 100644
--- a/docs/data/histograms/Puerto Rico/FK9896.json
+++ b/docs/data/histograms/Puerto Rico/FK9896.json
@@ -1 +1 @@
-{"batchcode": "FK9896", "histograms": [{"batchcodes": ["FK9896"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9896", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FK9896"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FKA729.json b/docs/data/histograms/Puerto Rico/FKA729.json
index b6bab3e8527..27cb9033097 100644
--- a/docs/data/histograms/Puerto Rico/FKA729.json
+++ b/docs/data/histograms/Puerto Rico/FKA729.json
@@ -1 +1 @@
-{"batchcode": "FKA729", "histograms": [{"batchcodes": ["FKA729"], "histogram": {"Burning sensation": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Pain": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FKA729", "histograms": [{"histogram": {"Burning sensation": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Pain": 1, "Paraesthesia": 1}, "batchcodes": ["FKA729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FL8094.json b/docs/data/histograms/Puerto Rico/FL8094.json
index 66b3572c6bb..20961a573ce 100644
--- a/docs/data/histograms/Puerto Rico/FL8094.json
+++ b/docs/data/histograms/Puerto Rico/FL8094.json
@@ -1 +1 @@
-{"batchcode": "FL8094", "histograms": [{"batchcodes": ["FL8094"], "histogram": {"Full blood count": 1, "Haematoma": 1, "Immune thrombocytopenia": 1, "Petechiae": 1, "Platelet count abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "FL8094", "histograms": [{"histogram": {"Full blood count": 1, "Haematoma": 1, "Immune thrombocytopenia": 1, "Petechiae": 1, "Platelet count abnormal": 1}, "batchcodes": ["FL8094"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/FM 9809.json b/docs/data/histograms/Puerto Rico/FM 9809.json
index 49a33ca9804..4b1659fdead 100644
--- a/docs/data/histograms/Puerto Rico/FM 9809.json
+++ b/docs/data/histograms/Puerto Rico/FM 9809.json
@@ -1 +1 @@
-{"batchcode": "FM 9809", "histograms": [{"batchcodes": ["FM 9809"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Dysgeusia": 1, "Flushing": 1, "Heart rate": 1, "Heart rate increased": 1, "Oral discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "FM 9809", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Dysgeusia": 1, "Flushing": 1, "Heart rate": 1, "Heart rate increased": 1, "Oral discomfort": 1}, "batchcodes": ["FM 9809"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/GW0151.json b/docs/data/histograms/Puerto Rico/GW0151.json
index 72fc82073ab..7b03aba8ae7 100644
--- a/docs/data/histograms/Puerto Rico/GW0151.json
+++ b/docs/data/histograms/Puerto Rico/GW0151.json
@@ -1 +1 @@
-{"batchcode": "GW0151", "histograms": [{"batchcodes": ["GW0151"], "histogram": {"Asthenia": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Headache": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "GW0151", "histograms": [{"histogram": {"Asthenia": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Headache": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["GW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/O70L20A.json b/docs/data/histograms/Puerto Rico/O70L20A.json
index 6bd63cf239f..ccea3389408 100644
--- a/docs/data/histograms/Puerto Rico/O70L20A.json
+++ b/docs/data/histograms/Puerto Rico/O70L20A.json
@@ -1 +1 @@
-{"batchcode": "O70L20A", "histograms": [{"batchcodes": ["O70L20A"], "histogram": {"Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "O70L20A", "histograms": [{"histogram": {"Lymphadenopathy": 1}, "batchcodes": ["O70L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/S3025BD.json b/docs/data/histograms/Puerto Rico/S3025BD.json
index 7420f19e109..90d17d95878 100644
--- a/docs/data/histograms/Puerto Rico/S3025BD.json
+++ b/docs/data/histograms/Puerto Rico/S3025BD.json
@@ -1 +1 @@
-{"batchcode": "S3025BD", "histograms": [{"batchcodes": ["S3025BD"], "histogram": {"Asthenia": 1, "Axillary pain": 1, "Immunisation": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "S3025BD", "histograms": [{"histogram": {"Asthenia": 1, "Axillary pain": 1, "Immunisation": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1}, "batchcodes": ["S3025BD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/SEY0584.json b/docs/data/histograms/Puerto Rico/SEY0584.json
index 3f543116b42..12c662189b9 100644
--- a/docs/data/histograms/Puerto Rico/SEY0584.json
+++ b/docs/data/histograms/Puerto Rico/SEY0584.json
@@ -1 +1 @@
-{"batchcode": "SEY0584", "histograms": [{"batchcodes": ["SEY0584"], "histogram": {"Cough": 1, "Dehydration": 1, "Headache": 1, "Hypertension": 1, "Influenza virus test": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Systemic inflammatory response syndrome": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "SEY0584", "histograms": [{"histogram": {"Cough": 1, "Dehydration": 1, "Headache": 1, "Hypertension": 1, "Influenza virus test": 1, "Pain": 1, "Pyrexia": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Systemic inflammatory response syndrome": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["SEY0584"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Puerto Rico/ZP6955.json b/docs/data/histograms/Puerto Rico/ZP6955.json
index 9ec270b575e..20de308696d 100644
--- a/docs/data/histograms/Puerto Rico/ZP6955.json
+++ b/docs/data/histograms/Puerto Rico/ZP6955.json
@@ -1 +1 @@
-{"batchcode": "ZP6955", "histograms": [{"batchcodes": ["ZP6955"], "histogram": {"Abdominal discomfort": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hypertension": 1, "Myalgia": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "ZP6955", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hypertension": 1, "Myalgia": 1, "Nausea": 1}, "batchcodes": ["ZP6955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Qatar/BR6166.json b/docs/data/histograms/Qatar/BR6166.json
index 562edcce9a4..d5ac937baf8 100644
--- a/docs/data/histograms/Qatar/BR6166.json
+++ b/docs/data/histograms/Qatar/BR6166.json
@@ -1 +1 @@
-{"batchcode": "BR6166", "histograms": [{"batchcodes": ["BR6166"], "histogram": {"Blood test": 1, "Computerised tomogram": 1, "Gait disturbance": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "BR6166", "histograms": [{"histogram": {"Blood test": 1, "Computerised tomogram": 1, "Gait disturbance": 1, "Vertigo": 1}, "batchcodes": ["BR6166"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Qatar/EK 4241.json b/docs/data/histograms/Qatar/EK 4241.json
index 57bb2285eda..08b9fc03e5a 100644
--- a/docs/data/histograms/Qatar/EK 4241.json
+++ b/docs/data/histograms/Qatar/EK 4241.json
@@ -1 +1 @@
-{"batchcode": "EK 4241", "histograms": [{"batchcodes": ["EK 4241"], "histogram": {"Dizziness": 1, "Erythema": 1, "Nausea": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EK 4241", "histograms": [{"histogram": {"Dizziness": 1, "Erythema": 1, "Nausea": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EK 4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Qatar/EK4241.json b/docs/data/histograms/Qatar/EK4241.json
index 4e65982fb03..2fe34ebd0bb 100644
--- a/docs/data/histograms/Qatar/EK4241.json
+++ b/docs/data/histograms/Qatar/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"Asthenia": 1, "Blood culture": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling hot": 1, "Full blood count": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Inflammatory marker increased": 1, "Neutrophil count increased": 1, "Ocular hyperaemia": 1, "Platelet count": 1, "Platelet count increased": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell sedimentation rate increased": 1, "Red blood cell sedimentation rate normal": 1, "Rhinovirus infection": 1, "SARS-CoV-2 test": 1, "Smear test": 1, "Syncope": 1, "Tachycardia": 1, "Urine analysis": 1, "Viral test": 1, "White blood cell count increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"Asthenia": 1, "Blood culture": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling hot": 1, "Full blood count": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Inflammatory marker increased": 1, "Neutrophil count increased": 1, "Ocular hyperaemia": 1, "Platelet count": 1, "Platelet count increased": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell sedimentation rate increased": 1, "Red blood cell sedimentation rate normal": 1, "Rhinovirus infection": 1, "SARS-CoV-2 test": 1, "Smear test": 1, "Syncope": 1, "Tachycardia": 1, "Urine analysis": 1, "Viral test": 1, "White blood cell count increased": 1, "X-ray": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Romania/025L21B.json b/docs/data/histograms/Romania/025L21B.json
index 0f8339f928d..97df6922efd 100644
--- a/docs/data/histograms/Romania/025L21B.json
+++ b/docs/data/histograms/Romania/025L21B.json
@@ -1 +1 @@
-{"batchcode": "025L21B", "histograms": [{"batchcodes": ["025L21B"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "025L21B", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["025L21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Romania/032B21A.json b/docs/data/histograms/Romania/032B21A.json
index 3dce3ba001d..8ec42792389 100644
--- a/docs/data/histograms/Romania/032B21A.json
+++ b/docs/data/histograms/Romania/032B21A.json
@@ -1 +1 @@
-{"batchcode": "032B21A", "histograms": [{"batchcodes": ["032B21A"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Influenza like illness": 1, "Malaise": 1, "Migraine": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "032B21A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Influenza like illness": 1, "Malaise": 1, "Migraine": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["032B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Romania/065F21A.json b/docs/data/histograms/Romania/065F21A.json
index 2f4eb7027de..9b99d496239 100644
--- a/docs/data/histograms/Romania/065F21A.json
+++ b/docs/data/histograms/Romania/065F21A.json
@@ -1 +1 @@
-{"batchcode": "065F21A", "histograms": [{"batchcodes": ["065F21A"], "histogram": {"Extra dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "065F21A", "histograms": [{"histogram": {"Extra dose administered": 1}, "batchcodes": ["065F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Russian Federation/1B004A.json b/docs/data/histograms/Russian Federation/1B004A.json
index 3012cd3bf9f..b69e5f6b272 100644
--- a/docs/data/histograms/Russian Federation/1B004A.json
+++ b/docs/data/histograms/Russian Federation/1B004A.json
@@ -1 +1 @@
-{"batchcode": "1B004A", "histograms": [{"batchcodes": ["1B004A"], "histogram": {"Anaphylactic shock": 1, "Body temperature": 1, "Body temperature abnormal": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Movement disorder": 1, "Myocarditis": 1, "Polymerase chain reaction": 1, "Pulmonary oedema": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "1B004A", "histograms": [{"histogram": {"Anaphylactic shock": 1, "Body temperature": 1, "Body temperature abnormal": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Movement disorder": 1, "Myocarditis": 1, "Polymerase chain reaction": 1, "Pulmonary oedema": 1, "Pyrexia": 1}, "batchcodes": ["1B004A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Russian Federation/ASKU.json b/docs/data/histograms/Russian Federation/ASKU.json
index 7dc1214f4f5..7ac72330149 100644
--- a/docs/data/histograms/Russian Federation/ASKU.json
+++ b/docs/data/histograms/Russian Federation/ASKU.json
@@ -1 +1 @@
-{"batchcode": "ASKU", "histograms": [{"batchcodes": ["ASKU"], "histogram": {"Asthenia": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Dizziness": 1, "Fatigue": 1, "Impaired work ability": 1, "Platelet count": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "ASKU", "histograms": [{"histogram": {"Asthenia": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Dizziness": 1, "Fatigue": 1, "Impaired work ability": 1, "Platelet count": 1, "Thrombocytopenia": 1}, "batchcodes": ["ASKU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saint Helena, Ascension and Tristan da Cunha/OO1AZ1A.json b/docs/data/histograms/Saint Helena, Ascension and Tristan da Cunha/OO1AZ1A.json
index 1d45a0a09da..c129dd80bfc 100644
--- a/docs/data/histograms/Saint Helena, Ascension and Tristan da Cunha/OO1AZ1A.json
+++ b/docs/data/histograms/Saint Helena, Ascension and Tristan da Cunha/OO1AZ1A.json
@@ -1 +1 @@
-{"batchcode": "OO1AZ1A", "histograms": [{"batchcodes": ["OO1AZ1A"], "histogram": {"Asthenia": 1, "Body temperature increased": 1, "Headache": 1, "Retching": 1, "Urinary incontinence": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "OO1AZ1A", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature increased": 1, "Headache": 1, "Retching": 1, "Urinary incontinence": 1, "Vaccination complication": 1}, "batchcodes": ["OO1AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saint Vincent and the Grenadines/013L20A.json b/docs/data/histograms/Saint Vincent and the Grenadines/013L20A.json
index 0850585f073..f2912faf07c 100644
--- a/docs/data/histograms/Saint Vincent and the Grenadines/013L20A.json
+++ b/docs/data/histograms/Saint Vincent and the Grenadines/013L20A.json
@@ -1 +1 @@
-{"batchcode": "013L20A", "histograms": [{"batchcodes": ["013L20A"], "histogram": {"Asthenia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20A", "histograms": [{"histogram": {"Asthenia": 1, "Pyrexia": 1}, "batchcodes": ["013L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/006C21A.json b/docs/data/histograms/Saudi Arabia/006C21A.json
index 2b89a5b9d7d..2b1e994ad50 100644
--- a/docs/data/histograms/Saudi Arabia/006C21A.json
+++ b/docs/data/histograms/Saudi Arabia/006C21A.json
@@ -1 +1 @@
-{"batchcode": "006C21A", "histograms": [{"batchcodes": ["006C21A"], "histogram": {"Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "006C21A", "histograms": [{"histogram": {"Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Skin warm": 1}, "batchcodes": ["006C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/015M20A.json b/docs/data/histograms/Saudi Arabia/015M20A.json
index 98658e3f775..057692f457d 100644
--- a/docs/data/histograms/Saudi Arabia/015M20A.json
+++ b/docs/data/histograms/Saudi Arabia/015M20A.json
@@ -1 +1 @@
-{"batchcode": "015M20A", "histograms": [{"batchcodes": ["015M20A"], "histogram": {"Cellulitis": 1, "Erythema": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Pain in extremity": 1, "Skin warm": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20A", "histograms": [{"histogram": {"Cellulitis": 1, "Erythema": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Pain in extremity": 1, "Skin warm": 1, "Swelling": 1}, "batchcodes": ["015M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/EK4237.json b/docs/data/histograms/Saudi Arabia/EK4237.json
index 5e84522da7e..2337afab519 100644
--- a/docs/data/histograms/Saudi Arabia/EK4237.json
+++ b/docs/data/histograms/Saudi Arabia/EK4237.json
@@ -1 +1 @@
-{"batchcode": "EK4237", "histograms": [{"batchcodes": ["EK4237"], "histogram": {"Antibody test": 1, "Herpes zoster": 1, "Platelet factor 4": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4237", "histograms": [{"histogram": {"Antibody test": 1, "Herpes zoster": 1, "Platelet factor 4": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EK4237"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/EN1201.json b/docs/data/histograms/Saudi Arabia/EN1201.json
index 0b33e83eb2a..a3c3139641d 100644
--- a/docs/data/histograms/Saudi Arabia/EN1201.json
+++ b/docs/data/histograms/Saudi Arabia/EN1201.json
@@ -1 +1 @@
-{"batchcode": "EN1201", "histograms": [{"batchcodes": ["EN1201"], "histogram": {"Angina bullosa haemorrhagica": 1, "Angina pectoris": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Gingival bleeding": 1, "Palpitations": 1, "Paraesthesia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1201", "histograms": [{"histogram": {"Angina bullosa haemorrhagica": 1, "Angina pectoris": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Gingival bleeding": 1, "Palpitations": 1, "Paraesthesia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Rash": 1}, "batchcodes": ["EN1201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/EN6206.json b/docs/data/histograms/Saudi Arabia/EN6206.json
index 42842c63a71..1a203b0d69e 100644
--- a/docs/data/histograms/Saudi Arabia/EN6206.json
+++ b/docs/data/histograms/Saudi Arabia/EN6206.json
@@ -1 +1 @@
-{"batchcode": "EN6206", "histograms": [{"batchcodes": ["EN6206", "EP7533"], "histogram": {"Deep vein thrombosis": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6206", "histograms": [{"histogram": {"Deep vein thrombosis": 1, "Ultrasound Doppler": 1}, "batchcodes": ["EN6206", "EP7533"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/EP7533.json b/docs/data/histograms/Saudi Arabia/EP7533.json
index 1de64c53da6..0706833e870 100644
--- a/docs/data/histograms/Saudi Arabia/EP7533.json
+++ b/docs/data/histograms/Saudi Arabia/EP7533.json
@@ -1 +1 @@
-{"batchcode": "EP7533", "histograms": [{"batchcodes": ["EN6206", "EP7533"], "histogram": {"Deep vein thrombosis": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "EP7533", "histograms": [{"histogram": {"Deep vein thrombosis": 1, "Ultrasound Doppler": 1}, "batchcodes": ["EN6206", "EP7533"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/ER0866.json b/docs/data/histograms/Saudi Arabia/ER0866.json
index 0c64979af10..167d680c1ab 100644
--- a/docs/data/histograms/Saudi Arabia/ER0866.json
+++ b/docs/data/histograms/Saudi Arabia/ER0866.json
@@ -1 +1 @@
-{"batchcode": "ER0866", "histograms": [{"batchcodes": ["ER0866"], "histogram": {"Haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "ER0866", "histograms": [{"histogram": {"Haemorrhage": 1}, "batchcodes": ["ER0866"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/ER6166.json b/docs/data/histograms/Saudi Arabia/ER6166.json
index 8262127c6c1..56449e5e99d 100644
--- a/docs/data/histograms/Saudi Arabia/ER6166.json
+++ b/docs/data/histograms/Saudi Arabia/ER6166.json
@@ -1 +1 @@
-{"batchcode": "ER6166", "histograms": [{"batchcodes": ["ER6166"], "histogram": {"Anxiety": 1, "Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Neck pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site infection": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "ER6166", "histograms": [{"histogram": {"Anxiety": 1, "Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Neck pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site infection": 1, "Vaccination site pain": 1}, "batchcodes": ["ER6166"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/ER8733.json b/docs/data/histograms/Saudi Arabia/ER8733.json
index f4db9aacd01..31c3ccb0e5c 100644
--- a/docs/data/histograms/Saudi Arabia/ER8733.json
+++ b/docs/data/histograms/Saudi Arabia/ER8733.json
@@ -1 +1 @@
-{"batchcode": "ER8733", "histograms": [{"batchcodes": ["ER8733"], "histogram": {"Intermenstrual bleeding": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8733", "histograms": [{"histogram": {"Intermenstrual bleeding": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ER8733"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/EX3546.json b/docs/data/histograms/Saudi Arabia/EX3546.json
index de3c3fe3959..60323884ab3 100644
--- a/docs/data/histograms/Saudi Arabia/EX3546.json
+++ b/docs/data/histograms/Saudi Arabia/EX3546.json
@@ -1 +1 @@
-{"batchcode": "EX3546", "histograms": [{"batchcodes": ["EX3546"], "histogram": {"Parosmia": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "EX3546", "histograms": [{"histogram": {"Parosmia": 1, "Polymerase chain reaction": 1}, "batchcodes": ["EX3546"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/EY5456.json b/docs/data/histograms/Saudi Arabia/EY5456.json
index b9d06c3d3a7..8e94c7a065c 100644
--- a/docs/data/histograms/Saudi Arabia/EY5456.json
+++ b/docs/data/histograms/Saudi Arabia/EY5456.json
@@ -1 +1 @@
-{"batchcode": "EY5456", "histograms": [{"batchcodes": ["EY5456"], "histogram": {"Aphonia": 1, "Asphyxia": 1, "Cough": 1, "Dysphonia": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Paraesthesia oral": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5456", "histograms": [{"histogram": {"Aphonia": 1, "Asphyxia": 1, "Cough": 1, "Dysphonia": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Paraesthesia oral": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Vision blurred": 1}, "batchcodes": ["EY5456"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/FF2153.json b/docs/data/histograms/Saudi Arabia/FF2153.json
index 4d3aa38bd0d..7e2b44c42d6 100644
--- a/docs/data/histograms/Saudi Arabia/FF2153.json
+++ b/docs/data/histograms/Saudi Arabia/FF2153.json
@@ -1 +1 @@
-{"batchcode": "FF2153", "histograms": [{"batchcodes": ["FF2153"], "histogram": {"Angina pectoris": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2153", "histograms": [{"histogram": {"Angina pectoris": 1, "Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Palpitations": 1, "Paraesthesia": 1}, "batchcodes": ["FF2153"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/FJ1964.json b/docs/data/histograms/Saudi Arabia/FJ1964.json
index 2f0a28bf8fd..15094f6c2b0 100644
--- a/docs/data/histograms/Saudi Arabia/FJ1964.json
+++ b/docs/data/histograms/Saudi Arabia/FJ1964.json
@@ -1 +1 @@
-{"batchcode": "FJ1964", "histograms": [{"batchcodes": ["FJ1964"], "histogram": {"Breast cancer female": 1, "Investigation": 1, "Mammogram": 1, "Ultrasound breast": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1964", "histograms": [{"histogram": {"Breast cancer female": 1, "Investigation": 1, "Mammogram": 1, "Ultrasound breast": 1}, "batchcodes": ["FJ1964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Saudi Arabia/FK8892.json b/docs/data/histograms/Saudi Arabia/FK8892.json
index b529b785e8f..0eda70125d7 100644
--- a/docs/data/histograms/Saudi Arabia/FK8892.json
+++ b/docs/data/histograms/Saudi Arabia/FK8892.json
@@ -1 +1 @@
-{"batchcode": "FK8892", "histograms": [{"batchcodes": ["FK8892"], "histogram": {"Blood cholesterol": 1, "Blood pressure measurement": 1, "Hypokinesia": 1, "Investigation": 1, "Lethargy": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8892", "histograms": [{"histogram": {"Blood cholesterol": 1, "Blood pressure measurement": 1, "Hypokinesia": 1, "Investigation": 1, "Lethargy": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Sleep disorder": 1}, "batchcodes": ["FK8892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Senegal/0255202A.json b/docs/data/histograms/Senegal/0255202A.json
index 6d7ab6935c3..4cc0f41799a 100644
--- a/docs/data/histograms/Senegal/0255202A.json
+++ b/docs/data/histograms/Senegal/0255202A.json
@@ -1 +1 @@
-{"batchcode": "0255202A", "histograms": [{"batchcodes": ["0255202A"], "histogram": {"Facial paralysis": 1, "Lip swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "0255202A", "histograms": [{"histogram": {"Facial paralysis": 1, "Lip swelling": 1, "Swelling face": 1}, "batchcodes": ["0255202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Senegal/EW0191.json b/docs/data/histograms/Senegal/EW0191.json
index 60b3673725b..82907b246bc 100644
--- a/docs/data/histograms/Senegal/EW0191.json
+++ b/docs/data/histograms/Senegal/EW0191.json
@@ -1 +1 @@
-{"batchcode": "EW0191", "histograms": [{"batchcodes": ["EW0191"], "histogram": {"Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0191", "histograms": [{"histogram": {"Product storage error": 1}, "batchcodes": ["EW0191"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/C0681.json b/docs/data/histograms/Serbia/C0681.json
index 709f895f08f..c4ef1f70e4b 100644
--- a/docs/data/histograms/Serbia/C0681.json
+++ b/docs/data/histograms/Serbia/C0681.json
@@ -1 +1 @@
-{"batchcode": "C0681", "histograms": [{"batchcodes": ["C0681"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "C0681", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["C0681"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EK 4241.json b/docs/data/histograms/Serbia/EK 4241.json
index c3986ca91b7..e5399a4f184 100644
--- a/docs/data/histograms/Serbia/EK 4241.json
+++ b/docs/data/histograms/Serbia/EK 4241.json
@@ -1 +1 @@
-{"batchcode": "EK 4241", "histograms": [{"batchcodes": ["EK 4241"], "histogram": {"Body temperature": 1, "Chills": 1, "Lymphadenopathy": 1, "Phlebitis": 1, "Pyrexia": 1, "Sepsis": 1}}]}
\ No newline at end of file
+{"batchcode": "EK 4241", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Lymphadenopathy": 1, "Phlebitis": 1, "Pyrexia": 1, "Sepsis": 1}, "batchcodes": ["EK 4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EK4241.json b/docs/data/histograms/Serbia/EK4241.json
index c32d2fa47ff..36ffb36e0ed 100644
--- a/docs/data/histograms/Serbia/EK4241.json
+++ b/docs/data/histograms/Serbia/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Face oedema": 1, "Fall": 1, "Fear of death": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Huntington's disease": 1, "Investigation": 1, "Pain in extremity": 1, "Platelet count": 1, "Protein urine": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Tongue oedema": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site haematoma": 1, "Vaccination site oedema": 1, "Vaccination site reaction": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Amylase": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Face oedema": 1, "Fall": 1, "Fear of death": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Huntington's disease": 1, "Investigation": 1, "Pain in extremity": 1, "Platelet count": 1, "Protein urine": 1, "Prothrombin time": 1, "Red blood cell count": 1, "Tongue oedema": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site haematoma": 1, "Vaccination site oedema": 1, "Vaccination site reaction": 1, "White blood cell count": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EK4245.json b/docs/data/histograms/Serbia/EK4245.json
index 1c86a74a5d5..4e918e3174b 100644
--- a/docs/data/histograms/Serbia/EK4245.json
+++ b/docs/data/histograms/Serbia/EK4245.json
@@ -1 +1 @@
-{"batchcode": "EK4245", "histograms": [{"batchcodes": ["EK4245"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Fatigue": 1, "Malaise": 1, "Myocardial infarction": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Skin reaction": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4245", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Fatigue": 1, "Malaise": 1, "Myocardial infarction": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Skin reaction": 1, "Tachycardia": 1}, "batchcodes": ["EK4245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EL020.json b/docs/data/histograms/Serbia/EL020.json
index 8a4716106dc..d95bba3d727 100644
--- a/docs/data/histograms/Serbia/EL020.json
+++ b/docs/data/histograms/Serbia/EL020.json
@@ -1 +1 @@
-{"batchcode": "EL020", "histograms": [{"batchcodes": ["EL020"], "histogram": {"Auscultation": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Dyspnoea": 1, "Hypertension": 1, "Malaise": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "SARS-CoV-2 test": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "EL020", "histograms": [{"histogram": {"Auscultation": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Dyspnoea": 1, "Hypertension": 1, "Malaise": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "SARS-CoV-2 test": 1, "Wheezing": 1}, "batchcodes": ["EL020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EL0200.json b/docs/data/histograms/Serbia/EL0200.json
index f6bd2b99741..113e5c98494 100644
--- a/docs/data/histograms/Serbia/EL0200.json
+++ b/docs/data/histograms/Serbia/EL0200.json
@@ -1 +1 @@
-{"batchcode": "EL0200", "histograms": [{"batchcodes": ["EL0200"], "histogram": {"Body temperature": 3, "Nausea": 3, "Pyrexia": 3, "Headache": 2, "Malaise": 2, "Abdominal X-ray": 1, "Ageusia": 1, "Amniocentesis": 1, "Arthralgia": 1, "Asthenia": 1, "Blepharospasm": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Facial paresis": 1, "Fallot's tetralogy": 1, "Feeling cold": 1, "Gait disturbance": 1, "Haematemesis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Joint stiffness": 1, "Leukopenia": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Nasal congestion": 1, "Neck pain": 1, "Nystagmus": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vision blurred": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0200", "histograms": [{"histogram": {"Body temperature": 3, "Nausea": 3, "Pyrexia": 3, "Headache": 2, "Malaise": 2, "Abdominal X-ray": 1, "Ageusia": 1, "Amniocentesis": 1, "Arthralgia": 1, "Asthenia": 1, "Blepharospasm": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Facial paresis": 1, "Fallot's tetralogy": 1, "Feeling cold": 1, "Gait disturbance": 1, "Haematemesis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Joint stiffness": 1, "Leukopenia": 1, "Loss of consciousness": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Nasal congestion": 1, "Neck pain": 1, "Nystagmus": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vision blurred": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["EL0200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EL8723.json b/docs/data/histograms/Serbia/EL8723.json
index 76ab069288a..c1b7c86707a 100644
--- a/docs/data/histograms/Serbia/EL8723.json
+++ b/docs/data/histograms/Serbia/EL8723.json
@@ -1 +1 @@
-{"batchcode": "EL8723", "histograms": [{"batchcodes": ["EL8723"], "histogram": {"COVID-19": 1, "Pneumonia": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EL8723", "histograms": [{"histogram": {"COVID-19": 1, "Pneumonia": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Vaccination failure": 1}, "batchcodes": ["EL8723"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EN1194.json b/docs/data/histograms/Serbia/EN1194.json
index a169c64d92f..46a54bd2192 100644
--- a/docs/data/histograms/Serbia/EN1194.json
+++ b/docs/data/histograms/Serbia/EN1194.json
@@ -1 +1 @@
-{"batchcode": "EN1194", "histograms": [{"batchcodes": ["EN1194"], "histogram": {"Erythema": 3, "Syncope": 3, "Blood pressure measurement": 2, "Hypertension": 2, "Investigation": 2, "Asphyxia": 1, "Chest pain": 1, "Dizziness": 1, "Eyelid oedema": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nausea": 1, "Pallor": 1, "Paraesthesia": 1, "Pulmonary function test": 1, "Tremor": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1194", "histograms": [{"histogram": {"Erythema": 3, "Syncope": 3, "Blood pressure measurement": 2, "Hypertension": 2, "Investigation": 2, "Asphyxia": 1, "Chest pain": 1, "Dizziness": 1, "Eyelid oedema": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nausea": 1, "Pallor": 1, "Paraesthesia": 1, "Pulmonary function test": 1, "Tremor": 1, "Urticaria": 1}, "batchcodes": ["EN1194"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EN1195.json b/docs/data/histograms/Serbia/EN1195.json
index 44912be7088..3d756f36308 100644
--- a/docs/data/histograms/Serbia/EN1195.json
+++ b/docs/data/histograms/Serbia/EN1195.json
@@ -1 +1 @@
-{"batchcode": "EN1195", "histograms": [{"batchcodes": ["EN1195"], "histogram": {"COVID-19": 3, "Drug ineffective": 3, "SARS-CoV-2 test": 3, "Blood pressure measurement": 2, "Investigation": 2, "Pyrexia": 2, "Abscess": 1, "Ageusia": 1, "Anosmia": 1, "Anti-thyroid antibody": 1, "Autoimmune thyroiditis": 1, "Blood glucose": 1, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19 pneumonia": 1, "Cardiomyopathy": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dizziness": 1, "Erythema": 1, "Erythema nodosum": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Fine motor skill dysfunction": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Impaired work ability": 1, "Joint swelling": 1, "Laryngeal discomfort": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Malaise": 1, "Monoparesis": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Paraesthesia": 1, "Paraesthesia mucosal": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Pharyngotonsillitis": 1, "Pneumonia": 1, "SARS-CoV-2 test positive": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Skin infection": 1, "Skin mass": 1, "Somnolence": 1, "Swelling face": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1195", "histograms": [{"histogram": {"COVID-19": 3, "Drug ineffective": 3, "SARS-CoV-2 test": 3, "Blood pressure measurement": 2, "Investigation": 2, "Pyrexia": 2, "Abscess": 1, "Ageusia": 1, "Anosmia": 1, "Anti-thyroid antibody": 1, "Autoimmune thyroiditis": 1, "Blood glucose": 1, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19 pneumonia": 1, "Cardiomyopathy": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Dizziness": 1, "Erythema": 1, "Erythema nodosum": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Fine motor skill dysfunction": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Impaired work ability": 1, "Joint swelling": 1, "Laryngeal discomfort": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Malaise": 1, "Monoparesis": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Nodule": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Paraesthesia": 1, "Paraesthesia mucosal": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Pharyngotonsillitis": 1, "Pneumonia": 1, "SARS-CoV-2 test positive": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Skin infection": 1, "Skin mass": 1, "Somnolence": 1, "Swelling face": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Ventricular extrasystoles": 1, "Ventricular tachycardia": 1, "X-ray": 1}, "batchcodes": ["EN1195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/ER7449.json b/docs/data/histograms/Serbia/ER7449.json
index fa09485d92d..539a0b47fa2 100644
--- a/docs/data/histograms/Serbia/ER7449.json
+++ b/docs/data/histograms/Serbia/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Dyspnoea": 2, "Blood cholesterol": 1, "Blood triglycerides": 1, "Body temperature": 1, "COVID-19": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Fatigue": 1, "High density lipoprotein": 1, "Low density lipoprotein": 1, "Pain in extremity": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Somnolence": 1, "Tachycardia": 1, "Ultrasound scan": 1, "Urticaria": 1, "Ventricular extrasystoles": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Dyspnoea": 2, "Blood cholesterol": 1, "Blood triglycerides": 1, "Body temperature": 1, "COVID-19": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Fatigue": 1, "High density lipoprotein": 1, "Low density lipoprotein": 1, "Pain in extremity": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Somnolence": 1, "Tachycardia": 1, "Ultrasound scan": 1, "Urticaria": 1, "Ventricular extrasystoles": 1, "X-ray": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EW2243.json b/docs/data/histograms/Serbia/EW2243.json
index ec21f4fb603..485f6f0ad0b 100644
--- a/docs/data/histograms/Serbia/EW2243.json
+++ b/docs/data/histograms/Serbia/EW2243.json
@@ -1 +1 @@
-{"batchcode": "EW2243", "histograms": [{"batchcodes": ["EW2243"], "histogram": {"SARS-CoV-2 test": 8, "COVID-19": 7, "Drug ineffective": 6, "Circulatory collapse": 3, "Malaise": 3, "Ageusia": 2, "Anosmia": 2, "Asthenia": 2, "Blood glucose": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Fatigue": 2, "Loss of consciousness": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Pyrexia": 2, "Abdominal pain": 1, "Amenorrhoea": 1, "Blood glucose increased": 1, "Blood immunoglobulin M": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Body temperature increased": 1, "Chest pain": 1, "Communication disorder": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram ambulatory": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hepatic enzyme abnormal": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Iron deficiency": 1, "Laboratory test": 1, "Myalgia": 1, "Neurological examination": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pneumonia": 1, "Seizure": 1, "Somnolence": 1, "Syncope": 1, "Thrombosis": 1, "Thyroiditis": 1, "Tricuspid valve incompetence": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EW2243", "histograms": [{"histogram": {"SARS-CoV-2 test": 8, "COVID-19": 7, "Drug ineffective": 6, "Circulatory collapse": 3, "Malaise": 3, "Ageusia": 2, "Anosmia": 2, "Asthenia": 2, "Blood glucose": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Fatigue": 2, "Loss of consciousness": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Pyrexia": 2, "Abdominal pain": 1, "Amenorrhoea": 1, "Blood glucose increased": 1, "Blood immunoglobulin M": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Body temperature increased": 1, "Chest pain": 1, "Communication disorder": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram ambulatory": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Hepatic enzyme abnormal": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Iron deficiency": 1, "Laboratory test": 1, "Myalgia": 1, "Neurological examination": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pneumonia": 1, "Seizure": 1, "Somnolence": 1, "Syncope": 1, "Thrombosis": 1, "Thyroiditis": 1, "Tricuspid valve incompetence": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Vital signs measurement": 1}, "batchcodes": ["EW2243"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EX 7823.json b/docs/data/histograms/Serbia/EX 7823.json
index e4877557a8d..41755958922 100644
--- a/docs/data/histograms/Serbia/EX 7823.json
+++ b/docs/data/histograms/Serbia/EX 7823.json
@@ -1 +1 @@
-{"batchcode": "EX 7823", "histograms": [{"batchcodes": ["EX 7823"], "histogram": {"Blood glucose": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment elevation": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypotensive crisis": 1, "Investigation": 1, "Nausea": 1, "Oxygen saturation": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "EX 7823", "histograms": [{"histogram": {"Blood glucose": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment elevation": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypotensive crisis": 1, "Investigation": 1, "Nausea": 1, "Oxygen saturation": 1, "Pallor": 1}, "batchcodes": ["EX 7823"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/EX6537.json b/docs/data/histograms/Serbia/EX6537.json
index 7d026cc6e93..670f3cd3a94 100644
--- a/docs/data/histograms/Serbia/EX6537.json
+++ b/docs/data/histograms/Serbia/EX6537.json
@@ -1 +1 @@
-{"batchcode": "EX6537", "histograms": [{"batchcodes": ["EX6537"], "histogram": {"Blood pressure measurement": 2, "Dizziness": 2, "Headache": 2, "Nausea": 2, "Anaesthesia": 1, "Blood pressure fluctuation": 1, "Cerebral infarction": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling cold": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Paraesthesia": 1, "Syncope": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Visual field defect": 1}}]}
\ No newline at end of file
+{"batchcode": "EX6537", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Dizziness": 2, "Headache": 2, "Nausea": 2, "Anaesthesia": 1, "Blood pressure fluctuation": 1, "Cerebral infarction": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling cold": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Paraesthesia": 1, "Syncope": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Visual field defect": 1}, "batchcodes": ["EX6537"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FC 3143.json b/docs/data/histograms/Serbia/FC 3143.json
index f4cfb9c3181..5b15c081b14 100644
--- a/docs/data/histograms/Serbia/FC 3143.json
+++ b/docs/data/histograms/Serbia/FC 3143.json
@@ -1 +1 @@
-{"batchcode": "FC 3143", "histograms": [{"batchcodes": ["FC 3143"], "histogram": {"Loss of consciousness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FC 3143", "histograms": [{"histogram": {"Loss of consciousness": 1, "Pain in extremity": 1}, "batchcodes": ["FC 3143"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FC0681.json b/docs/data/histograms/Serbia/FC0681.json
index e6aa890362c..3721b92e20b 100644
--- a/docs/data/histograms/Serbia/FC0681.json
+++ b/docs/data/histograms/Serbia/FC0681.json
@@ -1 +1 @@
-{"batchcode": "FC0681", "histograms": [{"batchcodes": ["FC0681"], "histogram": {"Blood pressure measurement": 1, "Fall": 1, "Lip injury": 1, "Oxygen saturation": 1, "Syncope": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FC0681", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Fall": 1, "Lip injury": 1, "Oxygen saturation": 1, "Syncope": 1, "Urticaria": 1}, "batchcodes": ["FC0681"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FC3098.json b/docs/data/histograms/Serbia/FC3098.json
index edcd47050c8..e74407cab8f 100644
--- a/docs/data/histograms/Serbia/FC3098.json
+++ b/docs/data/histograms/Serbia/FC3098.json
@@ -1 +1 @@
-{"batchcode": "FC3098", "histograms": [{"batchcodes": ["FC3098"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Hypotension": 1, "Malaise": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3098", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Hypotension": 1, "Malaise": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["FC3098"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FC3143.json b/docs/data/histograms/Serbia/FC3143.json
index e064d24e3e6..61e504753e5 100644
--- a/docs/data/histograms/Serbia/FC3143.json
+++ b/docs/data/histograms/Serbia/FC3143.json
@@ -1 +1 @@
-{"batchcode": "FC3143", "histograms": [{"batchcodes": ["FC3143"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Incorrect route of product administration": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3143", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Incorrect route of product administration": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["FC3143"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FC5029.json b/docs/data/histograms/Serbia/FC5029.json
index 079ee9a78bc..e60089dbcfa 100644
--- a/docs/data/histograms/Serbia/FC5029.json
+++ b/docs/data/histograms/Serbia/FC5029.json
@@ -1 +1 @@
-{"batchcode": "FC5029", "histograms": [{"batchcodes": ["FC5029"], "histogram": {"Anxiety": 1, "Arrhythmia": 1, "Condition aggravated": 1, "Hypothyroidism": 1, "Muscle spasms": 1, "Neck pain": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5029", "histograms": [{"histogram": {"Anxiety": 1, "Arrhythmia": 1, "Condition aggravated": 1, "Hypothyroidism": 1, "Muscle spasms": 1, "Neck pain": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}, "batchcodes": ["FC5029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FE3064.json b/docs/data/histograms/Serbia/FE3064.json
index b3f2501ed44..ef4a95b20ef 100644
--- a/docs/data/histograms/Serbia/FE3064.json
+++ b/docs/data/histograms/Serbia/FE3064.json
@@ -1 +1 @@
-{"batchcode": "FE3064", "histograms": [{"batchcodes": ["FE3064"], "histogram": {"Balance disorder": 1, "Body temperature": 1, "Body temperature increased": 1, "Dizziness": 1, "Dyspnoea": 1, "Pruritus": 1, "Seizure": 1, "Urticaria": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3064", "histograms": [{"histogram": {"Balance disorder": 1, "Body temperature": 1, "Body temperature increased": 1, "Dizziness": 1, "Dyspnoea": 1, "Pruritus": 1, "Seizure": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["FE3064"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FE6029.json b/docs/data/histograms/Serbia/FE6029.json
index 79aedf9962f..4d62daaee7c 100644
--- a/docs/data/histograms/Serbia/FE6029.json
+++ b/docs/data/histograms/Serbia/FE6029.json
@@ -1 +1 @@
-{"batchcode": "FE6029", "histograms": [{"batchcodes": ["FE6029"], "histogram": {"Angioedema": 3, "Asphyxia": 3, "Immunisation": 3, "Off label use": 3, "Blood pressure measurement": 2, "Echocardiogram": 2, "Rash": 2, "Urticaria": 2, "Angina pectoris": 1, "Atrial septal defect": 1, "Blood bicarbonate": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood sodium": 1, "Chest pain": 1, "Circulatory collapse": 1, "Coagulation factor": 1, "Congenital haematological disorder": 1, "Coombs direct test": 1, "Diabetes mellitus management": 1, "Dizziness": 1, "Electrocardiogram": 1, "Erythema": 1, "Foetal monitoring": 1, "Foetal monitoring abnormal": 1, "Foetal movement disorder": 1, "Full blood count": 1, "Hydrops foetalis": 1, "Hypertension": 1, "Hypoalbuminaemia": 1, "Hypocalcaemia": 1, "Hyponatraemia": 1, "Hypoproteinaemia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Maternal exposure during pregnancy": 1, "Neonatal asphyxia": 1, "Neonatal respiratory distress syndrome": 1, "PCO2": 1, "Pericarditis": 1, "Pharyngeal oedema": 1, "Premature baby": 1, "Protein total": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Tongue oedema": 1, "Ultrasound scan": 1, "White blood cell count": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FE6029", "histograms": [{"histogram": {"Angioedema": 3, "Asphyxia": 3, "Immunisation": 3, "Off label use": 3, "Blood pressure measurement": 2, "Echocardiogram": 2, "Rash": 2, "Urticaria": 2, "Angina pectoris": 1, "Atrial septal defect": 1, "Blood bicarbonate": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood sodium": 1, "Chest pain": 1, "Circulatory collapse": 1, "Coagulation factor": 1, "Congenital haematological disorder": 1, "Coombs direct test": 1, "Diabetes mellitus management": 1, "Dizziness": 1, "Electrocardiogram": 1, "Erythema": 1, "Foetal monitoring": 1, "Foetal monitoring abnormal": 1, "Foetal movement disorder": 1, "Full blood count": 1, "Hydrops foetalis": 1, "Hypertension": 1, "Hypoalbuminaemia": 1, "Hypocalcaemia": 1, "Hyponatraemia": 1, "Hypoproteinaemia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Maternal exposure during pregnancy": 1, "Neonatal asphyxia": 1, "Neonatal respiratory distress syndrome": 1, "PCO2": 1, "Pericarditis": 1, "Pharyngeal oedema": 1, "Premature baby": 1, "Protein total": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Tongue oedema": 1, "Ultrasound scan": 1, "White blood cell count": 1, "pH body fluid": 1}, "batchcodes": ["FE6029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FF 2832.json b/docs/data/histograms/Serbia/FF 2832.json
index 70ed74e528a..6a6f0a1f5b1 100644
--- a/docs/data/histograms/Serbia/FF 2832.json
+++ b/docs/data/histograms/Serbia/FF 2832.json
@@ -1 +1 @@
-{"batchcode": "FF 2832", "histograms": [{"batchcodes": ["FF 2832"], "histogram": {"Blood pressure measurement": 1, "Diabetes mellitus management": 1, "Dyskinesia": 1, "Gaze palsy": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "FF 2832", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Diabetes mellitus management": 1, "Dyskinesia": 1, "Gaze palsy": 1, "Pallor": 1}, "batchcodes": ["FF 2832"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FF2832.json b/docs/data/histograms/Serbia/FF2832.json
index 6878b616df8..2a8376910f9 100644
--- a/docs/data/histograms/Serbia/FF2832.json
+++ b/docs/data/histograms/Serbia/FF2832.json
@@ -1 +1 @@
-{"batchcode": "FF2832", "histograms": [{"batchcodes": ["FF2832"], "histogram": {"Off label use": 4, "Pyrexia": 4, "Body temperature": 3, "Interchange of vaccine products": 3, "Vaccination site pain": 3, "Loss of consciousness": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Angiogram": 1, "Biopsy": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Contusion": 1, "Death": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Erythema": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Hallucination": 1, "Hypotension": 1, "Immunisation": 1, "Immunology test": 1, "Immunology test abnormal": 1, "Insomnia": 1, "Leukopenia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mydriasis": 1, "Oedema": 1, "Pain": 1, "Pharyngeal paraesthesia": 1, "Platelet count": 1, "Product use issue": 1, "Pruritus": 1, "Pulse absent": 1, "Rash papular": 1, "SARS-CoV-2 test": 1, "Scleroedema": 1, "Skin mass": 1, "Skin reaction": 1, "Splenomegaly": 1, "Suffocation feeling": 1, "Tachycardia": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site swelling": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2832", "histograms": [{"histogram": {"Off label use": 4, "Pyrexia": 4, "Body temperature": 3, "Interchange of vaccine products": 3, "Vaccination site pain": 3, "Loss of consciousness": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Angiogram": 1, "Biopsy": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Contusion": 1, "Death": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Erythema": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Hallucination": 1, "Hypotension": 1, "Immunisation": 1, "Immunology test": 1, "Immunology test abnormal": 1, "Insomnia": 1, "Leukopenia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mydriasis": 1, "Oedema": 1, "Pain": 1, "Pharyngeal paraesthesia": 1, "Platelet count": 1, "Product use issue": 1, "Pruritus": 1, "Pulse absent": 1, "Rash papular": 1, "SARS-CoV-2 test": 1, "Scleroedema": 1, "Skin mass": 1, "Skin reaction": 1, "Splenomegaly": 1, "Suffocation feeling": 1, "Tachycardia": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site oedema": 1, "Vaccination site swelling": 1, "White blood cell count": 1}, "batchcodes": ["FF2832"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FF8847.json b/docs/data/histograms/Serbia/FF8847.json
index b513e962a0d..0b6369f15bb 100644
--- a/docs/data/histograms/Serbia/FF8847.json
+++ b/docs/data/histograms/Serbia/FF8847.json
@@ -1 +1 @@
-{"batchcode": "FF8847", "histograms": [{"batchcodes": ["FF8847"], "histogram": {"Fatigue": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Loss of consciousness": 1, "Muscle contractions involuntary": 1, "Pain": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8847", "histograms": [{"histogram": {"Fatigue": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Loss of consciousness": 1, "Muscle contractions involuntary": 1, "Pain": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["FF8847"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FH9678.json b/docs/data/histograms/Serbia/FH9678.json
index e16f2df1cec..18aa7ea3509 100644
--- a/docs/data/histograms/Serbia/FH9678.json
+++ b/docs/data/histograms/Serbia/FH9678.json
@@ -1 +1 @@
-{"batchcode": "FH9678", "histograms": [{"batchcodes": ["FH9678"], "histogram": {"Pyrexia": 3, "Loss of consciousness": 2, "Nausea": 2, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Blood beta-D-glucan": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bundle branch block right": 1, "C-reactive protein": 1, "Chills": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST segment elevation": 1, "Fall": 1, "Fatigue": 1, "Granulocyte count": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Investigation": 1, "Lymphocyte count": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Pharyngeal erythema": 1, "SARS-CoV-2 antibody test": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FH9678", "histograms": [{"histogram": {"Pyrexia": 3, "Loss of consciousness": 2, "Nausea": 2, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Blood beta-D-glucan": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bundle branch block right": 1, "C-reactive protein": 1, "Chills": 1, "Electrocardiogram": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST segment elevation": 1, "Fall": 1, "Fatigue": 1, "Granulocyte count": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Investigation": 1, "Lymphocyte count": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Pharyngeal erythema": 1, "SARS-CoV-2 antibody test": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["FH9678"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Serbia/FJ5782.json b/docs/data/histograms/Serbia/FJ5782.json
index 28f51c3b28b..33313bcbb53 100644
--- a/docs/data/histograms/Serbia/FJ5782.json
+++ b/docs/data/histograms/Serbia/FJ5782.json
@@ -1 +1 @@
-{"batchcode": "FJ5782", "histograms": [{"batchcodes": ["FJ5782"], "histogram": {"Loss of consciousness": 2, "Dizziness": 1, "Hypotension": 1, "Nausea": 1, "Paralysis": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5782", "histograms": [{"histogram": {"Loss of consciousness": 2, "Dizziness": 1, "Hypotension": 1, "Nausea": 1, "Paralysis": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["FJ5782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/007B21A.json b/docs/data/histograms/Seychelles/007B21A.json
index 28752b01369..c01445b9cf6 100644
--- a/docs/data/histograms/Seychelles/007B21A.json
+++ b/docs/data/histograms/Seychelles/007B21A.json
@@ -1 +1 @@
-{"batchcode": "007B21A", "histograms": [{"batchcodes": ["007B21A"], "histogram": {"Pain in extremity": 1, "Peripheral swelling": 1, "Syncope": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "007B21A", "histograms": [{"histogram": {"Pain in extremity": 1, "Peripheral swelling": 1, "Syncope": 1, "Ultrasound scan": 1}, "batchcodes": ["007B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/013L20A.json b/docs/data/histograms/Seychelles/013L20A.json
index f3f92f1af29..584ec2c473c 100644
--- a/docs/data/histograms/Seychelles/013L20A.json
+++ b/docs/data/histograms/Seychelles/013L20A.json
@@ -1 +1 @@
-{"batchcode": "013L20A", "histograms": [{"batchcodes": ["013L20A"], "histogram": {"Blood pressure increased": 1, "Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Chest pain": 1}, "batchcodes": ["013L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/014C21A.json b/docs/data/histograms/Seychelles/014C21A.json
index 3e2d140e1bd..4c84c429b26 100644
--- a/docs/data/histograms/Seychelles/014C21A.json
+++ b/docs/data/histograms/Seychelles/014C21A.json
@@ -1 +1 @@
-{"batchcode": "014C21A", "histograms": [{"batchcodes": ["014C21A"], "histogram": {"Inappropriate schedule of product administration": 2, "Dyspnoea": 1, "Flushing": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Injection site erythema": 1, "Nausea": 1, "Paraesthesia oral": 1, "Pharyngeal paraesthesia": 1, "Pruritus": 1, "Swelling face": 1, "Tongue disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "014C21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2, "Dyspnoea": 1, "Flushing": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Injection site erythema": 1, "Nausea": 1, "Paraesthesia oral": 1, "Pharyngeal paraesthesia": 1, "Pruritus": 1, "Swelling face": 1, "Tongue disorder": 1}, "batchcodes": ["014C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/016J21-2A.json b/docs/data/histograms/Seychelles/016J21-2A.json
index 014322efcfc..19b76dcc6af 100644
--- a/docs/data/histograms/Seychelles/016J21-2A.json
+++ b/docs/data/histograms/Seychelles/016J21-2A.json
@@ -1 +1 @@
-{"batchcode": "016J21-2A", "histograms": [{"batchcodes": ["016J21-2A"], "histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "016J21-2A", "histograms": [{"histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["016J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/022M20A.json b/docs/data/histograms/Seychelles/022M20A.json
index 158508d3047..3c90a7d043a 100644
--- a/docs/data/histograms/Seychelles/022M20A.json
+++ b/docs/data/histograms/Seychelles/022M20A.json
@@ -1 +1 @@
-{"batchcode": "022M20A", "histograms": [{"batchcodes": ["022M20A"], "histogram": {"Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "022M20A", "histograms": [{"histogram": {"Incorrect dose administered": 1}, "batchcodes": ["022M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/025B21A.json b/docs/data/histograms/Seychelles/025B21A.json
index 67cd87bc7d9..6701d0faf1a 100644
--- a/docs/data/histograms/Seychelles/025B21A.json
+++ b/docs/data/histograms/Seychelles/025B21A.json
@@ -1 +1 @@
-{"batchcode": "025B21A", "histograms": [{"batchcodes": ["025B21A"], "histogram": {"Burning sensation": 1, "Dizziness": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "025B21A", "histograms": [{"histogram": {"Burning sensation": 1, "Dizziness": 1, "Pruritus": 1}, "batchcodes": ["025B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/025C21A.json b/docs/data/histograms/Seychelles/025C21A.json
index e7099d3114d..1a757238fd2 100644
--- a/docs/data/histograms/Seychelles/025C21A.json
+++ b/docs/data/histograms/Seychelles/025C21A.json
@@ -1 +1 @@
-{"batchcode": "025C21A", "histograms": [{"batchcodes": ["025C21A"], "histogram": {"Staring": 1, "Syringe issue": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "025C21A", "histograms": [{"histogram": {"Staring": 1, "Syringe issue": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["025C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/026A21A.json b/docs/data/histograms/Seychelles/026A21A.json
index 42ac03c51ed..99ee6706c0f 100644
--- a/docs/data/histograms/Seychelles/026A21A.json
+++ b/docs/data/histograms/Seychelles/026A21A.json
@@ -1 +1 @@
-{"batchcode": "026A21A", "histograms": [{"batchcodes": ["026A21A"], "histogram": {"Dizziness": 1, "Fall": 1}}]}
\ No newline at end of file
+{"batchcode": "026A21A", "histograms": [{"histogram": {"Dizziness": 1, "Fall": 1}, "batchcodes": ["026A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/027A21A.json b/docs/data/histograms/Seychelles/027A21A.json
index 16c14e551da..ab05d04642d 100644
--- a/docs/data/histograms/Seychelles/027A21A.json
+++ b/docs/data/histograms/Seychelles/027A21A.json
@@ -1 +1 @@
-{"batchcode": "027A21A", "histograms": [{"batchcodes": ["027A21A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["027A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/030H21B.json b/docs/data/histograms/Seychelles/030H21B.json
index bd8d0885355..57572c15e65 100644
--- a/docs/data/histograms/Seychelles/030H21B.json
+++ b/docs/data/histograms/Seychelles/030H21B.json
@@ -1 +1 @@
-{"batchcode": "030H21B", "histograms": [{"batchcodes": ["030H21B"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "030H21B", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["030H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/031B21A.json b/docs/data/histograms/Seychelles/031B21A.json
index b21b05e5b24..b7830a1ca5d 100644
--- a/docs/data/histograms/Seychelles/031B21A.json
+++ b/docs/data/histograms/Seychelles/031B21A.json
@@ -1 +1 @@
-{"batchcode": "031B21A", "histograms": [{"batchcodes": ["031B21A"], "histogram": {"Extra dose administered": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21A", "histograms": [{"histogram": {"Extra dose administered": 1, "Injection site pain": 1}, "batchcodes": ["031B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/031L20A.json b/docs/data/histograms/Seychelles/031L20A.json
index 8590dee4b4b..5e4c06ce1dc 100644
--- a/docs/data/histograms/Seychelles/031L20A.json
+++ b/docs/data/histograms/Seychelles/031L20A.json
@@ -1 +1 @@
-{"batchcode": "031L20A", "histograms": [{"batchcodes": ["031L20A"], "histogram": {"Dizziness": 1, "Hypoaesthesia": 1, "Injection site rash": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20A", "histograms": [{"histogram": {"Dizziness": 1, "Hypoaesthesia": 1, "Injection site rash": 1, "Paraesthesia": 1}, "batchcodes": ["031L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/0330C21A.json b/docs/data/histograms/Seychelles/0330C21A.json
index c68d429c260..8a5a996ce6b 100644
--- a/docs/data/histograms/Seychelles/0330C21A.json
+++ b/docs/data/histograms/Seychelles/0330C21A.json
@@ -1 +1 @@
-{"batchcode": "0330C21A", "histograms": [{"batchcodes": ["0330C21A"], "histogram": {"Extra dose administered": 4, "No adverse event": 4, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0330C21A", "histograms": [{"histogram": {"Extra dose administered": 4, "No adverse event": 4, "Pain in extremity": 1}, "batchcodes": ["0330C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/033C21A.json b/docs/data/histograms/Seychelles/033C21A.json
index 4f8b8802a3b..d012c82e26f 100644
--- a/docs/data/histograms/Seychelles/033C21A.json
+++ b/docs/data/histograms/Seychelles/033C21A.json
@@ -1 +1 @@
-{"batchcode": "033C21A", "histograms": [{"batchcodes": ["033C21A"], "histogram": {"Extra dose administered": 2, "No adverse event": 2}}]}
\ No newline at end of file
+{"batchcode": "033C21A", "histograms": [{"histogram": {"Extra dose administered": 2, "No adverse event": 2}, "batchcodes": ["033C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/035C21A.json b/docs/data/histograms/Seychelles/035C21A.json
index 801b9455a7a..50cc9cba4c8 100644
--- a/docs/data/histograms/Seychelles/035C21A.json
+++ b/docs/data/histograms/Seychelles/035C21A.json
@@ -1 +1 @@
-{"batchcode": "035C21A", "histograms": [{"batchcodes": ["035C21A"], "histogram": {"No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "035C21A", "histograms": [{"histogram": {"No adverse event": 1}, "batchcodes": ["035C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/037B21A.json b/docs/data/histograms/Seychelles/037B21A.json
index de24ee6eab1..9e5b20188ad 100644
--- a/docs/data/histograms/Seychelles/037B21A.json
+++ b/docs/data/histograms/Seychelles/037B21A.json
@@ -1 +1 @@
-{"batchcode": "037B21A", "histograms": [{"batchcodes": ["037B21A"], "histogram": {"Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "037B21A", "histograms": [{"histogram": {"Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["037B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/038B21A.json b/docs/data/histograms/Seychelles/038B21A.json
index 5b88084ff52..76cd11fd4e2 100644
--- a/docs/data/histograms/Seychelles/038B21A.json
+++ b/docs/data/histograms/Seychelles/038B21A.json
@@ -1 +1 @@
-{"batchcode": "038B21A", "histograms": [{"batchcodes": ["038B21A"], "histogram": {"Dizziness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "038B21A", "histograms": [{"histogram": {"Dizziness": 1, "Malaise": 1}, "batchcodes": ["038B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/039B21A.json b/docs/data/histograms/Seychelles/039B21A.json
index 33aa174343d..3d3dc20e68b 100644
--- a/docs/data/histograms/Seychelles/039B21A.json
+++ b/docs/data/histograms/Seychelles/039B21A.json
@@ -1 +1 @@
-{"batchcode": "039B21A", "histograms": [{"batchcodes": ["039B21A"], "histogram": {"Dizziness": 1, "Feeling hot": 1, "Nausea": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "039B21A", "histograms": [{"histogram": {"Dizziness": 1, "Feeling hot": 1, "Nausea": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["039B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/041C21A.json b/docs/data/histograms/Seychelles/041C21A.json
index cdda0b52e34..60688bb860e 100644
--- a/docs/data/histograms/Seychelles/041C21A.json
+++ b/docs/data/histograms/Seychelles/041C21A.json
@@ -1 +1 @@
-{"batchcode": "041C21A", "histograms": [{"batchcodes": ["041C21A"], "histogram": {"Extra dose administered": 2, "No adverse event": 2}}]}
\ No newline at end of file
+{"batchcode": "041C21A", "histograms": [{"histogram": {"Extra dose administered": 2, "No adverse event": 2}, "batchcodes": ["041C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/047A21A.json b/docs/data/histograms/Seychelles/047A21A.json
index 178398b1a09..cefa47cd73c 100644
--- a/docs/data/histograms/Seychelles/047A21A.json
+++ b/docs/data/histograms/Seychelles/047A21A.json
@@ -1 +1 @@
-{"batchcode": "047A21A", "histograms": [{"batchcodes": ["047A21A"], "histogram": {"Oral mucosal erythema": 1, "Pharyngeal erythema": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "047A21A", "histograms": [{"histogram": {"Oral mucosal erythema": 1, "Pharyngeal erythema": 1, "Throat irritation": 1}, "batchcodes": ["047A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/048A21A.json b/docs/data/histograms/Seychelles/048A21A.json
index 31f60d69397..49aad7d9dfb 100644
--- a/docs/data/histograms/Seychelles/048A21A.json
+++ b/docs/data/histograms/Seychelles/048A21A.json
@@ -1 +1 @@
-{"batchcode": "048A21A", "histograms": [{"batchcodes": ["048A21A"], "histogram": {"Product administered to patient of inappropriate age": 2, "Malaise": 1, "Pyrexia": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "048A21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 2, "Malaise": 1, "Pyrexia": 1, "Swelling face": 1}, "batchcodes": ["048A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/048B21A.json b/docs/data/histograms/Seychelles/048B21A.json
index cd63b1ebac4..c34eb0583ec 100644
--- a/docs/data/histograms/Seychelles/048B21A.json
+++ b/docs/data/histograms/Seychelles/048B21A.json
@@ -1 +1 @@
-{"batchcode": "048B21A", "histograms": [{"batchcodes": ["048B21A"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "048B21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["048B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/049L21A.json b/docs/data/histograms/Seychelles/049L21A.json
index fc6af47d0a9..1e47a840199 100644
--- a/docs/data/histograms/Seychelles/049L21A.json
+++ b/docs/data/histograms/Seychelles/049L21A.json
@@ -1 +1 @@
-{"batchcode": "049L21A", "histograms": [{"batchcodes": ["049L21A"], "histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "049L21A", "histograms": [{"histogram": {"No adverse event": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["049L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/060H21A.json b/docs/data/histograms/Seychelles/060H21A.json
index 7e14f31679a..350c3fe218c 100644
--- a/docs/data/histograms/Seychelles/060H21A.json
+++ b/docs/data/histograms/Seychelles/060H21A.json
@@ -1 +1 @@
-{"batchcode": "060H21A", "histograms": [{"batchcodes": ["060H21A"], "histogram": {"Product storage error": 2}}]}
\ No newline at end of file
+{"batchcode": "060H21A", "histograms": [{"histogram": {"Product storage error": 2}, "batchcodes": ["060H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/1822811.json b/docs/data/histograms/Seychelles/1822811.json
index 579ea880899..b62de25364a 100644
--- a/docs/data/histograms/Seychelles/1822811.json
+++ b/docs/data/histograms/Seychelles/1822811.json
@@ -1 +1 @@
-{"batchcode": "1822811", "histograms": [{"batchcodes": ["1822811"], "histogram": {"Hyperhidrosis": 2, "Dizziness": 1, "Nausea": 1, "Nervousness": 1}}]}
\ No newline at end of file
+{"batchcode": "1822811", "histograms": [{"histogram": {"Hyperhidrosis": 2, "Dizziness": 1, "Nausea": 1, "Nervousness": 1}, "batchcodes": ["1822811"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/202A214.json b/docs/data/histograms/Seychelles/202A214.json
index c5262387cdb..25c0f9dc0a4 100644
--- a/docs/data/histograms/Seychelles/202A214.json
+++ b/docs/data/histograms/Seychelles/202A214.json
@@ -1 +1 @@
-{"batchcode": "202A214", "histograms": [{"batchcodes": ["202A214"], "histogram": {"Extra dose administered": 1, "Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "202A214", "histograms": [{"histogram": {"Extra dose administered": 1, "Interchange of vaccine products": 1}, "batchcodes": ["202A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/202A21A.json b/docs/data/histograms/Seychelles/202A21A.json
index 8256c027366..92b90a611d6 100644
--- a/docs/data/histograms/Seychelles/202A21A.json
+++ b/docs/data/histograms/Seychelles/202A21A.json
@@ -1 +1 @@
-{"batchcode": "202A21A", "histograms": [{"batchcodes": ["202A21A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "202A21A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["202A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/211A21A.json b/docs/data/histograms/Seychelles/211A21A.json
index 6e3d2382ddc..0b9543311e7 100644
--- a/docs/data/histograms/Seychelles/211A21A.json
+++ b/docs/data/histograms/Seychelles/211A21A.json
@@ -1 +1 @@
-{"batchcode": "211A21A", "histograms": [{"batchcodes": ["211A21A"], "histogram": {"Blood pressure decreased": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "211A21A", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Rash": 1}, "batchcodes": ["211A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/32030BP.json b/docs/data/histograms/Seychelles/32030BP.json
index f5c040ac867..58f07c46508 100644
--- a/docs/data/histograms/Seychelles/32030BP.json
+++ b/docs/data/histograms/Seychelles/32030BP.json
@@ -1 +1 @@
-{"batchcode": "32030BP", "histograms": [{"batchcodes": ["32030BP"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "32030BP", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["32030BP"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/33130BA.json b/docs/data/histograms/Seychelles/33130BA.json
index e33a87f4b31..59a2e08781f 100644
--- a/docs/data/histograms/Seychelles/33130BA.json
+++ b/docs/data/histograms/Seychelles/33130BA.json
@@ -1 +1 @@
-{"batchcode": "33130BA", "histograms": [{"batchcodes": ["33130BA"], "histogram": {"Feeling hot": 1, "Hypotension": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "33130BA", "histograms": [{"histogram": {"Feeling hot": 1, "Hypotension": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["33130BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/4302MF023.json b/docs/data/histograms/Seychelles/4302MF023.json
index e4a5a2fcf1c..86474bb0980 100644
--- a/docs/data/histograms/Seychelles/4302MF023.json
+++ b/docs/data/histograms/Seychelles/4302MF023.json
@@ -1 +1 @@
-{"batchcode": "4302MF023", "histograms": [{"batchcodes": ["4302MF023"], "histogram": {"Heart rate increased": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "4302MF023", "histograms": [{"histogram": {"Heart rate increased": 1, "Palpitations": 1}, "batchcodes": ["4302MF023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/939906.json b/docs/data/histograms/Seychelles/939906.json
index 273d414b878..240ace7ea4a 100644
--- a/docs/data/histograms/Seychelles/939906.json
+++ b/docs/data/histograms/Seychelles/939906.json
@@ -1 +1 @@
-{"batchcode": "939906", "histograms": [{"batchcodes": ["939906"], "histogram": {"Cardiac failure congestive": 1, "Condition aggravated": 1, "Death": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "939906", "histograms": [{"histogram": {"Cardiac failure congestive": 1, "Condition aggravated": 1, "Death": 1, "Dyspnoea": 1}, "batchcodes": ["939906"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/EW0170.json b/docs/data/histograms/Seychelles/EW0170.json
index 7bfadde4936..d16a4e21aa6 100644
--- a/docs/data/histograms/Seychelles/EW0170.json
+++ b/docs/data/histograms/Seychelles/EW0170.json
@@ -1 +1 @@
-{"batchcode": "EW0170", "histograms": [{"batchcodes": ["EW0170"], "histogram": {"Extra dose administered": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "No adverse event": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0170", "histograms": [{"histogram": {"Extra dose administered": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "No adverse event": 1, "Pain in extremity": 1}, "batchcodes": ["EW0170"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/FG3527.json b/docs/data/histograms/Seychelles/FG3527.json
index f3fc446c9a0..1bb99cd5c1f 100644
--- a/docs/data/histograms/Seychelles/FG3527.json
+++ b/docs/data/histograms/Seychelles/FG3527.json
@@ -1 +1 @@
-{"batchcode": "FG3527", "histograms": [{"batchcodes": ["FG3527"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "FG3527", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["FG3527"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/FH8028.json b/docs/data/histograms/Seychelles/FH8028.json
index 67eb1a78de7..7eaffbad605 100644
--- a/docs/data/histograms/Seychelles/FH8028.json
+++ b/docs/data/histograms/Seychelles/FH8028.json
@@ -1 +1 @@
-{"batchcode": "FH8028", "histograms": [{"batchcodes": ["FH8028"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8028", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}, "batchcodes": ["FH8028"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/FJ8762.json b/docs/data/histograms/Seychelles/FJ8762.json
index f10225f56e0..816ee9202ce 100644
--- a/docs/data/histograms/Seychelles/FJ8762.json
+++ b/docs/data/histograms/Seychelles/FJ8762.json
@@ -1 +1 @@
-{"batchcode": "FJ8762", "histograms": [{"batchcodes": ["FJ8762"], "histogram": {"Product administered to patient of inappropriate age": 2, "Cardiac flutter": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8762", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 2, "Cardiac flutter": 1}, "batchcodes": ["FJ8762"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/FK5127.json b/docs/data/histograms/Seychelles/FK5127.json
index 177f0e6055b..7b6c92a2a56 100644
--- a/docs/data/histograms/Seychelles/FK5127.json
+++ b/docs/data/histograms/Seychelles/FK5127.json
@@ -1 +1 @@
-{"batchcode": "FK5127", "histograms": [{"batchcodes": ["FK5127"], "histogram": {"Incorrect dose administered": 1, "Neck pain": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "FK5127", "histograms": [{"histogram": {"Incorrect dose administered": 1, "Neck pain": 1, "Underdose": 1}, "batchcodes": ["FK5127"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/FK9895.json b/docs/data/histograms/Seychelles/FK9895.json
index 7e623fa880f..a1aa90fbbaf 100644
--- a/docs/data/histograms/Seychelles/FK9895.json
+++ b/docs/data/histograms/Seychelles/FK9895.json
@@ -1 +1 @@
-{"batchcode": "FK9895", "histograms": [{"batchcodes": ["FK9895"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9895", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["FK9895"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/FN2908.json b/docs/data/histograms/Seychelles/FN2908.json
index ca24c910a41..2c736230a0e 100644
--- a/docs/data/histograms/Seychelles/FN2908.json
+++ b/docs/data/histograms/Seychelles/FN2908.json
@@ -1 +1 @@
-{"batchcode": "FN2908", "histograms": [{"batchcodes": ["FN2908"], "histogram": {"Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FN2908", "histograms": [{"histogram": {"Incorrect dose administered": 1}, "batchcodes": ["FN2908"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Seychelles/FT9142.json b/docs/data/histograms/Seychelles/FT9142.json
index 1c284942cc3..6fcb2cc84ef 100644
--- a/docs/data/histograms/Seychelles/FT9142.json
+++ b/docs/data/histograms/Seychelles/FT9142.json
@@ -1 +1 @@
-{"batchcode": "FT9142", "histograms": [{"batchcodes": ["FT9142"], "histogram": {"Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Incorrect product formulation administered": 1}}]}
\ No newline at end of file
+{"batchcode": "FT9142", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Incorrect product formulation administered": 1}, "batchcodes": ["FT9142"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Sierra Leone/027B21A.json b/docs/data/histograms/Sierra Leone/027B21A.json
index 383852d7142..2270fd3037c 100644
--- a/docs/data/histograms/Sierra Leone/027B21A.json
+++ b/docs/data/histograms/Sierra Leone/027B21A.json
@@ -1 +1 @@
-{"batchcode": "027B21A", "histograms": [{"batchcodes": ["027B21A"], "histogram": {"Chills": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "027B21A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["027B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/000029A.json b/docs/data/histograms/Singapore/000029A.json
index 09550f90295..2a09e9c099b 100644
--- a/docs/data/histograms/Singapore/000029A.json
+++ b/docs/data/histograms/Singapore/000029A.json
@@ -1 +1 @@
-{"batchcode": "000029A", "histograms": [{"batchcodes": ["000029A", "EN1196"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["000029A", "FF2154"], "histogram": {"COVID-19": 2, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "000029A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["000029A", "EN1196"]}, {"histogram": {"COVID-19": 2, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["000029A", "FF2154"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/1C005A.json b/docs/data/histograms/Singapore/1C005A.json
index d2d5096a699..645a999359d 100644
--- a/docs/data/histograms/Singapore/1C005A.json
+++ b/docs/data/histograms/Singapore/1C005A.json
@@ -1 +1 @@
-{"batchcode": "1C005A", "histograms": [{"batchcodes": ["1C005A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "1C005A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["1C005A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/1E002A.json b/docs/data/histograms/Singapore/1E002A.json
index 6e8a4f9e8c4..58c56e7bf93 100644
--- a/docs/data/histograms/Singapore/1E002A.json
+++ b/docs/data/histograms/Singapore/1E002A.json
@@ -1 +1 @@
-{"batchcode": "1E002A", "histograms": [{"batchcodes": ["1E002A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "1E002A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["1E002A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/1E022A.json b/docs/data/histograms/Singapore/1E022A.json
index 6b5ad3831c9..99cacd2839f 100644
--- a/docs/data/histograms/Singapore/1E022A.json
+++ b/docs/data/histograms/Singapore/1E022A.json
@@ -1 +1 @@
-{"batchcode": "1E022A", "histograms": [{"batchcodes": ["1E022A", "3005792"], "histogram": {"COVID-19": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["1E022A"], "histogram": {"COVID-19": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 4, "Oropharyngeal pain": 2, "Arrhythmia": 1, "Cough": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Electrocardiogram": 1, "Electrocardiogram QT prolonged": 1, "Electrocardiogram low voltage": 1, "Feeling cold": 1, "Headache": 1, "Palpitations": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sinus tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "1E022A", "histograms": [{"histogram": {"COVID-19": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["1E022A", "3005792"]}, {"histogram": {"COVID-19": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 4, "Oropharyngeal pain": 2, "Arrhythmia": 1, "Cough": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Electrocardiogram": 1, "Electrocardiogram QT prolonged": 1, "Electrocardiogram low voltage": 1, "Feeling cold": 1, "Headache": 1, "Palpitations": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sinus tachycardia": 1}, "batchcodes": ["1E022A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/200057A.json b/docs/data/histograms/Singapore/200057A.json
index a441cac36c0..9d53db11b64 100644
--- a/docs/data/histograms/Singapore/200057A.json
+++ b/docs/data/histograms/Singapore/200057A.json
@@ -1 +1 @@
-{"batchcode": "200057A", "histograms": [{"batchcodes": ["200057A", "FK8892"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "200057A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["200057A", "FK8892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/3002336.json b/docs/data/histograms/Singapore/3002336.json
index 14ae7ade3cc..bd4fe05e05a 100644
--- a/docs/data/histograms/Singapore/3002336.json
+++ b/docs/data/histograms/Singapore/3002336.json
@@ -1 +1 @@
-{"batchcode": "3002336", "histograms": [{"batchcodes": ["3002336"], "histogram": {"Blood test": 1, "Body temperature": 1, "Bruxism": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Eye movement disorder": 1, "Feeling hot": 1, "Inappropriate schedule of product administration": 1, "Low density lipoprotein": 1, "Postictal state": 1, "Pulmonary embolism": 1, "Seizure": 1, "Syncope": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "3002336", "histograms": [{"histogram": {"Blood test": 1, "Body temperature": 1, "Bruxism": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Eye movement disorder": 1, "Feeling hot": 1, "Inappropriate schedule of product administration": 1, "Low density lipoprotein": 1, "Postictal state": 1, "Pulmonary embolism": 1, "Seizure": 1, "Syncope": 1, "Thrombocytopenia": 1}, "batchcodes": ["3002336"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/3005686.json b/docs/data/histograms/Singapore/3005686.json
index 384823fe7c7..d4614cb3961 100644
--- a/docs/data/histograms/Singapore/3005686.json
+++ b/docs/data/histograms/Singapore/3005686.json
@@ -1 +1 @@
-{"batchcode": "3005686", "histograms": [{"batchcodes": ["3005686"], "histogram": {"Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Antinuclear antibody": 1, "Arachnoid cyst": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood smear test": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Coagulation factor": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Discomfort": 1, "Double stranded DNA antibody": 1, "Eosinophil count": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head discomfort": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Ophthalmological examination": 1, "Platelet count": 1, "Protein total": 1, "Prothrombin time": 1, "Pupillary light reflex tests": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "Somnolence": 1, "Thyroxine free": 1, "Treponema test": 1, "Vitamin B12": 1, "Vitamin B12 deficiency": 1, "Vitamin D": 1, "Vitamin D deficiency": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005686", "histograms": [{"histogram": {"Activated partial thromboplastin time": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Antinuclear antibody": 1, "Arachnoid cyst": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood glucose": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood smear test": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Coagulation factor": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Discomfort": 1, "Double stranded DNA antibody": 1, "Eosinophil count": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Head discomfort": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Ophthalmological examination": 1, "Platelet count": 1, "Protein total": 1, "Prothrombin time": 1, "Pupillary light reflex tests": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Rheumatoid factor": 1, "Somnolence": 1, "Thyroxine free": 1, "Treponema test": 1, "Vitamin B12": 1, "Vitamin B12 deficiency": 1, "Vitamin D": 1, "Vitamin D deficiency": 1, "White blood cell count": 1}, "batchcodes": ["3005686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/3005792.json b/docs/data/histograms/Singapore/3005792.json
index 4c0d88a3877..6e32835bce6 100644
--- a/docs/data/histograms/Singapore/3005792.json
+++ b/docs/data/histograms/Singapore/3005792.json
@@ -1 +1 @@
-{"batchcode": "3005792", "histograms": [{"batchcodes": ["1E022A", "3005792"], "histogram": {"COVID-19": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["3005792", "EN1196"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "3005792", "histograms": [{"histogram": {"COVID-19": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["1E022A", "3005792"]}, {"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["3005792", "EN1196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/9404638.json b/docs/data/histograms/Singapore/9404638.json
index 85611e1bf4b..2f88a01aec3 100644
--- a/docs/data/histograms/Singapore/9404638.json
+++ b/docs/data/histograms/Singapore/9404638.json
@@ -1 +1 @@
-{"batchcode": "9404638", "histograms": [{"batchcodes": ["9404638"], "histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "9404638", "histograms": [{"histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["9404638"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/EJ3002.json b/docs/data/histograms/Singapore/EJ3002.json
index 1e4df4871af..bf4e9e66307 100644
--- a/docs/data/histograms/Singapore/EJ3002.json
+++ b/docs/data/histograms/Singapore/EJ3002.json
@@ -1 +1 @@
-{"batchcode": "EJ3002", "histograms": [{"batchcodes": ["EJ3002"], "histogram": {"Anaphylactic reaction": 1, "COVID-19": 1, "Cellulitis": 1, "Confusional state": 1, "Dermatitis bullous": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Enlarged uvula": 1, "Fall": 1, "Generalised tonic-clonic seizure": 1, "IIIrd nerve paralysis": 1, "Oropharyngeal pain": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Tryptase": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ3002", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "COVID-19": 1, "Cellulitis": 1, "Confusional state": 1, "Dermatitis bullous": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Enlarged uvula": 1, "Fall": 1, "Generalised tonic-clonic seizure": 1, "IIIrd nerve paralysis": 1, "Oropharyngeal pain": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sensation of foreign body": 1, "Tryptase": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["EJ3002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/EK4237.json b/docs/data/histograms/Singapore/EK4237.json
index ea74b4f0932..a58685f8dba 100644
--- a/docs/data/histograms/Singapore/EK4237.json
+++ b/docs/data/histograms/Singapore/EK4237.json
@@ -1 +1 @@
-{"batchcode": "EK4237", "histograms": [{"batchcodes": ["EK4237"], "histogram": {"Blood pressure measurement": 7, "Dizziness": 7, "Heart rate": 6, "Oxygen saturation": 4, "Palpitations": 4, "Respiratory rate": 4, "Body temperature": 3, "Chest discomfort": 3, "Chills": 3, "Hypertension": 3, "Hypoaesthesia": 3, "Hypotension": 3, "Investigation": 3, "Tachycardia": 3, "Tryptase": 3, "Urticaria": 3, "Blood pressure increased": 2, "Computerised tomogram head": 2, "Dysphagia": 2, "Dysphonia": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Flushing": 2, "Magnetic resonance imaging head": 2, "Nausea": 2, "Seizure": 2, "Syncope": 2, "Throat tightness": 2, "Vital signs measurement": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Blood glucose": 1, "Blood pressure systolic increased": 1, "Blood test": 1, "Body temperature increased": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Decreased appetite": 1, "Dehydration": 1, "Dry eye": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysstasia": 1, "Electroencephalogram": 1, "Erythema": 1, "Eye disorder": 1, "Eye movement disorder": 1, "Fall": 1, "Full blood count": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haematocrit increased": 1, "Haemoglobin": 1, "Haemoglobin increased": 1, "Headache": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyperthyroidism": 1, "Lacrimation increased": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myocardial necrosis marker": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Oropharyngeal pain": 1, "PO2": 1, "Pain": 1, "Pain in extremity": 1, "Palatal oedema": 1, "Periorbital swelling": 1, "Petit mal epilepsy": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pruritus": 1, "Pupillary light reflex tests abnormal": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate decreased": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Sinus tachycardia": 1, "Swollen tongue": 1, "Throat irritation": 1, "Tonic clonic movements": 1, "Toxic neuropathy": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vestibular neuronitis": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4237", "histograms": [{"histogram": {"Blood pressure measurement": 7, "Dizziness": 7, "Heart rate": 6, "Oxygen saturation": 4, "Palpitations": 4, "Respiratory rate": 4, "Body temperature": 3, "Chest discomfort": 3, "Chills": 3, "Hypertension": 3, "Hypoaesthesia": 3, "Hypotension": 3, "Investigation": 3, "Tachycardia": 3, "Tryptase": 3, "Urticaria": 3, "Blood pressure increased": 2, "Computerised tomogram head": 2, "Dysphagia": 2, "Dysphonia": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Flushing": 2, "Magnetic resonance imaging head": 2, "Nausea": 2, "Seizure": 2, "Syncope": 2, "Throat tightness": 2, "Vital signs measurement": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Blood glucose": 1, "Blood pressure systolic increased": 1, "Blood test": 1, "Body temperature increased": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Decreased appetite": 1, "Dehydration": 1, "Dry eye": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysstasia": 1, "Electroencephalogram": 1, "Erythema": 1, "Eye disorder": 1, "Eye movement disorder": 1, "Fall": 1, "Full blood count": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haematocrit increased": 1, "Haemoglobin": 1, "Haemoglobin increased": 1, "Headache": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyperthyroidism": 1, "Lacrimation increased": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myocardial necrosis marker": 1, "Neck pain": 1, "Nerve conduction studies": 1, "Oropharyngeal pain": 1, "PO2": 1, "Pain": 1, "Pain in extremity": 1, "Palatal oedema": 1, "Periorbital swelling": 1, "Petit mal epilepsy": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pruritus": 1, "Pupillary light reflex tests abnormal": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate decreased": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Sinus tachycardia": 1, "Swollen tongue": 1, "Throat irritation": 1, "Tonic clonic movements": 1, "Toxic neuropathy": 1, "Unresponsive to stimuli": 1, "Urine analysis": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vestibular neuronitis": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["EK4237"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/EK4245.json b/docs/data/histograms/Singapore/EK4245.json
index 843f1eedbb0..b889766f038 100644
--- a/docs/data/histograms/Singapore/EK4245.json
+++ b/docs/data/histograms/Singapore/EK4245.json
@@ -1 +1 @@
-{"batchcode": "EK4245", "histograms": [{"batchcodes": ["EK4245"], "histogram": {"Anaphylactic reaction": 6, "Dyspnoea": 6, "Throat tightness": 4, "Blood pressure measurement": 3, "Heart rate": 3, "Oxygen saturation": 3, "Palpitations": 3, "Rash": 3, "Chest discomfort": 2, "Dizziness": 2, "Dysphonia": 2, "Hypotension": 2, "Nausea": 2, "Urticaria": 2, "Vomiting": 2, "Abdominal pain": 1, "Angioedema": 1, "Bell's palsy": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body mass index": 1, "Complement factor C3": 1, "Complement factor C3 increased": 1, "Cough": 1, "Deafness neurosensory": 1, "Drooling": 1, "Dyskinesia": 1, "Ectopic pregnancy": 1, "Enlarged uvula": 1, "Eosinophil count": 1, "Eye movement disorder": 1, "Eye swelling": 1, "Facial asymmetry": 1, "Facial paralysis": 1, "Femoral neck fracture": 1, "Flushing": 1, "Hypoaesthesia": 1, "Laryngeal oedema": 1, "Magnetic resonance imaging head": 1, "Migraine": 1, "Odynophagia": 1, "Palatal oedema": 1, "Periorbital swelling": 1, "Protein albumin ratio": 1, "Pruritus": 1, "Rash maculo-papular": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Tongue biting": 1, "Troponin increased": 1, "Tryptase": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4245", "histograms": [{"histogram": {"Anaphylactic reaction": 6, "Dyspnoea": 6, "Throat tightness": 4, "Blood pressure measurement": 3, "Heart rate": 3, "Oxygen saturation": 3, "Palpitations": 3, "Rash": 3, "Chest discomfort": 2, "Dizziness": 2, "Dysphonia": 2, "Hypotension": 2, "Nausea": 2, "Urticaria": 2, "Vomiting": 2, "Abdominal pain": 1, "Angioedema": 1, "Bell's palsy": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body mass index": 1, "Complement factor C3": 1, "Complement factor C3 increased": 1, "Cough": 1, "Deafness neurosensory": 1, "Drooling": 1, "Dyskinesia": 1, "Ectopic pregnancy": 1, "Enlarged uvula": 1, "Eosinophil count": 1, "Eye movement disorder": 1, "Eye swelling": 1, "Facial asymmetry": 1, "Facial paralysis": 1, "Femoral neck fracture": 1, "Flushing": 1, "Hypoaesthesia": 1, "Laryngeal oedema": 1, "Magnetic resonance imaging head": 1, "Migraine": 1, "Odynophagia": 1, "Palatal oedema": 1, "Periorbital swelling": 1, "Protein albumin ratio": 1, "Pruritus": 1, "Rash maculo-papular": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Tongue biting": 1, "Troponin increased": 1, "Tryptase": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vital signs measurement": 1}, "batchcodes": ["EK4245"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/EL0200.json b/docs/data/histograms/Singapore/EL0200.json
index a3e6fbf4c85..d32ae790228 100644
--- a/docs/data/histograms/Singapore/EL0200.json
+++ b/docs/data/histograms/Singapore/EL0200.json
@@ -1 +1 @@
-{"batchcode": "EL0200", "histograms": [{"batchcodes": ["EL0200"], "histogram": {"Cardiac failure": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0200", "histograms": [{"histogram": {"Cardiac failure": 1, "Dyspnoea": 1}, "batchcodes": ["EL0200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/EN1196.json b/docs/data/histograms/Singapore/EN1196.json
index a0da04aa966..4e0f956bfc6 100644
--- a/docs/data/histograms/Singapore/EN1196.json
+++ b/docs/data/histograms/Singapore/EN1196.json
@@ -1 +1 @@
-{"batchcode": "EN1196", "histograms": [{"batchcodes": ["000029A", "EN1196"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["3005792", "EN1196"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["EN1196"], "histogram": {"COVID-19": 36, "SARS-CoV-2 test": 35, "Vaccination failure": 31, "Drug ineffective": 8, "Cough": 4, "Oropharyngeal pain": 3, "Suspected COVID-19": 3, "Rhinorrhoea": 2, "Asymptomatic COVID-19": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Incorrect route of product administration": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Myalgia": 1, "Off label use": 1, "Pain": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1196", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["000029A", "EN1196"]}, {"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["3005792", "EN1196"]}, {"histogram": {"COVID-19": 36, "SARS-CoV-2 test": 35, "Vaccination failure": 31, "Drug ineffective": 8, "Cough": 4, "Oropharyngeal pain": 3, "Suspected COVID-19": 3, "Rhinorrhoea": 2, "Asymptomatic COVID-19": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Incorrect route of product administration": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Myalgia": 1, "Off label use": 1, "Pain": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["EN1196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/EP6775.json b/docs/data/histograms/Singapore/EP6775.json
index 29686603371..d45ef90d011 100644
--- a/docs/data/histograms/Singapore/EP6775.json
+++ b/docs/data/histograms/Singapore/EP6775.json
@@ -1 +1 @@
-{"batchcode": "EP6775", "histograms": [{"batchcodes": ["EP6775"], "histogram": {"Anaphylactic reaction": 1, "Angiogram": 1, "Computerised tomogram head": 1, "Diplopia": 1, "Dizziness": 1, "Glycosylated haemoglobin": 1, "Haemodynamic test": 1, "IVth nerve paralysis": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Optic neuritis": 1, "Oxygen saturation": 1, "Pituitary tumour": 1, "Rash macular": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EP6775", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Angiogram": 1, "Computerised tomogram head": 1, "Diplopia": 1, "Dizziness": 1, "Glycosylated haemoglobin": 1, "Haemodynamic test": 1, "IVth nerve paralysis": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Optic neuritis": 1, "Oxygen saturation": 1, "Pituitary tumour": 1, "Rash macular": 1, "Vision blurred": 1}, "batchcodes": ["EP6775"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/ER0866.json b/docs/data/histograms/Singapore/ER0866.json
index bbf9349e107..4b2eae2d06d 100644
--- a/docs/data/histograms/Singapore/ER0866.json
+++ b/docs/data/histograms/Singapore/ER0866.json
@@ -1 +1 @@
-{"batchcode": "ER0866", "histograms": [{"batchcodes": ["ER0866"], "histogram": {"Rash": 3, "Anaphylactic reaction": 2, "Oxygen saturation": 2, "Wheezing": 2, "Angiogram": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Antinuclear antibody": 1, "Breath sounds abnormal": 1, "Cough": 1, "Cranial nerve disorder": 1, "Glycosylated haemoglobin": 1, "IIIrd nerve paralysis": 1, "Magnetic resonance imaging head": 1, "Oxygen saturation decreased": 1, "Pneumonia aspiration": 1, "Pruritus": 1, "Skin abrasion": 1, "Somnolence": 1, "Tic": 1, "Tonic convulsion": 1, "Vaccination site rash": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "ER0866", "histograms": [{"histogram": {"Rash": 3, "Anaphylactic reaction": 2, "Oxygen saturation": 2, "Wheezing": 2, "Angiogram": 1, "Antineutrophil cytoplasmic antibody": 1, "Antineutrophil cytoplasmic antibody positive": 1, "Antinuclear antibody": 1, "Breath sounds abnormal": 1, "Cough": 1, "Cranial nerve disorder": 1, "Glycosylated haemoglobin": 1, "IIIrd nerve paralysis": 1, "Magnetic resonance imaging head": 1, "Oxygen saturation decreased": 1, "Pneumonia aspiration": 1, "Pruritus": 1, "Skin abrasion": 1, "Somnolence": 1, "Tic": 1, "Tonic convulsion": 1, "Vaccination site rash": 1, "Vital signs measurement": 1}, "batchcodes": ["ER0866"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/ER6166.json b/docs/data/histograms/Singapore/ER6166.json
index 16cf18fd726..d36239df2d9 100644
--- a/docs/data/histograms/Singapore/ER6166.json
+++ b/docs/data/histograms/Singapore/ER6166.json
@@ -1 +1 @@
-{"batchcode": "ER6166", "histograms": [{"batchcodes": ["ER6166"], "histogram": {"COVID-19": 3, "Vaccination failure": 3, "SARS-CoV-2 test": 2, "Investigation": 1}}]}
\ No newline at end of file
+{"batchcode": "ER6166", "histograms": [{"histogram": {"COVID-19": 3, "Vaccination failure": 3, "SARS-CoV-2 test": 2, "Investigation": 1}, "batchcodes": ["ER6166"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/ER9449.json b/docs/data/histograms/Singapore/ER9449.json
index c75b2262e97..7bb32b10161 100644
--- a/docs/data/histograms/Singapore/ER9449.json
+++ b/docs/data/histograms/Singapore/ER9449.json
@@ -1 +1 @@
-{"batchcode": "ER9449", "histograms": [{"batchcodes": ["ER9449"], "histogram": {"COVID-19": 1, "Hypertension": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9449", "histograms": [{"histogram": {"COVID-19": 1, "Hypertension": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination failure": 1}, "batchcodes": ["ER9449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/ET6924.json b/docs/data/histograms/Singapore/ET6924.json
index 2de61862cec..c3aac078bc6 100644
--- a/docs/data/histograms/Singapore/ET6924.json
+++ b/docs/data/histograms/Singapore/ET6924.json
@@ -1 +1 @@
-{"batchcode": "ET6924", "histograms": [{"batchcodes": ["ET6924"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ET6924", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["ET6924"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/EY5456.json b/docs/data/histograms/Singapore/EY5456.json
index e1d73aa2a4b..600e4825583 100644
--- a/docs/data/histograms/Singapore/EY5456.json
+++ b/docs/data/histograms/Singapore/EY5456.json
@@ -1 +1 @@
-{"batchcode": "EY5456", "histograms": [{"batchcodes": ["EY5456"], "histogram": {"Computerised tomogram": 1, "Echocardiogram": 1, "Hypoaesthesia": 1, "Hypopnoea": 1, "Palpitations": 1, "Paresis": 1, "SARS-CoV-1 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5456", "histograms": [{"histogram": {"Computerised tomogram": 1, "Echocardiogram": 1, "Hypoaesthesia": 1, "Hypopnoea": 1, "Palpitations": 1, "Paresis": 1, "SARS-CoV-1 test": 1}, "batchcodes": ["EY5456"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FC2396.json b/docs/data/histograms/Singapore/FC2396.json
index 1e5787b8107..86253aaad97 100644
--- a/docs/data/histograms/Singapore/FC2396.json
+++ b/docs/data/histograms/Singapore/FC2396.json
@@ -1 +1 @@
-{"batchcode": "FC2396", "histograms": [{"batchcodes": ["FC2396"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2396", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FC2396"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FE8087.json b/docs/data/histograms/Singapore/FE8087.json
index 979dcfe0378..bbe5606c532 100644
--- a/docs/data/histograms/Singapore/FE8087.json
+++ b/docs/data/histograms/Singapore/FE8087.json
@@ -1 +1 @@
-{"batchcode": "FE8087", "histograms": [{"batchcodes": ["FE8087"], "histogram": {"Blood pressure measurement": 2, "COVID-19": 2, "Chest pain": 2, "Dyspepsia": 2, "Dyspnoea": 2, "Eructation": 2, "Fatigue": 2, "Gastrointestinal disorder": 2, "Headache": 2, "Heart rate decreased": 2, "Heart rate irregular": 2, "Insomnia": 2, "Oxygen saturation": 2, "Palpitations": 2, "Pollakiuria": 2, "SARS-CoV-2 test": 2, "Blood test": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Serology negative": 1, "Serology test": 1, "Syncope": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8087", "histograms": [{"histogram": {"Blood pressure measurement": 2, "COVID-19": 2, "Chest pain": 2, "Dyspepsia": 2, "Dyspnoea": 2, "Eructation": 2, "Fatigue": 2, "Gastrointestinal disorder": 2, "Headache": 2, "Heart rate decreased": 2, "Heart rate irregular": 2, "Insomnia": 2, "Oxygen saturation": 2, "Palpitations": 2, "Pollakiuria": 2, "SARS-CoV-2 test": 2, "Blood test": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Serology negative": 1, "Serology test": 1, "Syncope": 1, "Vaccination failure": 1}, "batchcodes": ["FE8087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FE8088.json b/docs/data/histograms/Singapore/FE8088.json
index 619d8c31323..e922ae623e7 100644
--- a/docs/data/histograms/Singapore/FE8088.json
+++ b/docs/data/histograms/Singapore/FE8088.json
@@ -1 +1 @@
-{"batchcode": "FE8088", "histograms": [{"batchcodes": ["FE8088"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8088", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FE8088"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FF2154.json b/docs/data/histograms/Singapore/FF2154.json
index 52d7e64fd00..ba9da82eb69 100644
--- a/docs/data/histograms/Singapore/FF2154.json
+++ b/docs/data/histograms/Singapore/FF2154.json
@@ -1 +1 @@
-{"batchcode": "FF2154", "histograms": [{"batchcodes": ["000029A", "FF2154"], "histogram": {"COVID-19": 2, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["FF2154"], "histogram": {"SARS-CoV-2 test": 7, "COVID-19": 6, "Vaccination failure": 6, "Interchange of vaccine products": 2, "Off label use": 2, "Oropharyngeal pain": 2, "Pyrexia": 2, "Acute lymphocytic leukaemia": 1, "Angina pectoris": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart valve incompetence": 1, "Influenza": 1, "Palpitations": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2154", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["000029A", "FF2154"]}, {"histogram": {"SARS-CoV-2 test": 7, "COVID-19": 6, "Vaccination failure": 6, "Interchange of vaccine products": 2, "Off label use": 2, "Oropharyngeal pain": 2, "Pyrexia": 2, "Acute lymphocytic leukaemia": 1, "Angina pectoris": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart valve incompetence": 1, "Influenza": 1, "Palpitations": 1, "Vomiting": 1}, "batchcodes": ["FF2154"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FF3319.json b/docs/data/histograms/Singapore/FF3319.json
index e6e8aa2fa90..6e38937e28c 100644
--- a/docs/data/histograms/Singapore/FF3319.json
+++ b/docs/data/histograms/Singapore/FF3319.json
@@ -1 +1 @@
-{"batchcode": "FF3319", "histograms": [{"batchcodes": ["FF3319"], "histogram": {"Cardiac failure": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "FF3319", "histograms": [{"histogram": {"Cardiac failure": 1, "Malaise": 1}, "batchcodes": ["FF3319"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FG1657.json b/docs/data/histograms/Singapore/FG1657.json
index f578c5f1cfc..efac9ed56c0 100644
--- a/docs/data/histograms/Singapore/FG1657.json
+++ b/docs/data/histograms/Singapore/FG1657.json
@@ -1 +1 @@
-{"batchcode": "FG1657", "histograms": [{"batchcodes": ["FG1657"], "histogram": {"COVID-19": 14, "Vaccination failure": 14, "SARS-CoV-2 test": 13, "Headache": 2, "Alopecia": 1, "Angina pectoris": 1, "Arthralgia": 1, "Chest discomfort": 1, "Cough": 1, "Dizziness": 1, "Drug ineffective": 1, "Ear discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Ocular discomfort": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "FG1657", "histograms": [{"histogram": {"COVID-19": 14, "Vaccination failure": 14, "SARS-CoV-2 test": 13, "Headache": 2, "Alopecia": 1, "Angina pectoris": 1, "Arthralgia": 1, "Chest discomfort": 1, "Cough": 1, "Dizziness": 1, "Drug ineffective": 1, "Ear discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Ocular discomfort": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Throat irritation": 1}, "batchcodes": ["FG1657"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FH6408.json b/docs/data/histograms/Singapore/FH6408.json
index 3bf179fc2d8..5dcb7352035 100644
--- a/docs/data/histograms/Singapore/FH6408.json
+++ b/docs/data/histograms/Singapore/FH6408.json
@@ -1 +1 @@
-{"batchcode": "FH6408", "histograms": [{"batchcodes": ["FH6408"], "histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FH6408", "histograms": [{"histogram": {"Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["FH6408"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FJ1926.json b/docs/data/histograms/Singapore/FJ1926.json
index af822ece1f0..35aafecaaed 100644
--- a/docs/data/histograms/Singapore/FJ1926.json
+++ b/docs/data/histograms/Singapore/FJ1926.json
@@ -1 +1 @@
-{"batchcode": "FJ1926", "histograms": [{"batchcodes": ["FJ1926"], "histogram": {"COVID-19": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 5, "Cough": 1, "Drug ineffective": 1, "Erythema multiforme": 1, "Gingival bleeding": 1, "Immunisation": 1, "Mouth ulceration": 1, "Oral mucosal exfoliation": 1, "Oropharyngeal pain": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 RNA": 1, "Skin lesion": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1926", "histograms": [{"histogram": {"COVID-19": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 5, "Cough": 1, "Drug ineffective": 1, "Erythema multiforme": 1, "Gingival bleeding": 1, "Immunisation": 1, "Mouth ulceration": 1, "Oral mucosal exfoliation": 1, "Oropharyngeal pain": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 RNA": 1, "Skin lesion": 1, "Suspected COVID-19": 1}, "batchcodes": ["FJ1926"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FJ1966.json b/docs/data/histograms/Singapore/FJ1966.json
index 89ec73d727c..a37fd9a334f 100644
--- a/docs/data/histograms/Singapore/FJ1966.json
+++ b/docs/data/histograms/Singapore/FJ1966.json
@@ -1 +1 @@
-{"batchcode": "FJ1966", "histograms": [{"batchcodes": ["FJ1966"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}}]}
\ No newline at end of file
+{"batchcode": "FJ1966", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}, "batchcodes": ["FJ1966"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FJ8189.json b/docs/data/histograms/Singapore/FJ8189.json
index df3c9a79eb9..f7a0cd42766 100644
--- a/docs/data/histograms/Singapore/FJ8189.json
+++ b/docs/data/histograms/Singapore/FJ8189.json
@@ -1 +1 @@
-{"batchcode": "FJ8189", "histograms": [{"batchcodes": ["FJ8189"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8189", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FJ8189"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FJ8198.json b/docs/data/histograms/Singapore/FJ8198.json
index 540783e5a5f..0f47d8cd618 100644
--- a/docs/data/histograms/Singapore/FJ8198.json
+++ b/docs/data/histograms/Singapore/FJ8198.json
@@ -1 +1 @@
-{"batchcode": "FJ8198", "histograms": [{"batchcodes": ["FJ8198"], "histogram": {"COVID-19": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 5, "Drug ineffective": 3, "Suspected COVID-19": 2, "Asymptomatic COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ8198", "histograms": [{"histogram": {"COVID-19": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 5, "Drug ineffective": 3, "Suspected COVID-19": 2, "Asymptomatic COVID-19": 1}, "batchcodes": ["FJ8198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FK8888.json b/docs/data/histograms/Singapore/FK8888.json
index e1aee9ee27f..89c06813c11 100644
--- a/docs/data/histograms/Singapore/FK8888.json
+++ b/docs/data/histograms/Singapore/FK8888.json
@@ -1 +1 @@
-{"batchcode": "FK8888", "histograms": [{"batchcodes": ["FK8888"], "histogram": {"SARS-CoV-2 test": 5, "COVID-19": 4, "Vaccination failure": 4, "Drug ineffective": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8888", "histograms": [{"histogram": {"SARS-CoV-2 test": 5, "COVID-19": 4, "Vaccination failure": 4, "Drug ineffective": 1, "Suspected COVID-19": 1}, "batchcodes": ["FK8888"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FK8892.json b/docs/data/histograms/Singapore/FK8892.json
index cafaebc9eb3..4dd5b5865ad 100644
--- a/docs/data/histograms/Singapore/FK8892.json
+++ b/docs/data/histograms/Singapore/FK8892.json
@@ -1 +1 @@
-{"batchcode": "FK8892", "histograms": [{"batchcodes": ["200057A", "FK8892"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["FK8892"], "histogram": {"COVID-19": 46, "SARS-CoV-2 test": 45, "Vaccination failure": 42, "Drug ineffective": 5, "Body temperature": 2, "Cough": 2, "Influenza": 2, "Oropharyngeal pain": 2, "Pain": 2, "Asymptomatic COVID-19": 1, "Chest pain": 1, "Computerised tomogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Magnetic resonance imaging": 1, "Neuralgia": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Swelling": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FK8892", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["200057A", "FK8892"]}, {"histogram": {"COVID-19": 46, "SARS-CoV-2 test": 45, "Vaccination failure": 42, "Drug ineffective": 5, "Body temperature": 2, "Cough": 2, "Influenza": 2, "Oropharyngeal pain": 2, "Pain": 2, "Asymptomatic COVID-19": 1, "Chest pain": 1, "Computerised tomogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Magnetic resonance imaging": 1, "Neuralgia": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Swelling": 1, "X-ray": 1}, "batchcodes": ["FK8892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FL3560.json b/docs/data/histograms/Singapore/FL3560.json
index b9bf2968c96..acb99b18e1e 100644
--- a/docs/data/histograms/Singapore/FL3560.json
+++ b/docs/data/histograms/Singapore/FL3560.json
@@ -1 +1 @@
-{"batchcode": "FL3560", "histograms": [{"batchcodes": ["FL3560"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3560", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FL3560"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FN0087.json b/docs/data/histograms/Singapore/FN0087.json
index 8e45c028478..b133c9266ee 100644
--- a/docs/data/histograms/Singapore/FN0087.json
+++ b/docs/data/histograms/Singapore/FN0087.json
@@ -1 +1 @@
-{"batchcode": "FN0087", "histograms": [{"batchcodes": ["FN0087"], "histogram": {"SARS-CoV-2 test": 22, "COVID-19": 21, "Vaccination failure": 17, "Drug ineffective": 6, "Suspected COVID-19": 2, "Anaphylactic reaction": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dyspnoea exertional": 1, "Heart rate": 1, "Heart rate increased": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Multisystem inflammatory syndrome": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Pharyngitis": 1, "Productive cough": 1}}]}
\ No newline at end of file
+{"batchcode": "FN0087", "histograms": [{"histogram": {"SARS-CoV-2 test": 22, "COVID-19": 21, "Vaccination failure": 17, "Drug ineffective": 6, "Suspected COVID-19": 2, "Anaphylactic reaction": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dyspnoea exertional": 1, "Heart rate": 1, "Heart rate increased": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Multisystem inflammatory syndrome": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Pharyngitis": 1, "Productive cough": 1}, "batchcodes": ["FN0087"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FN9501.json b/docs/data/histograms/Singapore/FN9501.json
index d802b0706e9..5ceac6d6c6b 100644
--- a/docs/data/histograms/Singapore/FN9501.json
+++ b/docs/data/histograms/Singapore/FN9501.json
@@ -1 +1 @@
-{"batchcode": "FN9501", "histograms": [{"batchcodes": ["FN9501"], "histogram": {"COVID-19": 12, "SARS-CoV-2 test": 12, "Vaccination failure": 10, "Drug ineffective": 2}}]}
\ No newline at end of file
+{"batchcode": "FN9501", "histograms": [{"histogram": {"COVID-19": 12, "SARS-CoV-2 test": 12, "Vaccination failure": 10, "Drug ineffective": 2}, "batchcodes": ["FN9501"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/FR5497.json b/docs/data/histograms/Singapore/FR5497.json
index 9a020b42bb0..5948f67806f 100644
--- a/docs/data/histograms/Singapore/FR5497.json
+++ b/docs/data/histograms/Singapore/FR5497.json
@@ -1 +1 @@
-{"batchcode": "FR5497", "histograms": [{"batchcodes": ["FR5497"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}}]}
\ No newline at end of file
+{"batchcode": "FR5497", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3}, "batchcodes": ["FR5497"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/PFZ001.json b/docs/data/histograms/Singapore/PFZ001.json
index 05e421bc24d..63f796edd15 100644
--- a/docs/data/histograms/Singapore/PFZ001.json
+++ b/docs/data/histograms/Singapore/PFZ001.json
@@ -1 +1 @@
-{"batchcode": "PFZ001", "histograms": [{"batchcodes": ["PFZ001"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "PFZ001", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "Off label use": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["PFZ001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/SK8892.json b/docs/data/histograms/Singapore/SK8892.json
index 72cba3ceb80..edced86a382 100644
--- a/docs/data/histograms/Singapore/SK8892.json
+++ b/docs/data/histograms/Singapore/SK8892.json
@@ -1 +1 @@
-{"batchcode": "SK8892", "histograms": [{"batchcodes": ["SK8892"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "SK8892", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["SK8892"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Singapore/UNK.json b/docs/data/histograms/Singapore/UNK.json
index 302f51dc6a0..b3b867d8d0b 100644
--- a/docs/data/histograms/Singapore/UNK.json
+++ b/docs/data/histograms/Singapore/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK"], "histogram": {"Angioedema": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Hypersensitivity": 1, "Urticaria": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"Angioedema": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Hypersensitivity": 1, "Urticaria": 1, "Wheezing": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Slovenia/012L20A.json b/docs/data/histograms/Slovenia/012L20A.json
index e082dea7ca8..031ef8f4185 100644
--- a/docs/data/histograms/Slovenia/012L20A.json
+++ b/docs/data/histograms/Slovenia/012L20A.json
@@ -1 +1 @@
-{"batchcode": "012L20A", "histograms": [{"batchcodes": ["012L20A"], "histogram": {"Injection site erythema": 1, "Injection site hypoaesthesia": 1, "Injection site inflammation": 1, "Injection site pain": 1, "Injection site paraesthesia": 1, "Injection site warmth": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site hypoaesthesia": 1, "Injection site inflammation": 1, "Injection site pain": 1, "Injection site paraesthesia": 1, "Injection site warmth": 1, "Pain in extremity": 1}, "batchcodes": ["012L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/0000000?.json b/docs/data/histograms/South Africa/0000000?.json
index 1ddd804c456..1383ad3d214 100644
--- a/docs/data/histograms/South Africa/0000000?.json
+++ b/docs/data/histograms/South Africa/0000000?.json
@@ -1 +1 @@
-{"batchcode": "0000000?", "histograms": [{"batchcodes": ["0000000?"], "histogram": {"Dyspnoea": 1, "Essential tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "0000000?", "histograms": [{"histogram": {"Dyspnoea": 1, "Essential tremor": 1}, "batchcodes": ["0000000?"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/041A21A.json b/docs/data/histograms/South Africa/041A21A.json
index e9e3832de27..8a17df338ee 100644
--- a/docs/data/histograms/South Africa/041A21A.json
+++ b/docs/data/histograms/South Africa/041A21A.json
@@ -1 +1 @@
-{"batchcode": "041A21A", "histograms": [{"batchcodes": ["041A21A"], "histogram": {"Fatigue": 1, "Headache": 1, "Pain": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "041A21A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Pain": 1, "Weight decreased": 1}, "batchcodes": ["041A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/1.json b/docs/data/histograms/South Africa/1.json
index b651caf840f..05915a22045 100644
--- a/docs/data/histograms/South Africa/1.json
+++ b/docs/data/histograms/South Africa/1.json
@@ -1 +1 @@
-{"batchcode": "1", "histograms": [{"batchcodes": ["1"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/108A21A.json b/docs/data/histograms/South Africa/108A21A.json
index d12764acb09..7e40c9a3d7b 100644
--- a/docs/data/histograms/South Africa/108A21A.json
+++ b/docs/data/histograms/South Africa/108A21A.json
@@ -1 +1 @@
-{"batchcode": "108A21A", "histograms": [{"batchcodes": ["108A21A"], "histogram": {"Gait inability": 1, "Loss of personal independence in daily activities": 1, "Muscular weakness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "108A21A", "histograms": [{"histogram": {"Gait inability": 1, "Loss of personal independence in daily activities": 1, "Muscular weakness": 1, "Pain in extremity": 1}, "batchcodes": ["108A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/12345.json b/docs/data/histograms/South Africa/12345.json
index accf797ba22..5b3083db852 100644
--- a/docs/data/histograms/South Africa/12345.json
+++ b/docs/data/histograms/South Africa/12345.json
@@ -1 +1 @@
-{"batchcode": "12345", "histograms": [{"batchcodes": ["12345"], "histogram": {"Back pain": 1, "Dizziness": 1, "Myocardial infarction": 1, "Pain": 1, "Syncope": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "12345", "histograms": [{"histogram": {"Back pain": 1, "Dizziness": 1, "Myocardial infarction": 1, "Pain": 1, "Syncope": 1, "Weight decreased": 1}, "batchcodes": ["12345"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/12935.json b/docs/data/histograms/South Africa/12935.json
index e8dab64b47c..5764751858f 100644
--- a/docs/data/histograms/South Africa/12935.json
+++ b/docs/data/histograms/South Africa/12935.json
@@ -1 +1 @@
-{"batchcode": "12935", "histograms": [{"batchcodes": ["12935"], "histogram": {"Blood thrombin": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Pulmonary embolism": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Ultrasound Doppler": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "12935", "histograms": [{"histogram": {"Blood thrombin": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Pulmonary embolism": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Ultrasound Doppler": 1, "X-ray": 1}, "batchcodes": ["12935"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/13401.json b/docs/data/histograms/South Africa/13401.json
index 2c2bc992831..9da91730b1e 100644
--- a/docs/data/histograms/South Africa/13401.json
+++ b/docs/data/histograms/South Africa/13401.json
@@ -1 +1 @@
-{"batchcode": "13401", "histograms": [{"batchcodes": ["13401"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "13401", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["13401"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/187708992157.json b/docs/data/histograms/South Africa/187708992157.json
index bdb5c9a6cb4..7b03472fb6c 100644
--- a/docs/data/histograms/South Africa/187708992157.json
+++ b/docs/data/histograms/South Africa/187708992157.json
@@ -1 +1 @@
-{"batchcode": "187708992157", "histograms": [{"batchcodes": ["187708992157"], "histogram": {"Blood pressure measurement": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "187708992157", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Syncope": 1}, "batchcodes": ["187708992157"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/1F1043A.json b/docs/data/histograms/South Africa/1F1043A.json
index 036a5dc00e9..bf2e0bb8dce 100644
--- a/docs/data/histograms/South Africa/1F1043A.json
+++ b/docs/data/histograms/South Africa/1F1043A.json
@@ -1 +1 @@
-{"batchcode": "1F1043A", "histograms": [{"batchcodes": ["1F1043A"], "histogram": {"Dizziness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1043A", "histograms": [{"histogram": {"Dizziness": 1, "Pain in extremity": 1}, "batchcodes": ["1F1043A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/200336/10.json b/docs/data/histograms/South Africa/200336/10.json
index ecfa6b21e7f..66246c1e8cc 100644
--- a/docs/data/histograms/South Africa/200336/10.json
+++ b/docs/data/histograms/South Africa/200336/10.json
@@ -1 +1 @@
-{"batchcode": "200336/10", "histograms": [{"batchcodes": ["200336/10"], "histogram": {"International normalised ratio": 1, "International normalised ratio increased": 1, "Joint swelling": 1, "Prothrombin time": 1, "Prothrombin time prolonged": 1, "SARS-CoV-2 test": 1, "Thrombocytopenia": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "200336/10", "histograms": [{"histogram": {"International normalised ratio": 1, "International normalised ratio increased": 1, "Joint swelling": 1, "Prothrombin time": 1, "Prothrombin time prolonged": 1, "SARS-CoV-2 test": 1, "Thrombocytopenia": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["200336/10"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/200A21A.json b/docs/data/histograms/South Africa/200A21A.json
index d3f10edad82..5c04bf84242 100644
--- a/docs/data/histograms/South Africa/200A21A.json
+++ b/docs/data/histograms/South Africa/200A21A.json
@@ -1 +1 @@
-{"batchcode": "200A21A", "histograms": [{"batchcodes": ["200A21A"], "histogram": {"Breast tenderness": 1, "Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "200A21A", "histograms": [{"histogram": {"Breast tenderness": 1, "Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["200A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/201495-11.json b/docs/data/histograms/South Africa/201495-11.json
index 683949ecc8a..489c9ef9e51 100644
--- a/docs/data/histograms/South Africa/201495-11.json
+++ b/docs/data/histograms/South Africa/201495-11.json
@@ -1 +1 @@
-{"batchcode": "201495-11", "histograms": [{"batchcodes": ["201495-11"], "histogram": {"Abdominal pain": 1, "Chills": 1, "Decreased appetite": 1, "Diplopia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "201495-11", "histograms": [{"histogram": {"Abdominal pain": 1, "Chills": 1, "Decreased appetite": 1, "Diplopia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["201495-11"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/201778.json b/docs/data/histograms/South Africa/201778.json
index 1aee7db0e23..e0393e56fc7 100644
--- a/docs/data/histograms/South Africa/201778.json
+++ b/docs/data/histograms/South Africa/201778.json
@@ -1 +1 @@
-{"batchcode": "201778", "histograms": [{"batchcodes": ["201778"], "histogram": {"Dizziness": 1, "Headache": 1, "Muscle spasms": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "201778", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Muscle spasms": 1, "Thrombosis": 1}, "batchcodes": ["201778"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/202228.json b/docs/data/histograms/South Africa/202228.json
index 600107f1989..b66ff594741 100644
--- a/docs/data/histograms/South Africa/202228.json
+++ b/docs/data/histograms/South Africa/202228.json
@@ -1 +1 @@
-{"batchcode": "202228", "histograms": [{"batchcodes": ["202228"], "histogram": {"Infection": 1}}]}
\ No newline at end of file
+{"batchcode": "202228", "histograms": [{"histogram": {"Infection": 1}, "batchcodes": ["202228"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/203A2A.json b/docs/data/histograms/South Africa/203A2A.json
index d2484f51179..5c91f51f0db 100644
--- a/docs/data/histograms/South Africa/203A2A.json
+++ b/docs/data/histograms/South Africa/203A2A.json
@@ -1 +1 @@
-{"batchcode": "203A2A", "histograms": [{"batchcodes": ["203A2A"], "histogram": {"Dermatitis": 1}}]}
\ No newline at end of file
+{"batchcode": "203A2A", "histograms": [{"histogram": {"Dermatitis": 1}, "batchcodes": ["203A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/204883.json b/docs/data/histograms/South Africa/204883.json
index 07a379035a4..8f09f8c7fd4 100644
--- a/docs/data/histograms/South Africa/204883.json
+++ b/docs/data/histograms/South Africa/204883.json
@@ -1 +1 @@
-{"batchcode": "204883", "histograms": [{"batchcodes": ["204883"], "histogram": {"Bell's palsy": 1, "Blood test": 1, "Body temperature": 1, "Magnetic resonance imaging": 1, "Platelet count": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "204883", "histograms": [{"histogram": {"Bell's palsy": 1, "Blood test": 1, "Body temperature": 1, "Magnetic resonance imaging": 1, "Platelet count": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["204883"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/206105.json b/docs/data/histograms/South Africa/206105.json
index 8fe64a60861..454b4ccf065 100644
--- a/docs/data/histograms/South Africa/206105.json
+++ b/docs/data/histograms/South Africa/206105.json
@@ -1 +1 @@
-{"batchcode": "206105", "histograms": [{"batchcodes": ["206105"], "histogram": {"Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "206105", "histograms": [{"histogram": {"Transient ischaemic attack": 1}, "batchcodes": ["206105"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/207113.json b/docs/data/histograms/South Africa/207113.json
index 2b413d16634..fd20fc1df67 100644
--- a/docs/data/histograms/South Africa/207113.json
+++ b/docs/data/histograms/South Africa/207113.json
@@ -1 +1 @@
-{"batchcode": "207113", "histograms": [{"batchcodes": ["207113"], "histogram": {"Haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "207113", "histograms": [{"histogram": {"Haemorrhage": 1}, "batchcodes": ["207113"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/207865.json b/docs/data/histograms/South Africa/207865.json
index fb7fe4058dd..6e911846b58 100644
--- a/docs/data/histograms/South Africa/207865.json
+++ b/docs/data/histograms/South Africa/207865.json
@@ -1 +1 @@
-{"batchcode": "207865", "histograms": [{"batchcodes": ["207865"], "histogram": {"Cough": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "207865", "histograms": [{"histogram": {"Cough": 1, "Local reaction": 1}, "batchcodes": ["207865"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/208A21.json b/docs/data/histograms/South Africa/208A21.json
index c8a5b1e4e2d..8de8769d974 100644
--- a/docs/data/histograms/South Africa/208A21.json
+++ b/docs/data/histograms/South Africa/208A21.json
@@ -1 +1 @@
-{"batchcode": "208A21", "histograms": [{"batchcodes": ["208A21"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "208A21", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["208A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/208A21A.json b/docs/data/histograms/South Africa/208A21A.json
index 753434573e6..4e8fd7675ba 100644
--- a/docs/data/histograms/South Africa/208A21A.json
+++ b/docs/data/histograms/South Africa/208A21A.json
@@ -1 +1 @@
-{"batchcode": "208A21A", "histograms": [{"batchcodes": ["208A21A"], "histogram": {"Local reaction": 6, "Arthralgia": 5, "Headache": 5, "Dizziness": 3, "Syncope": 3, "Asthma": 2, "Blood pressure measurement": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Pain": 2, "Paraesthesia": 2, "Tinnitus": 2, "Abdominal pain lower": 1, "Anxiety": 1, "Back pain": 1, "Body temperature": 1, "Bronchitis": 1, "Bronchospasm": 1, "Coma": 1, "Cough": 1, "Deep vein thrombosis": 1, "Depression": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Ear pain": 1, "Fatigue": 1, "Flank pain": 1, "Gait disturbance": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Illness": 1, "Influenza like illness": 1, "Lethargy": 1, "Maternal exposure during breast feeding": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pyrexia": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Tuberculosis gastrointestinal": 1, "Urine analysis abnormal": 1, "Vertigo": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "208A21A", "histograms": [{"histogram": {"Local reaction": 6, "Arthralgia": 5, "Headache": 5, "Dizziness": 3, "Syncope": 3, "Asthma": 2, "Blood pressure measurement": 2, "Guillain-Barre syndrome": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Pain": 2, "Paraesthesia": 2, "Tinnitus": 2, "Abdominal pain lower": 1, "Anxiety": 1, "Back pain": 1, "Body temperature": 1, "Bronchitis": 1, "Bronchospasm": 1, "Coma": 1, "Cough": 1, "Deep vein thrombosis": 1, "Depression": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Ear pain": 1, "Fatigue": 1, "Flank pain": 1, "Gait disturbance": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypotension": 1, "Illness": 1, "Influenza like illness": 1, "Lethargy": 1, "Maternal exposure during breast feeding": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pyrexia": 1, "Rash": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Tuberculosis gastrointestinal": 1, "Urine analysis abnormal": 1, "Vertigo": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["208A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/208A21A21.json b/docs/data/histograms/South Africa/208A21A21.json
index b87a0fa91e6..94a3a6541d0 100644
--- a/docs/data/histograms/South Africa/208A21A21.json
+++ b/docs/data/histograms/South Africa/208A21A21.json
@@ -1 +1 @@
-{"batchcode": "208A21A21", "histograms": [{"batchcodes": ["208A21A21"], "histogram": {"Cardiac murmur": 1}}]}
\ No newline at end of file
+{"batchcode": "208A21A21", "histograms": [{"histogram": {"Cardiac murmur": 1}, "batchcodes": ["208A21A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/208AVZIA.json b/docs/data/histograms/South Africa/208AVZIA.json
index 095af99d339..bfa3371eb5e 100644
--- a/docs/data/histograms/South Africa/208AVZIA.json
+++ b/docs/data/histograms/South Africa/208AVZIA.json
@@ -1 +1 @@
-{"batchcode": "208AVZIA", "histograms": [{"batchcodes": ["208AVZIA"], "histogram": {"Arthralgia": 1, "Gait disturbance": 1, "Injection site pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "208AVZIA", "histograms": [{"histogram": {"Arthralgia": 1, "Gait disturbance": 1, "Injection site pain": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1}, "batchcodes": ["208AVZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/20919217.json b/docs/data/histograms/South Africa/20919217.json
index bf4b1004572..aecbab0afaf 100644
--- a/docs/data/histograms/South Africa/20919217.json
+++ b/docs/data/histograms/South Africa/20919217.json
@@ -1 +1 @@
-{"batchcode": "20919217", "histograms": [{"batchcodes": ["20919217"], "histogram": {"Abdominal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "20919217", "histograms": [{"histogram": {"Abdominal pain": 1}, "batchcodes": ["20919217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/2091A21A.json b/docs/data/histograms/South Africa/2091A21A.json
index 0bfb67dbf03..e212cce1960 100644
--- a/docs/data/histograms/South Africa/2091A21A.json
+++ b/docs/data/histograms/South Africa/2091A21A.json
@@ -1 +1 @@
-{"batchcode": "2091A21A", "histograms": [{"batchcodes": ["2091A21A"], "histogram": {"Thrombocytopenia": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "2091A21A", "histograms": [{"histogram": {"Thrombocytopenia": 1, "Thrombosis": 1}, "batchcodes": ["2091A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209821A.json b/docs/data/histograms/South Africa/209821A.json
index ce6c233c098..2dfa947b4a6 100644
--- a/docs/data/histograms/South Africa/209821A.json
+++ b/docs/data/histograms/South Africa/209821A.json
@@ -1 +1 @@
-{"batchcode": "209821A", "histograms": [{"batchcodes": ["209821A"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "209821A", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["209821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A 21A.json b/docs/data/histograms/South Africa/209A 21A.json
index 464f1c2a296..db5e6e1b7b4 100644
--- a/docs/data/histograms/South Africa/209A 21A.json
+++ b/docs/data/histograms/South Africa/209A 21A.json
@@ -1 +1 @@
-{"batchcode": "209A 21A", "histograms": [{"batchcodes": ["209A 21A"], "histogram": {"Heart rate": 1, "Heart rate irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "209A 21A", "histograms": [{"histogram": {"Heart rate": 1, "Heart rate irregular": 1}, "batchcodes": ["209A 21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A1A.json b/docs/data/histograms/South Africa/209A1A.json
index 6f4daac01ef..28d1375f6fd 100644
--- a/docs/data/histograms/South Africa/209A1A.json
+++ b/docs/data/histograms/South Africa/209A1A.json
@@ -1 +1 @@
-{"batchcode": "209A1A", "histograms": [{"batchcodes": ["209A1A"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "209A1A", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["209A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A21 A.json b/docs/data/histograms/South Africa/209A21 A.json
index b265c8d7cce..b7cd7c4977f 100644
--- a/docs/data/histograms/South Africa/209A21 A.json
+++ b/docs/data/histograms/South Africa/209A21 A.json
@@ -1 +1 @@
-{"batchcode": "209A21 A", "histograms": [{"batchcodes": ["209A21 A"], "histogram": {"Local reaction": 1, "Pruritus": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "209A21 A", "histograms": [{"histogram": {"Local reaction": 1, "Pruritus": 1, "Skin discolouration": 1}, "batchcodes": ["209A21 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A21.json b/docs/data/histograms/South Africa/209A21.json
index e5f04cfcc62..ca9314527c5 100644
--- a/docs/data/histograms/South Africa/209A21.json
+++ b/docs/data/histograms/South Africa/209A21.json
@@ -1 +1 @@
-{"batchcode": "209A21", "histograms": [{"batchcodes": ["209A21"], "histogram": {"Arthralgia": 1}}]}
\ No newline at end of file
+{"batchcode": "209A21", "histograms": [{"histogram": {"Arthralgia": 1}, "batchcodes": ["209A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A214.json b/docs/data/histograms/South Africa/209A214.json
index b3094d95700..62a7fb72d90 100644
--- a/docs/data/histograms/South Africa/209A214.json
+++ b/docs/data/histograms/South Africa/209A214.json
@@ -1 +1 @@
-{"batchcode": "209A214", "histograms": [{"batchcodes": ["209A214"], "histogram": {"Abdominal pain": 1, "Blood cholesterol": 1, "Fibrin D dimer": 1, "Headache": 1, "Injection site bruising": 1, "Injection site pain": 1, "Menstruation irregular": 1, "Platelet count": 1, "Pyrexia": 1, "Rash": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "209A214", "histograms": [{"histogram": {"Abdominal pain": 1, "Blood cholesterol": 1, "Fibrin D dimer": 1, "Headache": 1, "Injection site bruising": 1, "Injection site pain": 1, "Menstruation irregular": 1, "Platelet count": 1, "Pyrexia": 1, "Rash": 1, "Thrombosis": 1}, "batchcodes": ["209A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A21A.json b/docs/data/histograms/South Africa/209A21A.json
index 35388f15277..a677ec60460 100644
--- a/docs/data/histograms/South Africa/209A21A.json
+++ b/docs/data/histograms/South Africa/209A21A.json
@@ -1 +1 @@
-{"batchcode": "209A21A", "histograms": [{"batchcodes": ["209A21A", "PCA0038"], "histogram": {"Acute kidney injury": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Laboratory test": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Oxygen saturation": 1, "Platelet count": 1, "Protein total": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "White blood cell count": 1}}, {"batchcodes": ["209A21A"], "histogram": {"Headache": 19, "Local reaction": 14, "Pain in extremity": 14, "Arthralgia": 11, "Blood pressure measurement": 11, "Chest pain": 9, "Oxygen saturation": 9, "Peripheral swelling": 8, "Body temperature": 7, "Dyspnoea": 7, "Heart rate": 7, "Myalgia": 7, "Pain": 7, "Blood glucose": 6, "Fatigue": 6, "Injection site pain": 6, "Nausea": 6, "Respiratory rate": 6, "Vomiting": 6, "Back pain": 5, "Dizziness": 5, "Pyrexia": 5, "Chest discomfort": 4, "Haemoglobin": 4, "Hyperhidrosis": 4, "Syncope": 4, "Abdominal pain": 3, "Acute kidney injury": 3, "Anaphylactic reaction": 3, "Angiogram": 3, "Blood potassium": 3, "Blood urea": 3, "C-reactive protein": 3, "Diarrhoea": 3, "Electrocardiogram": 3, "Erectile dysfunction": 3, "Erythema": 3, "HIV test": 3, "Joint swelling": 3, "Laboratory test": 3, "Oedema peripheral": 3, "Paraesthesia": 3, "Platelet count": 3, "SARS-CoV-2 test": 3, "Tachycardia": 3, "Alanine aminotransferase": 2, "Albumin globulin ratio": 2, "Asthenia": 2, "Autonomic nervous system imbalance": 2, "Bell's palsy": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bicarbonate": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood creatine": 2, "Blood culture": 2, "Blood lactic acid": 2, "Blood pressure increased": 2, "Blood sodium": 2, "Bradycardia": 2, "Breath sounds": 2, "Cardiac arrest": 2, "Cardiovascular examination": 2, "Central nervous system function test": 2, "Cerebral atrophy": 2, "Cerebrovascular accident": 2, "Chills": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Culture urine": 2, "Death": 2, "Decreased appetite": 2, "Deep vein thrombosis": 2, "Epiglottic oedema": 2, "Exposure keratitis": 2, "Fraction of inspired oxygen": 2, "Full blood count": 2, "Fungal test": 2, "Gamma-glutamyltransferase": 2, "Gastrointestinal examination": 2, "Guillain-Barre syndrome": 2, "Heart sounds": 2, "Hypoaesthesia": 2, "Hypoxia": 2, "Infective keratitis": 2, "Insomnia": 2, "Interleukin level": 2, "International normalised ratio": 2, "Laryngoscopy": 2, "Lymphadenopathy": 2, "Lymphocyte count": 2, "Metabolic function test": 2, "Migraine": 2, "Mini mental status examination": 2, "Musculoskeletal stiffness": 2, "Myocarditis": 2, "Neurological examination": 2, "Night sweats": 2, "Ophthalmological examination": 2, "Oropharyngeal pain": 2, "PCO2": 2, "PO2": 2, "Pneumonia": 2, "Procalcitonin": 2, "Protein total": 2, "Pulmonary physical examination": 2, "Red blood cell count": 2, "Respiratory acidosis": 2, "Respiratory failure": 2, "SARS-CoV-2 test positive": 2, "Seizure": 2, "Septic screen": 2, "Septic shock": 2, "Skin hyperpigmentation": 2, "Swelling": 2, "Swelling face": 2, "Thrombocytopenia": 2, "Toxic shock syndrome": 2, "Tremor": 2, "Upper gastrointestinal haemorrhage": 2, "Urine output": 2, "White blood cell count": 2, "X-ray": 2, "pH body fluid": 2, "Acinetobacter sepsis": 1, "Allergy test": 1, "Anti-platelet antibody": 1, "Anxiety": 1, "Asthma": 1, "Balance disorder": 1, "Biopsy": 1, "Bladder pain": 1, "Blindness": 1, "Blister": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose decreased": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood sodium decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Brain injury": 1, "Bronchospasm": 1, "COVID-19 pneumonia": 1, "COVID-19 screening": 1, "CSF culture": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF protein": 1, "CSF white blood cell count": 1, "Cardiac failure congestive": 1, "Chronic obstructive pulmonary disease": 1, "Chronic spontaneous urticaria": 1, "Conjunctivitis": 1, "Cough": 1, "Deafness": 1, "Dehydration": 1, "Diarrhoea haemorrhagic": 1, "Dry mouth": 1, "Dysphagia": 1, "Ear pain": 1, "Embolism venous": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Eye irritation": 1, "Eye pain": 1, "Eye swelling": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Gram stain": 1, "HIV infection": 1, "Haemorrhage": 1, "Haemorrhage intracranial": 1, "Haemorrhage urinary tract": 1, "Hepatitis B surface antigen": 1, "Histology": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypotension": 1, "Influenza like illness": 1, "Injected limb mobility decreased": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Ischaemic limb pain": 1, "Limb injury": 1, "Localised infection": 1, "Loss of personal independence in daily activities": 1, "Maternal exposure during breast feeding": 1, "Mean cell volume": 1, "Monoparesis": 1, "Muscle spasms": 1, "Muscle strain": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Nerve injury": 1, "Nitrite urine present": 1, "Off label use": 1, "Osteoarthritis": 1, "Oxygen therapy": 1, "Pallor": 1, "Palpitations": 1, "Pemphigus": 1, "Peripheral coldness": 1, "Physical disability": 1, "Product administered to patient of inappropriate age": 1, "Pulmonary infarction": 1, "Pupil fixed": 1, "Renal embolism": 1, "Renal pain": 1, "Respiratory distress": 1, "Restlessness": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Scan with contrast": 1, "Skin disorder": 1, "Skin mass": 1, "Splenic infarction": 1, "Tenderness": 1, "Tension headache": 1, "Tinnitus": 1, "Tracheal aspirate culture": 1, "Treponema test": 1, "Trigeminal neuralgia": 1, "Troponin": 1, "Troponin T": 1, "Tuberculosis": 1, "Urticaria": 1, "Vaccine breakthrough infection": 1, "Vein disorder": 1, "Vision blurred": 1, "Wheezing": 1, "White blood cell count abnormal": 1, "X-ray limb": 1}}]}
\ No newline at end of file
+{"batchcode": "209A21A", "histograms": [{"histogram": {"Acute kidney injury": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Laboratory test": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Oxygen saturation": 1, "Platelet count": 1, "Protein total": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "White blood cell count": 1}, "batchcodes": ["209A21A", "PCA0038"]}, {"histogram": {"Headache": 19, "Local reaction": 14, "Pain in extremity": 14, "Arthralgia": 11, "Blood pressure measurement": 11, "Chest pain": 9, "Oxygen saturation": 9, "Peripheral swelling": 8, "Body temperature": 7, "Dyspnoea": 7, "Heart rate": 7, "Myalgia": 7, "Pain": 7, "Blood glucose": 6, "Fatigue": 6, "Injection site pain": 6, "Nausea": 6, "Respiratory rate": 6, "Vomiting": 6, "Back pain": 5, "Dizziness": 5, "Pyrexia": 5, "Chest discomfort": 4, "Haemoglobin": 4, "Hyperhidrosis": 4, "Syncope": 4, "Abdominal pain": 3, "Acute kidney injury": 3, "Anaphylactic reaction": 3, "Angiogram": 3, "Blood potassium": 3, "Blood urea": 3, "C-reactive protein": 3, "Diarrhoea": 3, "Electrocardiogram": 3, "Erectile dysfunction": 3, "Erythema": 3, "HIV test": 3, "Joint swelling": 3, "Laboratory test": 3, "Oedema peripheral": 3, "Paraesthesia": 3, "Platelet count": 3, "SARS-CoV-2 test": 3, "Tachycardia": 3, "Alanine aminotransferase": 2, "Albumin globulin ratio": 2, "Asthenia": 2, "Autonomic nervous system imbalance": 2, "Bell's palsy": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bicarbonate": 2, "Blood bilirubin": 2, "Blood chloride": 2, "Blood creatine": 2, "Blood culture": 2, "Blood lactic acid": 2, "Blood pressure increased": 2, "Blood sodium": 2, "Bradycardia": 2, "Breath sounds": 2, "Cardiac arrest": 2, "Cardiovascular examination": 2, "Central nervous system function test": 2, "Cerebral atrophy": 2, "Cerebrovascular accident": 2, "Chills": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Culture urine": 2, "Death": 2, "Decreased appetite": 2, "Deep vein thrombosis": 2, "Epiglottic oedema": 2, "Exposure keratitis": 2, "Fraction of inspired oxygen": 2, "Full blood count": 2, "Fungal test": 2, "Gamma-glutamyltransferase": 2, "Gastrointestinal examination": 2, "Guillain-Barre syndrome": 2, "Heart sounds": 2, "Hypoaesthesia": 2, "Hypoxia": 2, "Infective keratitis": 2, "Insomnia": 2, "Interleukin level": 2, "International normalised ratio": 2, "Laryngoscopy": 2, "Lymphadenopathy": 2, "Lymphocyte count": 2, "Metabolic function test": 2, "Migraine": 2, "Mini mental status examination": 2, "Musculoskeletal stiffness": 2, "Myocarditis": 2, "Neurological examination": 2, "Night sweats": 2, "Ophthalmological examination": 2, "Oropharyngeal pain": 2, "PCO2": 2, "PO2": 2, "Pneumonia": 2, "Procalcitonin": 2, "Protein total": 2, "Pulmonary physical examination": 2, "Red blood cell count": 2, "Respiratory acidosis": 2, "Respiratory failure": 2, "SARS-CoV-2 test positive": 2, "Seizure": 2, "Septic screen": 2, "Septic shock": 2, "Skin hyperpigmentation": 2, "Swelling": 2, "Swelling face": 2, "Thrombocytopenia": 2, "Toxic shock syndrome": 2, "Tremor": 2, "Upper gastrointestinal haemorrhage": 2, "Urine output": 2, "White blood cell count": 2, "X-ray": 2, "pH body fluid": 2, "Acinetobacter sepsis": 1, "Allergy test": 1, "Anti-platelet antibody": 1, "Anxiety": 1, "Asthma": 1, "Balance disorder": 1, "Biopsy": 1, "Bladder pain": 1, "Blindness": 1, "Blister": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose decreased": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood sodium decreased": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Brain injury": 1, "Bronchospasm": 1, "COVID-19 pneumonia": 1, "COVID-19 screening": 1, "CSF culture": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF protein": 1, "CSF white blood cell count": 1, "Cardiac failure congestive": 1, "Chronic obstructive pulmonary disease": 1, "Chronic spontaneous urticaria": 1, "Conjunctivitis": 1, "Cough": 1, "Deafness": 1, "Dehydration": 1, "Diarrhoea haemorrhagic": 1, "Dry mouth": 1, "Dysphagia": 1, "Ear pain": 1, "Embolism venous": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Eye irritation": 1, "Eye pain": 1, "Eye swelling": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Gram stain": 1, "HIV infection": 1, "Haemorrhage": 1, "Haemorrhage intracranial": 1, "Haemorrhage urinary tract": 1, "Hepatitis B surface antigen": 1, "Histology": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypotension": 1, "Influenza like illness": 1, "Injected limb mobility decreased": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Ischaemic limb pain": 1, "Limb injury": 1, "Localised infection": 1, "Loss of personal independence in daily activities": 1, "Maternal exposure during breast feeding": 1, "Mean cell volume": 1, "Monoparesis": 1, "Muscle spasms": 1, "Muscle strain": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Mydriasis": 1, "Myocardial infarction": 1, "Nerve injury": 1, "Nitrite urine present": 1, "Off label use": 1, "Osteoarthritis": 1, "Oxygen therapy": 1, "Pallor": 1, "Palpitations": 1, "Pemphigus": 1, "Peripheral coldness": 1, "Physical disability": 1, "Product administered to patient of inappropriate age": 1, "Pulmonary infarction": 1, "Pupil fixed": 1, "Renal embolism": 1, "Renal pain": 1, "Respiratory distress": 1, "Restlessness": 1, "Rhinorrhoea": 1, "Rotator cuff syndrome": 1, "Scan with contrast": 1, "Skin disorder": 1, "Skin mass": 1, "Splenic infarction": 1, "Tenderness": 1, "Tension headache": 1, "Tinnitus": 1, "Tracheal aspirate culture": 1, "Treponema test": 1, "Trigeminal neuralgia": 1, "Troponin": 1, "Troponin T": 1, "Tuberculosis": 1, "Urticaria": 1, "Vaccine breakthrough infection": 1, "Vein disorder": 1, "Vision blurred": 1, "Wheezing": 1, "White blood cell count abnormal": 1, "X-ray limb": 1}, "batchcodes": ["209A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A22A.json b/docs/data/histograms/South Africa/209A22A.json
index 9716c04e166..65ccd03db63 100644
--- a/docs/data/histograms/South Africa/209A22A.json
+++ b/docs/data/histograms/South Africa/209A22A.json
@@ -1 +1 @@
-{"batchcode": "209A22A", "histograms": [{"batchcodes": ["209A22A"], "histogram": {"Back pain": 1, "Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "209A22A", "histograms": [{"histogram": {"Back pain": 1, "Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["209A22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A26A.json b/docs/data/histograms/South Africa/209A26A.json
index 84d52c1bf07..bab008101c6 100644
--- a/docs/data/histograms/South Africa/209A26A.json
+++ b/docs/data/histograms/South Africa/209A26A.json
@@ -1 +1 @@
-{"batchcode": "209A26A", "histograms": [{"batchcodes": ["209A26A"], "histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "209A26A", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["209A26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A2A.json b/docs/data/histograms/South Africa/209A2A.json
index 37471211f0c..47a2434d4d6 100644
--- a/docs/data/histograms/South Africa/209A2A.json
+++ b/docs/data/histograms/South Africa/209A2A.json
@@ -1 +1 @@
-{"batchcode": "209A2A", "histograms": [{"batchcodes": ["209A2A"], "histogram": {"Back pain": 1, "Balance disorder": 1, "Burning sensation": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Diabetes mellitus": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "209A2A", "histograms": [{"histogram": {"Back pain": 1, "Balance disorder": 1, "Burning sensation": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Diabetes mellitus": 1, "Muscular weakness": 1}, "batchcodes": ["209A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209A2IA.json b/docs/data/histograms/South Africa/209A2IA.json
index a2b91fe9902..68743efb6cb 100644
--- a/docs/data/histograms/South Africa/209A2IA.json
+++ b/docs/data/histograms/South Africa/209A2IA.json
@@ -1 +1 @@
-{"batchcode": "209A2IA", "histograms": [{"batchcodes": ["209A2IA"], "histogram": {"Bronchospasm": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Guillain-Barre syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "209A2IA", "histograms": [{"histogram": {"Bronchospasm": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Guillain-Barre syndrome": 1}, "batchcodes": ["209A2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209AZ1A.json b/docs/data/histograms/South Africa/209AZ1A.json
index a8cce4210be..48492d7b45a 100644
--- a/docs/data/histograms/South Africa/209AZ1A.json
+++ b/docs/data/histograms/South Africa/209AZ1A.json
@@ -1 +1 @@
-{"batchcode": "209AZ1A", "histograms": [{"batchcodes": ["209AZ1A"], "histogram": {"Body temperature": 2, "Pyrexia": 2, "Agitation": 1, "Arthralgia": 1, "Back pain": 1, "Bell's palsy": 1, "Bursitis": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Ear pain": 1, "Fatigue": 1, "Headache": 1, "Hospitalisation": 1, "Inflammation": 1, "Influenza": 1, "Insomnia": 1, "Local reaction": 1, "Neck pain": 1, "Neurological symptom": 1, "Screaming": 1, "Suspected COVID-19": 1, "Tonsillar hypertrophy": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "209AZ1A", "histograms": [{"histogram": {"Body temperature": 2, "Pyrexia": 2, "Agitation": 1, "Arthralgia": 1, "Back pain": 1, "Bell's palsy": 1, "Bursitis": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Ear pain": 1, "Fatigue": 1, "Headache": 1, "Hospitalisation": 1, "Inflammation": 1, "Influenza": 1, "Insomnia": 1, "Local reaction": 1, "Neck pain": 1, "Neurological symptom": 1, "Screaming": 1, "Suspected COVID-19": 1, "Tonsillar hypertrophy": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "X-ray": 1}, "batchcodes": ["209AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209AZIA.json b/docs/data/histograms/South Africa/209AZIA.json
index 7eb32e52986..4070a4e6dad 100644
--- a/docs/data/histograms/South Africa/209AZIA.json
+++ b/docs/data/histograms/South Africa/209AZIA.json
@@ -1 +1 @@
-{"batchcode": "209AZIA", "histograms": [{"batchcodes": ["209AZIA"], "histogram": {"Eye swelling": 1, "Headache": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "209AZIA", "histograms": [{"histogram": {"Eye swelling": 1, "Headache": 1, "Local reaction": 1}, "batchcodes": ["209AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/209D21A.json b/docs/data/histograms/South Africa/209D21A.json
index a293b29f5a9..7191cdb1408 100644
--- a/docs/data/histograms/South Africa/209D21A.json
+++ b/docs/data/histograms/South Africa/209D21A.json
@@ -1 +1 @@
-{"batchcode": "209D21A", "histograms": [{"batchcodes": ["209D21A"], "histogram": {"Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1}}]}
\ No newline at end of file
+{"batchcode": "209D21A", "histograms": [{"histogram": {"Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1}, "batchcodes": ["209D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/20F08-09.json b/docs/data/histograms/South Africa/20F08-09.json
index fa92d197bee..09577dbcc11 100644
--- a/docs/data/histograms/South Africa/20F08-09.json
+++ b/docs/data/histograms/South Africa/20F08-09.json
@@ -1 +1 @@
-{"batchcode": "20F08-09", "histograms": [{"batchcodes": ["20F08-09"], "histogram": {"Deep vein thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "20F08-09", "histograms": [{"histogram": {"Deep vein thrombosis": 1}, "batchcodes": ["20F08-09"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/20FO8-09.json b/docs/data/histograms/South Africa/20FO8-09.json
index c07c69f75cf..3b6a3007ef2 100644
--- a/docs/data/histograms/South Africa/20FO8-09.json
+++ b/docs/data/histograms/South Africa/20FO8-09.json
@@ -1 +1 @@
-{"batchcode": "20FO8-09", "histograms": [{"batchcodes": ["20FO8-09"], "histogram": {"Arrhythmia": 1, "Chest pain": 1, "Electrocardiogram": 1, "Hypertension": 1, "Pain": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "20FO8-09", "histograms": [{"histogram": {"Arrhythmia": 1, "Chest pain": 1, "Electrocardiogram": 1, "Hypertension": 1, "Pain": 1, "Troponin": 1}, "batchcodes": ["20FO8-09"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/20G1 2-02.json b/docs/data/histograms/South Africa/20G1 2-02.json
index ea9e757a4ea..d75a542cd86 100644
--- a/docs/data/histograms/South Africa/20G1 2-02.json
+++ b/docs/data/histograms/South Africa/20G1 2-02.json
@@ -1 +1 @@
-{"batchcode": "20G1 2-02", "histograms": [{"batchcodes": ["20G1 2-02"], "histogram": {"Amnesia": 1, "Asthenia": 1, "Body temperature": 1, "Death": 1, "Dyspnoea": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "20G1 2-02", "histograms": [{"histogram": {"Amnesia": 1, "Asthenia": 1, "Body temperature": 1, "Death": 1, "Dyspnoea": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["20G1 2-02"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/216905.json b/docs/data/histograms/South Africa/216905.json
index cfc8d49a682..36c21858117 100644
--- a/docs/data/histograms/South Africa/216905.json
+++ b/docs/data/histograms/South Africa/216905.json
@@ -1 +1 @@
-{"batchcode": "216905", "histograms": [{"batchcodes": ["216905"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Haemorrhage": 1, "Heart rate": 1, "Hypertension": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "216905", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Haemorrhage": 1, "Heart rate": 1, "Hypertension": 1, "Respiratory rate": 1}, "batchcodes": ["216905"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/233/10:25/FCX.json b/docs/data/histograms/South Africa/233/10:25/FCX.json
index cd7351e4009..b44128a598c 100644
--- a/docs/data/histograms/South Africa/233/10:25/FCX.json
+++ b/docs/data/histograms/South Africa/233/10:25/FCX.json
@@ -1 +1 @@
-{"batchcode": "233/10:25/FCX", "histograms": [{"batchcodes": ["233/10:25/FCX"], "histogram": {"Angioedema": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "233/10:25/FCX", "histograms": [{"histogram": {"Angioedema": 1, "Urticaria": 1}, "batchcodes": ["233/10:25/FCX"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/290A21A.json b/docs/data/histograms/South Africa/290A21A.json
index d440d4951be..3f1348e97fc 100644
--- a/docs/data/histograms/South Africa/290A21A.json
+++ b/docs/data/histograms/South Africa/290A21A.json
@@ -1 +1 @@
-{"batchcode": "290A21A", "histograms": [{"batchcodes": ["290A21A"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Local reaction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "290A21A", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Local reaction": 1, "Vomiting": 1}, "batchcodes": ["290A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/291536AZTR8CWU.json b/docs/data/histograms/South Africa/291536AZTR8CWU.json
index f2f269f0bd0..ffeb94d6a6b 100644
--- a/docs/data/histograms/South Africa/291536AZTR8CWU.json
+++ b/docs/data/histograms/South Africa/291536AZTR8CWU.json
@@ -1 +1 @@
-{"batchcode": "291536AZTR8CWU", "histograms": [{"batchcodes": ["291536AZTR8CWU"], "histogram": {"Aldolase": 1, "Myalgia": 1, "Serum ferritin": 1}}]}
\ No newline at end of file
+{"batchcode": "291536AZTR8CWU", "histograms": [{"histogram": {"Aldolase": 1, "Myalgia": 1, "Serum ferritin": 1}, "batchcodes": ["291536AZTR8CWU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4301227.json b/docs/data/histograms/South Africa/4301227.json
index 3c624d1bc1a..85b5d3b4d02 100644
--- a/docs/data/histograms/South Africa/4301227.json
+++ b/docs/data/histograms/South Africa/4301227.json
@@ -1 +1 @@
-{"batchcode": "4301227", "histograms": [{"batchcodes": ["4301227"], "histogram": {"Headache": 1, "Oropharyngeal pain": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "4301227", "histograms": [{"histogram": {"Headache": 1, "Oropharyngeal pain": 1, "Pain": 1}, "batchcodes": ["4301227"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4381226.json b/docs/data/histograms/South Africa/4381226.json
index c0e87bbf3b8..00a449704e3 100644
--- a/docs/data/histograms/South Africa/4381226.json
+++ b/docs/data/histograms/South Africa/4381226.json
@@ -1 +1 @@
-{"batchcode": "4381226", "histograms": [{"batchcodes": ["4381226"], "histogram": {"Conjunctival haemorrhage": 1, "Headache": 1, "Lymphadenitis": 1, "Malaise": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "4381226", "histograms": [{"histogram": {"Conjunctival haemorrhage": 1, "Headache": 1, "Lymphadenitis": 1, "Malaise": 1, "Pain": 1}, "batchcodes": ["4381226"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4381227.json b/docs/data/histograms/South Africa/4381227.json
index 1fc36c1767f..e01b58f0d17 100644
--- a/docs/data/histograms/South Africa/4381227.json
+++ b/docs/data/histograms/South Africa/4381227.json
@@ -1 +1 @@
-{"batchcode": "4381227", "histograms": [{"batchcodes": ["4381227"], "histogram": {"Ataxia": 1, "Headache": 1, "Vertigo": 1, "Vestibular nystagmus": 1}}]}
\ No newline at end of file
+{"batchcode": "4381227", "histograms": [{"histogram": {"Ataxia": 1, "Headache": 1, "Vertigo": 1, "Vestibular nystagmus": 1}, "batchcodes": ["4381227"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4381228.json b/docs/data/histograms/South Africa/4381228.json
index 5ae1091c06c..6ca91bd7b1f 100644
--- a/docs/data/histograms/South Africa/4381228.json
+++ b/docs/data/histograms/South Africa/4381228.json
@@ -1 +1 @@
-{"batchcode": "4381228", "histograms": [{"batchcodes": ["4381228"], "histogram": {"Alopecia": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Swelling": 1, "Vaccination failure": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "4381228", "histograms": [{"histogram": {"Alopecia": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Swelling": 1, "Vaccination failure": 1, "Vomiting": 1}, "batchcodes": ["4381228"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4381266.json b/docs/data/histograms/South Africa/4381266.json
index b66a48e0cd8..4a7aafc08e9 100644
--- a/docs/data/histograms/South Africa/4381266.json
+++ b/docs/data/histograms/South Africa/4381266.json
@@ -1 +1 @@
-{"batchcode": "4381266", "histograms": [{"batchcodes": ["4381266"], "histogram": {"Dizziness": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "4381266", "histograms": [{"histogram": {"Dizziness": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["4381266"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/438233.json b/docs/data/histograms/South Africa/438233.json
index 3fa9d7b3a00..644166374ba 100644
--- a/docs/data/histograms/South Africa/438233.json
+++ b/docs/data/histograms/South Africa/438233.json
@@ -1 +1 @@
-{"batchcode": "438233", "histograms": [{"batchcodes": ["438233"], "histogram": {"Influenza like illness": 1}}]}
\ No newline at end of file
+{"batchcode": "438233", "histograms": [{"histogram": {"Influenza like illness": 1}, "batchcodes": ["438233"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382350.json b/docs/data/histograms/South Africa/4382350.json
index cff9b856ded..547b34d256c 100644
--- a/docs/data/histograms/South Africa/4382350.json
+++ b/docs/data/histograms/South Africa/4382350.json
@@ -1 +1 @@
-{"batchcode": "4382350", "histograms": [{"batchcodes": ["4382350"], "histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "4382350", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["4382350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382357.json b/docs/data/histograms/South Africa/4382357.json
index f64db6812b8..b615a1edb41 100644
--- a/docs/data/histograms/South Africa/4382357.json
+++ b/docs/data/histograms/South Africa/4382357.json
@@ -1 +1 @@
-{"batchcode": "4382357", "histograms": [{"batchcodes": ["4382357"], "histogram": {"Blood potassium": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Chest X-ray": 1, "Electrocardiogram": 1, "Exercise tolerance decreased": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate": 1, "HIV test": 1, "Mean cell volume": 1, "Oesophagitis": 1, "Pain": 1, "Product physical issue": 1, "Pyrexia": 1, "Red blood cell count": 1, "Shock": 1, "Troponin": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "4382357", "histograms": [{"histogram": {"Blood potassium": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Chest X-ray": 1, "Electrocardiogram": 1, "Exercise tolerance decreased": 1, "Gastrooesophageal reflux disease": 1, "Glomerular filtration rate": 1, "HIV test": 1, "Mean cell volume": 1, "Oesophagitis": 1, "Pain": 1, "Product physical issue": 1, "Pyrexia": 1, "Red blood cell count": 1, "Shock": 1, "Troponin": 1, "Ultrasound scan": 1}, "batchcodes": ["4382357"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382358,961177.json b/docs/data/histograms/South Africa/4382358,961177.json
index 1eca9354308..91344877931 100644
--- a/docs/data/histograms/South Africa/4382358,961177.json
+++ b/docs/data/histograms/South Africa/4382358,961177.json
@@ -1 +1 @@
-{"batchcode": "4382358,961177", "histograms": [{"batchcodes": ["4382358,961177"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "4382358,961177", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Pyrexia": 1}, "batchcodes": ["4382358,961177"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382386, 961176.json b/docs/data/histograms/South Africa/4382386, 961176.json
index 6fbd7604ad4..4ec07863eef 100644
--- a/docs/data/histograms/South Africa/4382386, 961176.json
+++ b/docs/data/histograms/South Africa/4382386, 961176.json
@@ -1 +1 @@
-{"batchcode": "4382386, 961176", "histograms": [{"batchcodes": ["4382386, 961176"], "histogram": {"Heavy menstrual bleeding": 1, "Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "4382386, 961176", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1, "Menstruation irregular": 1}, "batchcodes": ["4382386, 961176"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382386.json b/docs/data/histograms/South Africa/4382386.json
index e1e6449482f..e3d50cbe2b1 100644
--- a/docs/data/histograms/South Africa/4382386.json
+++ b/docs/data/histograms/South Africa/4382386.json
@@ -1 +1 @@
-{"batchcode": "4382386", "histograms": [{"batchcodes": ["4382386"], "histogram": {"Body temperature": 1, "Local reaction": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "4382386", "histograms": [{"histogram": {"Body temperature": 1, "Local reaction": 1, "Pyrexia": 1}, "batchcodes": ["4382386"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382387.json b/docs/data/histograms/South Africa/4382387.json
index e97302a6115..da08f60893d 100644
--- a/docs/data/histograms/South Africa/4382387.json
+++ b/docs/data/histograms/South Africa/4382387.json
@@ -1 +1 @@
-{"batchcode": "4382387", "histograms": [{"batchcodes": ["4382387"], "histogram": {"Back pain": 2, "Body temperature": 2, "Chills": 2, "Fatigue": 2, "Headache": 2, "Pyrexia": 2, "Abdominal pain": 1, "Amnesia": 1, "Arthralgia": 1, "Asthenia": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Cardiovascular function test": 1, "Diplegia": 1, "Dizziness": 1, "Dry eye": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Ear infection": 1, "Erythema": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Injection site pain": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Nasal obstruction": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Platelet count": 1, "Protein total": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Sinusitis": 1, "Speech disorder": 1, "Swelling": 1, "Tearfulness": 1, "Transaminases": 1, "Vision blurred": 1, "Visual impairment": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "4382387", "histograms": [{"histogram": {"Back pain": 2, "Body temperature": 2, "Chills": 2, "Fatigue": 2, "Headache": 2, "Pyrexia": 2, "Abdominal pain": 1, "Amnesia": 1, "Arthralgia": 1, "Asthenia": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Cardiovascular function test": 1, "Diplegia": 1, "Dizziness": 1, "Dry eye": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Ear infection": 1, "Erythema": 1, "Gamma-glutamyltransferase": 1, "Haematocrit": 1, "Haemoglobin": 1, "Injection site pain": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Nasal obstruction": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Platelet count": 1, "Protein total": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Sinusitis": 1, "Speech disorder": 1, "Swelling": 1, "Tearfulness": 1, "Transaminases": 1, "Vision blurred": 1, "Visual impairment": 1, "White blood cell count": 1}, "batchcodes": ["4382387"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382388.json b/docs/data/histograms/South Africa/4382388.json
index ea1dca81edc..6af2258a9bf 100644
--- a/docs/data/histograms/South Africa/4382388.json
+++ b/docs/data/histograms/South Africa/4382388.json
@@ -1 +1 @@
-{"batchcode": "4382388", "histograms": [{"batchcodes": ["4382388"], "histogram": {"Bronchospasm": 1, "COVID-19": 1, "Headache": 1, "Hypoaesthesia": 1, "Local reaction": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "4382388", "histograms": [{"histogram": {"Bronchospasm": 1, "COVID-19": 1, "Headache": 1, "Hypoaesthesia": 1, "Local reaction": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test": 1, "Syncope": 1}, "batchcodes": ["4382388"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/4382569.json b/docs/data/histograms/South Africa/4382569.json
index 347463e682e..97f7262ca4a 100644
--- a/docs/data/histograms/South Africa/4382569.json
+++ b/docs/data/histograms/South Africa/4382569.json
@@ -1 +1 @@
-{"batchcode": "4382569", "histograms": [{"batchcodes": ["4382569"], "histogram": {"Lymphadenitis": 1}}]}
\ No newline at end of file
+{"batchcode": "4382569", "histograms": [{"histogram": {"Lymphadenitis": 1}, "batchcodes": ["4382569"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/598285/D263.json b/docs/data/histograms/South Africa/598285/D263.json
index a22f035a561..b9c747fc82d 100644
--- a/docs/data/histograms/South Africa/598285/D263.json
+++ b/docs/data/histograms/South Africa/598285/D263.json
@@ -1 +1 @@
-{"batchcode": "598285/D263", "histograms": [{"batchcodes": ["598285/D263"], "histogram": {"Postmenopausal haemorrhage": 1, "Smear cervix": 1}}]}
\ No newline at end of file
+{"batchcode": "598285/D263", "histograms": [{"histogram": {"Postmenopausal haemorrhage": 1, "Smear cervix": 1}, "batchcodes": ["598285/D263"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/5982851D263.json b/docs/data/histograms/South Africa/5982851D263.json
index 47467ef93f8..daa4f518bd0 100644
--- a/docs/data/histograms/South Africa/5982851D263.json
+++ b/docs/data/histograms/South Africa/5982851D263.json
@@ -1 +1 @@
-{"batchcode": "5982851D263", "histograms": [{"batchcodes": ["5982851D263"], "histogram": {"Back pain": 1, "Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "5982851D263", "histograms": [{"histogram": {"Back pain": 1, "Chest pain": 1}, "batchcodes": ["5982851D263"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/63782.json b/docs/data/histograms/South Africa/63782.json
index 7f9fb2dc992..aff4476619c 100644
--- a/docs/data/histograms/South Africa/63782.json
+++ b/docs/data/histograms/South Africa/63782.json
@@ -1 +1 @@
-{"batchcode": "63782", "histograms": [{"batchcodes": ["63782"], "histogram": {"Dyspepsia": 1}}]}
\ No newline at end of file
+{"batchcode": "63782", "histograms": [{"histogram": {"Dyspepsia": 1}, "batchcodes": ["63782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/7A7812.json b/docs/data/histograms/South Africa/7A7812.json
index bf26c7e92ad..9b340e3357f 100644
--- a/docs/data/histograms/South Africa/7A7812.json
+++ b/docs/data/histograms/South Africa/7A7812.json
@@ -1 +1 @@
-{"batchcode": "7A7812", "histograms": [{"batchcodes": ["7A7812"], "histogram": {"Swelling": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "7A7812", "histograms": [{"histogram": {"Swelling": 1, "Thrombosis": 1}, "batchcodes": ["7A7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/7E2090.json b/docs/data/histograms/South Africa/7E2090.json
index 0b0c76fa852..3a7cc5643f4 100644
--- a/docs/data/histograms/South Africa/7E2090.json
+++ b/docs/data/histograms/South Africa/7E2090.json
@@ -1 +1 @@
-{"batchcode": "7E2090", "histograms": [{"batchcodes": ["7E2090"], "histogram": {"Arthralgia": 1, "Breast pain": 1, "Decreased appetite": 1, "Headache": 1, "Hypoaesthesia": 1, "Local reaction": 1, "Nausea": 1, "Off label use": 1, "Product use issue": 1}}]}
\ No newline at end of file
+{"batchcode": "7E2090", "histograms": [{"histogram": {"Arthralgia": 1, "Breast pain": 1, "Decreased appetite": 1, "Headache": 1, "Hypoaesthesia": 1, "Local reaction": 1, "Nausea": 1, "Off label use": 1, "Product use issue": 1}, "batchcodes": ["7E2090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/7E3064.json b/docs/data/histograms/South Africa/7E3064.json
index 10c4306219e..241298951fa 100644
--- a/docs/data/histograms/South Africa/7E3064.json
+++ b/docs/data/histograms/South Africa/7E3064.json
@@ -1 +1 @@
-{"batchcode": "7E3064", "histograms": [{"batchcodes": ["7E3064"], "histogram": {"Angioedema": 1}}]}
\ No newline at end of file
+{"batchcode": "7E3064", "histograms": [{"histogram": {"Angioedema": 1}, "batchcodes": ["7E3064"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/7G 7900.json b/docs/data/histograms/South Africa/7G 7900.json
index 025bc5fd311..dccd0233060 100644
--- a/docs/data/histograms/South Africa/7G 7900.json
+++ b/docs/data/histograms/South Africa/7G 7900.json
@@ -1 +1 @@
-{"batchcode": "7G 7900", "histograms": [{"batchcodes": ["7G 7900"], "histogram": {"Cerebrovascular accident": 1, "Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "7G 7900", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Hypertension": 1}, "batchcodes": ["7G 7900"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/8643.json b/docs/data/histograms/South Africa/8643.json
index 9bc3ff0bf66..9c15e1be03a 100644
--- a/docs/data/histograms/South Africa/8643.json
+++ b/docs/data/histograms/South Africa/8643.json
@@ -1 +1 @@
-{"batchcode": "8643", "histograms": [{"batchcodes": ["8643"], "histogram": {"Fall": 1, "Skin laceration": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "8643", "histograms": [{"histogram": {"Fall": 1, "Skin laceration": 1, "Somnolence": 1}, "batchcodes": ["8643"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/A3214.json b/docs/data/histograms/South Africa/A3214.json
index 2c6d3879f09..99d3272ca0c 100644
--- a/docs/data/histograms/South Africa/A3214.json
+++ b/docs/data/histograms/South Africa/A3214.json
@@ -1 +1 @@
-{"batchcode": "A3214", "histograms": [{"batchcodes": ["A3214"], "histogram": {"Ear pain": 1, "Headache": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "A3214", "histograms": [{"histogram": {"Ear pain": 1, "Headache": 1, "Local reaction": 1}, "batchcodes": ["A3214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/AF5715.json b/docs/data/histograms/South Africa/AF5715.json
index 57073eb0f8c..871870c1c22 100644
--- a/docs/data/histograms/South Africa/AF5715.json
+++ b/docs/data/histograms/South Africa/AF5715.json
@@ -1 +1 @@
-{"batchcode": "AF5715", "histograms": [{"batchcodes": ["AF5715"], "histogram": {"International normalised ratio": 1, "International normalised ratio abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "AF5715", "histograms": [{"histogram": {"International normalised ratio": 1, "International normalised ratio abnormal": 1}, "batchcodes": ["AF5715"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/AY4834.json b/docs/data/histograms/South Africa/AY4834.json
index 191e0963379..fc38a2a2b4f 100644
--- a/docs/data/histograms/South Africa/AY4834.json
+++ b/docs/data/histograms/South Africa/AY4834.json
@@ -1 +1 @@
-{"batchcode": "AY4834", "histograms": [{"batchcodes": ["AY4834"], "histogram": {"Diarrhoea": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "AY4834", "histograms": [{"histogram": {"Diarrhoea": 1, "Local reaction": 1}, "batchcodes": ["AY4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/BN209A21A.json b/docs/data/histograms/South Africa/BN209A21A.json
index 924d29026b9..c02ef309825 100644
--- a/docs/data/histograms/South Africa/BN209A21A.json
+++ b/docs/data/histograms/South Africa/BN209A21A.json
@@ -1 +1 @@
-{"batchcode": "BN209A21A", "histograms": [{"batchcodes": ["BN209A21A"], "histogram": {"Asthenia": 1, "Chest discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "BN209A21A", "histograms": [{"histogram": {"Asthenia": 1, "Chest discomfort": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["BN209A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/BOB-12QB9P6UJ.json b/docs/data/histograms/South Africa/BOB-12QB9P6UJ.json
index 600d6b612f9..5578c20abbc 100644
--- a/docs/data/histograms/South Africa/BOB-12QB9P6UJ.json
+++ b/docs/data/histograms/South Africa/BOB-12QB9P6UJ.json
@@ -1 +1 @@
-{"batchcode": "BOB-12QB9P6UJ", "histograms": [{"batchcodes": ["BOB-12QB9P6UJ"], "histogram": {"Acute coronary syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "BOB-12QB9P6UJ", "histograms": [{"histogram": {"Acute coronary syndrome": 1}, "batchcodes": ["BOB-12QB9P6UJ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C37CMJ7PEHTK.json b/docs/data/histograms/South Africa/C37CMJ7PEHTK.json
index 45a79a0099a..00533831dd2 100644
--- a/docs/data/histograms/South Africa/C37CMJ7PEHTK.json
+++ b/docs/data/histograms/South Africa/C37CMJ7PEHTK.json
@@ -1 +1 @@
-{"batchcode": "C37CMJ7PEHTK", "histograms": [{"batchcodes": ["C37CMJ7PEHTK"], "histogram": {"Arthralgia": 1, "Chills": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "C37CMJ7PEHTK", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Hypoaesthesia": 1}, "batchcodes": ["C37CMJ7PEHTK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C3AU3FAXPPUW.json b/docs/data/histograms/South Africa/C3AU3FAXPPUW.json
index 943eab71245..7111bcead18 100644
--- a/docs/data/histograms/South Africa/C3AU3FAXPPUW.json
+++ b/docs/data/histograms/South Africa/C3AU3FAXPPUW.json
@@ -1 +1 @@
-{"batchcode": "C3AU3FAXPPUW", "histograms": [{"batchcodes": ["C3AU3FAXPPUW"], "histogram": {"Hallucination": 1}}]}
\ No newline at end of file
+{"batchcode": "C3AU3FAXPPUW", "histograms": [{"histogram": {"Hallucination": 1}, "batchcodes": ["C3AU3FAXPPUW"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C3EFLWU6TKTM.json b/docs/data/histograms/South Africa/C3EFLWU6TKTM.json
index fc0254b91d1..fa0062e952a 100644
--- a/docs/data/histograms/South Africa/C3EFLWU6TKTM.json
+++ b/docs/data/histograms/South Africa/C3EFLWU6TKTM.json
@@ -1 +1 @@
-{"batchcode": "C3EFLWU6TKTM", "histograms": [{"batchcodes": ["C3EFLWU6TKTM"], "histogram": {"COVID-19 pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "C3EFLWU6TKTM", "histograms": [{"histogram": {"COVID-19 pneumonia": 1}, "batchcodes": ["C3EFLWU6TKTM"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C3HJPFYV9HRR.json b/docs/data/histograms/South Africa/C3HJPFYV9HRR.json
index d52f5c91ba8..bed77669a6d 100644
--- a/docs/data/histograms/South Africa/C3HJPFYV9HRR.json
+++ b/docs/data/histograms/South Africa/C3HJPFYV9HRR.json
@@ -1 +1 @@
-{"batchcode": "C3HJPFYV9HRR", "histograms": [{"batchcodes": ["C3HJPFYV9HRR"], "histogram": {"Lymphadenopathy": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "C3HJPFYV9HRR", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["C3HJPFYV9HRR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C3NMVY37EMTL.json b/docs/data/histograms/South Africa/C3NMVY37EMTL.json
index ba6a9a202e4..5067fedc571 100644
--- a/docs/data/histograms/South Africa/C3NMVY37EMTL.json
+++ b/docs/data/histograms/South Africa/C3NMVY37EMTL.json
@@ -1 +1 @@
-{"batchcode": "C3NMVY37EMTL", "histograms": [{"batchcodes": ["C3NMVY37EMTL"], "histogram": {"Feeding disorder": 1, "Guillain-Barre syndrome": 1, "Paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "C3NMVY37EMTL", "histograms": [{"histogram": {"Feeding disorder": 1, "Guillain-Barre syndrome": 1, "Paralysis": 1}, "batchcodes": ["C3NMVY37EMTL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C79XH4EHJHNE.json b/docs/data/histograms/South Africa/C79XH4EHJHNE.json
index 061e80824f1..1b5b2b55fab 100644
--- a/docs/data/histograms/South Africa/C79XH4EHJHNE.json
+++ b/docs/data/histograms/South Africa/C79XH4EHJHNE.json
@@ -1 +1 @@
-{"batchcode": "C79XH4EHJHNE", "histograms": [{"batchcodes": ["C79XH4EHJHNE"], "histogram": {"Autonomic nervous system imbalance": 1, "Fatigue": 1, "Migraine": 1, "Neuropathy peripheral": 1, "Postural orthostatic tachycardia syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "C79XH4EHJHNE", "histograms": [{"histogram": {"Autonomic nervous system imbalance": 1, "Fatigue": 1, "Migraine": 1, "Neuropathy peripheral": 1, "Postural orthostatic tachycardia syndrome": 1}, "batchcodes": ["C79XH4EHJHNE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C7GE3PLK4CDE.json b/docs/data/histograms/South Africa/C7GE3PLK4CDE.json
index 13f5c723393..3aa0cec8c63 100644
--- a/docs/data/histograms/South Africa/C7GE3PLK4CDE.json
+++ b/docs/data/histograms/South Africa/C7GE3PLK4CDE.json
@@ -1 +1 @@
-{"batchcode": "C7GE3PLK4CDE", "histograms": [{"batchcodes": ["C7GE3PLK4CDE"], "histogram": {"Breast mass": 1}}]}
\ No newline at end of file
+{"batchcode": "C7GE3PLK4CDE", "histograms": [{"histogram": {"Breast mass": 1}, "batchcodes": ["C7GE3PLK4CDE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/C94X7RTN RP3U.json b/docs/data/histograms/South Africa/C94X7RTN RP3U.json
index d6dd0e6dc6c..3587852a1f6 100644
--- a/docs/data/histograms/South Africa/C94X7RTN RP3U.json
+++ b/docs/data/histograms/South Africa/C94X7RTN RP3U.json
@@ -1 +1 @@
-{"batchcode": "C94X7RTN RP3U", "histograms": [{"batchcodes": ["C94X7RTN RP3U"], "histogram": {"Contusion": 1, "Erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "C94X7RTN RP3U", "histograms": [{"histogram": {"Contusion": 1, "Erythema": 1}, "batchcodes": ["C94X7RTN RP3U"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CA4AW7RYHNTM.json b/docs/data/histograms/South Africa/CA4AW7RYHNTM.json
index b382f12eed1..408d2e77742 100644
--- a/docs/data/histograms/South Africa/CA4AW7RYHNTM.json
+++ b/docs/data/histograms/South Africa/CA4AW7RYHNTM.json
@@ -1 +1 @@
-{"batchcode": "CA4AW7RYHNTM", "histograms": [{"batchcodes": ["CA4AW7RYHNTM"], "histogram": {"Gait disturbance": 1}}]}
\ No newline at end of file
+{"batchcode": "CA4AW7RYHNTM", "histograms": [{"histogram": {"Gait disturbance": 1}, "batchcodes": ["CA4AW7RYHNTM"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CA7812.json b/docs/data/histograms/South Africa/CA7812.json
index 3c3486a96c9..4f5f4401a53 100644
--- a/docs/data/histograms/South Africa/CA7812.json
+++ b/docs/data/histograms/South Africa/CA7812.json
@@ -1 +1 @@
-{"batchcode": "CA7812", "histograms": [{"batchcodes": ["CA7812"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "CA7812", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["CA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CAPJ3CTFK9XN.json b/docs/data/histograms/South Africa/CAPJ3CTFK9XN.json
index 6a0b9fc3a83..d39a3f21a69 100644
--- a/docs/data/histograms/South Africa/CAPJ3CTFK9XN.json
+++ b/docs/data/histograms/South Africa/CAPJ3CTFK9XN.json
@@ -1 +1 @@
-{"batchcode": "CAPJ3CTFK9XN", "histograms": [{"batchcodes": ["CAPJ3CTFK9XN"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "CAPJ3CTFK9XN", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1}, "batchcodes": ["CAPJ3CTFK9XN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CCMHF9A9U4KF.json b/docs/data/histograms/South Africa/CCMHF9A9U4KF.json
index 44d2963c34f..a168aa92fcb 100644
--- a/docs/data/histograms/South Africa/CCMHF9A9U4KF.json
+++ b/docs/data/histograms/South Africa/CCMHF9A9U4KF.json
@@ -1 +1 @@
-{"batchcode": "CCMHF9A9U4KF", "histograms": [{"batchcodes": ["CCMHF9A9U4KF"], "histogram": {"Aphasia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Hypokinesia": 1, "Monoplegia": 1, "Motor neurone disease": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "CCMHF9A9U4KF", "histograms": [{"histogram": {"Aphasia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Hypokinesia": 1, "Monoplegia": 1, "Motor neurone disease": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Weight decreased": 1}, "batchcodes": ["CCMHF9A9U4KF"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CEKFYU3E3MKE.json b/docs/data/histograms/South Africa/CEKFYU3E3MKE.json
index 2e6f6c48185..26cad91a7a6 100644
--- a/docs/data/histograms/South Africa/CEKFYU3E3MKE.json
+++ b/docs/data/histograms/South Africa/CEKFYU3E3MKE.json
@@ -1 +1 @@
-{"batchcode": "CEKFYU3E3MKE", "histograms": [{"batchcodes": ["CEKFYU3E3MKE"], "histogram": {"Back pain": 1, "Gait disturbance": 1}}]}
\ No newline at end of file
+{"batchcode": "CEKFYU3E3MKE", "histograms": [{"histogram": {"Back pain": 1, "Gait disturbance": 1}, "batchcodes": ["CEKFYU3E3MKE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CFJCPXEMYL3W.json b/docs/data/histograms/South Africa/CFJCPXEMYL3W.json
index 87e8bc71f45..9912f890636 100644
--- a/docs/data/histograms/South Africa/CFJCPXEMYL3W.json
+++ b/docs/data/histograms/South Africa/CFJCPXEMYL3W.json
@@ -1 +1 @@
-{"batchcode": "CFJCPXEMYL3W", "histograms": [{"batchcodes": ["CFJCPXEMYL3W"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "CFJCPXEMYL3W", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["CFJCPXEMYL3W"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CH4P7JWTARK.json b/docs/data/histograms/South Africa/CH4P7JWTARK.json
index 87c4dad000c..4c338e31c4b 100644
--- a/docs/data/histograms/South Africa/CH4P7JWTARK.json
+++ b/docs/data/histograms/South Africa/CH4P7JWTARK.json
@@ -1 +1 @@
-{"batchcode": "CH4P7JWTARK", "histograms": [{"batchcodes": ["CH4P7JWTARK"], "histogram": {"Headache": 1, "Nausea": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "CH4P7JWTARK", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1, "Pain": 1}, "batchcodes": ["CH4P7JWTARK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CHLVHH9LV7TA.json b/docs/data/histograms/South Africa/CHLVHH9LV7TA.json
index 15533dfbdfb..9f792aaa245 100644
--- a/docs/data/histograms/South Africa/CHLVHH9LV7TA.json
+++ b/docs/data/histograms/South Africa/CHLVHH9LV7TA.json
@@ -1 +1 @@
-{"batchcode": "CHLVHH9LV7TA", "histograms": [{"batchcodes": ["CHLVHH9LV7TA"], "histogram": {"Oral pain": 1}}]}
\ No newline at end of file
+{"batchcode": "CHLVHH9LV7TA", "histograms": [{"histogram": {"Oral pain": 1}, "batchcodes": ["CHLVHH9LV7TA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CJHF9JPFEAUW.json b/docs/data/histograms/South Africa/CJHF9JPFEAUW.json
index 217da973a77..c743e0cf5a4 100644
--- a/docs/data/histograms/South Africa/CJHF9JPFEAUW.json
+++ b/docs/data/histograms/South Africa/CJHF9JPFEAUW.json
@@ -1 +1 @@
-{"batchcode": "CJHF9JPFEAUW", "histograms": [{"batchcodes": ["CJHF9JPFEAUW"], "histogram": {"Blood test": 1, "Electrocardiogram": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "CJHF9JPFEAUW", "histograms": [{"histogram": {"Blood test": 1, "Electrocardiogram": 1, "Pain in extremity": 1}, "batchcodes": ["CJHF9JPFEAUW"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CJMYL.json b/docs/data/histograms/South Africa/CJMYL.json
index c13749e5677..56335745c85 100644
--- a/docs/data/histograms/South Africa/CJMYL.json
+++ b/docs/data/histograms/South Africa/CJMYL.json
@@ -1 +1 @@
-{"batchcode": "CJMYL", "histograms": [{"batchcodes": ["CJMYL"], "histogram": {"Antinuclear antibody": 1, "Lumbar puncture": 1, "Lumbosacral plexopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging spinal": 1, "Protein total": 1}}]}
\ No newline at end of file
+{"batchcode": "CJMYL", "histograms": [{"histogram": {"Antinuclear antibody": 1, "Lumbar puncture": 1, "Lumbosacral plexopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging spinal": 1, "Protein total": 1}, "batchcodes": ["CJMYL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CK9MLHUWKEFU.json b/docs/data/histograms/South Africa/CK9MLHUWKEFU.json
index d3718c6c0f0..eb30c9bc841 100644
--- a/docs/data/histograms/South Africa/CK9MLHUWKEFU.json
+++ b/docs/data/histograms/South Africa/CK9MLHUWKEFU.json
@@ -1 +1 @@
-{"batchcode": "CK9MLHUWKEFU", "histograms": [{"batchcodes": ["CK9MLHUWKEFU"], "histogram": {"Amnesia": 1, "Diarrhoea": 1, "Fatigue": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "CK9MLHUWKEFU", "histograms": [{"histogram": {"Amnesia": 1, "Diarrhoea": 1, "Fatigue": 1, "Nausea": 1}, "batchcodes": ["CK9MLHUWKEFU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CL479KLMFX47.json b/docs/data/histograms/South Africa/CL479KLMFX47.json
index b016fcee7db..3ec51498c95 100644
--- a/docs/data/histograms/South Africa/CL479KLMFX47.json
+++ b/docs/data/histograms/South Africa/CL479KLMFX47.json
@@ -1 +1 @@
-{"batchcode": "CL479KLMFX47", "histograms": [{"batchcodes": ["CL479KLMFX47"], "histogram": {"Body temperature": 1, "Oedema peripheral": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "CL479KLMFX47", "histograms": [{"histogram": {"Body temperature": 1, "Oedema peripheral": 1, "Pyrexia": 1}, "batchcodes": ["CL479KLMFX47"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CM3H3.json b/docs/data/histograms/South Africa/CM3H3.json
index a980ae60d60..15f4b2b274f 100644
--- a/docs/data/histograms/South Africa/CM3H3.json
+++ b/docs/data/histograms/South Africa/CM3H3.json
@@ -1 +1 @@
-{"batchcode": "CM3H3", "histograms": [{"batchcodes": ["CM3H3"], "histogram": {"Abdominal pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Local reaction": 1, "Oxygen saturation": 1, "Renal failure": 1, "Respiratory rate": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "CM3H3", "histograms": [{"histogram": {"Abdominal pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Heart rate": 1, "Local reaction": 1, "Oxygen saturation": 1, "Renal failure": 1, "Respiratory rate": 1, "Vomiting": 1}, "batchcodes": ["CM3H3"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CMX7XC, AWTYXC.json b/docs/data/histograms/South Africa/CMX7XC, AWTYXC.json
index b499babfcb1..68c607eb3b5 100644
--- a/docs/data/histograms/South Africa/CMX7XC, AWTYXC.json
+++ b/docs/data/histograms/South Africa/CMX7XC, AWTYXC.json
@@ -1 +1 @@
-{"batchcode": "CMX7XC, AWTYXC", "histograms": [{"batchcodes": ["CMX7XC, AWTYXC"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "CMX7XC, AWTYXC", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["CMX7XC, AWTYXC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CMYRYRERPX3LLP.json b/docs/data/histograms/South Africa/CMYRYRERPX3LLP.json
index 852ec0db31d..20dba37718a 100644
--- a/docs/data/histograms/South Africa/CMYRYRERPX3LLP.json
+++ b/docs/data/histograms/South Africa/CMYRYRERPX3LLP.json
@@ -1 +1 @@
-{"batchcode": "CMYRYRERPX3LLP", "histograms": [{"batchcodes": ["CMYRYRERPX3LLP"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "CMYRYRERPX3LLP", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["CMYRYRERPX3LLP"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CN3JEKJMWP7N.json b/docs/data/histograms/South Africa/CN3JEKJMWP7N.json
index b7a12f500e9..fef9ac1f546 100644
--- a/docs/data/histograms/South Africa/CN3JEKJMWP7N.json
+++ b/docs/data/histograms/South Africa/CN3JEKJMWP7N.json
@@ -1 +1 @@
-{"batchcode": "CN3JEKJMWP7N", "histograms": [{"batchcodes": ["CN3JEKJMWP7N"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "CN3JEKJMWP7N", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["CN3JEKJMWP7N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CN3JRACKXVN3.json b/docs/data/histograms/South Africa/CN3JRACKXVN3.json
index a33418deaa9..5cc67f023b0 100644
--- a/docs/data/histograms/South Africa/CN3JRACKXVN3.json
+++ b/docs/data/histograms/South Africa/CN3JRACKXVN3.json
@@ -1 +1 @@
-{"batchcode": "CN3JRACKXVN3", "histograms": [{"batchcodes": ["CN3JRACKXVN3"], "histogram": {"Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "CN3JRACKXVN3", "histograms": [{"histogram": {"Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1}, "batchcodes": ["CN3JRACKXVN3"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CNN3LV3ULFU3.json b/docs/data/histograms/South Africa/CNN3LV3ULFU3.json
index d91866d638e..25d23e97c9d 100644
--- a/docs/data/histograms/South Africa/CNN3LV3ULFU3.json
+++ b/docs/data/histograms/South Africa/CNN3LV3ULFU3.json
@@ -1 +1 @@
-{"batchcode": "CNN3LV3ULFU3", "histograms": [{"batchcodes": ["CNN3LV3ULFU3"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "CNN3LV3ULFU3", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["CNN3LV3ULFU3"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CR67XR7M6RN9.json b/docs/data/histograms/South Africa/CR67XR7M6RN9.json
index 33322fe79fd..6136e898558 100644
--- a/docs/data/histograms/South Africa/CR67XR7M6RN9.json
+++ b/docs/data/histograms/South Africa/CR67XR7M6RN9.json
@@ -1 +1 @@
-{"batchcode": "CR67XR7M6RN9", "histograms": [{"batchcodes": ["CR67XR7M6RN9"], "histogram": {"Eye swelling": 1, "Ocular hyperaemia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "CR67XR7M6RN9", "histograms": [{"histogram": {"Eye swelling": 1, "Ocular hyperaemia": 1, "Rash": 1}, "batchcodes": ["CR67XR7M6RN9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CRNAFEEF7HTH.json b/docs/data/histograms/South Africa/CRNAFEEF7HTH.json
index 40af9f645b4..aef656d93d7 100644
--- a/docs/data/histograms/South Africa/CRNAFEEF7HTH.json
+++ b/docs/data/histograms/South Africa/CRNAFEEF7HTH.json
@@ -1 +1 @@
-{"batchcode": "CRNAFEEF7HTH", "histograms": [{"batchcodes": ["CRNAFEEF7HTH"], "histogram": {"Ageusia": 1}}]}
\ No newline at end of file
+{"batchcode": "CRNAFEEF7HTH", "histograms": [{"histogram": {"Ageusia": 1}, "batchcodes": ["CRNAFEEF7HTH"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CRR4730L730HK.json b/docs/data/histograms/South Africa/CRR4730L730HK.json
index b411415c2d4..40022743695 100644
--- a/docs/data/histograms/South Africa/CRR4730L730HK.json
+++ b/docs/data/histograms/South Africa/CRR4730L730HK.json
@@ -1 +1 @@
-{"batchcode": "CRR4730L730HK", "histograms": [{"batchcodes": ["CRR4730L730HK"], "histogram": {"Toxic shock syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "CRR4730L730HK", "histograms": [{"histogram": {"Toxic shock syndrome": 1}, "batchcodes": ["CRR4730L730HK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CT4TEPAKXEH.json b/docs/data/histograms/South Africa/CT4TEPAKXEH.json
index fbf8246e3c5..b00f89259a3 100644
--- a/docs/data/histograms/South Africa/CT4TEPAKXEH.json
+++ b/docs/data/histograms/South Africa/CT4TEPAKXEH.json
@@ -1 +1 @@
-{"batchcode": "CT4TEPAKXEH", "histograms": [{"batchcodes": ["CT4TEPAKXEH"], "histogram": {"Headache": 1, "Local reaction": 1, "Muscular weakness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "CT4TEPAKXEH", "histograms": [{"histogram": {"Headache": 1, "Local reaction": 1, "Muscular weakness": 1, "Pain in extremity": 1}, "batchcodes": ["CT4TEPAKXEH"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CU9PFV9 MJUUP.json b/docs/data/histograms/South Africa/CU9PFV9 MJUUP.json
index 01ef0359479..95f8bbe0ba6 100644
--- a/docs/data/histograms/South Africa/CU9PFV9 MJUUP.json
+++ b/docs/data/histograms/South Africa/CU9PFV9 MJUUP.json
@@ -1 +1 @@
-{"batchcode": "CU9PFV9 MJUUP", "histograms": [{"batchcodes": ["CU9PFV9 MJUUP"], "histogram": {"Headache": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "CU9PFV9 MJUUP", "histograms": [{"histogram": {"Headache": 1, "Local reaction": 1}, "batchcodes": ["CU9PFV9 MJUUP"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CUNTMJ13 P79T.json b/docs/data/histograms/South Africa/CUNTMJ13 P79T.json
index 8ecac533693..a52c3acbd38 100644
--- a/docs/data/histograms/South Africa/CUNTMJ13 P79T.json
+++ b/docs/data/histograms/South Africa/CUNTMJ13 P79T.json
@@ -1 +1 @@
-{"batchcode": "CUNTMJ13 P79T", "histograms": [{"batchcodes": ["CUNTMJ13 P79T"], "histogram": {"Eye pruritus": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "CUNTMJ13 P79T", "histograms": [{"histogram": {"Eye pruritus": 1, "Vision blurred": 1}, "batchcodes": ["CUNTMJ13 P79T"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CUPKMMCF4TJ4.json b/docs/data/histograms/South Africa/CUPKMMCF4TJ4.json
index 5de2d5ab089..6e430d3012c 100644
--- a/docs/data/histograms/South Africa/CUPKMMCF4TJ4.json
+++ b/docs/data/histograms/South Africa/CUPKMMCF4TJ4.json
@@ -1 +1 @@
-{"batchcode": "CUPKMMCF4TJ4", "histograms": [{"batchcodes": ["CUPKMMCF4TJ4"], "histogram": {"Angina pectoris": 1, "Death": 1, "Heart rate increased": 1, "Local reaction": 1, "Toxic shock syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "CUPKMMCF4TJ4", "histograms": [{"histogram": {"Angina pectoris": 1, "Death": 1, "Heart rate increased": 1, "Local reaction": 1, "Toxic shock syndrome": 1}, "batchcodes": ["CUPKMMCF4TJ4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CUY99JURTHKR.json b/docs/data/histograms/South Africa/CUY99JURTHKR.json
index 57374bef2de..15749a159f0 100644
--- a/docs/data/histograms/South Africa/CUY99JURTHKR.json
+++ b/docs/data/histograms/South Africa/CUY99JURTHKR.json
@@ -1 +1 @@
-{"batchcode": "CUY99JURTHKR", "histograms": [{"batchcodes": ["CUY99JURTHKR"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "CUY99JURTHKR", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["CUY99JURTHKR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CVV9XCR7LMY9.json b/docs/data/histograms/South Africa/CVV9XCR7LMY9.json
index 67e9fae55a9..6401cbeab32 100644
--- a/docs/data/histograms/South Africa/CVV9XCR7LMY9.json
+++ b/docs/data/histograms/South Africa/CVV9XCR7LMY9.json
@@ -1 +1 @@
-{"batchcode": "CVV9XCR7LMY9", "histograms": [{"batchcodes": ["CVV9XCR7LMY9"], "histogram": {"Blister": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "CVV9XCR7LMY9", "histograms": [{"histogram": {"Blister": 1, "Peripheral swelling": 1}, "batchcodes": ["CVV9XCR7LMY9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CXFWV4WAVRNR.json b/docs/data/histograms/South Africa/CXFWV4WAVRNR.json
index 38acc87b4e8..fa9c768ab06 100644
--- a/docs/data/histograms/South Africa/CXFWV4WAVRNR.json
+++ b/docs/data/histograms/South Africa/CXFWV4WAVRNR.json
@@ -1 +1 @@
-{"batchcode": "CXFWV4WAVRNR", "histograms": [{"batchcodes": ["CXFWV4WAVRNR"], "histogram": {"Erythema": 1, "Maternal exposure during pregnancy": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "CXFWV4WAVRNR", "histograms": [{"histogram": {"Erythema": 1, "Maternal exposure during pregnancy": 1, "Swelling": 1}, "batchcodes": ["CXFWV4WAVRNR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CXU9JN4LYW2L.json b/docs/data/histograms/South Africa/CXU9JN4LYW2L.json
index f53c1fa4933..566addb147a 100644
--- a/docs/data/histograms/South Africa/CXU9JN4LYW2L.json
+++ b/docs/data/histograms/South Africa/CXU9JN4LYW2L.json
@@ -1 +1 @@
-{"batchcode": "CXU9JN4LYW2L", "histograms": [{"batchcodes": ["CXU9JN4LYW2L"], "histogram": {"Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "CXU9JN4LYW2L", "histograms": [{"histogram": {"Vision blurred": 1}, "batchcodes": ["CXU9JN4LYW2L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CY3WFCTK34.json b/docs/data/histograms/South Africa/CY3WFCTK34.json
index 4e85227bde2..57c41797910 100644
--- a/docs/data/histograms/South Africa/CY3WFCTK34.json
+++ b/docs/data/histograms/South Africa/CY3WFCTK34.json
@@ -1 +1 @@
-{"batchcode": "CY3WFCTK34", "histograms": [{"batchcodes": ["CY3WFCTK34"], "histogram": {"Local reaction": 1, "Oedema peripheral": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "CY3WFCTK34", "histograms": [{"histogram": {"Local reaction": 1, "Oedema peripheral": 1, "Thrombosis": 1}, "batchcodes": ["CY3WFCTK34"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CY4R7T3CRYPP.json b/docs/data/histograms/South Africa/CY4R7T3CRYPP.json
index 19ebad4e6cd..ada833540c4 100644
--- a/docs/data/histograms/South Africa/CY4R7T3CRYPP.json
+++ b/docs/data/histograms/South Africa/CY4R7T3CRYPP.json
@@ -1 +1 @@
-{"batchcode": "CY4R7T3CRYPP", "histograms": [{"batchcodes": ["CY4R7T3CRYPP"], "histogram": {"Blood pressure measurement": 1, "Electrocardiogram": 1, "Extrasystoles": 1, "Hypertension": 1, "Supraventricular extrasystoles": 1}}]}
\ No newline at end of file
+{"batchcode": "CY4R7T3CRYPP", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Electrocardiogram": 1, "Extrasystoles": 1, "Hypertension": 1, "Supraventricular extrasystoles": 1}, "batchcodes": ["CY4R7T3CRYPP"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CY9AELJN35MC.json b/docs/data/histograms/South Africa/CY9AELJN35MC.json
index a7d3b7b2c3c..8440a2ace6a 100644
--- a/docs/data/histograms/South Africa/CY9AELJN35MC.json
+++ b/docs/data/histograms/South Africa/CY9AELJN35MC.json
@@ -1 +1 @@
-{"batchcode": "CY9AELJN35MC", "histograms": [{"batchcodes": ["CY9AELJN35MC"], "histogram": {"Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "CY9AELJN35MC", "histograms": [{"histogram": {"Headache": 1, "Pyrexia": 1}, "batchcodes": ["CY9AELJN35MC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/CYVPVH4YVVME.json b/docs/data/histograms/South Africa/CYVPVH4YVVME.json
index 85b0d37f71c..c2dbd3ef81d 100644
--- a/docs/data/histograms/South Africa/CYVPVH4YVVME.json
+++ b/docs/data/histograms/South Africa/CYVPVH4YVVME.json
@@ -1 +1 @@
-{"batchcode": "CYVPVH4YVVME", "histograms": [{"batchcodes": ["CYVPVH4YVVME"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "CYVPVH4YVVME", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["CYVPVH4YVVME"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/E0581.json b/docs/data/histograms/South Africa/E0581.json
index f6a561f3dfa..34375fa564e 100644
--- a/docs/data/histograms/South Africa/E0581.json
+++ b/docs/data/histograms/South Africa/E0581.json
@@ -1 +1 @@
-{"batchcode": "E0581", "histograms": [{"batchcodes": ["E0581"], "histogram": {"Ageusia": 1, "Dehydration": 1, "Dysgeusia": 1}}]}
\ No newline at end of file
+{"batchcode": "E0581", "histograms": [{"histogram": {"Ageusia": 1, "Dehydration": 1, "Dysgeusia": 1}, "batchcodes": ["E0581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/E14834.json b/docs/data/histograms/South Africa/E14834.json
index e5fb953c572..e6d57d906dc 100644
--- a/docs/data/histograms/South Africa/E14834.json
+++ b/docs/data/histograms/South Africa/E14834.json
@@ -1 +1 @@
-{"batchcode": "E14834", "histograms": [{"batchcodes": ["E14834"], "histogram": {"Arteriosclerotic gangrene": 1, "Blood calcium": 1, "Blood calcium decreased": 1, "Blood chloride": 1, "Blood chloride increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood phosphorus": 1, "Blood phosphorus increased": 1, "Blood potassium": 1, "Blood potassium increased": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Blood urea increased": 1, "Carbon dioxide": 1, "Carbon dioxide decreased": 1, "Coagulopathy": 1, "Coma": 1, "Computerised tomogram head": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Ischaemic stroke": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Peripheral arterial occlusive disease": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Thrombosis": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "E14834", "histograms": [{"histogram": {"Arteriosclerotic gangrene": 1, "Blood calcium": 1, "Blood calcium decreased": 1, "Blood chloride": 1, "Blood chloride increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood magnesium": 1, "Blood magnesium decreased": 1, "Blood phosphorus": 1, "Blood phosphorus increased": 1, "Blood potassium": 1, "Blood potassium increased": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Blood urea increased": 1, "Carbon dioxide": 1, "Carbon dioxide decreased": 1, "Coagulopathy": 1, "Coma": 1, "Computerised tomogram head": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Ischaemic stroke": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Peripheral arterial occlusive disease": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Thrombosis": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["E14834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/E40582.json b/docs/data/histograms/South Africa/E40582.json
index c9d9d7c08df..19ad09a139d 100644
--- a/docs/data/histograms/South Africa/E40582.json
+++ b/docs/data/histograms/South Africa/E40582.json
@@ -1 +1 @@
-{"batchcode": "E40582", "histograms": [{"batchcodes": ["E40582"], "histogram": {"Asthenia": 1, "Cough": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Facial asymmetry": 1, "Facial pain": 1, "Headache": 1, "Myalgia": 1, "Neurological symptom": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Sensory loss": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Upper motor neurone lesion": 1, "Varicose vein": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "E40582", "histograms": [{"histogram": {"Asthenia": 1, "Cough": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Facial asymmetry": 1, "Facial pain": 1, "Headache": 1, "Myalgia": 1, "Neurological symptom": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Sensory loss": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Upper motor neurone lesion": 1, "Varicose vein": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["E40582"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/E426.json b/docs/data/histograms/South Africa/E426.json
index 9175ecbe01c..a27d8b4134b 100644
--- a/docs/data/histograms/South Africa/E426.json
+++ b/docs/data/histograms/South Africa/E426.json
@@ -1 +1 @@
-{"batchcode": "E426", "histograms": [{"batchcodes": ["E426"], "histogram": {"Eye pain": 1}}]}
\ No newline at end of file
+{"batchcode": "E426", "histograms": [{"histogram": {"Eye pain": 1}, "batchcodes": ["E426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/E7 0582.json b/docs/data/histograms/South Africa/E7 0582.json
index 16c0cb795b1..fe95bafdb5a 100644
--- a/docs/data/histograms/South Africa/E7 0582.json
+++ b/docs/data/histograms/South Africa/E7 0582.json
@@ -1 +1 @@
-{"batchcode": "E7 0582", "histograms": [{"batchcodes": ["E7 0582"], "histogram": {"Asthma": 1}}]}
\ No newline at end of file
+{"batchcode": "E7 0582", "histograms": [{"histogram": {"Asthma": 1}, "batchcodes": ["E7 0582"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EC1436.json b/docs/data/histograms/South Africa/EC1436.json
index c0271cb3059..fe64ff243e4 100644
--- a/docs/data/histograms/South Africa/EC1436.json
+++ b/docs/data/histograms/South Africa/EC1436.json
@@ -1 +1 @@
-{"batchcode": "EC1436", "histograms": [{"batchcodes": ["EC1436"], "histogram": {"Bell's palsy": 2}}]}
\ No newline at end of file
+{"batchcode": "EC1436", "histograms": [{"histogram": {"Bell's palsy": 2}, "batchcodes": ["EC1436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EF4834.json b/docs/data/histograms/South Africa/EF4834.json
index 0fb8e6ef5fe..88f0ed6e86f 100644
--- a/docs/data/histograms/South Africa/EF4834.json
+++ b/docs/data/histograms/South Africa/EF4834.json
@@ -1 +1 @@
-{"batchcode": "EF4834", "histograms": [{"batchcodes": ["EF4834"], "histogram": {"Haematuria": 1, "Local reaction": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EF4834", "histograms": [{"histogram": {"Haematuria": 1, "Local reaction": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["EF4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EWO581.json b/docs/data/histograms/South Africa/EWO581.json
index 9c8cab00e6d..5f2f50f5343 100644
--- a/docs/data/histograms/South Africa/EWO581.json
+++ b/docs/data/histograms/South Africa/EWO581.json
@@ -1 +1 @@
-{"batchcode": "EWO581", "histograms": [{"batchcodes": ["EWO581"], "histogram": {"Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Generalised tonic-clonic seizure": 1, "Headache": 1, "Heart rate": 1}}]}
\ No newline at end of file
+{"batchcode": "EWO581", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Coma scale": 1, "Depressed level of consciousness": 1, "Generalised tonic-clonic seizure": 1, "Headache": 1, "Heart rate": 1}, "batchcodes": ["EWO581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EX426.json b/docs/data/histograms/South Africa/EX426.json
index b3004fec8f3..6b731c7141c 100644
--- a/docs/data/histograms/South Africa/EX426.json
+++ b/docs/data/histograms/South Africa/EX426.json
@@ -1 +1 @@
-{"batchcode": "EX426", "histograms": [{"batchcodes": ["EX426"], "histogram": {"Arthritis": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "EX426", "histograms": [{"histogram": {"Arthritis": 1, "Myalgia": 1}, "batchcodes": ["EX426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY0532.json b/docs/data/histograms/South Africa/EY0532.json
index 154f1ff667a..64dd7c8190a 100644
--- a/docs/data/histograms/South Africa/EY0532.json
+++ b/docs/data/histograms/South Africa/EY0532.json
@@ -1 +1 @@
-{"batchcode": "EY0532", "histograms": [{"batchcodes": ["EY0532"], "histogram": {"Arthritis reactive": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0532", "histograms": [{"histogram": {"Arthritis reactive": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EY0532"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY0581.json b/docs/data/histograms/South Africa/EY0581.json
index ddea08d8d42..88b6390334c 100644
--- a/docs/data/histograms/South Africa/EY0581.json
+++ b/docs/data/histograms/South Africa/EY0581.json
@@ -1 +1 @@
-{"batchcode": "EY0581", "histograms": [{"batchcodes": ["EY0581"], "histogram": {"Pain": 4, "Blood pressure measurement": 3, "Body temperature": 3, "Cerebrovascular accident": 3, "Dizziness": 3, "Haemoglobin": 3, "Heart rate": 3, "Illness": 3, "Inappropriate schedule of product administration": 3, "Oxygen saturation": 3, "Blood chloride": 2, "Blood creatinine": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood urea": 2, "Dysgeusia": 2, "Fatigue": 2, "Haemoglobin decreased": 2, "Hypoaesthesia": 2, "Mean cell volume": 2, "Pain in extremity": 2, "Platelet count": 2, "SARS-CoV-2 test": 2, "Vomiting": 2, "Weight decreased": 2, "White blood cell count": 2, "Abdominal pain": 1, "Abscess": 1, "Adjusted calcium": 1, "Ageusia": 1, "Amylase": 1, "Amylase increased": 1, "Anion gap": 1, "Anion gap increased": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Binge drinking": 1, "Blood bicarbonate": 1, "Blood bicarbonate decreased": 1, "Blood chloride decreased": 1, "Blood creatinine increased": 1, "Blood fibrinogen": 1, "Blood fibrinogen increased": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin M": 1, "Blood magnesium": 1, "Blood parathyroid hormone": 1, "Blood phosphorus": 1, "Blood potassium decreased": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Bone swelling": 1, "Breath sounds": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF protein": 1, "CSF test": 1, "Cachexia": 1, "Candida infection": 1, "Chest pain": 1, "Chronic disease": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Confusional state": 1, "Cough": 1, "Cryptococcal cutaneous infection": 1, "Culture throat": 1, "Death": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Disease recurrence": 1, "Drooling": 1, "Dry mouth": 1, "Dysarthria": 1, "Dysphonia": 1, "Dyspnoea": 1, "Facial paresis": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Foetal disorder": 1, "Gait inability": 1, "Generalised tonic-clonic seizure": 1, "Glare": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Gram stain": 1, "HIV test": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Headache": 1, "Hepatosplenomegaly": 1, "Human metapneumovirus test": 1, "Hyperparathyroidism": 1, "Hypoaesthesia oral": 1, "Impaired work ability": 1, "Induration": 1, "Influenza": 1, "Laboratory test": 1, "Lipase": 1, "Lipase increased": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume decreased": 1, "Movement disorder": 1, "Oedema peripheral": 1, "Pancreatitis acute": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rales": 1, "Rash macular": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Scan": 1, "Stillbirth": 1, "Taste disorder": 1, "Tenderness": 1, "Thirst": 1, "Thyroxine": 1, "Tri-iodothyronine": 1, "Tuberculosis": 1, "Vision blurred": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0581", "histograms": [{"histogram": {"Pain": 4, "Blood pressure measurement": 3, "Body temperature": 3, "Cerebrovascular accident": 3, "Dizziness": 3, "Haemoglobin": 3, "Heart rate": 3, "Illness": 3, "Inappropriate schedule of product administration": 3, "Oxygen saturation": 3, "Blood chloride": 2, "Blood creatinine": 2, "Blood potassium": 2, "Blood sodium": 2, "Blood urea": 2, "Dysgeusia": 2, "Fatigue": 2, "Haemoglobin decreased": 2, "Hypoaesthesia": 2, "Mean cell volume": 2, "Pain in extremity": 2, "Platelet count": 2, "SARS-CoV-2 test": 2, "Vomiting": 2, "Weight decreased": 2, "White blood cell count": 2, "Abdominal pain": 1, "Abscess": 1, "Adjusted calcium": 1, "Ageusia": 1, "Amylase": 1, "Amylase increased": 1, "Anion gap": 1, "Anion gap increased": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Binge drinking": 1, "Blood bicarbonate": 1, "Blood bicarbonate decreased": 1, "Blood chloride decreased": 1, "Blood creatinine increased": 1, "Blood fibrinogen": 1, "Blood fibrinogen increased": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood immunoglobulin E increased": 1, "Blood immunoglobulin M": 1, "Blood magnesium": 1, "Blood parathyroid hormone": 1, "Blood phosphorus": 1, "Blood potassium decreased": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea increased": 1, "Bone swelling": 1, "Breath sounds": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF protein": 1, "CSF test": 1, "Cachexia": 1, "Candida infection": 1, "Chest pain": 1, "Chronic disease": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Confusional state": 1, "Cough": 1, "Cryptococcal cutaneous infection": 1, "Culture throat": 1, "Death": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Disease recurrence": 1, "Drooling": 1, "Dry mouth": 1, "Dysarthria": 1, "Dysphonia": 1, "Dyspnoea": 1, "Facial paresis": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flushing": 1, "Foetal disorder": 1, "Gait inability": 1, "Generalised tonic-clonic seizure": 1, "Glare": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Gram stain": 1, "HIV test": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Headache": 1, "Hepatosplenomegaly": 1, "Human metapneumovirus test": 1, "Hyperparathyroidism": 1, "Hypoaesthesia oral": 1, "Impaired work ability": 1, "Induration": 1, "Influenza": 1, "Laboratory test": 1, "Lipase": 1, "Lipase increased": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Mean cell haemoglobin decreased": 1, "Mean cell volume decreased": 1, "Movement disorder": 1, "Oedema peripheral": 1, "Pancreatitis acute": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rales": 1, "Rash macular": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Scan": 1, "Stillbirth": 1, "Taste disorder": 1, "Tenderness": 1, "Thirst": 1, "Thyroxine": 1, "Tri-iodothyronine": 1, "Tuberculosis": 1, "Vision blurred": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1, "X-ray": 1}, "batchcodes": ["EY0581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY0582.json b/docs/data/histograms/South Africa/EY0582.json
index cd57b90ef8a..8db1cd121df 100644
--- a/docs/data/histograms/South Africa/EY0582.json
+++ b/docs/data/histograms/South Africa/EY0582.json
@@ -1 +1 @@
-{"batchcode": "EY0582", "histograms": [{"batchcodes": ["EY0582"], "histogram": {"Inappropriate schedule of product administration": 6, "Chest pain": 4, "Dyspnoea": 4, "Fatigue": 4, "Pyrexia": 4, "Body temperature": 3, "Dizziness": 3, "Headache": 3, "Lymphadenitis": 3, "Nausea": 3, "Pain": 3, "Vomiting": 3, "Asthenia": 2, "Blood glucose": 2, "Blood pressure measurement": 2, "Blood test": 2, "Condition aggravated": 2, "Erythema": 2, "Heart rate": 2, "Oxygen saturation": 2, "Peripheral swelling": 2, "Swelling": 2, "Syncope": 2, "Abdominal distension": 1, "Abscess": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Arthralgia": 1, "Asthma": 1, "Axillary mass": 1, "Back pain": 1, "Blindness transient": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Breast mass": 1, "Burning sensation": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Coagulopathy": 1, "Congestive cardiomyopathy": 1, "Contusion": 1, "Cough": 1, "Diarrhoea": 1, "Disorientation": 1, "Eczema": 1, "Erythema multiforme": 1, "Eye pruritus": 1, "Feeling abnormal": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Illness": 1, "Impaired work ability": 1, "Induration": 1, "Joint swelling": 1, "Malaise": 1, "Monoplegia": 1, "Movement disorder": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Off label use": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1, "Platelet count": 1, "Presyncope": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Scar": 1, "Seizure": 1, "Shock": 1, "Skin hypertrophy": 1, "Swelling face": 1, "Ultrasound scan": 1, "Vaccination site induration": 1, "Vaccination site necrosis": 1, "Vaccination site swelling": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0582", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 6, "Chest pain": 4, "Dyspnoea": 4, "Fatigue": 4, "Pyrexia": 4, "Body temperature": 3, "Dizziness": 3, "Headache": 3, "Lymphadenitis": 3, "Nausea": 3, "Pain": 3, "Vomiting": 3, "Asthenia": 2, "Blood glucose": 2, "Blood pressure measurement": 2, "Blood test": 2, "Condition aggravated": 2, "Erythema": 2, "Heart rate": 2, "Oxygen saturation": 2, "Peripheral swelling": 2, "Swelling": 2, "Syncope": 2, "Abdominal distension": 1, "Abscess": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Arthralgia": 1, "Asthma": 1, "Axillary mass": 1, "Back pain": 1, "Blindness transient": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Breast mass": 1, "Burning sensation": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Coagulopathy": 1, "Congestive cardiomyopathy": 1, "Contusion": 1, "Cough": 1, "Diarrhoea": 1, "Disorientation": 1, "Eczema": 1, "Erythema multiforme": 1, "Eye pruritus": 1, "Feeling abnormal": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Illness": 1, "Impaired work ability": 1, "Induration": 1, "Joint swelling": 1, "Malaise": 1, "Monoplegia": 1, "Movement disorder": 1, "Myocarditis": 1, "Oedema peripheral": 1, "Off label use": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Pericarditis": 1, "Platelet count": 1, "Presyncope": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Scar": 1, "Seizure": 1, "Shock": 1, "Skin hypertrophy": 1, "Swelling face": 1, "Ultrasound scan": 1, "Vaccination site induration": 1, "Vaccination site necrosis": 1, "Vaccination site swelling": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["EY0582"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY0852.json b/docs/data/histograms/South Africa/EY0852.json
index 2055ee652d3..c6d5dbc9a95 100644
--- a/docs/data/histograms/South Africa/EY0852.json
+++ b/docs/data/histograms/South Africa/EY0852.json
@@ -1 +1 @@
-{"batchcode": "EY0852", "histograms": [{"batchcodes": ["EY0852"], "histogram": {"Abdominal discomfort": 1, "Bacterial infection": 1, "Bladder dysfunction": 1, "Diarrhoea": 1, "Headache": 1, "Myocarditis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0852", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Bacterial infection": 1, "Bladder dysfunction": 1, "Diarrhoea": 1, "Headache": 1, "Myocarditis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["EY0852"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY0881.json b/docs/data/histograms/South Africa/EY0881.json
index 8489054e953..50f9a6476b1 100644
--- a/docs/data/histograms/South Africa/EY0881.json
+++ b/docs/data/histograms/South Africa/EY0881.json
@@ -1 +1 @@
-{"batchcode": "EY0881", "histograms": [{"batchcodes": ["EY0881"], "histogram": {"Balance disorder": 1, "Nausea": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "EY0881", "histograms": [{"histogram": {"Balance disorder": 1, "Nausea": 1, "Palpitations": 1}, "batchcodes": ["EY0881"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY246.json b/docs/data/histograms/South Africa/EY246.json
index 1b40edfbd60..86722555176 100644
--- a/docs/data/histograms/South Africa/EY246.json
+++ b/docs/data/histograms/South Africa/EY246.json
@@ -1 +1 @@
-{"batchcode": "EY246", "histograms": [{"batchcodes": ["EY246"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "EY246", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["EY246"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY4832.json b/docs/data/histograms/South Africa/EY4832.json
index 9263d81dc51..1d4ab1cd6cf 100644
--- a/docs/data/histograms/South Africa/EY4832.json
+++ b/docs/data/histograms/South Africa/EY4832.json
@@ -1 +1 @@
-{"batchcode": "EY4832", "histograms": [{"batchcodes": ["EY4832"], "histogram": {"Dementia": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4832", "histograms": [{"histogram": {"Dementia": 1}, "batchcodes": ["EY4832"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY4834.json b/docs/data/histograms/South Africa/EY4834.json
index d0438fcdaab..921a935d0fa 100644
--- a/docs/data/histograms/South Africa/EY4834.json
+++ b/docs/data/histograms/South Africa/EY4834.json
@@ -1 +1 @@
-{"batchcode": "EY4834", "histograms": [{"batchcodes": ["EY4834"], "histogram": {"Headache": 10, "Local reaction": 7, "Dyspnoea": 6, "Blood pressure measurement": 4, "Pyrexia": 4, "Blood glucose": 3, "Body temperature": 3, "Death": 3, "Nausea": 3, "Vomiting": 3, "Anaphylactic reaction": 2, "Blood glucose decreased": 2, "Blood pressure increased": 2, "Deep vein thrombosis": 2, "Dizziness": 2, "Erythema": 2, "Fall": 2, "Heart rate": 2, "Neck pain": 2, "Pain": 2, "SARS-CoV-2 test": 2, "Alanine aminotransferase": 1, "Anaemia": 1, "Ankle fracture": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Autoimmune thyroiditis": 1, "Back pain": 1, "Bell's palsy": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood calcium": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Blood urea": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cardiothoracic ratio increased": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Confusional state": 1, "Cough": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Dermatitis": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dysarthria": 1, "Epilepsy": 1, "Eye pain": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Influenza": 1, "Injection site erythema": 1, "Insomnia": 1, "International normalised ratio": 1, "Loss of consciousness": 1, "Lymphocyte count decreased": 1, "Malaise": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Nasal congestion": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Peripheral swelling": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Red blood cell count decreased": 1, "Reticulocyte count decreased": 1, "Seasonal allergy": 1, "Seizure": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Swelling": 1, "Syncope": 1, "Thyroxine free": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Varicose vein": 1, "Ventricular failure": 1, "Vision blurred": 1, "Vitamin B12": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4834", "histograms": [{"histogram": {"Headache": 10, "Local reaction": 7, "Dyspnoea": 6, "Blood pressure measurement": 4, "Pyrexia": 4, "Blood glucose": 3, "Body temperature": 3, "Death": 3, "Nausea": 3, "Vomiting": 3, "Anaphylactic reaction": 2, "Blood glucose decreased": 2, "Blood pressure increased": 2, "Deep vein thrombosis": 2, "Dizziness": 2, "Erythema": 2, "Fall": 2, "Heart rate": 2, "Neck pain": 2, "Pain": 2, "SARS-CoV-2 test": 2, "Alanine aminotransferase": 1, "Anaemia": 1, "Ankle fracture": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Autoimmune thyroiditis": 1, "Back pain": 1, "Bell's palsy": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase decreased": 1, "Blood calcium": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Blood urea": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cardiothoracic ratio increased": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest pain": 1, "Confusional state": 1, "Cough": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Dermatitis": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dysarthria": 1, "Epilepsy": 1, "Eye pain": 1, "Gait disturbance": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Influenza": 1, "Injection site erythema": 1, "Insomnia": 1, "International normalised ratio": 1, "Loss of consciousness": 1, "Lymphocyte count decreased": 1, "Malaise": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Mean cell volume": 1, "Mean cell volume decreased": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Nasal congestion": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pallor": 1, "Palpitations": 1, "Peripheral swelling": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Presyncope": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Red blood cell count decreased": 1, "Reticulocyte count decreased": 1, "Seasonal allergy": 1, "Seizure": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Swelling": 1, "Syncope": 1, "Thyroxine free": 1, "Tinnitus": 1, "Transient ischaemic attack": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Varicose vein": 1, "Ventricular failure": 1, "Vision blurred": 1, "Vitamin B12": 1, "White blood cell count decreased": 1}, "batchcodes": ["EY4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY4834190521.json b/docs/data/histograms/South Africa/EY4834190521.json
index 1b316d88dd0..71c108e98b6 100644
--- a/docs/data/histograms/South Africa/EY4834190521.json
+++ b/docs/data/histograms/South Africa/EY4834190521.json
@@ -1 +1 @@
-{"batchcode": "EY4834190521", "histograms": [{"batchcodes": ["EY4834190521"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4834190521", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["EY4834190521"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY4838.json b/docs/data/histograms/South Africa/EY4838.json
index c8ed9e36f27..4b317903a34 100644
--- a/docs/data/histograms/South Africa/EY4838.json
+++ b/docs/data/histograms/South Africa/EY4838.json
@@ -1 +1 @@
-{"batchcode": "EY4838", "histograms": [{"batchcodes": ["EY4838"], "histogram": {"Cerebrovascular accident": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Dizziness": 1, "Fall": 1, "Inappropriate schedule of product administration": 1, "International normalised ratio abnormal": 1, "Local reaction": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Motor dysfunction": 1, "Seizure": 1, "Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4838", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Dizziness": 1, "Fall": 1, "Inappropriate schedule of product administration": 1, "International normalised ratio abnormal": 1, "Local reaction": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Motor dysfunction": 1, "Seizure": 1, "Speech disorder": 1}, "batchcodes": ["EY4838"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EY4854.json b/docs/data/histograms/South Africa/EY4854.json
index 2a0dbfb3d7c..5c1369319ce 100644
--- a/docs/data/histograms/South Africa/EY4854.json
+++ b/docs/data/histograms/South Africa/EY4854.json
@@ -1 +1 @@
-{"batchcode": "EY4854", "histograms": [{"batchcodes": ["EY4854"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "EY4854", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["EY4854"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/EYU834.json b/docs/data/histograms/South Africa/EYU834.json
index 7de500a665e..855fc905e49 100644
--- a/docs/data/histograms/South Africa/EYU834.json
+++ b/docs/data/histograms/South Africa/EYU834.json
@@ -1 +1 @@
-{"batchcode": "EYU834", "histograms": [{"batchcodes": ["EYU834"], "histogram": {"Lymphadenopathy": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EYU834", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Oropharyngeal pain": 1}, "batchcodes": ["EYU834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/F.H.0160.json b/docs/data/histograms/South Africa/F.H.0160.json
index c59bebcb0a1..f3209fd0e7c 100644
--- a/docs/data/histograms/South Africa/F.H.0160.json
+++ b/docs/data/histograms/South Africa/F.H.0160.json
@@ -1 +1 @@
-{"batchcode": "F.H.0160", "histograms": [{"batchcodes": ["F.H.0160"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Body temperature": 1, "Chest pain": 1, "Dyspnoea": 1, "Influenza like illness": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "F.H.0160", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Body temperature": 1, "Chest pain": 1, "Dyspnoea": 1, "Influenza like illness": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["F.H.0160"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/F00927.json b/docs/data/histograms/South Africa/F00927.json
index 134e153518a..746e18be9b3 100644
--- a/docs/data/histograms/South Africa/F00927.json
+++ b/docs/data/histograms/South Africa/F00927.json
@@ -1 +1 @@
-{"batchcode": "F00927", "histograms": [{"batchcodes": ["F00927"], "histogram": {"Cardiac disorder": 1, "Cerebrovascular disorder": 1, "Fall": 1, "Head injury": 1, "Lymphadenopathy": 1, "Pulmonary oedema": 1, "Skin laceration": 1}}]}
\ No newline at end of file
+{"batchcode": "F00927", "histograms": [{"histogram": {"Cardiac disorder": 1, "Cerebrovascular disorder": 1, "Fall": 1, "Head injury": 1, "Lymphadenopathy": 1, "Pulmonary oedema": 1, "Skin laceration": 1}, "batchcodes": ["F00927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/F68643.json b/docs/data/histograms/South Africa/F68643.json
index 9b5fb00b386..20068781a5c 100644
--- a/docs/data/histograms/South Africa/F68643.json
+++ b/docs/data/histograms/South Africa/F68643.json
@@ -1 +1 @@
-{"batchcode": "F68643", "histograms": [{"batchcodes": ["F68643"], "histogram": {"Anaphylactic reaction": 1, "Death": 1, "Eye pain": 1, "Eye swelling": 1, "Facial paralysis": 1, "Headache": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "F68643", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Death": 1, "Eye pain": 1, "Eye swelling": 1, "Facial paralysis": 1, "Headache": 1, "Swelling face": 1}, "batchcodes": ["F68643"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/F94421.json b/docs/data/histograms/South Africa/F94421.json
index 138e17fa418..eb25a1b31d3 100644
--- a/docs/data/histograms/South Africa/F94421.json
+++ b/docs/data/histograms/South Africa/F94421.json
@@ -1 +1 @@
-{"batchcode": "F94421", "histograms": [{"batchcodes": ["F94421"], "histogram": {"Bell's palsy": 1}}]}
\ No newline at end of file
+{"batchcode": "F94421", "histograms": [{"histogram": {"Bell's palsy": 1}, "batchcodes": ["F94421"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/F97900.json b/docs/data/histograms/South Africa/F97900.json
index b71ff9bd18a..81e76f048f7 100644
--- a/docs/data/histograms/South Africa/F97900.json
+++ b/docs/data/histograms/South Africa/F97900.json
@@ -1 +1 @@
-{"batchcode": "F97900", "histograms": [{"batchcodes": ["F97900"], "histogram": {"Erythema": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Injection site mass": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "F97900", "histograms": [{"histogram": {"Erythema": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Injection site mass": 1, "Peripheral swelling": 1}, "batchcodes": ["F97900"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA436.json b/docs/data/histograms/South Africa/FA436.json
index b480cc46964..3231dab3aa0 100644
--- a/docs/data/histograms/South Africa/FA436.json
+++ b/docs/data/histograms/South Africa/FA436.json
@@ -1 +1 @@
-{"batchcode": "FA436", "histograms": [{"batchcodes": ["FA436"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FA436", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["FA436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA5415.json b/docs/data/histograms/South Africa/FA5415.json
index 6f8dd0e40ff..bc306ac0e5a 100644
--- a/docs/data/histograms/South Africa/FA5415.json
+++ b/docs/data/histograms/South Africa/FA5415.json
@@ -1 +1 @@
-{"batchcode": "FA5415", "histograms": [{"batchcodes": ["FA5415"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5415", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["FA5415"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA5714.json b/docs/data/histograms/South Africa/FA5714.json
index 474e855dd9a..2cf59f1ecaa 100644
--- a/docs/data/histograms/South Africa/FA5714.json
+++ b/docs/data/histograms/South Africa/FA5714.json
@@ -1 +1 @@
-{"batchcode": "FA5714", "histograms": [{"batchcodes": ["FA5714"], "histogram": {"Retinal artery occlusion": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5714", "histograms": [{"histogram": {"Retinal artery occlusion": 1}, "batchcodes": ["FA5714"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA5715.json b/docs/data/histograms/South Africa/FA5715.json
index 7651bb5cb92..2b0c60305c4 100644
--- a/docs/data/histograms/South Africa/FA5715.json
+++ b/docs/data/histograms/South Africa/FA5715.json
@@ -1 +1 @@
-{"batchcode": "FA5715", "histograms": [{"batchcodes": ["FA5715"], "histogram": {"Local reaction": 7, "COVID-19": 6, "Drug ineffective": 5, "Death": 4, "Pyrexia": 4, "Body temperature": 3, "Dyspnoea": 3, "Headache": 3, "Pain": 3, "SARS-CoV-2 test": 3, "Swelling": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Erythema": 2, "Fatigue": 2, "Nausea": 2, "Vaccination site reaction": 2, "Vomiting": 2, "Abnormal behaviour": 1, "Agitation": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aneurysm ruptured": 1, "Arthralgia": 1, "Basophil count": 1, "Blood chloride": 1, "Blood chloride decreased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Blood sodium": 1, "Blood urea": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Confusional state": 1, "Cyclothymic disorder": 1, "Deafness": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Eosinophil count": 1, "Erectile dysfunction": 1, "Extrapyramidal disorder": 1, "Full blood count": 1, "Gait disturbance": 1, "Gait inability": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hallucination": 1, "Heart rate normal": 1, "Hypotonia": 1, "Influenza": 1, "Injection site pain": 1, "Laboratory test": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Mutism": 1, "Mycobacterium tuberculosis complex test": 1, "Neck pain": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Off label use": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia": 1, "Product use issue": 1, "Pruritus": 1, "Psychomotor hyperactivity": 1, "Red blood cell count": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Skin discolouration": 1, "Somnolence": 1, "Throat tightness": 1, "Tongue dry": 1, "Tremor": 1, "Vision blurred": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5715", "histograms": [{"histogram": {"Local reaction": 7, "COVID-19": 6, "Drug ineffective": 5, "Death": 4, "Pyrexia": 4, "Body temperature": 3, "Dyspnoea": 3, "Headache": 3, "Pain": 3, "SARS-CoV-2 test": 3, "Swelling": 3, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Erythema": 2, "Fatigue": 2, "Nausea": 2, "Vaccination site reaction": 2, "Vomiting": 2, "Abnormal behaviour": 1, "Agitation": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aneurysm ruptured": 1, "Arthralgia": 1, "Basophil count": 1, "Blood chloride": 1, "Blood chloride decreased": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Blood sodium": 1, "Blood urea": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Confusional state": 1, "Cyclothymic disorder": 1, "Deafness": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Eosinophil count": 1, "Erectile dysfunction": 1, "Extrapyramidal disorder": 1, "Full blood count": 1, "Gait disturbance": 1, "Gait inability": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hallucination": 1, "Heart rate normal": 1, "Hypotonia": 1, "Influenza": 1, "Injection site pain": 1, "Laboratory test": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Mutism": 1, "Mycobacterium tuberculosis complex test": 1, "Neck pain": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Off label use": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia": 1, "Product use issue": 1, "Pruritus": 1, "Psychomotor hyperactivity": 1, "Red blood cell count": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Skin discolouration": 1, "Somnolence": 1, "Throat tightness": 1, "Tongue dry": 1, "Tremor": 1, "Vision blurred": 1, "White blood cell count": 1}, "batchcodes": ["FA5715"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA5717.json b/docs/data/histograms/South Africa/FA5717.json
index 6fe97e669c2..ee89f09d754 100644
--- a/docs/data/histograms/South Africa/FA5717.json
+++ b/docs/data/histograms/South Africa/FA5717.json
@@ -1 +1 @@
-{"batchcode": "FA5717", "histograms": [{"batchcodes": ["FA5717"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5717", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["FA5717"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA5742.json b/docs/data/histograms/South Africa/FA5742.json
index a9041ac2405..82dbdd7ff60 100644
--- a/docs/data/histograms/South Africa/FA5742.json
+++ b/docs/data/histograms/South Africa/FA5742.json
@@ -1 +1 @@
-{"batchcode": "FA5742", "histograms": [{"batchcodes": ["FA5742"], "histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Abdominal tenderness": 1, "Angina pectoris": 1, "Blood iron": 1, "Body temperature": 1, "Embolism": 1, "Escherichia sepsis": 1, "Haemoglobin": 1, "Heart rate": 1, "Hepatitis": 1, "Investigation": 1, "Iron deficiency anaemia": 1, "Liver injury": 1, "Lymphopenia": 1, "Pallor": 1, "Pyrexia": 1, "Respiratory rate": 1, "Tachycardia": 1, "Tachypnoea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5742", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Abdominal tenderness": 1, "Angina pectoris": 1, "Blood iron": 1, "Body temperature": 1, "Embolism": 1, "Escherichia sepsis": 1, "Haemoglobin": 1, "Heart rate": 1, "Hepatitis": 1, "Investigation": 1, "Iron deficiency anaemia": 1, "Liver injury": 1, "Lymphopenia": 1, "Pallor": 1, "Pyrexia": 1, "Respiratory rate": 1, "Tachycardia": 1, "Tachypnoea": 1, "Vomiting": 1}, "batchcodes": ["FA5742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA7812.json b/docs/data/histograms/South Africa/FA7812.json
index 724b814b728..31541f75384 100644
--- a/docs/data/histograms/South Africa/FA7812.json
+++ b/docs/data/histograms/South Africa/FA7812.json
@@ -1 +1 @@
-{"batchcode": "FA7812", "histograms": [{"batchcodes": ["FA7812"], "histogram": {"Local reaction": 12, "Headache": 7, "Pyrexia": 6, "Cough": 4, "Death": 4, "Dyspnoea": 3, "Nausea": 3, "Pain": 3, "Ageusia": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Arthralgia": 2, "Asthenia": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Drug ineffective": 2, "Oropharyngeal pain": 2, "SARS-CoV-2 test": 2, "Thrombocytopenia": 2, "Acute aseptic arthritis": 1, "Anuria": 1, "Bell's palsy": 1, "Blister": 1, "Blood pressure increased": 1, "Body temperature": 1, "Bradycardia": 1, "Breast pain": 1, "COVID-19 pneumonia": 1, "Chest pain": 1, "Circulatory collapse": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Dizziness postural": 1, "Dysstasia": 1, "Fibrin D dimer increased": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hypotension": 1, "Influenza like illness": 1, "Ischaemic stroke": 1, "Lacrimation increased": 1, "Lip swelling": 1, "Malaise": 1, "Myalgia": 1, "Myocarditis": 1, "Oedema": 1, "Otitis media": 1, "Palpitations": 1, "Rash": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sepsis": 1, "Speech disorder": 1, "Stevens-Johnson syndrome": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7812", "histograms": [{"histogram": {"Local reaction": 12, "Headache": 7, "Pyrexia": 6, "Cough": 4, "Death": 4, "Dyspnoea": 3, "Nausea": 3, "Pain": 3, "Ageusia": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Arthralgia": 2, "Asthenia": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Drug ineffective": 2, "Oropharyngeal pain": 2, "SARS-CoV-2 test": 2, "Thrombocytopenia": 2, "Acute aseptic arthritis": 1, "Anuria": 1, "Bell's palsy": 1, "Blister": 1, "Blood pressure increased": 1, "Body temperature": 1, "Bradycardia": 1, "Breast pain": 1, "COVID-19 pneumonia": 1, "Chest pain": 1, "Circulatory collapse": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Dizziness postural": 1, "Dysstasia": 1, "Fibrin D dimer increased": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hypotension": 1, "Influenza like illness": 1, "Ischaemic stroke": 1, "Lacrimation increased": 1, "Lip swelling": 1, "Malaise": 1, "Myalgia": 1, "Myocarditis": 1, "Oedema": 1, "Otitis media": 1, "Palpitations": 1, "Rash": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sepsis": 1, "Speech disorder": 1, "Stevens-Johnson syndrome": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}, "batchcodes": ["FA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA781220210601.json b/docs/data/histograms/South Africa/FA781220210601.json
index 4e231f2cf0d..38a911fa926 100644
--- a/docs/data/histograms/South Africa/FA781220210601.json
+++ b/docs/data/histograms/South Africa/FA781220210601.json
@@ -1 +1 @@
-{"batchcode": "FA781220210601", "histograms": [{"batchcodes": ["FA781220210601"], "histogram": {"Hallucination": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "FA781220210601", "histograms": [{"histogram": {"Hallucination": 1, "Headache": 1}, "batchcodes": ["FA781220210601"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA7817.json b/docs/data/histograms/South Africa/FA7817.json
index 9966454d604..83316d4c8ca 100644
--- a/docs/data/histograms/South Africa/FA7817.json
+++ b/docs/data/histograms/South Africa/FA7817.json
@@ -1 +1 @@
-{"batchcode": "FA7817", "histograms": [{"batchcodes": ["FA7817"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7817", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["FA7817"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA7872.json b/docs/data/histograms/South Africa/FA7872.json
index cb74aea1864..334e815355b 100644
--- a/docs/data/histograms/South Africa/FA7872.json
+++ b/docs/data/histograms/South Africa/FA7872.json
@@ -1 +1 @@
-{"batchcode": "FA7872", "histograms": [{"batchcodes": ["FA7872"], "histogram": {"Balance disorder": 1, "Confusional state": 1, "Coordination abnormal": 1, "Fall": 1, "Hemiplegia": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7872", "histograms": [{"histogram": {"Balance disorder": 1, "Confusional state": 1, "Coordination abnormal": 1, "Fall": 1, "Hemiplegia": 1, "Pain": 1}, "batchcodes": ["FA7872"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FA9436.json b/docs/data/histograms/South Africa/FA9436.json
index 4d3951a6465..7a7c20fa928 100644
--- a/docs/data/histograms/South Africa/FA9436.json
+++ b/docs/data/histograms/South Africa/FA9436.json
@@ -1 +1 @@
-{"batchcode": "FA9436", "histograms": [{"batchcodes": ["FA9436"], "histogram": {"Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "FA9436", "histograms": [{"histogram": {"Malaise": 1}, "batchcodes": ["FA9436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FAS715.json b/docs/data/histograms/South Africa/FAS715.json
index 2cf537105fb..b2069031844 100644
--- a/docs/data/histograms/South Africa/FAS715.json
+++ b/docs/data/histograms/South Africa/FAS715.json
@@ -1 +1 @@
-{"batchcode": "FAS715", "histograms": [{"batchcodes": ["FAS715"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FAS715", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["FAS715"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FAY812.json b/docs/data/histograms/South Africa/FAY812.json
index 3e475a39a09..7d8dd5209cd 100644
--- a/docs/data/histograms/South Africa/FAY812.json
+++ b/docs/data/histograms/South Africa/FAY812.json
@@ -1 +1 @@
-{"batchcode": "FAY812", "histograms": [{"batchcodes": ["FAY812"], "histogram": {"Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "FAY812", "histograms": [{"histogram": {"Thrombocytopenia": 1}, "batchcodes": ["FAY812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FAZ812.json b/docs/data/histograms/South Africa/FAZ812.json
index ccb396fdc07..37b608361ed 100644
--- a/docs/data/histograms/South Africa/FAZ812.json
+++ b/docs/data/histograms/South Africa/FAZ812.json
@@ -1 +1 @@
-{"batchcode": "FAZ812", "histograms": [{"batchcodes": ["FAZ812"], "histogram": {"Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FAZ812", "histograms": [{"histogram": {"Vaccination site reaction": 1}, "batchcodes": ["FAZ812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FB0012.json b/docs/data/histograms/South Africa/FB0012.json
index aab6dc9fa9f..78b68dc3dee 100644
--- a/docs/data/histograms/South Africa/FB0012.json
+++ b/docs/data/histograms/South Africa/FB0012.json
@@ -1 +1 @@
-{"batchcode": "FB0012", "histograms": [{"batchcodes": ["FB0012"], "histogram": {"Dysphagia": 1}}]}
\ No newline at end of file
+{"batchcode": "FB0012", "histograms": [{"histogram": {"Dysphagia": 1}, "batchcodes": ["FB0012"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FB0927.json b/docs/data/histograms/South Africa/FB0927.json
index 05747c10690..b5e766f6a29 100644
--- a/docs/data/histograms/South Africa/FB0927.json
+++ b/docs/data/histograms/South Africa/FB0927.json
@@ -1 +1 @@
-{"batchcode": "FB0927", "histograms": [{"batchcodes": ["FB0927"], "histogram": {"Chest pain": 1, "Death": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FB0927", "histograms": [{"histogram": {"Chest pain": 1, "Death": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Vomiting": 1}, "batchcodes": ["FB0927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC 3558.json b/docs/data/histograms/South Africa/FC 3558.json
index 60f99e23216..231fd49fb5a 100644
--- a/docs/data/histograms/South Africa/FC 3558.json
+++ b/docs/data/histograms/South Africa/FC 3558.json
@@ -1 +1 @@
-{"batchcode": "FC 3558", "histograms": [{"batchcodes": ["FC 3558"], "histogram": {"Blood albumin": 1, "Blood albumin decreased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood urea": 1, "Blood urea increased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Circulatory collapse": 1, "Globulin": 1, "Globulins increased": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Heart rate": 1, "Oxygen saturation": 1, "Shock": 1, "Syncope": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "FC 3558", "histograms": [{"histogram": {"Blood albumin": 1, "Blood albumin decreased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood urea": 1, "Blood urea increased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Circulatory collapse": 1, "Globulin": 1, "Globulins increased": 1, "Glomerular filtration rate": 1, "Glomerular filtration rate decreased": 1, "Heart rate": 1, "Oxygen saturation": 1, "Shock": 1, "Syncope": 1, "Thrombocytopenia": 1}, "batchcodes": ["FC 3558"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC143.json b/docs/data/histograms/South Africa/FC143.json
index 1dda6c1b55e..08062b027df 100644
--- a/docs/data/histograms/South Africa/FC143.json
+++ b/docs/data/histograms/South Africa/FC143.json
@@ -1 +1 @@
-{"batchcode": "FC143", "histograms": [{"batchcodes": ["FC143"], "histogram": {"Ageusia": 1, "Alanine aminotransferase": 1, "Anosmia": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body mass index": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Glomerular filtration rate": 1, "Haemoglobin": 1, "Heart rate": 1, "International normalised ratio": 1, "Investigation": 1, "Local reaction": 1, "Mean cell volume": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Protein total": 1, "SARS-CoV-2 test positive": 1, "Syncope": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FC143", "histograms": [{"histogram": {"Ageusia": 1, "Alanine aminotransferase": 1, "Anosmia": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body mass index": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Glomerular filtration rate": 1, "Haemoglobin": 1, "Heart rate": 1, "International normalised ratio": 1, "Investigation": 1, "Local reaction": 1, "Mean cell volume": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Protein total": 1, "SARS-CoV-2 test positive": 1, "Syncope": 1, "White blood cell count": 1}, "batchcodes": ["FC143"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC1436.json b/docs/data/histograms/South Africa/FC1436.json
index 9b2bcf90a06..0ba47e99e89 100644
--- a/docs/data/histograms/South Africa/FC1436.json
+++ b/docs/data/histograms/South Africa/FC1436.json
@@ -1 +1 @@
-{"batchcode": "FC1436", "histograms": [{"batchcodes": ["FC1436"], "histogram": {"Asthenia": 7, "Headache": 7, "Local reaction": 7, "Pyrexia": 6, "Chest pain": 5, "Oxygen saturation": 5, "SARS-CoV-2 test": 5, "Syncope": 5, "Blood pressure measurement": 4, "COVID-19": 4, "Cerebrovascular accident": 4, "Dyspnoea": 4, "Fatigue": 4, "Chills": 3, "Death": 3, "Drug ineffective": 3, "Gait inability": 3, "Heart rate": 3, "Pain": 3, "Swelling": 3, "Arthralgia": 2, "Balance disorder": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood sodium": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Disorientation": 2, "Haemoglobin": 2, "Influenza like illness": 2, "Oxygen saturation decreased": 2, "Pain in extremity": 2, "Red blood cell count": 2, "SARS-CoV-2 antibody test": 2, "Seizure": 2, "Tremor": 2, "Urinary tract infection": 2, "Vomiting": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Aphasia": 1, "Aphthous ulcer": 1, "Audiogram": 1, "Back pain": 1, "Bilirubin conjugated increased": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood bilirubin decreased": 1, "Blood chloride decreased": 1, "Blood creatinine decreased": 1, "Blood potassium": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Body temperature": 1, "COVID-19 pneumonia": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Cough": 1, "Deafness": 1, "Dizziness": 1, "Dyspnoea at rest": 1, "Dysstasia": 1, "Eating disorder": 1, "Eyelid function disorder": 1, "Fall": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin decreased": 1, "Hallucination": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Hypotension": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Meniere's disease": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Neck pain": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Peripheral swelling": 1, "Platelet count": 1, "Platelet count increased": 1, "Protein total": 1, "Rash erythematous": 1, "Red blood cell count decreased": 1, "Renal pain": 1, "Rhinorrhoea": 1, "Shock symptom": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Trigeminal nerve disorder": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FC1436", "histograms": [{"histogram": {"Asthenia": 7, "Headache": 7, "Local reaction": 7, "Pyrexia": 6, "Chest pain": 5, "Oxygen saturation": 5, "SARS-CoV-2 test": 5, "Syncope": 5, "Blood pressure measurement": 4, "COVID-19": 4, "Cerebrovascular accident": 4, "Dyspnoea": 4, "Fatigue": 4, "Chills": 3, "Death": 3, "Drug ineffective": 3, "Gait inability": 3, "Heart rate": 3, "Pain": 3, "Swelling": 3, "Arthralgia": 2, "Balance disorder": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood sodium": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Disorientation": 2, "Haemoglobin": 2, "Influenza like illness": 2, "Oxygen saturation decreased": 2, "Pain in extremity": 2, "Red blood cell count": 2, "SARS-CoV-2 antibody test": 2, "Seizure": 2, "Tremor": 2, "Urinary tract infection": 2, "Vomiting": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Aphasia": 1, "Aphthous ulcer": 1, "Audiogram": 1, "Back pain": 1, "Bilirubin conjugated increased": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood bilirubin decreased": 1, "Blood chloride decreased": 1, "Blood creatinine decreased": 1, "Blood potassium": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Body temperature": 1, "COVID-19 pneumonia": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Cough": 1, "Deafness": 1, "Dizziness": 1, "Dyspnoea at rest": 1, "Dysstasia": 1, "Eating disorder": 1, "Eyelid function disorder": 1, "Fall": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haemoglobin decreased": 1, "Hallucination": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Hypotension": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Meniere's disease": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Neck pain": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Peripheral swelling": 1, "Platelet count": 1, "Platelet count increased": 1, "Protein total": 1, "Rash erythematous": 1, "Red blood cell count decreased": 1, "Renal pain": 1, "Rhinorrhoea": 1, "Shock symptom": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Trigeminal nerve disorder": 1, "Vaccination site cellulitis": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vertigo": 1}, "batchcodes": ["FC1436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC2090.json b/docs/data/histograms/South Africa/FC2090.json
index 9e2697d68bf..006164f9015 100644
--- a/docs/data/histograms/South Africa/FC2090.json
+++ b/docs/data/histograms/South Africa/FC2090.json
@@ -1 +1 @@
-{"batchcode": "FC2090", "histograms": [{"batchcodes": ["FC2090"], "histogram": {"Local reaction": 2, "Abdominal pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hemiparesis": 1, "Inappropriate schedule of product administration": 1, "Pruritus": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2090", "histograms": [{"histogram": {"Local reaction": 2, "Abdominal pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hemiparesis": 1, "Inappropriate schedule of product administration": 1, "Pruritus": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["FC2090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC2436.json b/docs/data/histograms/South Africa/FC2436.json
index e0a30731037..9d6b57d92f5 100644
--- a/docs/data/histograms/South Africa/FC2436.json
+++ b/docs/data/histograms/South Africa/FC2436.json
@@ -1 +1 @@
-{"batchcode": "FC2436", "histograms": [{"batchcodes": ["FC2436"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2436", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Local reaction": 1}, "batchcodes": ["FC2436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC2558.json b/docs/data/histograms/South Africa/FC2558.json
index fe66494c7c5..832648d25f0 100644
--- a/docs/data/histograms/South Africa/FC2558.json
+++ b/docs/data/histograms/South Africa/FC2558.json
@@ -1 +1 @@
-{"batchcode": "FC2558", "histograms": [{"batchcodes": ["FC2558"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Breast pain": 1, "Chest pain": 1, "Diarrhoea": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Erythema": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Lower respiratory tract infection": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2558", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Breast pain": 1, "Chest pain": 1, "Diarrhoea": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Erythema": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Lower respiratory tract infection": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1, "X-ray": 1}, "batchcodes": ["FC2558"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC3358.json b/docs/data/histograms/South Africa/FC3358.json
index 64b34901b20..eaadf12c86a 100644
--- a/docs/data/histograms/South Africa/FC3358.json
+++ b/docs/data/histograms/South Africa/FC3358.json
@@ -1 +1 @@
-{"batchcode": "FC3358", "histograms": [{"batchcodes": ["FC3358"], "histogram": {"Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3358", "histograms": [{"histogram": {"Vaccination site reaction": 1}, "batchcodes": ["FC3358"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC3558.json b/docs/data/histograms/South Africa/FC3558.json
index cba1d0c00fe..0cc200b65a1 100644
--- a/docs/data/histograms/South Africa/FC3558.json
+++ b/docs/data/histograms/South Africa/FC3558.json
@@ -1 +1 @@
-{"batchcode": "FC3558", "histograms": [{"batchcodes": ["FC3558"], "histogram": {"Local reaction": 8, "Death": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Heart rate": 3, "Asthenia": 2, "Body temperature": 2, "Headache": 2, "Nausea": 2, "Pain": 2, "Pneumonia": 2, "Pyrexia": 2, "Vomiting": 2, "Acute cardiac event": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Blindness": 1, "Blood pressure increased": 1, "Blood test": 1, "Breast pain": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Facial pain": 1, "Fatigue": 1, "Febrile convulsion": 1, "Haemorrhage": 1, "Hallucination": 1, "Heart rate increased": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Lip pain": 1, "Malaise": 1, "Menstrual disorder": 1, "Myalgia": 1, "Nasal discomfort": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Palpitations": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Thrombosis": 1, "Vaccination site reaction": 1, "Vision blurred": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3558", "histograms": [{"histogram": {"Local reaction": 8, "Death": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Heart rate": 3, "Asthenia": 2, "Body temperature": 2, "Headache": 2, "Nausea": 2, "Pain": 2, "Pneumonia": 2, "Pyrexia": 2, "Vomiting": 2, "Acute cardiac event": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Blindness": 1, "Blood pressure increased": 1, "Blood test": 1, "Breast pain": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Facial pain": 1, "Fatigue": 1, "Febrile convulsion": 1, "Haemorrhage": 1, "Hallucination": 1, "Heart rate increased": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Lip pain": 1, "Malaise": 1, "Menstrual disorder": 1, "Myalgia": 1, "Nasal discomfort": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Palpitations": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Thrombosis": 1, "Vaccination site reaction": 1, "Vision blurred": 1, "X-ray": 1}, "batchcodes": ["FC3558"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC3588/495/5.json b/docs/data/histograms/South Africa/FC3588/495/5.json
index 17b59d7a06e..f3707118229 100644
--- a/docs/data/histograms/South Africa/FC3588/495/5.json
+++ b/docs/data/histograms/South Africa/FC3588/495/5.json
@@ -1 +1 @@
-{"batchcode": "FC3588/495/5", "histograms": [{"batchcodes": ["FC3588/495/5"], "histogram": {"Ageusia": 1, "Asthenia": 1, "Chills": 1, "Death": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Hypoaesthesia oral": 1, "Loss of consciousness": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3588/495/5", "histograms": [{"histogram": {"Ageusia": 1, "Asthenia": 1, "Chills": 1, "Death": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Hypoaesthesia oral": 1, "Loss of consciousness": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["FC3588/495/5"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC5029.json b/docs/data/histograms/South Africa/FC5029.json
index 080008caca3..e1b75b26985 100644
--- a/docs/data/histograms/South Africa/FC5029.json
+++ b/docs/data/histograms/South Africa/FC5029.json
@@ -1 +1 @@
-{"batchcode": "FC5029", "histograms": [{"batchcodes": ["FC5029"], "histogram": {"Anaphylactic reaction": 3, "Pyrexia": 3, "Body temperature": 2, "Dyspnoea": 2, "Nausea": 2, "Ageusia": 1, "Anosmia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Chills": 1, "Death": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysania": 1, "Eye infection": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Induration": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Swollen tongue": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5029", "histograms": [{"histogram": {"Anaphylactic reaction": 3, "Pyrexia": 3, "Body temperature": 2, "Dyspnoea": 2, "Nausea": 2, "Ageusia": 1, "Anosmia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Chest discomfort": 1, "Chills": 1, "Death": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysania": 1, "Eye infection": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Induration": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Swollen tongue": 1, "Vision blurred": 1}, "batchcodes": ["FC5029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC5338.json b/docs/data/histograms/South Africa/FC5338.json
index 7739e1d0c5a..0a1b3858ae8 100644
--- a/docs/data/histograms/South Africa/FC5338.json
+++ b/docs/data/histograms/South Africa/FC5338.json
@@ -1 +1 @@
-{"batchcode": "FC5338", "histograms": [{"batchcodes": ["FC5338"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5338", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["FC5338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FC7053.json b/docs/data/histograms/South Africa/FC7053.json
index cc902e9a32e..e016d4fbc55 100644
--- a/docs/data/histograms/South Africa/FC7053.json
+++ b/docs/data/histograms/South Africa/FC7053.json
@@ -1 +1 @@
-{"batchcode": "FC7053", "histograms": [{"batchcodes": ["FC7053"], "histogram": {"Chills": 1, "Gastritis": 1, "Pain": 1, "Palpitations": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FC7053", "histograms": [{"histogram": {"Chills": 1, "Gastritis": 1, "Pain": 1, "Palpitations": 1, "Pyrexia": 1}, "batchcodes": ["FC7053"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD0297.json b/docs/data/histograms/South Africa/FD0297.json
index eaed2f31dac..21f595c7ce1 100644
--- a/docs/data/histograms/South Africa/FD0297.json
+++ b/docs/data/histograms/South Africa/FD0297.json
@@ -1 +1 @@
-{"batchcode": "FD0297", "histograms": [{"batchcodes": ["FD0297"], "histogram": {"Blood pressure measurement": 3, "Heart rate": 3, "Asthenia": 2, "Body temperature": 2, "Death": 2, "Dyspnoea": 2, "Oxygen saturation": 2, "Pain": 2, "Blood pressure increased": 1, "COVID-19": 1, "Chills": 1, "Chronic obstructive pulmonary disease": 1, "Cough": 1, "Diarrhoea": 1, "Dysuria": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Local reaction": 1, "Malaise": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Muscular weakness": 1, "Nausea": 1, "Oxygen saturation decreased": 1, "Productive cough": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0297", "histograms": [{"histogram": {"Blood pressure measurement": 3, "Heart rate": 3, "Asthenia": 2, "Body temperature": 2, "Death": 2, "Dyspnoea": 2, "Oxygen saturation": 2, "Pain": 2, "Blood pressure increased": 1, "COVID-19": 1, "Chills": 1, "Chronic obstructive pulmonary disease": 1, "Cough": 1, "Diarrhoea": 1, "Dysuria": 1, "Haematocrit": 1, "Haematocrit decreased": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Local reaction": 1, "Malaise": 1, "Mean cell haemoglobin concentration": 1, "Mean cell haemoglobin concentration decreased": 1, "Muscular weakness": 1, "Nausea": 1, "Oxygen saturation decreased": 1, "Productive cough": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["FD0297"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD0921.json b/docs/data/histograms/South Africa/FD0921.json
index 2d65e229e92..3ba249aac37 100644
--- a/docs/data/histograms/South Africa/FD0921.json
+++ b/docs/data/histograms/South Africa/FD0921.json
@@ -1 +1 @@
-{"batchcode": "FD0921", "histograms": [{"batchcodes": ["FD0921"], "histogram": {"Arthralgia": 1, "Febrile convulsion": 1, "Local reaction": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0921", "histograms": [{"histogram": {"Arthralgia": 1, "Febrile convulsion": 1, "Local reaction": 1, "Myalgia": 1}, "batchcodes": ["FD0921"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD0926.json b/docs/data/histograms/South Africa/FD0926.json
index 0600a5da0df..ec9aff63c13 100644
--- a/docs/data/histograms/South Africa/FD0926.json
+++ b/docs/data/histograms/South Africa/FD0926.json
@@ -1 +1 @@
-{"batchcode": "FD0926", "histograms": [{"batchcodes": ["FD0926"], "histogram": {"Asthenia": 1, "Chest pain": 1, "Cough": 1, "Decreased appetite": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0926", "histograms": [{"histogram": {"Asthenia": 1, "Chest pain": 1, "Cough": 1, "Decreased appetite": 1}, "batchcodes": ["FD0926"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD0927.json b/docs/data/histograms/South Africa/FD0927.json
index aea40b71395..8339ca98a5f 100644
--- a/docs/data/histograms/South Africa/FD0927.json
+++ b/docs/data/histograms/South Africa/FD0927.json
@@ -1 +1 @@
-{"batchcode": "FD0927", "histograms": [{"batchcodes": ["FD0927"], "histogram": {"Local reaction": 19, "Blood pressure measurement": 16, "Dyspnoea": 16, "SARS-CoV-2 test": 14, "Headache": 13, "Heart rate": 13, "COVID-19": 11, "Oxygen saturation": 10, "Body temperature": 9, "Pain": 9, "Blood glucose": 8, "Death": 8, "Fatigue": 8, "Diarrhoea": 7, "Asthenia": 6, "Dizziness": 6, "Drug ineffective": 6, "Haemoglobin": 6, "Rash": 6, "Blood chloride": 5, "Blood creatinine": 5, "Blood potassium": 5, "Blood pressure increased": 5, "Blood sodium": 5, "Blood urea": 5, "Peripheral swelling": 5, "Pyrexia": 5, "Swelling": 5, "Syncope": 5, "White blood cell count": 5, "Anaphylactic reaction": 4, "C-reactive protein": 4, "Chest pain": 4, "Chills": 4, "Gait inability": 4, "Haematocrit": 4, "Mean cell haemoglobin": 4, "Mean cell haemoglobin concentration": 4, "Mean cell volume": 4, "Pain in extremity": 4, "Platelet count": 4, "Red blood cell count": 4, "Red cell distribution width": 4, "Respiratory rate": 4, "SARS-CoV-2 test positive": 4, "Swelling face": 4, "Bradycardia": 3, "Cerebrovascular accident": 3, "Chest discomfort": 3, "Decreased appetite": 3, "Hypertension": 3, "Lip swelling": 3, "Mean platelet volume": 3, "Nausea": 3, "Vomiting": 3, "Abdominal pain": 2, "Angioedema": 2, "Confusional state": 2, "Cough": 2, "Ear pain": 2, "Erythema": 2, "Glomerular filtration rate": 2, "Haematocrit decreased": 2, "Haemoglobin decreased": 2, "Hemiparesis": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Illness": 2, "Malaise": 2, "Mean cell haemoglobin concentration decreased": 2, "Oedema peripheral": 2, "Oxygen saturation decreased": 2, "Palpitations": 2, "Pruritus": 2, "Rash pruritic": 2, "Red blood cell count decreased": 2, "SARS-CoV-2 antibody test": 2, "Sepsis": 2, "Urticaria": 2, "Vaccination site pain": 2, "Wheezing": 2, "Abdominal pain upper": 1, "Abscess neck": 1, "Acute kidney injury": 1, "Acute respiratory distress syndrome": 1, "Alanine aminotransferase": 1, "Anxiety": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Axillary mass": 1, "Balance disorder": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine decreased": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood pressure systolic increased": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "COVID-19 pneumonia": 1, "Cardiac flutter": 1, "Carditis": 1, "Chest X-ray": 1, "Colonoscopy": 1, "Contusion": 1, "Dermatitis bullous": 1, "Discoloured vomit": 1, "Disease recurrence": 1, "EGFR status assay": 1, "Electrocardiogram": 1, "Endoscopy": 1, "Epistaxis": 1, "Erectile dysfunction": 1, "Facial paresis": 1, "Faeces discoloured": 1, "Fall": 1, "Febrile convulsion": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gingival bleeding": 1, "Glycosylated haemoglobin": 1, "HIV test": 1, "Haematemesis": 1, "Hallucination": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Hypoxia": 1, "Incontinence": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Investigation": 1, "Lip blister": 1, "Lymphadenopathy": 1, "Malaria antigen test": 1, "Mean cell volume decreased": 1, "Memory impairment": 1, "Muscle fatigue": 1, "Musculoskeletal stiffness": 1, "Mutism": 1, "Myalgia": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "Neuralgia": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral embolism": 1, "Platelet count increased": 1, "Pneumonia": 1, "Presyncope": 1, "Productive cough": 1, "Protein total": 1, "Protein total increased": 1, "Pulmonary embolism": 1, "Rectal haemorrhage": 1, "Renal disorder": 1, "Respiratory distress": 1, "Seizure": 1, "Shock symptom": 1, "Sinusitis": 1, "Skin lesion": 1, "Speech disorder": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tongue erythema": 1, "Tongue oedema": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0927", "histograms": [{"histogram": {"Local reaction": 19, "Blood pressure measurement": 16, "Dyspnoea": 16, "SARS-CoV-2 test": 14, "Headache": 13, "Heart rate": 13, "COVID-19": 11, "Oxygen saturation": 10, "Body temperature": 9, "Pain": 9, "Blood glucose": 8, "Death": 8, "Fatigue": 8, "Diarrhoea": 7, "Asthenia": 6, "Dizziness": 6, "Drug ineffective": 6, "Haemoglobin": 6, "Rash": 6, "Blood chloride": 5, "Blood creatinine": 5, "Blood potassium": 5, "Blood pressure increased": 5, "Blood sodium": 5, "Blood urea": 5, "Peripheral swelling": 5, "Pyrexia": 5, "Swelling": 5, "Syncope": 5, "White blood cell count": 5, "Anaphylactic reaction": 4, "C-reactive protein": 4, "Chest pain": 4, "Chills": 4, "Gait inability": 4, "Haematocrit": 4, "Mean cell haemoglobin": 4, "Mean cell haemoglobin concentration": 4, "Mean cell volume": 4, "Pain in extremity": 4, "Platelet count": 4, "Red blood cell count": 4, "Red cell distribution width": 4, "Respiratory rate": 4, "SARS-CoV-2 test positive": 4, "Swelling face": 4, "Bradycardia": 3, "Cerebrovascular accident": 3, "Chest discomfort": 3, "Decreased appetite": 3, "Hypertension": 3, "Lip swelling": 3, "Mean platelet volume": 3, "Nausea": 3, "Vomiting": 3, "Abdominal pain": 2, "Angioedema": 2, "Confusional state": 2, "Cough": 2, "Ear pain": 2, "Erythema": 2, "Glomerular filtration rate": 2, "Haematocrit decreased": 2, "Haemoglobin decreased": 2, "Hemiparesis": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Illness": 2, "Malaise": 2, "Mean cell haemoglobin concentration decreased": 2, "Oedema peripheral": 2, "Oxygen saturation decreased": 2, "Palpitations": 2, "Pruritus": 2, "Rash pruritic": 2, "Red blood cell count decreased": 2, "SARS-CoV-2 antibody test": 2, "Sepsis": 2, "Urticaria": 2, "Vaccination site pain": 2, "Wheezing": 2, "Abdominal pain upper": 1, "Abscess neck": 1, "Acute kidney injury": 1, "Acute respiratory distress syndrome": 1, "Alanine aminotransferase": 1, "Anxiety": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Axillary mass": 1, "Balance disorder": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood albumin decreased": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine decreased": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood pressure systolic increased": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "COVID-19 pneumonia": 1, "Cardiac flutter": 1, "Carditis": 1, "Chest X-ray": 1, "Colonoscopy": 1, "Contusion": 1, "Dermatitis bullous": 1, "Discoloured vomit": 1, "Disease recurrence": 1, "EGFR status assay": 1, "Electrocardiogram": 1, "Endoscopy": 1, "Epistaxis": 1, "Erectile dysfunction": 1, "Facial paresis": 1, "Faeces discoloured": 1, "Fall": 1, "Febrile convulsion": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gingival bleeding": 1, "Glycosylated haemoglobin": 1, "HIV test": 1, "Haematemesis": 1, "Hallucination": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Hypoxia": 1, "Incontinence": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Investigation": 1, "Lip blister": 1, "Lymphadenopathy": 1, "Malaria antigen test": 1, "Mean cell volume decreased": 1, "Memory impairment": 1, "Muscle fatigue": 1, "Musculoskeletal stiffness": 1, "Mutism": 1, "Myalgia": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "Neuralgia": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral embolism": 1, "Platelet count increased": 1, "Pneumonia": 1, "Presyncope": 1, "Productive cough": 1, "Protein total": 1, "Protein total increased": 1, "Pulmonary embolism": 1, "Rectal haemorrhage": 1, "Renal disorder": 1, "Respiratory distress": 1, "Seizure": 1, "Shock symptom": 1, "Sinusitis": 1, "Skin lesion": 1, "Speech disorder": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tongue erythema": 1, "Tongue oedema": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vision blurred": 1}, "batchcodes": ["FD0927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD0929.json b/docs/data/histograms/South Africa/FD0929.json
index b86eaf975b5..d9ba757304c 100644
--- a/docs/data/histograms/South Africa/FD0929.json
+++ b/docs/data/histograms/South Africa/FD0929.json
@@ -1 +1 @@
-{"batchcode": "FD0929", "histograms": [{"batchcodes": ["FD0929"], "histogram": {"Local reaction": 1, "Oral herpes": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0929", "histograms": [{"histogram": {"Local reaction": 1, "Oral herpes": 1}, "batchcodes": ["FD0929"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD2090.json b/docs/data/histograms/South Africa/FD2090.json
index 6e15bc2a91a..c9c7e3e48f4 100644
--- a/docs/data/histograms/South Africa/FD2090.json
+++ b/docs/data/histograms/South Africa/FD2090.json
@@ -1 +1 @@
-{"batchcode": "FD2090", "histograms": [{"batchcodes": ["FD2090"], "histogram": {"Asthenia": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "FD2090", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1}, "batchcodes": ["FD2090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD7220.json b/docs/data/histograms/South Africa/FD7220.json
index 60cb13c0169..a7e9dcf3866 100644
--- a/docs/data/histograms/South Africa/FD7220.json
+++ b/docs/data/histograms/South Africa/FD7220.json
@@ -1 +1 @@
-{"batchcode": "FD7220", "histograms": [{"batchcodes": ["FD7220"], "histogram": {"Blood pressure measurement": 3, "Investigation": 2, "Respiratory rate": 2, "Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Blood test": 1, "Body temperature": 1, "Chest pain": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Exercise tolerance decreased": 1, "Fatigue": 1, "Gait disturbance": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Obstructive airways disorder": 1, "Oxygen saturation": 1, "Pallor": 1, "Pulmonary mass": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7220", "histograms": [{"histogram": {"Blood pressure measurement": 3, "Investigation": 2, "Respiratory rate": 2, "Anaphylactic reaction": 1, "Blood pressure decreased": 1, "Blood test": 1, "Body temperature": 1, "Chest pain": 1, "Circulatory collapse": 1, "Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Exercise tolerance decreased": 1, "Fatigue": 1, "Gait disturbance": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Obstructive airways disorder": 1, "Oxygen saturation": 1, "Pallor": 1, "Pulmonary mass": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Syncope": 1}, "batchcodes": ["FD7220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FD7812.json b/docs/data/histograms/South Africa/FD7812.json
index f557fabde0c..03573f6c833 100644
--- a/docs/data/histograms/South Africa/FD7812.json
+++ b/docs/data/histograms/South Africa/FD7812.json
@@ -1 +1 @@
-{"batchcode": "FD7812", "histograms": [{"batchcodes": ["FD7812"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Chills": 1, "Fatigue": 1, "Haemoptysis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7812", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Chills": 1, "Fatigue": 1, "Haemoptysis": 1, "Pyrexia": 1}, "batchcodes": ["FD7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FDO0927.json b/docs/data/histograms/South Africa/FDO0927.json
index be44492206d..1d2b01f6579 100644
--- a/docs/data/histograms/South Africa/FDO0927.json
+++ b/docs/data/histograms/South Africa/FDO0927.json
@@ -1 +1 @@
-{"batchcode": "FDO0927", "histograms": [{"batchcodes": ["FDO0927"], "histogram": {"Abscess": 1, "Erythema": 1, "Induration": 1, "Lymphadenitis": 1, "Movement disorder": 1, "Pain": 1, "Pyrexia": 1, "Swelling": 1, "Toxic shock syndrome": 1, "Vaccination site necrosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FDO0927", "histograms": [{"histogram": {"Abscess": 1, "Erythema": 1, "Induration": 1, "Lymphadenitis": 1, "Movement disorder": 1, "Pain": 1, "Pyrexia": 1, "Swelling": 1, "Toxic shock syndrome": 1, "Vaccination site necrosis": 1}, "batchcodes": ["FDO0927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FDO927.json b/docs/data/histograms/South Africa/FDO927.json
index eaaa68a615d..aeb646fe536 100644
--- a/docs/data/histograms/South Africa/FDO927.json
+++ b/docs/data/histograms/South Africa/FDO927.json
@@ -1 +1 @@
-{"batchcode": "FDO927", "histograms": [{"batchcodes": ["FDO927"], "histogram": {"Local reaction": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FDO927", "histograms": [{"histogram": {"Local reaction": 1, "Swelling": 1}, "batchcodes": ["FDO927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE 2090.json b/docs/data/histograms/South Africa/FE 2090.json
index 54a54ff79fc..294792ae965 100644
--- a/docs/data/histograms/South Africa/FE 2090.json
+++ b/docs/data/histograms/South Africa/FE 2090.json
@@ -1 +1 @@
-{"batchcode": "FE 2090", "histograms": [{"batchcodes": ["FE 2090"], "histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Dyspnoea": 1, "Granulocyte count": 1, "Hallucination": 1, "Headache": 1, "Heart rate": 1, "Influenza": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Unresponsive to stimuli": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 2090", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Dyspnoea": 1, "Granulocyte count": 1, "Hallucination": 1, "Headache": 1, "Heart rate": 1, "Influenza": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pyrexia": 1, "Respiratory arrest": 1, "SARS-CoV-2 test": 1, "Unresponsive to stimuli": 1}, "batchcodes": ["FE 2090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE 3064.json b/docs/data/histograms/South Africa/FE 3064.json
index 8b0cbff91ee..1aca0b58a55 100644
--- a/docs/data/histograms/South Africa/FE 3064.json
+++ b/docs/data/histograms/South Africa/FE 3064.json
@@ -1 +1 @@
-{"batchcode": "FE 3064", "histograms": [{"batchcodes": ["FE 3064"], "histogram": {"Abscess": 1, "Confusional state": 1, "Dyshidrotic eczema": 1, "Empyema": 1, "Haematemesis": 1, "Influenza": 1, "Insomnia": 1, "Neck pain": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Rash": 1, "Urinary incontinence": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 3064", "histograms": [{"histogram": {"Abscess": 1, "Confusional state": 1, "Dyshidrotic eczema": 1, "Empyema": 1, "Haematemesis": 1, "Influenza": 1, "Insomnia": 1, "Neck pain": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Rash": 1, "Urinary incontinence": 1}, "batchcodes": ["FE 3064"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE 7369.json b/docs/data/histograms/South Africa/FE 7369.json
index 66c013faf0b..a4715a31f9e 100644
--- a/docs/data/histograms/South Africa/FE 7369.json
+++ b/docs/data/histograms/South Africa/FE 7369.json
@@ -1 +1 @@
-{"batchcode": "FE 7369", "histograms": [{"batchcodes": ["FE 7369"], "histogram": {"Arthritis bacterial": 1, "Cellulitis": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Joint abscess": 1, "Joint destruction": 1, "Joint stiffness": 1, "Joint swelling": 1, "Muscular weakness": 1, "Physical examination": 1, "Soft tissue infection": 1, "Soft tissue inflammation": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 7369", "histograms": [{"histogram": {"Arthritis bacterial": 1, "Cellulitis": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Joint abscess": 1, "Joint destruction": 1, "Joint stiffness": 1, "Joint swelling": 1, "Muscular weakness": 1, "Physical examination": 1, "Soft tissue infection": 1, "Soft tissue inflammation": 1, "X-ray": 1}, "batchcodes": ["FE 7369"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE 9174.json b/docs/data/histograms/South Africa/FE 9174.json
index 7d171dd4fb2..34b3dfafabe 100644
--- a/docs/data/histograms/South Africa/FE 9174.json
+++ b/docs/data/histograms/South Africa/FE 9174.json
@@ -1 +1 @@
-{"batchcode": "FE 9174", "histograms": [{"batchcodes": ["FE 9174"], "histogram": {"Headache": 1, "Nausea": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 9174", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1, "Rash": 1}, "batchcodes": ["FE 9174"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE011.json b/docs/data/histograms/South Africa/FE011.json
index ec589d38c2f..72ac8834e1c 100644
--- a/docs/data/histograms/South Africa/FE011.json
+++ b/docs/data/histograms/South Africa/FE011.json
@@ -1 +1 @@
-{"batchcode": "FE011", "histograms": [{"batchcodes": ["FE011"], "histogram": {"Abdominal pain": 1, "Erectile dysfunction": 1, "Fatigue": 1, "Headache": 1, "Herpes zoster": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "FE011", "histograms": [{"histogram": {"Abdominal pain": 1, "Erectile dysfunction": 1, "Fatigue": 1, "Headache": 1, "Herpes zoster": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["FE011"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE1053.json b/docs/data/histograms/South Africa/FE1053.json
index 9b0092e5ff7..9194f13221f 100644
--- a/docs/data/histograms/South Africa/FE1053.json
+++ b/docs/data/histograms/South Africa/FE1053.json
@@ -1 +1 @@
-{"batchcode": "FE1053", "histograms": [{"batchcodes": ["FE1053"], "histogram": {"Abortion spontaneous": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "FE1053", "histograms": [{"histogram": {"Abortion spontaneous": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["FE1053"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE2090.json b/docs/data/histograms/South Africa/FE2090.json
index 9607108fb6c..ccad6f6ceee 100644
--- a/docs/data/histograms/South Africa/FE2090.json
+++ b/docs/data/histograms/South Africa/FE2090.json
@@ -1 +1 @@
-{"batchcode": "FE2090", "histograms": [{"batchcodes": ["FE2090"], "histogram": {"Pain": 12, "Local reaction": 11, "Pyrexia": 11, "SARS-CoV-2 test": 11, "Headache": 10, "Blood pressure measurement": 9, "Death": 8, "Drug ineffective": 7, "Dyspnoea": 7, "Vomiting": 7, "Asthenia": 6, "Body temperature": 6, "COVID-19": 6, "COVID-19 pneumonia": 6, "Fatigue": 6, "Heart rate": 5, "Oxygen saturation": 5, "Syncope": 5, "Vaccination site pain": 5, "Dizziness": 4, "Haemoglobin": 4, "Hypoaesthesia": 4, "Nausea": 4, "Blood glucose": 3, "Blood pressure increased": 3, "C-reactive protein": 3, "Chest X-ray": 3, "Chest pain": 3, "Chills": 3, "Cough": 3, "Diarrhoea": 3, "Malaise": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Arthralgia": 2, "Bell's palsy": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood test": 2, "Blood urea": 2, "Coma scale": 2, "Decreased appetite": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Erythema": 2, "Hypotension": 2, "Influenza": 2, "Investigation": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Peripheral swelling": 2, "Physical examination": 2, "Platelet count": 2, "Rash": 2, "Rash pruritic": 2, "SARS-CoV-2 antibody test positive": 2, "Speech disorder": 2, "Swelling": 2, "Vaccination site reaction": 2, "White blood cell count": 2, "Abdominal pain": 1, "Abnormal behaviour": 1, "Ageusia": 1, "Aggression": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Anion gap": 1, "Anosmia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Axillary mass": 1, "Back pain": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood galactose": 1, "Blood glucose increased": 1, "Blood phosphorus decreased": 1, "Blood potassium": 1, "Blood sodium": 1, "Bradycardia": 1, "C-reactive protein increased": 1, "CD4 lymphocytes decreased": 1, "Cardiac flutter": 1, "Cerebrovascular accident": 1, "Condition aggravated": 1, "Deafness": 1, "Depressed level of consciousness": 1, "Disorientation": 1, "Dizziness postural": 1, "Dry mouth": 1, "Dysphagia": 1, "Dysphonia": 1, "EGFR status assay": 1, "Eating disorder": 1, "Echocardiogram": 1, "Endocrine test": 1, "Energy increased": 1, "Erythema induratum": 1, "Euphoric mood": 1, "Fall": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Foaming at mouth": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haematuria": 1, "Heart rate increased": 1, "Hypertension": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Injection site swelling": 1, "Insomnia": 1, "International normalised ratio": 1, "Limb discomfort": 1, "Limb operation": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Lymphopenia": 1, "Mania": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Migraine with aura": 1, "Monocyte count decreased": 1, "Monocytopenia": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Oedema": 1, "PCO2": 1, "PO2": 1, "Pain assessment": 1, "Paralysis": 1, "Platelet count decreased": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Protein total": 1, "Pulmonary embolism": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sinus headache": 1, "Skin abrasion": 1, "Skin lesion": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Tenderness": 1, "Tendon disorder": 1, "Thinking abnormal": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Total cholesterol/HDL ratio": 1, "Toxic shock syndrome": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vision blurred": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FE2090", "histograms": [{"histogram": {"Pain": 12, "Local reaction": 11, "Pyrexia": 11, "SARS-CoV-2 test": 11, "Headache": 10, "Blood pressure measurement": 9, "Death": 8, "Drug ineffective": 7, "Dyspnoea": 7, "Vomiting": 7, "Asthenia": 6, "Body temperature": 6, "COVID-19": 6, "COVID-19 pneumonia": 6, "Fatigue": 6, "Heart rate": 5, "Oxygen saturation": 5, "Syncope": 5, "Vaccination site pain": 5, "Dizziness": 4, "Haemoglobin": 4, "Hypoaesthesia": 4, "Nausea": 4, "Blood glucose": 3, "Blood pressure increased": 3, "C-reactive protein": 3, "Chest X-ray": 3, "Chest pain": 3, "Chills": 3, "Cough": 3, "Diarrhoea": 3, "Malaise": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Arthralgia": 2, "Bell's palsy": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood test": 2, "Blood urea": 2, "Coma scale": 2, "Decreased appetite": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Erythema": 2, "Hypotension": 2, "Influenza": 2, "Investigation": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Peripheral swelling": 2, "Physical examination": 2, "Platelet count": 2, "Rash": 2, "Rash pruritic": 2, "SARS-CoV-2 antibody test positive": 2, "Speech disorder": 2, "Swelling": 2, "Vaccination site reaction": 2, "White blood cell count": 2, "Abdominal pain": 1, "Abnormal behaviour": 1, "Ageusia": 1, "Aggression": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Anion gap": 1, "Anosmia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Axillary mass": 1, "Back pain": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood galactose": 1, "Blood glucose increased": 1, "Blood phosphorus decreased": 1, "Blood potassium": 1, "Blood sodium": 1, "Bradycardia": 1, "C-reactive protein increased": 1, "CD4 lymphocytes decreased": 1, "Cardiac flutter": 1, "Cerebrovascular accident": 1, "Condition aggravated": 1, "Deafness": 1, "Depressed level of consciousness": 1, "Disorientation": 1, "Dizziness postural": 1, "Dry mouth": 1, "Dysphagia": 1, "Dysphonia": 1, "EGFR status assay": 1, "Eating disorder": 1, "Echocardiogram": 1, "Endocrine test": 1, "Energy increased": 1, "Erythema induratum": 1, "Euphoric mood": 1, "Fall": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Foaming at mouth": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Haematocrit": 1, "Haematuria": 1, "Heart rate increased": 1, "Hypertension": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Injection site swelling": 1, "Insomnia": 1, "International normalised ratio": 1, "Limb discomfort": 1, "Limb operation": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Lymphopenia": 1, "Mania": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Migraine with aura": 1, "Monocyte count decreased": 1, "Monocytopenia": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Oedema": 1, "PCO2": 1, "PO2": 1, "Pain assessment": 1, "Paralysis": 1, "Platelet count decreased": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Protein total": 1, "Pulmonary embolism": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sinus headache": 1, "Skin abrasion": 1, "Skin lesion": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Suspected COVID-19": 1, "Tenderness": 1, "Tendon disorder": 1, "Thinking abnormal": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Total cholesterol/HDL ratio": 1, "Toxic shock syndrome": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vision blurred": 1, "X-ray": 1}, "batchcodes": ["FE2090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE3063.json b/docs/data/histograms/South Africa/FE3063.json
index 3a65f7c3957..c3c3cfffb44 100644
--- a/docs/data/histograms/South Africa/FE3063.json
+++ b/docs/data/histograms/South Africa/FE3063.json
@@ -1 +1 @@
-{"batchcode": "FE3063", "histograms": [{"batchcodes": ["FE3063"], "histogram": {"Oedema peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3063", "histograms": [{"histogram": {"Oedema peripheral": 1}, "batchcodes": ["FE3063"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE3064.json b/docs/data/histograms/South Africa/FE3064.json
index 97b970efebd..d713d082665 100644
--- a/docs/data/histograms/South Africa/FE3064.json
+++ b/docs/data/histograms/South Africa/FE3064.json
@@ -1 +1 @@
-{"batchcode": "FE3064", "histograms": [{"batchcodes": ["FE3064"], "histogram": {"Headache": 14, "Local reaction": 9, "Dyspnoea": 7, "Asthenia": 6, "Pain": 6, "Cough": 5, "Chest pain": 4, "Chills": 4, "Palpitations": 4, "Arthralgia": 3, "Blood creatinine": 3, "Blood sodium": 3, "Blood urea": 3, "COVID-19 pneumonia": 3, "Dizziness": 3, "Drug ineffective": 3, "Fatigue": 3, "Gait disturbance": 3, "Glomerular filtration rate": 3, "Influenza like illness": 3, "Mean cell haemoglobin concentration": 3, "Myalgia": 3, "Nausea": 3, "Pain in extremity": 3, "Pulmonary embolism": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Thrombosis": 3, "Vomiting": 3, "Acute respiratory distress syndrome": 2, "Ageusia": 2, "Anion gap": 2, "Back pain": 2, "Blood bicarbonate": 2, "Blood chloride": 2, "Blood potassium": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Blood test": 2, "C-reactive protein": 2, "COVID-19": 2, "Computerised tomogram": 2, "Constipation": 2, "Death": 2, "Decreased appetite": 2, "Electrocardiogram": 2, "Fibrin D dimer": 2, "Gait inability": 2, "Haematocrit": 2, "Haemoglobin": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Mean cell haemoglobin": 2, "Mean cell volume": 2, "Myocarditis": 2, "Oxygen saturation": 2, "Paraesthesia": 2, "Paralysis": 2, "Platelet count": 2, "Red blood cell count": 2, "Red blood cell sedimentation rate": 2, "Red cell distribution width": 2, "Swelling": 2, "Wheezing": 2, "White blood cell count": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Apnoea": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Aura": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Blindness": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood calcium": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Body temperature": 1, "Bradycardia": 1, "Burning sensation": 1, "CSF electrophoresis": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac flutter": 1, "Cardiac murmur": 1, "Cardiomyopathy": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Computerised tomogram thorax": 1, "Coronary artery disease": 1, "Crying": 1, "Cyanosis": 1, "Demyelination": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dysgeusia": 1, "Dysstasia": 1, "Electric shock sensation": 1, "Eosinophil count": 1, "Fall": 1, "Feeling cold": 1, "Feeling hot": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Heart rate": 1, "Heart rate increased": 1, "Heart sounds": 1, "Hemianaesthesia": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Icterus index": 1, "Induration": 1, "Injection site erythema": 1, "Injection site pain": 1, "Insomnia": 1, "Interleukin level": 1, "Investigation": 1, "Lethargy": 1, "Lipaemic index score": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mass": 1, "Mean platelet volume": 1, "Microangiopathy": 1, "Monocyte count": 1, "Mood swings": 1, "Muscle fatigue": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myelitis transverse": 1, "Neuritis": 1, "Neutrophil count": 1, "Occipital neuralgia": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Procalcitonin": 1, "Protein total": 1, "Pulmonary oedema": 1, "Pulse absent": 1, "Rales": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Serum ferritin": 1, "Skin laceration": 1, "Stress": 1, "Syncope": 1, "Troponin I": 1, "Troponin T": 1, "Type 2 diabetes mellitus": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual impairment": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3064", "histograms": [{"histogram": {"Headache": 14, "Local reaction": 9, "Dyspnoea": 7, "Asthenia": 6, "Pain": 6, "Cough": 5, "Chest pain": 4, "Chills": 4, "Palpitations": 4, "Arthralgia": 3, "Blood creatinine": 3, "Blood sodium": 3, "Blood urea": 3, "COVID-19 pneumonia": 3, "Dizziness": 3, "Drug ineffective": 3, "Fatigue": 3, "Gait disturbance": 3, "Glomerular filtration rate": 3, "Influenza like illness": 3, "Mean cell haemoglobin concentration": 3, "Myalgia": 3, "Nausea": 3, "Pain in extremity": 3, "Pulmonary embolism": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Thrombosis": 3, "Vomiting": 3, "Acute respiratory distress syndrome": 2, "Ageusia": 2, "Anion gap": 2, "Back pain": 2, "Blood bicarbonate": 2, "Blood chloride": 2, "Blood potassium": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Blood test": 2, "C-reactive protein": 2, "COVID-19": 2, "Computerised tomogram": 2, "Constipation": 2, "Death": 2, "Decreased appetite": 2, "Electrocardiogram": 2, "Fibrin D dimer": 2, "Gait inability": 2, "Haematocrit": 2, "Haemoglobin": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Mean cell haemoglobin": 2, "Mean cell volume": 2, "Myocarditis": 2, "Oxygen saturation": 2, "Paraesthesia": 2, "Paralysis": 2, "Platelet count": 2, "Red blood cell count": 2, "Red blood cell sedimentation rate": 2, "Red cell distribution width": 2, "Swelling": 2, "Wheezing": 2, "White blood cell count": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Apnoea": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Aura": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Blindness": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood calcium": 1, "Blood glucose": 1, "Blood lactate dehydrogenase": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Body temperature": 1, "Bradycardia": 1, "Burning sensation": 1, "CSF electrophoresis": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac flutter": 1, "Cardiac murmur": 1, "Cardiomyopathy": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Computerised tomogram thorax": 1, "Coronary artery disease": 1, "Crying": 1, "Cyanosis": 1, "Demyelination": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Dysgeusia": 1, "Dysstasia": 1, "Electric shock sensation": 1, "Eosinophil count": 1, "Fall": 1, "Feeling cold": 1, "Feeling hot": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Heart rate": 1, "Heart rate increased": 1, "Heart sounds": 1, "Hemianaesthesia": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Icterus index": 1, "Induration": 1, "Injection site erythema": 1, "Injection site pain": 1, "Insomnia": 1, "Interleukin level": 1, "Investigation": 1, "Lethargy": 1, "Lipaemic index score": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mass": 1, "Mean platelet volume": 1, "Microangiopathy": 1, "Monocyte count": 1, "Mood swings": 1, "Muscle fatigue": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myelitis transverse": 1, "Neuritis": 1, "Neutrophil count": 1, "Occipital neuralgia": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Procalcitonin": 1, "Protein total": 1, "Pulmonary oedema": 1, "Pulse absent": 1, "Rales": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Serum ferritin": 1, "Skin laceration": 1, "Stress": 1, "Syncope": 1, "Troponin I": 1, "Troponin T": 1, "Type 2 diabetes mellitus": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual impairment": 1, "Weight decreased": 1}, "batchcodes": ["FE3064"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE3064210722.json b/docs/data/histograms/South Africa/FE3064210722.json
index 05518455268..159e291935a 100644
--- a/docs/data/histograms/South Africa/FE3064210722.json
+++ b/docs/data/histograms/South Africa/FE3064210722.json
@@ -1 +1 @@
-{"batchcode": "FE3064210722", "histograms": [{"batchcodes": ["FE3064210722"], "histogram": {"Erythema": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FE3064210722", "histograms": [{"histogram": {"Erythema": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["FE3064210722"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE4421.json b/docs/data/histograms/South Africa/FE4421.json
index afe105f0994..33b15105292 100644
--- a/docs/data/histograms/South Africa/FE4421.json
+++ b/docs/data/histograms/South Africa/FE4421.json
@@ -1 +1 @@
-{"batchcode": "FE4421", "histograms": [{"batchcodes": ["FE4421"], "histogram": {"Acute pulmonary oedema": 1, "Dyspnoea": 1, "Feeling hot": 1, "Syncope": 1, "Thirst": 1}}]}
\ No newline at end of file
+{"batchcode": "FE4421", "histograms": [{"histogram": {"Acute pulmonary oedema": 1, "Dyspnoea": 1, "Feeling hot": 1, "Syncope": 1, "Thirst": 1}, "batchcodes": ["FE4421"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE5715.json b/docs/data/histograms/South Africa/FE5715.json
index b8409e01e48..aa4c9c3d40d 100644
--- a/docs/data/histograms/South Africa/FE5715.json
+++ b/docs/data/histograms/South Africa/FE5715.json
@@ -1 +1 @@
-{"batchcode": "FE5715", "histograms": [{"batchcodes": ["FE5715"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FE5715", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["FE5715"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE7052.json b/docs/data/histograms/South Africa/FE7052.json
index 1916e0231fb..fd2f5506b0b 100644
--- a/docs/data/histograms/South Africa/FE7052.json
+++ b/docs/data/histograms/South Africa/FE7052.json
@@ -1 +1 @@
-{"batchcode": "FE7052", "histograms": [{"batchcodes": ["FE7052"], "histogram": {"Decreased appetite": 1, "Dyspnoea": 1, "Gait inability": 1}}]}
\ No newline at end of file
+{"batchcode": "FE7052", "histograms": [{"histogram": {"Decreased appetite": 1, "Dyspnoea": 1, "Gait inability": 1}, "batchcodes": ["FE7052"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE7053.json b/docs/data/histograms/South Africa/FE7053.json
index d765ba44d0a..35c4567dc32 100644
--- a/docs/data/histograms/South Africa/FE7053.json
+++ b/docs/data/histograms/South Africa/FE7053.json
@@ -1 +1 @@
-{"batchcode": "FE7053", "histograms": [{"batchcodes": ["FE7053"], "histogram": {"Dyspnoea": 4, "Headache": 4, "Confusional state": 3, "Heart rate": 3, "Nausea": 3, "Pain": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Back pain": 2, "Basophil count": 2, "Cerebrovascular accident": 2, "Chest pain": 2, "Eosinophil count": 2, "Fatigue": 2, "Feeling abnormal": 2, "Haematocrit": 2, "Haemoglobin": 2, "Inappropriate schedule of product administration": 2, "Lymphocyte count": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Neutrophil count": 2, "Palpitations": 2, "Platelet count": 2, "Red blood cell count": 2, "Red cell distribution width": 2, "White blood cell count": 2, "Abortion spontaneous": 1, "Alanine aminotransferase": 1, "Amnesia": 1, "Angina pectoris": 1, "Aphasia": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Balance disorder": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Cerebral disorder": 1, "Chest discomfort": 1, "Coronavirus test": 1, "Death": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gait inability": 1, "Haematocrit decreased": 1, "Haemoglobin decreased": 1, "Heart rate abnormal": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hepatitis A": 1, "Hepatitis B": 1, "Hepatitis C": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Influenza": 1, "Interleukin level": 1, "Investigation": 1, "Irritability": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Lymphocyte count decreased": 1, "Mean cell haemoglobin concentration decreased": 1, "Melaena": 1, "Meningitis": 1, "Metamyelocyte count": 1, "Metamyelocyte count increased": 1, "Migraine": 1, "Monocyte count": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Myelocyte count": 1, "Myelocyte count increased": 1, "Myocarditis": 1, "Neutrophil/lymphocyte ratio": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Personality change": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Pulmonary pain": 1, "Pyrexia": 1, "Radial nerve injury": 1, "Red blood cell count decreased": 1, "Red cell distribution width increased": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 antibody test": 1, "Sensory loss": 1, "Speech disorder": 1, "Swelling": 1, "Syncope": 1, "Thyroid function test": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "FE7053", "histograms": [{"histogram": {"Dyspnoea": 4, "Headache": 4, "Confusional state": 3, "Heart rate": 3, "Nausea": 3, "Pain": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Back pain": 2, "Basophil count": 2, "Cerebrovascular accident": 2, "Chest pain": 2, "Eosinophil count": 2, "Fatigue": 2, "Feeling abnormal": 2, "Haematocrit": 2, "Haemoglobin": 2, "Inappropriate schedule of product administration": 2, "Lymphocyte count": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Neutrophil count": 2, "Palpitations": 2, "Platelet count": 2, "Red blood cell count": 2, "Red cell distribution width": 2, "White blood cell count": 2, "Abortion spontaneous": 1, "Alanine aminotransferase": 1, "Amnesia": 1, "Angina pectoris": 1, "Aphasia": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Balance disorder": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Cerebral disorder": 1, "Chest discomfort": 1, "Coronavirus test": 1, "Death": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Gait inability": 1, "Haematocrit decreased": 1, "Haemoglobin decreased": 1, "Heart rate abnormal": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hepatitis A": 1, "Hepatitis B": 1, "Hepatitis C": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Influenza": 1, "Interleukin level": 1, "Investigation": 1, "Irritability": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Lymphocyte count decreased": 1, "Mean cell haemoglobin concentration decreased": 1, "Melaena": 1, "Meningitis": 1, "Metamyelocyte count": 1, "Metamyelocyte count increased": 1, "Migraine": 1, "Monocyte count": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Myalgia": 1, "Myelocyte count": 1, "Myelocyte count increased": 1, "Myocarditis": 1, "Neutrophil/lymphocyte ratio": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Personality change": 1, "Platelet count decreased": 1, "Pleural effusion": 1, "Pulmonary pain": 1, "Pyrexia": 1, "Radial nerve injury": 1, "Red blood cell count decreased": 1, "Red cell distribution width increased": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 antibody test": 1, "Sensory loss": 1, "Speech disorder": 1, "Swelling": 1, "Syncope": 1, "Thyroid function test": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vision blurred": 1}, "batchcodes": ["FE7053"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FE9174.json b/docs/data/histograms/South Africa/FE9174.json
index 107fa82758e..1c983d889fc 100644
--- a/docs/data/histograms/South Africa/FE9174.json
+++ b/docs/data/histograms/South Africa/FE9174.json
@@ -1 +1 @@
-{"batchcode": "FE9174", "histograms": [{"batchcodes": ["FE9174"], "histogram": {"Blood pressure measurement": 6, "Dizziness": 5, "Headache": 5, "Heart rate": 5, "Syncope": 5, "SARS-CoV-2 test": 4, "Death": 3, "Fatigue": 3, "Local reaction": 3, "Oxygen saturation": 3, "Pain": 3, "Abdominal pain upper": 2, "Anaphylactic reaction": 2, "Asthenia": 2, "Blood creatinine": 2, "Blood sodium": 2, "Blood test": 2, "Blood urea": 2, "Body temperature": 2, "C-reactive protein": 2, "COVID-19": 2, "Chills": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Erythema": 2, "Haemorrhage": 2, "Hypertension": 2, "Nausea": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Protein total": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Angina pectoris": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Basilar artery thrombosis": 1, "Beta-2 glycoprotein antibody": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "COVID-19 pneumonia": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF protein": 1, "CSF red blood cell count": 1, "CSF volume": 1, "Carbohydrate antigen 125": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Constipation": 1, "Coordination abnormal": 1, "Coronary artery occlusion": 1, "Cough": 1, "Disease recurrence": 1, "Dysphagia": 1, "Dysuria": 1, "Electrocardiogram": 1, "Eye pain": 1, "Feeling cold": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal pain": 1, "Glomerular filtration rate": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate normal": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Hypoaesthesia eye": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Laboratory test": 1, "Lateral medullary syndrome": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Movement disorder": 1, "Neck pain": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Platelet count": 1, "Pulmonary congestion": 1, "Pulmonary oedema": 1, "Rash": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate normal": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test positive": 1, "Seizure": 1, "Speech disorder": 1, "Swelling": 1, "Swollen tongue": 1, "Syphilis": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site ischaemia": 1, "Vertigo": 1, "Vision blurred": 1, "Visual impairment": 1, "Wheezing": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FE9174", "histograms": [{"histogram": {"Blood pressure measurement": 6, "Dizziness": 5, "Headache": 5, "Heart rate": 5, "Syncope": 5, "SARS-CoV-2 test": 4, "Death": 3, "Fatigue": 3, "Local reaction": 3, "Oxygen saturation": 3, "Pain": 3, "Abdominal pain upper": 2, "Anaphylactic reaction": 2, "Asthenia": 2, "Blood creatinine": 2, "Blood sodium": 2, "Blood test": 2, "Blood urea": 2, "Body temperature": 2, "C-reactive protein": 2, "COVID-19": 2, "Chills": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Erythema": 2, "Haemorrhage": 2, "Hypertension": 2, "Nausea": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Protein total": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Vomiting": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Angina pectoris": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Basilar artery thrombosis": 1, "Beta-2 glycoprotein antibody": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "COVID-19 pneumonia": 1, "CSF glucose": 1, "CSF lymphocyte count": 1, "CSF protein": 1, "CSF red blood cell count": 1, "CSF volume": 1, "Carbohydrate antigen 125": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Constipation": 1, "Coordination abnormal": 1, "Coronary artery occlusion": 1, "Cough": 1, "Disease recurrence": 1, "Dysphagia": 1, "Dysuria": 1, "Electrocardiogram": 1, "Eye pain": 1, "Feeling cold": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal pain": 1, "Glomerular filtration rate": 1, "HIV test": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate normal": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Hypoaesthesia eye": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Laboratory test": 1, "Lateral medullary syndrome": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Movement disorder": 1, "Neck pain": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Platelet count": 1, "Pulmonary congestion": 1, "Pulmonary oedema": 1, "Rash": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate normal": 1, "Red cell distribution width": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test positive": 1, "Seizure": 1, "Speech disorder": 1, "Swelling": 1, "Swollen tongue": 1, "Syphilis": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site ischaemia": 1, "Vertigo": 1, "Vision blurred": 1, "Visual impairment": 1, "Wheezing": 1, "White blood cell count": 1}, "batchcodes": ["FE9174"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FEZ090.json b/docs/data/histograms/South Africa/FEZ090.json
index ec31df39b16..9f7de75dee2 100644
--- a/docs/data/histograms/South Africa/FEZ090.json
+++ b/docs/data/histograms/South Africa/FEZ090.json
@@ -1 +1 @@
-{"batchcode": "FEZ090", "histograms": [{"batchcodes": ["FEZ090"], "histogram": {"Dysphagia": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "FEZ090", "histograms": [{"histogram": {"Dysphagia": 1, "Swollen tongue": 1}, "batchcodes": ["FEZ090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FF5111.json b/docs/data/histograms/South Africa/FF5111.json
index 16b071745a3..40443c38d66 100644
--- a/docs/data/histograms/South Africa/FF5111.json
+++ b/docs/data/histograms/South Africa/FF5111.json
@@ -1 +1 @@
-{"batchcode": "FF5111", "histograms": [{"batchcodes": ["FF5111"], "histogram": {"Dyspnoea": 4, "Chest pain": 3, "Headache": 3, "Inappropriate schedule of product administration": 3, "Erythema": 2, "Malaise": 2, "Pain": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Throat tightness": 2, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood glucose decreased": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Dermatitis infected": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Food allergy": 1, "HIV infection": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Illness": 1, "Immunodeficiency": 1, "Impaired work ability": 1, "Influenza": 1, "Lymphadenitis": 1, "Neck pain": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pruritus": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Swelling": 1, "Transient ischaemic attack": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FF5111", "histograms": [{"histogram": {"Dyspnoea": 4, "Chest pain": 3, "Headache": 3, "Inappropriate schedule of product administration": 3, "Erythema": 2, "Malaise": 2, "Pain": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Throat tightness": 2, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood glucose decreased": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Dermatitis infected": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Food allergy": 1, "HIV infection": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Illness": 1, "Immunodeficiency": 1, "Impaired work ability": 1, "Influenza": 1, "Lymphadenitis": 1, "Neck pain": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Pruritus": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Swelling": 1, "Transient ischaemic attack": 1, "Vaccination site swelling": 1}, "batchcodes": ["FF5111"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FF7053.json b/docs/data/histograms/South Africa/FF7053.json
index 9448d1ada50..9023637fd07 100644
--- a/docs/data/histograms/South Africa/FF7053.json
+++ b/docs/data/histograms/South Africa/FF7053.json
@@ -1 +1 @@
-{"batchcode": "FF7053", "histograms": [{"batchcodes": ["FF7053"], "histogram": {"Acute respiratory distress syndrome": 1, "Asthenia": 1, "Chest discomfort": 1, "Chest pain": 1, "Hemiplegia": 1}}]}
\ No newline at end of file
+{"batchcode": "FF7053", "histograms": [{"histogram": {"Acute respiratory distress syndrome": 1, "Asthenia": 1, "Chest discomfort": 1, "Chest pain": 1, "Hemiplegia": 1}, "batchcodes": ["FF7053"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG2090.json b/docs/data/histograms/South Africa/FG2090.json
index 7acb2891178..059e39bd677 100644
--- a/docs/data/histograms/South Africa/FG2090.json
+++ b/docs/data/histograms/South Africa/FG2090.json
@@ -1 +1 @@
-{"batchcode": "FG2090", "histograms": [{"batchcodes": ["FG2090"], "histogram": {"Blood glucose": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Conjunctivitis": 1, "Deafness": 1, "Excessive cerumen production": 1, "Heart rate": 1, "Oedema": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2090", "histograms": [{"histogram": {"Blood glucose": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Conjunctivitis": 1, "Deafness": 1, "Excessive cerumen production": 1, "Heart rate": 1, "Oedema": 1}, "batchcodes": ["FG2090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG2973.json b/docs/data/histograms/South Africa/FG2973.json
index 75d3be69ef2..8bf0623d858 100644
--- a/docs/data/histograms/South Africa/FG2973.json
+++ b/docs/data/histograms/South Africa/FG2973.json
@@ -1 +1 @@
-{"batchcode": "FG2973", "histograms": [{"batchcodes": ["FG2973"], "histogram": {"Inappropriate schedule of product administration": 1, "Infectious mononucleosis": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2973", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Infectious mononucleosis": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1}, "batchcodes": ["FG2973"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG2975.json b/docs/data/histograms/South Africa/FG2975.json
index 829ec09c912..f756e3be498 100644
--- a/docs/data/histograms/South Africa/FG2975.json
+++ b/docs/data/histograms/South Africa/FG2975.json
@@ -1 +1 @@
-{"batchcode": "FG2975", "histograms": [{"batchcodes": ["FG2975"], "histogram": {"Headache": 6, "Inappropriate schedule of product administration": 5, "Blood pressure measurement": 3, "Chest pain": 3, "Cough": 3, "Dizziness": 3, "Dyspnoea": 3, "Malaise": 3, "Pyrexia": 3, "Asthenia": 2, "Blood pressure increased": 2, "Fatigue": 2, "Full blood count": 2, "Heart rate": 2, "Investigation": 2, "Magnetic resonance imaging": 2, "Oxygen saturation": 2, "SARS-CoV-2 test": 2, "Swelling": 2, "Syncope": 2, "Abdominal pain upper": 1, "Abscess": 1, "Anaphylactic reaction": 1, "Anger": 1, "Arthralgia": 1, "Back pain": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Body temperature": 1, "C-reactive protein": 1, "Cerebral venous sinus thrombosis": 1, "Chest discomfort": 1, "Chills": 1, "Crying": 1, "Depressed mood": 1, "Depression": 1, "Diarrhoea": 1, "Dry throat": 1, "Dyspnoea paroxysmal nocturnal": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Emotional disorder": 1, "Encephalitis": 1, "Endocrine test": 1, "Expired product administered": 1, "Fibrin D dimer": 1, "Full blood count increased": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Haemolysis": 1, "Heavy menstrual bleeding": 1, "Hepatitis": 1, "Hepatitis A": 1, "Hepatitis B": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immunodeficiency": 1, "Insomnia": 1, "Irritability": 1, "Jaundice": 1, "Liver function test": 1, "Lower respiratory tract infection": 1, "Lumbar puncture": 1, "Lymph node tuberculosis": 1, "Lymphocyte count": 1, "Lymphocyte count increased": 1, "Menstrual disorder": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Orthopnoea": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Platelet count": 1, "Platelet count increased": 1, "Protein total": 1, "Pulmonary tuberculosis": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Semen analysis": 1, "Shock": 1, "Swollen tongue": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2975", "histograms": [{"histogram": {"Headache": 6, "Inappropriate schedule of product administration": 5, "Blood pressure measurement": 3, "Chest pain": 3, "Cough": 3, "Dizziness": 3, "Dyspnoea": 3, "Malaise": 3, "Pyrexia": 3, "Asthenia": 2, "Blood pressure increased": 2, "Fatigue": 2, "Full blood count": 2, "Heart rate": 2, "Investigation": 2, "Magnetic resonance imaging": 2, "Oxygen saturation": 2, "SARS-CoV-2 test": 2, "Swelling": 2, "Syncope": 2, "Abdominal pain upper": 1, "Abscess": 1, "Anaphylactic reaction": 1, "Anger": 1, "Arthralgia": 1, "Back pain": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Body temperature": 1, "C-reactive protein": 1, "Cerebral venous sinus thrombosis": 1, "Chest discomfort": 1, "Chills": 1, "Crying": 1, "Depressed mood": 1, "Depression": 1, "Diarrhoea": 1, "Dry throat": 1, "Dyspnoea paroxysmal nocturnal": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Emotional disorder": 1, "Encephalitis": 1, "Endocrine test": 1, "Expired product administered": 1, "Fibrin D dimer": 1, "Full blood count increased": 1, "Gait disturbance": 1, "General physical health deterioration": 1, "Haemolysis": 1, "Heavy menstrual bleeding": 1, "Hepatitis": 1, "Hepatitis A": 1, "Hepatitis B": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immunodeficiency": 1, "Insomnia": 1, "Irritability": 1, "Jaundice": 1, "Liver function test": 1, "Lower respiratory tract infection": 1, "Lumbar puncture": 1, "Lymph node tuberculosis": 1, "Lymphocyte count": 1, "Lymphocyte count increased": 1, "Menstrual disorder": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Orthopnoea": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Platelet count": 1, "Platelet count increased": 1, "Protein total": 1, "Pulmonary tuberculosis": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Semen analysis": 1, "Shock": 1, "Swollen tongue": 1, "Tremor": 1, "Vaccination site pain": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count increased": 1}, "batchcodes": ["FG2975"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG4421.json b/docs/data/histograms/South Africa/FG4421.json
index b38f098dcb1..7699cfa16c1 100644
--- a/docs/data/histograms/South Africa/FG4421.json
+++ b/docs/data/histograms/South Africa/FG4421.json
@@ -1 +1 @@
-{"batchcode": "FG4421", "histograms": [{"batchcodes": ["FG4421"], "histogram": {"Chest pain": 4, "Inappropriate schedule of product administration": 4, "Back pain": 3, "Blood alkaline phosphatase": 3, "Electrocardiogram": 3, "Headache": 3, "Pain in extremity": 3, "Red blood cell count": 3, "SARS-CoV-2 test": 3, "White blood cell count": 3, "Alanine aminotransferase": 2, "Arthralgia": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood potassium": 2, "Blood sodium": 2, "Body temperature": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Dizziness": 2, "Fatigue": 2, "Gamma-glutamyltransferase": 2, "Haemoglobin": 2, "Heart rate increased": 2, "Investigation": 2, "Lymphadenopathy": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Musculoskeletal stiffness": 2, "Pain": 2, "Platelet count": 2, "Protein total": 2, "Pyrexia": 2, "Red blood cell sedimentation rate": 2, "Red cell distribution width": 2, "Seizure": 2, "Swelling": 2, "Syncope": 2, "White blood cell count increased": 2, "Abdominal pain": 1, "Ageusia": 1, "Aneurysm": 1, "Angina pectoris": 1, "Antimicrobial susceptibility test": 1, "B-lymphocyte count": 1, "B-lymphocyte count decreased": 1, "Bacterial infection": 1, "Bacterial test": 1, "Bilirubin conjugated increased": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood chloride increased": 1, "Blood creatinine decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood urea": 1, "Carbon dioxide": 1, "Carbon dioxide decreased": 1, "Cardiomegaly": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cough": 1, "Crystal urine": 1, "Deafness bilateral": 1, "Death": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dyspnoea": 1, "EGFR status assay": 1, "Ear infection": 1, "Ear pain": 1, "Fibrin D dimer": 1, "Fungal infection": 1, "Gallbladder disorder": 1, "Gamma-glutamyltransferase increased": 1, "Globulin": 1, "Globulins increased": 1, "Haematocrit": 1, "Haemoptysis": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Induration": 1, "Infectious mononucleosis": 1, "Insomnia": 1, "International normalised ratio": 1, "Joint stiffness": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lower respiratory tract infection": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Mean platelet volume": 1, "Migraine": 1, "Mobility decreased": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Nausea": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil count abnormal": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pharyngitis": 1, "Platelet count decreased": 1, "Platelet-large cell ratio": 1, "Pneumonia": 1, "Premature labour": 1, "Procalcitonin": 1, "Prothrombin time": 1, "Red blood cell scan": 1, "Red blood cell sedimentation rate increased": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Sciatica": 1, "Septic rash": 1, "Shock symptom": 1, "Sinusitis": 1, "Specific gravity body fluid": 1, "Thirst": 1, "Thrombosis": 1, "Toxic shock syndrome": 1, "Tremor": 1, "Treponema test": 1, "Urinary casts": 1, "Urinary sediment present": 1, "Vaccination site reaction": 1, "Vertigo": 1, "X-ray": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FG4421", "histograms": [{"histogram": {"Chest pain": 4, "Inappropriate schedule of product administration": 4, "Back pain": 3, "Blood alkaline phosphatase": 3, "Electrocardiogram": 3, "Headache": 3, "Pain in extremity": 3, "Red blood cell count": 3, "SARS-CoV-2 test": 3, "White blood cell count": 3, "Alanine aminotransferase": 2, "Arthralgia": 2, "Aspartate aminotransferase": 2, "Asthenia": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood potassium": 2, "Blood sodium": 2, "Body temperature": 2, "C-reactive protein": 2, "C-reactive protein increased": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Dizziness": 2, "Fatigue": 2, "Gamma-glutamyltransferase": 2, "Haemoglobin": 2, "Heart rate increased": 2, "Investigation": 2, "Lymphadenopathy": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Musculoskeletal stiffness": 2, "Pain": 2, "Platelet count": 2, "Protein total": 2, "Pyrexia": 2, "Red blood cell sedimentation rate": 2, "Red cell distribution width": 2, "Seizure": 2, "Swelling": 2, "Syncope": 2, "White blood cell count increased": 2, "Abdominal pain": 1, "Ageusia": 1, "Aneurysm": 1, "Angina pectoris": 1, "Antimicrobial susceptibility test": 1, "B-lymphocyte count": 1, "B-lymphocyte count decreased": 1, "Bacterial infection": 1, "Bacterial test": 1, "Bilirubin conjugated increased": 1, "Blood albumin": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood chloride increased": 1, "Blood creatinine decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood urea": 1, "Carbon dioxide": 1, "Carbon dioxide decreased": 1, "Cardiomegaly": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cough": 1, "Crystal urine": 1, "Deafness bilateral": 1, "Death": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dyspnoea": 1, "EGFR status assay": 1, "Ear infection": 1, "Ear pain": 1, "Fibrin D dimer": 1, "Fungal infection": 1, "Gallbladder disorder": 1, "Gamma-glutamyltransferase increased": 1, "Globulin": 1, "Globulins increased": 1, "Haematocrit": 1, "Haemoptysis": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Induration": 1, "Infectious mononucleosis": 1, "Insomnia": 1, "International normalised ratio": 1, "Joint stiffness": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lower respiratory tract infection": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Mean platelet volume": 1, "Migraine": 1, "Mobility decreased": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Nausea": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil count abnormal": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pharyngitis": 1, "Platelet count decreased": 1, "Platelet-large cell ratio": 1, "Pneumonia": 1, "Premature labour": 1, "Procalcitonin": 1, "Prothrombin time": 1, "Red blood cell scan": 1, "Red blood cell sedimentation rate increased": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Sciatica": 1, "Septic rash": 1, "Shock symptom": 1, "Sinusitis": 1, "Specific gravity body fluid": 1, "Thirst": 1, "Thrombosis": 1, "Toxic shock syndrome": 1, "Tremor": 1, "Treponema test": 1, "Urinary casts": 1, "Urinary sediment present": 1, "Vaccination site reaction": 1, "Vertigo": 1, "X-ray": 1, "pH body fluid": 1}, "batchcodes": ["FG4421"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG6421.json b/docs/data/histograms/South Africa/FG6421.json
index 9c7102db794..5c02e0f6410 100644
--- a/docs/data/histograms/South Africa/FG6421.json
+++ b/docs/data/histograms/South Africa/FG6421.json
@@ -1 +1 @@
-{"batchcode": "FG6421", "histograms": [{"batchcodes": ["FG6421"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "FG6421", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["FG6421"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG7369.json b/docs/data/histograms/South Africa/FG7369.json
index 0641c371f0b..4c37bed9509 100644
--- a/docs/data/histograms/South Africa/FG7369.json
+++ b/docs/data/histograms/South Africa/FG7369.json
@@ -1 +1 @@
-{"batchcode": "FG7369", "histograms": [{"batchcodes": ["FG7369"], "histogram": {"Nausea": 5, "Syncope": 4, "Pain": 3, "Vomiting": 3, "Blood pressure measurement": 2, "Diarrhoea": 2, "Dizziness": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Malaise": 2, "Peripheral swelling": 2, "Pyrexia": 2, "Urticaria": 2, "Abdominal pain": 1, "Ageusia": 1, "Anosmia": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Blood test": 1, "Cardio-respiratory arrest": 1, "Chills": 1, "Confusional state": 1, "Depression": 1, "Dermatitis allergic": 1, "Epilepsy": 1, "Eye infection": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hypopnoea": 1, "Hypotension": 1, "Impaired work ability": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Insomnia": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Major depression": 1, "Mydriasis": 1, "Palpitations": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Rash": 1, "Renal function test": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Skin discolouration": 1, "Throat tightness": 1, "Tremor": 1, "Vasculitis": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7369", "histograms": [{"histogram": {"Nausea": 5, "Syncope": 4, "Pain": 3, "Vomiting": 3, "Blood pressure measurement": 2, "Diarrhoea": 2, "Dizziness": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Malaise": 2, "Peripheral swelling": 2, "Pyrexia": 2, "Urticaria": 2, "Abdominal pain": 1, "Ageusia": 1, "Anosmia": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Blood test": 1, "Cardio-respiratory arrest": 1, "Chills": 1, "Confusional state": 1, "Depression": 1, "Dermatitis allergic": 1, "Epilepsy": 1, "Eye infection": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hypopnoea": 1, "Hypotension": 1, "Impaired work ability": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Insomnia": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Major depression": 1, "Mydriasis": 1, "Palpitations": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Rash": 1, "Renal function test": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Skin discolouration": 1, "Throat tightness": 1, "Tremor": 1, "Vasculitis": 1, "Vertigo": 1}, "batchcodes": ["FG7369"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG7372.json b/docs/data/histograms/South Africa/FG7372.json
index 56efb041282..4693635aee6 100644
--- a/docs/data/histograms/South Africa/FG7372.json
+++ b/docs/data/histograms/South Africa/FG7372.json
@@ -1 +1 @@
-{"batchcode": "FG7372", "histograms": [{"batchcodes": ["FG7372"], "histogram": {"Alopecia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Ear pain": 1, "Headache": 1, "Influenza": 1, "Muscle spasms": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Sneezing": 1, "Vaccination site nodule": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7372", "histograms": [{"histogram": {"Alopecia": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Ear pain": 1, "Headache": 1, "Influenza": 1, "Muscle spasms": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Sneezing": 1, "Vaccination site nodule": 1, "Vaccination site reaction": 1}, "batchcodes": ["FG7372"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG7900.json b/docs/data/histograms/South Africa/FG7900.json
index 743b867d2e8..378ccb1a07d 100644
--- a/docs/data/histograms/South Africa/FG7900.json
+++ b/docs/data/histograms/South Africa/FG7900.json
@@ -1 +1 @@
-{"batchcode": "FG7900", "histograms": [{"batchcodes": ["FG7900"], "histogram": {"Pain": 6, "Headache": 5, "Vaccination site pain": 3, "Dizziness": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Pyrexia": 2, "Cerebrovascular accident": 1, "Deep vein thrombosis": 1, "Encephalopathy": 1, "Erythema": 1, "Fatigue": 1, "Gait inability": 1, "Illness": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Polymerase chain reaction": 1, "Pulmonary embolism": 1, "Shock": 1, "Swelling": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7900", "histograms": [{"histogram": {"Pain": 6, "Headache": 5, "Vaccination site pain": 3, "Dizziness": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Pyrexia": 2, "Cerebrovascular accident": 1, "Deep vein thrombosis": 1, "Encephalopathy": 1, "Erythema": 1, "Fatigue": 1, "Gait inability": 1, "Illness": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Polymerase chain reaction": 1, "Pulmonary embolism": 1, "Shock": 1, "Swelling": 1, "Urticaria": 1}, "batchcodes": ["FG7900"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FG8643.json b/docs/data/histograms/South Africa/FG8643.json
index 844f241739e..76d5cdab495 100644
--- a/docs/data/histograms/South Africa/FG8643.json
+++ b/docs/data/histograms/South Africa/FG8643.json
@@ -1 +1 @@
-{"batchcode": "FG8643", "histograms": [{"batchcodes": ["FG8643", "XE444"], "histogram": {"Fatigue": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Oedema": 1, "Peripheral coldness": 1, "Pyrexia": 1}}, {"batchcodes": ["FG8643"], "histogram": {"Inappropriate schedule of product administration": 4, "Oxygen saturation": 3, "Blood pressure measurement": 2, "Dyspnoea": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Seizure": 2, "Swelling": 2, "Angina pectoris": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure diastolic decreased": 1, "Body temperature": 1, "Chest pain": 1, "Cold sweat": 1, "Complex regional pain syndrome": 1, "Contusion": 1, "Cough": 1, "Cyst": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Gait disturbance": 1, "HIV infection": 1, "Headache": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Immune thrombocytopenia": 1, "Lymphadenopathy": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Presyncope": 1, "Pyrexia": 1, "Rales": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Syncope": 1, "Tuberculosis": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FG8643", "histograms": [{"histogram": {"Fatigue": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Oedema": 1, "Peripheral coldness": 1, "Pyrexia": 1}, "batchcodes": ["FG8643", "XE444"]}, {"histogram": {"Inappropriate schedule of product administration": 4, "Oxygen saturation": 3, "Blood pressure measurement": 2, "Dyspnoea": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Seizure": 2, "Swelling": 2, "Angina pectoris": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure diastolic decreased": 1, "Body temperature": 1, "Chest pain": 1, "Cold sweat": 1, "Complex regional pain syndrome": 1, "Contusion": 1, "Cough": 1, "Cyst": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Gait disturbance": 1, "HIV infection": 1, "Headache": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Immune thrombocytopenia": 1, "Lymphadenopathy": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Presyncope": 1, "Pyrexia": 1, "Rales": 1, "SARS-CoV-2 test": 1, "Shock": 1, "Syncope": 1, "Tuberculosis": 1, "Wheezing": 1}, "batchcodes": ["FG8643"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FH0160.json b/docs/data/histograms/South Africa/FH0160.json
index 8603763937f..0e7ff337c35 100644
--- a/docs/data/histograms/South Africa/FH0160.json
+++ b/docs/data/histograms/South Africa/FH0160.json
@@ -1 +1 @@
-{"batchcode": "FH0160", "histograms": [{"batchcodes": ["FH0160"], "histogram": {"Dyspnoea": 4, "Inappropriate schedule of product administration": 3, "Pain": 3, "Body temperature": 2, "Chest pain": 2, "Cough": 2, "Erythema": 2, "Hypersensitivity": 2, "Pneumonia": 2, "Pyrexia": 2, "Swelling": 2, "Allergy test": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Basophil count": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood glucose": 1, "Blood iron": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Bronchitis": 1, "Cellulitis": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Death": 1, "EGFR status assay": 1, "Ear pain": 1, "Ear tube insertion": 1, "Embolic stroke": 1, "Eosinophilia": 1, "Expired product administered": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Generalised oedema": 1, "Haematemesis": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hypercoagulation": 1, "Hypoaesthesia": 1, "Induration": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Influenza": 1, "Investigation": 1, "Iron deficiency": 1, "Joint swelling": 1, "Laboratory test": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Melaena": 1, "Monocyte count": 1, "Movement disorder": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Ocular icterus": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Rash": 1, "Red blood cell count": 1, "Thrombosis": 1, "Troponin T": 1, "Vitamin D": 1, "Vitamin D decreased": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FH0160", "histograms": [{"histogram": {"Dyspnoea": 4, "Inappropriate schedule of product administration": 3, "Pain": 3, "Body temperature": 2, "Chest pain": 2, "Cough": 2, "Erythema": 2, "Hypersensitivity": 2, "Pneumonia": 2, "Pyrexia": 2, "Swelling": 2, "Allergy test": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Basophil count": 1, "Blood bicarbonate": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood creatinine decreased": 1, "Blood glucose": 1, "Blood iron": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "Bronchitis": 1, "Cellulitis": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Death": 1, "EGFR status assay": 1, "Ear pain": 1, "Ear tube insertion": 1, "Embolic stroke": 1, "Eosinophilia": 1, "Expired product administered": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Generalised oedema": 1, "Haematemesis": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hypercoagulation": 1, "Hypoaesthesia": 1, "Induration": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Influenza": 1, "Investigation": 1, "Iron deficiency": 1, "Joint swelling": 1, "Laboratory test": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Melaena": 1, "Monocyte count": 1, "Movement disorder": 1, "Muscular weakness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Ocular icterus": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Rash": 1, "Red blood cell count": 1, "Thrombosis": 1, "Troponin T": 1, "Vitamin D": 1, "Vitamin D decreased": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["FH0160"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FJ5282.json b/docs/data/histograms/South Africa/FJ5282.json
index 89518afe475..5413ac1a0b5 100644
--- a/docs/data/histograms/South Africa/FJ5282.json
+++ b/docs/data/histograms/South Africa/FJ5282.json
@@ -1 +1 @@
-{"batchcode": "FJ5282", "histograms": [{"batchcodes": ["FJ5282"], "histogram": {"Asthma": 1, "Cough": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5282", "histograms": [{"histogram": {"Asthma": 1, "Cough": 1, "Heart rate": 1, "Heart rate increased": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "Wheezing": 1}, "batchcodes": ["FJ5282"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FJ5782.json b/docs/data/histograms/South Africa/FJ5782.json
index a0d46797570..a86ca4389c3 100644
--- a/docs/data/histograms/South Africa/FJ5782.json
+++ b/docs/data/histograms/South Africa/FJ5782.json
@@ -1 +1 @@
-{"batchcode": "FJ5782", "histograms": [{"batchcodes": ["FJ5782"], "histogram": {"Asthenia": 3, "Dyspnoea": 2, "Headache": 2, "Pain": 2, "Pyrexia": 2, "Blood glucose": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Cough": 1, "Death": 1, "Disseminated intravascular coagulation": 1, "Erythema": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin": 1, "Haemolysis": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Leukaemia": 1, "Lymphoma": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Platelet count": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Skin discolouration": 1, "Vaccination site necrosis": 1, "Wound": 1, "Wound infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ5782", "histograms": [{"histogram": {"Asthenia": 3, "Dyspnoea": 2, "Headache": 2, "Pain": 2, "Pyrexia": 2, "Blood glucose": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Cough": 1, "Death": 1, "Disseminated intravascular coagulation": 1, "Erythema": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin": 1, "Haemolysis": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Leukaemia": 1, "Lymphoma": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Platelet count": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Skin discolouration": 1, "Vaccination site necrosis": 1, "Wound": 1, "Wound infection": 1}, "batchcodes": ["FJ5782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FK0112.json b/docs/data/histograms/South Africa/FK0112.json
index 397caf9aa66..ce5f312f62b 100644
--- a/docs/data/histograms/South Africa/FK0112.json
+++ b/docs/data/histograms/South Africa/FK0112.json
@@ -1 +1 @@
-{"batchcode": "FK0112", "histograms": [{"batchcodes": ["FK0112"], "histogram": {"Blindness": 1, "Blood pressure measurement": 1, "Breathing-related sleep disorder": 1, "Chest pain": 1, "Cough": 1, "Glomerular filtration rate": 1, "HIV antibody": 1, "Haematemesis": 1, "Haematocrit": 1, "Heart rate": 1, "Investigation": 1, "Palpitations": 1, "Urine analysis": 1, "Visual acuity tests": 1, "Visual field tests": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0112", "histograms": [{"histogram": {"Blindness": 1, "Blood pressure measurement": 1, "Breathing-related sleep disorder": 1, "Chest pain": 1, "Cough": 1, "Glomerular filtration rate": 1, "HIV antibody": 1, "Haematemesis": 1, "Haematocrit": 1, "Heart rate": 1, "Investigation": 1, "Palpitations": 1, "Urine analysis": 1, "Visual acuity tests": 1, "Visual field tests": 1, "Wheezing": 1}, "batchcodes": ["FK0112"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FK0115.json b/docs/data/histograms/South Africa/FK0115.json
index 0869153e66f..4d779368dd8 100644
--- a/docs/data/histograms/South Africa/FK0115.json
+++ b/docs/data/histograms/South Africa/FK0115.json
@@ -1 +1 @@
-{"batchcode": "FK0115", "histograms": [{"batchcodes": ["FK0115"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Influenza": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Petechiae": 1, "Respiratory rate": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0115", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Influenza": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Petechiae": 1, "Respiratory rate": 1, "Tachycardia": 1}, "batchcodes": ["FK0115"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FK0738.json b/docs/data/histograms/South Africa/FK0738.json
index f01ad035b35..21cfcd91c5f 100644
--- a/docs/data/histograms/South Africa/FK0738.json
+++ b/docs/data/histograms/South Africa/FK0738.json
@@ -1 +1 @@
-{"batchcode": "FK0738", "histograms": [{"batchcodes": ["FK0738"], "histogram": {"Headache": 1, "Hypoaesthesia": 1, "Seizure": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0738", "histograms": [{"histogram": {"Headache": 1, "Hypoaesthesia": 1, "Seizure": 1, "Throat irritation": 1}, "batchcodes": ["FK0738"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FK1754.json b/docs/data/histograms/South Africa/FK1754.json
index 80e8b230d21..3b0017ac89a 100644
--- a/docs/data/histograms/South Africa/FK1754.json
+++ b/docs/data/histograms/South Africa/FK1754.json
@@ -1 +1 @@
-{"batchcode": "FK1754", "histograms": [{"batchcodes": ["FK1754"], "histogram": {"Asthenia": 2, "Confusional state": 2, "Diarrhoea": 2, "Pain": 2, "Vomiting": 2}}]}
\ No newline at end of file
+{"batchcode": "FK1754", "histograms": [{"histogram": {"Asthenia": 2, "Confusional state": 2, "Diarrhoea": 2, "Pain": 2, "Vomiting": 2}, "batchcodes": ["FK1754"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FL1436.json b/docs/data/histograms/South Africa/FL1436.json
index 74cea0b8d5d..17894c060d8 100644
--- a/docs/data/histograms/South Africa/FL1436.json
+++ b/docs/data/histograms/South Africa/FL1436.json
@@ -1 +1 @@
-{"batchcode": "FL1436", "histograms": [{"batchcodes": ["FL1436"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FL1436", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["FL1436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FL3558.json b/docs/data/histograms/South Africa/FL3558.json
index 081c9965507..e0126cd23d3 100644
--- a/docs/data/histograms/South Africa/FL3558.json
+++ b/docs/data/histograms/South Africa/FL3558.json
@@ -1 +1 @@
-{"batchcode": "FL3558", "histograms": [{"batchcodes": ["FL3558"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3558", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1}, "batchcodes": ["FL3558"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FO0527.json b/docs/data/histograms/South Africa/FO0527.json
index e01a07d57e8..cae1c019909 100644
--- a/docs/data/histograms/South Africa/FO0527.json
+++ b/docs/data/histograms/South Africa/FO0527.json
@@ -1 +1 @@
-{"batchcode": "FO0527", "histograms": [{"batchcodes": ["FO0527"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "FO0527", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["FO0527"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FO3558.json b/docs/data/histograms/South Africa/FO3558.json
index 119a668e8be..4d6f1514773 100644
--- a/docs/data/histograms/South Africa/FO3558.json
+++ b/docs/data/histograms/South Africa/FO3558.json
@@ -1 +1 @@
-{"batchcode": "FO3558", "histograms": [{"batchcodes": ["FO3558"], "histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Myalgia": 1, "Pyrexia": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "FO3558", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Drug ineffective": 1, "Myalgia": 1, "Pyrexia": 1, "Thrombosis": 1}, "batchcodes": ["FO3558"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FOC927.json b/docs/data/histograms/South Africa/FOC927.json
index b6020c766c2..3525ad1dc92 100644
--- a/docs/data/histograms/South Africa/FOC927.json
+++ b/docs/data/histograms/South Africa/FOC927.json
@@ -1 +1 @@
-{"batchcode": "FOC927", "histograms": [{"batchcodes": ["FOC927"], "histogram": {"Bell's palsy": 1, "Facial paresis": 1}}]}
\ No newline at end of file
+{"batchcode": "FOC927", "histograms": [{"histogram": {"Bell's palsy": 1, "Facial paresis": 1}, "batchcodes": ["FOC927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FT5782.json b/docs/data/histograms/South Africa/FT5782.json
index bfbfcd26cbb..c4eaeefc912 100644
--- a/docs/data/histograms/South Africa/FT5782.json
+++ b/docs/data/histograms/South Africa/FT5782.json
@@ -1 +1 @@
-{"batchcode": "FT5782", "histograms": [{"batchcodes": ["FT5782"], "histogram": {"Acne": 1, "Induration": 1, "Malaise": 1, "Pain": 1, "Skin ulcer": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FT5782", "histograms": [{"histogram": {"Acne": 1, "Induration": 1, "Malaise": 1, "Pain": 1, "Skin ulcer": 1, "Swelling": 1}, "batchcodes": ["FT5782"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FY0581.json b/docs/data/histograms/South Africa/FY0581.json
index 6ed757ebc9e..b8a8f54b3f1 100644
--- a/docs/data/histograms/South Africa/FY0581.json
+++ b/docs/data/histograms/South Africa/FY0581.json
@@ -1 +1 @@
-{"batchcode": "FY0581", "histograms": [{"batchcodes": ["FY0581"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FY0581", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["FY0581"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/FY812.json b/docs/data/histograms/South Africa/FY812.json
index 170c5532b98..1d0b5f1a382 100644
--- a/docs/data/histograms/South Africa/FY812.json
+++ b/docs/data/histograms/South Africa/FY812.json
@@ -1 +1 @@
-{"batchcode": "FY812", "histograms": [{"batchcodes": ["FY812"], "histogram": {"Cerebrovascular accident": 1, "Dizziness": 1, "Eye injury": 1, "Gait inability": 1, "Head injury": 1, "Musculoskeletal stiffness": 1, "Mutism": 1, "Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FY812", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Dizziness": 1, "Eye injury": 1, "Gait inability": 1, "Head injury": 1, "Musculoskeletal stiffness": 1, "Mutism": 1, "Syncope": 1, "Tremor": 1}, "batchcodes": ["FY812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/GY4834.json b/docs/data/histograms/South Africa/GY4834.json
index 7ffe410bb0f..c4f74316a2b 100644
--- a/docs/data/histograms/South Africa/GY4834.json
+++ b/docs/data/histograms/South Africa/GY4834.json
@@ -1 +1 @@
-{"batchcode": "GY4834", "histograms": [{"batchcodes": ["GY4834"], "histogram": {"Conjunctivitis": 1, "Headache": 1, "Injection site reaction": 1, "Urticaria": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "GY4834", "histograms": [{"histogram": {"Conjunctivitis": 1, "Headache": 1, "Injection site reaction": 1, "Urticaria": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["GY4834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/IF1028A.json b/docs/data/histograms/South Africa/IF1028A.json
index 8d805c0c101..aa4db333135 100644
--- a/docs/data/histograms/South Africa/IF1028A.json
+++ b/docs/data/histograms/South Africa/IF1028A.json
@@ -1 +1 @@
-{"batchcode": "IF1028A", "histograms": [{"batchcodes": ["IF1028A"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dysstasia": 1, "Headache": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Vertigo positional": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "IF1028A", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dysstasia": 1, "Headache": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Vertigo positional": 1, "Vomiting": 1}, "batchcodes": ["IF1028A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/KI0582.json b/docs/data/histograms/South Africa/KI0582.json
index cb7cb3978b7..733a68a9f4f 100644
--- a/docs/data/histograms/South Africa/KI0582.json
+++ b/docs/data/histograms/South Africa/KI0582.json
@@ -1 +1 @@
-{"batchcode": "KI0582", "histograms": [{"batchcodes": ["KI0582"], "histogram": {"Arthralgia": 1, "Inappropriate schedule of product administration": 1, "Joint swelling": 1, "Limb injury": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "KI0582", "histograms": [{"histogram": {"Arthralgia": 1, "Inappropriate schedule of product administration": 1, "Joint swelling": 1, "Limb injury": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["KI0582"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/KKL.json b/docs/data/histograms/South Africa/KKL.json
index d78fe08aa1b..df11a244e05 100644
--- a/docs/data/histograms/South Africa/KKL.json
+++ b/docs/data/histograms/South Africa/KKL.json
@@ -1 +1 @@
-{"batchcode": "KKL", "histograms": [{"batchcodes": ["KKL"], "histogram": {"Paraesthesia": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "KKL", "histograms": [{"histogram": {"Paraesthesia": 1, "Peripheral swelling": 1}, "batchcodes": ["KKL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/LOT.json b/docs/data/histograms/South Africa/LOT.json
index 73818efd192..a730179ef9d 100644
--- a/docs/data/histograms/South Africa/LOT.json
+++ b/docs/data/histograms/South Africa/LOT.json
@@ -1 +1 @@
-{"batchcode": "LOT", "histograms": [{"batchcodes": ["LOT"], "histogram": {"Deafness": 1, "Ear pain": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT", "histograms": [{"histogram": {"Deafness": 1, "Ear pain": 1}, "batchcodes": ["LOT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/NPA-1-YBAJ9XTU.json b/docs/data/histograms/South Africa/NPA-1-YBAJ9XTU.json
index 53e96b18b99..28fb52cfab6 100644
--- a/docs/data/histograms/South Africa/NPA-1-YBAJ9XTU.json
+++ b/docs/data/histograms/South Africa/NPA-1-YBAJ9XTU.json
@@ -1 +1 @@
-{"batchcode": "NPA-1-YBAJ9XTU", "histograms": [{"batchcodes": ["NPA-1-YBAJ9XTU"], "histogram": {"Body temperature": 1, "Confusional state": 1, "Decreased appetite": 1, "Headache": 1, "Monoplegia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "NPA-1-YBAJ9XTU", "histograms": [{"histogram": {"Body temperature": 1, "Confusional state": 1, "Decreased appetite": 1, "Headache": 1, "Monoplegia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["NPA-1-YBAJ9XTU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/P00927.json b/docs/data/histograms/South Africa/P00927.json
index ddb719b0892..b09c1ed9331 100644
--- a/docs/data/histograms/South Africa/P00927.json
+++ b/docs/data/histograms/South Africa/P00927.json
@@ -1 +1 @@
-{"batchcode": "P00927", "histograms": [{"batchcodes": ["P00927"], "histogram": {"Cerebral thrombosis": 1, "Magnetic resonance imaging head": 1, "Migraine": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "P00927", "histograms": [{"histogram": {"Cerebral thrombosis": 1, "Magnetic resonance imaging head": 1, "Migraine": 1, "Thrombocytopenia": 1}, "batchcodes": ["P00927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PAA165969.json b/docs/data/histograms/South Africa/PAA165969.json
index 8804e56704b..9ed8afe33b7 100644
--- a/docs/data/histograms/South Africa/PAA165969.json
+++ b/docs/data/histograms/South Africa/PAA165969.json
@@ -1 +1 @@
-{"batchcode": "PAA165969", "histograms": [{"batchcodes": ["PAA165969"], "histogram": {"Dyspnoea": 1, "Erythema": 1, "Induration": 1, "Pneumonia": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Swelling": 1, "Syncope": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA165969", "histograms": [{"histogram": {"Dyspnoea": 1, "Erythema": 1, "Induration": 1, "Pneumonia": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Swelling": 1, "Syncope": 1, "Urticaria": 1}, "batchcodes": ["PAA165969"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PAA65994.json b/docs/data/histograms/South Africa/PAA65994.json
index c845fbc7bb6..19607605e17 100644
--- a/docs/data/histograms/South Africa/PAA65994.json
+++ b/docs/data/histograms/South Africa/PAA65994.json
@@ -1 +1 @@
-{"batchcode": "PAA65994", "histograms": [{"batchcodes": ["PAA65994"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Loss of consciousness": 1, "Malaise": 1, "Oxygen saturation": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "PAA65994", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Heart rate": 1, "Loss of consciousness": 1, "Malaise": 1, "Oxygen saturation": 1, "Syncope": 1}, "batchcodes": ["PAA65994"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PC0036.json b/docs/data/histograms/South Africa/PC0036.json
index 1bd04d37056..8687511667b 100644
--- a/docs/data/histograms/South Africa/PC0036.json
+++ b/docs/data/histograms/South Africa/PC0036.json
@@ -1 +1 @@
-{"batchcode": "PC0036", "histograms": [{"batchcodes": ["PC0036"], "histogram": {"Angiogram": 1, "Antineutrophil cytoplasmic antibody": 1, "Aphasia": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood electrolytes": 1, "Blood glucose": 1, "Blood magnesium": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Body temperature": 1, "Cardiovascular examination": 1, "Cerebral artery occlusion": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Full blood count": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hepatitis A": 1, "Hepatitis B": 1, "Hepatitis C": 1, "High density lipoprotein": 1, "Infarction": 1, "Investigation": 1, "Liver function test": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Nausea": 1, "Oxygen saturation": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Speech disorder": 1, "Thyroxine": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PC0036", "histograms": [{"histogram": {"Angiogram": 1, "Antineutrophil cytoplasmic antibody": 1, "Aphasia": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood electrolytes": 1, "Blood glucose": 1, "Blood magnesium": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Body temperature": 1, "Cardiovascular examination": 1, "Cerebral artery occlusion": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Full blood count": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hepatitis A": 1, "Hepatitis B": 1, "Hepatitis C": 1, "High density lipoprotein": 1, "Infarction": 1, "Investigation": 1, "Liver function test": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Nausea": 1, "Oxygen saturation": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Speech disorder": 1, "Thyroxine": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Vomiting": 1}, "batchcodes": ["PC0036"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PC1436.json b/docs/data/histograms/South Africa/PC1436.json
index c088c429493..ee0ba930810 100644
--- a/docs/data/histograms/South Africa/PC1436.json
+++ b/docs/data/histograms/South Africa/PC1436.json
@@ -1 +1 @@
-{"batchcode": "PC1436", "histograms": [{"batchcodes": ["PC1436"], "histogram": {"COVID-19": 1, "Chest X-ray": 1, "Death": 1, "Malaise": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "PC1436", "histograms": [{"histogram": {"COVID-19": 1, "Chest X-ray": 1, "Death": 1, "Malaise": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["PC1436"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PC3558.json b/docs/data/histograms/South Africa/PC3558.json
index a539bf74254..419dca5749b 100644
--- a/docs/data/histograms/South Africa/PC3558.json
+++ b/docs/data/histograms/South Africa/PC3558.json
@@ -1 +1 @@
-{"batchcode": "PC3558", "histograms": [{"batchcodes": ["PC3558"], "histogram": {"Burning sensation": 1, "Neuralgia": 1, "Neuropathy peripheral": 1}}]}
\ No newline at end of file
+{"batchcode": "PC3558", "histograms": [{"histogram": {"Burning sensation": 1, "Neuralgia": 1, "Neuropathy peripheral": 1}, "batchcodes": ["PC3558"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PCA0033.json b/docs/data/histograms/South Africa/PCA0033.json
index fe97112b1ae..e51ef42612f 100644
--- a/docs/data/histograms/South Africa/PCA0033.json
+++ b/docs/data/histograms/South Africa/PCA0033.json
@@ -1 +1 @@
-{"batchcode": "PCA0033", "histograms": [{"batchcodes": ["PCA0033"], "histogram": {"Blood pressure measurement": 3, "Heart rate": 3, "Blood pressure increased": 2, "Headache": 2, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Chills": 1, "Coma scale": 1, "Confusional state": 1, "Dizziness": 1, "Dyspnoea": 1, "EGFR status assay": 1, "Epistaxis": 1, "Faeces discoloured": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Impaired work ability": 1, "Lipids": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Musculoskeletal stiffness": 1, "Off label use": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Platelet count": 1, "Prothrombin time ratio": 1, "Raynaud's phenomenon": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Seizure": 1, "Speech disorder": 1, "Swelling": 1, "Syncope": 1, "Throat tightness": 1, "Tremor": 1, "Unresponsive to stimuli": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0033", "histograms": [{"histogram": {"Blood pressure measurement": 3, "Heart rate": 3, "Blood pressure increased": 2, "Headache": 2, "Anaphylactic reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood bilirubin": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Chills": 1, "Coma scale": 1, "Confusional state": 1, "Dizziness": 1, "Dyspnoea": 1, "EGFR status assay": 1, "Epistaxis": 1, "Faeces discoloured": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immunisation": 1, "Impaired work ability": 1, "Lipids": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Musculoskeletal stiffness": 1, "Off label use": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Platelet count": 1, "Prothrombin time ratio": 1, "Raynaud's phenomenon": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Seizure": 1, "Speech disorder": 1, "Swelling": 1, "Syncope": 1, "Throat tightness": 1, "Tremor": 1, "Unresponsive to stimuli": 1, "White blood cell count": 1}, "batchcodes": ["PCA0033"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PCA0036.json b/docs/data/histograms/South Africa/PCA0036.json
index 111f64dde2e..103c32c5d94 100644
--- a/docs/data/histograms/South Africa/PCA0036.json
+++ b/docs/data/histograms/South Africa/PCA0036.json
@@ -1 +1 @@
-{"batchcode": "PCA0036", "histograms": [{"batchcodes": ["PCA0036"], "histogram": {"Asthenia": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Heart rate": 2, "Abdominal pain": 1, "Blood glucose": 1, "Dizziness": 1, "Oxygen saturation": 1, "Rash": 1, "Restlessness": 1, "Shock symptom": 1, "Sitting disability": 1, "Skin warm": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0036", "histograms": [{"histogram": {"Asthenia": 2, "Blood pressure measurement": 2, "Body temperature": 2, "Heart rate": 2, "Abdominal pain": 1, "Blood glucose": 1, "Dizziness": 1, "Oxygen saturation": 1, "Rash": 1, "Restlessness": 1, "Shock symptom": 1, "Sitting disability": 1, "Skin warm": 1, "Vomiting": 1}, "batchcodes": ["PCA0036"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PCA0038.json b/docs/data/histograms/South Africa/PCA0038.json
index afc74f33a91..2c5af81f245 100644
--- a/docs/data/histograms/South Africa/PCA0038.json
+++ b/docs/data/histograms/South Africa/PCA0038.json
@@ -1 +1 @@
-{"batchcode": "PCA0038", "histograms": [{"batchcodes": ["209A21A", "PCA0038"], "histogram": {"Acute kidney injury": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Laboratory test": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Oxygen saturation": 1, "Platelet count": 1, "Protein total": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "White blood cell count": 1}}, {"batchcodes": ["PCA0038"], "histogram": {"Asthenia": 2, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anaemia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Bilirubin conjugated": 1, "Bilirubin conjugated increased": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Blood urea increased": 1, "Body temperature": 1, "Coma": 1, "Dizziness": 1, "Dyspnoea": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypersomnia": 1, "Hypoglycaemia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lipaemic index score": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Oedema peripheral": 1, "Off label use": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Platelet count": 1, "Protein total normal": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Sepsis": 1, "Shock symptom": 1, "Somnolence": 1, "Speech disorder": 1, "Thrombosis": 1, "Vaccination site swelling": 1, "Vomiting": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0038", "histograms": [{"histogram": {"Acute kidney injury": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Coma scale": 1, "Gamma-glutamyltransferase": 1, "Gastritis": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypertension": 1, "Hypoglycaemia": 1, "Laboratory test": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Oxygen saturation": 1, "Platelet count": 1, "Protein total": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "White blood cell count": 1}, "batchcodes": ["209A21A", "PCA0038"]}, {"histogram": {"Asthenia": 2, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anaemia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Bilirubin conjugated": 1, "Bilirubin conjugated increased": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood bilirubin": 1, "Blood bilirubin increased": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Blood urea increased": 1, "Body temperature": 1, "Coma": 1, "Dizziness": 1, "Dyspnoea": 1, "Gait disturbance": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypersomnia": 1, "Hypoglycaemia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lipaemic index score": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Oedema peripheral": 1, "Off label use": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Platelet count": 1, "Protein total normal": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Sepsis": 1, "Shock symptom": 1, "Somnolence": 1, "Speech disorder": 1, "Thrombosis": 1, "Vaccination site swelling": 1, "Vomiting": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["PCA0038"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PE2090.json b/docs/data/histograms/South Africa/PE2090.json
index c28f3128a66..6a7436b2fc9 100644
--- a/docs/data/histograms/South Africa/PE2090.json
+++ b/docs/data/histograms/South Africa/PE2090.json
@@ -1 +1 @@
-{"batchcode": "PE2090", "histograms": [{"batchcodes": ["PE2090"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Disturbance in attention": 1, "Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "PE2090", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Disturbance in attention": 1, "Dizziness": 1}, "batchcodes": ["PE2090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PE3064.json b/docs/data/histograms/South Africa/PE3064.json
index 4e8dc99398f..ce66cb9f713 100644
--- a/docs/data/histograms/South Africa/PE3064.json
+++ b/docs/data/histograms/South Africa/PE3064.json
@@ -1 +1 @@
-{"batchcode": "PE3064", "histograms": [{"batchcodes": ["PE3064"], "histogram": {"Asthenia": 1, "Discomfort": 1, "Erythema": 1, "Hypoaesthesia": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pain in extremity": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "PE3064", "histograms": [{"histogram": {"Asthenia": 1, "Discomfort": 1, "Erythema": 1, "Hypoaesthesia": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pain in extremity": 1, "Swelling": 1}, "batchcodes": ["PE3064"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/PE9174.json b/docs/data/histograms/South Africa/PE9174.json
index a6edcfa2218..726886cbe57 100644
--- a/docs/data/histograms/South Africa/PE9174.json
+++ b/docs/data/histograms/South Africa/PE9174.json
@@ -1 +1 @@
-{"batchcode": "PE9174", "histograms": [{"batchcodes": ["PE9174"], "histogram": {"Migraine": 1}}]}
\ No newline at end of file
+{"batchcode": "PE9174", "histograms": [{"histogram": {"Migraine": 1}, "batchcodes": ["PE9174"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/Q0921.json b/docs/data/histograms/South Africa/Q0921.json
index 1bac2e196c0..63658a1fcae 100644
--- a/docs/data/histograms/South Africa/Q0921.json
+++ b/docs/data/histograms/South Africa/Q0921.json
@@ -1 +1 @@
-{"batchcode": "Q0921", "histograms": [{"batchcodes": ["Q0921"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "Q0921", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["Q0921"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/RA5715.json b/docs/data/histograms/South Africa/RA5715.json
index b7ab15d81b7..740403d4644 100644
--- a/docs/data/histograms/South Africa/RA5715.json
+++ b/docs/data/histograms/South Africa/RA5715.json
@@ -1 +1 @@
-{"batchcode": "RA5715", "histograms": [{"batchcodes": ["RA5715"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "RA5715", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["RA5715"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/RD0927.json b/docs/data/histograms/South Africa/RD0927.json
index 69f0e07d4df..92742aeda99 100644
--- a/docs/data/histograms/South Africa/RD0927.json
+++ b/docs/data/histograms/South Africa/RD0927.json
@@ -1 +1 @@
-{"batchcode": "RD0927", "histograms": [{"batchcodes": ["RD0927"], "histogram": {"Motor dysfunction": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "RD0927", "histograms": [{"histogram": {"Motor dysfunction": 1, "Pain": 1}, "batchcodes": ["RD0927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/S2-PASW7VSF.json b/docs/data/histograms/South Africa/S2-PASW7VSF.json
index b95bb5d60f8..9bafe17786d 100644
--- a/docs/data/histograms/South Africa/S2-PASW7VSF.json
+++ b/docs/data/histograms/South Africa/S2-PASW7VSF.json
@@ -1 +1 @@
-{"batchcode": "S2-PASW7VSF", "histograms": [{"batchcodes": ["S2-PASW7VSF"], "histogram": {"Breast pain": 1}}]}
\ No newline at end of file
+{"batchcode": "S2-PASW7VSF", "histograms": [{"histogram": {"Breast pain": 1}, "batchcodes": ["S2-PASW7VSF"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/S6496.json b/docs/data/histograms/South Africa/S6496.json
index af5bb4d53dd..31925611e13 100644
--- a/docs/data/histograms/South Africa/S6496.json
+++ b/docs/data/histograms/South Africa/S6496.json
@@ -1 +1 @@
-{"batchcode": "S6496", "histograms": [{"batchcodes": ["S6496"], "histogram": {"Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "S6496", "histograms": [{"histogram": {"Peripheral swelling": 1}, "batchcodes": ["S6496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/SC5338.json b/docs/data/histograms/South Africa/SC5338.json
index 3301daa92f1..9394c2b6eb8 100644
--- a/docs/data/histograms/South Africa/SC5338.json
+++ b/docs/data/histograms/South Africa/SC5338.json
@@ -1 +1 @@
-{"batchcode": "SC5338", "histograms": [{"batchcodes": ["SC5338"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "SC5338", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["SC5338"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/SD0927.json b/docs/data/histograms/South Africa/SD0927.json
index 8daf20da377..c195901a1c7 100644
--- a/docs/data/histograms/South Africa/SD0927.json
+++ b/docs/data/histograms/South Africa/SD0927.json
@@ -1 +1 @@
-{"batchcode": "SD0927", "histograms": [{"batchcodes": ["SD0927"], "histogram": {"Abdominal pain": 1, "COVID-19": 1, "Confusional state": 1, "Death": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "SD0927", "histograms": [{"histogram": {"Abdominal pain": 1, "COVID-19": 1, "Confusional state": 1, "Death": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["SD0927"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/SE426.json b/docs/data/histograms/South Africa/SE426.json
index 4c99126023a..cba70afa253 100644
--- a/docs/data/histograms/South Africa/SE426.json
+++ b/docs/data/histograms/South Africa/SE426.json
@@ -1 +1 @@
-{"batchcode": "SE426", "histograms": [{"batchcodes": ["SE426"], "histogram": {"Fibrin D dimer": 1, "Nasopharyngitis": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "SE426", "histograms": [{"histogram": {"Fibrin D dimer": 1, "Nasopharyngitis": 1, "Pulmonary embolism": 1}, "batchcodes": ["SE426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/SE494220215.json b/docs/data/histograms/South Africa/SE494220215.json
index dbde70d97c3..748809b3502 100644
--- a/docs/data/histograms/South Africa/SE494220215.json
+++ b/docs/data/histograms/South Africa/SE494220215.json
@@ -1 +1 @@
-{"batchcode": "SE494220215", "histograms": [{"batchcodes": ["SE494220215"], "histogram": {"Motor dysfunction": 1}}]}
\ No newline at end of file
+{"batchcode": "SE494220215", "histograms": [{"histogram": {"Motor dysfunction": 1}, "batchcodes": ["SE494220215"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/SK 0115.json b/docs/data/histograms/South Africa/SK 0115.json
index 912ff018cd5..09857c36376 100644
--- a/docs/data/histograms/South Africa/SK 0115.json
+++ b/docs/data/histograms/South Africa/SK 0115.json
@@ -1 +1 @@
-{"batchcode": "SK 0115", "histograms": [{"batchcodes": ["SK 0115"], "histogram": {"Dizziness": 1, "Dysphonia": 1, "Fatigue": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "SK 0115", "histograms": [{"histogram": {"Dizziness": 1, "Dysphonia": 1, "Fatigue": 1, "Nausea": 1}, "batchcodes": ["SK 0115"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T306272.json b/docs/data/histograms/South Africa/T306272.json
index c4dd3071272..ac2112a5473 100644
--- a/docs/data/histograms/South Africa/T306272.json
+++ b/docs/data/histograms/South Africa/T306272.json
@@ -1 +1 @@
-{"batchcode": "T306272", "histograms": [{"batchcodes": ["T306272"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "T306272", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["T306272"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T306274.json b/docs/data/histograms/South Africa/T306274.json
index a9408bc5556..0ffd6d82fcf 100644
--- a/docs/data/histograms/South Africa/T306274.json
+++ b/docs/data/histograms/South Africa/T306274.json
@@ -1 +1 @@
-{"batchcode": "T306274", "histograms": [{"batchcodes": ["T306274"], "histogram": {"Arthralgia": 1, "Confusional state": 1, "Dry skin": 1, "Headache": 1, "Hemiplegia": 1, "Humerus fracture": 1, "Juvenile psoriatic arthritis": 1, "Neck pain": 1, "Pain in extremity": 1, "Seizure": 1, "Swelling": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "T306274", "histograms": [{"histogram": {"Arthralgia": 1, "Confusional state": 1, "Dry skin": 1, "Headache": 1, "Hemiplegia": 1, "Humerus fracture": 1, "Juvenile psoriatic arthritis": 1, "Neck pain": 1, "Pain in extremity": 1, "Seizure": 1, "Swelling": 1, "Wound": 1}, "batchcodes": ["T306274"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T306275.json b/docs/data/histograms/South Africa/T306275.json
index c585950ee0a..39e21bde559 100644
--- a/docs/data/histograms/South Africa/T306275.json
+++ b/docs/data/histograms/South Africa/T306275.json
@@ -1 +1 @@
-{"batchcode": "T306275", "histograms": [{"batchcodes": ["T306275"], "histogram": {"Chest pain": 2, "Dizziness": 2, "Pyrexia": 2, "Arrhythmia": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cerebral venous sinus thrombosis": 1, "Chest discomfort": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Embolism": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gestational hypertension": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Haemorrhagic stroke": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Infection": 1, "Injection site pain": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Migraine": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Nerve block": 1, "Neuralgia": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Pre-eclampsia": 1, "Pulmonary embolism": 1, "Renal embolism": 1, "Somnolence": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "T306275", "histograms": [{"histogram": {"Chest pain": 2, "Dizziness": 2, "Pyrexia": 2, "Arrhythmia": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cerebral venous sinus thrombosis": 1, "Chest discomfort": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Embolism": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gestational hypertension": 1, "Guillain-Barre syndrome": 1, "Haemorrhage": 1, "Haemorrhagic stroke": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Infection": 1, "Injection site pain": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Migraine": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Nerve block": 1, "Neuralgia": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Pre-eclampsia": 1, "Pulmonary embolism": 1, "Renal embolism": 1, "Somnolence": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Vomiting": 1}, "batchcodes": ["T306275"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T306276.json b/docs/data/histograms/South Africa/T306276.json
index 24a94d1fff0..e9ba3912712 100644
--- a/docs/data/histograms/South Africa/T306276.json
+++ b/docs/data/histograms/South Africa/T306276.json
@@ -1 +1 @@
-{"batchcode": "T306276", "histograms": [{"batchcodes": ["T306276"], "histogram": {"Cough": 1, "Dizziness": 1, "Pulmonary embolism": 1, "Radiculitis brachial": 1}}]}
\ No newline at end of file
+{"batchcode": "T306276", "histograms": [{"histogram": {"Cough": 1, "Dizziness": 1, "Pulmonary embolism": 1, "Radiculitis brachial": 1}, "batchcodes": ["T306276"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T306277.json b/docs/data/histograms/South Africa/T306277.json
index ef2a7f9e6c0..db79f92a20c 100644
--- a/docs/data/histograms/South Africa/T306277.json
+++ b/docs/data/histograms/South Africa/T306277.json
@@ -1 +1 @@
-{"batchcode": "T306277", "histograms": [{"batchcodes": ["T306277"], "histogram": {"Blood pressure measurement": 2, "Electrocardiogram": 2, "Heart rate": 2, "Arrhythmia": 1, "Blood test": 1, "Body temperature": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Joint swelling": 1, "Oxygen saturation": 1, "Pleural effusion": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pulmonary thrombosis": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "T306277", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Electrocardiogram": 2, "Heart rate": 2, "Arrhythmia": 1, "Blood test": 1, "Body temperature": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Joint swelling": 1, "Oxygen saturation": 1, "Pleural effusion": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Pulmonary thrombosis": 1, "Respiratory rate": 1}, "batchcodes": ["T306277"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T306278.json b/docs/data/histograms/South Africa/T306278.json
index d20a1e133c9..38a73f8e0c4 100644
--- a/docs/data/histograms/South Africa/T306278.json
+++ b/docs/data/histograms/South Africa/T306278.json
@@ -1 +1 @@
-{"batchcode": "T306278", "histograms": [{"batchcodes": ["T306278"], "histogram": {"Dizziness": 4, "Headache": 3, "Arthralgia": 2, "Back pain": 1, "Blood test": 1, "Bone pain": 1, "Chest pain": 1, "Confusional state": 1, "Ear disorder": 1, "Encephalopathy": 1, "Fatigue": 1, "Hallucination": 1, "Local reaction": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Syncope": 1, "Taste disorder": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "T306278", "histograms": [{"histogram": {"Dizziness": 4, "Headache": 3, "Arthralgia": 2, "Back pain": 1, "Blood test": 1, "Bone pain": 1, "Chest pain": 1, "Confusional state": 1, "Ear disorder": 1, "Encephalopathy": 1, "Fatigue": 1, "Hallucination": 1, "Local reaction": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Syncope": 1, "Taste disorder": 1, "X-ray": 1}, "batchcodes": ["T306278"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T315652.json b/docs/data/histograms/South Africa/T315652.json
index c7e8ecc33d3..a2b31153603 100644
--- a/docs/data/histograms/South Africa/T315652.json
+++ b/docs/data/histograms/South Africa/T315652.json
@@ -1 +1 @@
-{"batchcode": "T315652", "histograms": [{"batchcodes": ["T315652"], "histogram": {"Headache": 2, "Pain": 2, "Body temperature": 1, "COVID-19 pneumonia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "T315652", "histograms": [{"histogram": {"Headache": 2, "Pain": 2, "Body temperature": 1, "COVID-19 pneumonia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["T315652"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T315653,20F08-0.json b/docs/data/histograms/South Africa/T315653,20F08-0.json
index ef6af0e979c..82029d86cdd 100644
--- a/docs/data/histograms/South Africa/T315653,20F08-0.json
+++ b/docs/data/histograms/South Africa/T315653,20F08-0.json
@@ -1 +1 @@
-{"batchcode": "T315653,20F08-0", "histograms": [{"batchcodes": ["T315653,20F08-0"], "histogram": {"Abdominal pain lower": 1, "Back pain": 1, "Biopsy prostate": 1, "Dysuria": 1, "Hypertension": 1, "Laboratory test": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Ultrasound abdomen": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "T315653,20F08-0", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Back pain": 1, "Biopsy prostate": 1, "Dysuria": 1, "Hypertension": 1, "Laboratory test": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Ultrasound abdomen": 1, "Urine analysis": 1}, "batchcodes": ["T315653,20F08-0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/T315653.json b/docs/data/histograms/South Africa/T315653.json
index 3442f15f80c..c60e0ea53ed 100644
--- a/docs/data/histograms/South Africa/T315653.json
+++ b/docs/data/histograms/South Africa/T315653.json
@@ -1 +1 @@
-{"batchcode": "T315653", "histograms": [{"batchcodes": ["T315653"], "histogram": {"Body mass index": 1, "Deep vein thrombosis": 1, "Fatigue": 1, "Gestational hypertension": 1, "HELLP syndrome": 1, "Hepatic enzyme": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Platelet count": 1, "Premature delivery": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "T315653", "histograms": [{"histogram": {"Body mass index": 1, "Deep vein thrombosis": 1, "Fatigue": 1, "Gestational hypertension": 1, "HELLP syndrome": 1, "Hepatic enzyme": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1, "Platelet count": 1, "Premature delivery": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["T315653"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/TC7YPXUPFFW.json b/docs/data/histograms/South Africa/TC7YPXUPFFW.json
index ed95a001993..c3ea1ce8c92 100644
--- a/docs/data/histograms/South Africa/TC7YPXUPFFW.json
+++ b/docs/data/histograms/South Africa/TC7YPXUPFFW.json
@@ -1 +1 @@
-{"batchcode": "TC7YPXUPFFW", "histograms": [{"batchcodes": ["TC7YPXUPFFW"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "TC7YPXUPFFW", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["TC7YPXUPFFW"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/TE425.json b/docs/data/histograms/South Africa/TE425.json
index 31e0c38c190..53b91d018a9 100644
--- a/docs/data/histograms/South Africa/TE425.json
+++ b/docs/data/histograms/South Africa/TE425.json
@@ -1 +1 @@
-{"batchcode": "TE425", "histograms": [{"batchcodes": ["TE425"], "histogram": {"Asthenia": 1, "Vaginal haemorrhage": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "TE425", "histograms": [{"histogram": {"Asthenia": 1, "Vaginal haemorrhage": 1, "Weight decreased": 1}, "batchcodes": ["TE425"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/TG2975.json b/docs/data/histograms/South Africa/TG2975.json
index b5422edc18a..c7148693d41 100644
--- a/docs/data/histograms/South Africa/TG2975.json
+++ b/docs/data/histograms/South Africa/TG2975.json
@@ -1 +1 @@
-{"batchcode": "TG2975", "histograms": [{"batchcodes": ["TG2975"], "histogram": {"Cardiac arrest": 1, "Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "TG2975", "histograms": [{"histogram": {"Cardiac arrest": 1, "Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["TG2975"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/TJ4X3FYW.json b/docs/data/histograms/South Africa/TJ4X3FYW.json
index cc50454b27e..27049660783 100644
--- a/docs/data/histograms/South Africa/TJ4X3FYW.json
+++ b/docs/data/histograms/South Africa/TJ4X3FYW.json
@@ -1 +1 @@
-{"batchcode": "TJ4X3FYW", "histograms": [{"batchcodes": ["TJ4X3FYW"], "histogram": {"Haemorrhage": 1, "Penile haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "TJ4X3FYW", "histograms": [{"histogram": {"Haemorrhage": 1, "Penile haemorrhage": 1}, "batchcodes": ["TJ4X3FYW"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/V37VCH4N7CAF.json b/docs/data/histograms/South Africa/V37VCH4N7CAF.json
index a089b8cb1fd..4053de49679 100644
--- a/docs/data/histograms/South Africa/V37VCH4N7CAF.json
+++ b/docs/data/histograms/South Africa/V37VCH4N7CAF.json
@@ -1 +1 @@
-{"batchcode": "V37VCH4N7CAF", "histograms": [{"batchcodes": ["V37VCH4N7CAF"], "histogram": {"Local reaction": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "V37VCH4N7CAF", "histograms": [{"histogram": {"Local reaction": 1, "Swelling": 1}, "batchcodes": ["V37VCH4N7CAF"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/V3HACNTACRLU.json b/docs/data/histograms/South Africa/V3HACNTACRLU.json
index db28234144e..0ca14c49685 100644
--- a/docs/data/histograms/South Africa/V3HACNTACRLU.json
+++ b/docs/data/histograms/South Africa/V3HACNTACRLU.json
@@ -1 +1 @@
-{"batchcode": "V3HACNTACRLU", "histograms": [{"batchcodes": ["V3HACNTACRLU"], "histogram": {"Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "V3HACNTACRLU", "histograms": [{"histogram": {"Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["V3HACNTACRLU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/V4PMK9WK74TM.json b/docs/data/histograms/South Africa/V4PMK9WK74TM.json
index 9f85618f471..be68f6fa9b6 100644
--- a/docs/data/histograms/South Africa/V4PMK9WK74TM.json
+++ b/docs/data/histograms/South Africa/V4PMK9WK74TM.json
@@ -1 +1 @@
-{"batchcode": "V4PMK9WK74TM", "histograms": [{"batchcodes": ["V4PMK9WK74TM"], "histogram": {"Blood cholesterol": 1, "Chest pain": 1, "Headache": 1, "Herpes zoster": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "V4PMK9WK74TM", "histograms": [{"histogram": {"Blood cholesterol": 1, "Chest pain": 1, "Headache": 1, "Herpes zoster": 1, "Pain": 1}, "batchcodes": ["V4PMK9WK74TM"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/V4RHJJ3T4TWJ.json b/docs/data/histograms/South Africa/V4RHJJ3T4TWJ.json
index f38ca6a877a..38c7e7931b6 100644
--- a/docs/data/histograms/South Africa/V4RHJJ3T4TWJ.json
+++ b/docs/data/histograms/South Africa/V4RHJJ3T4TWJ.json
@@ -1 +1 @@
-{"batchcode": "V4RHJJ3T4TWJ", "histograms": [{"batchcodes": ["V4RHJJ3T4TWJ"], "histogram": {"Asthenia": 1, "Confusional state": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "V4RHJJ3T4TWJ", "histograms": [{"histogram": {"Asthenia": 1, "Confusional state": 1, "Dyspnoea": 1}, "batchcodes": ["V4RHJJ3T4TWJ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VAHKVTLX7JJJ.json b/docs/data/histograms/South Africa/VAHKVTLX7JJJ.json
index 870369044de..ab6a2129d2a 100644
--- a/docs/data/histograms/South Africa/VAHKVTLX7JJJ.json
+++ b/docs/data/histograms/South Africa/VAHKVTLX7JJJ.json
@@ -1 +1 @@
-{"batchcode": "VAHKVTLX7JJJ", "histograms": [{"batchcodes": ["VAHKVTLX7JJJ"], "histogram": {"Culture": 1, "Dehydration": 1, "Diarrhoea": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "VAHKVTLX7JJJ", "histograms": [{"histogram": {"Culture": 1, "Dehydration": 1, "Diarrhoea": 1, "Polymerase chain reaction": 1}, "batchcodes": ["VAHKVTLX7JJJ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VARCUNJHJSPY.json b/docs/data/histograms/South Africa/VARCUNJHJSPY.json
index c33ff101fe3..91c8ff45035 100644
--- a/docs/data/histograms/South Africa/VARCUNJHJSPY.json
+++ b/docs/data/histograms/South Africa/VARCUNJHJSPY.json
@@ -1 +1 @@
-{"batchcode": "VARCUNJHJSPY", "histograms": [{"batchcodes": ["VARCUNJHJSPY"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VARCUNJHJSPY", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["VARCUNJHJSPY"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VE426.json b/docs/data/histograms/South Africa/VE426.json
index 43911d48212..bf04c779462 100644
--- a/docs/data/histograms/South Africa/VE426.json
+++ b/docs/data/histograms/South Africa/VE426.json
@@ -1 +1 @@
-{"batchcode": "VE426", "histograms": [{"batchcodes": ["VE426"], "histogram": {"Dizziness": 1, "Epistaxis": 1, "Haematochezia": 1, "Heart rate": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "VE426", "histograms": [{"histogram": {"Dizziness": 1, "Epistaxis": 1, "Haematochezia": 1, "Heart rate": 1, "Vision blurred": 1}, "batchcodes": ["VE426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VEFUALLE73VL.json b/docs/data/histograms/South Africa/VEFUALLE73VL.json
index 5456f9fd0ef..b7a9d55c428 100644
--- a/docs/data/histograms/South Africa/VEFUALLE73VL.json
+++ b/docs/data/histograms/South Africa/VEFUALLE73VL.json
@@ -1 +1 @@
-{"batchcode": "VEFUALLE73VL", "histograms": [{"batchcodes": ["VEFUALLE73VL"], "histogram": {"Blister": 1, "Haemoptysis": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "VEFUALLE73VL", "histograms": [{"histogram": {"Blister": 1, "Haemoptysis": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Weight decreased": 1}, "batchcodes": ["VEFUALLE73VL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VFLKF4XRTRNU.json b/docs/data/histograms/South Africa/VFLKF4XRTRNU.json
index a63f9ad2c90..b784eed7132 100644
--- a/docs/data/histograms/South Africa/VFLKF4XRTRNU.json
+++ b/docs/data/histograms/South Africa/VFLKF4XRTRNU.json
@@ -1 +1 @@
-{"batchcode": "VFLKF4XRTRNU", "histograms": [{"batchcodes": ["VFLKF4XRTRNU"], "histogram": {"Chest discomfort": 1, "Headache": 1, "Myalgia": 1, "Pruritus": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "VFLKF4XRTRNU", "histograms": [{"histogram": {"Chest discomfort": 1, "Headache": 1, "Myalgia": 1, "Pruritus": 1, "Rhinorrhoea": 1}, "batchcodes": ["VFLKF4XRTRNU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VK4E3UPYHLFVY.json b/docs/data/histograms/South Africa/VK4E3UPYHLFVY.json
index cbac6128a44..2297ad0111b 100644
--- a/docs/data/histograms/South Africa/VK4E3UPYHLFVY.json
+++ b/docs/data/histograms/South Africa/VK4E3UPYHLFVY.json
@@ -1 +1 @@
-{"batchcode": "VK4E3UPYHLFVY", "histograms": [{"batchcodes": ["VK4E3UPYHLFVY"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "VK4E3UPYHLFVY", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["VK4E3UPYHLFVY"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VKVJV9UL4CWJ.json b/docs/data/histograms/South Africa/VKVJV9UL4CWJ.json
index f15ce72b435..5fd1bd0e01c 100644
--- a/docs/data/histograms/South Africa/VKVJV9UL4CWJ.json
+++ b/docs/data/histograms/South Africa/VKVJV9UL4CWJ.json
@@ -1 +1 @@
-{"batchcode": "VKVJV9UL4CWJ", "histograms": [{"batchcodes": ["VKVJV9UL4CWJ"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Myasthenia gravis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VKVJV9UL4CWJ", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Myasthenia gravis": 1, "Pyrexia": 1}, "batchcodes": ["VKVJV9UL4CWJ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VL9UXMVHXJXN.json b/docs/data/histograms/South Africa/VL9UXMVHXJXN.json
index 5607762dd6f..f8d13e7c96f 100644
--- a/docs/data/histograms/South Africa/VL9UXMVHXJXN.json
+++ b/docs/data/histograms/South Africa/VL9UXMVHXJXN.json
@@ -1 +1 @@
-{"batchcode": "VL9UXMVHXJXN", "histograms": [{"batchcodes": ["VL9UXMVHXJXN"], "histogram": {"Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VL9UXMVHXJXN", "histograms": [{"histogram": {"Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1}, "batchcodes": ["VL9UXMVHXJXN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VP3EWH4YMFC3.json b/docs/data/histograms/South Africa/VP3EWH4YMFC3.json
index 606b5f22187..e32c9aaa1c6 100644
--- a/docs/data/histograms/South Africa/VP3EWH4YMFC3.json
+++ b/docs/data/histograms/South Africa/VP3EWH4YMFC3.json
@@ -1 +1 @@
-{"batchcode": "VP3EWH4YMFC3", "histograms": [{"batchcodes": ["VP3EWH4YMFC3"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "VP3EWH4YMFC3", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["VP3EWH4YMFC3"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPA-1-3HM4DTY5.json b/docs/data/histograms/South Africa/VPA-1-3HM4DTY5.json
index 6a3be5463a1..5d8fbaf33ac 100644
--- a/docs/data/histograms/South Africa/VPA-1-3HM4DTY5.json
+++ b/docs/data/histograms/South Africa/VPA-1-3HM4DTY5.json
@@ -1 +1 @@
-{"batchcode": "VPA-1-3HM4DTY5", "histograms": [{"batchcodes": ["VPA-1-3HM4DTY5"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "VPA-1-3HM4DTY5", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["VPA-1-3HM4DTY5"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPA-1-EVDBQP2.json b/docs/data/histograms/South Africa/VPA-1-EVDBQP2.json
index a72013af6b3..debe80e9a1f 100644
--- a/docs/data/histograms/South Africa/VPA-1-EVDBQP2.json
+++ b/docs/data/histograms/South Africa/VPA-1-EVDBQP2.json
@@ -1 +1 @@
-{"batchcode": "VPA-1-EVDBQP2", "histograms": [{"batchcodes": ["VPA-1-EVDBQP2"], "histogram": {"Bell's palsy": 1}}]}
\ No newline at end of file
+{"batchcode": "VPA-1-EVDBQP2", "histograms": [{"histogram": {"Bell's palsy": 1}, "batchcodes": ["VPA-1-EVDBQP2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPA-1-PYMKVJ2T.json b/docs/data/histograms/South Africa/VPA-1-PYMKVJ2T.json
index 6639767effb..b03a5479c81 100644
--- a/docs/data/histograms/South Africa/VPA-1-PYMKVJ2T.json
+++ b/docs/data/histograms/South Africa/VPA-1-PYMKVJ2T.json
@@ -1 +1 @@
-{"batchcode": "VPA-1-PYMKVJ2T", "histograms": [{"batchcodes": ["VPA-1-PYMKVJ2T"], "histogram": {"Confusional state": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VPA-1-PYMKVJ2T", "histograms": [{"histogram": {"Confusional state": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["VPA-1-PYMKVJ2T"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPA-1-SH233G4B.json b/docs/data/histograms/South Africa/VPA-1-SH233G4B.json
index 488b544d792..41d24c2a3ac 100644
--- a/docs/data/histograms/South Africa/VPA-1-SH233G4B.json
+++ b/docs/data/histograms/South Africa/VPA-1-SH233G4B.json
@@ -1 +1 @@
-{"batchcode": "VPA-1-SH233G4B", "histograms": [{"batchcodes": ["VPA-1-SH233G4B"], "histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VPA-1-SH233G4B", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["VPA-1-SH233G4B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPA2NFGAKCP9.json b/docs/data/histograms/South Africa/VPA2NFGAKCP9.json
index 1e665d7af1b..52df53eff92 100644
--- a/docs/data/histograms/South Africa/VPA2NFGAKCP9.json
+++ b/docs/data/histograms/South Africa/VPA2NFGAKCP9.json
@@ -1 +1 @@
-{"batchcode": "VPA2NFGAKCP9", "histograms": [{"batchcodes": ["VPA2NFGAKCP9"], "histogram": {"Abdominal pain": 1, "Death": 1, "Local reaction": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "VPA2NFGAKCP9", "histograms": [{"histogram": {"Abdominal pain": 1, "Death": 1, "Local reaction": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["VPA2NFGAKCP9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPB-1-5MVZ4TXQ.json b/docs/data/histograms/South Africa/VPB-1-5MVZ4TXQ.json
index 8e983270736..3359e4ad74f 100644
--- a/docs/data/histograms/South Africa/VPB-1-5MVZ4TXQ.json
+++ b/docs/data/histograms/South Africa/VPB-1-5MVZ4TXQ.json
@@ -1 +1 @@
-{"batchcode": "VPB-1-5MVZ4TXQ", "histograms": [{"batchcodes": ["VPB-1-5MVZ4TXQ"], "histogram": {"Dizziness": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "VPB-1-5MVZ4TXQ", "histograms": [{"histogram": {"Dizziness": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["VPB-1-5MVZ4TXQ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPB-1-G3EQHJ5V.json b/docs/data/histograms/South Africa/VPB-1-G3EQHJ5V.json
index df71566604a..ee07be5313c 100644
--- a/docs/data/histograms/South Africa/VPB-1-G3EQHJ5V.json
+++ b/docs/data/histograms/South Africa/VPB-1-G3EQHJ5V.json
@@ -1 +1 @@
-{"batchcode": "VPB-1-G3EQHJ5V", "histograms": [{"batchcodes": ["VPB-1-G3EQHJ5V"], "histogram": {"Anaphylactic reaction": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "VPB-1-G3EQHJ5V", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Local reaction": 1}, "batchcodes": ["VPB-1-G3EQHJ5V"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPB-1-SW4JDY2H.json b/docs/data/histograms/South Africa/VPB-1-SW4JDY2H.json
index 3eb2cc330a2..78c64795e38 100644
--- a/docs/data/histograms/South Africa/VPB-1-SW4JDY2H.json
+++ b/docs/data/histograms/South Africa/VPB-1-SW4JDY2H.json
@@ -1 +1 @@
-{"batchcode": "VPB-1-SW4JDY2H", "histograms": [{"batchcodes": ["VPB-1-SW4JDY2H"], "histogram": {"Arthralgia": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VPB-1-SW4JDY2H", "histograms": [{"histogram": {"Arthralgia": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["VPB-1-SW4JDY2H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPB-1MW53SBDN.json b/docs/data/histograms/South Africa/VPB-1MW53SBDN.json
index 3087b916788..a9ed09781b7 100644
--- a/docs/data/histograms/South Africa/VPB-1MW53SBDN.json
+++ b/docs/data/histograms/South Africa/VPB-1MW53SBDN.json
@@ -1 +1 @@
-{"batchcode": "VPB-1MW53SBDN", "histograms": [{"batchcodes": ["VPB-1MW53SBDN"], "histogram": {"Heart rate increased": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "VPB-1MW53SBDN", "histograms": [{"histogram": {"Heart rate increased": 1, "Loss of consciousness": 1}, "batchcodes": ["VPB-1MW53SBDN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPB1CW3YBAUR.json b/docs/data/histograms/South Africa/VPB1CW3YBAUR.json
index e8356feaa5b..4d9a0da48d3 100644
--- a/docs/data/histograms/South Africa/VPB1CW3YBAUR.json
+++ b/docs/data/histograms/South Africa/VPB1CW3YBAUR.json
@@ -1 +1 @@
-{"batchcode": "VPB1CW3YBAUR", "histograms": [{"batchcodes": ["VPB1CW3YBAUR"], "histogram": {"Heart rate": 1, "Palpitations": 1, "Superior vena cava syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "VPB1CW3YBAUR", "histograms": [{"histogram": {"Heart rate": 1, "Palpitations": 1, "Superior vena cava syndrome": 1}, "batchcodes": ["VPB1CW3YBAUR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPF7JXHU9N9W.json b/docs/data/histograms/South Africa/VPF7JXHU9N9W.json
index ae38ba6fd2f..24e1da750ac 100644
--- a/docs/data/histograms/South Africa/VPF7JXHU9N9W.json
+++ b/docs/data/histograms/South Africa/VPF7JXHU9N9W.json
@@ -1 +1 @@
-{"batchcode": "VPF7JXHU9N9W", "histograms": [{"batchcodes": ["VPF7JXHU9N9W"], "histogram": {"Erectile dysfunction": 1}}]}
\ No newline at end of file
+{"batchcode": "VPF7JXHU9N9W", "histograms": [{"histogram": {"Erectile dysfunction": 1}, "batchcodes": ["VPF7JXHU9N9W"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPRVJYAK97JJ.json b/docs/data/histograms/South Africa/VPRVJYAK97JJ.json
index 5d2693cfaf9..7911777fa5a 100644
--- a/docs/data/histograms/South Africa/VPRVJYAK97JJ.json
+++ b/docs/data/histograms/South Africa/VPRVJYAK97JJ.json
@@ -1 +1 @@
-{"batchcode": "VPRVJYAK97JJ", "histograms": [{"batchcodes": ["VPRVJYAK97JJ"], "histogram": {"Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "VPRVJYAK97JJ", "histograms": [{"histogram": {"Palpitations": 1}, "batchcodes": ["VPRVJYAK97JJ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VPWVFNAMKW44.json b/docs/data/histograms/South Africa/VPWVFNAMKW44.json
index 206fa8bdcc2..cbde862fcd8 100644
--- a/docs/data/histograms/South Africa/VPWVFNAMKW44.json
+++ b/docs/data/histograms/South Africa/VPWVFNAMKW44.json
@@ -1 +1 @@
-{"batchcode": "VPWVFNAMKW44", "histograms": [{"batchcodes": ["VPWVFNAMKW44"], "histogram": {"Headache": 1, "Pyrexia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "VPWVFNAMKW44", "histograms": [{"histogram": {"Headache": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["VPWVFNAMKW44"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VRFNTFRVUCMJ.json b/docs/data/histograms/South Africa/VRFNTFRVUCMJ.json
index 20c24d0559a..fffae0a451c 100644
--- a/docs/data/histograms/South Africa/VRFNTFRVUCMJ.json
+++ b/docs/data/histograms/South Africa/VRFNTFRVUCMJ.json
@@ -1 +1 @@
-{"batchcode": "VRFNTFRVUCMJ", "histograms": [{"batchcodes": ["VRFNTFRVUCMJ"], "histogram": {"Toxic shock syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "VRFNTFRVUCMJ", "histograms": [{"histogram": {"Toxic shock syndrome": 1}, "batchcodes": ["VRFNTFRVUCMJ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VT4CWRRPWC9W.json b/docs/data/histograms/South Africa/VT4CWRRPWC9W.json
index 6f42843984b..98864d655e5 100644
--- a/docs/data/histograms/South Africa/VT4CWRRPWC9W.json
+++ b/docs/data/histograms/South Africa/VT4CWRRPWC9W.json
@@ -1 +1 @@
-{"batchcode": "VT4CWRRPWC9W", "histograms": [{"batchcodes": ["VT4CWRRPWC9W"], "histogram": {"Psoriasis": 1}}]}
\ No newline at end of file
+{"batchcode": "VT4CWRRPWC9W", "histograms": [{"histogram": {"Psoriasis": 1}, "batchcodes": ["VT4CWRRPWC9W"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VTAE15MQMZANPE.json b/docs/data/histograms/South Africa/VTAE15MQMZANPE.json
index 15f810113d6..210cdf99638 100644
--- a/docs/data/histograms/South Africa/VTAE15MQMZANPE.json
+++ b/docs/data/histograms/South Africa/VTAE15MQMZANPE.json
@@ -1 +1 @@
-{"batchcode": "VTAE15MQMZANPE", "histograms": [{"batchcodes": ["VTAE15MQMZANPE"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "VTAE15MQMZANPE", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["VTAE15MQMZANPE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VTCYM4P3PKKN.json b/docs/data/histograms/South Africa/VTCYM4P3PKKN.json
index e00423b46f9..3eb1a5e43dd 100644
--- a/docs/data/histograms/South Africa/VTCYM4P3PKKN.json
+++ b/docs/data/histograms/South Africa/VTCYM4P3PKKN.json
@@ -1 +1 @@
-{"batchcode": "VTCYM4P3PKKN", "histograms": [{"batchcodes": ["VTCYM4P3PKKN"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "VTCYM4P3PKKN", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["VTCYM4P3PKKN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VTHM4PMYWUEY.json b/docs/data/histograms/South Africa/VTHM4PMYWUEY.json
index 211e2cc7cd4..005b68c8836 100644
--- a/docs/data/histograms/South Africa/VTHM4PMYWUEY.json
+++ b/docs/data/histograms/South Africa/VTHM4PMYWUEY.json
@@ -1 +1 @@
-{"batchcode": "VTHM4PMYWUEY", "histograms": [{"batchcodes": ["VTHM4PMYWUEY"], "histogram": {"Cellulitis": 1}}]}
\ No newline at end of file
+{"batchcode": "VTHM4PMYWUEY", "histograms": [{"histogram": {"Cellulitis": 1}, "batchcodes": ["VTHM4PMYWUEY"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VTHMFNCY7FC7.json b/docs/data/histograms/South Africa/VTHMFNCY7FC7.json
index 446c82df61e..f4ce03e1c97 100644
--- a/docs/data/histograms/South Africa/VTHMFNCY7FC7.json
+++ b/docs/data/histograms/South Africa/VTHMFNCY7FC7.json
@@ -1 +1 @@
-{"batchcode": "VTHMFNCY7FC7", "histograms": [{"batchcodes": ["VTHMFNCY7FC7"], "histogram": {"Autoimmune disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "VTHMFNCY7FC7", "histograms": [{"histogram": {"Autoimmune disorder": 1}, "batchcodes": ["VTHMFNCY7FC7"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VTREN73CUN4U.json b/docs/data/histograms/South Africa/VTREN73CUN4U.json
index 516bd308846..17d4e0d4960 100644
--- a/docs/data/histograms/South Africa/VTREN73CUN4U.json
+++ b/docs/data/histograms/South Africa/VTREN73CUN4U.json
@@ -1 +1 @@
-{"batchcode": "VTREN73CUN4U", "histograms": [{"batchcodes": ["VTREN73CUN4U"], "histogram": {"Asthenia": 1, "Pain": 1, "Pain in extremity": 1, "Tension headache": 1}}]}
\ No newline at end of file
+{"batchcode": "VTREN73CUN4U", "histograms": [{"histogram": {"Asthenia": 1, "Pain": 1, "Pain in extremity": 1, "Tension headache": 1}, "batchcodes": ["VTREN73CUN4U"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VU4HPLTEK97J.json b/docs/data/histograms/South Africa/VU4HPLTEK97J.json
index 8b972a1153e..3911f50696f 100644
--- a/docs/data/histograms/South Africa/VU4HPLTEK97J.json
+++ b/docs/data/histograms/South Africa/VU4HPLTEK97J.json
@@ -1 +1 @@
-{"batchcode": "VU4HPLTEK97J", "histograms": [{"batchcodes": ["VU4HPLTEK97J"], "histogram": {"Headache": 1, "Hyperhidrosis": 1}}]}
\ No newline at end of file
+{"batchcode": "VU4HPLTEK97J", "histograms": [{"histogram": {"Headache": 1, "Hyperhidrosis": 1}, "batchcodes": ["VU4HPLTEK97J"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VUPCRCJWVH9.json b/docs/data/histograms/South Africa/VUPCRCJWVH9.json
index ac3c440b6c9..0a624570a28 100644
--- a/docs/data/histograms/South Africa/VUPCRCJWVH9.json
+++ b/docs/data/histograms/South Africa/VUPCRCJWVH9.json
@@ -1 +1 @@
-{"batchcode": "VUPCRCJWVH9", "histograms": [{"batchcodes": ["VUPCRCJWVH9"], "histogram": {"Abscess": 1, "Anaphylactic reaction": 1, "Death": 1, "Encephalopathy": 1, "Febrile convulsion": 1, "Pyrexia": 1, "Sepsis": 1, "Thrombocytopenia": 1, "Toxic shock syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "VUPCRCJWVH9", "histograms": [{"histogram": {"Abscess": 1, "Anaphylactic reaction": 1, "Death": 1, "Encephalopathy": 1, "Febrile convulsion": 1, "Pyrexia": 1, "Sepsis": 1, "Thrombocytopenia": 1, "Toxic shock syndrome": 1}, "batchcodes": ["VUPCRCJWVH9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VVC7UC39XCVL.json b/docs/data/histograms/South Africa/VVC7UC39XCVL.json
index 12ce9483ce0..9d9a18d0039 100644
--- a/docs/data/histograms/South Africa/VVC7UC39XCVL.json
+++ b/docs/data/histograms/South Africa/VVC7UC39XCVL.json
@@ -1 +1 @@
-{"batchcode": "VVC7UC39XCVL", "histograms": [{"batchcodes": ["VVC7UC39XCVL"], "histogram": {"Dry mouth": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VVC7UC39XCVL", "histograms": [{"histogram": {"Dry mouth": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["VVC7UC39XCVL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VVVWAJMKHYCL.json b/docs/data/histograms/South Africa/VVVWAJMKHYCL.json
index d89ead35838..e114eaad558 100644
--- a/docs/data/histograms/South Africa/VVVWAJMKHYCL.json
+++ b/docs/data/histograms/South Africa/VVVWAJMKHYCL.json
@@ -1 +1 @@
-{"batchcode": "VVVWAJMKHYCL", "histograms": [{"batchcodes": ["VVVWAJMKHYCL"], "histogram": {"Local reaction": 1, "Toxic shock syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "VVVWAJMKHYCL", "histograms": [{"histogram": {"Local reaction": 1, "Toxic shock syndrome": 1}, "batchcodes": ["VVVWAJMKHYCL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VW3T3NXVVJF.json b/docs/data/histograms/South Africa/VW3T3NXVVJF.json
index 6d20373a02a..7547de40147 100644
--- a/docs/data/histograms/South Africa/VW3T3NXVVJF.json
+++ b/docs/data/histograms/South Africa/VW3T3NXVVJF.json
@@ -1 +1 @@
-{"batchcode": "VW3T3NXVVJF", "histograms": [{"batchcodes": ["VW3T3NXVVJF"], "histogram": {"Cough": 1, "Dizziness": 1, "Fatigue": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "VW3T3NXVVJF", "histograms": [{"histogram": {"Cough": 1, "Dizziness": 1, "Fatigue": 1, "Thrombosis": 1}, "batchcodes": ["VW3T3NXVVJF"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VWE4U4AF99WE.json b/docs/data/histograms/South Africa/VWE4U4AF99WE.json
index 770e36a0523..1a84566eded 100644
--- a/docs/data/histograms/South Africa/VWE4U4AF99WE.json
+++ b/docs/data/histograms/South Africa/VWE4U4AF99WE.json
@@ -1 +1 @@
-{"batchcode": "VWE4U4AF99WE", "histograms": [{"batchcodes": ["VWE4U4AF99WE"], "histogram": {"Abdominal pain upper": 1, "Colonoscopy": 1, "Constipation": 1, "Cystitis": 1, "Endoscopy upper gastrointestinal tract": 1, "Gastrointestinal oedema": 1, "SARS-CoV-2 test": 1, "Viral test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "VWE4U4AF99WE", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Colonoscopy": 1, "Constipation": 1, "Cystitis": 1, "Endoscopy upper gastrointestinal tract": 1, "Gastrointestinal oedema": 1, "SARS-CoV-2 test": 1, "Viral test": 1, "Vomiting": 1}, "batchcodes": ["VWE4U4AF99WE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VX9FVK9JKLEV.json b/docs/data/histograms/South Africa/VX9FVK9JKLEV.json
index 70c5122b3bc..28162e8d6c8 100644
--- a/docs/data/histograms/South Africa/VX9FVK9JKLEV.json
+++ b/docs/data/histograms/South Africa/VX9FVK9JKLEV.json
@@ -1 +1 @@
-{"batchcode": "VX9FVK9JKLEV", "histograms": [{"batchcodes": ["VX9FVK9JKLEV"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "VX9FVK9JKLEV", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["VX9FVK9JKLEV"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VXVUH3CJJXAJ.json b/docs/data/histograms/South Africa/VXVUH3CJJXAJ.json
index 2d518012dce..8daaa7cf3a5 100644
--- a/docs/data/histograms/South Africa/VXVUH3CJJXAJ.json
+++ b/docs/data/histograms/South Africa/VXVUH3CJJXAJ.json
@@ -1 +1 @@
-{"batchcode": "VXVUH3CJJXAJ", "histograms": [{"batchcodes": ["VXVUH3CJJXAJ"], "histogram": {"Confusional state": 1, "Constipation": 1, "Fatigue": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "VXVUH3CJJXAJ", "histograms": [{"histogram": {"Confusional state": 1, "Constipation": 1, "Fatigue": 1, "Rash": 1}, "batchcodes": ["VXVUH3CJJXAJ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/VYJX3Y7L344F.json b/docs/data/histograms/South Africa/VYJX3Y7L344F.json
index 7151bd77849..0d44f900dcf 100644
--- a/docs/data/histograms/South Africa/VYJX3Y7L344F.json
+++ b/docs/data/histograms/South Africa/VYJX3Y7L344F.json
@@ -1 +1 @@
-{"batchcode": "VYJX3Y7L344F", "histograms": [{"batchcodes": ["VYJX3Y7L344F"], "histogram": {"Back pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "VYJX3Y7L344F", "histograms": [{"histogram": {"Back pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["VYJX3Y7L344F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/X0426.json b/docs/data/histograms/South Africa/X0426.json
index 24cfcd477b5..122b60c57e8 100644
--- a/docs/data/histograms/South Africa/X0426.json
+++ b/docs/data/histograms/South Africa/X0426.json
@@ -1 +1 @@
-{"batchcode": "X0426", "histograms": [{"batchcodes": ["X0426"], "histogram": {"Body temperature": 1, "Chest pain": 1, "Headache": 1, "Heart rate": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "X0426", "histograms": [{"histogram": {"Body temperature": 1, "Chest pain": 1, "Headache": 1, "Heart rate": 1, "Pyrexia": 1}, "batchcodes": ["X0426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/X2426.json b/docs/data/histograms/South Africa/X2426.json
index 6039d67628c..7d0e6c748a8 100644
--- a/docs/data/histograms/South Africa/X2426.json
+++ b/docs/data/histograms/South Africa/X2426.json
@@ -1 +1 @@
-{"batchcode": "X2426", "histograms": [{"batchcodes": ["X2426"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "X2426", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["X2426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/X2448.json b/docs/data/histograms/South Africa/X2448.json
index d636cbbbbc1..984c1bc133f 100644
--- a/docs/data/histograms/South Africa/X2448.json
+++ b/docs/data/histograms/South Africa/X2448.json
@@ -1 +1 @@
-{"batchcode": "X2448", "histograms": [{"batchcodes": ["X2448"], "histogram": {"Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "X2448", "histograms": [{"histogram": {"Rash erythematous": 1}, "batchcodes": ["X2448"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/X494.json b/docs/data/histograms/South Africa/X494.json
index 2dbe118935d..23b6895fc7a 100644
--- a/docs/data/histograms/South Africa/X494.json
+++ b/docs/data/histograms/South Africa/X494.json
@@ -1 +1 @@
-{"batchcode": "X494", "histograms": [{"batchcodes": ["X494"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "X494", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["X494"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/X6445.json b/docs/data/histograms/South Africa/X6445.json
index 43b4fbeab31..0e0e9da9359 100644
--- a/docs/data/histograms/South Africa/X6445.json
+++ b/docs/data/histograms/South Africa/X6445.json
@@ -1 +1 @@
-{"batchcode": "X6445", "histograms": [{"batchcodes": ["X6445"], "histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling hot": 1, "Gait disturbance": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "X6445", "histograms": [{"histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling hot": 1, "Gait disturbance": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1}, "batchcodes": ["X6445"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XA426.json b/docs/data/histograms/South Africa/XA426.json
index af98d78d8ba..7c741913e8d 100644
--- a/docs/data/histograms/South Africa/XA426.json
+++ b/docs/data/histograms/South Africa/XA426.json
@@ -1 +1 @@
-{"batchcode": "XA426", "histograms": [{"batchcodes": ["XA426"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "XA426", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["XA426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XB426.json b/docs/data/histograms/South Africa/XB426.json
index 46c8a23cbc9..06332648509 100644
--- a/docs/data/histograms/South Africa/XB426.json
+++ b/docs/data/histograms/South Africa/XB426.json
@@ -1 +1 @@
-{"batchcode": "XB426", "histograms": [{"batchcodes": ["XB426"], "histogram": {"Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "XB426", "histograms": [{"histogram": {"Pruritus": 1}, "batchcodes": ["XB426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE 430.json b/docs/data/histograms/South Africa/XE 430.json
index 69e0e8c747e..44dd56f1975 100644
--- a/docs/data/histograms/South Africa/XE 430.json
+++ b/docs/data/histograms/South Africa/XE 430.json
@@ -1 +1 @@
-{"batchcode": "XE 430", "histograms": [{"batchcodes": ["XE 430"], "histogram": {"Headache": 2, "Pyrexia": 2, "Arthralgia": 1, "Body temperature": 1, "Contusion": 1, "Delirium": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart rate": 1, "Herpes zoster": 1, "Local reaction": 1, "Muscular weakness": 1, "Myalgia": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Respiratory rate increased": 1, "Sensory loss": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "XE 430", "histograms": [{"histogram": {"Headache": 2, "Pyrexia": 2, "Arthralgia": 1, "Body temperature": 1, "Contusion": 1, "Delirium": 1, "Dizziness": 1, "Dyspnoea": 1, "Heart rate": 1, "Herpes zoster": 1, "Local reaction": 1, "Muscular weakness": 1, "Myalgia": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Respiratory rate increased": 1, "Sensory loss": 1, "Tachycardia": 1}, "batchcodes": ["XE 430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE 444.json b/docs/data/histograms/South Africa/XE 444.json
index 9a71c38af26..c605b220956 100644
--- a/docs/data/histograms/South Africa/XE 444.json
+++ b/docs/data/histograms/South Africa/XE 444.json
@@ -1 +1 @@
-{"batchcode": "XE 444", "histograms": [{"batchcodes": ["XE 444"], "histogram": {"Fatigue": 1, "Heat stroke": 1, "Myalgia": 1, "Pruritus": 1, "Skin burning sensation": 1}}]}
\ No newline at end of file
+{"batchcode": "XE 444", "histograms": [{"histogram": {"Fatigue": 1, "Heat stroke": 1, "Myalgia": 1, "Pruritus": 1, "Skin burning sensation": 1}, "batchcodes": ["XE 444"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE 445.json b/docs/data/histograms/South Africa/XE 445.json
index bd229516c73..ca792593ae5 100644
--- a/docs/data/histograms/South Africa/XE 445.json
+++ b/docs/data/histograms/South Africa/XE 445.json
@@ -1 +1 @@
-{"batchcode": "XE 445", "histograms": [{"batchcodes": ["XE 445"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "XE 445", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["XE 445"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE 494.json b/docs/data/histograms/South Africa/XE 494.json
index d3040665e72..0afdcdd892d 100644
--- a/docs/data/histograms/South Africa/XE 494.json
+++ b/docs/data/histograms/South Africa/XE 494.json
@@ -1 +1 @@
-{"batchcode": "XE 494", "histograms": [{"batchcodes": ["XE 494"], "histogram": {"Dyspnoea": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "XE 494", "histograms": [{"histogram": {"Dyspnoea": 1, "Syncope": 1}, "batchcodes": ["XE 494"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE 496.json b/docs/data/histograms/South Africa/XE 496.json
index 9798765f4f2..8d1f8de0f1c 100644
--- a/docs/data/histograms/South Africa/XE 496.json
+++ b/docs/data/histograms/South Africa/XE 496.json
@@ -1 +1 @@
-{"batchcode": "XE 496", "histograms": [{"batchcodes": ["XE 496"], "histogram": {"Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "XE 496", "histograms": [{"histogram": {"Vomiting": 1}, "batchcodes": ["XE 496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE.json b/docs/data/histograms/South Africa/XE.json
index 915ce693a1b..c61a60f7528 100644
--- a/docs/data/histograms/South Africa/XE.json
+++ b/docs/data/histograms/South Africa/XE.json
@@ -1 +1 @@
-{"batchcode": "XE", "histograms": [{"batchcodes": ["XE"], "histogram": {"Contusion": 1}}]}
\ No newline at end of file
+{"batchcode": "XE", "histograms": [{"histogram": {"Contusion": 1}, "batchcodes": ["XE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE326.json b/docs/data/histograms/South Africa/XE326.json
index 788b79d7aeb..374ba09af42 100644
--- a/docs/data/histograms/South Africa/XE326.json
+++ b/docs/data/histograms/South Africa/XE326.json
@@ -1 +1 @@
-{"batchcode": "XE326", "histograms": [{"batchcodes": ["XE326"], "histogram": {"Hyposmia": 1}}]}
\ No newline at end of file
+{"batchcode": "XE326", "histograms": [{"histogram": {"Hyposmia": 1}, "batchcodes": ["XE326"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE426.json b/docs/data/histograms/South Africa/XE426.json
index e05293554b3..896895f1949 100644
--- a/docs/data/histograms/South Africa/XE426.json
+++ b/docs/data/histograms/South Africa/XE426.json
@@ -1 +1 @@
-{"batchcode": "XE426", "histograms": [{"batchcodes": ["XE426"], "histogram": {"Headache": 24, "Dizziness": 15, "Pyrexia": 13, "Local reaction": 12, "Pain": 11, "Blood pressure measurement": 9, "Syncope": 8, "Nausea": 7, "Pain in extremity": 7, "Body temperature": 6, "Fatigue": 6, "Heart rate": 6, "Vomiting": 6, "Cough": 5, "Dyspnoea": 5, "Myalgia": 5, "Oxygen saturation": 5, "Hyperhidrosis": 4, "Muscle spasms": 4, "Muscular weakness": 4, "Peripheral swelling": 4, "Arthralgia": 3, "Asthenia": 3, "Back pain": 3, "Chest discomfort": 3, "Chest pain": 3, "Death": 3, "Decreased appetite": 3, "Heart rate increased": 3, "Hypoaesthesia": 3, "Insomnia": 3, "Loss of consciousness": 3, "Abdominal pain upper": 2, "Ageusia": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Bell's palsy": 2, "Blood pressure increased": 2, "Dehydration": 2, "Discomfort": 2, "Disorientation": 2, "Erectile dysfunction": 2, "Gait inability": 2, "Guillain-Barre syndrome": 2, "Hypertension": 2, "Injection site pain": 2, "Injection site swelling": 2, "Lymphadenopathy": 2, "Neck pain": 2, "Night sweats": 2, "Pneumocystis jirovecii pneumonia": 2, "Presyncope": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Swelling": 2, "Urinary retention": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Vision blurred": 2, "Anxiety": 1, "Arthritis bacterial": 1, "Blindness": 1, "Blood test": 1, "Blood urine present": 1, "COVID-19 pneumonia": 1, "CSF protein": 1, "Cellulitis": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Coma scale": 1, "Contusion": 1, "Deep vein thrombosis": 1, "Delayed recovery from anaesthesia": 1, "Depression": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dysmenorrhoea": 1, "Dysstasia": 1, "Encephalitis autoimmune": 1, "Epistaxis": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Febrile convulsion": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Flushing": 1, "Gait disturbance": 1, "Glucose urine present": 1, "Heart rate decreased": 1, "Herpes zoster": 1, "Herpes zoster reactivation": 1, "Hospitalisation": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Illness": 1, "Impaired work ability": 1, "Infection": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site mass": 1, "Lethargy": 1, "Limb injury": 1, "Lumbar puncture": 1, "Maternal exposure during breast feeding": 1, "Migraine": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Mycobacterium tuberculosis complex test": 1, "Myocarditis": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Pain assessment": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Periorbital swelling": 1, "Physical examination": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Prolonged labour": 1, "Protein total": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pulmonary pain": 1, "Rash": 1, "Rash papular": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sensory loss": 1, "Skin induration": 1, "Stevens-Johnson syndrome": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Trigeminal neuralgia": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vertigo": 1, "Weight": 1, "Weight decreased": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "XE426", "histograms": [{"histogram": {"Headache": 24, "Dizziness": 15, "Pyrexia": 13, "Local reaction": 12, "Pain": 11, "Blood pressure measurement": 9, "Syncope": 8, "Nausea": 7, "Pain in extremity": 7, "Body temperature": 6, "Fatigue": 6, "Heart rate": 6, "Vomiting": 6, "Cough": 5, "Dyspnoea": 5, "Myalgia": 5, "Oxygen saturation": 5, "Hyperhidrosis": 4, "Muscle spasms": 4, "Muscular weakness": 4, "Peripheral swelling": 4, "Arthralgia": 3, "Asthenia": 3, "Back pain": 3, "Chest discomfort": 3, "Chest pain": 3, "Death": 3, "Decreased appetite": 3, "Heart rate increased": 3, "Hypoaesthesia": 3, "Insomnia": 3, "Loss of consciousness": 3, "Abdominal pain upper": 2, "Ageusia": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Bell's palsy": 2, "Blood pressure increased": 2, "Dehydration": 2, "Discomfort": 2, "Disorientation": 2, "Erectile dysfunction": 2, "Gait inability": 2, "Guillain-Barre syndrome": 2, "Hypertension": 2, "Injection site pain": 2, "Injection site swelling": 2, "Lymphadenopathy": 2, "Neck pain": 2, "Night sweats": 2, "Pneumocystis jirovecii pneumonia": 2, "Presyncope": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Swelling": 2, "Urinary retention": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Vision blurred": 2, "Anxiety": 1, "Arthritis bacterial": 1, "Blindness": 1, "Blood test": 1, "Blood urine present": 1, "COVID-19 pneumonia": 1, "CSF protein": 1, "Cellulitis": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Coma scale": 1, "Contusion": 1, "Deep vein thrombosis": 1, "Delayed recovery from anaesthesia": 1, "Depression": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dysmenorrhoea": 1, "Dysstasia": 1, "Encephalitis autoimmune": 1, "Epistaxis": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Febrile convulsion": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Flushing": 1, "Gait disturbance": 1, "Glucose urine present": 1, "Heart rate decreased": 1, "Herpes zoster": 1, "Herpes zoster reactivation": 1, "Hospitalisation": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Illness": 1, "Impaired work ability": 1, "Infection": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site mass": 1, "Lethargy": 1, "Limb injury": 1, "Lumbar puncture": 1, "Maternal exposure during breast feeding": 1, "Migraine": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Mycobacterium tuberculosis complex test": 1, "Myocarditis": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Pain assessment": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Periorbital swelling": 1, "Physical examination": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Prolonged labour": 1, "Protein total": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pulmonary pain": 1, "Rash": 1, "Rash papular": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sensory loss": 1, "Skin induration": 1, "Stevens-Johnson syndrome": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Tinnitus": 1, "Trigeminal neuralgia": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vertigo": 1, "Weight": 1, "Weight decreased": 1, "Yellow skin": 1}, "batchcodes": ["XE426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE4261.json b/docs/data/histograms/South Africa/XE4261.json
index 37a585c86c8..7f270efe0ed 100644
--- a/docs/data/histograms/South Africa/XE4261.json
+++ b/docs/data/histograms/South Africa/XE4261.json
@@ -1 +1 @@
-{"batchcode": "XE4261", "histograms": [{"batchcodes": ["XE4261"], "histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "XE4261", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["XE4261"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE430.json b/docs/data/histograms/South Africa/XE430.json
index 53c384c493c..8978667cc5b 100644
--- a/docs/data/histograms/South Africa/XE430.json
+++ b/docs/data/histograms/South Africa/XE430.json
@@ -1 +1 @@
-{"batchcode": "XE430", "histograms": [{"batchcodes": ["XE430"], "histogram": {"Blood pressure measurement": 6, "Local reaction": 5, "Pyrexia": 5, "Body temperature": 4, "Dyspnoea": 4, "Arthralgia": 3, "Back pain": 3, "Heart rate": 3, "Oxygen saturation": 3, "Blood glucose": 2, "Blood pressure decreased": 2, "Chills": 2, "Coma scale": 2, "Dizziness": 2, "Haemoglobin": 2, "Headache": 2, "Hypertension": 2, "Loss of consciousness": 2, "Mouth haemorrhage": 2, "Nausea": 2, "Pain": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Anaphylactic reaction": 1, "Blister": 1, "Blood creatinine increased": 1, "Blood pressure systolic": 1, "Blood urea": 1, "Blood urea increased": 1, "Bone pain": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Cold sweat": 1, "Cough": 1, "Delirium": 1, "Dysarthria": 1, "Ear congestion": 1, "Erectile dysfunction": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Flank pain": 1, "Gait inability": 1, "Haematoma": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Localised infection": 1, "Lymphadenitis": 1, "Monoparesis": 1, "Oral bacterial infection": 1, "Pallor": 1, "Paresis": 1, "Physical examination": 1, "Rash": 1, "Rash morbilliform": 1, "Smear cervix": 1, "Thrombosis": 1, "Tongue haematoma": 1}}]}
\ No newline at end of file
+{"batchcode": "XE430", "histograms": [{"histogram": {"Blood pressure measurement": 6, "Local reaction": 5, "Pyrexia": 5, "Body temperature": 4, "Dyspnoea": 4, "Arthralgia": 3, "Back pain": 3, "Heart rate": 3, "Oxygen saturation": 3, "Blood glucose": 2, "Blood pressure decreased": 2, "Chills": 2, "Coma scale": 2, "Dizziness": 2, "Haemoglobin": 2, "Headache": 2, "Hypertension": 2, "Loss of consciousness": 2, "Mouth haemorrhage": 2, "Nausea": 2, "Pain": 2, "Pain in extremity": 2, "Respiratory rate": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Anaphylactic reaction": 1, "Blister": 1, "Blood creatinine increased": 1, "Blood pressure systolic": 1, "Blood urea": 1, "Blood urea increased": 1, "Bone pain": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Cold sweat": 1, "Cough": 1, "Delirium": 1, "Dysarthria": 1, "Ear congestion": 1, "Erectile dysfunction": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Flank pain": 1, "Gait inability": 1, "Haematoma": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Localised infection": 1, "Lymphadenitis": 1, "Monoparesis": 1, "Oral bacterial infection": 1, "Pallor": 1, "Paresis": 1, "Physical examination": 1, "Rash": 1, "Rash morbilliform": 1, "Smear cervix": 1, "Thrombosis": 1, "Tongue haematoma": 1}, "batchcodes": ["XE430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE444.json b/docs/data/histograms/South Africa/XE444.json
index 923e166648e..d89cef35a82 100644
--- a/docs/data/histograms/South Africa/XE444.json
+++ b/docs/data/histograms/South Africa/XE444.json
@@ -1 +1 @@
-{"batchcode": "XE444", "histograms": [{"batchcodes": ["FG8643", "XE444"], "histogram": {"Fatigue": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Oedema": 1, "Peripheral coldness": 1, "Pyrexia": 1}}, {"batchcodes": ["XE444"], "histogram": {"Headache": 5, "Body temperature": 2, "Fatigue": 2, "Local reaction": 2, "Pyrexia": 2, "Urticaria": 2, "Angioedema": 1, "Anxiety": 1, "Blindness": 1, "Dizziness": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "HIV test": 1, "Hypoaesthesia": 1, "Influenza": 1, "Intermenstrual bleeding": 1, "Laboratory test": 1, "Menstrual disorder": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pain in jaw": 1, "Polymenorrhoea": 1, "Pruritus": 1, "Skin induration": 1, "Swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "XE444", "histograms": [{"histogram": {"Fatigue": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Oedema": 1, "Peripheral coldness": 1, "Pyrexia": 1}, "batchcodes": ["FG8643", "XE444"]}, {"histogram": {"Headache": 5, "Body temperature": 2, "Fatigue": 2, "Local reaction": 2, "Pyrexia": 2, "Urticaria": 2, "Angioedema": 1, "Anxiety": 1, "Blindness": 1, "Dizziness": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "HIV test": 1, "Hypoaesthesia": 1, "Influenza": 1, "Intermenstrual bleeding": 1, "Laboratory test": 1, "Menstrual disorder": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Pain": 1, "Pain in jaw": 1, "Polymenorrhoea": 1, "Pruritus": 1, "Skin induration": 1, "Swelling": 1, "Vomiting": 1}, "batchcodes": ["XE444"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE444220131.json b/docs/data/histograms/South Africa/XE444220131.json
index 594e1eaa372..b6633df7ea8 100644
--- a/docs/data/histograms/South Africa/XE444220131.json
+++ b/docs/data/histograms/South Africa/XE444220131.json
@@ -1 +1 @@
-{"batchcode": "XE444220131", "histograms": [{"batchcodes": ["XE444220131"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "XE444220131", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["XE444220131"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE4444.json b/docs/data/histograms/South Africa/XE4444.json
index 48e8029324b..07e7ece603a 100644
--- a/docs/data/histograms/South Africa/XE4444.json
+++ b/docs/data/histograms/South Africa/XE4444.json
@@ -1 +1 @@
-{"batchcode": "XE4444", "histograms": [{"batchcodes": ["XE4444"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Injection site pain": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "XE4444", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Injection site pain": 1, "Syncope": 1}, "batchcodes": ["XE4444"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE445.json b/docs/data/histograms/South Africa/XE445.json
index acd0abedabb..0237a8e33bb 100644
--- a/docs/data/histograms/South Africa/XE445.json
+++ b/docs/data/histograms/South Africa/XE445.json
@@ -1 +1 @@
-{"batchcode": "XE445", "histograms": [{"batchcodes": ["XE445"], "histogram": {"Headache": 8, "Pain": 4, "Fatigue": 3, "Off label use": 3, "Abortion spontaneous": 2, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "Diabetes mellitus": 2, "Dizziness": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Vomiting": 2, "Abdominal pain": 1, "Antibody test": 1, "Blood test": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF red blood cell count positive": 1, "CSF test": 1, "CSF white blood cell count": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Computerised tomogram thorax": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness postural": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Erectile dysfunction": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Gait inability": 1, "Heavy menstrual bleeding": 1, "Hospitalisation": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Laboratory test": 1, "Local reaction": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Maternal exposure before pregnancy": 1, "Mouth haemorrhage": 1, "Muscular weakness": 1, "Myelitis transverse": 1, "Nerve stimulation test": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Rash": 1, "Sensory loss": 1, "Smear cervix": 1, "Stomatitis": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Syncope": 1, "Tremor": 1, "Vaginal haemorrhage": 1, "Viral test": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "XE445", "histograms": [{"histogram": {"Headache": 8, "Pain": 4, "Fatigue": 3, "Off label use": 3, "Abortion spontaneous": 2, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "Diabetes mellitus": 2, "Dizziness": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Vomiting": 2, "Abdominal pain": 1, "Antibody test": 1, "Blood test": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF protein": 1, "CSF red blood cell count positive": 1, "CSF test": 1, "CSF white blood cell count": 1, "Cellulitis": 1, "Chest pain": 1, "Chills": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Computerised tomogram thorax": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness postural": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Erectile dysfunction": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Gait inability": 1, "Heavy menstrual bleeding": 1, "Hospitalisation": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Laboratory test": 1, "Local reaction": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Maternal exposure before pregnancy": 1, "Mouth haemorrhage": 1, "Muscular weakness": 1, "Myelitis transverse": 1, "Nerve stimulation test": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Pericardial effusion": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Rash": 1, "Sensory loss": 1, "Smear cervix": 1, "Stomatitis": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Syncope": 1, "Tremor": 1, "Vaginal haemorrhage": 1, "Viral test": 1, "Vital signs measurement": 1}, "batchcodes": ["XE445"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE44J.json b/docs/data/histograms/South Africa/XE44J.json
index c78593ec927..c5f09584f4c 100644
--- a/docs/data/histograms/South Africa/XE44J.json
+++ b/docs/data/histograms/South Africa/XE44J.json
@@ -1 +1 @@
-{"batchcode": "XE44J", "histograms": [{"batchcodes": ["XE44J"], "histogram": {"Decreased appetite": 1, "Nasopharyngitis": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "XE44J", "histograms": [{"histogram": {"Decreased appetite": 1, "Nasopharyngitis": 1, "Pain": 1}, "batchcodes": ["XE44J"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE44U.json b/docs/data/histograms/South Africa/XE44U.json
index 4c5bad2511b..b8753586ceb 100644
--- a/docs/data/histograms/South Africa/XE44U.json
+++ b/docs/data/histograms/South Africa/XE44U.json
@@ -1 +1 @@
-{"batchcode": "XE44U", "histograms": [{"batchcodes": ["XE44U"], "histogram": {"Body temperature": 1, "Influenza like illness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "XE44U", "histograms": [{"histogram": {"Body temperature": 1, "Influenza like illness": 1, "Pyrexia": 1}, "batchcodes": ["XE44U"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE455.json b/docs/data/histograms/South Africa/XE455.json
index 666ff9ea25f..66f5b2719fe 100644
--- a/docs/data/histograms/South Africa/XE455.json
+++ b/docs/data/histograms/South Africa/XE455.json
@@ -1 +1 @@
-{"batchcode": "XE455", "histograms": [{"batchcodes": ["XE455"], "histogram": {"Anosmia": 1, "Chest discomfort": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Pharyngitis": 1, "Polymerase chain reaction": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "XE455", "histograms": [{"histogram": {"Anosmia": 1, "Chest discomfort": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Pharyngitis": 1, "Polymerase chain reaction": 1, "Pyrexia": 1}, "batchcodes": ["XE455"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE474.json b/docs/data/histograms/South Africa/XE474.json
index 9ef048c940f..ddae10f2531 100644
--- a/docs/data/histograms/South Africa/XE474.json
+++ b/docs/data/histograms/South Africa/XE474.json
@@ -1 +1 @@
-{"batchcode": "XE474", "histograms": [{"batchcodes": ["XE474"], "histogram": {"Chills": 1, "Headache": 1, "Muscle spasms": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "XE474", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Muscle spasms": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["XE474"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE478.json b/docs/data/histograms/South Africa/XE478.json
index 59154b582df..c62433b5f9a 100644
--- a/docs/data/histograms/South Africa/XE478.json
+++ b/docs/data/histograms/South Africa/XE478.json
@@ -1 +1 @@
-{"batchcode": "XE478", "histograms": [{"batchcodes": ["XE478"], "histogram": {"Facial paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "XE478", "histograms": [{"histogram": {"Facial paralysis": 1}, "batchcodes": ["XE478"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE479.json b/docs/data/histograms/South Africa/XE479.json
index dbdba0de684..da5fd08460f 100644
--- a/docs/data/histograms/South Africa/XE479.json
+++ b/docs/data/histograms/South Africa/XE479.json
@@ -1 +1 @@
-{"batchcode": "XE479", "histograms": [{"batchcodes": ["XE479"], "histogram": {"Dyspnoea": 4, "Headache": 4, "Malaise": 2, "Maternal exposure during pregnancy": 2, "Pain in extremity": 2, "Seizure": 2, "Tachycardia": 2, "Vomiting": 2, "Abortion spontaneous": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Cold sweat": 1, "Contusion": 1, "Deep vein thrombosis": 1, "Epilepsy": 1, "Fall": 1, "Fatigue": 1, "Heart rate": 1, "Hypersensitivity": 1, "Joint contracture": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nausea": 1, "Oedema peripheral": 1, "Pain": 1, "Shock": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vaginal discharge": 1}}]}
\ No newline at end of file
+{"batchcode": "XE479", "histograms": [{"histogram": {"Dyspnoea": 4, "Headache": 4, "Malaise": 2, "Maternal exposure during pregnancy": 2, "Pain in extremity": 2, "Seizure": 2, "Tachycardia": 2, "Vomiting": 2, "Abortion spontaneous": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Cold sweat": 1, "Contusion": 1, "Deep vein thrombosis": 1, "Epilepsy": 1, "Fall": 1, "Fatigue": 1, "Heart rate": 1, "Hypersensitivity": 1, "Joint contracture": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nausea": 1, "Oedema peripheral": 1, "Pain": 1, "Shock": 1, "Swelling": 1, "Swelling face": 1, "Syncope": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vaginal discharge": 1}, "batchcodes": ["XE479"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE480.json b/docs/data/histograms/South Africa/XE480.json
index 4e49859eaa4..e4d197c7bf3 100644
--- a/docs/data/histograms/South Africa/XE480.json
+++ b/docs/data/histograms/South Africa/XE480.json
@@ -1 +1 @@
-{"batchcode": "XE480", "histograms": [{"batchcodes": ["XE480"], "histogram": {"Headache": 5, "Chest pain": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Cough": 2, "Dyspnoea": 2, "Fatigue": 2, "Muscle spasms": 2, "Aphonia": 1, "Asthenia": 1, "Back pain": 1, "Bell's palsy": 1, "Blindness": 1, "C-reactive protein": 1, "Death": 1, "Dizziness": 1, "Drug ineffective": 1, "Exposure during pregnancy": 1, "Fibrin D dimer": 1, "Foetal exposure during pregnancy": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Investigation": 1, "Laboratory test": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Premature baby": 1, "Premature labour": 1, "Pruritus": 1, "Red blood cell sedimentation rate": 1, "Respiratory rate": 1, "Swelling": 1, "Thrombosis": 1, "Vaccination site reaction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "XE480", "histograms": [{"histogram": {"Headache": 5, "Chest pain": 3, "Arthralgia": 2, "Blood pressure measurement": 2, "Cough": 2, "Dyspnoea": 2, "Fatigue": 2, "Muscle spasms": 2, "Aphonia": 1, "Asthenia": 1, "Back pain": 1, "Bell's palsy": 1, "Blindness": 1, "C-reactive protein": 1, "Death": 1, "Dizziness": 1, "Drug ineffective": 1, "Exposure during pregnancy": 1, "Fibrin D dimer": 1, "Foetal exposure during pregnancy": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Investigation": 1, "Laboratory test": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Premature baby": 1, "Premature labour": 1, "Pruritus": 1, "Red blood cell sedimentation rate": 1, "Respiratory rate": 1, "Swelling": 1, "Thrombosis": 1, "Vaccination site reaction": 1, "Vomiting": 1}, "batchcodes": ["XE480"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE486.json b/docs/data/histograms/South Africa/XE486.json
index 0859de8dadb..239b82d48ae 100644
--- a/docs/data/histograms/South Africa/XE486.json
+++ b/docs/data/histograms/South Africa/XE486.json
@@ -1 +1 @@
-{"batchcode": "XE486", "histograms": [{"batchcodes": ["XE486"], "histogram": {"Swelling of eyelid": 1}}]}
\ No newline at end of file
+{"batchcode": "XE486", "histograms": [{"histogram": {"Swelling of eyelid": 1}, "batchcodes": ["XE486"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE494.json b/docs/data/histograms/South Africa/XE494.json
index 51e63d74867..cd5ed1162c3 100644
--- a/docs/data/histograms/South Africa/XE494.json
+++ b/docs/data/histograms/South Africa/XE494.json
@@ -1 +1 @@
-{"batchcode": "XE494", "histograms": [{"batchcodes": ["XE494"], "histogram": {"Headache": 10, "Pain": 5, "Pain in extremity": 5, "Pyrexia": 5, "Fatigue": 4, "Dizziness": 3, "Hypoaesthesia": 3, "Paraesthesia": 3, "Blood pressure measurement": 2, "Dizziness postural": 2, "Dyspnoea": 2, "Heart rate": 2, "Hypersensitivity": 2, "Injection site pain": 2, "Muscular weakness": 2, "Oxygen saturation": 2, "Rash": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arthralgia": 1, "Axillary pain": 1, "Back pain": 1, "Blood lactate dehydrogenase": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cluster headache": 1, "Contusion": 1, "Diarrhoea": 1, "Erectile dysfunction": 1, "Erythema": 1, "Injection site swelling": 1, "Loss of consciousness": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Mycobacterium tuberculosis complex test": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pericarditis": 1, "Pruritus": 1, "Pulmonary physical examination": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Splenomegaly": 1, "Swelling": 1, "Urine analysis": 1, "Urticaria": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "XE494", "histograms": [{"histogram": {"Headache": 10, "Pain": 5, "Pain in extremity": 5, "Pyrexia": 5, "Fatigue": 4, "Dizziness": 3, "Hypoaesthesia": 3, "Paraesthesia": 3, "Blood pressure measurement": 2, "Dizziness postural": 2, "Dyspnoea": 2, "Heart rate": 2, "Hypersensitivity": 2, "Injection site pain": 2, "Muscular weakness": 2, "Oxygen saturation": 2, "Rash": 2, "Syncope": 2, "Vomiting": 2, "Abdominal pain": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arthralgia": 1, "Axillary pain": 1, "Back pain": 1, "Blood lactate dehydrogenase": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cluster headache": 1, "Contusion": 1, "Diarrhoea": 1, "Erectile dysfunction": 1, "Erythema": 1, "Injection site swelling": 1, "Loss of consciousness": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Mycobacterium tuberculosis complex test": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pericarditis": 1, "Pruritus": 1, "Pulmonary physical examination": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Splenomegaly": 1, "Swelling": 1, "Urine analysis": 1, "Urticaria": 1, "Weight": 1}, "batchcodes": ["XE494"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE494220228.json b/docs/data/histograms/South Africa/XE494220228.json
index 9a20dccb134..86e2717b124 100644
--- a/docs/data/histograms/South Africa/XE494220228.json
+++ b/docs/data/histograms/South Africa/XE494220228.json
@@ -1 +1 @@
-{"batchcode": "XE494220228", "histograms": [{"batchcodes": ["XE494220228"], "histogram": {"Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "XE494220228", "histograms": [{"histogram": {"Chills": 1}, "batchcodes": ["XE494220228"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE496.json b/docs/data/histograms/South Africa/XE496.json
index 87b97ae7868..dfdfa29b04f 100644
--- a/docs/data/histograms/South Africa/XE496.json
+++ b/docs/data/histograms/South Africa/XE496.json
@@ -1 +1 @@
-{"batchcode": "XE496", "histograms": [{"batchcodes": ["XE496"], "histogram": {"Pain": 4, "Diarrhoea": 3, "Pyrexia": 3, "Back pain": 2, "Blood pressure measurement": 2, "Death": 2, "Headache": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Rash": 2, "Restlessness": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "CSF cell count": 1, "Cardiac failure": 1, "Chest pain": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Eye swelling": 1, "Fatigue": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Lymphadenitis": 1, "Magnetic resonance imaging": 1, "Muscle spasms": 1, "Myocarditis": 1, "Nerve conduction studies": 1, "Night sweats": 1, "Off label use": 1, "Oxygen saturation": 1, "Pruritus": 1, "Rash pruritic": 1, "Renal injury": 1, "Respiratory rate": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaginal haemorrhage": 1, "Vulvovaginal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "XE496", "histograms": [{"histogram": {"Pain": 4, "Diarrhoea": 3, "Pyrexia": 3, "Back pain": 2, "Blood pressure measurement": 2, "Death": 2, "Headache": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Rash": 2, "Restlessness": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "CSF cell count": 1, "Cardiac failure": 1, "Chest pain": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Eye swelling": 1, "Fatigue": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Hypoglycaemia": 1, "Lymphadenitis": 1, "Magnetic resonance imaging": 1, "Muscle spasms": 1, "Myocarditis": 1, "Nerve conduction studies": 1, "Night sweats": 1, "Off label use": 1, "Oxygen saturation": 1, "Pruritus": 1, "Rash pruritic": 1, "Renal injury": 1, "Respiratory rate": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaginal haemorrhage": 1, "Vulvovaginal pain": 1}, "batchcodes": ["XE496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE499.json b/docs/data/histograms/South Africa/XE499.json
index 4f0ca7448f7..c6d3bd289b7 100644
--- a/docs/data/histograms/South Africa/XE499.json
+++ b/docs/data/histograms/South Africa/XE499.json
@@ -1 +1 @@
-{"batchcode": "XE499", "histograms": [{"batchcodes": ["XE499"], "histogram": {"Headache": 4, "Confusional state": 2, "Feeling hot": 2, "Agitation": 1, "COVID-19 pneumonia": 1, "Coronavirus infection": 1, "Cough": 1, "Dizziness": 1, "Dizziness postural": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Gait inability": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1, "Restlessness": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Viral myelitis": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "XE499", "histograms": [{"histogram": {"Headache": 4, "Confusional state": 2, "Feeling hot": 2, "Agitation": 1, "COVID-19 pneumonia": 1, "Coronavirus infection": 1, "Cough": 1, "Dizziness": 1, "Dizziness postural": 1, "Eyelid ptosis": 1, "Facial paralysis": 1, "Gait inability": 1, "Herpes zoster": 1, "Hypoaesthesia": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1, "Restlessness": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Viral myelitis": 1, "Vision blurred": 1}, "batchcodes": ["XE499"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XE4Y5.json b/docs/data/histograms/South Africa/XE4Y5.json
index 86776eb52ee..ccefe5dea48 100644
--- a/docs/data/histograms/South Africa/XE4Y5.json
+++ b/docs/data/histograms/South Africa/XE4Y5.json
@@ -1 +1 @@
-{"batchcode": "XE4Y5", "histograms": [{"batchcodes": ["XE4Y5"], "histogram": {"Crying": 1}}]}
\ No newline at end of file
+{"batchcode": "XE4Y5", "histograms": [{"histogram": {"Crying": 1}, "batchcodes": ["XE4Y5"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XEU30.json b/docs/data/histograms/South Africa/XEU30.json
index 196f79e5ddc..4c7b832a3d0 100644
--- a/docs/data/histograms/South Africa/XEU30.json
+++ b/docs/data/histograms/South Africa/XEU30.json
@@ -1 +1 @@
-{"batchcode": "XEU30", "histograms": [{"batchcodes": ["XEU30"], "histogram": {"Dry mouth": 1}}]}
\ No newline at end of file
+{"batchcode": "XEU30", "histograms": [{"histogram": {"Dry mouth": 1}, "batchcodes": ["XEU30"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XEY26.json b/docs/data/histograms/South Africa/XEY26.json
index 1e840a15f97..261e9d4951f 100644
--- a/docs/data/histograms/South Africa/XEY26.json
+++ b/docs/data/histograms/South Africa/XEY26.json
@@ -1 +1 @@
-{"batchcode": "XEY26", "histograms": [{"batchcodes": ["XEY26"], "histogram": {"Injection site oedema": 1, "Insomnia": 1}}]}
\ No newline at end of file
+{"batchcode": "XEY26", "histograms": [{"histogram": {"Injection site oedema": 1, "Insomnia": 1}, "batchcodes": ["XEY26"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XEY30.json b/docs/data/histograms/South Africa/XEY30.json
index 344dc8be5f1..db2fee80d93 100644
--- a/docs/data/histograms/South Africa/XEY30.json
+++ b/docs/data/histograms/South Africa/XEY30.json
@@ -1 +1 @@
-{"batchcode": "XEY30", "histograms": [{"batchcodes": ["XEY30"], "histogram": {"Abdominal pain upper": 1, "Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1, "Skin hyperpigmentation": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "XEY30", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Chest pain": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1, "Skin hyperpigmentation": 1, "Visual impairment": 1}, "batchcodes": ["XEY30"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XG426.json b/docs/data/histograms/South Africa/XG426.json
index 63edb60a36f..5d02f696484 100644
--- a/docs/data/histograms/South Africa/XG426.json
+++ b/docs/data/histograms/South Africa/XG426.json
@@ -1 +1 @@
-{"batchcode": "XG426", "histograms": [{"batchcodes": ["XG426"], "histogram": {"Body temperature": 1, "Headache": 1, "Local reaction": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Neuralgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "XG426", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Local reaction": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Neuralgia": 1, "Pyrexia": 1}, "batchcodes": ["XG426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XN444.json b/docs/data/histograms/South Africa/XN444.json
index 99cd5ede96b..18a75d9c988 100644
--- a/docs/data/histograms/South Africa/XN444.json
+++ b/docs/data/histograms/South Africa/XN444.json
@@ -1 +1 @@
-{"batchcode": "XN444", "histograms": [{"batchcodes": ["XN444"], "histogram": {"Local reaction": 1, "Peripheral swelling": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "XN444", "histograms": [{"histogram": {"Local reaction": 1, "Peripheral swelling": 1, "Thrombosis": 1}, "batchcodes": ["XN444"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XT444.json b/docs/data/histograms/South Africa/XT444.json
index 739fd60f8c2..a018d3b98a1 100644
--- a/docs/data/histograms/South Africa/XT444.json
+++ b/docs/data/histograms/South Africa/XT444.json
@@ -1 +1 @@
-{"batchcode": "XT444", "histograms": [{"batchcodes": ["XT444"], "histogram": {"Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "XT444", "histograms": [{"histogram": {"Local reaction": 1}, "batchcodes": ["XT444"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/XZ430.json b/docs/data/histograms/South Africa/XZ430.json
index 48b5053dbd7..3f8d6cd761b 100644
--- a/docs/data/histograms/South Africa/XZ430.json
+++ b/docs/data/histograms/South Africa/XZ430.json
@@ -1 +1 @@
-{"batchcode": "XZ430", "histograms": [{"batchcodes": ["XZ430"], "histogram": {"Erectile dysfunction": 1}}]}
\ No newline at end of file
+{"batchcode": "XZ430", "histograms": [{"histogram": {"Erectile dysfunction": 1}, "batchcodes": ["XZ430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/YE426.json b/docs/data/histograms/South Africa/YE426.json
index 18f0153b9f4..b49d49a9bf9 100644
--- a/docs/data/histograms/South Africa/YE426.json
+++ b/docs/data/histograms/South Africa/YE426.json
@@ -1 +1 @@
-{"batchcode": "YE426", "histograms": [{"batchcodes": ["YE426"], "histogram": {"Body temperature": 1, "Headache": 1, "Myelitis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "YE426", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Myelitis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["YE426"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Africa/ZO9AZIA.json b/docs/data/histograms/South Africa/ZO9AZIA.json
index 04c3b33d165..5c56ee4ef43 100644
--- a/docs/data/histograms/South Africa/ZO9AZIA.json
+++ b/docs/data/histograms/South Africa/ZO9AZIA.json
@@ -1 +1 @@
-{"batchcode": "ZO9AZIA", "histograms": [{"batchcodes": ["ZO9AZIA"], "histogram": {"Blood pressure measurement": 1, "Local reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "ZO9AZIA", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Local reaction": 1}, "batchcodes": ["ZO9AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Sudan/021C21A.json b/docs/data/histograms/South Sudan/021C21A.json
index dec26775de9..65091bf6a55 100644
--- a/docs/data/histograms/South Sudan/021C21A.json
+++ b/docs/data/histograms/South Sudan/021C21A.json
@@ -1 +1 @@
-{"batchcode": "021C21A", "histograms": [{"batchcodes": ["021C21A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "021C21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["021C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/South Sudan/ER8736.json b/docs/data/histograms/South Sudan/ER8736.json
index 68303284b15..27f2d935721 100644
--- a/docs/data/histograms/South Sudan/ER8736.json
+++ b/docs/data/histograms/South Sudan/ER8736.json
@@ -1 +1 @@
-{"batchcode": "ER8736", "histograms": [{"batchcodes": ["ER8736"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8736", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["ER8736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Spain/031H21A.json b/docs/data/histograms/Spain/031H21A.json
index 9a43cb20e0e..716dbbd6e21 100644
--- a/docs/data/histograms/Spain/031H21A.json
+++ b/docs/data/histograms/Spain/031H21A.json
@@ -1 +1 @@
-{"batchcode": "031H21A", "histograms": [{"batchcodes": ["031H21A"], "histogram": {"Asthenia": 1, "Bone pain": 1, "Cough": 1, "Decreased appetite": 1, "Headache": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Oedema peripheral": 1, "Pain": 1, "Painful respiration": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031H21A", "histograms": [{"histogram": {"Asthenia": 1, "Bone pain": 1, "Cough": 1, "Decreased appetite": 1, "Headache": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Oedema peripheral": 1, "Pain": 1, "Painful respiration": 1, "Pyrexia": 1}, "batchcodes": ["031H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Sri Lanka/FH8022.json b/docs/data/histograms/Sri Lanka/FH8022.json
index 856cf419b2e..ac13d0ea432 100644
--- a/docs/data/histograms/Sri Lanka/FH8022.json
+++ b/docs/data/histograms/Sri Lanka/FH8022.json
@@ -1 +1 @@
-{"batchcode": "FH8022", "histograms": [{"batchcodes": ["FH8022"], "histogram": {"Lymphadenopathy": 1, "Peripheral swelling": 1, "Subarachnoid haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "FH8022", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Peripheral swelling": 1, "Subarachnoid haemorrhage": 1}, "batchcodes": ["FH8022"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Sri Lanka/FL9994.json b/docs/data/histograms/Sri Lanka/FL9994.json
index 12d7e31120f..dead9e04ef6 100644
--- a/docs/data/histograms/Sri Lanka/FL9994.json
+++ b/docs/data/histograms/Sri Lanka/FL9994.json
@@ -1 +1 @@
-{"batchcode": "FL9994", "histograms": [{"batchcodes": ["FL9994"], "histogram": {"Cavernous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "FL9994", "histograms": [{"histogram": {"Cavernous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Interchange of vaccine products": 1}, "batchcodes": ["FL9994"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Svalbard and Jan Mayen/FF2593.json b/docs/data/histograms/Svalbard and Jan Mayen/FF2593.json
index 753861a0c34..eee62d8673d 100644
--- a/docs/data/histograms/Svalbard and Jan Mayen/FF2593.json
+++ b/docs/data/histograms/Svalbard and Jan Mayen/FF2593.json
@@ -1 +1 @@
-{"batchcode": "FF2593", "histograms": [{"batchcodes": ["FF2593"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2593", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["FF2593"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Sweden/039 F21A.json b/docs/data/histograms/Sweden/039 F21A.json
index 31eed2d90ee..2a84ebebee7 100644
--- a/docs/data/histograms/Sweden/039 F21A.json
+++ b/docs/data/histograms/Sweden/039 F21A.json
@@ -1 +1 @@
-{"batchcode": "039 F21A", "histograms": [{"batchcodes": ["039 F21A"], "histogram": {"Abdominal discomfort": 1, "Bowel movement irregularity": 1, "Diarrhoea": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Muscle spasms": 1, "Nervousness": 1}}]}
\ No newline at end of file
+{"batchcode": "039 F21A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Bowel movement irregularity": 1, "Diarrhoea": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Muscle spasms": 1, "Nervousness": 1}, "batchcodes": ["039 F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Sweden/EW0151.json b/docs/data/histograms/Sweden/EW0151.json
index 0699951d640..db5f4247eea 100644
--- a/docs/data/histograms/Sweden/EW0151.json
+++ b/docs/data/histograms/Sweden/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Gait disturbance": 1, "Pain in extremity": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Gait disturbance": 1, "Pain in extremity": 1, "Ultrasound scan": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/0004246.json b/docs/data/histograms/Switzerland/0004246.json
index 288f2f935b5..6dfada70589 100644
--- a/docs/data/histograms/Switzerland/0004246.json
+++ b/docs/data/histograms/Switzerland/0004246.json
@@ -1 +1 @@
-{"batchcode": "0004246", "histograms": [{"batchcodes": ["0004246"], "histogram": {"Bronchoalveolar lavage": 1, "Computerised tomogram": 1, "Death": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "0004246", "histograms": [{"histogram": {"Bronchoalveolar lavage": 1, "Computerised tomogram": 1, "Death": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["0004246"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/062G20A.json b/docs/data/histograms/Switzerland/062G20A.json
index 883444f9771..0042f33790b 100644
--- a/docs/data/histograms/Switzerland/062G20A.json
+++ b/docs/data/histograms/Switzerland/062G20A.json
@@ -1 +1 @@
-{"batchcode": "062G20A", "histograms": [{"batchcodes": ["062G20A"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Deep vein thrombosis": 1, "Heart rate": 1, "Oxygen saturation": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "062G20A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Deep vein thrombosis": 1, "Heart rate": 1, "Oxygen saturation": 1, "Respiratory rate": 1}, "batchcodes": ["062G20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/0795997875.json b/docs/data/histograms/Switzerland/0795997875.json
index 9f2e1645731..f1a412aacf0 100644
--- a/docs/data/histograms/Switzerland/0795997875.json
+++ b/docs/data/histograms/Switzerland/0795997875.json
@@ -1 +1 @@
-{"batchcode": "0795997875", "histograms": [{"batchcodes": ["0795997875"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Cardiovascular disorder": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hypersensitivity": 1, "Lip pain": 1, "Musculoskeletal stiffness": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Productive cough": 1, "Skin reaction": 1, "Taste disorder": 1, "Tongue discomfort": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "0795997875", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Cardiovascular disorder": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hypersensitivity": 1, "Lip pain": 1, "Musculoskeletal stiffness": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Productive cough": 1, "Skin reaction": 1, "Taste disorder": 1, "Tongue discomfort": 1, "Weight decreased": 1}, "batchcodes": ["0795997875"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/07F5F5D00DB3E9A.json b/docs/data/histograms/Switzerland/07F5F5D00DB3E9A.json
index 3c2d2eb42a7..cc5161c6462 100644
--- a/docs/data/histograms/Switzerland/07F5F5D00DB3E9A.json
+++ b/docs/data/histograms/Switzerland/07F5F5D00DB3E9A.json
@@ -1 +1 @@
-{"batchcode": "07F5F5D00DB3E9A", "histograms": [{"batchcodes": ["07F5F5D00DB3E9A"], "histogram": {"Axillary pain": 1, "Incorrect route of product administration": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "07F5F5D00DB3E9A", "histograms": [{"histogram": {"Axillary pain": 1, "Incorrect route of product administration": 1, "Lymphadenopathy": 1}, "batchcodes": ["07F5F5D00DB3E9A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/1. + 2. IMPFUNG.json b/docs/data/histograms/Switzerland/1. + 2. IMPFUNG.json
index 512e3600522..bc9d031493d 100644
--- a/docs/data/histograms/Switzerland/1. + 2. IMPFUNG.json
+++ b/docs/data/histograms/Switzerland/1. + 2. IMPFUNG.json
@@ -1 +1 @@
-{"batchcode": "1. + 2. IMPFUNG", "histograms": [{"batchcodes": ["1. + 2. IMPFUNG"], "histogram": {"Chest pain": 1, "Cough": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Laboratory test": 1, "Myocarditis": 1, "Pericardial rub": 1, "Pyrexia": 1, "Tachycardia": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "1. + 2. IMPFUNG", "histograms": [{"histogram": {"Chest pain": 1, "Cough": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Laboratory test": 1, "Myocarditis": 1, "Pericardial rub": 1, "Pyrexia": 1, "Tachycardia": 1, "Troponin": 1}, "batchcodes": ["1. + 2. IMPFUNG"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/120858.json b/docs/data/histograms/Switzerland/120858.json
index 58b5d45207b..7147b74ff4f 100644
--- a/docs/data/histograms/Switzerland/120858.json
+++ b/docs/data/histograms/Switzerland/120858.json
@@ -1 +1 @@
-{"batchcode": "120858", "histograms": [{"batchcodes": ["120858"], "histogram": {"Dizziness": 1, "Nausea": 1, "Vestibular neuronitis": 1}}]}
\ No newline at end of file
+{"batchcode": "120858", "histograms": [{"histogram": {"Dizziness": 1, "Nausea": 1, "Vestibular neuronitis": 1}, "batchcodes": ["120858"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/1C009A.json b/docs/data/histograms/Switzerland/1C009A.json
index e69fc5fb074..00bb9fdaca7 100644
--- a/docs/data/histograms/Switzerland/1C009A.json
+++ b/docs/data/histograms/Switzerland/1C009A.json
@@ -1 +1 @@
-{"batchcode": "1C009A", "histograms": [{"batchcodes": ["1C009A"], "histogram": {"Angiogram": 1, "Computerised tomogram head": 1, "Fibrin D dimer": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "N-terminal prohormone brain natriuretic peptide": 1}}]}
\ No newline at end of file
+{"batchcode": "1C009A", "histograms": [{"histogram": {"Angiogram": 1, "Computerised tomogram head": 1, "Fibrin D dimer": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "N-terminal prohormone brain natriuretic peptide": 1}, "batchcodes": ["1C009A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/1D014A.json b/docs/data/histograms/Switzerland/1D014A.json
index e9598f2c433..bffa0002ae6 100644
--- a/docs/data/histograms/Switzerland/1D014A.json
+++ b/docs/data/histograms/Switzerland/1D014A.json
@@ -1 +1 @@
-{"batchcode": "1D014A", "histograms": [{"batchcodes": ["1D014A"], "histogram": {"Pneumonia": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "1D014A", "histograms": [{"histogram": {"Pneumonia": 1, "Pulmonary embolism": 1}, "batchcodes": ["1D014A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/1D016A.json b/docs/data/histograms/Switzerland/1D016A.json
index 61697dec415..2d318d59272 100644
--- a/docs/data/histograms/Switzerland/1D016A.json
+++ b/docs/data/histograms/Switzerland/1D016A.json
@@ -1 +1 @@
-{"batchcode": "1D016A", "histograms": [{"batchcodes": ["1D016A"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Influenza like illness": 1, "Menstruation irregular": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1D016A", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Influenza like illness": 1, "Menstruation irregular": 1, "Vaccination site pain": 1}, "batchcodes": ["1D016A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/1F1003A.json b/docs/data/histograms/Switzerland/1F1003A.json
index 20a7eb762d1..8267a54ea9b 100644
--- a/docs/data/histograms/Switzerland/1F1003A.json
+++ b/docs/data/histograms/Switzerland/1F1003A.json
@@ -1 +1 @@
-{"batchcode": "1F1003A", "histograms": [{"batchcodes": ["1F1003A"], "histogram": {"Body mass index": 1, "Dysaesthesia": 1, "Gastrooesophageal reflux disease": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging spinal": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1003A", "histograms": [{"histogram": {"Body mass index": 1, "Dysaesthesia": 1, "Gastrooesophageal reflux disease": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging spinal": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["1F1003A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/1F1052A.json b/docs/data/histograms/Switzerland/1F1052A.json
index 4d59aa43282..04bbd71cb04 100644
--- a/docs/data/histograms/Switzerland/1F1052A.json
+++ b/docs/data/histograms/Switzerland/1F1052A.json
@@ -1 +1 @@
-{"batchcode": "1F1052A", "histograms": [{"batchcodes": ["1F1052A"], "histogram": {"Chills": 1, "Headache": 1, "Immunisation": 1, "Off label use": 1, "Pyrexia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1052A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Immunisation": 1, "Off label use": 1, "Pyrexia": 1, "Tinnitus": 1}, "batchcodes": ["1F1052A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/1G040A.json b/docs/data/histograms/Switzerland/1G040A.json
index 520f5f70bea..cbd78ecf8b0 100644
--- a/docs/data/histograms/Switzerland/1G040A.json
+++ b/docs/data/histograms/Switzerland/1G040A.json
@@ -1 +1 @@
-{"batchcode": "1G040A", "histograms": [{"batchcodes": ["1G040A"], "histogram": {"Cerebrovascular accident": 1, "Dysphagia": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "1G040A", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Dysphagia": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["1G040A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/200022A.json b/docs/data/histograms/Switzerland/200022A.json
index 3184bf83589..336be23793f 100644
--- a/docs/data/histograms/Switzerland/200022A.json
+++ b/docs/data/histograms/Switzerland/200022A.json
@@ -1 +1 @@
-{"batchcode": "200022A", "histograms": [{"batchcodes": ["200022A"], "histogram": {"Arthralgia": 2, "Headache": 2, "Vomiting": 2, "Atrial fibrillation": 1, "Chills": 1, "Depressed mood": 1, "Diarrhoea": 1, "Pneumonia": 1, "Pyrexia": 1, "Sensory processing disorder": 1, "Tearfulness": 1}}]}
\ No newline at end of file
+{"batchcode": "200022A", "histograms": [{"histogram": {"Arthralgia": 2, "Headache": 2, "Vomiting": 2, "Atrial fibrillation": 1, "Chills": 1, "Depressed mood": 1, "Diarrhoea": 1, "Pneumonia": 1, "Pyrexia": 1, "Sensory processing disorder": 1, "Tearfulness": 1}, "batchcodes": ["200022A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/2002544.json b/docs/data/histograms/Switzerland/2002544.json
index 863fc0d6904..564ec55d1ae 100644
--- a/docs/data/histograms/Switzerland/2002544.json
+++ b/docs/data/histograms/Switzerland/2002544.json
@@ -1 +1 @@
-{"batchcode": "2002544", "histograms": [{"batchcodes": ["2002544"], "histogram": {"Mechanical urticaria": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "2002544", "histograms": [{"histogram": {"Mechanical urticaria": 1, "Pruritus": 1}, "batchcodes": ["2002544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/2004215.json b/docs/data/histograms/Switzerland/2004215.json
index 4ea8795a27e..1dc2a4a0fb3 100644
--- a/docs/data/histograms/Switzerland/2004215.json
+++ b/docs/data/histograms/Switzerland/2004215.json
@@ -1 +1 @@
-{"batchcode": "2004215", "histograms": [{"batchcodes": ["2004215"], "histogram": {"Arrhythmia": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Nausea": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Sick leave": 1}}]}
\ No newline at end of file
+{"batchcode": "2004215", "histograms": [{"histogram": {"Arrhythmia": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Nausea": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Sick leave": 1}, "batchcodes": ["2004215"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/20SA21A.json b/docs/data/histograms/Switzerland/20SA21A.json
index 308ecb14409..248513dd138 100644
--- a/docs/data/histograms/Switzerland/20SA21A.json
+++ b/docs/data/histograms/Switzerland/20SA21A.json
@@ -1 +1 @@
-{"batchcode": "20SA21A", "histograms": [{"batchcodes": ["20SA21A"], "histogram": {"Heavy menstrual bleeding": 1, "Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "20SA21A", "histograms": [{"histogram": {"Heavy menstrual bleeding": 1, "Menstruation irregular": 1}, "batchcodes": ["20SA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/21C10-05.json b/docs/data/histograms/Switzerland/21C10-05.json
index 0c47fa0c228..0bf1480bcd0 100644
--- a/docs/data/histograms/Switzerland/21C10-05.json
+++ b/docs/data/histograms/Switzerland/21C10-05.json
@@ -1 +1 @@
-{"batchcode": "21C10-05", "histograms": [{"batchcodes": ["21C10-05"], "histogram": {"SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "21C10-05", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["21C10-05"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/21C11-05.json b/docs/data/histograms/Switzerland/21C11-05.json
index 0025ebfa339..f1caf9efa50 100644
--- a/docs/data/histograms/Switzerland/21C11-05.json
+++ b/docs/data/histograms/Switzerland/21C11-05.json
@@ -1 +1 @@
-{"batchcode": "21C11-05", "histograms": [{"batchcodes": ["21C11-05"], "histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "21C11-05", "histograms": [{"histogram": {"COVID-19": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}, "batchcodes": ["21C11-05"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/21E10-05.json b/docs/data/histograms/Switzerland/21E10-05.json
index 7ff7685703a..2c3aee13716 100644
--- a/docs/data/histograms/Switzerland/21E10-05.json
+++ b/docs/data/histograms/Switzerland/21E10-05.json
@@ -1 +1 @@
-{"batchcode": "21E10-05", "histograms": [{"batchcodes": ["21E10-05"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "21E10-05", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["21E10-05"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/2345766.json b/docs/data/histograms/Switzerland/2345766.json
index d59f71ca5c9..9f3bb4c91fa 100644
--- a/docs/data/histograms/Switzerland/2345766.json
+++ b/docs/data/histograms/Switzerland/2345766.json
@@ -1 +1 @@
-{"batchcode": "2345766", "histograms": [{"batchcodes": ["2345766"], "histogram": {"Arrhythmia": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "2345766", "histograms": [{"histogram": {"Arrhythmia": 1, "Thrombosis": 1}, "batchcodes": ["2345766"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/2766AU/ML.json b/docs/data/histograms/Switzerland/2766AU/ML.json
index d02f1c1c4e2..6b01b40fa06 100644
--- a/docs/data/histograms/Switzerland/2766AU/ML.json
+++ b/docs/data/histograms/Switzerland/2766AU/ML.json
@@ -1 +1 @@
-{"batchcode": "2766AU/ML", "histograms": [{"batchcodes": ["2766AU/ML"], "histogram": {"Angiogram": 1, "Autoimmune lung disease": 1, "Bronchoscopy": 1, "Cough": 1, "Haematology test": 1, "Incorrect route of product administration": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Pulmonary alveolar haemorrhage": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sputum test": 1, "Stool analysis": 1, "Vaccine associated enhanced respiratory disease": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "2766AU/ML", "histograms": [{"histogram": {"Angiogram": 1, "Autoimmune lung disease": 1, "Bronchoscopy": 1, "Cough": 1, "Haematology test": 1, "Incorrect route of product administration": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Pulmonary alveolar haemorrhage": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Sputum test": 1, "Stool analysis": 1, "Vaccine associated enhanced respiratory disease": 1, "X-ray": 1}, "batchcodes": ["2766AU/ML"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 042 460.json b/docs/data/histograms/Switzerland/300 042 460.json
index 4b0064be56c..9df9a159bd3 100644
--- a/docs/data/histograms/Switzerland/300 042 460.json
+++ b/docs/data/histograms/Switzerland/300 042 460.json
@@ -1 +1 @@
-{"batchcode": "300 042 460", "histograms": [{"batchcodes": ["300 042 460"], "histogram": {"Blood thyroid stimulating hormone": 1, "Full blood count": 1, "Herpes zoster": 1, "Liver function test": 1}}]}
\ No newline at end of file
+{"batchcode": "300 042 460", "histograms": [{"histogram": {"Blood thyroid stimulating hormone": 1, "Full blood count": 1, "Herpes zoster": 1, "Liver function test": 1}, "batchcodes": ["300 042 460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 15 30.json b/docs/data/histograms/Switzerland/300 15 30.json
index e01889b41ee..5a137e71351 100644
--- a/docs/data/histograms/Switzerland/300 15 30.json
+++ b/docs/data/histograms/Switzerland/300 15 30.json
@@ -1 +1 @@
-{"batchcode": "300 15 30", "histograms": [{"batchcodes": ["300 15 30"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "300 15 30", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["300 15 30"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 16 56.json b/docs/data/histograms/Switzerland/300 16 56.json
index ee3abdbbcb1..99fd527099f 100644
--- a/docs/data/histograms/Switzerland/300 16 56.json
+++ b/docs/data/histograms/Switzerland/300 16 56.json
@@ -1 +1 @@
-{"batchcode": "300 16 56", "histograms": [{"batchcodes": ["300 16 56"], "histogram": {"Lichenoid keratosis": 1}}]}
\ No newline at end of file
+{"batchcode": "300 16 56", "histograms": [{"histogram": {"Lichenoid keratosis": 1}, "batchcodes": ["300 16 56"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 21 86.json b/docs/data/histograms/Switzerland/300 21 86.json
index 5a11975f719..a072b5d8fee 100644
--- a/docs/data/histograms/Switzerland/300 21 86.json
+++ b/docs/data/histograms/Switzerland/300 21 86.json
@@ -1 +1 @@
-{"batchcode": "300 21 86", "histograms": [{"batchcodes": ["300 21 86"], "histogram": {"Arthralgia": 1, "Bell's palsy": 1, "Neurological symptom": 1, "Pain": 1, "Pruritus": 1, "Skin burning sensation": 1}}]}
\ No newline at end of file
+{"batchcode": "300 21 86", "histograms": [{"histogram": {"Arthralgia": 1, "Bell's palsy": 1, "Neurological symptom": 1, "Pain": 1, "Pruritus": 1, "Skin burning sensation": 1}, "batchcodes": ["300 21 86"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 25 41.json b/docs/data/histograms/Switzerland/300 25 41.json
index 687cacf667f..ff350e3afac 100644
--- a/docs/data/histograms/Switzerland/300 25 41.json
+++ b/docs/data/histograms/Switzerland/300 25 41.json
@@ -1 +1 @@
-{"batchcode": "300 25 41", "histograms": [{"batchcodes": ["300 25 41"], "histogram": {"Deep vein thrombosis": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "300 25 41", "histograms": [{"histogram": {"Deep vein thrombosis": 1, "Pulmonary embolism": 1}, "batchcodes": ["300 25 41"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 42 15.json b/docs/data/histograms/Switzerland/300 42 15.json
index e8c2596f715..59a4e6e5726 100644
--- a/docs/data/histograms/Switzerland/300 42 15.json
+++ b/docs/data/histograms/Switzerland/300 42 15.json
@@ -1 +1 @@
-{"batchcode": "300 42 15", "histograms": [{"batchcodes": ["300 42 15"], "histogram": {"Aspartate aminotransferase": 1, "Blood creatine phosphokinase": 1, "Rhabdomyolysis": 1}}]}
\ No newline at end of file
+{"batchcode": "300 42 15", "histograms": [{"histogram": {"Aspartate aminotransferase": 1, "Blood creatine phosphokinase": 1, "Rhabdomyolysis": 1}, "batchcodes": ["300 42 15"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 44 94.json b/docs/data/histograms/Switzerland/300 44 94.json
index 1fb359a5876..cf109a85ce8 100644
--- a/docs/data/histograms/Switzerland/300 44 94.json
+++ b/docs/data/histograms/Switzerland/300 44 94.json
@@ -1 +1 @@
-{"batchcode": "300 44 94", "histograms": [{"batchcodes": ["300 44 94"], "histogram": {"Kidney infection": 1}}]}
\ No newline at end of file
+{"batchcode": "300 44 94", "histograms": [{"histogram": {"Kidney infection": 1}, "batchcodes": ["300 44 94"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300 5704.json b/docs/data/histograms/Switzerland/300 5704.json
index e9e87b43690..fa60016838b 100644
--- a/docs/data/histograms/Switzerland/300 5704.json
+++ b/docs/data/histograms/Switzerland/300 5704.json
@@ -1 +1 @@
-{"batchcode": "300 5704", "histograms": [{"batchcodes": ["300 5704"], "histogram": {"Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "300 5704", "histograms": [{"histogram": {"Pruritus": 1, "Urticaria": 1}, "batchcodes": ["300 5704"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300-21-86.json b/docs/data/histograms/Switzerland/300-21-86.json
index 4339f563473..c692b54c06e 100644
--- a/docs/data/histograms/Switzerland/300-21-86.json
+++ b/docs/data/histograms/Switzerland/300-21-86.json
@@ -1 +1 @@
-{"batchcode": "300-21-86", "histograms": [{"batchcodes": ["300-21-86"], "histogram": {"Neuralgic amyotrophy": 1}}]}
\ No newline at end of file
+{"batchcode": "300-21-86", "histograms": [{"histogram": {"Neuralgic amyotrophy": 1}, "batchcodes": ["300-21-86"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000 4273.json b/docs/data/histograms/Switzerland/3000 4273.json
index 3354c7f9d8e..128b309187d 100644
--- a/docs/data/histograms/Switzerland/3000 4273.json
+++ b/docs/data/histograms/Switzerland/3000 4273.json
@@ -1 +1 @@
-{"batchcode": "3000 4273", "histograms": [{"batchcodes": ["3000 4273"], "histogram": {"Blood creatinine": 1, "Death": 1}}]}
\ No newline at end of file
+{"batchcode": "3000 4273", "histograms": [{"histogram": {"Blood creatinine": 1, "Death": 1}, "batchcodes": ["3000 4273"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30000496.json b/docs/data/histograms/Switzerland/30000496.json
index fcfbda3d6b2..88f71aedbd9 100644
--- a/docs/data/histograms/Switzerland/30000496.json
+++ b/docs/data/histograms/Switzerland/30000496.json
@@ -1 +1 @@
-{"batchcode": "30000496", "histograms": [{"batchcodes": ["30000496"], "histogram": {"Nausea": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "30000496", "histograms": [{"histogram": {"Nausea": 1, "Rash": 1}, "batchcodes": ["30000496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000150.json b/docs/data/histograms/Switzerland/3000150.json
index c9931fbcab8..7f68548f73f 100644
--- a/docs/data/histograms/Switzerland/3000150.json
+++ b/docs/data/histograms/Switzerland/3000150.json
@@ -1 +1 @@
-{"batchcode": "3000150", "histograms": [{"batchcodes": ["3000150"], "histogram": {"Blindness": 1, "Deafness": 1, "Dizziness": 1, "Encephalitis": 1, "Histology": 1}}]}
\ No newline at end of file
+{"batchcode": "3000150", "histograms": [{"histogram": {"Blindness": 1, "Deafness": 1, "Dizziness": 1, "Encephalitis": 1, "Histology": 1}, "batchcodes": ["3000150"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30001530.json b/docs/data/histograms/Switzerland/30001530.json
index 5ef1cc41e8f..3c12d30cb21 100644
--- a/docs/data/histograms/Switzerland/30001530.json
+++ b/docs/data/histograms/Switzerland/30001530.json
@@ -1 +1 @@
-{"batchcode": "30001530", "histograms": [{"batchcodes": ["30001530"], "histogram": {"Pulmonary embolism": 2, "Blood creatinine": 1, "Cerebrovascular accident": 1, "Computerised tomogram thorax": 1}}]}
\ No newline at end of file
+{"batchcode": "30001530", "histograms": [{"histogram": {"Pulmonary embolism": 2, "Blood creatinine": 1, "Cerebrovascular accident": 1, "Computerised tomogram thorax": 1}, "batchcodes": ["30001530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30002541.json b/docs/data/histograms/Switzerland/30002541.json
index c41c25171c8..765d817f074 100644
--- a/docs/data/histograms/Switzerland/30002541.json
+++ b/docs/data/histograms/Switzerland/30002541.json
@@ -1 +1 @@
-{"batchcode": "30002541", "histograms": [{"batchcodes": ["30002541"], "histogram": {"Pyrexia": 1, "Tibia fracture": 1}}]}
\ No newline at end of file
+{"batchcode": "30002541", "histograms": [{"histogram": {"Pyrexia": 1, "Tibia fracture": 1}, "batchcodes": ["30002541"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30004219.json b/docs/data/histograms/Switzerland/30004219.json
index 75efcb17043..cf7d5e58319 100644
--- a/docs/data/histograms/Switzerland/30004219.json
+++ b/docs/data/histograms/Switzerland/30004219.json
@@ -1 +1 @@
-{"batchcode": "30004219", "histograms": [{"batchcodes": ["30004219"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Myocarditis": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "30004219", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Myocarditis": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["30004219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000424 60.json b/docs/data/histograms/Switzerland/3000424 60.json
index c404466368f..898f83c0fb8 100644
--- a/docs/data/histograms/Switzerland/3000424 60.json
+++ b/docs/data/histograms/Switzerland/3000424 60.json
@@ -1 +1 @@
-{"batchcode": "3000424 60", "histograms": [{"batchcodes": ["3000424 60"], "histogram": {"Blood pressure measurement": 1, "Death": 1, "Heart rate": 1, "International normalised ratio": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "3000424 60", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Death": 1, "Heart rate": 1, "International normalised ratio": 1, "Ultrasound scan": 1}, "batchcodes": ["3000424 60"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000424.json b/docs/data/histograms/Switzerland/3000424.json
index 411c56fb93b..f57e412a215 100644
--- a/docs/data/histograms/Switzerland/3000424.json
+++ b/docs/data/histograms/Switzerland/3000424.json
@@ -1 +1 @@
-{"batchcode": "3000424", "histograms": [{"batchcodes": ["3000424"], "histogram": {"Injection site erythema": 2, "Injection site warmth": 2, "Skin reaction": 2, "Vaccination site swelling": 2, "Acute respiratory failure": 1, "Alanine aminotransferase increased": 1, "Angiogram": 1, "Aspartate aminotransferase": 1, "Atelectasis": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Blood immunoglobulin G": 1, "Blood test": 1, "Brain natriuretic peptide normal": 1, "CSF test": 1, "Chills": 1, "Chromaturia": 1, "Computerised tomogram": 1, "Confusional state": 1, "Culture urine": 1, "Decreased appetite": 1, "Diplopia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Gamma-glutamyltransferase": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site haematoma": 1, "Injection site pain": 1, "Injection site pruritus": 1, "PCO2": 1, "PO2": 1, "Pain": 1, "Papilloedema": 1, "Seizure": 1, "Serology test": 1, "Type IV hypersensitivity reaction": 1, "VIth nerve paralysis": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "3000424", "histograms": [{"histogram": {"Injection site erythema": 2, "Injection site warmth": 2, "Skin reaction": 2, "Vaccination site swelling": 2, "Acute respiratory failure": 1, "Alanine aminotransferase increased": 1, "Angiogram": 1, "Aspartate aminotransferase": 1, "Atelectasis": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Blood immunoglobulin G": 1, "Blood test": 1, "Brain natriuretic peptide normal": 1, "CSF test": 1, "Chills": 1, "Chromaturia": 1, "Computerised tomogram": 1, "Confusional state": 1, "Culture urine": 1, "Decreased appetite": 1, "Diplopia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Gamma-glutamyltransferase": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site haematoma": 1, "Injection site pain": 1, "Injection site pruritus": 1, "PCO2": 1, "PO2": 1, "Pain": 1, "Papilloedema": 1, "Seizure": 1, "Serology test": 1, "Type IV hypersensitivity reaction": 1, "VIth nerve paralysis": 1, "Vaccination site pain": 1}, "batchcodes": ["3000424"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300042450.json b/docs/data/histograms/Switzerland/300042450.json
index afad49b1fd7..af43dba8b24 100644
--- a/docs/data/histograms/Switzerland/300042450.json
+++ b/docs/data/histograms/Switzerland/300042450.json
@@ -1 +1 @@
-{"batchcode": "300042450", "histograms": [{"batchcodes": ["300042450"], "histogram": {"Death": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "300042450", "histograms": [{"histogram": {"Death": 1, "Seizure": 1}, "batchcodes": ["300042450"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30004246.json b/docs/data/histograms/Switzerland/30004246.json
index 9974bc4c903..9660abae606 100644
--- a/docs/data/histograms/Switzerland/30004246.json
+++ b/docs/data/histograms/Switzerland/30004246.json
@@ -1 +1 @@
-{"batchcode": "30004246", "histograms": [{"batchcodes": ["30004246"], "histogram": {"Computerised tomogram head": 1, "Eyelid ptosis": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "30004246", "histograms": [{"histogram": {"Computerised tomogram head": 1, "Eyelid ptosis": 1, "Ultrasound Doppler": 1}, "batchcodes": ["30004246"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300042460 / 300.json b/docs/data/histograms/Switzerland/300042460 / 300.json
index b013ce59cee..bda0da22d8c 100644
--- a/docs/data/histograms/Switzerland/300042460 / 300.json
+++ b/docs/data/histograms/Switzerland/300042460 / 300.json
@@ -1 +1 @@
-{"batchcode": "300042460 / 300", "histograms": [{"batchcodes": ["300042460 / 300"], "histogram": {"Blindness": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "300042460 / 300", "histograms": [{"histogram": {"Blindness": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Pulmonary embolism": 1}, "batchcodes": ["300042460 / 300"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300042460.json b/docs/data/histograms/Switzerland/300042460.json
index b8ba1f434b7..7c7f02f7e1f 100644
--- a/docs/data/histograms/Switzerland/300042460.json
+++ b/docs/data/histograms/Switzerland/300042460.json
@@ -1 +1 @@
-{"batchcode": "300042460", "histograms": [{"batchcodes": ["300042460"], "histogram": {"Headache": 11, "Arthralgia": 10, "Dyspnoea": 10, "Pyrexia": 10, "Fatigue": 9, "Skin reaction": 8, "Blood creatinine": 7, "Body temperature": 5, "C-reactive protein": 5, "Cardiac failure": 5, "Chills": 5, "Myalgia": 5, "Nausea": 5, "Rash": 5, "Death": 4, "Deep vein thrombosis": 4, "Erythema": 4, "Hallucination": 4, "Hypersensitivity": 4, "Pain": 4, "Pain in extremity": 4, "Pruritus": 4, "Swelling": 4, "Vaccination site erythema": 4, "Vaccination site reaction": 4, "Confusional state": 3, "Dizziness": 3, "Hemiparesis": 3, "Hyperhidrosis": 3, "Hypertension": 3, "Injection site pain": 3, "Loss of consciousness": 3, "Oxygen saturation": 3, "Peripheral swelling": 3, "Petechiae": 3, "Vaccination site pain": 3, "Acquired haemophilia": 2, "Antinuclear antibody": 2, "Aphasia": 2, "Asthenia": 2, "Asthma": 2, "Atrial fibrillation": 2, "Blood culture": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Chest X-ray": 2, "Chest pain": 2, "Cough": 2, "Diarrhoea": 2, "Drug ineffective": 2, "Ear pain": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Herpes zoster": 2, "Injection site erythema": 2, "Magnetic resonance imaging": 2, "Oedema": 2, "Optic ischaemic neuropathy": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Palpitations": 2, "SARS-CoV-2 test": 2, "Sepsis": 2, "Troponin": 2, "Ultrasound Doppler": 2, "Urticaria": 2, "Vaccination site swelling": 2, "Vasculitis": 2, "Vomiting": 2, "White blood cell count": 2, "X-ray": 2, "Acute kidney injury": 1, "Acute psychosis": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Antineutrophil cytoplasmic antibody": 1, "Anxiety": 1, "Aortic dissection": 1, "Arthritis": 1, "Axillary pain": 1, "Back pain": 1, "Biopsy brain": 1, "Biopsy skin": 1, "Blood creatine": 1, "Blood gases": 1, "Blood test": 1, "Bundle branch block right": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "C-reactive protein normal": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiomyopathy": 1, "Cerebral infarction": 1, "Coagulation factor": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Consciousness fluctuating": 1, "Corneal graft rejection": 1, "Decreased appetite": 1, "Delusion": 1, "Dermo-hypodermitis": 1, "Disorientation": 1, "Dry mouth": 1, "Dysaesthesia": 1, "Dysuria": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Electroneuromyography": 1, "Enanthema": 1, "Encephalitis": 1, "Epilepsy": 1, "Exposure to SARS-CoV-2": 1, "Eye infarction": 1, "Eyelid oedema": 1, "Facial paralysis": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Gallbladder rupture": 1, "General physical health deterioration": 1, "Glomerular filtration rate": 1, "Glomerulonephritis rapidly progressive": 1, "Guillain-Barre syndrome": 1, "HIV test": 1, "Haemobilia": 1, "Haemoglobin": 1, "Heart rate": 1, "Henoch-Schonlein purpura": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Hyperthermia": 1, "Hypotension": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Immunisation anxiety related reaction": 1, "Impaired healing": 1, "Impaired self-care": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Injection site rash": 1, "Injection site reaction": 1, "International normalised ratio": 1, "Iridocyclitis": 1, "Joint swelling": 1, "Laboratory test": 1, "Laboratory test normal": 1, "Legionella test": 1, "Leukaemia": 1, "Loss of proprioception": 1, "Lymphocyte count": 1, "Lymphopenia": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Migraine with aura": 1, "Monoplegia": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Ophthalmic herpes zoster": 1, "Oral herpes": 1, "Orthopaedic examination": 1, "Palmar-plantar erythrodysaesthesia syndrome": 1, "Paraesthesia": 1, "Personality change": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Pulmonary embolism": 1, "Pulmonary mass": 1, "Rales": 1, "Rash macular": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red blood cell sedimentation rate normal": 1, "Renal failure": 1, "Respiratory failure": 1, "Retinal vein thrombosis": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sneezing": 1, "Somnolence": 1, "Spontaneous haematoma": 1, "Status epilepticus": 1, "Streptococcal urinary tract infection": 1, "Streptococcus test": 1, "Stridor": 1, "Sudden onset of sleep": 1, "Swollen tongue": 1, "Systemic inflammatory response syndrome": 1, "Systolic hypertension": 1, "Thrombocytopenia": 1, "Topography corneal abnormal": 1, "Traumatic haematoma": 1, "Type I hypersensitivity": 1, "Ultrasound kidney": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination complication": 1, "Vaccination site warmth": 1, "Venous thrombosis limb": 1, "Ventricular hypertrophy": 1, "Visual acuity reduced": 1, "Visual impairment": 1, "Warm type haemolytic anaemia": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "300042460", "histograms": [{"histogram": {"Headache": 11, "Arthralgia": 10, "Dyspnoea": 10, "Pyrexia": 10, "Fatigue": 9, "Skin reaction": 8, "Blood creatinine": 7, "Body temperature": 5, "C-reactive protein": 5, "Cardiac failure": 5, "Chills": 5, "Myalgia": 5, "Nausea": 5, "Rash": 5, "Death": 4, "Deep vein thrombosis": 4, "Erythema": 4, "Hallucination": 4, "Hypersensitivity": 4, "Pain": 4, "Pain in extremity": 4, "Pruritus": 4, "Swelling": 4, "Vaccination site erythema": 4, "Vaccination site reaction": 4, "Confusional state": 3, "Dizziness": 3, "Hemiparesis": 3, "Hyperhidrosis": 3, "Hypertension": 3, "Injection site pain": 3, "Loss of consciousness": 3, "Oxygen saturation": 3, "Peripheral swelling": 3, "Petechiae": 3, "Vaccination site pain": 3, "Acquired haemophilia": 2, "Antinuclear antibody": 2, "Aphasia": 2, "Asthenia": 2, "Asthma": 2, "Atrial fibrillation": 2, "Blood culture": 2, "Blood pressure measurement": 2, "COVID-19": 2, "Chest X-ray": 2, "Chest pain": 2, "Cough": 2, "Diarrhoea": 2, "Drug ineffective": 2, "Ear pain": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Herpes zoster": 2, "Injection site erythema": 2, "Magnetic resonance imaging": 2, "Oedema": 2, "Optic ischaemic neuropathy": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Palpitations": 2, "SARS-CoV-2 test": 2, "Sepsis": 2, "Troponin": 2, "Ultrasound Doppler": 2, "Urticaria": 2, "Vaccination site swelling": 2, "Vasculitis": 2, "Vomiting": 2, "White blood cell count": 2, "X-ray": 2, "Acute kidney injury": 1, "Acute psychosis": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Antineutrophil cytoplasmic antibody": 1, "Anxiety": 1, "Aortic dissection": 1, "Arthritis": 1, "Axillary pain": 1, "Back pain": 1, "Biopsy brain": 1, "Biopsy skin": 1, "Blood creatine": 1, "Blood gases": 1, "Blood test": 1, "Bundle branch block right": 1, "Burning sensation": 1, "C-reactive protein increased": 1, "C-reactive protein normal": 1, "Cardiac arrest": 1, "Cardiac failure acute": 1, "Cardiomyopathy": 1, "Cerebral infarction": 1, "Coagulation factor": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Consciousness fluctuating": 1, "Corneal graft rejection": 1, "Decreased appetite": 1, "Delusion": 1, "Dermo-hypodermitis": 1, "Disorientation": 1, "Dry mouth": 1, "Dysaesthesia": 1, "Dysuria": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Electroneuromyography": 1, "Enanthema": 1, "Encephalitis": 1, "Epilepsy": 1, "Exposure to SARS-CoV-2": 1, "Eye infarction": 1, "Eyelid oedema": 1, "Facial paralysis": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Gallbladder rupture": 1, "General physical health deterioration": 1, "Glomerular filtration rate": 1, "Glomerulonephritis rapidly progressive": 1, "Guillain-Barre syndrome": 1, "HIV test": 1, "Haemobilia": 1, "Haemoglobin": 1, "Heart rate": 1, "Henoch-Schonlein purpura": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Hyperthermia": 1, "Hypotension": 1, "Hypoxia": 1, "IgA nephropathy": 1, "Immunisation anxiety related reaction": 1, "Impaired healing": 1, "Impaired self-care": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Injection site rash": 1, "Injection site reaction": 1, "International normalised ratio": 1, "Iridocyclitis": 1, "Joint swelling": 1, "Laboratory test": 1, "Laboratory test normal": 1, "Legionella test": 1, "Leukaemia": 1, "Loss of proprioception": 1, "Lymphocyte count": 1, "Lymphopenia": 1, "Macular oedema": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Migraine with aura": 1, "Monoplegia": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Ophthalmic herpes zoster": 1, "Oral herpes": 1, "Orthopaedic examination": 1, "Palmar-plantar erythrodysaesthesia syndrome": 1, "Paraesthesia": 1, "Personality change": 1, "Polymerase chain reaction": 1, "Productive cough": 1, "Pulmonary embolism": 1, "Pulmonary mass": 1, "Rales": 1, "Rash macular": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red blood cell sedimentation rate normal": 1, "Renal failure": 1, "Respiratory failure": 1, "Retinal vein thrombosis": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sneezing": 1, "Somnolence": 1, "Spontaneous haematoma": 1, "Status epilepticus": 1, "Streptococcal urinary tract infection": 1, "Streptococcus test": 1, "Stridor": 1, "Sudden onset of sleep": 1, "Swollen tongue": 1, "Systemic inflammatory response syndrome": 1, "Systolic hypertension": 1, "Thrombocytopenia": 1, "Topography corneal abnormal": 1, "Traumatic haematoma": 1, "Type I hypersensitivity": 1, "Ultrasound kidney": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination complication": 1, "Vaccination site warmth": 1, "Venous thrombosis limb": 1, "Ventricular hypertrophy": 1, "Visual acuity reduced": 1, "Visual impairment": 1, "Warm type haemolytic anaemia": 1, "Wheezing": 1}, "batchcodes": ["300042460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300042460G26761.json b/docs/data/histograms/Switzerland/300042460G26761.json
index b7a92d16a24..048c58ddd81 100644
--- a/docs/data/histograms/Switzerland/300042460G26761.json
+++ b/docs/data/histograms/Switzerland/300042460G26761.json
@@ -1 +1 @@
-{"batchcode": "300042460G26761", "histograms": [{"batchcodes": ["300042460G26761"], "histogram": {"Angioedema": 1, "Hypersensitivity": 1, "Lip erythema": 1, "Mouth swelling": 1, "Oral mucosal erythema": 1, "Rash erythematous": 1, "Swelling face": 1, "Swollen tongue": 1, "Tongue erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "300042460G26761", "histograms": [{"histogram": {"Angioedema": 1, "Hypersensitivity": 1, "Lip erythema": 1, "Mouth swelling": 1, "Oral mucosal erythema": 1, "Rash erythematous": 1, "Swelling face": 1, "Swollen tongue": 1, "Tongue erythema": 1}, "batchcodes": ["300042460G26761"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30004260.json b/docs/data/histograms/Switzerland/30004260.json
index e6f3eb2f751..48f0e433e2d 100644
--- a/docs/data/histograms/Switzerland/30004260.json
+++ b/docs/data/histograms/Switzerland/30004260.json
@@ -1 +1 @@
-{"batchcode": "30004260", "histograms": [{"batchcodes": ["30004260"], "histogram": {"Biopsy": 1, "Oral lichen planus": 1}}]}
\ No newline at end of file
+{"batchcode": "30004260", "histograms": [{"histogram": {"Biopsy": 1, "Oral lichen planus": 1}, "batchcodes": ["30004260"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000427 23.json b/docs/data/histograms/Switzerland/3000427 23.json
index 89560c5bc2b..06dd525fb6f 100644
--- a/docs/data/histograms/Switzerland/3000427 23.json
+++ b/docs/data/histograms/Switzerland/3000427 23.json
@@ -1 +1 @@
-{"batchcode": "3000427 23", "histograms": [{"batchcodes": ["3000427 23"], "histogram": {"Arthritis": 1, "Neck pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "3000427 23", "histograms": [{"histogram": {"Arthritis": 1, "Neck pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["3000427 23"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300042723.json b/docs/data/histograms/Switzerland/300042723.json
index 4d64c99c579..2a71244e1a3 100644
--- a/docs/data/histograms/Switzerland/300042723.json
+++ b/docs/data/histograms/Switzerland/300042723.json
@@ -1 +1 @@
-{"batchcode": "300042723", "histograms": [{"batchcodes": ["300042723"], "histogram": {"Pyrexia": 7, "Blood pressure measurement": 4, "Dyspnoea": 4, "Headache": 4, "Heart rate": 3, "Inappropriate schedule of product administration": 3, "Anaphylactic reaction": 2, "Anxiety": 2, "Asthenia": 2, "Computerised tomogram": 2, "Death": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "General physical health deterioration": 2, "Herpes zoster": 2, "Hypersensitivity": 2, "Nausea": 2, "Oxygen saturation": 2, "Pruritus": 2, "Pulmonary embolism": 2, "Tinnitus": 2, "Urticaria": 2, "Vomiting": 2, "Acute myocardial infarction": 1, "Angiogram": 1, "Arrhythmia": 1, "Audiogram": 1, "Back pain": 1, "Bell's palsy": 1, "Blood creatinine": 1, "Blood pressure systolic": 1, "Blood test": 1, "C-reactive protein": 1, "CSF test": 1, "Cardio-respiratory arrest": 1, "Cerebral venous sinus thrombosis": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Constipation": 1, "Cough": 1, "Dizziness": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Electroneurography": 1, "End stage renal disease": 1, "Endocarditis": 1, "Eosinophil count": 1, "Erythema": 1, "Fine motor skill dysfunction": 1, "Gait disturbance": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Haematoma": 1, "Haematoma infection": 1, "Haemodynamic test": 1, "Haemoglobin": 1, "Hallucination": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypoacusis": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Immunoelectrophoresis": 1, "Injection site erythema": 1, "Insomnia": 1, "Investigation": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Lichen planus": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Meningitis": 1, "Multiple sclerosis relapse": 1, "Muscle spasms": 1, "Myalgia": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Otoscopy": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Pharyngeal oedema": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Rash": 1, "Rinne tuning fork test": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sense of oppression": 1, "Serology test": 1, "Skin exfoliation": 1, "Skin fissures": 1, "Smear buccal": 1, "Stent placement": 1, "Stomatitis": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Tremor": 1, "Uhthoff's phenomenon": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Weber tuning fork test": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "300042723", "histograms": [{"histogram": {"Pyrexia": 7, "Blood pressure measurement": 4, "Dyspnoea": 4, "Headache": 4, "Heart rate": 3, "Inappropriate schedule of product administration": 3, "Anaphylactic reaction": 2, "Anxiety": 2, "Asthenia": 2, "Computerised tomogram": 2, "Death": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "General physical health deterioration": 2, "Herpes zoster": 2, "Hypersensitivity": 2, "Nausea": 2, "Oxygen saturation": 2, "Pruritus": 2, "Pulmonary embolism": 2, "Tinnitus": 2, "Urticaria": 2, "Vomiting": 2, "Acute myocardial infarction": 1, "Angiogram": 1, "Arrhythmia": 1, "Audiogram": 1, "Back pain": 1, "Bell's palsy": 1, "Blood creatinine": 1, "Blood pressure systolic": 1, "Blood test": 1, "C-reactive protein": 1, "CSF test": 1, "Cardio-respiratory arrest": 1, "Cerebral venous sinus thrombosis": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Constipation": 1, "Cough": 1, "Dizziness": 1, "Dysaesthesia": 1, "Echocardiogram": 1, "Electroneurography": 1, "End stage renal disease": 1, "Endocarditis": 1, "Eosinophil count": 1, "Erythema": 1, "Fine motor skill dysfunction": 1, "Gait disturbance": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Haematoma": 1, "Haematoma infection": 1, "Haemodynamic test": 1, "Haemoglobin": 1, "Hallucination": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypoacusis": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Immunoelectrophoresis": 1, "Injection site erythema": 1, "Insomnia": 1, "Investigation": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Lichen planus": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Meningitis": 1, "Multiple sclerosis relapse": 1, "Muscle spasms": 1, "Myalgia": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Otoscopy": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Pharyngeal oedema": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Rash": 1, "Rinne tuning fork test": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Sense of oppression": 1, "Serology test": 1, "Skin exfoliation": 1, "Skin fissures": 1, "Smear buccal": 1, "Stent placement": 1, "Stomatitis": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Tremor": 1, "Uhthoff's phenomenon": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Venous thrombosis limb": 1, "Ventricular fibrillation": 1, "Weber tuning fork test": 1, "White blood cell count": 1}, "batchcodes": ["300042723"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000496 / 30015.json b/docs/data/histograms/Switzerland/3000496 / 30015.json
index 8cd6eb83827..6a845f22b71 100644
--- a/docs/data/histograms/Switzerland/3000496 / 30015.json
+++ b/docs/data/histograms/Switzerland/3000496 / 30015.json
@@ -1 +1 @@
-{"batchcode": "3000496 / 30015", "histograms": [{"batchcodes": ["3000496 / 30015"], "histogram": {"C-reactive protein": 1, "Pain in extremity": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid factor": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3000496 / 30015", "histograms": [{"histogram": {"C-reactive protein": 1, "Pain in extremity": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid factor": 1, "White blood cell count": 1}, "batchcodes": ["3000496 / 30015"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000496 / XX.json b/docs/data/histograms/Switzerland/3000496 / XX.json
index 7fbb6a39313..7fdc887772a 100644
--- a/docs/data/histograms/Switzerland/3000496 / XX.json
+++ b/docs/data/histograms/Switzerland/3000496 / XX.json
@@ -1 +1 @@
-{"batchcode": "3000496 / XX", "histograms": [{"batchcodes": ["3000496 / XX"], "histogram": {"Embolism venous": 1}}]}
\ No newline at end of file
+{"batchcode": "3000496 / XX", "histograms": [{"histogram": {"Embolism venous": 1}, "batchcodes": ["3000496 / XX"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000496.json b/docs/data/histograms/Switzerland/3000496.json
index 7038dc2479e..5bc0289d9ba 100644
--- a/docs/data/histograms/Switzerland/3000496.json
+++ b/docs/data/histograms/Switzerland/3000496.json
@@ -1 +1 @@
-{"batchcode": "3000496", "histograms": [{"batchcodes": ["3000496"], "histogram": {"Headache": 7, "Dizziness": 4, "Pyrexia": 4, "Circulatory collapse": 3, "Diarrhoea": 3, "Fatigue": 3, "Herpes zoster": 3, "Asthenia": 2, "Biopsy skin": 2, "Blood test": 2, "Brain natriuretic peptide": 2, "Chills": 2, "Computerised tomogram": 2, "Dyspnoea": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Hypersensitivity": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Muscular weakness": 2, "Pulmonary embolism": 2, "Ultrasound scan": 2, "Urticarial vasculitis": 2, "Vomiting": 2, "White blood cell count": 2, "Abdomen scan": 1, "Acute respiratory distress syndrome": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anxiety": 1, "Apathy": 1, "Arthralgia": 1, "Arthritis": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Body mass index": 1, "Body temperature": 1, "Body temperature increased": 1, "Burning sensation": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cardiac failure acute": 1, "Cataract": 1, "Cerebral thrombosis": 1, "Chest discomfort": 1, "Chest pain": 1, "Chest scan": 1, "Confusional state": 1, "Cough": 1, "Culture urine": 1, "Death": 1, "Delirium": 1, "Ear pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroneuromyography": 1, "Epilepsy": 1, "Erythema": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Hypoxia": 1, "Immune thrombocytopenia": 1, "Injection site lymphadenopathy": 1, "Language disorder": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neuralgic amyotrophy": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Post herpetic neuralgia": 1, "Rash": 1, "Rash erythematous": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Salpingo-oophoritis": 1, "Sepsis": 1, "Septic shock": 1, "Tinnitus": 1, "Troponin T": 1, "Vaccination failure": 1, "Visual impairment": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3000496", "histograms": [{"histogram": {"Headache": 7, "Dizziness": 4, "Pyrexia": 4, "Circulatory collapse": 3, "Diarrhoea": 3, "Fatigue": 3, "Herpes zoster": 3, "Asthenia": 2, "Biopsy skin": 2, "Blood test": 2, "Brain natriuretic peptide": 2, "Chills": 2, "Computerised tomogram": 2, "Dyspnoea": 2, "Fibrin D dimer": 2, "Gait disturbance": 2, "Hypersensitivity": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Muscular weakness": 2, "Pulmonary embolism": 2, "Ultrasound scan": 2, "Urticarial vasculitis": 2, "Vomiting": 2, "White blood cell count": 2, "Abdomen scan": 1, "Acute respiratory distress syndrome": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anxiety": 1, "Apathy": 1, "Arthralgia": 1, "Arthritis": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Body mass index": 1, "Body temperature": 1, "Body temperature increased": 1, "Burning sensation": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cardiac failure acute": 1, "Cataract": 1, "Cerebral thrombosis": 1, "Chest discomfort": 1, "Chest pain": 1, "Chest scan": 1, "Confusional state": 1, "Cough": 1, "Culture urine": 1, "Death": 1, "Delirium": 1, "Ear pain": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electroneuromyography": 1, "Epilepsy": 1, "Erythema": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Hypoxia": 1, "Immune thrombocytopenia": 1, "Injection site lymphadenopathy": 1, "Language disorder": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neuralgic amyotrophy": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Post herpetic neuralgia": 1, "Rash": 1, "Rash erythematous": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Salpingo-oophoritis": 1, "Sepsis": 1, "Septic shock": 1, "Tinnitus": 1, "Troponin T": 1, "Vaccination failure": 1, "Visual impairment": 1, "X-ray": 1}, "batchcodes": ["3000496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30006324.json b/docs/data/histograms/Switzerland/30006324.json
index 76e19773798..b9455e9a6b4 100644
--- a/docs/data/histograms/Switzerland/30006324.json
+++ b/docs/data/histograms/Switzerland/30006324.json
@@ -1 +1 @@
-{"batchcode": "30006324", "histograms": [{"batchcodes": ["30006324"], "histogram": {"Anti-titin antibody": 1, "Antiacetylcholine receptor antibody": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Eyelid ptosis": 1, "Laboratory test": 1, "Ocular myasthenia": 1, "Tensilon test": 1}}]}
\ No newline at end of file
+{"batchcode": "30006324", "histograms": [{"histogram": {"Anti-titin antibody": 1, "Antiacetylcholine receptor antibody": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Eyelid ptosis": 1, "Laboratory test": 1, "Ocular myasthenia": 1, "Tensilon test": 1}, "batchcodes": ["30006324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30007449.json b/docs/data/histograms/Switzerland/30007449.json
index 71407e1c40a..8da7ede4120 100644
--- a/docs/data/histograms/Switzerland/30007449.json
+++ b/docs/data/histograms/Switzerland/30007449.json
@@ -1 +1 @@
-{"batchcode": "30007449", "histograms": [{"batchcodes": ["30007449"], "histogram": {"Cerebral infarction": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "30007449", "histograms": [{"histogram": {"Cerebral infarction": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["30007449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3000796.json b/docs/data/histograms/Switzerland/3000796.json
index 8301c261d6e..cbc72190ef7 100644
--- a/docs/data/histograms/Switzerland/3000796.json
+++ b/docs/data/histograms/Switzerland/3000796.json
@@ -1 +1 @@
-{"batchcode": "3000796", "histograms": [{"batchcodes": ["3000796"], "histogram": {"Biopsy": 1, "Pemphigoid": 1}}]}
\ No newline at end of file
+{"batchcode": "3000796", "histograms": [{"histogram": {"Biopsy": 1, "Pemphigoid": 1}, "batchcodes": ["3000796"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001.653.json b/docs/data/histograms/Switzerland/3001.653.json
index 30cd1f0c0ea..5476bf7ddd5 100644
--- a/docs/data/histograms/Switzerland/3001.653.json
+++ b/docs/data/histograms/Switzerland/3001.653.json
@@ -1 +1 @@
-{"batchcode": "3001.653", "histograms": [{"batchcodes": ["3001.653"], "histogram": {"Blood glucose": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "3001.653", "histograms": [{"histogram": {"Blood glucose": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1}, "batchcodes": ["3001.653"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30015.json b/docs/data/histograms/Switzerland/30015.json
index 80723541fec..213ee0c0f84 100644
--- a/docs/data/histograms/Switzerland/30015.json
+++ b/docs/data/histograms/Switzerland/30015.json
@@ -1 +1 @@
-{"batchcode": "30015", "histograms": [{"batchcodes": ["30015"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "30015", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["30015"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001530 / 30021.json b/docs/data/histograms/Switzerland/3001530 / 30021.json
index e25d559214f..fbfb1787cea 100644
--- a/docs/data/histograms/Switzerland/3001530 / 30021.json
+++ b/docs/data/histograms/Switzerland/3001530 / 30021.json
@@ -1 +1 @@
-{"batchcode": "3001530 / 30021", "histograms": [{"batchcodes": ["3001530 / 30021"], "histogram": {"Angiogram": 1, "Deep vein thrombosis": 1, "Electrocardiogram": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test negative": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "3001530 / 30021", "histograms": [{"histogram": {"Angiogram": 1, "Deep vein thrombosis": 1, "Electrocardiogram": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Pulmonary embolism": 1, "SARS-CoV-2 test negative": 1, "Troponin": 1}, "batchcodes": ["3001530 / 30021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001530.json b/docs/data/histograms/Switzerland/3001530.json
index 186b373cd43..b6514132226 100644
--- a/docs/data/histograms/Switzerland/3001530.json
+++ b/docs/data/histograms/Switzerland/3001530.json
@@ -1 +1 @@
-{"batchcode": "3001530", "histograms": [{"batchcodes": ["3001530"], "histogram": {"Headache": 15, "Fatigue": 14, "Pyrexia": 10, "Myalgia": 8, "Malaise": 6, "Nausea": 6, "Arthralgia": 5, "Electrocardiogram": 5, "Blood pressure measurement": 4, "Deep vein thrombosis": 4, "Dizziness": 4, "Fibrin D dimer": 4, "Magnetic resonance imaging head": 4, "Syncope": 4, "Blood creatinine": 3, "Blood pressure increased": 3, "Computerised tomogram": 3, "Cough": 3, "Echocardiogram": 3, "Herpes zoster": 3, "Neuralgia": 3, "Palpitations": 3, "Paraesthesia": 3, "Platelet count": 3, "Rhinorrhoea": 3, "Urticaria": 3, "Vertigo": 3, "Anosmia": 2, "Asthenia": 2, "Atrial fibrillation": 2, "Body temperature": 2, "Chills": 2, "Colitis ulcerative": 2, "Death": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Disturbance in attention": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Dysuria": 2, "Haematochezia": 2, "Haemoglobin": 2, "Head discomfort": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Immune thrombocytopenia": 2, "Inappropriate schedule of product administration": 2, "Injection site pain": 2, "Injection site reaction": 2, "International normalised ratio": 2, "Loss of consciousness": 2, "Magnetic resonance imaging": 2, "Myocarditis": 2, "Neck pain": 2, "Ophthalmic herpes zoster": 2, "Pruritus": 2, "Rash": 2, "Retinal vein thrombosis": 2, "SARS-CoV-2 test": 2, "SARS-CoV-2 test positive": 2, "Tinnitus": 2, "Troponin T": 2, "Ultrasound Doppler": 2, "Vaccination site pain": 2, "White blood cell count": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Ageusia": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Arterial thrombosis": 1, "Asthmatic crisis": 1, "Basedow's disease": 1, "Bell's palsy": 1, "Biopsy bone marrow": 1, "Biopsy kidney": 1, "Biopsy skin": 1, "Blepharitis": 1, "Blood potassium": 1, "Blood sodium": 1, "Brain stem infarction": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardiac stress test": 1, "Cardiolipin antibody": 1, "Chest discomfort": 1, "Chest pain": 1, "Chest scan": 1, "Circulatory collapse": 1, "Coagulation factor VIII level": 1, "Coagulation factor XIII level": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Contusion": 1, "Deafness bilateral": 1, "Dehydration": 1, "Delirium": 1, "Discomfort": 1, "Dupuytren's contracture": 1, "Dysarthria": 1, "Dysphagia": 1, "Electrocardiogram QT interval": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Electroneuromyography": 1, "Endophthalmitis": 1, "Epicondylitis": 1, "Epistaxis": 1, "Exposure to SARS-CoV-2": 1, "Eye infection": 1, "Facial paresis": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "General physical health deterioration": 1, "Glycosylated haemoglobin": 1, "Growing pains": 1, "Haematemesis": 1, "Haematuria": 1, "Haemoptysis": 1, "Hangover": 1, "Heart rate increased": 1, "Hepatic mass": 1, "Herpes simplex reactivation": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypotension": 1, "Imaging procedure": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Injection site hypersensitivity": 1, "Insomnia": 1, "Iridocyclitis": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Language disorder": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Microembolism": 1, "Migraine": 1, "Mixed connective tissue disease": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Myopericarditis": 1, "Nephrotic syndrome": 1, "Neurological examination": 1, "Neutrophil count": 1, "Non-cardiac chest pain": 1, "Optic ischaemic neuropathy": 1, "Oral herpes": 1, "Pain in extremity": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pleurisy": 1, "Pleuropericarditis": 1, "Pulmonary embolism": 1, "Purpura": 1, "QRS axis": 1, "Rash erythematous": 1, "Refusal of vaccination": 1, "Renal failure": 1, "Rheumatoid factor": 1, "Saliva altered": 1, "Seizure": 1, "Sepsis": 1, "Serum ferritin": 1, "Sinus rhythm": 1, "Skin burning sensation": 1, "Skin mass": 1, "Skin reaction": 1, "Specialist consultation": 1, "Spinal pain": 1, "Tachycardia": 1, "Thrombin-antithrombin III complex": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Trismus": 1, "Tryptase": 1, "Type II hypersensitivity": 1, "Ulnar nerve injury": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Varicose vein": 1, "Visual impairment": 1, "Vomiting": 1, "Von Willebrand's factor activity test": 1}}]}
\ No newline at end of file
+{"batchcode": "3001530", "histograms": [{"histogram": {"Headache": 15, "Fatigue": 14, "Pyrexia": 10, "Myalgia": 8, "Malaise": 6, "Nausea": 6, "Arthralgia": 5, "Electrocardiogram": 5, "Blood pressure measurement": 4, "Deep vein thrombosis": 4, "Dizziness": 4, "Fibrin D dimer": 4, "Magnetic resonance imaging head": 4, "Syncope": 4, "Blood creatinine": 3, "Blood pressure increased": 3, "Computerised tomogram": 3, "Cough": 3, "Echocardiogram": 3, "Herpes zoster": 3, "Neuralgia": 3, "Palpitations": 3, "Paraesthesia": 3, "Platelet count": 3, "Rhinorrhoea": 3, "Urticaria": 3, "Vertigo": 3, "Anosmia": 2, "Asthenia": 2, "Atrial fibrillation": 2, "Body temperature": 2, "Chills": 2, "Colitis ulcerative": 2, "Death": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Disturbance in attention": 2, "Drug ineffective": 2, "Dyspnoea": 2, "Dysuria": 2, "Haematochezia": 2, "Haemoglobin": 2, "Head discomfort": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Immune thrombocytopenia": 2, "Inappropriate schedule of product administration": 2, "Injection site pain": 2, "Injection site reaction": 2, "International normalised ratio": 2, "Loss of consciousness": 2, "Magnetic resonance imaging": 2, "Myocarditis": 2, "Neck pain": 2, "Ophthalmic herpes zoster": 2, "Pruritus": 2, "Rash": 2, "Retinal vein thrombosis": 2, "SARS-CoV-2 test": 2, "SARS-CoV-2 test positive": 2, "Tinnitus": 2, "Troponin T": 2, "Ultrasound Doppler": 2, "Vaccination site pain": 2, "White blood cell count": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Ageusia": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Arterial thrombosis": 1, "Asthmatic crisis": 1, "Basedow's disease": 1, "Bell's palsy": 1, "Biopsy bone marrow": 1, "Biopsy kidney": 1, "Biopsy skin": 1, "Blepharitis": 1, "Blood potassium": 1, "Blood sodium": 1, "Brain stem infarction": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardiac stress test": 1, "Cardiolipin antibody": 1, "Chest discomfort": 1, "Chest pain": 1, "Chest scan": 1, "Circulatory collapse": 1, "Coagulation factor VIII level": 1, "Coagulation factor XIII level": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Contusion": 1, "Deafness bilateral": 1, "Dehydration": 1, "Delirium": 1, "Discomfort": 1, "Dupuytren's contracture": 1, "Dysarthria": 1, "Dysphagia": 1, "Electrocardiogram QT interval": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Electroneuromyography": 1, "Endophthalmitis": 1, "Epicondylitis": 1, "Epistaxis": 1, "Exposure to SARS-CoV-2": 1, "Eye infection": 1, "Facial paresis": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "General physical health deterioration": 1, "Glycosylated haemoglobin": 1, "Growing pains": 1, "Haematemesis": 1, "Haematuria": 1, "Haemoptysis": 1, "Hangover": 1, "Heart rate increased": 1, "Hepatic mass": 1, "Herpes simplex reactivation": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypotension": 1, "Imaging procedure": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Injection site hypersensitivity": 1, "Insomnia": 1, "Iridocyclitis": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Language disorder": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Microembolism": 1, "Migraine": 1, "Mixed connective tissue disease": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Myopericarditis": 1, "Nephrotic syndrome": 1, "Neurological examination": 1, "Neutrophil count": 1, "Non-cardiac chest pain": 1, "Optic ischaemic neuropathy": 1, "Oral herpes": 1, "Pain in extremity": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pleurisy": 1, "Pleuropericarditis": 1, "Pulmonary embolism": 1, "Purpura": 1, "QRS axis": 1, "Rash erythematous": 1, "Refusal of vaccination": 1, "Renal failure": 1, "Rheumatoid factor": 1, "Saliva altered": 1, "Seizure": 1, "Sepsis": 1, "Serum ferritin": 1, "Sinus rhythm": 1, "Skin burning sensation": 1, "Skin mass": 1, "Skin reaction": 1, "Specialist consultation": 1, "Spinal pain": 1, "Tachycardia": 1, "Thrombin-antithrombin III complex": 1, "Thrombophlebitis": 1, "Thrombosis": 1, "Trismus": 1, "Tryptase": 1, "Type II hypersensitivity": 1, "Ulnar nerve injury": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Varicose vein": 1, "Visual impairment": 1, "Vomiting": 1, "Von Willebrand's factor activity test": 1}, "batchcodes": ["3001530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001530/3002541.json b/docs/data/histograms/Switzerland/3001530/3002541.json
index 748d9983c28..6339660279f 100644
--- a/docs/data/histograms/Switzerland/3001530/3002541.json
+++ b/docs/data/histograms/Switzerland/3001530/3002541.json
@@ -1 +1 @@
-{"batchcode": "3001530/3002541", "histograms": [{"batchcodes": ["3001530/3002541"], "histogram": {"Injection site pain": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3001530/3002541", "histograms": [{"histogram": {"Injection site pain": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["3001530/3002541"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001530/XX.json b/docs/data/histograms/Switzerland/3001530/XX.json
index 9061e258aef..a2ee8784323 100644
--- a/docs/data/histograms/Switzerland/3001530/XX.json
+++ b/docs/data/histograms/Switzerland/3001530/XX.json
@@ -1 +1 @@
-{"batchcode": "3001530/XX", "histograms": [{"batchcodes": ["3001530/XX"], "histogram": {"Herpes zoster": 1, "Movement disorder": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "3001530/XX", "histograms": [{"histogram": {"Herpes zoster": 1, "Movement disorder": 1, "Pain in extremity": 1}, "batchcodes": ["3001530/XX"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30016 56.json b/docs/data/histograms/Switzerland/30016 56.json
index d1b4287010a..536de17eb62 100644
--- a/docs/data/histograms/Switzerland/30016 56.json
+++ b/docs/data/histograms/Switzerland/30016 56.json
@@ -1 +1 @@
-{"batchcode": "30016 56", "histograms": [{"batchcodes": ["30016 56"], "histogram": {"Fatigue": 1, "Haemoglobin": 1, "Heparin-induced thrombocytopenia test positive": 1, "Immune thrombocytopenia": 1, "Petechiae": 1, "Platelet count": 1, "Purpura": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "30016 56", "histograms": [{"histogram": {"Fatigue": 1, "Haemoglobin": 1, "Heparin-induced thrombocytopenia test positive": 1, "Immune thrombocytopenia": 1, "Petechiae": 1, "Platelet count": 1, "Purpura": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["30016 56"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001653.json b/docs/data/histograms/Switzerland/3001653.json
index b33ec16392a..368c8c43ad5 100644
--- a/docs/data/histograms/Switzerland/3001653.json
+++ b/docs/data/histograms/Switzerland/3001653.json
@@ -1 +1 @@
-{"batchcode": "3001653", "histograms": [{"batchcodes": ["3001653"], "histogram": {"Fatigue": 4, "Blood creatinine": 3, "Deep vein thrombosis": 3, "Pyrexia": 3, "Urticaria": 3, "Computerised tomogram": 2, "Heart rate": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Pain in extremity": 2, "Ultrasound Doppler": 2, "Ageusia": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Arthralgia": 1, "Back pain": 1, "Blood immunoglobulin E": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic increased": 1, "Blood test": 1, "Cerebral venous sinus thrombosis": 1, "Chest pain": 1, "Computerised tomogram coronary artery": 1, "Computerised tomogram thorax": 1, "Conjunctival haemorrhage": 1, "Conjunctivitis": 1, "Death": 1, "Electroencephalogram": 1, "Facial paresis": 1, "Feeling drunk": 1, "Headache": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "International normalised ratio": 1, "Myositis": 1, "Nausea": 1, "Pain in jaw": 1, "Pancreatic enzymes increased": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Post-acute COVID-19 syndrome": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 antibody test": 1, "Skin reaction": 1, "Swollen tongue": 1, "Syncope": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "3001653", "histograms": [{"histogram": {"Fatigue": 4, "Blood creatinine": 3, "Deep vein thrombosis": 3, "Pyrexia": 3, "Urticaria": 3, "Computerised tomogram": 2, "Heart rate": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Pain in extremity": 2, "Ultrasound Doppler": 2, "Ageusia": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Arthralgia": 1, "Back pain": 1, "Blood immunoglobulin E": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic increased": 1, "Blood test": 1, "Cerebral venous sinus thrombosis": 1, "Chest pain": 1, "Computerised tomogram coronary artery": 1, "Computerised tomogram thorax": 1, "Conjunctival haemorrhage": 1, "Conjunctivitis": 1, "Death": 1, "Electroencephalogram": 1, "Facial paresis": 1, "Feeling drunk": 1, "Headache": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "International normalised ratio": 1, "Myositis": 1, "Nausea": 1, "Pain in jaw": 1, "Pancreatic enzymes increased": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Post-acute COVID-19 syndrome": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 antibody test": 1, "Skin reaction": 1, "Swollen tongue": 1, "Syncope": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1}, "batchcodes": ["3001653"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001656.json b/docs/data/histograms/Switzerland/3001656.json
index 971c4b52be3..a27b0ff9692 100644
--- a/docs/data/histograms/Switzerland/3001656.json
+++ b/docs/data/histograms/Switzerland/3001656.json
@@ -1 +1 @@
-{"batchcode": "3001656", "histograms": [{"batchcodes": ["3001656"], "histogram": {"Pyrexia": 12, "Headache": 9, "Fatigue": 8, "Nausea": 8, "Chills": 7, "Arthralgia": 4, "Dizziness": 4, "Injection site pain": 4, "Myalgia": 4, "Tachycardia": 4, "Asthenia": 3, "C-reactive protein": 3, "Herpes zoster": 3, "Insomnia": 3, "Lymphadenopathy": 3, "Myocarditis": 3, "White blood cell count": 3, "Blood test": 2, "Chest X-ray": 2, "Chest pain": 2, "Diarrhoea": 2, "Dry mouth": 2, "Dyspnoea": 2, "Eosinophilia": 2, "Hypertension": 2, "Hypotension": 2, "Injection site reaction": 2, "Pain in extremity": 2, "Palpitations": 2, "Paraesthesia": 2, "Pruritus": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Thirst": 2, "Tremor": 2, "Troponin": 2, "Vomiting": 2, "Acute abdomen": 1, "Acute coronary syndrome": 1, "Acute respiratory distress syndrome": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Angiocardiogram": 1, "Anosmia": 1, "Anxiety": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atypical pneumonia": 1, "Blood creatine phosphokinase": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Borrelia test": 1, "Breast pain": 1, "Burning sensation": 1, "COVID-19": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Creutzfeldt-Jakob disease": 1, "Cytomegalovirus test": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Emotional distress": 1, "Encephalitis": 1, "Eosinophil count": 1, "Epstein-Barr virus antibody": 1, "Feeling abnormal": 1, "Feeling of despair": 1, "Flavivirus test": 1, "General physical health deterioration": 1, "HIV test": 1, "Haematoma": 1, "Hallucination": 1, "Hepatitis viral test": 1, "Herpes zoster oticus": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site hypoaesthesia": 1, "Injection site swelling": 1, "Injury": 1, "Interstitial lung disease": 1, "Legionella infection": 1, "Leukocytosis": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Multiple sclerosis": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Pancreatic abscess": 1, "Partial seizures": 1, "Periostitis": 1, "Peripheral swelling": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Post herpetic neuralgia": 1, "Rash erythematous": 1, "Retinal vein thrombosis": 1, "Scan": 1, "Skin depigmentation": 1, "Skin reaction": 1, "Sleep disorder": 1, "Spinal pain": 1, "Tachypnoea": 1, "Thrombosis": 1, "Tinnitus": 1, "Toxoplasmosis": 1, "Treponema test": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Venous thrombosis": 1, "Ventricular fibrillation": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "3001656", "histograms": [{"histogram": {"Pyrexia": 12, "Headache": 9, "Fatigue": 8, "Nausea": 8, "Chills": 7, "Arthralgia": 4, "Dizziness": 4, "Injection site pain": 4, "Myalgia": 4, "Tachycardia": 4, "Asthenia": 3, "C-reactive protein": 3, "Herpes zoster": 3, "Insomnia": 3, "Lymphadenopathy": 3, "Myocarditis": 3, "White blood cell count": 3, "Blood test": 2, "Chest X-ray": 2, "Chest pain": 2, "Diarrhoea": 2, "Dry mouth": 2, "Dyspnoea": 2, "Eosinophilia": 2, "Hypertension": 2, "Hypotension": 2, "Injection site reaction": 2, "Pain in extremity": 2, "Palpitations": 2, "Paraesthesia": 2, "Pruritus": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Thirst": 2, "Tremor": 2, "Troponin": 2, "Vomiting": 2, "Acute abdomen": 1, "Acute coronary syndrome": 1, "Acute respiratory distress syndrome": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Angiocardiogram": 1, "Anosmia": 1, "Anxiety": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Ataxia": 1, "Atypical pneumonia": 1, "Blood creatine phosphokinase": 1, "Blood gases": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Body temperature increased": 1, "Borrelia test": 1, "Breast pain": 1, "Burning sensation": 1, "COVID-19": 1, "Cardio-respiratory arrest": 1, "Computerised tomogram thorax": 1, "Contusion": 1, "Creutzfeldt-Jakob disease": 1, "Cytomegalovirus test": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Emotional distress": 1, "Encephalitis": 1, "Eosinophil count": 1, "Epstein-Barr virus antibody": 1, "Feeling abnormal": 1, "Feeling of despair": 1, "Flavivirus test": 1, "General physical health deterioration": 1, "HIV test": 1, "Haematoma": 1, "Hallucination": 1, "Hepatitis viral test": 1, "Herpes zoster oticus": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site hypoaesthesia": 1, "Injection site swelling": 1, "Injury": 1, "Interstitial lung disease": 1, "Legionella infection": 1, "Leukocytosis": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Multiple sclerosis": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Pancreatic abscess": 1, "Partial seizures": 1, "Periostitis": 1, "Peripheral swelling": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Post herpetic neuralgia": 1, "Rash erythematous": 1, "Retinal vein thrombosis": 1, "Scan": 1, "Skin depigmentation": 1, "Skin reaction": 1, "Sleep disorder": 1, "Spinal pain": 1, "Tachypnoea": 1, "Thrombosis": 1, "Tinnitus": 1, "Toxoplasmosis": 1, "Treponema test": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Venous thrombosis": 1, "Ventricular fibrillation": 1, "Weight decreased": 1}, "batchcodes": ["3001656"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001656/3002186.json b/docs/data/histograms/Switzerland/3001656/3002186.json
index c9331c9af4e..9c9ff1892f6 100644
--- a/docs/data/histograms/Switzerland/3001656/3002186.json
+++ b/docs/data/histograms/Switzerland/3001656/3002186.json
@@ -1 +1 @@
-{"batchcode": "3001656/3002186", "histograms": [{"batchcodes": ["3001656/3002186"], "histogram": {"Face oedema": 1, "Oedema peripheral": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3001656/3002186", "histograms": [{"histogram": {"Face oedema": 1, "Oedema peripheral": 1, "Urticaria": 1}, "batchcodes": ["3001656/3002186"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001659.json b/docs/data/histograms/Switzerland/3001659.json
index ffa2553bc1d..2b7d24ade60 100644
--- a/docs/data/histograms/Switzerland/3001659.json
+++ b/docs/data/histograms/Switzerland/3001659.json
@@ -1 +1 @@
-{"batchcode": "3001659", "histograms": [{"batchcodes": ["3001659"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "3001659", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["3001659"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001941.json b/docs/data/histograms/Switzerland/3001941.json
index eb16e35e0ac..95b5a931ca1 100644
--- a/docs/data/histograms/Switzerland/3001941.json
+++ b/docs/data/histograms/Switzerland/3001941.json
@@ -1 +1 @@
-{"batchcode": "3001941", "histograms": [{"batchcodes": ["3001941"], "histogram": {"Fatigue": 6, "Pyrexia": 6, "Chills": 4, "Dyspnoea exertional": 2, "Injection site pain": 2, "Malaise": 2, "Nausea": 2, "Pain in extremity": 2, "Angioedema": 1, "Apathy": 1, "Blood test": 1, "C-reactive protein": 1, "Chest X-ray normal": 1, "Cognitive disorder": 1, "Computerised tomogram normal": 1, "Decreased appetite": 1, "Dermatitis bullous": 1, "Diaphragmatic paralysis": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Fibrin D dimer": 1, "Growing pains": 1, "Haemoglobin": 1, "Haemoglobin urine present": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoventilation": 1, "Incorrect route of product administration": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site inflammation": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Leukopenia": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Mobility decreased": 1, "Mononeuropathy": 1, "Musculoskeletal pain": 1, "Periarthritis": 1, "Peripheral swelling": 1, "Polymyalgia rheumatica": 1, "Protein urine": 1, "Retinal detachment": 1, "Sepsis": 1, "Sick leave": 1, "Skin mass": 1, "Sleep disorder": 1, "Tremor": 1, "Vaccination site pain": 1, "Visual field defect": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "3001941", "histograms": [{"histogram": {"Fatigue": 6, "Pyrexia": 6, "Chills": 4, "Dyspnoea exertional": 2, "Injection site pain": 2, "Malaise": 2, "Nausea": 2, "Pain in extremity": 2, "Angioedema": 1, "Apathy": 1, "Blood test": 1, "C-reactive protein": 1, "Chest X-ray normal": 1, "Cognitive disorder": 1, "Computerised tomogram normal": 1, "Decreased appetite": 1, "Dermatitis bullous": 1, "Diaphragmatic paralysis": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Fibrin D dimer": 1, "Growing pains": 1, "Haemoglobin": 1, "Haemoglobin urine present": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoventilation": 1, "Incorrect route of product administration": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site inflammation": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Leukopenia": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Mobility decreased": 1, "Mononeuropathy": 1, "Musculoskeletal pain": 1, "Periarthritis": 1, "Peripheral swelling": 1, "Polymyalgia rheumatica": 1, "Protein urine": 1, "Retinal detachment": 1, "Sepsis": 1, "Sick leave": 1, "Skin mass": 1, "Sleep disorder": 1, "Tremor": 1, "Vaccination site pain": 1, "Visual field defect": 1, "Visual impairment": 1}, "batchcodes": ["3001941"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001941/3002541.json b/docs/data/histograms/Switzerland/3001941/3002541.json
index 77387849ebe..c0cb2001cb3 100644
--- a/docs/data/histograms/Switzerland/3001941/3002541.json
+++ b/docs/data/histograms/Switzerland/3001941/3002541.json
@@ -1 +1 @@
-{"batchcode": "3001941/3002541", "histograms": [{"batchcodes": ["3001941/3002541"], "histogram": {"Chills": 1, "Injection site erythema": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "3001941/3002541", "histograms": [{"histogram": {"Chills": 1, "Injection site erythema": 1, "Pruritus": 1}, "batchcodes": ["3001941/3002541"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001942 3002544.json b/docs/data/histograms/Switzerland/3001942 3002544.json
index 0c92748a9c3..eb321f8c997 100644
--- a/docs/data/histograms/Switzerland/3001942 3002544.json
+++ b/docs/data/histograms/Switzerland/3001942 3002544.json
@@ -1 +1 @@
-{"batchcode": "3001942 3002544", "histograms": [{"batchcodes": ["3001942 3002544"], "histogram": {"Parosmia": 1}}]}
\ No newline at end of file
+{"batchcode": "3001942 3002544", "histograms": [{"histogram": {"Parosmia": 1}, "batchcodes": ["3001942 3002544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3001942.json b/docs/data/histograms/Switzerland/3001942.json
index 78a19bcc7d9..29e169d20f5 100644
--- a/docs/data/histograms/Switzerland/3001942.json
+++ b/docs/data/histograms/Switzerland/3001942.json
@@ -1 +1 @@
-{"batchcode": "3001942", "histograms": [{"batchcodes": ["3001942"], "histogram": {"Headache": 11, "Pyrexia": 8, "Chills": 5, "Electrocardiogram": 5, "Fatigue": 5, "Syncope": 5, "Asthenia": 4, "Dizziness": 4, "Pain in extremity": 4, "Angina pectoris": 3, "Arthralgia": 3, "Chest discomfort": 3, "Hypoaesthesia": 3, "Myalgia": 3, "Paraesthesia": 3, "Pulmonary embolism": 3, "Antinuclear antibody": 2, "C-reactive protein": 2, "Chest pain": 2, "Diarrhoea": 2, "Dysgeusia": 2, "Dyspnoea": 2, "Echocardiogram": 2, "Eye pain": 2, "Facial paralysis": 2, "Genital herpes": 2, "Herpes zoster": 2, "Hypersensitivity": 2, "Hypotension": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Nausea": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Tinnitus": 2, "Troponin": 2, "Visual impairment": 2, "Vomiting": 2, "White blood cell count": 2, "Abdominal pain": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Angiogram": 1, "Aplasia pure red cell": 1, "Arrhythmia": 1, "Aspiration bone marrow": 1, "Babinski reflex test": 1, "Back pain": 1, "Balance disorder": 1, "Blood creatinine": 1, "Blood erythropoietin increased": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood pressure fluctuation": 1, "Blood test": 1, "Body temperature": 1, "Bradycardia": 1, "Cardiovascular examination": 1, "Cerebral ischaemia": 1, "Cerebrovascular accident": 1, "Chest scan": 1, "Chronic fatigue syndrome": 1, "Cognitive disorder": 1, "Cold dysaesthesia": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dermatologic examination": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Ear, nose and throat examination": 1, "Erythema": 1, "Exercise tolerance decreased": 1, "Eye swelling": 1, "Eyelid infection": 1, "Face oedema": 1, "Gastritis": 1, "Gastrointestinal pain": 1, "Growing pains": 1, "HIV test": 1, "Haemoglobin": 1, "Hemiparaesthesia": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site pain": 1, "Injection site reaction": 1, "Intraocular pressure increased": 1, "Investigation": 1, "Ischaemic stroke": 1, "Lip swelling": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging head abnormal": 1, "Mental fatigue": 1, "Mesenteric vein thrombosis": 1, "Migraine": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myelitis": 1, "Myocarditis": 1, "Myringitis": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neuritis": 1, "Neurological examination": 1, "Night sweats": 1, "Non-Hodgkin's lymphoma": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Post herpetic neuralgia": 1, "Pruritus": 1, "Rash maculo-papular": 1, "Red blood cell sedimentation rate": 1, "Seizure": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Skin reaction": 1, "Sleep disorder": 1, "Somatic symptom disorder": 1, "Stress cardiomyopathy": 1, "Sudden hearing loss": 1, "Supraventricular tachycardia": 1, "Swollen tongue": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Thrombosis": 1, "Transferrin saturation": 1, "Type I hypersensitivity": 1, "Ultrasound scan": 1, "Urticaria": 1, "Uveitis": 1, "VIth nerve paralysis": 1, "Vaccination site pain": 1, "Varicella virus test": 1, "Vertigo": 1, "Vertigo positional": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3001942", "histograms": [{"histogram": {"Headache": 11, "Pyrexia": 8, "Chills": 5, "Electrocardiogram": 5, "Fatigue": 5, "Syncope": 5, "Asthenia": 4, "Dizziness": 4, "Pain in extremity": 4, "Angina pectoris": 3, "Arthralgia": 3, "Chest discomfort": 3, "Hypoaesthesia": 3, "Myalgia": 3, "Paraesthesia": 3, "Pulmonary embolism": 3, "Antinuclear antibody": 2, "C-reactive protein": 2, "Chest pain": 2, "Diarrhoea": 2, "Dysgeusia": 2, "Dyspnoea": 2, "Echocardiogram": 2, "Eye pain": 2, "Facial paralysis": 2, "Genital herpes": 2, "Herpes zoster": 2, "Hypersensitivity": 2, "Hypotension": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Nausea": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Tinnitus": 2, "Troponin": 2, "Visual impairment": 2, "Vomiting": 2, "White blood cell count": 2, "Abdominal pain": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Angiogram": 1, "Aplasia pure red cell": 1, "Arrhythmia": 1, "Aspiration bone marrow": 1, "Babinski reflex test": 1, "Back pain": 1, "Balance disorder": 1, "Blood creatinine": 1, "Blood erythropoietin increased": 1, "Blood immunoglobulin M": 1, "Blood iron": 1, "Blood pressure fluctuation": 1, "Blood test": 1, "Body temperature": 1, "Bradycardia": 1, "Cardiovascular examination": 1, "Cerebral ischaemia": 1, "Cerebrovascular accident": 1, "Chest scan": 1, "Chronic fatigue syndrome": 1, "Cognitive disorder": 1, "Cold dysaesthesia": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dermatologic examination": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Ear, nose and throat examination": 1, "Erythema": 1, "Exercise tolerance decreased": 1, "Eye swelling": 1, "Eyelid infection": 1, "Face oedema": 1, "Gastritis": 1, "Gastrointestinal pain": 1, "Growing pains": 1, "HIV test": 1, "Haemoglobin": 1, "Hemiparaesthesia": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site pain": 1, "Injection site reaction": 1, "Intraocular pressure increased": 1, "Investigation": 1, "Ischaemic stroke": 1, "Lip swelling": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging head abnormal": 1, "Mental fatigue": 1, "Mesenteric vein thrombosis": 1, "Migraine": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myelitis": 1, "Myocarditis": 1, "Myringitis": 1, "Neuralgia": 1, "Neuralgic amyotrophy": 1, "Neuritis": 1, "Neurological examination": 1, "Night sweats": 1, "Non-Hodgkin's lymphoma": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Post herpetic neuralgia": 1, "Pruritus": 1, "Rash maculo-papular": 1, "Red blood cell sedimentation rate": 1, "Seizure": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Skin reaction": 1, "Sleep disorder": 1, "Somatic symptom disorder": 1, "Stress cardiomyopathy": 1, "Sudden hearing loss": 1, "Supraventricular tachycardia": 1, "Swollen tongue": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Thrombosis": 1, "Transferrin saturation": 1, "Type I hypersensitivity": 1, "Ultrasound scan": 1, "Urticaria": 1, "Uveitis": 1, "VIth nerve paralysis": 1, "Vaccination site pain": 1, "Varicella virus test": 1, "Vertigo": 1, "Vertigo positional": 1, "X-ray": 1}, "batchcodes": ["3001942"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002186 / 30031.json b/docs/data/histograms/Switzerland/3002186 / 30031.json
index 22a32b0964c..1af028a784f 100644
--- a/docs/data/histograms/Switzerland/3002186 / 30031.json
+++ b/docs/data/histograms/Switzerland/3002186 / 30031.json
@@ -1 +1 @@
-{"batchcode": "3002186 / 30031", "histograms": [{"batchcodes": ["3002186 / 30031"], "histogram": {"Back pain": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Growing pains": 1, "Headache": 1, "Injection site reaction": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3002186 / 30031", "histograms": [{"histogram": {"Back pain": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Growing pains": 1, "Headache": 1, "Injection site reaction": 1, "Pyrexia": 1}, "batchcodes": ["3002186 / 30031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002186 3002986.json b/docs/data/histograms/Switzerland/3002186 3002986.json
index 3ae5b30bcf4..33fa76294f0 100644
--- a/docs/data/histograms/Switzerland/3002186 3002986.json
+++ b/docs/data/histograms/Switzerland/3002186 3002986.json
@@ -1 +1 @@
-{"batchcode": "3002186 3002986", "histograms": [{"batchcodes": ["3002186 3002986"], "histogram": {"Conjunctivitis": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3002186 3002986", "histograms": [{"histogram": {"Conjunctivitis": 1, "Syncope": 1}, "batchcodes": ["3002186 3002986"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002186.json b/docs/data/histograms/Switzerland/3002186.json
index 1fad24adb9d..a4221e05be5 100644
--- a/docs/data/histograms/Switzerland/3002186.json
+++ b/docs/data/histograms/Switzerland/3002186.json
@@ -1 +1 @@
-{"batchcode": "3002186", "histograms": [{"batchcodes": ["3002186"], "histogram": {"Headache": 31, "Pyrexia": 30, "Fatigue": 23, "Chills": 15, "Injection site pain": 13, "Nausea": 13, "Myalgia": 12, "Injection site reaction": 8, "Dizziness": 7, "Syncope": 6, "Vomiting": 6, "Arthralgia": 5, "Musculoskeletal pain": 5, "Rash": 5, "Dyspnoea": 4, "Injection site erythema": 4, "Ischaemic stroke": 4, "Ophthalmic herpes zoster": 4, "Abdominal pain": 3, "Asthenia": 3, "Back pain": 3, "Body temperature": 3, "Fibrin D dimer": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Influenza like illness": 3, "Insomnia": 3, "Loss of consciousness": 3, "Lymphadenopathy": 3, "Myocarditis": 3, "Pain in extremity": 3, "Pulmonary embolism": 3, "Skin reaction": 3, "Thrombosis": 3, "Urticaria": 3, "Arrhythmia": 2, "Chest discomfort": 2, "Chest pain": 2, "Circulatory collapse": 2, "Diarrhoea": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Heavy menstrual bleeding": 2, "Hot flush": 2, "Inappropriate schedule of product administration": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Somnolence": 2, "Sudden hearing loss": 2, "Tinnitus": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal loss of weight": 1, "Ageusia": 1, "Aggression": 1, "Amnestic disorder": 1, "Anaesthesia": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Anosmia": 1, "Asthma": 1, "Aversion": 1, "Bell's palsy": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood pH": 1, "Blood test": 1, "Breast enlargement": 1, "Cardiac ablation": 1, "Cardiac discomfort": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Chronic fatigue syndrome": 1, "Chronic spontaneous urticaria": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Cough": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Disturbance in attention": 1, "Ear pain": 1, "Embolic stroke": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling abnormal": 1, "Glomerulonephritis": 1, "Haematuria": 1, "Hemiplegia": 1, "Herpes ophthalmic": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Injection site swelling": 1, "Intermenstrual bleeding": 1, "Irritability": 1, "Lymphadenitis": 1, "Magnetic resonance imaging": 1, "Meningoencephalitis viral": 1, "Migraine": 1, "Morbid thoughts": 1, "Multiple sclerosis": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neck pain": 1, "New daily persistent headache": 1, "Noninfective gingivitis": 1, "Oligomenorrhoea": 1, "Omphalitis": 1, "Ophthalmic scan": 1, "Ophthalmological examination": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "Pain": 1, "Palpitations": 1, "Poor quality sleep": 1, "Presyncope": 1, "Prostatic acid phosphatase": 1, "Prostatitis": 1, "Pruritus": 1, "Psychomotor hyperactivity": 1, "Pulseless electrical activity": 1, "Renal pain": 1, "Restlessness": 1, "Retinal vein occlusion": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sleep disorder": 1, "Taste disorder": 1, "Troponin I": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "3002186", "histograms": [{"histogram": {"Headache": 31, "Pyrexia": 30, "Fatigue": 23, "Chills": 15, "Injection site pain": 13, "Nausea": 13, "Myalgia": 12, "Injection site reaction": 8, "Dizziness": 7, "Syncope": 6, "Vomiting": 6, "Arthralgia": 5, "Musculoskeletal pain": 5, "Rash": 5, "Dyspnoea": 4, "Injection site erythema": 4, "Ischaemic stroke": 4, "Ophthalmic herpes zoster": 4, "Abdominal pain": 3, "Asthenia": 3, "Back pain": 3, "Body temperature": 3, "Fibrin D dimer": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Influenza like illness": 3, "Insomnia": 3, "Loss of consciousness": 3, "Lymphadenopathy": 3, "Myocarditis": 3, "Pain in extremity": 3, "Pulmonary embolism": 3, "Skin reaction": 3, "Thrombosis": 3, "Urticaria": 3, "Arrhythmia": 2, "Chest discomfort": 2, "Chest pain": 2, "Circulatory collapse": 2, "Diarrhoea": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Heavy menstrual bleeding": 2, "Hot flush": 2, "Inappropriate schedule of product administration": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Somnolence": 2, "Sudden hearing loss": 2, "Tinnitus": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Abnormal loss of weight": 1, "Ageusia": 1, "Aggression": 1, "Amnestic disorder": 1, "Anaesthesia": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Anosmia": 1, "Asthma": 1, "Aversion": 1, "Bell's palsy": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood pH": 1, "Blood test": 1, "Breast enlargement": 1, "Cardiac ablation": 1, "Cardiac discomfort": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Chronic fatigue syndrome": 1, "Chronic spontaneous urticaria": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Cough": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Disturbance in attention": 1, "Ear pain": 1, "Embolic stroke": 1, "Fall": 1, "Febrile convulsion": 1, "Feeling abnormal": 1, "Glomerulonephritis": 1, "Haematuria": 1, "Hemiplegia": 1, "Herpes ophthalmic": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Injection site swelling": 1, "Intermenstrual bleeding": 1, "Irritability": 1, "Lymphadenitis": 1, "Magnetic resonance imaging": 1, "Meningoencephalitis viral": 1, "Migraine": 1, "Morbid thoughts": 1, "Multiple sclerosis": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neck pain": 1, "New daily persistent headache": 1, "Noninfective gingivitis": 1, "Oligomenorrhoea": 1, "Omphalitis": 1, "Ophthalmic scan": 1, "Ophthalmological examination": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "Pain": 1, "Palpitations": 1, "Poor quality sleep": 1, "Presyncope": 1, "Prostatic acid phosphatase": 1, "Prostatitis": 1, "Pruritus": 1, "Psychomotor hyperactivity": 1, "Pulseless electrical activity": 1, "Renal pain": 1, "Restlessness": 1, "Retinal vein occlusion": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sleep disorder": 1, "Taste disorder": 1, "Troponin I": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Wound": 1}, "batchcodes": ["3002186"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002186/3002544.json b/docs/data/histograms/Switzerland/3002186/3002544.json
index 59a3b263f6c..7ce50d1a097 100644
--- a/docs/data/histograms/Switzerland/3002186/3002544.json
+++ b/docs/data/histograms/Switzerland/3002186/3002544.json
@@ -1 +1 @@
-{"batchcode": "3002186/3002544", "histograms": [{"batchcodes": ["3002186/3002544"], "histogram": {"Chromaturia": 1, "Decreased appetite": 1, "Dizziness": 1, "Exercise tolerance decreased": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3002186/3002544", "histograms": [{"histogram": {"Chromaturia": 1, "Decreased appetite": 1, "Dizziness": 1, "Exercise tolerance decreased": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Pyrexia": 1}, "batchcodes": ["3002186/3002544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30021868.json b/docs/data/histograms/Switzerland/30021868.json
index 58679583607..50ee96db079 100644
--- a/docs/data/histograms/Switzerland/30021868.json
+++ b/docs/data/histograms/Switzerland/30021868.json
@@ -1 +1 @@
-{"batchcode": "30021868", "histograms": [{"batchcodes": ["30021868"], "histogram": {"Chills": 1, "Ear pain": 1, "Hypotonia": 1, "Influenza like illness": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "30021868", "histograms": [{"histogram": {"Chills": 1, "Ear pain": 1, "Hypotonia": 1, "Influenza like illness": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["30021868"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30022912.json b/docs/data/histograms/Switzerland/30022912.json
index 75ce4fba1ab..2eb7bc7ef9e 100644
--- a/docs/data/histograms/Switzerland/30022912.json
+++ b/docs/data/histograms/Switzerland/30022912.json
@@ -1 +1 @@
-{"batchcode": "30022912", "histograms": [{"batchcodes": ["30022912"], "histogram": {"Angiocardiogram": 1, "Magnetic resonance imaging abdominal": 1, "Pericarditis": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "30022912", "histograms": [{"histogram": {"Angiocardiogram": 1, "Magnetic resonance imaging abdominal": 1, "Pericarditis": 1, "Troponin I": 1}, "batchcodes": ["30022912"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002514.json b/docs/data/histograms/Switzerland/3002514.json
index 34a847a9d3a..84e8247a90a 100644
--- a/docs/data/histograms/Switzerland/3002514.json
+++ b/docs/data/histograms/Switzerland/3002514.json
@@ -1 +1 @@
-{"batchcode": "3002514", "histograms": [{"batchcodes": ["3002514"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "3002514", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["3002514"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002541 / 30031.json b/docs/data/histograms/Switzerland/3002541 / 30031.json
index 16b36138ecc..c02efa0c4bd 100644
--- a/docs/data/histograms/Switzerland/3002541 / 30031.json
+++ b/docs/data/histograms/Switzerland/3002541 / 30031.json
@@ -1 +1 @@
-{"batchcode": "3002541 / 30031", "histograms": [{"batchcodes": ["3002541 / 30031"], "histogram": {"Hypersensitivity": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "3002541 / 30031", "histograms": [{"histogram": {"Hypersensitivity": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["3002541 / 30031"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002541.json b/docs/data/histograms/Switzerland/3002541.json
index e1baf960b1f..e292db8bc83 100644
--- a/docs/data/histograms/Switzerland/3002541.json
+++ b/docs/data/histograms/Switzerland/3002541.json
@@ -1 +1 @@
-{"batchcode": "3002541", "histograms": [{"batchcodes": ["3002541"], "histogram": {"Pyrexia": 29, "Headache": 24, "Fatigue": 22, "Chills": 19, "Nausea": 16, "Dizziness": 11, "Injection site reaction": 11, "Asthenia": 8, "Chest pain": 8, "Injection site pain": 8, "Myalgia": 8, "Syncope": 8, "Dyspnoea": 7, "Vomiting": 7, "Myocarditis": 6, "Paraesthesia": 6, "Abdominal pain": 5, "Arrhythmia": 5, "Arthralgia": 5, "Decreased appetite": 5, "Herpes zoster": 5, "Hyperhidrosis": 5, "Musculoskeletal pain": 5, "Pain in extremity": 5, "Tinnitus": 5, "Back pain": 4, "Hypersensitivity": 4, "Palpitations": 4, "Skin reaction": 4, "Abdominal pain upper": 3, "Blood pressure measurement": 3, "Diarrhoea": 3, "Disturbance in attention": 3, "Feeling abnormal": 3, "Heart rate": 3, "Hot flush": 3, "Insomnia": 3, "Lymphadenopathy": 3, "Migraine": 3, "Vertigo": 3, "Visual impairment": 3, "Body temperature": 2, "Cough": 2, "Deafness": 2, "Dysmenorrhoea": 2, "Dyspepsia": 2, "Feeling cold": 2, "Heart rate increased": 2, "Hypertension": 2, "Inappropriate schedule of product administration": 2, "Night sweats": 2, "Pain": 2, "Pericarditis": 2, "Pruritus": 2, "Pulmonary embolism": 2, "Somnolence": 2, "Swollen tongue": 2, "Thrombocytopenia": 2, "Acute vestibular syndrome": 1, "Ageusia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antineutrophil cytoplasmic antibody": 1, "Anxiety": 1, "Aphthous ulcer": 1, "Aspiration joint": 1, "Bacterial test": 1, "Blindness": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood test": 1, "Body temperature abnormal": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Burnout syndrome": 1, "C-reactive protein": 1, "CSF volume": 1, "Cardiovascular disorder": 1, "Cardiovascular examination": 1, "Cerebellar stroke": 1, "Chest discomfort": 1, "Chronic spontaneous urticaria": 1, "Circulatory collapse": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Culture stool": 1, "Delirium febrile": 1, "Depressed mood": 1, "Depression": 1, "Depression suicidal": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dysphagia": 1, "Ear infection": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Enlarged uvula": 1, "Erythema": 1, "Erythema multiforme": 1, "Exposure via breast milk": 1, "Eye pruritus": 1, "Facial pain": 1, "Fibrin D dimer": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Genital herpes": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Growing pains": 1, "Guillain-Barre syndrome": 1, "HIV infection": 1, "Haematochezia": 1, "Haemorrhagic transformation stroke": 1, "Heavy menstrual bleeding": 1, "Herpetic radiculopathy": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immobilisation prolonged": 1, "Immune thrombocytopenia": 1, "Injection site swelling": 1, "Intercostal neuralgia": 1, "Joint swelling": 1, "Laboratory test": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Malaise": 1, "Memory impairment": 1, "Menometrorrhagia": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Neurogenic shock": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Oral herpes": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pemphigoid": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Pyelonephritis": 1, "Radicular pain": 1, "Rash": 1, "Respiratory tract infection viral": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "Rosacea": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Sleep disorder": 1, "Speech disorder": 1, "Synovitis": 1, "Tachycardia": 1, "Taste disorder": 1, "Throat tightness": 1, "Thyroiditis": 1, "Tonsillitis": 1, "Tonsillitis streptococcal": 1, "Transient global amnesia": 1, "Trigeminal neuralgia": 1, "Tryptase": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Urinary bladder haemorrhage": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Venous thrombosis limb": 1, "Vestibular disorder": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "3002541", "histograms": [{"histogram": {"Pyrexia": 29, "Headache": 24, "Fatigue": 22, "Chills": 19, "Nausea": 16, "Dizziness": 11, "Injection site reaction": 11, "Asthenia": 8, "Chest pain": 8, "Injection site pain": 8, "Myalgia": 8, "Syncope": 8, "Dyspnoea": 7, "Vomiting": 7, "Myocarditis": 6, "Paraesthesia": 6, "Abdominal pain": 5, "Arrhythmia": 5, "Arthralgia": 5, "Decreased appetite": 5, "Herpes zoster": 5, "Hyperhidrosis": 5, "Musculoskeletal pain": 5, "Pain in extremity": 5, "Tinnitus": 5, "Back pain": 4, "Hypersensitivity": 4, "Palpitations": 4, "Skin reaction": 4, "Abdominal pain upper": 3, "Blood pressure measurement": 3, "Diarrhoea": 3, "Disturbance in attention": 3, "Feeling abnormal": 3, "Heart rate": 3, "Hot flush": 3, "Insomnia": 3, "Lymphadenopathy": 3, "Migraine": 3, "Vertigo": 3, "Visual impairment": 3, "Body temperature": 2, "Cough": 2, "Deafness": 2, "Dysmenorrhoea": 2, "Dyspepsia": 2, "Feeling cold": 2, "Heart rate increased": 2, "Hypertension": 2, "Inappropriate schedule of product administration": 2, "Night sweats": 2, "Pain": 2, "Pericarditis": 2, "Pruritus": 2, "Pulmonary embolism": 2, "Somnolence": 2, "Swollen tongue": 2, "Thrombocytopenia": 2, "Acute vestibular syndrome": 1, "Ageusia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Antineutrophil cytoplasmic antibody": 1, "Anxiety": 1, "Aphthous ulcer": 1, "Aspiration joint": 1, "Bacterial test": 1, "Blindness": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood test": 1, "Body temperature abnormal": 1, "Body temperature increased": 1, "Bronchospasm": 1, "Burnout syndrome": 1, "C-reactive protein": 1, "CSF volume": 1, "Cardiovascular disorder": 1, "Cardiovascular examination": 1, "Cerebellar stroke": 1, "Chest discomfort": 1, "Chronic spontaneous urticaria": 1, "Circulatory collapse": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Culture stool": 1, "Delirium febrile": 1, "Depressed mood": 1, "Depression": 1, "Depression suicidal": 1, "Disorientation": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dysphagia": 1, "Ear infection": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Enlarged uvula": 1, "Erythema": 1, "Erythema multiforme": 1, "Exposure via breast milk": 1, "Eye pruritus": 1, "Facial pain": 1, "Fibrin D dimer": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Genital herpes": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Growing pains": 1, "Guillain-Barre syndrome": 1, "HIV infection": 1, "Haematochezia": 1, "Haemorrhagic transformation stroke": 1, "Heavy menstrual bleeding": 1, "Herpetic radiculopathy": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immobilisation prolonged": 1, "Immune thrombocytopenia": 1, "Injection site swelling": 1, "Intercostal neuralgia": 1, "Joint swelling": 1, "Laboratory test": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Malaise": 1, "Memory impairment": 1, "Menometrorrhagia": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Neurogenic shock": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Oral herpes": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pemphigoid": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Pyelonephritis": 1, "Radicular pain": 1, "Rash": 1, "Respiratory tract infection viral": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "Rosacea": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Sleep disorder": 1, "Speech disorder": 1, "Synovitis": 1, "Tachycardia": 1, "Taste disorder": 1, "Throat tightness": 1, "Thyroiditis": 1, "Tonsillitis": 1, "Tonsillitis streptococcal": 1, "Transient global amnesia": 1, "Trigeminal neuralgia": 1, "Tryptase": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Urinary bladder haemorrhage": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Venous thrombosis limb": 1, "Vestibular disorder": 1, "Vision blurred": 1, "Visual acuity reduced": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["3002541"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002541/3003188.json b/docs/data/histograms/Switzerland/3002541/3003188.json
index 96553588560..1a2dc9c91ea 100644
--- a/docs/data/histograms/Switzerland/3002541/3003188.json
+++ b/docs/data/histograms/Switzerland/3002541/3003188.json
@@ -1 +1 @@
-{"batchcode": "3002541/3003188", "histograms": [{"batchcodes": ["3002541/3003188"], "histogram": {"Embolism arterial": 1, "Peripheral arterial occlusive disease": 1, "Plethysmography": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "3002541/3003188", "histograms": [{"histogram": {"Embolism arterial": 1, "Peripheral arterial occlusive disease": 1, "Plethysmography": 1, "Ultrasound Doppler": 1}, "batchcodes": ["3002541/3003188"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002544.json b/docs/data/histograms/Switzerland/3002544.json
index e8a2a3e4b34..326f9477c68 100644
--- a/docs/data/histograms/Switzerland/3002544.json
+++ b/docs/data/histograms/Switzerland/3002544.json
@@ -1 +1 @@
-{"batchcode": "3002544", "histograms": [{"batchcodes": ["3002544"], "histogram": {"Headache": 17, "Pyrexia": 15, "Chills": 13, "Fatigue": 11, "Dizziness": 6, "Musculoskeletal pain": 6, "Nausea": 6, "Myalgia": 5, "Injection site pain": 4, "Injection site reaction": 4, "Arthralgia": 3, "Asthenia": 3, "Cough": 3, "Diarrhoea": 3, "Decreased appetite": 2, "Dyspnoea": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Pain in extremity": 2, "Pruritus": 2, "Somnolence": 2, "Syncope": 2, "Tremor": 2, "Urticaria": 2, "Vertigo": 2, "Vomiting": 2, "Abdominal pain": 1, "Adjustment disorder with depressed mood": 1, "Angina pectoris": 1, "Angioedema": 1, "Apathy": 1, "Aphthous ulcer": 1, "Back pain": 1, "Biopsy skin": 1, "Blood pressure increased": 1, "Body temperature increased": 1, "C-reactive protein increased": 1, "Cardiovascular disorder": 1, "Chest discomfort": 1, "Chest pain": 1, "Dry mouth": 1, "Dysmenorrhoea": 1, "Erythema": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Exercise tolerance decreased": 1, "Extrasystoles": 1, "Growing pains": 1, "Haematoma": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypotension": 1, "Influenza like illness": 1, "Insomnia": 1, "Lymphocyte count": 1, "Menstruation delayed": 1, "Myocarditis": 1, "Nervousness": 1, "Neutrophil count": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Rash": 1, "Restlessness": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Sick leave": 1, "Specialist consultation": 1, "Sudden hearing loss": 1, "Tinnitus": 1, "Vaccination failure": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "3002544", "histograms": [{"histogram": {"Headache": 17, "Pyrexia": 15, "Chills": 13, "Fatigue": 11, "Dizziness": 6, "Musculoskeletal pain": 6, "Nausea": 6, "Myalgia": 5, "Injection site pain": 4, "Injection site reaction": 4, "Arthralgia": 3, "Asthenia": 3, "Cough": 3, "Diarrhoea": 3, "Decreased appetite": 2, "Dyspnoea": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Pain in extremity": 2, "Pruritus": 2, "Somnolence": 2, "Syncope": 2, "Tremor": 2, "Urticaria": 2, "Vertigo": 2, "Vomiting": 2, "Abdominal pain": 1, "Adjustment disorder with depressed mood": 1, "Angina pectoris": 1, "Angioedema": 1, "Apathy": 1, "Aphthous ulcer": 1, "Back pain": 1, "Biopsy skin": 1, "Blood pressure increased": 1, "Body temperature increased": 1, "C-reactive protein increased": 1, "Cardiovascular disorder": 1, "Chest discomfort": 1, "Chest pain": 1, "Dry mouth": 1, "Dysmenorrhoea": 1, "Erythema": 1, "Erythema multiforme": 1, "Erythema nodosum": 1, "Exercise tolerance decreased": 1, "Extrasystoles": 1, "Growing pains": 1, "Haematoma": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypotension": 1, "Influenza like illness": 1, "Insomnia": 1, "Lymphocyte count": 1, "Menstruation delayed": 1, "Myocarditis": 1, "Nervousness": 1, "Neutrophil count": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Rash": 1, "Restlessness": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Sick leave": 1, "Specialist consultation": 1, "Sudden hearing loss": 1, "Tinnitus": 1, "Vaccination failure": 1, "Vision blurred": 1}, "batchcodes": ["3002544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002912.json b/docs/data/histograms/Switzerland/3002912.json
index 519a140e295..545a77b834c 100644
--- a/docs/data/histograms/Switzerland/3002912.json
+++ b/docs/data/histograms/Switzerland/3002912.json
@@ -1 +1 @@
-{"batchcode": "3002912", "histograms": [{"batchcodes": ["3002912"], "histogram": {"Pyrexia": 31, "Headache": 27, "Fatigue": 16, "Chills": 13, "Nausea": 13, "Dizziness": 10, "Myalgia": 10, "Arthralgia": 9, "Injection site reaction": 9, "Injection site pain": 8, "Paraesthesia": 8, "Dyspnoea": 6, "Syncope": 6, "Diarrhoea": 5, "Vomiting": 5, "Body temperature": 4, "Decreased appetite": 4, "Malaise": 4, "Pain": 4, "Rash": 4, "Urticaria": 4, "Arrhythmia": 3, "Chest discomfort": 3, "Growing pains": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Pain in extremity": 3, "Palpitations": 3, "Pruritus": 3, "Vaccination site pain": 3, "Angioedema": 2, "Anxiety": 2, "Asthenia": 2, "Blood pressure increased": 2, "Burning sensation": 2, "Condition aggravated": 2, "Deep vein thrombosis": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Injection site swelling": 2, "Ischaemic stroke": 2, "Magnetic resonance imaging": 2, "Muscle spasms": 2, "Musculoskeletal pain": 2, "Musculoskeletal stiffness": 2, "Myocarditis": 2, "Neck pain": 2, "Oropharyngeal pain": 2, "Renal pain": 2, "SARS-CoV-2 test": 2, "Skin burning sensation": 2, "Somnolence": 2, "Tachycardia": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Ageusia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aphthous ulcer": 1, "Arthritis enteropathic": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Bedridden": 1, "Blood count": 1, "Blood creatinine": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bursitis": 1, "Cardiac discomfort": 1, "Cardiovascular disorder": 1, "Chest pain": 1, "Cognitive disorder": 1, "Colitis ulcerative": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Concussion": 1, "Cough": 1, "Crohn's disease": 1, "Death": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Emotional disorder": 1, "Encephalitis": 1, "Faecal calprotectin": 1, "Fall": 1, "Feeling abnormal": 1, "Flushing": 1, "Gastric pH decreased": 1, "Hemiparesis": 1, "Hepatic pain": 1, "Hot flush": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypothyroidism": 1, "Immunisation anxiety related reaction": 1, "Influenza like illness": 1, "Injection site atrophy": 1, "Injection site erythema": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Iridocyclitis": 1, "Laboratory test": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Magnetic resonance imaging heart": 1, "Maternal exposure during breast feeding": 1, "Meningioma": 1, "Menometrorrhagia": 1, "Mental disorder": 1, "Migraine": 1, "Migraine with aura": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Nervous system disorder": 1, "Neuralgia": 1, "New daily persistent headache": 1, "Night sweats": 1, "Oesophagitis": 1, "Oligomenorrhoea": 1, "Ovarian cyst": 1, "Palmar erythema": 1, "Photophobia": 1, "Polymenorrhoea": 1, "Poor quality sleep": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Restlessness": 1, "Rhinitis allergic": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sense of oppression": 1, "Sensitive skin": 1, "Skin reaction": 1, "Sleep disorder": 1, "Swelling face": 1, "Swollen tongue": 1, "Thinking abnormal": 1, "Trigger finger": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site rash": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "3002912", "histograms": [{"histogram": {"Pyrexia": 31, "Headache": 27, "Fatigue": 16, "Chills": 13, "Nausea": 13, "Dizziness": 10, "Myalgia": 10, "Arthralgia": 9, "Injection site reaction": 9, "Injection site pain": 8, "Paraesthesia": 8, "Dyspnoea": 6, "Syncope": 6, "Diarrhoea": 5, "Vomiting": 5, "Body temperature": 4, "Decreased appetite": 4, "Malaise": 4, "Pain": 4, "Rash": 4, "Urticaria": 4, "Arrhythmia": 3, "Chest discomfort": 3, "Growing pains": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Pain in extremity": 3, "Palpitations": 3, "Pruritus": 3, "Vaccination site pain": 3, "Angioedema": 2, "Anxiety": 2, "Asthenia": 2, "Blood pressure increased": 2, "Burning sensation": 2, "Condition aggravated": 2, "Deep vein thrombosis": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Injection site swelling": 2, "Ischaemic stroke": 2, "Magnetic resonance imaging": 2, "Muscle spasms": 2, "Musculoskeletal pain": 2, "Musculoskeletal stiffness": 2, "Myocarditis": 2, "Neck pain": 2, "Oropharyngeal pain": 2, "Renal pain": 2, "SARS-CoV-2 test": 2, "Skin burning sensation": 2, "Somnolence": 2, "Tachycardia": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Ageusia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Aphthous ulcer": 1, "Arthritis enteropathic": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Bedridden": 1, "Blood count": 1, "Blood creatinine": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bursitis": 1, "Cardiac discomfort": 1, "Cardiovascular disorder": 1, "Chest pain": 1, "Cognitive disorder": 1, "Colitis ulcerative": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Concussion": 1, "Cough": 1, "Crohn's disease": 1, "Death": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Emotional disorder": 1, "Encephalitis": 1, "Faecal calprotectin": 1, "Fall": 1, "Feeling abnormal": 1, "Flushing": 1, "Gastric pH decreased": 1, "Hemiparesis": 1, "Hepatic pain": 1, "Hot flush": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypothyroidism": 1, "Immunisation anxiety related reaction": 1, "Influenza like illness": 1, "Injection site atrophy": 1, "Injection site erythema": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Iridocyclitis": 1, "Laboratory test": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Magnetic resonance imaging heart": 1, "Maternal exposure during breast feeding": 1, "Meningioma": 1, "Menometrorrhagia": 1, "Mental disorder": 1, "Migraine": 1, "Migraine with aura": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Nervous system disorder": 1, "Neuralgia": 1, "New daily persistent headache": 1, "Night sweats": 1, "Oesophagitis": 1, "Oligomenorrhoea": 1, "Ovarian cyst": 1, "Palmar erythema": 1, "Photophobia": 1, "Polymenorrhoea": 1, "Poor quality sleep": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Restlessness": 1, "Rhinitis allergic": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Sense of oppression": 1, "Sensitive skin": 1, "Skin reaction": 1, "Sleep disorder": 1, "Swelling face": 1, "Swollen tongue": 1, "Thinking abnormal": 1, "Trigger finger": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Uveitis": 1, "Vaccination failure": 1, "Vaccination site rash": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Visual impairment": 1}, "batchcodes": ["3002912"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002917/ 300360.json b/docs/data/histograms/Switzerland/3002917/ 300360.json
index fe44404a4d8..8d5bc0de789 100644
--- a/docs/data/histograms/Switzerland/3002917/ 300360.json
+++ b/docs/data/histograms/Switzerland/3002917/ 300360.json
@@ -1 +1 @@
-{"batchcode": "3002917/ 300360", "histograms": [{"batchcodes": ["3002917/ 300360"], "histogram": {"Cerebral haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "3002917/ 300360", "histograms": [{"histogram": {"Cerebral haemorrhage": 1}, "batchcodes": ["3002917/ 300360"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002918 / 30025.json b/docs/data/histograms/Switzerland/3002918 / 30025.json
index 4cc983075cb..f468f0d1d11 100644
--- a/docs/data/histograms/Switzerland/3002918 / 30025.json
+++ b/docs/data/histograms/Switzerland/3002918 / 30025.json
@@ -1 +1 @@
-{"batchcode": "3002918 / 30025", "histograms": [{"batchcodes": ["3002918 / 30025"], "histogram": {"Chills": 1, "Headache": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "3002918 / 30025", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Somnolence": 1}, "batchcodes": ["3002918 / 30025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3002918.json b/docs/data/histograms/Switzerland/3002918.json
index 246fbaca55e..e1829e3767c 100644
--- a/docs/data/histograms/Switzerland/3002918.json
+++ b/docs/data/histograms/Switzerland/3002918.json
@@ -1 +1 @@
-{"batchcode": "3002918", "histograms": [{"batchcodes": ["3002918"], "histogram": {"Pyrexia": 23, "Headache": 18, "Chills": 14, "Fatigue": 11, "Electrocardiogram": 9, "Nausea": 9, "Myocarditis": 8, "Back pain": 7, "Myalgia": 7, "Syncope": 7, "Asthenia": 6, "Dizziness": 6, "Musculoskeletal pain": 6, "Injection site pain": 5, "Echocardiogram": 4, "Erythema": 4, "Hyperhidrosis": 4, "Influenza like illness": 4, "Magnetic resonance imaging heart": 4, "Urticaria": 4, "Arthralgia": 3, "C-reactive protein": 3, "Chest pain": 3, "Decreased appetite": 3, "Dyspnoea": 3, "Injection site erythema": 3, "Injection site reaction": 3, "Malaise": 3, "Oropharyngeal pain": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Pulmonary embolism": 3, "Troponin": 3, "Ultrasound scan": 3, "Vertigo": 3, "Vomiting": 3, "Body temperature": 2, "Borrelia test": 2, "Computerised tomogram thorax": 2, "Disturbance in attention": 2, "Dysgeusia": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "HIV antibody": 2, "Heart rate": 2, "Inappropriate schedule of product administration": 2, "Injection site swelling": 2, "Insomnia": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Nasopharyngitis": 2, "Oxygen saturation": 2, "Pain": 2, "Pericarditis": 2, "Pruritus": 2, "Thirst": 2, "Troponin T": 2, "Abdominal pain upper": 1, "Anal haemorrhage": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Blister": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood test": 1, "Borrelia infection": 1, "Borrelia test positive": 1, "Brain stem haemorrhage": 1, "C-reactive protein increased": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiomyopathy": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Computerised tomogram coronary artery": 1, "Cough": 1, "Coxiella test": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Demyelination": 1, "Diarrhoea": 1, "Dysarthria": 1, "Ear pain": 1, "Electroencephalogram": 1, "Embolic pneumonia": 1, "Embolism": 1, "Embolism venous": 1, "Endocarditis": 1, "Epstein-Barr viraemia": 1, "Exercise electrocardiogram": 1, "Facial paralysis": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling drunk": 1, "Full blood count": 1, "General physical health deterioration": 1, "Glomerular filtration rate": 1, "Growing pains": 1, "HTLV test": 1, "Haematemesis": 1, "Haematochezia": 1, "Haemoptysis": 1, "Heart rate decreased": 1, "Hepatitis": 1, "Hepatitis E": 1, "Herpes simplex encephalitis": 1, "Herpes virus infection": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypoaesthesia": 1, "Irregular breathing": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Limb discomfort": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging spinal": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neurological symptom": 1, "New daily persistent headache": 1, "Oedema": 1, "Palpitations": 1, "Parvovirus B19 test": 1, "Pelvic pain": 1, "Peripheral swelling": 1, "Platelet count": 1, "Positron emission tomogram": 1, "Presyncope": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Renal cyst": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Skin reaction": 1, "Streptococcus test": 1, "Syphilis": 1, "Tachycardia": 1, "Tinnitus": 1, "Troponin I": 1, "Type I hypersensitivity": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Varicose veins pelvic": 1, "Vasodilatation": 1, "Viral test": 1, "Weight decreased": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "3002918", "histograms": [{"histogram": {"Pyrexia": 23, "Headache": 18, "Chills": 14, "Fatigue": 11, "Electrocardiogram": 9, "Nausea": 9, "Myocarditis": 8, "Back pain": 7, "Myalgia": 7, "Syncope": 7, "Asthenia": 6, "Dizziness": 6, "Musculoskeletal pain": 6, "Injection site pain": 5, "Echocardiogram": 4, "Erythema": 4, "Hyperhidrosis": 4, "Influenza like illness": 4, "Magnetic resonance imaging heart": 4, "Urticaria": 4, "Arthralgia": 3, "C-reactive protein": 3, "Chest pain": 3, "Decreased appetite": 3, "Dyspnoea": 3, "Injection site erythema": 3, "Injection site reaction": 3, "Malaise": 3, "Oropharyngeal pain": 3, "Pain in extremity": 3, "Paraesthesia": 3, "Pulmonary embolism": 3, "Troponin": 3, "Ultrasound scan": 3, "Vertigo": 3, "Vomiting": 3, "Body temperature": 2, "Borrelia test": 2, "Computerised tomogram thorax": 2, "Disturbance in attention": 2, "Dysgeusia": 2, "Feeling hot": 2, "Fibrin D dimer": 2, "HIV antibody": 2, "Heart rate": 2, "Inappropriate schedule of product administration": 2, "Injection site swelling": 2, "Insomnia": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Nasopharyngitis": 2, "Oxygen saturation": 2, "Pain": 2, "Pericarditis": 2, "Pruritus": 2, "Thirst": 2, "Troponin T": 2, "Abdominal pain upper": 1, "Anal haemorrhage": 1, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Blister": 1, "Blood creatine phosphokinase MB": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood test": 1, "Borrelia infection": 1, "Borrelia test positive": 1, "Brain stem haemorrhage": 1, "C-reactive protein increased": 1, "CSF test": 1, "Cardiac arrest": 1, "Cardiomyopathy": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Computerised tomogram coronary artery": 1, "Cough": 1, "Coxiella test": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Demyelination": 1, "Diarrhoea": 1, "Dysarthria": 1, "Ear pain": 1, "Electroencephalogram": 1, "Embolic pneumonia": 1, "Embolism": 1, "Embolism venous": 1, "Endocarditis": 1, "Epstein-Barr viraemia": 1, "Exercise electrocardiogram": 1, "Facial paralysis": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling drunk": 1, "Full blood count": 1, "General physical health deterioration": 1, "Glomerular filtration rate": 1, "Growing pains": 1, "HTLV test": 1, "Haematemesis": 1, "Haematochezia": 1, "Haemoptysis": 1, "Heart rate decreased": 1, "Hepatitis": 1, "Hepatitis E": 1, "Herpes simplex encephalitis": 1, "Herpes virus infection": 1, "High density lipoprotein": 1, "Hot flush": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Hypoaesthesia": 1, "Irregular breathing": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Limb discomfort": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging spinal": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neurological symptom": 1, "New daily persistent headache": 1, "Oedema": 1, "Palpitations": 1, "Parvovirus B19 test": 1, "Pelvic pain": 1, "Peripheral swelling": 1, "Platelet count": 1, "Positron emission tomogram": 1, "Presyncope": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Renal cyst": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Skin reaction": 1, "Streptococcus test": 1, "Syphilis": 1, "Tachycardia": 1, "Tinnitus": 1, "Troponin I": 1, "Type I hypersensitivity": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Varicose veins pelvic": 1, "Vasodilatation": 1, "Viral test": 1, "Weight decreased": 1, "Wound": 1}, "batchcodes": ["3002918"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3003185.json b/docs/data/histograms/Switzerland/3003185.json
index d0220e474f4..ee16edf5aea 100644
--- a/docs/data/histograms/Switzerland/3003185.json
+++ b/docs/data/histograms/Switzerland/3003185.json
@@ -1 +1 @@
-{"batchcode": "3003185", "histograms": [{"batchcodes": ["3003185"], "histogram": {"Fatigue": 2, "Headache": 2, "Chest pain": 1, "Computerised tomogram head": 1, "Dermatitis allergic": 1, "Dyspnoea": 1, "Injection site erythema": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Injection site reaction": 1, "Lumbar puncture": 1, "Meningitis aseptic": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Paraesthesia": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Rash": 1, "Rash maculo-papular": 1, "Sleep disorder": 1, "Somnolence": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3003185", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Chest pain": 1, "Computerised tomogram head": 1, "Dermatitis allergic": 1, "Dyspnoea": 1, "Injection site erythema": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Injection site reaction": 1, "Lumbar puncture": 1, "Meningitis aseptic": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Paraesthesia": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Rash": 1, "Rash maculo-papular": 1, "Sleep disorder": 1, "Somnolence": 1, "Urticaria": 1}, "batchcodes": ["3003185"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3003188.json b/docs/data/histograms/Switzerland/3003188.json
index 07aa3ce955f..3886a791dd6 100644
--- a/docs/data/histograms/Switzerland/3003188.json
+++ b/docs/data/histograms/Switzerland/3003188.json
@@ -1 +1 @@
-{"batchcode": "3003188", "histograms": [{"batchcodes": ["3003188"], "histogram": {"Pyrexia": 33, "Headache": 30, "Chills": 18, "Fatigue": 16, "Nausea": 16, "Myalgia": 10, "Dizziness": 9, "Injection site pain": 9, "Musculoskeletal pain": 9, "Syncope": 8, "Vomiting": 8, "Injection site reaction": 7, "Arthralgia": 6, "Dyspnoea": 6, "Cough": 5, "Hypoaesthesia": 5, "Malaise": 5, "Injection site erythema": 4, "Palpitations": 4, "Asthma": 3, "Decreased appetite": 3, "Facial paralysis": 3, "Hypotension": 3, "Paraesthesia": 3, "Rash": 3, "Tinnitus": 3, "Visual impairment": 3, "Asthenia": 2, "Chest discomfort": 2, "Chest pain": 2, "Computerised tomogram": 2, "Eye pain": 2, "General physical health deterioration": 2, "Injection site pruritus": 2, "Injection site swelling": 2, "Musculoskeletal stiffness": 2, "Myocarditis": 2, "Neck pain": 2, "Pain": 2, "Pain in extremity": 2, "Pulmonary embolism": 2, "Seizure": 2, "Skin reaction": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Accident": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Audiogram": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bone pain": 1, "Breast pain": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Collagen disorder": 1, "Confusional state": 1, "Corneal lesion": 1, "Deafness": 1, "Death": 1, "Depression": 1, "Diarrhoea": 1, "Dry eye": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eczema herpeticum": 1, "Electrocardiogram": 1, "Electroneuromyography": 1, "Encephalitis autoimmune": 1, "Epstein-Barr virus infection": 1, "Erythema": 1, "Exercise tolerance decreased": 1, "Eye disorder": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Hypotonia": 1, "Immunisation anxiety related reaction": 1, "Inflammation": 1, "Injection site warmth": 1, "Insomnia": 1, "Iron deficiency anaemia": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Liver injury": 1, "Lymphadenitis": 1, "Multiple sclerosis relapse": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Neuralgic amyotrophy": 1, "New daily persistent headache": 1, "Pain of skin": 1, "Pallor": 1, "Paralysis": 1, "Pericarditis": 1, "Photophobia": 1, "Physical examination": 1, "Pneumonitis": 1, "Polymenorrhoea": 1, "Productive cough": 1, "Restlessness": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seasonal allergy": 1, "Sense of oppression": 1, "Sneezing": 1, "Specialist consultation": 1, "Suicidal ideation": 1, "Suicide attempt": 1, "Tachycardia": 1, "Taste disorder": 1, "Thirst": 1, "Throat irritation": 1, "Tremor": 1, "Trigeminal neuralgia": 1, "Type I hypersensitivity": 1, "Urticaria": 1, "Vaccination site reaction": 1, "Vertebral artery dissection": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "3003188", "histograms": [{"histogram": {"Pyrexia": 33, "Headache": 30, "Chills": 18, "Fatigue": 16, "Nausea": 16, "Myalgia": 10, "Dizziness": 9, "Injection site pain": 9, "Musculoskeletal pain": 9, "Syncope": 8, "Vomiting": 8, "Injection site reaction": 7, "Arthralgia": 6, "Dyspnoea": 6, "Cough": 5, "Hypoaesthesia": 5, "Malaise": 5, "Injection site erythema": 4, "Palpitations": 4, "Asthma": 3, "Decreased appetite": 3, "Facial paralysis": 3, "Hypotension": 3, "Paraesthesia": 3, "Rash": 3, "Tinnitus": 3, "Visual impairment": 3, "Asthenia": 2, "Chest discomfort": 2, "Chest pain": 2, "Computerised tomogram": 2, "Eye pain": 2, "General physical health deterioration": 2, "Injection site pruritus": 2, "Injection site swelling": 2, "Musculoskeletal stiffness": 2, "Myocarditis": 2, "Neck pain": 2, "Pain": 2, "Pain in extremity": 2, "Pulmonary embolism": 2, "Seizure": 2, "Skin reaction": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Accident": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Audiogram": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Bone pain": 1, "Breast pain": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Collagen disorder": 1, "Confusional state": 1, "Corneal lesion": 1, "Deafness": 1, "Death": 1, "Depression": 1, "Diarrhoea": 1, "Dry eye": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eczema herpeticum": 1, "Electrocardiogram": 1, "Electroneuromyography": 1, "Encephalitis autoimmune": 1, "Epstein-Barr virus infection": 1, "Erythema": 1, "Exercise tolerance decreased": 1, "Eye disorder": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypertensive crisis": 1, "Hypotonia": 1, "Immunisation anxiety related reaction": 1, "Inflammation": 1, "Injection site warmth": 1, "Insomnia": 1, "Iron deficiency anaemia": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Liver injury": 1, "Lymphadenitis": 1, "Multiple sclerosis relapse": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Neuralgic amyotrophy": 1, "New daily persistent headache": 1, "Pain of skin": 1, "Pallor": 1, "Paralysis": 1, "Pericarditis": 1, "Photophobia": 1, "Physical examination": 1, "Pneumonitis": 1, "Polymenorrhoea": 1, "Productive cough": 1, "Restlessness": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seasonal allergy": 1, "Sense of oppression": 1, "Sneezing": 1, "Specialist consultation": 1, "Suicidal ideation": 1, "Suicide attempt": 1, "Tachycardia": 1, "Taste disorder": 1, "Thirst": 1, "Throat irritation": 1, "Tremor": 1, "Trigeminal neuralgia": 1, "Type I hypersensitivity": 1, "Urticaria": 1, "Vaccination site reaction": 1, "Vertebral artery dissection": 1, "Weight decreased": 1}, "batchcodes": ["3003188"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30031888.json b/docs/data/histograms/Switzerland/30031888.json
index affc61021af..e80bffc304d 100644
--- a/docs/data/histograms/Switzerland/30031888.json
+++ b/docs/data/histograms/Switzerland/30031888.json
@@ -1 +1 @@
-{"batchcode": "30031888", "histograms": [{"batchcodes": ["30031888"], "histogram": {"Chills": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "30031888", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["30031888"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3003606.json b/docs/data/histograms/Switzerland/3003606.json
index f65ccf381b9..3691a83ebb5 100644
--- a/docs/data/histograms/Switzerland/3003606.json
+++ b/docs/data/histograms/Switzerland/3003606.json
@@ -1 +1 @@
-{"batchcode": "3003606", "histograms": [{"batchcodes": ["3003606"], "histogram": {"Headache": 16, "Pyrexia": 15, "Chills": 12, "Fatigue": 11, "Nausea": 7, "Dizziness": 6, "Injection site reaction": 4, "Musculoskeletal pain": 4, "Somnolence": 4, "Electrocardiogram": 3, "Herpes zoster": 3, "Myalgia": 3, "Paraesthesia": 3, "Tachycardia": 3, "Vomiting": 3, "Arrhythmia": 2, "Arthralgia": 2, "Chest pain": 2, "Computerised tomogram": 2, "Diarrhoea": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Injection site pain": 2, "Insomnia": 2, "Magnetic resonance imaging": 2, "Muscle spasms": 2, "Myocarditis": 2, "Palpitations": 2, "Pericarditis": 2, "Respiratory disorder": 2, "Restlessness": 2, "SARS-CoV-2 test": 2, "Ultrasound scan": 2, "Weight": 2, "Weight decreased": 2, "Abdominal pain": 1, "Abnormal loss of weight": 1, "Acne": 1, "Ageusia": 1, "Agitation": 1, "Alpha 1 foetoprotein": 1, "Amenorrhoea": 1, "Angina pectoris": 1, "Aphasia": 1, "Asthenia": 1, "Autoantibody test": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Cough": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dysacusis": 1, "Dysphagia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Encephalitis": 1, "Epididymitis": 1, "Epstein-Barr virus infection reactivation": 1, "Erythema": 1, "Extrasystoles": 1, "Eye pain": 1, "Faeces soft": 1, "Feeling cold": 1, "Feeling hot": 1, "Feeling of despair": 1, "Gamma-glutamyltransferase increased": 1, "Goitre": 1, "HIV test": 1, "Heart rate increased": 1, "Human chorionic gonadotropin": 1, "Hyperacusis": 1, "Hyperaesthesia": 1, "Hypertonia": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Hypotonia": 1, "Imaging procedure": 1, "Immunisation anxiety related reaction": 1, "Influenza like illness": 1, "Intentional dose omission": 1, "Investigation": 1, "Laboratory test": 1, "Lichen planus": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mobility decreased": 1, "Monoplegia": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Nervousness": 1, "Night sweats": 1, "Oligodipsia": 1, "Ophthalmic herpes simplex": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Pain": 1, "Pain in jaw": 1, "Photophobia": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Pruritus": 1, "Rash": 1, "Reactive gastropathy": 1, "SARS-CoV-2 test positive": 1, "Sleep disorder": 1, "Somatic symptom disorder": 1, "Suicidal ideation": 1, "Syncope": 1, "Temperature intolerance": 1, "Thinking abnormal": 1, "Thirst": 1, "Tinnitus": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound testes": 1, "Ultrasound thyroid": 1, "Vaccination failure": 1, "Vision blurred": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3003606", "histograms": [{"histogram": {"Headache": 16, "Pyrexia": 15, "Chills": 12, "Fatigue": 11, "Nausea": 7, "Dizziness": 6, "Injection site reaction": 4, "Musculoskeletal pain": 4, "Somnolence": 4, "Electrocardiogram": 3, "Herpes zoster": 3, "Myalgia": 3, "Paraesthesia": 3, "Tachycardia": 3, "Vomiting": 3, "Arrhythmia": 2, "Arthralgia": 2, "Chest pain": 2, "Computerised tomogram": 2, "Diarrhoea": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Injection site pain": 2, "Insomnia": 2, "Magnetic resonance imaging": 2, "Muscle spasms": 2, "Myocarditis": 2, "Palpitations": 2, "Pericarditis": 2, "Respiratory disorder": 2, "Restlessness": 2, "SARS-CoV-2 test": 2, "Ultrasound scan": 2, "Weight": 2, "Weight decreased": 2, "Abdominal pain": 1, "Abnormal loss of weight": 1, "Acne": 1, "Ageusia": 1, "Agitation": 1, "Alpha 1 foetoprotein": 1, "Amenorrhoea": 1, "Angina pectoris": 1, "Aphasia": 1, "Asthenia": 1, "Autoantibody test": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiovascular disorder": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chronic fatigue syndrome": 1, "Circulatory collapse": 1, "Cough": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dysacusis": 1, "Dysphagia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Encephalitis": 1, "Epididymitis": 1, "Epstein-Barr virus infection reactivation": 1, "Erythema": 1, "Extrasystoles": 1, "Eye pain": 1, "Faeces soft": 1, "Feeling cold": 1, "Feeling hot": 1, "Feeling of despair": 1, "Gamma-glutamyltransferase increased": 1, "Goitre": 1, "HIV test": 1, "Heart rate increased": 1, "Human chorionic gonadotropin": 1, "Hyperacusis": 1, "Hyperaesthesia": 1, "Hypertonia": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Hypotonia": 1, "Imaging procedure": 1, "Immunisation anxiety related reaction": 1, "Influenza like illness": 1, "Intentional dose omission": 1, "Investigation": 1, "Laboratory test": 1, "Lichen planus": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mobility decreased": 1, "Monoplegia": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Nervousness": 1, "Night sweats": 1, "Oligodipsia": 1, "Ophthalmic herpes simplex": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Orthostatic hypotension": 1, "Pain": 1, "Pain in jaw": 1, "Photophobia": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Pruritus": 1, "Rash": 1, "Reactive gastropathy": 1, "SARS-CoV-2 test positive": 1, "Sleep disorder": 1, "Somatic symptom disorder": 1, "Suicidal ideation": 1, "Syncope": 1, "Temperature intolerance": 1, "Thinking abnormal": 1, "Thirst": 1, "Tinnitus": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound testes": 1, "Ultrasound thyroid": 1, "Vaccination failure": 1, "Vision blurred": 1, "X-ray": 1}, "batchcodes": ["3003606"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3003660.json b/docs/data/histograms/Switzerland/3003660.json
index 44f07860fb0..40aa0a86d75 100644
--- a/docs/data/histograms/Switzerland/3003660.json
+++ b/docs/data/histograms/Switzerland/3003660.json
@@ -1 +1 @@
-{"batchcode": "3003660", "histograms": [{"batchcodes": ["3003660"], "histogram": {"Headache": 8, "Pyrexia": 7, "Fatigue": 5, "Chills": 3, "Hypoaesthesia": 3, "Injection site pain": 3, "Paraesthesia": 3, "Dizziness": 2, "Musculoskeletal pain": 2, "Pain in extremity": 2, "Amenorrhoea": 1, "Ankylosing spondylitis": 1, "Arthralgia": 1, "Blood test": 1, "Borrelia test": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Computerised tomogram head": 1, "Cough": 1, "Dyspnoea": 1, "Ear haemorrhage": 1, "Ear swelling": 1, "Electrocardiogram": 1, "Eye pain": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Hypertension": 1, "Influenza like illness": 1, "Laboratory test": 1, "Muscular weakness": 1, "Myocarditis": 1, "Myoclonus": 1, "Nausea": 1, "Neurological examination": 1, "Pain": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "SARS-CoV-2 antibody test": 1, "Sick leave": 1, "Slow response to stimuli": 1, "Tachycardia": 1, "Tinnitus": 1, "Vision blurred": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "3003660", "histograms": [{"histogram": {"Headache": 8, "Pyrexia": 7, "Fatigue": 5, "Chills": 3, "Hypoaesthesia": 3, "Injection site pain": 3, "Paraesthesia": 3, "Dizziness": 2, "Musculoskeletal pain": 2, "Pain in extremity": 2, "Amenorrhoea": 1, "Ankylosing spondylitis": 1, "Arthralgia": 1, "Blood test": 1, "Borrelia test": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Computerised tomogram head": 1, "Cough": 1, "Dyspnoea": 1, "Ear haemorrhage": 1, "Ear swelling": 1, "Electrocardiogram": 1, "Eye pain": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Hypertension": 1, "Influenza like illness": 1, "Laboratory test": 1, "Muscular weakness": 1, "Myocarditis": 1, "Myoclonus": 1, "Nausea": 1, "Neurological examination": 1, "Pain": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "SARS-CoV-2 antibody test": 1, "Sick leave": 1, "Slow response to stimuli": 1, "Tachycardia": 1, "Tinnitus": 1, "Vision blurred": 1, "Weight decreased": 1}, "batchcodes": ["3003660"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3003888.json b/docs/data/histograms/Switzerland/3003888.json
index 54ba3121874..81fa63fee84 100644
--- a/docs/data/histograms/Switzerland/3003888.json
+++ b/docs/data/histograms/Switzerland/3003888.json
@@ -1 +1 @@
-{"batchcode": "3003888", "histograms": [{"batchcodes": ["3003888"], "histogram": {"Chills": 1, "Headache": 1, "Injection site pain": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3003888", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Injection site pain": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["3003888"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004 494.json b/docs/data/histograms/Switzerland/3004 494.json
index 7383ebc6129..abdd9e9145c 100644
--- a/docs/data/histograms/Switzerland/3004 494.json
+++ b/docs/data/histograms/Switzerland/3004 494.json
@@ -1 +1 @@
-{"batchcode": "3004 494", "histograms": [{"batchcodes": ["3004 494"], "histogram": {"Cardiac arrest": 1}}]}
\ No newline at end of file
+{"batchcode": "3004 494", "histograms": [{"histogram": {"Cardiac arrest": 1}, "batchcodes": ["3004 494"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004065.json b/docs/data/histograms/Switzerland/3004065.json
index 47e17b84609..d9ffdb145ae 100644
--- a/docs/data/histograms/Switzerland/3004065.json
+++ b/docs/data/histograms/Switzerland/3004065.json
@@ -1 +1 @@
-{"batchcode": "3004065", "histograms": [{"batchcodes": ["3004065"], "histogram": {"Injection site lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "3004065", "histograms": [{"histogram": {"Injection site lymphadenopathy": 1}, "batchcodes": ["3004065"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004215.json b/docs/data/histograms/Switzerland/3004215.json
index e540be9bcb9..827b8a1b995 100644
--- a/docs/data/histograms/Switzerland/3004215.json
+++ b/docs/data/histograms/Switzerland/3004215.json
@@ -1 +1 @@
-{"batchcode": "3004215", "histograms": [{"batchcodes": ["3004215"], "histogram": {"Headache": 17, "Fatigue": 14, "Pyrexia": 14, "Chills": 9, "Dizziness": 9, "Nausea": 6, "Dyspnoea": 5, "Electrocardiogram": 5, "Myalgia": 5, "Arthralgia": 4, "Chest discomfort": 4, "Chest pain": 4, "Cough": 4, "Musculoskeletal pain": 4, "Syncope": 4, "Vomiting": 4, "Back pain": 3, "Deep vein thrombosis": 3, "Disturbance in attention": 3, "Influenza like illness": 3, "Injection site pain": 3, "Injection site reaction": 3, "Myocarditis": 3, "Pain in extremity": 3, "Pulmonary embolism": 3, "Rash": 3, "Tinnitus": 3, "Asthenia": 2, "Balance disorder": 2, "Blood pressure measurement": 2, "Blood test": 2, "Body temperature": 2, "C-reactive protein": 2, "Dysphonia": 2, "Epilepsy": 2, "Erythema": 2, "Eye pain": 2, "Insomnia": 2, "Lymphadenopathy": 2, "Magnetic resonance imaging": 2, "Palpitations": 2, "Paraesthesia": 2, "Pruritus": 2, "Skin reaction": 2, "Vaccination site reaction": 2, "Vision blurred": 2, "Acute disseminated encephalomyelitis": 1, "Adenocarcinoma": 1, "Alanine aminotransferase": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Antimitochondrial antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Basedow's disease": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol increased": 1, "Blood glucose decreased": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood pressure increased": 1, "Breast cyst": 1, "Cardiac discomfort": 1, "Ceruloplasmin": 1, "Computerised tomogram head": 1, "Constipation": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Exercise tolerance decreased": 1, "Facial paresis": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal pain": 1, "Generalised tonic-clonic seizure": 1, "HIV antigen": 1, "Haematuria": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Hepatitis": 1, "Hepatitis A antibody": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Immunisation anxiety related reaction": 1, "Immunology test": 1, "Inflammation": 1, "Injection site hypoaesthesia": 1, "Injection site paraesthesia": 1, "Intermenstrual bleeding": 1, "Intervertebral disc protrusion": 1, "Iron binding capacity total": 1, "Laboratory test": 1, "Laryngeal inflammation": 1, "Lipase": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Malaise": 1, "Menstruation irregular": 1, "Migraine": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Myocardial necrosis marker": 1, "Neurodermatitis": 1, "Neurological examination": 1, "New daily persistent headache": 1, "Ophthalmic herpes zoster": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Performance status decreased": 1, "Pericarditis": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Proteinuria": 1, "Purpura": 1, "Rash pruritic": 1, "Rhinitis": 1, "Serum ferritin": 1, "Sick leave": 1, "Somnolence": 1, "Sudden hearing loss": 1, "Tachycardia": 1, "Transferrin": 1, "Transferrin saturation": 1, "Troponin": 1, "Tryptase": 1, "Type I hypersensitivity": 1, "Ultrasound chest": 1, "Urticaria": 1, "Vaccination site warmth": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3004215", "histograms": [{"histogram": {"Headache": 17, "Fatigue": 14, "Pyrexia": 14, "Chills": 9, "Dizziness": 9, "Nausea": 6, "Dyspnoea": 5, "Electrocardiogram": 5, "Myalgia": 5, "Arthralgia": 4, "Chest discomfort": 4, "Chest pain": 4, "Cough": 4, "Musculoskeletal pain": 4, "Syncope": 4, "Vomiting": 4, "Back pain": 3, "Deep vein thrombosis": 3, "Disturbance in attention": 3, "Influenza like illness": 3, "Injection site pain": 3, "Injection site reaction": 3, "Myocarditis": 3, "Pain in extremity": 3, "Pulmonary embolism": 3, "Rash": 3, "Tinnitus": 3, "Asthenia": 2, "Balance disorder": 2, "Blood pressure measurement": 2, "Blood test": 2, "Body temperature": 2, "C-reactive protein": 2, "Dysphonia": 2, "Epilepsy": 2, "Erythema": 2, "Eye pain": 2, "Insomnia": 2, "Lymphadenopathy": 2, "Magnetic resonance imaging": 2, "Palpitations": 2, "Paraesthesia": 2, "Pruritus": 2, "Skin reaction": 2, "Vaccination site reaction": 2, "Vision blurred": 2, "Acute disseminated encephalomyelitis": 1, "Adenocarcinoma": 1, "Alanine aminotransferase": 1, "Angina pectoris": 1, "Angioedema": 1, "Angiogram": 1, "Antimitochondrial antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Basedow's disease": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood cholesterol increased": 1, "Blood glucose decreased": 1, "Blood iron": 1, "Blood lactate dehydrogenase": 1, "Blood pressure increased": 1, "Breast cyst": 1, "Cardiac discomfort": 1, "Ceruloplasmin": 1, "Computerised tomogram head": 1, "Constipation": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Exercise tolerance decreased": 1, "Facial paresis": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Gamma-glutamyltransferase": 1, "Gastrointestinal pain": 1, "Generalised tonic-clonic seizure": 1, "HIV antigen": 1, "Haematuria": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Hepatitis": 1, "Hepatitis A antibody": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypertensive crisis": 1, "Immunisation anxiety related reaction": 1, "Immunology test": 1, "Inflammation": 1, "Injection site hypoaesthesia": 1, "Injection site paraesthesia": 1, "Intermenstrual bleeding": 1, "Intervertebral disc protrusion": 1, "Iron binding capacity total": 1, "Laboratory test": 1, "Laryngeal inflammation": 1, "Lipase": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Malaise": 1, "Menstruation irregular": 1, "Migraine": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Myocardial necrosis marker": 1, "Neurodermatitis": 1, "Neurological examination": 1, "New daily persistent headache": 1, "Ophthalmic herpes zoster": 1, "Orthostatic hypotension": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Performance status decreased": 1, "Pericarditis": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Proteinuria": 1, "Purpura": 1, "Rash pruritic": 1, "Rhinitis": 1, "Serum ferritin": 1, "Sick leave": 1, "Somnolence": 1, "Sudden hearing loss": 1, "Tachycardia": 1, "Transferrin": 1, "Transferrin saturation": 1, "Troponin": 1, "Tryptase": 1, "Type I hypersensitivity": 1, "Ultrasound chest": 1, "Urticaria": 1, "Vaccination site warmth": 1, "White blood cell count": 1}, "batchcodes": ["3004215"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004219.json b/docs/data/histograms/Switzerland/3004219.json
index 658bf3d5f5b..6da488fcd00 100644
--- a/docs/data/histograms/Switzerland/3004219.json
+++ b/docs/data/histograms/Switzerland/3004219.json
@@ -1 +1 @@
-{"batchcode": "3004219", "histograms": [{"batchcodes": ["3004219"], "histogram": {"Fatigue": 16, "Headache": 16, "Pyrexia": 10, "Dyspnoea": 8, "Chest pain": 7, "Asthenia": 6, "Dizziness": 6, "Echocardiogram": 6, "Electrocardiogram": 6, "Magnetic resonance imaging head": 6, "Malaise": 6, "Pain in extremity": 6, "Ultrasound scan": 6, "Injection site reaction": 5, "Lymphadenopathy": 5, "Myalgia": 5, "Paraesthesia": 5, "Syncope": 5, "Arrhythmia": 4, "Chest discomfort": 4, "Chills": 4, "Hypoaesthesia": 4, "Influenza like illness": 4, "Magnetic resonance imaging": 4, "Nausea": 4, "Pericarditis": 4, "Vomiting": 4, "Angina pectoris": 3, "Angiogram": 3, "Blood triglycerides": 3, "C-reactive protein": 3, "Computerised tomogram head": 3, "Diarrhoea": 3, "Electrocardiogram ambulatory": 3, "Erythema": 3, "Hypertension": 3, "Injection site pain": 3, "Ischaemic stroke": 3, "Low density lipoprotein": 3, "Myocarditis": 3, "Pain": 3, "Palpitations": 3, "Ultrasound Doppler": 3, "Apathy": 2, "Arthralgia": 2, "Blood cholesterol": 2, "Blood test": 2, "Body temperature": 2, "Burning sensation": 2, "Chronic fatigue syndrome": 2, "Computerised tomogram": 2, "Disturbance in attention": 2, "Fall": 2, "Glycosylated haemoglobin": 2, "Haemoglobin": 2, "High density lipoprotein": 2, "Hyperhidrosis": 2, "Immunisation anxiety related reaction": 2, "Insomnia": 2, "Investigation": 2, "Joint range of motion decreased": 2, "Neurological examination": 2, "Peripheral swelling": 2, "Pruritus": 2, "Pulmonary function test": 2, "Tinnitus": 2, "Troponin": 2, "Troponin increased": 2, "Visual impairment": 2, "Affect lability": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Amenorrhoea": 1, "Amnesia": 1, "Anovulatory cycle": 1, "Antinuclear antibody": 1, "Back pain": 1, "Bladder discomfort": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood test normal": 1, "Breast pain": 1, "Breath odour": 1, "C-reactive protein increased": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Circulatory collapse": 1, "Colitis ulcerative": 1, "Computerised tomogram thorax abnormal": 1, "Concussion": 1, "Confusional state": 1, "Cystitis": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Discomfort": 1, "Dysarthria": 1, "Dyslipidaemia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear, nose and throat examination": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram normal": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Exercise tolerance decreased": 1, "Eye infection": 1, "Eye swelling": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Full blood count": 1, "Gait disturbance": 1, "Giant cell arteritis": 1, "Haematuria": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Herpes simplex": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypoaesthesia oral": 1, "Hypokalaemia": 1, "Hypotension": 1, "Hypotonia": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Influenza": 1, "Ischaemic cerebral infarction": 1, "Joint stiffness": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Lymphadenitis": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Microembolism": 1, "Migraine": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "NIH stroke scale": 1, "Nasopharyngitis": 1, "Neuropsychological test": 1, "Neutropenia": 1, "Ocular discomfort": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "Oxygen saturation": 1, "Paralysis": 1, "Periorbital oedema": 1, "Pleuropericarditis": 1, "Polyarthritis": 1, "Polymenorrhoea": 1, "Portal vein thrombosis": 1, "Postictal paralysis": 1, "Psychiatric evaluation abnormal": 1, "Pulmonary embolism": 1, "Pupils unequal": 1, "Rash": 1, "Renal pain": 1, "Respiration abnormal": 1, "Retinal artery occlusion": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Serum amyloid A protein": 1, "Serum ferritin": 1, "Skin test": 1, "Spirometry": 1, "Status epilepticus": 1, "Tachycardia": 1, "Tetany": 1, "Thyroid function test": 1, "Troponin I": 1, "Ultrasound abdomen abnormal": 1, "Ultrasound bladder": 1, "Urine analysis": 1, "Urticaria chronic": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Vasculitis": 1, "Vertigo": 1, "Vision blurred": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vitreous detachment": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3004219", "histograms": [{"histogram": {"Fatigue": 16, "Headache": 16, "Pyrexia": 10, "Dyspnoea": 8, "Chest pain": 7, "Asthenia": 6, "Dizziness": 6, "Echocardiogram": 6, "Electrocardiogram": 6, "Magnetic resonance imaging head": 6, "Malaise": 6, "Pain in extremity": 6, "Ultrasound scan": 6, "Injection site reaction": 5, "Lymphadenopathy": 5, "Myalgia": 5, "Paraesthesia": 5, "Syncope": 5, "Arrhythmia": 4, "Chest discomfort": 4, "Chills": 4, "Hypoaesthesia": 4, "Influenza like illness": 4, "Magnetic resonance imaging": 4, "Nausea": 4, "Pericarditis": 4, "Vomiting": 4, "Angina pectoris": 3, "Angiogram": 3, "Blood triglycerides": 3, "C-reactive protein": 3, "Computerised tomogram head": 3, "Diarrhoea": 3, "Electrocardiogram ambulatory": 3, "Erythema": 3, "Hypertension": 3, "Injection site pain": 3, "Ischaemic stroke": 3, "Low density lipoprotein": 3, "Myocarditis": 3, "Pain": 3, "Palpitations": 3, "Ultrasound Doppler": 3, "Apathy": 2, "Arthralgia": 2, "Blood cholesterol": 2, "Blood test": 2, "Body temperature": 2, "Burning sensation": 2, "Chronic fatigue syndrome": 2, "Computerised tomogram": 2, "Disturbance in attention": 2, "Fall": 2, "Glycosylated haemoglobin": 2, "Haemoglobin": 2, "High density lipoprotein": 2, "Hyperhidrosis": 2, "Immunisation anxiety related reaction": 2, "Insomnia": 2, "Investigation": 2, "Joint range of motion decreased": 2, "Neurological examination": 2, "Peripheral swelling": 2, "Pruritus": 2, "Pulmonary function test": 2, "Tinnitus": 2, "Troponin": 2, "Troponin increased": 2, "Visual impairment": 2, "Affect lability": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Amenorrhoea": 1, "Amnesia": 1, "Anovulatory cycle": 1, "Antinuclear antibody": 1, "Back pain": 1, "Bladder discomfort": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood test normal": 1, "Breast pain": 1, "Breath odour": 1, "C-reactive protein increased": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Circulatory collapse": 1, "Colitis ulcerative": 1, "Computerised tomogram thorax abnormal": 1, "Concussion": 1, "Confusional state": 1, "Cystitis": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Discomfort": 1, "Dysarthria": 1, "Dyslipidaemia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear, nose and throat examination": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram normal": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Exercise tolerance decreased": 1, "Eye infection": 1, "Eye swelling": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Full blood count": 1, "Gait disturbance": 1, "Giant cell arteritis": 1, "Haematuria": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Herpes simplex": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypoaesthesia oral": 1, "Hypokalaemia": 1, "Hypotension": 1, "Hypotonia": 1, "Inappropriate schedule of product administration": 1, "Inflammation": 1, "Influenza": 1, "Ischaemic cerebral infarction": 1, "Joint stiffness": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Lymphadenitis": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Microembolism": 1, "Migraine": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Mydriasis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "NIH stroke scale": 1, "Nasopharyngitis": 1, "Neuropsychological test": 1, "Neutropenia": 1, "Ocular discomfort": 1, "Optical coherence tomography": 1, "Oral herpes": 1, "Oxygen saturation": 1, "Paralysis": 1, "Periorbital oedema": 1, "Pleuropericarditis": 1, "Polyarthritis": 1, "Polymenorrhoea": 1, "Portal vein thrombosis": 1, "Postictal paralysis": 1, "Psychiatric evaluation abnormal": 1, "Pulmonary embolism": 1, "Pupils unequal": 1, "Rash": 1, "Renal pain": 1, "Respiration abnormal": 1, "Retinal artery occlusion": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Serum amyloid A protein": 1, "Serum ferritin": 1, "Skin test": 1, "Spirometry": 1, "Status epilepticus": 1, "Tachycardia": 1, "Tetany": 1, "Thyroid function test": 1, "Troponin I": 1, "Ultrasound abdomen abnormal": 1, "Ultrasound bladder": 1, "Urine analysis": 1, "Urticaria chronic": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Vasculitis": 1, "Vertigo": 1, "Vision blurred": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vitreous detachment": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["3004219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004219/3004494.json b/docs/data/histograms/Switzerland/3004219/3004494.json
index a83c6877da2..76160aec5b4 100644
--- a/docs/data/histograms/Switzerland/3004219/3004494.json
+++ b/docs/data/histograms/Switzerland/3004219/3004494.json
@@ -1 +1 @@
-{"batchcode": "3004219/3004494", "histograms": [{"batchcodes": ["3004219/3004494"], "histogram": {"Blood loss anaemia": 1, "Heavy menstrual bleeding": 1, "Intermenstrual bleeding": 1, "Mineral supplementation": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3004219/3004494", "histograms": [{"histogram": {"Blood loss anaemia": 1, "Heavy menstrual bleeding": 1, "Intermenstrual bleeding": 1, "Mineral supplementation": 1, "Urticaria": 1}, "batchcodes": ["3004219/3004494"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004224.json b/docs/data/histograms/Switzerland/3004224.json
index b0dce25fef8..fb39174fa5a 100644
--- a/docs/data/histograms/Switzerland/3004224.json
+++ b/docs/data/histograms/Switzerland/3004224.json
@@ -1 +1 @@
-{"batchcode": "3004224", "histograms": [{"batchcodes": ["3004224"], "histogram": {"Fatigue": 6, "Dizziness": 5, "Dyspnoea": 4, "Headache": 4, "Chest pain": 3, "Chills": 2, "Injection site reaction": 2, "Insomnia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Histamine level increased": 1, "Hot flush": 1, "Hypertension": 1, "Hypotension": 1, "Injection site pain": 1, "Injection site swelling": 1, "Laboratory test": 1, "Myocarditis": 1, "Nausea": 1, "New daily persistent headache": 1, "Oxygen saturation": 1, "Palpitations": 1, "Peripheral coldness": 1, "Presyncope": 1, "Renal pain": 1, "Sleep disorder": 1, "Thirst": 1, "Tinnitus": 1, "Tremor": 1, "Vaccination site pain": 1, "Ventricular extrasystoles": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "3004224", "histograms": [{"histogram": {"Fatigue": 6, "Dizziness": 5, "Dyspnoea": 4, "Headache": 4, "Chest pain": 3, "Chills": 2, "Injection site reaction": 2, "Insomnia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vomiting": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Arrhythmia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Histamine level increased": 1, "Hot flush": 1, "Hypertension": 1, "Hypotension": 1, "Injection site pain": 1, "Injection site swelling": 1, "Laboratory test": 1, "Myocarditis": 1, "Nausea": 1, "New daily persistent headache": 1, "Oxygen saturation": 1, "Palpitations": 1, "Peripheral coldness": 1, "Presyncope": 1, "Renal pain": 1, "Sleep disorder": 1, "Thirst": 1, "Tinnitus": 1, "Tremor": 1, "Vaccination site pain": 1, "Ventricular extrasystoles": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["3004224"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004224/3004494.json b/docs/data/histograms/Switzerland/3004224/3004494.json
index 6cf6d4afcb4..1674f7d6134 100644
--- a/docs/data/histograms/Switzerland/3004224/3004494.json
+++ b/docs/data/histograms/Switzerland/3004224/3004494.json
@@ -1 +1 @@
-{"batchcode": "3004224/3004494", "histograms": [{"batchcodes": ["3004224/3004494"], "histogram": {"Psoriasis": 1, "Psoriatic arthropathy": 1}}]}
\ No newline at end of file
+{"batchcode": "3004224/3004494", "histograms": [{"histogram": {"Psoriasis": 1, "Psoriatic arthropathy": 1}, "batchcodes": ["3004224/3004494"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004233.json b/docs/data/histograms/Switzerland/3004233.json
index feb88ed90c7..eadae3a93b8 100644
--- a/docs/data/histograms/Switzerland/3004233.json
+++ b/docs/data/histograms/Switzerland/3004233.json
@@ -1 +1 @@
-{"batchcode": "3004233", "histograms": [{"batchcodes": ["3004233"], "histogram": {"Feeling hot": 1, "Lip dry": 1, "Lip swelling": 1, "Pruritus": 1, "Swelling face": 1, "Swelling of eyelid": 1}}]}
\ No newline at end of file
+{"batchcode": "3004233", "histograms": [{"histogram": {"Feeling hot": 1, "Lip dry": 1, "Lip swelling": 1, "Pruritus": 1, "Swelling face": 1, "Swelling of eyelid": 1}, "batchcodes": ["3004233"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004246.json b/docs/data/histograms/Switzerland/3004246.json
index 8ed505c0043..b959aaa7ff5 100644
--- a/docs/data/histograms/Switzerland/3004246.json
+++ b/docs/data/histograms/Switzerland/3004246.json
@@ -1 +1 @@
-{"batchcode": "3004246", "histograms": [{"batchcodes": ["3004246"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "3004246", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["3004246"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30042460.json b/docs/data/histograms/Switzerland/30042460.json
index 48a2ec80a23..92a116f4d17 100644
--- a/docs/data/histograms/Switzerland/30042460.json
+++ b/docs/data/histograms/Switzerland/30042460.json
@@ -1 +1 @@
-{"batchcode": "30042460", "histograms": [{"batchcodes": ["30042460"], "histogram": {"Aneurysm ruptured": 1, "Angina unstable": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "Chest pain": 1, "Fatigue": 1, "Glomerular filtration rate": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Procalcitonin": 1, "Pyrexia": 1, "Subarachnoid haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "30042460", "histograms": [{"histogram": {"Aneurysm ruptured": 1, "Angina unstable": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "Chest pain": 1, "Fatigue": 1, "Glomerular filtration rate": 1, "Headache": 1, "Hypertension": 1, "Nausea": 1, "Procalcitonin": 1, "Pyrexia": 1, "Subarachnoid haemorrhage": 1}, "batchcodes": ["30042460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30042703/ 30015.json b/docs/data/histograms/Switzerland/30042703/ 30015.json
index 18dac3ec8ac..431e7cee04b 100644
--- a/docs/data/histograms/Switzerland/30042703/ 30015.json
+++ b/docs/data/histograms/Switzerland/30042703/ 30015.json
@@ -1 +1 @@
-{"batchcode": "30042703/ 30015", "histograms": [{"batchcodes": ["30042703/ 30015"], "histogram": {"Pseudolymphoma": 1}}]}
\ No newline at end of file
+{"batchcode": "30042703/ 30015", "histograms": [{"histogram": {"Pseudolymphoma": 1}, "batchcodes": ["30042703/ 30015"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30042723.json b/docs/data/histograms/Switzerland/30042723.json
index baa168fccce..a6f6217559d 100644
--- a/docs/data/histograms/Switzerland/30042723.json
+++ b/docs/data/histograms/Switzerland/30042723.json
@@ -1 +1 @@
-{"batchcode": "30042723", "histograms": [{"batchcodes": ["30042723"], "histogram": {"Body temperature": 1, "Death": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "30042723", "histograms": [{"histogram": {"Body temperature": 1, "Death": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Urticaria": 1}, "batchcodes": ["30042723"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004494.json b/docs/data/histograms/Switzerland/3004494.json
index 22a0a67be7f..bf51257ce3f 100644
--- a/docs/data/histograms/Switzerland/3004494.json
+++ b/docs/data/histograms/Switzerland/3004494.json
@@ -1 +1 @@
-{"batchcode": "3004494", "histograms": [{"batchcodes": ["3004494"], "histogram": {"Fatigue": 6, "Disturbance in attention": 3, "Dyspnoea": 3, "Headache": 3, "Pyrexia": 3, "Arthralgia": 2, "Asthenia": 2, "Chest pain": 2, "Chills": 2, "Syncope": 2, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Injection site reaction": 1, "Lymphadenitis": 1, "Migraine": 1, "Mood swings": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Neurodermatitis": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Pruritus": 1, "Rash": 1, "Renal pain": 1, "Skin discomfort": 1, "Skin reaction": 1, "Swelling": 1, "Thrombocytopenia": 1, "Thyroiditis": 1, "Tremor": 1, "Urticaria": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "3004494", "histograms": [{"histogram": {"Fatigue": 6, "Disturbance in attention": 3, "Dyspnoea": 3, "Headache": 3, "Pyrexia": 3, "Arthralgia": 2, "Asthenia": 2, "Chest pain": 2, "Chills": 2, "Syncope": 2, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Injection site reaction": 1, "Lymphadenitis": 1, "Migraine": 1, "Mood swings": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Neurodermatitis": 1, "Pain": 1, "Palpitations": 1, "Pericarditis": 1, "Pruritus": 1, "Rash": 1, "Renal pain": 1, "Skin discomfort": 1, "Skin reaction": 1, "Swelling": 1, "Thrombocytopenia": 1, "Thyroiditis": 1, "Tremor": 1, "Urticaria": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["3004494"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004669.json b/docs/data/histograms/Switzerland/3004669.json
index 009d67b7338..dcbcde7b345 100644
--- a/docs/data/histograms/Switzerland/3004669.json
+++ b/docs/data/histograms/Switzerland/3004669.json
@@ -1 +1 @@
-{"batchcode": "3004669", "histograms": [{"batchcodes": ["3004669"], "histogram": {"Headache": 3, "Pruritus": 3, "Blood test": 2, "Polymyalgia rheumatica": 2, "Pyrexia": 2, "Rash": 2, "Syncope": 2, "Urticaria": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Aspiration pleural cavity": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Breast cancer": 1, "Bronchospasm": 1, "C-reactive protein": 1, "Chest pain": 1, "Chills": 1, "Computed tomographic abscessogram": 1, "Computerised tomogram": 1, "Creatinine renal clearance": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Ear infection": 1, "Eczema": 1, "Encephalitis": 1, "Erythema": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypotension": 1, "Keratoacanthoma": 1, "Laboratory test": 1, "Mechanical urticaria": 1, "Myalgia": 1, "Nasal herpes": 1, "Nausea": 1, "Optic ischaemic neuropathy": 1, "Pain in extremity": 1, "Pancreatitis": 1, "Pericardial effusion": 1, "Perichondritis": 1, "Pleural effusion": 1, "Pulmonary artery occlusion": 1, "Red blood cell sedimentation rate": 1, "Tachycardia": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Vision blurred": 1, "Vomiting": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3004669", "histograms": [{"histogram": {"Headache": 3, "Pruritus": 3, "Blood test": 2, "Polymyalgia rheumatica": 2, "Pyrexia": 2, "Rash": 2, "Syncope": 2, "Urticaria": 2, "Ageusia": 1, "Anaphylactic reaction": 1, "Arthralgia": 1, "Aspiration pleural cavity": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Breast cancer": 1, "Bronchospasm": 1, "C-reactive protein": 1, "Chest pain": 1, "Chills": 1, "Computed tomographic abscessogram": 1, "Computerised tomogram": 1, "Creatinine renal clearance": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Ear infection": 1, "Eczema": 1, "Encephalitis": 1, "Erythema": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypotension": 1, "Keratoacanthoma": 1, "Laboratory test": 1, "Mechanical urticaria": 1, "Myalgia": 1, "Nasal herpes": 1, "Nausea": 1, "Optic ischaemic neuropathy": 1, "Pain in extremity": 1, "Pancreatitis": 1, "Pericardial effusion": 1, "Perichondritis": 1, "Pleural effusion": 1, "Pulmonary artery occlusion": 1, "Red blood cell sedimentation rate": 1, "Tachycardia": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Vision blurred": 1, "Vomiting": 1, "X-ray": 1}, "batchcodes": ["3004669"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004689 3004955.json b/docs/data/histograms/Switzerland/3004689 3004955.json
index 48ba9befb0e..d3364723495 100644
--- a/docs/data/histograms/Switzerland/3004689 3004955.json
+++ b/docs/data/histograms/Switzerland/3004689 3004955.json
@@ -1 +1 @@
-{"batchcode": "3004689 3004955", "histograms": [{"batchcodes": ["3004689 3004955"], "histogram": {"Cutaneous vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "3004689 3004955", "histograms": [{"histogram": {"Cutaneous vasculitis": 1}, "batchcodes": ["3004689 3004955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004912.json b/docs/data/histograms/Switzerland/3004912.json
index e8efeba0216..00c91bd584e 100644
--- a/docs/data/histograms/Switzerland/3004912.json
+++ b/docs/data/histograms/Switzerland/3004912.json
@@ -1 +1 @@
-{"batchcode": "3004912", "histograms": [{"batchcodes": ["3004912"], "histogram": {"Cerebrovascular accident": 1}}]}
\ No newline at end of file
+{"batchcode": "3004912", "histograms": [{"histogram": {"Cerebrovascular accident": 1}, "batchcodes": ["3004912"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300495.json b/docs/data/histograms/Switzerland/300495.json
index a6d490ff0d2..d0df7471d79 100644
--- a/docs/data/histograms/Switzerland/300495.json
+++ b/docs/data/histograms/Switzerland/300495.json
@@ -1 +1 @@
-{"batchcode": "300495", "histograms": [{"batchcodes": ["300495"], "histogram": {"Facial pain": 1, "Headache": 1, "Influenza like illness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1, "Sinusitis": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "300495", "histograms": [{"histogram": {"Facial pain": 1, "Headache": 1, "Influenza like illness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1, "Sinusitis": 1, "Vision blurred": 1}, "batchcodes": ["300495"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3004955.json b/docs/data/histograms/Switzerland/3004955.json
index ecb9ec57aa5..da91642777e 100644
--- a/docs/data/histograms/Switzerland/3004955.json
+++ b/docs/data/histograms/Switzerland/3004955.json
@@ -1 +1 @@
-{"batchcode": "3004955", "histograms": [{"batchcodes": ["3004955"], "histogram": {"Urticaria": 6, "Dyspnoea": 5, "Pruritus": 5, "Dizziness": 4, "Headache": 4, "Arthralgia": 3, "Asthenia": 3, "Fatigue": 3, "Pain in extremity": 3, "Angioedema": 2, "Chest pain": 2, "Chills": 2, "Heart rate increased": 2, "Hypersensitivity": 2, "Hypertension": 2, "Nausea": 2, "Peripheral swelling": 2, "Pulmonary embolism": 2, "Pyrexia": 2, "Tryptase": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Anaphylactoid shock": 1, "Anxiety": 1, "Blood creatinine": 1, "Body temperature": 1, "Chest discomfort": 1, "Deafness unilateral": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysmenorrhoea": 1, "Ear pain": 1, "Facial pain": 1, "Feeling cold": 1, "Flushing": 1, "Glomerular filtration rate": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Influenza like illness": 1, "Injection site rash": 1, "Injection site reaction": 1, "Intermenstrual bleeding": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Neovascular age-related macular degeneration": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Presyncope": 1, "Rash": 1, "Rash erythematous": 1, "Sick leave": 1, "Skin reaction": 1, "Sudden hearing loss": 1, "Syncope": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria chronic": 1, "Vasculitis": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004955", "histograms": [{"histogram": {"Urticaria": 6, "Dyspnoea": 5, "Pruritus": 5, "Dizziness": 4, "Headache": 4, "Arthralgia": 3, "Asthenia": 3, "Fatigue": 3, "Pain in extremity": 3, "Angioedema": 2, "Chest pain": 2, "Chills": 2, "Heart rate increased": 2, "Hypersensitivity": 2, "Hypertension": 2, "Nausea": 2, "Peripheral swelling": 2, "Pulmonary embolism": 2, "Pyrexia": 2, "Tryptase": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Anaphylactoid shock": 1, "Anxiety": 1, "Blood creatinine": 1, "Body temperature": 1, "Chest discomfort": 1, "Deafness unilateral": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysmenorrhoea": 1, "Ear pain": 1, "Facial pain": 1, "Feeling cold": 1, "Flushing": 1, "Glomerular filtration rate": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Influenza like illness": 1, "Injection site rash": 1, "Injection site reaction": 1, "Intermenstrual bleeding": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Neovascular age-related macular degeneration": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Presyncope": 1, "Rash": 1, "Rash erythematous": 1, "Sick leave": 1, "Skin reaction": 1, "Sudden hearing loss": 1, "Syncope": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria chronic": 1, "Vasculitis": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["3004955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300496.json b/docs/data/histograms/Switzerland/300496.json
index f36f92ba827..caffb4cac56 100644
--- a/docs/data/histograms/Switzerland/300496.json
+++ b/docs/data/histograms/Switzerland/300496.json
@@ -1 +1 @@
-{"batchcode": "300496", "histograms": [{"batchcodes": ["300496"], "histogram": {"Angina pectoris": 1, "Bell's palsy": 1, "Blood creatine": 1, "C-reactive protein": 1, "Chills": 1, "Erythema": 1, "Influenza like illness": 1, "Intraductal proliferative breast lesion": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Paralysis": 1, "Positron emission tomogram": 1, "Pyrexia": 1, "Ultrasound breast": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "300496", "histograms": [{"histogram": {"Angina pectoris": 1, "Bell's palsy": 1, "Blood creatine": 1, "C-reactive protein": 1, "Chills": 1, "Erythema": 1, "Influenza like illness": 1, "Intraductal proliferative breast lesion": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Paralysis": 1, "Positron emission tomogram": 1, "Pyrexia": 1, "Ultrasound breast": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["300496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3005219.json b/docs/data/histograms/Switzerland/3005219.json
index 5c5fc98655e..7af4ff13e11 100644
--- a/docs/data/histograms/Switzerland/3005219.json
+++ b/docs/data/histograms/Switzerland/3005219.json
@@ -1 +1 @@
-{"batchcode": "3005219", "histograms": [{"batchcodes": ["3005219"], "histogram": {"Influenza like illness": 1, "Magnetic resonance imaging heart": 1, "Myocarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "3005219", "histograms": [{"histogram": {"Influenza like illness": 1, "Magnetic resonance imaging heart": 1, "Myocarditis": 1}, "batchcodes": ["3005219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3005238.json b/docs/data/histograms/Switzerland/3005238.json
index 58a71fb974f..94a3caddcc1 100644
--- a/docs/data/histograms/Switzerland/3005238.json
+++ b/docs/data/histograms/Switzerland/3005238.json
@@ -1 +1 @@
-{"batchcode": "3005238", "histograms": [{"batchcodes": ["3005238"], "histogram": {"Urticaria": 13, "Pruritus": 8, "Fatigue": 4, "Dizziness": 3, "Dyspnoea": 3, "Headache": 3, "Injection site pain": 3, "Mechanical urticaria": 2, "Myalgia": 2, "Nausea": 2, "Pyrexia": 2, "Rash": 2, "Skin reaction": 2, "Syncope": 2, "Acute febrile neutrophilic dermatosis": 1, "Angina pectoris": 1, "Ankylosing spondylitis": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Blood creatine phosphokinase increased": 1, "Blood test": 1, "C-reactive protein increased": 1, "Carotid artery stenosis": 1, "Chest discomfort": 1, "Chills": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Dysgeusia": 1, "Dysphagia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gastrooesophageal reflux disease": 1, "Haematoma": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immune thrombocytopenia": 1, "Insomnia": 1, "Ischaemic stroke": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Motor dysfunction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal inflammation": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pleurisy": 1, "Pneumonia": 1, "Polyserositis": 1, "Pulmonary embolism": 1, "Pulmonary thrombosis": 1, "Renal impairment": 1, "Rheumatoid arthritis": 1, "Sensory disturbance": 1, "Skin swelling": 1, "Tachycardia": 1, "Thrombosis": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Urticaria chronic": 1, "Vasculitis": 1, "Weight increased": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "3005238", "histograms": [{"histogram": {"Urticaria": 13, "Pruritus": 8, "Fatigue": 4, "Dizziness": 3, "Dyspnoea": 3, "Headache": 3, "Injection site pain": 3, "Mechanical urticaria": 2, "Myalgia": 2, "Nausea": 2, "Pyrexia": 2, "Rash": 2, "Skin reaction": 2, "Syncope": 2, "Acute febrile neutrophilic dermatosis": 1, "Angina pectoris": 1, "Ankylosing spondylitis": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Blood creatine phosphokinase increased": 1, "Blood test": 1, "C-reactive protein increased": 1, "Carotid artery stenosis": 1, "Chest discomfort": 1, "Chills": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Dysgeusia": 1, "Dysphagia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gastrooesophageal reflux disease": 1, "Haematoma": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immune thrombocytopenia": 1, "Insomnia": 1, "Ischaemic stroke": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Motor dysfunction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal inflammation": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pleurisy": 1, "Pneumonia": 1, "Polyserositis": 1, "Pulmonary embolism": 1, "Pulmonary thrombosis": 1, "Renal impairment": 1, "Rheumatoid arthritis": 1, "Sensory disturbance": 1, "Skin swelling": 1, "Tachycardia": 1, "Thrombosis": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Urticaria chronic": 1, "Vasculitis": 1, "Weight increased": 1, "White blood cell count increased": 1}, "batchcodes": ["3005238"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3005290.json b/docs/data/histograms/Switzerland/3005290.json
index 93136b2782f..587f7ba60eb 100644
--- a/docs/data/histograms/Switzerland/3005290.json
+++ b/docs/data/histograms/Switzerland/3005290.json
@@ -1 +1 @@
-{"batchcode": "3005290", "histograms": [{"batchcodes": ["3005290"], "histogram": {"Polyarthritis": 1, "Skin reaction": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3005290", "histograms": [{"histogram": {"Polyarthritis": 1, "Skin reaction": 1, "Urticaria": 1}, "batchcodes": ["3005290"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3005704,.json b/docs/data/histograms/Switzerland/3005704,.json
index 66369a19a4f..d9a70199f67 100644
--- a/docs/data/histograms/Switzerland/3005704,.json
+++ b/docs/data/histograms/Switzerland/3005704,.json
@@ -1 +1 @@
-{"batchcode": "3005704,", "histograms": [{"batchcodes": ["3005704,"], "histogram": {"Myalgia": 1, "Neck pain": 1, "Oesophageal pain": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "3005704,", "histograms": [{"histogram": {"Myalgia": 1, "Neck pain": 1, "Oesophageal pain": 1, "Urticaria": 1}, "batchcodes": ["3005704,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3005704.json b/docs/data/histograms/Switzerland/3005704.json
index f5b10695d8c..f803bf7df59 100644
--- a/docs/data/histograms/Switzerland/3005704.json
+++ b/docs/data/histograms/Switzerland/3005704.json
@@ -1 +1 @@
-{"batchcode": "3005704", "histograms": [{"batchcodes": ["3005704"], "histogram": {"Urticaria": 11, "Pain in extremity": 5, "Pruritus": 5, "Pyrexia": 5, "Fatigue": 4, "Chest discomfort": 3, "Dyspnoea": 3, "Nausea": 3, "Syncope": 3, "Abdominal pain lower": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Chills": 2, "Dizziness": 2, "Echocardiogram": 2, "Hypoacusis": 2, "Laboratory test": 2, "Mechanical urticaria": 2, "Rash erythematous": 2, "Skin reaction": 2, "Tinnitus": 2, "Ageusia": 1, "Amputation": 1, "Angiocardiogram": 1, "Arthralgia": 1, "Aspiration pleural cavity normal": 1, "Asthenia": 1, "Audiogram": 1, "Back pain": 1, "Balance disorder": 1, "Blood cholesterol": 1, "Blood culture positive": 1, "Blood glucose": 1, "Bursitis": 1, "C-reactive protein": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Computerised tomogram thorax abnormal": 1, "Congestive cardiomyopathy": 1, "Death": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysmenorrhoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear swelling": 1, "Echocardiogram abnormal": 1, "Eczema": 1, "Electrocardiogram": 1, "Eyelid rash": 1, "Gastroenteritis viral": 1, "Gastrointestinal pain": 1, "General physical health deterioration": 1, "Genital herpes": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypotonia": 1, "Impaired work ability": 1, "Joint swelling": 1, "Lip swelling": 1, "Liver function test abnormal": 1, "Lymphadenopathy": 1, "Macular oedema": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Menstrual disorder": 1, "Mouth swelling": 1, "Muscle spasms": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Neuralgic amyotrophy": 1, "Obstructive sleep apnoea syndrome": 1, "Oedema": 1, "Ophthalmological examination": 1, "Oropharyngeal pain": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Parosmia": 1, "Perioral dermatitis": 1, "Peripheral swelling": 1, "Polyneuropathy": 1, "Positron emission tomogram": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash pruritic": 1, "Retinal artery thrombosis": 1, "Retinal vein thrombosis": 1, "SARS-CoV-2 antibody test positive": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sick leave": 1, "Skin irritation": 1, "Soft tissue infection": 1, "Splenomegaly": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid function test": 1, "Trigeminal neuralgia": 1, "Urticaria chronic": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005704", "histograms": [{"histogram": {"Urticaria": 11, "Pain in extremity": 5, "Pruritus": 5, "Pyrexia": 5, "Fatigue": 4, "Chest discomfort": 3, "Dyspnoea": 3, "Nausea": 3, "Syncope": 3, "Abdominal pain lower": 2, "Blood pressure measurement": 2, "Chest pain": 2, "Chills": 2, "Dizziness": 2, "Echocardiogram": 2, "Hypoacusis": 2, "Laboratory test": 2, "Mechanical urticaria": 2, "Rash erythematous": 2, "Skin reaction": 2, "Tinnitus": 2, "Ageusia": 1, "Amputation": 1, "Angiocardiogram": 1, "Arthralgia": 1, "Aspiration pleural cavity normal": 1, "Asthenia": 1, "Audiogram": 1, "Back pain": 1, "Balance disorder": 1, "Blood cholesterol": 1, "Blood culture positive": 1, "Blood glucose": 1, "Bursitis": 1, "C-reactive protein": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Computerised tomogram thorax abnormal": 1, "Congestive cardiomyopathy": 1, "Death": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysmenorrhoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear swelling": 1, "Echocardiogram abnormal": 1, "Eczema": 1, "Electrocardiogram": 1, "Eyelid rash": 1, "Gastroenteritis viral": 1, "Gastrointestinal pain": 1, "General physical health deterioration": 1, "Genital herpes": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypotonia": 1, "Impaired work ability": 1, "Joint swelling": 1, "Lip swelling": 1, "Liver function test abnormal": 1, "Lymphadenopathy": 1, "Macular oedema": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Menstrual disorder": 1, "Mouth swelling": 1, "Muscle spasms": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Neuralgic amyotrophy": 1, "Obstructive sleep apnoea syndrome": 1, "Oedema": 1, "Ophthalmological examination": 1, "Oropharyngeal pain": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Parosmia": 1, "Perioral dermatitis": 1, "Peripheral swelling": 1, "Polyneuropathy": 1, "Positron emission tomogram": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash pruritic": 1, "Retinal artery thrombosis": 1, "Retinal vein thrombosis": 1, "SARS-CoV-2 antibody test positive": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sick leave": 1, "Skin irritation": 1, "Soft tissue infection": 1, "Splenomegaly": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid function test": 1, "Trigeminal neuralgia": 1, "Urticaria chronic": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1}, "batchcodes": ["3005704"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3005837.json b/docs/data/histograms/Switzerland/3005837.json
index 64ec7d8019b..a562ad0c76f 100644
--- a/docs/data/histograms/Switzerland/3005837.json
+++ b/docs/data/histograms/Switzerland/3005837.json
@@ -1 +1 @@
-{"batchcode": "3005837", "histograms": [{"batchcodes": ["3005837"], "histogram": {"Urticaria": 10, "Fatigue": 7, "Pyrexia": 5, "Dyspnoea": 4, "Headache": 4, "Pruritus": 4, "Chest discomfort": 3, "Chills": 3, "Sick leave": 3, "Angioedema": 2, "Asthenia": 2, "Eyelid ptosis": 2, "Feeling abnormal": 2, "Hyperhidrosis": 2, "Muscle spasms": 2, "Palpitations": 2, "Rash": 2, "Skin reaction": 2, "Tachycardia": 2, "Abdominal discomfort": 1, "Adverse reaction": 1, "Aphthous ulcer": 1, "Asthma": 1, "Back pain": 1, "Blood pressure increased": 1, "Chest pain": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysphagia": 1, "Extrasystoles": 1, "Eye swelling": 1, "Gastrooesophageal reflux disease": 1, "General physical health deterioration": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypotonia": 1, "Influenza like illness": 1, "Injection site reaction": 1, "Lip exfoliation": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Migraine": 1, "Muscle rigidity": 1, "Myalgia": 1, "Nausea": 1, "Ophthalmological examination": 1, "Pain": 1, "Pain in extremity": 1, "Skin swelling": 1, "Somnolence": 1, "Syncope": 1, "Tinnitus": 1, "Urticaria chronic": 1}}]}
\ No newline at end of file
+{"batchcode": "3005837", "histograms": [{"histogram": {"Urticaria": 10, "Fatigue": 7, "Pyrexia": 5, "Dyspnoea": 4, "Headache": 4, "Pruritus": 4, "Chest discomfort": 3, "Chills": 3, "Sick leave": 3, "Angioedema": 2, "Asthenia": 2, "Eyelid ptosis": 2, "Feeling abnormal": 2, "Hyperhidrosis": 2, "Muscle spasms": 2, "Palpitations": 2, "Rash": 2, "Skin reaction": 2, "Tachycardia": 2, "Abdominal discomfort": 1, "Adverse reaction": 1, "Aphthous ulcer": 1, "Asthma": 1, "Back pain": 1, "Blood pressure increased": 1, "Chest pain": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysphagia": 1, "Extrasystoles": 1, "Eye swelling": 1, "Gastrooesophageal reflux disease": 1, "General physical health deterioration": 1, "Heart rate increased": 1, "Hypertension": 1, "Hypotonia": 1, "Influenza like illness": 1, "Injection site reaction": 1, "Lip exfoliation": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Migraine": 1, "Muscle rigidity": 1, "Myalgia": 1, "Nausea": 1, "Ophthalmological examination": 1, "Pain": 1, "Pain in extremity": 1, "Skin swelling": 1, "Somnolence": 1, "Syncope": 1, "Tinnitus": 1, "Urticaria chronic": 1}, "batchcodes": ["3005837"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3006274 / 30036.json b/docs/data/histograms/Switzerland/3006274 / 30036.json
index 0d6d3fd948c..9d82c193221 100644
--- a/docs/data/histograms/Switzerland/3006274 / 30036.json
+++ b/docs/data/histograms/Switzerland/3006274 / 30036.json
@@ -1 +1 @@
-{"batchcode": "3006274 / 30036", "histograms": [{"batchcodes": ["3006274 / 30036"], "histogram": {"Administration site movement impairment": 1, "Chills": 1, "Injection site pain": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "3006274 / 30036", "histograms": [{"histogram": {"Administration site movement impairment": 1, "Chills": 1, "Injection site pain": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["3006274 / 30036"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3006274.json b/docs/data/histograms/Switzerland/3006274.json
index 3e9396b5104..51d141f5f61 100644
--- a/docs/data/histograms/Switzerland/3006274.json
+++ b/docs/data/histograms/Switzerland/3006274.json
@@ -1 +1 @@
-{"batchcode": "3006274", "histograms": [{"batchcodes": ["3006274"], "histogram": {"Urticaria": 13, "Dyspnoea": 4, "Pruritus": 4, "Fatigue": 3, "Pyrexia": 3, "Headache": 2, "Herpes zoster": 2, "Mechanical urticaria": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Angioedema": 1, "Arthralgia": 1, "Aspartate aminotransferase normal": 1, "Atrial fibrillation": 1, "Blood alkaline phosphatase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Cerebral venous thrombosis": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Coagulopathy": 1, "Colitis": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea at rest": 1, "Epicondylitis": 1, "Erythema": 1, "Gastritis": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin": 1, "Helicobacter test": 1, "Hot flush": 1, "Injection site pain": 1, "Irritability": 1, "Lymphadenopathy": 1, "Menstruation irregular": 1, "Musculoskeletal pain": 1, "Myopericarditis": 1, "Nausea": 1, "Night sweats": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Parasite blood test": 1, "Phlebitis": 1, "Red blood cell sedimentation rate": 1, "Scan thyroid gland": 1, "Skin reaction": 1, "Sleep disorder": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Urticaria chronic": 1, "Urticarial vasculitis": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3006274", "histograms": [{"histogram": {"Urticaria": 13, "Dyspnoea": 4, "Pruritus": 4, "Fatigue": 3, "Pyrexia": 3, "Headache": 2, "Herpes zoster": 2, "Mechanical urticaria": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Alanine aminotransferase": 1, "Angioedema": 1, "Arthralgia": 1, "Aspartate aminotransferase normal": 1, "Atrial fibrillation": 1, "Blood alkaline phosphatase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood lactate dehydrogenase": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Cerebral venous thrombosis": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Coagulopathy": 1, "Colitis": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea at rest": 1, "Epicondylitis": 1, "Erythema": 1, "Gastritis": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin": 1, "Helicobacter test": 1, "Hot flush": 1, "Injection site pain": 1, "Irritability": 1, "Lymphadenopathy": 1, "Menstruation irregular": 1, "Musculoskeletal pain": 1, "Myopericarditis": 1, "Nausea": 1, "Night sweats": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Parasite blood test": 1, "Phlebitis": 1, "Red blood cell sedimentation rate": 1, "Scan thyroid gland": 1, "Skin reaction": 1, "Sleep disorder": 1, "Sudden hearing loss": 1, "Swelling": 1, "Syncope": 1, "Urticaria chronic": 1, "Urticarial vasculitis": 1, "White blood cell count": 1}, "batchcodes": ["3006274"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3006324.json b/docs/data/histograms/Switzerland/3006324.json
index cd1e7837557..e6daf812885 100644
--- a/docs/data/histograms/Switzerland/3006324.json
+++ b/docs/data/histograms/Switzerland/3006324.json
@@ -1 +1 @@
-{"batchcode": "3006324", "histograms": [{"batchcodes": ["3006324"], "histogram": {"Pruritus": 5, "Urticaria": 4, "Haemoglobin": 2, "Angioedema": 1, "Asthma": 1, "Axial spondyloarthritis": 1, "Blister": 1, "Blood cholesterol": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Cytogenetic analysis": 1, "Cytology": 1, "Dyspnoea": 1, "Electrophoresis": 1, "Fear of death": 1, "Headache": 1, "Herpes zoster cutaneous disseminated": 1, "Histology": 1, "Hypergammaglobulinaemia benign monoclonal": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Light chain analysis": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Mechanical urticaria": 1, "Monoclonal gammopathy": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral spondyloarthritis": 1, "Peripheral swelling": 1, "Polymyalgia rheumatica": 1, "Respiratory distress": 1, "Serum ferritin": 1, "Skin burning sensation": 1, "Skin reaction": 1, "Tachycardia": 1, "Trigeminal neuralgia": 1, "Urticaria chronic": 1, "Vitamin B12": 1}}]}
\ No newline at end of file
+{"batchcode": "3006324", "histograms": [{"histogram": {"Pruritus": 5, "Urticaria": 4, "Haemoglobin": 2, "Angioedema": 1, "Asthma": 1, "Axial spondyloarthritis": 1, "Blister": 1, "Blood cholesterol": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Cytogenetic analysis": 1, "Cytology": 1, "Dyspnoea": 1, "Electrophoresis": 1, "Fear of death": 1, "Headache": 1, "Herpes zoster cutaneous disseminated": 1, "Histology": 1, "Hypergammaglobulinaemia benign monoclonal": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Laboratory test": 1, "Light chain analysis": 1, "Liver function test": 1, "Magnetic resonance imaging": 1, "Mechanical urticaria": 1, "Monoclonal gammopathy": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral spondyloarthritis": 1, "Peripheral swelling": 1, "Polymyalgia rheumatica": 1, "Respiratory distress": 1, "Serum ferritin": 1, "Skin burning sensation": 1, "Skin reaction": 1, "Tachycardia": 1, "Trigeminal neuralgia": 1, "Urticaria chronic": 1, "Vitamin B12": 1}, "batchcodes": ["3006324"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3006372.json b/docs/data/histograms/Switzerland/3006372.json
index 142fc4b8621..e67589914e3 100644
--- a/docs/data/histograms/Switzerland/3006372.json
+++ b/docs/data/histograms/Switzerland/3006372.json
@@ -1 +1 @@
-{"batchcode": "3006372", "histograms": [{"batchcodes": ["3006372"], "histogram": {"Anaphylactic shock": 1, "Circulatory collapse": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "3006372", "histograms": [{"histogram": {"Anaphylactic shock": 1, "Circulatory collapse": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["3006372"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/300918.json b/docs/data/histograms/Switzerland/300918.json
index 8e46119851b..d5c5cfb1b4e 100644
--- a/docs/data/histograms/Switzerland/300918.json
+++ b/docs/data/histograms/Switzerland/300918.json
@@ -1 +1 @@
-{"batchcode": "300918", "histograms": [{"batchcodes": ["300918"], "histogram": {"Facial paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "300918", "histograms": [{"histogram": {"Facial paralysis": 1}, "batchcodes": ["300918"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/301530.json b/docs/data/histograms/Switzerland/301530.json
index 594877cf83a..3fba98c5070 100644
--- a/docs/data/histograms/Switzerland/301530.json
+++ b/docs/data/histograms/Switzerland/301530.json
@@ -1 +1 @@
-{"batchcode": "301530", "histograms": [{"batchcodes": ["301530"], "histogram": {"Anxiety": 1, "Headache": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pyrexia": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "301530", "histograms": [{"histogram": {"Anxiety": 1, "Headache": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pyrexia": 1, "Tachycardia": 1}, "batchcodes": ["301530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/302544.json b/docs/data/histograms/Switzerland/302544.json
index 23ef098ffe7..0ea29075cde 100644
--- a/docs/data/histograms/Switzerland/302544.json
+++ b/docs/data/histograms/Switzerland/302544.json
@@ -1 +1 @@
-{"batchcode": "302544", "histograms": [{"batchcodes": ["302544"], "histogram": {"Chills": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "302544", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["302544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3038077700688 /.json b/docs/data/histograms/Switzerland/3038077700688 /.json
index 51ebd7686d2..5b3a838f51b 100644
--- a/docs/data/histograms/Switzerland/3038077700688 /.json
+++ b/docs/data/histograms/Switzerland/3038077700688 /.json
@@ -1 +1 @@
-{"batchcode": "3038077700688 /", "histograms": [{"batchcodes": ["3038077700688 /"], "histogram": {"Deep vein thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "3038077700688 /", "histograms": [{"histogram": {"Deep vein thrombosis": 1}, "batchcodes": ["3038077700688 /"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30380777700.json b/docs/data/histograms/Switzerland/30380777700.json
index 5d9610d2c37..fcfe79e7a06 100644
--- a/docs/data/histograms/Switzerland/30380777700.json
+++ b/docs/data/histograms/Switzerland/30380777700.json
@@ -1 +1 @@
-{"batchcode": "30380777700", "histograms": [{"batchcodes": ["30380777700"], "histogram": {"Bladder disorder": 1, "Cardiovascular disorder": 1, "Chills": 1, "Growing pains": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "30380777700", "histograms": [{"histogram": {"Bladder disorder": 1, "Cardiovascular disorder": 1, "Chills": 1, "Growing pains": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["30380777700"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30380777700688,.json b/docs/data/histograms/Switzerland/30380777700688,.json
index 7f6a93cfb28..62dc0da8b0b 100644
--- a/docs/data/histograms/Switzerland/30380777700688,.json
+++ b/docs/data/histograms/Switzerland/30380777700688,.json
@@ -1 +1 @@
-{"batchcode": "30380777700688,", "histograms": [{"batchcodes": ["30380777700688,"], "histogram": {"Chest discomfort": 1, "Myocarditis": 1, "Palpitations": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "30380777700688,", "histograms": [{"histogram": {"Chest discomfort": 1, "Myocarditis": 1, "Palpitations": 1, "Urticaria": 1}, "batchcodes": ["30380777700688,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30380777700688.json b/docs/data/histograms/Switzerland/30380777700688.json
index 297d23e3b5c..e84d1053a56 100644
--- a/docs/data/histograms/Switzerland/30380777700688.json
+++ b/docs/data/histograms/Switzerland/30380777700688.json
@@ -1 +1 @@
-{"batchcode": "30380777700688", "histograms": [{"batchcodes": ["30380777700688"], "histogram": {"Pyrexia": 10, "Chills": 8, "Headache": 6, "Myalgia": 6, "Nausea": 5, "Dizziness": 4, "Fatigue": 4, "Injection site pain": 4, "Pulmonary embolism": 4, "Abdominal pain": 3, "Diarrhoea": 3, "Dyspnoea": 3, "Electrocardiogram": 3, "Pain in extremity": 3, "Syncope": 3, "Vomiting": 3, "C-reactive protein": 2, "Deep vein thrombosis": 2, "Pericarditis": 2, "Abdominal discomfort": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Adnexa uteri pain": 1, "Arthralgia": 1, "Asthma": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Chorea": 1, "Computerised tomogram": 1, "Constipation": 1, "Cough": 1, "Cystitis noninfective": 1, "Death": 1, "Disorientation": 1, "Echocardiogram": 1, "Encephalopathy": 1, "Epilepsy": 1, "Genital herpes zoster": 1, "Growing pains": 1, "Heart rate": 1, "Hepatic pain": 1, "Herpes simplex": 1, "Herpes zoster oticus": 1, "Hyperhidrosis": 1, "Hypovolaemia": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Insomnia": 1, "Laboratory test": 1, "Malaise": 1, "Memory impairment": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Periarthritis": 1, "Petechiae": 1, "Platelet count": 1, "Post herpetic neuralgia": 1, "Pruritus": 1, "Rash": 1, "Renal pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Sleep attacks": 1, "Somnolence": 1, "Specialist consultation": 1, "Sudden hearing loss": 1, "Troponin T": 1, "Vaccination failure": 1, "Vaccination site movement impairment": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "30380777700688", "histograms": [{"histogram": {"Pyrexia": 10, "Chills": 8, "Headache": 6, "Myalgia": 6, "Nausea": 5, "Dizziness": 4, "Fatigue": 4, "Injection site pain": 4, "Pulmonary embolism": 4, "Abdominal pain": 3, "Diarrhoea": 3, "Dyspnoea": 3, "Electrocardiogram": 3, "Pain in extremity": 3, "Syncope": 3, "Vomiting": 3, "C-reactive protein": 2, "Deep vein thrombosis": 2, "Pericarditis": 2, "Abdominal discomfort": 1, "Acute myocardial infarction": 1, "Acute respiratory failure": 1, "Adnexa uteri pain": 1, "Arthralgia": 1, "Asthma": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest pain": 1, "Chorea": 1, "Computerised tomogram": 1, "Constipation": 1, "Cough": 1, "Cystitis noninfective": 1, "Death": 1, "Disorientation": 1, "Echocardiogram": 1, "Encephalopathy": 1, "Epilepsy": 1, "Genital herpes zoster": 1, "Growing pains": 1, "Heart rate": 1, "Hepatic pain": 1, "Herpes simplex": 1, "Herpes zoster oticus": 1, "Hyperhidrosis": 1, "Hypovolaemia": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Insomnia": 1, "Laboratory test": 1, "Malaise": 1, "Memory impairment": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Ophthalmic herpes zoster": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Periarthritis": 1, "Petechiae": 1, "Platelet count": 1, "Post herpetic neuralgia": 1, "Pruritus": 1, "Rash": 1, "Renal pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Sleep attacks": 1, "Somnolence": 1, "Specialist consultation": 1, "Sudden hearing loss": 1, "Troponin T": 1, "Vaccination failure": 1, "Vaccination site movement impairment": 1, "Vasculitis": 1}, "batchcodes": ["30380777700688"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30380777700688/.json b/docs/data/histograms/Switzerland/30380777700688/.json
index f40c5f527d1..7cf7e9f8e5b 100644
--- a/docs/data/histograms/Switzerland/30380777700688/.json
+++ b/docs/data/histograms/Switzerland/30380777700688/.json
@@ -1 +1 @@
-{"batchcode": "30380777700688/", "histograms": [{"batchcodes": ["30380777700688/"], "histogram": {"Chest pain": 1, "Magnetic resonance imaging": 1, "Pulmonary embolism": 1, "Radiculopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "30380777700688/", "histograms": [{"histogram": {"Chest pain": 1, "Magnetic resonance imaging": 1, "Pulmonary embolism": 1, "Radiculopathy": 1}, "batchcodes": ["30380777700688/"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3042460.json b/docs/data/histograms/Switzerland/3042460.json
index 7432925c486..35a88022311 100644
--- a/docs/data/histograms/Switzerland/3042460.json
+++ b/docs/data/histograms/Switzerland/3042460.json
@@ -1 +1 @@
-{"batchcode": "3042460", "histograms": [{"batchcodes": ["3042460"], "histogram": {"Blood thyroid stimulating hormone": 1, "Borrelia test": 1, "C-reactive protein": 1, "Cytomegalovirus test": 1, "Diplopia": 1, "Dizziness": 1, "HIV test": 1, "Herpes simplex": 1, "Infectious mononucleosis": 1, "Optic neuropathy": 1, "Red blood cell sedimentation rate": 1, "Syphilis": 1, "Vitamin B1": 1, "Vitamin B2": 1, "Vitamin B6": 1}}]}
\ No newline at end of file
+{"batchcode": "3042460", "histograms": [{"histogram": {"Blood thyroid stimulating hormone": 1, "Borrelia test": 1, "C-reactive protein": 1, "Cytomegalovirus test": 1, "Diplopia": 1, "Dizziness": 1, "HIV test": 1, "Herpes simplex": 1, "Infectious mononucleosis": 1, "Optic neuropathy": 1, "Red blood cell sedimentation rate": 1, "Syphilis": 1, "Vitamin B1": 1, "Vitamin B2": 1, "Vitamin B6": 1}, "batchcodes": ["3042460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/30496.json b/docs/data/histograms/Switzerland/30496.json
index 7e56bc9e77d..9af09185108 100644
--- a/docs/data/histograms/Switzerland/30496.json
+++ b/docs/data/histograms/Switzerland/30496.json
@@ -1 +1 @@
-{"batchcode": "30496", "histograms": [{"batchcodes": ["30496"], "histogram": {"Asthenia": 1, "Blood sodium": 1, "Hyponatraemia": 1, "Laboratory test abnormal": 1, "Nausea": 1, "Urine analysis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "30496", "histograms": [{"histogram": {"Asthenia": 1, "Blood sodium": 1, "Hyponatraemia": 1, "Laboratory test abnormal": 1, "Nausea": 1, "Urine analysis": 1, "Vomiting": 1}, "batchcodes": ["30496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/3132760.json b/docs/data/histograms/Switzerland/3132760.json
index de468b1b389..ae1b5b89b41 100644
--- a/docs/data/histograms/Switzerland/3132760.json
+++ b/docs/data/histograms/Switzerland/3132760.json
@@ -1 +1 @@
-{"batchcode": "3132760", "histograms": [{"batchcodes": ["3132760"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Insomnia": 1}}]}
\ No newline at end of file
+{"batchcode": "3132760", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Insomnia": 1}, "batchcodes": ["3132760"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/34215.json b/docs/data/histograms/Switzerland/34215.json
index f4df0dc4afd..ca0cbbe6a60 100644
--- a/docs/data/histograms/Switzerland/34215.json
+++ b/docs/data/histograms/Switzerland/34215.json
@@ -1 +1 @@
-{"batchcode": "34215", "histograms": [{"batchcodes": ["34215"], "histogram": {"Hypoglycaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "34215", "histograms": [{"histogram": {"Hypoglycaemia": 1}, "batchcodes": ["34215"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/4.json b/docs/data/histograms/Switzerland/4.json
index 69997142308..6c60ffedd22 100644
--- a/docs/data/histograms/Switzerland/4.json
+++ b/docs/data/histograms/Switzerland/4.json
@@ -1 +1 @@
-{"batchcode": "4", "histograms": [{"batchcodes": ["4"], "histogram": {"Dizziness": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "4", "histograms": [{"histogram": {"Dizziness": 1, "Nausea": 1}, "batchcodes": ["4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/46FEEFDDBD88D64.json b/docs/data/histograms/Switzerland/46FEEFDDBD88D64.json
index 25ba6cf9b38..9649356df09 100644
--- a/docs/data/histograms/Switzerland/46FEEFDDBD88D64.json
+++ b/docs/data/histograms/Switzerland/46FEEFDDBD88D64.json
@@ -1 +1 @@
-{"batchcode": "46FEEFDDBD88D64", "histograms": [{"batchcodes": ["46FEEFDDBD88D64"], "histogram": {"Angioedema": 1}}]}
\ No newline at end of file
+{"batchcode": "46FEEFDDBD88D64", "histograms": [{"histogram": {"Angioedema": 1}, "batchcodes": ["46FEEFDDBD88D64"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/5005238.json b/docs/data/histograms/Switzerland/5005238.json
index 70645bfc95d..0f5023bfba6 100644
--- a/docs/data/histograms/Switzerland/5005238.json
+++ b/docs/data/histograms/Switzerland/5005238.json
@@ -1 +1 @@
-{"batchcode": "5005238", "histograms": [{"batchcodes": ["5005238"], "histogram": {"Computerised tomogram": 1, "Deep vein thrombosis": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "5005238", "histograms": [{"histogram": {"Computerised tomogram": 1, "Deep vein thrombosis": 1, "Pulmonary embolism": 1}, "batchcodes": ["5005238"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/68225.json b/docs/data/histograms/Switzerland/68225.json
index c5ae50c0c38..8b5838c0598 100644
--- a/docs/data/histograms/Switzerland/68225.json
+++ b/docs/data/histograms/Switzerland/68225.json
@@ -1 +1 @@
-{"batchcode": "68225", "histograms": [{"batchcodes": ["68225"], "histogram": {"C-reactive protein": 1, "Petechiae": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "68225", "histograms": [{"histogram": {"C-reactive protein": 1, "Petechiae": 1, "Vasculitis": 1}, "batchcodes": ["68225"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/76806822250011.json b/docs/data/histograms/Switzerland/76806822250011.json
index 8fc437b836e..36efb590e90 100644
--- a/docs/data/histograms/Switzerland/76806822250011.json
+++ b/docs/data/histograms/Switzerland/76806822250011.json
@@ -1 +1 @@
-{"batchcode": "76806822250011", "histograms": [{"batchcodes": ["76806822250011"], "histogram": {"Babinski reflex test": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Chills": 1, "Coma scale": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Headache": 1, "Heart rate": 1, "Heart sounds": 1, "Investigation": 1, "Malaise": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Romberg test": 1, "Syncope": 1, "Upper motor neurone lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "76806822250011", "histograms": [{"histogram": {"Babinski reflex test": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Chills": 1, "Coma scale": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Headache": 1, "Heart rate": 1, "Heart sounds": 1, "Investigation": 1, "Malaise": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Romberg test": 1, "Syncope": 1, "Upper motor neurone lesion": 1}, "batchcodes": ["76806822250011"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/7680682250011.json b/docs/data/histograms/Switzerland/7680682250011.json
index 2393500dca6..eaf13caeb2b 100644
--- a/docs/data/histograms/Switzerland/7680682250011.json
+++ b/docs/data/histograms/Switzerland/7680682250011.json
@@ -1 +1 @@
-{"batchcode": "7680682250011", "histograms": [{"batchcodes": ["7680682250011"], "histogram": {"Herpes zoster": 3, "Arthralgia": 2, "Computerised tomogram head": 2, "Dyspnoea": 2, "Fatigue": 2, "Neuralgia": 2, "Apathy": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Body mass index": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cerebral artery occlusion": 1, "Cerebral atrophy": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Confusional state": 1, "Coordination abnormal": 1, "Dizziness": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electroneuromyography": 1, "Erythema migrans": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gross motor delay": 1, "Headache": 1, "Hyperreflexia": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Intervertebral disc protrusion": 1, "Intervertebral disc space narrowing": 1, "Intracranial aneurysm": 1, "Intracranial pressure increased": 1, "Joint dislocation": 1, "Leukoencephalopathy": 1, "Listless": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging spinal": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myelomalacia": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Nuchal rigidity": 1, "Off label use": 1, "Office visit": 1, "Panic attack": 1, "Paraesthesia": 1, "Phobic postural vertigo": 1, "Pityriasis rosea": 1, "Pulmonary embolism": 1, "Retinal artery occlusion": 1, "Schellong test": 1, "Skin disorder": 1, "Specialist consultation": 1, "Spinal osteoarthritis": 1, "Syncope": 1, "Tendon rupture": 1, "Ultrasound scan": 1, "Vascular encephalopathy": 1, "Vertebral foraminal stenosis": 1, "Vertigo": 1, "Vertigo positional": 1, "Vision blurred": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "7680682250011", "histograms": [{"histogram": {"Herpes zoster": 3, "Arthralgia": 2, "Computerised tomogram head": 2, "Dyspnoea": 2, "Fatigue": 2, "Neuralgia": 2, "Apathy": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "Body mass index": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cerebral artery occlusion": 1, "Cerebral atrophy": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Confusional state": 1, "Coordination abnormal": 1, "Dizziness": 1, "Dysstasia": 1, "Echocardiogram": 1, "Electroneuromyography": 1, "Erythema migrans": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gross motor delay": 1, "Headache": 1, "Hyperreflexia": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Intervertebral disc protrusion": 1, "Intervertebral disc space narrowing": 1, "Intracranial aneurysm": 1, "Intracranial pressure increased": 1, "Joint dislocation": 1, "Leukoencephalopathy": 1, "Listless": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Magnetic resonance imaging spinal": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Myelomalacia": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Nuchal rigidity": 1, "Off label use": 1, "Office visit": 1, "Panic attack": 1, "Paraesthesia": 1, "Phobic postural vertigo": 1, "Pityriasis rosea": 1, "Pulmonary embolism": 1, "Retinal artery occlusion": 1, "Schellong test": 1, "Skin disorder": 1, "Specialist consultation": 1, "Spinal osteoarthritis": 1, "Syncope": 1, "Tendon rupture": 1, "Ultrasound scan": 1, "Vascular encephalopathy": 1, "Vertebral foraminal stenosis": 1, "Vertigo": 1, "Vertigo positional": 1, "Vision blurred": 1, "X-ray": 1}, "batchcodes": ["7680682250011"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/7F64101643D3161.json b/docs/data/histograms/Switzerland/7F64101643D3161.json
index a944edd04c7..f24a028fcf7 100644
--- a/docs/data/histograms/Switzerland/7F64101643D3161.json
+++ b/docs/data/histograms/Switzerland/7F64101643D3161.json
@@ -1 +1 @@
-{"batchcode": "7F64101643D3161", "histograms": [{"batchcodes": ["7F64101643D3161"], "histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "7F64101643D3161", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["7F64101643D3161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/88332A.json b/docs/data/histograms/Switzerland/88332A.json
index 068d2e41281..ffbb1b96c2a 100644
--- a/docs/data/histograms/Switzerland/88332A.json
+++ b/docs/data/histograms/Switzerland/88332A.json
@@ -1 +1 @@
-{"batchcode": "88332A", "histograms": [{"batchcodes": ["88332A"], "histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "88332A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["88332A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/8A9Z2L.json b/docs/data/histograms/Switzerland/8A9Z2L.json
index 358b015502c..63df1874431 100644
--- a/docs/data/histograms/Switzerland/8A9Z2L.json
+++ b/docs/data/histograms/Switzerland/8A9Z2L.json
@@ -1 +1 @@
-{"batchcode": "8A9Z2L", "histograms": [{"batchcodes": ["8A9Z2L"], "histogram": {"Ear discomfort": 1, "Herpes zoster": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "8A9Z2L", "histograms": [{"histogram": {"Ear discomfort": 1, "Herpes zoster": 1, "Hypoaesthesia": 1}, "batchcodes": ["8A9Z2L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/9.json b/docs/data/histograms/Switzerland/9.json
index 6d17a3d3b2f..bdc162261ca 100644
--- a/docs/data/histograms/Switzerland/9.json
+++ b/docs/data/histograms/Switzerland/9.json
@@ -1 +1 @@
-{"batchcode": "9", "histograms": [{"batchcodes": ["9"], "histogram": {"Asthenia": 1, "Chills": 1, "Feeling of despair": 1, "Injection site reaction": 1, "Muscle spasms": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "9", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Feeling of despair": 1, "Injection site reaction": 1, "Muscle spasms": 1, "Pain in extremity": 1}, "batchcodes": ["9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/9256D1A4BEA2ABC.json b/docs/data/histograms/Switzerland/9256D1A4BEA2ABC.json
index bdaeed5e180..d10223381b3 100644
--- a/docs/data/histograms/Switzerland/9256D1A4BEA2ABC.json
+++ b/docs/data/histograms/Switzerland/9256D1A4BEA2ABC.json
@@ -1 +1 @@
-{"batchcode": "9256D1A4BEA2ABC", "histograms": [{"batchcodes": ["9256D1A4BEA2ABC"], "histogram": {"Asthenia": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Influenza like illness": 1, "Insomnia": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Oral herpes": 1, "Palpitations": 1, "Paraesthesia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "9256D1A4BEA2ABC", "histograms": [{"histogram": {"Asthenia": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Influenza like illness": 1, "Insomnia": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Oral herpes": 1, "Palpitations": 1, "Paraesthesia": 1, "Tremor": 1}, "batchcodes": ["9256D1A4BEA2ABC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/99705C49FBDB849.json b/docs/data/histograms/Switzerland/99705C49FBDB849.json
index a7f8e14ce78..21bd5cfbcd6 100644
--- a/docs/data/histograms/Switzerland/99705C49FBDB849.json
+++ b/docs/data/histograms/Switzerland/99705C49FBDB849.json
@@ -1 +1 @@
-{"batchcode": "99705C49FBDB849", "histograms": [{"batchcodes": ["99705C49FBDB849"], "histogram": {"Body temperature": 1, "Chest pain": 1, "Depressed mood": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Retinitis": 1}}]}
\ No newline at end of file
+{"batchcode": "99705C49FBDB849", "histograms": [{"histogram": {"Body temperature": 1, "Chest pain": 1, "Depressed mood": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Retinitis": 1}, "batchcodes": ["99705C49FBDB849"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/9A4D5858BC6DF27.json b/docs/data/histograms/Switzerland/9A4D5858BC6DF27.json
index e27e6493d99..c259336495b 100644
--- a/docs/data/histograms/Switzerland/9A4D5858BC6DF27.json
+++ b/docs/data/histograms/Switzerland/9A4D5858BC6DF27.json
@@ -1 +1 @@
-{"batchcode": "9A4D5858BC6DF27", "histograms": [{"batchcodes": ["9A4D5858BC6DF27"], "histogram": {"Genital herpes": 1}}]}
\ No newline at end of file
+{"batchcode": "9A4D5858BC6DF27", "histograms": [{"histogram": {"Genital herpes": 1}, "batchcodes": ["9A4D5858BC6DF27"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/9D9DC45BC5C26BF.json b/docs/data/histograms/Switzerland/9D9DC45BC5C26BF.json
index 1d090d707aa..2a002d20a50 100644
--- a/docs/data/histograms/Switzerland/9D9DC45BC5C26BF.json
+++ b/docs/data/histograms/Switzerland/9D9DC45BC5C26BF.json
@@ -1 +1 @@
-{"batchcode": "9D9DC45BC5C26BF", "histograms": [{"batchcodes": ["9D9DC45BC5C26BF"], "histogram": {"Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "9D9DC45BC5C26BF", "histograms": [{"histogram": {"Muscular weakness": 1}, "batchcodes": ["9D9DC45BC5C26BF"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/A2251D3.json b/docs/data/histograms/Switzerland/A2251D3.json
index a208f1a2486..0fb2e38359e 100644
--- a/docs/data/histograms/Switzerland/A2251D3.json
+++ b/docs/data/histograms/Switzerland/A2251D3.json
@@ -1 +1 @@
-{"batchcode": "A2251D3", "histograms": [{"batchcodes": ["A2251D3"], "histogram": {"Headache": 1, "Injection site reaction": 1, "Myalgia": 1, "Pyrexia": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "A2251D3", "histograms": [{"histogram": {"Headache": 1, "Injection site reaction": 1, "Myalgia": 1, "Pyrexia": 1, "Sleep disorder": 1}, "batchcodes": ["A2251D3"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/A271E2BEA93C499.json b/docs/data/histograms/Switzerland/A271E2BEA93C499.json
index 528380a4757..d688c856348 100644
--- a/docs/data/histograms/Switzerland/A271E2BEA93C499.json
+++ b/docs/data/histograms/Switzerland/A271E2BEA93C499.json
@@ -1 +1 @@
-{"batchcode": "A271E2BEA93C499", "histograms": [{"batchcodes": ["A271E2BEA93C499"], "histogram": {"Hypoaesthesia": 1, "Injection site pain": 1, "Muscle strength abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "A271E2BEA93C499", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Injection site pain": 1, "Muscle strength abnormal": 1}, "batchcodes": ["A271E2BEA93C499"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/A5FF3467 F37B09.json b/docs/data/histograms/Switzerland/A5FF3467 F37B09.json
index ea6f46ff484..9615565c4d3 100644
--- a/docs/data/histograms/Switzerland/A5FF3467 F37B09.json
+++ b/docs/data/histograms/Switzerland/A5FF3467 F37B09.json
@@ -1 +1 @@
-{"batchcode": "A5FF3467 F37B09", "histograms": [{"batchcodes": ["A5FF3467 F37B09"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Dizziness": 1, "Ear discomfort": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Parosmia": 1, "Tachycardia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "A5FF3467 F37B09", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Dizziness": 1, "Ear discomfort": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Parosmia": 1, "Tachycardia": 1, "Tinnitus": 1}, "batchcodes": ["A5FF3467 F37B09"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/AA5BA7C4D9A2EDB.json b/docs/data/histograms/Switzerland/AA5BA7C4D9A2EDB.json
index 489f9783326..b2b02d75191 100644
--- a/docs/data/histograms/Switzerland/AA5BA7C4D9A2EDB.json
+++ b/docs/data/histograms/Switzerland/AA5BA7C4D9A2EDB.json
@@ -1 +1 @@
-{"batchcode": "AA5BA7C4D9A2EDB", "histograms": [{"batchcodes": ["AA5BA7C4D9A2EDB"], "histogram": {"Ophthalmological examination": 1, "Retinal detachment": 1, "Visual impairment": 1, "Vitreous haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "AA5BA7C4D9A2EDB", "histograms": [{"histogram": {"Ophthalmological examination": 1, "Retinal detachment": 1, "Visual impairment": 1, "Vitreous haemorrhage": 1}, "batchcodes": ["AA5BA7C4D9A2EDB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/AB25320.json b/docs/data/histograms/Switzerland/AB25320.json
index 20f560233cf..34bffe19d2b 100644
--- a/docs/data/histograms/Switzerland/AB25320.json
+++ b/docs/data/histograms/Switzerland/AB25320.json
@@ -1 +1 @@
-{"batchcode": "AB25320", "histograms": [{"batchcodes": ["AB25320"], "histogram": {"Asthenia": 1, "Burning sensation": 1, "Chest pain": 1, "Dyspnoea": 1, "Feeling of despair": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Syncope": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "AB25320", "histograms": [{"histogram": {"Asthenia": 1, "Burning sensation": 1, "Chest pain": 1, "Dyspnoea": 1, "Feeling of despair": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Syncope": 1, "Tachycardia": 1}, "batchcodes": ["AB25320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/AB85320.json b/docs/data/histograms/Switzerland/AB85320.json
index 6981fa10678..e114104fd63 100644
--- a/docs/data/histograms/Switzerland/AB85320.json
+++ b/docs/data/histograms/Switzerland/AB85320.json
@@ -1 +1 @@
-{"batchcode": "AB85320", "histograms": [{"batchcodes": ["AB85320"], "histogram": {"Myalgia": 1, "Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "AB85320", "histograms": [{"histogram": {"Myalgia": 1, "Myocardial infarction": 1}, "batchcodes": ["AB85320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ABZ 5320.json b/docs/data/histograms/Switzerland/ABZ 5320.json
index be498626ea8..1ab8c04edca 100644
--- a/docs/data/histograms/Switzerland/ABZ 5320.json
+++ b/docs/data/histograms/Switzerland/ABZ 5320.json
@@ -1 +1 @@
-{"batchcode": "ABZ 5320", "histograms": [{"batchcodes": ["ABZ 5320"], "histogram": {"Purpura": 1, "Venous thrombosis limb": 1}}]}
\ No newline at end of file
+{"batchcode": "ABZ 5320", "histograms": [{"histogram": {"Purpura": 1, "Venous thrombosis limb": 1}, "batchcodes": ["ABZ 5320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ABZ5320.json b/docs/data/histograms/Switzerland/ABZ5320.json
index cd4673972c1..c19f80683e4 100644
--- a/docs/data/histograms/Switzerland/ABZ5320.json
+++ b/docs/data/histograms/Switzerland/ABZ5320.json
@@ -1 +1 @@
-{"batchcode": "ABZ5320", "histograms": [{"batchcodes": ["ABZ5320"], "histogram": {"Dizziness": 6, "Headache": 6, "Pyrexia": 6, "Fatigue": 5, "Vision blurred": 4, "Musculoskeletal pain": 3, "Nausea": 3, "Pain in extremity": 3, "Angioedema": 2, "Arthralgia": 2, "Asthenia": 2, "Chills": 2, "Disturbance in attention": 2, "Dyspnoea": 2, "Injection site pain": 2, "Muscle spasms": 2, "Paraesthesia": 2, "Sleep disorder": 2, "Tachycardia": 2, "Tinnitus": 2, "Urticaria": 2, "Abdominal pain": 1, "Ageusia": 1, "Application site coldness": 1, "Back pain": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blood test": 1, "Bone pain": 1, "Chest X-ray abnormal": 1, "Diarrhoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Erectile dysfunction": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Flatulence": 1, "Gastrointestinal disorder": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Myocarditis": 1, "Neuralgia": 1, "Neurodermatitis": 1, "New daily persistent headache": 1, "Ophthalmological examination": 1, "Pain": 1, "Pericarditis": 1, "Premenstrual pain": 1, "Rash": 1, "Skin reaction": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "ABZ5320", "histograms": [{"histogram": {"Dizziness": 6, "Headache": 6, "Pyrexia": 6, "Fatigue": 5, "Vision blurred": 4, "Musculoskeletal pain": 3, "Nausea": 3, "Pain in extremity": 3, "Angioedema": 2, "Arthralgia": 2, "Asthenia": 2, "Chills": 2, "Disturbance in attention": 2, "Dyspnoea": 2, "Injection site pain": 2, "Muscle spasms": 2, "Paraesthesia": 2, "Sleep disorder": 2, "Tachycardia": 2, "Tinnitus": 2, "Urticaria": 2, "Abdominal pain": 1, "Ageusia": 1, "Application site coldness": 1, "Back pain": 1, "Balance disorder": 1, "Bell's palsy": 1, "Blood test": 1, "Bone pain": 1, "Chest X-ray abnormal": 1, "Diarrhoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Erectile dysfunction": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Flatulence": 1, "Gastrointestinal disorder": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Myocarditis": 1, "Neuralgia": 1, "Neurodermatitis": 1, "New daily persistent headache": 1, "Ophthalmological examination": 1, "Pain": 1, "Pericarditis": 1, "Premenstrual pain": 1, "Rash": 1, "Skin reaction": 1, "Somnolence": 1}, "batchcodes": ["ABZ5320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/AC7D726223EC08C.json b/docs/data/histograms/Switzerland/AC7D726223EC08C.json
index 8299e2a49f8..9e6747365f4 100644
--- a/docs/data/histograms/Switzerland/AC7D726223EC08C.json
+++ b/docs/data/histograms/Switzerland/AC7D726223EC08C.json
@@ -1 +1 @@
-{"batchcode": "AC7D726223EC08C", "histograms": [{"batchcodes": ["AC7D726223EC08C"], "histogram": {"Angina pectoris": 2, "Electrocardiogram": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Angiocardiogram": 1, "Angiogram": 1}}]}
\ No newline at end of file
+{"batchcode": "AC7D726223EC08C", "histograms": [{"histogram": {"Angina pectoris": 2, "Electrocardiogram": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Angiocardiogram": 1, "Angiogram": 1}, "batchcodes": ["AC7D726223EC08C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ARZ75320.json b/docs/data/histograms/Switzerland/ARZ75320.json
index e5d09259bc4..4a1463d4755 100644
--- a/docs/data/histograms/Switzerland/ARZ75320.json
+++ b/docs/data/histograms/Switzerland/ARZ75320.json
@@ -1 +1 @@
-{"batchcode": "ARZ75320", "histograms": [{"batchcodes": ["ARZ75320"], "histogram": {"Tinnitus": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "ARZ75320", "histograms": [{"histogram": {"Tinnitus": 1, "Visual impairment": 1}, "batchcodes": ["ARZ75320"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ASKU.json b/docs/data/histograms/Switzerland/ASKU.json
index b5fffc47876..498444c72a9 100644
--- a/docs/data/histograms/Switzerland/ASKU.json
+++ b/docs/data/histograms/Switzerland/ASKU.json
@@ -1 +1 @@
-{"batchcode": "ASKU", "histograms": [{"batchcodes": ["ASKU"], "histogram": {"Arrhythmia": 1, "Chills": 1, "Decreased appetite": 1, "Depression": 1, "Pain": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Psoriasis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ASKU", "histograms": [{"histogram": {"Arrhythmia": 1, "Chills": 1, "Decreased appetite": 1, "Depression": 1, "Pain": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Psoriasis": 1, "Pyrexia": 1}, "batchcodes": ["ASKU"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/AXWQY2.json b/docs/data/histograms/Switzerland/AXWQY2.json
index 062b90a64c5..01f197af1d8 100644
--- a/docs/data/histograms/Switzerland/AXWQY2.json
+++ b/docs/data/histograms/Switzerland/AXWQY2.json
@@ -1 +1 @@
-{"batchcode": "AXWQY2", "histograms": [{"batchcodes": ["AXWQY2"], "histogram": {"Eczema": 1, "Facial pain": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "AXWQY2", "histograms": [{"histogram": {"Eczema": 1, "Facial pain": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1, "Swelling face": 1}, "batchcodes": ["AXWQY2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/BNT162B2.json b/docs/data/histograms/Switzerland/BNT162B2.json
index 2c4f524edea..a7ceee4d136 100644
--- a/docs/data/histograms/Switzerland/BNT162B2.json
+++ b/docs/data/histograms/Switzerland/BNT162B2.json
@@ -1 +1 @@
-{"batchcode": "BNT162B2", "histograms": [{"batchcodes": ["BNT162B2"], "histogram": {"Cerebrovascular accident": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Magnetic resonance imaging": 1, "Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "BNT162B2", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Magnetic resonance imaging": 1, "Transient ischaemic attack": 1}, "batchcodes": ["BNT162B2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/BX8679.json b/docs/data/histograms/Switzerland/BX8679.json
index 225dc2b89c0..3594191bd55 100644
--- a/docs/data/histograms/Switzerland/BX8679.json
+++ b/docs/data/histograms/Switzerland/BX8679.json
@@ -1 +1 @@
-{"batchcode": "BX8679", "histograms": [{"batchcodes": ["BX8679"], "histogram": {"Angina pectoris": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "BX8679", "histograms": [{"histogram": {"Angina pectoris": 1, "Fatigue": 1}, "batchcodes": ["BX8679"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/CH.-B.:1D016A.json b/docs/data/histograms/Switzerland/CH.-B.:1D016A.json
index 9b4e0637583..c83846a063e 100644
--- a/docs/data/histograms/Switzerland/CH.-B.:1D016A.json
+++ b/docs/data/histograms/Switzerland/CH.-B.:1D016A.json
@@ -1 +1 @@
-{"batchcode": "CH.-B.:1D016A", "histograms": [{"batchcodes": ["CH.-B.:1D016A"], "histogram": {"Amenorrhoea": 1, "Arthralgia": 1, "Blood prolactin": 1, "Blood prolactin increased": 1, "Depression": 1, "Fatigue": 1, "Menstruation irregular": 1, "Premature menopause": 1}}]}
\ No newline at end of file
+{"batchcode": "CH.-B.:1D016A", "histograms": [{"histogram": {"Amenorrhoea": 1, "Arthralgia": 1, "Blood prolactin": 1, "Blood prolactin increased": 1, "Depression": 1, "Fatigue": 1, "Menstruation irregular": 1, "Premature menopause": 1}, "batchcodes": ["CH.-B.:1D016A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/CH2A9A5B4AFFE93.json b/docs/data/histograms/Switzerland/CH2A9A5B4AFFE93.json
index 55eb4ebe580..948ea5f987f 100644
--- a/docs/data/histograms/Switzerland/CH2A9A5B4AFFE93.json
+++ b/docs/data/histograms/Switzerland/CH2A9A5B4AFFE93.json
@@ -1 +1 @@
-{"batchcode": "CH2A9A5B4AFFE93", "histograms": [{"batchcodes": ["CH2A9A5B4AFFE93"], "histogram": {"Blood creatine phosphokinase": 1, "Rhabdomyolysis": 1}}]}
\ No newline at end of file
+{"batchcode": "CH2A9A5B4AFFE93", "histograms": [{"histogram": {"Blood creatine phosphokinase": 1, "Rhabdomyolysis": 1}, "batchcodes": ["CH2A9A5B4AFFE93"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/CH3001656.json b/docs/data/histograms/Switzerland/CH3001656.json
index 90ba25147ae..18dbf32cb6a 100644
--- a/docs/data/histograms/Switzerland/CH3001656.json
+++ b/docs/data/histograms/Switzerland/CH3001656.json
@@ -1 +1 @@
-{"batchcode": "CH3001656", "histograms": [{"batchcodes": ["CH3001656"], "histogram": {"Peripheral swelling": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "CH3001656", "histograms": [{"histogram": {"Peripheral swelling": 1, "Ultrasound Doppler": 1}, "batchcodes": ["CH3001656"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/CH: 4C414B33964.json b/docs/data/histograms/Switzerland/CH: 4C414B33964.json
index 0c85d37a12a..4a226234701 100644
--- a/docs/data/histograms/Switzerland/CH: 4C414B33964.json
+++ b/docs/data/histograms/Switzerland/CH: 4C414B33964.json
@@ -1 +1 @@
-{"batchcode": "CH: 4C414B33964", "histograms": [{"batchcodes": ["CH: 4C414B33964"], "histogram": {"Ventricular fibrillation": 1}}]}
\ No newline at end of file
+{"batchcode": "CH: 4C414B33964", "histograms": [{"histogram": {"Ventricular fibrillation": 1}, "batchcodes": ["CH: 4C414B33964"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/CH:32200357C047.json b/docs/data/histograms/Switzerland/CH:32200357C047.json
index 1e20868b65a..0fef9b6153e 100644
--- a/docs/data/histograms/Switzerland/CH:32200357C047.json
+++ b/docs/data/histograms/Switzerland/CH:32200357C047.json
@@ -1 +1 @@
-{"batchcode": "CH:32200357C047", "histograms": [{"batchcodes": ["CH:32200357C047"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "CH:32200357C047", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["CH:32200357C047"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/CHB 04 409 1 A.json b/docs/data/histograms/Switzerland/CHB 04 409 1 A.json
index 9c87491117a..317bacf9d32 100644
--- a/docs/data/histograms/Switzerland/CHB 04 409 1 A.json
+++ b/docs/data/histograms/Switzerland/CHB 04 409 1 A.json
@@ -1 +1 @@
-{"batchcode": "CHB 04 409 1 A", "histograms": [{"batchcodes": ["CHB 04 409 1 A"], "histogram": {"Burning sensation": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "CHB 04 409 1 A", "histograms": [{"histogram": {"Burning sensation": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["CHB 04 409 1 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/D730AA30A3C8313.json b/docs/data/histograms/Switzerland/D730AA30A3C8313.json
index 0899a4652e6..6247f820746 100644
--- a/docs/data/histograms/Switzerland/D730AA30A3C8313.json
+++ b/docs/data/histograms/Switzerland/D730AA30A3C8313.json
@@ -1 +1 @@
-{"batchcode": "D730AA30A3C8313", "histograms": [{"batchcodes": ["D730AA30A3C8313"], "histogram": {"Ischaemic stroke": 1}}]}
\ No newline at end of file
+{"batchcode": "D730AA30A3C8313", "histograms": [{"histogram": {"Ischaemic stroke": 1}, "batchcodes": ["D730AA30A3C8313"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/DEOCAB8643.json b/docs/data/histograms/Switzerland/DEOCAB8643.json
index 160af5c2be1..6fb377ce7bb 100644
--- a/docs/data/histograms/Switzerland/DEOCAB8643.json
+++ b/docs/data/histograms/Switzerland/DEOCAB8643.json
@@ -1 +1 @@
-{"batchcode": "DEOCAB8643", "histograms": [{"batchcodes": ["DEOCAB8643"], "histogram": {"Angiogram": 1, "Autoimmune eye disorder": 1, "Headache": 1, "Migraine": 1, "Nausea": 1, "Specialist consultation": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "DEOCAB8643", "histograms": [{"histogram": {"Angiogram": 1, "Autoimmune eye disorder": 1, "Headache": 1, "Migraine": 1, "Nausea": 1, "Specialist consultation": 1, "Visual impairment": 1}, "batchcodes": ["DEOCAB8643"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/E43014.json b/docs/data/histograms/Switzerland/E43014.json
index 7443dbc922a..9193a4d0e23 100644
--- a/docs/data/histograms/Switzerland/E43014.json
+++ b/docs/data/histograms/Switzerland/E43014.json
@@ -1 +1 @@
-{"batchcode": "E43014", "histograms": [{"batchcodes": ["E43014"], "histogram": {"Dizziness": 1, "Hot flush": 1, "Hypertension": 1, "Malaise": 1, "Sinus tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "E43014", "histograms": [{"histogram": {"Dizziness": 1, "Hot flush": 1, "Hypertension": 1, "Malaise": 1, "Sinus tachycardia": 1}, "batchcodes": ["E43014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/E56796.json b/docs/data/histograms/Switzerland/E56796.json
index 318177288c6..65bb49eaf80 100644
--- a/docs/data/histograms/Switzerland/E56796.json
+++ b/docs/data/histograms/Switzerland/E56796.json
@@ -1 +1 @@
-{"batchcode": "E56796", "histograms": [{"batchcodes": ["E56796"], "histogram": {"Asthenia": 1, "Feeling cold": 1, "Myalgia": 1, "Prostatic specific antigen": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Skin lesion": 1}}]}
\ No newline at end of file
+{"batchcode": "E56796", "histograms": [{"histogram": {"Asthenia": 1, "Feeling cold": 1, "Myalgia": 1, "Prostatic specific antigen": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Skin lesion": 1}, "batchcodes": ["E56796"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/E76788.json b/docs/data/histograms/Switzerland/E76788.json
index 70d8bba7d60..a4829de8b92 100644
--- a/docs/data/histograms/Switzerland/E76788.json
+++ b/docs/data/histograms/Switzerland/E76788.json
@@ -1 +1 @@
-{"batchcode": "E76788", "histograms": [{"batchcodes": ["E76788"], "histogram": {"Biopsy": 1, "Computerised tomogram": 1, "Magnetic resonance imaging": 1, "Positron emission tomogram": 1, "Taste disorder": 1, "Tongue paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "E76788", "histograms": [{"histogram": {"Biopsy": 1, "Computerised tomogram": 1, "Magnetic resonance imaging": 1, "Positron emission tomogram": 1, "Taste disorder": 1, "Tongue paralysis": 1}, "batchcodes": ["E76788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EBB5BF6017.json b/docs/data/histograms/Switzerland/EBB5BF6017.json
index ee2946ad27b..3a03886f83d 100644
--- a/docs/data/histograms/Switzerland/EBB5BF6017.json
+++ b/docs/data/histograms/Switzerland/EBB5BF6017.json
@@ -1 +1 @@
-{"batchcode": "EBB5BF6017", "histograms": [{"batchcodes": ["EBB5BF6017"], "histogram": {"Angiogram": 1, "Photophobia": 1, "Specialist consultation": 1, "Vitreous floaters": 1}}]}
\ No newline at end of file
+{"batchcode": "EBB5BF6017", "histograms": [{"histogram": {"Angiogram": 1, "Photophobia": 1, "Specialist consultation": 1, "Vitreous floaters": 1}, "batchcodes": ["EBB5BF6017"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EC3143.json b/docs/data/histograms/Switzerland/EC3143.json
index 471800d6b96..2a5cdb2fb3f 100644
--- a/docs/data/histograms/Switzerland/EC3143.json
+++ b/docs/data/histograms/Switzerland/EC3143.json
@@ -1 +1 @@
-{"batchcode": "EC3143", "histograms": [{"batchcodes": ["EC3143"], "histogram": {"Asthenia": 1, "Dyspnoea": 1, "Heart rate": 1, "Nausea": 1, "Paraesthesia": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "EC3143", "histograms": [{"histogram": {"Asthenia": 1, "Dyspnoea": 1, "Heart rate": 1, "Nausea": 1, "Paraesthesia": 1, "Tachycardia": 1}, "batchcodes": ["EC3143"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EH0477.json b/docs/data/histograms/Switzerland/EH0477.json
index ebc98ecc6fa..422678e35d2 100644
--- a/docs/data/histograms/Switzerland/EH0477.json
+++ b/docs/data/histograms/Switzerland/EH0477.json
@@ -1 +1 @@
-{"batchcode": "EH0477", "histograms": [{"batchcodes": ["EH0477"], "histogram": {"Anti-thyroid antibody": 1, "Basedow's disease": 1, "Blood folate": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Hypothyroidism": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroxine": 1, "Ultrasound thyroid": 1, "Vitamin B12": 1, "Vitamin D": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EH0477", "histograms": [{"histogram": {"Anti-thyroid antibody": 1, "Basedow's disease": 1, "Blood folate": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "C-reactive protein": 1, "Hypothyroidism": 1, "SARS-CoV-2 test": 1, "Serum ferritin": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroxine": 1, "Ultrasound thyroid": 1, "Vitamin B12": 1, "Vitamin D": 1, "White blood cell count": 1}, "batchcodes": ["EH0477"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EI0725.json b/docs/data/histograms/Switzerland/EI0725.json
index 77e783e3fd9..0d5d3e806b5 100644
--- a/docs/data/histograms/Switzerland/EI0725.json
+++ b/docs/data/histograms/Switzerland/EI0725.json
@@ -1 +1 @@
-{"batchcode": "EI0725", "histograms": [{"batchcodes": ["EI0725"], "histogram": {"Blood calcium": 1, "Blood chloride": 1, "Blood lactic acid": 1, "Blood pH": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Fibrin D dimer": 1, "Investigation": 1, "Malaise": 1, "PCO2": 1, "PO2": 1, "Syncope": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "EI0725", "histograms": [{"histogram": {"Blood calcium": 1, "Blood chloride": 1, "Blood lactic acid": 1, "Blood pH": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Fibrin D dimer": 1, "Investigation": 1, "Malaise": 1, "PCO2": 1, "PO2": 1, "Syncope": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound scan": 1}, "batchcodes": ["EI0725"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EI6796.json b/docs/data/histograms/Switzerland/EI6796.json
index d78917e6819..b0320338762 100644
--- a/docs/data/histograms/Switzerland/EI6796.json
+++ b/docs/data/histograms/Switzerland/EI6796.json
@@ -1 +1 @@
-{"batchcode": "EI6796", "histograms": [{"batchcodes": ["EI6796"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "EI6796", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["EI6796"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EJ 6788.json b/docs/data/histograms/Switzerland/EJ 6788.json
index 95a222e6246..dcc0732b4a0 100644
--- a/docs/data/histograms/Switzerland/EJ 6788.json
+++ b/docs/data/histograms/Switzerland/EJ 6788.json
@@ -1 +1 @@
-{"batchcode": "EJ 6788", "histograms": [{"batchcodes": ["EJ 6788"], "histogram": {"Biopsy colon": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Culture stool": 1, "Embolic stroke": 1, "Head discomfort": 1, "Malaise": 1, "Psychotic symptom": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ 6788", "histograms": [{"histogram": {"Biopsy colon": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Culture stool": 1, "Embolic stroke": 1, "Head discomfort": 1, "Malaise": 1, "Psychotic symptom": 1}, "batchcodes": ["EJ 6788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EJ 6796.json b/docs/data/histograms/Switzerland/EJ 6796.json
index 4d3ebe8f794..4f586096641 100644
--- a/docs/data/histograms/Switzerland/EJ 6796.json
+++ b/docs/data/histograms/Switzerland/EJ 6796.json
@@ -1 +1 @@
-{"batchcode": "EJ 6796", "histograms": [{"batchcodes": ["EJ 6796"], "histogram": {"Arrhythmia": 1, "Atrial fibrillation": 1, "Computerised tomogram": 1, "Craniocerebral injury": 1, "Fall": 1, "Skull fracture": 1, "Subdural haematoma": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ 6796", "histograms": [{"histogram": {"Arrhythmia": 1, "Atrial fibrillation": 1, "Computerised tomogram": 1, "Craniocerebral injury": 1, "Fall": 1, "Skull fracture": 1, "Subdural haematoma": 1}, "batchcodes": ["EJ 6796"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EJ6788.json b/docs/data/histograms/Switzerland/EJ6788.json
index 0e7f77c6151..44717eb5ca0 100644
--- a/docs/data/histograms/Switzerland/EJ6788.json
+++ b/docs/data/histograms/Switzerland/EJ6788.json
@@ -1 +1 @@
-{"batchcode": "EJ6788", "histograms": [{"batchcodes": ["EJ6788"], "histogram": {"SARS-CoV-2 test": 3, "Computerised tomogram": 2, "Heart rate": 2, "Malaise": 2, "Tachycardia": 2, "Vaccination failure": 2, "Acute kidney injury": 1, "Angioedema": 1, "Aphonia": 1, "Appendicitis": 1, "Blood calcium": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Cardiac arrest": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Culture throat": 1, "Death": 1, "Dehydration": 1, "Diabetic complication": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Exercise electrocardiogram": 1, "Gastrointestinal disorder": 1, "Generalised tonic-clonic seizure": 1, "Haemoglobin": 1, "Herpes zoster": 1, "Hypercalcaemia": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Laryngeal oedema": 1, "Magnetic resonance imaging heart": 1, "Metabolic syndrome": 1, "Myocarditis": 1, "Nausea": 1, "Obstructive airways disorder": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Polyneuropathy": 1, "Presyncope": 1, "Pruritus": 1, "Psychiatric decompensation": 1, "Pyrexia": 1, "Rash pustular": 1, "SARS-CoV-2 antibody test": 1, "Skin reaction": 1, "Tongue oedema": 1, "Tremor": 1, "Vaccination site haematoma": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ6788", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "Computerised tomogram": 2, "Heart rate": 2, "Malaise": 2, "Tachycardia": 2, "Vaccination failure": 2, "Acute kidney injury": 1, "Angioedema": 1, "Aphonia": 1, "Appendicitis": 1, "Blood calcium": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Cardiac arrest": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Culture throat": 1, "Death": 1, "Dehydration": 1, "Diabetic complication": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Exercise electrocardiogram": 1, "Gastrointestinal disorder": 1, "Generalised tonic-clonic seizure": 1, "Haemoglobin": 1, "Herpes zoster": 1, "Hypercalcaemia": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Laryngeal oedema": 1, "Magnetic resonance imaging heart": 1, "Metabolic syndrome": 1, "Myocarditis": 1, "Nausea": 1, "Obstructive airways disorder": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Pneumonia": 1, "Pneumonia aspiration": 1, "Polyneuropathy": 1, "Presyncope": 1, "Pruritus": 1, "Psychiatric decompensation": 1, "Pyrexia": 1, "Rash pustular": 1, "SARS-CoV-2 antibody test": 1, "Skin reaction": 1, "Tongue oedema": 1, "Tremor": 1, "Vaccination site haematoma": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["EJ6788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EJ6795.json b/docs/data/histograms/Switzerland/EJ6795.json
index 4393d988212..cec269e0339 100644
--- a/docs/data/histograms/Switzerland/EJ6795.json
+++ b/docs/data/histograms/Switzerland/EJ6795.json
@@ -1 +1 @@
-{"batchcode": "EJ6795", "histograms": [{"batchcodes": ["EJ6795"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ6795", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["EJ6795"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EJ6796.json b/docs/data/histograms/Switzerland/EJ6796.json
index e98e621dc0f..092c78b989d 100644
--- a/docs/data/histograms/Switzerland/EJ6796.json
+++ b/docs/data/histograms/Switzerland/EJ6796.json
@@ -1 +1 @@
-{"batchcode": "EJ6796", "histograms": [{"batchcodes": ["EJ6796"], "histogram": {"Headache": 5, "COVID-19": 4, "Nausea": 4, "SARS-CoV-2 test": 4, "Arthralgia": 3, "Chills": 3, "Diarrhoea": 3, "General physical health deterioration": 3, "Malaise": 3, "Blood pressure measurement": 2, "Dizziness": 2, "Fatigue": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Magnetic resonance imaging": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "Somnolence": 2, "Angioedema": 1, "Aspiration bone marrow": 1, "Asthenia": 1, "Bedridden": 1, "Blood pressure increased": 1, "Burning sensation": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Condition aggravated": 1, "Conjunctivitis bacterial": 1, "Cough": 1, "Creatinine renal clearance": 1, "Deafness unilateral": 1, "Death": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Electromyogram": 1, "Epistaxis": 1, "Erysipeloid": 1, "Fall": 1, "Flushing": 1, "Hallucination, visual": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Joint swelling": 1, "Lower respiratory tract infection": 1, "Muscular weakness": 1, "Neck pain": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Orthopaedic examination": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pemphigoid": 1, "Periarthritis": 1, "Platelet count": 1, "Pneumonia pneumococcal": 1, "Pulmonary embolism": 1, "Rheumatoid arthritis": 1, "Sensory disturbance": 1, "Sepsis": 1, "Spinal pain": 1, "Tachycardia": 1, "Tachypnoea": 1, "Tinnitus": 1, "Ultrasound Doppler normal": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vertigo positional": 1, "Vomiting": 1, "White blood cell disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ6796", "histograms": [{"histogram": {"Headache": 5, "COVID-19": 4, "Nausea": 4, "SARS-CoV-2 test": 4, "Arthralgia": 3, "Chills": 3, "Diarrhoea": 3, "General physical health deterioration": 3, "Malaise": 3, "Blood pressure measurement": 2, "Dizziness": 2, "Fatigue": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Magnetic resonance imaging": 2, "Myalgia": 2, "Oropharyngeal pain": 2, "Somnolence": 2, "Angioedema": 1, "Aspiration bone marrow": 1, "Asthenia": 1, "Bedridden": 1, "Blood pressure increased": 1, "Burning sensation": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Condition aggravated": 1, "Conjunctivitis bacterial": 1, "Cough": 1, "Creatinine renal clearance": 1, "Deafness unilateral": 1, "Death": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Electromyogram": 1, "Epistaxis": 1, "Erysipeloid": 1, "Fall": 1, "Flushing": 1, "Hallucination, visual": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Inappropriate schedule of product administration": 1, "Joint swelling": 1, "Lower respiratory tract infection": 1, "Muscular weakness": 1, "Neck pain": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Orthopaedic examination": 1, "Oxygen saturation": 1, "Oxygen saturation abnormal": 1, "Oxygen saturation decreased": 1, "Paraesthesia": 1, "Pemphigoid": 1, "Periarthritis": 1, "Platelet count": 1, "Pneumonia pneumococcal": 1, "Pulmonary embolism": 1, "Rheumatoid arthritis": 1, "Sensory disturbance": 1, "Sepsis": 1, "Spinal pain": 1, "Tachycardia": 1, "Tachypnoea": 1, "Tinnitus": 1, "Ultrasound Doppler normal": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vertigo positional": 1, "Vomiting": 1, "White blood cell disorder": 1}, "batchcodes": ["EJ6796"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EJ6798.json b/docs/data/histograms/Switzerland/EJ6798.json
index 1bb14f37546..899cad2ba4a 100644
--- a/docs/data/histograms/Switzerland/EJ6798.json
+++ b/docs/data/histograms/Switzerland/EJ6798.json
@@ -1 +1 @@
-{"batchcode": "EJ6798", "histograms": [{"batchcodes": ["EJ6798"], "histogram": {"Blood creatinine": 1, "Body temperature": 1, "C-reactive protein": 1, "Death": 1, "Disorientation": 1, "Pyrexia": 1, "Renal failure": 1, "Sepsis": 1}}]}
\ No newline at end of file
+{"batchcode": "EJ6798", "histograms": [{"histogram": {"Blood creatinine": 1, "Body temperature": 1, "C-reactive protein": 1, "Death": 1, "Disorientation": 1, "Pyrexia": 1, "Renal failure": 1, "Sepsis": 1}, "batchcodes": ["EJ6798"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EK0788.json b/docs/data/histograms/Switzerland/EK0788.json
index 0a2653e0a78..489be148d78 100644
--- a/docs/data/histograms/Switzerland/EK0788.json
+++ b/docs/data/histograms/Switzerland/EK0788.json
@@ -1 +1 @@
-{"batchcode": "EK0788", "histograms": [{"batchcodes": ["EK0788"], "histogram": {"Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Invasive lobular breast carcinoma": 1}}]}
\ No newline at end of file
+{"batchcode": "EK0788", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Invasive lobular breast carcinoma": 1}, "batchcodes": ["EK0788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EK9788.json b/docs/data/histograms/Switzerland/EK9788.json
index 32caa271819..04f3ea1ca9c 100644
--- a/docs/data/histograms/Switzerland/EK9788.json
+++ b/docs/data/histograms/Switzerland/EK9788.json
@@ -1 +1 @@
-{"batchcode": "EK9788", "histograms": [{"batchcodes": ["EK9788"], "histogram": {"Dizziness": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Hyperhidrosis": 3, "Angiocardiogram": 2, "Blood pressure increased": 2, "Cough": 2, "Echocardiogram": 2, "Headache": 2, "Heart rate": 2, "Muscle spasms": 2, "Peripheral coldness": 2, "Pulmonary embolism": 2, "Stress cardiomyopathy": 2, "Troponin": 2, "Acute stress disorder": 1, "Blood gases": 1, "Blood pH": 1, "Blood thyroid stimulating hormone": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Death": 1, "Dissociative disorder": 1, "Drug ineffective": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Flushing": 1, "General physical health deterioration": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypotension": 1, "Influenza like illness": 1, "Magnetic resonance imaging": 1, "Nasopharyngitis": 1, "Oxygen saturation": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Pneumonia aspiration": 1, "Presyncope": 1, "Prostatic specific antigen": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test": 1, "Sense of oppression": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tremor": 1, "Ultrasound abdomen normal": 1, "Underdose": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EK9788", "histograms": [{"histogram": {"Dizziness": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Hyperhidrosis": 3, "Angiocardiogram": 2, "Blood pressure increased": 2, "Cough": 2, "Echocardiogram": 2, "Headache": 2, "Heart rate": 2, "Muscle spasms": 2, "Peripheral coldness": 2, "Pulmonary embolism": 2, "Stress cardiomyopathy": 2, "Troponin": 2, "Acute stress disorder": 1, "Blood gases": 1, "Blood pH": 1, "Blood thyroid stimulating hormone": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Computerised tomogram thorax": 1, "Death": 1, "Dissociative disorder": 1, "Drug ineffective": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Epilepsy": 1, "Erythema": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Flushing": 1, "General physical health deterioration": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypotension": 1, "Influenza like illness": 1, "Magnetic resonance imaging": 1, "Nasopharyngitis": 1, "Oxygen saturation": 1, "Pallor": 1, "Palpitations": 1, "Paraesthesia": 1, "Pneumonia aspiration": 1, "Presyncope": 1, "Prostatic specific antigen": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test": 1, "Sense of oppression": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tremor": 1, "Ultrasound abdomen normal": 1, "Underdose": 1, "Vaccination failure": 1}, "batchcodes": ["EK9788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EL 0725.json b/docs/data/histograms/Switzerland/EL 0725.json
index df87226182a..fc9f7e5b7be 100644
--- a/docs/data/histograms/Switzerland/EL 0725.json
+++ b/docs/data/histograms/Switzerland/EL 0725.json
@@ -1 +1 @@
-{"batchcode": "EL 0725", "histograms": [{"batchcodes": ["EL 0725"], "histogram": {"Diarrhoea haemorrhagic": 1, "Ear, nose and throat examination": 1, "Enterocolitis haemorrhagic": 1, "Hot flush": 1, "Hyperthermia": 1, "Nausea": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "EL 0725", "histograms": [{"histogram": {"Diarrhoea haemorrhagic": 1, "Ear, nose and throat examination": 1, "Enterocolitis haemorrhagic": 1, "Hot flush": 1, "Hyperthermia": 1, "Nausea": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["EL 0725"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EL0725.json b/docs/data/histograms/Switzerland/EL0725.json
index d18a91cf4ae..e3c97bc871b 100644
--- a/docs/data/histograms/Switzerland/EL0725.json
+++ b/docs/data/histograms/Switzerland/EL0725.json
@@ -1 +1 @@
-{"batchcode": "EL0725", "histograms": [{"batchcodes": ["EL0725"], "histogram": {"Hypertension": 4, "Nausea": 4, "Blood pressure measurement": 3, "COVID-19": 3, "Syncope": 3, "Ultrasound scan": 3, "Vaccination failure": 3, "Chills": 2, "Dizziness": 2, "Fatigue": 2, "Heart rate": 2, "Laboratory test": 2, "Musculoskeletal pain": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Abdominal discomfort": 1, "Anaphylactic reaction": 1, "Asthenia": 1, "Asthma": 1, "Axillary lymphadenectomy": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood fibrinogen increased": 1, "Blood uric acid": 1, "Body temperature": 1, "Borrelia test": 1, "Breast haematoma": 1, "Breast pain": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Cold sweat": 1, "Cough": 1, "Death": 1, "Diarrhoea": 1, "Double stranded DNA antibody": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Electrocardiogram normal": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Glomerular filtration rate": 1, "Hypersensitivity": 1, "Investigation": 1, "Joint swelling": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Macular oedema": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Monoplegia": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Myelodysplastic syndrome": 1, "Myoclonus": 1, "Oedema peripheral": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pharyngeal paraesthesia": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Retinal vein thrombosis": 1, "Rhinitis": 1, "SARS-CoV-2 test positive": 1, "Salivary gland enlargement": 1, "Sensory disturbance": 1, "Serology test": 1, "Sickle cell anaemia with crisis": 1, "Sinusitis": 1, "Specialist consultation": 1, "Speech disorder": 1, "Systemic lupus erythematosus": 1, "Tendonitis": 1, "Thrombocytopenia": 1, "Type II hypersensitivity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EL0725", "histograms": [{"histogram": {"Hypertension": 4, "Nausea": 4, "Blood pressure measurement": 3, "COVID-19": 3, "Syncope": 3, "Ultrasound scan": 3, "Vaccination failure": 3, "Chills": 2, "Dizziness": 2, "Fatigue": 2, "Heart rate": 2, "Laboratory test": 2, "Musculoskeletal pain": 2, "SARS-CoV-2 test": 2, "Tachycardia": 2, "Abdominal discomfort": 1, "Anaphylactic reaction": 1, "Asthenia": 1, "Asthma": 1, "Axillary lymphadenectomy": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood fibrinogen increased": 1, "Blood uric acid": 1, "Body temperature": 1, "Borrelia test": 1, "Breast haematoma": 1, "Breast pain": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Cold sweat": 1, "Cough": 1, "Death": 1, "Diarrhoea": 1, "Double stranded DNA antibody": 1, "Dysaesthesia": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Electrocardiogram normal": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Glomerular filtration rate": 1, "Hypersensitivity": 1, "Investigation": 1, "Joint swelling": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Macular oedema": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Monoplegia": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Myelodysplastic syndrome": 1, "Myoclonus": 1, "Oedema peripheral": 1, "Pallor": 1, "Paraesthesia oral": 1, "Pharyngeal paraesthesia": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Retinal vein thrombosis": 1, "Rhinitis": 1, "SARS-CoV-2 test positive": 1, "Salivary gland enlargement": 1, "Sensory disturbance": 1, "Serology test": 1, "Sickle cell anaemia with crisis": 1, "Sinusitis": 1, "Specialist consultation": 1, "Speech disorder": 1, "Systemic lupus erythematosus": 1, "Tendonitis": 1, "Thrombocytopenia": 1, "Type II hypersensitivity": 1, "Vaccination site pain": 1}, "batchcodes": ["EL0725"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EL3560.json b/docs/data/histograms/Switzerland/EL3560.json
index 958f41c415a..24cd02dc968 100644
--- a/docs/data/histograms/Switzerland/EL3560.json
+++ b/docs/data/histograms/Switzerland/EL3560.json
@@ -1 +1 @@
-{"batchcode": "EL3560", "histograms": [{"batchcodes": ["EL3560"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EL3560", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["EL3560"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EL6796.json b/docs/data/histograms/Switzerland/EL6796.json
index 1796e460140..04a8d8abf19 100644
--- a/docs/data/histograms/Switzerland/EL6796.json
+++ b/docs/data/histograms/Switzerland/EL6796.json
@@ -1 +1 @@
-{"batchcode": "EL6796", "histograms": [{"batchcodes": ["EL6796"], "histogram": {"Angiogram": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Circulatory collapse": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Hypotension": 1, "Incorrect route of product administration": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EL6796", "histograms": [{"histogram": {"Angiogram": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Circulatory collapse": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Hypotension": 1, "Incorrect route of product administration": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EL6796"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EL8723.json b/docs/data/histograms/Switzerland/EL8723.json
index 055a85d48b3..b97ee62d76c 100644
--- a/docs/data/histograms/Switzerland/EL8723.json
+++ b/docs/data/histograms/Switzerland/EL8723.json
@@ -1 +1 @@
-{"batchcode": "EL8723", "histograms": [{"batchcodes": ["EL8723"], "histogram": {"COVID-19": 4, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Asthenia": 2, "Blood culture": 2, "Chest X-ray": 2, "Computerised tomogram thorax": 2, "Epilepsy": 2, "Hypersensitivity": 2, "Pyrexia": 2, "Rash": 2, "SARS-CoV-2 antibody test": 2, "Angiogram": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Blood count": 1, "Body temperature": 1, "COVID-19 pneumonia": 1, "Cardiac telemetry": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Culture urine": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Depressed mood": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Drug eruption": 1, "Drug ineffective": 1, "Echocardiogram": 1, "Emergency care examination": 1, "Erythromelalgia": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Infection": 1, "Investigation": 1, "Laboratory test": 1, "Legionella infection": 1, "Malaise": 1, "Nausea": 1, "Ophthalmic vein thrombosis": 1, "Pruritus": 1, "Renal function test": 1, "Respiratory viral panel": 1, "Retinal vein occlusion": 1, "Rheumatoid factor": 1, "Sepsis": 1, "Severe acute respiratory syndrome": 1, "Sinus tachycardia": 1, "Stool analysis": 1, "Swollen tongue": 1, "Trigeminal neuralgia": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "EL8723", "histograms": [{"histogram": {"COVID-19": 4, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Asthenia": 2, "Blood culture": 2, "Chest X-ray": 2, "Computerised tomogram thorax": 2, "Epilepsy": 2, "Hypersensitivity": 2, "Pyrexia": 2, "Rash": 2, "SARS-CoV-2 antibody test": 2, "Angiogram": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Blood count": 1, "Body temperature": 1, "COVID-19 pneumonia": 1, "Cardiac telemetry": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Culture urine": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Depressed mood": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Drug eruption": 1, "Drug ineffective": 1, "Echocardiogram": 1, "Emergency care examination": 1, "Erythromelalgia": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Infection": 1, "Investigation": 1, "Laboratory test": 1, "Legionella infection": 1, "Malaise": 1, "Nausea": 1, "Ophthalmic vein thrombosis": 1, "Pruritus": 1, "Renal function test": 1, "Respiratory viral panel": 1, "Retinal vein occlusion": 1, "Rheumatoid factor": 1, "Sepsis": 1, "Severe acute respiratory syndrome": 1, "Sinus tachycardia": 1, "Stool analysis": 1, "Swollen tongue": 1, "Trigeminal neuralgia": 1, "Ultrasound Doppler": 1}, "batchcodes": ["EL8723"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EM 0477.json b/docs/data/histograms/Switzerland/EM 0477.json
index bb9b1f6018b..71f9743b1e5 100644
--- a/docs/data/histograms/Switzerland/EM 0477.json
+++ b/docs/data/histograms/Switzerland/EM 0477.json
@@ -1 +1 @@
-{"batchcode": "EM 0477", "histograms": [{"batchcodes": ["EM 0477"], "histogram": {"Arrhythmia": 1, "Atrial fibrillation": 1, "Fall": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EM 0477", "histograms": [{"histogram": {"Arrhythmia": 1, "Atrial fibrillation": 1, "Fall": 1, "Syncope": 1}, "batchcodes": ["EM 0477"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EM0477.json b/docs/data/histograms/Switzerland/EM0477.json
index 94623e9fd25..c16e546dc4c 100644
--- a/docs/data/histograms/Switzerland/EM0477.json
+++ b/docs/data/histograms/Switzerland/EM0477.json
@@ -1 +1 @@
-{"batchcode": "EM0477", "histograms": [{"batchcodes": ["EM0477"], "histogram": {"C-reactive protein": 9, "Pyrexia": 8, "Fatigue": 7, "Herpes zoster": 7, "Dyspnoea": 6, "SARS-CoV-2 test": 6, "Blood creatinine": 5, "COVID-19": 5, "Chills": 5, "Dizziness": 5, "White blood cell count": 5, "Cough": 4, "Headache": 4, "Investigation": 4, "Myalgia": 4, "Oxygen saturation": 4, "Pain in extremity": 4, "Pruritus": 4, "Rash": 4, "Vomiting": 4, "Anaphylactic reaction": 3, "Asthenia": 3, "Blood pressure measurement": 3, "Body temperature": 3, "Computerised tomogram thorax": 3, "Condition aggravated": 3, "Death": 3, "Fall": 3, "Fibrin D dimer": 3, "Glomerular filtration rate": 3, "Heart rate": 3, "Magnetic resonance imaging": 3, "Platelet count": 3, "Arthralgia": 2, "Blood creatine phosphokinase": 2, "Blood lactic acid": 2, "Blood test": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Confusional state": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Electroencephalogram": 2, "Hypersensitivity": 2, "Influenza like illness": 2, "Low density lipoprotein": 2, "Magnetic resonance imaging head": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nausea": 2, "Neck pain": 2, "Presyncope": 2, "SARS-CoV-2 antibody test": 2, "Serology test": 2, "Vaccination failure": 2, "Vertigo": 2, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angioedema": 1, "Angiogram": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Aortitis": 1, "Appendicitis": 1, "Arthritis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Autoimmune thyroid disorder": 1, "Blindness": 1, "Blood alkaline phosphatase": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood gases": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Body mass index": 1, "Borrelia test": 1, "Bronchial wall thickening": 1, "C-reactive protein increased": 1, "CSF mononuclear cell count increased": 1, "Cardiac arrest": 1, "Cardiovascular disorder": 1, "Cardiovascular function test": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chronic obstructive pulmonary disease": 1, "Computerised tomogram head": 1, "Corneal infiltrates": 1, "Craniocerebral injury": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dermatitis psoriasiform": 1, "Disease progression": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dry eye": 1, "Dysarthria": 1, "Dysphonia": 1, "Ear pain": 1, "Echocardiogram": 1, "Eczema": 1, "Encephalitis": 1, "Enterovirus test": 1, "Erythema annulare": 1, "Extremity necrosis": 1, "Eye disorder": 1, "Eye pain": 1, "Facial bones fracture": 1, "Feeling abnormal": 1, "Fractional exhaled nitric oxide": 1, "Gait disturbance": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Groin pain": 1, "HIV antibody": 1, "Haematoma muscle": 1, "Haemoglobin": 1, "Heart sounds": 1, "Hemianopia homonymous": 1, "Herpes simplex test": 1, "High density lipoprotein": 1, "Hypertension": 1, "Hypoxia": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Ischaemic cerebral infarction": 1, "Ischaemic stroke": 1, "Leukopenia": 1, "Lumbar puncture": 1, "Lung consolidation": 1, "Lymphadenopathy": 1, "Lymphoedema": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "NIH stroke scale": 1, "Nasopharyngitis": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Oedema peripheral": 1, "Oesophageal perforation": 1, "Oesophagogastroduodenoscopy": 1, "Ophthalmic herpes zoster": 1, "PCO2": 1, "PO2": 1, "Pain": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Pemphigoid": 1, "Peripheral venous disease": 1, "Physical examination": 1, "Plethysmography": 1, "Polymerase chain reaction": 1, "Pulmonary arterial pressure": 1, "Pulmonary fibrosis": 1, "Pulmonary hypertension": 1, "Pulmonary oedema": 1, "Purpura": 1, "Radiation mastitis": 1, "Rash maculo-papular": 1, "Rash papulosquamous": 1, "Respiratory distress": 1, "Salivary hypersecretion": 1, "Schellong test": 1, "Scratch": 1, "Septic shock": 1, "Skin lesion": 1, "Speech disorder": 1, "Spinal cord ischaemia": 1, "Spinal disorder": 1, "Sudden hearing loss": 1, "Swelling": 1, "Tachycardia paroxysmal": 1, "Thrombocytopenia": 1, "Thyroglobulin": 1, "Thyroiditis": 1, "Thyroxine free": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Treponema test": 1, "Tri-iodothyronine free": 1, "Trismus": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1, "Urinary retention": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Vasculitis": 1, "Viral test": 1, "Visual impairment": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EM0477", "histograms": [{"histogram": {"C-reactive protein": 9, "Pyrexia": 8, "Fatigue": 7, "Herpes zoster": 7, "Dyspnoea": 6, "SARS-CoV-2 test": 6, "Blood creatinine": 5, "COVID-19": 5, "Chills": 5, "Dizziness": 5, "White blood cell count": 5, "Cough": 4, "Headache": 4, "Investigation": 4, "Myalgia": 4, "Oxygen saturation": 4, "Pain in extremity": 4, "Pruritus": 4, "Rash": 4, "Vomiting": 4, "Anaphylactic reaction": 3, "Asthenia": 3, "Blood pressure measurement": 3, "Body temperature": 3, "Computerised tomogram thorax": 3, "Condition aggravated": 3, "Death": 3, "Fall": 3, "Fibrin D dimer": 3, "Glomerular filtration rate": 3, "Heart rate": 3, "Magnetic resonance imaging": 3, "Platelet count": 3, "Arthralgia": 2, "Blood creatine phosphokinase": 2, "Blood lactic acid": 2, "Blood test": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Confusional state": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Electroencephalogram": 2, "Hypersensitivity": 2, "Influenza like illness": 2, "Low density lipoprotein": 2, "Magnetic resonance imaging head": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nausea": 2, "Neck pain": 2, "Presyncope": 2, "SARS-CoV-2 antibody test": 2, "Serology test": 2, "Vaccination failure": 2, "Vertigo": 2, "Anaphylactic shock": 1, "Angiocardiogram": 1, "Angioedema": 1, "Angiogram": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Aortitis": 1, "Appendicitis": 1, "Arthritis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Autoimmune thyroid disorder": 1, "Blindness": 1, "Blood alkaline phosphatase": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood gases": 1, "Blood potassium": 1, "Blood pressure increased": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Body mass index": 1, "Borrelia test": 1, "Bronchial wall thickening": 1, "C-reactive protein increased": 1, "CSF mononuclear cell count increased": 1, "Cardiac arrest": 1, "Cardiovascular disorder": 1, "Cardiovascular function test": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chronic obstructive pulmonary disease": 1, "Computerised tomogram head": 1, "Corneal infiltrates": 1, "Craniocerebral injury": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dermatitis psoriasiform": 1, "Disease progression": 1, "Disease recurrence": 1, "Disorientation": 1, "Drug hypersensitivity": 1, "Drug ineffective": 1, "Dry eye": 1, "Dysarthria": 1, "Dysphonia": 1, "Ear pain": 1, "Echocardiogram": 1, "Eczema": 1, "Encephalitis": 1, "Enterovirus test": 1, "Erythema annulare": 1, "Extremity necrosis": 1, "Eye disorder": 1, "Eye pain": 1, "Facial bones fracture": 1, "Feeling abnormal": 1, "Fractional exhaled nitric oxide": 1, "Gait disturbance": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Groin pain": 1, "HIV antibody": 1, "Haematoma muscle": 1, "Haemoglobin": 1, "Heart sounds": 1, "Hemianopia homonymous": 1, "Herpes simplex test": 1, "High density lipoprotein": 1, "Hypertension": 1, "Hypoxia": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Ischaemic cerebral infarction": 1, "Ischaemic stroke": 1, "Leukopenia": 1, "Lumbar puncture": 1, "Lung consolidation": 1, "Lymphadenopathy": 1, "Lymphoedema": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "NIH stroke scale": 1, "Nasopharyngitis": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Oedema peripheral": 1, "Oesophageal perforation": 1, "Oesophagogastroduodenoscopy": 1, "Ophthalmic herpes zoster": 1, "PCO2": 1, "PO2": 1, "Pain": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paresis": 1, "Pemphigoid": 1, "Peripheral venous disease": 1, "Physical examination": 1, "Plethysmography": 1, "Polymerase chain reaction": 1, "Pulmonary arterial pressure": 1, "Pulmonary fibrosis": 1, "Pulmonary hypertension": 1, "Pulmonary oedema": 1, "Purpura": 1, "Radiation mastitis": 1, "Rash maculo-papular": 1, "Rash papulosquamous": 1, "Respiratory distress": 1, "Salivary hypersecretion": 1, "Schellong test": 1, "Scratch": 1, "Septic shock": 1, "Skin lesion": 1, "Speech disorder": 1, "Spinal cord ischaemia": 1, "Spinal disorder": 1, "Sudden hearing loss": 1, "Swelling": 1, "Tachycardia paroxysmal": 1, "Thrombocytopenia": 1, "Thyroglobulin": 1, "Thyroiditis": 1, "Thyroxine free": 1, "Tinnitus": 1, "Toxic skin eruption": 1, "Transient ischaemic attack": 1, "Treponema test": 1, "Tri-iodothyronine free": 1, "Trismus": 1, "Troponin T": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1, "Urinary retention": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Vasculitis": 1, "Viral test": 1, "Visual impairment": 1, "pH body fluid": 1}, "batchcodes": ["EM0477"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EM0477/PAA15657.json b/docs/data/histograms/Switzerland/EM0477/PAA15657.json
index 37dcbd83f1f..94c089908b3 100644
--- a/docs/data/histograms/Switzerland/EM0477/PAA15657.json
+++ b/docs/data/histograms/Switzerland/EM0477/PAA15657.json
@@ -1 +1 @@
-{"batchcode": "EM0477/PAA15657", "histograms": [{"batchcodes": ["EM0477/PAA15657"], "histogram": {"Cardiac arrest": 1}}]}
\ No newline at end of file
+{"batchcode": "EM0477/PAA15657", "histograms": [{"histogram": {"Cardiac arrest": 1}, "batchcodes": ["EM0477/PAA15657"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EP 2163.json b/docs/data/histograms/Switzerland/EP 2163.json
index f7d2c97c800..abab227e1b6 100644
--- a/docs/data/histograms/Switzerland/EP 2163.json
+++ b/docs/data/histograms/Switzerland/EP 2163.json
@@ -1 +1 @@
-{"batchcode": "EP 2163", "histograms": [{"batchcodes": ["EP 2163"], "histogram": {"Neurological examination": 1, "Restless legs syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "EP 2163", "histograms": [{"histogram": {"Neurological examination": 1, "Restless legs syndrome": 1}, "batchcodes": ["EP 2163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EP 7449.json b/docs/data/histograms/Switzerland/EP 7449.json
index 65362bcab63..8a22047151c 100644
--- a/docs/data/histograms/Switzerland/EP 7449.json
+++ b/docs/data/histograms/Switzerland/EP 7449.json
@@ -1 +1 @@
-{"batchcode": "EP 7449", "histograms": [{"batchcodes": ["EP 7449"], "histogram": {"Electric shock sensation": 1, "Limb discomfort": 1, "Paraesthesia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EP 7449", "histograms": [{"histogram": {"Electric shock sensation": 1, "Limb discomfort": 1, "Paraesthesia": 1, "Vaccination site pain": 1}, "batchcodes": ["EP 7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EP 9605.json b/docs/data/histograms/Switzerland/EP 9605.json
index 64bfbbfa2bc..5df6486726f 100644
--- a/docs/data/histograms/Switzerland/EP 9605.json
+++ b/docs/data/histograms/Switzerland/EP 9605.json
@@ -1 +1 @@
-{"batchcode": "EP 9605", "histograms": [{"batchcodes": ["EP 9605"], "histogram": {"Cardiac failure acute": 1, "Circulatory collapse": 1, "Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "EP 9605", "histograms": [{"histogram": {"Cardiac failure acute": 1, "Circulatory collapse": 1, "Myocardial infarction": 1}, "batchcodes": ["EP 9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EP0725.json b/docs/data/histograms/Switzerland/EP0725.json
index 1e3a4781f15..da62b9e9226 100644
--- a/docs/data/histograms/Switzerland/EP0725.json
+++ b/docs/data/histograms/Switzerland/EP0725.json
@@ -1 +1 @@
-{"batchcode": "EP0725", "histograms": [{"batchcodes": ["EP0725"], "histogram": {"Electrocardiogram ambulatory": 1, "Hyperhidrosis": 1, "Neuralgia": 1, "Palpitations": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EP0725", "histograms": [{"histogram": {"Electrocardiogram ambulatory": 1, "Hyperhidrosis": 1, "Neuralgia": 1, "Palpitations": 1, "Presyncope": 1}, "batchcodes": ["EP0725"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EP2163.json b/docs/data/histograms/Switzerland/EP2163.json
index 5cb53880693..8a8cc656a8b 100644
--- a/docs/data/histograms/Switzerland/EP2163.json
+++ b/docs/data/histograms/Switzerland/EP2163.json
@@ -1 +1 @@
-{"batchcode": "EP2163", "histograms": [{"batchcodes": ["EP2163"], "histogram": {"Fatigue": 8, "Arthralgia": 5, "Headache": 5, "Magnetic resonance imaging": 4, "Pain": 4, "Blood pressure measurement": 3, "Dizziness": 3, "Enthesopathy": 3, "Myalgia": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Blood creatinine": 2, "C-reactive protein": 2, "COVID-19": 2, "Chills": 2, "Cough": 2, "Deep vein thrombosis": 2, "Heart rate": 2, "Hypertension": 2, "Laboratory test": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Red blood cell sedimentation rate": 2, "Rheumatoid factor": 2, "Somnolence": 2, "Ultrasound Doppler": 2, "Vaccination failure": 2, "Vertigo": 2, "Agitation": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Audiogram": 1, "Back pain": 1, "Biopsy bladder": 1, "Bladder pain": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood calcium": 1, "Blood count": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Body temperature": 1, "Borrelia test": 1, "C-reactive protein increased": 1, "Cerebral ischaemia": 1, "Cerebrovascular accident": 1, "Chest scan": 1, "Colitis ulcerative": 1, "Computerised tomogram head": 1, "Cystitis interstitial": 1, "Cystoscopy": 1, "Deafness unilateral": 1, "Decreased activity": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electroneuromyography": 1, "Epicondylitis": 1, "Facet joint syndrome": 1, "Facial paresis": 1, "Feeling hot": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "HIV test": 1, "Hemiplegia": 1, "Hepatitis B core antibody positive": 1, "Hepatitis E virus test": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypokalaemia": 1, "Immunisation reaction": 1, "Interchange of vaccine products": 1, "Ischaemic cerebral infarction": 1, "Leukopenia": 1, "Lipids": 1, "Lumbar puncture": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging neck": 1, "Middle insomnia": 1, "Multiple sclerosis relapse": 1, "Muscle spasticity": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "NIH stroke scale score decreased": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Osteoarthritis": 1, "Oxygen saturation": 1, "Pelvic discomfort": 1, "Peripheral swelling": 1, "Presyncope": 1, "Radioisotope scan": 1, "SARS-CoV-2 test positive": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sleep disorder": 1, "Specialist consultation": 1, "Spinal osteoarthritis": 1, "Sudden death": 1, "Synovitis": 1, "Tachycardia": 1, "Tendon rupture": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urethral pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site reaction": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EP2163", "histograms": [{"histogram": {"Fatigue": 8, "Arthralgia": 5, "Headache": 5, "Magnetic resonance imaging": 4, "Pain": 4, "Blood pressure measurement": 3, "Dizziness": 3, "Enthesopathy": 3, "Myalgia": 3, "Pyrexia": 3, "SARS-CoV-2 test": 3, "Asthenia": 2, "Blood creatinine": 2, "C-reactive protein": 2, "COVID-19": 2, "Chills": 2, "Cough": 2, "Deep vein thrombosis": 2, "Heart rate": 2, "Hypertension": 2, "Laboratory test": 2, "Magnetic resonance imaging head": 2, "Malaise": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Red blood cell sedimentation rate": 2, "Rheumatoid factor": 2, "Somnolence": 2, "Ultrasound Doppler": 2, "Vaccination failure": 2, "Vertigo": 2, "Agitation": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Audiogram": 1, "Back pain": 1, "Biopsy bladder": 1, "Bladder pain": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood calcium": 1, "Blood count": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Body temperature": 1, "Borrelia test": 1, "C-reactive protein increased": 1, "Cerebral ischaemia": 1, "Cerebrovascular accident": 1, "Chest scan": 1, "Colitis ulcerative": 1, "Computerised tomogram head": 1, "Cystitis interstitial": 1, "Cystoscopy": 1, "Deafness unilateral": 1, "Decreased activity": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Electric shock sensation": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Electroneuromyography": 1, "Epicondylitis": 1, "Facet joint syndrome": 1, "Facial paresis": 1, "Feeling hot": 1, "Full blood count": 1, "Gamma-glutamyltransferase": 1, "Generalised tonic-clonic seizure": 1, "Glycosylated haemoglobin": 1, "HIV test": 1, "Hemiplegia": 1, "Hepatitis B core antibody positive": 1, "Hepatitis E virus test": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hypokalaemia": 1, "Immunisation reaction": 1, "Interchange of vaccine products": 1, "Ischaemic cerebral infarction": 1, "Leukopenia": 1, "Lipids": 1, "Lumbar puncture": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging neck": 1, "Middle insomnia": 1, "Multiple sclerosis relapse": 1, "Muscle spasticity": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "NIH stroke scale score decreased": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Osteoarthritis": 1, "Oxygen saturation": 1, "Pelvic discomfort": 1, "Peripheral swelling": 1, "Presyncope": 1, "Radioisotope scan": 1, "SARS-CoV-2 test positive": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sleep disorder": 1, "Specialist consultation": 1, "Spinal osteoarthritis": 1, "Sudden death": 1, "Synovitis": 1, "Tachycardia": 1, "Tendon rupture": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urethral pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site reaction": 1, "White blood cell count": 1}, "batchcodes": ["EP2163"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EP3014.json b/docs/data/histograms/Switzerland/EP3014.json
index 59ac899ee5a..78d96a32731 100644
--- a/docs/data/histograms/Switzerland/EP3014.json
+++ b/docs/data/histograms/Switzerland/EP3014.json
@@ -1 +1 @@
-{"batchcode": "EP3014", "histograms": [{"batchcodes": ["EP3014"], "histogram": {"Abdominal pain": 1, "C-reactive protein": 1, "Fibrin D dimer": 1, "Pericardial effusion": 1, "Specialist consultation": 1, "Ultrasound abdomen": 1}}]}
\ No newline at end of file
+{"batchcode": "EP3014", "histograms": [{"histogram": {"Abdominal pain": 1, "C-reactive protein": 1, "Fibrin D dimer": 1, "Pericardial effusion": 1, "Specialist consultation": 1, "Ultrasound abdomen": 1}, "batchcodes": ["EP3014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EP9605.json b/docs/data/histograms/Switzerland/EP9605.json
index dc31e2beaf7..5028263f7c4 100644
--- a/docs/data/histograms/Switzerland/EP9605.json
+++ b/docs/data/histograms/Switzerland/EP9605.json
@@ -1 +1 @@
-{"batchcode": "EP9605", "histograms": [{"batchcodes": ["EP9605"], "histogram": {"SARS-CoV-2 test": 16, "Blood pressure measurement": 15, "COVID-19": 13, "Vaccination failure": 12, "Headache": 10, "Heart rate": 10, "Fatigue": 8, "Pyrexia": 8, "Hypertension": 7, "Blood creatinine": 6, "C-reactive protein": 6, "Dyspnoea": 6, "Electrocardiogram": 6, "Herpes zoster": 6, "Oxygen saturation": 6, "Tachycardia": 6, "Ultrasound scan": 6, "Asthenia": 5, "Death": 5, "Paraesthesia": 5, "Rash": 5, "Arthralgia": 4, "Blood glucose": 4, "Chills": 4, "Fibrin D dimer": 4, "Myalgia": 4, "Blood count": 3, "Blood culture": 3, "Body temperature": 3, "Cerebrovascular accident": 3, "Chest X-ray": 3, "Computerised tomogram head": 3, "Deep vein thrombosis": 3, "Dizziness": 3, "Electroencephalogram": 3, "Facial paralysis": 3, "Fall": 3, "Glycosylated haemoglobin": 3, "Haemoglobin": 3, "Investigation": 3, "Low density lipoprotein": 3, "Magnetic resonance imaging": 3, "Magnetic resonance imaging head": 3, "Physical examination": 3, "Platelet count": 3, "Pruritus": 3, "Pulmonary embolism": 3, "Rhinorrhoea": 3, "Troponin": 3, "Ultrasound Doppler": 3, "Abdominal pain": 2, "Activated partial thromboplastin time": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase": 2, "Anaphylactic reaction": 2, "Angina pectoris": 2, "Angiogram": 2, "Anosmia": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Blood pressure increased": 2, "Blood sodium": 2, "Blood test": 2, "Blood thyroid stimulating hormone": 2, "Blood uric acid": 2, "Borrelia test": 2, "Chest pain": 2, "Colonoscopy": 2, "Computerised tomogram": 2, "Cough": 2, "Diarrhoea": 2, "Drug ineffective": 2, "Echocardiogram": 2, "Endocarditis": 2, "Epilepsy": 2, "Exercise tolerance decreased": 2, "Extrasystoles": 2, "Gamma-glutamyltransferase": 2, "Glomerular filtration rate": 2, "Haematocrit": 2, "Ischaemic stroke": 2, "Lymphocyte count": 2, "Malaise": 2, "Muscular weakness": 2, "NIH stroke scale": 2, "Nausea": 2, "Neurological examination": 2, "Oedema peripheral": 2, "Off label use": 2, "Oral herpes": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Rash pruritic": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Sinus rhythm": 2, "Specialist consultation": 2, "Sudden death": 2, "Syncope": 2, "Treponema test": 2, "Troponin T": 2, "Tryptase": 2, "Vaccination site haematoma": 2, "Vomiting": 2, "White blood cell count": 2, "X-ray": 2, "Acute pulmonary oedema": 1, "Ageusia": 1, "Alanine aminotransferase increased": 1, "Allergy to vaccine": 1, "Amenorrhoea": 1, "Amnesia": 1, "Anaemia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Angiogram cerebral": 1, "Ankylosing spondylitis": 1, "Anxiety": 1, "Aphasia": 1, "Arthritis": 1, "Aspartate aminotransferase increased": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Atrioventricular block first degree": 1, "Auscultation": 1, "Back pain": 1, "Balance disorder": 1, "Basedow's disease": 1, "Behcet's syndrome": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase decreased": 1, "Blood electrolytes": 1, "Blood fibrinogen": 1, "Blood immunoglobulin E": 1, "Blood potassium": 1, "Blood pressure systolic": 1, "Blood sodium increased": 1, "Blood test abnormal": 1, "Blood uric acid increased": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "Cardiac function test": 1, "Cardiac telemetry": 1, "Cardiac ventriculogram": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Cardiovascular examination": 1, "Cardioversion": 1, "Carotid artery dissection": 1, "Cervical radiculopathy": 1, "Chest injury": 1, "Chlamydia test": 1, "Choking": 1, "Cholangitis": 1, "Cholecystitis acute": 1, "Coagulation factor VIII level": 1, "Coagulation test": 1, "Colonoscopy normal": 1, "Computerised tomogram normal": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Conjunctivitis bacterial": 1, "Constipation": 1, "Crohn's disease": 1, "Culture urine": 1, "Cystitis": 1, "Cystitis escherichia": 1, "Cytomegalovirus test": 1, "Cytomegalovirus viraemia": 1, "Delirium": 1, "Dermatitis allergic": 1, "Dermatologic examination": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysuria": 1, "Ear pain": 1, "Electromyogram": 1, "Electrophoresis protein": 1, "Encephalitis": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Epididymitis": 1, "Epistaxis": 1, "Eye discharge": 1, "Eye disorder": 1, "Eye irritation": 1, "Eye pain": 1, "Eyelids pruritus": 1, "Facial pain": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Gait inability": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "Gaze palsy": 1, "Genital herpes": 1, "Genital ulceration": 1, "Granulocyte count": 1, "HIV test": 1, "Haemoglobin increased": 1, "Head injury": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Herpes virus infection": 1, "Herpes zoster cutaneous disseminated": 1, "Herpes zoster oticus": 1, "Histology": 1, "Horner's syndrome": 1, "Hydrocele": 1, "Hypercholesterolaemia": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypertonia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Immunisation anxiety related reaction": 1, "Inappropriate schedule of product administration": 1, "Increased insulin requirement": 1, "Increased tendency to bruise": 1, "Influenza": 1, "Injury": 1, "International normalised ratio abnormal": 1, "Joint swelling": 1, "Laboratory test": 1, "Lip blister": 1, "Liver function test": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging abdominal": 1, "Magnetic resonance imaging heart": 1, "Meniere's disease": 1, "Menstruation irregular": 1, "Migraine": 1, "Monoplegia": 1, "Muscle tightness": 1, "Myocardial infarction": 1, "Myocardial injury": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal obstruction": 1, "Nasal oedema": 1, "Neisseria test": 1, "Neuralgia": 1, "Neurodermatitis": 1, "Night sweats": 1, "Nocturia": 1, "Occipital neuralgia": 1, "Ocular hyperaemia": 1, "Office visit": 1, "Ophthalmic herpes zoster": 1, "Optic ischaemic neuropathy": 1, "Oral disorder": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain assessment": 1, "Palpitations": 1, "Pancreatitis": 1, "Peripheral coldness": 1, "Petechiae": 1, "Polymerase chain reaction": 1, "Polyneuropathy": 1, "Pregnancy test": 1, "Presyncope": 1, "Product use issue": 1, "Prothrombin time": 1, "Pulmonary function test": 1, "Pyelonephritis": 1, "Radiculitis brachial": 1, "Rash pustular": 1, "Red blood cell abnormality": 1, "Red blood cell count decreased": 1, "Red blood cell count increased": 1, "Red blood cells urine": 1, "Renal function test": 1, "Respiratory disorder": 1, "Retinal artery occlusion": 1, "Retinal haemorrhage": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test positive": 1, "Sarcoidosis": 1, "Scan": 1, "Seborrhoeic dermatitis": 1, "Sensorimotor disorder": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Subclavian vein thrombosis": 1, "Suffocation feeling": 1, "Suspected COVID-19": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroxine free": 1, "Tinnitus": 1, "Tooth infection": 1, "Transient ischaemic attack": 1, "Traumatic haematoma": 1, "Tri-iodothyronine free": 1, "Troponin increased": 1, "Ultrasound abdomen": 1, "Ultrasound scan normal": 1, "Ultrasound thyroid": 1, "Urinary sediment present": 1, "Urine analysis": 1, "Urticaria chronic": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Venous thrombosis": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Vibration test": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Visual impairment": 1, "Von Willebrand's factor antibody": 1, "Von Willebrand's factor antigen test": 1, "Weight": 1, "Weight decreased": 1, "X-ray normal": 1}}]}
\ No newline at end of file
+{"batchcode": "EP9605", "histograms": [{"histogram": {"SARS-CoV-2 test": 16, "Blood pressure measurement": 15, "COVID-19": 13, "Vaccination failure": 12, "Headache": 10, "Heart rate": 10, "Fatigue": 8, "Pyrexia": 8, "Hypertension": 7, "Blood creatinine": 6, "C-reactive protein": 6, "Dyspnoea": 6, "Electrocardiogram": 6, "Herpes zoster": 6, "Oxygen saturation": 6, "Tachycardia": 6, "Ultrasound scan": 6, "Asthenia": 5, "Death": 5, "Paraesthesia": 5, "Rash": 5, "Arthralgia": 4, "Blood glucose": 4, "Chills": 4, "Fibrin D dimer": 4, "Myalgia": 4, "Blood count": 3, "Blood culture": 3, "Body temperature": 3, "Cerebrovascular accident": 3, "Chest X-ray": 3, "Computerised tomogram head": 3, "Deep vein thrombosis": 3, "Dizziness": 3, "Electroencephalogram": 3, "Facial paralysis": 3, "Fall": 3, "Glycosylated haemoglobin": 3, "Haemoglobin": 3, "Investigation": 3, "Low density lipoprotein": 3, "Magnetic resonance imaging": 3, "Magnetic resonance imaging head": 3, "Physical examination": 3, "Platelet count": 3, "Pruritus": 3, "Pulmonary embolism": 3, "Rhinorrhoea": 3, "Troponin": 3, "Ultrasound Doppler": 3, "Abdominal pain": 2, "Activated partial thromboplastin time": 2, "Acute myocardial infarction": 2, "Alanine aminotransferase": 2, "Anaphylactic reaction": 2, "Angina pectoris": 2, "Angiogram": 2, "Anosmia": 2, "Arrhythmia": 2, "Aspartate aminotransferase": 2, "Blood pressure increased": 2, "Blood sodium": 2, "Blood test": 2, "Blood thyroid stimulating hormone": 2, "Blood uric acid": 2, "Borrelia test": 2, "Chest pain": 2, "Colonoscopy": 2, "Computerised tomogram": 2, "Cough": 2, "Diarrhoea": 2, "Drug ineffective": 2, "Echocardiogram": 2, "Endocarditis": 2, "Epilepsy": 2, "Exercise tolerance decreased": 2, "Extrasystoles": 2, "Gamma-glutamyltransferase": 2, "Glomerular filtration rate": 2, "Haematocrit": 2, "Ischaemic stroke": 2, "Lymphocyte count": 2, "Malaise": 2, "Muscular weakness": 2, "NIH stroke scale": 2, "Nausea": 2, "Neurological examination": 2, "Oedema peripheral": 2, "Off label use": 2, "Oral herpes": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Rash pruritic": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Sinus rhythm": 2, "Specialist consultation": 2, "Sudden death": 2, "Syncope": 2, "Treponema test": 2, "Troponin T": 2, "Tryptase": 2, "Vaccination site haematoma": 2, "Vomiting": 2, "White blood cell count": 2, "X-ray": 2, "Acute pulmonary oedema": 1, "Ageusia": 1, "Alanine aminotransferase increased": 1, "Allergy to vaccine": 1, "Amenorrhoea": 1, "Amnesia": 1, "Anaemia": 1, "Angiocardiogram": 1, "Angioedema": 1, "Angiogram cerebral": 1, "Ankylosing spondylitis": 1, "Anxiety": 1, "Aphasia": 1, "Arthritis": 1, "Aspartate aminotransferase increased": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Atrioventricular block first degree": 1, "Auscultation": 1, "Back pain": 1, "Balance disorder": 1, "Basedow's disease": 1, "Behcet's syndrome": 1, "Bilirubin conjugated": 1, "Biopsy": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase decreased": 1, "Blood electrolytes": 1, "Blood fibrinogen": 1, "Blood immunoglobulin E": 1, "Blood potassium": 1, "Blood pressure systolic": 1, "Blood sodium increased": 1, "Blood test abnormal": 1, "Blood uric acid increased": 1, "Bradycardia": 1, "Brain natriuretic peptide": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "Cardiac function test": 1, "Cardiac telemetry": 1, "Cardiac ventriculogram": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Cardiovascular examination": 1, "Cardioversion": 1, "Carotid artery dissection": 1, "Cervical radiculopathy": 1, "Chest injury": 1, "Chlamydia test": 1, "Choking": 1, "Cholangitis": 1, "Cholecystitis acute": 1, "Coagulation factor VIII level": 1, "Coagulation test": 1, "Colonoscopy normal": 1, "Computerised tomogram normal": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Conjunctivitis bacterial": 1, "Constipation": 1, "Crohn's disease": 1, "Culture urine": 1, "Cystitis": 1, "Cystitis escherichia": 1, "Cytomegalovirus test": 1, "Cytomegalovirus viraemia": 1, "Delirium": 1, "Dermatitis allergic": 1, "Dermatologic examination": 1, "Discomfort": 1, "Disease recurrence": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysuria": 1, "Ear pain": 1, "Electromyogram": 1, "Electrophoresis protein": 1, "Encephalitis": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Epididymitis": 1, "Epistaxis": 1, "Eye discharge": 1, "Eye disorder": 1, "Eye irritation": 1, "Eye pain": 1, "Eyelids pruritus": 1, "Facial pain": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Gait inability": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "Gaze palsy": 1, "Genital herpes": 1, "Genital ulceration": 1, "Granulocyte count": 1, "HIV test": 1, "Haemoglobin increased": 1, "Head injury": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Herpes virus infection": 1, "Herpes zoster cutaneous disseminated": 1, "Herpes zoster oticus": 1, "Histology": 1, "Horner's syndrome": 1, "Hydrocele": 1, "Hypercholesterolaemia": 1, "Hypersensitivity": 1, "Hypertensive crisis": 1, "Hyperthyroidism": 1, "Hypertonia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Immunisation anxiety related reaction": 1, "Inappropriate schedule of product administration": 1, "Increased insulin requirement": 1, "Increased tendency to bruise": 1, "Influenza": 1, "Injury": 1, "International normalised ratio abnormal": 1, "Joint swelling": 1, "Laboratory test": 1, "Lip blister": 1, "Liver function test": 1, "Loss of consciousness": 1, "Lumbar puncture": 1, "Magnetic resonance imaging abdominal": 1, "Magnetic resonance imaging heart": 1, "Meniere's disease": 1, "Menstruation irregular": 1, "Migraine": 1, "Monoplegia": 1, "Muscle tightness": 1, "Myocardial infarction": 1, "Myocardial injury": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nasal obstruction": 1, "Nasal oedema": 1, "Neisseria test": 1, "Neuralgia": 1, "Neurodermatitis": 1, "Night sweats": 1, "Nocturia": 1, "Occipital neuralgia": 1, "Ocular hyperaemia": 1, "Office visit": 1, "Ophthalmic herpes zoster": 1, "Optic ischaemic neuropathy": 1, "Oral disorder": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pain assessment": 1, "Palpitations": 1, "Pancreatitis": 1, "Peripheral coldness": 1, "Petechiae": 1, "Polymerase chain reaction": 1, "Polyneuropathy": 1, "Pregnancy test": 1, "Presyncope": 1, "Product use issue": 1, "Prothrombin time": 1, "Pulmonary function test": 1, "Pyelonephritis": 1, "Radiculitis brachial": 1, "Rash pustular": 1, "Red blood cell abnormality": 1, "Red blood cell count decreased": 1, "Red blood cell count increased": 1, "Red blood cells urine": 1, "Renal function test": 1, "Respiratory disorder": 1, "Retinal artery occlusion": 1, "Retinal haemorrhage": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test positive": 1, "Sarcoidosis": 1, "Scan": 1, "Seborrhoeic dermatitis": 1, "Sensorimotor disorder": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Subclavian vein thrombosis": 1, "Suffocation feeling": 1, "Suspected COVID-19": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroxine free": 1, "Tinnitus": 1, "Tooth infection": 1, "Transient ischaemic attack": 1, "Traumatic haematoma": 1, "Tri-iodothyronine free": 1, "Troponin increased": 1, "Ultrasound abdomen": 1, "Ultrasound scan normal": 1, "Ultrasound thyroid": 1, "Urinary sediment present": 1, "Urine analysis": 1, "Urticaria chronic": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Venous thrombosis": 1, "Ventricular fibrillation": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Vibration test": 1, "Visual acuity tests": 1, "Visual field defect": 1, "Visual impairment": 1, "Von Willebrand's factor antibody": 1, "Von Willebrand's factor antigen test": 1, "Weight": 1, "Weight decreased": 1, "X-ray normal": 1}, "batchcodes": ["EP9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER 7449.json b/docs/data/histograms/Switzerland/ER 7449.json
index 054dadf61f8..a4a9965961e 100644
--- a/docs/data/histograms/Switzerland/ER 7449.json
+++ b/docs/data/histograms/Switzerland/ER 7449.json
@@ -1 +1 @@
-{"batchcode": "ER 7449", "histograms": [{"batchcodes": ["ER 7449"], "histogram": {"Angioedema": 1, "Arthralgia": 1, "Back pain": 1, "Diabetic metabolic decompensation": 1, "Gait disturbance": 1, "Glycosylated haemoglobin": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Uveitis": 1}}]}
\ No newline at end of file
+{"batchcode": "ER 7449", "histograms": [{"histogram": {"Angioedema": 1, "Arthralgia": 1, "Back pain": 1, "Diabetic metabolic decompensation": 1, "Gait disturbance": 1, "Glycosylated haemoglobin": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Uveitis": 1}, "batchcodes": ["ER 7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER3014.json b/docs/data/histograms/Switzerland/ER3014.json
index a09f78c8035..1bb92faf8b2 100644
--- a/docs/data/histograms/Switzerland/ER3014.json
+++ b/docs/data/histograms/Switzerland/ER3014.json
@@ -1 +1 @@
-{"batchcode": "ER3014", "histograms": [{"batchcodes": ["ER3014"], "histogram": {"Oedema peripheral": 1, "Pain": 1, "Vasodilatation": 1}}]}
\ No newline at end of file
+{"batchcode": "ER3014", "histograms": [{"histogram": {"Oedema peripheral": 1, "Pain": 1, "Vasodilatation": 1}, "batchcodes": ["ER3014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER4779.json b/docs/data/histograms/Switzerland/ER4779.json
index c35964a4349..21abcc0fe6a 100644
--- a/docs/data/histograms/Switzerland/ER4779.json
+++ b/docs/data/histograms/Switzerland/ER4779.json
@@ -1 +1 @@
-{"batchcode": "ER4779", "histograms": [{"batchcodes": ["ER4779"], "histogram": {"Acute stress disorder": 1, "Anaphylactic reaction": 1, "Hyperventilation": 1}}]}
\ No newline at end of file
+{"batchcode": "ER4779", "histograms": [{"histogram": {"Acute stress disorder": 1, "Anaphylactic reaction": 1, "Hyperventilation": 1}, "batchcodes": ["ER4779"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER74449.json b/docs/data/histograms/Switzerland/ER74449.json
index a9582f13637..b0168547e85 100644
--- a/docs/data/histograms/Switzerland/ER74449.json
+++ b/docs/data/histograms/Switzerland/ER74449.json
@@ -1 +1 @@
-{"batchcode": "ER74449", "histograms": [{"batchcodes": ["ER74449"], "histogram": {"Blood culture": 1, "Body temperature": 1, "C-reactive protein": 1, "Culture urine": 1, "Erythema": 1, "Headache": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Procalcitonin": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Scan brain": 1, "Syncope": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "ER74449", "histograms": [{"histogram": {"Blood culture": 1, "Body temperature": 1, "C-reactive protein": 1, "Culture urine": 1, "Erythema": 1, "Headache": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Procalcitonin": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Scan brain": 1, "Syncope": 1, "White blood cell count": 1}, "batchcodes": ["ER74449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER7449.json b/docs/data/histograms/Switzerland/ER7449.json
index 40eb880d83c..78adda61379 100644
--- a/docs/data/histograms/Switzerland/ER7449.json
+++ b/docs/data/histograms/Switzerland/ER7449.json
@@ -1 +1 @@
-{"batchcode": "ER7449", "histograms": [{"batchcodes": ["ER7449"], "histogram": {"Headache": 14, "SARS-CoV-2 test": 12, "Fatigue": 11, "Pyrexia": 11, "COVID-19": 10, "Dizziness": 9, "Malaise": 9, "Blood pressure measurement": 8, "Body temperature": 8, "C-reactive protein": 8, "Heart rate": 8, "Vaccination failure": 8, "Chills": 6, "Dyspnoea": 6, "Electrocardiogram": 6, "Hypertension": 6, "Investigation": 6, "Magnetic resonance imaging": 6, "Nausea": 6, "Vaccination site pain": 6, "Platelet count": 5, "Vertigo": 5, "Arrhythmia": 4, "Asthenia": 4, "Chest discomfort": 4, "Computerised tomogram": 4, "Herpes zoster": 4, "Lymphadenopathy": 4, "Pulmonary embolism": 4, "Syncope": 4, "Tachycardia": 4, "Anaphylactic reaction": 3, "Antinuclear antibody": 3, "Arthralgia": 3, "Atrial fibrillation": 3, "Chest pain": 3, "Cough": 3, "Echocardiogram": 3, "Erythema": 3, "Fibrin D dimer": 3, "Hot flush": 3, "Inappropriate schedule of product administration": 3, "Myalgia": 3, "Neurological examination": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Palpitations": 3, "Presyncope": 3, "Pruritus": 3, "Rheumatoid factor": 3, "Ultrasound scan": 3, "Vomiting": 3, "Abdominal pain": 2, "Alanine aminotransferase": 2, "Angina pectoris": 2, "Angioscopy": 2, "Antineutrophil cytoplasmic antibody": 2, "Aspartate aminotransferase": 2, "Autonomic nervous system imbalance": 2, "Blood alkaline phosphatase": 2, "Blood count": 2, "Blood test": 2, "Chest scan": 2, "Chlamydia test": 2, "Computerised tomogram head": 2, "Condition aggravated": 2, "Deep vein thrombosis": 2, "Drug ineffective": 2, "Dysphagia": 2, "Dysphonia": 2, "Electrocardiogram ambulatory": 2, "Electroneuromyography": 2, "Erythromelalgia": 2, "Full blood count": 2, "Gamma-glutamyltransferase": 2, "Heavy menstrual bleeding": 2, "Hyperaesthesia": 2, "Incorrect route of product administration": 2, "Insomnia": 2, "Laboratory test": 2, "Livedo reticularis": 2, "Magnetic resonance imaging head": 2, "Muscular weakness": 2, "Musculoskeletal pain": 2, "Oropharyngeal pain": 2, "Pain": 2, "Paraesthesia": 2, "Pericarditis": 2, "Rash": 2, "Respiratory rate": 2, "SARS-CoV-2 test positive": 2, "Thrombotic thrombocytopenic purpura": 2, "Tinnitus": 2, "Troponin": 2, "Tryptase": 2, "Type I hypersensitivity": 2, "Vaccination site reaction": 2, "Vasodilatation": 2, "Abdominal pain upper": 1, "Abortion": 1, "Abortion spontaneous": 1, "Allergy test": 1, "Alopecia": 1, "Amnesia": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antiphospholipid antibodies": 1, "Anxiety disorder": 1, "Apathy": 1, "Aphasia": 1, "Arteriosclerosis coronary artery": 1, "Asthma": 1, "Asthmatic crisis": 1, "Back pain": 1, "Blood creatinine": 1, "Blood electrolytes": 1, "Blood gases": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood pressure increased": 1, "Body mass index": 1, "Borrelia test": 1, "Bronchial secretion retention": 1, "Burning sensation": 1, "CSF test": 1, "Cardiac failure": 1, "Cardiolipin antibody": 1, "Chiropractic": 1, "Circulatory collapse": 1, "Coagulation factor": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Culture urine": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Decreased vibratory sense": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Duodenal ulcer": 1, "Dysmenorrhoea": 1, "Dysuria": 1, "Electrocardiogram QRS complex": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment elevation": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Electrophoresis protein": 1, "Epilepsy": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Extrasystoles": 1, "Eye infection toxoplasmal": 1, "Eye pain": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Galactorrhoea": 1, "Gastrointestinal haemorrhage": 1, "General physical health deterioration": 1, "Glossopharyngeal nerve disorder": 1, "Glycosylated haemoglobin": 1, "Haemoglobin": 1, "Hair colour changes": 1, "Hallucination": 1, "Hepatitis A virus test": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Herpes simplex": 1, "Herpes zoster meningitis": 1, "Histology": 1, "Hyperhidrosis": 1, "Hypertensive heart disease": 1, "Hyperthyroidism": 1, "Hypotonia": 1, "Imaging procedure": 1, "Immunology test": 1, "Inflammation": 1, "Intermenstrual bleeding": 1, "Interspinous osteoarthritis": 1, "Iridocyclitis": 1, "Language disorder": 1, "Limb discomfort": 1, "Lip pain": 1, "Lip swelling": 1, "Liver function test": 1, "Lumbosacral radiculopathy": 1, "Lung diffusion test": 1, "Lymphangitis": 1, "Macroangiopathy": 1, "Malignant ascites": 1, "Memory impairment": 1, "Meniere's disease": 1, "Migraine": 1, "Monocyte count": 1, "Monocytosis": 1, "Monoparesis": 1, "Mucosal disorder": 1, "Multiple sclerosis": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myasthenia gravis": 1, "Myocarditis": 1, "Neisseria test": 1, "Nerve compression": 1, "Night sweats": 1, "Normochromic normocytic anaemia": 1, "Oedema peripheral": 1, "Ophthalmic herpes zoster": 1, "Oral herpes": 1, "Otoscopy": 1, "Overdose": 1, "Pain assessment": 1, "Paraesthesia oral": 1, "Parvovirus B19 test": 1, "Peripheral sensory neuropathy": 1, "Petechiae": 1, "Petit mal epilepsy": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleocytosis": 1, "Plethysmography": 1, "Pleurisy": 1, "Polymyalgia rheumatica": 1, "Pregnancy test": 1, "Pulmonary infarction": 1, "Quadrantanopia": 1, "Red blood cell sedimentation rate": 1, "Renal function test": 1, "Respiratory disorder": 1, "Retinal artery occlusion": 1, "Romberg test": 1, "Rubella antibody test": 1, "SARS-CoV-2 antibody test": 1, "Sarcoidosis": 1, "Sensitive skin": 1, "Serum amyloid A protein": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Skin discolouration": 1, "Skin test": 1, "Somnolence": 1, "Specialist consultation": 1, "Spinal X-ray": 1, "Spontaneous haematoma": 1, "Streptococcus test": 1, "Supraventricular tachycardia": 1, "Swelling face": 1, "Thalamus haemorrhage": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Thrombotic microangiopathy": 1, "Thyroid function test": 1, "Toxoplasmosis": 1, "Tremor": 1, "Treponema test": 1, "Trigeminal neuralgia": 1, "Type III immune complex mediated reaction": 1, "Vaccination site erythema": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site warmth": 1, "Vaginal discharge": 1, "Varicella virus test": 1, "Ventricular hypertrophy": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Walking distance test": 1, "Wheezing": 1, "X-ray of pelvis and hip": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7449", "histograms": [{"histogram": {"Headache": 14, "SARS-CoV-2 test": 12, "Fatigue": 11, "Pyrexia": 11, "COVID-19": 10, "Dizziness": 9, "Malaise": 9, "Blood pressure measurement": 8, "Body temperature": 8, "C-reactive protein": 8, "Heart rate": 8, "Vaccination failure": 8, "Chills": 6, "Dyspnoea": 6, "Electrocardiogram": 6, "Hypertension": 6, "Investigation": 6, "Magnetic resonance imaging": 6, "Nausea": 6, "Vaccination site pain": 6, "Platelet count": 5, "Vertigo": 5, "Arrhythmia": 4, "Asthenia": 4, "Chest discomfort": 4, "Computerised tomogram": 4, "Herpes zoster": 4, "Lymphadenopathy": 4, "Pulmonary embolism": 4, "Syncope": 4, "Tachycardia": 4, "Anaphylactic reaction": 3, "Antinuclear antibody": 3, "Arthralgia": 3, "Atrial fibrillation": 3, "Chest pain": 3, "Cough": 3, "Echocardiogram": 3, "Erythema": 3, "Fibrin D dimer": 3, "Hot flush": 3, "Inappropriate schedule of product administration": 3, "Myalgia": 3, "Neurological examination": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Palpitations": 3, "Presyncope": 3, "Pruritus": 3, "Rheumatoid factor": 3, "Ultrasound scan": 3, "Vomiting": 3, "Abdominal pain": 2, "Alanine aminotransferase": 2, "Angina pectoris": 2, "Angioscopy": 2, "Antineutrophil cytoplasmic antibody": 2, "Aspartate aminotransferase": 2, "Autonomic nervous system imbalance": 2, "Blood alkaline phosphatase": 2, "Blood count": 2, "Blood test": 2, "Chest scan": 2, "Chlamydia test": 2, "Computerised tomogram head": 2, "Condition aggravated": 2, "Deep vein thrombosis": 2, "Drug ineffective": 2, "Dysphagia": 2, "Dysphonia": 2, "Electrocardiogram ambulatory": 2, "Electroneuromyography": 2, "Erythromelalgia": 2, "Full blood count": 2, "Gamma-glutamyltransferase": 2, "Heavy menstrual bleeding": 2, "Hyperaesthesia": 2, "Incorrect route of product administration": 2, "Insomnia": 2, "Laboratory test": 2, "Livedo reticularis": 2, "Magnetic resonance imaging head": 2, "Muscular weakness": 2, "Musculoskeletal pain": 2, "Oropharyngeal pain": 2, "Pain": 2, "Paraesthesia": 2, "Pericarditis": 2, "Rash": 2, "Respiratory rate": 2, "SARS-CoV-2 test positive": 2, "Thrombotic thrombocytopenic purpura": 2, "Tinnitus": 2, "Troponin": 2, "Tryptase": 2, "Type I hypersensitivity": 2, "Vaccination site reaction": 2, "Vasodilatation": 2, "Abdominal pain upper": 1, "Abortion": 1, "Abortion spontaneous": 1, "Allergy test": 1, "Alopecia": 1, "Amnesia": 1, "Angiocardiogram": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antiphospholipid antibodies": 1, "Anxiety disorder": 1, "Apathy": 1, "Aphasia": 1, "Arteriosclerosis coronary artery": 1, "Asthma": 1, "Asthmatic crisis": 1, "Back pain": 1, "Blood creatinine": 1, "Blood electrolytes": 1, "Blood gases": 1, "Blood glucose": 1, "Blood immunoglobulin E": 1, "Blood pressure increased": 1, "Body mass index": 1, "Borrelia test": 1, "Bronchial secretion retention": 1, "Burning sensation": 1, "CSF test": 1, "Cardiac failure": 1, "Cardiolipin antibody": 1, "Chiropractic": 1, "Circulatory collapse": 1, "Coagulation factor": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Culture urine": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Deafness bilateral": 1, "Decreased appetite": 1, "Decreased vibratory sense": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disease recurrence": 1, "Duodenal ulcer": 1, "Dysmenorrhoea": 1, "Dysuria": 1, "Electrocardiogram QRS complex": 1, "Electrocardiogram ST segment": 1, "Electrocardiogram ST segment elevation": 1, "Electroencephalogram": 1, "Electromyogram": 1, "Electrophoresis protein": 1, "Epilepsy": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Extrasystoles": 1, "Eye infection toxoplasmal": 1, "Eye pain": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Galactorrhoea": 1, "Gastrointestinal haemorrhage": 1, "General physical health deterioration": 1, "Glossopharyngeal nerve disorder": 1, "Glycosylated haemoglobin": 1, "Haemoglobin": 1, "Hair colour changes": 1, "Hallucination": 1, "Hepatitis A virus test": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Herpes simplex": 1, "Herpes zoster meningitis": 1, "Histology": 1, "Hyperhidrosis": 1, "Hypertensive heart disease": 1, "Hyperthyroidism": 1, "Hypotonia": 1, "Imaging procedure": 1, "Immunology test": 1, "Inflammation": 1, "Intermenstrual bleeding": 1, "Interspinous osteoarthritis": 1, "Iridocyclitis": 1, "Language disorder": 1, "Limb discomfort": 1, "Lip pain": 1, "Lip swelling": 1, "Liver function test": 1, "Lumbosacral radiculopathy": 1, "Lung diffusion test": 1, "Lymphangitis": 1, "Macroangiopathy": 1, "Malignant ascites": 1, "Memory impairment": 1, "Meniere's disease": 1, "Migraine": 1, "Monocyte count": 1, "Monocytosis": 1, "Monoparesis": 1, "Mucosal disorder": 1, "Multiple sclerosis": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myasthenia gravis": 1, "Myocarditis": 1, "Neisseria test": 1, "Nerve compression": 1, "Night sweats": 1, "Normochromic normocytic anaemia": 1, "Oedema peripheral": 1, "Ophthalmic herpes zoster": 1, "Oral herpes": 1, "Otoscopy": 1, "Overdose": 1, "Pain assessment": 1, "Paraesthesia oral": 1, "Parvovirus B19 test": 1, "Peripheral sensory neuropathy": 1, "Petechiae": 1, "Petit mal epilepsy": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Physical examination": 1, "Platelet count decreased": 1, "Pleocytosis": 1, "Plethysmography": 1, "Pleurisy": 1, "Polymyalgia rheumatica": 1, "Pregnancy test": 1, "Pulmonary infarction": 1, "Quadrantanopia": 1, "Red blood cell sedimentation rate": 1, "Renal function test": 1, "Respiratory disorder": 1, "Retinal artery occlusion": 1, "Romberg test": 1, "Rubella antibody test": 1, "SARS-CoV-2 antibody test": 1, "Sarcoidosis": 1, "Sensitive skin": 1, "Serum amyloid A protein": 1, "Sinus rhythm": 1, "Sinus tachycardia": 1, "Skin discolouration": 1, "Skin test": 1, "Somnolence": 1, "Specialist consultation": 1, "Spinal X-ray": 1, "Spontaneous haematoma": 1, "Streptococcus test": 1, "Supraventricular tachycardia": 1, "Swelling face": 1, "Thalamus haemorrhage": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Thrombotic microangiopathy": 1, "Thyroid function test": 1, "Toxoplasmosis": 1, "Tremor": 1, "Treponema test": 1, "Trigeminal neuralgia": 1, "Type III immune complex mediated reaction": 1, "Vaccination site erythema": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site warmth": 1, "Vaginal discharge": 1, "Varicella virus test": 1, "Ventricular hypertrophy": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Walking distance test": 1, "Wheezing": 1, "X-ray of pelvis and hip": 1}, "batchcodes": ["ER7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER7823.json b/docs/data/histograms/Switzerland/ER7823.json
index 59564bf64eb..ae38cb2180a 100644
--- a/docs/data/histograms/Switzerland/ER7823.json
+++ b/docs/data/histograms/Switzerland/ER7823.json
@@ -1 +1 @@
-{"batchcode": "ER7823", "histograms": [{"batchcodes": ["ER7823"], "histogram": {"Arthralgia": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Fatigue": 1, "Gait disturbance": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Postmenopausal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7823", "histograms": [{"histogram": {"Arthralgia": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Fatigue": 1, "Gait disturbance": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Postmenopausal haemorrhage": 1}, "batchcodes": ["ER7823"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER7949.json b/docs/data/histograms/Switzerland/ER7949.json
index f128655a067..80f945b743a 100644
--- a/docs/data/histograms/Switzerland/ER7949.json
+++ b/docs/data/histograms/Switzerland/ER7949.json
@@ -1 +1 @@
-{"batchcode": "ER7949", "histograms": [{"batchcodes": ["ER7949"], "histogram": {"Asthenia": 1, "Blood pressure fluctuation": 1, "Diarrhoea": 1, "Hypotension": 1, "Migraine": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "ER7949", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure fluctuation": 1, "Diarrhoea": 1, "Hypotension": 1, "Migraine": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Vomiting": 1}, "batchcodes": ["ER7949"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ER9605.json b/docs/data/histograms/Switzerland/ER9605.json
index 02ba537769f..a0ab0f8c6c0 100644
--- a/docs/data/histograms/Switzerland/ER9605.json
+++ b/docs/data/histograms/Switzerland/ER9605.json
@@ -1 +1 @@
-{"batchcode": "ER9605", "histograms": [{"batchcodes": ["ER9605"], "histogram": {"Blood creatinine": 1, "Formication": 1, "Muscular weakness": 1, "Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "ER9605", "histograms": [{"histogram": {"Blood creatinine": 1, "Formication": 1, "Muscular weakness": 1, "Speech disorder": 1}, "batchcodes": ["ER9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ES6788.json b/docs/data/histograms/Switzerland/ES6788.json
index 74589a4e653..2dfd8b8aacb 100644
--- a/docs/data/histograms/Switzerland/ES6788.json
+++ b/docs/data/histograms/Switzerland/ES6788.json
@@ -1 +1 @@
-{"batchcode": "ES6788", "histograms": [{"batchcodes": ["ES6788"], "histogram": {"Angioedema": 1, "Blood pressure measurement": 1, "Dysgeusia": 1, "Hypersensitivity": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "ES6788", "histograms": [{"histogram": {"Angioedema": 1, "Blood pressure measurement": 1, "Dysgeusia": 1, "Hypersensitivity": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["ES6788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/ES6796.json b/docs/data/histograms/Switzerland/ES6796.json
index 0b5ad044499..014928c666f 100644
--- a/docs/data/histograms/Switzerland/ES6796.json
+++ b/docs/data/histograms/Switzerland/ES6796.json
@@ -1 +1 @@
-{"batchcode": "ES6796", "histograms": [{"batchcodes": ["ES6796"], "histogram": {"Dyspnoea": 1, "Herpes zoster": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ES6796", "histograms": [{"histogram": {"Dyspnoea": 1, "Herpes zoster": 1, "Pyrexia": 1}, "batchcodes": ["ES6796"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EW6126.json b/docs/data/histograms/Switzerland/EW6126.json
index 5488ae629e0..74461dc9549 100644
--- a/docs/data/histograms/Switzerland/EW6126.json
+++ b/docs/data/histograms/Switzerland/EW6126.json
@@ -1 +1 @@
-{"batchcode": "EW6126", "histograms": [{"batchcodes": ["EW6126"], "histogram": {"Acute psychosis": 1, "Completed suicide": 1, "Euphoric mood": 1}}]}
\ No newline at end of file
+{"batchcode": "EW6126", "histograms": [{"histogram": {"Acute psychosis": 1, "Completed suicide": 1, "Euphoric mood": 1}, "batchcodes": ["EW6126"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EX7823.json b/docs/data/histograms/Switzerland/EX7823.json
index 2848b9b21c2..44b53c6382d 100644
--- a/docs/data/histograms/Switzerland/EX7823.json
+++ b/docs/data/histograms/Switzerland/EX7823.json
@@ -1 +1 @@
-{"batchcode": "EX7823", "histograms": [{"batchcodes": ["EX7823"], "histogram": {"Dyspnoea": 5, "Pain in extremity": 5, "Pyrexia": 5, "Body temperature": 4, "Fatigue": 4, "Myalgia": 4, "Chills": 3, "Headache": 3, "COVID-19": 2, "Dizziness": 2, "Fall": 2, "Paraesthesia": 2, "Pneumonia": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Vaccination failure": 2, "Angiogram": 1, "Ankylosing spondylitis": 1, "Arthralgia": 1, "Arthritis": 1, "Auscultation": 1, "Back pain": 1, "Biopsy": 1, "Blood gases": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Cough": 1, "Cutaneous vasculitis": 1, "Dependence on oxygen therapy": 1, "Dry mouth": 1, "Echocardiogram": 1, "Endoscopy": 1, "Erythema": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gastrointestinal disorder": 1, "Hypersensitivity": 1, "Intervertebral disc protrusion": 1, "Investigation": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neutrophil count": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pruritus": 1, "Pulmonary arterial pressure increased": 1, "Pulmonary embolism": 1, "Pulmonary pain": 1, "Right ventricular dilatation": 1, "Skin lesion": 1, "Somnolence": 1, "Specialist consultation": 1, "Synovial cyst": 1, "Tachycardia": 1, "Thirst": 1, "Tongue discomfort": 1, "Tremor": 1, "Troponin T": 1, "Troponin T increased": 1, "Tuberculosis": 1, "Ultrasound Doppler": 1, "Urinary tract infection": 1, "Urticaria": 1, "Uveitis": 1, "Varicella zoster virus infection": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EX7823", "histograms": [{"histogram": {"Dyspnoea": 5, "Pain in extremity": 5, "Pyrexia": 5, "Body temperature": 4, "Fatigue": 4, "Myalgia": 4, "Chills": 3, "Headache": 3, "COVID-19": 2, "Dizziness": 2, "Fall": 2, "Paraesthesia": 2, "Pneumonia": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Syncope": 2, "Vaccination failure": 2, "Angiogram": 1, "Ankylosing spondylitis": 1, "Arthralgia": 1, "Arthritis": 1, "Auscultation": 1, "Back pain": 1, "Biopsy": 1, "Blood gases": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Circulatory collapse": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Cough": 1, "Cutaneous vasculitis": 1, "Dependence on oxygen therapy": 1, "Dry mouth": 1, "Echocardiogram": 1, "Endoscopy": 1, "Erythema": 1, "Erythema multiforme": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gastrointestinal disorder": 1, "Hypersensitivity": 1, "Intervertebral disc protrusion": 1, "Investigation": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neutrophil count": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Pruritus": 1, "Pulmonary arterial pressure increased": 1, "Pulmonary embolism": 1, "Pulmonary pain": 1, "Right ventricular dilatation": 1, "Skin lesion": 1, "Somnolence": 1, "Specialist consultation": 1, "Synovial cyst": 1, "Tachycardia": 1, "Thirst": 1, "Tongue discomfort": 1, "Tremor": 1, "Troponin T": 1, "Troponin T increased": 1, "Tuberculosis": 1, "Ultrasound Doppler": 1, "Urinary tract infection": 1, "Urticaria": 1, "Uveitis": 1, "Varicella zoster virus infection": 1, "Vision blurred": 1}, "batchcodes": ["EX7823"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EX7829.json b/docs/data/histograms/Switzerland/EX7829.json
index b76434e5608..579261128a6 100644
--- a/docs/data/histograms/Switzerland/EX7829.json
+++ b/docs/data/histograms/Switzerland/EX7829.json
@@ -1 +1 @@
-{"batchcode": "EX7829", "histograms": [{"batchcodes": ["EX7829"], "histogram": {"Disturbance in attention": 1, "Fatigue": 1, "Headache": 1, "Magnetic resonance imaging": 1, "Photophobia": 1}}]}
\ No newline at end of file
+{"batchcode": "EX7829", "histograms": [{"histogram": {"Disturbance in attention": 1, "Fatigue": 1, "Headache": 1, "Magnetic resonance imaging": 1, "Photophobia": 1}, "batchcodes": ["EX7829"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EY 3010.json b/docs/data/histograms/Switzerland/EY 3010.json
index 7151298b0ea..594b0c39d49 100644
--- a/docs/data/histograms/Switzerland/EY 3010.json
+++ b/docs/data/histograms/Switzerland/EY 3010.json
@@ -1 +1 @@
-{"batchcode": "EY 3010", "histograms": [{"batchcodes": ["EY 3010"], "histogram": {"Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "EY 3010", "histograms": [{"histogram": {"Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Ultrasound scan": 1}, "batchcodes": ["EY 3010"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EY 3014.json b/docs/data/histograms/Switzerland/EY 3014.json
index 58e9c7974d6..3d3fd9dcb8c 100644
--- a/docs/data/histograms/Switzerland/EY 3014.json
+++ b/docs/data/histograms/Switzerland/EY 3014.json
@@ -1 +1 @@
-{"batchcode": "EY 3014", "histograms": [{"batchcodes": ["EY 3014"], "histogram": {"Angioedema": 1, "Type I hypersensitivity": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "EY 3014", "histograms": [{"histogram": {"Angioedema": 1, "Type I hypersensitivity": 1, "Urticaria": 1}, "batchcodes": ["EY 3014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EY3014.json b/docs/data/histograms/Switzerland/EY3014.json
index 79207e2d196..2ea544fdd6e 100644
--- a/docs/data/histograms/Switzerland/EY3014.json
+++ b/docs/data/histograms/Switzerland/EY3014.json
@@ -1 +1 @@
-{"batchcode": "EY3014", "histograms": [{"batchcodes": ["EY3014"], "histogram": {"Blood pressure measurement": 12, "Fatigue": 12, "Headache": 9, "SARS-CoV-2 test": 9, "Arthralgia": 8, "COVID-19": 7, "Dyspnoea": 7, "Heart rate": 7, "C-reactive protein": 6, "Magnetic resonance imaging head": 6, "Myalgia": 6, "Oxygen saturation": 6, "Body temperature": 5, "Dizziness": 5, "Magnetic resonance imaging": 5, "Magnetic resonance imaging spinal": 5, "Platelet count": 5, "Pruritus": 5, "Pyrexia": 5, "Vaccination failure": 5, "White blood cell count": 5, "Anaphylactic reaction": 4, "Blood creatinine": 4, "Electrocardiogram": 4, "Fibrin D dimer": 4, "Herpes zoster": 4, "Investigation": 4, "Neurological examination": 4, "Pulmonary embolism": 4, "Alanine aminotransferase": 3, "Blood pressure increased": 3, "Blood thyroid stimulating hormone": 3, "Borrelia test": 3, "Drug ineffective": 3, "Echocardiogram": 3, "Haemoglobin": 3, "Lumbar puncture": 3, "Nausea": 3, "Syncope": 3, "Tinnitus": 3, "Angiocardiogram": 2, "Antibody test": 2, "Aspartate aminotransferase": 2, "Blood creatine phosphokinase": 2, "Blood immunoglobulin A": 2, "Blood immunoglobulin G": 2, "Blood immunoglobulin M": 2, "Blood potassium": 2, "Blood test": 2, "Body mass index": 2, "Chest X-ray": 2, "Chest pain": 2, "Cold sweat": 2, "Diarrhoea": 2, "Dysphagia": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Gamma-glutamyltransferase": 2, "Hepatitis C virus test": 2, "Hot flush": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Leukocytosis": 2, "Limb discomfort": 2, "Monoparesis": 2, "Muscular weakness": 2, "Myelitis transverse": 2, "Pain": 2, "Paraesthesia": 2, "Rash": 2, "SARS-CoV-2 antibody test": 2, "Serum ferritin": 2, "Tachycardia": 2, "Ultrasound scan": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Varicella virus test": 2, "Vitamin B12": 2, "X-ray of pelvis and hip": 2, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Adenocarcinoma of colon": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Altered state of consciousness": 1, "Angioedema": 1, "Angiogram cerebral": 1, "Angiotensin converting enzyme": 1, "Anti-aquaporin-4 antibody": 1, "Anti-thyroid antibody increased": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aortic valve incompetence": 1, "Asthenia": 1, "Asthma": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Auscultation": 1, "Autoantibody test": 1, "Autoimmune disorder": 1, "Balance disorder": 1, "Beta 2 globulin": 1, "Beta globulin": 1, "Biopsy colon": 1, "Biopsy stomach": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood culture": 1, "Blood folate": 1, "Blood gases": 1, "Blood immunoglobulin E": 1, "Blood phosphorus": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Body temperature increased": 1, "Borrelia infection": 1, "CSF glucose": 1, "CSF lactate": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "CSF white blood cell count": 1, "Cardiac murmur": 1, "Cardiomegaly": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Chiropractic": 1, "Chlamydia test": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Computerised tomogram thorax": 1, "Conjunctivitis": 1, "Cough": 1, "Cyanosis": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Decreased vibratory sense": 1, "Demyelination": 1, "Depression": 1, "Diplopia": 1, "Disease recurrence": 1, "Distractibility": 1, "Diverticulitis": 1, "Dry eye": 1, "Dry throat": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysphonia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Electroencephalogram": 1, "Electrophoresis protein": 1, "Erythema": 1, "Exercise tolerance decreased": 1, "Eyelid haematoma": 1, "Fall": 1, "Feeling cold": 1, "Full blood count": 1, "Gastritis erosive": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Granulocyte count": 1, "Granulocyte percentage": 1, "HIV antibody": 1, "HIV test": 1, "Haematocrit": 1, "Hallucination, visual": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hemianopia": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatitis B virus test": 1, "Herpes simplex test": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Illness": 1, "Immunoglobulins": 1, "Immunology test": 1, "Incontinence": 1, "Intermenstrual bleeding": 1, "Intestinal haemorrhage": 1, "Intracranial aneurysm": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Legionella test": 1, "Lemierre syndrome": 1, "Lipase": 1, "Liver function test": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbosacral radiculopathy": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging neck": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Measles antibody": 1, "Menometrorrhagia": 1, "Menstruation irregular": 1, "Microscopy": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Multiple sclerosis": 1, "Mumps antibody test": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myasthenia gravis": 1, "Mycobacterium test": 1, "Mycobacterium tuberculosis complex test": 1, "Mycoplasma test": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nerve compression": 1, "Neurilemmoma benign": 1, "Neuritis": 1, "Neuroborreliosis": 1, "Neurological decompensation": 1, "New daily persistent headache": 1, "Oesophagogastroduodenoscopy": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Pain assessment": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Panic attack": 1, "Parosmia": 1, "Peak expiratory flow rate": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Photophobia": 1, "Physical examination": 1, "Pneumonia": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Presyncope": 1, "Proctosigmoidoscopy": 1, "Productive cough": 1, "Prostatic specific antigen": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary oedema": 1, "Rales": 1, "Rash macular": 1, "Rash maculo-papular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal function test": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Restless legs syndrome": 1, "Rhabdomyolysis": 1, "Rheumatoid factor": 1, "Romberg test": 1, "Romberg test positive": 1, "Rubella antibody test": 1, "Sensory loss": 1, "Skin hypertrophy": 1, "Skin test": 1, "Skin tightness": 1, "Sleep deficit": 1, "Somnolence": 1, "Specialist consultation": 1, "Spinal X-ray": 1, "Spine malformation": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Swelling": 1, "Taste disorder": 1, "Tenosynovitis": 1, "Throat tightness": 1, "Thunderclap headache": 1, "Thyroid function test": 1, "Thyroiditis acute": 1, "Thyroxine": 1, "Tick-borne viral encephalitis": 1, "Tonsillitis": 1, "Total cholesterol/HDL ratio": 1, "Treponema test": 1, "Troponin": 1, "Troponin T": 1, "Tryptase": 1, "Tuberculosis": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Urticaria": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Vision blurred": 1, "Visual evoked potentials": 1, "Vitamin D": 1, "Vomiting": 1, "Vomiting projectile": 1, "Walking aid user": 1, "Walking disability": 1, "Wheezing": 1, "White matter lesion": 1, "X-ray": 1, "Xanthochromia": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "EY3014", "histograms": [{"histogram": {"Blood pressure measurement": 12, "Fatigue": 12, "Headache": 9, "SARS-CoV-2 test": 9, "Arthralgia": 8, "COVID-19": 7, "Dyspnoea": 7, "Heart rate": 7, "C-reactive protein": 6, "Magnetic resonance imaging head": 6, "Myalgia": 6, "Oxygen saturation": 6, "Body temperature": 5, "Dizziness": 5, "Magnetic resonance imaging": 5, "Magnetic resonance imaging spinal": 5, "Platelet count": 5, "Pruritus": 5, "Pyrexia": 5, "Vaccination failure": 5, "White blood cell count": 5, "Anaphylactic reaction": 4, "Blood creatinine": 4, "Electrocardiogram": 4, "Fibrin D dimer": 4, "Herpes zoster": 4, "Investigation": 4, "Neurological examination": 4, "Pulmonary embolism": 4, "Alanine aminotransferase": 3, "Blood pressure increased": 3, "Blood thyroid stimulating hormone": 3, "Borrelia test": 3, "Drug ineffective": 3, "Echocardiogram": 3, "Haemoglobin": 3, "Lumbar puncture": 3, "Nausea": 3, "Syncope": 3, "Tinnitus": 3, "Angiocardiogram": 2, "Antibody test": 2, "Aspartate aminotransferase": 2, "Blood creatine phosphokinase": 2, "Blood immunoglobulin A": 2, "Blood immunoglobulin G": 2, "Blood immunoglobulin M": 2, "Blood potassium": 2, "Blood test": 2, "Body mass index": 2, "Chest X-ray": 2, "Chest pain": 2, "Cold sweat": 2, "Diarrhoea": 2, "Dysphagia": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Gamma-glutamyltransferase": 2, "Hepatitis C virus test": 2, "Hot flush": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Leukocytosis": 2, "Limb discomfort": 2, "Monoparesis": 2, "Muscular weakness": 2, "Myelitis transverse": 2, "Pain": 2, "Paraesthesia": 2, "Rash": 2, "SARS-CoV-2 antibody test": 2, "Serum ferritin": 2, "Tachycardia": 2, "Ultrasound scan": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Varicella virus test": 2, "Vitamin B12": 2, "X-ray of pelvis and hip": 2, "Activated partial thromboplastin time": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Adenocarcinoma of colon": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Altered state of consciousness": 1, "Angioedema": 1, "Angiogram cerebral": 1, "Angiotensin converting enzyme": 1, "Anti-aquaporin-4 antibody": 1, "Anti-thyroid antibody increased": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aortic valve incompetence": 1, "Asthenia": 1, "Asthma": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Auscultation": 1, "Autoantibody test": 1, "Autoimmune disorder": 1, "Balance disorder": 1, "Beta 2 globulin": 1, "Beta globulin": 1, "Biopsy colon": 1, "Biopsy stomach": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood culture": 1, "Blood folate": 1, "Blood gases": 1, "Blood immunoglobulin E": 1, "Blood phosphorus": 1, "Blood sodium": 1, "Blood triglycerides": 1, "Blood uric acid": 1, "Body temperature increased": 1, "Borrelia infection": 1, "CSF glucose": 1, "CSF lactate": 1, "CSF oligoclonal band": 1, "CSF protein": 1, "CSF test": 1, "CSF white blood cell count": 1, "Cardiac murmur": 1, "Cardiomegaly": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Chiropractic": 1, "Chlamydia test": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Computerised tomogram thorax": 1, "Conjunctivitis": 1, "Cough": 1, "Cyanosis": 1, "Cytomegalovirus test": 1, "Deafness": 1, "Decreased vibratory sense": 1, "Demyelination": 1, "Depression": 1, "Diplopia": 1, "Disease recurrence": 1, "Distractibility": 1, "Diverticulitis": 1, "Dry eye": 1, "Dry throat": 1, "Dysaesthesia": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dysphonia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Electroencephalogram": 1, "Electrophoresis protein": 1, "Erythema": 1, "Exercise tolerance decreased": 1, "Eyelid haematoma": 1, "Fall": 1, "Feeling cold": 1, "Full blood count": 1, "Gastritis erosive": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Granulocyte count": 1, "Granulocyte percentage": 1, "HIV antibody": 1, "HIV test": 1, "Haematocrit": 1, "Hallucination, visual": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hemianopia": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hepatitis B virus test": 1, "Herpes simplex test": 1, "High density lipoprotein": 1, "Hyperhidrosis": 1, "Hypotension": 1, "Illness": 1, "Immunoglobulins": 1, "Immunology test": 1, "Incontinence": 1, "Intermenstrual bleeding": 1, "Intestinal haemorrhage": 1, "Intracranial aneurysm": 1, "Ischaemic stroke": 1, "Laboratory test": 1, "Legionella test": 1, "Lemierre syndrome": 1, "Lipase": 1, "Liver function test": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lumbosacral radiculopathy": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Magnetic resonance imaging head abnormal": 1, "Magnetic resonance imaging neck": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Measles antibody": 1, "Menometrorrhagia": 1, "Menstruation irregular": 1, "Microscopy": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Monocyte percentage": 1, "Multiple sclerosis": 1, "Mumps antibody test": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myasthenia gravis": 1, "Mycobacterium test": 1, "Mycobacterium tuberculosis complex test": 1, "Mycoplasma test": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Nerve compression": 1, "Neurilemmoma benign": 1, "Neuritis": 1, "Neuroborreliosis": 1, "Neurological decompensation": 1, "New daily persistent headache": 1, "Oesophagogastroduodenoscopy": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Pain assessment": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Palpitations": 1, "Panic attack": 1, "Parosmia": 1, "Peak expiratory flow rate": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Photophobia": 1, "Physical examination": 1, "Pneumonia": 1, "Polyarthritis": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Presyncope": 1, "Proctosigmoidoscopy": 1, "Productive cough": 1, "Prostatic specific antigen": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary oedema": 1, "Rales": 1, "Rash macular": 1, "Rash maculo-papular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal function test": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Restless legs syndrome": 1, "Rhabdomyolysis": 1, "Rheumatoid factor": 1, "Romberg test": 1, "Romberg test positive": 1, "Rubella antibody test": 1, "Sensory loss": 1, "Skin hypertrophy": 1, "Skin test": 1, "Skin tightness": 1, "Sleep deficit": 1, "Somnolence": 1, "Specialist consultation": 1, "Spinal X-ray": 1, "Spine malformation": 1, "Subarachnoid haemorrhage": 1, "Sudden hearing loss": 1, "Suffocation feeling": 1, "Swelling": 1, "Taste disorder": 1, "Tenosynovitis": 1, "Throat tightness": 1, "Thunderclap headache": 1, "Thyroid function test": 1, "Thyroiditis acute": 1, "Thyroxine": 1, "Tick-borne viral encephalitis": 1, "Tonsillitis": 1, "Total cholesterol/HDL ratio": 1, "Treponema test": 1, "Troponin": 1, "Troponin T": 1, "Tryptase": 1, "Tuberculosis": 1, "Type I hypersensitivity": 1, "Ultrasound abdomen": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Urticaria": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Vision blurred": 1, "Visual evoked potentials": 1, "Vitamin D": 1, "Vomiting": 1, "Vomiting projectile": 1, "Walking aid user": 1, "Walking disability": 1, "Wheezing": 1, "White matter lesion": 1, "X-ray": 1, "Xanthochromia": 1, "pH body fluid": 1}, "batchcodes": ["EY3014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/EY7449.json b/docs/data/histograms/Switzerland/EY7449.json
index d51046ebe2f..79738663513 100644
--- a/docs/data/histograms/Switzerland/EY7449.json
+++ b/docs/data/histograms/Switzerland/EY7449.json
@@ -1 +1 @@
-{"batchcode": "EY7449", "histograms": [{"batchcodes": ["EY7449"], "histogram": {"Cough": 2, "Electrocardiogram": 2, "Aphonia": 1, "Asthma": 1, "Blood thyroid stimulating hormone": 1, "Chest X-ray": 1, "Chest pain": 1, "Disease recurrence": 1, "Fibrin D dimer": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Odynophagia": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1, "Thyroiditis subacute": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Ultrasound thyroid": 1}}]}
\ No newline at end of file
+{"batchcode": "EY7449", "histograms": [{"histogram": {"Cough": 2, "Electrocardiogram": 2, "Aphonia": 1, "Asthma": 1, "Blood thyroid stimulating hormone": 1, "Chest X-ray": 1, "Chest pain": 1, "Disease recurrence": 1, "Fibrin D dimer": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Odynophagia": 1, "Oxygen saturation": 1, "SARS-CoV-2 test": 1, "Thyroiditis subacute": 1, "Tri-iodothyronine free": 1, "Troponin": 1, "Ultrasound thyroid": 1}, "batchcodes": ["EY7449"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FA7812.json b/docs/data/histograms/Switzerland/FA7812.json
index fe77f9a93af..b891b8db107 100644
--- a/docs/data/histograms/Switzerland/FA7812.json
+++ b/docs/data/histograms/Switzerland/FA7812.json
@@ -1 +1 @@
-{"batchcode": "FA7812", "histograms": [{"batchcodes": ["FA7812"], "histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Anorectal discomfort": 1, "Eye pain": 1, "Faeces discoloured": 1, "Gait disturbance": 1, "Hordeolum": 1, "Insomnia": 1, "Neuralgia": 1, "Neurological examination": 1, "Pain": 1, "Paraesthesia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7812", "histograms": [{"histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Anorectal discomfort": 1, "Eye pain": 1, "Faeces discoloured": 1, "Gait disturbance": 1, "Hordeolum": 1, "Insomnia": 1, "Neuralgia": 1, "Neurological examination": 1, "Pain": 1, "Paraesthesia": 1, "Vaccination site pain": 1}, "batchcodes": ["FA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC 3143.json b/docs/data/histograms/Switzerland/FC 3143.json
index 14c3ca31680..b118ca9221c 100644
--- a/docs/data/histograms/Switzerland/FC 3143.json
+++ b/docs/data/histograms/Switzerland/FC 3143.json
@@ -1 +1 @@
-{"batchcode": "FC 3143", "histograms": [{"batchcodes": ["FC 3143"], "histogram": {"Anaphylactic reaction": 1, "Hypertonia": 1, "Restlessness": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "FC 3143", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Hypertonia": 1, "Restlessness": 1, "Throat tightness": 1}, "batchcodes": ["FC 3143"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC 8736.json b/docs/data/histograms/Switzerland/FC 8736.json
index 0b3385b6975..4b883c2216b 100644
--- a/docs/data/histograms/Switzerland/FC 8736.json
+++ b/docs/data/histograms/Switzerland/FC 8736.json
@@ -1 +1 @@
-{"batchcode": "FC 8736", "histograms": [{"batchcodes": ["FC 8736"], "histogram": {"Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Borrelia infection": 1, "Borrelia test": 1, "Death": 1, "Erythema migrans": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Neuralgia": 1, "Photophobia": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "FC 8736", "histograms": [{"histogram": {"Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Borrelia infection": 1, "Borrelia test": 1, "Death": 1, "Erythema migrans": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Neuralgia": 1, "Photophobia": 1, "Vasculitis": 1}, "batchcodes": ["FC 8736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC0618.json b/docs/data/histograms/Switzerland/FC0618.json
index bf08f5915a1..4a0a05c28dd 100644
--- a/docs/data/histograms/Switzerland/FC0618.json
+++ b/docs/data/histograms/Switzerland/FC0618.json
@@ -1 +1 @@
-{"batchcode": "FC0618", "histograms": [{"batchcodes": ["FC0618"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FC0618", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FC0618"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC0681.json b/docs/data/histograms/Switzerland/FC0681.json
index 87b751f45f4..ad91aebf2ca 100644
--- a/docs/data/histograms/Switzerland/FC0681.json
+++ b/docs/data/histograms/Switzerland/FC0681.json
@@ -1 +1 @@
-{"batchcode": "FC0681", "histograms": [{"batchcodes": ["FC0681"], "histogram": {"Arthralgia": 4, "Pyrexia": 4, "Fibrin D dimer": 3, "Asthenia": 2, "C-reactive protein": 2, "Chest pain": 2, "Chills": 2, "Dyspnoea": 2, "Eye disorder": 2, "Headache": 2, "Muscle spasms": 2, "Musculoskeletal pain": 2, "Myalgia": 2, "Oxygen saturation": 2, "SARS-CoV-2 test": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Anti-cyclic citrullinated peptide antibody negative": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arthritis": 1, "Autoimmune disorder": 1, "Blister": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood test abnormal": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiomegaly": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest scan": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Colonoscopy": 1, "Computerised tomogram abdomen": 1, "Death": 1, "Dizziness": 1, "Echocardiogram": 1, "Endoscopy": 1, "Exercise tolerance decreased": 1, "Eye irritation": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Generalised tonic-clonic seizure": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemoptysis": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Herpes ophthalmic": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Illness": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Insomnia": 1, "Joint stiffness": 1, "Large intestinal haemorrhage": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Meniscus injury": 1, "Menstruation irregular": 1, "Mitral valve incompetence": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Neck pain": 1, "Ophthalmic herpes zoster": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Palpitations": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polymyalgia rheumatica": 1, "Premenstrual syndrome": 1, "Procalcitonin": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Red blood cell sedimentation rate": 1, "Retrograde amnesia": 1, "Rheumatic disorder": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Serum ferritin decreased": 1, "Sleep disorder": 1, "Syncope": 1, "Synovial cyst": 1, "Tachycardia": 1, "Thermal burn": 1, "Thrombosis": 1, "Tinnitus": 1, "Type I hypersensitivity": 1, "Ultrasonic angiogram": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vaccination site reaction": 1, "Vascular resistance pulmonary increased": 1, "Venous thrombosis limb": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FC0681", "histograms": [{"histogram": {"Arthralgia": 4, "Pyrexia": 4, "Fibrin D dimer": 3, "Asthenia": 2, "C-reactive protein": 2, "Chest pain": 2, "Chills": 2, "Dyspnoea": 2, "Eye disorder": 2, "Headache": 2, "Muscle spasms": 2, "Musculoskeletal pain": 2, "Myalgia": 2, "Oxygen saturation": 2, "SARS-CoV-2 test": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Anti-cyclic citrullinated peptide antibody negative": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arthritis": 1, "Autoimmune disorder": 1, "Blister": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood test abnormal": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiomegaly": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest scan": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Colonoscopy": 1, "Computerised tomogram abdomen": 1, "Death": 1, "Dizziness": 1, "Echocardiogram": 1, "Endoscopy": 1, "Exercise tolerance decreased": 1, "Eye irritation": 1, "Feeling hot": 1, "Fibrin D dimer increased": 1, "Generalised tonic-clonic seizure": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemoptysis": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Herpes ophthalmic": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Illness": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Insomnia": 1, "Joint stiffness": 1, "Large intestinal haemorrhage": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Meniscus injury": 1, "Menstruation irregular": 1, "Mitral valve incompetence": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Neck pain": 1, "Ophthalmic herpes zoster": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Palpitations": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polymyalgia rheumatica": 1, "Premenstrual syndrome": 1, "Procalcitonin": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pulmonary infarction": 1, "Red blood cell sedimentation rate": 1, "Retrograde amnesia": 1, "Rheumatic disorder": 1, "Rheumatoid factor": 1, "Serum ferritin": 1, "Serum ferritin decreased": 1, "Sleep disorder": 1, "Syncope": 1, "Synovial cyst": 1, "Tachycardia": 1, "Thermal burn": 1, "Thrombosis": 1, "Tinnitus": 1, "Type I hypersensitivity": 1, "Ultrasonic angiogram": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vaccination site reaction": 1, "Vascular resistance pulmonary increased": 1, "Venous thrombosis limb": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1, "White blood cell count": 1}, "batchcodes": ["FC0681"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC2336.json b/docs/data/histograms/Switzerland/FC2336.json
index 7561325d1c3..4006250357c 100644
--- a/docs/data/histograms/Switzerland/FC2336.json
+++ b/docs/data/histograms/Switzerland/FC2336.json
@@ -1 +1 @@
-{"batchcode": "FC2336", "histograms": [{"batchcodes": ["FC2336"], "histogram": {"Guillain-Barre syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2336", "histograms": [{"histogram": {"Guillain-Barre syndrome": 1}, "batchcodes": ["FC2336"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC3098.json b/docs/data/histograms/Switzerland/FC3098.json
index 7b319e268b3..6bba34320ec 100644
--- a/docs/data/histograms/Switzerland/FC3098.json
+++ b/docs/data/histograms/Switzerland/FC3098.json
@@ -1 +1 @@
-{"batchcode": "FC3098", "histograms": [{"batchcodes": ["FC3098"], "histogram": {"Headache": 4, "C-reactive protein": 3, "Dizziness": 3, "Fibrin D dimer": 3, "Pulmonary embolism": 3, "Blood glucose": 2, "Chest pain": 2, "Computerised tomogram": 2, "Dyspnoea exertional": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Fatigue": 2, "Haemoglobin": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Oxygen saturation": 2, "Pain in extremity": 2, "Palpitations": 2, "Paraesthesia": 2, "Platelet count": 2, "Protein total": 2, "SARS-CoV-2 test": 2, "SARS-CoV-2 test positive": 2, "Troponin": 2, "Vaccination failure": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Amylase": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-transglutaminase antibody": 1, "Antigliadin antibody": 1, "Antinuclear antibody": 1, "Aptyalism": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asthma": 1, "Auscultation": 1, "Beta 2 globulin": 1, "Beta globulin": 1, "Bilirubin urine": 1, "Bladder pain": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Blood urine absent": 1, "Body mass index": 1, "Burning mouth syndrome": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Colonoscopy": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Crohn's disease": 1, "DNA antibody": 1, "Deep vein thrombosis": 1, "Depression": 1, "Diarrhoea": 1, "Dry mouth": 1, "Dyspnoea": 1, "Dysuria": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Electroneuromyography": 1, "Eye disorder": 1, "Eye irritation": 1, "Facial paralysis": 1, "Faecal calprotectin": 1, "Feeling cold": 1, "Gamma-glutamyltransferase": 1, "Gingival erythema": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Glucose urine absent": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Heavy menstrual bleeding": 1, "High density lipoprotein": 1, "Holotranscobalamin test": 1, "Hyperhidrosis": 1, "Immunoglobulins": 1, "Immunology test": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Intercostal neuralgia": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Menstrual disorder": 1, "Migraine": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Myalgia": 1, "Nausea": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nitrite urine absent": 1, "Off label use": 1, "Oral herpes": 1, "Oral mucosal erythema": 1, "Orthostatic hypotension": 1, "Pain": 1, "Painful respiration": 1, "Post-acute COVID-19 syndrome": 1, "Protein urine absent": 1, "Pruritus": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Sinusitis": 1, "Sleep disorder": 1, "Specific gravity urine": 1, "Splenomegaly": 1, "Stomatitis": 1, "Swollen tongue": 1, "Syncope": 1, "Thyroxine free": 1, "Tinnitus": 1, "Tongue erythema": 1, "Total cholesterol/HDL ratio": 1, "Toxicologic test": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urinary sediment": 1, "Urine ketone body absent": 1, "Urobilinogen urine": 1, "Ventricular extrasystoles": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH body fluid": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3098", "histograms": [{"histogram": {"Headache": 4, "C-reactive protein": 3, "Dizziness": 3, "Fibrin D dimer": 3, "Pulmonary embolism": 3, "Blood glucose": 2, "Chest pain": 2, "Computerised tomogram": 2, "Dyspnoea exertional": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Fatigue": 2, "Haemoglobin": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Oxygen saturation": 2, "Pain in extremity": 2, "Palpitations": 2, "Paraesthesia": 2, "Platelet count": 2, "Protein total": 2, "SARS-CoV-2 test": 2, "SARS-CoV-2 test positive": 2, "Troponin": 2, "Vaccination failure": 2, "Abdominal pain": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Alpha 1 globulin": 1, "Alpha 2 globulin": 1, "Amylase": 1, "Angiogram": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-transglutaminase antibody": 1, "Antigliadin antibody": 1, "Antinuclear antibody": 1, "Aptyalism": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asthma": 1, "Auscultation": 1, "Beta 2 globulin": 1, "Beta globulin": 1, "Bilirubin urine": 1, "Bladder pain": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blood uric acid": 1, "Blood urine absent": 1, "Body mass index": 1, "Burning mouth syndrome": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Colonoscopy": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Crohn's disease": 1, "DNA antibody": 1, "Deep vein thrombosis": 1, "Depression": 1, "Diarrhoea": 1, "Dry mouth": 1, "Dyspnoea": 1, "Dysuria": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Electroneuromyography": 1, "Eye disorder": 1, "Eye irritation": 1, "Facial paralysis": 1, "Faecal calprotectin": 1, "Feeling cold": 1, "Gamma-glutamyltransferase": 1, "Gingival erythema": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Glucose urine absent": 1, "Glycosylated haemoglobin": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Heavy menstrual bleeding": 1, "High density lipoprotein": 1, "Holotranscobalamin test": 1, "Hyperhidrosis": 1, "Immunoglobulins": 1, "Immunology test": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Intercostal neuralgia": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Menstrual disorder": 1, "Migraine": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Myalgia": 1, "Nausea": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nitrite urine absent": 1, "Off label use": 1, "Oral herpes": 1, "Oral mucosal erythema": 1, "Orthostatic hypotension": 1, "Pain": 1, "Painful respiration": 1, "Post-acute COVID-19 syndrome": 1, "Protein urine absent": 1, "Pruritus": 1, "Pyrexia": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid factor": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sensory disturbance": 1, "Serum ferritin": 1, "Sinusitis": 1, "Sleep disorder": 1, "Specific gravity urine": 1, "Splenomegaly": 1, "Stomatitis": 1, "Swollen tongue": 1, "Syncope": 1, "Thyroxine free": 1, "Tinnitus": 1, "Tongue erythema": 1, "Total cholesterol/HDL ratio": 1, "Toxicologic test": 1, "Troponin I": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urinary sediment": 1, "Urine ketone body absent": 1, "Urobilinogen urine": 1, "Ventricular extrasystoles": 1, "Vitamin B12": 1, "Vitamin D": 1, "Vomiting": 1, "White blood cell count": 1, "White blood cells urine": 1, "pH body fluid": 1, "pH urine": 1}, "batchcodes": ["FC3098"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC3143.json b/docs/data/histograms/Switzerland/FC3143.json
index 3a10bae76e3..ef17224c4cf 100644
--- a/docs/data/histograms/Switzerland/FC3143.json
+++ b/docs/data/histograms/Switzerland/FC3143.json
@@ -1 +1 @@
-{"batchcode": "FC3143", "histograms": [{"batchcodes": ["FC3143"], "histogram": {"Headache": 6, "Fatigue": 5, "Pyrexia": 5, "Chest discomfort": 4, "Asthenia": 3, "Body temperature": 3, "Decreased appetite": 3, "Dizziness": 3, "Dyspnoea": 3, "Hypoaesthesia": 3, "Myalgia": 3, "Nausea": 3, "Vomiting": 3, "Angina pectoris": 2, "Diarrhoea": 2, "Facial paralysis": 2, "Muscle twitching": 2, "Musculoskeletal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Rash": 2, "Restlessness": 2, "Somnolence": 2, "Abdominal pain": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Aspiration bone marrow": 1, "Autoinflammatory disease": 1, "Back pain": 1, "Biopsy skin": 1, "Blood creatinine": 1, "Breast discomfort": 1, "C-reactive protein": 1, "Cardiac discomfort": 1, "Chest pain": 1, "Conjunctivitis allergic": 1, "Cough": 1, "Dehydration": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Exposure via breast milk": 1, "Eye allergy": 1, "Eye irritation": 1, "Face oedema": 1, "Feeling abnormal": 1, "Gynaecological examination": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Influenza like illness": 1, "Intermenstrual bleeding": 1, "Intraocular pressure increased": 1, "Irritability": 1, "Lip swelling": 1, "Liver function test": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Monoplegia": 1, "Myocarditis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Pain": 1, "Palpitations": 1, "Postural orthostatic tachycardia syndrome": 1, "Pruritus": 1, "Seasonal allergy": 1, "Serum ferritin": 1, "Skin burning sensation": 1, "Sleep disorder": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Throat tightness": 1, "Toothache": 1, "Troponin": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3143", "histograms": [{"histogram": {"Headache": 6, "Fatigue": 5, "Pyrexia": 5, "Chest discomfort": 4, "Asthenia": 3, "Body temperature": 3, "Decreased appetite": 3, "Dizziness": 3, "Dyspnoea": 3, "Hypoaesthesia": 3, "Myalgia": 3, "Nausea": 3, "Vomiting": 3, "Angina pectoris": 2, "Diarrhoea": 2, "Facial paralysis": 2, "Muscle twitching": 2, "Musculoskeletal pain": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Rash": 2, "Restlessness": 2, "Somnolence": 2, "Abdominal pain": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthralgia": 1, "Aspiration bone marrow": 1, "Autoinflammatory disease": 1, "Back pain": 1, "Biopsy skin": 1, "Blood creatinine": 1, "Breast discomfort": 1, "C-reactive protein": 1, "Cardiac discomfort": 1, "Chest pain": 1, "Conjunctivitis allergic": 1, "Cough": 1, "Dehydration": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Exposure via breast milk": 1, "Eye allergy": 1, "Eye irritation": 1, "Face oedema": 1, "Feeling abnormal": 1, "Gynaecological examination": 1, "Haemoglobin": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Influenza like illness": 1, "Intermenstrual bleeding": 1, "Intraocular pressure increased": 1, "Irritability": 1, "Lip swelling": 1, "Liver function test": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Lymphocyte count": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Monoplegia": 1, "Myocarditis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Pain": 1, "Palpitations": 1, "Postural orthostatic tachycardia syndrome": 1, "Pruritus": 1, "Seasonal allergy": 1, "Serum ferritin": 1, "Skin burning sensation": 1, "Sleep disorder": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Throat tightness": 1, "Toothache": 1, "Troponin": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight decreased": 1}, "batchcodes": ["FC3143"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC5089.json b/docs/data/histograms/Switzerland/FC5089.json
index d0ac18070e0..7dc176aed1a 100644
--- a/docs/data/histograms/Switzerland/FC5089.json
+++ b/docs/data/histograms/Switzerland/FC5089.json
@@ -1 +1 @@
-{"batchcode": "FC5089", "histograms": [{"batchcodes": ["FC5089"], "histogram": {"Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "FC5089", "histograms": [{"histogram": {"Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["FC5089"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC6029.json b/docs/data/histograms/Switzerland/FC6029.json
index d810e7fba0b..1098a8db830 100644
--- a/docs/data/histograms/Switzerland/FC6029.json
+++ b/docs/data/histograms/Switzerland/FC6029.json
@@ -1 +1 @@
-{"batchcode": "FC6029", "histograms": [{"batchcodes": ["FC6029"], "histogram": {"Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "FC6029", "histograms": [{"histogram": {"Fatigue": 1}, "batchcodes": ["FC6029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC8736.json b/docs/data/histograms/Switzerland/FC8736.json
index fadf5c03049..2eb2ce7e0ea 100644
--- a/docs/data/histograms/Switzerland/FC8736.json
+++ b/docs/data/histograms/Switzerland/FC8736.json
@@ -1 +1 @@
-{"batchcode": "FC8736", "histograms": [{"batchcodes": ["FC8736"], "histogram": {"Fatigue": 3, "Arthralgia": 2, "Dyspnoea": 2, "Headache": 2, "Laboratory test": 2, "Muscle spasms": 2, "Palpitations": 2, "Pyrexia": 2, "Angiogram": 1, "Anosmia": 1, "Asthenia": 1, "Asthma": 1, "Blood cholesterol": 1, "Blood triglycerides": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiomyopathy": 1, "Cerebral infarction": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Facial paresis": 1, "Gait disturbance": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hypogeusia": 1, "Incorrect route of product administration": 1, "Macular hole": 1, "Myalgia": 1, "Myocarditis": 1, "NIH stroke scale": 1, "Nausea": 1, "Neuritis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Paraesthesia": 1, "Performance status decreased": 1, "Peripheral swelling": 1, "Physical examination": 1, "Polyarthritis": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Tachycardia": 1, "Tinnitus": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1}}]}
\ No newline at end of file
+{"batchcode": "FC8736", "histograms": [{"histogram": {"Fatigue": 3, "Arthralgia": 2, "Dyspnoea": 2, "Headache": 2, "Laboratory test": 2, "Muscle spasms": 2, "Palpitations": 2, "Pyrexia": 2, "Angiogram": 1, "Anosmia": 1, "Asthenia": 1, "Asthma": 1, "Blood cholesterol": 1, "Blood triglycerides": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiomyopathy": 1, "Cerebral infarction": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Facial paresis": 1, "Gait disturbance": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hypogeusia": 1, "Incorrect route of product administration": 1, "Macular hole": 1, "Myalgia": 1, "Myocarditis": 1, "NIH stroke scale": 1, "Nausea": 1, "Neuritis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Paraesthesia": 1, "Performance status decreased": 1, "Peripheral swelling": 1, "Physical examination": 1, "Polyarthritis": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Tachycardia": 1, "Tinnitus": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Visual acuity reduced": 1}, "batchcodes": ["FC8736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FC9414.json b/docs/data/histograms/Switzerland/FC9414.json
index 8c687a2b49d..0582dedbf58 100644
--- a/docs/data/histograms/Switzerland/FC9414.json
+++ b/docs/data/histograms/Switzerland/FC9414.json
@@ -1 +1 @@
-{"batchcode": "FC9414", "histograms": [{"batchcodes": ["FC9414"], "histogram": {"Arthralgia": 1, "Movement disorder": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9414", "histograms": [{"histogram": {"Arthralgia": 1, "Movement disorder": 1, "Rash": 1}, "batchcodes": ["FC9414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FD 0932.json b/docs/data/histograms/Switzerland/FD 0932.json
index 912c05cf8e9..a9664a8c3b0 100644
--- a/docs/data/histograms/Switzerland/FD 0932.json
+++ b/docs/data/histograms/Switzerland/FD 0932.json
@@ -1 +1 @@
-{"batchcode": "FD 0932", "histograms": [{"batchcodes": ["FD 0932"], "histogram": {"Pericarditis": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "FD 0932", "histograms": [{"histogram": {"Pericarditis": 1, "Ultrasound Doppler": 1}, "batchcodes": ["FD 0932"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FD0350.json b/docs/data/histograms/Switzerland/FD0350.json
index 9bf8475ab36..fc8b32635f2 100644
--- a/docs/data/histograms/Switzerland/FD0350.json
+++ b/docs/data/histograms/Switzerland/FD0350.json
@@ -1 +1 @@
-{"batchcode": "FD0350", "histograms": [{"batchcodes": ["FD0350"], "histogram": {"Headache": 8, "Fatigue": 7, "Blood pressure measurement": 6, "Dizziness": 6, "Body temperature": 5, "Echocardiogram": 5, "Heart rate": 5, "Myalgia": 5, "Pyrexia": 5, "Chest pain": 4, "Oxygen saturation": 4, "SARS-CoV-2 test": 4, "Arthralgia": 3, "Chest X-ray": 3, "Dyspnoea": 3, "Electrocardiogram": 3, "Palpitations": 3, "Paraesthesia": 3, "Physical examination": 3, "Weight decreased": 3, "Abdominal pain": 2, "Angioedema": 2, "Asthenia": 2, "Balance disorder": 2, "Blood glucose": 2, "Blood test": 2, "Blood triglycerides": 2, "C-reactive protein": 2, "Cardiovascular disorder": 2, "Chest discomfort": 2, "Coma scale": 2, "Decreased appetite": 2, "Disturbance in attention": 2, "Insomnia": 2, "Magnetic resonance imaging head": 2, "Migraine": 2, "Nausea": 2, "Pain in extremity": 2, "Pericardial effusion": 2, "Pleurisy": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Allergy test": 1, "Amylase": 1, "Angiocardiogram": 1, "Anxiety": 1, "Appendicitis": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Back pain": 1, "Beta globulin": 1, "Blindness": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Body mass index": 1, "Body surface area": 1, "COVID-19": 1, "Chills": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Constipation": 1, "Contusion": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Dysstasia": 1, "Electrocardiogram QT prolonged": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Endoscopy": 1, "Exercise tolerance decreased": 1, "Eye swelling": 1, "Eyelid oedema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Haemoglobin": 1, "Head injury": 1, "Heart rate increased": 1, "Hepatic pain": 1, "Histamine intolerance": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypothermia": 1, "Influenza": 1, "Investigation": 1, "Limb discomfort": 1, "Limb injury": 1, "Lip oedema": 1, "Lipase": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abdominal": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Migraine with aura": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Nephrolithiasis": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Oropharyngeal pain": 1, "Pancreatitis": 1, "Panic attack": 1, "Parosmia": 1, "Performance status decreased": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Premature menopause": 1, "Pruritus": 1, "Red blood cell sedimentation rate": 1, "Retinal detachment": 1, "Rhinitis allergic": 1, "Seizure": 1, "Skin reaction": 1, "Somnolence": 1, "Specialist consultation": 1, "Strabismus": 1, "Swollen tongue": 1, "Syncope": 1, "Tinnitus": 1, "Tongue ulceration": 1, "Tonsillitis": 1, "Tremor": 1, "Troponin": 1, "Type I hypersensitivity": 1, "Urine analysis": 1, "Urological examination": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Weight": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0350", "histograms": [{"histogram": {"Headache": 8, "Fatigue": 7, "Blood pressure measurement": 6, "Dizziness": 6, "Body temperature": 5, "Echocardiogram": 5, "Heart rate": 5, "Myalgia": 5, "Pyrexia": 5, "Chest pain": 4, "Oxygen saturation": 4, "SARS-CoV-2 test": 4, "Arthralgia": 3, "Chest X-ray": 3, "Dyspnoea": 3, "Electrocardiogram": 3, "Palpitations": 3, "Paraesthesia": 3, "Physical examination": 3, "Weight decreased": 3, "Abdominal pain": 2, "Angioedema": 2, "Asthenia": 2, "Balance disorder": 2, "Blood glucose": 2, "Blood test": 2, "Blood triglycerides": 2, "C-reactive protein": 2, "Cardiovascular disorder": 2, "Chest discomfort": 2, "Coma scale": 2, "Decreased appetite": 2, "Disturbance in attention": 2, "Insomnia": 2, "Magnetic resonance imaging head": 2, "Migraine": 2, "Nausea": 2, "Pain in extremity": 2, "Pericardial effusion": 2, "Pleurisy": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Abdominal pain lower": 1, "Abdominal pain upper": 1, "Allergy test": 1, "Amylase": 1, "Angiocardiogram": 1, "Anxiety": 1, "Appendicitis": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Auscultation": 1, "Back pain": 1, "Beta globulin": 1, "Blindness": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Body mass index": 1, "Body surface area": 1, "COVID-19": 1, "Chills": 1, "Circulatory collapse": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Constipation": 1, "Contusion": 1, "Cyanosis": 1, "Deafness neurosensory": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Dysstasia": 1, "Electrocardiogram QT prolonged": 1, "Electrocardiogram ambulatory": 1, "Embolic stroke": 1, "Endoscopic retrograde cholangiopancreatography": 1, "Endoscopy": 1, "Exercise tolerance decreased": 1, "Eye swelling": 1, "Eyelid oedema": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gastrointestinal disorder": 1, "Glomerular filtration rate": 1, "Haemoglobin": 1, "Head injury": 1, "Heart rate increased": 1, "Hepatic pain": 1, "Histamine intolerance": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypothermia": 1, "Influenza": 1, "Investigation": 1, "Limb discomfort": 1, "Limb injury": 1, "Lip oedema": 1, "Lipase": 1, "Low density lipoprotein": 1, "Lumbar puncture": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging abdominal": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Migraine with aura": 1, "Muscular weakness": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Nephrolithiasis": 1, "Nervous system disorder": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Ophthalmological examination": 1, "Oropharyngeal pain": 1, "Pancreatitis": 1, "Panic attack": 1, "Parosmia": 1, "Performance status decreased": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Premature menopause": 1, "Pruritus": 1, "Red blood cell sedimentation rate": 1, "Retinal detachment": 1, "Rhinitis allergic": 1, "Seizure": 1, "Skin reaction": 1, "Somnolence": 1, "Specialist consultation": 1, "Strabismus": 1, "Swollen tongue": 1, "Syncope": 1, "Tinnitus": 1, "Tongue ulceration": 1, "Tonsillitis": 1, "Tremor": 1, "Troponin": 1, "Type I hypersensitivity": 1, "Urine analysis": 1, "Urological examination": 1, "Vaccination failure": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Weight": 1, "White blood cell count": 1}, "batchcodes": ["FD0350"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FD0932.json b/docs/data/histograms/Switzerland/FD0932.json
index 7000a93321a..2f04b1ff75d 100644
--- a/docs/data/histograms/Switzerland/FD0932.json
+++ b/docs/data/histograms/Switzerland/FD0932.json
@@ -1 +1 @@
-{"batchcode": "FD0932", "histograms": [{"batchcodes": ["FD0932"], "histogram": {"Headache": 3, "Cough": 2, "Dyspnoea": 2, "Abdominal pain upper": 1, "Angioedema": 1, "Arthralgia": 1, "Bone pain": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysphonia": 1, "Ear pain": 1, "Eye pain": 1, "Facial pain": 1, "Fatigue": 1, "Herpes ophthalmic": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Jaw fracture": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain": 1, "Pain in jaw": 1, "Performance status decreased": 1, "Pericardial effusion": 1, "Pleural effusion": 1, "Polyserositis": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "FD0932", "histograms": [{"histogram": {"Headache": 3, "Cough": 2, "Dyspnoea": 2, "Abdominal pain upper": 1, "Angioedema": 1, "Arthralgia": 1, "Bone pain": 1, "COVID-19": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Drug ineffective": 1, "Dysphonia": 1, "Ear pain": 1, "Eye pain": 1, "Facial pain": 1, "Fatigue": 1, "Herpes ophthalmic": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Jaw fracture": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain": 1, "Pain in jaw": 1, "Performance status decreased": 1, "Pericardial effusion": 1, "Pleural effusion": 1, "Polyserositis": 1, "Respiratory distress": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Tinnitus": 1}, "batchcodes": ["FD0932"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FD4500.json b/docs/data/histograms/Switzerland/FD4500.json
index 74e4ffedf19..8bbc26eac50 100644
--- a/docs/data/histograms/Switzerland/FD4500.json
+++ b/docs/data/histograms/Switzerland/FD4500.json
@@ -1 +1 @@
-{"batchcode": "FD4500", "histograms": [{"batchcodes": ["FD4500"], "histogram": {"Anxiety": 1, "Blood culture": 1, "C-reactive protein": 1, "Cardiac valve vegetation": 1, "Computerised tomogram thorax": 1, "Disturbance in attention": 1, "Dizziness": 1, "Echocardiogram": 1, "Fatigue": 1, "Magnetic resonance imaging head": 1, "Ocular discomfort": 1, "Red blood cell sedimentation rate": 1, "Serology test": 1, "Sleep disorder": 1, "Stress": 1, "Tremor": 1, "Ultrasound chest": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "FD4500", "histograms": [{"histogram": {"Anxiety": 1, "Blood culture": 1, "C-reactive protein": 1, "Cardiac valve vegetation": 1, "Computerised tomogram thorax": 1, "Disturbance in attention": 1, "Dizziness": 1, "Echocardiogram": 1, "Fatigue": 1, "Magnetic resonance imaging head": 1, "Ocular discomfort": 1, "Red blood cell sedimentation rate": 1, "Serology test": 1, "Sleep disorder": 1, "Stress": 1, "Tremor": 1, "Ultrasound chest": 1, "Ultrasound scan": 1}, "batchcodes": ["FD4500"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FD6029.json b/docs/data/histograms/Switzerland/FD6029.json
index 672f95d0a17..7eac647e2dd 100644
--- a/docs/data/histograms/Switzerland/FD6029.json
+++ b/docs/data/histograms/Switzerland/FD6029.json
@@ -1 +1 @@
-{"batchcode": "FD6029", "histograms": [{"batchcodes": ["FD6029"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Drug ineffective": 1, "Headache": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Pyrexia": 1, "Scar pain": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FD6029", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Drug ineffective": 1, "Headache": 1, "Insomnia": 1, "Intermenstrual bleeding": 1, "Pyrexia": 1, "Scar pain": 1, "Suspected COVID-19": 1}, "batchcodes": ["FD6029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FD9309.json b/docs/data/histograms/Switzerland/FD9309.json
index 514bb95fdf0..047fb394fb6 100644
--- a/docs/data/histograms/Switzerland/FD9309.json
+++ b/docs/data/histograms/Switzerland/FD9309.json
@@ -1 +1 @@
-{"batchcode": "FD9309", "histograms": [{"batchcodes": ["FD9309"], "histogram": {"Arthralgia": 1, "Herpes dermatitis": 1, "Muscle contractions involuntary": 1, "Muscle twitching": 1}}]}
\ No newline at end of file
+{"batchcode": "FD9309", "histograms": [{"histogram": {"Arthralgia": 1, "Herpes dermatitis": 1, "Muscle contractions involuntary": 1, "Muscle twitching": 1}, "batchcodes": ["FD9309"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FE 2296.json b/docs/data/histograms/Switzerland/FE 2296.json
index 89712b78114..032503736bb 100644
--- a/docs/data/histograms/Switzerland/FE 2296.json
+++ b/docs/data/histograms/Switzerland/FE 2296.json
@@ -1 +1 @@
-{"batchcode": "FE 2296", "histograms": [{"batchcodes": ["FE 2296"], "histogram": {"Antinuclear antibody": 1, "Blood creatine phosphokinase": 1, "Borrelia test": 1, "C-reactive protein": 1, "Cytomegalovirus test": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epstein-Barr virus test": 1, "HIV test": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Investigation": 1, "Magnetic resonance imaging heart": 1, "Mycobacterium test": 1, "Myocarditis": 1, "Parvovirus B19 test": 1, "SARS-CoV-2 test": 1, "Troponin": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 2296", "histograms": [{"histogram": {"Antinuclear antibody": 1, "Blood creatine phosphokinase": 1, "Borrelia test": 1, "C-reactive protein": 1, "Cytomegalovirus test": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epstein-Barr virus test": 1, "HIV test": 1, "Hepatitis B virus test": 1, "Hepatitis C virus test": 1, "Investigation": 1, "Magnetic resonance imaging heart": 1, "Mycobacterium test": 1, "Myocarditis": 1, "Parvovirus B19 test": 1, "SARS-CoV-2 test": 1, "Troponin": 1, "White blood cell count": 1}, "batchcodes": ["FE 2296"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FE 8235.json b/docs/data/histograms/Switzerland/FE 8235.json
index d0ff7576815..cd5d1116533 100644
--- a/docs/data/histograms/Switzerland/FE 8235.json
+++ b/docs/data/histograms/Switzerland/FE 8235.json
@@ -1 +1 @@
-{"batchcode": "FE 8235", "histograms": [{"batchcodes": ["FE 8235"], "histogram": {"COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Increased upper airway secretion": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Stridor": 1, "Tachypnoea": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FE 8235", "histograms": [{"histogram": {"COVID-19": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Increased upper airway secretion": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Stridor": 1, "Tachypnoea": 1, "Vaccination failure": 1}, "batchcodes": ["FE 8235"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FE0688.json b/docs/data/histograms/Switzerland/FE0688.json
index 5efaa5cd799..b8044ee50ef 100644
--- a/docs/data/histograms/Switzerland/FE0688.json
+++ b/docs/data/histograms/Switzerland/FE0688.json
@@ -1 +1 @@
-{"batchcode": "FE0688", "histograms": [{"batchcodes": ["FE0688"], "histogram": {"Arthralgia": 1, "Audiogram": 1, "Deafness bilateral": 1, "Electroneuromyography": 1, "Magnetic resonance imaging": 1, "Paraesthesia": 1, "Tinnitus": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "FE0688", "histograms": [{"histogram": {"Arthralgia": 1, "Audiogram": 1, "Deafness bilateral": 1, "Electroneuromyography": 1, "Magnetic resonance imaging": 1, "Paraesthesia": 1, "Tinnitus": 1, "Ultrasound Doppler": 1}, "batchcodes": ["FE0688"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FE2296.json b/docs/data/histograms/Switzerland/FE2296.json
index 1e7496444b9..3f0014ff32f 100644
--- a/docs/data/histograms/Switzerland/FE2296.json
+++ b/docs/data/histograms/Switzerland/FE2296.json
@@ -1 +1 @@
-{"batchcode": "FE2296", "histograms": [{"batchcodes": ["FE2296"], "histogram": {"Magnetic resonance imaging head": 3, "Neurological examination": 3, "Dizziness": 2, "Electrocardiogram": 2, "Hypoaesthesia": 2, "Movement disorder": 2, "Specialist consultation": 2, "Vertigo": 2, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Arthropathy": 1, "Autoimmune disorder": 1, "Blood creatine phosphokinase": 1, "Blood culture": 1, "Blood test": 1, "Body temperature": 1, "Borrelia test": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF lactate": 1, "CSF lymphocyte count": 1, "CSF monocyte count": 1, "CSF protein": 1, "Carpal tunnel syndrome": 1, "Dysarthria": 1, "Ear pain": 1, "Echocardiogram": 1, "Electromyogram": 1, "Electroneuromyography": 1, "Electrophoresis protein": 1, "Fatigue": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Herpes zoster": 1, "Herpes zoster meningitis": 1, "Hyperaesthesia": 1, "Influenza like illness": 1, "Ischaemic cerebral infarction": 1, "Lipase": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Muscle injury": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Mycobacterium tuberculosis complex test": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Ophthalmic herpes zoster": 1, "Pain": 1, "Pain in extremity": 1, "Pancreatitis acute": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Phonophobia": 1, "Photophobia": 1, "Presyncope": 1, "Pyoderma gangrenosum": 1, "Respiratory viral panel": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Subarachnoid haemorrhage": 1, "Troponin": 1, "Ultrasound scan": 1, "Varicella virus test": 1, "Viral test": 1, "Vision blurred": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "FE2296", "histograms": [{"histogram": {"Magnetic resonance imaging head": 3, "Neurological examination": 3, "Dizziness": 2, "Electrocardiogram": 2, "Hypoaesthesia": 2, "Movement disorder": 2, "Specialist consultation": 2, "Vertigo": 2, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Arthropathy": 1, "Autoimmune disorder": 1, "Blood creatine phosphokinase": 1, "Blood culture": 1, "Blood test": 1, "Body temperature": 1, "Borrelia test": 1, "C-reactive protein": 1, "CSF cell count": 1, "CSF glucose": 1, "CSF lactate": 1, "CSF lymphocyte count": 1, "CSF monocyte count": 1, "CSF protein": 1, "Carpal tunnel syndrome": 1, "Dysarthria": 1, "Ear pain": 1, "Echocardiogram": 1, "Electromyogram": 1, "Electroneuromyography": 1, "Electrophoresis protein": 1, "Fatigue": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Herpes zoster": 1, "Herpes zoster meningitis": 1, "Hyperaesthesia": 1, "Influenza like illness": 1, "Ischaemic cerebral infarction": 1, "Lipase": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging heart": 1, "Muscle injury": 1, "Muscular weakness": 1, "Musculoskeletal pain": 1, "Myalgia": 1, "Mycobacterium tuberculosis complex test": 1, "Myocarditis": 1, "Nausea": 1, "Neck pain": 1, "Ophthalmic herpes zoster": 1, "Pain": 1, "Pain in extremity": 1, "Pancreatitis acute": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Phonophobia": 1, "Photophobia": 1, "Presyncope": 1, "Pyoderma gangrenosum": 1, "Respiratory viral panel": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Subarachnoid haemorrhage": 1, "Troponin": 1, "Ultrasound scan": 1, "Varicella virus test": 1, "Viral test": 1, "Vision blurred": 1, "X-ray": 1}, "batchcodes": ["FE2296"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FE6029.json b/docs/data/histograms/Switzerland/FE6029.json
index d1980ef1023..e0ecd0e385d 100644
--- a/docs/data/histograms/Switzerland/FE6029.json
+++ b/docs/data/histograms/Switzerland/FE6029.json
@@ -1 +1 @@
-{"batchcode": "FE6029", "histograms": [{"batchcodes": ["FE6029"], "histogram": {"COVID-19": 3, "Dizziness": 3, "Fatigue": 3, "Headache": 3, "Myocarditis": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Asthenia": 2, "Blindness unilateral": 2, "Cardiac function test": 2, "Confusional state": 2, "Decreased appetite": 2, "Dyspnoea": 2, "Heart rate": 2, "Investigation": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Nausea": 2, "Palpitations": 2, "Paraesthesia": 2, "Rash": 2, "Abdominal pain upper": 1, "Acute polyneuropathy": 1, "Alopecia": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Balance disorder": 1, "Blindness": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Chest pain": 1, "Computerised tomogram abdomen": 1, "Death": 1, "Disturbance in attention": 1, "Dry eye": 1, "Dyschromatopsia": 1, "Electroencephalogram": 1, "Eye pain": 1, "Facial paralysis": 1, "Fear of falling": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypotension": 1, "Hypotonia": 1, "Illusion": 1, "Laboratory test": 1, "Light chain analysis": 1, "Lumbar puncture": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Mobility decreased": 1, "Myalgia": 1, "Ophthalmological examination": 1, "Optic neuritis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Parosmia": 1, "Pelvi-ureteric obstruction": 1, "Pericarditis": 1, "Periorbital pain": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pupillary reflex impaired": 1, "Purpura": 1, "Radioisotope scan": 1, "Red blood cells urine": 1, "Renal pain": 1, "Scar pain": 1, "Somnolence": 1, "Specific gravity urine": 1, "Speech disorder": 1, "Stridor": 1, "Swelling face": 1, "Tachycardia": 1, "Taste disorder": 1, "Thirst": 1, "Thrombosis": 1, "Tinnitus": 1, "Troponin": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Urogram": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1, "Weight decreased": 1, "White blood cells urine": 1}}]}
\ No newline at end of file
+{"batchcode": "FE6029", "histograms": [{"histogram": {"COVID-19": 3, "Dizziness": 3, "Fatigue": 3, "Headache": 3, "Myocarditis": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Asthenia": 2, "Blindness unilateral": 2, "Cardiac function test": 2, "Confusional state": 2, "Decreased appetite": 2, "Dyspnoea": 2, "Heart rate": 2, "Investigation": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Nausea": 2, "Palpitations": 2, "Paraesthesia": 2, "Rash": 2, "Abdominal pain upper": 1, "Acute polyneuropathy": 1, "Alopecia": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Balance disorder": 1, "Blindness": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Chest pain": 1, "Computerised tomogram abdomen": 1, "Death": 1, "Disturbance in attention": 1, "Dry eye": 1, "Dyschromatopsia": 1, "Electroencephalogram": 1, "Eye pain": 1, "Facial paralysis": 1, "Fear of falling": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypotension": 1, "Hypotonia": 1, "Illusion": 1, "Laboratory test": 1, "Light chain analysis": 1, "Lumbar puncture": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Mobility decreased": 1, "Myalgia": 1, "Ophthalmological examination": 1, "Optic neuritis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Parosmia": 1, "Pelvi-ureteric obstruction": 1, "Pericarditis": 1, "Periorbital pain": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pupillary reflex impaired": 1, "Purpura": 1, "Radioisotope scan": 1, "Red blood cells urine": 1, "Renal pain": 1, "Scar pain": 1, "Somnolence": 1, "Specific gravity urine": 1, "Speech disorder": 1, "Stridor": 1, "Swelling face": 1, "Tachycardia": 1, "Taste disorder": 1, "Thirst": 1, "Thrombosis": 1, "Tinnitus": 1, "Troponin": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Urogram": 1, "Vision blurred": 1, "Visual impairment": 1, "Vomiting": 1, "Weight decreased": 1, "White blood cells urine": 1}, "batchcodes": ["FE6029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FE8235.json b/docs/data/histograms/Switzerland/FE8235.json
index f36d4810d37..ee469df838a 100644
--- a/docs/data/histograms/Switzerland/FE8235.json
+++ b/docs/data/histograms/Switzerland/FE8235.json
@@ -1 +1 @@
-{"batchcode": "FE8235", "histograms": [{"batchcodes": ["FE8235"], "histogram": {"Dyspnoea": 3, "Arthralgia": 2, "Blood creatinine": 2, "Burning sensation": 2, "Dizziness": 2, "Nausea": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anovulatory cycle": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Bacterial prostatitis": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Breast pain": 1, "C-reactive protein": 1, "Calculus bladder": 1, "Chest pain": 1, "Cough": 1, "Culture urine": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysphagia": 1, "Dysphonia": 1, "Fatigue": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Headache": 1, "Hypersensitivity": 1, "Laboratory test": 1, "Liver function test increased": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Monoplegia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Neurological examination": 1, "Neutrophil count increased": 1, "New daily persistent headache": 1, "Ocular discomfort": 1, "Optic neuritis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pneumonitis": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Premenstrual syndrome": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Respiratory tract haemorrhage": 1, "Sepsis": 1, "Swelling": 1, "Tinnitus": 1, "Tongue pruritus": 1, "Trigeminal neuralgia": 1, "Urinary tract infection": 1, "Vertigo": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FE8235", "histograms": [{"histogram": {"Dyspnoea": 3, "Arthralgia": 2, "Blood creatinine": 2, "Burning sensation": 2, "Dizziness": 2, "Nausea": 2, "Abdominal pain": 1, "Acute myocardial infarction": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anovulatory cycle": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Bacterial prostatitis": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Breast pain": 1, "C-reactive protein": 1, "Calculus bladder": 1, "Chest pain": 1, "Cough": 1, "Culture urine": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dysphagia": 1, "Dysphonia": 1, "Fatigue": 1, "Gamma-glutamyltransferase": 1, "Gamma-glutamyltransferase increased": 1, "Headache": 1, "Hypersensitivity": 1, "Laboratory test": 1, "Liver function test increased": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Monoplegia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Neurological examination": 1, "Neutrophil count increased": 1, "New daily persistent headache": 1, "Ocular discomfort": 1, "Optic neuritis": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pneumonitis": 1, "Polymerase chain reaction": 1, "Postmenopausal haemorrhage": 1, "Premenstrual syndrome": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Respiratory tract haemorrhage": 1, "Sepsis": 1, "Swelling": 1, "Tinnitus": 1, "Tongue pruritus": 1, "Trigeminal neuralgia": 1, "Urinary tract infection": 1, "Vertigo": 1, "Vision blurred": 1, "Visual acuity tests": 1, "Visual impairment": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["FE8235"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FF0680.json b/docs/data/histograms/Switzerland/FF0680.json
index 63b0287fa78..10f6b1fc304 100644
--- a/docs/data/histograms/Switzerland/FF0680.json
+++ b/docs/data/histograms/Switzerland/FF0680.json
@@ -1 +1 @@
-{"batchcode": "FF0680", "histograms": [{"batchcodes": ["FF0680"], "histogram": {"Balance disorder": 1, "Chest discomfort": 1, "Inflammation": 1, "Migraine": 1, "Myalgia": 1, "Paraesthesia": 1, "Skin discolouration": 1, "Tension headache": 1}}]}
\ No newline at end of file
+{"batchcode": "FF0680", "histograms": [{"histogram": {"Balance disorder": 1, "Chest discomfort": 1, "Inflammation": 1, "Migraine": 1, "Myalgia": 1, "Paraesthesia": 1, "Skin discolouration": 1, "Tension headache": 1}, "batchcodes": ["FF0680"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FF0688.json b/docs/data/histograms/Switzerland/FF0688.json
index 0e79bb3faed..065ada329e9 100644
--- a/docs/data/histograms/Switzerland/FF0688.json
+++ b/docs/data/histograms/Switzerland/FF0688.json
@@ -1 +1 @@
-{"batchcode": "FF0688", "histograms": [{"batchcodes": ["FF0688"], "histogram": {"Headache": 4, "Disturbance in attention": 3, "Fatigue": 3, "Blood pressure measurement": 2, "Condition aggravated": 2, "Dizziness": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Nausea": 2, "Sensory disturbance": 2, "Aggression": 1, "Amenorrhoea": 1, "Anxiety": 1, "Arthralgia": 1, "Balance disorder": 1, "Cerebral ischaemia": 1, "Cognitive disorder": 1, "Cough": 1, "Depressed mood": 1, "Diarrhoea": 1, "Dyspepsia": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Emotional disorder": 1, "Eye contusion": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Mood altered": 1, "Muscular weakness": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Pericarditis": 1, "Photophobia": 1, "Polyneuropathy": 1, "Postural orthostatic tachycardia syndrome": 1, "Schellong test": 1, "Sneezing": 1, "Syncope": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "FF0688", "histograms": [{"histogram": {"Headache": 4, "Disturbance in attention": 3, "Fatigue": 3, "Blood pressure measurement": 2, "Condition aggravated": 2, "Dizziness": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Nausea": 2, "Sensory disturbance": 2, "Aggression": 1, "Amenorrhoea": 1, "Anxiety": 1, "Arthralgia": 1, "Balance disorder": 1, "Cerebral ischaemia": 1, "Cognitive disorder": 1, "Cough": 1, "Depressed mood": 1, "Diarrhoea": 1, "Dyspepsia": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Emotional disorder": 1, "Eye contusion": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Mood altered": 1, "Muscular weakness": 1, "Pain": 1, "Paraesthesia": 1, "Paralysis": 1, "Pericarditis": 1, "Photophobia": 1, "Polyneuropathy": 1, "Postural orthostatic tachycardia syndrome": 1, "Schellong test": 1, "Sneezing": 1, "Syncope": 1, "Tremor": 1}, "batchcodes": ["FF0688"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FF2832.json b/docs/data/histograms/Switzerland/FF2832.json
index 948808167c2..3b336de137d 100644
--- a/docs/data/histograms/Switzerland/FF2832.json
+++ b/docs/data/histograms/Switzerland/FF2832.json
@@ -1 +1 @@
-{"batchcode": "FF2832", "histograms": [{"batchcodes": ["FF2832"], "histogram": {"Palpitations": 3, "Ultrasound scan": 3, "Arthralgia": 2, "C-reactive protein": 2, "Computerised tomogram": 2, "Computerised tomogram thorax": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Fibrin D dimer": 2, "Fibrin D dimer increased": 2, "Hypertension": 2, "Immunisation": 2, "Oxygen saturation": 2, "Pulmonary embolism": 2, "White blood cell count": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Angina pectoris": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Asthenia": 1, "Bacterial test": 1, "Blood gases": 1, "Blood lactic acid": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Chest pain": 1, "Chronic gastritis": 1, "Colitis": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Cough": 1, "Culture stool": 1, "Cytology": 1, "Death": 1, "Disease progression": 1, "Double stranded DNA antibody": 1, "Dyslipidaemia": 1, "Echocardiogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Fractional exhaled nitric oxide": 1, "Gastritis": 1, "Gastrointestinal inflammation": 1, "Gout": 1, "Headache": 1, "Heart rate": 1, "Helicobacter infection": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Inflammatory marker test": 1, "Influenza like illness": 1, "Interferon gamma level": 1, "Investigation": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Lymphopenia": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Musculoskeletal pain": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neutrophilia": 1, "New daily persistent headache": 1, "Noninfective oophoritis": 1, "Obstructive sleep apnoea syndrome": 1, "Ovarian cyst": 1, "Pericardial drainage": 1, "Pericarditis": 1, "Plethysmography": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Pulmonary fibrosis": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Scleroderma": 1, "Serology test": 1, "Shunt thrombosis": 1, "Tremor": 1, "Troponin": 1, "Type 2 diabetes mellitus": 1, "Urine analysis": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2832", "histograms": [{"histogram": {"Palpitations": 3, "Ultrasound scan": 3, "Arthralgia": 2, "C-reactive protein": 2, "Computerised tomogram": 2, "Computerised tomogram thorax": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Fibrin D dimer": 2, "Fibrin D dimer increased": 2, "Hypertension": 2, "Immunisation": 2, "Oxygen saturation": 2, "Pulmonary embolism": 2, "White blood cell count": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Angina pectoris": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Asthenia": 1, "Bacterial test": 1, "Blood gases": 1, "Blood lactic acid": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Chest pain": 1, "Chronic gastritis": 1, "Colitis": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Cough": 1, "Culture stool": 1, "Cytology": 1, "Death": 1, "Disease progression": 1, "Double stranded DNA antibody": 1, "Dyslipidaemia": 1, "Echocardiogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Fractional exhaled nitric oxide": 1, "Gastritis": 1, "Gastrointestinal inflammation": 1, "Gout": 1, "Headache": 1, "Heart rate": 1, "Helicobacter infection": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypokalaemia": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Inflammatory marker test": 1, "Influenza like illness": 1, "Interferon gamma level": 1, "Investigation": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Lymphopenia": 1, "Magnetic resonance imaging": 1, "Menstruation irregular": 1, "Musculoskeletal pain": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neutrophilia": 1, "New daily persistent headache": 1, "Noninfective oophoritis": 1, "Obstructive sleep apnoea syndrome": 1, "Ovarian cyst": 1, "Pericardial drainage": 1, "Pericarditis": 1, "Plethysmography": 1, "Polymerase chain reaction": 1, "Positron emission tomogram": 1, "Pulmonary fibrosis": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test": 1, "Scleroderma": 1, "Serology test": 1, "Shunt thrombosis": 1, "Tremor": 1, "Troponin": 1, "Type 2 diabetes mellitus": 1, "Urine analysis": 1, "pH body fluid": 1}, "batchcodes": ["FF2832"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FF2834.json b/docs/data/histograms/Switzerland/FF2834.json
index 83c0b8c42a3..642b2116308 100644
--- a/docs/data/histograms/Switzerland/FF2834.json
+++ b/docs/data/histograms/Switzerland/FF2834.json
@@ -1 +1 @@
-{"batchcode": "FF2834", "histograms": [{"batchcodes": ["FF2834"], "histogram": {"Body mass index": 1, "Dizziness": 1, "Magnetic resonance imaging spinal": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2834", "histograms": [{"histogram": {"Body mass index": 1, "Dizziness": 1, "Magnetic resonance imaging spinal": 1, "Palpitations": 1}, "batchcodes": ["FF2834"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FF7898.json b/docs/data/histograms/Switzerland/FF7898.json
index 64bedc6dd43..f9041b7ae20 100644
--- a/docs/data/histograms/Switzerland/FF7898.json
+++ b/docs/data/histograms/Switzerland/FF7898.json
@@ -1 +1 @@
-{"batchcode": "FF7898", "histograms": [{"batchcodes": ["FF7898"], "histogram": {"Blood creatine phosphokinase": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Circulatory collapse": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Electrocardiogram": 1, "Heart rate": 1, "Immunisation": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "FF7898", "histograms": [{"histogram": {"Blood creatine phosphokinase": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Circulatory collapse": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Electrocardiogram": 1, "Heart rate": 1, "Immunisation": 1, "Troponin": 1}, "batchcodes": ["FF7898"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FG6431.json b/docs/data/histograms/Switzerland/FG6431.json
index 86d87970ebf..fbc92d6bff7 100644
--- a/docs/data/histograms/Switzerland/FG6431.json
+++ b/docs/data/histograms/Switzerland/FG6431.json
@@ -1 +1 @@
-{"batchcode": "FG6431", "histograms": [{"batchcodes": ["FG6431"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FG6431", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FG6431"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FG7387.json b/docs/data/histograms/Switzerland/FG7387.json
index 67e6a96e6c4..081d861c843 100644
--- a/docs/data/histograms/Switzerland/FG7387.json
+++ b/docs/data/histograms/Switzerland/FG7387.json
@@ -1 +1 @@
-{"batchcode": "FG7387", "histograms": [{"batchcodes": ["FG7387"], "histogram": {"Angiogram": 1, "Haemorrhagic stroke": 1, "Magnetic resonance imaging": 1, "NIH stroke scale": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7387", "histograms": [{"histogram": {"Angiogram": 1, "Haemorrhagic stroke": 1, "Magnetic resonance imaging": 1, "NIH stroke scale": 1}, "batchcodes": ["FG7387"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FG7898.json b/docs/data/histograms/Switzerland/FG7898.json
index 268cc58ad5b..e0a5ed9dbfa 100644
--- a/docs/data/histograms/Switzerland/FG7898.json
+++ b/docs/data/histograms/Switzerland/FG7898.json
@@ -1 +1 @@
-{"batchcode": "FG7898", "histograms": [{"batchcodes": ["FG7898"], "histogram": {"Headache": 2, "Pain": 2, "Paraesthesia": 2, "Abdominal pain upper": 1, "Aerophagia": 1, "Albumin urine": 1, "Albuminuria": 1, "Appendicitis": 1, "Back pain": 1, "Biopsy": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Body mass index": 1, "Cardiac flutter": 1, "Chills": 1, "Concussion": 1, "Cutaneous vasculitis": 1, "Diarrhoea": 1, "Epilepsy": 1, "Erythema": 1, "Fatigue": 1, "Gastrointestinal sounds abnormal": 1, "Insomnia": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neck pain": 1, "Night sweats": 1, "Peritonitis": 1, "Phlebitis": 1, "Rash": 1, "Respiratory tract infection": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Sick leave": 1, "Sleep disorder": 1, "Superficial vein thrombosis": 1, "Syncope": 1, "Toxic skin eruption": 1}}]}
\ No newline at end of file
+{"batchcode": "FG7898", "histograms": [{"histogram": {"Headache": 2, "Pain": 2, "Paraesthesia": 2, "Abdominal pain upper": 1, "Aerophagia": 1, "Albumin urine": 1, "Albuminuria": 1, "Appendicitis": 1, "Back pain": 1, "Biopsy": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Body mass index": 1, "Cardiac flutter": 1, "Chills": 1, "Concussion": 1, "Cutaneous vasculitis": 1, "Diarrhoea": 1, "Epilepsy": 1, "Erythema": 1, "Fatigue": 1, "Gastrointestinal sounds abnormal": 1, "Insomnia": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Neck pain": 1, "Night sweats": 1, "Peritonitis": 1, "Phlebitis": 1, "Rash": 1, "Respiratory tract infection": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Sick leave": 1, "Sleep disorder": 1, "Superficial vein thrombosis": 1, "Syncope": 1, "Toxic skin eruption": 1}, "batchcodes": ["FG7898"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FH 3253.json b/docs/data/histograms/Switzerland/FH 3253.json
index b4a4b201a8b..50a3af493c5 100644
--- a/docs/data/histograms/Switzerland/FH 3253.json
+++ b/docs/data/histograms/Switzerland/FH 3253.json
@@ -1 +1 @@
-{"batchcode": "FH 3253", "histograms": [{"batchcodes": ["FH 3253"], "histogram": {"Blood creatine phosphokinase": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epstein-Barr virus antibody": 1, "Fibrin D dimer": 1, "Haemoglobin": 1, "Magnetic resonance imaging heart": 1, "Myocardial fibrosis": 1, "Myocardial oedema": 1, "Myocarditis": 1, "Myoglobin blood": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Pericardial effusion": 1, "Platelet count": 1, "Platelet count decreased": 1, "Troponin I": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FH 3253", "histograms": [{"histogram": {"Blood creatine phosphokinase": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Epstein-Barr virus antibody": 1, "Fibrin D dimer": 1, "Haemoglobin": 1, "Magnetic resonance imaging heart": 1, "Myocardial fibrosis": 1, "Myocardial oedema": 1, "Myocarditis": 1, "Myoglobin blood": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Pericardial effusion": 1, "Platelet count": 1, "Platelet count decreased": 1, "Troponin I": 1, "White blood cell count": 1}, "batchcodes": ["FH 3253"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FH 9678.json b/docs/data/histograms/Switzerland/FH 9678.json
index c03ba6d4858..39370987979 100644
--- a/docs/data/histograms/Switzerland/FH 9678.json
+++ b/docs/data/histograms/Switzerland/FH 9678.json
@@ -1 +1 @@
-{"batchcode": "FH 9678", "histograms": [{"batchcodes": ["FH 9678"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FH 9678", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FH 9678"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FH32119.json b/docs/data/histograms/Switzerland/FH32119.json
index 392cd3a5dd6..4a37aefdd73 100644
--- a/docs/data/histograms/Switzerland/FH32119.json
+++ b/docs/data/histograms/Switzerland/FH32119.json
@@ -1 +1 @@
-{"batchcode": "FH32119", "histograms": [{"batchcodes": ["FH32119"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FH32119", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["FH32119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FH3219.json b/docs/data/histograms/Switzerland/FH3219.json
index c4951b0d84c..e2d8439f0b8 100644
--- a/docs/data/histograms/Switzerland/FH3219.json
+++ b/docs/data/histograms/Switzerland/FH3219.json
@@ -1 +1 @@
-{"batchcode": "FH3219", "histograms": [{"batchcodes": ["FH3219"], "histogram": {"COVID-19": 15, "SARS-CoV-2 test": 15, "Vaccination failure": 15, "Drug ineffective": 3, "Suspected COVID-19": 3, "Body temperature": 2, "Condition aggravated": 2, "Dyspnoea": 2, "Magnetic resonance imaging head": 2, "Nasopharyngeal swab": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Amyotrophic lateral sclerosis": 1, "Autoimmune hepatitis": 1, "Blood loss anaemia": 1, "Blood test": 1, "Cardiac disorder": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Costochondritis": 1, "Diarrhoea": 1, "Dizziness": 1, "Dizziness postural": 1, "Dysphagia": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "Immunisation": 1, "Investigation": 1, "Iron deficiency": 1, "Micturition urgency": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Neurological examination": 1, "Palpitations": 1, "Paraesthesia": 1, "Polymenorrhoea": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Specialist consultation": 1, "Speech disorder": 1, "Tongue disorder": 1, "Torticollis": 1, "Vaccine breakthrough infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3219", "histograms": [{"histogram": {"COVID-19": 15, "SARS-CoV-2 test": 15, "Vaccination failure": 15, "Drug ineffective": 3, "Suspected COVID-19": 3, "Body temperature": 2, "Condition aggravated": 2, "Dyspnoea": 2, "Magnetic resonance imaging head": 2, "Nasopharyngeal swab": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Amyotrophic lateral sclerosis": 1, "Autoimmune hepatitis": 1, "Blood loss anaemia": 1, "Blood test": 1, "Cardiac disorder": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Costochondritis": 1, "Diarrhoea": 1, "Dizziness": 1, "Dizziness postural": 1, "Dysphagia": 1, "Headache": 1, "Heavy menstrual bleeding": 1, "Immunisation": 1, "Investigation": 1, "Iron deficiency": 1, "Micturition urgency": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Neurological examination": 1, "Palpitations": 1, "Paraesthesia": 1, "Polymenorrhoea": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Specialist consultation": 1, "Speech disorder": 1, "Tongue disorder": 1, "Torticollis": 1, "Vaccine breakthrough infection": 1}, "batchcodes": ["FH3219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FH3253.json b/docs/data/histograms/Switzerland/FH3253.json
index b807a656f4f..2d6d8e880de 100644
--- a/docs/data/histograms/Switzerland/FH3253.json
+++ b/docs/data/histograms/Switzerland/FH3253.json
@@ -1 +1 @@
-{"batchcode": "FH3253", "histograms": [{"batchcodes": ["FH3253"], "histogram": {"COVID-19": 6, "SARS-CoV-2 test": 6, "Vaccination failure": 5, "Drug ineffective": 2, "Fatigue": 2, "Immunisation": 2, "Pyrexia": 2, "Arrhythmia": 1, "Blister": 1, "Body temperature": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Interchange of vaccine products": 1, "Intercostal neuralgia": 1, "Loss of consciousness": 1, "Myocarditis": 1, "Off label use": 1, "Pain in extremity": 1, "Polymyalgia rheumatica": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3253", "histograms": [{"histogram": {"COVID-19": 6, "SARS-CoV-2 test": 6, "Vaccination failure": 5, "Drug ineffective": 2, "Fatigue": 2, "Immunisation": 2, "Pyrexia": 2, "Arrhythmia": 1, "Blister": 1, "Body temperature": 1, "Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Interchange of vaccine products": 1, "Intercostal neuralgia": 1, "Loss of consciousness": 1, "Myocarditis": 1, "Off label use": 1, "Pain in extremity": 1, "Polymyalgia rheumatica": 1, "Suspected COVID-19": 1}, "batchcodes": ["FH3253"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FH9678.json b/docs/data/histograms/Switzerland/FH9678.json
index ee95875bfce..1aa64b4e74c 100644
--- a/docs/data/histograms/Switzerland/FH9678.json
+++ b/docs/data/histograms/Switzerland/FH9678.json
@@ -1 +1 @@
-{"batchcode": "FH9678", "histograms": [{"batchcodes": ["FH9678"], "histogram": {"SARS-CoV-2 test": 10, "COVID-19": 7, "Vaccination failure": 6, "Headache": 4, "Pyrexia": 4, "Arthralgia": 3, "Dyspnoea": 3, "Body temperature": 2, "C-reactive protein": 2, "Chest discomfort": 2, "Chest pain": 2, "Cough": 2, "Fatigue": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Nasopharyngitis": 2, "Nausea": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "SARS-CoV-2 antibody test": 2, "Sleep disorder": 2, "Abortion early": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Asthenia": 1, "Asthma": 1, "Biopsy muscle": 1, "Body temperature increased": 1, "Bone pain": 1, "Breast swelling": 1, "Burn oral cavity": 1, "Cardiac failure": 1, "Cardiovascular disorder": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Confusional state": 1, "Delirium": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea exertional": 1, "Enthesopathy": 1, "Epicondylitis": 1, "Extrasystoles": 1, "Facial pain": 1, "Fibrin D dimer": 1, "Gastrointestinal disorder": 1, "General physical health deterioration": 1, "Groin pain": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Ischaemic stroke": 1, "Lymphadenopathy": 1, "Migraine": 1, "Muscle contractions involuntary": 1, "Muscle oedema": 1, "Muscle twitching": 1, "Myalgia": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuritis": 1, "Neuropathic muscular atrophy": 1, "Night sweats": 1, "Oral herpes": 1, "Oral pruritus": 1, "Osteoarthritis": 1, "Pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Paresis": 1, "Pelvic discomfort": 1, "Peripheral nerve lesion": 1, "Peripheral nerve palsy": 1, "Pleural effusion": 1, "Pregnancy test": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Red blood cell sedimentation rate": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sensory disturbance": 1, "Sick leave": 1, "Spinal osteoarthritis": 1, "Tendonitis": 1, "Trigeminal neuralgia": 1, "Troponin T": 1, "Vaccination site pain": 1, "Vaccine breakthrough infection": 1, "Vertigo": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "FH9678", "histograms": [{"histogram": {"SARS-CoV-2 test": 10, "COVID-19": 7, "Vaccination failure": 6, "Headache": 4, "Pyrexia": 4, "Arthralgia": 3, "Dyspnoea": 3, "Body temperature": 2, "C-reactive protein": 2, "Chest discomfort": 2, "Chest pain": 2, "Cough": 2, "Fatigue": 2, "Magnetic resonance imaging": 2, "Muscular weakness": 2, "Nasopharyngitis": 2, "Nausea": 2, "Oropharyngeal pain": 2, "Pain in extremity": 2, "SARS-CoV-2 antibody test": 2, "Sleep disorder": 2, "Abortion early": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Asthenia": 1, "Asthma": 1, "Biopsy muscle": 1, "Body temperature increased": 1, "Bone pain": 1, "Breast swelling": 1, "Burn oral cavity": 1, "Cardiac failure": 1, "Cardiovascular disorder": 1, "Chills": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Confusional state": 1, "Delirium": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Drug ineffective": 1, "Dyspnoea exertional": 1, "Enthesopathy": 1, "Epicondylitis": 1, "Extrasystoles": 1, "Facial pain": 1, "Fibrin D dimer": 1, "Gastrointestinal disorder": 1, "General physical health deterioration": 1, "Groin pain": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Ischaemic stroke": 1, "Lymphadenopathy": 1, "Migraine": 1, "Muscle contractions involuntary": 1, "Muscle oedema": 1, "Muscle twitching": 1, "Myalgia": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuritis": 1, "Neuropathic muscular atrophy": 1, "Night sweats": 1, "Oral herpes": 1, "Oral pruritus": 1, "Osteoarthritis": 1, "Pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Paresis": 1, "Pelvic discomfort": 1, "Peripheral nerve lesion": 1, "Peripheral nerve palsy": 1, "Pleural effusion": 1, "Pregnancy test": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Red blood cell sedimentation rate": 1, "Rhinorrhoea": 1, "Seizure": 1, "Sensory disturbance": 1, "Sick leave": 1, "Spinal osteoarthritis": 1, "Tendonitis": 1, "Trigeminal neuralgia": 1, "Troponin T": 1, "Vaccination site pain": 1, "Vaccine breakthrough infection": 1, "Vertigo": 1, "Wheezing": 1}, "batchcodes": ["FH9678"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FH9951.json b/docs/data/histograms/Switzerland/FH9951.json
index a97d3d60dad..8cf7ccb68ef 100644
--- a/docs/data/histograms/Switzerland/FH9951.json
+++ b/docs/data/histograms/Switzerland/FH9951.json
@@ -1 +1 @@
-{"batchcode": "FH9951", "histograms": [{"batchcodes": ["FH9951"], "histogram": {"Asthenia": 1, "Asthma": 1, "Dizziness": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "FH9951", "histograms": [{"histogram": {"Asthenia": 1, "Asthma": 1, "Dizziness": 1, "Paraesthesia": 1}, "batchcodes": ["FH9951"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FK 9414.json b/docs/data/histograms/Switzerland/FK 9414.json
index 0b474f7e788..6cd7d0ef9ac 100644
--- a/docs/data/histograms/Switzerland/FK 9414.json
+++ b/docs/data/histograms/Switzerland/FK 9414.json
@@ -1 +1 @@
-{"batchcode": "FK 9414", "histograms": [{"batchcodes": ["FK 9414"], "histogram": {"Carpal tunnel syndrome": 1, "Facial paralysis": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "FK 9414", "histograms": [{"histogram": {"Carpal tunnel syndrome": 1, "Facial paralysis": 1, "Urticaria": 1}, "batchcodes": ["FK 9414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FK 9707.json b/docs/data/histograms/Switzerland/FK 9707.json
index 2cc0194fcb4..4ae05aaeb73 100644
--- a/docs/data/histograms/Switzerland/FK 9707.json
+++ b/docs/data/histograms/Switzerland/FK 9707.json
@@ -1 +1 @@
-{"batchcode": "FK 9707", "histograms": [{"batchcodes": ["FK 9707"], "histogram": {"Invasive lobular breast carcinoma": 1}}]}
\ No newline at end of file
+{"batchcode": "FK 9707", "histograms": [{"histogram": {"Invasive lobular breast carcinoma": 1}, "batchcodes": ["FK 9707"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FK0738.json b/docs/data/histograms/Switzerland/FK0738.json
index 6ebf589ec17..baae572d225 100644
--- a/docs/data/histograms/Switzerland/FK0738.json
+++ b/docs/data/histograms/Switzerland/FK0738.json
@@ -1 +1 @@
-{"batchcode": "FK0738", "histograms": [{"batchcodes": ["FK0738"], "histogram": {"Dizziness": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Angiocardiogram": 1, "Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness postural": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Menstrual disorder": 1, "Migraine": 1, "Myalgia": 1, "Myocarditis": 1, "Pain in extremity": 1, "Tachycardia": 1, "Tonsillar hypertrophy": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Vertigo positional": 1, "Viral test": 1}}]}
\ No newline at end of file
+{"batchcode": "FK0738", "histograms": [{"histogram": {"Dizziness": 2, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Angiocardiogram": 1, "Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness postural": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Menstrual disorder": 1, "Migraine": 1, "Myalgia": 1, "Myocarditis": 1, "Pain in extremity": 1, "Tachycardia": 1, "Tonsillar hypertrophy": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Ventricular tachycardia": 1, "Vertigo positional": 1, "Viral test": 1}, "batchcodes": ["FK0738"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FK6268.json b/docs/data/histograms/Switzerland/FK6268.json
index cb0d41e2bd3..7b715d4bb74 100644
--- a/docs/data/histograms/Switzerland/FK6268.json
+++ b/docs/data/histograms/Switzerland/FK6268.json
@@ -1 +1 @@
-{"batchcode": "FK6268", "histograms": [{"batchcodes": ["FK6268"], "histogram": {"Nausea": 3, "SARS-CoV-2 test": 3, "Alopecia": 2, "C-reactive protein": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Fatigue": 2, "Headache": 2, "Heart rate": 2, "Myalgia": 2, "Palpitations": 2, "SARS-CoV-2 antibody test": 2, "Sick leave": 2, "Alanine aminotransferase": 1, "Allergy to vaccine": 1, "Apnoeic attack": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Bell's palsy": 1, "Blindness": 1, "Blood alkaline phosphatase": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Body temperature": 1, "COVID-19": 1, "Cardiac disorder": 1, "Cardiopulmonary exercise test": 1, "Cerebrospinal fluid leakage": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Circulatory collapse": 1, "Cyanosis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram abnormal": 1, "Eye swelling": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Glomerular filtration rate": 1, "Haemoglobin": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Laboratory test": 1, "Limb discomfort": 1, "Loss of libido": 1, "Malaise": 1, "Memory impairment": 1, "Nervous system disorder": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Peripheral vascular disorder": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Post-acute COVID-19 syndrome": 1, "Postmenopausal haemorrhage": 1, "Postural orthostatic tachycardia syndrome": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary function test": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Retinal artery thrombosis": 1, "Rheumatoid factor": 1, "Sensory overload": 1, "Serology test": 1, "Sinusitis": 1, "Specialist consultation": 1, "Tachycardia": 1, "Tendon rupture": 1, "Tinnitus": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urticaria": 1, "Uterine hypotonus": 1, "Vaccination failure": 1, "Vaccination site coldness": 1, "Vaccination site dysaesthesia": 1, "Vitamin B12": 1, "Vulvovaginal dryness": 1, "Walking disability": 1, "Weight increased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FK6268", "histograms": [{"histogram": {"Nausea": 3, "SARS-CoV-2 test": 3, "Alopecia": 2, "C-reactive protein": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Fatigue": 2, "Headache": 2, "Heart rate": 2, "Myalgia": 2, "Palpitations": 2, "SARS-CoV-2 antibody test": 2, "Sick leave": 2, "Alanine aminotransferase": 1, "Allergy to vaccine": 1, "Apnoeic attack": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Bell's palsy": 1, "Blindness": 1, "Blood alkaline phosphatase": 1, "Blood creatinine": 1, "Blood folate": 1, "Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Body temperature": 1, "COVID-19": 1, "Cardiac disorder": 1, "Cardiopulmonary exercise test": 1, "Cerebrospinal fluid leakage": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Circulatory collapse": 1, "Cyanosis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram abnormal": 1, "Eye swelling": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Gamma-glutamyltransferase": 1, "Glomerular filtration rate": 1, "Haemoglobin": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Laboratory test": 1, "Limb discomfort": 1, "Loss of libido": 1, "Malaise": 1, "Memory impairment": 1, "Nervous system disorder": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Peripheral vascular disorder": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Post-acute COVID-19 syndrome": 1, "Postmenopausal haemorrhage": 1, "Postural orthostatic tachycardia syndrome": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary function test": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Respiratory disorder": 1, "Respiratory rate": 1, "Retinal artery thrombosis": 1, "Rheumatoid factor": 1, "Sensory overload": 1, "Serology test": 1, "Sinusitis": 1, "Specialist consultation": 1, "Tachycardia": 1, "Tendon rupture": 1, "Tinnitus": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urticaria": 1, "Uterine hypotonus": 1, "Vaccination failure": 1, "Vaccination site coldness": 1, "Vaccination site dysaesthesia": 1, "Vitamin B12": 1, "Vulvovaginal dryness": 1, "Walking disability": 1, "Weight increased": 1, "White blood cell count": 1}, "batchcodes": ["FK6268"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FK9414.json b/docs/data/histograms/Switzerland/FK9414.json
index 05fe74d2e07..691c3ef69e7 100644
--- a/docs/data/histograms/Switzerland/FK9414.json
+++ b/docs/data/histograms/Switzerland/FK9414.json
@@ -1 +1 @@
-{"batchcode": "FK9414", "histograms": [{"batchcodes": ["FK9414"], "histogram": {"COVID-19": 5, "Fatigue": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 5, "Chest pain": 4, "Dizziness": 4, "Dyspnoea": 4, "Arthralgia": 3, "Headache": 3, "Myalgia": 3, "Paraesthesia": 3, "Interchange of vaccine products": 2, "Nausea": 2, "Off label use": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Anxiety": 1, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Breast pain": 1, "Breast swelling": 1, "Cardiovascular disorder": 1, "Chills": 1, "Cough": 1, "Ear pain": 1, "Echocardiogram": 1, "Eczema": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling hot": 1, "Heart rate": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Inflammation": 1, "Influenza like illness": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging heart": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Migraine": 1, "Muscle swelling": 1, "Musculoskeletal pain": 1, "Myopericarditis": 1, "Neuralgia": 1, "New daily persistent headache": 1, "Ophthalmic migraine": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Performance status decreased": 1, "Pruritus": 1, "Sick leave": 1, "Specialist consultation": 1, "Sudden visual loss": 1, "Taste disorder": 1, "Tremor": 1, "Troponin": 1, "Tunnel vision": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9414", "histograms": [{"histogram": {"COVID-19": 5, "Fatigue": 5, "SARS-CoV-2 test": 5, "Vaccination failure": 5, "Chest pain": 4, "Dizziness": 4, "Dyspnoea": 4, "Arthralgia": 3, "Headache": 3, "Myalgia": 3, "Paraesthesia": 3, "Interchange of vaccine products": 2, "Nausea": 2, "Off label use": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Anxiety": 1, "Arrhythmia": 1, "Asthenia": 1, "Back pain": 1, "Blood creatine phosphokinase": 1, "Breast pain": 1, "Breast swelling": 1, "Cardiovascular disorder": 1, "Chills": 1, "Cough": 1, "Ear pain": 1, "Echocardiogram": 1, "Eczema": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling hot": 1, "Heart rate": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Inflammation": 1, "Influenza like illness": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging heart": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Migraine": 1, "Muscle swelling": 1, "Musculoskeletal pain": 1, "Myopericarditis": 1, "Neuralgia": 1, "New daily persistent headache": 1, "Ophthalmic migraine": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Performance status decreased": 1, "Pruritus": 1, "Sick leave": 1, "Specialist consultation": 1, "Sudden visual loss": 1, "Taste disorder": 1, "Tremor": 1, "Troponin": 1, "Tunnel vision": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["FK9414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FK94414.json b/docs/data/histograms/Switzerland/FK94414.json
index eaeccf7fc42..daab9bcfe8e 100644
--- a/docs/data/histograms/Switzerland/FK94414.json
+++ b/docs/data/histograms/Switzerland/FK94414.json
@@ -1 +1 @@
-{"batchcode": "FK94414", "histograms": [{"batchcodes": ["FK94414"], "histogram": {"COVID-19": 1, "Cough": 1, "Dizziness": 1, "Headache": 1, "Investigation": 1, "Sneezing": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "FK94414", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Dizziness": 1, "Headache": 1, "Investigation": 1, "Sneezing": 1, "Vaccination failure": 1}, "batchcodes": ["FK94414"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FK9707.json b/docs/data/histograms/Switzerland/FK9707.json
index 9fbde9d8ff9..fd5536c5e8f 100644
--- a/docs/data/histograms/Switzerland/FK9707.json
+++ b/docs/data/histograms/Switzerland/FK9707.json
@@ -1 +1 @@
-{"batchcode": "FK9707", "histograms": [{"batchcodes": ["FK9707"], "histogram": {"Arthralgia": 1, "Atrial fibrillation": 1, "Blood pressure ambulatory": 1, "Blood pressure measurement": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Exercise tolerance decreased": 1, "Hepatosplenomegaly": 1, "Hypertension": 1, "Intestinal haemorrhage": 1, "Myalgia": 1, "Myocarditis": 1, "Polygraph test": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FK9707", "histograms": [{"histogram": {"Arthralgia": 1, "Atrial fibrillation": 1, "Blood pressure ambulatory": 1, "Blood pressure measurement": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Exercise tolerance decreased": 1, "Hepatosplenomegaly": 1, "Hypertension": 1, "Intestinal haemorrhage": 1, "Myalgia": 1, "Myocarditis": 1, "Polygraph test": 1, "Rash": 1}, "batchcodes": ["FK9707"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FL3560.json b/docs/data/histograms/Switzerland/FL3560.json
index cda3d8a48d4..98030fedfc2 100644
--- a/docs/data/histograms/Switzerland/FL3560.json
+++ b/docs/data/histograms/Switzerland/FL3560.json
@@ -1 +1 @@
-{"batchcode": "FL3560", "histograms": [{"batchcodes": ["FL3560"], "histogram": {"Dyspnoea": 5, "Fatigue": 4, "Chest discomfort": 3, "COVID-19": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Pyrexia": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Vaccination site pain": 2, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Blood creatinine": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Depressed mood": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Headache": 1, "Myocarditis": 1, "Myopericarditis": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Pulmonary function test": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Rheumatic fever": 1, "Suspected COVID-19": 1, "Trigeminal neuralgia": 1, "Troponin": 1, "Vaccine breakthrough infection": 1}}]}
\ No newline at end of file
+{"batchcode": "FL3560", "histograms": [{"histogram": {"Dyspnoea": 5, "Fatigue": 4, "Chest discomfort": 3, "COVID-19": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Pyrexia": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 2, "Vaccination site pain": 2, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Blood creatinine": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Depressed mood": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Headache": 1, "Myocarditis": 1, "Myopericarditis": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Pulmonary function test": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Rheumatic fever": 1, "Suspected COVID-19": 1, "Trigeminal neuralgia": 1, "Troponin": 1, "Vaccine breakthrough infection": 1}, "batchcodes": ["FL3560"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FN0987.json b/docs/data/histograms/Switzerland/FN0987.json
index c968330222d..f8430680e77 100644
--- a/docs/data/histograms/Switzerland/FN0987.json
+++ b/docs/data/histograms/Switzerland/FN0987.json
@@ -1 +1 @@
-{"batchcode": "FN0987", "histograms": [{"batchcodes": ["FN0987"], "histogram": {"Fatigue": 3, "Headache": 2, "Aggression": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "COVID-19": 1, "Chronic fatigue syndrome": 1, "Dizziness": 1, "Drug ineffective": 1, "Electric shock sensation": 1, "Electroencephalogram": 1, "Freezing phenomenon": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lumbar puncture": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Monoplegia": 1, "Muscular weakness": 1, "Off label use": 1, "Orthostatic hypotension": 1, "Pain in extremity": 1, "Panic attack": 1, "Photosensitivity reaction": 1, "Protein total": 1, "Quality of life decreased": 1, "Rash": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Sick leave": 1, "Tachycardia": 1, "Toxicologic test": 1, "Tremor": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "FN0987", "histograms": [{"histogram": {"Fatigue": 3, "Headache": 2, "Aggression": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Body temperature increased": 1, "COVID-19": 1, "Chronic fatigue syndrome": 1, "Dizziness": 1, "Drug ineffective": 1, "Electric shock sensation": 1, "Electroencephalogram": 1, "Freezing phenomenon": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lumbar puncture": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Monoplegia": 1, "Muscular weakness": 1, "Off label use": 1, "Orthostatic hypotension": 1, "Pain in extremity": 1, "Panic attack": 1, "Photosensitivity reaction": 1, "Protein total": 1, "Quality of life decreased": 1, "Rash": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Sick leave": 1, "Tachycardia": 1, "Toxicologic test": 1, "Tremor": 1, "Weight decreased": 1}, "batchcodes": ["FN0987"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FN1430.json b/docs/data/histograms/Switzerland/FN1430.json
index 01fef09269e..54ca9b5a46c 100644
--- a/docs/data/histograms/Switzerland/FN1430.json
+++ b/docs/data/histograms/Switzerland/FN1430.json
@@ -1 +1 @@
-{"batchcode": "FN1430", "histograms": [{"batchcodes": ["FN1430"], "histogram": {"Off label use": 4, "Immunisation": 3, "Chest pain": 2, "Pain in extremity": 2, "Pyrexia": 2, "Urticaria": 2, "Abdominal pain upper": 1, "Angioedema": 1, "Asthenia": 1, "Back pain": 1, "Blood test": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Cholecystectomy": 1, "Cholecystitis": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Granuloma annulare": 1, "Headache": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Musculoskeletal pain": 1, "Peripheral swelling": 1, "Post procedural infection": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Thrombosis": 1, "Vaccination failure": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "FN1430", "histograms": [{"histogram": {"Off label use": 4, "Immunisation": 3, "Chest pain": 2, "Pain in extremity": 2, "Pyrexia": 2, "Urticaria": 2, "Abdominal pain upper": 1, "Angioedema": 1, "Asthenia": 1, "Back pain": 1, "Blood test": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Cholecystectomy": 1, "Cholecystitis": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Granuloma annulare": 1, "Headache": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Musculoskeletal pain": 1, "Peripheral swelling": 1, "Post procedural infection": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Thrombosis": 1, "Vaccination failure": 1, "Vaccination site swelling": 1}, "batchcodes": ["FN1430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FN4071.json b/docs/data/histograms/Switzerland/FN4071.json
index 7175619e148..6c54f78c6f5 100644
--- a/docs/data/histograms/Switzerland/FN4071.json
+++ b/docs/data/histograms/Switzerland/FN4071.json
@@ -1 +1 @@
-{"batchcode": "FN4071", "histograms": [{"batchcodes": ["FN4071"], "histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Fatigue": 2, "Body temperature": 1, "Body temperature increased": 1, "Epstein-Barr virus antibody": 1, "Feeling cold": 1, "Headache": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Productive cough": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4071", "histograms": [{"histogram": {"COVID-19": 3, "SARS-CoV-2 test": 3, "Vaccination failure": 3, "Fatigue": 2, "Body temperature": 1, "Body temperature increased": 1, "Epstein-Barr virus antibody": 1, "Feeling cold": 1, "Headache": 1, "Laboratory test": 1, "Magnetic resonance imaging": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Productive cough": 1, "Rhinitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["FN4071"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FN9672.json b/docs/data/histograms/Switzerland/FN9672.json
index 147d633a11d..b5660e2633a 100644
--- a/docs/data/histograms/Switzerland/FN9672.json
+++ b/docs/data/histograms/Switzerland/FN9672.json
@@ -1 +1 @@
-{"batchcode": "FN9672", "histograms": [{"batchcodes": ["FN9672"], "histogram": {"Hepatocellular carcinoma": 1}}]}
\ No newline at end of file
+{"batchcode": "FN9672", "histograms": [{"histogram": {"Hepatocellular carcinoma": 1}, "batchcodes": ["FN9672"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/FP9605.json b/docs/data/histograms/Switzerland/FP9605.json
index 08a7aa46e35..ccbc5cdee9e 100644
--- a/docs/data/histograms/Switzerland/FP9605.json
+++ b/docs/data/histograms/Switzerland/FP9605.json
@@ -1 +1 @@
-{"batchcode": "FP9605", "histograms": [{"batchcodes": ["FP9605"], "histogram": {"Disturbance in attention": 1, "Dizziness": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "FP9605", "histograms": [{"histogram": {"Disturbance in attention": 1, "Dizziness": 1, "Somnolence": 1}, "batchcodes": ["FP9605"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/G 26761 A; LOT.json b/docs/data/histograms/Switzerland/G 26761 A; LOT.json
index e12acd07211..25d7739feaa 100644
--- a/docs/data/histograms/Switzerland/G 26761 A; LOT.json
+++ b/docs/data/histograms/Switzerland/G 26761 A; LOT.json
@@ -1 +1 @@
-{"batchcode": "G 26761 A; LOT", "histograms": [{"batchcodes": ["G 26761 A; LOT"], "histogram": {"Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Glycosylated haemoglobin": 1, "Granulocytes abnormal": 1, "Haemoglobin": 1, "Lymphocyte count": 1, "Myocardial infarction": 1, "Platelet count": 1, "Troponin T": 1}}]}
\ No newline at end of file
+{"batchcode": "G 26761 A; LOT", "histograms": [{"histogram": {"Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood glucose": 1, "Glycosylated haemoglobin": 1, "Granulocytes abnormal": 1, "Haemoglobin": 1, "Lymphocyte count": 1, "Myocardial infarction": 1, "Platelet count": 1, "Troponin T": 1}, "batchcodes": ["G 26761 A; LOT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/G 26761A / G267.json b/docs/data/histograms/Switzerland/G 26761A / G267.json
index 5d86e369b21..9a4dbfd2ded 100644
--- a/docs/data/histograms/Switzerland/G 26761A / G267.json
+++ b/docs/data/histograms/Switzerland/G 26761A / G267.json
@@ -1 +1 @@
-{"batchcode": "G 26761A / G267", "histograms": [{"batchcodes": ["G 26761A / G267"], "histogram": {"Asthma": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "G 26761A / G267", "histograms": [{"histogram": {"Asthma": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["G 26761A / G267"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/G26761A.json b/docs/data/histograms/Switzerland/G26761A.json
index 35d86284a1e..e409727e6aa 100644
--- a/docs/data/histograms/Switzerland/G26761A.json
+++ b/docs/data/histograms/Switzerland/G26761A.json
@@ -1 +1 @@
-{"batchcode": "G26761A", "histograms": [{"batchcodes": ["G26761A"], "histogram": {"Hypersensitivity": 1, "Ophthalmic vein thrombosis": 1, "Somnambulism": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "G26761A", "histograms": [{"histogram": {"Hypersensitivity": 1, "Ophthalmic vein thrombosis": 1, "Somnambulism": 1, "Urticaria": 1}, "batchcodes": ["G26761A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/GD6800.json b/docs/data/histograms/Switzerland/GD6800.json
index a0d86d015d8..95bade6d026 100644
--- a/docs/data/histograms/Switzerland/GD6800.json
+++ b/docs/data/histograms/Switzerland/GD6800.json
@@ -1 +1 @@
-{"batchcode": "GD6800", "histograms": [{"batchcodes": ["GD6800"], "histogram": {"COVID-19": 1, "SARS-CoV-2 antibody test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "GD6800", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 antibody test": 1, "Vaccination failure": 1}, "batchcodes": ["GD6800"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/GE8207.json b/docs/data/histograms/Switzerland/GE8207.json
index 63e72a293b0..833681c77a3 100644
--- a/docs/data/histograms/Switzerland/GE8207.json
+++ b/docs/data/histograms/Switzerland/GE8207.json
@@ -1 +1 @@
-{"batchcode": "GE8207", "histograms": [{"batchcodes": ["GE8207"], "histogram": {"Ischaemic cerebral infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "GE8207", "histograms": [{"histogram": {"Ischaemic cerebral infarction": 1}, "batchcodes": ["GE8207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/GE8297.json b/docs/data/histograms/Switzerland/GE8297.json
index 47d30c85a26..8f1ef439b27 100644
--- a/docs/data/histograms/Switzerland/GE8297.json
+++ b/docs/data/histograms/Switzerland/GE8297.json
@@ -1 +1 @@
-{"batchcode": "GE8297", "histograms": [{"batchcodes": ["GE8297"], "histogram": {"Dizziness": 2, "Dyspnoea": 2, "SARS-CoV-2 test": 2, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Arrhythmia": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Gamma-glutamyltransferase": 1, "Hypertension": 1, "Interchange of vaccine products": 1, "Liver function test increased": 1, "Malaise": 1, "Nasopharyngitis": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Seizure": 1, "Tachycardia": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "GE8297", "histograms": [{"histogram": {"Dizziness": 2, "Dyspnoea": 2, "SARS-CoV-2 test": 2, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Arrhythmia": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Blood lactate dehydrogenase": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Gamma-glutamyltransferase": 1, "Hypertension": 1, "Interchange of vaccine products": 1, "Liver function test increased": 1, "Malaise": 1, "Nasopharyngitis": 1, "Pneumonia": 1, "Polymerase chain reaction": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Seizure": 1, "Tachycardia": 1, "Ultrasound scan": 1}, "batchcodes": ["GE8297"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/GGGGGGGG.json b/docs/data/histograms/Switzerland/GGGGGGGG.json
index 23af90038e1..0d7f99b0cb3 100644
--- a/docs/data/histograms/Switzerland/GGGGGGGG.json
+++ b/docs/data/histograms/Switzerland/GGGGGGGG.json
@@ -1 +1 @@
-{"batchcode": "GGGGGGGG", "histograms": [{"batchcodes": ["GGGGGGGG"], "histogram": {"Fatigue": 1, "Headache": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Postmenopausal haemorrhage": 1, "Rhinitis": 1}}]}
\ No newline at end of file
+{"batchcode": "GGGGGGGG", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Postmenopausal haemorrhage": 1, "Rhinitis": 1}, "batchcodes": ["GGGGGGGG"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/IF1003A.json b/docs/data/histograms/Switzerland/IF1003A.json
index c508fde7726..7eb9b075351 100644
--- a/docs/data/histograms/Switzerland/IF1003A.json
+++ b/docs/data/histograms/Switzerland/IF1003A.json
@@ -1 +1 @@
-{"batchcode": "IF1003A", "histograms": [{"batchcodes": ["IF1003A"], "histogram": {"Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "IF1003A", "histograms": [{"histogram": {"Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Ultrasound scan": 1}, "batchcodes": ["IF1003A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/L 3002544.json b/docs/data/histograms/Switzerland/L 3002544.json
index 76767c9025d..f3e672f4e9c 100644
--- a/docs/data/histograms/Switzerland/L 3002544.json
+++ b/docs/data/histograms/Switzerland/L 3002544.json
@@ -1 +1 @@
-{"batchcode": "L 3002544", "histograms": [{"batchcodes": ["L 3002544"], "histogram": {"C-reactive protein": 1, "Computerised tomogram": 1, "Fibrin D dimer": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "L 3002544", "histograms": [{"histogram": {"C-reactive protein": 1, "Computerised tomogram": 1, "Fibrin D dimer": 1, "Pulmonary embolism": 1}, "batchcodes": ["L 3002544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/L300042460.json b/docs/data/histograms/Switzerland/L300042460.json
index 97324e8e0cd..d7090718cc0 100644
--- a/docs/data/histograms/Switzerland/L300042460.json
+++ b/docs/data/histograms/Switzerland/L300042460.json
@@ -1 +1 @@
-{"batchcode": "L300042460", "histograms": [{"batchcodes": ["L300042460"], "histogram": {"Blood creatine": 1, "Polymyalgia rheumatica": 1, "Red blood cell sedimentation rate": 1}}]}
\ No newline at end of file
+{"batchcode": "L300042460", "histograms": [{"histogram": {"Blood creatine": 1, "Polymyalgia rheumatica": 1, "Red blood cell sedimentation rate": 1}, "batchcodes": ["L300042460"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/L6ZRM6.json b/docs/data/histograms/Switzerland/L6ZRM6.json
index f236ca928b0..06764fa578f 100644
--- a/docs/data/histograms/Switzerland/L6ZRM6.json
+++ b/docs/data/histograms/Switzerland/L6ZRM6.json
@@ -1 +1 @@
-{"batchcode": "L6ZRM6", "histograms": [{"batchcodes": ["L6ZRM6"], "histogram": {"Electroencephalogram": 1, "Febrile convulsion": 1}}]}
\ No newline at end of file
+{"batchcode": "L6ZRM6", "histograms": [{"histogram": {"Electroencephalogram": 1, "Febrile convulsion": 1}, "batchcodes": ["L6ZRM6"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT 200022A.json b/docs/data/histograms/Switzerland/LOT 200022A.json
index 21ef42626e6..b8eb2a981f3 100644
--- a/docs/data/histograms/Switzerland/LOT 200022A.json
+++ b/docs/data/histograms/Switzerland/LOT 200022A.json
@@ -1 +1 @@
-{"batchcode": "LOT 200022A", "histograms": [{"batchcodes": ["LOT 200022A"], "histogram": {"Fatigue": 2, "Pyrexia": 2, "Application site pain": 1, "Headache": 1, "Insomnia": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Postmenopausal haemorrhage": 1, "Sick leave": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT 200022A", "histograms": [{"histogram": {"Fatigue": 2, "Pyrexia": 2, "Application site pain": 1, "Headache": 1, "Insomnia": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Postmenopausal haemorrhage": 1, "Sick leave": 1, "Vomiting": 1}, "batchcodes": ["LOT 200022A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT 3002541.json b/docs/data/histograms/Switzerland/LOT 3002541.json
index d8019541992..53f150b2913 100644
--- a/docs/data/histograms/Switzerland/LOT 3002541.json
+++ b/docs/data/histograms/Switzerland/LOT 3002541.json
@@ -1 +1 @@
-{"batchcode": "LOT 3002541", "histograms": [{"batchcodes": ["LOT 3002541"], "histogram": {"Culture stool": 1, "Gastroenteritis Escherichia coli": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT 3002541", "histograms": [{"histogram": {"Culture stool": 1, "Gastroenteritis Escherichia coli": 1}, "batchcodes": ["LOT 3002541"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT 3002918.json b/docs/data/histograms/Switzerland/LOT 3002918.json
index 061dca18897..3343cad6f62 100644
--- a/docs/data/histograms/Switzerland/LOT 3002918.json
+++ b/docs/data/histograms/Switzerland/LOT 3002918.json
@@ -1 +1 @@
-{"batchcode": "LOT 3002918", "histograms": [{"batchcodes": ["LOT 3002918"], "histogram": {"Injection site pain": 1, "Pain in extremity": 1, "Polymyalgia rheumatica": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT 3002918", "histograms": [{"histogram": {"Injection site pain": 1, "Pain in extremity": 1, "Polymyalgia rheumatica": 1}, "batchcodes": ["LOT 3002918"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT 3004215.json b/docs/data/histograms/Switzerland/LOT 3004215.json
index f9f2788ea03..8fbb009c5bb 100644
--- a/docs/data/histograms/Switzerland/LOT 3004215.json
+++ b/docs/data/histograms/Switzerland/LOT 3004215.json
@@ -1 +1 @@
-{"batchcode": "LOT 3004215", "histograms": [{"batchcodes": ["LOT 3004215"], "histogram": {"Chronic spontaneous urticaria": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT 3004215", "histograms": [{"histogram": {"Chronic spontaneous urticaria": 1, "Fatigue": 1}, "batchcodes": ["LOT 3004215"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT 3005704.json b/docs/data/histograms/Switzerland/LOT 3005704.json
index 9e02d737bca..9bffc2feea5 100644
--- a/docs/data/histograms/Switzerland/LOT 3005704.json
+++ b/docs/data/histograms/Switzerland/LOT 3005704.json
@@ -1 +1 @@
-{"batchcode": "LOT 3005704", "histograms": [{"batchcodes": ["LOT 3005704"], "histogram": {"Application site reaction": 1, "Cognitive disorder": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Myocarditis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT 3005704", "histograms": [{"histogram": {"Application site reaction": 1, "Cognitive disorder": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Myocarditis": 1, "Pyrexia": 1}, "batchcodes": ["LOT 3005704"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT 3006274.json b/docs/data/histograms/Switzerland/LOT 3006274.json
index 3a0c6d27e8e..b14b9d9d472 100644
--- a/docs/data/histograms/Switzerland/LOT 3006274.json
+++ b/docs/data/histograms/Switzerland/LOT 3006274.json
@@ -1 +1 @@
-{"batchcode": "LOT 3006274", "histograms": [{"batchcodes": ["LOT 3006274"], "histogram": {"Fall": 1, "Flatulence": 1, "Functional gastrointestinal disorder": 1, "Influenza like illness": 1, "Polyarthritis": 1, "Syncope": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT 3006274", "histograms": [{"histogram": {"Fall": 1, "Flatulence": 1, "Functional gastrointestinal disorder": 1, "Influenza like illness": 1, "Polyarthritis": 1, "Syncope": 1, "Urticaria": 1}, "batchcodes": ["LOT 3006274"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT3002537.json b/docs/data/histograms/Switzerland/LOT3002537.json
index 871171bd914..ccacc8e436f 100644
--- a/docs/data/histograms/Switzerland/LOT3002537.json
+++ b/docs/data/histograms/Switzerland/LOT3002537.json
@@ -1 +1 @@
-{"batchcode": "LOT3002537", "histograms": [{"batchcodes": ["LOT3002537"], "histogram": {"Arrhythmia": 1, "Electrocardiogram": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT3002537", "histograms": [{"histogram": {"Arrhythmia": 1, "Electrocardiogram": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["LOT3002537"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT3004215.json b/docs/data/histograms/Switzerland/LOT3004215.json
index 040db7f0c4f..43304f0bcb0 100644
--- a/docs/data/histograms/Switzerland/LOT3004215.json
+++ b/docs/data/histograms/Switzerland/LOT3004215.json
@@ -1 +1 @@
-{"batchcode": "LOT3004215", "histograms": [{"batchcodes": ["LOT3004215"], "histogram": {"Musculoskeletal stiffness": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT3004215", "histograms": [{"histogram": {"Musculoskeletal stiffness": 1, "Pulmonary embolism": 1}, "batchcodes": ["LOT3004215"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT3005238.json b/docs/data/histograms/Switzerland/LOT3005238.json
index d67c04ae9d4..942a51139e9 100644
--- a/docs/data/histograms/Switzerland/LOT3005238.json
+++ b/docs/data/histograms/Switzerland/LOT3005238.json
@@ -1 +1 @@
-{"batchcode": "LOT3005238", "histograms": [{"batchcodes": ["LOT3005238"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT3005238", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["LOT3005238"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/LOT3005704.json b/docs/data/histograms/Switzerland/LOT3005704.json
index b67035bfbbd..708eedb6ef9 100644
--- a/docs/data/histograms/Switzerland/LOT3005704.json
+++ b/docs/data/histograms/Switzerland/LOT3005704.json
@@ -1 +1 @@
-{"batchcode": "LOT3005704", "histograms": [{"batchcodes": ["LOT3005704"], "histogram": {"Dyspnoea": 1, "Swelling face": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "LOT3005704", "histograms": [{"histogram": {"Dyspnoea": 1, "Swelling face": 1, "Urticaria": 1}, "batchcodes": ["LOT3005704"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/M0477.json b/docs/data/histograms/Switzerland/M0477.json
index 9c2ac562107..e8d5541fe54 100644
--- a/docs/data/histograms/Switzerland/M0477.json
+++ b/docs/data/histograms/Switzerland/M0477.json
@@ -1 +1 @@
-{"batchcode": "M0477", "histograms": [{"batchcodes": ["M0477"], "histogram": {"Malaise": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "M0477", "histograms": [{"histogram": {"Malaise": 1, "Tachycardia": 1}, "batchcodes": ["M0477"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/NCIHT BEKANNT (.json b/docs/data/histograms/Switzerland/NCIHT BEKANNT (.json
index 29c70daebe0..8111936763c 100644
--- a/docs/data/histograms/Switzerland/NCIHT BEKANNT (.json
+++ b/docs/data/histograms/Switzerland/NCIHT BEKANNT (.json
@@ -1 +1 @@
-{"batchcode": "NCIHT BEKANNT (", "histograms": [{"batchcodes": ["NCIHT BEKANNT ("], "histogram": {"Angiocardiogram": 1, "C-reactive protein": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Myocarditis": 1, "Troponin": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "NCIHT BEKANNT (", "histograms": [{"histogram": {"Angiocardiogram": 1, "C-reactive protein": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Myocarditis": 1, "Troponin": 1, "Ultrasound scan": 1}, "batchcodes": ["NCIHT BEKANNT ("]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/NOT AVAILABLE.json b/docs/data/histograms/Switzerland/NOT AVAILABLE.json
index ebea0845dd5..6135f1c385a 100644
--- a/docs/data/histograms/Switzerland/NOT AVAILABLE.json
+++ b/docs/data/histograms/Switzerland/NOT AVAILABLE.json
@@ -1 +1 @@
-{"batchcode": "NOT AVAILABLE", "histograms": [{"batchcodes": ["NOT AVAILABLE"], "histogram": {"Computerised tomogram": 1, "Dizziness": 1, "Magnetic resonance imaging": 1}}]}
\ No newline at end of file
+{"batchcode": "NOT AVAILABLE", "histograms": [{"histogram": {"Computerised tomogram": 1, "Dizziness": 1, "Magnetic resonance imaging": 1}, "batchcodes": ["NOT AVAILABLE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/NOT PROVIDED.json b/docs/data/histograms/Switzerland/NOT PROVIDED.json
index 41a31a5ab18..8459847dbd7 100644
--- a/docs/data/histograms/Switzerland/NOT PROVIDED.json
+++ b/docs/data/histograms/Switzerland/NOT PROVIDED.json
@@ -1 +1 @@
-{"batchcode": "NOT PROVIDED", "histograms": [{"batchcodes": ["NOT PROVIDED"], "histogram": {"Dizziness": 1, "Groin pain": 1, "Headache": 1, "Labour stimulation": 1, "Monoplegia": 1, "Nausea": 1, "Pyrexia": 1, "Renal pain": 1, "Uterine pain": 1}}]}
\ No newline at end of file
+{"batchcode": "NOT PROVIDED", "histograms": [{"histogram": {"Dizziness": 1, "Groin pain": 1, "Headache": 1, "Labour stimulation": 1, "Monoplegia": 1, "Nausea": 1, "Pyrexia": 1, "Renal pain": 1, "Uterine pain": 1}, "batchcodes": ["NOT PROVIDED"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/SCRW2.json b/docs/data/histograms/Switzerland/SCRW2.json
index 173ca141b12..b46aad1754a 100644
--- a/docs/data/histograms/Switzerland/SCRW2.json
+++ b/docs/data/histograms/Switzerland/SCRW2.json
@@ -1 +1 @@
-{"batchcode": "SCRW2", "histograms": [{"batchcodes": ["SCRW2"], "histogram": {"Bladder cancer": 1, "Inappropriate schedule of product administration": 1, "Ultrasound scan": 1, "Urinary tract neoplasm": 1}}]}
\ No newline at end of file
+{"batchcode": "SCRW2", "histograms": [{"histogram": {"Bladder cancer": 1, "Inappropriate schedule of product administration": 1, "Ultrasound scan": 1, "Urinary tract neoplasm": 1}, "batchcodes": ["SCRW2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/SCTN4.json b/docs/data/histograms/Switzerland/SCTN4.json
index a8b2954a77a..65af5e7b476 100644
--- a/docs/data/histograms/Switzerland/SCTN4.json
+++ b/docs/data/histograms/Switzerland/SCTN4.json
@@ -1 +1 @@
-{"batchcode": "SCTN4", "histograms": [{"batchcodes": ["SCTN4"], "histogram": {"Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "SCTN4", "histograms": [{"histogram": {"Pericarditis": 1}, "batchcodes": ["SCTN4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/SG7898.json b/docs/data/histograms/Switzerland/SG7898.json
index 5a678e6eda8..65b1ccb96d1 100644
--- a/docs/data/histograms/Switzerland/SG7898.json
+++ b/docs/data/histograms/Switzerland/SG7898.json
@@ -1 +1 @@
-{"batchcode": "SG7898", "histograms": [{"batchcodes": ["SG7898"], "histogram": {"C-reactive protein": 1, "Lipase": 1, "Pancreatitis acute": 1}}]}
\ No newline at end of file
+{"batchcode": "SG7898", "histograms": [{"histogram": {"C-reactive protein": 1, "Lipase": 1, "Pancreatitis acute": 1}, "batchcodes": ["SG7898"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/UNBEKANNT.json b/docs/data/histograms/Switzerland/UNBEKANNT.json
index c1537af25f7..f9f052ac8fe 100644
--- a/docs/data/histograms/Switzerland/UNBEKANNT.json
+++ b/docs/data/histograms/Switzerland/UNBEKANNT.json
@@ -1 +1 @@
-{"batchcode": "UNBEKANNT", "histograms": [{"batchcodes": ["UNBEKANNT"], "histogram": {"Arrhythmia": 1, "Cardiac function test": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Myalgia": 1, "Neurological examination": 1, "Paralysis": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "UNBEKANNT", "histograms": [{"histogram": {"Arrhythmia": 1, "Cardiac function test": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Myalgia": 1, "Neurological examination": 1, "Paralysis": 1, "Urticaria": 1}, "batchcodes": ["UNBEKANNT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/UNK.json b/docs/data/histograms/Switzerland/UNK.json
index 751b1296304..085ed83c2cc 100644
--- a/docs/data/histograms/Switzerland/UNK.json
+++ b/docs/data/histograms/Switzerland/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK", "UNK"], "histogram": {"Haemorrhage in pregnancy": 1, "Maternal exposure timing unspecified": 1, "Premature separation of placenta": 1}}, {"batchcodes": ["UNK"], "histogram": {"Pruritus": 3, "Pulmonary embolism": 3, "Urticaria": 3, "Affect lability": 1, "Angiocardiogram": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Confusional state": 1, "Death": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Fibrin D dimer": 1, "Headache": 1, "Influenza like illness": 1, "Injection site pain": 1, "Insomnia": 1, "Muscle spasms": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Pain": 1, "Palpitations": 1, "Performance status decreased": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Premenstrual pain": 1, "Rash": 1, "Skin reaction": 1, "Troponin": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site oedema": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"Haemorrhage in pregnancy": 1, "Maternal exposure timing unspecified": 1, "Premature separation of placenta": 1}, "batchcodes": ["UNK", "UNK"]}, {"histogram": {"Haemorrhage in pregnancy": 1, "Maternal exposure timing unspecified": 1, "Premature separation of placenta": 1}, "batchcodes": ["UNK", "UNK"]}, {"histogram": {"Pruritus": 3, "Pulmonary embolism": 3, "Urticaria": 3, "Affect lability": 1, "Angiocardiogram": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure decreased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Confusional state": 1, "Death": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Fibrin D dimer": 1, "Headache": 1, "Influenza like illness": 1, "Injection site pain": 1, "Insomnia": 1, "Muscle spasms": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Pain": 1, "Palpitations": 1, "Performance status decreased": 1, "Pneumonia": 1, "Postmenopausal haemorrhage": 1, "Premenstrual pain": 1, "Rash": 1, "Skin reaction": 1, "Troponin": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site oedema": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/URN:UVCI:01 :CH.json b/docs/data/histograms/Switzerland/URN:UVCI:01 :CH.json
index f6bfc38eeb7..8cd412b2ca5 100644
--- a/docs/data/histograms/Switzerland/URN:UVCI:01 :CH.json
+++ b/docs/data/histograms/Switzerland/URN:UVCI:01 :CH.json
@@ -1 +1 @@
-{"batchcode": "URN:UVCI:01 :CH", "histograms": [{"batchcodes": ["URN:UVCI:01 :CH"], "histogram": {"Contusion": 1, "Fall": 1, "Nausea": 1, "Skin laceration": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "URN:UVCI:01 :CH", "histograms": [{"histogram": {"Contusion": 1, "Fall": 1, "Nausea": 1, "Skin laceration": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["URN:UVCI:01 :CH"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/URN:UVCI:01:CH:.json b/docs/data/histograms/Switzerland/URN:UVCI:01:CH:.json
index 5f2ffdd6459..b0ed2c809a5 100644
--- a/docs/data/histograms/Switzerland/URN:UVCI:01:CH:.json
+++ b/docs/data/histograms/Switzerland/URN:UVCI:01:CH:.json
@@ -1 +1 @@
-{"batchcode": "URN:UVCI:01:CH:", "histograms": [{"batchcodes": ["URN:UVCI:01:CH:"], "histogram": {"Breast cancer": 1, "Chills": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "URN:UVCI:01:CH:", "histograms": [{"histogram": {"Breast cancer": 1, "Chills": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["URN:UVCI:01:CH:"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/URN:UVCI:01:LI:.json b/docs/data/histograms/Switzerland/URN:UVCI:01:LI:.json
index 94f79da30c5..d4f40eeb4f7 100644
--- a/docs/data/histograms/Switzerland/URN:UVCI:01:LI:.json
+++ b/docs/data/histograms/Switzerland/URN:UVCI:01:LI:.json
@@ -1 +1 @@
-{"batchcode": "URN:UVCI:01:LI:", "histograms": [{"batchcodes": ["URN:UVCI:01:LI:"], "histogram": {"Diarrhoea": 1, "Rash": 1, "Syncope": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "URN:UVCI:01:LI:", "histograms": [{"histogram": {"Diarrhoea": 1, "Rash": 1, "Syncope": 1, "Urticaria": 1}, "batchcodes": ["URN:UVCI:01:LI:"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/URN:UVCI:CH:4DE.json b/docs/data/histograms/Switzerland/URN:UVCI:CH:4DE.json
index 9fd6e42b768..50956f1285d 100644
--- a/docs/data/histograms/Switzerland/URN:UVCI:CH:4DE.json
+++ b/docs/data/histograms/Switzerland/URN:UVCI:CH:4DE.json
@@ -1 +1 @@
-{"batchcode": "URN:UVCI:CH:4DE", "histograms": [{"batchcodes": ["URN:UVCI:CH:4DE"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "URN:UVCI:CH:4DE", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["URN:UVCI:CH:4DE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/URN:UVCI:O1:CH:.json b/docs/data/histograms/Switzerland/URN:UVCI:O1:CH:.json
index 78f5d135ac7..3fbe1a277be 100644
--- a/docs/data/histograms/Switzerland/URN:UVCI:O1:CH:.json
+++ b/docs/data/histograms/Switzerland/URN:UVCI:O1:CH:.json
@@ -1 +1 @@
-{"batchcode": "URN:UVCI:O1:CH:", "histograms": [{"batchcodes": ["URN:UVCI:O1:CH:"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "URN:UVCI:O1:CH:", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["URN:UVCI:O1:CH:"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/XD985.json b/docs/data/histograms/Switzerland/XD985.json
index 12860df46a9..82d98ac7efd 100644
--- a/docs/data/histograms/Switzerland/XD985.json
+++ b/docs/data/histograms/Switzerland/XD985.json
@@ -1 +1 @@
-{"batchcode": "XD985", "histograms": [{"batchcodes": ["XD985"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "XD985", "histograms": [{"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["XD985"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/XX / 3000496.json b/docs/data/histograms/Switzerland/XX / 3000496.json
index 91005217bf7..1e066567576 100644
--- a/docs/data/histograms/Switzerland/XX / 3000496.json
+++ b/docs/data/histograms/Switzerland/XX / 3000496.json
@@ -1 +1 @@
-{"batchcode": "XX / 3000496", "histograms": [{"batchcodes": ["XX / 3000496"], "histogram": {"Ophthalmic herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "XX / 3000496", "histograms": [{"histogram": {"Ophthalmic herpes zoster": 1}, "batchcodes": ["XX / 3000496"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Switzerland/XX / 3001530.json b/docs/data/histograms/Switzerland/XX / 3001530.json
index 190630f20b7..8b3717b8a8a 100644
--- a/docs/data/histograms/Switzerland/XX / 3001530.json
+++ b/docs/data/histograms/Switzerland/XX / 3001530.json
@@ -1 +1 @@
-{"batchcode": "XX / 3001530", "histograms": [{"batchcodes": ["XX / 3001530"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "XX / 3001530", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["XX / 3001530"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Syrian Arab Republic/EY5456.json b/docs/data/histograms/Syrian Arab Republic/EY5456.json
index 4e98f5c7440..9a4817fc78f 100644
--- a/docs/data/histograms/Syrian Arab Republic/EY5456.json
+++ b/docs/data/histograms/Syrian Arab Republic/EY5456.json
@@ -1 +1 @@
-{"batchcode": "EY5456", "histograms": [{"batchcodes": ["EY5456"], "histogram": {"Arthralgia": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Food allergy": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Loss of control of legs": 1, "Migraine": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nausea": 1, "Neck pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1, "Sensory loss": 1, "Skin irritation": 1, "Slow speech": 1, "Speech disorder": 1, "Throat tightness": 1, "Vital functions abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "EY5456", "histograms": [{"histogram": {"Arthralgia": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Food allergy": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Loss of control of legs": 1, "Migraine": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nausea": 1, "Neck pain": 1, "Oxygen saturation decreased": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1, "Sensory loss": 1, "Skin irritation": 1, "Slow speech": 1, "Speech disorder": 1, "Throat tightness": 1, "Vital functions abnormal": 1}, "batchcodes": ["EY5456"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/000440A_1110816.json b/docs/data/histograms/Taiwan, Province of China/000440A_1110816.json
index 46c8739305d..4c202ab27e3 100644
--- a/docs/data/histograms/Taiwan, Province of China/000440A_1110816.json
+++ b/docs/data/histograms/Taiwan, Province of China/000440A_1110816.json
@@ -1 +1 @@
-{"batchcode": "000440A_1110816", "histograms": [{"batchcodes": ["000440A_1110816"], "histogram": {"Asthma": 1, "Chills": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000440A_1110816", "histograms": [{"histogram": {"Asthma": 1, "Chills": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["000440A_1110816"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/00440A_1110816-.json b/docs/data/histograms/Taiwan, Province of China/00440A_1110816-.json
index 67824705887..417ef9cfca4 100644
--- a/docs/data/histograms/Taiwan, Province of China/00440A_1110816-.json
+++ b/docs/data/histograms/Taiwan, Province of China/00440A_1110816-.json
@@ -1 +1 @@
-{"batchcode": "00440A_1110816-", "histograms": [{"batchcodes": ["00440A_1110816-"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "00440A_1110816-", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["00440A_1110816-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/006K21A 1110210.json b/docs/data/histograms/Taiwan, Province of China/006K21A 1110210.json
index 3412f5c007c..ea5ae40d6d6 100644
--- a/docs/data/histograms/Taiwan, Province of China/006K21A 1110210.json
+++ b/docs/data/histograms/Taiwan, Province of China/006K21A 1110210.json
@@ -1 +1 @@
-{"batchcode": "006K21A 1110210", "histograms": [{"batchcodes": ["006K21A 1110210"], "histogram": {"Acute myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "006K21A 1110210", "histograms": [{"histogram": {"Acute myocardial infarction": 1}, "batchcodes": ["006K21A 1110210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/006K21A.json b/docs/data/histograms/Taiwan, Province of China/006K21A.json
index a291a57f3b6..5d108718caf 100644
--- a/docs/data/histograms/Taiwan, Province of China/006K21A.json
+++ b/docs/data/histograms/Taiwan, Province of China/006K21A.json
@@ -1 +1 @@
-{"batchcode": "006K21A", "histograms": [{"batchcodes": ["006K21A"], "histogram": {"Pyrexia": 3, "Chest pain": 1, "Chills": 1, "Deafness": 1, "Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Paralysis": 1, "Syncope": 1, "Tinnitus": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "006K21A", "histograms": [{"histogram": {"Pyrexia": 3, "Chest pain": 1, "Chills": 1, "Deafness": 1, "Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Muscular weakness": 1, "Paraesthesia": 1, "Paralysis": 1, "Syncope": 1, "Tinnitus": 1, "Vomiting": 1}, "batchcodes": ["006K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/006K21A_1110208.json b/docs/data/histograms/Taiwan, Province of China/006K21A_1110208.json
index 7acba03142f..ddcf336e054 100644
--- a/docs/data/histograms/Taiwan, Province of China/006K21A_1110208.json
+++ b/docs/data/histograms/Taiwan, Province of China/006K21A_1110208.json
@@ -1 +1 @@
-{"batchcode": "006K21A_1110208", "histograms": [{"batchcodes": ["006K21A_1110208"], "histogram": {"Altered state of consciousness": 2, "Muscular weakness": 2, "Syncope": 2, "Abdominal pain": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "Sepsis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "006K21A_1110208", "histograms": [{"histogram": {"Altered state of consciousness": 2, "Muscular weakness": 2, "Syncope": 2, "Abdominal pain": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "Sepsis": 1, "Vomiting": 1}, "batchcodes": ["006K21A_1110208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/006K21A_1110210.json b/docs/data/histograms/Taiwan, Province of China/006K21A_1110210.json
index f5e7f9dad34..a236a4d71f2 100644
--- a/docs/data/histograms/Taiwan, Province of China/006K21A_1110210.json
+++ b/docs/data/histograms/Taiwan, Province of China/006K21A_1110210.json
@@ -1 +1 @@
-{"batchcode": "006K21A_1110210", "histograms": [{"batchcodes": ["006K21A_1110210"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Consciousness fluctuating": 1, "Dyspnoea": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "006K21A_1110210", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Consciousness fluctuating": 1, "Dyspnoea": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Vomiting": 1}, "batchcodes": ["006K21A_1110210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/006K21A_1110214.json b/docs/data/histograms/Taiwan, Province of China/006K21A_1110214.json
index a93962a40e3..e92db967cd8 100644
--- a/docs/data/histograms/Taiwan, Province of China/006K21A_1110214.json
+++ b/docs/data/histograms/Taiwan, Province of China/006K21A_1110214.json
@@ -1 +1 @@
-{"batchcode": "006K21A_1110214", "histograms": [{"batchcodes": ["006K21A_1110214"], "histogram": {"Chest pain": 2, "Dyspnoea": 2, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Death": 1, "Headache": 1, "Heart rate": 1, "Laboratory test": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Pancytopenia": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "006K21A_1110214", "histograms": [{"histogram": {"Chest pain": 2, "Dyspnoea": 2, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Coma scale": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Death": 1, "Headache": 1, "Heart rate": 1, "Laboratory test": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Pancytopenia": 1, "Respiratory rate": 1}, "batchcodes": ["006K21A_1110214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/019G21A-1101121.json b/docs/data/histograms/Taiwan, Province of China/019G21A-1101121.json
index afda8fed44b..b5cf62ad408 100644
--- a/docs/data/histograms/Taiwan, Province of China/019G21A-1101121.json
+++ b/docs/data/histograms/Taiwan, Province of China/019G21A-1101121.json
@@ -1 +1 @@
-{"batchcode": "019G21A-1101121", "histograms": [{"batchcodes": ["019G21A-1101121"], "histogram": {"Decreased appetite": 1, "Fatigue": 1, "Pyrexia": 1, "Sepsis": 1}}]}
\ No newline at end of file
+{"batchcode": "019G21A-1101121", "histograms": [{"histogram": {"Decreased appetite": 1, "Fatigue": 1, "Pyrexia": 1, "Sepsis": 1}, "batchcodes": ["019G21A-1101121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/019G21A.json b/docs/data/histograms/Taiwan, Province of China/019G21A.json
index 3b427827110..84cb0b00267 100644
--- a/docs/data/histograms/Taiwan, Province of China/019G21A.json
+++ b/docs/data/histograms/Taiwan, Province of China/019G21A.json
@@ -1 +1 @@
-{"batchcode": "019G21A", "histograms": [{"batchcodes": ["019G21A"], "histogram": {"Altered state of consciousness": 1, "Asthenia": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Lethargy": 1, "Lip swelling": 1, "Muscular weakness": 1, "Nephrotic syndrome": 1, "Pharyngeal swelling": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Swelling of eyelid": 1}}]}
\ No newline at end of file
+{"batchcode": "019G21A", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Asthenia": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Lethargy": 1, "Lip swelling": 1, "Muscular weakness": 1, "Nephrotic syndrome": 1, "Pharyngeal swelling": 1, "Productive cough": 1, "Pruritus": 1, "Rash": 1, "Swelling of eyelid": 1}, "batchcodes": ["019G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/019G21A_1101115.json b/docs/data/histograms/Taiwan, Province of China/019G21A_1101115.json
index 1f2bfbfd81e..a0e0b1fa5ba 100644
--- a/docs/data/histograms/Taiwan, Province of China/019G21A_1101115.json
+++ b/docs/data/histograms/Taiwan, Province of China/019G21A_1101115.json
@@ -1 +1 @@
-{"batchcode": "019G21A_1101115", "histograms": [{"batchcodes": ["019G21A_1101115"], "histogram": {"Pruritus": 3, "Pyrexia": 3, "Rash": 3, "Chest pain": 2, "Death": 2, "Headache": 2, "Abdominal pain": 1, "Asthma": 1, "Back pain": 1, "Blood pressure increased": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Glycosylated haemoglobin": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Muscular weakness": 1, "Myalgia": 1, "Palpitations": 1, "Peripheral swelling": 1, "Sudden cardiac death": 1}}]}
\ No newline at end of file
+{"batchcode": "019G21A_1101115", "histograms": [{"histogram": {"Pruritus": 3, "Pyrexia": 3, "Rash": 3, "Chest pain": 2, "Death": 2, "Headache": 2, "Abdominal pain": 1, "Asthma": 1, "Back pain": 1, "Blood pressure increased": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Facial paralysis": 1, "Glycosylated haemoglobin": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Muscular weakness": 1, "Myalgia": 1, "Palpitations": 1, "Peripheral swelling": 1, "Sudden cardiac death": 1}, "batchcodes": ["019G21A_1101115"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/019G21A_1101121.json b/docs/data/histograms/Taiwan, Province of China/019G21A_1101121.json
index 07df006f10a..e4a3078cade 100644
--- a/docs/data/histograms/Taiwan, Province of China/019G21A_1101121.json
+++ b/docs/data/histograms/Taiwan, Province of China/019G21A_1101121.json
@@ -1 +1 @@
-{"batchcode": "019G21A_1101121", "histograms": [{"batchcodes": ["019G21A_1101121"], "histogram": {"Alopecia": 1, "Chills": 1, "Death": 1, "Dysarthria": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Syncope": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "019G21A_1101121", "histograms": [{"histogram": {"Alopecia": 1, "Chills": 1, "Death": 1, "Dysarthria": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Syncope": 1, "Visual impairment": 1}, "batchcodes": ["019G21A_1101121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/030M21-2A_11105.json b/docs/data/histograms/Taiwan, Province of China/030M21-2A_11105.json
index 9899441821f..e486864b3fc 100644
--- a/docs/data/histograms/Taiwan, Province of China/030M21-2A_11105.json
+++ b/docs/data/histograms/Taiwan, Province of China/030M21-2A_11105.json
@@ -1 +1 @@
-{"batchcode": "030M21-2A_11105", "histograms": [{"batchcodes": ["030M21-2A_11105"], "histogram": {"Alanine aminotransferase": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Coma scale": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Heart rate": 1, "Hemiplegia": 1, "Hypoaesthesia": 1, "Lymphocyte count": 1, "Muscular weakness": 1, "Nausea": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pyrexia": 1, "Respiratory rate": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "030M21-2A_11105", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Coma scale": 1, "Diarrhoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Heart rate": 1, "Hemiplegia": 1, "Hypoaesthesia": 1, "Lymphocyte count": 1, "Muscular weakness": 1, "Nausea": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pyrexia": 1, "Respiratory rate": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["030M21-2A_11105"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/048M21A_1110427.json b/docs/data/histograms/Taiwan, Province of China/048M21A_1110427.json
index ab1a9826434..9a750256490 100644
--- a/docs/data/histograms/Taiwan, Province of China/048M21A_1110427.json
+++ b/docs/data/histograms/Taiwan, Province of China/048M21A_1110427.json
@@ -1 +1 @@
-{"batchcode": "048M21A_1110427", "histograms": [{"batchcodes": ["048M21A_1110427"], "histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Headache": 2, "Anti-platelet factor 4 antibody test": 1, "Blood creatine phosphokinase MB": 1, "Brain natriuretic peptide": 1, "Cerebral thrombosis": 1, "Chest X-ray": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eyelid oedema": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Nausea": 1, "Oxygen saturation": 1, "Physical examination": 1, "Pyrexia": 1, "Respiratory rate": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "048M21A_1110427", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Headache": 2, "Anti-platelet factor 4 antibody test": 1, "Blood creatine phosphokinase MB": 1, "Brain natriuretic peptide": 1, "Cerebral thrombosis": 1, "Chest X-ray": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eyelid oedema": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Nausea": 1, "Oxygen saturation": 1, "Physical examination": 1, "Pyrexia": 1, "Respiratory rate": 1, "Troponin I": 1}, "batchcodes": ["048M21A_1110427"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/048M21A_1110504.json b/docs/data/histograms/Taiwan, Province of China/048M21A_1110504.json
index 48a3cbfd6d2..6ff14a3fc14 100644
--- a/docs/data/histograms/Taiwan, Province of China/048M21A_1110504.json
+++ b/docs/data/histograms/Taiwan, Province of China/048M21A_1110504.json
@@ -1 +1 @@
-{"batchcode": "048M21A_1110504", "histograms": [{"batchcodes": ["048M21A_1110504"], "histogram": {"Blood bilirubin": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Breath sounds": 1, "Chest scan": 1, "Coma scale": 1, "Death": 1, "Heart rate": 1, "Laboratory test": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory rate": 1, "Thrombocytopenia": 1, "Urinary system X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "048M21A_1110504", "histograms": [{"histogram": {"Blood bilirubin": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Breath sounds": 1, "Chest scan": 1, "Coma scale": 1, "Death": 1, "Heart rate": 1, "Laboratory test": 1, "Muscular weakness": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory rate": 1, "Thrombocytopenia": 1, "Urinary system X-ray": 1}, "batchcodes": ["048M21A_1110504"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/048M21A_1110509.json b/docs/data/histograms/Taiwan, Province of China/048M21A_1110509.json
index 14cf8dfde06..4da1c06bdc5 100644
--- a/docs/data/histograms/Taiwan, Province of China/048M21A_1110509.json
+++ b/docs/data/histograms/Taiwan, Province of China/048M21A_1110509.json
@@ -1 +1 @@
-{"batchcode": "048M21A_1110509", "histograms": [{"batchcodes": ["048M21A_1110509"], "histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Coma scale": 2, "Heart rate": 2, "Lymphocyte count": 2, "Nausea": 2, "Neutrophil count": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Respiratory rate": 2, "Vomiting": 2, "White blood cell count": 2, "Abdominal X-ray": 1, "Abdominal pain": 1, "Blood urea": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chills": 1, "Dizziness": 1, "Dysuria": 1, "Electrocardiogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Guillain-Barre syndrome": 1, "Platelet count": 1, "Pneumonia": 1, "Pollakiuria": 1, "Syncope": 1, "Ultrasound abdomen": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "048M21A_1110509", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Coma scale": 2, "Heart rate": 2, "Lymphocyte count": 2, "Nausea": 2, "Neutrophil count": 2, "Oxygen saturation": 2, "Pyrexia": 2, "Respiratory rate": 2, "Vomiting": 2, "White blood cell count": 2, "Abdominal X-ray": 1, "Abdominal pain": 1, "Blood urea": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chills": 1, "Dizziness": 1, "Dysuria": 1, "Electrocardiogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Guillain-Barre syndrome": 1, "Platelet count": 1, "Pneumonia": 1, "Pollakiuria": 1, "Syncope": 1, "Ultrasound abdomen": 1, "Vaccination site pain": 1}, "batchcodes": ["048M21A_1110509"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/048M21A_1110512.json b/docs/data/histograms/Taiwan, Province of China/048M21A_1110512.json
index 132961d87be..eaf9bf79b74 100644
--- a/docs/data/histograms/Taiwan, Province of China/048M21A_1110512.json
+++ b/docs/data/histograms/Taiwan, Province of China/048M21A_1110512.json
@@ -1 +1 @@
-{"batchcode": "048M21A_1110512", "histograms": [{"batchcodes": ["048M21A_1110512"], "histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Heart rate": 1, "Muscular weakness": 1, "Nausea": 1, "Oxygen saturation": 1, "Pupillary light reflex tests": 1, "Respiratory rate": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "048M21A_1110512", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Heart rate": 1, "Muscular weakness": 1, "Nausea": 1, "Oxygen saturation": 1, "Pupillary light reflex tests": 1, "Respiratory rate": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["048M21A_1110512"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/048M21A_1110517.json b/docs/data/histograms/Taiwan, Province of China/048M21A_1110517.json
index 3f327a57a14..bf334703f7e 100644
--- a/docs/data/histograms/Taiwan, Province of China/048M21A_1110517.json
+++ b/docs/data/histograms/Taiwan, Province of China/048M21A_1110517.json
@@ -1 +1 @@
-{"batchcode": "048M21A_1110517", "histograms": [{"batchcodes": ["048M21A_1110517"], "histogram": {"Alopecia": 1, "Death": 1}}]}
\ No newline at end of file
+{"batchcode": "048M21A_1110517", "histograms": [{"histogram": {"Alopecia": 1, "Death": 1}, "batchcodes": ["048M21A_1110517"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/048M21A_1110519.json b/docs/data/histograms/Taiwan, Province of China/048M21A_1110519.json
index 9843ba24197..dbb6d47b476 100644
--- a/docs/data/histograms/Taiwan, Province of China/048M21A_1110519.json
+++ b/docs/data/histograms/Taiwan, Province of China/048M21A_1110519.json
@@ -1 +1 @@
-{"batchcode": "048M21A_1110519", "histograms": [{"batchcodes": ["048M21A_1110519"], "histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Chest X-ray": 2, "Dizziness": 2, "Electrocardiogram": 2, "Heart rate": 2, "Respiratory rate": 2, "Anti-platelet factor 4 antibody test": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Death": 1, "Discomfort": 1, "Dysarthria": 1, "Echocardiogram": 1, "Headache": 1, "Lymphocyte count": 1, "Muscular weakness": 1, "Myalgia": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Physical examination": 1, "Scan myocardial perfusion": 1, "Troponin I": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "048M21A_1110519", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Chest X-ray": 2, "Dizziness": 2, "Electrocardiogram": 2, "Heart rate": 2, "Respiratory rate": 2, "Anti-platelet factor 4 antibody test": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Death": 1, "Discomfort": 1, "Dysarthria": 1, "Echocardiogram": 1, "Headache": 1, "Lymphocyte count": 1, "Muscular weakness": 1, "Myalgia": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Physical examination": 1, "Scan myocardial perfusion": 1, "Troponin I": 1, "White blood cell count": 1}, "batchcodes": ["048M21A_1110519"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/050F21A-1110124.json b/docs/data/histograms/Taiwan, Province of China/050F21A-1110124.json
index 58acf4c7981..052f5b9d7c4 100644
--- a/docs/data/histograms/Taiwan, Province of China/050F21A-1110124.json
+++ b/docs/data/histograms/Taiwan, Province of China/050F21A-1110124.json
@@ -1 +1 @@
-{"batchcode": "050F21A-1110124", "histograms": [{"batchcodes": ["050F21A-1110124"], "histogram": {"Apnoea": 1, "Cardiac arrest": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "050F21A-1110124", "histograms": [{"histogram": {"Apnoea": 1, "Cardiac arrest": 1, "Loss of consciousness": 1}, "batchcodes": ["050F21A-1110124"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/050F21A.json b/docs/data/histograms/Taiwan, Province of China/050F21A.json
index 6b913b85012..fe9933140eb 100644
--- a/docs/data/histograms/Taiwan, Province of China/050F21A.json
+++ b/docs/data/histograms/Taiwan, Province of China/050F21A.json
@@ -1 +1 @@
-{"batchcode": "050F21A", "histograms": [{"batchcodes": ["050F21A"], "histogram": {"Adverse reaction": 1, "Altered state of consciousness": 1, "Brain stem haemorrhage": 1, "Cardiac arrest": 1, "Chest pain": 1, "Chills": 1, "Coronary artery disease": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Muscular weakness": 1, "Pulmonary thrombosis": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "050F21A", "histograms": [{"histogram": {"Adverse reaction": 1, "Altered state of consciousness": 1, "Brain stem haemorrhage": 1, "Cardiac arrest": 1, "Chest pain": 1, "Chills": 1, "Coronary artery disease": 1, "Headache": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Muscular weakness": 1, "Pulmonary thrombosis": 1, "Syncope": 1}, "batchcodes": ["050F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/050F21A_1110121.json b/docs/data/histograms/Taiwan, Province of China/050F21A_1110121.json
index cfbdef07736..4eacd947ba5 100644
--- a/docs/data/histograms/Taiwan, Province of China/050F21A_1110121.json
+++ b/docs/data/histograms/Taiwan, Province of China/050F21A_1110121.json
@@ -1 +1 @@
-{"batchcode": "050F21A_1110121", "histograms": [{"batchcodes": ["050F21A_1110121"], "histogram": {"Computerised tomogram": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Neurological examination": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "050F21A_1110121", "histograms": [{"histogram": {"Computerised tomogram": 1, "Lumbar puncture": 1, "Magnetic resonance imaging": 1, "Neurological examination": 1, "Seizure": 1}, "batchcodes": ["050F21A_1110121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/050F21A_1110124.json b/docs/data/histograms/Taiwan, Province of China/050F21A_1110124.json
index dc0eeb08992..33f867343da 100644
--- a/docs/data/histograms/Taiwan, Province of China/050F21A_1110124.json
+++ b/docs/data/histograms/Taiwan, Province of China/050F21A_1110124.json
@@ -1 +1 @@
-{"batchcode": "050F21A_1110124", "histograms": [{"batchcodes": ["050F21A_1110124"], "histogram": {"Muscular weakness": 5, "Altered state of consciousness": 4, "Dyspnoea": 4, "Pyrexia": 3, "Vomiting": 3, "Abdominal pain": 2, "Chest pain": 2, "Decreased appetite": 2, "Fatigue": 2, "Pruritus": 2, "Rash": 2, "Syncope": 2, "Abscess": 1, "Alopecia": 1, "Asthma": 1, "Back pain": 1, "Burning sensation": 1, "Cellulitis": 1, "Chest discomfort": 1, "Chills": 1, "Electrocardiogram": 1, "Headache": 1, "Hepatitis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Somnolence": 1, "Tremor": 1, "Troponin I": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "050F21A_1110124", "histograms": [{"histogram": {"Muscular weakness": 5, "Altered state of consciousness": 4, "Dyspnoea": 4, "Pyrexia": 3, "Vomiting": 3, "Abdominal pain": 2, "Chest pain": 2, "Decreased appetite": 2, "Fatigue": 2, "Pruritus": 2, "Rash": 2, "Syncope": 2, "Abscess": 1, "Alopecia": 1, "Asthma": 1, "Back pain": 1, "Burning sensation": 1, "Cellulitis": 1, "Chest discomfort": 1, "Chills": 1, "Electrocardiogram": 1, "Headache": 1, "Hepatitis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Somnolence": 1, "Tremor": 1, "Troponin I": 1, "Wheezing": 1}, "batchcodes": ["050F21A_1110124"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A, 110122.json b/docs/data/histograms/Taiwan, Province of China/072F21A, 110122.json
index a314f003a12..1a7739344b1 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A, 110122.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A, 110122.json
@@ -1 +1 @@
-{"batchcode": "072F21A, 110122", "histograms": [{"batchcodes": ["072F21A, 110122"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A, 110122", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["072F21A, 110122"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A-1101207.json b/docs/data/histograms/Taiwan, Province of China/072F21A-1101207.json
index 98da6868cc8..468c99bee28 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A-1101207.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A-1101207.json
@@ -1 +1 @@
-{"batchcode": "072F21A-1101207", "histograms": [{"batchcodes": ["072F21A-1101207"], "histogram": {"Altered state of consciousness": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A-1101207", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Chest discomfort": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Muscular weakness": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["072F21A-1101207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A-1110112.json b/docs/data/histograms/Taiwan, Province of China/072F21A-1110112.json
index 654c7ce0752..3b5013b31a5 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A-1110112.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A-1110112.json
@@ -1 +1 @@
-{"batchcode": "072F21A-1110112", "histograms": [{"batchcodes": ["072F21A-1110112"], "histogram": {"Fall": 1, "Liver function test": 1, "Muscular weakness": 1, "SARS-CoV-2 test": 1, "Tic": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A-1110112", "histograms": [{"histogram": {"Fall": 1, "Liver function test": 1, "Muscular weakness": 1, "SARS-CoV-2 test": 1, "Tic": 1, "Tremor": 1}, "batchcodes": ["072F21A-1110112"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A-1110117.json b/docs/data/histograms/Taiwan, Province of China/072F21A-1110117.json
index 591ed32bac7..9b389c27dc6 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A-1110117.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A-1110117.json
@@ -1 +1 @@
-{"batchcode": "072F21A-1110117", "histograms": [{"batchcodes": ["072F21A-1110117"], "histogram": {"Blood pressure measurement": 1, "Coma scale": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A-1110117", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Coma scale": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Pulmonary embolism": 1}, "batchcodes": ["072F21A-1110117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A-1110129.json b/docs/data/histograms/Taiwan, Province of China/072F21A-1110129.json
index 83bfc2bef4d..06468a1ca9f 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A-1110129.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A-1110129.json
@@ -1 +1 @@
-{"batchcode": "072F21A-1110129", "histograms": [{"batchcodes": ["072F21A-1110129"], "histogram": {"Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A-1110129", "histograms": [{"histogram": {"Wheezing": 1}, "batchcodes": ["072F21A-1110129"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A.json b/docs/data/histograms/Taiwan, Province of China/072F21A.json
index 335349ec68f..30e7212dcf6 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A.json
@@ -1 +1 @@
-{"batchcode": "072F21A", "histograms": [{"batchcodes": ["072F21A"], "histogram": {"Hypersensitivity": 2, "Myalgia": 2, "Asthma": 1, "Chest pain": 1, "Headache": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Nausea": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A", "histograms": [{"histogram": {"Hypersensitivity": 2, "Myalgia": 2, "Asthma": 1, "Chest pain": 1, "Headache": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Nausea": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["072F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1100121.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1100121.json
index 5aa7172b1be..34dbf822cda 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1100121.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1100121.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1100121", "histograms": [{"batchcodes": ["072F21A_1100121"], "histogram": {"Nausea": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1100121", "histograms": [{"histogram": {"Nausea": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["072F21A_1100121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1101207.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1101207.json
index cbd1e8250ad..316e51895e2 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1101207.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1101207.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1101207", "histograms": [{"batchcodes": ["072F21A_1101207"], "histogram": {"Pyrexia": 2, "Abdominal pain": 1, "Altered state of consciousness": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Facial paralysis": 1, "Leukocytosis": 1, "Neutrophilia": 1, "Pain": 1, "Paraesthesia": 1, "Seizure": 1, "Thrombocytopenia": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1101207", "histograms": [{"histogram": {"Pyrexia": 2, "Abdominal pain": 1, "Altered state of consciousness": 1, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Facial paralysis": 1, "Leukocytosis": 1, "Neutrophilia": 1, "Pain": 1, "Paraesthesia": 1, "Seizure": 1, "Thrombocytopenia": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["072F21A_1101207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1101209.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1101209.json
index 4a81ae58a89..86ac90ea888 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1101209.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1101209.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1101209", "histograms": [{"batchcodes": ["072F21A_1101209"], "histogram": {"Anti-platelet factor 4 antibody test": 1, "Chest X-ray": 1, "Death": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1101209", "histograms": [{"histogram": {"Anti-platelet factor 4 antibody test": 1, "Chest X-ray": 1, "Death": 1}, "batchcodes": ["072F21A_1101209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1101212.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1101212.json
index 4e0cfc31be6..5343d0cef2c 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1101212.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1101212.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1101212", "histograms": [{"batchcodes": ["072F21A_1101212"], "histogram": {"Myocarditis": 3, "Headache": 2, "Pain in extremity": 2, "Death": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1101212", "histograms": [{"histogram": {"Myocarditis": 3, "Headache": 2, "Pain in extremity": 2, "Death": 1, "Fatigue": 1}, "batchcodes": ["072F21A_1101212"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1101221.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1101221.json
index a674206dce6..25695c70415 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1101221.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1101221.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1101221", "histograms": [{"batchcodes": ["072F21A_1101221"], "histogram": {"Chest pain": 1, "Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1101221", "histograms": [{"histogram": {"Chest pain": 1, "Muscle spasms": 1}, "batchcodes": ["072F21A_1101221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1110112.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1110112.json
index 006c344126a..476c658f0f2 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1110112.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1110112.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1110112", "histograms": [{"batchcodes": ["072F21A_1110112"], "histogram": {"Headache": 2, "Rash": 2, "Blood test": 1, "Chest pain": 1, "Decreased appetite": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Nausea": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1110112", "histograms": [{"histogram": {"Headache": 2, "Rash": 2, "Blood test": 1, "Chest pain": 1, "Decreased appetite": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Nausea": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["072F21A_1110112"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1110117.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1110117.json
index cc6909d6e24..dd4a39a1dd4 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1110117.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1110117.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1110117", "histograms": [{"batchcodes": ["072F21A_1110117"], "histogram": {"Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1110117", "histograms": [{"histogram": {"Lymphadenopathy": 1}, "batchcodes": ["072F21A_1110117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1110119.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1110119.json
index d9d0335f46e..7dcd883441c 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1110119.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1110119.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1110119", "histograms": [{"batchcodes": ["072F21A_1110119"], "histogram": {"Chest pain": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1110119", "histograms": [{"histogram": {"Chest pain": 1, "Syncope": 1}, "batchcodes": ["072F21A_1110119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/072F21A_1110129.json b/docs/data/histograms/Taiwan, Province of China/072F21A_1110129.json
index 84d14623e2a..ec0f6d079b4 100644
--- a/docs/data/histograms/Taiwan, Province of China/072F21A_1110129.json
+++ b/docs/data/histograms/Taiwan, Province of China/072F21A_1110129.json
@@ -1 +1 @@
-{"batchcode": "072F21A_1110129", "histograms": [{"batchcodes": ["072F21A_1110129"], "histogram": {"Abdominal pain": 1, "Atrial flutter": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Jaundice": 1, "Muscular weakness": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "072F21A_1110129", "histograms": [{"histogram": {"Abdominal pain": 1, "Atrial flutter": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Jaundice": 1, "Muscular weakness": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["072F21A_1110129"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/082F21-CDC.json b/docs/data/histograms/Taiwan, Province of China/082F21-CDC.json
index a3d99c358ea..958bcb6d25e 100644
--- a/docs/data/histograms/Taiwan, Province of China/082F21-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/082F21-CDC.json
@@ -1 +1 @@
-{"batchcode": "082F21-CDC", "histograms": [{"batchcodes": ["082F21-CDC"], "histogram": {"Cerebral haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "082F21-CDC", "histograms": [{"histogram": {"Cerebral haemorrhage": 1}, "batchcodes": ["082F21-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/082F210B.json b/docs/data/histograms/Taiwan, Province of China/082F210B.json
index c9b8caead56..867b1f18fd1 100644
--- a/docs/data/histograms/Taiwan, Province of China/082F210B.json
+++ b/docs/data/histograms/Taiwan, Province of China/082F210B.json
@@ -1 +1 @@
-{"batchcode": "082F210B", "histograms": [{"batchcodes": ["082F210B"], "histogram": {"Cerebrovascular accident": 1}}]}
\ No newline at end of file
+{"batchcode": "082F210B", "histograms": [{"histogram": {"Cerebrovascular accident": 1}, "batchcodes": ["082F210B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/082F218-CDC.json b/docs/data/histograms/Taiwan, Province of China/082F218-CDC.json
index c0167f9faed..e13d10f5b34 100644
--- a/docs/data/histograms/Taiwan, Province of China/082F218-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/082F218-CDC.json
@@ -1 +1 @@
-{"batchcode": "082F218-CDC", "histograms": [{"batchcodes": ["082F218-CDC"], "histogram": {"Altered state of consciousness": 1, "Deep vein thrombosis": 1, "Eye swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "082F218-CDC", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Deep vein thrombosis": 1, "Eye swelling": 1}, "batchcodes": ["082F218-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/082F21B-CDC.json b/docs/data/histograms/Taiwan, Province of China/082F21B-CDC.json
index 0b87a86dd43..3f89169ba88 100644
--- a/docs/data/histograms/Taiwan, Province of China/082F21B-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/082F21B-CDC.json
@@ -1 +1 @@
-{"batchcode": "082F21B-CDC", "histograms": [{"batchcodes": ["082F21B-CDC"], "histogram": {"Facial paralysis": 3, "Pyrexia": 3, "Death": 2, "Dyspnoea": 2, "Headache": 2, "Muscular weakness": 2, "Pruritus": 2, "Rash": 2, "Thrombocytopenia": 2, "Abscess": 1, "Asthenia": 1, "Blindness": 1, "Body temperature": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Gait disturbance": 1, "Hepatitis": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Ischaemic stroke": 1, "Liver function test": 1, "Loss of consciousness": 1, "Myalgia": 1, "Myocarditis": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Respiratory failure": 1, "Stillbirth": 1, "Syncope": 1, "Vein disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "082F21B-CDC", "histograms": [{"histogram": {"Facial paralysis": 3, "Pyrexia": 3, "Death": 2, "Dyspnoea": 2, "Headache": 2, "Muscular weakness": 2, "Pruritus": 2, "Rash": 2, "Thrombocytopenia": 2, "Abscess": 1, "Asthenia": 1, "Blindness": 1, "Body temperature": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Chest pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Gait disturbance": 1, "Hepatitis": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Ischaemic stroke": 1, "Liver function test": 1, "Loss of consciousness": 1, "Myalgia": 1, "Myocarditis": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral swelling": 1, "Pleural effusion": 1, "Respiratory failure": 1, "Stillbirth": 1, "Syncope": 1, "Vein disorder": 1, "Vomiting": 1}, "batchcodes": ["082F21B-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/082F21B.json b/docs/data/histograms/Taiwan, Province of China/082F21B.json
index c9ee8c70ba1..d7a89880ead 100644
--- a/docs/data/histograms/Taiwan, Province of China/082F21B.json
+++ b/docs/data/histograms/Taiwan, Province of China/082F21B.json
@@ -1 +1 @@
-{"batchcode": "082F21B", "histograms": [{"batchcodes": ["082F21B"], "histogram": {"Death": 2, "Dizziness": 2, "Arthralgia": 1, "Atrial fibrillation": 1, "Body temperature": 1, "Chest pain": 1, "Computerised tomogram": 1, "Contusion": 1, "Dyspnoea": 1, "Encephalitis": 1, "Fall": 1, "Fatigue": 1, "Lung disorder": 1, "Neuralgia": 1, "Pain": 1, "Palpitations": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Sepsis": 1, "Syncope": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Vertigo": 1, "Vomiting": 1, "X-ray": 1, "pH urine": 1}}]}
\ No newline at end of file
+{"batchcode": "082F21B", "histograms": [{"histogram": {"Death": 2, "Dizziness": 2, "Arthralgia": 1, "Atrial fibrillation": 1, "Body temperature": 1, "Chest pain": 1, "Computerised tomogram": 1, "Contusion": 1, "Dyspnoea": 1, "Encephalitis": 1, "Fall": 1, "Fatigue": 1, "Lung disorder": 1, "Neuralgia": 1, "Pain": 1, "Palpitations": 1, "Pyrexia": 1, "Rhabdomyolysis": 1, "Rhinorrhoea": 1, "Sepsis": 1, "Syncope": 1, "Thrombosis with thrombocytopenia syndrome": 1, "Vertigo": 1, "Vomiting": 1, "X-ray": 1, "pH urine": 1}, "batchcodes": ["082F21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/091G21A_1101115.json b/docs/data/histograms/Taiwan, Province of China/091G21A_1101115.json
index 3ad591824b6..248ad67a29c 100644
--- a/docs/data/histograms/Taiwan, Province of China/091G21A_1101115.json
+++ b/docs/data/histograms/Taiwan, Province of China/091G21A_1101115.json
@@ -1 +1 @@
-{"batchcode": "091G21A_1101115", "histograms": [{"batchcodes": ["091G21A_1101115"], "histogram": {"Nausea": 1, "Palpitations": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "091G21A_1101115", "histograms": [{"histogram": {"Nausea": 1, "Palpitations": 1, "Vomiting": 1}, "batchcodes": ["091G21A_1101115"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/11061A_1101224.json b/docs/data/histograms/Taiwan, Province of China/11061A_1101224.json
index 8d4761f5e22..3c7e077b921 100644
--- a/docs/data/histograms/Taiwan, Province of China/11061A_1101224.json
+++ b/docs/data/histograms/Taiwan, Province of China/11061A_1101224.json
@@ -1 +1 @@
-{"batchcode": "11061A_1101224", "histograms": [{"batchcodes": ["11061A_1101224"], "histogram": {"Abnormal weight gain": 1, "Arrhythmia": 1, "Asthenia": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Ejection fraction": 1, "Hepatic function abnormal": 1, "Liver function test": 1, "Oedema peripheral": 1, "Pleural effusion": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "11061A_1101224", "histograms": [{"histogram": {"Abnormal weight gain": 1, "Arrhythmia": 1, "Asthenia": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Ejection fraction": 1, "Hepatic function abnormal": 1, "Liver function test": 1, "Oedema peripheral": 1, "Pleural effusion": 1, "Weight": 1}, "batchcodes": ["11061A_1101224"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/11063A.json b/docs/data/histograms/Taiwan, Province of China/11063A.json
index b150f397553..23f3e5331a1 100644
--- a/docs/data/histograms/Taiwan, Province of China/11063A.json
+++ b/docs/data/histograms/Taiwan, Province of China/11063A.json
@@ -1 +1 @@
-{"batchcode": "11063A", "histograms": [{"batchcodes": ["11063A"], "histogram": {"Angiogram": 1, "Body mass index": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Electrocardiogram": 1, "Embolic cerebral infarction": 1, "Endoscopy": 1, "Fatigue": 1, "Hemiparesis": 1, "Hemiplegia": 1, "High density lipoprotein": 1, "Hypoaesthesia": 1, "Investigation": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "NIH stroke scale": 1, "Ophthalmological examination": 1, "Pupillary light reflex tests": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Transcranial electrical motor evoked potential monitoring": 1, "Transient ischaemic attack": 1, "Troponin T": 1, "Ultrasonic angiogram": 1}}]}
\ No newline at end of file
+{"batchcode": "11063A", "histograms": [{"histogram": {"Angiogram": 1, "Body mass index": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Electrocardiogram": 1, "Embolic cerebral infarction": 1, "Endoscopy": 1, "Fatigue": 1, "Hemiparesis": 1, "Hemiplegia": 1, "High density lipoprotein": 1, "Hypoaesthesia": 1, "Investigation": 1, "Low density lipoprotein": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "NIH stroke scale": 1, "Ophthalmological examination": 1, "Pupillary light reflex tests": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Transcranial electrical motor evoked potential monitoring": 1, "Transient ischaemic attack": 1, "Troponin T": 1, "Ultrasonic angiogram": 1}, "batchcodes": ["11063A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/11069A.json b/docs/data/histograms/Taiwan, Province of China/11069A.json
index 731ef94a82f..a86d8435b77 100644
--- a/docs/data/histograms/Taiwan, Province of China/11069A.json
+++ b/docs/data/histograms/Taiwan, Province of China/11069A.json
@@ -1 +1 @@
-{"batchcode": "11069A", "histograms": [{"batchcodes": ["11069A"], "histogram": {"Angiogram": 1, "Blood fibrinogen": 1, "Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Platelet count": 1, "Thrombosis with thrombocytopenia syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "11069A", "histograms": [{"histogram": {"Angiogram": 1, "Blood fibrinogen": 1, "Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Platelet count": 1, "Thrombosis with thrombocytopenia syndrome": 1}, "batchcodes": ["11069A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/11071A-CDC.json b/docs/data/histograms/Taiwan, Province of China/11071A-CDC.json
index c9892e5b0f0..fd858778a49 100644
--- a/docs/data/histograms/Taiwan, Province of China/11071A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/11071A-CDC.json
@@ -1 +1 @@
-{"batchcode": "11071A-CDC", "histograms": [{"batchcodes": ["11071A-CDC"], "histogram": {"Antibody test": 1, "Overdose": 1, "Pleural effusion": 1}}]}
\ No newline at end of file
+{"batchcode": "11071A-CDC", "histograms": [{"histogram": {"Antibody test": 1, "Overdose": 1, "Pleural effusion": 1}, "batchcodes": ["11071A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1110408.json b/docs/data/histograms/Taiwan, Province of China/1110408.json
index a179c62eb0a..19102e22ab0 100644
--- a/docs/data/histograms/Taiwan, Province of China/1110408.json
+++ b/docs/data/histograms/Taiwan, Province of China/1110408.json
@@ -1 +1 @@
-{"batchcode": "1110408", "histograms": [{"batchcodes": ["1110408"], "histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Chest X-ray": 1, "Computerised tomogram abdomen": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Haemoglobin": 1, "Lymphocyte morphology abnormal": 1, "Neutrophil count": 1, "Physical examination": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Thrombocytopenia": 1, "Urine analysis": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1110408", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Chest X-ray": 1, "Computerised tomogram abdomen": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Haemoglobin": 1, "Lymphocyte morphology abnormal": 1, "Neutrophil count": 1, "Physical examination": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Thrombocytopenia": 1, "Urine analysis": 1, "White blood cell count": 1}, "batchcodes": ["1110408"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1G042A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1G042A-CDC.json
index 578bedffdae..fb8dac88692 100644
--- a/docs/data/histograms/Taiwan, Province of China/1G042A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1G042A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1G042A-CDC", "histograms": [{"batchcodes": ["1G042A-CDC"], "histogram": {"Electrocardiogram": 24, "Chest discomfort": 23, "Chest pain": 22, "Dizziness": 20, "Body temperature": 14, "Fatigue": 13, "Blood test": 11, "Dyspnoea": 11, "Nausea": 11, "Syncope": 11, "Vomiting": 11, "Blood pressure measurement": 10, "Heart rate": 9, "Pyrexia": 9, "Headache": 8, "Myocarditis": 8, "Muscular weakness": 7, "Decreased appetite": 6, "Physical examination": 6, "Asthenia": 5, "Dehydration": 5, "Hypoaesthesia": 5, "Pain in extremity": 5, "Palpitations": 5, "Somnolence": 5, "Arthralgia": 4, "Blood creatine phosphokinase": 4, "Diarrhoea": 4, "Echocardiogram": 4, "Myocardial necrosis marker": 4, "Oxygen saturation": 4, "Respiratory rate": 4, "Abdominal pain upper": 3, "Blood glucose": 3, "Chest X-ray": 3, "Cold sweat": 3, "Discomfort": 3, "Electroencephalogram": 3, "Hypertension": 3, "Hypotension": 3, "Investigation": 3, "Myalgia": 3, "Overdose": 3, "Respiration abnormal": 3, "Troponin I": 3, "X-ray": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Angina pectoris": 2, "Arrhythmia": 2, "Asthma": 2, "Blood creatine phosphokinase MB": 2, "Capillary nail refill test": 2, "Cardiac disorder": 2, "Central nervous system lesion": 2, "Computerised tomogram head": 2, "Ejection fraction": 2, "Facial paralysis": 2, "Fall": 2, "Fibrin D dimer": 2, "Magnetic resonance imaging": 2, "Oropharyngeal pain": 2, "Pericarditis": 2, "Pruritus": 2, "Rash": 2, "Tachycardia": 2, "Urine output": 2, "Abdomen scan": 1, "Abdominal discomfort": 1, "Activated partial thromboplastin time": 1, "Acute cutaneous lupus erythematosus": 1, "Anaemia": 1, "Appendix cancer": 1, "Atrioventricular block": 1, "Auscultation": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Carditis": 1, "Cerebral artery embolism": 1, "Chills": 1, "Coma scale": 1, "Coronary artery disease": 1, "Cough": 1, "Decreased activity": 1, "Directional Doppler flow tests": 1, "Electrocardiogram ambulatory": 1, "End stage renal disease": 1, "Endocarditis": 1, "Enteritis": 1, "Epilepsy": 1, "Epistaxis": 1, "Eye pain": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Haemorrhage": 1, "Halo vision": 1, "Heart rate decreased": 1, "Heart rate variability test": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Hypophagia": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Insomnia": 1, "Laboratory test": 1, "Lethargy": 1, "Lip swelling": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging head abnormal": 1, "Mechanical urticaria": 1, "Myocardial infarction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neck pain": 1, "Nervous system disorder": 1, "Pain": 1, "Painful respiration": 1, "Paraesthesia": 1, "Pharyngitis": 1, "Platelet count": 1, "Pneumonia": 1, "Pneumothorax": 1, "Pulmonary function test": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sinus bradycardia": 1, "Sleep disorder": 1, "Sudden death": 1, "Temperature intolerance": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Troponin T": 1, "Urine output decreased": 1, "Vaccination site pain": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "1G042A-CDC", "histograms": [{"histogram": {"Electrocardiogram": 24, "Chest discomfort": 23, "Chest pain": 22, "Dizziness": 20, "Body temperature": 14, "Fatigue": 13, "Blood test": 11, "Dyspnoea": 11, "Nausea": 11, "Syncope": 11, "Vomiting": 11, "Blood pressure measurement": 10, "Heart rate": 9, "Pyrexia": 9, "Headache": 8, "Myocarditis": 8, "Muscular weakness": 7, "Decreased appetite": 6, "Physical examination": 6, "Asthenia": 5, "Dehydration": 5, "Hypoaesthesia": 5, "Pain in extremity": 5, "Palpitations": 5, "Somnolence": 5, "Arthralgia": 4, "Blood creatine phosphokinase": 4, "Diarrhoea": 4, "Echocardiogram": 4, "Myocardial necrosis marker": 4, "Oxygen saturation": 4, "Respiratory rate": 4, "Abdominal pain upper": 3, "Blood glucose": 3, "Chest X-ray": 3, "Cold sweat": 3, "Discomfort": 3, "Electroencephalogram": 3, "Hypertension": 3, "Hypotension": 3, "Investigation": 3, "Myalgia": 3, "Overdose": 3, "Respiration abnormal": 3, "Troponin I": 3, "X-ray": 3, "Abdominal pain": 2, "Altered state of consciousness": 2, "Angina pectoris": 2, "Arrhythmia": 2, "Asthma": 2, "Blood creatine phosphokinase MB": 2, "Capillary nail refill test": 2, "Cardiac disorder": 2, "Central nervous system lesion": 2, "Computerised tomogram head": 2, "Ejection fraction": 2, "Facial paralysis": 2, "Fall": 2, "Fibrin D dimer": 2, "Magnetic resonance imaging": 2, "Oropharyngeal pain": 2, "Pericarditis": 2, "Pruritus": 2, "Rash": 2, "Tachycardia": 2, "Urine output": 2, "Abdomen scan": 1, "Abdominal discomfort": 1, "Activated partial thromboplastin time": 1, "Acute cutaneous lupus erythematosus": 1, "Anaemia": 1, "Appendix cancer": 1, "Atrioventricular block": 1, "Auscultation": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardio-respiratory arrest": 1, "Carditis": 1, "Cerebral artery embolism": 1, "Chills": 1, "Coma scale": 1, "Coronary artery disease": 1, "Cough": 1, "Decreased activity": 1, "Directional Doppler flow tests": 1, "Electrocardiogram ambulatory": 1, "End stage renal disease": 1, "Endocarditis": 1, "Enteritis": 1, "Epilepsy": 1, "Epistaxis": 1, "Eye pain": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Haemorrhage": 1, "Halo vision": 1, "Heart rate decreased": 1, "Heart rate variability test": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hyperventilation": 1, "Hypophagia": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Insomnia": 1, "Laboratory test": 1, "Lethargy": 1, "Lip swelling": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging head abnormal": 1, "Mechanical urticaria": 1, "Myocardial infarction": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neck pain": 1, "Nervous system disorder": 1, "Pain": 1, "Painful respiration": 1, "Paraesthesia": 1, "Pharyngitis": 1, "Platelet count": 1, "Pneumonia": 1, "Pneumothorax": 1, "Pulmonary function test": 1, "Renal impairment": 1, "Respiratory arrest": 1, "Respiratory failure": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sinus bradycardia": 1, "Sleep disorder": 1, "Sudden death": 1, "Temperature intolerance": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Troponin T": 1, "Urine output decreased": 1, "Vaccination site pain": 1, "Vital signs measurement": 1}, "batchcodes": ["1G042A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1G042A.json b/docs/data/histograms/Taiwan, Province of China/1G042A.json
index 32c461504fd..a1b9d13013d 100644
--- a/docs/data/histograms/Taiwan, Province of China/1G042A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1G042A.json
@@ -1 +1 @@
-{"batchcode": "1G042A", "histograms": [{"batchcodes": ["1G042A"], "histogram": {"Chest pain": 6, "Electrocardiogram": 5, "Blood creatine phosphokinase MB": 4, "Chest discomfort": 4, "Myocarditis": 4, "Pyrexia": 4, "Blood creatine phosphokinase": 3, "Body temperature": 3, "Echocardiogram": 3, "Headache": 3, "Pain": 3, "Pain in extremity": 3, "Blood creatine phosphokinase MB increased": 2, "Blood creatine phosphokinase increased": 2, "Blood test": 2, "Chest X-ray": 2, "Decreased appetite": 2, "Fatigue": 2, "Heart rate": 2, "Investigation": 2, "Myalgia": 2, "Troponin I": 2, "Troponin T": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asthma": 1, "Auscultation": 1, "Bacterial test": 1, "Blood calcium": 1, "Blood creatinine": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Chest scan": 1, "Confusional state": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Electrocardiogram ambulatory": 1, "Electromyogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gait inability": 1, "Heart rate abnormal": 1, "Hypoaesthesia": 1, "Incorrect route of product administration": 1, "Laboratory test": 1, "Lymphocyte percentage": 1, "Muscular weakness": 1, "Myocardial hypoxia": 1, "Neutrophil percentage": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pericarditis": 1, "Physical examination": 1, "Rash": 1, "Respiration abnormal": 1, "Respiratory symptom": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sinus arrhythmia": 1, "Troponin increased": 1, "Urine output": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1G042A", "histograms": [{"histogram": {"Chest pain": 6, "Electrocardiogram": 5, "Blood creatine phosphokinase MB": 4, "Chest discomfort": 4, "Myocarditis": 4, "Pyrexia": 4, "Blood creatine phosphokinase": 3, "Body temperature": 3, "Echocardiogram": 3, "Headache": 3, "Pain": 3, "Pain in extremity": 3, "Blood creatine phosphokinase MB increased": 2, "Blood creatine phosphokinase increased": 2, "Blood test": 2, "Chest X-ray": 2, "Decreased appetite": 2, "Fatigue": 2, "Heart rate": 2, "Investigation": 2, "Myalgia": 2, "Troponin I": 2, "Troponin T": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Asthma": 1, "Auscultation": 1, "Bacterial test": 1, "Blood calcium": 1, "Blood creatinine": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "Chest scan": 1, "Confusional state": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Electrocardiogram ambulatory": 1, "Electromyogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Gait inability": 1, "Heart rate abnormal": 1, "Hypoaesthesia": 1, "Incorrect route of product administration": 1, "Laboratory test": 1, "Lymphocyte percentage": 1, "Muscular weakness": 1, "Myocardial hypoxia": 1, "Neutrophil percentage": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pericarditis": 1, "Physical examination": 1, "Rash": 1, "Respiration abnormal": 1, "Respiratory symptom": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sinus arrhythmia": 1, "Troponin increased": 1, "Urine output": 1, "Vaccination site pain": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["1G042A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1G043A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1G043A-CDC.json
index a32a240cf89..e9637eeb4eb 100644
--- a/docs/data/histograms/Taiwan, Province of China/1G043A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1G043A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1G043A-CDC", "histograms": [{"batchcodes": ["1G043A-CDC"], "histogram": {"Chest discomfort": 14, "Chest pain": 14, "Pyrexia": 11, "Dyspnoea": 10, "Heart rate": 10, "Physical examination": 10, "Dizziness": 9, "Electrocardiogram": 9, "Palpitations": 9, "Blood pressure measurement": 8, "Body temperature": 8, "Headache": 7, "Syncope": 7, "Chest X-ray": 5, "Dehydration": 5, "Computerised tomogram head": 4, "Fatigue": 4, "Investigation": 4, "Oxygen saturation": 4, "Respiration abnormal": 4, "Respiratory rate": 4, "Vaccination site pain": 4, "Asthenia": 3, "Blood test": 3, "C-reactive protein": 3, "Coma scale": 3, "Diarrhoea": 3, "Electrocardiogram QT interval": 3, "Fibrin D dimer": 3, "Gastrooesophageal reflux disease": 3, "Muscular weakness": 3, "Abdominal pain": 2, "Abdominal pain upper": 2, "Arthralgia": 2, "Blood glucose": 2, "Cold sweat": 2, "Computerised tomogram thorax": 2, "Cough": 2, "Haemoglobin": 2, "Hypotension": 2, "Laboratory test": 2, "Myalgia": 2, "Myocarditis": 2, "Nausea": 2, "Pruritus": 2, "QRS axis": 2, "Rash": 2, "Sinus tachycardia": 2, "Ultrasound abdomen": 2, "Vomiting": 2, "White blood cell count": 2, "X-ray": 2, "5-alpha reductase inhibition therapy": 1, "Activated partial thromboplastin time": 1, "Acute sinusitis": 1, "Altered state of consciousness": 1, "Anal examination": 1, "Angina pectoris": 1, "Asthma": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Brain stem haemorrhage": 1, "Burkitt's lymphoma stage I": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Chronic gastritis": 1, "Computerised tomogram abdomen": 1, "Connective tissue disorder": 1, "Decreased appetite": 1, "Dengue virus test": 1, "Discomfort": 1, "Electrocardiogram QRS complex": 1, "Empyema": 1, "Epilepsy": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Gastroenteritis": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic cyst": 1, "Hepatic function abnormal": 1, "Hepatic steatosis": 1, "Hyperbilirubinaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Immune-mediated lung disease": 1, "Immune-mediated thyroiditis": 1, "Immunisation": 1, "Immunology test": 1, "Inflammation scan": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "International normalised ratio": 1, "Ischaemic stroke": 1, "Lethargy": 1, "Lower respiratory tract infection": 1, "Lung opacity": 1, "Lymphadenitis": 1, "Lymphoma": 1, "Malaise": 1, "Mass": 1, "Mean cell volume": 1, "Mediastinal disorder": 1, "Microbiology test": 1, "Microcytic anaemia": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal disorder": 1, "Myocardial necrosis marker": 1, "Nephrolithiasis": 1, "Neuralgia": 1, "Oesophagogastroduodenoscopy": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Pain": 1, "Pharyngeal erythema": 1, "Pleural effusion": 1, "Pleural thickening": 1, "Pneumonia viral": 1, "Pneumothorax": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary function test": 1, "Pustule": 1, "Rash maculo-papular": 1, "Respiratory disorder": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Seizure": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sleep disorder": 1, "Somnolence": 1, "Tachypnoea": 1, "Thrombocytopenia": 1, "Toothache": 1, "Tremor": 1, "Tumour marker test": 1, "Vasodilatation": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "1G043A-CDC", "histograms": [{"histogram": {"Chest discomfort": 14, "Chest pain": 14, "Pyrexia": 11, "Dyspnoea": 10, "Heart rate": 10, "Physical examination": 10, "Dizziness": 9, "Electrocardiogram": 9, "Palpitations": 9, "Blood pressure measurement": 8, "Body temperature": 8, "Headache": 7, "Syncope": 7, "Chest X-ray": 5, "Dehydration": 5, "Computerised tomogram head": 4, "Fatigue": 4, "Investigation": 4, "Oxygen saturation": 4, "Respiration abnormal": 4, "Respiratory rate": 4, "Vaccination site pain": 4, "Asthenia": 3, "Blood test": 3, "C-reactive protein": 3, "Coma scale": 3, "Diarrhoea": 3, "Electrocardiogram QT interval": 3, "Fibrin D dimer": 3, "Gastrooesophageal reflux disease": 3, "Muscular weakness": 3, "Abdominal pain": 2, "Abdominal pain upper": 2, "Arthralgia": 2, "Blood glucose": 2, "Cold sweat": 2, "Computerised tomogram thorax": 2, "Cough": 2, "Haemoglobin": 2, "Hypotension": 2, "Laboratory test": 2, "Myalgia": 2, "Myocarditis": 2, "Nausea": 2, "Pruritus": 2, "QRS axis": 2, "Rash": 2, "Sinus tachycardia": 2, "Ultrasound abdomen": 2, "Vomiting": 2, "White blood cell count": 2, "X-ray": 2, "5-alpha reductase inhibition therapy": 1, "Activated partial thromboplastin time": 1, "Acute sinusitis": 1, "Altered state of consciousness": 1, "Anal examination": 1, "Angina pectoris": 1, "Asthma": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood creatinine": 1, "Blood lactate dehydrogenase": 1, "Blood lactate dehydrogenase increased": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Brain stem haemorrhage": 1, "Burkitt's lymphoma stage I": 1, "Cerebral haemorrhage": 1, "Cerebral infarction": 1, "Chronic gastritis": 1, "Computerised tomogram abdomen": 1, "Connective tissue disorder": 1, "Decreased appetite": 1, "Dengue virus test": 1, "Discomfort": 1, "Electrocardiogram QRS complex": 1, "Empyema": 1, "Epilepsy": 1, "Fall": 1, "Feeling abnormal": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Gastroenteritis": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hepatic cyst": 1, "Hepatic function abnormal": 1, "Hepatic steatosis": 1, "Hyperbilirubinaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Immune-mediated lung disease": 1, "Immune-mediated thyroiditis": 1, "Immunisation": 1, "Immunology test": 1, "Inflammation scan": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "International normalised ratio": 1, "Ischaemic stroke": 1, "Lethargy": 1, "Lower respiratory tract infection": 1, "Lung opacity": 1, "Lymphadenitis": 1, "Lymphoma": 1, "Malaise": 1, "Mass": 1, "Mean cell volume": 1, "Mediastinal disorder": 1, "Microbiology test": 1, "Microcytic anaemia": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal disorder": 1, "Myocardial necrosis marker": 1, "Nephrolithiasis": 1, "Neuralgia": 1, "Oesophagogastroduodenoscopy": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "PO2": 1, "Pain": 1, "Pharyngeal erythema": 1, "Pleural effusion": 1, "Pleural thickening": 1, "Pneumonia viral": 1, "Pneumothorax": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary function test": 1, "Pustule": 1, "Rash maculo-papular": 1, "Respiratory disorder": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Seizure": 1, "Serum ferritin": 1, "Serum ferritin increased": 1, "Sleep disorder": 1, "Somnolence": 1, "Tachypnoea": 1, "Thrombocytopenia": 1, "Toothache": 1, "Tremor": 1, "Tumour marker test": 1, "Vasodilatation": 1, "Ventricular tachycardia": 1, "Vertigo": 1, "Wheezing": 1}, "batchcodes": ["1G043A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1G043A.json b/docs/data/histograms/Taiwan, Province of China/1G043A.json
index edcf5047e73..ee6c23079f5 100644
--- a/docs/data/histograms/Taiwan, Province of China/1G043A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1G043A.json
@@ -1 +1 @@
-{"batchcode": "1G043A", "histograms": [{"batchcodes": ["1G043A"], "histogram": {"Syncope": 5, "Blood pressure measurement": 4, "Chest discomfort": 3, "Heart rate": 3, "Hypotension": 3, "Dizziness": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Altered state of consciousness": 1, "Angina pectoris": 1, "Arteriosclerosis": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood test": 1, "Capillary nail refill test": 1, "Capillary nail refill test abnormal": 1, "Cerebral haemorrhage": 1, "Chest pain": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Drug hypersensitivity": 1, "Echocardiogram": 1, "Eczema": 1, "Exercise electrocardiogram": 1, "Feeling abnormal": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hyperlipidaemia": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Myocarditis": 1, "Neoplasm malignant": 1, "Overdose": 1, "Pain": 1, "Pain assessment": 1, "Palpitations": 1, "Platelet count": 1, "Rash": 1, "Seizure": 1, "Troponin": 1, "Ulcer": 1, "Underdose": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1G043A", "histograms": [{"histogram": {"Syncope": 5, "Blood pressure measurement": 4, "Chest discomfort": 3, "Heart rate": 3, "Hypotension": 3, "Dizziness": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Altered state of consciousness": 1, "Angina pectoris": 1, "Arteriosclerosis": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood test": 1, "Capillary nail refill test": 1, "Capillary nail refill test abnormal": 1, "Cerebral haemorrhage": 1, "Chest pain": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Drug hypersensitivity": 1, "Echocardiogram": 1, "Eczema": 1, "Exercise electrocardiogram": 1, "Feeling abnormal": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Hyperlipidaemia": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Myocarditis": 1, "Neoplasm malignant": 1, "Overdose": 1, "Pain": 1, "Pain assessment": 1, "Palpitations": 1, "Platelet count": 1, "Rash": 1, "Seizure": 1, "Troponin": 1, "Ulcer": 1, "Underdose": 1, "Vaccination site pain": 1}, "batchcodes": ["1G043A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1G043A/C1G043A/.json b/docs/data/histograms/Taiwan, Province of China/1G043A/C1G043A/.json
index 025db77c92c..91782f0e777 100644
--- a/docs/data/histograms/Taiwan, Province of China/1G043A/C1G043A/.json
+++ b/docs/data/histograms/Taiwan, Province of China/1G043A/C1G043A/.json
@@ -1 +1 @@
-{"batchcode": "1G043A/C1G043A/", "histograms": [{"batchcodes": ["1G043A/C1G043A/"], "histogram": {"Angiocardiogram": 1, "Back pain": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Lung infiltration": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Visual analogue scale": 1}}]}
\ No newline at end of file
+{"batchcode": "1G043A/C1G043A/", "histograms": [{"histogram": {"Angiocardiogram": 1, "Back pain": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram thorax": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Lung infiltration": 1, "Myocardial ischaemia": 1, "Myocardial necrosis marker": 1, "Visual analogue scale": 1}, "batchcodes": ["1G043A/C1G043A/"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1G059A_1101204.json b/docs/data/histograms/Taiwan, Province of China/1G059A_1101204.json
index c03be7d8b06..673ff46a500 100644
--- a/docs/data/histograms/Taiwan, Province of China/1G059A_1101204.json
+++ b/docs/data/histograms/Taiwan, Province of China/1G059A_1101204.json
@@ -1 +1 @@
-{"batchcode": "1G059A_1101204", "histograms": [{"batchcodes": ["1G059A_1101204"], "histogram": {"Abdominal pain": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Chest discomfort": 1, "Electrocardiogram": 1, "Inappropriate schedule of product administration": 1, "Myocarditis": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "1G059A_1101204", "histograms": [{"histogram": {"Abdominal pain": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Chest discomfort": 1, "Electrocardiogram": 1, "Inappropriate schedule of product administration": 1, "Myocarditis": 1, "Troponin I": 1}, "batchcodes": ["1G059A_1101204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H05-1A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1H05-1A-CDC.json
index 59129f5f986..2bb0074d937 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H05-1A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H05-1A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1H05-1A-CDC", "histograms": [{"batchcodes": ["1H05-1A-CDC"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Glossodynia": 1, "Hypoaesthesia oral": 1, "Lip pain": 1, "Palpitations": 1, "Tongue injury": 1, "Tongue paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "1H05-1A-CDC", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Glossodynia": 1, "Hypoaesthesia oral": 1, "Lip pain": 1, "Palpitations": 1, "Tongue injury": 1, "Tongue paralysis": 1}, "batchcodes": ["1H05-1A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H050A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1H050A-CDC.json
index cf928a8a4d3..ee519629da6 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H050A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H050A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1H050A-CDC", "histograms": [{"batchcodes": ["1H050A-CDC"], "histogram": {"Blood pressure measurement": 4, "Body temperature": 4, "Dizziness": 4, "Heart rate": 4, "Coma scale": 3, "Overdose": 3, "Respiratory rate": 3, "Chest discomfort": 2, "Electrocardiogram": 2, "Muscular weakness": 2, "Myalgia": 2, "Pain": 2, "Palpitations": 2, "Physical examination": 2, "Pyrexia": 2, "Syncope": 2, "Vaccination site pain": 2, "Vomiting": 2, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Blood test": 1, "C-reactive protein": 1, "Cellulitis": 1, "Chest pain": 1, "Computerised tomogram": 1, "Deafness": 1, "Death": 1, "Diarrhoea": 1, "Ear discomfort": 1, "Facial paralysis": 1, "Gait inability": 1, "Haemodialysis": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immune system disorder": 1, "Infection": 1, "Influenza": 1, "Investigation": 1, "Muscle spasms": 1, "Nausea": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Peripheral arterial occlusive disease": 1, "Rash pruritic": 1, "Scan": 1, "Shock": 1, "Tenosynovitis": 1, "Tinnitus": 1, "Trigeminal neuralgia": 1, "Urticaria": 1, "Vasculitis": 1, "Visual brightness": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1H050A-CDC", "histograms": [{"histogram": {"Blood pressure measurement": 4, "Body temperature": 4, "Dizziness": 4, "Heart rate": 4, "Coma scale": 3, "Overdose": 3, "Respiratory rate": 3, "Chest discomfort": 2, "Electrocardiogram": 2, "Muscular weakness": 2, "Myalgia": 2, "Pain": 2, "Palpitations": 2, "Physical examination": 2, "Pyrexia": 2, "Syncope": 2, "Vaccination site pain": 2, "Vomiting": 2, "Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure decreased": 1, "Blood test": 1, "C-reactive protein": 1, "Cellulitis": 1, "Chest pain": 1, "Computerised tomogram": 1, "Deafness": 1, "Death": 1, "Diarrhoea": 1, "Ear discomfort": 1, "Facial paralysis": 1, "Gait inability": 1, "Haemodialysis": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immune system disorder": 1, "Infection": 1, "Influenza": 1, "Investigation": 1, "Muscle spasms": 1, "Nausea": 1, "Neurological examination": 1, "Oedema peripheral": 1, "Pain in extremity": 1, "Peripheral arterial occlusive disease": 1, "Rash pruritic": 1, "Scan": 1, "Shock": 1, "Tenosynovitis": 1, "Tinnitus": 1, "Trigeminal neuralgia": 1, "Urticaria": 1, "Vasculitis": 1, "Visual brightness": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["1H050A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H050A.json b/docs/data/histograms/Taiwan, Province of China/1H050A.json
index 869123affd9..7d37e980624 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H050A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H050A.json
@@ -1 +1 @@
-{"batchcode": "1H050A", "histograms": [{"batchcodes": ["1H050A"], "histogram": {"Fatigue": 2, "Hypoaesthesia": 2, "Muscular weakness": 2, "Palpitations": 2, "Syncope": 2, "Allergy to vaccine": 1, "Allodynia": 1, "Arthralgia": 1, "Asthenia": 1, "Ataxia": 1, "Babinski reflex test": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Brain stem infarction": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Lip swelling": 1, "Nasopharyngitis": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neurological examination": 1, "Overdose": 1, "Pain": 1, "Paralysis": 1, "Peripheral nerve injury": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pulmonary fibrosis": 1, "Pupillary light reflex tests": 1, "Romberg test": 1, "Scan brain": 1, "Swelling of eyelid": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual field tests": 1}}]}
\ No newline at end of file
+{"batchcode": "1H050A", "histograms": [{"histogram": {"Fatigue": 2, "Hypoaesthesia": 2, "Muscular weakness": 2, "Palpitations": 2, "Syncope": 2, "Allergy to vaccine": 1, "Allodynia": 1, "Arthralgia": 1, "Asthenia": 1, "Ataxia": 1, "Babinski reflex test": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Brain stem infarction": 1, "Cerebral thrombosis": 1, "Cerebrovascular accident": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Lip swelling": 1, "Nasopharyngitis": 1, "Nerve conduction studies": 1, "Neuralgia": 1, "Neurological examination": 1, "Overdose": 1, "Pain": 1, "Paralysis": 1, "Peripheral nerve injury": 1, "Pharyngeal swelling": 1, "Physical examination": 1, "Pulmonary fibrosis": 1, "Pupillary light reflex tests": 1, "Romberg test": 1, "Scan brain": 1, "Swelling of eyelid": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual field tests": 1}, "batchcodes": ["1H050A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H051-1A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1H051-1A-CDC.json
index 84429b49a29..bc556aa6cdb 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H051-1A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H051-1A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1H051-1A-CDC", "histograms": [{"batchcodes": ["1H051-1A-CDC"], "histogram": {"Blood pressure measurement": 3, "Body temperature": 3, "Coma scale": 3, "Heart rate": 3, "Investigation": 3, "Muscular weakness": 3, "Blood pressure systolic": 2, "Blood test": 2, "Computerised tomogram head": 2, "Loss of consciousness": 2, "Oxygen saturation": 2, "Physical examination": 2, "Respiratory rate": 2, "Abnormal loss of weight": 1, "Alopecia areata": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Blood pressure increased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19 screening": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Fall": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Haemorrhage intracranial": 1, "Headache": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hypertension": 1, "Injury": 1, "Laboratory test": 1, "Leukocytosis": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Nephritis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Palpitations": 1, "Physical deconditioning": 1, "Rash pustular": 1, "Seizure": 1, "Urine analysis": 1, "Vomiting": 1, "Weight": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1H051-1A-CDC", "histograms": [{"histogram": {"Blood pressure measurement": 3, "Body temperature": 3, "Coma scale": 3, "Heart rate": 3, "Investigation": 3, "Muscular weakness": 3, "Blood pressure systolic": 2, "Blood test": 2, "Computerised tomogram head": 2, "Loss of consciousness": 2, "Oxygen saturation": 2, "Physical examination": 2, "Respiratory rate": 2, "Abnormal loss of weight": 1, "Alopecia areata": 1, "Altered state of consciousness": 1, "Arrhythmia": 1, "Blood pressure increased": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "COVID-19 screening": 1, "Cerebral infarction": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Fall": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Haemorrhage intracranial": 1, "Headache": 1, "Heart rate increased": 1, "Hemiplegia": 1, "Hypertension": 1, "Injury": 1, "Laboratory test": 1, "Leukocytosis": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Nephritis": 1, "Oropharyngeal pain": 1, "Pain": 1, "Palpitations": 1, "Physical deconditioning": 1, "Rash pustular": 1, "Seizure": 1, "Urine analysis": 1, "Vomiting": 1, "Weight": 1, "White blood cell count": 1}, "batchcodes": ["1H051-1A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H051A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1H051A-CDC.json
index 58b8071a465..a6cdc951c7a 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H051A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H051A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1H051A-CDC", "histograms": [{"batchcodes": ["1H051A-CDC"], "histogram": {"Chest pain": 3, "Chest discomfort": 2, "Computerised tomogram head": 2, "Dyspnoea": 2, "Fatigue": 2, "Physical examination": 2, "Vital signs measurement": 2, "Aortic intramural haematoma": 1, "Arrhythmia": 1, "Asthma": 1, "Blister": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Computerised tomogram aorta": 1, "Echocardiogram": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Nausea": 1, "Overdose": 1, "Platelet count": 1, "Pneumothorax": 1, "Pneumothorax spontaneous": 1, "Pyrexia": 1, "Rash": 1, "Respiration abnormal": 1, "Scan myocardial perfusion": 1, "Syncope": 1, "Transient global amnesia": 1, "Troponin I": 1, "Visual analogue scale": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1H051A-CDC", "histograms": [{"histogram": {"Chest pain": 3, "Chest discomfort": 2, "Computerised tomogram head": 2, "Dyspnoea": 2, "Fatigue": 2, "Physical examination": 2, "Vital signs measurement": 2, "Aortic intramural haematoma": 1, "Arrhythmia": 1, "Asthma": 1, "Blister": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Cerebral infarction": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Computerised tomogram aorta": 1, "Echocardiogram": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Investigation": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Nausea": 1, "Overdose": 1, "Platelet count": 1, "Pneumothorax": 1, "Pneumothorax spontaneous": 1, "Pyrexia": 1, "Rash": 1, "Respiration abnormal": 1, "Scan myocardial perfusion": 1, "Syncope": 1, "Transient global amnesia": 1, "Troponin I": 1, "Visual analogue scale": 1, "X-ray": 1}, "batchcodes": ["1H051A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H051A.json b/docs/data/histograms/Taiwan, Province of China/1H051A.json
index 1bef351a436..19df36a713f 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H051A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H051A.json
@@ -1 +1 @@
-{"batchcode": "1H051A", "histograms": [{"batchcodes": ["1H051A"], "histogram": {"Chest discomfort": 2, "Palpitations": 2, "Vaccination site pain": 2, "Aneurysm": 1, "Dizziness": 1, "Dyspnoea": 1, "Electromyogram": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Facial nerve disorder": 1, "Facial paralysis": 1, "Headache": 1, "Hypertension": 1, "Magnetic resonance imaging head": 1, "Muscle rigidity": 1, "Myasthenia gravis": 1, "Respiration abnormal": 1, "Vaccination site discomfort": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "1H051A", "histograms": [{"histogram": {"Chest discomfort": 2, "Palpitations": 2, "Vaccination site pain": 2, "Aneurysm": 1, "Dizziness": 1, "Dyspnoea": 1, "Electromyogram": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Facial nerve disorder": 1, "Facial paralysis": 1, "Headache": 1, "Hypertension": 1, "Magnetic resonance imaging head": 1, "Muscle rigidity": 1, "Myasthenia gravis": 1, "Respiration abnormal": 1, "Vaccination site discomfort": 1, "Vision blurred": 1}, "batchcodes": ["1H051A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H054A-1101125-.json b/docs/data/histograms/Taiwan, Province of China/1H054A-1101125-.json
index bed300b5877..d1915b583de 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H054A-1101125-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H054A-1101125-.json
@@ -1 +1 @@
-{"batchcode": "1H054A-1101125-", "histograms": [{"batchcodes": ["1H054A-1101125-"], "histogram": {"Agitation": 1, "Anaphylactic reaction": 1, "Back pain": 1, "Blood pressure measurement": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Glossodynia": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Respiratory rate": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "1H054A-1101125-", "histograms": [{"histogram": {"Agitation": 1, "Anaphylactic reaction": 1, "Back pain": 1, "Blood pressure measurement": 1, "Dysphagia": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Glossodynia": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Respiratory rate": 1, "Tremor": 1}, "batchcodes": ["1H054A-1101125-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H054A-1101126-.json b/docs/data/histograms/Taiwan, Province of China/1H054A-1101126-.json
index 75d44573052..00396e0ddfd 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H054A-1101126-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H054A-1101126-.json
@@ -1 +1 @@
-{"batchcode": "1H054A-1101126-", "histograms": [{"batchcodes": ["1H054A-1101126-"], "histogram": {"Acute myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "1H054A-1101126-", "histograms": [{"histogram": {"Acute myocardial infarction": 1}, "batchcodes": ["1H054A-1101126-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H054A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1H054A-CDC.json
index f09a86abd2d..4738b4c2ad6 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H054A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H054A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1H054A-CDC", "histograms": [{"batchcodes": ["1H054A-CDC"], "histogram": {"Abdominal pain upper": 1, "Altered state of consciousness": 1, "Asthenia": 1, "Bacterial test": 1, "Diarrhoea": 1, "Osteomyelitis bacterial": 1}}]}
\ No newline at end of file
+{"batchcode": "1H054A-CDC", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Altered state of consciousness": 1, "Asthenia": 1, "Bacterial test": 1, "Diarrhoea": 1, "Osteomyelitis bacterial": 1}, "batchcodes": ["1H054A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H054A.json b/docs/data/histograms/Taiwan, Province of China/1H054A.json
index 3331f192668..d3f0dc6ae08 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H054A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H054A.json
@@ -1 +1 @@
-{"batchcode": "1H054A", "histograms": [{"batchcodes": ["1H054A"], "histogram": {"Alanine aminotransferase": 1, "Blood creatine phosphokinase": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "1H054A", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Blood creatine phosphokinase": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Palpitations": 1}, "batchcodes": ["1H054A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H054A_1101125-.json b/docs/data/histograms/Taiwan, Province of China/1H054A_1101125-.json
index 43aaae12fda..9d592a7cb84 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H054A_1101125-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H054A_1101125-.json
@@ -1 +1 @@
-{"batchcode": "1H054A_1101125-", "histograms": [{"batchcodes": ["1H054A_1101125-"], "histogram": {"Blood pressure measurement": 3, "Facial paralysis": 3, "Heart rate": 3, "Respiratory rate": 3, "Vomiting": 3, "Body temperature": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Fatigue": 2, "Headache": 2, "Physical examination": 2, "Pupillary light reflex tests": 2, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Bell's palsy": 1, "Bilirubin conjugated": 1, "Blood bilirubin": 1, "Blood test": 1, "C-reactive protein": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Consciousness fluctuating": 1, "Diarrhoea": 1, "Dizziness": 1, "Erythema": 1, "Eye swelling": 1, "Haemoglobin": 1, "Haemorrhage intracranial": 1, "Hepatitis acute": 1, "Hyperhidrosis": 1, "Jaundice": 1, "Leukaemia": 1, "Measles": 1, "Muscular weakness": 1, "Nausea": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Swelling face": 1, "Thyroxine free increased": 1, "Ultrasound abdomen": 1, "Vaccination site pain": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "1H054A_1101125-", "histograms": [{"histogram": {"Blood pressure measurement": 3, "Facial paralysis": 3, "Heart rate": 3, "Respiratory rate": 3, "Vomiting": 3, "Body temperature": 2, "Coma scale": 2, "Computerised tomogram head": 2, "Fatigue": 2, "Headache": 2, "Physical examination": 2, "Pupillary light reflex tests": 2, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Bell's palsy": 1, "Bilirubin conjugated": 1, "Blood bilirubin": 1, "Blood test": 1, "C-reactive protein": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Consciousness fluctuating": 1, "Diarrhoea": 1, "Dizziness": 1, "Erythema": 1, "Eye swelling": 1, "Haemoglobin": 1, "Haemorrhage intracranial": 1, "Hepatitis acute": 1, "Hyperhidrosis": 1, "Jaundice": 1, "Leukaemia": 1, "Measles": 1, "Muscular weakness": 1, "Nausea": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Swelling face": 1, "Thyroxine free increased": 1, "Ultrasound abdomen": 1, "Vaccination site pain": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["1H054A_1101125-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H054A_1101126-.json b/docs/data/histograms/Taiwan, Province of China/1H054A_1101126-.json
index ec084d95a03..aa1767c7a79 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H054A_1101126-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H054A_1101126-.json
@@ -1 +1 @@
-{"batchcode": "1H054A_1101126-", "histograms": [{"batchcodes": ["1H054A_1101126-"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Blood test": 1, "Blood test abnormal": 1, "Body temperature": 1, "Body temperature decreased": 1, "Chest pain": 1, "Myocarditis": 1, "Vascular pain": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "1H054A_1101126-", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Blood test": 1, "Blood test abnormal": 1, "Body temperature": 1, "Body temperature decreased": 1, "Chest pain": 1, "Myocarditis": 1, "Vascular pain": 1, "Vasculitis": 1}, "batchcodes": ["1H054A_1101126-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H054A_1101126.json b/docs/data/histograms/Taiwan, Province of China/1H054A_1101126.json
index b7ee49422cf..5352d568021 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H054A_1101126.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H054A_1101126.json
@@ -1 +1 @@
-{"batchcode": "1H054A_1101126", "histograms": [{"batchcodes": ["1H054A_1101126"], "histogram": {"Chest pain": 1, "Death": 1, "Electrocardiogram": 1, "Myocardial injury": 1}}]}
\ No newline at end of file
+{"batchcode": "1H054A_1101126", "histograms": [{"histogram": {"Chest pain": 1, "Death": 1, "Electrocardiogram": 1, "Myocardial injury": 1}, "batchcodes": ["1H054A_1101126"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A-1101117-.json b/docs/data/histograms/Taiwan, Province of China/1H055A-1101117-.json
index db7d67a91b4..e0faa4fe5d2 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A-1101117-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A-1101117-.json
@@ -1 +1 @@
-{"batchcode": "1H055A-1101117-", "histograms": [{"batchcodes": ["1H055A-1101117-"], "histogram": {"Chest discomfort": 1, "Decreased appetite": 1, "Heart rate": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A-1101117-", "histograms": [{"histogram": {"Chest discomfort": 1, "Decreased appetite": 1, "Heart rate": 1}, "batchcodes": ["1H055A-1101117-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A-1101118-.json b/docs/data/histograms/Taiwan, Province of China/1H055A-1101118-.json
index a9a66efb7a9..a0d44150777 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A-1101118-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A-1101118-.json
@@ -1 +1 @@
-{"batchcode": "1H055A-1101118-", "histograms": [{"batchcodes": ["1H055A-1101118-"], "histogram": {"Abdominal pain": 1, "Angiopathy": 1, "Bacteraemia": 1, "Chills": 1, "Overdose": 1, "Pain in extremity": 1, "Physical examination": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A-1101118-", "histograms": [{"histogram": {"Abdominal pain": 1, "Angiopathy": 1, "Bacteraemia": 1, "Chills": 1, "Overdose": 1, "Pain in extremity": 1, "Physical examination": 1}, "batchcodes": ["1H055A-1101118-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1H055A-CDC.json
index f270aa919ce..71549483e3d 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1H055A-CDC", "histograms": [{"batchcodes": ["1H055A-CDC"], "histogram": {"Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Overdose": 1, "Pain": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Road traffic accident": 1, "Sudden hearing loss": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A-CDC", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Chest discomfort": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Overdose": 1, "Pain": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Road traffic accident": 1, "Sudden hearing loss": 1, "Syncope": 1}, "batchcodes": ["1H055A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A.json b/docs/data/histograms/Taiwan, Province of China/1H055A.json
index 24714f6b5b6..aa66d781985 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A.json
@@ -1 +1 @@
-{"batchcode": "1H055A", "histograms": [{"batchcodes": ["1H055A"], "histogram": {"Blood test": 2, "Chest discomfort": 2, "Electrocardiogram": 2, "Pain in extremity": 2, "Palpitations": 2, "Anti-platelet factor 4 antibody test": 1, "Arthralgia": 1, "Biochemical pregnancy": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Dermatitis": 1, "Discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Headache": 1, "Leukocytosis": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Neutrophil percentage": 1, "Overdose": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Pyuria": 1, "Respiration abnormal": 1, "Seizure": 1, "Syncope": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A", "histograms": [{"histogram": {"Blood test": 2, "Chest discomfort": 2, "Electrocardiogram": 2, "Pain in extremity": 2, "Palpitations": 2, "Anti-platelet factor 4 antibody test": 1, "Arthralgia": 1, "Biochemical pregnancy": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Dermatitis": 1, "Discomfort": 1, "Dyspnoea": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Headache": 1, "Leukocytosis": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Neutrophil percentage": 1, "Overdose": 1, "Platelet count": 1, "Pulmonary embolism": 1, "Pyuria": 1, "Respiration abnormal": 1, "Seizure": 1, "Syncope": 1, "White blood cell count": 1}, "batchcodes": ["1H055A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A_1101117-.json b/docs/data/histograms/Taiwan, Province of China/1H055A_1101117-.json
index 3ff6586a997..ea0a1a1824c 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A_1101117-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A_1101117-.json
@@ -1 +1 @@
-{"batchcode": "1H055A_1101117-", "histograms": [{"batchcodes": ["1H055A_1101117-"], "histogram": {"Body temperature": 5, "Heart rate": 4, "Blood pressure measurement": 3, "Chest discomfort": 3, "Dyspnoea": 3, "Respiratory rate": 3, "Cerebral haemorrhage": 2, "Coma scale": 2, "Computerised tomogram abdomen": 2, "Dizziness": 2, "Hemiparesis": 2, "Hypersensitivity": 2, "Palpitations": 2, "Pruritus": 2, "Pyrexia": 2, "Arthralgia": 1, "Blood creatine phosphokinase MB": 1, "Brain oedema": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Cough": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Halo vision": 1, "Headache": 1, "Heart rate increased": 1, "Hepatic haemorrhage": 1, "Hypertension": 1, "Loss of consciousness": 1, "Malaise": 1, "Myocarditis": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Paraesthesia": 1, "Physical examination": 1, "Platelet count": 1, "Rash": 1, "Skin laceration": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Troponin I": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A_1101117-", "histograms": [{"histogram": {"Body temperature": 5, "Heart rate": 4, "Blood pressure measurement": 3, "Chest discomfort": 3, "Dyspnoea": 3, "Respiratory rate": 3, "Cerebral haemorrhage": 2, "Coma scale": 2, "Computerised tomogram abdomen": 2, "Dizziness": 2, "Hemiparesis": 2, "Hypersensitivity": 2, "Palpitations": 2, "Pruritus": 2, "Pyrexia": 2, "Arthralgia": 1, "Blood creatine phosphokinase MB": 1, "Brain oedema": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Cough": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Halo vision": 1, "Headache": 1, "Heart rate increased": 1, "Hepatic haemorrhage": 1, "Hypertension": 1, "Loss of consciousness": 1, "Malaise": 1, "Myocarditis": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Paraesthesia": 1, "Physical examination": 1, "Platelet count": 1, "Rash": 1, "Skin laceration": 1, "Subarachnoid haemorrhage": 1, "Swelling": 1, "Troponin I": 1, "Vomiting": 1}, "batchcodes": ["1H055A_1101117-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A_1101117.json b/docs/data/histograms/Taiwan, Province of China/1H055A_1101117.json
index f97733597d0..8bf83fee1ca 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A_1101117.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A_1101117.json
@@ -1 +1 @@
-{"batchcode": "1H055A_1101117", "histograms": [{"batchcodes": ["1H055A_1101117"], "histogram": {"Congestive cardiomyopathy": 1, "Facial paralysis": 1, "Myocardial haemorrhage": 1, "Paralysis": 1, "Pulmonary thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A_1101117", "histograms": [{"histogram": {"Congestive cardiomyopathy": 1, "Facial paralysis": 1, "Myocardial haemorrhage": 1, "Paralysis": 1, "Pulmonary thrombosis": 1}, "batchcodes": ["1H055A_1101117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A_1101118-.json b/docs/data/histograms/Taiwan, Province of China/1H055A_1101118-.json
index f261d7d6992..8a944c55353 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A_1101118-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A_1101118-.json
@@ -1 +1 @@
-{"batchcode": "1H055A_1101118-", "histograms": [{"batchcodes": ["1H055A_1101118-"], "histogram": {"Chest discomfort": 4, "Asthma": 2, "C-reactive protein": 2, "Dyspnoea": 2, "Investigation": 2, "Pyrexia": 2, "Angina pectoris": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Asthenia": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest X-ray": 1, "Cough": 1, "Diarrhoea": 1, "Discomfort": 1, "Double stranded DNA antibody": 1, "Dry eye": 1, "Dry mouth": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Facial paralysis": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Heart rate": 1, "Hypersensitivity": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pelvic infection": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Platelet count": 1, "Pulmonary function test": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Respiration abnormal": 1, "Rheumatoid arthritis": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Saliva analysis": 1, "Serum ferritin": 1, "Sjogren's syndrome": 1, "Somnolence": 1, "Troponin I": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A_1101118-", "histograms": [{"histogram": {"Chest discomfort": 4, "Asthma": 2, "C-reactive protein": 2, "Dyspnoea": 2, "Investigation": 2, "Pyrexia": 2, "Angina pectoris": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Antinuclear antibody": 1, "Asthenia": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest X-ray": 1, "Cough": 1, "Diarrhoea": 1, "Discomfort": 1, "Double stranded DNA antibody": 1, "Dry eye": 1, "Dry mouth": 1, "Electrocardiogram": 1, "Eosinophil count": 1, "Facial paralysis": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Heart rate": 1, "Hypersensitivity": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Pelvic infection": 1, "Pericardial effusion": 1, "Peripheral swelling": 1, "Platelet count": 1, "Pulmonary function test": 1, "Rash": 1, "Red blood cell sedimentation rate": 1, "Respiration abnormal": 1, "Rheumatoid arthritis": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Saliva analysis": 1, "Serum ferritin": 1, "Sjogren's syndrome": 1, "Somnolence": 1, "Troponin I": 1, "Ultrasound Doppler": 1, "Urticaria": 1, "White blood cell count": 1}, "batchcodes": ["1H055A_1101118-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H055A_1101118.json b/docs/data/histograms/Taiwan, Province of China/1H055A_1101118.json
index 721e9273d2e..92c0451943a 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H055A_1101118.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H055A_1101118.json
@@ -1 +1 @@
-{"batchcode": "1H055A_1101118", "histograms": [{"batchcodes": ["1H055A_1101118"], "histogram": {"Computerised tomogram": 1, "Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Hyperhidrosis": 1, "Nausea": 1, "Overdose": 1}}]}
\ No newline at end of file
+{"batchcode": "1H055A_1101118", "histograms": [{"histogram": {"Computerised tomogram": 1, "Deep vein thrombosis": 1, "Fibrin D dimer": 1, "Hyperhidrosis": 1, "Nausea": 1, "Overdose": 1}, "batchcodes": ["1H055A_1101118"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H056A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1H056A-CDC.json
index 2af72c75338..d01a513d687 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H056A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H056A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1H056A-CDC", "histograms": [{"batchcodes": ["1H056A-CDC"], "histogram": {"Blood pressure measurement": 5, "Headache": 4, "Heart rate": 4, "Respiratory rate": 4, "Chest discomfort": 3, "Chest pain": 3, "Coma scale": 3, "Dizziness": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Pyrexia": 3, "Asthenia": 2, "Asthma": 2, "Blood pressure increased": 2, "Body temperature": 2, "Diarrhoea": 2, "Muscular weakness": 2, "Myocarditis": 2, "Palpitations": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Acute myocardial infarction": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Cardiac arrest": 1, "Cellulitis": 1, "Cold sweat": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gastrooesophageal reflux disease": 1, "Haemorrhage coronary artery": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Intervertebral disc protrusion": 1, "Lymphadenopathy": 1, "Mental impairment": 1, "Myalgia": 1, "Nausea": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Paralysis": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count": 1, "Respiratory rate increased": 1, "Sensory disturbance": 1, "Tendonitis": 1, "Troponin I": 1, "Troponin increased": 1, "Urethral disorder": 1, "Vaccination site erythema": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1H056A-CDC", "histograms": [{"histogram": {"Blood pressure measurement": 5, "Headache": 4, "Heart rate": 4, "Respiratory rate": 4, "Chest discomfort": 3, "Chest pain": 3, "Coma scale": 3, "Dizziness": 3, "Oxygen saturation": 3, "Pain in extremity": 3, "Pyrexia": 3, "Asthenia": 2, "Asthma": 2, "Blood pressure increased": 2, "Body temperature": 2, "Diarrhoea": 2, "Muscular weakness": 2, "Myocarditis": 2, "Palpitations": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Acute myocardial infarction": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Cardiac arrest": 1, "Cellulitis": 1, "Cold sweat": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Gastrooesophageal reflux disease": 1, "Haemorrhage coronary artery": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Intervertebral disc protrusion": 1, "Lymphadenopathy": 1, "Mental impairment": 1, "Myalgia": 1, "Nausea": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Paralysis": 1, "Peripheral swelling": 1, "Physical examination": 1, "Platelet count": 1, "Respiratory rate increased": 1, "Sensory disturbance": 1, "Tendonitis": 1, "Troponin I": 1, "Troponin increased": 1, "Urethral disorder": 1, "Vaccination site erythema": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["1H056A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H056A.json b/docs/data/histograms/Taiwan, Province of China/1H056A.json
index 7887c287e38..ffcc79e52b9 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H056A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H056A.json
@@ -1 +1 @@
-{"batchcode": "1H056A", "histograms": [{"batchcodes": ["1H056A"], "histogram": {"Abdominal pain upper": 1, "Brain injury": 1, "Death": 1, "Haematemesis": 1, "Splenitis": 1, "Tracheal obstruction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1H056A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Brain injury": 1, "Death": 1, "Haematemesis": 1, "Splenitis": 1, "Tracheal obstruction": 1, "Vomiting": 1}, "batchcodes": ["1H056A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H058A-1101209-.json b/docs/data/histograms/Taiwan, Province of China/1H058A-1101209-.json
index 1cb1a38e50b..bf4e7525e17 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H058A-1101209-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H058A-1101209-.json
@@ -1 +1 @@
-{"batchcode": "1H058A-1101209-", "histograms": [{"batchcodes": ["1H058A-1101209-"], "histogram": {"Blood test": 1, "Electrocardiogram": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Lymphadenopathy": 1, "Swelling": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1H058A-1101209-", "histograms": [{"histogram": {"Blood test": 1, "Electrocardiogram": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Lymphadenopathy": 1, "Swelling": 1, "X-ray": 1}, "batchcodes": ["1H058A-1101209-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H058A.json b/docs/data/histograms/Taiwan, Province of China/1H058A.json
index 753449433b9..dd68b55eeff 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H058A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H058A.json
@@ -1 +1 @@
-{"batchcode": "1H058A", "histograms": [{"batchcodes": ["1H058A"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Overdose": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1H058A", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Overdose": 1, "Pain": 1}, "batchcodes": ["1H058A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H058A11012023.json b/docs/data/histograms/Taiwan, Province of China/1H058A11012023.json
index b6a863b6332..688035d875c 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H058A11012023.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H058A11012023.json
@@ -1 +1 @@
-{"batchcode": "1H058A11012023", "histograms": [{"batchcodes": ["1H058A11012023"], "histogram": {"Blood pressure measurement": 1, "Heart rate": 1, "Muscle spasms": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1H058A11012023", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Heart rate": 1, "Muscle spasms": 1, "Oxygen saturation": 1, "Seizure": 1, "Syncope": 1}, "batchcodes": ["1H058A11012023"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H058A_1101209-.json b/docs/data/histograms/Taiwan, Province of China/1H058A_1101209-.json
index 41dccb85696..e4c865d19c4 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H058A_1101209-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H058A_1101209-.json
@@ -1 +1 @@
-{"batchcode": "1H058A_1101209-", "histograms": [{"batchcodes": ["1H058A_1101209-"], "histogram": {"Blood pressure measurement": 2, "Chest discomfort": 2, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac failure acute": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Cough": 1, "Death": 1, "Diplopia": 1, "Discomfort": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Epistaxis": 1, "Haemorrhage": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Leukocytosis": 1, "Loss of consciousness": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neutrophil count": 1, "Neutrophilia": 1, "Overdose": 1, "Oxygen saturation": 1, "Palpitations": 1, "Physical examination": 1, "Platelet count": 1, "Pruritus": 1, "Pulmonary oedema": 1, "Rash": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory rate": 1, "Thrombocytopenia": 1, "Troponin I": 1, "Troponin I increased": 1, "VIth nerve paralysis": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1H058A_1101209-", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Chest discomfort": 2, "Body temperature": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cardiac failure acute": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest pain": 1, "Coma scale": 1, "Cough": 1, "Death": 1, "Diplopia": 1, "Discomfort": 1, "Dyspnoea": 1, "Ecchymosis": 1, "Epistaxis": 1, "Haemorrhage": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Leukocytosis": 1, "Loss of consciousness": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Neutrophil count": 1, "Neutrophilia": 1, "Overdose": 1, "Oxygen saturation": 1, "Palpitations": 1, "Physical examination": 1, "Platelet count": 1, "Pruritus": 1, "Pulmonary oedema": 1, "Rash": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory rate": 1, "Thrombocytopenia": 1, "Troponin I": 1, "Troponin I increased": 1, "VIth nerve paralysis": 1, "White blood cell count": 1}, "batchcodes": ["1H058A_1101209-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H058A_1101209.json b/docs/data/histograms/Taiwan, Province of China/1H058A_1101209.json
index 91d2af3b39f..745776e5646 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H058A_1101209.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H058A_1101209.json
@@ -1 +1 @@
-{"batchcode": "1H058A_1101209", "histograms": [{"batchcodes": ["1H058A_1101209"], "histogram": {"Adverse event": 1, "Angina unstable": 1, "Ascites": 1, "Cellulitis": 1, "Diabetic nephropathy": 1, "Discomfort": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Hepatic cirrhosis": 1, "Hepatic failure": 1, "Hyperlipidaemia": 1, "Liver disorder": 1, "Multiple organ dysfunction syndrome": 1, "Nephropathy": 1, "Renal failure": 1, "Septic shock": 1, "Splenomegaly": 1, "Thrombosis": 1, "Thyroid disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "1H058A_1101209", "histograms": [{"histogram": {"Adverse event": 1, "Angina unstable": 1, "Ascites": 1, "Cellulitis": 1, "Diabetic nephropathy": 1, "Discomfort": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Hepatic cirrhosis": 1, "Hepatic failure": 1, "Hyperlipidaemia": 1, "Liver disorder": 1, "Multiple organ dysfunction syndrome": 1, "Nephropathy": 1, "Renal failure": 1, "Septic shock": 1, "Splenomegaly": 1, "Thrombosis": 1, "Thyroid disorder": 1}, "batchcodes": ["1H058A_1101209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H058A_1101223.json b/docs/data/histograms/Taiwan, Province of China/1H058A_1101223.json
index bc44142ed03..b94d9ddb784 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H058A_1101223.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H058A_1101223.json
@@ -1 +1 @@
-{"batchcode": "1H058A_1101223", "histograms": [{"batchcodes": ["1H058A_1101223"], "histogram": {"Blood test": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Incorrect dose administered": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain in extremity": 1, "Tremor": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1H058A_1101223", "histograms": [{"histogram": {"Blood test": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Incorrect dose administered": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain in extremity": 1, "Tremor": 1, "Vomiting": 1}, "batchcodes": ["1H058A_1101223"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H059-A.json b/docs/data/histograms/Taiwan, Province of China/1H059-A.json
index 845b1c507dc..9f602a1c7ce 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H059-A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H059-A.json
@@ -1 +1 @@
-{"batchcode": "1H059-A", "histograms": [{"batchcodes": ["1H059-A"], "histogram": {"Chest discomfort": 1, "Dizziness": 1, "Respiration abnormal": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1H059-A", "histograms": [{"histogram": {"Chest discomfort": 1, "Dizziness": 1, "Respiration abnormal": 1, "Syncope": 1}, "batchcodes": ["1H059-A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H059A-1101204-.json b/docs/data/histograms/Taiwan, Province of China/1H059A-1101204-.json
index 3b6442d462a..e0249809189 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H059A-1101204-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H059A-1101204-.json
@@ -1 +1 @@
-{"batchcode": "1H059A-1101204-", "histograms": [{"batchcodes": ["1H059A-1101204-"], "histogram": {"Altered state of consciousness": 1, "Dizziness": 1, "Facial paralysis": 1, "Fall": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "1H059A-1101204-", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Dizziness": 1, "Facial paralysis": 1, "Fall": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Vertigo": 1}, "batchcodes": ["1H059A-1101204-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H059A.json b/docs/data/histograms/Taiwan, Province of China/1H059A.json
index 5413874d3ad..3970da17fbe 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H059A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H059A.json
@@ -1 +1 @@
-{"batchcode": "1H059A", "histograms": [{"batchcodes": ["1H059A"], "histogram": {"Alanine aminotransferase": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Electrocardiogram": 1, "Erythema": 1, "Facial paralysis": 1, "Gait inability": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hepatitis B": 1, "Hepatitis B core antibody": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Hypotension": 1, "Interchange of vaccine products": 1, "Mean cell haemoglobin concentration": 1, "Necrotising fasciitis": 1, "Off label use": 1, "Pain": 1, "Procalcitonin": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Syncope": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1H059A", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Electrocardiogram": 1, "Erythema": 1, "Facial paralysis": 1, "Gait inability": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hepatitis B": 1, "Hepatitis B core antibody": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C virus test": 1, "Hypotension": 1, "Interchange of vaccine products": 1, "Mean cell haemoglobin concentration": 1, "Necrotising fasciitis": 1, "Off label use": 1, "Pain": 1, "Procalcitonin": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Sepsis": 1, "Syncope": 1, "White blood cell count": 1}, "batchcodes": ["1H059A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H059A_1101204-.json b/docs/data/histograms/Taiwan, Province of China/1H059A_1101204-.json
index c9507c4a746..878463e9cc8 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H059A_1101204-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H059A_1101204-.json
@@ -1 +1 @@
-{"batchcode": "1H059A_1101204-", "histograms": [{"batchcodes": ["1H059A_1101204-"], "histogram": {"Heart rate": 3, "Altered state of consciousness": 2, "Blood pressure measurement": 2, "Headache": 2, "Muscular weakness": 2, "Angina pectoris": 1, "Arrhythmia": 1, "Arthralgia": 1, "Blood pressure decreased": 1, "Blood pressure diastolic decreased": 1, "Blood test": 1, "Carditis": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Investigation": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pain": 1, "Pain assessment": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Tachycardia": 1, "Vomiting": 1, "Weight": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1H059A_1101204-", "histograms": [{"histogram": {"Heart rate": 3, "Altered state of consciousness": 2, "Blood pressure measurement": 2, "Headache": 2, "Muscular weakness": 2, "Angina pectoris": 1, "Arrhythmia": 1, "Arthralgia": 1, "Blood pressure decreased": 1, "Blood pressure diastolic decreased": 1, "Blood test": 1, "Carditis": 1, "Catheterisation cardiac": 1, "Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Investigation": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Oxygen saturation": 1, "Pain": 1, "Pain assessment": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Tachycardia": 1, "Vomiting": 1, "Weight": 1, "X-ray": 1}, "batchcodes": ["1H059A_1101204-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H059A_1101204.json b/docs/data/histograms/Taiwan, Province of China/1H059A_1101204.json
index 9c7590a6f57..f3cb123f0a8 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H059A_1101204.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H059A_1101204.json
@@ -1 +1 @@
-{"batchcode": "1H059A_1101204", "histograms": [{"batchcodes": ["1H059A_1101204"], "histogram": {"Death": 2, "Abdominal pain": 1, "Fatigue": 1, "Head injury": 1, "Pyrexia": 1, "Skull fracture": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1H059A_1101204", "histograms": [{"histogram": {"Death": 2, "Abdominal pain": 1, "Fatigue": 1, "Head injury": 1, "Pyrexia": 1, "Skull fracture": 1, "Subarachnoid haemorrhage": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["1H059A_1101204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1H059A_1101207-.json b/docs/data/histograms/Taiwan, Province of China/1H059A_1101207-.json
index e9d7b3b275b..8cbfdc9ed9b 100644
--- a/docs/data/histograms/Taiwan, Province of China/1H059A_1101207-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1H059A_1101207-.json
@@ -1 +1 @@
-{"batchcode": "1H059A_1101207-", "histograms": [{"batchcodes": ["1H059A_1101207-"], "histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bacterial infection": 1, "Blood bicarbonate": 1, "Blood creatinine": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac arrest": 1, "Coma scale": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Haemoglobin": 1, "Multiple organ dysfunction syndrome": 1, "PCO2": 1, "PO2": 1, "Propofol infusion syndrome": 1, "White blood cell count": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "1H059A_1101207-", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bacterial infection": 1, "Blood bicarbonate": 1, "Blood creatinine": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac arrest": 1, "Coma scale": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Haemoglobin": 1, "Multiple organ dysfunction syndrome": 1, "PCO2": 1, "PO2": 1, "Propofol infusion syndrome": 1, "White blood cell count": 1, "pH body fluid": 1}, "batchcodes": ["1H059A_1101207-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I061A.json b/docs/data/histograms/Taiwan, Province of China/1I061A.json
index e5b49f65a1f..d3493c523cb 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I061A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I061A.json
@@ -1 +1 @@
-{"batchcode": "1I061A", "histograms": [{"batchcodes": ["1I061A"], "histogram": {"Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Headache": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Palpitations": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "1I061A", "histograms": [{"histogram": {"Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Headache": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Palpitations": 1, "Vision blurred": 1}, "batchcodes": ["1I061A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I061A_1101224-.json b/docs/data/histograms/Taiwan, Province of China/1I061A_1101224-.json
index c3d9336ab2b..f1ec3e6b014 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I061A_1101224-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I061A_1101224-.json
@@ -1 +1 @@
-{"batchcode": "1I061A_1101224-", "histograms": [{"batchcodes": ["1I061A_1101224-"], "histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Coma scale": 2, "Heart rate": 2, "Respiratory rate": 2, "Altered state of consciousness": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Chest discomfort": 1, "Computerised tomogram head": 1, "Death": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Epigastric discomfort": 1, "Fatigue": 1, "Headache": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hypokalaemia": 1, "Hyponatraemia": 1, "Intraventricular haemorrhage": 1, "Investigation": 1, "Muscle strength abnormal": 1, "Nausea": 1, "Overdose": 1, "Pruritus": 1, "Rash erythematous": 1, "Red blood cell sedimentation rate": 1, "Respiratory arrest": 1, "Urine analysis": 1, "Urticarial vasculitis": 1, "Vital signs measurement": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1I061A_1101224-", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Coma scale": 2, "Heart rate": 2, "Respiratory rate": 2, "Altered state of consciousness": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Chest discomfort": 1, "Computerised tomogram head": 1, "Death": 1, "Decreased appetite": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Epigastric discomfort": 1, "Fatigue": 1, "Headache": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hypokalaemia": 1, "Hyponatraemia": 1, "Intraventricular haemorrhage": 1, "Investigation": 1, "Muscle strength abnormal": 1, "Nausea": 1, "Overdose": 1, "Pruritus": 1, "Rash erythematous": 1, "Red blood cell sedimentation rate": 1, "Respiratory arrest": 1, "Urine analysis": 1, "Urticarial vasculitis": 1, "Vital signs measurement": 1, "Vomiting": 1}, "batchcodes": ["1I061A_1101224-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I061A_1101224.json b/docs/data/histograms/Taiwan, Province of China/1I061A_1101224.json
index 395e67c4aa4..d45b8b99fb7 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I061A_1101224.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I061A_1101224.json
@@ -1 +1 @@
-{"batchcode": "1I061A_1101224", "histograms": [{"batchcodes": ["1I061A_1101224"], "histogram": {"Acute respiratory failure": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac arrest": 1, "Coma": 1, "Device occlusion": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Myocardial infarction": 1, "Oxygen saturation": 1}}]}
\ No newline at end of file
+{"batchcode": "1I061A_1101224", "histograms": [{"histogram": {"Acute respiratory failure": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cardiac arrest": 1, "Coma": 1, "Device occlusion": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Myocardial infarction": 1, "Oxygen saturation": 1}, "batchcodes": ["1I061A_1101224"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I061A_1101224_.json b/docs/data/histograms/Taiwan, Province of China/1I061A_1101224_.json
index 2dbca786edd..094f27932aa 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I061A_1101224_.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I061A_1101224_.json
@@ -1 +1 @@
-{"batchcode": "1I061A_1101224_", "histograms": [{"batchcodes": ["1I061A_1101224_"], "histogram": {"Chest discomfort": 1, "Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1I061A_1101224_", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1}, "batchcodes": ["1I061A_1101224_"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I061A_1110101-.json b/docs/data/histograms/Taiwan, Province of China/1I061A_1110101-.json
index 9a7d76aed37..1220e055397 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I061A_1110101-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I061A_1110101-.json
@@ -1 +1 @@
-{"batchcode": "1I061A_1110101-", "histograms": [{"batchcodes": ["1I061A_1110101-"], "histogram": {"Chest X-ray": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Myocarditis": 2, "Physical examination": 2, "Asthma": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure chronic": 1, "Cardiomegaly": 1, "Chest discomfort": 1, "Chest pain": 1, "Coma scale": 1, "Coronary artery disease": 1, "Cough": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Gastroenteritis viral": 1, "Gastrooesophageal reflux disease": 1, "Heart rate": 1, "Heart sounds": 1, "Investigation": 1, "Laboratory test": 1, "Oxygen saturation": 1, "Pleural effusion": 1, "Respiratory rate": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1I061A_1110101-", "histograms": [{"histogram": {"Chest X-ray": 2, "Dyspnoea": 2, "Electrocardiogram": 2, "Myocarditis": 2, "Physical examination": 2, "Asthma": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure chronic": 1, "Cardiomegaly": 1, "Chest discomfort": 1, "Chest pain": 1, "Coma scale": 1, "Coronary artery disease": 1, "Cough": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Gastroenteritis viral": 1, "Gastrooesophageal reflux disease": 1, "Heart rate": 1, "Heart sounds": 1, "Investigation": 1, "Laboratory test": 1, "Oxygen saturation": 1, "Pleural effusion": 1, "Respiratory rate": 1, "Troponin I": 1, "Ultrasound abdomen": 1, "White blood cell count": 1}, "batchcodes": ["1I061A_1110101-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I063A.json b/docs/data/histograms/Taiwan, Province of China/1I063A.json
index 434eb49b64b..7d4b78e29b1 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I063A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I063A.json
@@ -1 +1 @@
-{"batchcode": "1I063A", "histograms": [{"batchcodes": ["1I063A"], "histogram": {"Chest discomfort": 2, "Chest pain": 2, "Angina pectoris": 1, "Blood creatine phosphokinase MB": 1, "Brain natriuretic peptide": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Exercise test": 1, "Fibrin D dimer": 1, "Headache": 1, "Hypoaesthesia": 1, "Pain in extremity": 1, "Palpitations": 1, "Platelet count": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "1I063A", "histograms": [{"histogram": {"Chest discomfort": 2, "Chest pain": 2, "Angina pectoris": 1, "Blood creatine phosphokinase MB": 1, "Brain natriuretic peptide": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Exercise test": 1, "Fibrin D dimer": 1, "Headache": 1, "Hypoaesthesia": 1, "Pain in extremity": 1, "Palpitations": 1, "Platelet count": 1, "Troponin I": 1}, "batchcodes": ["1I063A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I063A_1101229-.json b/docs/data/histograms/Taiwan, Province of China/1I063A_1101229-.json
index 97acdd77131..cef7b342713 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I063A_1101229-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I063A_1101229-.json
@@ -1 +1 @@
-{"batchcode": "1I063A_1101229-", "histograms": [{"batchcodes": ["1I063A_1101229-"], "histogram": {"Nausea": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Blood test": 1, "Burnout syndrome": 1, "Cachexia": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Hepatitis fulminant": 1, "Investigation": 1, "Jaundice": 1, "Mental status changes": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Swelling face": 1, "Vomiting": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "1I063A_1101229-", "histograms": [{"histogram": {"Nausea": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Alanine aminotransferase": 1, "Blood test": 1, "Burnout syndrome": 1, "Cachexia": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Hepatitis fulminant": 1, "Investigation": 1, "Jaundice": 1, "Mental status changes": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Swelling face": 1, "Vomiting": 1, "Yellow skin": 1}, "batchcodes": ["1I063A_1101229-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I063A_1110105-.json b/docs/data/histograms/Taiwan, Province of China/1I063A_1110105-.json
index 57f5d948b29..ad1eb926d48 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I063A_1110105-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I063A_1110105-.json
@@ -1 +1 @@
-{"batchcode": "1I063A_1110105-", "histograms": [{"batchcodes": ["1I063A_1110105-"], "histogram": {"Chest discomfort": 5, "Electrocardiogram": 4, "Chest pain": 3, "Blood creatine phosphokinase MB": 2, "Blood test": 2, "Palpitations": 2, "Troponin I": 2, "Angina pectoris": 1, "Blood creatine phosphokinase": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Myalgia": 1, "Myocarditis": 1, "Physical examination": 1, "Platelet count": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "1I063A_1110105-", "histograms": [{"histogram": {"Chest discomfort": 5, "Electrocardiogram": 4, "Chest pain": 3, "Blood creatine phosphokinase MB": 2, "Blood test": 2, "Palpitations": 2, "Troponin I": 2, "Angina pectoris": 1, "Blood creatine phosphokinase": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Myalgia": 1, "Myocarditis": 1, "Physical examination": 1, "Platelet count": 1, "Pyrexia": 1}, "batchcodes": ["1I063A_1110105-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I063A_1110105.json b/docs/data/histograms/Taiwan, Province of China/1I063A_1110105.json
index 3f3c280e07d..c3cc2d1fd1c 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I063A_1110105.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I063A_1110105.json
@@ -1 +1 @@
-{"batchcode": "1I063A_1110105", "histograms": [{"batchcodes": ["1I063A_1110105"], "histogram": {"Bronchitis": 1, "Chest discomfort": 1, "Gastritis": 1, "Gastrooesophageal reflux disease": 1, "Haemorrhoids": 1, "Hypersensitivity": 1, "Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "1I063A_1110105", "histograms": [{"histogram": {"Bronchitis": 1, "Chest discomfort": 1, "Gastritis": 1, "Gastrooesophageal reflux disease": 1, "Haemorrhoids": 1, "Hypersensitivity": 1, "Pneumonia": 1}, "batchcodes": ["1I063A_1110105"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A-1110112-.json b/docs/data/histograms/Taiwan, Province of China/1I069A-1110112-.json
index d786fad0a26..0c09e786b43 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A-1110112-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A-1110112-.json
@@ -1 +1 @@
-{"batchcode": "1I069A-1110112-", "histograms": [{"batchcodes": ["1I069A-1110112-"], "histogram": {"Syncope": 1, "Tachypnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A-1110112-", "histograms": [{"histogram": {"Syncope": 1, "Tachypnoea": 1}, "batchcodes": ["1I069A-1110112-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A.json b/docs/data/histograms/Taiwan, Province of China/1I069A.json
index c2b09de93b2..436ffe60520 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A.json
@@ -1 +1 @@
-{"batchcode": "1I069A", "histograms": [{"batchcodes": ["1I069A"], "histogram": {"Chest pain": 5, "Blood creatine phosphokinase": 4, "Myocarditis": 4, "Pyrexia": 4, "Troponin I": 4, "Blood creatine phosphokinase MB": 3, "Body temperature": 3, "Chest discomfort": 3, "Electrocardiogram": 3, "Inappropriate schedule of product administration": 3, "Blood pressure measurement": 2, "Discomfort": 2, "Dyspnoea": 2, "Headache": 2, "Heart rate": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Asthma": 1, "Blood creatine phosphokinase decreased": 1, "C-reactive protein": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Coma scale": 1, "Dizziness": 1, "Electrocardiogram ambulatory": 1, "Heart rate abnormal": 1, "Hydronephrosis": 1, "Hypoaesthesia": 1, "Investigation": 1, "Nasopharyngitis": 1, "Overdose": 1, "Oxygen saturation": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Rash pruritic": 1, "Renal function test": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urticaria": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A", "histograms": [{"histogram": {"Chest pain": 5, "Blood creatine phosphokinase": 4, "Myocarditis": 4, "Pyrexia": 4, "Troponin I": 4, "Blood creatine phosphokinase MB": 3, "Body temperature": 3, "Chest discomfort": 3, "Electrocardiogram": 3, "Inappropriate schedule of product administration": 3, "Blood pressure measurement": 2, "Discomfort": 2, "Dyspnoea": 2, "Headache": 2, "Heart rate": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Asthma": 1, "Blood creatine phosphokinase decreased": 1, "C-reactive protein": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Coma scale": 1, "Dizziness": 1, "Electrocardiogram ambulatory": 1, "Heart rate abnormal": 1, "Hydronephrosis": 1, "Hypoaesthesia": 1, "Investigation": 1, "Nasopharyngitis": 1, "Overdose": 1, "Oxygen saturation": 1, "Physical examination": 1, "Polymerase chain reaction": 1, "Rash pruritic": 1, "Renal function test": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "SARS-CoV-2 test": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urticaria": 1, "White blood cell count": 1}, "batchcodes": ["1I069A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A0106.json b/docs/data/histograms/Taiwan, Province of China/1I069A0106.json
index 282fa46db66..0077083ee7b 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A0106.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A0106.json
@@ -1 +1 @@
-{"batchcode": "1I069A0106", "histograms": [{"batchcodes": ["1I069A0106"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Hypersensitivity": 1, "Laryngeal oedema": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pharyngeal oedema": 1, "Pruritus": 1, "Vital signs measurement": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A0106", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Hypersensitivity": 1, "Laryngeal oedema": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pharyngeal oedema": 1, "Pruritus": 1, "Vital signs measurement": 1, "X-ray": 1}, "batchcodes": ["1I069A0106"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A_1110105-.json b/docs/data/histograms/Taiwan, Province of China/1I069A_1110105-.json
index dfbf2ac5251..1a343169c2b 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A_1110105-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A_1110105-.json
@@ -1 +1 @@
-{"batchcode": "1I069A_1110105-", "histograms": [{"batchcodes": ["1I069A_1110105-"], "histogram": {"Dizziness": 3, "Altered state of consciousness": 2, "Chest discomfort": 2, "Decreased appetite": 2, "Fatigue": 2, "Nausea": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac discomfort": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Death": 1, "Discomfort": 1, "Electrocardiogram": 1, "Eye injury": 1, "Feeling cold": 1, "Headache": 1, "Heart rate": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Productive cough": 1, "Respiration abnormal": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A_1110105-", "histograms": [{"histogram": {"Dizziness": 3, "Altered state of consciousness": 2, "Chest discomfort": 2, "Decreased appetite": 2, "Fatigue": 2, "Nausea": 2, "Pyrexia": 2, "Anaphylactic reaction": 1, "Blood pressure measurement": 1, "Blood test": 1, "Cardiac discomfort": 1, "Cardiovascular disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Death": 1, "Discomfort": 1, "Electrocardiogram": 1, "Eye injury": 1, "Feeling cold": 1, "Headache": 1, "Heart rate": 1, "Oxygen saturation": 1, "Pain": 1, "Palpitations": 1, "Productive cough": 1, "Respiration abnormal": 1, "Syncope": 1}, "batchcodes": ["1I069A_1110105-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A_1110106-.json b/docs/data/histograms/Taiwan, Province of China/1I069A_1110106-.json
index efcbe439094..cd9763fe737 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A_1110106-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A_1110106-.json
@@ -1 +1 @@
-{"batchcode": "1I069A_1110106-", "histograms": [{"batchcodes": ["1I069A_1110106-"], "histogram": {"Electrocardiogram": 6, "Blood pressure measurement": 5, "Chest pain": 5, "Pyrexia": 5, "Heart rate": 4, "Chest discomfort": 3, "Nausea": 3, "Pruritus": 3, "Vomiting": 3, "Altered state of consciousness": 2, "Arrhythmia": 2, "Blood test": 2, "Body temperature": 2, "Cold sweat": 2, "Dyspnoea": 2, "Headache": 2, "Oxygen saturation": 2, "Palpitations": 2, "Syncope": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Abdominal neoplasm": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Allergic oedema": 1, "Angina pectoris": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Bone scan": 1, "Coma": 1, "Coma scale": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Congenital mitral valve incompetence": 1, "Cyanosis": 1, "Decreased activity": 1, "Decreased appetite": 1, "Dehydration": 1, "Dizziness": 1, "Echocardiogram": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fatigue": 1, "Haemorrhage intracranial": 1, "Hepatomegaly": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Intravascular haemolysis": 1, "Investigation": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Metastases to bone": 1, "Metastases to liver": 1, "Mucosal dryness": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Myocarditis": 1, "Neuroblastoma": 1, "Overdose": 1, "Pain": 1, "Pain in extremity": 1, "Platelet count": 1, "Rash": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sleep disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Troponin": 1, "Tumour marker test": 1, "Ultrasonic angiogram": 1, "Urine output decreased": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vision blurred": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A_1110106-", "histograms": [{"histogram": {"Electrocardiogram": 6, "Blood pressure measurement": 5, "Chest pain": 5, "Pyrexia": 5, "Heart rate": 4, "Chest discomfort": 3, "Nausea": 3, "Pruritus": 3, "Vomiting": 3, "Altered state of consciousness": 2, "Arrhythmia": 2, "Blood test": 2, "Body temperature": 2, "Cold sweat": 2, "Dyspnoea": 2, "Headache": 2, "Oxygen saturation": 2, "Palpitations": 2, "Syncope": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Abdominal neoplasm": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Allergic oedema": 1, "Angina pectoris": 1, "Arthralgia": 1, "Biopsy bone marrow": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Bone scan": 1, "Coma": 1, "Coma scale": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram head": 1, "Congenital mitral valve incompetence": 1, "Cyanosis": 1, "Decreased activity": 1, "Decreased appetite": 1, "Dehydration": 1, "Dizziness": 1, "Echocardiogram": 1, "Eye swelling": 1, "Facial paralysis": 1, "Fatigue": 1, "Haemorrhage intracranial": 1, "Hepatomegaly": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Intravascular haemolysis": 1, "Investigation": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Metastases to bone": 1, "Metastases to liver": 1, "Mucosal dryness": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Myocarditis": 1, "Neuroblastoma": 1, "Overdose": 1, "Pain": 1, "Pain in extremity": 1, "Platelet count": 1, "Rash": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Sleep disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Troponin": 1, "Tumour marker test": 1, "Ultrasonic angiogram": 1, "Urine output decreased": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vision blurred": 1, "Vital signs measurement": 1}, "batchcodes": ["1I069A_1110106-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A_1110106.json b/docs/data/histograms/Taiwan, Province of China/1I069A_1110106.json
index 83710d1b260..8b93f9902cf 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A_1110106.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A_1110106.json
@@ -1 +1 @@
-{"batchcode": "1I069A_1110106", "histograms": [{"batchcodes": ["1I069A_1110106"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Myocarditis": 1, "Palpitations": 1, "Physical examination": 1, "Pyrexia": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A_1110106", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Myocarditis": 1, "Palpitations": 1, "Physical examination": 1, "Pyrexia": 1, "Troponin": 1}, "batchcodes": ["1I069A_1110106"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A_1110106_.json b/docs/data/histograms/Taiwan, Province of China/1I069A_1110106_.json
index 34ed67801fa..14da1814ad0 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A_1110106_.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A_1110106_.json
@@ -1 +1 @@
-{"batchcode": "1I069A_1110106_", "histograms": [{"batchcodes": ["1I069A_1110106_"], "histogram": {"Electrocardiogram": 1, "Heart rate irregular": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A_1110106_", "histograms": [{"histogram": {"Electrocardiogram": 1, "Heart rate irregular": 1, "Seizure": 1}, "batchcodes": ["1I069A_1110106_"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A_1110112-.json b/docs/data/histograms/Taiwan, Province of China/1I069A_1110112-.json
index f2ef4ce833c..0ef1b409d86 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A_1110112-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A_1110112-.json
@@ -1 +1 @@
-{"batchcode": "1I069A_1110112-", "histograms": [{"batchcodes": ["1I069A_1110112-"], "histogram": {"Chest discomfort": 7, "Dizziness": 5, "Body temperature": 4, "Chest pain": 4, "Electrocardiogram": 4, "Headache": 4, "Blood test": 3, "Heart rate": 3, "Myocarditis": 3, "Pyrexia": 3, "Dyspnoea": 2, "Echocardiogram": 2, "Heart rate increased": 2, "Inappropriate schedule of product administration": 2, "Vomiting": 2, "Acute lymphocytic leukaemia": 1, "Arthralgia": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Cardiac discomfort": 1, "Cardiac index": 1, "Cardiomegaly": 1, "Cough": 1, "Decreased activity": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Discomfort": 1, "Epistaxis": 1, "Fatigue": 1, "Inflammatory marker increased": 1, "Insomnia": 1, "Investigation": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Physical examination": 1, "Platelet count": 1, "Respiration abnormal": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Ultrasound scan": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A_1110112-", "histograms": [{"histogram": {"Chest discomfort": 7, "Dizziness": 5, "Body temperature": 4, "Chest pain": 4, "Electrocardiogram": 4, "Headache": 4, "Blood test": 3, "Heart rate": 3, "Myocarditis": 3, "Pyrexia": 3, "Dyspnoea": 2, "Echocardiogram": 2, "Heart rate increased": 2, "Inappropriate schedule of product administration": 2, "Vomiting": 2, "Acute lymphocytic leukaemia": 1, "Arthralgia": 1, "Blood creatine phosphokinase MB": 1, "Blood creatine phosphokinase MB increased": 1, "Cardiac discomfort": 1, "Cardiac index": 1, "Cardiomegaly": 1, "Cough": 1, "Decreased activity": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Discomfort": 1, "Epistaxis": 1, "Fatigue": 1, "Inflammatory marker increased": 1, "Insomnia": 1, "Investigation": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Physical examination": 1, "Platelet count": 1, "Respiration abnormal": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Tachycardia": 1, "Thrombocytopenia": 1, "Ultrasound scan": 1, "X-ray": 1}, "batchcodes": ["1I069A_1110112-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I069A_1110112_.json b/docs/data/histograms/Taiwan, Province of China/1I069A_1110112_.json
index 36fbdea4855..88d74971140 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I069A_1110112_.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I069A_1110112_.json
@@ -1 +1 @@
-{"batchcode": "1I069A_1110112_", "histograms": [{"batchcodes": ["1I069A_1110112_"], "histogram": {"Blood creatine phosphokinase MB": 4, "Body temperature": 4, "Physical examination": 4, "White blood cell count": 4, "Chest X-ray": 3, "Electrocardiogram": 3, "Inappropriate schedule of product administration": 3, "Lymphocyte percentage": 3, "Neutrophil percentage": 3, "SARS-CoV-2 test": 3, "Troponin I": 3, "Dizziness": 2, "Echocardiogram": 2, "Amylase": 1, "Antinuclear antibody": 1, "Blood sodium": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Chest pain": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Gastroenteritis": 1, "Haematuria": 1, "Hypersensitivity": 1, "Lipase": 1, "Lymphocyte count": 1, "Mitral valve incompetence": 1, "Mouth ulceration": 1, "Mycoplasma test": 1, "Myocarditis": 1, "Neutrophil count": 1, "Pericarditis": 1, "Protein urine": 1, "Pyrexia": 1, "Rash": 1, "Red blood cells urine": 1, "Tricuspid valve incompetence": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Urinary occult blood": 1, "Urinary tract infection": 1, "Vomiting": 1, "White blood cells urine": 1}}]}
\ No newline at end of file
+{"batchcode": "1I069A_1110112_", "histograms": [{"histogram": {"Blood creatine phosphokinase MB": 4, "Body temperature": 4, "Physical examination": 4, "White blood cell count": 4, "Chest X-ray": 3, "Electrocardiogram": 3, "Inappropriate schedule of product administration": 3, "Lymphocyte percentage": 3, "Neutrophil percentage": 3, "SARS-CoV-2 test": 3, "Troponin I": 3, "Dizziness": 2, "Echocardiogram": 2, "Amylase": 1, "Antinuclear antibody": 1, "Blood sodium": 1, "C-reactive protein": 1, "Chest discomfort": 1, "Chest pain": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Gastroenteritis": 1, "Haematuria": 1, "Hypersensitivity": 1, "Lipase": 1, "Lymphocyte count": 1, "Mitral valve incompetence": 1, "Mouth ulceration": 1, "Mycoplasma test": 1, "Myocarditis": 1, "Neutrophil count": 1, "Pericarditis": 1, "Protein urine": 1, "Pyrexia": 1, "Rash": 1, "Red blood cells urine": 1, "Tricuspid valve incompetence": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Urinary occult blood": 1, "Urinary tract infection": 1, "Vomiting": 1, "White blood cells urine": 1}, "batchcodes": ["1I069A_1110112_"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A-1110119-.json b/docs/data/histograms/Taiwan, Province of China/1I070A-1110119-.json
index aa3040fc17c..384e0e02e6c 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A-1110119-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A-1110119-.json
@@ -1 +1 @@
-{"batchcode": "1I070A-1110119-", "histograms": [{"batchcodes": ["1I070A-1110119-"], "histogram": {"Apnoea": 1, "Cardiac arrest": 1, "Coma": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Dysstasia": 1, "Fatigue": 1, "Gait disturbance": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A-1110119-", "histograms": [{"histogram": {"Apnoea": 1, "Cardiac arrest": 1, "Coma": 1, "Decreased appetite": 1, "Dysgeusia": 1, "Dysstasia": 1, "Fatigue": 1, "Gait disturbance": 1, "Loss of consciousness": 1}, "batchcodes": ["1I070A-1110119-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A-1110211-.json b/docs/data/histograms/Taiwan, Province of China/1I070A-1110211-.json
index 989563563ab..5a2e457b3ca 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A-1110211-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A-1110211-.json
@@ -1 +1 @@
-{"batchcode": "1I070A-1110211-", "histograms": [{"batchcodes": ["1I070A-1110211-"], "histogram": {"Arthritis": 1, "Breast mass": 1, "Cellulitis": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Embolism venous": 1, "Nausea": 1, "Thrombocytopenia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A-1110211-", "histograms": [{"histogram": {"Arthritis": 1, "Breast mass": 1, "Cellulitis": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Embolism venous": 1, "Nausea": 1, "Thrombocytopenia": 1, "Vomiting": 1}, "batchcodes": ["1I070A-1110211-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A-1110216.json b/docs/data/histograms/Taiwan, Province of China/1I070A-1110216.json
index 5d4b117858c..70ae797d459 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A-1110216.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A-1110216.json
@@ -1 +1 @@
-{"batchcode": "1I070A-1110216", "histograms": [{"batchcodes": ["1I070A-1110216"], "histogram": {"Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Chest discomfort": 1, "Chest pain": 1, "Dizziness": 1, "Electrocardiogram": 1, "Myalgia": 1, "Respiratory distress": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A-1110216", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Chest discomfort": 1, "Chest pain": 1, "Dizziness": 1, "Electrocardiogram": 1, "Myalgia": 1, "Respiratory distress": 1, "Troponin": 1}, "batchcodes": ["1I070A-1110216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A.json b/docs/data/histograms/Taiwan, Province of China/1I070A.json
index ffba3fe5ca2..14e9cfe0104 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A.json
@@ -1 +1 @@
-{"batchcode": "1I070A", "histograms": [{"batchcodes": ["1I070A"], "histogram": {"Magnetic resonance imaging": 2, "Altered state of consciousness": 1, "Bacterial sepsis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Coma": 1, "Dizziness": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Headache": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Neuropathy peripheral": 1, "Overdose": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory rate": 1, "Syncope": 1, "Troponin I": 1, "Troponin increased": 1, "Vital signs measurement": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A", "histograms": [{"histogram": {"Magnetic resonance imaging": 2, "Altered state of consciousness": 1, "Bacterial sepsis": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Coma": 1, "Dizziness": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Headache": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Neuropathy peripheral": 1, "Overdose": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory rate": 1, "Syncope": 1, "Troponin I": 1, "Troponin increased": 1, "Vital signs measurement": 1, "X-ray": 1}, "batchcodes": ["1I070A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110115-.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110115-.json
index c59236c7d71..590aaa18404 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110115-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110115-.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110115-", "histograms": [{"batchcodes": ["1I070A_1110115-"], "histogram": {"Chest X-ray": 2, "Chest discomfort": 2, "Electrocardiogram": 2, "Heart rate": 2, "Myocarditis": 2, "Troponin I": 2, "Abdominal pain upper": 1, "Arrhythmia": 1, "Asthma": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Coma scale": 1, "Dehydration": 1, "Dizziness": 1, "Dysphagia": 1, "Ear inflammation": 1, "Electrocardiogram QT interval": 1, "Fibrin D dimer": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Manufacturing laboratory controls issue": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neurological examination": 1, "Overdose": 1, "Physical examination": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Sinus bradycardia": 1, "Sinus rhythm": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110115-", "histograms": [{"histogram": {"Chest X-ray": 2, "Chest discomfort": 2, "Electrocardiogram": 2, "Heart rate": 2, "Myocarditis": 2, "Troponin I": 2, "Abdominal pain upper": 1, "Arrhythmia": 1, "Asthma": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Coma scale": 1, "Dehydration": 1, "Dizziness": 1, "Dysphagia": 1, "Ear inflammation": 1, "Electrocardiogram QT interval": 1, "Fibrin D dimer": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Manufacturing laboratory controls issue": 1, "Muscular weakness": 1, "Myocardial necrosis marker": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neurological examination": 1, "Overdose": 1, "Physical examination": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Sinus bradycardia": 1, "Sinus rhythm": 1, "Syncope": 1}, "batchcodes": ["1I070A_1110115-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110115.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110115.json
index 5e0c192d065..02fe27b0290 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110115.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110115.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110115", "histograms": [{"batchcodes": ["1I070A_1110115"], "histogram": {"Chest discomfort": 2, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myocarditis": 1, "Respiration abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110115", "histograms": [{"histogram": {"Chest discomfort": 2, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myocarditis": 1, "Respiration abnormal": 1}, "batchcodes": ["1I070A_1110115"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110119-.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110119-.json
index 1e3a27e84da..2e5d50154fd 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110119-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110119-.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110119-", "histograms": [{"batchcodes": ["1I070A_1110119-"], "histogram": {"Pain": 2, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood test": 1, "Electrocardiogram": 1, "Fatigue": 1, "Liver function test": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Myocarditis": 1, "Vascular occlusion": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110119-", "histograms": [{"histogram": {"Pain": 2, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood test": 1, "Electrocardiogram": 1, "Fatigue": 1, "Liver function test": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Myocarditis": 1, "Vascular occlusion": 1}, "batchcodes": ["1I070A_1110119-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110126-.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110126-.json
index 16d9218c929..8cfea64d497 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110126-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110126-.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110126-", "histograms": [{"batchcodes": ["1I070A_1110126-"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110126-", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["1I070A_1110126-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110126.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110126.json
index 562a8931365..17a155d7e8e 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110126.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110126.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110126", "histograms": [{"batchcodes": ["1I070A_1110126"], "histogram": {"Anaphylactic reaction": 1, "Cough": 1, "Dyspnoea": 1, "Immunisation": 1, "Nausea": 1, "Off label use": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110126", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Cough": 1, "Dyspnoea": 1, "Immunisation": 1, "Nausea": 1, "Off label use": 1, "Vaccination site pruritus": 1}, "batchcodes": ["1I070A_1110126"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110126_.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110126_.json
index 25ba14dde1c..12dd989e665 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110126_.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110126_.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110126_", "histograms": [{"batchcodes": ["1I070A_1110126_"], "histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "CSF pressure": 1, "Cerebral haemorrhage": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Coordination abnormal": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate": 1, "Hydrocephalus": 1, "Malaise": 1, "Respiratory rate": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110126_", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "CSF pressure": 1, "Cerebral haemorrhage": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Coordination abnormal": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate": 1, "Hydrocephalus": 1, "Malaise": 1, "Respiratory rate": 1, "Vomiting": 1}, "batchcodes": ["1I070A_1110126_"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110209-.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110209-.json
index 3cef09cf4d1..d9a0c43efb7 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110209-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110209-.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110209-", "histograms": [{"batchcodes": ["1I070A_1110209-"], "histogram": {"Asthma": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Pleural effusion": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110209-", "histograms": [{"histogram": {"Asthma": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Pleural effusion": 1, "Pyrexia": 1}, "batchcodes": ["1I070A_1110209-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110209.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110209.json
index 94deb7d5232..9ec0860b4e9 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110209.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110209.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110209", "histograms": [{"batchcodes": ["1I070A_1110209"], "histogram": {"Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Cerebral infarction": 1, "Death": 1, "Investigation": 1, "Peripheral coldness": 1, "Sepsis": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110209", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Altered state of consciousness": 1, "Cerebral infarction": 1, "Death": 1, "Investigation": 1, "Peripheral coldness": 1, "Sepsis": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["1I070A_1110209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110211-.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110211-.json
index a3b3226acd5..f00647a9c10 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110211-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110211-.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110211-", "histograms": [{"batchcodes": ["1I070A_1110211-"], "histogram": {"Troponin I": 4, "Asthenia": 3, "Blood creatine phosphokinase MB": 3, "Electrocardiogram": 3, "Blood pressure measurement": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chest pain": 2, "Myocardial necrosis marker increased": 2, "Myocarditis": 2, "Physical examination": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Altered state of consciousness": 1, "Angiogram": 1, "Arthritis": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood pressure decreased": 1, "Blood test": 1, "Blood urea": 1, "Body temperature": 1, "Brain natriuretic peptide": 1, "Breath sounds abnormal": 1, "Cardiac failure": 1, "Colonoscopy": 1, "Coronary artery occlusion": 1, "Coronary artery stenosis": 1, "Cyanosis": 1, "Dehydration": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Eye swelling": 1, "Gangrene": 1, "Gastroenteritis": 1, "Gastrointestinal haemorrhage": 1, "Haematochezia": 1, "Haemoglobin": 1, "Hallucination": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Lacrimation increased": 1, "Off label use": 1, "Platelet count": 1, "Pulmonary oedema": 1, "Respiratory rate": 1, "Sepsis": 1, "Thrombosis": 1, "Use of accessory respiratory muscles": 1, "Vascular resistance pulmonary": 1, "Vision blurred": 1, "Vomiting": 1, "Wheezing": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110211-", "histograms": [{"histogram": {"Troponin I": 4, "Asthenia": 3, "Blood creatine phosphokinase MB": 3, "Electrocardiogram": 3, "Blood pressure measurement": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chest pain": 2, "Myocardial necrosis marker increased": 2, "Myocarditis": 2, "Physical examination": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Altered state of consciousness": 1, "Angiogram": 1, "Arthritis": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood pressure decreased": 1, "Blood test": 1, "Blood urea": 1, "Body temperature": 1, "Brain natriuretic peptide": 1, "Breath sounds abnormal": 1, "Cardiac failure": 1, "Colonoscopy": 1, "Coronary artery occlusion": 1, "Coronary artery stenosis": 1, "Cyanosis": 1, "Dehydration": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Eye swelling": 1, "Gangrene": 1, "Gastroenteritis": 1, "Gastrointestinal haemorrhage": 1, "Haematochezia": 1, "Haemoglobin": 1, "Hallucination": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Lacrimation increased": 1, "Off label use": 1, "Platelet count": 1, "Pulmonary oedema": 1, "Respiratory rate": 1, "Sepsis": 1, "Thrombosis": 1, "Use of accessory respiratory muscles": 1, "Vascular resistance pulmonary": 1, "Vision blurred": 1, "Vomiting": 1, "Wheezing": 1, "White blood cell count": 1}, "batchcodes": ["1I070A_1110211-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110216-.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110216-.json
index cb839440787..b991daec81b 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110216-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110216-.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110216-", "histograms": [{"batchcodes": ["1I070A_1110216-"], "histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Blood urea nitrogen/creatinine ratio": 1, "Breath sounds abnormal": 1, "C-reactive protein": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Dehydration": 1, "Dysphoria": 1, "Ear, nose and throat examination abnormal": 1, "Facial nerve disorder": 1, "Headache": 1, "Intestinal obstruction": 1, "Ischaemic enteritis": 1, "Myocarditis": 1, "Overdose": 1, "Pericarditis": 1, "Physical examination": 1, "Pneumonia": 1, "Urine analysis": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110216-", "histograms": [{"histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Blood urea nitrogen/creatinine ratio": 1, "Breath sounds abnormal": 1, "C-reactive protein": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Dehydration": 1, "Dysphoria": 1, "Ear, nose and throat examination abnormal": 1, "Facial nerve disorder": 1, "Headache": 1, "Intestinal obstruction": 1, "Ischaemic enteritis": 1, "Myocarditis": 1, "Overdose": 1, "Pericarditis": 1, "Physical examination": 1, "Pneumonia": 1, "Urine analysis": 1, "White blood cell count": 1}, "batchcodes": ["1I070A_1110216-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I070A_1110216.json b/docs/data/histograms/Taiwan, Province of China/1I070A_1110216.json
index c4d3701dc9b..7f6eda30bc3 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I070A_1110216.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I070A_1110216.json
@@ -1 +1 @@
-{"batchcode": "1I070A_1110216", "histograms": [{"batchcodes": ["1I070A_1110216"], "histogram": {"Blood culture": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Computerised tomogram": 1, "Culture urine": 1, "Heart rate": 1, "Overdose": 1, "Prostatic specific antigen": 1, "Respiratory rate": 1, "Sepsis": 1}}]}
\ No newline at end of file
+{"batchcode": "1I070A_1110216", "histograms": [{"histogram": {"Blood culture": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Computerised tomogram": 1, "Culture urine": 1, "Heart rate": 1, "Overdose": 1, "Prostatic specific antigen": 1, "Respiratory rate": 1, "Sepsis": 1}, "batchcodes": ["1I070A_1110216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I071A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1I071A-CDC.json
index cff36c5a639..beb62f1b777 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I071A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I071A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1I071A-CDC", "histograms": [{"batchcodes": ["1I071A-CDC"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Gastrointestinal viral infection": 1, "Heart rate": 1, "Musculoskeletal pain": 1, "Pain in extremity": 1, "Syncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1I071A-CDC", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Gastrointestinal viral infection": 1, "Heart rate": 1, "Musculoskeletal pain": 1, "Pain in extremity": 1, "Syncope": 1, "Vaccination site pain": 1}, "batchcodes": ["1I071A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I071A.json b/docs/data/histograms/Taiwan, Province of China/1I071A.json
index 3ab3cb0fec8..3c6795aff11 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I071A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I071A.json
@@ -1 +1 @@
-{"batchcode": "1I071A", "histograms": [{"batchcodes": ["1I071A"], "histogram": {"Dizziness": 2, "Syncope": 2, "Body temperature": 1, "Limb discomfort": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nausea": 1, "Pyrexia": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "1I071A", "histograms": [{"histogram": {"Dizziness": 2, "Syncope": 2, "Body temperature": 1, "Limb discomfort": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nausea": 1, "Pyrexia": 1, "Troponin": 1}, "batchcodes": ["1I071A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I071A_1110216-.json b/docs/data/histograms/Taiwan, Province of China/1I071A_1110216-.json
index 994e6c4f818..766797c9bbe 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I071A_1110216-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I071A_1110216-.json
@@ -1 +1 @@
-{"batchcode": "1I071A_1110216-", "histograms": [{"batchcodes": ["1I071A_1110216-"], "histogram": {"Altered state of consciousness": 1, "Blister infected": 1, "Blood creatine phosphokinase MB": 1, "Blood uric acid": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest pain": 1, "Cold sweat": 1, "Coma scale": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Laboratory test": 1, "Pericardial effusion": 1, "Physical examination": 1, "Scan myocardial perfusion": 1, "Sepsis": 1, "Troponin I": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "1I071A_1110216-", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Blister infected": 1, "Blood creatine phosphokinase MB": 1, "Blood uric acid": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest pain": 1, "Cold sweat": 1, "Coma scale": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Laboratory test": 1, "Pericardial effusion": 1, "Physical examination": 1, "Scan myocardial perfusion": 1, "Sepsis": 1, "Troponin I": 1, "Vital signs measurement": 1}, "batchcodes": ["1I071A_1110216-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I071A_1110218-.json b/docs/data/histograms/Taiwan, Province of China/1I071A_1110218-.json
index f5b3d7a48fd..d977fad7740 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I071A_1110218-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I071A_1110218-.json
@@ -1 +1 @@
-{"batchcode": "1I071A_1110218-", "histograms": [{"batchcodes": ["1I071A_1110218-"], "histogram": {"Anaphylactic reaction": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Chest discomfort": 1, "Coma": 1, "Coma scale": 1, "Facial paralysis": 1, "Hypoxia": 1, "Lacrimation increased": 1, "Malaise": 1, "Muscular weakness": 1, "Overdose": 1, "Renal failure": 1}}]}
\ No newline at end of file
+{"batchcode": "1I071A_1110218-", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Chest discomfort": 1, "Coma": 1, "Coma scale": 1, "Facial paralysis": 1, "Hypoxia": 1, "Lacrimation increased": 1, "Malaise": 1, "Muscular weakness": 1, "Overdose": 1, "Renal failure": 1}, "batchcodes": ["1I071A_1110218-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I071A_1110218.json b/docs/data/histograms/Taiwan, Province of China/1I071A_1110218.json
index e97b1442b08..6ca477437a6 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I071A_1110218.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I071A_1110218.json
@@ -1 +1 @@
-{"batchcode": "1I071A_1110218", "histograms": [{"batchcodes": ["1I071A_1110218"], "histogram": {"Blood potassium": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coma scale": 1, "Dizziness": 1, "Electrocardiogram": 1, "Headache": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Neutrophil percentage": 1, "Oxygen saturation": 1, "Pyrexia": 1, "QRS axis abnormal": 1, "Respiratory rate": 1, "Urinary sediment present": 1, "Urinary tract infection": 1, "White blood cell count": 1, "White blood cells urine": 1}}]}
\ No newline at end of file
+{"batchcode": "1I071A_1110218", "histograms": [{"histogram": {"Blood potassium": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coma scale": 1, "Dizziness": 1, "Electrocardiogram": 1, "Headache": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Neutrophil percentage": 1, "Oxygen saturation": 1, "Pyrexia": 1, "QRS axis abnormal": 1, "Respiratory rate": 1, "Urinary sediment present": 1, "Urinary tract infection": 1, "White blood cell count": 1, "White blood cells urine": 1}, "batchcodes": ["1I071A_1110218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I071A_1110223-.json b/docs/data/histograms/Taiwan, Province of China/1I071A_1110223-.json
index abbcd553087..8a939f7e1a1 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I071A_1110223-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I071A_1110223-.json
@@ -1 +1 @@
-{"batchcode": "1I071A_1110223-", "histograms": [{"batchcodes": ["1I071A_1110223-"], "histogram": {"Death": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "1I071A_1110223-", "histograms": [{"histogram": {"Death": 1, "Muscular weakness": 1}, "batchcodes": ["1I071A_1110223-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1I70A_1110211.json b/docs/data/histograms/Taiwan, Province of China/1I70A_1110211.json
index 1ed6d47f3a1..30929b8c933 100644
--- a/docs/data/histograms/Taiwan, Province of China/1I70A_1110211.json
+++ b/docs/data/histograms/Taiwan, Province of China/1I70A_1110211.json
@@ -1 +1 @@
-{"batchcode": "1I70A_1110211", "histograms": [{"batchcodes": ["1I70A_1110211"], "histogram": {"Altered state of consciousness": 1, "Blood creatine phosphokinase": 1, "Blood electrolytes": 1, "Blood gases": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "C-reactive protein": 1, "Coma scale": 1, "Fibrin D dimer": 1, "Haemoglobin": 1, "Heart rate": 1, "Leptospirosis": 1, "Metabolic acidosis": 1, "Musculoskeletal stiffness": 1, "Overdose": 1, "Platelet count": 1, "Respiratory rate": 1, "Scrub typhus": 1, "Seizure": 1, "Sepsis": 1, "Septic shock": 1, "Severe fever with thrombocytopenia syndrome": 1, "Shock": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1I70A_1110211", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Blood creatine phosphokinase": 1, "Blood electrolytes": 1, "Blood gases": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "C-reactive protein": 1, "Coma scale": 1, "Fibrin D dimer": 1, "Haemoglobin": 1, "Heart rate": 1, "Leptospirosis": 1, "Metabolic acidosis": 1, "Musculoskeletal stiffness": 1, "Overdose": 1, "Platelet count": 1, "Respiratory rate": 1, "Scrub typhus": 1, "Seizure": 1, "Sepsis": 1, "Septic shock": 1, "Severe fever with thrombocytopenia syndrome": 1, "Shock": 1, "White blood cell count": 1}, "batchcodes": ["1I70A_1110211"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1ID69A-1110112-.json b/docs/data/histograms/Taiwan, Province of China/1ID69A-1110112-.json
index 5b897356c9b..a8b7a65adb4 100644
--- a/docs/data/histograms/Taiwan, Province of China/1ID69A-1110112-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1ID69A-1110112-.json
@@ -1 +1 @@
-{"batchcode": "1ID69A-1110112-", "histograms": [{"batchcodes": ["1ID69A-1110112-"], "histogram": {"Blood test": 1, "Chest discomfort": 1, "Discomfort": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Respiratory arrest": 1}}]}
\ No newline at end of file
+{"batchcode": "1ID69A-1110112-", "histograms": [{"histogram": {"Blood test": 1, "Chest discomfort": 1, "Discomfort": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Respiratory arrest": 1}, "batchcodes": ["1ID69A-1110112-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1IO70A-CDC.json b/docs/data/histograms/Taiwan, Province of China/1IO70A-CDC.json
index f5dba0f31c0..b5b717c8647 100644
--- a/docs/data/histograms/Taiwan, Province of China/1IO70A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/1IO70A-CDC.json
@@ -1 +1 @@
-{"batchcode": "1IO70A-CDC", "histograms": [{"batchcodes": ["1IO70A-CDC"], "histogram": {"Blood test": 1, "Electrocardiogram": 1, "Overdose": 1, "Viral myocarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "1IO70A-CDC", "histograms": [{"histogram": {"Blood test": 1, "Electrocardiogram": 1, "Overdose": 1, "Viral myocarditis": 1}, "batchcodes": ["1IO70A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1K083A-1110224.json b/docs/data/histograms/Taiwan, Province of China/1K083A-1110224.json
index e717dd31272..bc65ae46e94 100644
--- a/docs/data/histograms/Taiwan, Province of China/1K083A-1110224.json
+++ b/docs/data/histograms/Taiwan, Province of China/1K083A-1110224.json
@@ -1 +1 @@
-{"batchcode": "1K083A-1110224", "histograms": [{"batchcodes": ["1K083A-1110224"], "histogram": {"Blood test": 1, "Chest discomfort": 1, "Fibrin D dimer": 1, "Myalgia": 1, "Physical examination": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "1K083A-1110224", "histograms": [{"histogram": {"Blood test": 1, "Chest discomfort": 1, "Fibrin D dimer": 1, "Myalgia": 1, "Physical examination": 1, "Troponin I": 1}, "batchcodes": ["1K083A-1110224"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1K083A-1110226-.json b/docs/data/histograms/Taiwan, Province of China/1K083A-1110226-.json
index 941ec0f013a..38f765d9ae9 100644
--- a/docs/data/histograms/Taiwan, Province of China/1K083A-1110226-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1K083A-1110226-.json
@@ -1 +1 @@
-{"batchcode": "1K083A-1110226-", "histograms": [{"batchcodes": ["1K083A-1110226-"], "histogram": {"Cerebrovascular accident": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Limb injury": 1, "Muscular weakness": 1, "Night sweats": 1, "Pain in extremity": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "1K083A-1110226-", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Chest X-ray": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Limb injury": 1, "Muscular weakness": 1, "Night sweats": 1, "Pain in extremity": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["1K083A-1110226-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1K083A.json b/docs/data/histograms/Taiwan, Province of China/1K083A.json
index 22a75189ead..e24e748560d 100644
--- a/docs/data/histograms/Taiwan, Province of China/1K083A.json
+++ b/docs/data/histograms/Taiwan, Province of China/1K083A.json
@@ -1 +1 @@
-{"batchcode": "1K083A", "histograms": [{"batchcodes": ["1K083A"], "histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Asthma": 1, "Body temperature": 1, "Chest discomfort": 1, "Diarrhoea": 1, "Discomfort": 1, "Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Overdose": 1, "Palpitations": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "1K083A", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Asthma": 1, "Body temperature": 1, "Chest discomfort": 1, "Diarrhoea": 1, "Discomfort": 1, "Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Overdose": 1, "Palpitations": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site swelling": 1}, "batchcodes": ["1K083A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1K083A_1110226-.json b/docs/data/histograms/Taiwan, Province of China/1K083A_1110226-.json
index 6f215821142..2e93a76cb2d 100644
--- a/docs/data/histograms/Taiwan, Province of China/1K083A_1110226-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1K083A_1110226-.json
@@ -1 +1 @@
-{"batchcode": "1K083A_1110226-", "histograms": [{"batchcodes": ["1K083A_1110226-"], "histogram": {"Discomfort": 2, "Abdominal pain": 1, "Asthenia": 1, "Blood test": 1, "Diarrhoea": 1, "Fatigue": 1, "Interchange of vaccine products": 1, "Ischaemic enteritis": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1K083A_1110226-", "histograms": [{"histogram": {"Discomfort": 2, "Abdominal pain": 1, "Asthenia": 1, "Blood test": 1, "Diarrhoea": 1, "Fatigue": 1, "Interchange of vaccine products": 1, "Ischaemic enteritis": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["1K083A_1110226-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1K083A_1110309-.json b/docs/data/histograms/Taiwan, Province of China/1K083A_1110309-.json
index b75b0dc7de0..8565ca15118 100644
--- a/docs/data/histograms/Taiwan, Province of China/1K083A_1110309-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1K083A_1110309-.json
@@ -1 +1 @@
-{"batchcode": "1K083A_1110309-", "histograms": [{"batchcodes": ["1K083A_1110309-"], "histogram": {"Blood pressure measurement": 2, "Asthenia": 1, "Back pain": 1, "Bacterial test": 1, "Bacterial test positive": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiopulmonary failure": 1, "Chills": 1, "Cold sweat": 1, "Dizziness": 1, "Facial paralysis": 1, "Fatigue": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Limb discomfort": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Troponin I": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1K083A_1110309-", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Asthenia": 1, "Back pain": 1, "Bacterial test": 1, "Bacterial test positive": 1, "C-reactive protein": 1, "Cardiac arrest": 1, "Cardiopulmonary failure": 1, "Chills": 1, "Cold sweat": 1, "Dizziness": 1, "Facial paralysis": 1, "Fatigue": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Limb discomfort": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pallor": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Troponin I": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["1K083A_1110309-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1K083A_1110323-.json b/docs/data/histograms/Taiwan, Province of China/1K083A_1110323-.json
index c1f0a0c2bbd..546304cf65c 100644
--- a/docs/data/histograms/Taiwan, Province of China/1K083A_1110323-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1K083A_1110323-.json
@@ -1 +1 @@
-{"batchcode": "1K083A_1110323-", "histograms": [{"batchcodes": ["1K083A_1110323-"], "histogram": {"Chest pain": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram": 1, "Dizziness": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Headache": 1, "Heart rate": 1, "Heart rate irregular": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "Spleen disorder": 1, "Thrombosis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "1K083A_1110323-", "histograms": [{"histogram": {"Chest pain": 2, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram": 1, "Dizziness": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Headache": 1, "Heart rate": 1, "Heart rate irregular": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Off label use": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "Spleen disorder": 1, "Thrombosis": 1, "Vomiting": 1}, "batchcodes": ["1K083A_1110323-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1K083A_1110323.json b/docs/data/histograms/Taiwan, Province of China/1K083A_1110323.json
index ab5fefa79e1..c618e8e4cc2 100644
--- a/docs/data/histograms/Taiwan, Province of China/1K083A_1110323.json
+++ b/docs/data/histograms/Taiwan, Province of China/1K083A_1110323.json
@@ -1 +1 @@
-{"batchcode": "1K083A_1110323", "histograms": [{"batchcodes": ["1K083A_1110323"], "histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Coma scale": 2, "Electrocardiogram": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Blood glucose": 1, "C-reactive protein": 1, "C-reactive protein abnormal": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Lymphocyte count": 1, "Lymphocyte percentage abnormal": 1, "Nausea": 1, "Neutrophil count": 1, "Neutrophil percentage abnormal": 1, "Palpitations": 1, "QRS axis abnormal": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1K083A_1110323", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Body temperature": 2, "Coma scale": 2, "Electrocardiogram": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Blood glucose": 1, "C-reactive protein": 1, "C-reactive protein abnormal": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Lymphocyte count": 1, "Lymphocyte percentage abnormal": 1, "Nausea": 1, "Neutrophil count": 1, "Neutrophil percentage abnormal": 1, "Palpitations": 1, "QRS axis abnormal": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["1K083A_1110323"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1L063A_1110105-.json b/docs/data/histograms/Taiwan, Province of China/1L063A_1110105-.json
index 7b961ad5329..27f7edbce5a 100644
--- a/docs/data/histograms/Taiwan, Province of China/1L063A_1110105-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1L063A_1110105-.json
@@ -1 +1 @@
-{"batchcode": "1L063A_1110105-", "histograms": [{"batchcodes": ["1L063A_1110105-"], "histogram": {"Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Chest pain": 1, "Cough": 1, "Myalgia": 1, "Myocarditis": 1, "Physical examination": 1, "Pyrexia": 1, "Troponin I": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "1L063A_1110105-", "histograms": [{"histogram": {"Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "C-reactive protein": 1, "Chest pain": 1, "Cough": 1, "Myalgia": 1, "Myocarditis": 1, "Physical examination": 1, "Pyrexia": 1, "Troponin I": 1, "White blood cell count": 1}, "batchcodes": ["1L063A_1110105-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1L069A_1110105.json b/docs/data/histograms/Taiwan, Province of China/1L069A_1110105.json
index 77c6c09a5e2..1c6d9508bcd 100644
--- a/docs/data/histograms/Taiwan, Province of China/1L069A_1110105.json
+++ b/docs/data/histograms/Taiwan, Province of China/1L069A_1110105.json
@@ -1 +1 @@
-{"batchcode": "1L069A_1110105", "histograms": [{"batchcodes": ["1L069A_1110105"], "histogram": {"Fall": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Seizure": 1, "Swelling": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "1L069A_1110105", "histograms": [{"histogram": {"Fall": 1, "Gaze palsy": 1, "Generalised tonic-clonic seizure": 1, "Seizure": 1, "Swelling": 1, "Syncope": 1}, "batchcodes": ["1L069A_1110105"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/1L069A_1110106-.json b/docs/data/histograms/Taiwan, Province of China/1L069A_1110106-.json
index 046dad08262..64342c59b92 100644
--- a/docs/data/histograms/Taiwan, Province of China/1L069A_1110106-.json
+++ b/docs/data/histograms/Taiwan, Province of China/1L069A_1110106-.json
@@ -1 +1 @@
-{"batchcode": "1L069A_1110106-", "histograms": [{"batchcodes": ["1L069A_1110106-"], "histogram": {"Body temperature": 1, "Embolism venous": 1, "Fibrin D dimer": 1, "Laboratory test": 1, "Musculoskeletal stiffness": 1, "Oedema peripheral": 1, "Thrombocytopenia": 1, "Venogram": 1}}]}
\ No newline at end of file
+{"batchcode": "1L069A_1110106-", "histograms": [{"histogram": {"Body temperature": 1, "Embolism venous": 1, "Fibrin D dimer": 1, "Laboratory test": 1, "Musculoskeletal stiffness": 1, "Oedema peripheral": 1, "Thrombocytopenia": 1, "Venogram": 1}, "batchcodes": ["1L069A_1110106-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2011685_1110305.json b/docs/data/histograms/Taiwan, Province of China/2011685_1110305.json
index 28315ccf06e..569935fd4d9 100644
--- a/docs/data/histograms/Taiwan, Province of China/2011685_1110305.json
+++ b/docs/data/histograms/Taiwan, Province of China/2011685_1110305.json
@@ -1 +1 @@
-{"batchcode": "2011685_1110305", "histograms": [{"batchcodes": ["2011685_1110305"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "2011685_1110305", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["2011685_1110305"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100685-1110305.json b/docs/data/histograms/Taiwan, Province of China/2100685-1110305.json
index 11c1adec990..7cbdeb5720a 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100685-1110305.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100685-1110305.json
@@ -1 +1 @@
-{"batchcode": "2100685-1110305", "histograms": [{"batchcodes": ["2100685-1110305"], "histogram": {"Alopecia": 1, "Blood test": 1}}]}
\ No newline at end of file
+{"batchcode": "2100685-1110305", "histograms": [{"histogram": {"Alopecia": 1, "Blood test": 1}, "batchcodes": ["2100685-1110305"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100685-CDC.json b/docs/data/histograms/Taiwan, Province of China/2100685-CDC.json
index 6c4baca1243..55b57a601d8 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100685-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100685-CDC.json
@@ -1 +1 @@
-{"batchcode": "2100685-CDC", "histograms": [{"batchcodes": ["2100685-CDC"], "histogram": {"Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "2100685-CDC", "histograms": [{"histogram": {"Chest pain": 1}, "batchcodes": ["2100685-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100685.json b/docs/data/histograms/Taiwan, Province of China/2100685.json
index b312c52c6fd..9bd90b839dd 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100685.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100685.json
@@ -1 +1 @@
-{"batchcode": "2100685", "histograms": [{"batchcodes": ["2100685"], "histogram": {"Syncope": 3, "Chest pain": 2, "Paraesthesia": 2, "Sepsis": 2, "Abdominal pain": 1, "Anti-platelet factor 4 antibody test": 1, "Aphasia": 1, "Bacteraemia": 1, "Blood pressure measurement": 1, "Body mass index": 1, "Body temperature": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Coma hepatic": 1, "Coma scale": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Embolic stroke": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Heart rate": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Illusion": 1, "Ischaemic stroke": 1, "Liver abscess": 1, "Muscular weakness": 1, "Myocarditis": 1, "Paralysis": 1, "Platelet count": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Septic shock": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "2100685", "histograms": [{"histogram": {"Syncope": 3, "Chest pain": 2, "Paraesthesia": 2, "Sepsis": 2, "Abdominal pain": 1, "Anti-platelet factor 4 antibody test": 1, "Aphasia": 1, "Bacteraemia": 1, "Blood pressure measurement": 1, "Body mass index": 1, "Body temperature": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Coma hepatic": 1, "Coma scale": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Embolic stroke": 1, "Facial paralysis": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Heart rate": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Illusion": 1, "Ischaemic stroke": 1, "Liver abscess": 1, "Muscular weakness": 1, "Myocarditis": 1, "Paralysis": 1, "Platelet count": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Septic shock": 1, "Thrombosis": 1, "Transient ischaemic attack": 1, "Troponin I": 1}, "batchcodes": ["2100685"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100685_11103 0.json b/docs/data/histograms/Taiwan, Province of China/2100685_11103 0.json
index 5b84fee9404..496fddcc25c 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100685_11103 0.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100685_11103 0.json
@@ -1 +1 @@
-{"batchcode": "2100685_11103 0", "histograms": [{"batchcodes": ["2100685_11103 0"], "histogram": {"Blood pressure measurement": 1, "Coma scale": 1, "Deep vein thrombosis": 1, "Echocardiogram": 1}}]}
\ No newline at end of file
+{"batchcode": "2100685_11103 0", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Coma scale": 1, "Deep vein thrombosis": 1, "Echocardiogram": 1}, "batchcodes": ["2100685_11103 0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100685_1110305.json b/docs/data/histograms/Taiwan, Province of China/2100685_1110305.json
index 7847fa17c9f..c82347483b7 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100685_1110305.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100685_1110305.json
@@ -1 +1 @@
-{"batchcode": "2100685_1110305", "histograms": [{"batchcodes": ["2100685_1110305"], "histogram": {"Chest discomfort": 4, "Chest pain": 2, "Dyspnoea": 2, "Fatigue": 2, "Muscular weakness": 2, "Acute myocardial infarction": 1, "Alopecia": 1, "Atrioventricular block complete": 1, "Cardiac arrest": 1, "Computerised tomogram": 1, "Headache": 1, "Hiccups": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpatory finding abnormal": 1, "Productive cough": 1, "Pyrexia": 1, "Syncope": 1, "Tachypnoea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "2100685_1110305", "histograms": [{"histogram": {"Chest discomfort": 4, "Chest pain": 2, "Dyspnoea": 2, "Fatigue": 2, "Muscular weakness": 2, "Acute myocardial infarction": 1, "Alopecia": 1, "Atrioventricular block complete": 1, "Cardiac arrest": 1, "Computerised tomogram": 1, "Headache": 1, "Hiccups": 1, "Hyperhidrosis": 1, "Lymphadenopathy": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpatory finding abnormal": 1, "Productive cough": 1, "Pyrexia": 1, "Syncope": 1, "Tachypnoea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["2100685_1110305"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100685_1110308.json b/docs/data/histograms/Taiwan, Province of China/2100685_1110308.json
index f5cf6645e6a..a8f4f513738 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100685_1110308.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100685_1110308.json
@@ -1 +1 @@
-{"batchcode": "2100685_1110308", "histograms": [{"batchcodes": ["2100685_1110308"], "histogram": {"Feeling cold": 1, "Headache": 1, "Muscular weakness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "2100685_1110308", "histograms": [{"histogram": {"Feeling cold": 1, "Headache": 1, "Muscular weakness": 1, "Pyrexia": 1}, "batchcodes": ["2100685_1110308"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100685_1110314.json b/docs/data/histograms/Taiwan, Province of China/2100685_1110314.json
index 119cd535adf..73c5c46e586 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100685_1110314.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100685_1110314.json
@@ -1 +1 @@
-{"batchcode": "2100685_1110314", "histograms": [{"batchcodes": ["2100685_1110314"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "2100685_1110314", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["2100685_1110314"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686, 111042.json b/docs/data/histograms/Taiwan, Province of China/2100686, 111042.json
index 0319369e342..759bb011879 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686, 111042.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686, 111042.json
@@ -1 +1 @@
-{"batchcode": "2100686, 111042", "histograms": [{"batchcodes": ["2100686, 111042"], "histogram": {"Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Heart rate": 1, "Oxygen saturation": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686, 111042", "histograms": [{"histogram": {"Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Heart rate": 1, "Oxygen saturation": 1, "Respiratory rate": 1}, "batchcodes": ["2100686, 111042"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686-1110425.json b/docs/data/histograms/Taiwan, Province of China/2100686-1110425.json
index 91c8369cafb..0fb505da2dd 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686-1110425.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686-1110425.json
@@ -1 +1 @@
-{"batchcode": "2100686-1110425", "histograms": [{"batchcodes": ["2100686-1110425"], "histogram": {"Abdominal pain": 1, "Chest X-ray": 1, "Computerised tomogram abdomen": 1, "Endoscopy upper gastrointestinal tract": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686-1110425", "histograms": [{"histogram": {"Abdominal pain": 1, "Chest X-ray": 1, "Computerised tomogram abdomen": 1, "Endoscopy upper gastrointestinal tract": 1, "Pyrexia": 1}, "batchcodes": ["2100686-1110425"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686-1110427.json b/docs/data/histograms/Taiwan, Province of China/2100686-1110427.json
index 0b57aa349b0..015db603ca4 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686-1110427.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686-1110427.json
@@ -1 +1 @@
-{"batchcode": "2100686-1110427", "histograms": [{"batchcodes": ["2100686-1110427"], "histogram": {"Headache": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686-1110427", "histograms": [{"histogram": {"Headache": 1, "Syncope": 1}, "batchcodes": ["2100686-1110427"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686.json b/docs/data/histograms/Taiwan, Province of China/2100686.json
index 68746b2d794..bf5cf38466d 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686.json
@@ -1 +1 @@
-{"batchcode": "2100686", "histograms": [{"batchcodes": ["2100686"], "histogram": {"Headache": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686", "histograms": [{"histogram": {"Headache": 1, "Muscular weakness": 1}, "batchcodes": ["2100686"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686_1110322.json b/docs/data/histograms/Taiwan, Province of China/2100686_1110322.json
index 027fe2b50d8..3de817ad406 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686_1110322.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686_1110322.json
@@ -1 +1 @@
-{"batchcode": "2100686_1110322", "histograms": [{"batchcodes": ["2100686_1110322"], "histogram": {"Coma": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686_1110322", "histograms": [{"histogram": {"Coma": 1}, "batchcodes": ["2100686_1110322"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686_1110323.json b/docs/data/histograms/Taiwan, Province of China/2100686_1110323.json
index e6964c9d31e..f7096ea81df 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686_1110323.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686_1110323.json
@@ -1 +1 @@
-{"batchcode": "2100686_1110323", "histograms": [{"batchcodes": ["2100686_1110323"], "histogram": {"Muscular weakness": 3, "Blood test": 1, "Chest discomfort": 1, "Consciousness fluctuating": 1, "Dysarthria": 1, "Facial paralysis": 1, "Myocarditis": 1, "Respiration abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686_1110323", "histograms": [{"histogram": {"Muscular weakness": 3, "Blood test": 1, "Chest discomfort": 1, "Consciousness fluctuating": 1, "Dysarthria": 1, "Facial paralysis": 1, "Myocarditis": 1, "Respiration abnormal": 1}, "batchcodes": ["2100686_1110323"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686_1110418.json b/docs/data/histograms/Taiwan, Province of China/2100686_1110418.json
index 663bceea8fc..3107b6b062d 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686_1110418.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686_1110418.json
@@ -1 +1 @@
-{"batchcode": "2100686_1110418", "histograms": [{"batchcodes": ["2100686_1110418"], "histogram": {"Altered state of consciousness": 2, "Anti-platelet factor 4 antibody test": 1, "Chest discomfort": 1, "Coronary artery disease": 1, "Ecchymosis": 1, "Muscular weakness": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686_1110418", "histograms": [{"histogram": {"Altered state of consciousness": 2, "Anti-platelet factor 4 antibody test": 1, "Chest discomfort": 1, "Coronary artery disease": 1, "Ecchymosis": 1, "Muscular weakness": 1, "Thrombocytopenia": 1}, "batchcodes": ["2100686_1110418"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100686_1110427.json b/docs/data/histograms/Taiwan, Province of China/2100686_1110427.json
index fffe640e76a..47e8fc02013 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100686_1110427.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100686_1110427.json
@@ -1 +1 @@
-{"batchcode": "2100686_1110427", "histograms": [{"batchcodes": ["2100686_1110427"], "histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebral haemorrhage": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Headache": 1, "Heart rate": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Oxygen saturation": 1}}]}
\ No newline at end of file
+{"batchcode": "2100686_1110427", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Cerebral haemorrhage": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Headache": 1, "Heart rate": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Oxygen saturation": 1}, "batchcodes": ["2100686_1110427"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100696-1110525.json b/docs/data/histograms/Taiwan, Province of China/2100696-1110525.json
index 4f8dff10648..f8704650814 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100696-1110525.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100696-1110525.json
@@ -1 +1 @@
-{"batchcode": "2100696-1110525", "histograms": [{"batchcodes": ["2100696-1110525"], "histogram": {"Bell's palsy": 1, "Facial paralysis": 1, "Lagophthalmos": 1}}]}
\ No newline at end of file
+{"batchcode": "2100696-1110525", "histograms": [{"histogram": {"Bell's palsy": 1, "Facial paralysis": 1, "Lagophthalmos": 1}, "batchcodes": ["2100696-1110525"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100696.json b/docs/data/histograms/Taiwan, Province of China/2100696.json
index 1afe44710c8..56410acd6cb 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100696.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100696.json
@@ -1 +1 @@
-{"batchcode": "2100696", "histograms": [{"batchcodes": ["2100696"], "histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood lactic acid": 1, "Blood urea nitrogen/creatinine ratio": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Echocardiogram": 1, "Haemoglobin": 1, "Mean cell volume": 1, "Platelet count": 1, "Prurigo": 1, "Rash": 1, "Red cell distribution width": 1, "Troponin I": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "2100696", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood lactic acid": 1, "Blood urea nitrogen/creatinine ratio": 1, "Cardiac failure": 1, "Chest X-ray": 1, "Echocardiogram": 1, "Haemoglobin": 1, "Mean cell volume": 1, "Platelet count": 1, "Prurigo": 1, "Rash": 1, "Red cell distribution width": 1, "Troponin I": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "White blood cell count": 1}, "batchcodes": ["2100696"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100696_1110525.json b/docs/data/histograms/Taiwan, Province of China/2100696_1110525.json
index 07766f00dda..b23bc720d0a 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100696_1110525.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100696_1110525.json
@@ -1 +1 @@
-{"batchcode": "2100696_1110525", "histograms": [{"batchcodes": ["2100696_1110525"], "histogram": {"Blood pressure measurement": 2, "Coma scale": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Aphasia": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood test": 1, "Body temperature": 1, "Chest pain": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram head": 1, "Echocardiogram": 1, "Haemoglobin": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Laboratory test": 1, "Mean cell volume": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Occult blood": 1, "Pancytopenia": 1, "Physical examination": 1, "Platelet count": 1, "Rash": 1, "Splenomegaly": 1, "Syncope": 1, "Ultrasound abdomen": 1, "Vital signs measurement": 1, "Vitamin B12": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "2100696_1110525", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Coma scale": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Aphasia": 1, "Blood immunoglobulin A": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood lactate dehydrogenase": 1, "Blood test": 1, "Body temperature": 1, "Chest pain": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram head": 1, "Echocardiogram": 1, "Haemoglobin": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Laboratory test": 1, "Mean cell volume": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Occult blood": 1, "Pancytopenia": 1, "Physical examination": 1, "Platelet count": 1, "Rash": 1, "Splenomegaly": 1, "Syncope": 1, "Ultrasound abdomen": 1, "Vital signs measurement": 1, "Vitamin B12": 1, "White blood cell count": 1}, "batchcodes": ["2100696_1110525"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100696_1110606.json b/docs/data/histograms/Taiwan, Province of China/2100696_1110606.json
index 5f5b09a116a..91c17f5c426 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100696_1110606.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100696_1110606.json
@@ -1 +1 @@
-{"batchcode": "2100696_1110606", "histograms": [{"batchcodes": ["2100696_1110606"], "histogram": {"Angiogram": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Consciousness fluctuating": 1, "Headache": 1, "Heart rate": 1, "Muscular weakness": 1, "Physical examination": 1, "Respiratory rate": 1}}]}
\ No newline at end of file
+{"batchcode": "2100696_1110606", "histograms": [{"histogram": {"Angiogram": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Consciousness fluctuating": 1, "Headache": 1, "Heart rate": 1, "Muscular weakness": 1, "Physical examination": 1, "Respiratory rate": 1}, "batchcodes": ["2100696_1110606"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100696_1110629.json b/docs/data/histograms/Taiwan, Province of China/2100696_1110629.json
index a2d5481150a..01601183f76 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100696_1110629.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100696_1110629.json
@@ -1 +1 @@
-{"batchcode": "2100696_1110629", "histograms": [{"batchcodes": ["2100696_1110629"], "histogram": {"Altered state of consciousness": 1, "Syncope": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "2100696_1110629", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Syncope": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["2100696_1110629"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100696_1110703.json b/docs/data/histograms/Taiwan, Province of China/2100696_1110703.json
index 528dbfaf462..15bbe2e76c8 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100696_1110703.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100696_1110703.json
@@ -1 +1 @@
-{"batchcode": "2100696_1110703", "histograms": [{"batchcodes": ["2100696_1110703"], "histogram": {"Abdomen scan": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Hepatitis acute": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "2100696_1110703", "histograms": [{"histogram": {"Abdomen scan": 1, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Hepatitis acute": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["2100696_1110703"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100702.json b/docs/data/histograms/Taiwan, Province of China/2100702.json
index 30555ab4f50..e6655adc3f6 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100702.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100702.json
@@ -1 +1 @@
-{"batchcode": "2100702", "histograms": [{"batchcodes": ["2100702"], "histogram": {"Myalgia": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "2100702", "histograms": [{"histogram": {"Myalgia": 1, "Vasculitis": 1}, "batchcodes": ["2100702"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/21007021108012C.json b/docs/data/histograms/Taiwan, Province of China/21007021108012C.json
index 5ff13c08087..8b47268b3d8 100644
--- a/docs/data/histograms/Taiwan, Province of China/21007021108012C.json
+++ b/docs/data/histograms/Taiwan, Province of China/21007021108012C.json
@@ -1 +1 @@
-{"batchcode": "21007021108012C", "histograms": [{"batchcodes": ["21007021108012C"], "histogram": {"Auscultation": 1, "Band neutrophil count": 1, "Body temperature": 1, "Diagnostic aspiration": 1, "Dyspnoea": 1, "Heart rate": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory rate": 1, "Ultrasound scan": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "21007021108012C", "histograms": [{"histogram": {"Auscultation": 1, "Band neutrophil count": 1, "Body temperature": 1, "Diagnostic aspiration": 1, "Dyspnoea": 1, "Heart rate": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Respiratory rate": 1, "Ultrasound scan": 1, "White blood cell count": 1}, "batchcodes": ["21007021108012C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100702_1110705.json b/docs/data/histograms/Taiwan, Province of China/2100702_1110705.json
index b3e0579b630..3aff04113da 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100702_1110705.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100702_1110705.json
@@ -1 +1 @@
-{"batchcode": "2100702_1110705", "histograms": [{"batchcodes": ["2100702_1110705"], "histogram": {"Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "2100702_1110705", "histograms": [{"histogram": {"Thrombocytopenia": 1}, "batchcodes": ["2100702_1110705"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100702_1110712.json b/docs/data/histograms/Taiwan, Province of China/2100702_1110712.json
index 2a75da1f419..0b2837ce4e6 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100702_1110712.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100702_1110712.json
@@ -1 +1 @@
-{"batchcode": "2100702_1110712", "histograms": [{"batchcodes": ["2100702_1110712"], "histogram": {"Haematuria": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "2100702_1110712", "histograms": [{"histogram": {"Haematuria": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["2100702_1110712"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100702_1110718.json b/docs/data/histograms/Taiwan, Province of China/2100702_1110718.json
index 6cbccf54b16..1c3ce13fb9f 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100702_1110718.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100702_1110718.json
@@ -1 +1 @@
-{"batchcode": "2100702_1110718", "histograms": [{"batchcodes": ["2100702_1110718"], "histogram": {"Computerised tomogram": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Paralysis": 1, "Sepsis": 1}}]}
\ No newline at end of file
+{"batchcode": "2100702_1110718", "histograms": [{"histogram": {"Computerised tomogram": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Paralysis": 1, "Sepsis": 1}, "batchcodes": ["2100702_1110718"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100702_1110725.json b/docs/data/histograms/Taiwan, Province of China/2100702_1110725.json
index aae8d6837c0..8f8b817ef96 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100702_1110725.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100702_1110725.json
@@ -1 +1 @@
-{"batchcode": "2100702_1110725", "histograms": [{"batchcodes": ["2100702_1110725"], "histogram": {"Syncope": 2, "Blood pressure measurement": 1, "Catheterisation cardiac": 1, "Decreased appetite": 1, "Echocardiogram": 1, "Hypersensitivity": 1, "Muscular weakness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "2100702_1110725", "histograms": [{"histogram": {"Syncope": 2, "Blood pressure measurement": 1, "Catheterisation cardiac": 1, "Decreased appetite": 1, "Echocardiogram": 1, "Hypersensitivity": 1, "Muscular weakness": 1, "Pyrexia": 1}, "batchcodes": ["2100702_1110725"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100703_1110820.json b/docs/data/histograms/Taiwan, Province of China/2100703_1110820.json
index be807532c16..6f91fe24a40 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100703_1110820.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100703_1110820.json
@@ -1 +1 @@
-{"batchcode": "2100703_1110820", "histograms": [{"batchcodes": ["2100703_1110820"], "histogram": {"Deafness unilateral": 1}}]}
\ No newline at end of file
+{"batchcode": "2100703_1110820", "histograms": [{"histogram": {"Deafness unilateral": 1}, "batchcodes": ["2100703_1110820"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2100706.json b/docs/data/histograms/Taiwan, Province of China/2100706.json
index de0ee97acb8..78a40dbf899 100644
--- a/docs/data/histograms/Taiwan, Province of China/2100706.json
+++ b/docs/data/histograms/Taiwan, Province of China/2100706.json
@@ -1 +1 @@
-{"batchcode": "2100706", "histograms": [{"batchcodes": ["2100706"], "histogram": {"Lymphadenopathy": 1, "Myalgia": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "2100706", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Myalgia": 1, "Vaccination site swelling": 1}, "batchcodes": ["2100706"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2A087A.json b/docs/data/histograms/Taiwan, Province of China/2A087A.json
index 7b6335b2d42..dbafff642e1 100644
--- a/docs/data/histograms/Taiwan, Province of China/2A087A.json
+++ b/docs/data/histograms/Taiwan, Province of China/2A087A.json
@@ -1 +1 @@
-{"batchcode": "2A087A", "histograms": [{"batchcodes": ["2A087A"], "histogram": {"Pyrexia": 3, "Chest discomfort": 2, "Fatigue": 2, "Abdominal pain": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Liver function test increased": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Palpitations": 1, "Prohormone brain natriuretic peptide": 1, "Troponin I": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "2A087A", "histograms": [{"histogram": {"Pyrexia": 3, "Chest discomfort": 2, "Fatigue": 2, "Abdominal pain": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood test": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Liver function test increased": 1, "Myalgia": 1, "Myocarditis": 1, "Nausea": 1, "Palpitations": 1, "Prohormone brain natriuretic peptide": 1, "Troponin I": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["2A087A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2A087A_1110617-.json b/docs/data/histograms/Taiwan, Province of China/2A087A_1110617-.json
index ffcffae5cd0..3999b86e578 100644
--- a/docs/data/histograms/Taiwan, Province of China/2A087A_1110617-.json
+++ b/docs/data/histograms/Taiwan, Province of China/2A087A_1110617-.json
@@ -1 +1 @@
-{"batchcode": "2A087A_1110617-", "histograms": [{"batchcodes": ["2A087A_1110617-"], "histogram": {"Angina pectoris": 1, "Hypoaesthesia": 1, "Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "2A087A_1110617-", "histograms": [{"histogram": {"Angina pectoris": 1, "Hypoaesthesia": 1, "Muscular weakness": 1}, "batchcodes": ["2A087A_1110617-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2A087A_1110622-.json b/docs/data/histograms/Taiwan, Province of China/2A087A_1110622-.json
index ad9dcb34e3f..bdfd22063d9 100644
--- a/docs/data/histograms/Taiwan, Province of China/2A087A_1110622-.json
+++ b/docs/data/histograms/Taiwan, Province of China/2A087A_1110622-.json
@@ -1 +1 @@
-{"batchcode": "2A087A_1110622-", "histograms": [{"batchcodes": ["2A087A_1110622-"], "histogram": {"Chest discomfort": 2, "Asthenia": 1, "Blood pressure measurement": 1, "Blood test": 1, "COVID-19 screening": 1, "Chest pain": 1, "Discomfort": 1, "Heart rate": 1, "Myalgia": 1, "Pallor": 1, "Pericarditis": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "2A087A_1110622-", "histograms": [{"histogram": {"Chest discomfort": 2, "Asthenia": 1, "Blood pressure measurement": 1, "Blood test": 1, "COVID-19 screening": 1, "Chest pain": 1, "Discomfort": 1, "Heart rate": 1, "Myalgia": 1, "Pallor": 1, "Pericarditis": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["2A087A_1110622-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2A087A_1110622.json b/docs/data/histograms/Taiwan, Province of China/2A087A_1110622.json
index 4ab03768323..2fab1fe2fcf 100644
--- a/docs/data/histograms/Taiwan, Province of China/2A087A_1110622.json
+++ b/docs/data/histograms/Taiwan, Province of China/2A087A_1110622.json
@@ -1 +1 @@
-{"batchcode": "2A087A_1110622", "histograms": [{"batchcodes": ["2A087A_1110622"], "histogram": {"Cardiac index": 1, "Chest discomfort": 1, "Chest pain": 1, "Myocarditis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "2A087A_1110622", "histograms": [{"histogram": {"Cardiac index": 1, "Chest discomfort": 1, "Chest pain": 1, "Myocarditis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["2A087A_1110622"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2A087A_1110706-.json b/docs/data/histograms/Taiwan, Province of China/2A087A_1110706-.json
index ae235e13e71..ca765e57119 100644
--- a/docs/data/histograms/Taiwan, Province of China/2A087A_1110706-.json
+++ b/docs/data/histograms/Taiwan, Province of China/2A087A_1110706-.json
@@ -1 +1 @@
-{"batchcode": "2A087A_1110706-", "histograms": [{"batchcodes": ["2A087A_1110706-"], "histogram": {"Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Heart rate": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "2A087A_1110706-", "histograms": [{"histogram": {"Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Bradycardia": 1, "Electrocardiogram": 1, "Heart rate": 1, "Vaccination site pain": 1}, "batchcodes": ["2A087A_1110706-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2A087A_1110727-.json b/docs/data/histograms/Taiwan, Province of China/2A087A_1110727-.json
index e3504c2f046..ad8d1d6d6fa 100644
--- a/docs/data/histograms/Taiwan, Province of China/2A087A_1110727-.json
+++ b/docs/data/histograms/Taiwan, Province of China/2A087A_1110727-.json
@@ -1 +1 @@
-{"batchcode": "2A087A_1110727-", "histograms": [{"batchcodes": ["2A087A_1110727-"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Palpitations": 1, "Tachypnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "2A087A_1110727-", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Palpitations": 1, "Tachypnoea": 1}, "batchcodes": ["2A087A_1110727-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2A087A_1110921-.json b/docs/data/histograms/Taiwan, Province of China/2A087A_1110921-.json
index 3c4014d5507..2a4a82f114f 100644
--- a/docs/data/histograms/Taiwan, Province of China/2A087A_1110921-.json
+++ b/docs/data/histograms/Taiwan, Province of China/2A087A_1110921-.json
@@ -1 +1 @@
-{"batchcode": "2A087A_1110921-", "histograms": [{"batchcodes": ["2A087A_1110921-"], "histogram": {"Abdominal distension": 1, "Chest discomfort": 1, "Chest pain": 1, "Electrocardiogram": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Myocarditis": 1, "Physical examination": 1, "Troponin I": 1, "Troponin I increased": 1}}]}
\ No newline at end of file
+{"batchcode": "2A087A_1110921-", "histograms": [{"histogram": {"Abdominal distension": 1, "Chest discomfort": 1, "Chest pain": 1, "Electrocardiogram": 1, "Myocardial necrosis marker": 1, "Myocardial necrosis marker increased": 1, "Myocarditis": 1, "Physical examination": 1, "Troponin I": 1, "Troponin I increased": 1}, "batchcodes": ["2A087A_1110921-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/2C097A_1111019-.json b/docs/data/histograms/Taiwan, Province of China/2C097A_1111019-.json
index fe603a8b722..0801aafd211 100644
--- a/docs/data/histograms/Taiwan, Province of China/2C097A_1111019-.json
+++ b/docs/data/histograms/Taiwan, Province of China/2C097A_1111019-.json
@@ -1 +1 @@
-{"batchcode": "2C097A_1111019-", "histograms": [{"batchcodes": ["2C097A_1111019-"], "histogram": {"Eye haemorrhage": 1, "Ophthalmological examination": 1, "Visual acuity tests": 1}}]}
\ No newline at end of file
+{"batchcode": "2C097A_1111019-", "histograms": [{"histogram": {"Eye haemorrhage": 1, "Ophthalmological examination": 1, "Visual acuity tests": 1}, "batchcodes": ["2C097A_1111019-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3002544-CDC.json b/docs/data/histograms/Taiwan, Province of China/3002544-CDC.json
index 745621c4b12..fe5d012910a 100644
--- a/docs/data/histograms/Taiwan, Province of China/3002544-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3002544-CDC.json
@@ -1 +1 @@
-{"batchcode": "3002544-CDC", "histograms": [{"batchcodes": ["3002544-CDC"], "histogram": {"Facial paralysis": 2, "Blood test": 1, "Gastritis": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Mucosal ulceration": 1, "Peripheral nerve palsy": 1, "Pruritus": 1, "Rash": 1, "Tongue paralysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "3002544-CDC", "histograms": [{"histogram": {"Facial paralysis": 2, "Blood test": 1, "Gastritis": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Mucosal ulceration": 1, "Peripheral nerve palsy": 1, "Pruritus": 1, "Rash": 1, "Tongue paralysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["3002544-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3002544.json b/docs/data/histograms/Taiwan, Province of China/3002544.json
index 7d5cb3056ba..af3887e5274 100644
--- a/docs/data/histograms/Taiwan, Province of China/3002544.json
+++ b/docs/data/histograms/Taiwan, Province of China/3002544.json
@@ -1 +1 @@
-{"batchcode": "3002544", "histograms": [{"batchcodes": ["3002544"], "histogram": {"Arthralgia": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Back pain": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Dysphagia": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paralysis": 1, "Groin pain": 1, "Haemorrhage": 1, "Headache": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Lymphadenopathy": 1, "Mouth ulceration": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Skin mass": 1, "Stomatitis": 1, "Tongue discomfort": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "3002544", "histograms": [{"histogram": {"Arthralgia": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Back pain": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Dysphagia": 1, "Dyspnoea": 1, "Erythema": 1, "Facial paralysis": 1, "Groin pain": 1, "Haemorrhage": 1, "Headache": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Lymphadenopathy": 1, "Mouth ulceration": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Skin mass": 1, "Stomatitis": 1, "Tongue discomfort": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["3002544"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3002615-CDC.json b/docs/data/histograms/Taiwan, Province of China/3002615-CDC.json
index 66036c0293c..4b33700d553 100644
--- a/docs/data/histograms/Taiwan, Province of China/3002615-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3002615-CDC.json
@@ -1 +1 @@
-{"batchcode": "3002615-CDC", "histograms": [{"batchcodes": ["3002615-CDC"], "histogram": {"Rash": 4, "Hypersensitivity": 3, "Body temperature": 2, "Dyspnoea": 2, "Facial paralysis": 2, "Headache": 2, "Pruritus": 2, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Altered state of consciousness": 1, "Arthritis": 1, "Blood pressure measurement": 1, "Deafness neurosensory": 1, "Dizziness": 1, "Double stranded DNA antibody": 1, "Ecchymosis": 1, "Eustachian tube dysfunction": 1, "Eye haemorrhage": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lethargy": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscular weakness": 1, "Myalgia": 1, "Papule": 1, "Pleural effusion": 1, "Product dose omission issue": 1, "Pustule": 1, "Pyrexia": 1, "Systemic lupus erythematosus": 1, "Tachycardia": 1, "Tinea versicolour": 1, "Ultrasound antenatal screen": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site rash": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "3002615-CDC", "histograms": [{"histogram": {"Rash": 4, "Hypersensitivity": 3, "Body temperature": 2, "Dyspnoea": 2, "Facial paralysis": 2, "Headache": 2, "Pruritus": 2, "Abortion spontaneous": 1, "Acoustic stimulation tests": 1, "Altered state of consciousness": 1, "Arthritis": 1, "Blood pressure measurement": 1, "Deafness neurosensory": 1, "Dizziness": 1, "Double stranded DNA antibody": 1, "Ecchymosis": 1, "Eustachian tube dysfunction": 1, "Eye haemorrhage": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lethargy": 1, "Lymphadenopathy": 1, "Malaise": 1, "Muscular weakness": 1, "Myalgia": 1, "Papule": 1, "Pleural effusion": 1, "Product dose omission issue": 1, "Pustule": 1, "Pyrexia": 1, "Systemic lupus erythematosus": 1, "Tachycardia": 1, "Tinea versicolour": 1, "Ultrasound antenatal screen": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site rash": 1, "Weight decreased": 1}, "batchcodes": ["3002615-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3002615.json b/docs/data/histograms/Taiwan, Province of China/3002615.json
index 7af4fc1eafa..f490b8770fb 100644
--- a/docs/data/histograms/Taiwan, Province of China/3002615.json
+++ b/docs/data/histograms/Taiwan, Province of China/3002615.json
@@ -1 +1 @@
-{"batchcode": "3002615", "histograms": [{"batchcodes": ["3002615"], "histogram": {"Hypersensitivity": 3, "Rash": 3, "Fatigue": 2, "Pruritus": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Abdominal pain": 1, "Cellulitis": 1, "Cerebral infarction": 1, "Chills": 1, "Coronary artery disease": 1, "Diarrhoea": 1, "Discomfort": 1, "Facial paralysis": 1, "Foetal death": 1, "Gingival bleeding": 1, "Haemorrhoids thrombosed": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site swelling": 1, "Jaw fracture": 1, "Lymphadenopathy": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Nausea": 1, "Oculogyric crisis": 1, "Physical examination": 1, "Proctalgia": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Stevens-Johnson syndrome": 1, "Syncope": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Ultrasound antenatal screen": 1, "Unresponsive to stimuli": 1, "Vaccination complication": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3002615", "histograms": [{"histogram": {"Hypersensitivity": 3, "Rash": 3, "Fatigue": 2, "Pruritus": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Abdominal pain": 1, "Cellulitis": 1, "Cerebral infarction": 1, "Chills": 1, "Coronary artery disease": 1, "Diarrhoea": 1, "Discomfort": 1, "Facial paralysis": 1, "Foetal death": 1, "Gingival bleeding": 1, "Haemorrhoids thrombosed": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site swelling": 1, "Jaw fracture": 1, "Lymphadenopathy": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Nausea": 1, "Oculogyric crisis": 1, "Physical examination": 1, "Proctalgia": 1, "Pyrexia": 1, "Red blood cell count": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Stevens-Johnson syndrome": 1, "Syncope": 1, "Throat tightness": 1, "Thrombocytopenia": 1, "Ultrasound antenatal screen": 1, "Unresponsive to stimuli": 1, "Vaccination complication": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["3002615"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3003184-CDC.json b/docs/data/histograms/Taiwan, Province of China/3003184-CDC.json
index f2419d728a1..93ed5d0c7f9 100644
--- a/docs/data/histograms/Taiwan, Province of China/3003184-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3003184-CDC.json
@@ -1 +1 @@
-{"batchcode": "3003184-CDC", "histograms": [{"batchcodes": ["3003184-CDC"], "histogram": {"Decreased appetite": 3, "Hypoaesthesia": 2, "Myalgia": 2, "Abdominal infection": 1, "Abdominal pain": 1, "Arthralgia": 1, "Blood glucose": 1, "Cardiac failure": 1, "Computerised tomogram head": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Facial paralysis": 1, "Fatigue": 1, "Gait disturbance": 1, "Insomnia": 1, "Intestinal obstruction": 1, "Ischaemia": 1, "Multiple organ dysfunction syndrome": 1, "Muscular weakness": 1, "Oedema peripheral": 1, "Paraesthesia": 1, "Pleural effusion": 1, "Pneumonia": 1, "Pruritus": 1, "Pulmonary function test": 1, "Pyrexia": 1, "Sepsis": 1, "Septic shock": 1, "Syncope": 1, "Tachycardia": 1, "Thrombosis": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "3003184-CDC", "histograms": [{"histogram": {"Decreased appetite": 3, "Hypoaesthesia": 2, "Myalgia": 2, "Abdominal infection": 1, "Abdominal pain": 1, "Arthralgia": 1, "Blood glucose": 1, "Cardiac failure": 1, "Computerised tomogram head": 1, "Death": 1, "Dizziness": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Facial paralysis": 1, "Fatigue": 1, "Gait disturbance": 1, "Insomnia": 1, "Intestinal obstruction": 1, "Ischaemia": 1, "Multiple organ dysfunction syndrome": 1, "Muscular weakness": 1, "Oedema peripheral": 1, "Paraesthesia": 1, "Pleural effusion": 1, "Pneumonia": 1, "Pruritus": 1, "Pulmonary function test": 1, "Pyrexia": 1, "Sepsis": 1, "Septic shock": 1, "Syncope": 1, "Tachycardia": 1, "Thrombosis": 1, "Wheezing": 1}, "batchcodes": ["3003184-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3003184.json b/docs/data/histograms/Taiwan, Province of China/3003184.json
index 6c787634d45..515ef33a00a 100644
--- a/docs/data/histograms/Taiwan, Province of China/3003184.json
+++ b/docs/data/histograms/Taiwan, Province of China/3003184.json
@@ -1 +1 @@
-{"batchcode": "3003184", "histograms": [{"batchcodes": ["3003184"], "histogram": {"Alanine aminotransferase": 1, "Ammonia": 1, "Aspartate aminotransferase increased": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "Bone pain": 1, "Chills": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Erythema": 1, "Fibrin D dimer": 1, "Hepatic failure": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Neutrophil count": 1, "Pancytopenia": 1, "Platelet count": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Red cell distribution width increased": 1, "Swelling": 1, "Thrombocytopenia": 1, "Toxicity to various agents": 1, "Transaminases increased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3003184", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Ammonia": 1, "Aspartate aminotransferase increased": 1, "Blood creatine phosphokinase": 1, "Blood test": 1, "Bone pain": 1, "Chills": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Erythema": 1, "Fibrin D dimer": 1, "Hepatic failure": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Neutrophil count": 1, "Pancytopenia": 1, "Platelet count": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Red cell distribution width increased": 1, "Swelling": 1, "Thrombocytopenia": 1, "Toxicity to various agents": 1, "Transaminases increased": 1, "White blood cell count": 1}, "batchcodes": ["3003184"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004073.json b/docs/data/histograms/Taiwan, Province of China/3004073.json
index 1122a96a04a..e3f467ea0ea 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004073.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004073.json
@@ -1 +1 @@
-{"batchcode": "3004073", "histograms": [{"batchcodes": ["3004073"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Nausea": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Tachycardia": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "3004073", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Heart rate": 1, "Nausea": 1, "Oxygen saturation": 1, "Pyrexia": 1, "Tachycardia": 1, "Thrombosis": 1}, "batchcodes": ["3004073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004223-CDC.json b/docs/data/histograms/Taiwan, Province of China/3004223-CDC.json
index 2727847d9a2..39cfa443fb2 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004223-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004223-CDC.json
@@ -1 +1 @@
-{"batchcode": "3004223-CDC", "histograms": [{"batchcodes": ["3004223-CDC"], "histogram": {"Pain in extremity": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Heart rate": 3, "Chest discomfort": 2, "Chest pain": 2, "Computerised tomogram": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Myocardial infarction": 2, "Pruritus": 2, "Somnolence": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Aortic dissection": 1, "Arteriosclerosis coronary artery": 1, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "Cardiac arrest": 1, "Cardiac hypertrophy": 1, "Cardiac valve disease": 1, "Condition aggravated": 1, "Contusion": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Muscle fatigue": 1, "Myocardial fibrosis": 1, "Nausea": 1, "Oral discomfort": 1, "Oxygen saturation": 1, "Palpitations": 1, "Poor quality sleep": 1, "Postural orthostatic tachycardia syndrome": 1, "Productive cough": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site swelling": 1, "Varicose vein": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004223-CDC", "histograms": [{"histogram": {"Pain in extremity": 4, "Blood pressure measurement": 3, "Dyspnoea": 3, "Heart rate": 3, "Chest discomfort": 2, "Chest pain": 2, "Computerised tomogram": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Myocardial infarction": 2, "Pruritus": 2, "Somnolence": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Aortic dissection": 1, "Arteriosclerosis coronary artery": 1, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "Cardiac arrest": 1, "Cardiac hypertrophy": 1, "Cardiac valve disease": 1, "Condition aggravated": 1, "Contusion": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Fibrin D dimer": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Magnetic resonance imaging heart": 1, "Malaise": 1, "Muscle fatigue": 1, "Myocardial fibrosis": 1, "Nausea": 1, "Oral discomfort": 1, "Oxygen saturation": 1, "Palpitations": 1, "Poor quality sleep": 1, "Postural orthostatic tachycardia syndrome": 1, "Productive cough": 1, "Pyrexia": 1, "Rash": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Syncope": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site swelling": 1, "Varicose vein": 1, "Vomiting": 1}, "batchcodes": ["3004223-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004223.json b/docs/data/histograms/Taiwan, Province of China/3004223.json
index 6cf7b22b3d4..172b32d17fe 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004223.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004223.json
@@ -1 +1 @@
-{"batchcode": "3004223", "histograms": [{"batchcodes": ["3004223"], "histogram": {"Death": 3, "Headache": 3, "Nausea": 3, "Pyrexia": 3, "Body temperature": 2, "Chills": 2, "Facial paralysis": 2, "Muscular weakness": 2, "Acute respiratory failure": 1, "Altered state of consciousness": 1, "Bell's palsy": 1, "Blood gases": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Deafness": 1, "Diabetic hyperosmolar coma": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea": 1, "Fatigue": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Leukocytosis": 1, "Magnetic resonance imaging head": 1, "Metabolic encephalopathy": 1, "Myocarditis": 1, "Neuralgia": 1, "Neuroleptic malignant syndrome": 1, "Neutrophil count": 1, "Papilloma": 1, "Rash": 1, "Respiratory rate": 1, "Syncope": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3004223", "histograms": [{"histogram": {"Death": 3, "Headache": 3, "Nausea": 3, "Pyrexia": 3, "Body temperature": 2, "Chills": 2, "Facial paralysis": 2, "Muscular weakness": 2, "Acute respiratory failure": 1, "Altered state of consciousness": 1, "Bell's palsy": 1, "Blood gases": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood test": 1, "C-reactive protein": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Deafness": 1, "Diabetic hyperosmolar coma": 1, "Diabetic ketoacidosis": 1, "Dizziness": 1, "Dysarthria": 1, "Dyspnoea": 1, "Fatigue": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hyperglycaemia": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Interchange of vaccine products": 1, "Leukocytosis": 1, "Magnetic resonance imaging head": 1, "Metabolic encephalopathy": 1, "Myocarditis": 1, "Neuralgia": 1, "Neuroleptic malignant syndrome": 1, "Neutrophil count": 1, "Papilloma": 1, "Rash": 1, "Respiratory rate": 1, "Syncope": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "White blood cell count": 1}, "batchcodes": ["3004223"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004729-CDC.json b/docs/data/histograms/Taiwan, Province of China/3004729-CDC.json
index 23bd5e5c871..28de8ce501a 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004729-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004729-CDC.json
@@ -1 +1 @@
-{"batchcode": "3004729-CDC", "histograms": [{"batchcodes": ["3004729-CDC"], "histogram": {"Pyrexia": 7, "Headache": 4, "Chest discomfort": 3, "Fibrin D dimer": 3, "Muscular weakness": 3, "Myalgia": 3, "Asthenia": 2, "C-reactive protein": 2, "Cellulitis": 2, "Chest X-ray": 2, "Death": 2, "Diarrhoea": 2, "Dizziness": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Pain in extremity": 2, "Platelet count": 2, "Pneumonia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Vomiting": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Aphasia": 1, "Arthralgia": 1, "Asthma": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood pressure measurement": 1, "Body temperature": 1, "CSF test": 1, "Cardiac discomfort": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Ecchymosis": 1, "Encephalopathy": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count": 1, "Exostosis": 1, "Face oedema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling cold": 1, "Gastric ulcer": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Heart rate": 1, "Hemiparesis": 1, "Hepatitis E": 1, "Hyperhidrosis": 1, "Intervertebral disc protrusion": 1, "Ischaemic stroke": 1, "Lymphadenopathy": 1, "Lymphangitis": 1, "Muscle tightness": 1, "Nausea": 1, "Nerve conduction studies": 1, "Neurosis": 1, "Obstructive airways disorder": 1, "Pain": 1, "Pharyngeal oedema": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Rash": 1, "Secretion discharge": 1, "Tachypnoea": 1, "Tinnitus": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Urinary system X-ray": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Walking aid user": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "3004729-CDC", "histograms": [{"histogram": {"Pyrexia": 7, "Headache": 4, "Chest discomfort": 3, "Fibrin D dimer": 3, "Muscular weakness": 3, "Myalgia": 3, "Asthenia": 2, "C-reactive protein": 2, "Cellulitis": 2, "Chest X-ray": 2, "Death": 2, "Diarrhoea": 2, "Dizziness": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Pain in extremity": 2, "Platelet count": 2, "Pneumonia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Vomiting": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abortion spontaneous": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Aphasia": 1, "Arthralgia": 1, "Asthma": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatine phosphokinase": 1, "Blood fibrinogen": 1, "Blood pressure measurement": 1, "Body temperature": 1, "CSF test": 1, "Cardiac discomfort": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Ecchymosis": 1, "Encephalopathy": 1, "Endoscopy upper gastrointestinal tract": 1, "Eosinophil count": 1, "Exostosis": 1, "Face oedema": 1, "Facial paralysis": 1, "Fatigue": 1, "Feeling cold": 1, "Gastric ulcer": 1, "Guillain-Barre syndrome": 1, "Haematemesis": 1, "Heart rate": 1, "Hemiparesis": 1, "Hepatitis E": 1, "Hyperhidrosis": 1, "Intervertebral disc protrusion": 1, "Ischaemic stroke": 1, "Lymphadenopathy": 1, "Lymphangitis": 1, "Muscle tightness": 1, "Nausea": 1, "Nerve conduction studies": 1, "Neurosis": 1, "Obstructive airways disorder": 1, "Pain": 1, "Pharyngeal oedema": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Rash": 1, "Secretion discharge": 1, "Tachypnoea": 1, "Tinnitus": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Urinary system X-ray": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Walking aid user": 1, "Wheezing": 1}, "batchcodes": ["3004729-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004729.json b/docs/data/histograms/Taiwan, Province of China/3004729.json
index 6aa07f1cca2..1486e1eb10c 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004729.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004729.json
@@ -1 +1 @@
-{"batchcode": "3004729", "histograms": [{"batchcodes": ["3004729"], "histogram": {"Muscular weakness": 3, "Pyrexia": 3, "Syncope": 3, "Blood pressure measurement": 2, "Computerised tomogram": 2, "Dizziness": 2, "Headache": 2, "Activated partial thromboplastin time": 1, "Blood test": 1, "Cardiac discomfort": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Embolism": 1, "Face oedema": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Mental status changes": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Sciatic nerve injury": 1, "Seizure": 1, "Spinal osteoarthritis": 1, "Tachycardia": 1, "Thrombosis": 1, "Tinnitus": 1, "Trismus": 1, "Vaccination site mass": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "3004729", "histograms": [{"histogram": {"Muscular weakness": 3, "Pyrexia": 3, "Syncope": 3, "Blood pressure measurement": 2, "Computerised tomogram": 2, "Dizziness": 2, "Headache": 2, "Activated partial thromboplastin time": 1, "Blood test": 1, "Cardiac discomfort": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Chills": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Discomfort": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Embolism": 1, "Face oedema": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Mental status changes": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Sciatic nerve injury": 1, "Seizure": 1, "Spinal osteoarthritis": 1, "Tachycardia": 1, "Thrombosis": 1, "Tinnitus": 1, "Trismus": 1, "Vaccination site mass": 1, "Vomiting": 1}, "batchcodes": ["3004729"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004960-CD.json b/docs/data/histograms/Taiwan, Province of China/3004960-CD.json
index dc65070fbee..90c192739c6 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004960-CD.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004960-CD.json
@@ -1 +1 @@
-{"batchcode": "3004960-CD", "histograms": [{"batchcodes": ["3004960-CD"], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "3004960-CD", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["3004960-CD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004960-CDC.json b/docs/data/histograms/Taiwan, Province of China/3004960-CDC.json
index 2f59a4341bb..6bb5c9fe17e 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004960-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004960-CDC.json
@@ -1 +1 @@
-{"batchcode": "3004960-CDC", "histograms": [{"batchcodes": ["3004960-CDC"], "histogram": {"Acute myocardial infarction": 1, "Facial paralysis": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "3004960-CDC", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Facial paralysis": 1, "Headache": 1}, "batchcodes": ["3004960-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3004960.json b/docs/data/histograms/Taiwan, Province of China/3004960.json
index 7067fbe84a7..7b3abd0e105 100644
--- a/docs/data/histograms/Taiwan, Province of China/3004960.json
+++ b/docs/data/histograms/Taiwan, Province of China/3004960.json
@@ -1 +1 @@
-{"batchcode": "3004960", "histograms": [{"batchcodes": ["3004960"], "histogram": {"Abscess": 1, "Arthritis": 1, "Breast mass": 1, "Cellulitis": 1, "Connective tissue disorder": 1, "Dizziness": 1, "Dyspnoea": 1, "Mediastinal disorder": 1, "Musculoskeletal disorder": 1, "Respiratory disorder": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "3004960", "histograms": [{"histogram": {"Abscess": 1, "Arthritis": 1, "Breast mass": 1, "Cellulitis": 1, "Connective tissue disorder": 1, "Dizziness": 1, "Dyspnoea": 1, "Mediastinal disorder": 1, "Musculoskeletal disorder": 1, "Respiratory disorder": 1, "Thrombocytopenia": 1}, "batchcodes": ["3004960"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3005238-CDC.json b/docs/data/histograms/Taiwan, Province of China/3005238-CDC.json
index 0139d076048..2e89150dbe8 100644
--- a/docs/data/histograms/Taiwan, Province of China/3005238-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3005238-CDC.json
@@ -1 +1 @@
-{"batchcode": "3005238-CDC", "histograms": [{"batchcodes": ["3005238-CDC"], "histogram": {"Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "3005238-CDC", "histograms": [{"histogram": {"Muscular weakness": 1}, "batchcodes": ["3005238-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3005792-CDC.json b/docs/data/histograms/Taiwan, Province of China/3005792-CDC.json
index b2c415ccb3b..9e90aefbf85 100644
--- a/docs/data/histograms/Taiwan, Province of China/3005792-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/3005792-CDC.json
@@ -1 +1 @@
-{"batchcode": "3005792-CDC", "histograms": [{"batchcodes": ["3005792-CDC"], "histogram": {"Muscular weakness": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Vomiting": 3, "Asthenia": 2, "Blood glucose": 2, "Body temperature": 2, "Death": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Dizziness": 2, "Heart rate": 2, "Nausea": 2, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Arthralgia": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Blood creatine": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardiac valve thickening": 1, "Cerebral infarction": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Dermatitis": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Haemoglobin": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lung disorder": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mental status changes": 1, "Mobility decreased": 1, "Myalgia": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "NIH stroke scale": 1, "Neutrophil count": 1, "Paralysis": 1, "Platelet count": 1, "Productive cough": 1, "Swelling": 1, "Syncope": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vital signs measurement": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "3005792-CDC", "histograms": [{"histogram": {"Muscular weakness": 4, "Pyrexia": 4, "Blood pressure measurement": 3, "Vomiting": 3, "Asthenia": 2, "Blood glucose": 2, "Body temperature": 2, "Death": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Dizziness": 2, "Heart rate": 2, "Nausea": 2, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Arthralgia": 1, "Arthritis": 1, "Aspartate aminotransferase": 1, "Blood creatine": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardiac valve thickening": 1, "Cerebral infarction": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Dermatitis": 1, "Dyspnoea": 1, "Dysstasia": 1, "Echocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Haemoglobin": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lung disorder": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mental status changes": 1, "Mobility decreased": 1, "Myalgia": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "NIH stroke scale": 1, "Neutrophil count": 1, "Paralysis": 1, "Platelet count": 1, "Productive cough": 1, "Swelling": 1, "Syncope": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Vital signs measurement": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["3005792-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/3005792.json b/docs/data/histograms/Taiwan, Province of China/3005792.json
index 217f9864d59..666c68191ff 100644
--- a/docs/data/histograms/Taiwan, Province of China/3005792.json
+++ b/docs/data/histograms/Taiwan, Province of China/3005792.json
@@ -1 +1 @@
-{"batchcode": "3005792", "histograms": [{"batchcodes": ["3005792"], "histogram": {"Computerised tomogram": 1, "Death": 1, "Facial paralysis": 1, "Headache": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Thrombotic stroke": 1}}]}
\ No newline at end of file
+{"batchcode": "3005792", "histograms": [{"histogram": {"Computerised tomogram": 1, "Death": 1, "Facial paralysis": 1, "Headache": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Thrombotic stroke": 1}, "batchcodes": ["3005792"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/39600.json b/docs/data/histograms/Taiwan, Province of China/39600.json
index 94612fecfae..bc8c9bf0a62 100644
--- a/docs/data/histograms/Taiwan, Province of China/39600.json
+++ b/docs/data/histograms/Taiwan, Province of China/39600.json
@@ -1 +1 @@
-{"batchcode": "39600", "histograms": [{"batchcodes": ["39600"], "histogram": {"Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Syncope": 2, "Vomiting": 2, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bleeding time": 1, "Blood creatinine": 1, "Blood urea": 1, "Body temperature": 1, "Chills": 1, "Defaecation urgency": 1, "Heart rate increased": 1, "Hypotension": 1, "Pyrexia": 1, "Respiratory distress": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "39600", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Heart rate": 2, "Oxygen saturation": 2, "Respiratory rate": 2, "Syncope": 2, "Vomiting": 2, "Alanine aminotransferase": 1, "Aspartate aminotransferase": 1, "Bleeding time": 1, "Blood creatinine": 1, "Blood urea": 1, "Body temperature": 1, "Chills": 1, "Defaecation urgency": 1, "Heart rate increased": 1, "Hypotension": 1, "Pyrexia": 1, "Respiratory distress": 1, "Vision blurred": 1}, "batchcodes": ["39600"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/4302MF002-CDC.json b/docs/data/histograms/Taiwan, Province of China/4302MF002-CDC.json
index 565e8f7fddd..1299b857939 100644
--- a/docs/data/histograms/Taiwan, Province of China/4302MF002-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/4302MF002-CDC.json
@@ -1 +1 @@
-{"batchcode": "4302MF002-CDC", "histograms": [{"batchcodes": ["4302MF002-CDC"], "histogram": {"Acute myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "4302MF002-CDC", "histograms": [{"histogram": {"Acute myocardial infarction": 1}, "batchcodes": ["4302MF002-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/4302MF002.json b/docs/data/histograms/Taiwan, Province of China/4302MF002.json
index c1bb4317c47..54acef48340 100644
--- a/docs/data/histograms/Taiwan, Province of China/4302MF002.json
+++ b/docs/data/histograms/Taiwan, Province of China/4302MF002.json
@@ -1 +1 @@
-{"batchcode": "4302MF002", "histograms": [{"batchcodes": ["4302MF002"], "histogram": {"Arthralgia": 1, "Blood test": 1, "Contusion": 1, "Myalgia": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "4302MF002", "histograms": [{"histogram": {"Arthralgia": 1, "Blood test": 1, "Contusion": 1, "Myalgia": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["4302MF002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/4302MF017-CDC.json b/docs/data/histograms/Taiwan, Province of China/4302MF017-CDC.json
index 248ae2013a4..b13983bac4d 100644
--- a/docs/data/histograms/Taiwan, Province of China/4302MF017-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/4302MF017-CDC.json
@@ -1 +1 @@
-{"batchcode": "4302MF017-CDC", "histograms": [{"batchcodes": ["4302MF017-CDC"], "histogram": {"Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "4302MF017-CDC", "histograms": [{"histogram": {"Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["4302MF017-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/739600.json b/docs/data/histograms/Taiwan, Province of China/739600.json
index 867780a1ea6..850a67c5a66 100644
--- a/docs/data/histograms/Taiwan, Province of China/739600.json
+++ b/docs/data/histograms/Taiwan, Province of China/739600.json
@@ -1 +1 @@
-{"batchcode": "739600", "histograms": [{"batchcodes": ["739600"], "histogram": {"Blood fibrinogen": 1, "Blood triglycerides": 1, "Coagulation time": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Dysarthria": 1, "Fibrin D dimer": 1, "High density lipoprotein": 1, "Ischaemic stroke": 1, "Low density lipoprotein": 1, "Total cholesterol/HDL ratio": 1}}]}
\ No newline at end of file
+{"batchcode": "739600", "histograms": [{"histogram": {"Blood fibrinogen": 1, "Blood triglycerides": 1, "Coagulation time": 1, "Computerised tomogram head": 1, "Dizziness": 1, "Dysarthria": 1, "Fibrin D dimer": 1, "High density lipoprotein": 1, "Ischaemic stroke": 1, "Low density lipoprotein": 1, "Total cholesterol/HDL ratio": 1}, "batchcodes": ["739600"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939559.json b/docs/data/histograms/Taiwan, Province of China/939559.json
index 30506dc7054..f1791cbeea3 100644
--- a/docs/data/histograms/Taiwan, Province of China/939559.json
+++ b/docs/data/histograms/Taiwan, Province of China/939559.json
@@ -1 +1 @@
-{"batchcode": "939559", "histograms": [{"batchcodes": ["939559"], "histogram": {"Blood pressure measurement": 6, "Body temperature": 6, "Heart rate": 6, "Oxygen saturation": 6, "Pyrexia": 6, "Respiratory rate": 6, "White blood cell count": 5, "C-reactive protein": 4, "Troponin I": 4, "Blood potassium": 3, "Dizziness": 3, "Blood creatinine": 2, "Blood glucose": 2, "Haemoglobin": 2, "Nausea": 2, "White blood cells urine": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Ammonia": 1, "Blood sodium": 1, "Blood sodium increased": 1, "Blood urea": 1, "Brain natriuretic peptide": 1, "Chest discomfort": 1, "Chills": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Gastrointestinal haemorrhage": 1, "Glucose urine": 1, "Hyperhidrosis": 1, "Infection": 1, "Melaena": 1, "Muscular weakness": 1, "Red blood cells urine": 1, "Urinary retention": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "939559", "histograms": [{"histogram": {"Blood pressure measurement": 6, "Body temperature": 6, "Heart rate": 6, "Oxygen saturation": 6, "Pyrexia": 6, "Respiratory rate": 6, "White blood cell count": 5, "C-reactive protein": 4, "Troponin I": 4, "Blood potassium": 3, "Dizziness": 3, "Blood creatinine": 2, "Blood glucose": 2, "Haemoglobin": 2, "Nausea": 2, "White blood cells urine": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Ammonia": 1, "Blood sodium": 1, "Blood sodium increased": 1, "Blood urea": 1, "Brain natriuretic peptide": 1, "Chest discomfort": 1, "Chills": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Electrocardiogram": 1, "Gastrointestinal haemorrhage": 1, "Glucose urine": 1, "Hyperhidrosis": 1, "Infection": 1, "Melaena": 1, "Muscular weakness": 1, "Red blood cells urine": 1, "Urinary retention": 1, "Vomiting": 1}, "batchcodes": ["939559"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939599-CDC.json b/docs/data/histograms/Taiwan, Province of China/939599-CDC.json
index f6697ae599d..ed0a8430a45 100644
--- a/docs/data/histograms/Taiwan, Province of China/939599-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/939599-CDC.json
@@ -1 +1 @@
-{"batchcode": "939599-CDC", "histograms": [{"batchcodes": ["939599-CDC"], "histogram": {"Death": 9, "Pyrexia": 8, "Body temperature": 6, "Dyspnoea": 6, "Heart rate": 6, "Chest discomfort": 5, "Fatigue": 5, "Muscular weakness": 5, "Nausea": 5, "Altered state of consciousness": 4, "Asthenia": 4, "Asthma": 4, "Blood pressure measurement": 4, "Dizziness": 4, "Oxygen saturation": 4, "Chest X-ray": 3, "Fibrin D dimer": 3, "Pneumonia": 3, "Pruritus": 3, "Respiratory rate": 3, "Syncope": 3, "Thrombosis": 3, "Vomiting": 3, "Abdominal pain": 2, "Choking": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Cough": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Encephalopathy": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Haemoglobin": 2, "Headache": 2, "Hypoaesthesia": 2, "Myocardial infarction": 2, "Peripheral swelling": 2, "Pulmonary embolism": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Shock": 2, "Troponin I": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Ventilation/perfusion scan": 2, "Abdominal distension": 1, "Acute coronary syndrome": 1, "Anaemia": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Back pain": 1, "Blood creatine phosphokinase MB": 1, "Blood culture": 1, "Blood pressure decreased": 1, "Brain oedema": 1, "Bronchitis": 1, "CSF pressure": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral arteriosclerosis": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chills": 1, "Clumsiness": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Culture urine": 1, "Deep vein thrombosis": 1, "Discomfort": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ecchymosis": 1, "Faeces discoloured": 1, "Fall": 1, "Fracture": 1, "Gastritis": 1, "Gout": 1, "Haemoptysis": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Heparin-induced thrombocytopenia test": 1, "Hydrocephalus": 1, "Hyperhidrosis": 1, "Hypokalaemia": 1, "Hypotension": 1, "Immune-mediated myositis": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Intentional dose omission": 1, "Intracranial pressure increased": 1, "Ischaemia": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Mental status changes": 1, "Multiple organ dysfunction syndrome": 1, "Myalgia": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Osteomyelitis": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Petechiae": 1, "Physical examination": 1, "Pleural effusion": 1, "Polymerase chain reaction": 1, "Prurigo": 1, "Rash": 1, "Respiratory arrest": 1, "Resuscitation": 1, "Scan myocardial perfusion": 1, "Sepsis": 1, "Septic shock": 1, "Somnolence": 1, "Speech disorder": 1, "Sputum culture": 1, "Stevens-Johnson syndrome": 1, "Tachycardia": 1, "Temperature intolerance": 1, "Thrombocytopenia": 1, "Toxic skin eruption": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vascular occlusion": 1, "Vital signs measurement": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "939599-CDC", "histograms": [{"histogram": {"Death": 9, "Pyrexia": 8, "Body temperature": 6, "Dyspnoea": 6, "Heart rate": 6, "Chest discomfort": 5, "Fatigue": 5, "Muscular weakness": 5, "Nausea": 5, "Altered state of consciousness": 4, "Asthenia": 4, "Asthma": 4, "Blood pressure measurement": 4, "Dizziness": 4, "Oxygen saturation": 4, "Chest X-ray": 3, "Fibrin D dimer": 3, "Pneumonia": 3, "Pruritus": 3, "Respiratory rate": 3, "Syncope": 3, "Thrombosis": 3, "Vomiting": 3, "Abdominal pain": 2, "Choking": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Cough": 2, "Decreased appetite": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Encephalopathy": 2, "Facial paralysis": 2, "Gait disturbance": 2, "Haemoglobin": 2, "Headache": 2, "Hypoaesthesia": 2, "Myocardial infarction": 2, "Peripheral swelling": 2, "Pulmonary embolism": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Shock": 2, "Troponin I": 2, "Ultrasound scan": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Ventilation/perfusion scan": 2, "Abdominal distension": 1, "Acute coronary syndrome": 1, "Anaemia": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Back pain": 1, "Blood creatine phosphokinase MB": 1, "Blood culture": 1, "Blood pressure decreased": 1, "Brain oedema": 1, "Bronchitis": 1, "CSF pressure": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cerebral arteriosclerosis": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Chills": 1, "Clumsiness": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Culture urine": 1, "Deep vein thrombosis": 1, "Discomfort": 1, "Dysphagia": 1, "Dyspnoea exertional": 1, "Ecchymosis": 1, "Faeces discoloured": 1, "Fall": 1, "Fracture": 1, "Gastritis": 1, "Gout": 1, "Haemoptysis": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Heparin-induced thrombocytopenia test": 1, "Hydrocephalus": 1, "Hyperhidrosis": 1, "Hypokalaemia": 1, "Hypotension": 1, "Immune-mediated myositis": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Intentional dose omission": 1, "Intracranial pressure increased": 1, "Ischaemia": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Mental status changes": 1, "Multiple organ dysfunction syndrome": 1, "Myalgia": 1, "Neurological examination": 1, "Neutrophil count": 1, "Oedema peripheral": 1, "Osteomyelitis": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Petechiae": 1, "Physical examination": 1, "Pleural effusion": 1, "Polymerase chain reaction": 1, "Prurigo": 1, "Rash": 1, "Respiratory arrest": 1, "Resuscitation": 1, "Scan myocardial perfusion": 1, "Sepsis": 1, "Septic shock": 1, "Somnolence": 1, "Speech disorder": 1, "Sputum culture": 1, "Stevens-Johnson syndrome": 1, "Tachycardia": 1, "Temperature intolerance": 1, "Thrombocytopenia": 1, "Toxic skin eruption": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vascular occlusion": 1, "Vital signs measurement": 1, "White blood cell count": 1}, "batchcodes": ["939599-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939599.json b/docs/data/histograms/Taiwan, Province of China/939599.json
index c96d1f1b992..09b5579b734 100644
--- a/docs/data/histograms/Taiwan, Province of China/939599.json
+++ b/docs/data/histograms/Taiwan, Province of China/939599.json
@@ -1 +1 @@
-{"batchcode": "939599", "histograms": [{"batchcodes": ["939599"], "histogram": {"Pyrexia": 5, "Syncope": 5, "Asthenia": 4, "Blood pressure measurement": 4, "Dizziness": 3, "Vomiting": 3, "Blood potassium": 2, "Decreased appetite": 2, "Echocardiogram": 2, "Facial paralysis": 2, "Fibrin D dimer": 2, "Headache": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Injection site erythema": 2, "Muscular weakness": 2, "Nausea": 2, "Oedema peripheral": 2, "Rash": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Vision blurred": 2, "White blood cell count": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abscess": 1, "Amniocentesis": 1, "Amniotic membrane rupture test": 1, "Anaemia": 1, "Arthralgia": 1, "Atrial septal defect": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood pressure increased": 1, "Body temperature": 1, "Bone pain": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cachexia": 1, "Caesarean section": 1, "Carbuncle": 1, "Cataract": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Cold sweat": 1, "Coma": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Cough": 1, "Cryoglobulins": 1, "Cytomegalovirus test": 1, "Discomfort": 1, "Dysarthria": 1, "Ear pain": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Epstein-Barr virus antibody": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrin degradation products": 1, "Foetal heart rate": 1, "Foetal heart rate abnormal": 1, "Foetal hypokinesia": 1, "Foetal non-stress test": 1, "Full blood count": 1, "Gastritis": 1, "Haemoglobin": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hypertension": 1, "Injection site pain": 1, "Injection site swelling": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuralgia": 1, "Ophthalmological examination": 1, "Optical coherence tomography": 1, "Oxygen saturation": 1, "Patent ductus arteriosus": 1, "Physical examination": 1, "Platelet count": 1, "Pruritus": 1, "Purtscher retinopathy": 1, "Rash pustular": 1, "Retinal artery occlusion": 1, "Retinal disorder": 1, "SARS-CoV-2 antibody test": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaginal discharge": 1, "Varicose vein": 1, "Ventricular septal defect": 1, "Visual evoked potentials abnormal": 1, "Vitreous haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "939599", "histograms": [{"histogram": {"Pyrexia": 5, "Syncope": 5, "Asthenia": 4, "Blood pressure measurement": 4, "Dizziness": 3, "Vomiting": 3, "Blood potassium": 2, "Decreased appetite": 2, "Echocardiogram": 2, "Facial paralysis": 2, "Fibrin D dimer": 2, "Headache": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Injection site erythema": 2, "Muscular weakness": 2, "Nausea": 2, "Oedema peripheral": 2, "Rash": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Vision blurred": 2, "White blood cell count": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abscess": 1, "Amniocentesis": 1, "Amniotic membrane rupture test": 1, "Anaemia": 1, "Arthralgia": 1, "Atrial septal defect": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase MB": 1, "Blood fibrinogen": 1, "Blood lactate dehydrogenase": 1, "Blood pressure increased": 1, "Body temperature": 1, "Bone pain": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Cachexia": 1, "Caesarean section": 1, "Carbuncle": 1, "Cataract": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Cold sweat": 1, "Coma": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Cough": 1, "Cryoglobulins": 1, "Cytomegalovirus test": 1, "Discomfort": 1, "Dysarthria": 1, "Ear pain": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Electroencephalogram": 1, "Epstein-Barr virus antibody": 1, "Erythema": 1, "Erythema multiforme": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fibrin degradation products": 1, "Foetal heart rate": 1, "Foetal heart rate abnormal": 1, "Foetal hypokinesia": 1, "Foetal non-stress test": 1, "Full blood count": 1, "Gastritis": 1, "Haemoglobin": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hypertension": 1, "Injection site pain": 1, "Injection site swelling": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Myocarditis": 1, "N-terminal prohormone brain natriuretic peptide": 1, "Neuralgia": 1, "Ophthalmological examination": 1, "Optical coherence tomography": 1, "Oxygen saturation": 1, "Patent ductus arteriosus": 1, "Physical examination": 1, "Platelet count": 1, "Pruritus": 1, "Purtscher retinopathy": 1, "Rash pustular": 1, "Retinal artery occlusion": 1, "Retinal disorder": 1, "SARS-CoV-2 antibody test": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaginal discharge": 1, "Varicose vein": 1, "Ventricular septal defect": 1, "Visual evoked potentials abnormal": 1, "Vitreous haemorrhage": 1}, "batchcodes": ["939599"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939599_CDC.json b/docs/data/histograms/Taiwan, Province of China/939599_CDC.json
index 4487be4fd0c..bf16dc28f5f 100644
--- a/docs/data/histograms/Taiwan, Province of China/939599_CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/939599_CDC.json
@@ -1 +1 @@
-{"batchcode": "939599_CDC", "histograms": [{"batchcodes": ["939599_CDC"], "histogram": {"Feeling hot": 1}}]}
\ No newline at end of file
+{"batchcode": "939599_CDC", "histograms": [{"histogram": {"Feeling hot": 1}, "batchcodes": ["939599_CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939600-CDC.json b/docs/data/histograms/Taiwan, Province of China/939600-CDC.json
index 9437272a151..357a41f0bd1 100644
--- a/docs/data/histograms/Taiwan, Province of China/939600-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/939600-CDC.json
@@ -1 +1 @@
-{"batchcode": "939600-CDC", "histograms": [{"batchcodes": ["939600-CDC"], "histogram": {"Pyrexia": 7, "Decreased appetite": 6, "Fatigue": 6, "Headache": 6, "Muscular weakness": 5, "Myalgia": 5, "Body temperature": 4, "Dizziness": 4, "Pruritus": 4, "Rash": 4, "Syncope": 4, "Blood pressure measurement": 3, "Cerebral haemorrhage": 3, "Chills": 3, "Diarrhoea": 3, "Discomfort": 3, "Heart rate": 3, "Oxygen saturation": 3, "SARS-CoV-2 test": 3, "Vaccination site swelling": 3, "Abdominal pain": 2, "Asthenia": 2, "Blood creatine phosphokinase MB": 2, "Brain stem haemorrhage": 2, "Cerebrovascular accident": 2, "Computerised tomogram": 2, "Death": 2, "Dyspnoea": 2, "Erythema": 2, "Haemorrhagic stroke": 2, "Hypoaesthesia": 2, "Myocarditis": 2, "Pain": 2, "Pain in extremity": 2, "Pallor": 2, "Polymerase chain reaction": 2, "Rash pruritic": 2, "Respiratory rate": 2, "Swelling": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vision blurred": 2, "Vomiting": 2, "Wheezing": 2, "Acute kidney injury": 1, "Acute respiratory failure": 1, "Allergy to vaccine": 1, "Altered state of consciousness": 1, "Arthralgia": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Bacteraemia": 1, "Blood creatine phosphokinase": 1, "Blood culture": 1, "Blood glucose": 1, "Bone pain": 1, "Brain death": 1, "Brain natriuretic peptide": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiovascular disorder": 1, "Catheterisation cardiac": 1, "Chest X-ray": 1, "Coma scale": 1, "Condition aggravated": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Extrasystoles": 1, "Eye haemorrhage": 1, "Facial bones fracture": 1, "Fall": 1, "Fibrin D dimer": 1, "Foetal death": 1, "Gastrointestinal haemorrhage": 1, "Heart rate irregular": 1, "Hemiparesis": 1, "Hepatic cancer": 1, "Hepatic cirrhosis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Inflammation": 1, "Injection site mass": 1, "Injection site pain": 1, "Jaundice cholestatic": 1, "Laryngeal oedema": 1, "Meniere's disease": 1, "Nasoendoscopy": 1, "Nausea": 1, "Pancreatitis": 1, "Pneumonia": 1, "Rhinorrhoea": 1, "Rib fracture": 1, "Scapula fracture": 1, "Sepsis": 1, "Septic shock": 1, "Shock haemorrhagic": 1, "Sleep disorder": 1, "Somnolence": 1, "Speech disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Toothache": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound foetal": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vasculitis": 1, "Weight": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "939600-CDC", "histograms": [{"histogram": {"Pyrexia": 7, "Decreased appetite": 6, "Fatigue": 6, "Headache": 6, "Muscular weakness": 5, "Myalgia": 5, "Body temperature": 4, "Dizziness": 4, "Pruritus": 4, "Rash": 4, "Syncope": 4, "Blood pressure measurement": 3, "Cerebral haemorrhage": 3, "Chills": 3, "Diarrhoea": 3, "Discomfort": 3, "Heart rate": 3, "Oxygen saturation": 3, "SARS-CoV-2 test": 3, "Vaccination site swelling": 3, "Abdominal pain": 2, "Asthenia": 2, "Blood creatine phosphokinase MB": 2, "Brain stem haemorrhage": 2, "Cerebrovascular accident": 2, "Computerised tomogram": 2, "Death": 2, "Dyspnoea": 2, "Erythema": 2, "Haemorrhagic stroke": 2, "Hypoaesthesia": 2, "Myocarditis": 2, "Pain": 2, "Pain in extremity": 2, "Pallor": 2, "Polymerase chain reaction": 2, "Rash pruritic": 2, "Respiratory rate": 2, "Swelling": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vision blurred": 2, "Vomiting": 2, "Wheezing": 2, "Acute kidney injury": 1, "Acute respiratory failure": 1, "Allergy to vaccine": 1, "Altered state of consciousness": 1, "Arthralgia": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Bacteraemia": 1, "Blood creatine phosphokinase": 1, "Blood culture": 1, "Blood glucose": 1, "Bone pain": 1, "Brain death": 1, "Brain natriuretic peptide": 1, "Cardiac arrest": 1, "Cardiac disorder": 1, "Cardiovascular disorder": 1, "Catheterisation cardiac": 1, "Chest X-ray": 1, "Coma scale": 1, "Condition aggravated": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysphonia": 1, "Electrocardiogram": 1, "Extrasystoles": 1, "Eye haemorrhage": 1, "Facial bones fracture": 1, "Fall": 1, "Fibrin D dimer": 1, "Foetal death": 1, "Gastrointestinal haemorrhage": 1, "Heart rate irregular": 1, "Hemiparesis": 1, "Hepatic cancer": 1, "Hepatic cirrhosis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Inflammation": 1, "Injection site mass": 1, "Injection site pain": 1, "Jaundice cholestatic": 1, "Laryngeal oedema": 1, "Meniere's disease": 1, "Nasoendoscopy": 1, "Nausea": 1, "Pancreatitis": 1, "Pneumonia": 1, "Rhinorrhoea": 1, "Rib fracture": 1, "Scapula fracture": 1, "Sepsis": 1, "Septic shock": 1, "Shock haemorrhagic": 1, "Sleep disorder": 1, "Somnolence": 1, "Speech disorder": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Toothache": 1, "Troponin": 1, "Troponin I": 1, "Ultrasound foetal": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vasculitis": 1, "Weight": 1, "X-ray": 1}, "batchcodes": ["939600-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939600.json b/docs/data/histograms/Taiwan, Province of China/939600.json
index 05d163cce0c..0104077392c 100644
--- a/docs/data/histograms/Taiwan, Province of China/939600.json
+++ b/docs/data/histograms/Taiwan, Province of China/939600.json
@@ -1 +1 @@
-{"batchcode": "939600", "histograms": [{"batchcodes": ["939600"], "histogram": {"Blood pressure measurement": 6, "Heart rate": 6, "Dizziness": 5, "Haemoglobin": 5, "Syncope": 5, "Chest X-ray": 4, "Electrocardiogram": 4, "Muscular weakness": 4, "Blood glucose": 3, "C-reactive protein": 3, "Dyspnoea": 3, "Gait disturbance": 3, "Oxygen saturation": 3, "Palpitations": 3, "Pyrexia": 3, "Respiratory rate": 3, "Activated partial thromboplastin time": 2, "Blood creatinine": 2, "Blood potassium": 2, "Blood urea": 2, "Body temperature": 2, "Bradycardia": 2, "Chest discomfort": 2, "Chills": 2, "Computerised tomogram": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Diarrhoea": 2, "Facial paralysis": 2, "Fatigue": 2, "Fibrin D dimer": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nausea": 2, "Pain in extremity": 2, "Platelet count": 2, "Rash": 2, "Troponin I": 2, "Vision blurred": 2, "Vomiting": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal faeces": 1, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Angioedema": 1, "Anuria": 1, "Arrhythmia": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Atrial fibrillation": 1, "Bacteraemia": 1, "Balance disorder": 1, "Bleeding time": 1, "Blood albumin": 1, "Blood creatine": 1, "Blood creatine phosphokinase MB": 1, "Blood gases": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood test": 1, "Brain natriuretic peptide": 1, "COVID-19 screening": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram abdomen": 1, "Cough": 1, "Critical illness": 1, "Culture urine": 1, "Death": 1, "Decreased appetite": 1, "Diabetes mellitus": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electromyogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Erythema": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemoglobin decreased": 1, "Head discomfort": 1, "Headache": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hyperkalaemia": 1, "Hypoaesthesia": 1, "Hyponatraemia": 1, "Hypotension": 1, "Hypothermia": 1, "Interstitial lung disease": 1, "Intraocular pressure test": 1, "Jaundice": 1, "Joint swelling": 1, "Language disorder": 1, "Leukocytosis": 1, "Limb discomfort": 1, "Muscle spasms": 1, "Myalgia": 1, "Necrosis": 1, "Oedema": 1, "Pallor": 1, "Paraesthesia": 1, "Physical examination": 1, "Pneumonitis": 1, "Procalcitonin": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Red blood cell count": 1, "Respiratory failure": 1, "Serum ferritin": 1, "Shock": 1, "Stool analysis": 1, "Tinnitus": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Urine output": 1, "Urosepsis": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vestibular disorder": 1, "Weight": 1, "Wheezing": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "939600", "histograms": [{"histogram": {"Blood pressure measurement": 6, "Heart rate": 6, "Dizziness": 5, "Haemoglobin": 5, "Syncope": 5, "Chest X-ray": 4, "Electrocardiogram": 4, "Muscular weakness": 4, "Blood glucose": 3, "C-reactive protein": 3, "Dyspnoea": 3, "Gait disturbance": 3, "Oxygen saturation": 3, "Palpitations": 3, "Pyrexia": 3, "Respiratory rate": 3, "Activated partial thromboplastin time": 2, "Blood creatinine": 2, "Blood potassium": 2, "Blood urea": 2, "Body temperature": 2, "Bradycardia": 2, "Chest discomfort": 2, "Chills": 2, "Computerised tomogram": 2, "Computerised tomogram head": 2, "Computerised tomogram thorax": 2, "Diarrhoea": 2, "Facial paralysis": 2, "Fatigue": 2, "Fibrin D dimer": 2, "N-terminal prohormone brain natriuretic peptide": 2, "Nausea": 2, "Pain in extremity": 2, "Platelet count": 2, "Rash": 2, "Troponin I": 2, "Vision blurred": 2, "Vomiting": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal faeces": 1, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Angioedema": 1, "Anuria": 1, "Arrhythmia": 1, "Arthralgia": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Atrial fibrillation": 1, "Bacteraemia": 1, "Balance disorder": 1, "Bleeding time": 1, "Blood albumin": 1, "Blood creatine": 1, "Blood creatine phosphokinase MB": 1, "Blood gases": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood test": 1, "Brain natriuretic peptide": 1, "COVID-19 screening": 1, "Cardiac failure": 1, "Cerebrovascular accident": 1, "Chest pain": 1, "Coma scale": 1, "Computerised tomogram abdomen": 1, "Cough": 1, "Critical illness": 1, "Culture urine": 1, "Death": 1, "Decreased appetite": 1, "Diabetes mellitus": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Electromyogram": 1, "Endoscopy upper gastrointestinal tract": 1, "Erythema": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemoglobin decreased": 1, "Head discomfort": 1, "Headache": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hyperkalaemia": 1, "Hypoaesthesia": 1, "Hyponatraemia": 1, "Hypotension": 1, "Hypothermia": 1, "Interstitial lung disease": 1, "Intraocular pressure test": 1, "Jaundice": 1, "Joint swelling": 1, "Language disorder": 1, "Leukocytosis": 1, "Limb discomfort": 1, "Muscle spasms": 1, "Myalgia": 1, "Necrosis": 1, "Oedema": 1, "Pallor": 1, "Paraesthesia": 1, "Physical examination": 1, "Pneumonitis": 1, "Procalcitonin": 1, "Productive cough": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Red blood cell count": 1, "Respiratory failure": 1, "Serum ferritin": 1, "Shock": 1, "Stool analysis": 1, "Tinnitus": 1, "Troponin T": 1, "Ultrasound scan": 1, "Urine analysis": 1, "Urine output": 1, "Urosepsis": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vestibular disorder": 1, "Weight": 1, "Wheezing": 1, "White blood cell count": 1}, "batchcodes": ["939600"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939600CDC.json b/docs/data/histograms/Taiwan, Province of China/939600CDC.json
index a053c2327a0..12badab8635 100644
--- a/docs/data/histograms/Taiwan, Province of China/939600CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/939600CDC.json
@@ -1 +1 @@
-{"batchcode": "939600CDC", "histograms": [{"batchcodes": ["939600CDC"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "939600CDC", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["939600CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939676-CDC.json b/docs/data/histograms/Taiwan, Province of China/939676-CDC.json
index c68d9a80dab..9081333393d 100644
--- a/docs/data/histograms/Taiwan, Province of China/939676-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/939676-CDC.json
@@ -1 +1 @@
-{"batchcode": "939676-CDC", "histograms": [{"batchcodes": ["939676-CDC"], "histogram": {"Decreased appetite": 5, "Fatigue": 5, "Dizziness": 4, "Muscular weakness": 4, "Facial paralysis": 3, "Headache": 3, "Pyrexia": 3, "Rash": 3, "Somnolence": 3, "Thrombocytopenia": 3, "Altered state of consciousness": 2, "Asthenia": 2, "Asthma": 2, "Chest discomfort": 2, "Death": 2, "Diabetes mellitus": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Palpitations": 2, "Paralysis": 2, "Seizure": 2, "Skin discolouration": 2, "Abdominal pain": 1, "Acute kidney injury": 1, "Anal incontinence": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Blood glucose": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Cardiogenic shock": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Coma": 1, "Computerised tomogram head": 1, "Deafness unilateral": 1, "Dry eye": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site swelling": 1, "Insomnia": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Malaise": 1, "Meningitis": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pallor": 1, "Paraesthesia": 1, "Platelet count": 1, "Poor quality sleep": 1, "Procedural pain": 1, "Pruritus": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test": 1, "Subdural effusion": 1, "Subdural haematoma": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Vaccination site cellulitis": 1, "Vaccination site discomfort": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "939676-CDC", "histograms": [{"histogram": {"Decreased appetite": 5, "Fatigue": 5, "Dizziness": 4, "Muscular weakness": 4, "Facial paralysis": 3, "Headache": 3, "Pyrexia": 3, "Rash": 3, "Somnolence": 3, "Thrombocytopenia": 3, "Altered state of consciousness": 2, "Asthenia": 2, "Asthma": 2, "Chest discomfort": 2, "Death": 2, "Diabetes mellitus": 2, "Dyspnoea": 2, "Loss of consciousness": 2, "Palpitations": 2, "Paralysis": 2, "Seizure": 2, "Skin discolouration": 2, "Abdominal pain": 1, "Acute kidney injury": 1, "Anal incontinence": 1, "Angina pectoris": 1, "Arrhythmia": 1, "Blood glucose": 1, "Blood pressure diastolic": 1, "Blood pressure diastolic decreased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Cardiogenic shock": 1, "Chest X-ray": 1, "Chest pain": 1, "Chills": 1, "Coma": 1, "Computerised tomogram head": 1, "Deafness unilateral": 1, "Dry eye": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Heart rate": 1, "Hemiparesis": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site swelling": 1, "Insomnia": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Malaise": 1, "Meningitis": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pallor": 1, "Paraesthesia": 1, "Platelet count": 1, "Poor quality sleep": 1, "Procedural pain": 1, "Pruritus": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test": 1, "Subdural effusion": 1, "Subdural haematoma": 1, "Syncope": 1, "Transient ischaemic attack": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Vaccination site cellulitis": 1, "Vaccination site discomfort": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["939676-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939676.json b/docs/data/histograms/Taiwan, Province of China/939676.json
index ab228d51d8d..f46fb536bee 100644
--- a/docs/data/histograms/Taiwan, Province of China/939676.json
+++ b/docs/data/histograms/Taiwan, Province of China/939676.json
@@ -1 +1 @@
-{"batchcode": "939676", "histograms": [{"batchcodes": ["939676"], "histogram": {"Blood pressure measurement": 3, "Dizziness": 3, "Facial paralysis": 3, "Myalgia": 3, "Dyspnoea": 2, "Peripheral swelling": 2, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Blood alkaline phosphatase": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Chest pain": 1, "Cough": 1, "Discomfort": 1, "Echocardiogram": 1, "Empyema": 1, "Erythema": 1, "Gamma-glutamyltransferase": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Lip swelling": 1, "Muscle twitching": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polyarthritis": 1, "Post procedural complication": 1, "Pyrexia": 1, "Syncope": 1, "Thrombosis": 1, "Underdose": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Vomiting": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "939676", "histograms": [{"histogram": {"Blood pressure measurement": 3, "Dizziness": 3, "Facial paralysis": 3, "Myalgia": 3, "Dyspnoea": 2, "Peripheral swelling": 2, "Arthralgia": 1, "Asthenia": 1, "Asthma": 1, "Blood alkaline phosphatase": 1, "Body temperature": 1, "C-reactive protein increased": 1, "Cardio-respiratory arrest": 1, "Chest X-ray": 1, "Chest pain": 1, "Cough": 1, "Discomfort": 1, "Echocardiogram": 1, "Empyema": 1, "Erythema": 1, "Gamma-glutamyltransferase": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Lip swelling": 1, "Muscle twitching": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Pleural effusion": 1, "Pneumonia": 1, "Polyarthritis": 1, "Post procedural complication": 1, "Pyrexia": 1, "Syncope": 1, "Thrombosis": 1, "Underdose": 1, "Vision blurred": 1, "Vital signs measurement": 1, "Vomiting": 1, "White blood cell count": 1}, "batchcodes": ["939676"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939679-CDC.json b/docs/data/histograms/Taiwan, Province of China/939679-CDC.json
index f7963d6c438..5e23cb68322 100644
--- a/docs/data/histograms/Taiwan, Province of China/939679-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/939679-CDC.json
@@ -1 +1 @@
-{"batchcode": "939679-CDC", "histograms": [{"batchcodes": ["939679-CDC"], "histogram": {"Cerebrovascular accident": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "939679-CDC", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Thrombocytopenia": 1}, "batchcodes": ["939679-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939697.json b/docs/data/histograms/Taiwan, Province of China/939697.json
index d86e10fe329..13504921ab8 100644
--- a/docs/data/histograms/Taiwan, Province of China/939697.json
+++ b/docs/data/histograms/Taiwan, Province of China/939697.json
@@ -1 +1 @@
-{"batchcode": "939697", "histograms": [{"batchcodes": ["939697"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "939697", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["939697"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/939767.json b/docs/data/histograms/Taiwan, Province of China/939767.json
index 4430be67bc5..deb19d1f100 100644
--- a/docs/data/histograms/Taiwan, Province of China/939767.json
+++ b/docs/data/histograms/Taiwan, Province of China/939767.json
@@ -1 +1 @@
-{"batchcode": "939767", "histograms": [{"batchcodes": ["939767"], "histogram": {"Altered state of consciousness": 1, "Anxiety": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "939767", "histograms": [{"histogram": {"Altered state of consciousness": 1, "Anxiety": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["939767"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/ABX6083-CDC.json b/docs/data/histograms/Taiwan, Province of China/ABX6083-CDC.json
index 613f0cdaca5..fb2a0a0f7fd 100644
--- a/docs/data/histograms/Taiwan, Province of China/ABX6083-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/ABX6083-CDC.json
@@ -1 +1 @@
-{"batchcode": "ABX6083-CDC", "histograms": [{"batchcodes": ["ABX6083-CDC"], "histogram": {"Headache": 1, "Nausea": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "ABX6083-CDC", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1, "Syncope": 1}, "batchcodes": ["ABX6083-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/CTMAV509-CDC.json b/docs/data/histograms/Taiwan, Province of China/CTMAV509-CDC.json
index 29d4fcad7b8..8099099efb9 100644
--- a/docs/data/histograms/Taiwan, Province of China/CTMAV509-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/CTMAV509-CDC.json
@@ -1 +1 @@
-{"batchcode": "CTMAV509-CDC", "histograms": [{"batchcodes": ["CTMAV509-CDC"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "CTMAV509-CDC", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["CTMAV509-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/DP4A141P.json b/docs/data/histograms/Taiwan, Province of China/DP4A141P.json
index fb9b18ace54..d7a3c9802da 100644
--- a/docs/data/histograms/Taiwan, Province of China/DP4A141P.json
+++ b/docs/data/histograms/Taiwan, Province of China/DP4A141P.json
@@ -1 +1 @@
-{"batchcode": "DP4A141P", "histograms": [{"batchcodes": ["DP4A141P"], "histogram": {"Angiogram": 1, "Antiacetylcholine receptor antibody": 1, "CSF test": 1, "Dry eye": 1, "Effusion": 1, "Eye pain": 1, "Headache": 1, "IIIrd nerve paralysis": 1, "Neurodegenerative disorder": 1, "Ophthalmological examination": 1, "Sinus pain": 1, "Streptococcus test": 1}}]}
\ No newline at end of file
+{"batchcode": "DP4A141P", "histograms": [{"histogram": {"Angiogram": 1, "Antiacetylcholine receptor antibody": 1, "CSF test": 1, "Dry eye": 1, "Effusion": 1, "Eye pain": 1, "Headache": 1, "IIIrd nerve paralysis": 1, "Neurodegenerative disorder": 1, "Ophthalmological examination": 1, "Sinus pain": 1, "Streptococcus test": 1}, "batchcodes": ["DP4A141P"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/EH050A_CDC.json b/docs/data/histograms/Taiwan, Province of China/EH050A_CDC.json
index f13469ffd40..302f55d8056 100644
--- a/docs/data/histograms/Taiwan, Province of China/EH050A_CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/EH050A_CDC.json
@@ -1 +1 @@
-{"batchcode": "EH050A_CDC", "histograms": [{"batchcodes": ["EH050A_CDC"], "histogram": {"Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Decreased activity": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Haemoglobin": 1, "Heart rate": 1, "Lymphocyte count": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Troponin I": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "EH050A_CDC", "histograms": [{"histogram": {"Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest pain": 1, "Decreased activity": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Haemoglobin": 1, "Heart rate": 1, "Lymphocyte count": 1, "Neutrophil count": 1, "Oxygen saturation": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Troponin I": 1, "White blood cell count": 1}, "batchcodes": ["EH050A_CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/EH059A.json b/docs/data/histograms/Taiwan, Province of China/EH059A.json
index 6158f797ddd..27d35185a95 100644
--- a/docs/data/histograms/Taiwan, Province of China/EH059A.json
+++ b/docs/data/histograms/Taiwan, Province of China/EH059A.json
@@ -1 +1 @@
-{"batchcode": "EH059A", "histograms": [{"batchcodes": ["EH059A"], "histogram": {"Cytopenia": 1, "Diarrhoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "EH059A", "histograms": [{"histogram": {"Cytopenia": 1, "Diarrhoea": 1, "Pyrexia": 1}, "batchcodes": ["EH059A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/EN054A-1101126-.json b/docs/data/histograms/Taiwan, Province of China/EN054A-1101126-.json
index ee8c1d3046b..2795a3654be 100644
--- a/docs/data/histograms/Taiwan, Province of China/EN054A-1101126-.json
+++ b/docs/data/histograms/Taiwan, Province of China/EN054A-1101126-.json
@@ -1 +1 @@
-{"batchcode": "EN054A-1101126-", "histograms": [{"batchcodes": ["EN054A-1101126-"], "histogram": {"Acute myocardial infarction": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coma scale": 1, "Coronary artery dilatation": 1, "Coronary artery disease": 1, "Electrocardiogram": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Respiratory rate": 1, "Sluggishness": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "EN054A-1101126-", "histograms": [{"histogram": {"Acute myocardial infarction": 1, "Blood creatine phosphokinase MB": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coma scale": 1, "Coronary artery dilatation": 1, "Coronary artery disease": 1, "Electrocardiogram": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Investigation": 1, "Myocarditis": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Respiratory rate": 1, "Sluggishness": 1, "Troponin I": 1}, "batchcodes": ["EN054A-1101126-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101-1110731-.json b/docs/data/histograms/Taiwan, Province of China/FW5101-1110731-.json
index 7ae2b77b5a4..f1b3ee7b312 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101-1110731-.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101-1110731-.json
@@ -1 +1 @@
-{"batchcode": "FW5101-1110731-", "histograms": [{"batchcodes": ["FW5101-1110731-"], "histogram": {"Eye pain": 1, "Eye swelling": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Overdose": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101-1110731-", "histograms": [{"histogram": {"Eye pain": 1, "Eye swelling": 1, "Hypersensitivity": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Overdose": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["FW5101-1110731-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101-1110802-.json b/docs/data/histograms/Taiwan, Province of China/FW5101-1110802-.json
index 1e03648bec2..d7645e4c98b 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101-1110802-.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101-1110802-.json
@@ -1 +1 @@
-{"batchcode": "FW5101-1110802-", "histograms": [{"batchcodes": ["FW5101-1110802-"], "histogram": {"Aspartate aminotransferase": 1, "Blood lactate dehydrogenase": 1, "Body temperature": 1, "C-reactive protein": 1, "Decreased appetite": 1, "Investigation": 1, "Mycoplasma test": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Urine antigen test": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101-1110802-", "histograms": [{"histogram": {"Aspartate aminotransferase": 1, "Blood lactate dehydrogenase": 1, "Body temperature": 1, "C-reactive protein": 1, "Decreased appetite": 1, "Investigation": 1, "Mycoplasma test": 1, "Polymerase chain reaction": 1, "Pyrexia": 1, "Urine antigen test": 1}, "batchcodes": ["FW5101-1110802-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101.json b/docs/data/histograms/Taiwan, Province of China/FW5101.json
index 03ee6ba757c..df86c13e282 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101.json
@@ -1 +1 @@
-{"batchcode": "FW5101", "histograms": [{"batchcodes": ["FW5101"], "histogram": {"Fall": 1, "Gait disturbance": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Paralysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101", "histograms": [{"histogram": {"Fall": 1, "Gait disturbance": 1, "Hemiparesis": 1, "Hypoaesthesia": 1, "Muscular weakness": 1, "Paralysis": 1}, "batchcodes": ["FW5101"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101_1110731-.json b/docs/data/histograms/Taiwan, Province of China/FW5101_1110731-.json
index 8e05988a5f6..9876e96c21b 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101_1110731-.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101_1110731-.json
@@ -1 +1 @@
-{"batchcode": "FW5101_1110731-", "histograms": [{"batchcodes": ["FW5101_1110731-"], "histogram": {"Tremor": 2, "Blood test": 1, "Chest pain": 1, "Croup infectious": 1, "Hypoaesthesia": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101_1110731-", "histograms": [{"histogram": {"Tremor": 2, "Blood test": 1, "Chest pain": 1, "Croup infectious": 1, "Hypoaesthesia": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Rash": 1}, "batchcodes": ["FW5101_1110731-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101_1110802-.json b/docs/data/histograms/Taiwan, Province of China/FW5101_1110802-.json
index 344d11cb235..4d97578671f 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101_1110802-.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101_1110802-.json
@@ -1 +1 @@
-{"batchcode": "FW5101_1110802-", "histograms": [{"batchcodes": ["FW5101_1110802-"], "histogram": {"Dizziness": 2, "Body temperature": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Syncope": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101_1110802-", "histograms": [{"histogram": {"Dizziness": 2, "Body temperature": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Syncope": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["FW5101_1110802-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101_1110807-.json b/docs/data/histograms/Taiwan, Province of China/FW5101_1110807-.json
index d6cb568e91d..60e20d8d916 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101_1110807-.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101_1110807-.json
@@ -1 +1 @@
-{"batchcode": "FW5101_1110807-", "histograms": [{"batchcodes": ["FW5101_1110807-"], "histogram": {"Abdominal pain lower": 1, "Appendicitis": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101_1110807-", "histograms": [{"histogram": {"Abdominal pain lower": 1, "Appendicitis": 1}, "batchcodes": ["FW5101_1110807-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101_1110828-.json b/docs/data/histograms/Taiwan, Province of China/FW5101_1110828-.json
index fa7129a8ae7..73a56d95301 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101_1110828-.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101_1110828-.json
@@ -1 +1 @@
-{"batchcode": "FW5101_1110828-", "histograms": [{"batchcodes": ["FW5101_1110828-"], "histogram": {"Blood creatine phosphokinase MB": 2, "Body temperature": 2, "Coma scale": 2, "Troponin I": 2, "Altered state of consciousness": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Cytomegalovirus test": 1, "Dehydration": 1, "Electrocardiogram": 1, "Enterovirus test": 1, "Epididymitis": 1, "Epstein-Barr virus test": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Herpes simplex test": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Off label use": 1, "Oxygen saturation": 1, "Physical examination": 1, "Pyrexia": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Specific gravity urine": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101_1110828-", "histograms": [{"histogram": {"Blood creatine phosphokinase MB": 2, "Body temperature": 2, "Coma scale": 2, "Troponin I": 2, "Altered state of consciousness": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Cardiac arrest": 1, "Chest discomfort": 1, "Chest pain": 1, "Computerised tomogram head": 1, "Cytomegalovirus test": 1, "Dehydration": 1, "Electrocardiogram": 1, "Enterovirus test": 1, "Epididymitis": 1, "Epstein-Barr virus test": 1, "Fibrin D dimer": 1, "Heart rate": 1, "Herpes simplex test": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Myocardial necrosis marker": 1, "Myocarditis": 1, "Off label use": 1, "Oxygen saturation": 1, "Physical examination": 1, "Pyrexia": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Specific gravity urine": 1, "Ultrasound scan": 1}, "batchcodes": ["FW5101_1110828-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/FW5101_1110828.json b/docs/data/histograms/Taiwan, Province of China/FW5101_1110828.json
index a86df7c4c76..0e3e4f008b3 100644
--- a/docs/data/histograms/Taiwan, Province of China/FW5101_1110828.json
+++ b/docs/data/histograms/Taiwan, Province of China/FW5101_1110828.json
@@ -1 +1 @@
-{"batchcode": "FW5101_1110828", "histograms": [{"batchcodes": ["FW5101_1110828"], "histogram": {"Alopecia": 1, "Lymphadenopathy": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FW5101_1110828", "histograms": [{"histogram": {"Alopecia": 1, "Lymphadenopathy": 1, "Pyrexia": 1}, "batchcodes": ["FW5101_1110828"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/G042A-CDC.json b/docs/data/histograms/Taiwan, Province of China/G042A-CDC.json
index ebbac2e766c..a66b0da13ea 100644
--- a/docs/data/histograms/Taiwan, Province of China/G042A-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/G042A-CDC.json
@@ -1 +1 @@
-{"batchcode": "G042A-CDC", "histograms": [{"batchcodes": ["G042A-CDC"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Diarrhoea": 1, "Nausea": 1, "Overdose": 1}}]}
\ No newline at end of file
+{"batchcode": "G042A-CDC", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Diarrhoea": 1, "Nausea": 1, "Overdose": 1}, "batchcodes": ["G042A-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/GE0695_1111101-.json b/docs/data/histograms/Taiwan, Province of China/GE0695_1111101-.json
index 1a1c90a6e5d..a7f6cf231fc 100644
--- a/docs/data/histograms/Taiwan, Province of China/GE0695_1111101-.json
+++ b/docs/data/histograms/Taiwan, Province of China/GE0695_1111101-.json
@@ -1 +1 @@
-{"batchcode": "GE0695_1111101-", "histograms": [{"batchcodes": ["GE0695_1111101-"], "histogram": {"Body temperature": 1, "Cellulitis": 1, "Decreased appetite": 1, "Gingival disorder": 1, "Gingival ulceration": 1, "Inflammation": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "GE0695_1111101-", "histograms": [{"histogram": {"Body temperature": 1, "Cellulitis": 1, "Decreased appetite": 1, "Gingival disorder": 1, "Gingival ulceration": 1, "Inflammation": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["GE0695_1111101-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/I1070A_1110115-.json b/docs/data/histograms/Taiwan, Province of China/I1070A_1110115-.json
index 63486f04813..d4b18f9e566 100644
--- a/docs/data/histograms/Taiwan, Province of China/I1070A_1110115-.json
+++ b/docs/data/histograms/Taiwan, Province of China/I1070A_1110115-.json
@@ -1 +1 @@
-{"batchcode": "I1070A_1110115-", "histograms": [{"batchcodes": ["I1070A_1110115-"], "histogram": {"Brain natriuretic peptide": 1, "Chest X-ray normal": 1, "Chest discomfort": 1, "Chest pain": 1, "Palpitations": 1, "Platelet count": 1, "Troponin I": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "I1070A_1110115-", "histograms": [{"histogram": {"Brain natriuretic peptide": 1, "Chest X-ray normal": 1, "Chest discomfort": 1, "Chest pain": 1, "Palpitations": 1, "Platelet count": 1, "Troponin I": 1, "Vomiting": 1}, "batchcodes": ["I1070A_1110115-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/P4A140P.json b/docs/data/histograms/Taiwan, Province of China/P4A140P.json
index 5b57217fd21..ad5f3d3636f 100644
--- a/docs/data/histograms/Taiwan, Province of China/P4A140P.json
+++ b/docs/data/histograms/Taiwan, Province of China/P4A140P.json
@@ -1 +1 @@
-{"batchcode": "P4A140P", "histograms": [{"batchcodes": ["P4A140P"], "histogram": {"Acute kidney injury": 1, "Blood creatinine": 1, "Cold sweat": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "P4A140P", "histograms": [{"histogram": {"Acute kidney injury": 1, "Blood creatinine": 1, "Cold sweat": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["P4A140P"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/S002615.json b/docs/data/histograms/Taiwan, Province of China/S002615.json
index edeff16273f..c2c3ea149a1 100644
--- a/docs/data/histograms/Taiwan, Province of China/S002615.json
+++ b/docs/data/histograms/Taiwan, Province of China/S002615.json
@@ -1 +1 @@
-{"batchcode": "S002615", "histograms": [{"batchcodes": ["S002615"], "histogram": {"Contusion": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "S002615", "histograms": [{"histogram": {"Contusion": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["S002615"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/SP2107V-CDC.json b/docs/data/histograms/Taiwan, Province of China/SP2107V-CDC.json
index 5ab66cdfb7c..8825731792b 100644
--- a/docs/data/histograms/Taiwan, Province of China/SP2107V-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/SP2107V-CDC.json
@@ -1 +1 @@
-{"batchcode": "SP2107V-CDC", "histograms": [{"batchcodes": ["SP2107V-CDC"], "histogram": {"Muscular weakness": 1}}]}
\ No newline at end of file
+{"batchcode": "SP2107V-CDC", "histograms": [{"histogram": {"Muscular weakness": 1}, "batchcodes": ["SP2107V-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/SP2110-CDC.json b/docs/data/histograms/Taiwan, Province of China/SP2110-CDC.json
index 188b1797fb1..a4593aa8e2c 100644
--- a/docs/data/histograms/Taiwan, Province of China/SP2110-CDC.json
+++ b/docs/data/histograms/Taiwan, Province of China/SP2110-CDC.json
@@ -1 +1 @@
-{"batchcode": "SP2110-CDC", "histograms": [{"batchcodes": ["SP2110-CDC"], "histogram": {"Tachypnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "SP2110-CDC", "histograms": [{"histogram": {"Tachypnoea": 1}, "batchcodes": ["SP2110-CDC"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Taiwan, Province of China/UNK.json b/docs/data/histograms/Taiwan, Province of China/UNK.json
index 484be4f7ede..6de2616c361 100644
--- a/docs/data/histograms/Taiwan, Province of China/UNK.json
+++ b/docs/data/histograms/Taiwan, Province of China/UNK.json
@@ -1 +1 @@
-{"batchcode": "UNK", "histograms": [{"batchcodes": ["UNK"], "histogram": {"Dizziness": 2, "Angina pectoris": 1, "Asthma": 1, "Diarrhoea": 1, "Fatigue": 1, "Heart rate": 1, "Nausea": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pyrexia": 1, "Rash": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "UNK", "histograms": [{"histogram": {"Dizziness": 2, "Angina pectoris": 1, "Asthma": 1, "Diarrhoea": 1, "Fatigue": 1, "Heart rate": 1, "Nausea": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pyrexia": 1, "Rash": 1, "Syncope": 1}, "batchcodes": ["UNK"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Tanzania, United Republic of/1822788.json b/docs/data/histograms/Tanzania, United Republic of/1822788.json
index a475f6434b8..267a7bf290d 100644
--- a/docs/data/histograms/Tanzania, United Republic of/1822788.json
+++ b/docs/data/histograms/Tanzania, United Republic of/1822788.json
@@ -1 +1 @@
-{"batchcode": "1822788", "histograms": [{"batchcodes": ["1822788"], "histogram": {"Acute kidney injury": 1, "Arthralgia": 1, "Back pain": 1, "Blood glucose": 1, "Haemoglobin": 1, "Headache": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hypernatraemia": 1, "Myalgia": 1, "Normochromic normocytic anaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "1822788", "histograms": [{"histogram": {"Acute kidney injury": 1, "Arthralgia": 1, "Back pain": 1, "Blood glucose": 1, "Haemoglobin": 1, "Headache": 1, "Hyperglycaemic hyperosmolar nonketotic syndrome": 1, "Hypernatraemia": 1, "Myalgia": 1, "Normochromic normocytic anaemia": 1}, "batchcodes": ["1822788"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/021F214.json b/docs/data/histograms/Thailand/021F214.json
index f41ad28b9ea..3c3652fd86b 100644
--- a/docs/data/histograms/Thailand/021F214.json
+++ b/docs/data/histograms/Thailand/021F214.json
@@ -1 +1 @@
-{"batchcode": "021F214", "histograms": [{"batchcodes": ["021F214"], "histogram": {"Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "021F214", "histograms": [{"histogram": {"Vaccination complication": 1}, "batchcodes": ["021F214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/021F21A.json b/docs/data/histograms/Thailand/021F21A.json
index 29d1ab602e2..da9ce724959 100644
--- a/docs/data/histograms/Thailand/021F21A.json
+++ b/docs/data/histograms/Thailand/021F21A.json
@@ -1 +1 @@
-{"batchcode": "021F21A", "histograms": [{"batchcodes": ["021F21A"], "histogram": {"Pyrexia": 15, "Vomiting": 14, "Nausea": 12, "Vaccination complication": 12, "Dizziness": 11, "Headache": 11, "Dyspnoea": 6, "Chest discomfort": 5, "Chills": 5, "Fatigue": 5, "Vertigo": 4, "Adverse event following immunisation": 3, "Asthenia": 3, "Blood pressure measurement": 3, "Cerebrovascular accident": 3, "Ischaemic stroke": 3, "Oxygen saturation": 3, "Pain": 3, "Syncope": 3, "Chest pain": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Loss of consciousness": 2, "Myalgia": 2, "Palpitations": 2, "Urticaria": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Adverse event": 1, "Anaphylactic reaction": 1, "Back pain": 1, "Blood glucose": 1, "Blood pressure diastolic decreased": 1, "Body temperature": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Death": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Electrolyte imbalance": 1, "Epigastric discomfort": 1, "Eye pain": 1, "Facial discomfort": 1, "Feeding disorder": 1, "Gastrointestinal haemorrhage": 1, "Haematemesis": 1, "Haematocrit": 1, "Hot flush": 1, "Hypertensive urgency": 1, "Hyperventilation": 1, "Hypoglycaemia": 1, "Hypokalaemia": 1, "Hypomagnesaemia": 1, "Hyponatraemia": 1, "Hypophosphataemia": 1, "Immunisation anxiety related reaction": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Nasal congestion": 1, "Neck pain": 1, "Pain in extremity": 1, "Physical examination": 1, "Pulmonary function test": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Somnolence": 1, "Throat tightness": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "021F21A", "histograms": [{"histogram": {"Pyrexia": 15, "Vomiting": 14, "Nausea": 12, "Vaccination complication": 12, "Dizziness": 11, "Headache": 11, "Dyspnoea": 6, "Chest discomfort": 5, "Chills": 5, "Fatigue": 5, "Vertigo": 4, "Adverse event following immunisation": 3, "Asthenia": 3, "Blood pressure measurement": 3, "Cerebrovascular accident": 3, "Ischaemic stroke": 3, "Oxygen saturation": 3, "Pain": 3, "Syncope": 3, "Chest pain": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Heart rate": 2, "Hypoaesthesia": 2, "Loss of consciousness": 2, "Myalgia": 2, "Palpitations": 2, "Urticaria": 2, "Abdominal pain": 1, "Acute coronary syndrome": 1, "Acute kidney injury": 1, "Adverse event": 1, "Anaphylactic reaction": 1, "Back pain": 1, "Blood glucose": 1, "Blood pressure diastolic decreased": 1, "Body temperature": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Death": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Electrolyte imbalance": 1, "Epigastric discomfort": 1, "Eye pain": 1, "Facial discomfort": 1, "Feeding disorder": 1, "Gastrointestinal haemorrhage": 1, "Haematemesis": 1, "Haematocrit": 1, "Hot flush": 1, "Hypertensive urgency": 1, "Hyperventilation": 1, "Hypoglycaemia": 1, "Hypokalaemia": 1, "Hypomagnesaemia": 1, "Hyponatraemia": 1, "Hypophosphataemia": 1, "Immunisation anxiety related reaction": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Nasal congestion": 1, "Neck pain": 1, "Pain in extremity": 1, "Physical examination": 1, "Pulmonary function test": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Somnolence": 1, "Throat tightness": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["021F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/031A21A.json b/docs/data/histograms/Thailand/031A21A.json
index b35619803c5..66085db5bc2 100644
--- a/docs/data/histograms/Thailand/031A21A.json
+++ b/docs/data/histograms/Thailand/031A21A.json
@@ -1 +1 @@
-{"batchcode": "031A21A", "histograms": [{"batchcodes": ["031A21A"], "histogram": {"Rash macular": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "031A21A", "histograms": [{"histogram": {"Rash macular": 1, "Skin discolouration": 1}, "batchcodes": ["031A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/039K20A.json b/docs/data/histograms/Thailand/039K20A.json
index be2bd24721b..c4710516c42 100644
--- a/docs/data/histograms/Thailand/039K20A.json
+++ b/docs/data/histograms/Thailand/039K20A.json
@@ -1 +1 @@
-{"batchcode": "039K20A", "histograms": [{"batchcodes": ["039K20A"], "histogram": {"Fatigue": 1, "Paraesthesia": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "039K20A", "histograms": [{"histogram": {"Fatigue": 1, "Paraesthesia": 1, "Skin discolouration": 1}, "batchcodes": ["039K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/049F214.json b/docs/data/histograms/Thailand/049F214.json
index 3752972ac3e..390168be21a 100644
--- a/docs/data/histograms/Thailand/049F214.json
+++ b/docs/data/histograms/Thailand/049F214.json
@@ -1 +1 @@
-{"batchcode": "049F214", "histograms": [{"batchcodes": ["049F214"], "histogram": {"Influenza like illness": 2, "Muscle strain": 2, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "049F214", "histograms": [{"histogram": {"Influenza like illness": 2, "Muscle strain": 2, "Myalgia": 1}, "batchcodes": ["049F214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/049F21A.json b/docs/data/histograms/Thailand/049F21A.json
index 1213ddb6b4e..0080a996909 100644
--- a/docs/data/histograms/Thailand/049F21A.json
+++ b/docs/data/histograms/Thailand/049F21A.json
@@ -1 +1 @@
-{"batchcode": "049F21A", "histograms": [{"batchcodes": ["049F21A"], "histogram": {"Pyrexia": 36, "Vaccination complication": 27, "Headache": 21, "Fatigue": 18, "Nausea": 17, "Chest discomfort": 16, "Dizziness": 16, "Myalgia": 16, "Vomiting": 16, "Chest pain": 10, "Body temperature": 9, "Oxygen saturation": 9, "Adverse event following immunisation": 8, "Dyspnoea": 8, "Palpitations": 8, "Heart rate": 7, "Hypoaesthesia": 6, "Pain in extremity": 6, "Rash": 6, "Syncope": 6, "Asthenia": 5, "Chills": 5, "Respiratory rate": 5, "Abdominal pain": 4, "Blood pressure measurement": 4, "Diarrhoea": 4, "Electrocardiogram": 4, "Pain": 4, "Vaccination site pain": 4, "Allergy to vaccine": 3, "Arthralgia": 3, "Cough": 3, "Haematocrit": 3, "Hypovolaemia": 3, "Platelet count": 3, "Vertigo positional": 3, "White blood cell count": 3, "Abdominal distension": 2, "Blood creatinine": 2, "Blood potassium": 2, "Blood pressure diastolic": 2, "Decreased appetite": 2, "Epigastric discomfort": 2, "Erythema": 2, "Full blood count": 2, "Gastritis": 2, "Haemoglobin": 2, "Hypotension": 2, "Myocarditis": 2, "Physical examination": 2, "Pruritus": 2, "Red blood cell count": 2, "Sinus rhythm": 2, "Swelling": 2, "Troponin T": 2, "Urticaria": 2, "Vertigo": 2, "Abdomen scan": 1, "Abdominal pain upper": 1, "Acute kidney injury": 1, "Adverse event": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Aplastic anaemia": 1, "Back pain": 1, "Blood chloride": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "C-reactive protein increased": 1, "Carbon dioxide": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Cardiac function test": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Chronic kidney disease": 1, "Death": 1, "Decreased immune responsiveness": 1, "Diabetes mellitus": 1, "EGFR status assay": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Epilepsy": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Food poisoning": 1, "Gait inability": 1, "Glomerular filtration rate": 1, "Haematology test": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Injection site hypoaesthesia": 1, "Interchange of vaccine products": 1, "Joint swelling": 1, "Kidney infection": 1, "Lymphocyte count": 1, "Mass excision": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Micturition disorder": 1, "Mobility decreased": 1, "Monocyte count": 1, "Mouth swelling": 1, "Muscle strain": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Neurological examination": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Rash pruritic": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate abnormal": 1, "Respiratory disorder": 1, "Respiratory rate decreased": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sinus tachycardia": 1, "Somnolence": 1, "Tachycardia": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Ventilation/perfusion scan": 1}}]}
\ No newline at end of file
+{"batchcode": "049F21A", "histograms": [{"histogram": {"Pyrexia": 36, "Vaccination complication": 27, "Headache": 21, "Fatigue": 18, "Nausea": 17, "Chest discomfort": 16, "Dizziness": 16, "Myalgia": 16, "Vomiting": 16, "Chest pain": 10, "Body temperature": 9, "Oxygen saturation": 9, "Adverse event following immunisation": 8, "Dyspnoea": 8, "Palpitations": 8, "Heart rate": 7, "Hypoaesthesia": 6, "Pain in extremity": 6, "Rash": 6, "Syncope": 6, "Asthenia": 5, "Chills": 5, "Respiratory rate": 5, "Abdominal pain": 4, "Blood pressure measurement": 4, "Diarrhoea": 4, "Electrocardiogram": 4, "Pain": 4, "Vaccination site pain": 4, "Allergy to vaccine": 3, "Arthralgia": 3, "Cough": 3, "Haematocrit": 3, "Hypovolaemia": 3, "Platelet count": 3, "Vertigo positional": 3, "White blood cell count": 3, "Abdominal distension": 2, "Blood creatinine": 2, "Blood potassium": 2, "Blood pressure diastolic": 2, "Decreased appetite": 2, "Epigastric discomfort": 2, "Erythema": 2, "Full blood count": 2, "Gastritis": 2, "Haemoglobin": 2, "Hypotension": 2, "Myocarditis": 2, "Physical examination": 2, "Pruritus": 2, "Red blood cell count": 2, "Sinus rhythm": 2, "Swelling": 2, "Troponin T": 2, "Urticaria": 2, "Vertigo": 2, "Abdomen scan": 1, "Abdominal pain upper": 1, "Acute kidney injury": 1, "Adverse event": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Aplastic anaemia": 1, "Back pain": 1, "Blood chloride": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "C-reactive protein increased": 1, "Carbon dioxide": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Cardiac function test": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Chronic kidney disease": 1, "Death": 1, "Decreased immune responsiveness": 1, "Diabetes mellitus": 1, "EGFR status assay": 1, "Ear, nose and throat examination": 1, "Echocardiogram": 1, "Eosinophil count": 1, "Epilepsy": 1, "Feeding disorder": 1, "Fibrin D dimer increased": 1, "Food poisoning": 1, "Gait inability": 1, "Glomerular filtration rate": 1, "Haematology test": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Injection site hypoaesthesia": 1, "Interchange of vaccine products": 1, "Joint swelling": 1, "Kidney infection": 1, "Lymphocyte count": 1, "Mass excision": 1, "Mean arterial pressure": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Micturition disorder": 1, "Mobility decreased": 1, "Monocyte count": 1, "Mouth swelling": 1, "Muscle strain": 1, "Myocardial infarction": 1, "Myocardial ischaemia": 1, "Neurological examination": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Rash pruritic": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate abnormal": 1, "Respiratory disorder": 1, "Respiratory rate decreased": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sinus tachycardia": 1, "Somnolence": 1, "Tachycardia": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Ventilation/perfusion scan": 1}, "batchcodes": ["049F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/063K21A.json b/docs/data/histograms/Thailand/063K21A.json
index 66d1ef22201..47797ed22cc 100644
--- a/docs/data/histograms/Thailand/063K21A.json
+++ b/docs/data/histograms/Thailand/063K21A.json
@@ -1 +1 @@
-{"batchcode": "063K21A", "histograms": [{"batchcodes": ["063K21A"], "histogram": {"Blood pressure measurement": 6, "Body temperature": 6, "Heart rate": 6, "Oxygen saturation": 6, "Dizziness": 4, "Interchange of vaccine products": 4, "Respiratory rate": 4, "Electrocardiogram": 3, "Pyrexia": 3, "Chest pain": 2, "Haematocrit": 2, "Haemoglobin": 2, "Injection site pain": 2, "Nausea": 2, "Palpitations": 2, "Syncope": 2, "Troponin T": 2, "Vomiting": 2, "Angioedema": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Blood sodium": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Epigastric discomfort": 1, "Full blood count": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Mean cell volume": 1, "Pain in extremity": 1, "Performance status decreased": 1, "Physical examination": 1, "Red blood cell sedimentation rate": 1, "Thrombocytosis": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "063K21A", "histograms": [{"histogram": {"Blood pressure measurement": 6, "Body temperature": 6, "Heart rate": 6, "Oxygen saturation": 6, "Dizziness": 4, "Interchange of vaccine products": 4, "Respiratory rate": 4, "Electrocardiogram": 3, "Pyrexia": 3, "Chest pain": 2, "Haematocrit": 2, "Haemoglobin": 2, "Injection site pain": 2, "Nausea": 2, "Palpitations": 2, "Syncope": 2, "Troponin T": 2, "Vomiting": 2, "Angioedema": 1, "Blood creatinine": 1, "Blood pressure increased": 1, "Blood sodium": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Epigastric discomfort": 1, "Full blood count": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Loss of consciousness": 1, "Mean cell volume": 1, "Pain in extremity": 1, "Performance status decreased": 1, "Physical examination": 1, "Red blood cell sedimentation rate": 1, "Thrombocytosis": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "White blood cell count": 1}, "batchcodes": ["063K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/084M21A.json b/docs/data/histograms/Thailand/084M21A.json
index 52b59d5e9ba..e910b57086f 100644
--- a/docs/data/histograms/Thailand/084M21A.json
+++ b/docs/data/histograms/Thailand/084M21A.json
@@ -1 +1 @@
-{"batchcode": "084M21A", "histograms": [{"batchcodes": ["084M21A"], "histogram": {"Death": 1}}]}
\ No newline at end of file
+{"batchcode": "084M21A", "histograms": [{"histogram": {"Death": 1}, "batchcodes": ["084M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/1F1060A.json b/docs/data/histograms/Thailand/1F1060A.json
index 1e6bedba55e..cc0eb7cbf62 100644
--- a/docs/data/histograms/Thailand/1F1060A.json
+++ b/docs/data/histograms/Thailand/1F1060A.json
@@ -1 +1 @@
-{"batchcode": "1F1060A", "histograms": [{"batchcodes": ["1F1060A"], "histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2, "Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "1F1060A", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2, "Interchange of vaccine products": 1}, "batchcodes": ["1F1060A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/1I064A.json b/docs/data/histograms/Thailand/1I064A.json
index b5399816445..bf683229c01 100644
--- a/docs/data/histograms/Thailand/1I064A.json
+++ b/docs/data/histograms/Thailand/1I064A.json
@@ -1 +1 @@
-{"batchcode": "1I064A", "histograms": [{"batchcodes": ["1I064A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "1I064A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["1I064A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/1K078A.json b/docs/data/histograms/Thailand/1K078A.json
index 54457012d86..1ae6ec99582 100644
--- a/docs/data/histograms/Thailand/1K078A.json
+++ b/docs/data/histograms/Thailand/1K078A.json
@@ -1 +1 @@
-{"batchcode": "1K078A", "histograms": [{"batchcodes": ["1K078A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "1K078A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["1K078A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/1L085A.json b/docs/data/histograms/Thailand/1L085A.json
index 2e0cc0b7176..2009b6fac06 100644
--- a/docs/data/histograms/Thailand/1L085A.json
+++ b/docs/data/histograms/Thailand/1L085A.json
@@ -1 +1 @@
-{"batchcode": "1L085A", "histograms": [{"batchcodes": ["1L085A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "1L085A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["1L085A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/3005841.json b/docs/data/histograms/Thailand/3005841.json
index 31ea7fa18e9..60532df8d28 100644
--- a/docs/data/histograms/Thailand/3005841.json
+++ b/docs/data/histograms/Thailand/3005841.json
@@ -1 +1 @@
-{"batchcode": "3005841", "histograms": [{"batchcodes": ["3005841"], "histogram": {"Dizziness": 15, "Nausea": 13, "Pyrexia": 11, "Vomiting": 11, "Syncope": 9, "Headache": 8, "Blood pressure measurement": 7, "Dyspnoea": 7, "Heart rate": 7, "Myalgia": 7, "Oxygen saturation": 7, "Vaccination complication": 7, "Body temperature": 6, "Chest discomfort": 6, "Fatigue": 6, "Pain in extremity": 6, "Adverse event following immunisation": 5, "Electrocardiogram": 5, "Chest X-ray": 4, "Chest pain": 4, "Respiratory rate": 4, "Blood creatinine": 3, "Blood sodium": 3, "Diarrhoea": 3, "Myocarditis": 3, "Palpitations": 3, "Troponin T": 3, "Vertigo": 3, "Allergy to vaccine": 2, "Asthenia": 2, "Blood chloride": 2, "Blood potassium": 2, "Blood urea": 2, "COVID-19 immunisation": 2, "Carbon dioxide": 2, "Chills": 2, "Death": 2, "Decreased appetite": 2, "Glomerular filtration rate": 2, "Haematocrit": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Troponin": 2, "Urticaria": 2, "Vision blurred": 2, "Activated partial thromboplastin time shortened": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Asthma": 1, "Autonomic neuropathy": 1, "Blood calcium": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood glucose fluctuation": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Bradycardia": 1, "Burning sensation": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dysphagia": 1, "Dysstasia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Erythema": 1, "Eye swelling": 1, "Face oedema": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Generalised oedema": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Heart sounds": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "International normalised ratio": 1, "Joint swelling": 1, "Laboratory test": 1, "Limb deformity": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mouth haemorrhage": 1, "Mouth swelling": 1, "Muscle strain": 1, "Muscular weakness": 1, "Ovarian cyst": 1, "Pain in jaw": 1, "Physical examination": 1, "Platelet count decreased": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "Romberg test": 1, "Sinus tachycardia": 1, "Swelling": 1, "Tachycardia": 1, "Tandem gait test": 1, "Thyroid function test": 1, "Tinnitus": 1, "Troponin I": 1, "Ultrasound scan vagina abnormal": 1, "Walking aid user": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "3005841", "histograms": [{"histogram": {"Dizziness": 15, "Nausea": 13, "Pyrexia": 11, "Vomiting": 11, "Syncope": 9, "Headache": 8, "Blood pressure measurement": 7, "Dyspnoea": 7, "Heart rate": 7, "Myalgia": 7, "Oxygen saturation": 7, "Vaccination complication": 7, "Body temperature": 6, "Chest discomfort": 6, "Fatigue": 6, "Pain in extremity": 6, "Adverse event following immunisation": 5, "Electrocardiogram": 5, "Chest X-ray": 4, "Chest pain": 4, "Respiratory rate": 4, "Blood creatinine": 3, "Blood sodium": 3, "Diarrhoea": 3, "Myocarditis": 3, "Palpitations": 3, "Troponin T": 3, "Vertigo": 3, "Allergy to vaccine": 2, "Asthenia": 2, "Blood chloride": 2, "Blood potassium": 2, "Blood urea": 2, "COVID-19 immunisation": 2, "Carbon dioxide": 2, "Chills": 2, "Death": 2, "Decreased appetite": 2, "Glomerular filtration rate": 2, "Haematocrit": 2, "SARS-CoV-2 test": 2, "Seizure": 2, "Troponin": 2, "Urticaria": 2, "Vision blurred": 2, "Activated partial thromboplastin time shortened": 1, "Altered state of consciousness": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Asthma": 1, "Autonomic neuropathy": 1, "Blood calcium": 1, "Blood creatine phosphokinase MB": 1, "Blood glucose": 1, "Blood glucose fluctuation": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Bradycardia": 1, "Burning sensation": 1, "Cardiac arrest": 1, "Cardiac failure congestive": 1, "Coma scale": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Dysphagia": 1, "Dysstasia": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Erythema": 1, "Eye swelling": 1, "Face oedema": 1, "Fibrin D dimer": 1, "Full blood count": 1, "Generalised oedema": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Heart sounds": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "International normalised ratio": 1, "Joint swelling": 1, "Laboratory test": 1, "Limb deformity": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mouth haemorrhage": 1, "Mouth swelling": 1, "Muscle strain": 1, "Muscular weakness": 1, "Ovarian cyst": 1, "Pain in jaw": 1, "Physical examination": 1, "Platelet count decreased": 1, "Prothrombin time": 1, "Prothrombin time ratio": 1, "Pulmonary embolism": 1, "Rash": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "Romberg test": 1, "Sinus tachycardia": 1, "Swelling": 1, "Tachycardia": 1, "Tandem gait test": 1, "Thyroid function test": 1, "Tinnitus": 1, "Troponin I": 1, "Ultrasound scan vagina abnormal": 1, "Walking aid user": 1, "White blood cell count": 1}, "batchcodes": ["3005841"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/3005841/SR.4157.json b/docs/data/histograms/Thailand/3005841/SR.4157.json
index b3f38e3eb22..b0c90e58a15 100644
--- a/docs/data/histograms/Thailand/3005841/SR.4157.json
+++ b/docs/data/histograms/Thailand/3005841/SR.4157.json
@@ -1 +1 @@
-{"batchcode": "3005841/SR.4157", "histograms": [{"batchcodes": ["3005841/SR.4157"], "histogram": {"Cerebrovascular accident": 1}}]}
\ No newline at end of file
+{"batchcode": "3005841/SR.4157", "histograms": [{"histogram": {"Cerebrovascular accident": 1}, "batchcodes": ["3005841/SR.4157"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/30125BA.json b/docs/data/histograms/Thailand/30125BA.json
index e89c5d87144..6aecea4688f 100644
--- a/docs/data/histograms/Thailand/30125BA.json
+++ b/docs/data/histograms/Thailand/30125BA.json
@@ -1 +1 @@
-{"batchcode": "30125BA", "histograms": [{"batchcodes": ["30125BA"], "histogram": {"Arthralgia": 2, "Gait inability": 2, "Pain": 2, "Psoriatic arthropathy": 2, "Subcutaneous abscess": 2, "Blister infected": 1, "Blood test": 1, "Chillblains": 1, "Coronavirus test": 1, "Foot deformity": 1, "Glomerulonephritis rapidly progressive": 1, "Rash": 1, "Staphylococcal infection": 1, "Systemic lupus erythematosus": 1, "Wound infection staphylococcal": 1}}]}
\ No newline at end of file
+{"batchcode": "30125BA", "histograms": [{"histogram": {"Arthralgia": 2, "Gait inability": 2, "Pain": 2, "Psoriatic arthropathy": 2, "Subcutaneous abscess": 2, "Blister infected": 1, "Blood test": 1, "Chillblains": 1, "Coronavirus test": 1, "Foot deformity": 1, "Glomerulonephritis rapidly progressive": 1, "Rash": 1, "Staphylococcal infection": 1, "Systemic lupus erythematosus": 1, "Wound infection staphylococcal": 1}, "batchcodes": ["30125BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/35627TB.json b/docs/data/histograms/Thailand/35627TB.json
index 74802f13e76..6ee5254fbe6 100644
--- a/docs/data/histograms/Thailand/35627TB.json
+++ b/docs/data/histograms/Thailand/35627TB.json
@@ -1 +1 @@
-{"batchcode": "35627TB", "histograms": [{"batchcodes": ["35627TB"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "35627TB", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["35627TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/36642TB.json b/docs/data/histograms/Thailand/36642TB.json
index 721b727e83e..62290c8c744 100644
--- a/docs/data/histograms/Thailand/36642TB.json
+++ b/docs/data/histograms/Thailand/36642TB.json
@@ -1 +1 @@
-{"batchcode": "36642TB", "histograms": [{"batchcodes": ["36642TB"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "36642TB", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["36642TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/36715TB.json b/docs/data/histograms/Thailand/36715TB.json
index bd8ec391949..231907e1cea 100644
--- a/docs/data/histograms/Thailand/36715TB.json
+++ b/docs/data/histograms/Thailand/36715TB.json
@@ -1 +1 @@
-{"batchcode": "36715TB", "histograms": [{"batchcodes": ["36715TB"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "36715TB", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["36715TB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/8000844.json b/docs/data/histograms/Thailand/8000844.json
index 47bc78b3fc3..6a5177c5eaf 100644
--- a/docs/data/histograms/Thailand/8000844.json
+++ b/docs/data/histograms/Thailand/8000844.json
@@ -1 +1 @@
-{"batchcode": "8000844", "histograms": [{"batchcodes": ["8000844"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "8000844", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["8000844"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/940913.json b/docs/data/histograms/Thailand/940913.json
index 86425a24346..2f127e6880c 100644
--- a/docs/data/histograms/Thailand/940913.json
+++ b/docs/data/histograms/Thailand/940913.json
@@ -1 +1 @@
-{"batchcode": "940913", "histograms": [{"batchcodes": ["940913"], "histogram": {"Body temperature": 4, "Heart rate": 4, "Oxygen saturation": 4, "Respiratory rate": 4, "Blood pressure measurement": 3, "Dizziness": 3, "Interchange of vaccine products": 3, "Nausea": 3, "Pyrexia": 3, "Chest discomfort": 2, "Headache": 2, "Vomiting": 2, "Blood creatine": 1, "Blood potassium": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood test": 1, "Cardiac function test": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Extra dose administered": 1, "Flushing": 1, "Full blood count": 1, "General physical condition": 1, "Haemoglobin": 1, "Hypoaesthesia": 1, "Neurological examination": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Progesterone receptor assay": 1, "Troponin T": 1, "Venous pressure jugular": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "940913", "histograms": [{"histogram": {"Body temperature": 4, "Heart rate": 4, "Oxygen saturation": 4, "Respiratory rate": 4, "Blood pressure measurement": 3, "Dizziness": 3, "Interchange of vaccine products": 3, "Nausea": 3, "Pyrexia": 3, "Chest discomfort": 2, "Headache": 2, "Vomiting": 2, "Blood creatine": 1, "Blood potassium": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood test": 1, "Cardiac function test": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Extra dose administered": 1, "Flushing": 1, "Full blood count": 1, "General physical condition": 1, "Haemoglobin": 1, "Hypoaesthesia": 1, "Neurological examination": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Progesterone receptor assay": 1, "Troponin T": 1, "Venous pressure jugular": 1, "White blood cell count": 1}, "batchcodes": ["940913"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/EW0151.json b/docs/data/histograms/Thailand/EW0151.json
index 499a1a45383..b62566cb437 100644
--- a/docs/data/histograms/Thailand/EW0151.json
+++ b/docs/data/histograms/Thailand/EW0151.json
@@ -1 +1 @@
-{"batchcode": "EW0151", "histograms": [{"batchcodes": ["EW0151"], "histogram": {"Breast haematoma": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0151", "histograms": [{"histogram": {"Breast haematoma": 1}, "batchcodes": ["EW0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/FF8841.json b/docs/data/histograms/Thailand/FF8841.json
index 848d203763d..4313b2740f9 100644
--- a/docs/data/histograms/Thailand/FF8841.json
+++ b/docs/data/histograms/Thailand/FF8841.json
@@ -1 +1 @@
-{"batchcode": "FF8841", "histograms": [{"batchcodes": ["FF8841"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8841", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["FF8841"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/FH3226.json b/docs/data/histograms/Thailand/FH3226.json
index 95103c84434..9bed07e973e 100644
--- a/docs/data/histograms/Thailand/FH3226.json
+++ b/docs/data/histograms/Thailand/FH3226.json
@@ -1 +1 @@
-{"batchcode": "FH3226", "histograms": [{"batchcodes": ["FH3226"], "histogram": {"Anaphylactic reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FH3226", "histograms": [{"histogram": {"Anaphylactic reaction": 1}, "batchcodes": ["FH3226"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/FN1430.json b/docs/data/histograms/Thailand/FN1430.json
index 695a0dd1059..648470f0e78 100644
--- a/docs/data/histograms/Thailand/FN1430.json
+++ b/docs/data/histograms/Thailand/FN1430.json
@@ -1 +1 @@
-{"batchcode": "FN1430", "histograms": [{"batchcodes": ["FN1430"], "histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2}}]}
\ No newline at end of file
+{"batchcode": "FN1430", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 2, "SARS-CoV-2 test": 2}, "batchcodes": ["FN1430"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/FN4073.json b/docs/data/histograms/Thailand/FN4073.json
index 90ddd7e8bcb..a69fe1af5fd 100644
--- a/docs/data/histograms/Thailand/FN4073.json
+++ b/docs/data/histograms/Thailand/FN4073.json
@@ -1 +1 @@
-{"batchcode": "FN4073", "histograms": [{"batchcodes": ["FN4073"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FN4073", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FN4073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/J07BX03.json b/docs/data/histograms/Thailand/J07BX03.json
index a0bc68ae209..a019eba10af 100644
--- a/docs/data/histograms/Thailand/J07BX03.json
+++ b/docs/data/histograms/Thailand/J07BX03.json
@@ -1 +1 @@
-{"batchcode": "J07BX03", "histograms": [{"batchcodes": ["J07BX03"], "histogram": {"Anaemia": 1, "Angiogram": 1, "Arteriosclerosis": 1, "Basophil count": 1, "Blood pressure diastolic": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Cardiac stress test": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST segment elevation": 1, "Eosinophil count": 1, "Fear": 1, "Fibrin D dimer": 1, "General physical health deterioration": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypertension": 1, "Lymphocyte count": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Myocardial ischaemia": 1, "Neutrophil count": 1, "Platelet count": 1, "Pruritus": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Red blood cell morphology": 1, "Red cell distribution width": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Sensory disturbance": 1, "Thrombosis": 1, "Vascular pain": 1, "Vasodilatation": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "J07BX03", "histograms": [{"histogram": {"Anaemia": 1, "Angiogram": 1, "Arteriosclerosis": 1, "Basophil count": 1, "Blood pressure diastolic": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Cardiac stress test": 1, "Electrocardiogram ST segment depression": 1, "Electrocardiogram ST segment elevation": 1, "Eosinophil count": 1, "Fear": 1, "Fibrin D dimer": 1, "General physical health deterioration": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hypertension": 1, "Lymphocyte count": 1, "Malaise": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Myocardial ischaemia": 1, "Neutrophil count": 1, "Platelet count": 1, "Pruritus": 1, "Rash erythematous": 1, "Red blood cell count": 1, "Red blood cell morphology": 1, "Red cell distribution width": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Sensory disturbance": 1, "Thrombosis": 1, "Vascular pain": 1, "Vasodilatation": 1, "White blood cell count": 1}, "batchcodes": ["J07BX03"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/PCA0068.json b/docs/data/histograms/Thailand/PCA0068.json
index 8d2675afd80..0c00071fc14 100644
--- a/docs/data/histograms/Thailand/PCA0068.json
+++ b/docs/data/histograms/Thailand/PCA0068.json
@@ -1 +1 @@
-{"batchcode": "PCA0068", "histograms": [{"batchcodes": ["PCA0068"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "PCA0068", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["PCA0068"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/TR021F21A.json b/docs/data/histograms/Thailand/TR021F21A.json
index 4d1894382e9..6c04de527fe 100644
--- a/docs/data/histograms/Thailand/TR021F21A.json
+++ b/docs/data/histograms/Thailand/TR021F21A.json
@@ -1 +1 @@
-{"batchcode": "TR021F21A", "histograms": [{"batchcodes": ["TR021F21A"], "histogram": {"Chest pain": 1, "Computerised tomogram head": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "TR021F21A", "histograms": [{"histogram": {"Chest pain": 1, "Computerised tomogram head": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["TR021F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/TRC021F21A.json b/docs/data/histograms/Thailand/TRC021F21A.json
index 0c404c736df..255655fea95 100644
--- a/docs/data/histograms/Thailand/TRC021F21A.json
+++ b/docs/data/histograms/Thailand/TRC021F21A.json
@@ -1 +1 @@
-{"batchcode": "TRC021F21A", "histograms": [{"batchcodes": ["TRC021F21A"], "histogram": {"Pyrexia": 1, "Supraventricular tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "TRC021F21A", "histograms": [{"histogram": {"Pyrexia": 1, "Supraventricular tachycardia": 1}, "batchcodes": ["TRC021F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/TRC049F21A.json b/docs/data/histograms/Thailand/TRC049F21A.json
index 26e64d7c0a2..b51238510e0 100644
--- a/docs/data/histograms/Thailand/TRC049F21A.json
+++ b/docs/data/histograms/Thailand/TRC049F21A.json
@@ -1 +1 @@
-{"batchcode": "TRC049F21A", "histograms": [{"batchcodes": ["TRC049F21A"], "histogram": {"Ill-defined disorder": 1, "Myocardial infarction": 1}}]}
\ No newline at end of file
+{"batchcode": "TRC049F21A", "histograms": [{"histogram": {"Ill-defined disorder": 1, "Myocardial infarction": 1}, "batchcodes": ["TRC049F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Thailand/TRC3005841.json b/docs/data/histograms/Thailand/TRC3005841.json
index f12f3b7ba3e..a9c69de6725 100644
--- a/docs/data/histograms/Thailand/TRC3005841.json
+++ b/docs/data/histograms/Thailand/TRC3005841.json
@@ -1 +1 @@
-{"batchcode": "TRC3005841", "histograms": [{"batchcodes": ["TRC3005841"], "histogram": {"Asthenia": 1, "COVID-19 pneumonia": 1, "Cardiac arrest": 1, "Dysarthria": 1, "Ischaemic stroke": 1, "Muscular weakness": 1, "Oral discomfort": 1, "Respiratory failure": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "TRC3005841", "histograms": [{"histogram": {"Asthenia": 1, "COVID-19 pneumonia": 1, "Cardiac arrest": 1, "Dysarthria": 1, "Ischaemic stroke": 1, "Muscular weakness": 1, "Oral discomfort": 1, "Respiratory failure": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["TRC3005841"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Trinidad and Tobago/EW0187.json b/docs/data/histograms/Trinidad and Tobago/EW0187.json
index ab90a7f4733..2dbd062ecec 100644
--- a/docs/data/histograms/Trinidad and Tobago/EW0187.json
+++ b/docs/data/histograms/Trinidad and Tobago/EW0187.json
@@ -1 +1 @@
-{"batchcode": "EW0187", "histograms": [{"batchcodes": ["EW0187"], "histogram": {"SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0187", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["EW0187"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Trinidad and Tobago/EW0196.json b/docs/data/histograms/Trinidad and Tobago/EW0196.json
index 47e03becdaa..85cc6cdccb2 100644
--- a/docs/data/histograms/Trinidad and Tobago/EW0196.json
+++ b/docs/data/histograms/Trinidad and Tobago/EW0196.json
@@ -1 +1 @@
-{"batchcode": "EW0196", "histograms": [{"batchcodes": ["EW0196"], "histogram": {"Fatigue": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0196", "histograms": [{"histogram": {"Fatigue": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["EW0196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Trinidad and Tobago/FD7220.json b/docs/data/histograms/Trinidad and Tobago/FD7220.json
index ad807289ba1..996ecfd2fea 100644
--- a/docs/data/histograms/Trinidad and Tobago/FD7220.json
+++ b/docs/data/histograms/Trinidad and Tobago/FD7220.json
@@ -1 +1 @@
-{"batchcode": "FD7220", "histograms": [{"batchcodes": ["FD7220"], "histogram": {"Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Anti-NMDA antibody": 1, "Anti-thyroid antibody": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Blindness": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood grouping": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "CSF cell count": 1, "Computerised tomogram": 1, "Confusional state": 1, "Corneal reflex decreased": 1, "Decreased appetite": 1, "Depression": 1, "Dysstasia": 1, "Electroencephalogram": 1, "Encephalitis autoimmune": 1, "Epilepsy": 1, "Focal dyscognitive seizures": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Haemoglobin": 1, "Heart rate": 1, "Hostility": 1, "Hypertension": 1, "Insomnia": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mean cell volume": 1, "Memory impairment": 1, "Monocyte count": 1, "Mutism": 1, "Neutrophil count": 1, "Obsessive thoughts": 1, "Oxygen saturation": 1, "Physical examination": 1, "Platelet count": 1, "Protein total": 1, "Red blood cell sedimentation rate": 1, "Sinus tachycardia": 1, "Somnolence": 1, "Thyroid function test": 1, "Tremor": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FD7220", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Anti-NMDA antibody": 1, "Anti-thyroid antibody": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Blindness": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood grouping": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Body temperature": 1, "CSF cell count": 1, "Computerised tomogram": 1, "Confusional state": 1, "Corneal reflex decreased": 1, "Decreased appetite": 1, "Depression": 1, "Dysstasia": 1, "Electroencephalogram": 1, "Encephalitis autoimmune": 1, "Epilepsy": 1, "Focal dyscognitive seizures": 1, "Gamma-glutamyltransferase": 1, "Globulin": 1, "Haemoglobin": 1, "Heart rate": 1, "Hostility": 1, "Hypertension": 1, "Insomnia": 1, "Lumbar puncture": 1, "Lymphocyte count": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mean cell volume": 1, "Memory impairment": 1, "Monocyte count": 1, "Mutism": 1, "Neutrophil count": 1, "Obsessive thoughts": 1, "Oxygen saturation": 1, "Physical examination": 1, "Platelet count": 1, "Protein total": 1, "Red blood cell sedimentation rate": 1, "Sinus tachycardia": 1, "Somnolence": 1, "Thyroid function test": 1, "Tremor": 1, "White blood cell count": 1}, "batchcodes": ["FD7220"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Tunisia/FF2153.json b/docs/data/histograms/Tunisia/FF2153.json
index fa736d649c5..97c11c3ee52 100644
--- a/docs/data/histograms/Tunisia/FF2153.json
+++ b/docs/data/histograms/Tunisia/FF2153.json
@@ -1 +1 @@
-{"batchcode": "FF2153", "histograms": [{"batchcodes": ["FF2153"], "histogram": {"Anaemia": 1, "Autoimmune disorder": 1, "Chromaturia": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Jaundice": 1, "Pulmonary fibrosis": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FF2153", "histograms": [{"histogram": {"Anaemia": 1, "Autoimmune disorder": 1, "Chromaturia": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Jaundice": 1, "Pulmonary fibrosis": 1, "White blood cell count increased": 1}, "batchcodes": ["FF2153"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Tunisia/FF8111.json b/docs/data/histograms/Tunisia/FF8111.json
index 34c1d0f7cd9..7ae32c675a3 100644
--- a/docs/data/histograms/Tunisia/FF8111.json
+++ b/docs/data/histograms/Tunisia/FF8111.json
@@ -1 +1 @@
-{"batchcode": "FF8111", "histograms": [{"batchcodes": ["FF8111"], "histogram": {"Chest pain": 1, "Pleural effusion": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "FF8111", "histograms": [{"histogram": {"Chest pain": 1, "Pleural effusion": 1, "Pulmonary embolism": 1}, "batchcodes": ["FF8111"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Tunisia/FG2943.json b/docs/data/histograms/Tunisia/FG2943.json
index 27f806a4e22..c4fdfc0c227 100644
--- a/docs/data/histograms/Tunisia/FG2943.json
+++ b/docs/data/histograms/Tunisia/FG2943.json
@@ -1 +1 @@
-{"batchcode": "FG2943", "histograms": [{"batchcodes": ["FG2943"], "histogram": {"Alopecia": 1}}]}
\ No newline at end of file
+{"batchcode": "FG2943", "histograms": [{"histogram": {"Alopecia": 1}, "batchcodes": ["FG2943"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/1808980.json b/docs/data/histograms/Turkey/1808980.json
index 2581a0f3cd5..a5248e8d701 100644
--- a/docs/data/histograms/Turkey/1808980.json
+++ b/docs/data/histograms/Turkey/1808980.json
@@ -1 +1 @@
-{"batchcode": "1808980", "histograms": [{"batchcodes": ["1808980"], "histogram": {"HIV infection": 1, "HIV test": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "1808980", "histograms": [{"histogram": {"HIV infection": 1, "HIV test": 1, "Lymphadenopathy": 1}, "batchcodes": ["1808980"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/ER6166.json b/docs/data/histograms/Turkey/ER6166.json
index eed4ac4170d..391ed2a30fb 100644
--- a/docs/data/histograms/Turkey/ER6166.json
+++ b/docs/data/histograms/Turkey/ER6166.json
@@ -1 +1 @@
-{"batchcode": "ER6166", "histograms": [{"batchcodes": ["ER6166"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Hypoaesthesia": 1, "Joint range of motion decreased": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "ER6166", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Hypoaesthesia": 1, "Joint range of motion decreased": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["ER6166"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/ET2838A11.json b/docs/data/histograms/Turkey/ET2838A11.json
index 94f801af7b7..4c37c35bb40 100644
--- a/docs/data/histograms/Turkey/ET2838A11.json
+++ b/docs/data/histograms/Turkey/ET2838A11.json
@@ -1 +1 @@
-{"batchcode": "ET2838A11", "histograms": [{"batchcodes": ["ET2838A11"], "histogram": {"Anaphylactic reaction": 1, "Blister": 1, "Burning sensation": 1, "C-reactive protein": 1, "Erythema": 1, "Fibrin D dimer": 1, "Hypersensitivity": 1, "Investigation": 1, "Laboratory test": 1, "Pruritus": 1, "Throat tightness": 1, "Urticaria": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "ET2838A11", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Blister": 1, "Burning sensation": 1, "C-reactive protein": 1, "Erythema": 1, "Fibrin D dimer": 1, "Hypersensitivity": 1, "Investigation": 1, "Laboratory test": 1, "Pruritus": 1, "Throat tightness": 1, "Urticaria": 1, "White blood cell count": 1}, "batchcodes": ["ET2838A11"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/F116408A13.json b/docs/data/histograms/Turkey/F116408A13.json
index 56c08a13be0..339d220a1a1 100644
--- a/docs/data/histograms/Turkey/F116408A13.json
+++ b/docs/data/histograms/Turkey/F116408A13.json
@@ -1 +1 @@
-{"batchcode": "F116408A13", "histograms": [{"batchcodes": ["F116408A13"], "histogram": {"Dysphagia": 1}}]}
\ No newline at end of file
+{"batchcode": "F116408A13", "histograms": [{"histogram": {"Dysphagia": 1}, "batchcodes": ["F116408A13"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FC2396A21.json b/docs/data/histograms/Turkey/FC2396A21.json
index 4b09d2dcac7..4f322ef3e9c 100644
--- a/docs/data/histograms/Turkey/FC2396A21.json
+++ b/docs/data/histograms/Turkey/FC2396A21.json
@@ -1 +1 @@
-{"batchcode": "FC2396A21", "histograms": [{"batchcodes": ["FC2396A21"], "histogram": {"Laryngeal oedema": 1, "Laryngospasm": 1}}]}
\ No newline at end of file
+{"batchcode": "FC2396A21", "histograms": [{"histogram": {"Laryngeal oedema": 1, "Laryngospasm": 1}, "batchcodes": ["FC2396A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FD558OA19.json b/docs/data/histograms/Turkey/FD558OA19.json
index c0aaca4a90e..acb222986a8 100644
--- a/docs/data/histograms/Turkey/FD558OA19.json
+++ b/docs/data/histograms/Turkey/FD558OA19.json
@@ -1 +1 @@
-{"batchcode": "FD558OA19", "histograms": [{"batchcodes": ["FD558OA19"], "histogram": {"Alanine aminotransferase": 1, "Amylase": 1, "Aspartate aminotransferase": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase increased": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood methaemoglobin": 1, "Blood osmolarity": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Carboxyhaemoglobin": 1, "Chest pain": 1, "Eosinophil count": 1, "Erythema": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypotension": 1, "Investigation": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Monocyte count normal": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "PCO2 decreased": 1, "PO2": 1, "Platelet count": 1, "Platelet distribution width": 1, "Procalcitonin": 1, "Red blood cell count": 1, "Red cell distribution width increased": 1, "Tachycardia": 1, "Troponin T": 1, "Urticaria": 1, "White blood cell count": 1, "pH body fluid": 1}}]}
\ No newline at end of file
+{"batchcode": "FD558OA19", "histograms": [{"histogram": {"Alanine aminotransferase": 1, "Amylase": 1, "Aspartate aminotransferase": 1, "Base excess": 1, "Basophil count": 1, "Bilirubin conjugated": 1, "Blood alkaline phosphatase increased": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood bilirubin unconjugated": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood gases": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood lactate dehydrogenase": 1, "Blood lactic acid": 1, "Blood methaemoglobin": 1, "Blood osmolarity": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood urea": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Carboxyhaemoglobin": 1, "Chest pain": 1, "Eosinophil count": 1, "Erythema": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypotension": 1, "Investigation": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Monocyte count": 1, "Monocyte count normal": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "PCO2": 1, "PCO2 decreased": 1, "PO2": 1, "Platelet count": 1, "Platelet distribution width": 1, "Procalcitonin": 1, "Red blood cell count": 1, "Red cell distribution width increased": 1, "Tachycardia": 1, "Troponin T": 1, "Urticaria": 1, "White blood cell count": 1, "pH body fluid": 1}, "batchcodes": ["FD558OA19"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FD9235AO6.json b/docs/data/histograms/Turkey/FD9235AO6.json
index ede8c761459..f3e928a405a 100644
--- a/docs/data/histograms/Turkey/FD9235AO6.json
+++ b/docs/data/histograms/Turkey/FD9235AO6.json
@@ -1 +1 @@
-{"batchcode": "FD9235AO6", "histograms": [{"batchcodes": ["FD9235AO6"], "histogram": {"Erythema": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypersensitivity": 1, "Investigation": 1, "Lymphoblast count": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Platelet count": 1, "Platelet distribution width": 1, "Procalcitonin": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Troponin T": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "FD9235AO6", "histograms": [{"histogram": {"Erythema": 1, "Haematocrit": 1, "Haemoglobin": 1, "Hypersensitivity": 1, "Investigation": 1, "Lymphoblast count": 1, "Lymphocyte count": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Platelet count": 1, "Platelet distribution width": 1, "Procalcitonin": 1, "Red blood cell count": 1, "Red cell distribution width": 1, "Troponin T": 1, "White blood cell count": 1}, "batchcodes": ["FD9235AO6"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FF0884002.json b/docs/data/histograms/Turkey/FF0884002.json
index 8ada5db6fba..ff237957d97 100644
--- a/docs/data/histograms/Turkey/FF0884002.json
+++ b/docs/data/histograms/Turkey/FF0884002.json
@@ -1 +1 @@
-{"batchcode": "FF0884002", "histograms": [{"batchcodes": ["FF0884002"], "histogram": {"Asthma": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "FF0884002", "histograms": [{"histogram": {"Asthma": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Tachycardia": 1}, "batchcodes": ["FF0884002"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FF3341.json b/docs/data/histograms/Turkey/FF3341.json
index 029e312d6a6..ff0d937b398 100644
--- a/docs/data/histograms/Turkey/FF3341.json
+++ b/docs/data/histograms/Turkey/FF3341.json
@@ -1 +1 @@
-{"batchcode": "FF3341", "histograms": [{"batchcodes": ["FF3341"], "histogram": {"Dyspnoea": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FF3341", "histograms": [{"histogram": {"Dyspnoea": 1, "Palpitations": 1}, "batchcodes": ["FF3341"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FG4658A20.json b/docs/data/histograms/Turkey/FG4658A20.json
index b2f0ffaa205..a3b53b6e133 100644
--- a/docs/data/histograms/Turkey/FG4658A20.json
+++ b/docs/data/histograms/Turkey/FG4658A20.json
@@ -1 +1 @@
-{"batchcode": "FG4658A20", "histograms": [{"batchcodes": ["FG4658A20"], "histogram": {"Palpitations": 1, "Pruritus": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FG4658A20", "histograms": [{"histogram": {"Palpitations": 1, "Pruritus": 1, "Pyrexia": 1}, "batchcodes": ["FG4658A20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FH2496A05.json b/docs/data/histograms/Turkey/FH2496A05.json
index 91c923f703a..8cfbea51356 100644
--- a/docs/data/histograms/Turkey/FH2496A05.json
+++ b/docs/data/histograms/Turkey/FH2496A05.json
@@ -1 +1 @@
-{"batchcode": "FH2496A05", "histograms": [{"batchcodes": ["FH2496A05"], "histogram": {"Anaphylactic reaction": 1, "Hypersensitivity": 1}}]}
\ No newline at end of file
+{"batchcode": "FH2496A05", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Hypersensitivity": 1}, "batchcodes": ["FH2496A05"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FH2596A06.json b/docs/data/histograms/Turkey/FH2596A06.json
index bfe11a4ba73..4acea6174ac 100644
--- a/docs/data/histograms/Turkey/FH2596A06.json
+++ b/docs/data/histograms/Turkey/FH2596A06.json
@@ -1 +1 @@
-{"batchcode": "FH2596A06", "histograms": [{"batchcodes": ["FH2596A06"], "histogram": {"Cough": 1, "Hypoaesthesia oral": 1, "Nausea": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "FH2596A06", "histograms": [{"histogram": {"Cough": 1, "Hypoaesthesia oral": 1, "Nausea": 1, "Palpitations": 1}, "batchcodes": ["FH2596A06"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/FH6408A13.json b/docs/data/histograms/Turkey/FH6408A13.json
index 3ed11a03e2b..ffe75195596 100644
--- a/docs/data/histograms/Turkey/FH6408A13.json
+++ b/docs/data/histograms/Turkey/FH6408A13.json
@@ -1 +1 @@
-{"batchcode": "FH6408A13", "histograms": [{"batchcodes": ["FH6408A13"], "histogram": {"Dysphagia": 1, "Erythema": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "FH6408A13", "histograms": [{"histogram": {"Dysphagia": 1, "Erythema": 1, "Pruritus": 1}, "batchcodes": ["FH6408A13"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turkey/UNREACHABLE.json b/docs/data/histograms/Turkey/UNREACHABLE.json
index f3c383949b6..4d3ce1c3e3b 100644
--- a/docs/data/histograms/Turkey/UNREACHABLE.json
+++ b/docs/data/histograms/Turkey/UNREACHABLE.json
@@ -1 +1 @@
-{"batchcode": "UNREACHABLE", "histograms": [{"batchcodes": ["UNREACHABLE"], "histogram": {"Dyspnoea": 1, "Echocardiogram": 1, "Hypertension": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Palpitations": 1, "Panic disorder": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "UNREACHABLE", "histograms": [{"histogram": {"Dyspnoea": 1, "Echocardiogram": 1, "Hypertension": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Palpitations": 1, "Panic disorder": 1, "Pericarditis": 1}, "batchcodes": ["UNREACHABLE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Turks and Caicos Islands/023M20A.json b/docs/data/histograms/Turks and Caicos Islands/023M20A.json
index 55766769113..ba8aae8d197 100644
--- a/docs/data/histograms/Turks and Caicos Islands/023M20A.json
+++ b/docs/data/histograms/Turks and Caicos Islands/023M20A.json
@@ -1 +1 @@
-{"batchcode": "023M20A", "histograms": [{"batchcodes": ["023M20A"], "histogram": {"Rash": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20A", "histograms": [{"histogram": {"Rash": 1, "Rash erythematous": 1}, "batchcodes": ["023M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ukraine/205A21A.json b/docs/data/histograms/Ukraine/205A21A.json
index 310bad35710..f8d8f13e713 100644
--- a/docs/data/histograms/Ukraine/205A21A.json
+++ b/docs/data/histograms/Ukraine/205A21A.json
@@ -1 +1 @@
-{"batchcode": "205A21A", "histograms": [{"batchcodes": ["205A21A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "205A21A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ukraine/FA7812.json b/docs/data/histograms/Ukraine/FA7812.json
index e3572849e87..f78fef335d7 100644
--- a/docs/data/histograms/Ukraine/FA7812.json
+++ b/docs/data/histograms/Ukraine/FA7812.json
@@ -1 +1 @@
-{"batchcode": "FA7812", "histograms": [{"batchcodes": ["FA7812"], "histogram": {"Affect lability": 1, "Blood pressure decreased": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling of body temperature change": 1, "Insomnia": 1, "Lung disorder": 1, "Malaise": 1, "Mental impairment": 1, "Muscle contractions involuntary": 1, "Muscle twitching": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Rash": 1, "Somnolence": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "FA7812", "histograms": [{"histogram": {"Affect lability": 1, "Blood pressure decreased": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling of body temperature change": 1, "Insomnia": 1, "Lung disorder": 1, "Malaise": 1, "Mental impairment": 1, "Muscle contractions involuntary": 1, "Muscle twitching": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Rash": 1, "Somnolence": 1, "Vomiting": 1}, "batchcodes": ["FA7812"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ukraine/FD5996.json b/docs/data/histograms/Ukraine/FD5996.json
index 5e94e5de200..2b10d52ca24 100644
--- a/docs/data/histograms/Ukraine/FD5996.json
+++ b/docs/data/histograms/Ukraine/FD5996.json
@@ -1 +1 @@
-{"batchcode": "FD5996", "histograms": [{"batchcodes": ["FD5996"], "histogram": {"Amnesia": 1, "Cognitive disorder": 1, "Disturbance in attention": 1, "Dizziness": 1, "Feeling abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5996", "histograms": [{"histogram": {"Amnesia": 1, "Cognitive disorder": 1, "Disturbance in attention": 1, "Dizziness": 1, "Feeling abnormal": 1}, "batchcodes": ["FD5996"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/Ukraine/KK8871.json b/docs/data/histograms/Ukraine/KK8871.json
index 19ec87bfb42..6a4ecc3502b 100644
--- a/docs/data/histograms/Ukraine/KK8871.json
+++ b/docs/data/histograms/Ukraine/KK8871.json
@@ -1 +1 @@
-{"batchcode": "KK8871", "histograms": [{"batchcodes": ["KK8871"], "histogram": {"Erythema": 1, "Vaccination site induration": 1}}]}
\ No newline at end of file
+{"batchcode": "KK8871", "histograms": [{"histogram": {"Erythema": 1, "Vaccination site induration": 1}, "batchcodes": ["KK8871"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/007J21-2A.json b/docs/data/histograms/United Arab Emirates/007J21-2A.json
index 5797a5bc15b..d680780fbf5 100644
--- a/docs/data/histograms/United Arab Emirates/007J21-2A.json
+++ b/docs/data/histograms/United Arab Emirates/007J21-2A.json
@@ -1 +1 @@
-{"batchcode": "007J21-2A", "histograms": [{"batchcodes": ["007J21-2A"], "histogram": {"Axillary pain": 1, "Chills": 1, "Oedema peripheral": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "007J21-2A", "histograms": [{"histogram": {"Axillary pain": 1, "Chills": 1, "Oedema peripheral": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["007J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/EK4241.json b/docs/data/histograms/United Arab Emirates/EK4241.json
index e7122e17162..b5c3312cc62 100644
--- a/docs/data/histograms/United Arab Emirates/EK4241.json
+++ b/docs/data/histograms/United Arab Emirates/EK4241.json
@@ -1 +1 @@
-{"batchcode": "EK4241", "histograms": [{"batchcodes": ["EK4241"], "histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Gait disturbance": 1, "Ocular vascular disorder": 1, "Rectal haemorrhage": 1, "SARS-CoV-2 test negative": 1, "Thrombosis": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EK4241", "histograms": [{"histogram": {"Blood pressure decreased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Gait disturbance": 1, "Ocular vascular disorder": 1, "Rectal haemorrhage": 1, "SARS-CoV-2 test negative": 1, "Thrombosis": 1, "Vision blurred": 1}, "batchcodes": ["EK4241"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/EN1195.json b/docs/data/histograms/United Arab Emirates/EN1195.json
index fefa5bd6784..75021192a74 100644
--- a/docs/data/histograms/United Arab Emirates/EN1195.json
+++ b/docs/data/histograms/United Arab Emirates/EN1195.json
@@ -1 +1 @@
-{"batchcode": "EN1195", "histograms": [{"batchcodes": ["EN1195"], "histogram": {"Bell's palsy": 1, "Chest pain": 1, "Fibrin D dimer increased": 1, "Head injury": 1, "Headache": 1, "Loss of consciousness": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "EN1195", "histograms": [{"histogram": {"Bell's palsy": 1, "Chest pain": 1, "Fibrin D dimer increased": 1, "Head injury": 1, "Headache": 1, "Loss of consciousness": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1}, "batchcodes": ["EN1195"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/EN6198.json b/docs/data/histograms/United Arab Emirates/EN6198.json
index 6ce45ff9429..2c00e40acdf 100644
--- a/docs/data/histograms/United Arab Emirates/EN6198.json
+++ b/docs/data/histograms/United Arab Emirates/EN6198.json
@@ -1 +1 @@
-{"batchcode": "EN6198", "histograms": [{"batchcodes": ["EN6198"], "histogram": {"COVID-19": 1, "Cardiac arrest": 1, "Lung neoplasm malignant": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "EN6198", "histograms": [{"histogram": {"COVID-19": 1, "Cardiac arrest": 1, "Lung neoplasm malignant": 1, "Polymerase chain reaction": 1, "Vaccination failure": 1}, "batchcodes": ["EN6198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/EX0438.json b/docs/data/histograms/United Arab Emirates/EX0438.json
index 28134a4a2f7..d1f9c4c9e13 100644
--- a/docs/data/histograms/United Arab Emirates/EX0438.json
+++ b/docs/data/histograms/United Arab Emirates/EX0438.json
@@ -1 +1 @@
-{"batchcode": "EX0438", "histograms": [{"batchcodes": ["EX0438"], "histogram": {"Cardiomyopathy": 1, "Chest pain": 1, "Cold sweat": 1, "Dizziness": 1, "Myocardial infarction": 1, "SARS-CoV-2 test": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "EX0438", "histograms": [{"histogram": {"Cardiomyopathy": 1, "Chest pain": 1, "Cold sweat": 1, "Dizziness": 1, "Myocardial infarction": 1, "SARS-CoV-2 test": 1, "Syncope": 1}, "batchcodes": ["EX0438"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/FA5742.json b/docs/data/histograms/United Arab Emirates/FA5742.json
index 6dabb18a427..2bc4d374074 100644
--- a/docs/data/histograms/United Arab Emirates/FA5742.json
+++ b/docs/data/histograms/United Arab Emirates/FA5742.json
@@ -1 +1 @@
-{"batchcode": "FA5742", "histograms": [{"batchcodes": ["FA5742"], "histogram": {"Blood creatinine": 1, "Blood creatinine increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5742", "histograms": [{"histogram": {"Blood creatinine": 1, "Blood creatinine increased": 1}, "batchcodes": ["FA5742"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/FA5843.json b/docs/data/histograms/United Arab Emirates/FA5843.json
index 509e9f071f2..7e127021d89 100644
--- a/docs/data/histograms/United Arab Emirates/FA5843.json
+++ b/docs/data/histograms/United Arab Emirates/FA5843.json
@@ -1 +1 @@
-{"batchcode": "FA5843", "histograms": [{"batchcodes": ["FA5843"], "histogram": {"Dizziness": 1, "Ear disorder": 1, "Head discomfort": 1, "Headache": 1, "Migraine": 1, "Neck pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "FA5843", "histograms": [{"histogram": {"Dizziness": 1, "Ear disorder": 1, "Head discomfort": 1, "Headache": 1, "Migraine": 1, "Neck pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["FA5843"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/FC8289.json b/docs/data/histograms/United Arab Emirates/FC8289.json
index 9f2886ff783..e2b1cf947f6 100644
--- a/docs/data/histograms/United Arab Emirates/FC8289.json
+++ b/docs/data/histograms/United Arab Emirates/FC8289.json
@@ -1 +1 @@
-{"batchcode": "FC8289", "histograms": [{"batchcodes": ["FC8289"], "histogram": {"Blood test": 1, "Body temperature": 1, "Gingival pain": 1, "Head discomfort": 1, "Headache": 1, "Lymphadenopathy": 1, "Nocturia": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "SARS-CoV-2 test": 1, "Tonsillar ulcer": 1, "Urine analysis": 1}}]}
\ No newline at end of file
+{"batchcode": "FC8289", "histograms": [{"histogram": {"Blood test": 1, "Body temperature": 1, "Gingival pain": 1, "Head discomfort": 1, "Headache": 1, "Lymphadenopathy": 1, "Nocturia": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "SARS-CoV-2 test": 1, "Tonsillar ulcer": 1, "Urine analysis": 1}, "batchcodes": ["FC8289"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/FC9001.json b/docs/data/histograms/United Arab Emirates/FC9001.json
index bbab38d0bcb..2c873d80b4b 100644
--- a/docs/data/histograms/United Arab Emirates/FC9001.json
+++ b/docs/data/histograms/United Arab Emirates/FC9001.json
@@ -1 +1 @@
-{"batchcode": "FC9001", "histograms": [{"batchcodes": ["FC9001"], "histogram": {"Eye disorder": 1, "Eyelid disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "FC9001", "histograms": [{"histogram": {"Eye disorder": 1, "Eyelid disorder": 1}, "batchcodes": ["FC9001"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/FD5613.json b/docs/data/histograms/United Arab Emirates/FD5613.json
index b1692bbfb35..872793a40fe 100644
--- a/docs/data/histograms/United Arab Emirates/FD5613.json
+++ b/docs/data/histograms/United Arab Emirates/FD5613.json
@@ -1 +1 @@
-{"batchcode": "FD5613", "histograms": [{"batchcodes": ["FD5613"], "histogram": {"Blood pressure measurement": 1, "Hypertension": 1, "Pericardial effusion": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "FD5613", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Hypertension": 1, "Pericardial effusion": 1, "Polymerase chain reaction": 1}, "batchcodes": ["FD5613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Arab Emirates/FZ8269.json b/docs/data/histograms/United Arab Emirates/FZ8269.json
index e9bd608eb11..0664ba77f2a 100644
--- a/docs/data/histograms/United Arab Emirates/FZ8269.json
+++ b/docs/data/histograms/United Arab Emirates/FZ8269.json
@@ -1 +1 @@
-{"batchcode": "FZ8269", "histograms": [{"batchcodes": ["FZ8269"], "histogram": {"Myocardial infarction": 1, "Troponin increased": 1}}]}
\ No newline at end of file
+{"batchcode": "FZ8269", "histograms": [{"histogram": {"Myocardial infarction": 1, "Troponin increased": 1}, "batchcodes": ["FZ8269"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United Kingdom/3004673.json b/docs/data/histograms/United Kingdom/3004673.json
index f872288b6ff..18884865331 100644
--- a/docs/data/histograms/United Kingdom/3004673.json
+++ b/docs/data/histograms/United Kingdom/3004673.json
@@ -1 +1 @@
-{"batchcode": "3004673", "histograms": [{"batchcodes": ["3004673"], "histogram": {"Asthma": 1, "COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "3004673", "histograms": [{"histogram": {"Asthma": 1, "COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["3004673"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/EH9899.json b/docs/data/histograms/United States Minor Outlying Islands/EH9899.json
index 3a49a25aebc..3abeb701543 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/EH9899.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/EH9899.json
@@ -1 +1 @@
-{"batchcode": "EH9899", "histograms": [{"batchcodes": ["EH9899"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Feeling of body temperature change": 1, "Headache": 1, "Malaise": 1, "Muscle tightness": 1, "Myalgia": 1, "Ocular hyperaemia": 1, "Sneezing": 1, "Vertigo": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "EH9899", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Feeling of body temperature change": 1, "Headache": 1, "Malaise": 1, "Muscle tightness": 1, "Myalgia": 1, "Ocular hyperaemia": 1, "Sneezing": 1, "Vertigo": 1, "Vision blurred": 1}, "batchcodes": ["EH9899"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/ELI284.json b/docs/data/histograms/United States Minor Outlying Islands/ELI284.json
index 8deccffabd3..cf0fc671bb9 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/ELI284.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/ELI284.json
@@ -1 +1 @@
-{"batchcode": "ELI284", "histograms": [{"batchcodes": ["ELI284"], "histogram": {"Discomfort": 1, "Joint range of motion decreased": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "ELI284", "histograms": [{"histogram": {"Discomfort": 1, "Joint range of motion decreased": 1, "Lymphadenopathy": 1}, "batchcodes": ["ELI284"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/EM9810.json b/docs/data/histograms/United States Minor Outlying Islands/EM9810.json
index 30fbbf9657e..6607989bc35 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/EM9810.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/EM9810.json
@@ -1 +1 @@
-{"batchcode": "EM9810", "histograms": [{"batchcodes": ["EM9810"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "EM9810", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["EM9810"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/EN5318.json b/docs/data/histograms/United States Minor Outlying Islands/EN5318.json
index 193fe71032e..b7c83f8ee86 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/EN5318.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/EN5318.json
@@ -1 +1 @@
-{"batchcode": "EN5318", "histograms": [{"batchcodes": ["EN5318"], "histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Dizziness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "EN5318", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Dizziness": 1, "Pain in extremity": 1}, "batchcodes": ["EN5318"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/ER8727.json b/docs/data/histograms/United States Minor Outlying Islands/ER8727.json
index f19130e17f6..6b90ea8f6a2 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/ER8727.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/ER8727.json
@@ -1 +1 @@
-{"batchcode": "ER8727", "histograms": [{"batchcodes": ["ER8727"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "ER8727", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["ER8727"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/EW0158.json b/docs/data/histograms/United States Minor Outlying Islands/EW0158.json
index 950573ed418..d1c79eac1c6 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/EW0158.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/EW0158.json
@@ -1 +1 @@
-{"batchcode": "EW0158", "histograms": [{"batchcodes": ["EW0158"], "histogram": {"Arthralgia": 1, "Pain of skin": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0158", "histograms": [{"histogram": {"Arthralgia": 1, "Pain of skin": 1}, "batchcodes": ["EW0158"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/EW0164.json b/docs/data/histograms/United States Minor Outlying Islands/EW0164.json
index e73f0da1636..6b1d8edc5b9 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/EW0164.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/EW0164.json
@@ -1 +1 @@
-{"batchcode": "EW0164", "histograms": [{"batchcodes": ["EW0164"], "histogram": {"Dizziness": 1, "Headache": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0164", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Swelling": 1}, "batchcodes": ["EW0164"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/EW0167.json b/docs/data/histograms/United States Minor Outlying Islands/EW0167.json
index 7b7bf321fdd..cc43edc5691 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/EW0167.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/EW0167.json
@@ -1 +1 @@
-{"batchcode": "EW0167", "histograms": [{"batchcodes": ["EW0167"], "histogram": {"Confusional state": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "EW0167", "histograms": [{"histogram": {"Confusional state": 1, "Vertigo": 1}, "batchcodes": ["EW0167"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/FC3181.json b/docs/data/histograms/United States Minor Outlying Islands/FC3181.json
index 4aa2a0cacfd..41be8fe23af 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/FC3181.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/FC3181.json
@@ -1 +1 @@
-{"batchcode": "FC3181", "histograms": [{"batchcodes": ["FC3181"], "histogram": {"Asthenia": 1, "Bedridden": 1, "Confusional state": 1, "Immunisation": 1, "Influenza": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "FC3181", "histograms": [{"histogram": {"Asthenia": 1, "Bedridden": 1, "Confusional state": 1, "Immunisation": 1, "Influenza": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["FC3181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States Minor Outlying Islands/FJ1611.json b/docs/data/histograms/United States Minor Outlying Islands/FJ1611.json
index 4faddc8a5c0..94269cc18da 100644
--- a/docs/data/histograms/United States Minor Outlying Islands/FJ1611.json
+++ b/docs/data/histograms/United States Minor Outlying Islands/FJ1611.json
@@ -1 +1 @@
-{"batchcode": "FJ1611", "histograms": [{"batchcodes": ["FJ1611"], "histogram": {"Angina pectoris": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "FJ1611", "histograms": [{"histogram": {"Angina pectoris": 1, "Immunisation": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Pericarditis": 1}, "batchcodes": ["FJ1611"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/# 009C01A.json b/docs/data/histograms/United States/# 009C01A.json
index 4be927272ab..6c9b9cc5481 100644
--- a/docs/data/histograms/United States/# 009C01A.json
+++ b/docs/data/histograms/United States/# 009C01A.json
@@ -1 +1 @@
-{"batchcode": "# 009C01A", "histograms": [{"batchcodes": ["# 009C01A"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "# 009C01A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["# 009C01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/# EN6206.json b/docs/data/histograms/United States/# EN6206.json
index 27e52f4db9e..d8a53feec64 100644
--- a/docs/data/histograms/United States/# EN6206.json
+++ b/docs/data/histograms/United States/# EN6206.json
@@ -1 +1 @@
-{"batchcode": "# EN6206", "histograms": [{"batchcodes": ["# EN6206"], "histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "# EN6206", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["# EN6206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#002F21A.json b/docs/data/histograms/United States/#002F21A.json
index 2b802c150cf..d10ab6df216 100644
--- a/docs/data/histograms/United States/#002F21A.json
+++ b/docs/data/histograms/United States/#002F21A.json
@@ -1 +1 @@
-{"batchcode": "#002F21A", "histograms": [{"batchcodes": ["#002F21A"], "histogram": {"Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "#002F21A", "histograms": [{"histogram": {"Off label use": 1}, "batchcodes": ["#002F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#003B21A.json b/docs/data/histograms/United States/#003B21A.json
index e7606cfc53a..aba3d95862c 100644
--- a/docs/data/histograms/United States/#003B21A.json
+++ b/docs/data/histograms/United States/#003B21A.json
@@ -1 +1 @@
-{"batchcode": "#003B21A", "histograms": [{"batchcodes": ["#003B21A"], "histogram": {"Rash pruritic": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "#003B21A", "histograms": [{"histogram": {"Rash pruritic": 1, "Vaccination site rash": 1}, "batchcodes": ["#003B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#003C21A.json b/docs/data/histograms/United States/#003C21A.json
index 717181897c4..ea63f1e8f4c 100644
--- a/docs/data/histograms/United States/#003C21A.json
+++ b/docs/data/histograms/United States/#003C21A.json
@@ -1 +1 @@
-{"batchcode": "#003C21A", "histograms": [{"batchcodes": ["#003C21A"], "histogram": {"Chills": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#003C21A", "histograms": [{"histogram": {"Chills": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["#003C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#006C21A.json b/docs/data/histograms/United States/#006C21A.json
index f300ae678aa..9eb0c3f0d94 100644
--- a/docs/data/histograms/United States/#006C21A.json
+++ b/docs/data/histograms/United States/#006C21A.json
@@ -1 +1 @@
-{"batchcode": "#006C21A", "histograms": [{"batchcodes": ["#006C21A"], "histogram": {"Vaccination site discharge": 1}}]}
\ No newline at end of file
+{"batchcode": "#006C21A", "histograms": [{"histogram": {"Vaccination site discharge": 1}, "batchcodes": ["#006C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#011J20A.json b/docs/data/histograms/United States/#011J20A.json
index 8eacbf03c90..38b7de9f4ed 100644
--- a/docs/data/histograms/United States/#011J20A.json
+++ b/docs/data/histograms/United States/#011J20A.json
@@ -1 +1 @@
-{"batchcode": "#011J20A", "histograms": [{"batchcodes": ["#011J20A"], "histogram": {"Dermatitis allergic": 1, "Hypersensitivity": 1, "Loss of personal independence in daily activities": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "#011J20A", "histograms": [{"histogram": {"Dermatitis allergic": 1, "Hypersensitivity": 1, "Loss of personal independence in daily activities": 1, "Vasculitis": 1}, "batchcodes": ["#011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#011M20A.json b/docs/data/histograms/United States/#011M20A.json
index b26159c4e5b..93e001a0f3a 100644
--- a/docs/data/histograms/United States/#011M20A.json
+++ b/docs/data/histograms/United States/#011M20A.json
@@ -1 +1 @@
-{"batchcode": "#011M20A", "histograms": [{"batchcodes": ["#011M20A"], "histogram": {"Insomnia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#011M20A", "histograms": [{"histogram": {"Insomnia": 1, "Vaccination site pain": 1}, "batchcodes": ["#011M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#012A21A.json b/docs/data/histograms/United States/#012A21A.json
index d6a41c2a563..4f95d0e1988 100644
--- a/docs/data/histograms/United States/#012A21A.json
+++ b/docs/data/histograms/United States/#012A21A.json
@@ -1 +1 @@
-{"batchcode": "#012A21A", "histograms": [{"batchcodes": ["#012A21A"], "histogram": {"Arthralgia": 1, "Burning sensation": 1, "Limb discomfort": 1, "Oropharyngeal pain": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#012A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Burning sensation": 1, "Limb discomfort": 1, "Oropharyngeal pain": 1, "Pain": 1}, "batchcodes": ["#012A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#013A21A.json b/docs/data/histograms/United States/#013A21A.json
index 1edbd78137f..ea6db96c0d3 100644
--- a/docs/data/histograms/United States/#013A21A.json
+++ b/docs/data/histograms/United States/#013A21A.json
@@ -1 +1 @@
-{"batchcode": "#013A21A", "histograms": [{"batchcodes": ["#013A21A"], "histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "#013A21A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Pruritus": 1}, "batchcodes": ["#013A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#013L20A.json b/docs/data/histograms/United States/#013L20A.json
index f287b2ef9de..8b0eaffd877 100644
--- a/docs/data/histograms/United States/#013L20A.json
+++ b/docs/data/histograms/United States/#013L20A.json
@@ -1 +1 @@
-{"batchcode": "#013L20A", "histograms": [{"batchcodes": ["#013L20A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#013L20A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["#013L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#016B21A.json b/docs/data/histograms/United States/#016B21A.json
index 7b2690753fc..41ae509a22c 100644
--- a/docs/data/histograms/United States/#016B21A.json
+++ b/docs/data/histograms/United States/#016B21A.json
@@ -1 +1 @@
-{"batchcode": "#016B21A", "histograms": [{"batchcodes": ["#016B21A"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "#016B21A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["#016B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#017C21A.json b/docs/data/histograms/United States/#017C21A.json
index adda6ab08d0..a34166e6fc9 100644
--- a/docs/data/histograms/United States/#017C21A.json
+++ b/docs/data/histograms/United States/#017C21A.json
@@ -1 +1 @@
-{"batchcode": "#017C21A", "histograms": [{"batchcodes": ["#017C21A"], "histogram": {"Distractibility": 1, "Erythema": 1, "Feeling cold": 1, "Feeling hot": 1, "Musculoskeletal stiffness": 1, "Nodule": 1, "Pain in extremity": 1, "Pruritus": 1, "Scratch": 1, "Skin swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "#017C21A", "histograms": [{"histogram": {"Distractibility": 1, "Erythema": 1, "Feeling cold": 1, "Feeling hot": 1, "Musculoskeletal stiffness": 1, "Nodule": 1, "Pain in extremity": 1, "Pruritus": 1, "Scratch": 1, "Skin swelling": 1}, "batchcodes": ["#017C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#022M20A.json b/docs/data/histograms/United States/#022M20A.json
index 9233555014e..06261ab2d52 100644
--- a/docs/data/histograms/United States/#022M20A.json
+++ b/docs/data/histograms/United States/#022M20A.json
@@ -1 +1 @@
-{"batchcode": "#022M20A", "histograms": [{"batchcodes": ["#022M20A"], "histogram": {"Erythema": 1, "Pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "#022M20A", "histograms": [{"histogram": {"Erythema": 1, "Pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["#022M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#023M20A.json b/docs/data/histograms/United States/#023M20A.json
index fbc9eebc758..e1a402dd79c 100644
--- a/docs/data/histograms/United States/#023M20A.json
+++ b/docs/data/histograms/United States/#023M20A.json
@@ -1 +1 @@
-{"batchcode": "#023M20A", "histograms": [{"batchcodes": ["#023M20A"], "histogram": {"Ageusia": 1, "Feeling abnormal": 1, "Headache": 1, "Lethargy": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "#023M20A", "histograms": [{"histogram": {"Ageusia": 1, "Feeling abnormal": 1, "Headache": 1, "Lethargy": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["#023M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#027L20A.json b/docs/data/histograms/United States/#027L20A.json
index b29fdc6f405..9b4d379c274 100644
--- a/docs/data/histograms/United States/#027L20A.json
+++ b/docs/data/histograms/United States/#027L20A.json
@@ -1 +1 @@
-{"batchcode": "#027L20A", "histograms": [{"batchcodes": ["#027L20A"], "histogram": {"Blood pressure fluctuation": 1, "Cerebrovascular accident": 1, "Dizziness": 1, "Heart rate irregular": 1, "Illness": 1, "SARS-CoV-2 antibody test": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "#027L20A", "histograms": [{"histogram": {"Blood pressure fluctuation": 1, "Cerebrovascular accident": 1, "Dizziness": 1, "Heart rate irregular": 1, "Illness": 1, "SARS-CoV-2 antibody test": 1, "Tachycardia": 1}, "batchcodes": ["#027L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#029A21A.json b/docs/data/histograms/United States/#029A21A.json
index 612254b1984..0bfd8a3ab62 100644
--- a/docs/data/histograms/United States/#029A21A.json
+++ b/docs/data/histograms/United States/#029A21A.json
@@ -1 +1 @@
-{"batchcode": "#029A21A", "histograms": [{"batchcodes": ["#029A21A"], "histogram": {"Cough": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Productive cough": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "#029A21A", "histograms": [{"histogram": {"Cough": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Productive cough": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["#029A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#029L20A.json b/docs/data/histograms/United States/#029L20A.json
index f7be3f004ca..9fda72073ba 100644
--- a/docs/data/histograms/United States/#029L20A.json
+++ b/docs/data/histograms/United States/#029L20A.json
@@ -1 +1 @@
-{"batchcode": "#029L20A", "histograms": [{"batchcodes": ["#029L20A"], "histogram": {"Cardiac stress test": 1, "Chest pain": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Loss of personal independence in daily activities": 1, "Mobility decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "#029L20A", "histograms": [{"histogram": {"Cardiac stress test": 1, "Chest pain": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fatigue": 1, "Loss of personal independence in daily activities": 1, "Mobility decreased": 1}, "batchcodes": ["#029L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#029L24A.json b/docs/data/histograms/United States/#029L24A.json
index 033c7f4baa7..8096a2f406b 100644
--- a/docs/data/histograms/United States/#029L24A.json
+++ b/docs/data/histograms/United States/#029L24A.json
@@ -1 +1 @@
-{"batchcode": "#029L24A", "histograms": [{"batchcodes": ["#029L24A"], "histogram": {"Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "#029L24A", "histograms": [{"histogram": {"Vaccination complication": 1}, "batchcodes": ["#029L24A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#031A21A.json b/docs/data/histograms/United States/#031A21A.json
index 7133fa12722..d238e7de1de 100644
--- a/docs/data/histograms/United States/#031A21A.json
+++ b/docs/data/histograms/United States/#031A21A.json
@@ -1 +1 @@
-{"batchcode": "#031A21A", "histograms": [{"batchcodes": ["#031A21A"], "histogram": {"Headache": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#031A21A", "histograms": [{"histogram": {"Headache": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Vaccination site pain": 1}, "batchcodes": ["#031A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#032L20A.json b/docs/data/histograms/United States/#032L20A.json
index 9a586757aab..01cb63a1bf5 100644
--- a/docs/data/histograms/United States/#032L20A.json
+++ b/docs/data/histograms/United States/#032L20A.json
@@ -1 +1 @@
-{"batchcode": "#032L20A", "histograms": [{"batchcodes": ["#032L20A"], "histogram": {"Body temperature": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "#032L20A", "histograms": [{"histogram": {"Body temperature": 1, "Diarrhoea": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["#032L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#037A7LB.json b/docs/data/histograms/United States/#037A7LB.json
index cc2fdda755a..ba9c3239cda 100644
--- a/docs/data/histograms/United States/#037A7LB.json
+++ b/docs/data/histograms/United States/#037A7LB.json
@@ -1 +1 @@
-{"batchcode": "#037A7LB", "histograms": [{"batchcodes": ["#037A7LB"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "#037A7LB", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1}, "batchcodes": ["#037A7LB"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#039B21A.json b/docs/data/histograms/United States/#039B21A.json
index 50a6d4dfd93..980527597f7 100644
--- a/docs/data/histograms/United States/#039B21A.json
+++ b/docs/data/histograms/United States/#039B21A.json
@@ -1 +1 @@
-{"batchcode": "#039B21A", "histograms": [{"batchcodes": ["#039B21A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "#039B21A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["#039B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#042L20A.json b/docs/data/histograms/United States/#042L20A.json
index 4818cbe90d3..43e1eed8b44 100644
--- a/docs/data/histograms/United States/#042L20A.json
+++ b/docs/data/histograms/United States/#042L20A.json
@@ -1 +1 @@
-{"batchcode": "#042L20A", "histograms": [{"batchcodes": ["#042L20A"], "histogram": {"Fatigue": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "#042L20A", "histograms": [{"histogram": {"Fatigue": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site reaction": 1}, "batchcodes": ["#042L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#045A21A.json b/docs/data/histograms/United States/#045A21A.json
index 02e171835c8..7adc3a22041 100644
--- a/docs/data/histograms/United States/#045A21A.json
+++ b/docs/data/histograms/United States/#045A21A.json
@@ -1 +1 @@
-{"batchcode": "#045A21A", "histograms": [{"batchcodes": ["#045A21A"], "histogram": {"Asthenia": 1, "Decreased appetite": 1, "Fatigue": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "#045A21A", "histograms": [{"histogram": {"Asthenia": 1, "Decreased appetite": 1, "Fatigue": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["#045A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#046B21A.json b/docs/data/histograms/United States/#046B21A.json
index 6fbfdfa1430..b13734b01ec 100644
--- a/docs/data/histograms/United States/#046B21A.json
+++ b/docs/data/histograms/United States/#046B21A.json
@@ -1 +1 @@
-{"batchcode": "#046B21A", "histograms": [{"batchcodes": ["#046B21A"], "histogram": {"Migraine": 1}}]}
\ No newline at end of file
+{"batchcode": "#046B21A", "histograms": [{"histogram": {"Migraine": 1}, "batchcodes": ["#046B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#047B21A.json b/docs/data/histograms/United States/#047B21A.json
index 3fbacc84409..7e1de4d87d4 100644
--- a/docs/data/histograms/United States/#047B21A.json
+++ b/docs/data/histograms/United States/#047B21A.json
@@ -1 +1 @@
-{"batchcode": "#047B21A", "histograms": [{"batchcodes": ["#047B21A"], "histogram": {"Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "#047B21A", "histograms": [{"histogram": {"Wrong technique in device usage process": 1}, "batchcodes": ["#047B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#048B21A.json b/docs/data/histograms/United States/#048B21A.json
index 5390988eed6..94adeef5076 100644
--- a/docs/data/histograms/United States/#048B21A.json
+++ b/docs/data/histograms/United States/#048B21A.json
@@ -1 +1 @@
-{"batchcode": "#048B21A", "histograms": [{"batchcodes": ["#048B21A"], "histogram": {"Dysgeusia": 1, "Feeling hot": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "#048B21A", "histograms": [{"histogram": {"Dysgeusia": 1, "Feeling hot": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Urticaria": 1}, "batchcodes": ["#048B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#052E21A.json b/docs/data/histograms/United States/#052E21A.json
index cfe446b157a..045405a71b1 100644
--- a/docs/data/histograms/United States/#052E21A.json
+++ b/docs/data/histograms/United States/#052E21A.json
@@ -1 +1 @@
-{"batchcode": "#052E21A", "histograms": [{"batchcodes": ["#052E21A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "#052E21A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Pyrexia": 1}, "batchcodes": ["#052E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#069H21A.json b/docs/data/histograms/United States/#069H21A.json
index 47907d32b16..7c968fff789 100644
--- a/docs/data/histograms/United States/#069H21A.json
+++ b/docs/data/histograms/United States/#069H21A.json
@@ -1 +1 @@
-{"batchcode": "#069H21A", "histograms": [{"batchcodes": ["#069H21A"], "histogram": {"Asthenia": 1, "Chills": 1, "Death": 1, "Dyspnoea": 1, "Fatigue": 1, "Loss of consciousness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "#069H21A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Death": 1, "Dyspnoea": 1, "Fatigue": 1, "Loss of consciousness": 1, "Malaise": 1}, "batchcodes": ["#069H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#3247.json b/docs/data/histograms/United States/#3247.json
index d695742ad1d..c0e23688af3 100644
--- a/docs/data/histograms/United States/#3247.json
+++ b/docs/data/histograms/United States/#3247.json
@@ -1 +1 @@
-{"batchcode": "#3247", "histograms": [{"batchcodes": ["#3247"], "histogram": {"Insomnia": 1, "Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "#3247", "histograms": [{"histogram": {"Insomnia": 1, "Muscle spasms": 1}, "batchcodes": ["#3247"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#74802.json b/docs/data/histograms/United States/#74802.json
index 2362e78b1fb..90611e823e4 100644
--- a/docs/data/histograms/United States/#74802.json
+++ b/docs/data/histograms/United States/#74802.json
@@ -1 +1 @@
-{"batchcode": "#74802", "histograms": [{"batchcodes": ["#74802"], "histogram": {"Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "#74802", "histograms": [{"histogram": {"Nausea": 1, "Pyrexia": 1}, "batchcodes": ["#74802"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#EL0140.json b/docs/data/histograms/United States/#EL0140.json
index d9c8f8075f7..d1d10df3c25 100644
--- a/docs/data/histograms/United States/#EL0140.json
+++ b/docs/data/histograms/United States/#EL0140.json
@@ -1 +1 @@
-{"batchcode": "#EL0140", "histograms": [{"batchcodes": ["#EL0140"], "histogram": {"Arthralgia": 1, "Magnetic resonance imaging": 1, "Movement disorder": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#EL0140", "histograms": [{"histogram": {"Arthralgia": 1, "Magnetic resonance imaging": 1, "Movement disorder": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "Vaccination site pain": 1}, "batchcodes": ["#EL0140"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#EL3247.json b/docs/data/histograms/United States/#EL3247.json
index 2ccd0bb3a1d..ef41df34731 100644
--- a/docs/data/histograms/United States/#EL3247.json
+++ b/docs/data/histograms/United States/#EL3247.json
@@ -1 +1 @@
-{"batchcode": "#EL3247", "histograms": [{"batchcodes": ["#EL3247"], "histogram": {"Axillary mass": 1, "Blood test": 1, "Fatigue": 1, "Neck pain": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "#EL3247", "histograms": [{"histogram": {"Axillary mass": 1, "Blood test": 1, "Fatigue": 1, "Neck pain": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["#EL3247"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#EP6955.json b/docs/data/histograms/United States/#EP6955.json
index 75c7a93cc49..f4f9bd1cc10 100644
--- a/docs/data/histograms/United States/#EP6955.json
+++ b/docs/data/histograms/United States/#EP6955.json
@@ -1 +1 @@
-{"batchcode": "#EP6955", "histograms": [{"batchcodes": ["#EP6955"], "histogram": {"Balance disorder": 1, "Chills": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Transient ischaemic attack": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#EP6955", "histograms": [{"histogram": {"Balance disorder": 1, "Chills": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Headache": 1, "Hypoaesthesia": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Transient ischaemic attack": 1, "Vaccination site pain": 1}, "batchcodes": ["#EP6955"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#ER613.json b/docs/data/histograms/United States/#ER613.json
index 617be6680f2..543161bcfbc 100644
--- a/docs/data/histograms/United States/#ER613.json
+++ b/docs/data/histograms/United States/#ER613.json
@@ -1 +1 @@
-{"batchcode": "#ER613", "histograms": [{"batchcodes": ["#ER613"], "histogram": {"Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "#ER613", "histograms": [{"histogram": {"Visual impairment": 1}, "batchcodes": ["#ER613"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#ER8737.json b/docs/data/histograms/United States/#ER8737.json
index c623e0e180e..7660bc5e5b9 100644
--- a/docs/data/histograms/United States/#ER8737.json
+++ b/docs/data/histograms/United States/#ER8737.json
@@ -1 +1 @@
-{"batchcode": "#ER8737", "histograms": [{"batchcodes": ["#ER8737"], "histogram": {"Body temperature": 1, "Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "#ER8737", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Pyrexia": 1}, "batchcodes": ["#ER8737"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#EW0177.json b/docs/data/histograms/United States/#EW0177.json
index 4b87858aadf..398d90b6240 100644
--- a/docs/data/histograms/United States/#EW0177.json
+++ b/docs/data/histograms/United States/#EW0177.json
@@ -1 +1 @@
-{"batchcode": "#EW0177", "histograms": [{"batchcodes": ["#EW0177"], "histogram": {"Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "#EW0177", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["#EW0177"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/#R8727.json b/docs/data/histograms/United States/#R8727.json
index 5580e3a6018..026210e74c8 100644
--- a/docs/data/histograms/United States/#R8727.json
+++ b/docs/data/histograms/United States/#R8727.json
@@ -1 +1 @@
-{"batchcode": "#R8727", "histograms": [{"batchcodes": ["#R8727"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Bursitis": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "#R8727", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Bursitis": 1, "Pain": 1}, "batchcodes": ["#R8727"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/'042A2A'.json b/docs/data/histograms/United States/'042A2A'.json
index 2d674b9194a..51409d435b9 100644
--- a/docs/data/histograms/United States/'042A2A'.json
+++ b/docs/data/histograms/United States/'042A2A'.json
@@ -1 +1 @@
-{"batchcode": "'042A2A'", "histograms": [{"batchcodes": ["'042A2A'"], "histogram": {"Abdominal distension": 1, "Abdominal pain upper": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Insomnia": 1, "Lethargy": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "'042A2A'", "histograms": [{"histogram": {"Abdominal distension": 1, "Abdominal pain upper": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Insomnia": 1, "Lethargy": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["'042A2A'"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/'046AZIA'.json b/docs/data/histograms/United States/'046AZIA'.json
index 075f6b1af94..1ef65cd3c46 100644
--- a/docs/data/histograms/United States/'046AZIA'.json
+++ b/docs/data/histograms/United States/'046AZIA'.json
@@ -1 +1 @@
-{"batchcode": "'046AZIA'", "histograms": [{"batchcodes": ["'046AZIA'"], "histogram": {"Feeling hot": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "'046AZIA'", "histograms": [{"histogram": {"Feeling hot": 1, "Headache": 1}, "batchcodes": ["'046AZIA'"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/'087871A'.json b/docs/data/histograms/United States/'087871A'.json
index c4e9b3e6d83..2fbfaf347b9 100644
--- a/docs/data/histograms/United States/'087871A'.json
+++ b/docs/data/histograms/United States/'087871A'.json
@@ -1 +1 @@
-{"batchcode": "'087871A'", "histograms": [{"batchcodes": ["'087871A'"], "histogram": {"Chills": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Insomnia": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "'087871A'", "histograms": [{"histogram": {"Chills": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Insomnia": 1, "Myalgia": 1}, "batchcodes": ["'087871A'"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/'T821286'.json b/docs/data/histograms/United States/'T821286'.json
index c170fda48b8..e1c30f90905 100644
--- a/docs/data/histograms/United States/'T821286'.json
+++ b/docs/data/histograms/United States/'T821286'.json
@@ -1 +1 @@
-{"batchcode": "'T821286'", "histograms": [{"batchcodes": ["'T821286'"], "histogram": {"Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "'T821286'", "histograms": [{"histogram": {"Seizure": 1}, "batchcodes": ["'T821286'"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/(0 O6)31L20A.json b/docs/data/histograms/United States/(0 O6)31L20A.json
index 21a3cd1249d..b0fa491d162 100644
--- a/docs/data/histograms/United States/(0 O6)31L20A.json
+++ b/docs/data/histograms/United States/(0 O6)31L20A.json
@@ -1 +1 @@
-{"batchcode": "(0 O6)31L20A", "histograms": [{"batchcodes": ["(0 O6)31L20A"], "histogram": {"Autoimmune hepatitis": 1, "Condition aggravated": 1, "Hepatic enzyme increased": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "(0 O6)31L20A", "histograms": [{"histogram": {"Autoimmune hepatitis": 1, "Condition aggravated": 1, "Hepatic enzyme increased": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["(0 O6)31L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/(1 OR 0) 27A21A.json b/docs/data/histograms/United States/(1 OR 0) 27A21A.json
index f1ca89cc555..6f7c2109fa4 100644
--- a/docs/data/histograms/United States/(1 OR 0) 27A21A.json
+++ b/docs/data/histograms/United States/(1 OR 0) 27A21A.json
@@ -1 +1 @@
-{"batchcode": "(1 OR 0) 27A21A", "histograms": [{"batchcodes": ["(1 OR 0) 27A21A"], "histogram": {"Feeling hot": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "(1 OR 0) 27A21A", "histograms": [{"histogram": {"Feeling hot": 1, "Vaccination site erythema": 1}, "batchcodes": ["(1 OR 0) 27A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/(6 OR 0)43A(2OR.json b/docs/data/histograms/United States/(6 OR 0)43A(2OR.json
index f18bb1be296..7a831b4f2c8 100644
--- a/docs/data/histograms/United States/(6 OR 0)43A(2OR.json
+++ b/docs/data/histograms/United States/(6 OR 0)43A(2OR.json
@@ -1 +1 @@
-{"batchcode": "(6 OR 0)43A(2OR", "histograms": [{"batchcodes": ["(6 OR 0)43A(2OR"], "histogram": {"Burning sensation": 1, "Fibromyalgia": 1, "Lymph node pain": 1, "Nausea": 1, "Pain in extremity": 1, "Spinal pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "(6 OR 0)43A(2OR", "histograms": [{"histogram": {"Burning sensation": 1, "Fibromyalgia": 1, "Lymph node pain": 1, "Nausea": 1, "Pain in extremity": 1, "Spinal pain": 1, "Vertigo": 1}, "batchcodes": ["(6 OR 0)43A(2OR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/(77/11)20A.json b/docs/data/histograms/United States/(77/11)20A.json
index 16d8a96e0de..6f8df02b4da 100644
--- a/docs/data/histograms/United States/(77/11)20A.json
+++ b/docs/data/histograms/United States/(77/11)20A.json
@@ -1 +1 @@
-{"batchcode": "(77/11)20A", "histograms": [{"batchcodes": ["(77/11)20A"], "histogram": {"Headache": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "(77/11)20A", "histograms": [{"histogram": {"Headache": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site rash": 1}, "batchcodes": ["(77/11)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/(910) 938-9954.json b/docs/data/histograms/United States/(910) 938-9954.json
index d2fe53fe792..7fd6477d4e8 100644
--- a/docs/data/histograms/United States/(910) 938-9954.json
+++ b/docs/data/histograms/United States/(910) 938-9954.json
@@ -1 +1 @@
-{"batchcode": "(910) 938-9954", "histograms": [{"batchcodes": ["(910) 938-9954"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "(910) 938-9954", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["(910) 938-9954"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/(UNSURE).json b/docs/data/histograms/United States/(UNSURE).json
index f78bd544c2f..849abaf22f5 100644
--- a/docs/data/histograms/United States/(UNSURE).json
+++ b/docs/data/histograms/United States/(UNSURE).json
@@ -1 +1 @@
-{"batchcode": "(UNSURE)", "histograms": [{"batchcodes": ["(UNSURE)"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Dizziness": 1, "Headache": 1, "Pain": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "(UNSURE)", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Dizziness": 1, "Headache": 1, "Pain": 1, "Palpitations": 1}, "batchcodes": ["(UNSURE)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/-.json b/docs/data/histograms/United States/-.json
index bfca13510e8..13926062e28 100644
--- a/docs/data/histograms/United States/-.json
+++ b/docs/data/histograms/United States/-.json
@@ -1 +1 @@
-{"batchcode": "-", "histograms": [{"batchcodes": ["-"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "-", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["-"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/.048B21A..json b/docs/data/histograms/United States/.048B21A..json
index f7e6bd6200e..6dec6f6be4e 100644
--- a/docs/data/histograms/United States/.048B21A..json
+++ b/docs/data/histograms/United States/.048B21A..json
@@ -1 +1 @@
-{"batchcode": ".048B21A.", "histograms": [{"batchcodes": [".048B21A."], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": ".048B21A.", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": [".048B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0 21B21A.json b/docs/data/histograms/United States/0 21B21A.json
index 0143beff1a4..54d0ee8b02c 100644
--- a/docs/data/histograms/United States/0 21B21A.json
+++ b/docs/data/histograms/United States/0 21B21A.json
@@ -1 +1 @@
-{"batchcode": "0 21B21A", "histograms": [{"batchcodes": ["0 21B21A"], "histogram": {"Fatigue": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0 21B21A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["0 21B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0 OR D 26L20A.json b/docs/data/histograms/United States/0 OR D 26L20A.json
index 3de8a285a0a..4e21a5abe54 100644
--- a/docs/data/histograms/United States/0 OR D 26L20A.json
+++ b/docs/data/histograms/United States/0 OR D 26L20A.json
@@ -1 +1 @@
-{"batchcode": "0 OR D 26L20A", "histograms": [{"batchcodes": ["0 OR D 26L20A"], "histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "0 OR D 26L20A", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1, "Sneezing": 1}, "batchcodes": ["0 OR D 26L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0'X'8L20A.json b/docs/data/histograms/United States/0'X'8L20A.json
index 9b65392557e..8e558cce811 100644
--- a/docs/data/histograms/United States/0'X'8L20A.json
+++ b/docs/data/histograms/United States/0'X'8L20A.json
@@ -1 +1 @@
-{"batchcode": "0'X'8L20A", "histograms": [{"batchcodes": ["0'X'8L20A"], "histogram": {"Burning sensation": 1, "Chills": 1, "Pyrexia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0'X'8L20A", "histograms": [{"histogram": {"Burning sensation": 1, "Chills": 1, "Pyrexia": 1, "Urticaria": 1}, "batchcodes": ["0'X'8L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0-14C21A.json b/docs/data/histograms/United States/0-14C21A.json
index de13bab0c48..34a729ee9a7 100644
--- a/docs/data/histograms/United States/0-14C21A.json
+++ b/docs/data/histograms/United States/0-14C21A.json
@@ -1 +1 @@
-{"batchcode": "0-14C21A", "histograms": [{"batchcodes": ["0-14C21A"], "histogram": {"Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0-14C21A", "histograms": [{"histogram": {"Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0-14C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0/O 29A21A.json b/docs/data/histograms/United States/0/O 29A21A.json
index a8a62ac6865..f8a9ca1d6a9 100644
--- a/docs/data/histograms/United States/0/O 29A21A.json
+++ b/docs/data/histograms/United States/0/O 29A21A.json
@@ -1 +1 @@
-{"batchcode": "0/O 29A21A", "histograms": [{"batchcodes": ["0/O 29A21A"], "histogram": {"Biopsy": 1, "Thyroid cancer": 1}}]}
\ No newline at end of file
+{"batchcode": "0/O 29A21A", "histograms": [{"histogram": {"Biopsy": 1, "Thyroid cancer": 1}, "batchcodes": ["0/O 29A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00-B21A.json b/docs/data/histograms/United States/00-B21A.json
index fb97f92b9d2..564080282d6 100644
--- a/docs/data/histograms/United States/00-B21A.json
+++ b/docs/data/histograms/United States/00-B21A.json
@@ -1 +1 @@
-{"batchcode": "00-B21A", "histograms": [{"batchcodes": ["00-B21A"], "histogram": {"Fatigue": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00-B21A", "histograms": [{"histogram": {"Fatigue": 1, "Pain": 1}, "batchcodes": ["00-B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00/A2/A.json b/docs/data/histograms/United States/00/A2/A.json
index 3d3283416fb..46d3d760ee1 100644
--- a/docs/data/histograms/United States/00/A2/A.json
+++ b/docs/data/histograms/United States/00/A2/A.json
@@ -1 +1 @@
-{"batchcode": "00/A2/A", "histograms": [{"batchcodes": ["00/A2/A"], "histogram": {"Fatigue": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "00/A2/A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["00/A2/A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000.json b/docs/data/histograms/United States/000.json
index 9c4e5cab48a..06f64446cec 100644
--- a/docs/data/histograms/United States/000.json
+++ b/docs/data/histograms/United States/000.json
@@ -1 +1 @@
-{"batchcode": "000", "histograms": [{"batchcodes": ["000"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "000", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["000"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0000.json b/docs/data/histograms/United States/0000.json
index b14e6ac0838..34cb3b2be13 100644
--- a/docs/data/histograms/United States/0000.json
+++ b/docs/data/histograms/United States/0000.json
@@ -1 +1 @@
-{"batchcode": "0000", "histograms": [{"batchcodes": ["0000"], "histogram": {"Arthralgia": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "0000", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1}, "batchcodes": ["0000"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000000.json b/docs/data/histograms/United States/000000.json
index 01fe679eea0..39de8b187bb 100644
--- a/docs/data/histograms/United States/000000.json
+++ b/docs/data/histograms/United States/000000.json
@@ -1 +1 @@
-{"batchcode": "000000", "histograms": [{"batchcodes": ["000000"], "histogram": {"Granuloma annulare": 1}}]}
\ No newline at end of file
+{"batchcode": "000000", "histograms": [{"histogram": {"Granuloma annulare": 1}, "batchcodes": ["000000"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0000000.json b/docs/data/histograms/United States/0000000.json
index e0977a6e933..f805fc78942 100644
--- a/docs/data/histograms/United States/0000000.json
+++ b/docs/data/histograms/United States/0000000.json
@@ -1 +1 @@
-{"batchcode": "0000000", "histograms": [{"batchcodes": ["0000000"], "histogram": {"Accidental underdose": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "0000000", "histograms": [{"histogram": {"Accidental underdose": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["0000000"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00011A.json b/docs/data/histograms/United States/00011A.json
index aff2198034b..4e13878ff49 100644
--- a/docs/data/histograms/United States/00011A.json
+++ b/docs/data/histograms/United States/00011A.json
@@ -1 +1 @@
-{"batchcode": "00011A", "histograms": [{"batchcodes": ["00011A"], "histogram": {"Erythema": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "00011A", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1}, "batchcodes": ["00011A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0001335991.json b/docs/data/histograms/United States/0001335991.json
index a73b1691772..613d9e60d97 100644
--- a/docs/data/histograms/United States/0001335991.json
+++ b/docs/data/histograms/United States/0001335991.json
@@ -1 +1 @@
-{"batchcode": "0001335991", "histograms": [{"batchcodes": ["0001335991"], "histogram": {"Arthralgia": 1, "Chills": 1, "Gait disturbance": 1, "Myalgia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "0001335991", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Gait disturbance": 1, "Myalgia": 1, "Somnolence": 1}, "batchcodes": ["0001335991"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000134A.json b/docs/data/histograms/United States/000134A.json
index ad0c404297c..e6a84794b7b 100644
--- a/docs/data/histograms/United States/000134A.json
+++ b/docs/data/histograms/United States/000134A.json
@@ -1 +1 @@
-{"batchcode": "000134A", "histograms": [{"batchcodes": ["000134A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "000134A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["000134A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00013M20A.json b/docs/data/histograms/United States/00013M20A.json
index 17a6fbb061d..3f2c07b75c3 100644
--- a/docs/data/histograms/United States/00013M20A.json
+++ b/docs/data/histograms/United States/00013M20A.json
@@ -1 +1 @@
-{"batchcode": "00013M20A", "histograms": [{"batchcodes": ["00013M20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Vaccination complication": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "00013M20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Vaccination complication": 1, "Vomiting": 1}, "batchcodes": ["00013M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0001A21A.json b/docs/data/histograms/United States/0001A21A.json
index 9463706eaf2..eb5e4f3c49d 100644
--- a/docs/data/histograms/United States/0001A21A.json
+++ b/docs/data/histograms/United States/0001A21A.json
@@ -1 +1 @@
-{"batchcode": "0001A21A", "histograms": [{"batchcodes": ["0001A21A"], "histogram": {"Vaccination site reaction": 3, "Pruritus": 1, "Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0001A21A", "histograms": [{"histogram": {"Vaccination site reaction": 3, "Pruritus": 1, "Rash": 1, "Urticaria": 1}, "batchcodes": ["0001A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00042780.json b/docs/data/histograms/United States/00042780.json
index a83ea9fdf60..c16a23f1dc5 100644
--- a/docs/data/histograms/United States/00042780.json
+++ b/docs/data/histograms/United States/00042780.json
@@ -1 +1 @@
-{"batchcode": "00042780", "histograms": [{"batchcodes": ["00042780"], "histogram": {"Erythema": 1, "Pruritus": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "00042780", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1, "Rash erythematous": 1}, "batchcodes": ["00042780"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00045124.json b/docs/data/histograms/United States/00045124.json
index ea64a5eee23..032805acef2 100644
--- a/docs/data/histograms/United States/00045124.json
+++ b/docs/data/histograms/United States/00045124.json
@@ -1 +1 @@
-{"batchcode": "00045124", "histograms": [{"batchcodes": ["00045124"], "histogram": {"Chills": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00045124", "histograms": [{"histogram": {"Chills": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Swelling": 1}, "batchcodes": ["00045124"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0004M20A.json b/docs/data/histograms/United States/0004M20A.json
index c1fdce0306b..3d1feaf1311 100644
--- a/docs/data/histograms/United States/0004M20A.json
+++ b/docs/data/histograms/United States/0004M20A.json
@@ -1 +1 @@
-{"batchcode": "0004M20A", "histograms": [{"batchcodes": ["0004M20A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0004M20A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["0004M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00053740.json b/docs/data/histograms/United States/00053740.json
index 47c3f506bf9..93722081ed2 100644
--- a/docs/data/histograms/United States/00053740.json
+++ b/docs/data/histograms/United States/00053740.json
@@ -1 +1 @@
-{"batchcode": "00053740", "histograms": [{"batchcodes": ["00053740"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Blood creatine phosphokinase": 1, "Fatigue": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00053740", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Blood creatine phosphokinase": 1, "Fatigue": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["00053740"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000621A.json b/docs/data/histograms/United States/000621A.json
index 250d41e32a3..cc6d04881b8 100644
--- a/docs/data/histograms/United States/000621A.json
+++ b/docs/data/histograms/United States/000621A.json
@@ -1 +1 @@
-{"batchcode": "000621A", "histograms": [{"batchcodes": ["000621A"], "histogram": {"Adverse event": 1, "Chills": 1, "Myalgia": 1, "Pyrexia": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "000621A", "histograms": [{"histogram": {"Adverse event": 1, "Chills": 1, "Myalgia": 1, "Pyrexia": 1, "Sleep disorder": 1}, "batchcodes": ["000621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00068720.json b/docs/data/histograms/United States/00068720.json
index 1dc753044f8..67dee68236b 100644
--- a/docs/data/histograms/United States/00068720.json
+++ b/docs/data/histograms/United States/00068720.json
@@ -1 +1 @@
-{"batchcode": "00068720", "histograms": [{"batchcodes": ["00068720"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "00068720", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["00068720"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0006B21A.json b/docs/data/histograms/United States/0006B21A.json
index 620ca7b12bd..305642555b9 100644
--- a/docs/data/histograms/United States/0006B21A.json
+++ b/docs/data/histograms/United States/0006B21A.json
@@ -1 +1 @@
-{"batchcode": "0006B21A", "histograms": [{"batchcodes": ["0006B21A"], "histogram": {"Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0006B21A", "histograms": [{"histogram": {"Oropharyngeal pain": 1}, "batchcodes": ["0006B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0006M20A.json b/docs/data/histograms/United States/0006M20A.json
index ab5e57b0c01..59618b4cc22 100644
--- a/docs/data/histograms/United States/0006M20A.json
+++ b/docs/data/histograms/United States/0006M20A.json
@@ -1 +1 @@
-{"batchcode": "0006M20A", "histograms": [{"batchcodes": ["0006M20A"], "histogram": {"Cystitis noninfective": 1}}]}
\ No newline at end of file
+{"batchcode": "0006M20A", "histograms": [{"histogram": {"Cystitis noninfective": 1}, "batchcodes": ["0006M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00076190.json b/docs/data/histograms/United States/00076190.json
index b8444d34c37..185229f6689 100644
--- a/docs/data/histograms/United States/00076190.json
+++ b/docs/data/histograms/United States/00076190.json
@@ -1 +1 @@
-{"batchcode": "00076190", "histograms": [{"batchcodes": ["00076190"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "00076190", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["00076190"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0007B21A.json b/docs/data/histograms/United States/0007B21A.json
index 9bc0ba91254..e4b9c9f804b 100644
--- a/docs/data/histograms/United States/0007B21A.json
+++ b/docs/data/histograms/United States/0007B21A.json
@@ -1 +1 @@
-{"batchcode": "0007B21A", "histograms": [{"batchcodes": ["0007B21A"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "0007B21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["0007B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000B21A.json b/docs/data/histograms/United States/000B21A.json
index fa7aa2f8a70..c39aff17d6e 100644
--- a/docs/data/histograms/United States/000B21A.json
+++ b/docs/data/histograms/United States/000B21A.json
@@ -1 +1 @@
-{"batchcode": "000B21A", "histograms": [{"batchcodes": ["000B21A"], "histogram": {"Injection site erythema": 1, "Injection site swelling": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "000B21A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site swelling": 1, "Vaccination site pain": 1}, "batchcodes": ["000B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000H21A.json b/docs/data/histograms/United States/000H21A.json
index 931265358de..2835ec8d270 100644
--- a/docs/data/histograms/United States/000H21A.json
+++ b/docs/data/histograms/United States/000H21A.json
@@ -1 +1 @@
-{"batchcode": "000H21A", "histograms": [{"batchcodes": ["000H21A"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Ear discomfort": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "000H21A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Ear discomfort": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}, "batchcodes": ["000H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000K20A.json b/docs/data/histograms/United States/000K20A.json
index 54f106d2f19..004c4c223f9 100644
--- a/docs/data/histograms/United States/000K20A.json
+++ b/docs/data/histograms/United States/000K20A.json
@@ -1 +1 @@
-{"batchcode": "000K20A", "histograms": [{"batchcodes": ["000K20A"], "histogram": {"Headache": 1, "Injection site pain": 1, "Nausea": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "000K20A", "histograms": [{"histogram": {"Headache": 1, "Injection site pain": 1, "Nausea": 1, "Pain": 1}, "batchcodes": ["000K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/000UM20A.json b/docs/data/histograms/United States/000UM20A.json
index 26b15d4069a..4c9ae9a0695 100644
--- a/docs/data/histograms/United States/000UM20A.json
+++ b/docs/data/histograms/United States/000UM20A.json
@@ -1 +1 @@
-{"batchcode": "000UM20A", "histograms": [{"batchcodes": ["000UM20A"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Feeling cold": 1}}]}
\ No newline at end of file
+{"batchcode": "000UM20A", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Feeling cold": 1}, "batchcodes": ["000UM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001021A.json b/docs/data/histograms/United States/001021A.json
index aa0eefc68e6..b829e489983 100644
--- a/docs/data/histograms/United States/001021A.json
+++ b/docs/data/histograms/United States/001021A.json
@@ -1 +1 @@
-{"batchcode": "001021A", "histograms": [{"batchcodes": ["001021A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "001021A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["001021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00104045.json b/docs/data/histograms/United States/00104045.json
index 7e3b613b6b2..5cde5ec9596 100644
--- a/docs/data/histograms/United States/00104045.json
+++ b/docs/data/histograms/United States/00104045.json
@@ -1 +1 @@
-{"batchcode": "00104045", "histograms": [{"batchcodes": ["00104045"], "histogram": {"COVID-19": 1, "Cough": 1}}]}
\ No newline at end of file
+{"batchcode": "00104045", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1}, "batchcodes": ["00104045"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00105736.json b/docs/data/histograms/United States/00105736.json
index 102d6288397..977fafc7a1c 100644
--- a/docs/data/histograms/United States/00105736.json
+++ b/docs/data/histograms/United States/00105736.json
@@ -1 +1 @@
-{"batchcode": "00105736", "histograms": [{"batchcodes": ["00105736"], "histogram": {"Headache": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "00105736", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["00105736"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00106950.json b/docs/data/histograms/United States/00106950.json
index ecc9a6ee990..0c1255f6f53 100644
--- a/docs/data/histograms/United States/00106950.json
+++ b/docs/data/histograms/United States/00106950.json
@@ -1 +1 @@
-{"batchcode": "00106950", "histograms": [{"batchcodes": ["00106950"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00106950", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["00106950"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0010A21A.json b/docs/data/histograms/United States/0010A21A.json
index b2ba9e26f74..8acb22d55cc 100644
--- a/docs/data/histograms/United States/0010A21A.json
+++ b/docs/data/histograms/United States/0010A21A.json
@@ -1 +1 @@
-{"batchcode": "0010A21A", "histograms": [{"batchcodes": ["0010A21A"], "histogram": {"Arthralgia": 1, "COVID-19": 1, "Myalgia": 1, "Spinal pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0010A21A", "histograms": [{"histogram": {"Arthralgia": 1, "COVID-19": 1, "Myalgia": 1, "Spinal pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["0010A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001121A.json b/docs/data/histograms/United States/001121A.json
index dbfeb0e4016..a3df8c8577e 100644
--- a/docs/data/histograms/United States/001121A.json
+++ b/docs/data/histograms/United States/001121A.json
@@ -1 +1 @@
-{"batchcode": "001121A", "histograms": [{"batchcodes": ["001121A"], "histogram": {"Abdominal pain": 1, "Acute kidney injury": 1, "Anaemia": 1, "Asthenia": 1, "Azotaemia": 1, "Blood culture": 1, "Blood gases": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Brain natriuretic peptide": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Heart rate": 1, "Hyperkalaemia": 1, "Hyperphosphataemia": 1, "Hyperuricaemia": 1, "Hyponatraemia": 1, "Lethargy": 1, "Malnutrition": 1, "Metabolic acidosis": 1, "Metabolic encephalopathy": 1, "Multiple organ dysfunction syndrome": 1, "Nausea": 1, "Oxygen saturation": 1, "Prothrombin time": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Troponin": 1, "Urine analysis": 1, "Waist circumference increased": 1}}]}
\ No newline at end of file
+{"batchcode": "001121A", "histograms": [{"histogram": {"Abdominal pain": 1, "Acute kidney injury": 1, "Anaemia": 1, "Asthenia": 1, "Azotaemia": 1, "Blood culture": 1, "Blood gases": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Brain natriuretic peptide": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Heart rate": 1, "Hyperkalaemia": 1, "Hyperphosphataemia": 1, "Hyperuricaemia": 1, "Hyponatraemia": 1, "Lethargy": 1, "Malnutrition": 1, "Metabolic acidosis": 1, "Metabolic encephalopathy": 1, "Multiple organ dysfunction syndrome": 1, "Nausea": 1, "Oxygen saturation": 1, "Prothrombin time": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Troponin": 1, "Urine analysis": 1, "Waist circumference increased": 1}, "batchcodes": ["001121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011321A.json b/docs/data/histograms/United States/0011321A.json
index a7cd472636e..4ac7670969d 100644
--- a/docs/data/histograms/United States/0011321A.json
+++ b/docs/data/histograms/United States/0011321A.json
@@ -1 +1 @@
-{"batchcode": "0011321A", "histograms": [{"batchcodes": ["0011321A"], "histogram": {"Fatigue": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "0011321A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1}, "batchcodes": ["0011321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011321A/001B21.json b/docs/data/histograms/United States/0011321A/001B21.json
index 49093a84274..8b32292ed94 100644
--- a/docs/data/histograms/United States/0011321A/001B21.json
+++ b/docs/data/histograms/United States/0011321A/001B21.json
@@ -1 +1 @@
-{"batchcode": "0011321A/001B21", "histograms": [{"batchcodes": ["0011321A/001B21"], "histogram": {"Arthralgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0011321A/001B21", "histograms": [{"histogram": {"Arthralgia": 1, "Vaccination site pain": 1}, "batchcodes": ["0011321A/001B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011521A.json b/docs/data/histograms/United States/0011521A.json
index 19708216c28..a2d5f51fb22 100644
--- a/docs/data/histograms/United States/0011521A.json
+++ b/docs/data/histograms/United States/0011521A.json
@@ -1 +1 @@
-{"batchcode": "0011521A", "histograms": [{"batchcodes": ["0011521A"], "histogram": {"Pain in extremity": 2, "Depression": 1, "Emotional poverty": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Neck pain": 1, "Pain": 1, "Polymyalgia rheumatica": 1, "Weight decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "0011521A", "histograms": [{"histogram": {"Pain in extremity": 2, "Depression": 1, "Emotional poverty": 1, "Insomnia": 1, "Magnetic resonance imaging": 1, "Neck pain": 1, "Pain": 1, "Polymyalgia rheumatica": 1, "Weight decreased": 1, "X-ray": 1}, "batchcodes": ["0011521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00115719.json b/docs/data/histograms/United States/00115719.json
index 884e1765c10..1f9097ae46d 100644
--- a/docs/data/histograms/United States/00115719.json
+++ b/docs/data/histograms/United States/00115719.json
@@ -1 +1 @@
-{"batchcode": "00115719", "histograms": [{"batchcodes": ["00115719"], "histogram": {"Incorrect dose administered": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "00115719", "histograms": [{"histogram": {"Incorrect dose administered": 1, "Urinary tract infection": 1}, "batchcodes": ["00115719"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011621A.json b/docs/data/histograms/United States/0011621A.json
index 92bbf20106b..976207a3f05 100644
--- a/docs/data/histograms/United States/0011621A.json
+++ b/docs/data/histograms/United States/0011621A.json
@@ -1 +1 @@
-{"batchcode": "0011621A", "histograms": [{"batchcodes": ["0011621A"], "histogram": {"Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0011621A", "histograms": [{"histogram": {"Headache": 1, "Pyrexia": 1}, "batchcodes": ["0011621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011A21A.json b/docs/data/histograms/United States/0011A21A.json
index 61d79cbd27a..fde167c39e8 100644
--- a/docs/data/histograms/United States/0011A21A.json
+++ b/docs/data/histograms/United States/0011A21A.json
@@ -1 +1 @@
-{"batchcode": "0011A21A", "histograms": [{"batchcodes": ["0011A21A"], "histogram": {"Joint swelling": 2, "Arthralgia": 1, "Condition aggravated": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "0011A21A", "histograms": [{"histogram": {"Joint swelling": 2, "Arthralgia": 1, "Condition aggravated": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin tightness": 1}, "batchcodes": ["0011A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011B21A.json b/docs/data/histograms/United States/0011B21A.json
index c568f045ac6..eeb0710eee0 100644
--- a/docs/data/histograms/United States/0011B21A.json
+++ b/docs/data/histograms/United States/0011B21A.json
@@ -1 +1 @@
-{"batchcode": "0011B21A", "histograms": [{"batchcodes": ["0011B21A"], "histogram": {"Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "0011B21A", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1}, "batchcodes": ["0011B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011J12A.json b/docs/data/histograms/United States/0011J12A.json
index f14da70dc57..db24ef849f5 100644
--- a/docs/data/histograms/United States/0011J12A.json
+++ b/docs/data/histograms/United States/0011J12A.json
@@ -1 +1 @@
-{"batchcode": "0011J12A", "histograms": [{"batchcodes": ["0011J12A"], "histogram": {"Cough": 1, "Fatigue": 1, "Headache": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "0011J12A", "histograms": [{"histogram": {"Cough": 1, "Fatigue": 1, "Headache": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Pyrexia": 1, "Sneezing": 1}, "batchcodes": ["0011J12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011J20A.json b/docs/data/histograms/United States/0011J20A.json
index 16a28e809c6..3f0324ea904 100644
--- a/docs/data/histograms/United States/0011J20A.json
+++ b/docs/data/histograms/United States/0011J20A.json
@@ -1 +1 @@
-{"batchcode": "0011J20A", "histograms": [{"batchcodes": ["0011J20A"], "histogram": {"Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Dysstasia": 1, "Exposure via skin contact": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Hypokalaemia": 1, "Incorrect dose administered": 1, "Intentional dose omission": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "0011J20A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Chest discomfort": 1, "Chest pain": 1, "Dysstasia": 1, "Exposure via skin contact": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Hypokalaemia": 1, "Incorrect dose administered": 1, "Intentional dose omission": 1, "Loss of consciousness": 1}, "batchcodes": ["0011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011JZ0A.json b/docs/data/histograms/United States/0011JZ0A.json
index c0f744d7539..4550d3e9bf5 100644
--- a/docs/data/histograms/United States/0011JZ0A.json
+++ b/docs/data/histograms/United States/0011JZ0A.json
@@ -1 +1 @@
-{"batchcode": "0011JZ0A", "histograms": [{"batchcodes": ["0011JZ0A"], "histogram": {"Chest pain": 1, "Pericarditis": 1}}]}
\ No newline at end of file
+{"batchcode": "0011JZ0A", "histograms": [{"histogram": {"Chest pain": 1, "Pericarditis": 1}, "batchcodes": ["0011JZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0011M20A.json b/docs/data/histograms/United States/0011M20A.json
index 5217638c110..e860831875c 100644
--- a/docs/data/histograms/United States/0011M20A.json
+++ b/docs/data/histograms/United States/0011M20A.json
@@ -1 +1 @@
-{"batchcode": "0011M20A", "histograms": [{"batchcodes": ["0011M20A"], "histogram": {"Injection site pain": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "0011M20A", "histograms": [{"histogram": {"Injection site pain": 1, "Pruritus": 1}, "batchcodes": ["0011M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001211A.json b/docs/data/histograms/United States/001211A.json
index a1a5e40c377..f298c7398f1 100644
--- a/docs/data/histograms/United States/001211A.json
+++ b/docs/data/histograms/United States/001211A.json
@@ -1 +1 @@
-{"batchcode": "001211A", "histograms": [{"batchcodes": ["001211A"], "histogram": {"Chills": 1, "Fatigue": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "001211A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1}, "batchcodes": ["001211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00121A.json b/docs/data/histograms/United States/00121A.json
index 1c2e00319d9..aa230ed9999 100644
--- a/docs/data/histograms/United States/00121A.json
+++ b/docs/data/histograms/United States/00121A.json
@@ -1 +1 @@
-{"batchcode": "00121A", "histograms": [{"batchcodes": ["00121A"], "histogram": {"Arthralgia": 1, "Asthma": 1, "Dizziness": 1, "Dyspnoea": 1, "Magnetic resonance imaging": 1, "Neck pain": 1, "Pain in extremity": 1, "Scan": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "00121A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthma": 1, "Dizziness": 1, "Dyspnoea": 1, "Magnetic resonance imaging": 1, "Neck pain": 1, "Pain in extremity": 1, "Scan": 1, "X-ray": 1}, "batchcodes": ["00121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00122073.json b/docs/data/histograms/United States/00122073.json
index b455defa056..93da4d3af45 100644
--- a/docs/data/histograms/United States/00122073.json
+++ b/docs/data/histograms/United States/00122073.json
@@ -1 +1 @@
-{"batchcode": "00122073", "histograms": [{"batchcodes": ["00122073"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "00122073", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["00122073"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00124216.json b/docs/data/histograms/United States/00124216.json
index 0b275e3145c..9b43617f191 100644
--- a/docs/data/histograms/United States/00124216.json
+++ b/docs/data/histograms/United States/00124216.json
@@ -1 +1 @@
-{"batchcode": "00124216", "histograms": [{"batchcodes": ["00124216"], "histogram": {"Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00124216", "histograms": [{"histogram": {"Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["00124216"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0012A21A.json b/docs/data/histograms/United States/0012A21A.json
index 0c381afe477..b5729df4325 100644
--- a/docs/data/histograms/United States/0012A21A.json
+++ b/docs/data/histograms/United States/0012A21A.json
@@ -1 +1 @@
-{"batchcode": "0012A21A", "histograms": [{"batchcodes": ["0012A21A"], "histogram": {"Erythema": 1, "Lip swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Swelling": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0012A21A", "histograms": [{"histogram": {"Erythema": 1, "Lip swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Swelling": 1, "Urticaria": 1}, "batchcodes": ["0012A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001321A.json b/docs/data/histograms/United States/001321A.json
index 3c3f7267162..60b6af34a24 100644
--- a/docs/data/histograms/United States/001321A.json
+++ b/docs/data/histograms/United States/001321A.json
@@ -1 +1 @@
-{"batchcode": "001321A", "histograms": [{"batchcodes": ["001321A"], "histogram": {"Pain in extremity": 2, "Fatigue": 1, "Headache": 1, "Injection site swelling": 1, "Paraesthesia": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "001321A", "histograms": [{"histogram": {"Pain in extremity": 2, "Fatigue": 1, "Headache": 1, "Injection site swelling": 1, "Paraesthesia": 1, "Peripheral swelling": 1}, "batchcodes": ["001321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00137959.json b/docs/data/histograms/United States/00137959.json
index 1612533deae..fab8d1d4a37 100644
--- a/docs/data/histograms/United States/00137959.json
+++ b/docs/data/histograms/United States/00137959.json
@@ -1 +1 @@
-{"batchcode": "00137959", "histograms": [{"batchcodes": ["00137959"], "histogram": {"Arthralgia": 1, "Bone pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "00137959", "histograms": [{"histogram": {"Arthralgia": 1, "Bone pain": 1, "Vaccination site rash": 1}, "batchcodes": ["00137959"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001421A.json b/docs/data/histograms/United States/001421A.json
index ba54b0b3d6a..f050e9eb83d 100644
--- a/docs/data/histograms/United States/001421A.json
+++ b/docs/data/histograms/United States/001421A.json
@@ -1 +1 @@
-{"batchcode": "001421A", "histograms": [{"batchcodes": ["001421A"], "histogram": {"Chills": 1, "Constipation": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Migraine": 1, "Nerve injury": 1, "Neuralgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "001421A", "histograms": [{"histogram": {"Chills": 1, "Constipation": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Headache": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Migraine": 1, "Nerve injury": 1, "Neuralgia": 1, "Pain in extremity": 1}, "batchcodes": ["001421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0014M20A.json b/docs/data/histograms/United States/0014M20A.json
index 7d9c41d58c3..80e55a2c803 100644
--- a/docs/data/histograms/United States/0014M20A.json
+++ b/docs/data/histograms/United States/0014M20A.json
@@ -1 +1 @@
-{"batchcode": "0014M20A", "histograms": [{"batchcodes": ["0014M20A"], "histogram": {"Rash macular": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0014M20A", "histograms": [{"histogram": {"Rash macular": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0014M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0015214.json b/docs/data/histograms/United States/0015214.json
index 7ae66bb1883..a499e956823 100644
--- a/docs/data/histograms/United States/0015214.json
+++ b/docs/data/histograms/United States/0015214.json
@@ -1 +1 @@
-{"batchcode": "0015214", "histograms": [{"batchcodes": ["0015214"], "histogram": {"Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0015214", "histograms": [{"histogram": {"Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0015214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00153352.json b/docs/data/histograms/United States/00153352.json
index ab74ffe4b52..70d0e72b396 100644
--- a/docs/data/histograms/United States/00153352.json
+++ b/docs/data/histograms/United States/00153352.json
@@ -1 +1 @@
-{"batchcode": "00153352", "histograms": [{"batchcodes": ["00153352"], "histogram": {"Arthralgia": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "00153352", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1}, "batchcodes": ["00153352"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00155BA.json b/docs/data/histograms/United States/00155BA.json
index 645f568b694..28010a8f7b5 100644
--- a/docs/data/histograms/United States/00155BA.json
+++ b/docs/data/histograms/United States/00155BA.json
@@ -1 +1 @@
-{"batchcode": "00155BA", "histograms": [{"batchcodes": ["00155BA"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "00155BA", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["00155BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00156463.json b/docs/data/histograms/United States/00156463.json
index 88b80890cfa..054729474f5 100644
--- a/docs/data/histograms/United States/00156463.json
+++ b/docs/data/histograms/United States/00156463.json
@@ -1 +1 @@
-{"batchcode": "00156463", "histograms": [{"batchcodes": ["00156463"], "histogram": {"Neuralgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "00156463", "histograms": [{"histogram": {"Neuralgia": 1, "Pain in extremity": 1}, "batchcodes": ["00156463"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00157558.json b/docs/data/histograms/United States/00157558.json
index fd92465bb07..af5ec721fac 100644
--- a/docs/data/histograms/United States/00157558.json
+++ b/docs/data/histograms/United States/00157558.json
@@ -1 +1 @@
-{"batchcode": "00157558", "histograms": [{"batchcodes": ["00157558", "017C21A"], "histogram": {"Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "00157558", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["00157558", "017C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00157606.json b/docs/data/histograms/United States/00157606.json
index 39928d48f92..cefad17c1a3 100644
--- a/docs/data/histograms/United States/00157606.json
+++ b/docs/data/histograms/United States/00157606.json
@@ -1 +1 @@
-{"batchcode": "00157606", "histograms": [{"batchcodes": ["00157606"], "histogram": {"Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "00157606", "histograms": [{"histogram": {"Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["00157606"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00161.json b/docs/data/histograms/United States/00161.json
index dbf8ec810f0..19d6c29aa49 100644
--- a/docs/data/histograms/United States/00161.json
+++ b/docs/data/histograms/United States/00161.json
@@ -1 +1 @@
-{"batchcode": "00161", "histograms": [{"batchcodes": ["00161"], "histogram": {"Muscle spasms": 1, "Muscle twitching": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "00161", "histograms": [{"histogram": {"Muscle spasms": 1, "Muscle twitching": 1, "Pain in extremity": 1}, "batchcodes": ["00161"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0016210.json b/docs/data/histograms/United States/0016210.json
index 2e350b47a6f..f9d9339c462 100644
--- a/docs/data/histograms/United States/0016210.json
+++ b/docs/data/histograms/United States/0016210.json
@@ -1 +1 @@
-{"batchcode": "0016210", "histograms": [{"batchcodes": ["0016210"], "histogram": {"Arthralgia": 1}}]}
\ No newline at end of file
+{"batchcode": "0016210", "histograms": [{"histogram": {"Arthralgia": 1}, "batchcodes": ["0016210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0016MOA (?).json b/docs/data/histograms/United States/0016MOA (?).json
index 5f82bb0605b..280e5127d5e 100644
--- a/docs/data/histograms/United States/0016MOA (?).json
+++ b/docs/data/histograms/United States/0016MOA (?).json
@@ -1 +1 @@
-{"batchcode": "0016MOA (?)", "histograms": [{"batchcodes": ["0016MOA (?)"], "histogram": {"Concussion": 1, "Fall": 1, "Headache": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pain in extremity": 1, "Sleep disorder": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "0016MOA (?)", "histograms": [{"histogram": {"Concussion": 1, "Fall": 1, "Headache": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1, "Pain in extremity": 1, "Sleep disorder": 1, "Tachycardia": 1}, "batchcodes": ["0016MOA (?)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00170848.json b/docs/data/histograms/United States/00170848.json
index 506d6b52c75..ce24af2087e 100644
--- a/docs/data/histograms/United States/00170848.json
+++ b/docs/data/histograms/United States/00170848.json
@@ -1 +1 @@
-{"batchcode": "00170848", "histograms": [{"batchcodes": ["00170848"], "histogram": {"Accidental exposure to product": 1}}]}
\ No newline at end of file
+{"batchcode": "00170848", "histograms": [{"histogram": {"Accidental exposure to product": 1}, "batchcodes": ["00170848"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0017B12A.json b/docs/data/histograms/United States/0017B12A.json
index 62656851435..6983829484e 100644
--- a/docs/data/histograms/United States/0017B12A.json
+++ b/docs/data/histograms/United States/0017B12A.json
@@ -1 +1 @@
-{"batchcode": "0017B12A", "histograms": [{"batchcodes": ["0017B12A"], "histogram": {"Blood glucose": 1, "Blood glucose increased": 1}}]}
\ No newline at end of file
+{"batchcode": "0017B12A", "histograms": [{"histogram": {"Blood glucose": 1, "Blood glucose increased": 1}, "batchcodes": ["0017B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001821A.json b/docs/data/histograms/United States/001821A.json
index 6a6893220be..1a0a1a897ee 100644
--- a/docs/data/histograms/United States/001821A.json
+++ b/docs/data/histograms/United States/001821A.json
@@ -1 +1 @@
-{"batchcode": "001821A", "histograms": [{"batchcodes": ["001821A"], "histogram": {"Pain in extremity": 3, "Chills": 2, "Erythema": 2, "Nausea": 2, "Pain": 2, "Pyrexia": 2, "Alopecia": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood glucose increased": 1, "Blood test": 1, "Body temperature": 1, "Brain death": 1, "Breakthrough COVID-19": 1, "Cerebral thrombosis": 1, "Condition aggravated": 1, "Contusion": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspepsia": 1, "Expired product administered": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Flushing": 1, "Hallucination": 1, "Headache": 1, "Hyperhidrosis": 1, "Induration": 1, "Injection site pain": 1, "Injection site swelling": 1, "Intermenstrual bleeding": 1, "Ligament sprain": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Mechanical urticaria": 1, "Mobility decreased": 1, "Pharyngeal swelling": 1, "Pruritus": 1, "Rash": 1, "Skin warm": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site reaction": 1, "Vertigo": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "001821A", "histograms": [{"histogram": {"Pain in extremity": 3, "Chills": 2, "Erythema": 2, "Nausea": 2, "Pain": 2, "Pyrexia": 2, "Alopecia": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood glucose increased": 1, "Blood test": 1, "Body temperature": 1, "Brain death": 1, "Breakthrough COVID-19": 1, "Cerebral thrombosis": 1, "Condition aggravated": 1, "Contusion": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspepsia": 1, "Expired product administered": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Flushing": 1, "Hallucination": 1, "Headache": 1, "Hyperhidrosis": 1, "Induration": 1, "Injection site pain": 1, "Injection site swelling": 1, "Intermenstrual bleeding": 1, "Ligament sprain": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Mechanical urticaria": 1, "Mobility decreased": 1, "Pharyngeal swelling": 1, "Pruritus": 1, "Rash": 1, "Skin warm": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site reaction": 1, "Vertigo": 1, "X-ray": 1}, "batchcodes": ["001821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0018221A.json b/docs/data/histograms/United States/0018221A.json
index 9f4eec8158a..443c6ad5958 100644
--- a/docs/data/histograms/United States/0018221A.json
+++ b/docs/data/histograms/United States/0018221A.json
@@ -1 +1 @@
-{"batchcode": "0018221A", "histograms": [{"batchcodes": ["0018221A"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "0018221A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}, "batchcodes": ["0018221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00182TA.json b/docs/data/histograms/United States/00182TA.json
index eafb010c943..95d8e6b386b 100644
--- a/docs/data/histograms/United States/00182TA.json
+++ b/docs/data/histograms/United States/00182TA.json
@@ -1 +1 @@
-{"batchcode": "00182TA", "histograms": [{"batchcodes": ["00182TA"], "histogram": {"Blood glucose increased": 1}}]}
\ No newline at end of file
+{"batchcode": "00182TA", "histograms": [{"histogram": {"Blood glucose increased": 1}, "batchcodes": ["00182TA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00183340.json b/docs/data/histograms/United States/00183340.json
index d19b702c553..88fe24818b8 100644
--- a/docs/data/histograms/United States/00183340.json
+++ b/docs/data/histograms/United States/00183340.json
@@ -1 +1 @@
-{"batchcode": "00183340", "histograms": [{"batchcodes": ["00183340"], "histogram": {"Anxiety": 1, "Blood test": 1, "Chest X-ray": 1, "Chest pain": 1, "Electrocardiogram": 1, "Erythropsia": 1, "Headache": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "00183340", "histograms": [{"histogram": {"Anxiety": 1, "Blood test": 1, "Chest X-ray": 1, "Chest pain": 1, "Electrocardiogram": 1, "Erythropsia": 1, "Headache": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["00183340"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00186502.json b/docs/data/histograms/United States/00186502.json
index 56663a9ff3a..31c8da437b2 100644
--- a/docs/data/histograms/United States/00186502.json
+++ b/docs/data/histograms/United States/00186502.json
@@ -1 +1 @@
-{"batchcode": "00186502", "histograms": [{"batchcodes": ["00186502"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "00186502", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["00186502"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00188164.json b/docs/data/histograms/United States/00188164.json
index 5a016fbc1da..11a2cf39bb8 100644
--- a/docs/data/histograms/United States/00188164.json
+++ b/docs/data/histograms/United States/00188164.json
@@ -1 +1 @@
-{"batchcode": "00188164", "histograms": [{"batchcodes": ["00188164"], "histogram": {"Arthralgia": 1, "Cardiac disorder": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Memory impairment": 1, "Muscular weakness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "00188164", "histograms": [{"histogram": {"Arthralgia": 1, "Cardiac disorder": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Memory impairment": 1, "Muscular weakness": 1, "Pain in extremity": 1}, "batchcodes": ["00188164"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0018B21A.json b/docs/data/histograms/United States/0018B21A.json
index 8e8b21ce4d8..30bf0fd2b58 100644
--- a/docs/data/histograms/United States/0018B21A.json
+++ b/docs/data/histograms/United States/0018B21A.json
@@ -1 +1 @@
-{"batchcode": "0018B21A", "histograms": [{"batchcodes": ["0018B21A"], "histogram": {"Exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "0018B21A", "histograms": [{"histogram": {"Exposure during pregnancy": 1}, "batchcodes": ["0018B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0019B21A.json b/docs/data/histograms/United States/0019B21A.json
index 95a7d02e656..6f00c9e7ea0 100644
--- a/docs/data/histograms/United States/0019B21A.json
+++ b/docs/data/histograms/United States/0019B21A.json
@@ -1 +1 @@
-{"batchcode": "0019B21A", "histograms": [{"batchcodes": ["0019B21A"], "histogram": {"Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "0019B21A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urinary tract infection": 1}, "batchcodes": ["0019B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A01A.json b/docs/data/histograms/United States/001A01A.json
index 80ce9ff4fd4..7c01dbc73a8 100644
--- a/docs/data/histograms/United States/001A01A.json
+++ b/docs/data/histograms/United States/001A01A.json
@@ -1 +1 @@
-{"batchcode": "001A01A", "histograms": [{"batchcodes": ["001A01A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "001A01A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["001A01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A1A.json b/docs/data/histograms/United States/001A1A.json
index 6ee64e16493..d40297b34f5 100644
--- a/docs/data/histograms/United States/001A1A.json
+++ b/docs/data/histograms/United States/001A1A.json
@@ -1 +1 @@
-{"batchcode": "001A1A", "histograms": [{"batchcodes": ["001A1A"], "histogram": {"Headache": 1, "Injection site erythema": 1, "Malaise": 1, "Musculoskeletal stiffness": 1}}]}
\ No newline at end of file
+{"batchcode": "001A1A", "histograms": [{"histogram": {"Headache": 1, "Injection site erythema": 1, "Malaise": 1, "Musculoskeletal stiffness": 1}, "batchcodes": ["001A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A2(ORZ)1A.json b/docs/data/histograms/United States/001A2(ORZ)1A.json
index c85f33e352e..f5529b67e51 100644
--- a/docs/data/histograms/United States/001A2(ORZ)1A.json
+++ b/docs/data/histograms/United States/001A2(ORZ)1A.json
@@ -1 +1 @@
-{"batchcode": "001A2(ORZ)1A", "histograms": [{"batchcodes": ["001A2(ORZ)1A"], "histogram": {"Influenza like illness": 1, "SARS-CoV-1 test": 1}}]}
\ No newline at end of file
+{"batchcode": "001A2(ORZ)1A", "histograms": [{"histogram": {"Influenza like illness": 1, "SARS-CoV-1 test": 1}, "batchcodes": ["001A2(ORZ)1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A20A.json b/docs/data/histograms/United States/001A20A.json
index 9ab728a0f98..7e39d7a91f6 100644
--- a/docs/data/histograms/United States/001A20A.json
+++ b/docs/data/histograms/United States/001A20A.json
@@ -1 +1 @@
-{"batchcode": "001A20A", "histograms": [{"batchcodes": ["001A20A"], "histogram": {"Dysgeusia": 3, "Gastrooesophageal reflux disease": 3, "Throat irritation": 3, "Blister": 1, "Dry mouth": 1, "Feeding disorder": 1, "Gingival swelling": 1, "Headache": 1, "Nasal congestion": 1, "Nausea": 1, "Pain in extremity": 1, "Rash": 1, "Toothache": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "001A20A", "histograms": [{"histogram": {"Dysgeusia": 3, "Gastrooesophageal reflux disease": 3, "Throat irritation": 3, "Blister": 1, "Dry mouth": 1, "Feeding disorder": 1, "Gingival swelling": 1, "Headache": 1, "Nasal congestion": 1, "Nausea": 1, "Pain in extremity": 1, "Rash": 1, "Toothache": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["001A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A210.json b/docs/data/histograms/United States/001A210.json
index 324acfe030e..e06ca2e05c5 100644
--- a/docs/data/histograms/United States/001A210.json
+++ b/docs/data/histograms/United States/001A210.json
@@ -1 +1 @@
-{"batchcode": "001A210", "histograms": [{"batchcodes": ["001A210"], "histogram": {"Insomnia": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "001A210", "histograms": [{"histogram": {"Insomnia": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["001A210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A210A.json b/docs/data/histograms/United States/001A210A.json
index 195a4de768a..1736d590218 100644
--- a/docs/data/histograms/United States/001A210A.json
+++ b/docs/data/histograms/United States/001A210A.json
@@ -1 +1 @@
-{"batchcode": "001A210A", "histograms": [{"batchcodes": ["001A210A"], "histogram": {"Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "001A210A", "histograms": [{"histogram": {"Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["001A210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A214.json b/docs/data/histograms/United States/001A214.json
index 2ed924b9cb7..fb21f12e0ec 100644
--- a/docs/data/histograms/United States/001A214.json
+++ b/docs/data/histograms/United States/001A214.json
@@ -1 +1 @@
-{"batchcode": "001A214", "histograms": [{"batchcodes": ["001A214"], "histogram": {"Cystitis": 1}}]}
\ No newline at end of file
+{"batchcode": "001A214", "histograms": [{"histogram": {"Cystitis": 1}, "batchcodes": ["001A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A21A..json b/docs/data/histograms/United States/001A21A..json
index b94be4c528b..a640f742d23 100644
--- a/docs/data/histograms/United States/001A21A..json
+++ b/docs/data/histograms/United States/001A21A..json
@@ -1 +1 @@
-{"batchcode": "001A21A.", "histograms": [{"batchcodes": ["001A21A."], "histogram": {"Blood test": 1, "Diarrhoea haemorrhagic": 1, "Haemoglobin": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "001A21A.", "histograms": [{"histogram": {"Blood test": 1, "Diarrhoea haemorrhagic": 1, "Haemoglobin": 1, "Presyncope": 1}, "batchcodes": ["001A21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A21A.json b/docs/data/histograms/United States/001A21A.json
index e40c069c42b..19918b06b44 100644
--- a/docs/data/histograms/United States/001A21A.json
+++ b/docs/data/histograms/United States/001A21A.json
@@ -1 +1 @@
-{"batchcode": "001A21A", "histograms": [{"batchcodes": ["001A21A", "EL9264"], "histogram": {"COVID-19 immunisation": 1, "Cardiac failure": 1, "Dyspnoea": 1, "Fear": 1, "Heart disease congenital": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Oxygen saturation": 1, "Pericardial effusion": 1, "Pulmonary oedema": 1}}, {"batchcodes": ["001A21A"], "histogram": {"Headache": 103, "Pain in extremity": 93, "Fatigue": 90, "Pyrexia": 86, "Chills": 69, "Myalgia": 61, "Vaccination site pain": 59, "Pain": 58, "Nausea": 42, "Feeling abnormal": 40, "Arthralgia": 35, "Vaccination site erythema": 34, "Dizziness": 33, "Pruritus": 33, "Asthenia": 31, "Rash": 29, "Erythema": 26, "Body temperature": 25, "Diarrhoea": 25, "Vaccination site swelling": 23, "Vaccination site pruritus": 22, "Dyspnoea": 18, "Lymphadenopathy": 17, "Peripheral swelling": 17, "Vomiting": 17, "Malaise": 16, "Vaccination site warmth": 16, "Hypoaesthesia": 15, "SARS-CoV-2 test": 15, "Blood pressure measurement": 14, "Decreased appetite": 14, "Insomnia": 14, "Vaccination complication": 14, "COVID-19": 13, "Cough": 13, "Urticaria": 13, "Tremor": 11, "Feeling hot": 10, "Somnolence": 10, "Vaccination site rash": 10, "Vaccination site reaction": 10, "Abdominal discomfort": 9, "Anxiety": 9, "Inappropriate schedule of product administration": 9, "Paraesthesia": 9, "Swelling": 9, "Tinnitus": 9, "Back pain": 8, "Chest discomfort": 8, "Influenza like illness": 8, "Limb discomfort": 8, "Oropharyngeal pain": 8, "Palpitations": 8, "Balance disorder": 7, "Burning sensation": 7, "Chest pain": 7, "Hyperhidrosis": 7, "Illness": 7, "Injection site pain": 7, "Injection site pruritus": 7, "Injection site swelling": 7, "Musculoskeletal stiffness": 7, "Neck pain": 7, "Product dose omission issue": 7, "Sluggishness": 7, "Heart rate": 6, "Heart rate increased": 6, "Hypersensitivity": 6, "Joint swelling": 6, "Migraine": 6, "Swelling face": 6, "Vaccination site bruising": 6, "Vaccination site induration": 6, "Vertigo": 6, "Abdominal pain": 5, "Abdominal pain upper": 5, "Fall": 5, "Gait disturbance": 5, "Hypertension": 5, "Injection site erythema": 5, "Lymph node pain": 5, "Mobility decreased": 5, "Rash macular": 5, "Tenderness": 5, "Blood test": 4, "Bone pain": 4, "Condition aggravated": 4, "Device connection issue": 4, "Disorientation": 4, "Electrocardiogram": 4, "Expired product administered": 4, "Head discomfort": 4, "Injection site rash": 4, "Lip swelling": 4, "Loss of consciousness": 4, "Nasopharyngitis": 4, "Nervousness": 4, "Oxygen saturation": 4, "Throat tightness": 4, "Vaccination site mass": 4, "Ageusia": 3, "Arthritis": 3, "Blister": 3, "Blood glucose": 3, "Blood pressure increased": 3, "Body temperature increased": 3, "Breast pain": 3, "Computerised tomogram": 3, "Confusional state": 3, "Contusion": 3, "Discomfort": 3, "Dry mouth": 3, "Dysphagia": 3, "Dyspnoea exertional": 3, "Ear pain": 3, "Eye pain": 3, "Feeding disorder": 3, "Feeling cold": 3, "Gait inability": 3, "Hypoaesthesia oral": 3, "Immunisation reaction": 3, "Muscular weakness": 3, "Nasal discomfort": 3, "Neuralgia": 3, "No adverse event": 3, "Pain in jaw": 3, "Paraesthesia oral": 3, "Pharyngeal swelling": 3, "Pregnancy test": 3, "Rash erythematous": 3, "Rash pruritic": 3, "Tension headache": 3, "Throat irritation": 3, "Underdose": 3, "Urinary tract infection": 3, "Alopecia": 2, "Amnesia": 2, "Anaphylactic reaction": 2, "Anaphylactic shock": 2, "Antibody test": 2, "Aphasia": 2, "Axillary pain": 2, "Bedridden": 2, "Bell's palsy": 2, "Blood glucose increased": 2, "Body temperature abnormal": 2, "Cardiac stress test": 2, "Dehydration": 2, "Dental discomfort": 2, "Depression": 2, "Dizziness postural": 2, "Dysgeusia": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye pruritus": 2, "Facial discomfort": 2, "Feeling of body temperature change": 2, "Fibrin D dimer": 2, "Hot flush": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Immunodeficiency": 2, "Incorrect route of product administration": 2, "Inflammation": 2, "Influenza": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Lethargy": 2, "Loss of personal independence in daily activities": 2, "Mass": 2, "Melanocytic naevus": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Night sweats": 2, "Nightmare": 2, "Ocular discomfort": 2, "Panic attack": 2, "Peripheral coldness": 2, "Pollakiuria": 2, "Product administration interrupted": 2, "Productive cough": 2, "Reading disorder": 2, "Respiratory rate": 2, "Retching": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "Sinus disorder": 2, "Skin mass": 2, "Stress": 2, "Suicidal ideation": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Tachycardia": 2, "Taste disorder": 2, "Tongue discomfort": 2, "Ultrasound scan": 2, "Vaccination site discolouration": 2, "Vaccination site urticaria": 2, "Vision blurred": 2, "Weight decreased": 2, "X-ray": 2, "Abdominal distension": 1, "Accidental underdose": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Adverse event": 1, "Adverse reaction": 1, "Anal incontinence": 1, "Angioedema": 1, "Anosmia": 1, "Antibody test negative": 1, "Aortic aneurysm": 1, "Aphthous ulcer": 1, "Appetite disorder": 1, "Arteriogram carotid": 1, "Ascites": 1, "Asthenopia": 1, "Asthma": 1, "B-cell lymphoma": 1, "Back injury": 1, "Bladder pain": 1, "Bladder spasm": 1, "Blindness transient": 1, "Blood blister": 1, "Blood cholesterol": 1, "Blood mercury": 1, "Blood urine": 1, "Blood urine present": 1, "Body temperature fluctuation": 1, "Breast discharge": 1, "Breast inflammation": 1, "Breast tenderness": 1, "Bronchospasm": 1, "Cardiac pacemaker insertion": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Cheilitis": 1, "Choking sensation": 1, "Colonoscopy": 1, "Crying": 1, "Deafness unilateral": 1, "Decreased activity": 1, "Dermatitis contact": 1, "Disturbance in attention": 1, "Drug intolerance": 1, "Dry skin": 1, "Duodenogastric reflux": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear congestion": 1, "Electric shock sensation": 1, "Emphysema": 1, "Endoscopy": 1, "Enlarged uvula": 1, "Eructation": 1, "Exfoliative rash": 1, "Eye disorder": 1, "Eye irritation": 1, "Facial pain": 1, "Fear": 1, "Feeling jittery": 1, "Flank pain": 1, "Fluid retention": 1, "Flushing": 1, "Fragile X carrier": 1, "Gastrooesophageal reflux disease": 1, "Generalised tonic-clonic seizure": 1, "Gingival swelling": 1, "Heart rate abnormal": 1, "Hepatic enzyme abnormal": 1, "Herpes zoster": 1, "Hospitalisation": 1, "Hunger": 1, "Hyperkeratosis": 1, "Hypogeusia": 1, "Hypopnoea": 1, "Hyposmia": 1, "Hypoxia": 1, "Ill-defined disorder": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered": 1, "Induration": 1, "Injected limb mobility decreased": 1, "Injection site induration": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "International normalised ratio": 1, "Irritable bowel syndrome": 1, "Ischaemic stroke": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Joint warmth": 1, "Laboratory test": 1, "Lip blister": 1, "Livedo reticularis": 1, "Liver function test": 1, "Lymphoma": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Mastication disorder": 1, "Maternal exposure during pregnancy": 1, "Medication error": 1, "Memory impairment": 1, "Migraine with aura": 1, "Miliaria": 1, "Monoparesis": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle injury": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Non-cardiac chest pain": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oesophageal injury": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oral mucosal eruption": 1, "Oral mucosal erythema": 1, "Oropharyngeal blistering": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Pancreatic enzymes increased": 1, "Pancreatitis": 1, "Papule": 1, "Paralysis": 1, "Periarthritis": 1, "Phantom limb syndrome": 1, "Pharyngeal oedema": 1, "Photopsia": 1, "Pneumonia": 1, "Poor quality product administered": 1, "Pregnancy": 1, "Presyncope": 1, "Product availability issue": 1, "Product storage error": 1, "Product temperature excursion issue": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Psoriatic arthropathy": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary oedema": 1, "Rash papular": 1, "Rash vesicular": 1, "Respiratory failure": 1, "Rhinitis allergic": 1, "SARS-CoV-2 antibody test": 1, "Salivary hypersecretion": 1, "Scab": 1, "Sciatica": 1, "Scratch": 1, "Seasonal allergy": 1, "Seizure": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion inflammation": 1, "Skin reaction": 1, "Skin sensitisation": 1, "Skin swelling": 1, "Skin warm": 1, "Sneezing": 1, "Speech disorder": 1, "Stomatitis": 1, "Sunburn": 1, "Symptom recurrence": 1, "Syncope": 1, "Temporomandibular joint syndrome": 1, "Tendonitis": 1, "Thirst": 1, "Thrombosis": 1, "Tongue blistering": 1, "Tongue discolouration": 1, "Tongue disorder": 1, "Tongue paralysis": 1, "Tongue ulceration": 1, "Tonsillitis": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Urinary incontinence": 1, "Urticaria papular": 1, "Vaccination site discomfort": 1, "Vaccination site hypersensitivity": 1, "Vaccination site injury": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Varicose vein": 1, "Vascular test": 1, "Venous thrombosis limb": 1, "Weight": 1, "Weight increased": 1, "Wheezing": 1, "Wrong technique in device usage process": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "001A21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Cardiac failure": 1, "Dyspnoea": 1, "Fear": 1, "Heart disease congenital": 1, "Hypoxia": 1, "Inappropriate schedule of product administration": 1, "Oxygen saturation": 1, "Pericardial effusion": 1, "Pulmonary oedema": 1}, "batchcodes": ["001A21A", "EL9264"]}, {"histogram": {"Headache": 103, "Pain in extremity": 93, "Fatigue": 90, "Pyrexia": 86, "Chills": 69, "Myalgia": 61, "Vaccination site pain": 59, "Pain": 58, "Nausea": 42, "Feeling abnormal": 40, "Arthralgia": 35, "Vaccination site erythema": 34, "Dizziness": 33, "Pruritus": 33, "Asthenia": 31, "Rash": 29, "Erythema": 26, "Body temperature": 25, "Diarrhoea": 25, "Vaccination site swelling": 23, "Vaccination site pruritus": 22, "Dyspnoea": 18, "Lymphadenopathy": 17, "Peripheral swelling": 17, "Vomiting": 17, "Malaise": 16, "Vaccination site warmth": 16, "Hypoaesthesia": 15, "SARS-CoV-2 test": 15, "Blood pressure measurement": 14, "Decreased appetite": 14, "Insomnia": 14, "Vaccination complication": 14, "COVID-19": 13, "Cough": 13, "Urticaria": 13, "Tremor": 11, "Feeling hot": 10, "Somnolence": 10, "Vaccination site rash": 10, "Vaccination site reaction": 10, "Abdominal discomfort": 9, "Anxiety": 9, "Inappropriate schedule of product administration": 9, "Paraesthesia": 9, "Swelling": 9, "Tinnitus": 9, "Back pain": 8, "Chest discomfort": 8, "Influenza like illness": 8, "Limb discomfort": 8, "Oropharyngeal pain": 8, "Palpitations": 8, "Balance disorder": 7, "Burning sensation": 7, "Chest pain": 7, "Hyperhidrosis": 7, "Illness": 7, "Injection site pain": 7, "Injection site pruritus": 7, "Injection site swelling": 7, "Musculoskeletal stiffness": 7, "Neck pain": 7, "Product dose omission issue": 7, "Sluggishness": 7, "Heart rate": 6, "Heart rate increased": 6, "Hypersensitivity": 6, "Joint swelling": 6, "Migraine": 6, "Swelling face": 6, "Vaccination site bruising": 6, "Vaccination site induration": 6, "Vertigo": 6, "Abdominal pain": 5, "Abdominal pain upper": 5, "Fall": 5, "Gait disturbance": 5, "Hypertension": 5, "Injection site erythema": 5, "Lymph node pain": 5, "Mobility decreased": 5, "Rash macular": 5, "Tenderness": 5, "Blood test": 4, "Bone pain": 4, "Condition aggravated": 4, "Device connection issue": 4, "Disorientation": 4, "Electrocardiogram": 4, "Expired product administered": 4, "Head discomfort": 4, "Injection site rash": 4, "Lip swelling": 4, "Loss of consciousness": 4, "Nasopharyngitis": 4, "Nervousness": 4, "Oxygen saturation": 4, "Throat tightness": 4, "Vaccination site mass": 4, "Ageusia": 3, "Arthritis": 3, "Blister": 3, "Blood glucose": 3, "Blood pressure increased": 3, "Body temperature increased": 3, "Breast pain": 3, "Computerised tomogram": 3, "Confusional state": 3, "Contusion": 3, "Discomfort": 3, "Dry mouth": 3, "Dysphagia": 3, "Dyspnoea exertional": 3, "Ear pain": 3, "Eye pain": 3, "Feeding disorder": 3, "Feeling cold": 3, "Gait inability": 3, "Hypoaesthesia oral": 3, "Immunisation reaction": 3, "Muscular weakness": 3, "Nasal discomfort": 3, "Neuralgia": 3, "No adverse event": 3, "Pain in jaw": 3, "Paraesthesia oral": 3, "Pharyngeal swelling": 3, "Pregnancy test": 3, "Rash erythematous": 3, "Rash pruritic": 3, "Tension headache": 3, "Throat irritation": 3, "Underdose": 3, "Urinary tract infection": 3, "Alopecia": 2, "Amnesia": 2, "Anaphylactic reaction": 2, "Anaphylactic shock": 2, "Antibody test": 2, "Aphasia": 2, "Axillary pain": 2, "Bedridden": 2, "Bell's palsy": 2, "Blood glucose increased": 2, "Body temperature abnormal": 2, "Cardiac stress test": 2, "Dehydration": 2, "Dental discomfort": 2, "Depression": 2, "Dizziness postural": 2, "Dysgeusia": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye pruritus": 2, "Facial discomfort": 2, "Feeling of body temperature change": 2, "Fibrin D dimer": 2, "Hot flush": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Immunodeficiency": 2, "Incorrect route of product administration": 2, "Inflammation": 2, "Influenza": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Lethargy": 2, "Loss of personal independence in daily activities": 2, "Mass": 2, "Melanocytic naevus": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Night sweats": 2, "Nightmare": 2, "Ocular discomfort": 2, "Panic attack": 2, "Peripheral coldness": 2, "Pollakiuria": 2, "Product administration interrupted": 2, "Productive cough": 2, "Reading disorder": 2, "Respiratory rate": 2, "Retching": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "Sinus disorder": 2, "Skin mass": 2, "Stress": 2, "Suicidal ideation": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Tachycardia": 2, "Taste disorder": 2, "Tongue discomfort": 2, "Ultrasound scan": 2, "Vaccination site discolouration": 2, "Vaccination site urticaria": 2, "Vision blurred": 2, "Weight decreased": 2, "X-ray": 2, "Abdominal distension": 1, "Accidental underdose": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Adverse event": 1, "Adverse reaction": 1, "Anal incontinence": 1, "Angioedema": 1, "Anosmia": 1, "Antibody test negative": 1, "Aortic aneurysm": 1, "Aphthous ulcer": 1, "Appetite disorder": 1, "Arteriogram carotid": 1, "Ascites": 1, "Asthenopia": 1, "Asthma": 1, "B-cell lymphoma": 1, "Back injury": 1, "Bladder pain": 1, "Bladder spasm": 1, "Blindness transient": 1, "Blood blister": 1, "Blood cholesterol": 1, "Blood mercury": 1, "Blood urine": 1, "Blood urine present": 1, "Body temperature fluctuation": 1, "Breast discharge": 1, "Breast inflammation": 1, "Breast tenderness": 1, "Bronchospasm": 1, "Cardiac pacemaker insertion": 1, "Cardiomyopathy": 1, "Catheterisation cardiac": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Cheilitis": 1, "Choking sensation": 1, "Colonoscopy": 1, "Crying": 1, "Deafness unilateral": 1, "Decreased activity": 1, "Dermatitis contact": 1, "Disturbance in attention": 1, "Drug intolerance": 1, "Dry skin": 1, "Duodenogastric reflux": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear congestion": 1, "Electric shock sensation": 1, "Emphysema": 1, "Endoscopy": 1, "Enlarged uvula": 1, "Eructation": 1, "Exfoliative rash": 1, "Eye disorder": 1, "Eye irritation": 1, "Facial pain": 1, "Fear": 1, "Feeling jittery": 1, "Flank pain": 1, "Fluid retention": 1, "Flushing": 1, "Fragile X carrier": 1, "Gastrooesophageal reflux disease": 1, "Generalised tonic-clonic seizure": 1, "Gingival swelling": 1, "Heart rate abnormal": 1, "Hepatic enzyme abnormal": 1, "Herpes zoster": 1, "Hospitalisation": 1, "Hunger": 1, "Hyperkeratosis": 1, "Hypogeusia": 1, "Hypopnoea": 1, "Hyposmia": 1, "Hypoxia": 1, "Ill-defined disorder": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered": 1, "Induration": 1, "Injected limb mobility decreased": 1, "Injection site induration": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "International normalised ratio": 1, "Irritable bowel syndrome": 1, "Ischaemic stroke": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Joint warmth": 1, "Laboratory test": 1, "Lip blister": 1, "Livedo reticularis": 1, "Liver function test": 1, "Lymphoma": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Mastication disorder": 1, "Maternal exposure during pregnancy": 1, "Medication error": 1, "Memory impairment": 1, "Migraine with aura": 1, "Miliaria": 1, "Monoparesis": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle injury": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Non-cardiac chest pain": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oesophageal injury": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oral mucosal eruption": 1, "Oral mucosal erythema": 1, "Oropharyngeal blistering": 1, "Oxygen saturation decreased": 1, "Pallor": 1, "Pancreatic enzymes increased": 1, "Pancreatitis": 1, "Papule": 1, "Paralysis": 1, "Periarthritis": 1, "Phantom limb syndrome": 1, "Pharyngeal oedema": 1, "Photopsia": 1, "Pneumonia": 1, "Poor quality product administered": 1, "Pregnancy": 1, "Presyncope": 1, "Product availability issue": 1, "Product storage error": 1, "Product temperature excursion issue": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Psoriatic arthropathy": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary oedema": 1, "Rash papular": 1, "Rash vesicular": 1, "Respiratory failure": 1, "Rhinitis allergic": 1, "SARS-CoV-2 antibody test": 1, "Salivary hypersecretion": 1, "Scab": 1, "Sciatica": 1, "Scratch": 1, "Seasonal allergy": 1, "Seizure": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion inflammation": 1, "Skin reaction": 1, "Skin sensitisation": 1, "Skin swelling": 1, "Skin warm": 1, "Sneezing": 1, "Speech disorder": 1, "Stomatitis": 1, "Sunburn": 1, "Symptom recurrence": 1, "Syncope": 1, "Temporomandibular joint syndrome": 1, "Tendonitis": 1, "Thirst": 1, "Thrombosis": 1, "Tongue blistering": 1, "Tongue discolouration": 1, "Tongue disorder": 1, "Tongue paralysis": 1, "Tongue ulceration": 1, "Tonsillitis": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Urinary incontinence": 1, "Urticaria papular": 1, "Vaccination site discomfort": 1, "Vaccination site hypersensitivity": 1, "Vaccination site injury": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Varicose vein": 1, "Vascular test": 1, "Venous thrombosis limb": 1, "Weight": 1, "Weight increased": 1, "Wheezing": 1, "Wrong technique in device usage process": 1, "Yellow skin": 1}, "batchcodes": ["001A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A22A.json b/docs/data/histograms/United States/001A22A.json
index bce6111937a..2b8f289d439 100644
--- a/docs/data/histograms/United States/001A22A.json
+++ b/docs/data/histograms/United States/001A22A.json
@@ -1 +1 @@
-{"batchcode": "001A22A", "histograms": [{"batchcodes": ["001A22A"], "histogram": {"Arthralgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "001A22A", "histograms": [{"histogram": {"Arthralgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["001A22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A29A.json b/docs/data/histograms/United States/001A29A.json
index e680a1a0605..982779c5c13 100644
--- a/docs/data/histograms/United States/001A29A.json
+++ b/docs/data/histograms/United States/001A29A.json
@@ -1 +1 @@
-{"batchcode": "001A29A", "histograms": [{"batchcodes": ["001A29A"], "histogram": {"Discomfort": 1, "Movement disorder": 1, "Myalgia": 1, "Pain": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "001A29A", "histograms": [{"histogram": {"Discomfort": 1, "Movement disorder": 1, "Myalgia": 1, "Pain": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["001A29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001A2A OR 001A2.json b/docs/data/histograms/United States/001A2A OR 001A2.json
index b8167ed1586..77cb7da5f2c 100644
--- a/docs/data/histograms/United States/001A2A OR 001A2.json
+++ b/docs/data/histograms/United States/001A2A OR 001A2.json
@@ -1 +1 @@
-{"batchcode": "001A2A OR 001A2", "histograms": [{"batchcodes": ["001A2A OR 001A2"], "histogram": {"Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "001A2A OR 001A2", "histograms": [{"histogram": {"Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["001A2A OR 001A2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001AC1A.json b/docs/data/histograms/United States/001AC1A.json
index 8a88eaf09bc..a2529085233 100644
--- a/docs/data/histograms/United States/001AC1A.json
+++ b/docs/data/histograms/United States/001AC1A.json
@@ -1 +1 @@
-{"batchcode": "001AC1A", "histograms": [{"batchcodes": ["001AC1A"], "histogram": {"Fatigue": 1, "Influenza": 1, "Muscle tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "001AC1A", "histograms": [{"histogram": {"Fatigue": 1, "Influenza": 1, "Muscle tightness": 1}, "batchcodes": ["001AC1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001AQ1A.json b/docs/data/histograms/United States/001AQ1A.json
index ad8f7652f8c..e3022d51d75 100644
--- a/docs/data/histograms/United States/001AQ1A.json
+++ b/docs/data/histograms/United States/001AQ1A.json
@@ -1 +1 @@
-{"batchcode": "001AQ1A", "histograms": [{"batchcodes": ["001AQ1A"], "histogram": {"Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "001AQ1A", "histograms": [{"histogram": {"Pruritus": 1}, "batchcodes": ["001AQ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001AZ10.json b/docs/data/histograms/United States/001AZ10.json
index 76ea8a5bca9..eb2c81713e6 100644
--- a/docs/data/histograms/United States/001AZ10.json
+++ b/docs/data/histograms/United States/001AZ10.json
@@ -1 +1 @@
-{"batchcode": "001AZ10", "histograms": [{"batchcodes": ["001AZ10"], "histogram": {"Chills": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Pyrexia": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "001AZ10", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Pyrexia": 1, "Tachycardia": 1}, "batchcodes": ["001AZ10"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001AZ1A.json b/docs/data/histograms/United States/001AZ1A.json
index ab5b67adf8a..bffae959c03 100644
--- a/docs/data/histograms/United States/001AZ1A.json
+++ b/docs/data/histograms/United States/001AZ1A.json
@@ -1 +1 @@
-{"batchcode": "001AZ1A", "histograms": [{"batchcodes": ["001AZ1A"], "histogram": {"Headache": 2, "Nausea": 2, "Pruritus": 2, "Blood glucose increased": 1, "Bone pain": 1, "Burning sensation": 1, "Dizziness postural": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash pruritic": 1, "Skin disorder": 1, "Somnolence": 1, "Swelling": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "001AZ1A", "histograms": [{"histogram": {"Headache": 2, "Nausea": 2, "Pruritus": 2, "Blood glucose increased": 1, "Bone pain": 1, "Burning sensation": 1, "Dizziness postural": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash pruritic": 1, "Skin disorder": 1, "Somnolence": 1, "Swelling": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["001AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001AZIA.json b/docs/data/histograms/United States/001AZIA.json
index 1a164214024..523928d0e23 100644
--- a/docs/data/histograms/United States/001AZIA.json
+++ b/docs/data/histograms/United States/001AZIA.json
@@ -1 +1 @@
-{"batchcode": "001AZIA", "histograms": [{"batchcodes": ["001AZIA"], "histogram": {"Asthenia": 1, "Cough": 1, "Delirium": 1, "Hypoaesthesia": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Myocardial infarction": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Pneumonia": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "001AZIA", "histograms": [{"histogram": {"Asthenia": 1, "Cough": 1, "Delirium": 1, "Hypoaesthesia": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Myocardial infarction": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Pneumonia": 1, "Urinary tract infection": 1}, "batchcodes": ["001AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B/621A.json b/docs/data/histograms/United States/001B/621A.json
index 2e9153805ec..987431d5388 100644
--- a/docs/data/histograms/United States/001B/621A.json
+++ b/docs/data/histograms/United States/001B/621A.json
@@ -1 +1 @@
-{"batchcode": "001B/621A", "histograms": [{"batchcodes": ["001B/621A"], "histogram": {"Ageusia": 1}}]}
\ No newline at end of file
+{"batchcode": "001B/621A", "histograms": [{"histogram": {"Ageusia": 1}, "batchcodes": ["001B/621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B02A.json b/docs/data/histograms/United States/001B02A.json
index b0971b592c9..663d8947189 100644
--- a/docs/data/histograms/United States/001B02A.json
+++ b/docs/data/histograms/United States/001B02A.json
@@ -1 +1 @@
-{"batchcode": "001B02A", "histograms": [{"batchcodes": ["001B02A"], "histogram": {"Erythema": 1, "Pyrexia": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "001B02A", "histograms": [{"histogram": {"Erythema": 1, "Pyrexia": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1}, "batchcodes": ["001B02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B121A.json b/docs/data/histograms/United States/001B121A.json
index 71cfce42249..cbeea5c1574 100644
--- a/docs/data/histograms/United States/001B121A.json
+++ b/docs/data/histograms/United States/001B121A.json
@@ -1 +1 @@
-{"batchcode": "001B121A", "histograms": [{"batchcodes": ["001B121A"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "001B121A", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["001B121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B1321A.json b/docs/data/histograms/United States/001B1321A.json
index 96cae1f747c..b718a6a1465 100644
--- a/docs/data/histograms/United States/001B1321A.json
+++ b/docs/data/histograms/United States/001B1321A.json
@@ -1 +1 @@
-{"batchcode": "001B1321A", "histograms": [{"batchcodes": ["001B1321A"], "histogram": {"Myalgia": 2, "Chills": 1, "Computerised tomogram": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Pain": 1, "Pain in jaw": 1, "Pyrexia": 1, "Toothache": 1}}]}
\ No newline at end of file
+{"batchcode": "001B1321A", "histograms": [{"histogram": {"Myalgia": 2, "Chills": 1, "Computerised tomogram": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Pain": 1, "Pain in jaw": 1, "Pyrexia": 1, "Toothache": 1}, "batchcodes": ["001B1321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B21.json b/docs/data/histograms/United States/001B21.json
index c56cd9e85be..38577512c17 100644
--- a/docs/data/histograms/United States/001B21.json
+++ b/docs/data/histograms/United States/001B21.json
@@ -1 +1 @@
-{"batchcode": "001B21", "histograms": [{"batchcodes": ["001B21"], "histogram": {"Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21", "histograms": [{"histogram": {"Visual impairment": 1}, "batchcodes": ["001B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B211A.json b/docs/data/histograms/United States/001B211A.json
index 4b699c36dda..c21ccdbba7e 100644
--- a/docs/data/histograms/United States/001B211A.json
+++ b/docs/data/histograms/United States/001B211A.json
@@ -1 +1 @@
-{"batchcode": "001B211A", "histograms": [{"batchcodes": ["001B211A"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "001B211A", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["001B211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B214.json b/docs/data/histograms/United States/001B214.json
index 53452f26ef0..427841b3f31 100644
--- a/docs/data/histograms/United States/001B214.json
+++ b/docs/data/histograms/United States/001B214.json
@@ -1 +1 @@
-{"batchcode": "001B214", "histograms": [{"batchcodes": ["001B214"], "histogram": {"Dizziness": 1, "Dysstasia": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Nausea": 1, "Vertigo": 1, "Vestibular neuronitis": 1}}]}
\ No newline at end of file
+{"batchcode": "001B214", "histograms": [{"histogram": {"Dizziness": 1, "Dysstasia": 1, "Magnetic resonance imaging head": 1, "Malaise": 1, "Nausea": 1, "Vertigo": 1, "Vestibular neuronitis": 1}, "batchcodes": ["001B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B219.json b/docs/data/histograms/United States/001B219.json
index 926d310a80e..aef3d7d6ba7 100644
--- a/docs/data/histograms/United States/001B219.json
+++ b/docs/data/histograms/United States/001B219.json
@@ -1 +1 @@
-{"batchcode": "001B219", "histograms": [{"batchcodes": ["001B219"], "histogram": {"Anxiety": 1, "Atrial flutter": 1, "Ocular hyperaemia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "001B219", "histograms": [{"histogram": {"Anxiety": 1, "Atrial flutter": 1, "Ocular hyperaemia": 1, "Vision blurred": 1}, "batchcodes": ["001B219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B21A,.json b/docs/data/histograms/United States/001B21A,.json
index 01f955e911d..8d66d585d34 100644
--- a/docs/data/histograms/United States/001B21A,.json
+++ b/docs/data/histograms/United States/001B21A,.json
@@ -1 +1 @@
-{"batchcode": "001B21A,", "histograms": [{"batchcodes": ["001B21A,"], "histogram": {"Dry skin": 1, "Psoriasis": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21A,", "histograms": [{"histogram": {"Dry skin": 1, "Psoriasis": 1, "Rash": 1}, "batchcodes": ["001B21A,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B21A..json b/docs/data/histograms/United States/001B21A..json
index 54fbf7670a0..13b446ed132 100644
--- a/docs/data/histograms/United States/001B21A..json
+++ b/docs/data/histograms/United States/001B21A..json
@@ -1 +1 @@
-{"batchcode": "001B21A.", "histograms": [{"batchcodes": ["001B21A."], "histogram": {"Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21A.", "histograms": [{"histogram": {"Rash pruritic": 1}, "batchcodes": ["001B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B21A.json b/docs/data/histograms/United States/001B21A.json
index 17008dd507f..daeed19e310 100644
--- a/docs/data/histograms/United States/001B21A.json
+++ b/docs/data/histograms/United States/001B21A.json
@@ -1 +1 @@
-{"batchcode": "001B21A", "histograms": [{"batchcodes": ["001B21A", "FH8030"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 antibody test": 1}}, {"batchcodes": ["001B21A"], "histogram": {"Pyrexia": 68, "Headache": 61, "Fatigue": 59, "Pain in extremity": 47, "Chills": 45, "Vaccination site pain": 43, "Expired product administered": 41, "Myalgia": 41, "Nausea": 33, "Pain": 28, "Dizziness": 26, "Rash": 25, "Feeling abnormal": 19, "Asthenia": 18, "Body temperature": 18, "Product storage error": 17, "Pruritus": 17, "Arthralgia": 16, "Diarrhoea": 15, "Hyperhidrosis": 15, "Peripheral swelling": 14, "Illness": 13, "Malaise": 13, "Vaccination site erythema": 13, "Vomiting": 13, "Decreased appetite": 12, "Dyspnoea": 12, "Erythema": 12, "Inappropriate schedule of product administration": 12, "Insomnia": 12, "Lymphadenopathy": 12, "Swelling": 12, "Hypoaesthesia": 11, "Product dose omission issue": 11, "Vaccination site warmth": 11, "Vaccination site pruritus": 10, "Vaccination site rash": 10, "Vaccination site swelling": 10, "Influenza like illness": 9, "Nasopharyngitis": 9, "Cough": 8, "Feeling hot": 8, "Gait disturbance": 8, "SARS-CoV-2 test": 8, "Tinnitus": 8, "Urticaria": 8, "Vaccination complication": 8, "Abdominal pain upper": 7, "Chest pain": 7, "Migraine": 7, "COVID-19": 6, "Heart rate": 6, "Hypersensitivity": 6, "Paraesthesia": 6, "Rash pruritic": 6, "Tremor": 6, "Abdominal discomfort": 5, "Blood pressure measurement": 5, "Blood test": 5, "Exposure during pregnancy": 5, "Pregnancy test": 5, "Rash erythematous": 5, "Rhinorrhoea": 5, "Vertigo": 5, "Abdominal pain": 4, "Back pain": 4, "Burning sensation": 4, "Chest discomfort": 4, "Computerised tomogram": 4, "Limb discomfort": 4, "Night sweats": 4, "Palpitations": 4, "SARS-CoV-2 test positive": 4, "Somnolence": 4, "Swelling face": 4, "Taste disorder": 4, "Abdominal distension": 3, "Anaphylactic reaction": 3, "Axillary pain": 3, "Blood glucose": 3, "Bone pain": 3, "Condition aggravated": 3, "Contusion": 3, "Dehydration": 3, "Discomfort": 3, "Hypertension": 3, "Lethargy": 3, "Lip swelling": 3, "Loss of personal independence in daily activities": 3, "Maternal exposure during pregnancy": 3, "Muscle spasms": 3, "Muscular weakness": 3, "Nasal congestion": 3, "Product administered to patient of inappropriate age": 3, "Swollen tongue": 3, "Ultrasound scan": 3, "Underdose": 3, "Vaccination site induration": 3, "Vaccination site movement impairment": 3, "Vaccination site reaction": 3, "Vaccination site urticaria": 3, "Activated partial thromboplastin time": 2, "Ageusia": 2, "Antiphospholipid antibodies": 2, "Anxiety": 2, "Arthritis": 2, "Asthma": 2, "Balance disorder": 2, "Bone tuberculosis": 2, "Chromaturia": 2, "Cold sweat": 2, "Constipation": 2, "Deafness unilateral": 2, "Device connection issue": 2, "Disturbance in attention": 2, "Dysuria": 2, "Electric shock sensation": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Eye pain": 2, "Feeling of body temperature change": 2, "Flushing": 2, "Glucose tolerance test": 2, "Haematemesis": 2, "Haematochezia": 2, "Heart rate increased": 2, "Herpes zoster": 2, "Hyperglycaemia": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Incorrect dose administered": 2, "Inflammation": 2, "Influenza virus test": 2, "Injection site erythema": 2, "Injection site pain": 2, "Intentional product use issue": 2, "Lymph node pain": 2, "Mobility decreased": 2, "Movement disorder": 2, "Muscle tightness": 2, "Musculoskeletal stiffness": 2, "Nerve injury": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "Pain in jaw": 2, "Parosmia": 2, "Pharyngeal swelling": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Productive cough": 2, "Rash papular": 2, "Sensory disturbance": 2, "Skin discolouration": 2, "Skin exfoliation": 2, "Skin mass": 2, "Sleep disorder": 2, "Sluggishness": 2, "Sneezing": 2, "Therapeutic response unexpected": 2, "Throat tightness": 2, "Vaccination site mass": 2, "Wheezing": 2, "Abdominal pain lower": 1, "Accidental overdose": 1, "Activated partial thromboplastin time prolonged": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Agitation": 1, "Allergy test": 1, "Antibody test": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Autoimmune thyroiditis": 1, "Axillary mass": 1, "Bedridden": 1, "Blister": 1, "Blood glucose abnormal": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood pressure abnormal": 1, "Blood urine present": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "Cardiac disorder": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Circumoral swelling": 1, "Conjunctival haemorrhage": 1, "Delirium": 1, "Depression": 1, "Dermatitis contact": 1, "Diabetic complication": 1, "Diarrhoea haemorrhagic": 1, "Disability": 1, "Drug ineffective": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Ear swelling": 1, "Eating disorder": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Eructation": 1, "Erythema of eyelid": 1, "Exposure via breast milk": 1, "Exposure via eye contact": 1, "Extra dose administered": 1, "Eye swelling": 1, "Facial paresis": 1, "Fall": 1, "Fear": 1, "Fear of injection": 1, "Flatulence": 1, "Food allergy": 1, "Foreign body reaction": 1, "Formication": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gingival discomfort": 1, "Gingival oedema": 1, "Gingival pruritus": 1, "Grey matter heterotopia": 1, "Haemorrhage": 1, "Haemorrhagic stroke": 1, "Hair disorder": 1, "Hangover": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Hemiparesis": 1, "Hypersomnia": 1, "Hypomenorrhoea": 1, "Hypoxia": 1, "Immune system disorder": 1, "Immunodeficiency": 1, "Impaired work ability": 1, "Induration": 1, "Influenza": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Joint swelling": 1, "Lesion excision": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lymphopenia": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Memory impairment": 1, "Menstruation delayed": 1, "Mental impairment": 1, "Miliaria": 1, "Miosis": 1, "Monoplegia": 1, "Mouth swelling": 1, "Multiple sclerosis": 1, "Muscle fatigue": 1, "Muscle strain": 1, "Musculoskeletal chest pain": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Myoclonus": 1, "Nasal dryness": 1, "Neoplasm malignant": 1, "Neurological infection": 1, "Neurological symptom": 1, "Nightmare": 1, "No adverse event": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Painful respiration": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paranasal sinus discomfort": 1, "Pericarditis": 1, "Photosensitivity reaction": 1, "Pollakiuria": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product selection error": 1, "Product use issue": 1, "Protein total": 1, "Pulmonary embolism": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Rash macular": 1, "Rash pustular": 1, "Renal pain": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Salivary hypersecretion": 1, "Scratch": 1, "Secretion discharge": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin reaction": 1, "Skin ulcer": 1, "Skin warm": 1, "Spinal osteoarthritis": 1, "Sunburn": 1, "Swelling of eyelid": 1, "Syncope": 1, "Syringe issue": 1, "Tachycardia": 1, "Testicular pain": 1, "Thirst": 1, "Throat irritation": 1, "Tongue pruritus": 1, "Tuberculosis": 1, "Ultrasound ovary": 1, "Urinary tract infection": 1, "Urine output decreased": 1, "Vaccination site discolouration": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site joint erythema": 1, "Vaccination site oedema": 1, "Vascular pain": 1, "Vasodilatation": 1, "Viral infection": 1, "Vision blurred": 1, "Visual brightness": 1, "Weight decreased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["001B21A", "FH8030"]}, {"histogram": {"Pyrexia": 68, "Headache": 61, "Fatigue": 59, "Pain in extremity": 47, "Chills": 45, "Vaccination site pain": 43, "Expired product administered": 41, "Myalgia": 41, "Nausea": 33, "Pain": 28, "Dizziness": 26, "Rash": 25, "Feeling abnormal": 19, "Asthenia": 18, "Body temperature": 18, "Product storage error": 17, "Pruritus": 17, "Arthralgia": 16, "Diarrhoea": 15, "Hyperhidrosis": 15, "Peripheral swelling": 14, "Illness": 13, "Malaise": 13, "Vaccination site erythema": 13, "Vomiting": 13, "Decreased appetite": 12, "Dyspnoea": 12, "Erythema": 12, "Inappropriate schedule of product administration": 12, "Insomnia": 12, "Lymphadenopathy": 12, "Swelling": 12, "Hypoaesthesia": 11, "Product dose omission issue": 11, "Vaccination site warmth": 11, "Vaccination site pruritus": 10, "Vaccination site rash": 10, "Vaccination site swelling": 10, "Influenza like illness": 9, "Nasopharyngitis": 9, "Cough": 8, "Feeling hot": 8, "Gait disturbance": 8, "SARS-CoV-2 test": 8, "Tinnitus": 8, "Urticaria": 8, "Vaccination complication": 8, "Abdominal pain upper": 7, "Chest pain": 7, "Migraine": 7, "COVID-19": 6, "Heart rate": 6, "Hypersensitivity": 6, "Paraesthesia": 6, "Rash pruritic": 6, "Tremor": 6, "Abdominal discomfort": 5, "Blood pressure measurement": 5, "Blood test": 5, "Exposure during pregnancy": 5, "Pregnancy test": 5, "Rash erythematous": 5, "Rhinorrhoea": 5, "Vertigo": 5, "Abdominal pain": 4, "Back pain": 4, "Burning sensation": 4, "Chest discomfort": 4, "Computerised tomogram": 4, "Limb discomfort": 4, "Night sweats": 4, "Palpitations": 4, "SARS-CoV-2 test positive": 4, "Somnolence": 4, "Swelling face": 4, "Taste disorder": 4, "Abdominal distension": 3, "Anaphylactic reaction": 3, "Axillary pain": 3, "Blood glucose": 3, "Bone pain": 3, "Condition aggravated": 3, "Contusion": 3, "Dehydration": 3, "Discomfort": 3, "Hypertension": 3, "Lethargy": 3, "Lip swelling": 3, "Loss of personal independence in daily activities": 3, "Maternal exposure during pregnancy": 3, "Muscle spasms": 3, "Muscular weakness": 3, "Nasal congestion": 3, "Product administered to patient of inappropriate age": 3, "Swollen tongue": 3, "Ultrasound scan": 3, "Underdose": 3, "Vaccination site induration": 3, "Vaccination site movement impairment": 3, "Vaccination site reaction": 3, "Vaccination site urticaria": 3, "Activated partial thromboplastin time": 2, "Ageusia": 2, "Antiphospholipid antibodies": 2, "Anxiety": 2, "Arthritis": 2, "Asthma": 2, "Balance disorder": 2, "Bone tuberculosis": 2, "Chromaturia": 2, "Cold sweat": 2, "Constipation": 2, "Deafness unilateral": 2, "Device connection issue": 2, "Disturbance in attention": 2, "Dysuria": 2, "Electric shock sensation": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Eye pain": 2, "Feeling of body temperature change": 2, "Flushing": 2, "Glucose tolerance test": 2, "Haematemesis": 2, "Haematochezia": 2, "Heart rate increased": 2, "Herpes zoster": 2, "Hyperglycaemia": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Incorrect dose administered": 2, "Inflammation": 2, "Influenza virus test": 2, "Injection site erythema": 2, "Injection site pain": 2, "Intentional product use issue": 2, "Lymph node pain": 2, "Mobility decreased": 2, "Movement disorder": 2, "Muscle tightness": 2, "Musculoskeletal stiffness": 2, "Nerve injury": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "Pain in jaw": 2, "Parosmia": 2, "Pharyngeal swelling": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Productive cough": 2, "Rash papular": 2, "Sensory disturbance": 2, "Skin discolouration": 2, "Skin exfoliation": 2, "Skin mass": 2, "Sleep disorder": 2, "Sluggishness": 2, "Sneezing": 2, "Therapeutic response unexpected": 2, "Throat tightness": 2, "Vaccination site mass": 2, "Wheezing": 2, "Abdominal pain lower": 1, "Accidental overdose": 1, "Activated partial thromboplastin time prolonged": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Agitation": 1, "Allergy test": 1, "Antibody test": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Autoimmune thyroiditis": 1, "Axillary mass": 1, "Bedridden": 1, "Blister": 1, "Blood glucose abnormal": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood pressure abnormal": 1, "Blood urine present": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "Cardiac disorder": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Circumoral swelling": 1, "Conjunctival haemorrhage": 1, "Delirium": 1, "Depression": 1, "Dermatitis contact": 1, "Diabetic complication": 1, "Diarrhoea haemorrhagic": 1, "Disability": 1, "Drug ineffective": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Ear swelling": 1, "Eating disorder": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Eructation": 1, "Erythema of eyelid": 1, "Exposure via breast milk": 1, "Exposure via eye contact": 1, "Extra dose administered": 1, "Eye swelling": 1, "Facial paresis": 1, "Fall": 1, "Fear": 1, "Fear of injection": 1, "Flatulence": 1, "Food allergy": 1, "Foreign body reaction": 1, "Formication": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gingival discomfort": 1, "Gingival oedema": 1, "Gingival pruritus": 1, "Grey matter heterotopia": 1, "Haemorrhage": 1, "Haemorrhagic stroke": 1, "Hair disorder": 1, "Hangover": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Hemiparesis": 1, "Hypersomnia": 1, "Hypomenorrhoea": 1, "Hypoxia": 1, "Immune system disorder": 1, "Immunodeficiency": 1, "Impaired work ability": 1, "Induration": 1, "Influenza": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Joint swelling": 1, "Lesion excision": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lymphopenia": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Memory impairment": 1, "Menstruation delayed": 1, "Mental impairment": 1, "Miliaria": 1, "Miosis": 1, "Monoplegia": 1, "Mouth swelling": 1, "Multiple sclerosis": 1, "Muscle fatigue": 1, "Muscle strain": 1, "Musculoskeletal chest pain": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Myoclonus": 1, "Nasal dryness": 1, "Neoplasm malignant": 1, "Neurological infection": 1, "Neurological symptom": 1, "Nightmare": 1, "No adverse event": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Painful respiration": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Paranasal sinus discomfort": 1, "Pericarditis": 1, "Photosensitivity reaction": 1, "Pollakiuria": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product selection error": 1, "Product use issue": 1, "Protein total": 1, "Pulmonary embolism": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Rash macular": 1, "Rash pustular": 1, "Renal pain": 1, "Respiratory rate": 1, "Respiratory rate increased": 1, "Salivary hypersecretion": 1, "Scratch": 1, "Secretion discharge": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin reaction": 1, "Skin ulcer": 1, "Skin warm": 1, "Spinal osteoarthritis": 1, "Sunburn": 1, "Swelling of eyelid": 1, "Syncope": 1, "Syringe issue": 1, "Tachycardia": 1, "Testicular pain": 1, "Thirst": 1, "Throat irritation": 1, "Tongue pruritus": 1, "Tuberculosis": 1, "Ultrasound ovary": 1, "Urinary tract infection": 1, "Urine output decreased": 1, "Vaccination site discolouration": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site joint erythema": 1, "Vaccination site oedema": 1, "Vascular pain": 1, "Vasodilatation": 1, "Viral infection": 1, "Vision blurred": 1, "Visual brightness": 1, "Weight decreased": 1, "White blood cell count": 1}, "batchcodes": ["001B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B21A/026B21A.json b/docs/data/histograms/United States/001B21A/026B21A.json
index d9813506866..bc472c3ca79 100644
--- a/docs/data/histograms/United States/001B21A/026B21A.json
+++ b/docs/data/histograms/United States/001B21A/026B21A.json
@@ -1 +1 @@
-{"batchcode": "001B21A/026B21A", "histograms": [{"batchcodes": ["001B21A/026B21A"], "histogram": {"Feeling hot": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21A/026B21A", "histograms": [{"histogram": {"Feeling hot": 1, "Rash pruritic": 1}, "batchcodes": ["001B21A/026B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B21Q.json b/docs/data/histograms/United States/001B21Q.json
index a6fdd997936..9be189d96dc 100644
--- a/docs/data/histograms/United States/001B21Q.json
+++ b/docs/data/histograms/United States/001B21Q.json
@@ -1 +1 @@
-{"batchcode": "001B21Q", "histograms": [{"batchcodes": ["001B21Q"], "histogram": {"Insomnia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "001B21Q", "histograms": [{"histogram": {"Insomnia": 1, "Tinnitus": 1}, "batchcodes": ["001B21Q"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001B22A.json b/docs/data/histograms/United States/001B22A.json
index c24e0844dac..e2b1669a500 100644
--- a/docs/data/histograms/United States/001B22A.json
+++ b/docs/data/histograms/United States/001B22A.json
@@ -1 +1 @@
-{"batchcode": "001B22A", "histograms": [{"batchcodes": ["001B22A"], "histogram": {"Death": 1, "Dizziness": 1, "Feeling abnormal": 1, "Hot flush": 1}}]}
\ No newline at end of file
+{"batchcode": "001B22A", "histograms": [{"histogram": {"Death": 1, "Dizziness": 1, "Feeling abnormal": 1, "Hot flush": 1}, "batchcodes": ["001B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001BZ18A.json b/docs/data/histograms/United States/001BZ18A.json
index d13c7a43eac..2462f1f032d 100644
--- a/docs/data/histograms/United States/001BZ18A.json
+++ b/docs/data/histograms/United States/001BZ18A.json
@@ -1 +1 @@
-{"batchcode": "001BZ18A", "histograms": [{"batchcodes": ["001BZ18A"], "histogram": {"Heart rate irregular": 1, "Influenza like illness": 1, "Urticaria": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "001BZ18A", "histograms": [{"histogram": {"Heart rate irregular": 1, "Influenza like illness": 1, "Urticaria": 1, "Vaccination site pain": 1}, "batchcodes": ["001BZ18A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001BZ1A.json b/docs/data/histograms/United States/001BZ1A.json
index ec9099ee8a4..c37499f98a3 100644
--- a/docs/data/histograms/United States/001BZ1A.json
+++ b/docs/data/histograms/United States/001BZ1A.json
@@ -1 +1 @@
-{"batchcode": "001BZ1A", "histograms": [{"batchcodes": ["001BZ1A"], "histogram": {"Body temperature": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "001BZ1A", "histograms": [{"histogram": {"Body temperature": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["001BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001BZIA.json b/docs/data/histograms/United States/001BZIA.json
index 9890012b4e4..7debd375c1b 100644
--- a/docs/data/histograms/United States/001BZIA.json
+++ b/docs/data/histograms/United States/001BZIA.json
@@ -1 +1 @@
-{"batchcode": "001BZIA", "histograms": [{"batchcodes": ["001BZIA"], "histogram": {"Fatigue": 2, "Cyst": 1, "Erythema": 1, "Feeling abnormal": 1, "Nausea": 1, "Performance status decreased": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "001BZIA", "histograms": [{"histogram": {"Fatigue": 2, "Cyst": 1, "Erythema": 1, "Feeling abnormal": 1, "Nausea": 1, "Performance status decreased": 1, "Vaccination site pain": 1}, "batchcodes": ["001BZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001C1A.json b/docs/data/histograms/United States/001C1A.json
index 0dc0b8d6a29..0d5d14d7d5e 100644
--- a/docs/data/histograms/United States/001C1A.json
+++ b/docs/data/histograms/United States/001C1A.json
@@ -1 +1 @@
-{"batchcode": "001C1A", "histograms": [{"batchcodes": ["001C1A"], "histogram": {"Dyspnoea": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Incision site rash": 1, "Pruritus": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "001C1A", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Incision site rash": 1, "Pruritus": 1, "Throat tightness": 1}, "batchcodes": ["001C1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001C21A.json b/docs/data/histograms/United States/001C21A.json
index 359c6b63a4c..16b9a571117 100644
--- a/docs/data/histograms/United States/001C21A.json
+++ b/docs/data/histograms/United States/001C21A.json
@@ -1 +1 @@
-{"batchcode": "001C21A", "histograms": [{"batchcodes": ["001C21A", "001C21A"], "histogram": {"Chills": 1, "Injection site bruising": 1, "Injection site rash": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1}}, {"batchcodes": ["001C21A"], "histogram": {"Headache": 31, "Pyrexia": 25, "Pain in extremity": 22, "Fatigue": 18, "Myalgia": 18, "Chills": 17, "Expired product administered": 17, "Vaccination site pain": 13, "Nausea": 10, "Rash": 10, "Erythema": 8, "Feeling abnormal": 8, "Illness": 8, "Inappropriate schedule of product administration": 8, "Pain": 8, "Pruritus": 8, "Dyspnoea": 7, "Vomiting": 7, "Arthralgia": 6, "Lymphadenopathy": 5, "Swelling": 5, "Urticaria": 5, "Back pain": 4, "Body temperature": 4, "Chest pain": 4, "Diarrhoea": 4, "Dizziness": 4, "Eating disorder": 4, "Limb discomfort": 4, "Paraesthesia": 4, "Product dose omission issue": 4, "Vaccination site erythema": 4, "Asthenia": 3, "Decreased appetite": 3, "Hypersensitivity": 3, "Insomnia": 3, "Lethargy": 3, "Malaise": 3, "Nasopharyngitis": 3, "Oropharyngeal pain": 3, "Peripheral swelling": 3, "Product storage error": 3, "Pulmonary embolism": 3, "Swelling face": 3, "Tremor": 3, "Vaccination site swelling": 3, "Vaccination site warmth": 3, "Vision blurred": 3, "Abdominal pain upper": 2, "Anxiety": 2, "Blood pressure measurement": 2, "Chest discomfort": 2, "Contusion": 2, "Deep vein thrombosis": 2, "Discomfort": 2, "Dysgeusia": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye swelling": 2, "Gait disturbance": 2, "Herpes zoster": 2, "Hypoaesthesia": 2, "Injection site swelling": 2, "Joint swelling": 2, "Neck pain": 2, "Pneumonitis": 2, "Product administered to patient of inappropriate age": 2, "Rash pruritic": 2, "Ultrasound scan": 2, "Vaccination complication": 2, "Vaccination site pruritus": 2, "Vaccination site rash": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Abdominal pain": 1, "Accidental underdose": 1, "Activated partial thromboplastin time": 1, "Adverse reaction": 1, "Ageusia": 1, "Amaurosis fugax": 1, "Anaphylactic reaction": 1, "Aphonia": 1, "Application site reaction": 1, "Arthritis": 1, "Axillary pain": 1, "Balance disorder": 1, "Blister": 1, "Blood glucose": 1, "Bone pain": 1, "Breast pain": 1, "Bronchitis": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Confusional state": 1, "Cough": 1, "Dehydration": 1, "Diabetes mellitus inadequate control": 1, "Dysstasia": 1, "Ear pain": 1, "Eye irritation": 1, "Eye pruritus": 1, "Face oedema": 1, "Feeling hot": 1, "Full blood count": 1, "Gastrooesophageal reflux disease": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Immobile": 1, "Immunisation reaction": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Migraine": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Myocardial infarction": 1, "Neoplasm": 1, "Non-cardiac chest pain": 1, "Pain in jaw": 1, "Pallor": 1, "Periorbital swelling": 1, "Photopsia": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Pulmonary pain": 1, "Pyelonephritis": 1, "Rash macular": 1, "Rash papular": 1, "Rhinorrhoea": 1, "Salivary hypersecretion": 1, "Scab": 1, "Secretion discharge": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin depigmentation": 1, "Skin irritation": 1, "Sleep disorder": 1, "Sluggishness": 1, "Somnolence": 1, "Staphylococcal infection": 1, "Stress": 1, "Syncope": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Upper respiratory tract infection": 1, "Vaccination site joint movement impairment": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Vasodilatation": 1, "Wrong product administered": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "001C21A", "histograms": [{"histogram": {"Chills": 1, "Injection site bruising": 1, "Injection site rash": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1}, "batchcodes": ["001C21A", "001C21A"]}, {"histogram": {"Chills": 1, "Injection site bruising": 1, "Injection site rash": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1}, "batchcodes": ["001C21A", "001C21A"]}, {"histogram": {"Headache": 31, "Pyrexia": 25, "Pain in extremity": 22, "Fatigue": 18, "Myalgia": 18, "Chills": 17, "Expired product administered": 17, "Vaccination site pain": 13, "Nausea": 10, "Rash": 10, "Erythema": 8, "Feeling abnormal": 8, "Illness": 8, "Inappropriate schedule of product administration": 8, "Pain": 8, "Pruritus": 8, "Dyspnoea": 7, "Vomiting": 7, "Arthralgia": 6, "Lymphadenopathy": 5, "Swelling": 5, "Urticaria": 5, "Back pain": 4, "Body temperature": 4, "Chest pain": 4, "Diarrhoea": 4, "Dizziness": 4, "Eating disorder": 4, "Limb discomfort": 4, "Paraesthesia": 4, "Product dose omission issue": 4, "Vaccination site erythema": 4, "Asthenia": 3, "Decreased appetite": 3, "Hypersensitivity": 3, "Insomnia": 3, "Lethargy": 3, "Malaise": 3, "Nasopharyngitis": 3, "Oropharyngeal pain": 3, "Peripheral swelling": 3, "Product storage error": 3, "Pulmonary embolism": 3, "Swelling face": 3, "Tremor": 3, "Vaccination site swelling": 3, "Vaccination site warmth": 3, "Vision blurred": 3, "Abdominal pain upper": 2, "Anxiety": 2, "Blood pressure measurement": 2, "Chest discomfort": 2, "Contusion": 2, "Deep vein thrombosis": 2, "Discomfort": 2, "Dysgeusia": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye swelling": 2, "Gait disturbance": 2, "Herpes zoster": 2, "Hypoaesthesia": 2, "Injection site swelling": 2, "Joint swelling": 2, "Neck pain": 2, "Pneumonitis": 2, "Product administered to patient of inappropriate age": 2, "Rash pruritic": 2, "Ultrasound scan": 2, "Vaccination complication": 2, "Vaccination site pruritus": 2, "Vaccination site rash": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Abdominal pain": 1, "Accidental underdose": 1, "Activated partial thromboplastin time": 1, "Adverse reaction": 1, "Ageusia": 1, "Amaurosis fugax": 1, "Anaphylactic reaction": 1, "Aphonia": 1, "Application site reaction": 1, "Arthritis": 1, "Axillary pain": 1, "Balance disorder": 1, "Blister": 1, "Blood glucose": 1, "Bone pain": 1, "Breast pain": 1, "Bronchitis": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Confusional state": 1, "Cough": 1, "Dehydration": 1, "Diabetes mellitus inadequate control": 1, "Dysstasia": 1, "Ear pain": 1, "Eye irritation": 1, "Eye pruritus": 1, "Face oedema": 1, "Feeling hot": 1, "Full blood count": 1, "Gastrooesophageal reflux disease": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Immobile": 1, "Immunisation reaction": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Inflammation": 1, "Influenza like illness": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Migraine": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Myocardial infarction": 1, "Neoplasm": 1, "Non-cardiac chest pain": 1, "Pain in jaw": 1, "Pallor": 1, "Periorbital swelling": 1, "Photopsia": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Pulmonary pain": 1, "Pyelonephritis": 1, "Rash macular": 1, "Rash papular": 1, "Rhinorrhoea": 1, "Salivary hypersecretion": 1, "Scab": 1, "Secretion discharge": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin depigmentation": 1, "Skin irritation": 1, "Sleep disorder": 1, "Sluggishness": 1, "Somnolence": 1, "Staphylococcal infection": 1, "Stress": 1, "Syncope": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Upper respiratory tract infection": 1, "Vaccination site joint movement impairment": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaginal haemorrhage": 1, "Vasodilatation": 1, "Wrong product administered": 1, "X-ray": 1}, "batchcodes": ["001C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001C2IA.json b/docs/data/histograms/United States/001C2IA.json
index 5b6687850b0..69082eb2f58 100644
--- a/docs/data/histograms/United States/001C2IA.json
+++ b/docs/data/histograms/United States/001C2IA.json
@@ -1 +1 @@
-{"batchcode": "001C2IA", "histograms": [{"batchcodes": ["001C2IA"], "histogram": {"Balance disorder": 1, "Fall": 1, "Fatigue": 1, "Groin pain": 1, "Pain in extremity": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "001C2IA", "histograms": [{"histogram": {"Balance disorder": 1, "Fall": 1, "Fatigue": 1, "Groin pain": 1, "Pain in extremity": 1, "Swelling": 1}, "batchcodes": ["001C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001CA1A.json b/docs/data/histograms/United States/001CA1A.json
index 91c7257cc22..4dcd998a20a 100644
--- a/docs/data/histograms/United States/001CA1A.json
+++ b/docs/data/histograms/United States/001CA1A.json
@@ -1 +1 @@
-{"batchcode": "001CA1A", "histograms": [{"batchcodes": ["001CA1A"], "histogram": {"Insomnia": 1, "Limb discomfort": 1, "Swelling": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "001CA1A", "histograms": [{"histogram": {"Insomnia": 1, "Limb discomfort": 1, "Swelling": 1, "Vaccination site swelling": 1}, "batchcodes": ["001CA1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001CR1A.json b/docs/data/histograms/United States/001CR1A.json
index cd8abdefb52..bd6fa886069 100644
--- a/docs/data/histograms/United States/001CR1A.json
+++ b/docs/data/histograms/United States/001CR1A.json
@@ -1 +1 @@
-{"batchcode": "001CR1A", "histograms": [{"batchcodes": ["001CR1A"], "histogram": {"Chills": 1, "Headache": 1, "Mental impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "001CR1A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Mental impairment": 1}, "batchcodes": ["001CR1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001CZ1A.json b/docs/data/histograms/United States/001CZ1A.json
index 198ea638916..76f314a1f33 100644
--- a/docs/data/histograms/United States/001CZ1A.json
+++ b/docs/data/histograms/United States/001CZ1A.json
@@ -1 +1 @@
-{"batchcode": "001CZ1A", "histograms": [{"batchcodes": ["001CZ1A"], "histogram": {"Abdominal discomfort": 1, "Anger": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Crying": 1, "Depression": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "001CZ1A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Anger": 1, "Anxiety": 1, "Asthenia": 1, "Back pain": 1, "Crying": 1, "Depression": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["001CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001E21A.json b/docs/data/histograms/United States/001E21A.json
index 32fc146682a..c7296cbe270 100644
--- a/docs/data/histograms/United States/001E21A.json
+++ b/docs/data/histograms/United States/001E21A.json
@@ -1 +1 @@
-{"batchcode": "001E21A", "histograms": [{"batchcodes": ["001E21A"], "histogram": {"Headache": 4, "Movement disorder": 3, "Pain in extremity": 3, "Chills": 2, "Diarrhoea": 2, "Lip swelling": 2, "Nausea": 2, "Pain": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Apraxia": 1, "Arthralgia": 1, "Body temperature": 1, "Chromaturia": 1, "Dizziness": 1, "Dysphagia": 1, "Fatigue": 1, "Flatulence": 1, "Gastrointestinal pain": 1, "Injection site rash": 1, "Insomnia": 1, "Malaise": 1, "Muscle spasticity": 1, "Oropharyngeal swelling": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "Rash vesicular": 1, "Skin burning sensation": 1, "Speech disorder": 1, "Swollen tongue": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "001E21A", "histograms": [{"histogram": {"Headache": 4, "Movement disorder": 3, "Pain in extremity": 3, "Chills": 2, "Diarrhoea": 2, "Lip swelling": 2, "Nausea": 2, "Pain": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Apraxia": 1, "Arthralgia": 1, "Body temperature": 1, "Chromaturia": 1, "Dizziness": 1, "Dysphagia": 1, "Fatigue": 1, "Flatulence": 1, "Gastrointestinal pain": 1, "Injection site rash": 1, "Insomnia": 1, "Malaise": 1, "Muscle spasticity": 1, "Oropharyngeal swelling": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "Rash vesicular": 1, "Skin burning sensation": 1, "Speech disorder": 1, "Swollen tongue": 1, "Throat tightness": 1}, "batchcodes": ["001E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001EZ1A.json b/docs/data/histograms/United States/001EZ1A.json
index db09d545dae..a7795bcdb5c 100644
--- a/docs/data/histograms/United States/001EZ1A.json
+++ b/docs/data/histograms/United States/001EZ1A.json
@@ -1 +1 @@
-{"batchcode": "001EZ1A", "histograms": [{"batchcodes": ["001EZ1A"], "histogram": {"Aspartate aminotransferase": 1, "Asthenia": 1, "Gait disturbance": 1, "Muscle twitching": 1, "Paraesthesia": 1, "Serum ferritin": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "001EZ1A", "histograms": [{"histogram": {"Aspartate aminotransferase": 1, "Asthenia": 1, "Gait disturbance": 1, "Muscle twitching": 1, "Paraesthesia": 1, "Serum ferritin": 1, "Tremor": 1}, "batchcodes": ["001EZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001F21A.json b/docs/data/histograms/United States/001F21A.json
index 2c3363fc3cd..3d0000227bf 100644
--- a/docs/data/histograms/United States/001F21A.json
+++ b/docs/data/histograms/United States/001F21A.json
@@ -1 +1 @@
-{"batchcode": "001F21A", "histograms": [{"batchcodes": ["001F21A"], "histogram": {"Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "001F21A", "histograms": [{"histogram": {"Rash pruritic": 1}, "batchcodes": ["001F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001H21A.json b/docs/data/histograms/United States/001H21A.json
index 5a5c2b028c2..a32bc1a0ac9 100644
--- a/docs/data/histograms/United States/001H21A.json
+++ b/docs/data/histograms/United States/001H21A.json
@@ -1 +1 @@
-{"batchcode": "001H21A", "histograms": [{"batchcodes": ["001H21A"], "histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1, "Vision blurred": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "001H21A", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1, "Vision blurred": 1, "X-ray": 1}, "batchcodes": ["001H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001J20A.json b/docs/data/histograms/United States/001J20A.json
index 35cca7b8666..1f6ca83f70f 100644
--- a/docs/data/histograms/United States/001J20A.json
+++ b/docs/data/histograms/United States/001J20A.json
@@ -1 +1 @@
-{"batchcode": "001J20A", "histograms": [{"batchcodes": ["001J20A", "GH9703"], "histogram": {"Myalgia": 1}}, {"batchcodes": ["001J20A"], "histogram": {"Dizziness": 2, "Bone pain": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Erythema": 1, "Expired product administered": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Hypopnoea": 1, "Illness": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Injected limb mobility decreased": 1, "Injection site mass": 1, "Nausea": 1, "Nervousness": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Tenderness": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "001J20A", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["001J20A", "GH9703"]}, {"histogram": {"Dizziness": 2, "Bone pain": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Erythema": 1, "Expired product administered": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Hypopnoea": 1, "Illness": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Injected limb mobility decreased": 1, "Injection site mass": 1, "Nausea": 1, "Nervousness": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Respiratory rate decreased": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test negative": 1, "Tenderness": 1, "Vomiting": 1}, "batchcodes": ["001J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001J21-2A.json b/docs/data/histograms/United States/001J21-2A.json
index 4a9778d9c71..366e8c0e4a2 100644
--- a/docs/data/histograms/United States/001J21-2A.json
+++ b/docs/data/histograms/United States/001J21-2A.json
@@ -1 +1 @@
-{"batchcode": "001J21-2A", "histograms": [{"batchcodes": ["001J21-2A"], "histogram": {"Expired product administered": 8, "Product temperature excursion issue": 6, "Poor quality product administered": 3, "Product storage error": 3, "Body temperature": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Metastases to lung": 1, "Nasal congestion": 1, "Oxygen saturation": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "001J21-2A", "histograms": [{"histogram": {"Expired product administered": 8, "Product temperature excursion issue": 6, "Poor quality product administered": 3, "Product storage error": 3, "Body temperature": 1, "Chest pain": 1, "Cough": 1, "Dyspnoea": 1, "Metastases to lung": 1, "Nasal congestion": 1, "Oxygen saturation": 1, "Pyrexia": 1}, "batchcodes": ["001J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001J212A.json b/docs/data/histograms/United States/001J212A.json
index 27176913018..0fb94290671 100644
--- a/docs/data/histograms/United States/001J212A.json
+++ b/docs/data/histograms/United States/001J212A.json
@@ -1 +1 @@
-{"batchcode": "001J212A", "histograms": [{"batchcodes": ["001J212A"], "histogram": {"Burning sensation": 1, "COVID-19": 1, "Condition aggravated": 1, "Hot flush": 1, "Hypertension": 1, "Influenza like illness": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "001J212A", "histograms": [{"histogram": {"Burning sensation": 1, "COVID-19": 1, "Condition aggravated": 1, "Hot flush": 1, "Hypertension": 1, "Influenza like illness": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1}, "batchcodes": ["001J212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001L20A.json b/docs/data/histograms/United States/001L20A.json
index 473ae031b56..b12a4a07e4d 100644
--- a/docs/data/histograms/United States/001L20A.json
+++ b/docs/data/histograms/United States/001L20A.json
@@ -1 +1 @@
-{"batchcode": "001L20A", "histograms": [{"batchcodes": ["001L20A"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "001L20A", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["001L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001L21A.json b/docs/data/histograms/United States/001L21A.json
index bc5e9f57232..4e274797de4 100644
--- a/docs/data/histograms/United States/001L21A.json
+++ b/docs/data/histograms/United States/001L21A.json
@@ -1 +1 @@
-{"batchcode": "001L21A", "histograms": [{"batchcodes": ["001L21A"], "histogram": {"Arthralgia": 1, "Axillary pain": 1, "Body temperature": 1, "Chills": 1, "Device connection issue": 1, "Groin pain": 1, "Headache": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Swelling": 1, "Taste disorder": 1, "Underdose": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "001L21A", "histograms": [{"histogram": {"Arthralgia": 1, "Axillary pain": 1, "Body temperature": 1, "Chills": 1, "Device connection issue": 1, "Groin pain": 1, "Headache": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Swelling": 1, "Taste disorder": 1, "Underdose": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["001L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001M20A.json b/docs/data/histograms/United States/001M20A.json
index 5843b55958f..1ca015c9d13 100644
--- a/docs/data/histograms/United States/001M20A.json
+++ b/docs/data/histograms/United States/001M20A.json
@@ -1 +1 @@
-{"batchcode": "001M20A", "histograms": [{"batchcodes": ["001M20A"], "histogram": {"Vaccination site pain": 3, "Rash erythematous": 2, "Vaccination site discomfort": 2, "Atrial fibrillation": 1, "Chills": 1, "Depressed mood": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Muscular weakness": 1, "Nausea": 1, "Neck pain": 1, "Oral discomfort": 1, "Oral pain": 1, "Pain": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Vaccination error": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "001M20A", "histograms": [{"histogram": {"Vaccination site pain": 3, "Rash erythematous": 2, "Vaccination site discomfort": 2, "Atrial fibrillation": 1, "Chills": 1, "Depressed mood": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Muscular weakness": 1, "Nausea": 1, "Neck pain": 1, "Oral discomfort": 1, "Oral pain": 1, "Pain": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Vaccination error": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["001M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001M21A.json b/docs/data/histograms/United States/001M21A.json
index 6bb417302ed..3f4c95a1b6e 100644
--- a/docs/data/histograms/United States/001M21A.json
+++ b/docs/data/histograms/United States/001M21A.json
@@ -1 +1 @@
-{"batchcode": "001M21A", "histograms": [{"batchcodes": ["001M21A", "1822811"], "histogram": {"Abdominal pain upper": 2, "Body temperature": 2, "COVID-19": 2, "Diarrhoea": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Inappropriate schedule of product administration": 1, "Vaccination failure": 1}}, {"batchcodes": ["001M21A"], "histogram": {"Expired product administered": 28, "Product storage error": 24, "COVID-19": 4, "SARS-CoV-2 test": 4, "Headache": 3, "No adverse event": 3, "Asthenia": 2, "Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Vaccination site erythema": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Bed rest": 1, "Body temperature": 1, "Cervical radiculopathy": 1, "Confusional state": 1, "Dizziness": 1, "Dysstasia": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Hallucination": 1, "Head discomfort": 1, "Hyperhidrosis": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Influenza like illness": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Pain": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Product formulation issue": 1, "Pruritus": 1, "Rash": 1, "Skin reaction": 1, "Sluggishness": 1, "Suspected COVID-19": 1, "Swelling": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "001M21A", "histograms": [{"histogram": {"Abdominal pain upper": 2, "Body temperature": 2, "COVID-19": 2, "Diarrhoea": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Inappropriate schedule of product administration": 1, "Vaccination failure": 1}, "batchcodes": ["001M21A", "1822811"]}, {"histogram": {"Expired product administered": 28, "Product storage error": 24, "COVID-19": 4, "SARS-CoV-2 test": 4, "Headache": 3, "No adverse event": 3, "Asthenia": 2, "Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Vaccination site erythema": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Bed rest": 1, "Body temperature": 1, "Cervical radiculopathy": 1, "Confusional state": 1, "Dizziness": 1, "Dysstasia": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Hallucination": 1, "Head discomfort": 1, "Hyperhidrosis": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Influenza like illness": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Neck pain": 1, "Pain": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Product formulation issue": 1, "Pruritus": 1, "Rash": 1, "Skin reaction": 1, "Sluggishness": 1, "Suspected COVID-19": 1, "Swelling": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["001M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001R21$.json b/docs/data/histograms/United States/001R21$.json
index a220c2249e5..b72b181a79e 100644
--- a/docs/data/histograms/United States/001R21$.json
+++ b/docs/data/histograms/United States/001R21$.json
@@ -1 +1 @@
-{"batchcode": "001R21$", "histograms": [{"batchcodes": ["001R21$"], "histogram": {"Arthralgia": 1, "Insomnia": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "001R21$", "histograms": [{"histogram": {"Arthralgia": 1, "Insomnia": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["001R21$"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001R214.json b/docs/data/histograms/United States/001R214.json
index a40a1218acb..f620715ab74 100644
--- a/docs/data/histograms/United States/001R214.json
+++ b/docs/data/histograms/United States/001R214.json
@@ -1 +1 @@
-{"batchcode": "001R214", "histograms": [{"batchcodes": ["001R214"], "histogram": {"No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "001R214", "histograms": [{"histogram": {"No adverse event": 1}, "batchcodes": ["001R214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/001V21A.json b/docs/data/histograms/United States/001V21A.json
index 5b74eb9e3b7..f83cb318ed9 100644
--- a/docs/data/histograms/United States/001V21A.json
+++ b/docs/data/histograms/United States/001V21A.json
@@ -1 +1 @@
-{"batchcode": "001V21A", "histograms": [{"batchcodes": ["001V21A"], "histogram": {"Chills": 1, "Hypoaesthesia oral": 1, "Pain in extremity": 1, "Pyrexia": 1, "Taste disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "001V21A", "histograms": [{"histogram": {"Chills": 1, "Hypoaesthesia oral": 1, "Pain in extremity": 1, "Pyrexia": 1, "Taste disorder": 1}, "batchcodes": ["001V21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002-1321A.json b/docs/data/histograms/United States/002-1321A.json
index 771a67dffe9..6b5318a0cd3 100644
--- a/docs/data/histograms/United States/002-1321A.json
+++ b/docs/data/histograms/United States/002-1321A.json
@@ -1 +1 @@
-{"batchcode": "002-1321A", "histograms": [{"batchcodes": ["002-1321A"], "histogram": {"COVID-19": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "002-1321A", "histograms": [{"histogram": {"COVID-19": 1, "Somnolence": 1}, "batchcodes": ["002-1321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0020A21A.json b/docs/data/histograms/United States/0020A21A.json
index 488474dedaf..260ae18dafb 100644
--- a/docs/data/histograms/United States/0020A21A.json
+++ b/docs/data/histograms/United States/0020A21A.json
@@ -1 +1 @@
-{"batchcode": "0020A21A", "histograms": [{"batchcodes": ["0020A21A"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1, "Urticaria": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0020A21A", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash erythematous": 1, "Urticaria": 1, "Vaccination site pain": 1}, "batchcodes": ["0020A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0020B20A.json b/docs/data/histograms/United States/0020B20A.json
index b2c0e27f204..4382a888b68 100644
--- a/docs/data/histograms/United States/0020B20A.json
+++ b/docs/data/histograms/United States/0020B20A.json
@@ -1 +1 @@
-{"batchcode": "0020B20A", "histograms": [{"batchcodes": ["0020B20A"], "histogram": {"Fatigue": 1, "Feeling of relaxation": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0020B20A", "histograms": [{"histogram": {"Fatigue": 1, "Feeling of relaxation": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["0020B20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0020L0A.json b/docs/data/histograms/United States/0020L0A.json
index 2ef79c731cb..fe40b8075a6 100644
--- a/docs/data/histograms/United States/0020L0A.json
+++ b/docs/data/histograms/United States/0020L0A.json
@@ -1 +1 @@
-{"batchcode": "0020L0A", "histograms": [{"batchcodes": ["0020L0A"], "histogram": {"Pruritus": 1, "Scratch": 1}}]}
\ No newline at end of file
+{"batchcode": "0020L0A", "histograms": [{"histogram": {"Pruritus": 1, "Scratch": 1}, "batchcodes": ["0020L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002121A.json b/docs/data/histograms/United States/002121A.json
index cf73fc0afc9..8bfdc8cb091 100644
--- a/docs/data/histograms/United States/002121A.json
+++ b/docs/data/histograms/United States/002121A.json
@@ -1 +1 @@
-{"batchcode": "002121A", "histograms": [{"batchcodes": ["002121A"], "histogram": {"Body temperature": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Nausea": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "002121A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Nausea": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["002121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0021321A, 002B2.json b/docs/data/histograms/United States/0021321A, 002B2.json
index 3b991c57ba1..db5de6cdf81 100644
--- a/docs/data/histograms/United States/0021321A, 002B2.json
+++ b/docs/data/histograms/United States/0021321A, 002B2.json
@@ -1 +1 @@
-{"batchcode": "0021321A, 002B2", "histograms": [{"batchcodes": ["0021321A, 002B2"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0021321A, 002B2", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["0021321A, 002B2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0021321A.json b/docs/data/histograms/United States/0021321A.json
index 07ed56c3f88..d15fd122958 100644
--- a/docs/data/histograms/United States/0021321A.json
+++ b/docs/data/histograms/United States/0021321A.json
@@ -1 +1 @@
-{"batchcode": "0021321A", "histograms": [{"batchcodes": ["0021321A"], "histogram": {"Myalgia": 3, "Headache": 2, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Immunisation reaction": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Pyrexia": 1, "Renal failure": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0021321A", "histograms": [{"histogram": {"Myalgia": 3, "Headache": 2, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Immunisation reaction": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Pyrexia": 1, "Renal failure": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["0021321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0021A.json b/docs/data/histograms/United States/0021A.json
index cbd88cb189a..b8aff57e2a4 100644
--- a/docs/data/histograms/United States/0021A.json
+++ b/docs/data/histograms/United States/0021A.json
@@ -1 +1 @@
-{"batchcode": "0021A", "histograms": [{"batchcodes": ["0021A"], "histogram": {"Chills": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0021A", "histograms": [{"histogram": {"Chills": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["0021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0021C21A.json b/docs/data/histograms/United States/0021C21A.json
index 3189c3791f2..56e1ff6d2f1 100644
--- a/docs/data/histograms/United States/0021C21A.json
+++ b/docs/data/histograms/United States/0021C21A.json
@@ -1 +1 @@
-{"batchcode": "0021C21A", "histograms": [{"batchcodes": ["0021C21A"], "histogram": {"Headache": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0021C21A", "histograms": [{"histogram": {"Headache": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["0021C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0022C21A.json b/docs/data/histograms/United States/0022C21A.json
index b786c793f4d..c1b522d8e4f 100644
--- a/docs/data/histograms/United States/0022C21A.json
+++ b/docs/data/histograms/United States/0022C21A.json
@@ -1 +1 @@
-{"batchcode": "0022C21A", "histograms": [{"batchcodes": ["0022C21A"], "histogram": {"Headache": 2, "Chills": 1, "Ear congestion": 1, "Ear discomfort": 1, "Influenza": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Pain of skin": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Rhinorrhoea": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "0022C21A", "histograms": [{"histogram": {"Headache": 2, "Chills": 1, "Ear congestion": 1, "Ear discomfort": 1, "Influenza": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Pain of skin": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Rhinorrhoea": 1, "Sneezing": 1}, "batchcodes": ["0022C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0022M0A.json b/docs/data/histograms/United States/0022M0A.json
index e499d554bfd..ce474160e7c 100644
--- a/docs/data/histograms/United States/0022M0A.json
+++ b/docs/data/histograms/United States/0022M0A.json
@@ -1 +1 @@
-{"batchcode": "0022M0A", "histograms": [{"batchcodes": ["0022M0A"], "histogram": {"Body temperature": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0022M0A", "histograms": [{"histogram": {"Body temperature": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["0022M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0022M20A.json b/docs/data/histograms/United States/0022M20A.json
index 38c238c7320..af3eaa9f0e4 100644
--- a/docs/data/histograms/United States/0022M20A.json
+++ b/docs/data/histograms/United States/0022M20A.json
@@ -1 +1 @@
-{"batchcode": "0022M20A", "histograms": [{"batchcodes": ["0022M20A"], "histogram": {"COVID-19": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Lethargy": 1, "Limb discomfort": 1, "Pain": 1, "Paraesthesia": 1, "Product colour issue": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0022M20A", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Lethargy": 1, "Limb discomfort": 1, "Pain": 1, "Paraesthesia": 1, "Product colour issue": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["0022M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0024M20A.json b/docs/data/histograms/United States/0024M20A.json
index 93a9cfaa0a1..c58021f244b 100644
--- a/docs/data/histograms/United States/0024M20A.json
+++ b/docs/data/histograms/United States/0024M20A.json
@@ -1 +1 @@
-{"batchcode": "0024M20A", "histograms": [{"batchcodes": ["0024M20A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0024M20A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["0024M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002521A.json b/docs/data/histograms/United States/002521A.json
index 4e20cfffdc7..fee688cc738 100644
--- a/docs/data/histograms/United States/002521A.json
+++ b/docs/data/histograms/United States/002521A.json
@@ -1 +1 @@
-{"batchcode": "002521A", "histograms": [{"batchcodes": ["002521A"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "002521A", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["002521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0025H21A.json b/docs/data/histograms/United States/0025H21A.json
index de0eb460b61..4cb1f929a3d 100644
--- a/docs/data/histograms/United States/0025H21A.json
+++ b/docs/data/histograms/United States/0025H21A.json
@@ -1 +1 @@
-{"batchcode": "0025H21A", "histograms": [{"batchcodes": ["0025H21A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0025H21A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0025H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0026052.json b/docs/data/histograms/United States/0026052.json
index e577c41f8e5..8cbab6f4b65 100644
--- a/docs/data/histograms/United States/0026052.json
+++ b/docs/data/histograms/United States/0026052.json
@@ -1 +1 @@
-{"batchcode": "0026052", "histograms": [{"batchcodes": ["0026052"], "histogram": {"Fatigue": 1, "Induration": 1, "Pain": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Vaccination site pustule": 1}}]}
\ No newline at end of file
+{"batchcode": "0026052", "histograms": [{"histogram": {"Fatigue": 1, "Induration": 1, "Pain": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Vaccination site pustule": 1}, "batchcodes": ["0026052"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0026C21A.json b/docs/data/histograms/United States/0026C21A.json
index 9546f8b7655..b4bf6eecde2 100644
--- a/docs/data/histograms/United States/0026C21A.json
+++ b/docs/data/histograms/United States/0026C21A.json
@@ -1 +1 @@
-{"batchcode": "0026C21A", "histograms": [{"batchcodes": ["0026C21A"], "histogram": {"Dizziness": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "0026C21A", "histograms": [{"histogram": {"Dizziness": 1, "Off label use": 1}, "batchcodes": ["0026C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0028218.json b/docs/data/histograms/United States/0028218.json
index 32315a284d1..c5312a6fd5d 100644
--- a/docs/data/histograms/United States/0028218.json
+++ b/docs/data/histograms/United States/0028218.json
@@ -1 +1 @@
-{"batchcode": "0028218", "histograms": [{"batchcodes": ["0028218"], "histogram": {"Product expiration date issue": 1, "Product physical issue": 1}}]}
\ No newline at end of file
+{"batchcode": "0028218", "histograms": [{"histogram": {"Product expiration date issue": 1, "Product physical issue": 1}, "batchcodes": ["0028218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002821A.json b/docs/data/histograms/United States/002821A.json
index bbdb927342a..7eab11c8437 100644
--- a/docs/data/histograms/United States/002821A.json
+++ b/docs/data/histograms/United States/002821A.json
@@ -1 +1 @@
-{"batchcode": "002821A", "histograms": [{"batchcodes": ["002821A"], "histogram": {"Pain in extremity": 4, "Fatigue": 3, "Asthenia": 2, "Chills": 2, "Dizziness": 2, "Dyspnoea": 2, "Headache": 2, "Heart rate": 2, "Heart rate increased": 2, "Myalgia": 2, "Severe acute respiratory syndrome": 2, "Vision blurred": 2, "Vomiting": 2, "Arthralgia": 1, "Blood test": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Erythema": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Gastrooesophageal reflux disease": 1, "Hyperhidrosis": 1, "Illness": 1, "Impaired quality of life": 1, "Infection": 1, "Joint swelling": 1, "Muscular weakness": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pulmonary congestion": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "002821A", "histograms": [{"histogram": {"Pain in extremity": 4, "Fatigue": 3, "Asthenia": 2, "Chills": 2, "Dizziness": 2, "Dyspnoea": 2, "Headache": 2, "Heart rate": 2, "Heart rate increased": 2, "Myalgia": 2, "Severe acute respiratory syndrome": 2, "Vision blurred": 2, "Vomiting": 2, "Arthralgia": 1, "Blood test": 1, "COVID-19": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Erythema": 1, "Fall": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Gastrooesophageal reflux disease": 1, "Hyperhidrosis": 1, "Illness": 1, "Impaired quality of life": 1, "Infection": 1, "Joint swelling": 1, "Muscular weakness": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pallor": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pulmonary congestion": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["002821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0028A21A.json b/docs/data/histograms/United States/0028A21A.json
index 65f00db266f..f2591dd4cd1 100644
--- a/docs/data/histograms/United States/0028A21A.json
+++ b/docs/data/histograms/United States/0028A21A.json
@@ -1 +1 @@
-{"batchcode": "0028A21A", "histograms": [{"batchcodes": ["0028A21A"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0028A21A", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["0028A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0028L20A.json b/docs/data/histograms/United States/0028L20A.json
index 48775a97a4e..5cd20a9277e 100644
--- a/docs/data/histograms/United States/0028L20A.json
+++ b/docs/data/histograms/United States/0028L20A.json
@@ -1 +1 @@
-{"batchcode": "0028L20A", "histograms": [{"batchcodes": ["0028L20A"], "histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Rash morbilliform": 1}}]}
\ No newline at end of file
+{"batchcode": "0028L20A", "histograms": [{"histogram": {"Fatigue": 1, "Inappropriate schedule of product administration": 1, "Rash morbilliform": 1}, "batchcodes": ["0028L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0029N3.json b/docs/data/histograms/United States/0029N3.json
index dbc67225fe1..bb03d1bc7a6 100644
--- a/docs/data/histograms/United States/0029N3.json
+++ b/docs/data/histograms/United States/0029N3.json
@@ -1 +1 @@
-{"batchcode": "0029N3", "histograms": [{"batchcodes": ["0029N3"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0029N3", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["0029N3"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002A21.json b/docs/data/histograms/United States/002A21.json
index c2799699647..ac880ebd521 100644
--- a/docs/data/histograms/United States/002A21.json
+++ b/docs/data/histograms/United States/002A21.json
@@ -1 +1 @@
-{"batchcode": "002A21", "histograms": [{"batchcodes": ["002A21"], "histogram": {"Fatigue": 2, "Pyrexia": 2, "Alanine aminotransferase": 1, "Anion gap": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Feeling abnormal": 1, "Globulin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Lymphocyte count": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Ocular discomfort": 1, "Physical examination": 1, "Platelet count": 1, "Protein total normal": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate normal": 1, "Red cell distribution width": 1, "Vaccination site pain": 1, "Vision blurred": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "002A21", "histograms": [{"histogram": {"Fatigue": 2, "Pyrexia": 2, "Alanine aminotransferase": 1, "Anion gap": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Asthenia": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Eosinophil count": 1, "Feeling abnormal": 1, "Globulin": 1, "Haematocrit": 1, "Haemoglobin": 1, "Headache": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Lymphocyte count": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Monocyte count": 1, "Neutrophil count": 1, "Ocular discomfort": 1, "Physical examination": 1, "Platelet count": 1, "Protein total normal": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate normal": 1, "Red cell distribution width": 1, "Vaccination site pain": 1, "Vision blurred": 1, "White blood cell count": 1}, "batchcodes": ["002A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002A211A.json b/docs/data/histograms/United States/002A211A.json
index 8e508a68d7e..82e6a0e00c6 100644
--- a/docs/data/histograms/United States/002A211A.json
+++ b/docs/data/histograms/United States/002A211A.json
@@ -1 +1 @@
-{"batchcode": "002A211A", "histograms": [{"batchcodes": ["002A211A"], "histogram": {"Chills": 2, "Nausea": 2, "Adverse reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling hot": 1, "Gait disturbance": 1, "Headache": 1, "Hyperhidrosis": 1, "Nasal discomfort": 1, "Oral pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Skin swelling": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "002A211A", "histograms": [{"histogram": {"Chills": 2, "Nausea": 2, "Adverse reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Decreased appetite": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling hot": 1, "Gait disturbance": 1, "Headache": 1, "Hyperhidrosis": 1, "Nasal discomfort": 1, "Oral pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Skin swelling": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1}, "batchcodes": ["002A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002A21A.json b/docs/data/histograms/United States/002A21A.json
index 96fe02b3e70..de9318dddc0 100644
--- a/docs/data/histograms/United States/002A21A.json
+++ b/docs/data/histograms/United States/002A21A.json
@@ -1 +1 @@
-{"batchcode": "002A21A", "histograms": [{"batchcodes": ["002A21A"], "histogram": {"Headache": 83, "Fatigue": 77, "Pain in extremity": 68, "Pyrexia": 67, "Chills": 54, "Vaccination site pain": 53, "Nausea": 45, "Myalgia": 39, "Pain": 38, "Erythema": 31, "Feeling abnormal": 31, "Vaccination site erythema": 31, "Dizziness": 25, "Vaccination site swelling": 24, "Arthralgia": 23, "Pruritus": 22, "Rash": 21, "Vomiting": 20, "Vaccination site pruritus": 19, "Asthenia": 18, "Dyspnoea": 18, "Body temperature": 17, "Peripheral swelling": 17, "Vaccination site rash": 17, "Diarrhoea": 16, "Vaccination site warmth": 14, "Feeling hot": 12, "Paraesthesia": 12, "Product dose omission issue": 12, "Inappropriate schedule of product administration": 11, "Lymphadenopathy": 11, "Neck pain": 11, "COVID-19": 10, "Malaise": 10, "Burning sensation": 9, "Injection site erythema": 9, "Hypoaesthesia": 8, "Palpitations": 8, "Rash macular": 8, "SARS-CoV-2 test": 8, "Swelling": 8, "Back pain": 7, "Cough": 7, "Gait disturbance": 7, "Insomnia": 7, "Muscle spasms": 7, "Oropharyngeal pain": 7, "Vaccination site reaction": 7, "Decreased appetite": 6, "Hypersensitivity": 6, "Influenza like illness": 6, "Injection site swelling": 6, "Pregnancy test": 6, "Somnolence": 6, "Tenderness": 6, "Abdominal pain upper": 5, "Breast pain": 5, "Chest pain": 5, "Computerised tomogram": 5, "Disorientation": 5, "Expired product administered": 5, "Exposure during pregnancy": 5, "Heart rate": 5, "Illness": 5, "Injection site pain": 5, "Lethargy": 5, "Maternal exposure during pregnancy": 5, "Musculoskeletal stiffness": 5, "Nasopharyngitis": 5, "Rash pruritic": 5, "Tremor": 5, "Urticaria": 5, "Vaccination complication": 5, "Vaccination site induration": 5, "Vaccination site mass": 5, "Vertigo": 5, "Abdominal discomfort": 4, "Balance disorder": 4, "Bedridden": 4, "Blister": 4, "Blood pressure measurement": 4, "Chest discomfort": 4, "Condition aggravated": 4, "Discomfort": 4, "Dysphonia": 4, "Feeling cold": 4, "Head discomfort": 4, "Heart rate increased": 4, "Injection site warmth": 4, "Limb discomfort": 4, "Nasal congestion": 4, "Seizure": 4, "Ultrasound scan": 4, "Abdominal pain": 3, "Anxiety": 3, "Blood test": 3, "Body temperature increased": 3, "Confusional state": 3, "Contusion": 3, "Disturbance in attention": 3, "Drug ineffective": 3, "Dry mouth": 3, "Dyspepsia": 3, "Ear pain": 3, "Flushing": 3, "Herpes zoster": 3, "Hypertension": 3, "Inflammation": 3, "Mass": 3, "Muscular weakness": 3, "Nervousness": 3, "Neuralgia": 3, "Pharyngeal swelling": 3, "Rash erythematous": 3, "Rhinorrhoea": 3, "Skin discolouration": 3, "Urinary incontinence": 3, "Amniocentesis": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "COVID-19 pneumonia": 2, "Cerebrovascular accident": 2, "Constipation": 2, "Dehydration": 2, "Depression": 2, "Dyskinesia": 2, "Ear discomfort": 2, "Electric shock sensation": 2, "Eye pain": 2, "Feeding disorder": 2, "Feeling drunk": 2, "Gastrooesophageal reflux disease": 2, "Hypersomnia": 2, "Hypotension": 2, "Influenza": 2, "Injection site pruritus": 2, "Joint swelling": 2, "Lacrimation increased": 2, "Lip swelling": 2, "Loss of consciousness": 2, "Memory impairment": 2, "Mobility decreased": 2, "Muscle twitching": 2, "Ocular hyperaemia": 2, "Oedema": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Pollakiuria": 2, "Productive cough": 2, "Rash morbilliform": 2, "SARS-CoV-2 test positive": 2, "Sensation of foreign body": 2, "Swelling face": 2, "Taste disorder": 2, "Therapeutic response unexpected": 2, "Thrombosis": 2, "Toothache": 2, "Ultrasound foetal": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vaccination site urticaria": 2, "Abdominal distension": 1, "Abnormal behaviour": 1, "Abnormal dreams": 1, "Abnormal sensation in eye": 1, "Accidental overdose": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Affective disorder": 1, "Ageusia": 1, "Anger": 1, "Antibody test": 1, "Aphonia": 1, "Arteriogram": 1, "Arthritis": 1, "Ascites": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Bell's palsy": 1, "Benign lymph node neoplasm": 1, "Biopsy breast": 1, "Biopsy salivary gland": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood urine present": 1, "Bone pain": 1, "Breast tenderness": 1, "Bronchitis": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cardiomegaly": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Chest X-ray": 1, "Choking sensation": 1, "Coordination abnormal": 1, "Deafness": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Device connection issue": 1, "Diplopia": 1, "Drug hypersensitivity": 1, "Dry skin": 1, "Dysphagia": 1, "Dysuria": 1, "Emotional distress": 1, "Excessive cerumen production": 1, "Exposure via breast milk": 1, "Eye disorder": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Fall": 1, "Feeling jittery": 1, "Feeling of relaxation": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Functional gastrointestinal disorder": 1, "Gait inability": 1, "Gingival bleeding": 1, "Gingivitis": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hepatomegaly": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Injection site bruising": 1, "Injection site induration": 1, "Injection site mass": 1, "Injection site rash": 1, "Injection site reaction": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Limb injury": 1, "Lip blister": 1, "Localised oedema": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphopenia": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Menstrual disorder": 1, "Migraine": 1, "Mood swings": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Nasal oedema": 1, "Nasal pruritus": 1, "Nerve injury": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Oesophagitis": 1, "Oral candidiasis": 1, "Oral discomfort": 1, "Oral pain": 1, "Pallor": 1, "Paranasal sinus discomfort": 1, "Parkinson's disease": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Pharyngeal paraesthesia": 1, "Pharyngitis streptococcal": 1, "Photophobia": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia": 1, "Poor feeding infant": 1, "Poor quality sleep": 1, "Premenstrual pain": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product storage error": 1, "Pulmonary congestion": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Reflux gastritis": 1, "Renal disorder": 1, "Restless legs syndrome": 1, "Retching": 1, "Retinal migraine": 1, "SARS-CoV-1 test": 1, "Salivary gland enlargement": 1, "Scar": 1, "Screaming": 1, "Secretion discharge": 1, "Sensory loss": 1, "Sinus congestion": 1, "Sinus disorder": 1, "Sinus headache": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin swelling": 1, "Skin warm": 1, "Skin weeping": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Stenosis": 1, "Suicidal ideation": 1, "Swollen tongue": 1, "Syncope": 1, "Tension headache": 1, "Throat clearing": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid pain": 1, "Tinnitus": 1, "Tongue coated": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Transient ischaemic attack": 1, "Underdose": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site lymphadenopathy": 1, "Vaccine breakthrough infection": 1, "Vascular rupture": 1, "Vasoconstriction": 1, "Vasodilatation": 1, "Vein disorder": 1, "Visual impairment": 1, "Wheezing": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "002A21A", "histograms": [{"histogram": {"Headache": 83, "Fatigue": 77, "Pain in extremity": 68, "Pyrexia": 67, "Chills": 54, "Vaccination site pain": 53, "Nausea": 45, "Myalgia": 39, "Pain": 38, "Erythema": 31, "Feeling abnormal": 31, "Vaccination site erythema": 31, "Dizziness": 25, "Vaccination site swelling": 24, "Arthralgia": 23, "Pruritus": 22, "Rash": 21, "Vomiting": 20, "Vaccination site pruritus": 19, "Asthenia": 18, "Dyspnoea": 18, "Body temperature": 17, "Peripheral swelling": 17, "Vaccination site rash": 17, "Diarrhoea": 16, "Vaccination site warmth": 14, "Feeling hot": 12, "Paraesthesia": 12, "Product dose omission issue": 12, "Inappropriate schedule of product administration": 11, "Lymphadenopathy": 11, "Neck pain": 11, "COVID-19": 10, "Malaise": 10, "Burning sensation": 9, "Injection site erythema": 9, "Hypoaesthesia": 8, "Palpitations": 8, "Rash macular": 8, "SARS-CoV-2 test": 8, "Swelling": 8, "Back pain": 7, "Cough": 7, "Gait disturbance": 7, "Insomnia": 7, "Muscle spasms": 7, "Oropharyngeal pain": 7, "Vaccination site reaction": 7, "Decreased appetite": 6, "Hypersensitivity": 6, "Influenza like illness": 6, "Injection site swelling": 6, "Pregnancy test": 6, "Somnolence": 6, "Tenderness": 6, "Abdominal pain upper": 5, "Breast pain": 5, "Chest pain": 5, "Computerised tomogram": 5, "Disorientation": 5, "Expired product administered": 5, "Exposure during pregnancy": 5, "Heart rate": 5, "Illness": 5, "Injection site pain": 5, "Lethargy": 5, "Maternal exposure during pregnancy": 5, "Musculoskeletal stiffness": 5, "Nasopharyngitis": 5, "Rash pruritic": 5, "Tremor": 5, "Urticaria": 5, "Vaccination complication": 5, "Vaccination site induration": 5, "Vaccination site mass": 5, "Vertigo": 5, "Abdominal discomfort": 4, "Balance disorder": 4, "Bedridden": 4, "Blister": 4, "Blood pressure measurement": 4, "Chest discomfort": 4, "Condition aggravated": 4, "Discomfort": 4, "Dysphonia": 4, "Feeling cold": 4, "Head discomfort": 4, "Heart rate increased": 4, "Injection site warmth": 4, "Limb discomfort": 4, "Nasal congestion": 4, "Seizure": 4, "Ultrasound scan": 4, "Abdominal pain": 3, "Anxiety": 3, "Blood test": 3, "Body temperature increased": 3, "Confusional state": 3, "Contusion": 3, "Disturbance in attention": 3, "Drug ineffective": 3, "Dry mouth": 3, "Dyspepsia": 3, "Ear pain": 3, "Flushing": 3, "Herpes zoster": 3, "Hypertension": 3, "Inflammation": 3, "Mass": 3, "Muscular weakness": 3, "Nervousness": 3, "Neuralgia": 3, "Pharyngeal swelling": 3, "Rash erythematous": 3, "Rhinorrhoea": 3, "Skin discolouration": 3, "Urinary incontinence": 3, "Amniocentesis": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "COVID-19 pneumonia": 2, "Cerebrovascular accident": 2, "Constipation": 2, "Dehydration": 2, "Depression": 2, "Dyskinesia": 2, "Ear discomfort": 2, "Electric shock sensation": 2, "Eye pain": 2, "Feeding disorder": 2, "Feeling drunk": 2, "Gastrooesophageal reflux disease": 2, "Hypersomnia": 2, "Hypotension": 2, "Influenza": 2, "Injection site pruritus": 2, "Joint swelling": 2, "Lacrimation increased": 2, "Lip swelling": 2, "Loss of consciousness": 2, "Memory impairment": 2, "Mobility decreased": 2, "Muscle twitching": 2, "Ocular hyperaemia": 2, "Oedema": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Pollakiuria": 2, "Productive cough": 2, "Rash morbilliform": 2, "SARS-CoV-2 test positive": 2, "Sensation of foreign body": 2, "Swelling face": 2, "Taste disorder": 2, "Therapeutic response unexpected": 2, "Thrombosis": 2, "Toothache": 2, "Ultrasound foetal": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vaccination site urticaria": 2, "Abdominal distension": 1, "Abnormal behaviour": 1, "Abnormal dreams": 1, "Abnormal sensation in eye": 1, "Accidental overdose": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Affective disorder": 1, "Ageusia": 1, "Anger": 1, "Antibody test": 1, "Aphonia": 1, "Arteriogram": 1, "Arthritis": 1, "Ascites": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Bell's palsy": 1, "Benign lymph node neoplasm": 1, "Biopsy breast": 1, "Biopsy salivary gland": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood urine present": 1, "Bone pain": 1, "Breast tenderness": 1, "Bronchitis": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cardiomegaly": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Chest X-ray": 1, "Choking sensation": 1, "Coordination abnormal": 1, "Deafness": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Device connection issue": 1, "Diplopia": 1, "Drug hypersensitivity": 1, "Dry skin": 1, "Dysphagia": 1, "Dysuria": 1, "Emotional distress": 1, "Excessive cerumen production": 1, "Exposure via breast milk": 1, "Eye disorder": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Fall": 1, "Feeling jittery": 1, "Feeling of relaxation": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Functional gastrointestinal disorder": 1, "Gait inability": 1, "Gingival bleeding": 1, "Gingivitis": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hepatomegaly": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Injection site bruising": 1, "Injection site induration": 1, "Injection site mass": 1, "Injection site rash": 1, "Injection site reaction": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Limb injury": 1, "Lip blister": 1, "Localised oedema": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Lymphopenia": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Menstrual disorder": 1, "Migraine": 1, "Mood swings": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle spasticity": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Nasal oedema": 1, "Nasal pruritus": 1, "Nerve injury": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Oesophagitis": 1, "Oral candidiasis": 1, "Oral discomfort": 1, "Oral pain": 1, "Pallor": 1, "Paranasal sinus discomfort": 1, "Parkinson's disease": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Pharyngeal paraesthesia": 1, "Pharyngitis streptococcal": 1, "Photophobia": 1, "Platelet count": 1, "Pleural effusion": 1, "Pneumonia": 1, "Poor feeding infant": 1, "Poor quality sleep": 1, "Premenstrual pain": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product storage error": 1, "Pulmonary congestion": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Reflux gastritis": 1, "Renal disorder": 1, "Restless legs syndrome": 1, "Retching": 1, "Retinal migraine": 1, "SARS-CoV-1 test": 1, "Salivary gland enlargement": 1, "Scar": 1, "Screaming": 1, "Secretion discharge": 1, "Sensory loss": 1, "Sinus congestion": 1, "Sinus disorder": 1, "Sinus headache": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin swelling": 1, "Skin warm": 1, "Skin weeping": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Stenosis": 1, "Suicidal ideation": 1, "Swollen tongue": 1, "Syncope": 1, "Tension headache": 1, "Throat clearing": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid pain": 1, "Tinnitus": 1, "Tongue coated": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Transient ischaemic attack": 1, "Underdose": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site lymphadenopathy": 1, "Vaccine breakthrough infection": 1, "Vascular rupture": 1, "Vasoconstriction": 1, "Vasodilatation": 1, "Vein disorder": 1, "Visual impairment": 1, "Wheezing": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["002A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002A2JA.json b/docs/data/histograms/United States/002A2JA.json
index d9dab07b0e7..e5cfbb2ef3c 100644
--- a/docs/data/histograms/United States/002A2JA.json
+++ b/docs/data/histograms/United States/002A2JA.json
@@ -1 +1 @@
-{"batchcode": "002A2JA", "histograms": [{"batchcodes": ["002A2JA"], "histogram": {"Pruritus": 1, "Rash macular": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "002A2JA", "histograms": [{"histogram": {"Pruritus": 1, "Rash macular": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}, "batchcodes": ["002A2JA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002A821A.json b/docs/data/histograms/United States/002A821A.json
index 014b10fac95..1e93550ee8b 100644
--- a/docs/data/histograms/United States/002A821A.json
+++ b/docs/data/histograms/United States/002A821A.json
@@ -1 +1 @@
-{"batchcode": "002A821A", "histograms": [{"batchcodes": ["002A821A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Fatigue": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Photophobia": 1, "Product dose omission issue": 1, "Pyrexia": 1, "SARS-CoV-2 test positive": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "002A821A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Fatigue": 1, "Hypersensitivity": 1, "Lymphadenopathy": 1, "Photophobia": 1, "Product dose omission issue": 1, "Pyrexia": 1, "SARS-CoV-2 test positive": 1, "Somnolence": 1}, "batchcodes": ["002A821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002AZ1A.json b/docs/data/histograms/United States/002AZ1A.json
index f2d11d886d0..ce31b4f2f90 100644
--- a/docs/data/histograms/United States/002AZ1A.json
+++ b/docs/data/histograms/United States/002AZ1A.json
@@ -1 +1 @@
-{"batchcode": "002AZ1A", "histograms": [{"batchcodes": ["002AZ1A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "002AZ1A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["002AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002AZIA.json b/docs/data/histograms/United States/002AZIA.json
index 6f18ec72791..b82e71ad4bf 100644
--- a/docs/data/histograms/United States/002AZIA.json
+++ b/docs/data/histograms/United States/002AZIA.json
@@ -1 +1 @@
-{"batchcode": "002AZIA", "histograms": [{"batchcodes": ["002AZIA"], "histogram": {"Pain": 2, "Pyrexia": 2, "Arthralgia": 1, "Chills": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Productive cough": 1}}]}
\ No newline at end of file
+{"batchcode": "002AZIA", "histograms": [{"histogram": {"Pain": 2, "Pyrexia": 2, "Arthralgia": 1, "Chills": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Productive cough": 1}, "batchcodes": ["002AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B.json b/docs/data/histograms/United States/002B.json
index 26394641df5..9d064a47897 100644
--- a/docs/data/histograms/United States/002B.json
+++ b/docs/data/histograms/United States/002B.json
@@ -1 +1 @@
-{"batchcode": "002B", "histograms": [{"batchcodes": ["002B"], "histogram": {"Fatigue": 2}}]}
\ No newline at end of file
+{"batchcode": "002B", "histograms": [{"histogram": {"Fatigue": 2}, "batchcodes": ["002B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B12A.json b/docs/data/histograms/United States/002B12A.json
index d8fa35b46e9..c1cca3e7e90 100644
--- a/docs/data/histograms/United States/002B12A.json
+++ b/docs/data/histograms/United States/002B12A.json
@@ -1 +1 @@
-{"batchcode": "002B12A", "histograms": [{"batchcodes": ["002B12A"], "histogram": {"Expired product administered": 1, "Eye pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Skin indentation": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "002B12A", "histograms": [{"histogram": {"Expired product administered": 1, "Eye pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Skin indentation": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Vaccination site warmth": 1}, "batchcodes": ["002B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B1A.json b/docs/data/histograms/United States/002B1A.json
index 75c39f32166..c13599aeacc 100644
--- a/docs/data/histograms/United States/002B1A.json
+++ b/docs/data/histograms/United States/002B1A.json
@@ -1 +1 @@
-{"batchcode": "002B1A", "histograms": [{"batchcodes": ["002B1A"], "histogram": {"Headache": 2, "Back pain": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "002B1A", "histograms": [{"histogram": {"Headache": 2, "Back pain": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["002B1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B214.json b/docs/data/histograms/United States/002B214.json
index a449eb01625..17a2773ee49 100644
--- a/docs/data/histograms/United States/002B214.json
+++ b/docs/data/histograms/United States/002B214.json
@@ -1 +1 @@
-{"batchcode": "002B214", "histograms": [{"batchcodes": ["002B214"], "histogram": {"Asthenia": 1, "Dyspnoea": 1, "Fatigue": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "002B214", "histograms": [{"histogram": {"Asthenia": 1, "Dyspnoea": 1, "Fatigue": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["002B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B218.json b/docs/data/histograms/United States/002B218.json
index e5f081a81a7..e17378e3225 100644
--- a/docs/data/histograms/United States/002B218.json
+++ b/docs/data/histograms/United States/002B218.json
@@ -1 +1 @@
-{"batchcode": "002B218", "histograms": [{"batchcodes": ["002B218"], "histogram": {"Adverse event": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "002B218", "histograms": [{"histogram": {"Adverse event": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["002B218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B21A,.json b/docs/data/histograms/United States/002B21A,.json
index aed79f5ce9f..a3382bbf441 100644
--- a/docs/data/histograms/United States/002B21A,.json
+++ b/docs/data/histograms/United States/002B21A,.json
@@ -1 +1 @@
-{"batchcode": "002B21A,", "histograms": [{"batchcodes": ["002B21A,"], "histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "002B21A,", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["002B21A,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B21A-HRSA.json b/docs/data/histograms/United States/002B21A-HRSA.json
index c0d6b07842b..882f27acf1f 100644
--- a/docs/data/histograms/United States/002B21A-HRSA.json
+++ b/docs/data/histograms/United States/002B21A-HRSA.json
@@ -1 +1 @@
-{"batchcode": "002B21A-HRSA", "histograms": [{"batchcodes": ["002B21A-HRSA"], "histogram": {"Anxiety": 1, "Crying": 1, "Depression": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "002B21A-HRSA", "histograms": [{"histogram": {"Anxiety": 1, "Crying": 1, "Depression": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["002B21A-HRSA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B21A..json b/docs/data/histograms/United States/002B21A..json
index e6ee89d9ea4..9e1b49c09d0 100644
--- a/docs/data/histograms/United States/002B21A..json
+++ b/docs/data/histograms/United States/002B21A..json
@@ -1 +1 @@
-{"batchcode": "002B21A.", "histograms": [{"batchcodes": ["002B21A."], "histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "002B21A.", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["002B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B21A.json b/docs/data/histograms/United States/002B21A.json
index a53f4a34bb8..0b7c765dd40 100644
--- a/docs/data/histograms/United States/002B21A.json
+++ b/docs/data/histograms/United States/002B21A.json
@@ -1 +1 @@
-{"batchcode": "002B21A", "histograms": [{"batchcodes": ["002B21A", "040B21A"], "histogram": {"Back pain": 1, "Biopsy": 1, "Burning sensation": 1, "Contusion": 1, "Decreased immune responsiveness": 1, "Feeling abnormal": 1, "Herpes zoster": 1, "Hyperaesthesia": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Pain": 1, "Pain in extremity": 1, "Rash macular": 1, "Rash papular": 1, "Vaccination failure": 1}}, {"batchcodes": ["002B21A"], "histogram": {"Headache": 58, "Pain in extremity": 55, "Pyrexia": 44, "Chills": 39, "Fatigue": 39, "Vaccination site pain": 38, "Myalgia": 31, "Nausea": 27, "Arthralgia": 22, "Vaccination site erythema": 22, "Pruritus": 21, "Dizziness": 20, "Pain": 20, "Vaccination site swelling": 18, "Feeling abnormal": 17, "Rash": 17, "Vaccination site warmth": 14, "Asthenia": 13, "Dyspnoea": 13, "Vomiting": 13, "SARS-CoV-2 test": 12, "Erythema": 11, "Inappropriate schedule of product administration": 11, "Body temperature": 10, "Peripheral swelling": 10, "COVID-19": 9, "Diarrhoea": 9, "Vaccination site pruritus": 9, "Cough": 8, "Feeling hot": 8, "Lymphadenopathy": 8, "Malaise": 8, "Product dose omission issue": 8, "Urticaria": 8, "Back pain": 7, "Decreased appetite": 7, "Expired product administered": 7, "Feeling cold": 7, "Herpes zoster": 7, "Oropharyngeal pain": 6, "Vaccination complication": 6, "Blood pressure measurement": 5, "Condition aggravated": 5, "Heart rate": 5, "Hypoaesthesia": 5, "Influenza like illness": 5, "Insomnia": 5, "Migraine": 5, "Muscle spasms": 5, "Neck pain": 5, "Somnolence": 5, "Tinnitus": 5, "Vaccination site rash": 5, "Vertigo": 5, "Abdominal discomfort": 4, "Abdominal pain upper": 4, "Anxiety": 4, "Balance disorder": 4, "Chest pain": 4, "Gait disturbance": 4, "Hyperhidrosis": 4, "Limb discomfort": 4, "Movement disorder": 4, "Nasopharyngitis": 4, "Rash pruritic": 4, "Rhinorrhoea": 4, "Skin discolouration": 4, "Sleep disorder": 4, "Swelling": 4, "Tremor": 4, "Ageusia": 3, "Burning sensation": 3, "Depressed mood": 3, "Discomfort": 3, "Fall": 3, "Head discomfort": 3, "Heart rate increased": 3, "Hypokinesia": 3, "Illness": 3, "Injection site erythema": 3, "Joint stiffness": 3, "Mass": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Nasal congestion": 3, "Palpitations": 3, "Rash erythematous": 3, "Swelling face": 3, "Vaccination site bruising": 3, "Vaccination site discolouration": 3, "Vaccination site movement impairment": 3, "Vaccination site reaction": 3, "Accidental overdose": 2, "Amnesia": 2, "Breast mass": 2, "Cerebral haemorrhage": 2, "Chest discomfort": 2, "Confusional state": 2, "Constipation": 2, "Contusion": 2, "Exposure during pregnancy": 2, "Flushing": 2, "Gastrointestinal infection": 2, "Gastrooesophageal reflux disease": 2, "Hyperacusis": 2, "Hypersensitivity": 2, "Injection site pain": 2, "Intentional product use issue": 2, "Interchange of vaccine products": 2, "Lymph node pain": 2, "Maternal exposure during pregnancy": 2, "Mechanical urticaria": 2, "Memory impairment": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Musculoskeletal stiffness": 2, "Ocular discomfort": 2, "Off label use": 2, "Oral candidiasis": 2, "Oral pain": 2, "Oral pruritus": 2, "Oxygen saturation": 2, "Pallor": 2, "Paraesthesia": 2, "Product administered to patient of inappropriate age": 2, "Rheumatoid arthritis": 2, "Skin burning sensation": 2, "Speech disorder": 2, "Syncope": 2, "Throat irritation": 2, "Thrombosis": 2, "Underdose": 2, "Vaccination site discomfort": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site paraesthesia": 2, "Weight decreased": 2, "Abdominal distension": 1, "Adverse event": 1, "Adverse reaction": 1, "Alopecia": 1, "Alpha 1 foetoprotein": 1, "Angioedema": 1, "Anosmia": 1, "Arthritis": 1, "Asthma": 1, "Atrioventricular block": 1, "Bacterial infection": 1, "Bedridden": 1, "Biopsy": 1, "Blister": 1, "Blood blister": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Bradyphrenia": 1, "Breast pain": 1, "Candida infection": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Chondrocalcinosis pyrophosphate": 1, "Chronic obstructive pulmonary disease": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Costochondritis": 1, "Deafness": 1, "Decreased activity": 1, "Dental caries": 1, "Dental discomfort": 1, "Depression": 1, "Device connection issue": 1, "Diplegia": 1, "Dysgraphia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Eagle's syndrome": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pain": 1, "Ear swelling": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Energy increased": 1, "Epistaxis": 1, "Eructation": 1, "Eye allergy": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Gait inability": 1, "Genital discomfort": 1, "Genital erythema": 1, "Genital infection fungal": 1, "Head injury": 1, "Hospitalisation": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Immunisation": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incontinence": 1, "Incorrect route of product administration": 1, "Induration": 1, "Infection": 1, "Inflammation": 1, "Influenza": 1, "Injection site induration": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "Intercepted product administration error": 1, "Irritable bowel syndrome": 1, "Lethargy": 1, "Lichen planus": 1, "Ligament sprain": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Monoplegia": 1, "Muscle fatigue": 1, "Muscle rigidity": 1, "Muscle swelling": 1, "Myocardial infarction": 1, "Nerve compression": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Nightmare": 1, "No adverse event": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Papule": 1, "Paraesthesia oral": 1, "Parkinson's disease": 1, "Pelvic pain": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Photopsia": 1, "Pleural effusion": 1, "Plicated tongue": 1, "Pneumonia": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Rash papular": 1, "Respiratory rate": 1, "Retching": 1, "Retinal tear": 1, "SARS-CoV-2 test positive": 1, "Sepsis": 1, "Sinusitis": 1, "Skin warm": 1, "Sluggishness": 1, "Spondylitis": 1, "Tachycardia": 1, "Taste disorder": 1, "Tenderness": 1, "Tension headache": 1, "Testicular disorder": 1, "Testicular pain": 1, "Testicular swelling": 1, "Therapeutic response unexpected": 1, "Throat tightness": 1, "Tongue discomfort": 1, "Tooth disorder": 1, "Treatment noncompliance": 1, "Treponema test positive": 1, "Ultrasound Doppler": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Urticaria chronic": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Vestibular migraine": 1, "Vitreous floaters": 1, "Vitreous haemorrhage": 1, "White blood cell count": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "002B21A", "histograms": [{"histogram": {"Back pain": 1, "Biopsy": 1, "Burning sensation": 1, "Contusion": 1, "Decreased immune responsiveness": 1, "Feeling abnormal": 1, "Herpes zoster": 1, "Hyperaesthesia": 1, "Malaise": 1, "Musculoskeletal pain": 1, "Pain": 1, "Pain in extremity": 1, "Rash macular": 1, "Rash papular": 1, "Vaccination failure": 1}, "batchcodes": ["002B21A", "040B21A"]}, {"histogram": {"Headache": 58, "Pain in extremity": 55, "Pyrexia": 44, "Chills": 39, "Fatigue": 39, "Vaccination site pain": 38, "Myalgia": 31, "Nausea": 27, "Arthralgia": 22, "Vaccination site erythema": 22, "Pruritus": 21, "Dizziness": 20, "Pain": 20, "Vaccination site swelling": 18, "Feeling abnormal": 17, "Rash": 17, "Vaccination site warmth": 14, "Asthenia": 13, "Dyspnoea": 13, "Vomiting": 13, "SARS-CoV-2 test": 12, "Erythema": 11, "Inappropriate schedule of product administration": 11, "Body temperature": 10, "Peripheral swelling": 10, "COVID-19": 9, "Diarrhoea": 9, "Vaccination site pruritus": 9, "Cough": 8, "Feeling hot": 8, "Lymphadenopathy": 8, "Malaise": 8, "Product dose omission issue": 8, "Urticaria": 8, "Back pain": 7, "Decreased appetite": 7, "Expired product administered": 7, "Feeling cold": 7, "Herpes zoster": 7, "Oropharyngeal pain": 6, "Vaccination complication": 6, "Blood pressure measurement": 5, "Condition aggravated": 5, "Heart rate": 5, "Hypoaesthesia": 5, "Influenza like illness": 5, "Insomnia": 5, "Migraine": 5, "Muscle spasms": 5, "Neck pain": 5, "Somnolence": 5, "Tinnitus": 5, "Vaccination site rash": 5, "Vertigo": 5, "Abdominal discomfort": 4, "Abdominal pain upper": 4, "Anxiety": 4, "Balance disorder": 4, "Chest pain": 4, "Gait disturbance": 4, "Hyperhidrosis": 4, "Limb discomfort": 4, "Movement disorder": 4, "Nasopharyngitis": 4, "Rash pruritic": 4, "Rhinorrhoea": 4, "Skin discolouration": 4, "Sleep disorder": 4, "Swelling": 4, "Tremor": 4, "Ageusia": 3, "Burning sensation": 3, "Depressed mood": 3, "Discomfort": 3, "Fall": 3, "Head discomfort": 3, "Heart rate increased": 3, "Hypokinesia": 3, "Illness": 3, "Injection site erythema": 3, "Joint stiffness": 3, "Mass": 3, "Mobility decreased": 3, "Muscular weakness": 3, "Nasal congestion": 3, "Palpitations": 3, "Rash erythematous": 3, "Swelling face": 3, "Vaccination site bruising": 3, "Vaccination site discolouration": 3, "Vaccination site movement impairment": 3, "Vaccination site reaction": 3, "Accidental overdose": 2, "Amnesia": 2, "Breast mass": 2, "Cerebral haemorrhage": 2, "Chest discomfort": 2, "Confusional state": 2, "Constipation": 2, "Contusion": 2, "Exposure during pregnancy": 2, "Flushing": 2, "Gastrointestinal infection": 2, "Gastrooesophageal reflux disease": 2, "Hyperacusis": 2, "Hypersensitivity": 2, "Injection site pain": 2, "Intentional product use issue": 2, "Interchange of vaccine products": 2, "Lymph node pain": 2, "Maternal exposure during pregnancy": 2, "Mechanical urticaria": 2, "Memory impairment": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Musculoskeletal stiffness": 2, "Ocular discomfort": 2, "Off label use": 2, "Oral candidiasis": 2, "Oral pain": 2, "Oral pruritus": 2, "Oxygen saturation": 2, "Pallor": 2, "Paraesthesia": 2, "Product administered to patient of inappropriate age": 2, "Rheumatoid arthritis": 2, "Skin burning sensation": 2, "Speech disorder": 2, "Syncope": 2, "Throat irritation": 2, "Thrombosis": 2, "Underdose": 2, "Vaccination site discomfort": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site paraesthesia": 2, "Weight decreased": 2, "Abdominal distension": 1, "Adverse event": 1, "Adverse reaction": 1, "Alopecia": 1, "Alpha 1 foetoprotein": 1, "Angioedema": 1, "Anosmia": 1, "Arthritis": 1, "Asthma": 1, "Atrioventricular block": 1, "Bacterial infection": 1, "Bedridden": 1, "Biopsy": 1, "Blister": 1, "Blood blister": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Bradyphrenia": 1, "Breast pain": 1, "Candida infection": 1, "Cerebral disorder": 1, "Cerebrovascular accident": 1, "Chondrocalcinosis pyrophosphate": 1, "Chronic obstructive pulmonary disease": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Costochondritis": 1, "Deafness": 1, "Decreased activity": 1, "Dental caries": 1, "Dental discomfort": 1, "Depression": 1, "Device connection issue": 1, "Diplegia": 1, "Dysgraphia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Eagle's syndrome": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pain": 1, "Ear swelling": 1, "Electrocardiogram": 1, "Emotional distress": 1, "Energy increased": 1, "Epistaxis": 1, "Eructation": 1, "Eye allergy": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Gait inability": 1, "Genital discomfort": 1, "Genital erythema": 1, "Genital infection fungal": 1, "Head injury": 1, "Hospitalisation": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Immunisation": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incontinence": 1, "Incorrect route of product administration": 1, "Induration": 1, "Infection": 1, "Inflammation": 1, "Influenza": 1, "Injection site induration": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "Intercepted product administration error": 1, "Irritable bowel syndrome": 1, "Lethargy": 1, "Lichen planus": 1, "Ligament sprain": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Monoplegia": 1, "Muscle fatigue": 1, "Muscle rigidity": 1, "Muscle swelling": 1, "Myocardial infarction": 1, "Nerve compression": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Nightmare": 1, "No adverse event": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Papule": 1, "Paraesthesia oral": 1, "Parkinson's disease": 1, "Pelvic pain": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Photopsia": 1, "Pleural effusion": 1, "Plicated tongue": 1, "Pneumonia": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Rash papular": 1, "Respiratory rate": 1, "Retching": 1, "Retinal tear": 1, "SARS-CoV-2 test positive": 1, "Sepsis": 1, "Sinusitis": 1, "Skin warm": 1, "Sluggishness": 1, "Spondylitis": 1, "Tachycardia": 1, "Taste disorder": 1, "Tenderness": 1, "Tension headache": 1, "Testicular disorder": 1, "Testicular pain": 1, "Testicular swelling": 1, "Therapeutic response unexpected": 1, "Throat tightness": 1, "Tongue discomfort": 1, "Tooth disorder": 1, "Treatment noncompliance": 1, "Treponema test positive": 1, "Ultrasound Doppler": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Urticaria chronic": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Vestibular migraine": 1, "Vitreous floaters": 1, "Vitreous haemorrhage": 1, "White blood cell count": 1, "Wrong product administered": 1}, "batchcodes": ["002B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B21D.json b/docs/data/histograms/United States/002B21D.json
index 2b310db9c49..081284bfeeb 100644
--- a/docs/data/histograms/United States/002B21D.json
+++ b/docs/data/histograms/United States/002B21D.json
@@ -1 +1 @@
-{"batchcode": "002B21D", "histograms": [{"batchcodes": ["002B21D"], "histogram": {"Aplasia pure red cell": 1, "Full blood count": 1}}]}
\ No newline at end of file
+{"batchcode": "002B21D", "histograms": [{"histogram": {"Aplasia pure red cell": 1, "Full blood count": 1}, "batchcodes": ["002B21D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B27A.json b/docs/data/histograms/United States/002B27A.json
index e08369dfc00..96ff93f9775 100644
--- a/docs/data/histograms/United States/002B27A.json
+++ b/docs/data/histograms/United States/002B27A.json
@@ -1 +1 @@
-{"batchcode": "002B27A", "histograms": [{"batchcodes": ["002B27A"], "histogram": {"Body temperature": 1, "Bone pain": 1, "Chest pain": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Head discomfort": 1, "Migraine": 1, "Nausea": 1, "Pain of skin": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "002B27A", "histograms": [{"histogram": {"Body temperature": 1, "Bone pain": 1, "Chest pain": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Head discomfort": 1, "Migraine": 1, "Nausea": 1, "Pain of skin": 1, "Pyrexia": 1}, "batchcodes": ["002B27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B31A.json b/docs/data/histograms/United States/002B31A.json
index 2c60bc62c97..0fe0a3d13fe 100644
--- a/docs/data/histograms/United States/002B31A.json
+++ b/docs/data/histograms/United States/002B31A.json
@@ -1 +1 @@
-{"batchcode": "002B31A", "histograms": [{"batchcodes": ["002B31A"], "histogram": {"Axillary pain": 1}}]}
\ No newline at end of file
+{"batchcode": "002B31A", "histograms": [{"histogram": {"Axillary pain": 1}, "batchcodes": ["002B31A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002B321A.json b/docs/data/histograms/United States/002B321A.json
index ee45a108bb1..257aab61c01 100644
--- a/docs/data/histograms/United States/002B321A.json
+++ b/docs/data/histograms/United States/002B321A.json
@@ -1 +1 @@
-{"batchcode": "002B321A", "histograms": [{"batchcodes": ["002B321A"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "002B321A", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["002B321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002BNA.json b/docs/data/histograms/United States/002BNA.json
index a768923a66f..de499f0b44a 100644
--- a/docs/data/histograms/United States/002BNA.json
+++ b/docs/data/histograms/United States/002BNA.json
@@ -1 +1 @@
-{"batchcode": "002BNA", "histograms": [{"batchcodes": ["002BNA"], "histogram": {"Asthenia": 1, "Bowel movement irregularity": 1, "Decreased appetite": 1, "Hallucination": 1, "Parosmia": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "002BNA", "histograms": [{"histogram": {"Asthenia": 1, "Bowel movement irregularity": 1, "Decreased appetite": 1, "Hallucination": 1, "Parosmia": 1, "Product dose omission issue": 1}, "batchcodes": ["002BNA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002BZ1A.json b/docs/data/histograms/United States/002BZ1A.json
index 8678ea8762f..327f5bc607c 100644
--- a/docs/data/histograms/United States/002BZ1A.json
+++ b/docs/data/histograms/United States/002BZ1A.json
@@ -1 +1 @@
-{"batchcode": "002BZ1A", "histograms": [{"batchcodes": ["002BZ1A"], "histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Colonoscopy": 1, "Depression": 1, "Diarrhoea": 1, "Endoscopy": 1, "Fatigue": 1, "Gastrointestinal pain": 1, "Headache": 1, "Influenza like illness": 1, "Irritable bowel syndrome": 1, "Nausea": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "002BZ1A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Colonoscopy": 1, "Depression": 1, "Diarrhoea": 1, "Endoscopy": 1, "Fatigue": 1, "Gastrointestinal pain": 1, "Headache": 1, "Influenza like illness": 1, "Irritable bowel syndrome": 1, "Nausea": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["002BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C12A.json b/docs/data/histograms/United States/002C12A.json
index 70b86accc2b..0106b0ad4a3 100644
--- a/docs/data/histograms/United States/002C12A.json
+++ b/docs/data/histograms/United States/002C12A.json
@@ -1 +1 @@
-{"batchcode": "002C12A", "histograms": [{"batchcodes": ["002C12A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Contusion": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Rash macular": 1, "Swelling": 1, "Vaccination site infection": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "002C12A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Contusion": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Rash macular": 1, "Swelling": 1, "Vaccination site infection": 1, "Vomiting": 1}, "batchcodes": ["002C12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C1A.json b/docs/data/histograms/United States/002C1A.json
index b316caf83c4..4ad62d8d14f 100644
--- a/docs/data/histograms/United States/002C1A.json
+++ b/docs/data/histograms/United States/002C1A.json
@@ -1 +1 @@
-{"batchcode": "002C1A", "histograms": [{"batchcodes": ["002C1A"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1, "Sciatica": 1, "Systemic lupus erythematosus": 1}}]}
\ No newline at end of file
+{"batchcode": "002C1A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1, "Sciatica": 1, "Systemic lupus erythematosus": 1}, "batchcodes": ["002C1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C21.json b/docs/data/histograms/United States/002C21.json
index c0d886a9b0f..bcb80aca5dd 100644
--- a/docs/data/histograms/United States/002C21.json
+++ b/docs/data/histograms/United States/002C21.json
@@ -1 +1 @@
-{"batchcode": "002C21", "histograms": [{"batchcodes": ["002C21"], "histogram": {"Expired product administered": 2, "Chills": 1, "Headache": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "002C21", "histograms": [{"histogram": {"Expired product administered": 2, "Chills": 1, "Headache": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Weight decreased": 1}, "batchcodes": ["002C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C214.json b/docs/data/histograms/United States/002C214.json
index 5f19cdbfcca..f479b0555e8 100644
--- a/docs/data/histograms/United States/002C214.json
+++ b/docs/data/histograms/United States/002C214.json
@@ -1 +1 @@
-{"batchcode": "002C214", "histograms": [{"batchcodes": ["002C214"], "histogram": {"Arthralgia": 1, "Bedridden": 1, "Cough": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Pyrexia": 1, "Rash macular": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "002C214", "histograms": [{"histogram": {"Arthralgia": 1, "Bedridden": 1, "Cough": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Pyrexia": 1, "Rash macular": 1, "Wheezing": 1}, "batchcodes": ["002C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C21A.json b/docs/data/histograms/United States/002C21A.json
index f344b738be0..58ebbab728b 100644
--- a/docs/data/histograms/United States/002C21A.json
+++ b/docs/data/histograms/United States/002C21A.json
@@ -1 +1 @@
-{"batchcode": "002C21A", "histograms": [{"batchcodes": ["002C21A"], "histogram": {"Fatigue": 36, "Myalgia": 34, "Pyrexia": 33, "Vaccination site pain": 32, "Headache": 31, "Expired product administered": 30, "Chills": 23, "Pain in extremity": 21, "Nausea": 15, "Pain": 14, "Arthralgia": 13, "Feeling abnormal": 12, "Asthenia": 11, "Dyspnoea": 11, "Body temperature": 10, "Cough": 10, "Dizziness": 10, "Inappropriate schedule of product administration": 10, "Product storage error": 10, "Vaccination site erythema": 10, "Back pain": 9, "Hypoaesthesia": 9, "Illness": 9, "Influenza like illness": 9, "SARS-CoV-2 test": 9, "Tremor": 9, "Peripheral swelling": 8, "Product administered to patient of inappropriate age": 8, "Product dose omission issue": 8, "Vaccination complication": 8, "Decreased appetite": 7, "Diarrhoea": 7, "Erythema": 7, "Gait disturbance": 7, "Pruritus": 7, "Rash": 7, "Vaccination site swelling": 7, "Chest pain": 6, "Hyperhidrosis": 6, "Insomnia": 6, "Rash pruritic": 6, "Somnolence": 6, "Underdose": 6, "Vomiting": 6, "Abdominal pain": 5, "Ageusia": 5, "COVID-19": 5, "Device connection issue": 5, "Malaise": 5, "Mobility decreased": 5, "Nasal congestion": 5, "Vaccination site rash": 5, "Abdominal pain upper": 4, "Anosmia": 4, "Discomfort": 4, "Feeding disorder": 4, "Loss of consciousness": 4, "Mass": 4, "Neck pain": 4, "Rash erythematous": 4, "Rhinorrhoea": 4, "Swelling": 4, "Vertigo": 4, "Balance disorder": 3, "Chest discomfort": 3, "Head discomfort": 3, "Lethargy": 3, "Migraine": 3, "Nasopharyngitis": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Vaccination site warmth": 3, "Abdominal discomfort": 2, "Accidental overdose": 2, "Arrhythmia": 2, "Bedridden": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Echocardiogram": 2, "Epistaxis": 2, "Fall": 2, "Haematuria": 2, "Heart rate": 2, "Heart rate increased": 2, "Heavy menstrual bleeding": 2, "Inflammation": 2, "Joint swelling": 2, "Lymphadenopathy": 2, "Memory impairment": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Oral herpes": 2, "Oral mucosal blistering": 2, "Paraesthesia": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Productive cough": 2, "Pulmonary pain": 2, "Rash papular": 2, "Sleep disorder": 2, "Sneezing": 2, "Testicular pain": 2, "Urinary tract infection": 2, "Urticaria": 2, "Vaccination site movement impairment": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal pain lower": 1, "Abnormal loss of weight": 1, "Agitation": 1, "Allergy to vaccine": 1, "Anxiety": 1, "Arthritis": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Bradycardia": 1, "Breast cyst": 1, "Breast pain": 1, "Bruxism": 1, "Burning sensation": 1, "Chest X-ray": 1, "Coagulopathy": 1, "Complex regional pain syndrome": 1, "Constipation": 1, "Contusion": 1, "Crying": 1, "Diarrhoea haemorrhagic": 1, "Diplopia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Ear pain": 1, "Eating disorder symptom": 1, "Electrocardiogram": 1, "Enuresis": 1, "Epilepsy": 1, "Euphoric mood": 1, "Exposure via breast milk": 1, "Extra dose administered": 1, "Eye irritation": 1, "Eye pain": 1, "Feeling cold": 1, "Feeling hot": 1, "Fine motor skill dysfunction": 1, "Foaming at mouth": 1, "Gene mutation identification test": 1, "Generalised tonic-clonic seizure": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematemesis": 1, "Hunger": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Increased appetite": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lung disorder": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Mass excision": 1, "Maternal exposure during pregnancy": 1, "Mental impairment": 1, "Micrographia": 1, "Moaning": 1, "Mood altered": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Neck mass": 1, "Nephrocalcinosis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Oxygen consumption decreased": 1, "Pain in jaw": 1, "Palpitations": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Paranasal sinus discomfort": 1, "Parkinson's disease": 1, "Parosmia": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Pneumonitis": 1, "Pregnancy test": 1, "Presyncope": 1, "Renal pain": 1, "Respiratory disorder": 1, "Restlessness": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Shoulder operation": 1, "Sinus disorder": 1, "Sitting disability": 1, "Skin abrasion": 1, "Skin discolouration": 1, "Skin disorder": 1, "Skin injury": 1, "Skin swelling": 1, "Skin warm": 1, "Speech disorder": 1, "Swollen tongue": 1, "Taste disorder": 1, "Tenderness": 1, "Tension": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroxine": 1, "Tinnitus": 1, "Tongue discolouration": 1, "Tooth injury": 1, "Toothache": 1, "Ultrasound scan": 1, "Unevaluable event": 1, "Urinary incontinence": 1, "Urine abnormality": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaginal haemorrhage": 1, "Vein disorder": 1, "Vital signs measurement": 1, "Vomiting projectile": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "002C21A", "histograms": [{"histogram": {"Fatigue": 36, "Myalgia": 34, "Pyrexia": 33, "Vaccination site pain": 32, "Headache": 31, "Expired product administered": 30, "Chills": 23, "Pain in extremity": 21, "Nausea": 15, "Pain": 14, "Arthralgia": 13, "Feeling abnormal": 12, "Asthenia": 11, "Dyspnoea": 11, "Body temperature": 10, "Cough": 10, "Dizziness": 10, "Inappropriate schedule of product administration": 10, "Product storage error": 10, "Vaccination site erythema": 10, "Back pain": 9, "Hypoaesthesia": 9, "Illness": 9, "Influenza like illness": 9, "SARS-CoV-2 test": 9, "Tremor": 9, "Peripheral swelling": 8, "Product administered to patient of inappropriate age": 8, "Product dose omission issue": 8, "Vaccination complication": 8, "Decreased appetite": 7, "Diarrhoea": 7, "Erythema": 7, "Gait disturbance": 7, "Pruritus": 7, "Rash": 7, "Vaccination site swelling": 7, "Chest pain": 6, "Hyperhidrosis": 6, "Insomnia": 6, "Rash pruritic": 6, "Somnolence": 6, "Underdose": 6, "Vomiting": 6, "Abdominal pain": 5, "Ageusia": 5, "COVID-19": 5, "Device connection issue": 5, "Malaise": 5, "Mobility decreased": 5, "Nasal congestion": 5, "Vaccination site rash": 5, "Abdominal pain upper": 4, "Anosmia": 4, "Discomfort": 4, "Feeding disorder": 4, "Loss of consciousness": 4, "Mass": 4, "Neck pain": 4, "Rash erythematous": 4, "Rhinorrhoea": 4, "Swelling": 4, "Vertigo": 4, "Balance disorder": 3, "Chest discomfort": 3, "Head discomfort": 3, "Lethargy": 3, "Migraine": 3, "Nasopharyngitis": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Vaccination site warmth": 3, "Abdominal discomfort": 2, "Accidental overdose": 2, "Arrhythmia": 2, "Bedridden": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Echocardiogram": 2, "Epistaxis": 2, "Fall": 2, "Haematuria": 2, "Heart rate": 2, "Heart rate increased": 2, "Heavy menstrual bleeding": 2, "Inflammation": 2, "Joint swelling": 2, "Lymphadenopathy": 2, "Memory impairment": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Oral herpes": 2, "Oral mucosal blistering": 2, "Paraesthesia": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Productive cough": 2, "Pulmonary pain": 2, "Rash papular": 2, "Sleep disorder": 2, "Sneezing": 2, "Testicular pain": 2, "Urinary tract infection": 2, "Urticaria": 2, "Vaccination site movement impairment": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal pain lower": 1, "Abnormal loss of weight": 1, "Agitation": 1, "Allergy to vaccine": 1, "Anxiety": 1, "Arthritis": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Bradycardia": 1, "Breast cyst": 1, "Breast pain": 1, "Bruxism": 1, "Burning sensation": 1, "Chest X-ray": 1, "Coagulopathy": 1, "Complex regional pain syndrome": 1, "Constipation": 1, "Contusion": 1, "Crying": 1, "Diarrhoea haemorrhagic": 1, "Diplopia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Ear pain": 1, "Eating disorder symptom": 1, "Electrocardiogram": 1, "Enuresis": 1, "Epilepsy": 1, "Euphoric mood": 1, "Exposure via breast milk": 1, "Extra dose administered": 1, "Eye irritation": 1, "Eye pain": 1, "Feeling cold": 1, "Feeling hot": 1, "Fine motor skill dysfunction": 1, "Foaming at mouth": 1, "Gene mutation identification test": 1, "Generalised tonic-clonic seizure": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematemesis": 1, "Hunger": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypokinesia": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Increased appetite": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lung disorder": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Mass excision": 1, "Maternal exposure during pregnancy": 1, "Mental impairment": 1, "Micrographia": 1, "Moaning": 1, "Mood altered": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Neck mass": 1, "Nephrocalcinosis": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Oxygen consumption decreased": 1, "Pain in jaw": 1, "Palpitations": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Paranasal sinus discomfort": 1, "Parkinson's disease": 1, "Parosmia": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Pneumonitis": 1, "Pregnancy test": 1, "Presyncope": 1, "Renal pain": 1, "Respiratory disorder": 1, "Restlessness": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Shoulder operation": 1, "Sinus disorder": 1, "Sitting disability": 1, "Skin abrasion": 1, "Skin discolouration": 1, "Skin disorder": 1, "Skin injury": 1, "Skin swelling": 1, "Skin warm": 1, "Speech disorder": 1, "Swollen tongue": 1, "Taste disorder": 1, "Tenderness": 1, "Tension": 1, "Thirst": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroxine": 1, "Tinnitus": 1, "Tongue discolouration": 1, "Tooth injury": 1, "Toothache": 1, "Ultrasound scan": 1, "Unevaluable event": 1, "Urinary incontinence": 1, "Urine abnormality": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaginal haemorrhage": 1, "Vein disorder": 1, "Vital signs measurement": 1, "Vomiting projectile": 1, "Wheezing": 1}, "batchcodes": ["002C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C21B.json b/docs/data/histograms/United States/002C21B.json
index 25c52c2a035..a65555f43dc 100644
--- a/docs/data/histograms/United States/002C21B.json
+++ b/docs/data/histograms/United States/002C21B.json
@@ -1 +1 @@
-{"batchcode": "002C21B", "histograms": [{"batchcodes": ["002C21B"], "histogram": {"Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "002C21B", "histograms": [{"histogram": {"Urinary tract infection": 1}, "batchcodes": ["002C21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C26A.json b/docs/data/histograms/United States/002C26A.json
index 4455ab1c8c6..7f2762e8e4a 100644
--- a/docs/data/histograms/United States/002C26A.json
+++ b/docs/data/histograms/United States/002C26A.json
@@ -1 +1 @@
-{"batchcode": "002C26A", "histograms": [{"batchcodes": ["002C26A"], "histogram": {"Fatigue": 1, "Headache": 1, "Hypertension": 1, "Myalgia": 1, "Nausea": 1, "Ocular discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "002C26A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Hypertension": 1, "Myalgia": 1, "Nausea": 1, "Ocular discomfort": 1}, "batchcodes": ["002C26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002C2IA.json b/docs/data/histograms/United States/002C2IA.json
index 6bf1b47ee02..ba10856c8a9 100644
--- a/docs/data/histograms/United States/002C2IA.json
+++ b/docs/data/histograms/United States/002C2IA.json
@@ -1 +1 @@
-{"batchcode": "002C2IA", "histograms": [{"batchcodes": ["002C2IA"], "histogram": {"Incorrect route of product administration": 1, "Insomnia": 1, "Limb discomfort": 1, "Musculoskeletal discomfort": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "002C2IA", "histograms": [{"histogram": {"Incorrect route of product administration": 1, "Insomnia": 1, "Limb discomfort": 1, "Musculoskeletal discomfort": 1, "Pain": 1}, "batchcodes": ["002C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002CIA.json b/docs/data/histograms/United States/002CIA.json
index a14dae32e54..e776fe4ab0a 100644
--- a/docs/data/histograms/United States/002CIA.json
+++ b/docs/data/histograms/United States/002CIA.json
@@ -1 +1 @@
-{"batchcode": "002CIA", "histograms": [{"batchcodes": ["002CIA"], "histogram": {"Arthritis": 1, "Diarrhoea": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "002CIA", "histograms": [{"histogram": {"Arthritis": 1, "Diarrhoea": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["002CIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002CZ1A.json b/docs/data/histograms/United States/002CZ1A.json
index d2b49c1c433..c78a32c5dd4 100644
--- a/docs/data/histograms/United States/002CZ1A.json
+++ b/docs/data/histograms/United States/002CZ1A.json
@@ -1 +1 @@
-{"batchcode": "002CZ1A", "histograms": [{"batchcodes": ["002CZ1A"], "histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Injection site warmth": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "002CZ1A", "histograms": [{"histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Injection site warmth": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["002CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002D21A.json b/docs/data/histograms/United States/002D21A.json
index 7982dea8fe9..2a1ffccce70 100644
--- a/docs/data/histograms/United States/002D21A.json
+++ b/docs/data/histograms/United States/002D21A.json
@@ -1 +1 @@
-{"batchcode": "002D21A", "histograms": [{"batchcodes": ["002D21A"], "histogram": {"Asthma": 1, "Cough": 1, "Dyspnoea": 1, "Illness": 1, "Lymphadenopathy": 1, "Pain": 1, "Pharyngeal swelling": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "002D21A", "histograms": [{"histogram": {"Asthma": 1, "Cough": 1, "Dyspnoea": 1, "Illness": 1, "Lymphadenopathy": 1, "Pain": 1, "Pharyngeal swelling": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["002D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002DA1C.json b/docs/data/histograms/United States/002DA1C.json
index bf5a9247816..229663304d9 100644
--- a/docs/data/histograms/United States/002DA1C.json
+++ b/docs/data/histograms/United States/002DA1C.json
@@ -1 +1 @@
-{"batchcode": "002DA1C", "histograms": [{"batchcodes": ["002DA1C"], "histogram": {"Device connection issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "002DA1C", "histograms": [{"histogram": {"Device connection issue": 1, "Underdose": 1}, "batchcodes": ["002DA1C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002E21A.json b/docs/data/histograms/United States/002E21A.json
index bb046795b65..02f323bac16 100644
--- a/docs/data/histograms/United States/002E21A.json
+++ b/docs/data/histograms/United States/002E21A.json
@@ -1 +1 @@
-{"batchcode": "002E21A", "histograms": [{"batchcodes": ["002E21A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "002E21A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["002E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002F21.json b/docs/data/histograms/United States/002F21.json
index dad030a6170..ee905534226 100644
--- a/docs/data/histograms/United States/002F21.json
+++ b/docs/data/histograms/United States/002F21.json
@@ -1 +1 @@
-{"batchcode": "002F21", "histograms": [{"batchcodes": ["002F21"], "histogram": {"Feeling abnormal": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "002F21", "histograms": [{"histogram": {"Feeling abnormal": 1, "Headache": 1}, "batchcodes": ["002F21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002F214.json b/docs/data/histograms/United States/002F214.json
index 1c43a139ae2..a39f0020bbe 100644
--- a/docs/data/histograms/United States/002F214.json
+++ b/docs/data/histograms/United States/002F214.json
@@ -1 +1 @@
-{"batchcode": "002F214", "histograms": [{"batchcodes": ["002F214"], "histogram": {"Chills": 1, "Hyperhidrosis": 1, "Muscle spasms": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "002F214", "histograms": [{"histogram": {"Chills": 1, "Hyperhidrosis": 1, "Muscle spasms": 1, "Vomiting": 1}, "batchcodes": ["002F214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002F21A NO EX.json b/docs/data/histograms/United States/002F21A NO EX.json
index c5667b4704f..b1dfc76da24 100644
--- a/docs/data/histograms/United States/002F21A NO EX.json
+++ b/docs/data/histograms/United States/002F21A NO EX.json
@@ -1 +1 @@
-{"batchcode": "002F21A NO EX", "histograms": [{"batchcodes": ["002F21A NO EX"], "histogram": {"Body temperature": 1, "Chills": 1, "Cold sweat": 1, "Decreased appetite": 1, "Nausea": 1, "Nervousness": 1, "Pyrexia": 1, "Restless legs syndrome": 1, "SARS-CoV-2 test": 1, "Thirst": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "002F21A NO EX", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Cold sweat": 1, "Decreased appetite": 1, "Nausea": 1, "Nervousness": 1, "Pyrexia": 1, "Restless legs syndrome": 1, "SARS-CoV-2 test": 1, "Thirst": 1, "Vomiting": 1}, "batchcodes": ["002F21A NO EX"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002F21A OR 602F.json b/docs/data/histograms/United States/002F21A OR 602F.json
index 6abb10ba7fc..16ebd790d04 100644
--- a/docs/data/histograms/United States/002F21A OR 602F.json
+++ b/docs/data/histograms/United States/002F21A OR 602F.json
@@ -1 +1 @@
-{"batchcode": "002F21A OR 602F", "histograms": [{"batchcodes": ["002F21A OR 602F"], "histogram": {"Cough": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash pruritic": 1, "Varicella": 1}}]}
\ No newline at end of file
+{"batchcode": "002F21A OR 602F", "histograms": [{"histogram": {"Cough": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash pruritic": 1, "Varicella": 1}, "batchcodes": ["002F21A OR 602F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002F21A.json b/docs/data/histograms/United States/002F21A.json
index 20a7e32b5b0..7e10759b5ae 100644
--- a/docs/data/histograms/United States/002F21A.json
+++ b/docs/data/histograms/United States/002F21A.json
@@ -1 +1 @@
-{"batchcode": "002F21A", "histograms": [{"batchcodes": ["002F21A"], "histogram": {"Expired product administered": 21, "Myalgia": 10, "Nausea": 10, "Vaccination site pain": 8, "Chills": 7, "Fatigue": 7, "Headache": 7, "Pain in extremity": 7, "Vaccination site erythema": 7, "Erythema": 6, "Feeling abnormal": 6, "Feeling cold": 6, "Peripheral swelling": 6, "Pruritus": 6, "Pyrexia": 6, "Body temperature": 5, "Dizziness": 5, "Lymphadenopathy": 5, "Vaccination complication": 5, "Abdominal pain upper": 4, "Chest discomfort": 4, "Dyspnoea": 4, "Hyperhidrosis": 4, "Illness": 4, "Inappropriate schedule of product administration": 4, "Pain": 4, "Rash": 4, "Vaccination site swelling": 4, "Arthralgia": 3, "Asthenia": 3, "Diarrhoea": 3, "Feeling hot": 3, "Limb discomfort": 3, "Nasal congestion": 3, "Product storage error": 3, "Tremor": 3, "Vaccination site pruritus": 3, "Vaccination site rash": 3, "Vaccination site warmth": 3, "Ageusia": 2, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Blood pressure measurement": 2, "Cardiac flutter": 2, "Cough": 2, "Device connection issue": 2, "Euphoric mood": 2, "Feeding disorder": 2, "Feeling of despair": 2, "Hypersensitivity": 2, "Influenza like illness": 2, "Insomnia": 2, "Lethargy": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Nasal discomfort": 2, "Oropharyngeal pain": 2, "Pallor": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Urticaria": 2, "Vaccination site mass": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal dreams": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Appendicitis": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Bedridden": 1, "Blood phosphorus": 1, "Bone pain": 1, "Cardiac disorder": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest pain": 1, "Choking": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Crying": 1, "Cyanosis": 1, "Diplopia": 1, "Discomfort": 1, "Diverticulitis": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysstasia": 1, "Eye swelling": 1, "Fall": 1, "Fear": 1, "Flushing": 1, "Haemoptysis": 1, "Head discomfort": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatic function abnormal": 1, "Hot flush": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired driving ability": 1, "Impaired quality of life": 1, "Inflammation": 1, "Influenza": 1, "Injection site pruritus": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint lock": 1, "Limb mass": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Motor dysfunction": 1, "Muscle discomfort": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nervous system disorder": 1, "No adverse event": 1, "Oral mucosal erythema": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paranasal sinus discomfort": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Polydipsia": 1, "Poor quality sleep": 1, "Product administration interrupted": 1, "Product contamination physical": 1, "Product dose omission issue": 1, "Pulmonary oedema": 1, "Rash erythematous": 1, "Rhinorrhoea": 1, "Scab": 1, "Skin discomfort": 1, "Sleep disorder": 1, "Stomatitis": 1, "Swollen tongue": 1, "Syncope": 1, "Tachycardia": 1, "Tenderness": 1, "Thirst": 1, "Throat tightness": 1, "Tongue discolouration": 1, "Underdose": 1, "Vaccination site induration": 1, "Vaccination site infection": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Weight loss poor": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "002F21A", "histograms": [{"histogram": {"Expired product administered": 21, "Myalgia": 10, "Nausea": 10, "Vaccination site pain": 8, "Chills": 7, "Fatigue": 7, "Headache": 7, "Pain in extremity": 7, "Vaccination site erythema": 7, "Erythema": 6, "Feeling abnormal": 6, "Feeling cold": 6, "Peripheral swelling": 6, "Pruritus": 6, "Pyrexia": 6, "Body temperature": 5, "Dizziness": 5, "Lymphadenopathy": 5, "Vaccination complication": 5, "Abdominal pain upper": 4, "Chest discomfort": 4, "Dyspnoea": 4, "Hyperhidrosis": 4, "Illness": 4, "Inappropriate schedule of product administration": 4, "Pain": 4, "Rash": 4, "Vaccination site swelling": 4, "Arthralgia": 3, "Asthenia": 3, "Diarrhoea": 3, "Feeling hot": 3, "Limb discomfort": 3, "Nasal congestion": 3, "Product storage error": 3, "Tremor": 3, "Vaccination site pruritus": 3, "Vaccination site rash": 3, "Vaccination site warmth": 3, "Ageusia": 2, "Alanine aminotransferase": 2, "Aspartate aminotransferase": 2, "Blood pressure measurement": 2, "Cardiac flutter": 2, "Cough": 2, "Device connection issue": 2, "Euphoric mood": 2, "Feeding disorder": 2, "Feeling of despair": 2, "Hypersensitivity": 2, "Influenza like illness": 2, "Insomnia": 2, "Lethargy": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Nasal discomfort": 2, "Oropharyngeal pain": 2, "Pallor": 2, "Paraesthesia": 2, "SARS-CoV-2 test": 2, "Urticaria": 2, "Vaccination site mass": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal dreams": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Appendicitis": 1, "Arthritis": 1, "Atrial fibrillation": 1, "Autoimmune hepatitis": 1, "Back pain": 1, "Bedridden": 1, "Blood phosphorus": 1, "Bone pain": 1, "Cardiac disorder": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chest pain": 1, "Choking": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Crying": 1, "Cyanosis": 1, "Diplopia": 1, "Discomfort": 1, "Diverticulitis": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysstasia": 1, "Eye swelling": 1, "Fall": 1, "Fear": 1, "Flushing": 1, "Haemoptysis": 1, "Head discomfort": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatic function abnormal": 1, "Hot flush": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired driving ability": 1, "Impaired quality of life": 1, "Inflammation": 1, "Influenza": 1, "Injection site pruritus": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint lock": 1, "Limb mass": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Motor dysfunction": 1, "Muscle discomfort": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nervous system disorder": 1, "No adverse event": 1, "Oral mucosal erythema": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Paranasal sinus discomfort": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Polydipsia": 1, "Poor quality sleep": 1, "Product administration interrupted": 1, "Product contamination physical": 1, "Product dose omission issue": 1, "Pulmonary oedema": 1, "Rash erythematous": 1, "Rhinorrhoea": 1, "Scab": 1, "Skin discomfort": 1, "Sleep disorder": 1, "Stomatitis": 1, "Swollen tongue": 1, "Syncope": 1, "Tachycardia": 1, "Tenderness": 1, "Thirst": 1, "Throat tightness": 1, "Tongue discolouration": 1, "Underdose": 1, "Vaccination site induration": 1, "Vaccination site infection": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Weight loss poor": 1, "Wheezing": 1}, "batchcodes": ["002F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002H20A.json b/docs/data/histograms/United States/002H20A.json
index 8954bc56bae..97cf8bcf796 100644
--- a/docs/data/histograms/United States/002H20A.json
+++ b/docs/data/histograms/United States/002H20A.json
@@ -1 +1 @@
-{"batchcode": "002H20A", "histograms": [{"batchcodes": ["002H20A"], "histogram": {"Fatigue": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "002H20A", "histograms": [{"histogram": {"Fatigue": 1, "Pain in extremity": 1}, "batchcodes": ["002H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002H21A.json b/docs/data/histograms/United States/002H21A.json
index 126632f6bcb..c0f92164aa3 100644
--- a/docs/data/histograms/United States/002H21A.json
+++ b/docs/data/histograms/United States/002H21A.json
@@ -1 +1 @@
-{"batchcode": "002H21A", "histograms": [{"batchcodes": ["002H21A"], "histogram": {"Pyrexia": 2, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Rhinorrhoea": 1, "Somnolence": 1, "Taste disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "002H21A", "histograms": [{"histogram": {"Pyrexia": 2, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Rhinorrhoea": 1, "Somnolence": 1, "Taste disorder": 1}, "batchcodes": ["002H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002L20A.json b/docs/data/histograms/United States/002L20A.json
index b5b2f28a205..4755fa2f36b 100644
--- a/docs/data/histograms/United States/002L20A.json
+++ b/docs/data/histograms/United States/002L20A.json
@@ -1 +1 @@
-{"batchcode": "002L20A", "histograms": [{"batchcodes": ["002L20A"], "histogram": {"Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "002L20A", "histograms": [{"histogram": {"Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["002L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002L21A.json b/docs/data/histograms/United States/002L21A.json
index 8d7974e944f..19fd91c650c 100644
--- a/docs/data/histograms/United States/002L21A.json
+++ b/docs/data/histograms/United States/002L21A.json
@@ -1 +1 @@
-{"batchcode": "002L21A", "histograms": [{"batchcodes": ["002L21A"], "histogram": {"Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "002L21A", "histograms": [{"histogram": {"Chills": 1, "Pyrexia": 1}, "batchcodes": ["002L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002M1A.json b/docs/data/histograms/United States/002M1A.json
index ac46991e8d1..3fad3fa76ab 100644
--- a/docs/data/histograms/United States/002M1A.json
+++ b/docs/data/histograms/United States/002M1A.json
@@ -1 +1 @@
-{"batchcode": "002M1A", "histograms": [{"batchcodes": ["002M1A"], "histogram": {"COVID-19": 1, "Chills": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "002M1A", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["002M1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002M20A.json b/docs/data/histograms/United States/002M20A.json
index 108a7d19954..9ec5be53e82 100644
--- a/docs/data/histograms/United States/002M20A.json
+++ b/docs/data/histograms/United States/002M20A.json
@@ -1 +1 @@
-{"batchcode": "002M20A", "histograms": [{"batchcodes": ["002M20A"], "histogram": {"Body temperature": 1, "Bradyphrenia": 1, "Breast swelling": 1, "Breast tenderness": 1, "COVID-19": 1, "Headache": 1, "Mass": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "002M20A", "histograms": [{"histogram": {"Body temperature": 1, "Bradyphrenia": 1, "Breast swelling": 1, "Breast tenderness": 1, "COVID-19": 1, "Headache": 1, "Mass": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["002M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002M21A.json b/docs/data/histograms/United States/002M21A.json
index daf6ed367c2..dbac8a2cc1b 100644
--- a/docs/data/histograms/United States/002M21A.json
+++ b/docs/data/histograms/United States/002M21A.json
@@ -1 +1 @@
-{"batchcode": "002M21A", "histograms": [{"batchcodes": ["002M21A"], "histogram": {"Expired product administered": 44, "Product storage error": 27, "COVID-19": 4, "Back pain": 2, "Body temperature": 2, "Fall": 2, "Fatigue": 2, "Headache": 2, "No adverse event": 2, "Pain": 2, "Pain in extremity": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Abdominal discomfort": 1, "Anxiety": 1, "Blood glucose fluctuation": 1, "Blood pressure measurement": 1, "Body mass index": 1, "Bone pain": 1, "Brain injury": 1, "Chills": 1, "Computerised tomogram": 1, "Contusion": 1, "Erythema": 1, "Feeling hot": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Heart rate increased": 1, "Hypertension": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Migraine": 1, "Musculoskeletal discomfort": 1, "Neck pain": 1, "Night sweats": 1, "Oxygen saturation": 1, "Panic attack": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Presyncope": 1, "Product administered to patient of inappropriate age": 1, "Rash": 1, "Respiratory rate": 1, "Skin discolouration": 1, "Skin induration": 1, "Swelling": 1, "Tremor": 1, "Vaccination failure": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "002M21A", "histograms": [{"histogram": {"Expired product administered": 44, "Product storage error": 27, "COVID-19": 4, "Back pain": 2, "Body temperature": 2, "Fall": 2, "Fatigue": 2, "Headache": 2, "No adverse event": 2, "Pain": 2, "Pain in extremity": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Abdominal discomfort": 1, "Anxiety": 1, "Blood glucose fluctuation": 1, "Blood pressure measurement": 1, "Body mass index": 1, "Bone pain": 1, "Brain injury": 1, "Chills": 1, "Computerised tomogram": 1, "Contusion": 1, "Erythema": 1, "Feeling hot": 1, "Gait disturbance": 1, "Generalised tonic-clonic seizure": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Heart rate increased": 1, "Hypertension": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Migraine": 1, "Musculoskeletal discomfort": 1, "Neck pain": 1, "Night sweats": 1, "Oxygen saturation": 1, "Panic attack": 1, "Peripheral swelling": 1, "Pneumonia": 1, "Presyncope": 1, "Product administered to patient of inappropriate age": 1, "Rash": 1, "Respiratory rate": 1, "Skin discolouration": 1, "Skin induration": 1, "Swelling": 1, "Tremor": 1, "Vaccination failure": 1, "Vision blurred": 1}, "batchcodes": ["002M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002MZ1A/00ZMZIA.json b/docs/data/histograms/United States/002MZ1A/00ZMZIA.json
index d387fbee7a1..c7164bccda6 100644
--- a/docs/data/histograms/United States/002MZ1A/00ZMZIA.json
+++ b/docs/data/histograms/United States/002MZ1A/00ZMZIA.json
@@ -1 +1 @@
-{"batchcode": "002MZ1A/00ZMZIA", "histograms": [{"batchcodes": ["002MZ1A/00ZMZIA"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "002MZ1A/00ZMZIA", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["002MZ1A/00ZMZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002N20A.json b/docs/data/histograms/United States/002N20A.json
index b8114a53312..bd1fef4bfcf 100644
--- a/docs/data/histograms/United States/002N20A.json
+++ b/docs/data/histograms/United States/002N20A.json
@@ -1 +1 @@
-{"batchcode": "002N20A", "histograms": [{"batchcodes": ["002N20A"], "histogram": {"Chills": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Night sweats": 1}}]}
\ No newline at end of file
+{"batchcode": "002N20A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Night sweats": 1}, "batchcodes": ["002N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002S21A.json b/docs/data/histograms/United States/002S21A.json
index b0fe1d5df29..776e422bcc9 100644
--- a/docs/data/histograms/United States/002S21A.json
+++ b/docs/data/histograms/United States/002S21A.json
@@ -1 +1 @@
-{"batchcode": "002S21A", "histograms": [{"batchcodes": ["002S21A"], "histogram": {"Abdominal pain upper": 1, "Accidental overdose": 1, "Diarrhoea": 1, "Head injury": 1, "Influenza": 1, "Loss of consciousness": 1, "Nausea": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "002S21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Accidental overdose": 1, "Diarrhoea": 1, "Head injury": 1, "Influenza": 1, "Loss of consciousness": 1, "Nausea": 1, "No adverse event": 1}, "batchcodes": ["002S21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/002ZAZ1A.json b/docs/data/histograms/United States/002ZAZ1A.json
index 14666af3983..bd8cadf80b8 100644
--- a/docs/data/histograms/United States/002ZAZ1A.json
+++ b/docs/data/histograms/United States/002ZAZ1A.json
@@ -1 +1 @@
-{"batchcode": "002ZAZ1A", "histograms": [{"batchcodes": ["002ZAZ1A"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Headache": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "002ZAZ1A", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Headache": 1, "Pain": 1}, "batchcodes": ["002ZAZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003.json b/docs/data/histograms/United States/003.json
index f087b6b18c2..bde7f2e801d 100644
--- a/docs/data/histograms/United States/003.json
+++ b/docs/data/histograms/United States/003.json
@@ -1 +1 @@
-{"batchcode": "003", "histograms": [{"batchcodes": ["003"], "histogram": {"Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "003", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1}, "batchcodes": ["003"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0030210.json b/docs/data/histograms/United States/0030210.json
index 936f8eb4f08..ebf597e444d 100644
--- a/docs/data/histograms/United States/0030210.json
+++ b/docs/data/histograms/United States/0030210.json
@@ -1 +1 @@
-{"batchcode": "0030210", "histograms": [{"batchcodes": ["0030210"], "histogram": {"Ear discomfort": 1, "Ear pruritus": 1, "Hypersensitivity": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "0030210", "histograms": [{"histogram": {"Ear discomfort": 1, "Ear pruritus": 1, "Hypersensitivity": 1, "Off label use": 1}, "batchcodes": ["0030210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003021A.json b/docs/data/histograms/United States/003021A.json
index d453210655c..9b6ee80674f 100644
--- a/docs/data/histograms/United States/003021A.json
+++ b/docs/data/histograms/United States/003021A.json
@@ -1 +1 @@
-{"batchcode": "003021A", "histograms": [{"batchcodes": ["003021A"], "histogram": {"Bone pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Vaccination site pruritus": 1, "Vitreous floaters": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "003021A", "histograms": [{"histogram": {"Bone pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Vaccination site pruritus": 1, "Vitreous floaters": 1, "Vomiting": 1}, "batchcodes": ["003021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0030C21A.json b/docs/data/histograms/United States/0030C21A.json
index e1f0c457072..7cd28763602 100644
--- a/docs/data/histograms/United States/0030C21A.json
+++ b/docs/data/histograms/United States/0030C21A.json
@@ -1 +1 @@
-{"batchcode": "0030C21A", "histograms": [{"batchcodes": ["0030C21A"], "histogram": {"Feeling abnormal": 1, "Memory impairment": 1, "Nasopharyngitis": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "0030C21A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Memory impairment": 1, "Nasopharyngitis": 1, "Somnolence": 1}, "batchcodes": ["0030C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0030L20A.json b/docs/data/histograms/United States/0030L20A.json
index 63524a3e762..b474023a8f7 100644
--- a/docs/data/histograms/United States/0030L20A.json
+++ b/docs/data/histograms/United States/0030L20A.json
@@ -1 +1 @@
-{"batchcode": "0030L20A", "histograms": [{"batchcodes": ["0030L20A"], "histogram": {"Body temperature": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0030L20A", "histograms": [{"histogram": {"Body temperature": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["0030L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0031321A.json b/docs/data/histograms/United States/0031321A.json
index 0f44831622b..b8eb6a62d7f 100644
--- a/docs/data/histograms/United States/0031321A.json
+++ b/docs/data/histograms/United States/0031321A.json
@@ -1 +1 @@
-{"batchcode": "0031321A", "histograms": [{"batchcodes": ["0031321A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0031321A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["0031321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0031321V.json b/docs/data/histograms/United States/0031321V.json
index c5d28a59049..d0ef90fc14a 100644
--- a/docs/data/histograms/United States/0031321V.json
+++ b/docs/data/histograms/United States/0031321V.json
@@ -1 +1 @@
-{"batchcode": "0031321V", "histograms": [{"batchcodes": ["0031321V"], "histogram": {"Condition aggravated": 1, "Insomnia": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0031321V", "histograms": [{"histogram": {"Condition aggravated": 1, "Insomnia": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0031321V"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0031821A.json b/docs/data/histograms/United States/0031821A.json
index a931f422573..e2b814e562c 100644
--- a/docs/data/histograms/United States/0031821A.json
+++ b/docs/data/histograms/United States/0031821A.json
@@ -1 +1 @@
-{"batchcode": "0031821A", "histograms": [{"batchcodes": ["0031821A"], "histogram": {"Asthenia": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0031821A", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["0031821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0031A21A.json b/docs/data/histograms/United States/0031A21A.json
index fda6e541454..5b0f5be5e9f 100644
--- a/docs/data/histograms/United States/0031A21A.json
+++ b/docs/data/histograms/United States/0031A21A.json
@@ -1 +1 @@
-{"batchcode": "0031A21A", "histograms": [{"batchcodes": ["0031A21A"], "histogram": {"Chills": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0031A21A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site rash": 1}, "batchcodes": ["0031A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0031B21A.json b/docs/data/histograms/United States/0031B21A.json
index 4e92f30ff6a..5cfba05725c 100644
--- a/docs/data/histograms/United States/0031B21A.json
+++ b/docs/data/histograms/United States/0031B21A.json
@@ -1 +1 @@
-{"batchcode": "0031B21A", "histograms": [{"batchcodes": ["0031B21A"], "histogram": {"Anaphylactic reaction": 1, "Dyspnoea": 1, "Hypertension": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0031B21A", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Dyspnoea": 1, "Hypertension": 1, "Pain in extremity": 1}, "batchcodes": ["0031B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0031M20A.json b/docs/data/histograms/United States/0031M20A.json
index d66d9155728..66b8eae5334 100644
--- a/docs/data/histograms/United States/0031M20A.json
+++ b/docs/data/histograms/United States/0031M20A.json
@@ -1 +1 @@
-{"batchcode": "0031M20A", "histograms": [{"batchcodes": ["0031M20A"], "histogram": {"Injection site pain": 1, "Limb injury": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "0031M20A", "histograms": [{"histogram": {"Injection site pain": 1, "Limb injury": 1, "Product dose omission issue": 1}, "batchcodes": ["0031M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00321A.json b/docs/data/histograms/United States/00321A.json
index af622dc1a0c..d2aade25dd9 100644
--- a/docs/data/histograms/United States/00321A.json
+++ b/docs/data/histograms/United States/00321A.json
@@ -1 +1 @@
-{"batchcode": "00321A", "histograms": [{"batchcodes": ["00321A"], "histogram": {"Fatigue": 1, "Headache": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Sinusitis": 1}}]}
\ No newline at end of file
+{"batchcode": "00321A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Sinusitis": 1}, "batchcodes": ["00321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00321CA.json b/docs/data/histograms/United States/00321CA.json
index cde822e40ab..dc227672b67 100644
--- a/docs/data/histograms/United States/00321CA.json
+++ b/docs/data/histograms/United States/00321CA.json
@@ -1 +1 @@
-{"batchcode": "00321CA", "histograms": [{"batchcodes": ["00321CA"], "histogram": {"Device connection issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "00321CA", "histograms": [{"histogram": {"Device connection issue": 1, "Underdose": 1}, "batchcodes": ["00321CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0032B21A.json b/docs/data/histograms/United States/0032B21A.json
index 913cc828896..f0b8d1529c9 100644
--- a/docs/data/histograms/United States/0032B21A.json
+++ b/docs/data/histograms/United States/0032B21A.json
@@ -1 +1 @@
-{"batchcode": "0032B21A", "histograms": [{"batchcodes": ["0032B21A"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "0032B21A", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["0032B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0032C (L OR I).json b/docs/data/histograms/United States/0032C (L OR I).json
index 54344cce3c6..de4740c8406 100644
--- a/docs/data/histograms/United States/0032C (L OR I).json
+++ b/docs/data/histograms/United States/0032C (L OR I).json
@@ -1 +1 @@
-{"batchcode": "0032C (L OR I)", "histograms": [{"batchcodes": ["0032C (L OR I)"], "histogram": {"Fatigue": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "0032C (L OR I)", "histograms": [{"histogram": {"Fatigue": 1, "Myalgia": 1}, "batchcodes": ["0032C (L OR I)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0032L20A.json b/docs/data/histograms/United States/0032L20A.json
index 19adfc35a4e..f1aaa89f100 100644
--- a/docs/data/histograms/United States/0032L20A.json
+++ b/docs/data/histograms/United States/0032L20A.json
@@ -1 +1 @@
-{"batchcode": "0032L20A", "histograms": [{"batchcodes": ["0032L20A"], "histogram": {"Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0032L20A", "histograms": [{"histogram": {"Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0032L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003321-2A.json b/docs/data/histograms/United States/003321-2A.json
index b892ecd8720..242e455a56d 100644
--- a/docs/data/histograms/United States/003321-2A.json
+++ b/docs/data/histograms/United States/003321-2A.json
@@ -1 +1 @@
-{"batchcode": "003321-2A", "histograms": [{"batchcodes": ["003321-2A"], "histogram": {"Acne": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "003321-2A", "histograms": [{"histogram": {"Acne": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["003321-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0034211A.json b/docs/data/histograms/United States/0034211A.json
index 20336e94b00..c7d95c50075 100644
--- a/docs/data/histograms/United States/0034211A.json
+++ b/docs/data/histograms/United States/0034211A.json
@@ -1 +1 @@
-{"batchcode": "0034211A", "histograms": [{"batchcodes": ["0034211A"], "histogram": {"Feeling abnormal": 1, "Lymph node pain": 1, "Nasal congestion": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "0034211A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Lymph node pain": 1, "Nasal congestion": 1, "Throat tightness": 1}, "batchcodes": ["0034211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0034214.json b/docs/data/histograms/United States/0034214.json
index f0f3a11a0b6..dd73a0a1e4b 100644
--- a/docs/data/histograms/United States/0034214.json
+++ b/docs/data/histograms/United States/0034214.json
@@ -1 +1 @@
-{"batchcode": "0034214", "histograms": [{"batchcodes": ["0034214"], "histogram": {"Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "0034214", "histograms": [{"histogram": {"Tinnitus": 1}, "batchcodes": ["0034214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003421A.json b/docs/data/histograms/United States/003421A.json
index 1a827781f3d..39f2097fb8f 100644
--- a/docs/data/histograms/United States/003421A.json
+++ b/docs/data/histograms/United States/003421A.json
@@ -1 +1 @@
-{"batchcode": "003421A", "histograms": [{"batchcodes": ["003421A"], "histogram": {"Hypokinesia": 1, "Pain in extremity": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "003421A", "histograms": [{"histogram": {"Hypokinesia": 1, "Pain in extremity": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["003421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0034C21A.json b/docs/data/histograms/United States/0034C21A.json
index 696d4f6dec1..a0550754ef8 100644
--- a/docs/data/histograms/United States/0034C21A.json
+++ b/docs/data/histograms/United States/0034C21A.json
@@ -1 +1 @@
-{"batchcode": "0034C21A", "histograms": [{"batchcodes": ["0034C21A"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pain in jaw": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0034C21A", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pain in jaw": 1, "Pyrexia": 1}, "batchcodes": ["0034C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0035252A.json b/docs/data/histograms/United States/0035252A.json
index 84dcb96c8a9..98fa00e2c3a 100644
--- a/docs/data/histograms/United States/0035252A.json
+++ b/docs/data/histograms/United States/0035252A.json
@@ -1 +1 @@
-{"batchcode": "0035252A", "histograms": [{"batchcodes": ["0035252A"], "histogram": {"Blood pressure measurement": 1, "Cough": 1, "Fatigue": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Rhinorrhoea": 1, "Sneezing": 1, "Vital signs measurement": 1}}]}
\ No newline at end of file
+{"batchcode": "0035252A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Cough": 1, "Fatigue": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Rhinorrhoea": 1, "Sneezing": 1, "Vital signs measurement": 1}, "batchcodes": ["0035252A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0035C21A.json b/docs/data/histograms/United States/0035C21A.json
index 7c90e2ef1e2..c9d3307b971 100644
--- a/docs/data/histograms/United States/0035C21A.json
+++ b/docs/data/histograms/United States/0035C21A.json
@@ -1 +1 @@
-{"batchcode": "0035C21A", "histograms": [{"batchcodes": ["0035C21A"], "histogram": {"Therapeutic response unexpected": 1}}]}
\ No newline at end of file
+{"batchcode": "0035C21A", "histograms": [{"histogram": {"Therapeutic response unexpected": 1}, "batchcodes": ["0035C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003621A.json b/docs/data/histograms/United States/003621A.json
index 2566e3e3fcd..791234040e6 100644
--- a/docs/data/histograms/United States/003621A.json
+++ b/docs/data/histograms/United States/003621A.json
@@ -1 +1 @@
-{"batchcode": "003621A", "histograms": [{"batchcodes": ["003621A"], "histogram": {"Eye swelling": 1, "Headache": 1, "Lip blister": 1, "Lip swelling": 1, "Myalgia": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "003621A", "histograms": [{"histogram": {"Eye swelling": 1, "Headache": 1, "Lip blister": 1, "Lip swelling": 1, "Myalgia": 1, "Swelling face": 1}, "batchcodes": ["003621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0037A21B.json b/docs/data/histograms/United States/0037A21B.json
index 7550569891d..a2c4da58f4b 100644
--- a/docs/data/histograms/United States/0037A21B.json
+++ b/docs/data/histograms/United States/0037A21B.json
@@ -1 +1 @@
-{"batchcode": "0037A21B", "histograms": [{"batchcodes": ["0037A21B"], "histogram": {"Asthenia": 1, "Chills": 1, "Night sweats": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "0037A21B", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Night sweats": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["0037A21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003811A.json b/docs/data/histograms/United States/003811A.json
index 1d7609870a2..0027c2bf7bf 100644
--- a/docs/data/histograms/United States/003811A.json
+++ b/docs/data/histograms/United States/003811A.json
@@ -1 +1 @@
-{"batchcode": "003811A", "histograms": [{"batchcodes": ["003811A"], "histogram": {"Mobility decreased": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "003811A", "histograms": [{"histogram": {"Mobility decreased": 1, "Pain in extremity": 1}, "batchcodes": ["003811A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003821A.json b/docs/data/histograms/United States/003821A.json
index 21cc4e25f96..ef9b0937ee3 100644
--- a/docs/data/histograms/United States/003821A.json
+++ b/docs/data/histograms/United States/003821A.json
@@ -1 +1 @@
-{"batchcode": "003821A", "histograms": [{"batchcodes": ["003821A"], "histogram": {"Nausea": 2, "Pyrexia": 2, "Vomiting": 2, "Arthralgia": 1, "Bone pain": 1, "Cardiac function test": 1, "Chest injury": 1, "Contusion": 1, "Face injury": 1, "Fall": 1, "Headache": 1, "Illness": 1, "Injection site rash": 1, "Insomnia": 1, "Joint injury": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "003821A", "histograms": [{"histogram": {"Nausea": 2, "Pyrexia": 2, "Vomiting": 2, "Arthralgia": 1, "Bone pain": 1, "Cardiac function test": 1, "Chest injury": 1, "Contusion": 1, "Face injury": 1, "Fall": 1, "Headache": 1, "Illness": 1, "Injection site rash": 1, "Insomnia": 1, "Joint injury": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["003821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0038B21A.json b/docs/data/histograms/United States/0038B21A.json
index 4ac0db99f55..83ee6fd6a54 100644
--- a/docs/data/histograms/United States/0038B21A.json
+++ b/docs/data/histograms/United States/0038B21A.json
@@ -1 +1 @@
-{"batchcode": "0038B21A", "histograms": [{"batchcodes": ["0038B21A"], "histogram": {"Biopsy skin": 1, "Blood thyroid stimulating hormone": 1, "Colonoscopy": 1, "Computerised tomogram thorax": 1, "Expired product administered": 1, "High density lipoprotein decreased": 1, "Investigation": 1, "Physical examination": 1, "Rectal examination": 1}}]}
\ No newline at end of file
+{"batchcode": "0038B21A", "histograms": [{"histogram": {"Biopsy skin": 1, "Blood thyroid stimulating hormone": 1, "Colonoscopy": 1, "Computerised tomogram thorax": 1, "Expired product administered": 1, "High density lipoprotein decreased": 1, "Investigation": 1, "Physical examination": 1, "Rectal examination": 1}, "batchcodes": ["0038B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0039B21A.json b/docs/data/histograms/United States/0039B21A.json
index 83b977d7313..21bb5bc786c 100644
--- a/docs/data/histograms/United States/0039B21A.json
+++ b/docs/data/histograms/United States/0039B21A.json
@@ -1 +1 @@
-{"batchcode": "0039B21A", "histograms": [{"batchcodes": ["0039B21A"], "histogram": {"Blood test": 2, "Injection site inflammation": 2, "Body temperature": 1, "Chills": 1, "Expired product administered": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Injection site swelling": 1, "Lymphadenopathy": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Swelling": 1, "Ultrasound scan": 1, "Ultrasound scan normal": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "0039B21A", "histograms": [{"histogram": {"Blood test": 2, "Injection site inflammation": 2, "Body temperature": 1, "Chills": 1, "Expired product administered": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Injection site swelling": 1, "Lymphadenopathy": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Swelling": 1, "Ultrasound scan": 1, "Ultrasound scan normal": 1, "Vaccination site reaction": 1}, "batchcodes": ["0039B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003A12A.json b/docs/data/histograms/United States/003A12A.json
index afc8d6d7296..1bc8f274b56 100644
--- a/docs/data/histograms/United States/003A12A.json
+++ b/docs/data/histograms/United States/003A12A.json
@@ -1 +1 @@
-{"batchcode": "003A12A", "histograms": [{"batchcodes": ["003A12A"], "histogram": {"Body temperature": 1, "Influenza like illness": 1, "Myalgia": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "003A12A", "histograms": [{"histogram": {"Body temperature": 1, "Influenza like illness": 1, "Myalgia": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["003A12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003A21.json b/docs/data/histograms/United States/003A21.json
index 275045851a1..dc800402517 100644
--- a/docs/data/histograms/United States/003A21.json
+++ b/docs/data/histograms/United States/003A21.json
@@ -1 +1 @@
-{"batchcode": "003A21", "histograms": [{"batchcodes": ["003A21"], "histogram": {"Body temperature": 1, "Chills": 1, "Deafness": 1, "Ear discomfort": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Head discomfort": 1, "Headache": 1, "Lymphadenopathy": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tenderness": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "003A21", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Deafness": 1, "Ear discomfort": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Head discomfort": 1, "Headache": 1, "Lymphadenopathy": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tenderness": 1, "Tinnitus": 1}, "batchcodes": ["003A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003A2117.json b/docs/data/histograms/United States/003A2117.json
index 71f523065c3..924d04a91d5 100644
--- a/docs/data/histograms/United States/003A2117.json
+++ b/docs/data/histograms/United States/003A2117.json
@@ -1 +1 @@
-{"batchcode": "003A2117", "histograms": [{"batchcodes": ["003A2117"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "003A2117", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["003A2117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003A211A.json b/docs/data/histograms/United States/003A211A.json
index 63175b4eb66..7e59e2ed6cb 100644
--- a/docs/data/histograms/United States/003A211A.json
+++ b/docs/data/histograms/United States/003A211A.json
@@ -1 +1 @@
-{"batchcode": "003A211A", "histograms": [{"batchcodes": ["003A211A"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "003A211A", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["003A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003A21A..json b/docs/data/histograms/United States/003A21A..json
index f5bbe59a901..f21658e2f1e 100644
--- a/docs/data/histograms/United States/003A21A..json
+++ b/docs/data/histograms/United States/003A21A..json
@@ -1 +1 @@
-{"batchcode": "003A21A.", "histograms": [{"batchcodes": ["003A21A."], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "003A21A.", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["003A21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003A21A.json b/docs/data/histograms/United States/003A21A.json
index 24f29499fb1..dc4ddfaacb5 100644
--- a/docs/data/histograms/United States/003A21A.json
+++ b/docs/data/histograms/United States/003A21A.json
@@ -1 +1 @@
-{"batchcode": "003A21A", "histograms": [{"batchcodes": ["003A21A"], "histogram": {"Fatigue": 58, "Pyrexia": 53, "Chills": 51, "Pain in extremity": 49, "Headache": 47, "Pain": 40, "Myalgia": 35, "Nausea": 34, "Vaccination site pain": 28, "Vaccination site erythema": 24, "Erythema": 20, "Dizziness": 19, "Arthralgia": 18, "Vaccination site swelling": 17, "Vaccination site warmth": 16, "Expired product administered": 15, "Vaccination site pruritus": 15, "Feeling abnormal": 14, "Malaise": 14, "Peripheral swelling": 14, "Pruritus": 14, "Body temperature": 12, "Diarrhoea": 12, "Asthenia": 11, "Insomnia": 11, "Rash": 11, "Decreased appetite": 10, "Dyspnoea": 10, "Feeling hot": 9, "Inappropriate schedule of product administration": 9, "Influenza like illness": 9, "Product administered to patient of inappropriate age": 9, "Vomiting": 8, "COVID-19": 7, "Oropharyngeal pain": 7, "Product administration error": 7, "Somnolence": 7, "Tremor": 7, "Vaccination site rash": 7, "Blood pressure measurement": 6, "Limb discomfort": 6, "Musculoskeletal stiffness": 6, "Nasopharyngitis": 6, "Abdominal pain upper": 5, "Back pain": 5, "Gait disturbance": 5, "Heart rate": 5, "Heart rate increased": 5, "Illness": 5, "Lymphadenopathy": 5, "Paraesthesia": 5, "Urticaria": 5, "Vaccination site induration": 5, "Blood test": 4, "Cough": 4, "Exposure during pregnancy": 4, "Head discomfort": 4, "Immunisation reaction": 4, "Muscle spasms": 4, "Nasal congestion": 4, "Neck pain": 4, "Palpitations": 4, "Product dose omission issue": 4, "Rash macular": 4, "SARS-CoV-2 test": 4, "Swelling": 4, "Tinnitus": 4, "Vaccination site bruising": 4, "Vaccination site reaction": 4, "Balance disorder": 3, "Bedridden": 3, "Burning sensation": 3, "Chest pain": 3, "Confusional state": 3, "Fall": 3, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Paraesthesia oral": 3, "Pregnancy": 3, "Rash erythematous": 3, "Rash pruritic": 3, "SARS-CoV-2 test positive": 3, "Therapeutic response unexpected": 3, "Vaccination complication": 3, "Weight decreased": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Ageusia": 2, "Angioedema": 2, "Anxiety": 2, "Aphonia": 2, "Blister": 2, "Blood pressure decreased": 2, "Blood pressure fluctuation": 2, "Cerebrovascular accident": 2, "Condition aggravated": 2, "Depressed mood": 2, "Disorientation": 2, "Drug ineffective": 2, "Dysstasia": 2, "Eczema": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Eye irritation": 2, "Feeling cold": 2, "Herpes zoster": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Incorrect route of product administration": 2, "Infection": 2, "Influenza": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Mobility decreased": 2, "Muscular weakness": 2, "Nervousness": 2, "Neuralgia": 2, "Oxygen saturation": 2, "Parosmia": 2, "Pulmonary embolism": 2, "Seizure": 2, "Sinus disorder": 2, "Sneezing": 2, "Swelling face": 2, "Syncope": 2, "Tachycardia": 2, "Tenderness": 2, "Thrombosis": 2, "Vaccination site inflammation": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "X-ray": 2, "Accidental exposure to product": 1, "Accidental overdose": 1, "Adverse event": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Arthritis": 1, "Asthma": 1, "Axillary pain": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Blood urine": 1, "Blood urine present": 1, "Bone pain": 1, "Brain oedema": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Chest discomfort": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Constipation": 1, "Contusion": 1, "Cor pulmonale acute": 1, "Death": 1, "Deep vein thrombosis": 1, "Depression": 1, "Dermatitis": 1, "Discomfort": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyspnoea at rest": 1, "Ear haemorrhage": 1, "Ear pain": 1, "Epicondylitis": 1, "Epilepsy": 1, "Epstein-Barr virus infection reactivation": 1, "Exposure to SARS-CoV-2": 1, "Extrasystoles": 1, "Eye pruritus": 1, "Fear": 1, "Feeding disorder": 1, "Female orgasmic disorder": 1, "Flat affect": 1, "Gastrooesophageal reflux disease": 1, "Gingival discomfort": 1, "Groin pain": 1, "Haematemesis": 1, "Haemorrhage": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hot flush": 1, "Hypotension": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Influenza A virus test": 1, "Influenza virus test": 1, "Injection site coldness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Intermenstrual bleeding": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Laryngitis": 1, "Lethargy": 1, "Limb mass": 1, "Lip blister": 1, "Mass": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Nervous system disorder": 1, "Night sweats": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral herpes": 1, "Osteoarthritis": 1, "Pain of skin": 1, "Palatal swelling": 1, "Panic attack": 1, "Paranasal sinus discomfort": 1, "Parkinsonism": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Pneumonitis": 1, "Pregnancy test positive": 1, "Presyncope": 1, "Product storage error": 1, "Renal disorder": 1, "Retching": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "Sciatica": 1, "Shoulder injury related to vaccine administration": 1, "Sinusitis": 1, "Skin warm": 1, "Skin weeping": 1, "Sleep disorder": 1, "Sluggishness": 1, "Stress": 1, "Sunburn": 1, "Swollen tongue": 1, "Synovial cyst": 1, "Tendonitis": 1, "Therapeutic product ineffective": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat irritation": 1, "Tongue pruritus": 1, "Torticollis": 1, "Unevaluable event": 1, "Urinary tract infection": 1, "Vaccination site abscess": 1, "Vaccination site discolouration": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site nodule": 1, "Vaccination site pallor": 1, "Vaccination site urticaria": 1, "Vein disorder": 1, "Vertigo": 1, "Viral infection": 1, "Visual impairment": 1, "Vitreous floaters": 1, "Walking aid user": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "003A21A", "histograms": [{"histogram": {"Fatigue": 58, "Pyrexia": 53, "Chills": 51, "Pain in extremity": 49, "Headache": 47, "Pain": 40, "Myalgia": 35, "Nausea": 34, "Vaccination site pain": 28, "Vaccination site erythema": 24, "Erythema": 20, "Dizziness": 19, "Arthralgia": 18, "Vaccination site swelling": 17, "Vaccination site warmth": 16, "Expired product administered": 15, "Vaccination site pruritus": 15, "Feeling abnormal": 14, "Malaise": 14, "Peripheral swelling": 14, "Pruritus": 14, "Body temperature": 12, "Diarrhoea": 12, "Asthenia": 11, "Insomnia": 11, "Rash": 11, "Decreased appetite": 10, "Dyspnoea": 10, "Feeling hot": 9, "Inappropriate schedule of product administration": 9, "Influenza like illness": 9, "Product administered to patient of inappropriate age": 9, "Vomiting": 8, "COVID-19": 7, "Oropharyngeal pain": 7, "Product administration error": 7, "Somnolence": 7, "Tremor": 7, "Vaccination site rash": 7, "Blood pressure measurement": 6, "Limb discomfort": 6, "Musculoskeletal stiffness": 6, "Nasopharyngitis": 6, "Abdominal pain upper": 5, "Back pain": 5, "Gait disturbance": 5, "Heart rate": 5, "Heart rate increased": 5, "Illness": 5, "Lymphadenopathy": 5, "Paraesthesia": 5, "Urticaria": 5, "Vaccination site induration": 5, "Blood test": 4, "Cough": 4, "Exposure during pregnancy": 4, "Head discomfort": 4, "Immunisation reaction": 4, "Muscle spasms": 4, "Nasal congestion": 4, "Neck pain": 4, "Palpitations": 4, "Product dose omission issue": 4, "Rash macular": 4, "SARS-CoV-2 test": 4, "Swelling": 4, "Tinnitus": 4, "Vaccination site bruising": 4, "Vaccination site reaction": 4, "Balance disorder": 3, "Bedridden": 3, "Burning sensation": 3, "Chest pain": 3, "Confusional state": 3, "Fall": 3, "Hyperhidrosis": 3, "Loss of consciousness": 3, "Paraesthesia oral": 3, "Pregnancy": 3, "Rash erythematous": 3, "Rash pruritic": 3, "SARS-CoV-2 test positive": 3, "Therapeutic response unexpected": 3, "Vaccination complication": 3, "Weight decreased": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Ageusia": 2, "Angioedema": 2, "Anxiety": 2, "Aphonia": 2, "Blister": 2, "Blood pressure decreased": 2, "Blood pressure fluctuation": 2, "Cerebrovascular accident": 2, "Condition aggravated": 2, "Depressed mood": 2, "Disorientation": 2, "Drug ineffective": 2, "Dysstasia": 2, "Eczema": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Eye irritation": 2, "Feeling cold": 2, "Herpes zoster": 2, "Hypertension": 2, "Hypoaesthesia": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Incorrect route of product administration": 2, "Infection": 2, "Influenza": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Mobility decreased": 2, "Muscular weakness": 2, "Nervousness": 2, "Neuralgia": 2, "Oxygen saturation": 2, "Parosmia": 2, "Pulmonary embolism": 2, "Seizure": 2, "Sinus disorder": 2, "Sneezing": 2, "Swelling face": 2, "Syncope": 2, "Tachycardia": 2, "Tenderness": 2, "Thrombosis": 2, "Vaccination site inflammation": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "X-ray": 2, "Accidental exposure to product": 1, "Accidental overdose": 1, "Adverse event": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Arthritis": 1, "Asthma": 1, "Axillary pain": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Blood urine": 1, "Blood urine present": 1, "Bone pain": 1, "Brain oedema": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Chest discomfort": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Constipation": 1, "Contusion": 1, "Cor pulmonale acute": 1, "Death": 1, "Deep vein thrombosis": 1, "Depression": 1, "Dermatitis": 1, "Discomfort": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyspnoea at rest": 1, "Ear haemorrhage": 1, "Ear pain": 1, "Epicondylitis": 1, "Epilepsy": 1, "Epstein-Barr virus infection reactivation": 1, "Exposure to SARS-CoV-2": 1, "Extrasystoles": 1, "Eye pruritus": 1, "Fear": 1, "Feeding disorder": 1, "Female orgasmic disorder": 1, "Flat affect": 1, "Gastrooesophageal reflux disease": 1, "Gingival discomfort": 1, "Groin pain": 1, "Haematemesis": 1, "Haemorrhage": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hot flush": 1, "Hypotension": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Influenza A virus test": 1, "Influenza virus test": 1, "Injection site coldness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Intermenstrual bleeding": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Laryngitis": 1, "Lethargy": 1, "Limb mass": 1, "Lip blister": 1, "Mass": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Nervous system disorder": 1, "Night sweats": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral herpes": 1, "Osteoarthritis": 1, "Pain of skin": 1, "Palatal swelling": 1, "Panic attack": 1, "Paranasal sinus discomfort": 1, "Parkinsonism": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Pneumonitis": 1, "Pregnancy test positive": 1, "Presyncope": 1, "Product storage error": 1, "Renal disorder": 1, "Retching": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "Sciatica": 1, "Shoulder injury related to vaccine administration": 1, "Sinusitis": 1, "Skin warm": 1, "Skin weeping": 1, "Sleep disorder": 1, "Sluggishness": 1, "Stress": 1, "Sunburn": 1, "Swollen tongue": 1, "Synovial cyst": 1, "Tendonitis": 1, "Therapeutic product ineffective": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat irritation": 1, "Tongue pruritus": 1, "Torticollis": 1, "Unevaluable event": 1, "Urinary tract infection": 1, "Vaccination site abscess": 1, "Vaccination site discolouration": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site nodule": 1, "Vaccination site pallor": 1, "Vaccination site urticaria": 1, "Vein disorder": 1, "Vertigo": 1, "Viral infection": 1, "Visual impairment": 1, "Vitreous floaters": 1, "Walking aid user": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["003A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003A27A.json b/docs/data/histograms/United States/003A27A.json
index ea00924b603..117f73e7309 100644
--- a/docs/data/histograms/United States/003A27A.json
+++ b/docs/data/histograms/United States/003A27A.json
@@ -1 +1 @@
-{"batchcode": "003A27A", "histograms": [{"batchcodes": ["003A27A"], "histogram": {"Headache": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "003A27A", "histograms": [{"histogram": {"Headache": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["003A27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003ACIA.json b/docs/data/histograms/United States/003ACIA.json
index f15d695f3f2..773192c7a7a 100644
--- a/docs/data/histograms/United States/003ACIA.json
+++ b/docs/data/histograms/United States/003ACIA.json
@@ -1 +1 @@
-{"batchcode": "003ACIA", "histograms": [{"batchcodes": ["003ACIA"], "histogram": {"Abdominal pain": 1, "Adverse drug reaction": 1, "Blood pressure increased": 1, "Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oral pigmentation": 1, "Pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "003ACIA", "histograms": [{"histogram": {"Abdominal pain": 1, "Adverse drug reaction": 1, "Blood pressure increased": 1, "Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oral pigmentation": 1, "Pain": 1, "Vomiting": 1}, "batchcodes": ["003ACIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003AHA.json b/docs/data/histograms/United States/003AHA.json
index 1cd21c20541..ef7488effbf 100644
--- a/docs/data/histograms/United States/003AHA.json
+++ b/docs/data/histograms/United States/003AHA.json
@@ -1 +1 @@
-{"batchcode": "003AHA", "histograms": [{"batchcodes": ["003AHA"], "histogram": {"Body temperature": 1, "Chills": 1, "Headache": 1, "Insomnia": 1, "Lip swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "003AHA", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Headache": 1, "Insomnia": 1, "Lip swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["003AHA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003AZ1A.json b/docs/data/histograms/United States/003AZ1A.json
index 1faca82a9dc..ecf758d8dee 100644
--- a/docs/data/histograms/United States/003AZ1A.json
+++ b/docs/data/histograms/United States/003AZ1A.json
@@ -1 +1 @@
-{"batchcode": "003AZ1A", "histograms": [{"batchcodes": ["003AZ1A"], "histogram": {"Drug specific antibody": 1, "Fatigue": 1, "Lethargy": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "003AZ1A", "histograms": [{"histogram": {"Drug specific antibody": 1, "Fatigue": 1, "Lethargy": 1, "Somnolence": 1}, "batchcodes": ["003AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003AZIA.json b/docs/data/histograms/United States/003AZIA.json
index 27912513c7a..d2f44cc32b9 100644
--- a/docs/data/histograms/United States/003AZIA.json
+++ b/docs/data/histograms/United States/003AZIA.json
@@ -1 +1 @@
-{"batchcode": "003AZIA", "histograms": [{"batchcodes": ["003AZIA"], "histogram": {"Myalgia": 2, "Pyrexia": 2, "Asthenia": 1, "Chills": 1, "Confusional state": 1, "Dizziness": 1, "Dysgeusia": 1, "Dysstasia": 1, "Fall": 1, "Fatigue": 1, "Headache": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Injury": 1, "Nausea": 1, "Nervous system disorder": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "003AZIA", "histograms": [{"histogram": {"Myalgia": 2, "Pyrexia": 2, "Asthenia": 1, "Chills": 1, "Confusional state": 1, "Dizziness": 1, "Dysgeusia": 1, "Dysstasia": 1, "Fall": 1, "Fatigue": 1, "Headache": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Injury": 1, "Nausea": 1, "Nervous system disorder": 1, "Pain": 1}, "batchcodes": ["003AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003B21.json b/docs/data/histograms/United States/003B21.json
index bd2a0b62917..2be9c508671 100644
--- a/docs/data/histograms/United States/003B21.json
+++ b/docs/data/histograms/United States/003B21.json
@@ -1 +1 @@
-{"batchcode": "003B21", "histograms": [{"batchcodes": ["003B21"], "histogram": {"Expired product administered": 2, "Investigation": 1, "Occult blood": 1, "Physical examination": 1}}]}
\ No newline at end of file
+{"batchcode": "003B21", "histograms": [{"histogram": {"Expired product administered": 2, "Investigation": 1, "Occult blood": 1, "Physical examination": 1}, "batchcodes": ["003B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003B21A.json b/docs/data/histograms/United States/003B21A.json
index b39b84bfbe8..020cdb867c1 100644
--- a/docs/data/histograms/United States/003B21A.json
+++ b/docs/data/histograms/United States/003B21A.json
@@ -1 +1 @@
-{"batchcode": "003B21A", "histograms": [{"batchcodes": ["003B21A", "GH9697"], "histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Product use issue": 1, "Wheezing": 1}}, {"batchcodes": ["003B21A"], "histogram": {"Fatigue": 58, "Headache": 56, "Myalgia": 53, "Pyrexia": 51, "Chills": 46, "Expired product administered": 43, "Pain in extremity": 41, "Product temperature excursion issue": 34, "Vaccination site pain": 33, "Pain": 30, "Product storage error": 29, "Nausea": 28, "Dizziness": 23, "Feeling abnormal": 22, "Vaccination site erythema": 22, "Arthralgia": 20, "Vaccination site swelling": 20, "COVID-19": 19, "Vaccination site warmth": 15, "Lymphadenopathy": 14, "Asthenia": 13, "Vomiting": 13, "Illness": 12, "Rash": 12, "Swelling": 12, "Vaccination site pruritus": 12, "Dyspnoea": 11, "Erythema": 11, "Insomnia": 11, "Poor quality product administered": 11, "Pruritus": 11, "Chest pain": 10, "SARS-CoV-2 test": 10, "Wrong technique in product usage process": 9, "Feeling hot": 8, "Hyperhidrosis": 8, "Body temperature": 7, "Diarrhoea": 7, "Feeling cold": 7, "Lymph node pain": 7, "Neck pain": 7, "Palpitations": 7, "Product dose omission issue": 7, "Vaccination site reaction": 7, "Axillary pain": 6, "Decreased appetite": 6, "Inappropriate schedule of product administration": 6, "Influenza like illness": 6, "Malaise": 6, "Maternal exposure during pregnancy": 6, "Musculoskeletal stiffness": 6, "Nasopharyngitis": 6, "Oropharyngeal pain": 6, "Peripheral swelling": 6, "Physical examination": 6, "Somnolence": 6, "Tinnitus": 6, "Urticaria": 6, "Back pain": 5, "Blood pressure measurement": 5, "Heart rate": 5, "Heart rate increased": 5, "Hypoaesthesia": 5, "Mobility decreased": 5, "Paraesthesia": 5, "Product administered to patient of inappropriate age": 5, "Product administration error": 5, "Contusion": 4, "Cough": 4, "Electrocardiogram": 4, "Hypersomnia": 4, "Investigation": 4, "Muscle spasms": 4, "Swollen tongue": 4, "Vaccination site rash": 4, "Abdominal pain upper": 3, "Blood test": 3, "Condition aggravated": 3, "Dehydration": 3, "Dysgeusia": 3, "Exposure during pregnancy": 3, "Eye pruritus": 3, "Hypersensitivity": 3, "Inflammation": 3, "Laboratory test": 3, "Limb discomfort": 3, "Muscular weakness": 3, "Pregnancy test": 3, "Retching": 3, "Thirst": 3, "Urinary tract infection": 3, "Urine analysis": 3, "Vaccination site induration": 3, "Vaccination site movement impairment": 3, "Vertigo": 3, "Weight decreased": 3, "Abdominal pain": 2, "Aphasia": 2, "Atrial fibrillation": 2, "Balance disorder": 2, "Bell's palsy": 2, "Blepharospasm": 2, "Blood pressure fluctuation": 2, "Body temperature increased": 2, "Breast pain": 2, "Cellulitis": 2, "Cheilitis": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Coronavirus test": 2, "Device connection issue": 2, "Diplopia": 2, "Disorientation": 2, "Disturbance in attention": 2, "Drug ineffective": 2, "Dyspepsia": 2, "Ear pain": 2, "Eye irritation": 2, "Eye swelling": 2, "Head discomfort": 2, "Hot flush": 2, "Hypertension": 2, "Hypoaesthesia oral": 2, "Impaired work ability": 2, "Injected limb mobility decreased": 2, "Injection site erythema": 2, "Injection site pain": 2, "Injection site pruritus": 2, "Joint swelling": 2, "Lip swelling": 2, "Liver function test": 2, "Maternal exposure before pregnancy": 2, "Memory impairment": 2, "Migraine": 2, "Nasal congestion": 2, "Nervousness": 2, "Ocular hyperaemia": 2, "Oxygen saturation": 2, "Product colour issue": 2, "Product quality issue": 2, "Productive cough": 2, "Rhinorrhoea": 2, "Serum ferritin increased": 2, "Sinusitis": 2, "Skin reaction": 2, "Sleep disorder": 2, "Swelling face": 2, "Tachycardia": 2, "Throat irritation": 2, "Throat tightness": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site mass": 2, "Vision blurred": 2, "Visual impairment": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Abnormal cord insertion": 1, "Abortion spontaneous": 1, "Abscess": 1, "Accidental underdose": 1, "Acne": 1, "Ageusia": 1, "Agitation": 1, "Alopecia": 1, "Anal pruritus": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aptyalism": 1, "Arthritis": 1, "Asthma": 1, "Autoscopy": 1, "Axillary mass": 1, "Bile output abnormal": 1, "Biopsy": 1, "Bipolar disorder": 1, "Blister": 1, "Blood albumin": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Breast swelling": 1, "Bronchial oedema": 1, "Bronchitis": 1, "Bronchospasm": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cardiac murmur": 1, "Cardiac stress test": 1, "Cerebral artery embolism": 1, "Chapped lips": 1, "Chest X-ray": 1, "Cluster headache": 1, "Colitis ulcerative": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Deafness": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Defaecation urgency": 1, "Dehydroepiandrosterone test": 1, "Delirium": 1, "Depression suicidal": 1, "Device occlusion": 1, "Discomfort": 1, "Diverticulitis": 1, "Drug eruption": 1, "Dry mouth": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Eating disorder": 1, "Electromyogram": 1, "Energy increased": 1, "Epistaxis": 1, "Eustachian tube dysfunction": 1, "Exposure to SARS-CoV-2": 1, "Eye haemorrhage": 1, "Eyelid ptosis": 1, "Fall": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Flushing": 1, "Foot fracture": 1, "Freezing phenomenon": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "General physical condition": 1, "Gingival abscess": 1, "Gingival discomfort": 1, "Glucose tolerance test": 1, "Gout": 1, "Hair disorder": 1, "Heavy menstrual bleeding": 1, "Hemianaesthesia": 1, "Hemiparaesthesia": 1, "Hepatic enzyme abnormal": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hunger": 1, "Hypertensive crisis": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Incoherent": 1, "Influenza": 1, "Inguinal mass": 1, "Injection site haemorrhage": 1, "Injection site mass": 1, "Injection site swelling": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Lacrimation increased": 1, "Laryngitis": 1, "Left ventricular hypertrophy": 1, "Lethargy": 1, "Libido decreased": 1, "Limb deformity": 1, "Lip dry": 1, "Macrocytosis": 1, "Mammogram": 1, "Mass": 1, "Miliaria": 1, "Mouth swelling": 1, "Movement disorder": 1, "Mucosal dryness": 1, "Muscle contractions involuntary": 1, "Muscle contracture": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Nasal discomfort": 1, "Nasal dryness": 1, "Near death experience": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nightmare": 1, "Ocular discomfort": 1, "Off label use": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oral mucosal erythema": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pallor": 1, "Panic reaction": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Pharyngeal swelling": 1, "Pharyngitis": 1, "Placental disorder": 1, "Platelet count": 1, "Presyncope": 1, "Proctalgia": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal failure": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Right ventricular failure": 1, "Right ventricular hypertrophy": 1, "SARS-CoV-2 test positive": 1, "Scab": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin irritation": 1, "Skin test": 1, "Sleep deficit": 1, "Speech disorder": 1, "Strabismus": 1, "Subchorionic haematoma": 1, "Suspected counterfeit product": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Tenderness": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thyroid disorder": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Tuberculin test": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1, "Underdose": 1, "Unevaluable event": 1, "Urine abnormality": 1, "Vaccination complication": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vaccination site urticaria": 1, "Ventricular extrasystoles": 1, "Vulvovaginal discomfort": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "003B21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Product use issue": 1, "Wheezing": 1}, "batchcodes": ["003B21A", "GH9697"]}, {"histogram": {"Fatigue": 58, "Headache": 56, "Myalgia": 53, "Pyrexia": 51, "Chills": 46, "Expired product administered": 43, "Pain in extremity": 41, "Product temperature excursion issue": 34, "Vaccination site pain": 33, "Pain": 30, "Product storage error": 29, "Nausea": 28, "Dizziness": 23, "Feeling abnormal": 22, "Vaccination site erythema": 22, "Arthralgia": 20, "Vaccination site swelling": 20, "COVID-19": 19, "Vaccination site warmth": 15, "Lymphadenopathy": 14, "Asthenia": 13, "Vomiting": 13, "Illness": 12, "Rash": 12, "Swelling": 12, "Vaccination site pruritus": 12, "Dyspnoea": 11, "Erythema": 11, "Insomnia": 11, "Poor quality product administered": 11, "Pruritus": 11, "Chest pain": 10, "SARS-CoV-2 test": 10, "Wrong technique in product usage process": 9, "Feeling hot": 8, "Hyperhidrosis": 8, "Body temperature": 7, "Diarrhoea": 7, "Feeling cold": 7, "Lymph node pain": 7, "Neck pain": 7, "Palpitations": 7, "Product dose omission issue": 7, "Vaccination site reaction": 7, "Axillary pain": 6, "Decreased appetite": 6, "Inappropriate schedule of product administration": 6, "Influenza like illness": 6, "Malaise": 6, "Maternal exposure during pregnancy": 6, "Musculoskeletal stiffness": 6, "Nasopharyngitis": 6, "Oropharyngeal pain": 6, "Peripheral swelling": 6, "Physical examination": 6, "Somnolence": 6, "Tinnitus": 6, "Urticaria": 6, "Back pain": 5, "Blood pressure measurement": 5, "Heart rate": 5, "Heart rate increased": 5, "Hypoaesthesia": 5, "Mobility decreased": 5, "Paraesthesia": 5, "Product administered to patient of inappropriate age": 5, "Product administration error": 5, "Contusion": 4, "Cough": 4, "Electrocardiogram": 4, "Hypersomnia": 4, "Investigation": 4, "Muscle spasms": 4, "Swollen tongue": 4, "Vaccination site rash": 4, "Abdominal pain upper": 3, "Blood test": 3, "Condition aggravated": 3, "Dehydration": 3, "Dysgeusia": 3, "Exposure during pregnancy": 3, "Eye pruritus": 3, "Hypersensitivity": 3, "Inflammation": 3, "Laboratory test": 3, "Limb discomfort": 3, "Muscular weakness": 3, "Pregnancy test": 3, "Retching": 3, "Thirst": 3, "Urinary tract infection": 3, "Urine analysis": 3, "Vaccination site induration": 3, "Vaccination site movement impairment": 3, "Vertigo": 3, "Weight decreased": 3, "Abdominal pain": 2, "Aphasia": 2, "Atrial fibrillation": 2, "Balance disorder": 2, "Bell's palsy": 2, "Blepharospasm": 2, "Blood pressure fluctuation": 2, "Body temperature increased": 2, "Breast pain": 2, "Cellulitis": 2, "Cheilitis": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Coronavirus test": 2, "Device connection issue": 2, "Diplopia": 2, "Disorientation": 2, "Disturbance in attention": 2, "Drug ineffective": 2, "Dyspepsia": 2, "Ear pain": 2, "Eye irritation": 2, "Eye swelling": 2, "Head discomfort": 2, "Hot flush": 2, "Hypertension": 2, "Hypoaesthesia oral": 2, "Impaired work ability": 2, "Injected limb mobility decreased": 2, "Injection site erythema": 2, "Injection site pain": 2, "Injection site pruritus": 2, "Joint swelling": 2, "Lip swelling": 2, "Liver function test": 2, "Maternal exposure before pregnancy": 2, "Memory impairment": 2, "Migraine": 2, "Nasal congestion": 2, "Nervousness": 2, "Ocular hyperaemia": 2, "Oxygen saturation": 2, "Product colour issue": 2, "Product quality issue": 2, "Productive cough": 2, "Rhinorrhoea": 2, "Serum ferritin increased": 2, "Sinusitis": 2, "Skin reaction": 2, "Sleep disorder": 2, "Swelling face": 2, "Tachycardia": 2, "Throat irritation": 2, "Throat tightness": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site mass": 2, "Vision blurred": 2, "Visual impairment": 2, "Abdominal discomfort": 1, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Abnormal cord insertion": 1, "Abortion spontaneous": 1, "Abscess": 1, "Accidental underdose": 1, "Acne": 1, "Ageusia": 1, "Agitation": 1, "Alopecia": 1, "Anal pruritus": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Aptyalism": 1, "Arthritis": 1, "Asthma": 1, "Autoscopy": 1, "Axillary mass": 1, "Bile output abnormal": 1, "Biopsy": 1, "Bipolar disorder": 1, "Blister": 1, "Blood albumin": 1, "Blood glucose": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Breast swelling": 1, "Bronchial oedema": 1, "Bronchitis": 1, "Bronchospasm": 1, "Burning sensation": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cardiac murmur": 1, "Cardiac stress test": 1, "Cerebral artery embolism": 1, "Chapped lips": 1, "Chest X-ray": 1, "Cluster headache": 1, "Colitis ulcerative": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Deafness": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Defaecation urgency": 1, "Dehydroepiandrosterone test": 1, "Delirium": 1, "Depression suicidal": 1, "Device occlusion": 1, "Discomfort": 1, "Diverticulitis": 1, "Drug eruption": 1, "Dry mouth": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Eating disorder": 1, "Electromyogram": 1, "Energy increased": 1, "Epistaxis": 1, "Eustachian tube dysfunction": 1, "Exposure to SARS-CoV-2": 1, "Eye haemorrhage": 1, "Eyelid ptosis": 1, "Fall": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Flushing": 1, "Foot fracture": 1, "Freezing phenomenon": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "General physical condition": 1, "Gingival abscess": 1, "Gingival discomfort": 1, "Glucose tolerance test": 1, "Gout": 1, "Hair disorder": 1, "Heavy menstrual bleeding": 1, "Hemianaesthesia": 1, "Hemiparaesthesia": 1, "Hepatic enzyme abnormal": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hunger": 1, "Hypertensive crisis": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Incoherent": 1, "Influenza": 1, "Inguinal mass": 1, "Injection site haemorrhage": 1, "Injection site mass": 1, "Injection site swelling": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Lacrimation increased": 1, "Laryngitis": 1, "Left ventricular hypertrophy": 1, "Lethargy": 1, "Libido decreased": 1, "Limb deformity": 1, "Lip dry": 1, "Macrocytosis": 1, "Mammogram": 1, "Mass": 1, "Miliaria": 1, "Mouth swelling": 1, "Movement disorder": 1, "Mucosal dryness": 1, "Muscle contractions involuntary": 1, "Muscle contracture": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Nasal discomfort": 1, "Nasal dryness": 1, "Near death experience": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nightmare": 1, "Ocular discomfort": 1, "Off label use": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oral mucosal erythema": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pallor": 1, "Panic reaction": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Pharyngeal swelling": 1, "Pharyngitis": 1, "Placental disorder": 1, "Platelet count": 1, "Presyncope": 1, "Proctalgia": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal failure": 1, "Respiratory rate increased": 1, "Respiratory tract infection": 1, "Right ventricular failure": 1, "Right ventricular hypertrophy": 1, "SARS-CoV-2 test positive": 1, "Scab": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin irritation": 1, "Skin test": 1, "Sleep deficit": 1, "Speech disorder": 1, "Strabismus": 1, "Subchorionic haematoma": 1, "Suspected counterfeit product": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Tenderness": 1, "Thrombocytopenia": 1, "Thrombosis": 1, "Thyroid disorder": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Tuberculin test": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1, "Underdose": 1, "Unevaluable event": 1, "Urine abnormality": 1, "Vaccination complication": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vaccination site urticaria": 1, "Ventricular extrasystoles": 1, "Vulvovaginal discomfort": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["003B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003B21D.json b/docs/data/histograms/United States/003B21D.json
index f79cc8b4c48..db402c41489 100644
--- a/docs/data/histograms/United States/003B21D.json
+++ b/docs/data/histograms/United States/003B21D.json
@@ -1 +1 @@
-{"batchcode": "003B21D", "histograms": [{"batchcodes": ["003B21D"], "histogram": {"Arrhythmia": 3, "Pain in extremity": 3, "Atrial fibrillation": 2, "Heart rate": 2, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Pain": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "003B21D", "histograms": [{"histogram": {"Arrhythmia": 3, "Pain in extremity": 3, "Atrial fibrillation": 2, "Heart rate": 2, "Dizziness": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Pain": 1, "Palpitations": 1}, "batchcodes": ["003B21D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003B21E.json b/docs/data/histograms/United States/003B21E.json
index f3cadb0c325..82eff5951df 100644
--- a/docs/data/histograms/United States/003B21E.json
+++ b/docs/data/histograms/United States/003B21E.json
@@ -1 +1 @@
-{"batchcode": "003B21E", "histograms": [{"batchcodes": ["003B21E"], "histogram": {"Asthenia": 1, "Headache": 1, "Pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "003B21E", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Pain": 1, "Vaccination site pain": 1}, "batchcodes": ["003B21E"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003B71A.json b/docs/data/histograms/United States/003B71A.json
index 0fa6617878e..2de7157422f 100644
--- a/docs/data/histograms/United States/003B71A.json
+++ b/docs/data/histograms/United States/003B71A.json
@@ -1 +1 @@
-{"batchcode": "003B71A", "histograms": [{"batchcodes": ["003B71A"], "histogram": {"Chills": 2, "Fatigue": 2, "Pain in extremity": 2, "Pyrexia": 2, "Ageusia": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "003B71A", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Pain in extremity": 2, "Pyrexia": 2, "Ageusia": 1, "Headache": 1}, "batchcodes": ["003B71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003B84H.json b/docs/data/histograms/United States/003B84H.json
index fa9aa6aa087..b016897ba4e 100644
--- a/docs/data/histograms/United States/003B84H.json
+++ b/docs/data/histograms/United States/003B84H.json
@@ -1 +1 @@
-{"batchcode": "003B84H", "histograms": [{"batchcodes": ["003B84H"], "histogram": {"Asthenia": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Electric shock sensation": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gastrooesophageal reflux disease": 1, "Head discomfort": 1, "Hypophagia": 1, "Immunisation reaction": 1, "Lactose intolerance": 1, "Migraine": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Sinus disorder": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "003B84H", "histograms": [{"histogram": {"Asthenia": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Electric shock sensation": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gastrooesophageal reflux disease": 1, "Head discomfort": 1, "Hypophagia": 1, "Immunisation reaction": 1, "Lactose intolerance": 1, "Migraine": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Sinus disorder": 1, "Visual impairment": 1}, "batchcodes": ["003B84H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003BB21A.json b/docs/data/histograms/United States/003BB21A.json
index 8bb3bee34c9..81c15dbf848 100644
--- a/docs/data/histograms/United States/003BB21A.json
+++ b/docs/data/histograms/United States/003BB21A.json
@@ -1 +1 @@
-{"batchcode": "003BB21A", "histograms": [{"batchcodes": ["003BB21A"], "histogram": {"Pain in extremity": 2, "Chills": 1, "Discomfort": 1, "Fatigue": 1, "Feeling hot": 1, "Gait disturbance": 1, "Headache": 1, "Hyperhidrosis": 1, "Limb discomfort": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Peripheral swelling": 1, "Somnolence": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "003BB21A", "histograms": [{"histogram": {"Pain in extremity": 2, "Chills": 1, "Discomfort": 1, "Fatigue": 1, "Feeling hot": 1, "Gait disturbance": 1, "Headache": 1, "Hyperhidrosis": 1, "Limb discomfort": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Peripheral swelling": 1, "Somnolence": 1, "Vaccination site pain": 1}, "batchcodes": ["003BB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003BNA.json b/docs/data/histograms/United States/003BNA.json
index 86885aace1c..92306f6c1fc 100644
--- a/docs/data/histograms/United States/003BNA.json
+++ b/docs/data/histograms/United States/003BNA.json
@@ -1 +1 @@
-{"batchcode": "003BNA", "histograms": [{"batchcodes": ["003BNA"], "histogram": {"Nasopharyngitis": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "003BNA", "histograms": [{"histogram": {"Nasopharyngitis": 1, "Presyncope": 1}, "batchcodes": ["003BNA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003C21.json b/docs/data/histograms/United States/003C21.json
index 440a5f83a85..d61045f9837 100644
--- a/docs/data/histograms/United States/003C21.json
+++ b/docs/data/histograms/United States/003C21.json
@@ -1 +1 @@
-{"batchcode": "003C21", "histograms": [{"batchcodes": ["003C21"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "003C21", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["003C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003C211A.json b/docs/data/histograms/United States/003C211A.json
index 8e5aa70573c..8963279a1ba 100644
--- a/docs/data/histograms/United States/003C211A.json
+++ b/docs/data/histograms/United States/003C211A.json
@@ -1 +1 @@
-{"batchcode": "003C211A", "histograms": [{"batchcodes": ["003C211A"], "histogram": {"Confusional state": 1, "Headache": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "003C211A", "histograms": [{"histogram": {"Confusional state": 1, "Headache": 1, "Vaccination site pain": 1}, "batchcodes": ["003C211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003C21A.json b/docs/data/histograms/United States/003C21A.json
index 1c2ad4d4078..4d53fc315e8 100644
--- a/docs/data/histograms/United States/003C21A.json
+++ b/docs/data/histograms/United States/003C21A.json
@@ -1 +1 @@
-{"batchcode": "003C21A", "histograms": [{"batchcodes": ["003C21A", "031B21A"], "histogram": {"Chills": 1, "Extra dose administered": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Lethargy": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1}}, {"batchcodes": ["003C21A"], "histogram": {"Expired product administered": 55, "Pyrexia": 37, "Chills": 29, "Headache": 29, "Fatigue": 24, "Myalgia": 19, "Pain in extremity": 19, "Vaccination site pain": 16, "Feeling abnormal": 15, "Nausea": 14, "Rash": 12, "Pruritus": 11, "SARS-CoV-2 test": 11, "Dyspnoea": 10, "Arthralgia": 9, "Vaccination complication": 9, "Vomiting": 9, "Body temperature": 8, "Dizziness": 8, "Product dose omission issue": 8, "Product storage error": 8, "Vaccination site pruritus": 8, "Asthenia": 7, "COVID-19": 7, "Cough": 7, "Vaccination site swelling": 7, "Hypoaesthesia": 6, "Illness": 6, "Malaise": 6, "Peripheral swelling": 6, "Underdose": 6, "Vaccination site warmth": 6, "Erythema": 5, "Inappropriate schedule of product administration": 5, "Influenza like illness": 5, "Musculoskeletal stiffness": 5, "Pain": 5, "Paraesthesia": 5, "Vaccination site erythema": 5, "Bedridden": 4, "Blood pressure measurement": 4, "Device connection issue": 4, "Diarrhoea": 4, "Lethargy": 4, "Mobility decreased": 4, "Product administered to patient of inappropriate age": 4, "Rash macular": 4, "Somnolence": 4, "Urticaria": 4, "Vaccination site rash": 4, "Chest discomfort": 3, "Condition aggravated": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Hypokinesia": 3, "Impaired work ability": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Lymphadenopathy": 3, "Neck pain": 3, "Neuralgia": 3, "Oropharyngeal pain": 3, "Swelling": 3, "Taste disorder": 3, "Throat tightness": 3, "Vaccination site induration": 3, "Anxiety": 2, "Back pain": 2, "Bell's palsy": 2, "Bone pain": 2, "Chest pain": 2, "Discomfort": 2, "Disturbance in attention": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Electrocardiogram": 2, "Eye pain": 2, "Feeling cold": 2, "Gait inability": 2, "Heart rate": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Hypertension": 2, "Hypoacusis": 2, "Injection site erythema": 2, "Insomnia": 2, "Loss of consciousness": 2, "Neuropathy peripheral": 2, "Paraesthesia oral": 2, "Prothrombin time": 2, "Rash pruritic": 2, "Scratch": 2, "Swelling face": 2, "Syringe issue": 2, "Tachycardia": 2, "Throat irritation": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Abnormal dreams": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Aggression": 1, "Agitation": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Blister": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Carbon dioxide": 1, "Cardiac function test": 1, "Coagulopathy": 1, "Computerised tomogram abdomen": 1, "Constipation": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dementia": 1, "Diplopia": 1, "Drooling": 1, "Dry mouth": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear pain": 1, "Eating disorder": 1, "Epistaxis": 1, "Facial pain": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Gastritis": 1, "Gastrooesophageal reflux disease": 1, "Generalised oedema": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Immunisation reaction": 1, "Incontinence": 1, "Incorrect dose administered": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injury associated with device": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Kidney infection": 1, "Limb discomfort": 1, "Lip disorder": 1, "Lip swelling": 1, "Menstruation irregular": 1, "Motor dysfunction": 1, "Mouth ulceration": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myocardial necrosis marker": 1, "Myopathy": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Near death experience": 1, "Nervousness": 1, "No adverse event": 1, "Nodule": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Platelet count": 1, "Product administration error": 1, "Product expiration date issue": 1, "Product temperature excursion issue": 1, "Prothrombin level decreased": 1, "Psychotic disorder": 1, "Restlessness": 1, "Retching": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "Secretion discharge": 1, "Sensitisation": 1, "Sinus disorder": 1, "Skin discolouration": 1, "Skin infection": 1, "Sleep disorder": 1, "Sneezing": 1, "Spinal pain": 1, "Splenic rupture": 1, "Substance-induced psychotic disorder": 1, "Swelling of eyelid": 1, "Temperature intolerance": 1, "Thirst": 1, "Tinnitus": 1, "Tongue disorder": 1, "Tremor": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vertigo": 1, "Vision blurred": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "003C21A", "histograms": [{"histogram": {"Chills": 1, "Extra dose administered": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Lethargy": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["003C21A", "031B21A"]}, {"histogram": {"Expired product administered": 55, "Pyrexia": 37, "Chills": 29, "Headache": 29, "Fatigue": 24, "Myalgia": 19, "Pain in extremity": 19, "Vaccination site pain": 16, "Feeling abnormal": 15, "Nausea": 14, "Rash": 12, "Pruritus": 11, "SARS-CoV-2 test": 11, "Dyspnoea": 10, "Arthralgia": 9, "Vaccination complication": 9, "Vomiting": 9, "Body temperature": 8, "Dizziness": 8, "Product dose omission issue": 8, "Product storage error": 8, "Vaccination site pruritus": 8, "Asthenia": 7, "COVID-19": 7, "Cough": 7, "Vaccination site swelling": 7, "Hypoaesthesia": 6, "Illness": 6, "Malaise": 6, "Peripheral swelling": 6, "Underdose": 6, "Vaccination site warmth": 6, "Erythema": 5, "Inappropriate schedule of product administration": 5, "Influenza like illness": 5, "Musculoskeletal stiffness": 5, "Pain": 5, "Paraesthesia": 5, "Vaccination site erythema": 5, "Bedridden": 4, "Blood pressure measurement": 4, "Device connection issue": 4, "Diarrhoea": 4, "Lethargy": 4, "Mobility decreased": 4, "Product administered to patient of inappropriate age": 4, "Rash macular": 4, "Somnolence": 4, "Urticaria": 4, "Vaccination site rash": 4, "Chest discomfort": 3, "Condition aggravated": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Hypokinesia": 3, "Impaired work ability": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Lymphadenopathy": 3, "Neck pain": 3, "Neuralgia": 3, "Oropharyngeal pain": 3, "Swelling": 3, "Taste disorder": 3, "Throat tightness": 3, "Vaccination site induration": 3, "Anxiety": 2, "Back pain": 2, "Bell's palsy": 2, "Bone pain": 2, "Chest pain": 2, "Discomfort": 2, "Disturbance in attention": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Electrocardiogram": 2, "Eye pain": 2, "Feeling cold": 2, "Gait inability": 2, "Heart rate": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Hypertension": 2, "Hypoacusis": 2, "Injection site erythema": 2, "Insomnia": 2, "Loss of consciousness": 2, "Neuropathy peripheral": 2, "Paraesthesia oral": 2, "Prothrombin time": 2, "Rash pruritic": 2, "Scratch": 2, "Swelling face": 2, "Syringe issue": 2, "Tachycardia": 2, "Throat irritation": 2, "Wheezing": 2, "Abdominal discomfort": 1, "Abnormal behaviour": 1, "Abnormal dreams": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Aggression": 1, "Agitation": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Blister": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Carbon dioxide": 1, "Cardiac function test": 1, "Coagulopathy": 1, "Computerised tomogram abdomen": 1, "Constipation": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Dementia": 1, "Diplopia": 1, "Drooling": 1, "Dry mouth": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear pain": 1, "Eating disorder": 1, "Epistaxis": 1, "Facial pain": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Gastritis": 1, "Gastrooesophageal reflux disease": 1, "Generalised oedema": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Immunisation reaction": 1, "Incontinence": 1, "Incorrect dose administered": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injury associated with device": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Kidney infection": 1, "Limb discomfort": 1, "Lip disorder": 1, "Lip swelling": 1, "Menstruation irregular": 1, "Motor dysfunction": 1, "Mouth ulceration": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myocardial necrosis marker": 1, "Myopathy": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Near death experience": 1, "Nervousness": 1, "No adverse event": 1, "Nodule": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Platelet count": 1, "Product administration error": 1, "Product expiration date issue": 1, "Product temperature excursion issue": 1, "Prothrombin level decreased": 1, "Psychotic disorder": 1, "Restlessness": 1, "Retching": 1, "Rhinorrhoea": 1, "SARS-CoV-1 test": 1, "Secretion discharge": 1, "Sensitisation": 1, "Sinus disorder": 1, "Skin discolouration": 1, "Skin infection": 1, "Sleep disorder": 1, "Sneezing": 1, "Spinal pain": 1, "Splenic rupture": 1, "Substance-induced psychotic disorder": 1, "Swelling of eyelid": 1, "Temperature intolerance": 1, "Thirst": 1, "Tinnitus": 1, "Tongue disorder": 1, "Tremor": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vertigo": 1, "Vision blurred": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["003C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003C21N.json b/docs/data/histograms/United States/003C21N.json
index 044a67c82ad..4f4776f2428 100644
--- a/docs/data/histograms/United States/003C21N.json
+++ b/docs/data/histograms/United States/003C21N.json
@@ -1 +1 @@
-{"batchcode": "003C21N", "histograms": [{"batchcodes": ["003C21N"], "histogram": {"Dyspnoea": 1, "Nasal congestion": 1, "Product administered to patient of inappropriate age": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "003C21N", "histograms": [{"histogram": {"Dyspnoea": 1, "Nasal congestion": 1, "Product administered to patient of inappropriate age": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["003C21N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003C2HA.json b/docs/data/histograms/United States/003C2HA.json
index de400da8855..acc4838c1d2 100644
--- a/docs/data/histograms/United States/003C2HA.json
+++ b/docs/data/histograms/United States/003C2HA.json
@@ -1 +1 @@
-{"batchcode": "003C2HA", "histograms": [{"batchcodes": ["003C2HA"], "histogram": {"Abdominal discomfort": 1, "Illness": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "003C2HA", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Illness": 1, "Nausea": 1}, "batchcodes": ["003C2HA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003CB1A.json b/docs/data/histograms/United States/003CB1A.json
index 74e67b787e9..0a6ca935c7b 100644
--- a/docs/data/histograms/United States/003CB1A.json
+++ b/docs/data/histograms/United States/003CB1A.json
@@ -1 +1 @@
-{"batchcode": "003CB1A", "histograms": [{"batchcodes": ["003CB1A"], "histogram": {"Headache": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "003CB1A", "histograms": [{"histogram": {"Headache": 1, "Peripheral swelling": 1}, "batchcodes": ["003CB1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003CZ1A OR 003C.json b/docs/data/histograms/United States/003CZ1A OR 003C.json
index 3665a9d92e8..d49735304d8 100644
--- a/docs/data/histograms/United States/003CZ1A OR 003C.json
+++ b/docs/data/histograms/United States/003CZ1A OR 003C.json
@@ -1 +1 @@
-{"batchcode": "003CZ1A OR 003C", "histograms": [{"batchcodes": ["003CZ1A OR 003C"], "histogram": {"Fatigue": 1, "Feeling cold": 1, "Frustration tolerance decreased": 1, "Impaired work ability": 1, "Pain in extremity": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "003CZ1A OR 003C", "histograms": [{"histogram": {"Fatigue": 1, "Feeling cold": 1, "Frustration tolerance decreased": 1, "Impaired work ability": 1, "Pain in extremity": 1, "Somnolence": 1}, "batchcodes": ["003CZ1A OR 003C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003CZ1A.json b/docs/data/histograms/United States/003CZ1A.json
index 54defea4b0f..aa2b9469103 100644
--- a/docs/data/histograms/United States/003CZ1A.json
+++ b/docs/data/histograms/United States/003CZ1A.json
@@ -1 +1 @@
-{"batchcode": "003CZ1A", "histograms": [{"batchcodes": ["003CZ1A"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan vagina": 1}}]}
\ No newline at end of file
+{"batchcode": "003CZ1A", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan vagina": 1}, "batchcodes": ["003CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003CZIA.json b/docs/data/histograms/United States/003CZIA.json
index f60e7b8bd01..1b9b723e0dc 100644
--- a/docs/data/histograms/United States/003CZIA.json
+++ b/docs/data/histograms/United States/003CZIA.json
@@ -1 +1 @@
-{"batchcode": "003CZIA", "histograms": [{"batchcodes": ["003CZIA"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "003CZIA", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["003CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003D21A.json b/docs/data/histograms/United States/003D21A.json
index b91654e525b..91b1b6e1d8a 100644
--- a/docs/data/histograms/United States/003D21A.json
+++ b/docs/data/histograms/United States/003D21A.json
@@ -1 +1 @@
-{"batchcode": "003D21A", "histograms": [{"batchcodes": ["003D21A"], "histogram": {"Asthenia": 1, "Back pain": 1, "Diarrhoea": 1, "Fatigue": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "003D21A", "histograms": [{"histogram": {"Asthenia": 1, "Back pain": 1, "Diarrhoea": 1, "Fatigue": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["003D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003E21A..json b/docs/data/histograms/United States/003E21A..json
index ce640a984d8..c30958c8b7e 100644
--- a/docs/data/histograms/United States/003E21A..json
+++ b/docs/data/histograms/United States/003E21A..json
@@ -1 +1 @@
-{"batchcode": "003E21A.", "histograms": [{"batchcodes": ["003E21A."], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hot flush": 1, "Peripheral swelling": 1, "Pigmentation disorder": 1, "Swelling face": 1, "Thought blocking": 1}}]}
\ No newline at end of file
+{"batchcode": "003E21A.", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hot flush": 1, "Peripheral swelling": 1, "Pigmentation disorder": 1, "Swelling face": 1, "Thought blocking": 1}, "batchcodes": ["003E21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003E21A.json b/docs/data/histograms/United States/003E21A.json
index 3d74a64ddd0..3015080c79a 100644
--- a/docs/data/histograms/United States/003E21A.json
+++ b/docs/data/histograms/United States/003E21A.json
@@ -1 +1 @@
-{"batchcode": "003E21A", "histograms": [{"batchcodes": ["003E21A"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hot flush": 1, "Mobility decreased": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Skin discolouration": 1, "Thought blocking": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "003E21A", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hot flush": 1, "Mobility decreased": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Skin discolouration": 1, "Thought blocking": 1, "Tremor": 1}, "batchcodes": ["003E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003F2121A.json b/docs/data/histograms/United States/003F2121A.json
index e0c4f7cfed9..fd44a3b884b 100644
--- a/docs/data/histograms/United States/003F2121A.json
+++ b/docs/data/histograms/United States/003F2121A.json
@@ -1 +1 @@
-{"batchcode": "003F2121A", "histograms": [{"batchcodes": ["003F2121A"], "histogram": {"Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "003F2121A", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["003F2121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003F214.json b/docs/data/histograms/United States/003F214.json
index d7cb931e736..42036a4ab54 100644
--- a/docs/data/histograms/United States/003F214.json
+++ b/docs/data/histograms/United States/003F214.json
@@ -1 +1 @@
-{"batchcode": "003F214", "histograms": [{"batchcodes": ["003F214", "1805018"], "histogram": {"Asymptomatic COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "003F214", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["003F214", "1805018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003F21A.json b/docs/data/histograms/United States/003F21A.json
index 59507df903c..1eba35446e0 100644
--- a/docs/data/histograms/United States/003F21A.json
+++ b/docs/data/histograms/United States/003F21A.json
@@ -1 +1 @@
-{"batchcode": "003F21A", "histograms": [{"batchcodes": ["003F21A"], "histogram": {"Expired product administered": 7, "Fatigue": 4, "Arthralgia": 3, "Headache": 3, "Pyrexia": 3, "Somnolence": 3, "Ageusia": 2, "Anosmia": 2, "Asthenia": 2, "Blood pressure measurement": 2, "Cough": 2, "Erythema": 2, "Feeling hot": 2, "Myalgia": 2, "Pain in extremity": 2, "Palpitations": 2, "Product administered to patient of inappropriate age": 2, "Product dose omission issue": 2, "Product storage error": 2, "Swelling": 2, "Swelling face": 2, "Accidental overdose": 1, "Axillary pain": 1, "Back pain": 1, "Blood test": 1, "Body temperature": 1, "Burning feet syndrome": 1, "COVID-19": 1, "Chills": 1, "Cutaneous lupus erythematosus": 1, "Decreased appetite": 1, "Dermatitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Embolic stroke": 1, "Eye inflammation": 1, "Eye pain": 1, "Faeces discoloured": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Groin pain": 1, "Heart rate": 1, "Hyperlipidaemia": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Limb discomfort": 1, "Lip swelling": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Muscle spasms": 1, "Nausea": 1, "Ocular discomfort": 1, "Pain": 1, "Pneumonia": 1, "Product temperature excursion issue": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Skin mass": 1, "Sleep disorder": 1, "Suppressed lactation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Visual impairment": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "003F21A", "histograms": [{"histogram": {"Expired product administered": 7, "Fatigue": 4, "Arthralgia": 3, "Headache": 3, "Pyrexia": 3, "Somnolence": 3, "Ageusia": 2, "Anosmia": 2, "Asthenia": 2, "Blood pressure measurement": 2, "Cough": 2, "Erythema": 2, "Feeling hot": 2, "Myalgia": 2, "Pain in extremity": 2, "Palpitations": 2, "Product administered to patient of inappropriate age": 2, "Product dose omission issue": 2, "Product storage error": 2, "Swelling": 2, "Swelling face": 2, "Accidental overdose": 1, "Axillary pain": 1, "Back pain": 1, "Blood test": 1, "Body temperature": 1, "Burning feet syndrome": 1, "COVID-19": 1, "Chills": 1, "Cutaneous lupus erythematosus": 1, "Decreased appetite": 1, "Dermatitis": 1, "Dizziness": 1, "Dyspnoea": 1, "Embolic stroke": 1, "Eye inflammation": 1, "Eye pain": 1, "Faeces discoloured": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Groin pain": 1, "Heart rate": 1, "Hyperlipidaemia": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Inappropriate schedule of product administration": 1, "Influenza": 1, "Limb discomfort": 1, "Lip swelling": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Muscle spasms": 1, "Nausea": 1, "Ocular discomfort": 1, "Pain": 1, "Pneumonia": 1, "Product temperature excursion issue": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Skin mass": 1, "Sleep disorder": 1, "Suppressed lactation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Visual impairment": 1, "Vomiting": 1}, "batchcodes": ["003F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003J21-2A.json b/docs/data/histograms/United States/003J21-2A.json
index a227ae66ac5..a4ca59d09dc 100644
--- a/docs/data/histograms/United States/003J21-2A.json
+++ b/docs/data/histograms/United States/003J21-2A.json
@@ -1 +1 @@
-{"batchcode": "003J21-2A", "histograms": [{"batchcodes": ["003J21-2A"], "histogram": {"Expired product administered": 6, "Product storage error": 5, "Headache": 3, "Vaccination site pain": 3, "SARS-CoV-2 test": 2, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "COVID-19": 1, "Erythema": 1, "Feeling hot": 1, "Malaise": 1, "Mass": 1, "Menstruation irregular": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site mass": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "003J21-2A", "histograms": [{"histogram": {"Expired product administered": 6, "Product storage error": 5, "Headache": 3, "Vaccination site pain": 3, "SARS-CoV-2 test": 2, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "COVID-19": 1, "Erythema": 1, "Feeling hot": 1, "Malaise": 1, "Mass": 1, "Menstruation irregular": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site mass": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["003J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003J21/2A.json b/docs/data/histograms/United States/003J21/2A.json
index 7b0db4ef68e..b5f80671b9d 100644
--- a/docs/data/histograms/United States/003J21/2A.json
+++ b/docs/data/histograms/United States/003J21/2A.json
@@ -1 +1 @@
-{"batchcode": "003J21/2A", "histograms": [{"batchcodes": ["003J21/2A"], "histogram": {"Inappropriate schedule of product administration": 2}}]}
\ No newline at end of file
+{"batchcode": "003J21/2A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 2}, "batchcodes": ["003J21/2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003J212A.json b/docs/data/histograms/United States/003J212A.json
index 78f909580a9..64c4da8a3b4 100644
--- a/docs/data/histograms/United States/003J212A.json
+++ b/docs/data/histograms/United States/003J212A.json
@@ -1 +1 @@
-{"batchcode": "003J212A", "histograms": [{"batchcodes": ["003J212A"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "003J212A", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["003J212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003K21-2A.json b/docs/data/histograms/United States/003K21-2A.json
index d7ffa96c057..5aeb6c51e24 100644
--- a/docs/data/histograms/United States/003K21-2A.json
+++ b/docs/data/histograms/United States/003K21-2A.json
@@ -1 +1 @@
-{"batchcode": "003K21-2A", "histograms": [{"batchcodes": ["003K21-2A"], "histogram": {"Expired product administered": 10, "Product storage error": 8, "No adverse event": 5, "Illness": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "003K21-2A", "histograms": [{"histogram": {"Expired product administered": 10, "Product storage error": 8, "No adverse event": 5, "Illness": 1, "Malaise": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["003K21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003K21A.json b/docs/data/histograms/United States/003K21A.json
index 5736cfe30e1..276b91fa9c3 100644
--- a/docs/data/histograms/United States/003K21A.json
+++ b/docs/data/histograms/United States/003K21A.json
@@ -1 +1 @@
-{"batchcode": "003K21A", "histograms": [{"batchcodes": ["003K21A"], "histogram": {"COVID-19": 1, "Dizziness": 1, "Ear haemorrhage": 1, "Epistaxis": 1, "Eye haemorrhage": 1, "Internal haemorrhage": 1, "Pharyngeal haemorrhage": 1, "Tinnitus": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "003K21A", "histograms": [{"histogram": {"COVID-19": 1, "Dizziness": 1, "Ear haemorrhage": 1, "Epistaxis": 1, "Eye haemorrhage": 1, "Internal haemorrhage": 1, "Pharyngeal haemorrhage": 1, "Tinnitus": 1, "Vaccination failure": 1}, "batchcodes": ["003K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003L20A.json b/docs/data/histograms/United States/003L20A.json
index 7dca9651e45..4cc17a58220 100644
--- a/docs/data/histograms/United States/003L20A.json
+++ b/docs/data/histograms/United States/003L20A.json
@@ -1 +1 @@
-{"batchcode": "003L20A", "histograms": [{"batchcodes": ["003L20A"], "histogram": {"Bronchitis": 1, "Cough": 1}}]}
\ No newline at end of file
+{"batchcode": "003L20A", "histograms": [{"histogram": {"Bronchitis": 1, "Cough": 1}, "batchcodes": ["003L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003L30A.json b/docs/data/histograms/United States/003L30A.json
index 849b71e0b59..135a96f9a15 100644
--- a/docs/data/histograms/United States/003L30A.json
+++ b/docs/data/histograms/United States/003L30A.json
@@ -1 +1 @@
-{"batchcode": "003L30A", "histograms": [{"batchcodes": ["003L30A"], "histogram": {"Arthralgia": 2, "Arthritis": 2, "Dizziness": 2, "Dyspnoea": 2, "Hyperhidrosis": 2, "Vomiting": 2, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "003L30A", "histograms": [{"histogram": {"Arthralgia": 2, "Arthritis": 2, "Dizziness": 2, "Dyspnoea": 2, "Hyperhidrosis": 2, "Vomiting": 2, "Myalgia": 1}, "batchcodes": ["003L30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003M20A.json b/docs/data/histograms/United States/003M20A.json
index 78622813ae5..9a01eefa4a0 100644
--- a/docs/data/histograms/United States/003M20A.json
+++ b/docs/data/histograms/United States/003M20A.json
@@ -1 +1 @@
-{"batchcode": "003M20A", "histograms": [{"batchcodes": ["003M20A"], "histogram": {"Adverse event": 1, "Back pain": 1, "Chest discomfort": 1, "Choking sensation": 1, "Fatigue": 1, "Haemorrhage": 1, "Headache": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Neck pain": 1, "Nuchal rigidity": 1, "Swelling": 1, "Vaccination complication": 1, "Vein rupture": 1}}]}
\ No newline at end of file
+{"batchcode": "003M20A", "histograms": [{"histogram": {"Adverse event": 1, "Back pain": 1, "Chest discomfort": 1, "Choking sensation": 1, "Fatigue": 1, "Haemorrhage": 1, "Headache": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Neck pain": 1, "Nuchal rigidity": 1, "Swelling": 1, "Vaccination complication": 1, "Vein rupture": 1}, "batchcodes": ["003M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003M21A.json b/docs/data/histograms/United States/003M21A.json
index 23322fc3f6a..5a527f36162 100644
--- a/docs/data/histograms/United States/003M21A.json
+++ b/docs/data/histograms/United States/003M21A.json
@@ -1 +1 @@
-{"batchcode": "003M21A", "histograms": [{"batchcodes": ["003M21A"], "histogram": {"Poor quality product administered": 1, "Product temperature excursion issue": 1}}]}
\ No newline at end of file
+{"batchcode": "003M21A", "histograms": [{"histogram": {"Poor quality product administered": 1, "Product temperature excursion issue": 1}, "batchcodes": ["003M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003T-21A.json b/docs/data/histograms/United States/003T-21A.json
index cfb89b9cbfa..dc03c467009 100644
--- a/docs/data/histograms/United States/003T-21A.json
+++ b/docs/data/histograms/United States/003T-21A.json
@@ -1 +1 @@
-{"batchcode": "003T-21A", "histograms": [{"batchcodes": ["003T-21A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "003T-21A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Vaccination complication": 1}, "batchcodes": ["003T-21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/003T21A.json b/docs/data/histograms/United States/003T21A.json
index 25a9055af44..1b2f3945590 100644
--- a/docs/data/histograms/United States/003T21A.json
+++ b/docs/data/histograms/United States/003T21A.json
@@ -1 +1 @@
-{"batchcode": "003T21A", "histograms": [{"batchcodes": ["003T21A"], "histogram": {"Dyspnoea": 1, "Intentional product use issue": 1}}]}
\ No newline at end of file
+{"batchcode": "003T21A", "histograms": [{"histogram": {"Dyspnoea": 1, "Intentional product use issue": 1}, "batchcodes": ["003T21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004020A.json b/docs/data/histograms/United States/004020A.json
index c7d276e436d..657d01a7218 100644
--- a/docs/data/histograms/United States/004020A.json
+++ b/docs/data/histograms/United States/004020A.json
@@ -1 +1 @@
-{"batchcode": "004020A", "histograms": [{"batchcodes": ["004020A"], "histogram": {"Fatigue": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "004020A", "histograms": [{"histogram": {"Fatigue": 1, "Nausea": 1}, "batchcodes": ["004020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004021A.json b/docs/data/histograms/United States/004021A.json
index 374909d9952..0c307b3a1d8 100644
--- a/docs/data/histograms/United States/004021A.json
+++ b/docs/data/histograms/United States/004021A.json
@@ -1 +1 @@
-{"batchcode": "004021A", "histograms": [{"batchcodes": ["004021A"], "histogram": {"Lymphadenopathy": 2, "Expired product administered": 1, "Lymphorrhoea": 1, "Suspected COVID-19": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "004021A", "histograms": [{"histogram": {"Lymphadenopathy": 2, "Expired product administered": 1, "Lymphorrhoea": 1, "Suspected COVID-19": 1, "Vaccination complication": 1}, "batchcodes": ["004021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004121A.json b/docs/data/histograms/United States/004121A.json
index 52c4bcf0324..c3c68a1fc3d 100644
--- a/docs/data/histograms/United States/004121A.json
+++ b/docs/data/histograms/United States/004121A.json
@@ -1 +1 @@
-{"batchcode": "004121A", "histograms": [{"batchcodes": ["004121A"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Feeling abnormal": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "004121A", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Feeling abnormal": 1, "Headache": 1}, "batchcodes": ["004121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0041297301.json b/docs/data/histograms/United States/0041297301.json
index ce4260ddc1d..dac8c4252d8 100644
--- a/docs/data/histograms/United States/0041297301.json
+++ b/docs/data/histograms/United States/0041297301.json
@@ -1 +1 @@
-{"batchcode": "0041297301", "histograms": [{"batchcodes": ["0041297301"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dysgeusia": 1, "Dysphagia": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "0041297301", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dysgeusia": 1, "Dysphagia": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["0041297301"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00417120A.json b/docs/data/histograms/United States/00417120A.json
index 77bcd7b7f02..27df6cff97d 100644
--- a/docs/data/histograms/United States/00417120A.json
+++ b/docs/data/histograms/United States/00417120A.json
@@ -1 +1 @@
-{"batchcode": "00417120A", "histograms": [{"batchcodes": ["00417120A"], "histogram": {"Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Diarrhoea": 1, "Muscle spasms": 1, "Nausea": 1, "Peripheral coldness": 1}}]}
\ No newline at end of file
+{"batchcode": "00417120A", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Diarrhoea": 1, "Muscle spasms": 1, "Nausea": 1, "Peripheral coldness": 1}, "batchcodes": ["00417120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0041720A.json b/docs/data/histograms/United States/0041720A.json
index 99275550968..85bce29048b 100644
--- a/docs/data/histograms/United States/0041720A.json
+++ b/docs/data/histograms/United States/0041720A.json
@@ -1 +1 @@
-{"batchcode": "0041720A", "histograms": [{"batchcodes": ["0041720A"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Dysphonia": 1, "Fatigue": 1, "Headache": 1, "Lacrimation increased": 1, "Paranasal sinus discomfort": 1, "Periorbital swelling": 1, "Rhinorrhoea": 1, "Sinus congestion": 1, "Sneezing": 1, "Upper-airway cough syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "0041720A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Dysphonia": 1, "Fatigue": 1, "Headache": 1, "Lacrimation increased": 1, "Paranasal sinus discomfort": 1, "Periorbital swelling": 1, "Rhinorrhoea": 1, "Sinus congestion": 1, "Sneezing": 1, "Upper-airway cough syndrome": 1}, "batchcodes": ["0041720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0041991.json b/docs/data/histograms/United States/0041991.json
index 7e52b68e2aa..5bcbe685f35 100644
--- a/docs/data/histograms/United States/0041991.json
+++ b/docs/data/histograms/United States/0041991.json
@@ -1 +1 @@
-{"batchcode": "0041991", "histograms": [{"batchcodes": ["0041991"], "histogram": {"Abdominal discomfort": 1, "Cold sweat": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Incorrect dose administered": 1, "Lip swelling": 1, "Pain": 1, "Sensation of foreign body": 1, "Skin test": 1, "Swelling face": 1, "Swollen tongue": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "0041991", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Cold sweat": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Incorrect dose administered": 1, "Lip swelling": 1, "Pain": 1, "Sensation of foreign body": 1, "Skin test": 1, "Swelling face": 1, "Swollen tongue": 1, "Vaccination site pruritus": 1}, "batchcodes": ["0041991"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00420A.json b/docs/data/histograms/United States/00420A.json
index 64593660637..5f831827eba 100644
--- a/docs/data/histograms/United States/00420A.json
+++ b/docs/data/histograms/United States/00420A.json
@@ -1 +1 @@
-{"batchcode": "00420A", "histograms": [{"batchcodes": ["00420A"], "histogram": {"Anosmia": 1, "Asthenia": 1, "Decreased appetite": 1, "Injection site pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00420A", "histograms": [{"histogram": {"Anosmia": 1, "Asthenia": 1, "Decreased appetite": 1, "Injection site pain": 1, "Vaccination site pain": 1}, "batchcodes": ["00420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0043A21A.json b/docs/data/histograms/United States/0043A21A.json
index eb11b28d267..203a645b31e 100644
--- a/docs/data/histograms/United States/0043A21A.json
+++ b/docs/data/histograms/United States/0043A21A.json
@@ -1 +1 @@
-{"batchcode": "0043A21A", "histograms": [{"batchcodes": ["0043A21A"], "histogram": {"Poor quality product administered": 1, "Product administered to patient of inappropriate age": 1, "Underdose": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "0043A21A", "histograms": [{"histogram": {"Poor quality product administered": 1, "Product administered to patient of inappropriate age": 1, "Underdose": 1, "Wrong product administered": 1}, "batchcodes": ["0043A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004420A.json b/docs/data/histograms/United States/004420A.json
index dabc975665f..53415c8e04d 100644
--- a/docs/data/histograms/United States/004420A.json
+++ b/docs/data/histograms/United States/004420A.json
@@ -1 +1 @@
-{"batchcode": "004420A", "histograms": [{"batchcodes": ["004420A"], "histogram": {"Sluggishness": 1, "Vaccination site discolouration": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "004420A", "histograms": [{"histogram": {"Sluggishness": 1, "Vaccination site discolouration": 1, "Vaccination site rash": 1}, "batchcodes": ["004420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0044B21A.json b/docs/data/histograms/United States/0044B21A.json
index 7ef9403f031..19ea0bf481b 100644
--- a/docs/data/histograms/United States/0044B21A.json
+++ b/docs/data/histograms/United States/0044B21A.json
@@ -1 +1 @@
-{"batchcode": "0044B21A", "histograms": [{"batchcodes": ["0044B21A"], "histogram": {"Feeling abnormal": 1, "Gait disturbance": 1, "Musculoskeletal stiffness": 1}}]}
\ No newline at end of file
+{"batchcode": "0044B21A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Gait disturbance": 1, "Musculoskeletal stiffness": 1}, "batchcodes": ["0044B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0045A21A.json b/docs/data/histograms/United States/0045A21A.json
index d7d6a0fc895..fa4cfac70af 100644
--- a/docs/data/histograms/United States/0045A21A.json
+++ b/docs/data/histograms/United States/0045A21A.json
@@ -1 +1 @@
-{"batchcode": "0045A21A", "histograms": [{"batchcodes": ["0045A21A"], "histogram": {"Dizziness": 1, "Hypertension": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0045A21A", "histograms": [{"histogram": {"Dizziness": 1, "Hypertension": 1, "Pain in extremity": 1}, "batchcodes": ["0045A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0046214.json b/docs/data/histograms/United States/0046214.json
index 99ee2cf757c..5b64bc03af8 100644
--- a/docs/data/histograms/United States/0046214.json
+++ b/docs/data/histograms/United States/0046214.json
@@ -1 +1 @@
-{"batchcode": "0046214", "histograms": [{"batchcodes": ["0046214"], "histogram": {"Body temperature": 1, "Chills": 1, "Cough": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0046214", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Cough": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["0046214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004921A.json b/docs/data/histograms/United States/004921A.json
index 8af3904a30b..71c540826de 100644
--- a/docs/data/histograms/United States/004921A.json
+++ b/docs/data/histograms/United States/004921A.json
@@ -1 +1 @@
-{"batchcode": "004921A", "histograms": [{"batchcodes": ["004921A"], "histogram": {"Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "004921A", "histograms": [{"histogram": {"Chest discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1}, "batchcodes": ["004921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004A21A.json b/docs/data/histograms/United States/004A21A.json
index b03d9af182e..42ade7c6b50 100644
--- a/docs/data/histograms/United States/004A21A.json
+++ b/docs/data/histograms/United States/004A21A.json
@@ -1 +1 @@
-{"batchcode": "004A21A", "histograms": [{"batchcodes": ["004A21A"], "histogram": {"Contusion": 1, "Erythema": 1, "Fatigue": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "004A21A", "histograms": [{"histogram": {"Contusion": 1, "Erythema": 1, "Fatigue": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Vaccination site pain": 1}, "batchcodes": ["004A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004AZ1A.json b/docs/data/histograms/United States/004AZ1A.json
index e90e6cd7194..3b8d0e91bb2 100644
--- a/docs/data/histograms/United States/004AZ1A.json
+++ b/docs/data/histograms/United States/004AZ1A.json
@@ -1 +1 @@
-{"batchcode": "004AZ1A", "histograms": [{"batchcodes": ["004AZ1A"], "histogram": {"Body temperature": 1, "Chills": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "004AZ1A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["004AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004B21A.json b/docs/data/histograms/United States/004B21A.json
index 38643cda427..df08d7ba6cb 100644
--- a/docs/data/histograms/United States/004B21A.json
+++ b/docs/data/histograms/United States/004B21A.json
@@ -1 +1 @@
-{"batchcode": "004B21A", "histograms": [{"batchcodes": ["004B21A"], "histogram": {"Pyrexia": 5, "Inappropriate schedule of product administration": 3, "Dizziness": 2, "Myalgia": 2, "Nausea": 2, "Pain in extremity": 2, "Accidental underdose": 1, "Chills": 1, "Cough": 1, "Device connection issue": 1, "Fatigue": 1, "Feeling hot": 1, "Head discomfort": 1, "Headache": 1, "Hyperhidrosis": 1, "Malaise": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "004B21A", "histograms": [{"histogram": {"Pyrexia": 5, "Inappropriate schedule of product administration": 3, "Dizziness": 2, "Myalgia": 2, "Nausea": 2, "Pain in extremity": 2, "Accidental underdose": 1, "Chills": 1, "Cough": 1, "Device connection issue": 1, "Fatigue": 1, "Feeling hot": 1, "Head discomfort": 1, "Headache": 1, "Hyperhidrosis": 1, "Malaise": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vomiting": 1}, "batchcodes": ["004B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004C21.json b/docs/data/histograms/United States/004C21.json
index 0f94491a498..c0d35767d3d 100644
--- a/docs/data/histograms/United States/004C21.json
+++ b/docs/data/histograms/United States/004C21.json
@@ -1 +1 @@
-{"batchcode": "004C21", "histograms": [{"batchcodes": ["004C21"], "histogram": {"Expired product administered": 1, "Paraesthesia": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "004C21", "histograms": [{"histogram": {"Expired product administered": 1, "Paraesthesia": 1, "Pruritus": 1}, "batchcodes": ["004C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004C214.json b/docs/data/histograms/United States/004C214.json
index 94a6a42bef6..16b15602229 100644
--- a/docs/data/histograms/United States/004C214.json
+++ b/docs/data/histograms/United States/004C214.json
@@ -1 +1 @@
-{"batchcode": "004C214", "histograms": [{"batchcodes": ["004C214"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "004C214", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["004C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004C21A..json b/docs/data/histograms/United States/004C21A..json
index f23155bba7a..b1fc3534053 100644
--- a/docs/data/histograms/United States/004C21A..json
+++ b/docs/data/histograms/United States/004C21A..json
@@ -1 +1 @@
-{"batchcode": "004C21A.", "histograms": [{"batchcodes": ["004C21A."], "histogram": {"Asthenia": 1, "Balance disorder": 1, "Blood test": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Syncope": 1, "Tremor": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "004C21A.", "histograms": [{"histogram": {"Asthenia": 1, "Balance disorder": 1, "Blood test": 1, "Chest X-ray": 1, "Computerised tomogram": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Feeling cold": 1, "Syncope": 1, "Tremor": 1, "Vertigo": 1}, "batchcodes": ["004C21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004C21A.json b/docs/data/histograms/United States/004C21A.json
index a772c1efa9a..a0bbbd9093a 100644
--- a/docs/data/histograms/United States/004C21A.json
+++ b/docs/data/histograms/United States/004C21A.json
@@ -1 +1 @@
-{"batchcode": "004C21A", "histograms": [{"batchcodes": ["004C21A"], "histogram": {"Expired product administered": 42, "Headache": 22, "Fatigue": 18, "Pyrexia": 18, "Myalgia": 17, "Feeling abnormal": 12, "Nausea": 12, "Vaccination site pain": 12, "Dizziness": 10, "Pain": 10, "Chills": 9, "Asthenia": 7, "Inappropriate schedule of product administration": 7, "Rash": 7, "Dyspnoea": 6, "Pain in extremity": 6, "Product storage error": 6, "Chest pain": 5, "Malaise": 5, "Product dose omission issue": 5, "SARS-CoV-2 test": 5, "Vaccination complication": 5, "Vomiting": 5, "Arthralgia": 4, "Body temperature": 4, "COVID-19": 4, "Diarrhoea": 4, "Heart rate": 4, "Hyperhidrosis": 4, "Migraine": 4, "Pruritus": 4, "Rash pruritic": 4, "Somnolence": 4, "Vaccination site discolouration": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Bedridden": 3, "Decreased appetite": 3, "Disturbance in attention": 3, "Electrocardiogram": 3, "Erythema": 3, "Illness": 3, "Loss of personal independence in daily activities": 3, "Oral pain": 3, "Product administration error": 3, "Rash erythematous": 3, "Rash macular": 3, "Vertigo": 3, "Abdominal pain": 2, "Anxiety": 2, "Back pain": 2, "Balance disorder": 2, "Blood pressure measurement": 2, "Blood test": 2, "Bone pain": 2, "Confusional state": 2, "Contusion": 2, "Cough": 2, "Dermatitis acneiform": 2, "Device connection issue": 2, "Dysstasia": 2, "Feeling hot": 2, "Heart rate increased": 2, "Influenza like illness": 2, "Injection site pain": 2, "Insomnia": 2, "Lethargy": 2, "Loss of consciousness": 2, "Mobility decreased": 2, "Mouth swelling": 2, "Mouth ulceration": 2, "Muscular weakness": 2, "Nasopharyngitis": 2, "Night sweats": 2, "Oropharyngeal pain": 2, "Peripheral swelling": 2, "Rhinorrhoea": 2, "Sneezing": 2, "Underdose": 2, "Vaccination site erythema": 2, "Vaccination site haemorrhage": 2, "Vaccination site swelling": 2, "Weight decreased": 2, "Abnormal dreams": 1, "Accidental overdose": 1, "Ageusia": 1, "Aphthous ulcer": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Burning sensation": 1, "Cardiovascular disorder": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Constipation": 1, "Crohn's disease": 1, "Decreased activity": 1, "Dermatitis atopic": 1, "Discomfort": 1, "Dizziness postural": 1, "Eating disorder": 1, "Eczema": 1, "Epistaxis": 1, "Exposure via skin contact": 1, "Eye irritation": 1, "Eye pruritus": 1, "Fall": 1, "Feeding disorder": 1, "Flashback": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Impaired work ability": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Lymphadenopathy": 1, "Mechanical urticaria": 1, "Memory impairment": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Oral herpes": 1, "Oral mucosal erythema": 1, "Pain of skin": 1, "Paraesthesia": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Product administered to patient of inappropriate age": 1, "Product container issue": 1, "Product temperature excursion issue": 1, "Pulmonary pain": 1, "Rash papular": 1, "Seizure": 1, "Sensitivity to weather change": 1, "Skin burning sensation": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Temperature regulation disorder": 1, "Tension": 1, "Tinnitus": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vestibular disorder": 1, "Visual impairment": 1, "Walking aid user": 1, "Walking disability": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "004C21A", "histograms": [{"histogram": {"Expired product administered": 42, "Headache": 22, "Fatigue": 18, "Pyrexia": 18, "Myalgia": 17, "Feeling abnormal": 12, "Nausea": 12, "Vaccination site pain": 12, "Dizziness": 10, "Pain": 10, "Chills": 9, "Asthenia": 7, "Inappropriate schedule of product administration": 7, "Rash": 7, "Dyspnoea": 6, "Pain in extremity": 6, "Product storage error": 6, "Chest pain": 5, "Malaise": 5, "Product dose omission issue": 5, "SARS-CoV-2 test": 5, "Vaccination complication": 5, "Vomiting": 5, "Arthralgia": 4, "Body temperature": 4, "COVID-19": 4, "Diarrhoea": 4, "Heart rate": 4, "Hyperhidrosis": 4, "Migraine": 4, "Pruritus": 4, "Rash pruritic": 4, "Somnolence": 4, "Vaccination site discolouration": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Bedridden": 3, "Decreased appetite": 3, "Disturbance in attention": 3, "Electrocardiogram": 3, "Erythema": 3, "Illness": 3, "Loss of personal independence in daily activities": 3, "Oral pain": 3, "Product administration error": 3, "Rash erythematous": 3, "Rash macular": 3, "Vertigo": 3, "Abdominal pain": 2, "Anxiety": 2, "Back pain": 2, "Balance disorder": 2, "Blood pressure measurement": 2, "Blood test": 2, "Bone pain": 2, "Confusional state": 2, "Contusion": 2, "Cough": 2, "Dermatitis acneiform": 2, "Device connection issue": 2, "Dysstasia": 2, "Feeling hot": 2, "Heart rate increased": 2, "Influenza like illness": 2, "Injection site pain": 2, "Insomnia": 2, "Lethargy": 2, "Loss of consciousness": 2, "Mobility decreased": 2, "Mouth swelling": 2, "Mouth ulceration": 2, "Muscular weakness": 2, "Nasopharyngitis": 2, "Night sweats": 2, "Oropharyngeal pain": 2, "Peripheral swelling": 2, "Rhinorrhoea": 2, "Sneezing": 2, "Underdose": 2, "Vaccination site erythema": 2, "Vaccination site haemorrhage": 2, "Vaccination site swelling": 2, "Weight decreased": 2, "Abnormal dreams": 1, "Accidental overdose": 1, "Ageusia": 1, "Aphthous ulcer": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Blood sodium decreased": 1, "Burning sensation": 1, "Cardiovascular disorder": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Constipation": 1, "Crohn's disease": 1, "Decreased activity": 1, "Dermatitis atopic": 1, "Discomfort": 1, "Dizziness postural": 1, "Eating disorder": 1, "Eczema": 1, "Epistaxis": 1, "Exposure via skin contact": 1, "Eye irritation": 1, "Eye pruritus": 1, "Fall": 1, "Feeding disorder": 1, "Flashback": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Haemorrhage": 1, "Head discomfort": 1, "Heart rate irregular": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Impaired work ability": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Lymphadenopathy": 1, "Mechanical urticaria": 1, "Memory impairment": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Ocular hyperaemia": 1, "Oral herpes": 1, "Oral mucosal erythema": 1, "Pain of skin": 1, "Paraesthesia": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Product administered to patient of inappropriate age": 1, "Product container issue": 1, "Product temperature excursion issue": 1, "Pulmonary pain": 1, "Rash papular": 1, "Seizure": 1, "Sensitivity to weather change": 1, "Skin burning sensation": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Temperature regulation disorder": 1, "Tension": 1, "Tinnitus": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vestibular disorder": 1, "Visual impairment": 1, "Walking aid user": 1, "Walking disability": 1, "X-ray": 1}, "batchcodes": ["004C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004C27A.json b/docs/data/histograms/United States/004C27A.json
index bc29bfbf0aa..ba41856099d 100644
--- a/docs/data/histograms/United States/004C27A.json
+++ b/docs/data/histograms/United States/004C27A.json
@@ -1 +1 @@
-{"batchcode": "004C27A", "histograms": [{"batchcodes": ["004C27A"], "histogram": {"Allergy to vaccine": 1, "Cellulitis": 1, "Erythema": 1, "Haemorrhage": 1, "Headache": 1, "Inflammation": 1, "Jaw disorder": 1, "Lymph node pain": 1, "Nasal discomfort": 1, "Neuralgia": 1, "Product administered at inappropriate site": 1, "Product dose omission issue": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "004C27A", "histograms": [{"histogram": {"Allergy to vaccine": 1, "Cellulitis": 1, "Erythema": 1, "Haemorrhage": 1, "Headache": 1, "Inflammation": 1, "Jaw disorder": 1, "Lymph node pain": 1, "Nasal discomfort": 1, "Neuralgia": 1, "Product administered at inappropriate site": 1, "Product dose omission issue": 1, "Swelling face": 1}, "batchcodes": ["004C27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004C31A.json b/docs/data/histograms/United States/004C31A.json
index 25c0c9cff17..30bfc7dd283 100644
--- a/docs/data/histograms/United States/004C31A.json
+++ b/docs/data/histograms/United States/004C31A.json
@@ -1 +1 @@
-{"batchcode": "004C31A", "histograms": [{"batchcodes": ["004C31A"], "histogram": {"Fatigue": 1, "Headache": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "004C31A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["004C31A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004C4A.json b/docs/data/histograms/United States/004C4A.json
index 590ca194938..145e3843ccf 100644
--- a/docs/data/histograms/United States/004C4A.json
+++ b/docs/data/histograms/United States/004C4A.json
@@ -1 +1 @@
-{"batchcode": "004C4A", "histograms": [{"batchcodes": ["004C4A"], "histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "004C4A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1}, "batchcodes": ["004C4A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004CZ1A.json b/docs/data/histograms/United States/004CZ1A.json
index f32f027983e..944ef92a871 100644
--- a/docs/data/histograms/United States/004CZ1A.json
+++ b/docs/data/histograms/United States/004CZ1A.json
@@ -1 +1 @@
-{"batchcode": "004CZ1A", "histograms": [{"batchcodes": ["004CZ1A"], "histogram": {"Lymph node pain": 1, "Muscle tightness": 1, "Neck pain": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "004CZ1A", "histograms": [{"histogram": {"Lymph node pain": 1, "Muscle tightness": 1, "Neck pain": 1, "Tenderness": 1}, "batchcodes": ["004CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004D21A.json b/docs/data/histograms/United States/004D21A.json
index 4d1b7843ce9..8013dd5214f 100644
--- a/docs/data/histograms/United States/004D21A.json
+++ b/docs/data/histograms/United States/004D21A.json
@@ -1 +1 @@
-{"batchcode": "004D21A", "histograms": [{"batchcodes": ["004D21A"], "histogram": {"Chills": 3, "Inappropriate schedule of product administration": 3, "Vaccination site pain": 3, "Axillary pain": 2, "Back pain": 2, "COVID-19": 2, "Expired product administered": 2, "Headache": 2, "Mobility decreased": 2, "Pain in extremity": 2, "Product storage error": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Aphonia": 1, "Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "Burning sensation": 1, "Chest X-ray": 1, "Coagulation test": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Gout": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck mass": 1, "Neck pain": 1, "Pain": 1, "Pulmonary thrombosis": 1, "Rheumatoid arthritis": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "004D21A", "histograms": [{"histogram": {"Chills": 3, "Inappropriate schedule of product administration": 3, "Vaccination site pain": 3, "Axillary pain": 2, "Back pain": 2, "COVID-19": 2, "Expired product administered": 2, "Headache": 2, "Mobility decreased": 2, "Pain in extremity": 2, "Product storage error": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "Aphonia": 1, "Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "Burning sensation": 1, "Chest X-ray": 1, "Coagulation test": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Gout": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myalgia": 1, "Neck mass": 1, "Neck pain": 1, "Pain": 1, "Pulmonary thrombosis": 1, "Rheumatoid arthritis": 1, "Thrombosis": 1, "Ultrasound scan": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}, "batchcodes": ["004D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004F211A.json b/docs/data/histograms/United States/004F211A.json
index 3cb1155c5f0..86e6f4ee07e 100644
--- a/docs/data/histograms/United States/004F211A.json
+++ b/docs/data/histograms/United States/004F211A.json
@@ -1 +1 @@
-{"batchcode": "004F211A", "histograms": [{"batchcodes": ["004F211A"], "histogram": {"Headache": 1, "Illness": 1}}]}
\ No newline at end of file
+{"batchcode": "004F211A", "histograms": [{"histogram": {"Headache": 1, "Illness": 1}, "batchcodes": ["004F211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004F21A.json b/docs/data/histograms/United States/004F21A.json
index a5094a0b5ef..be4e118a8f1 100644
--- a/docs/data/histograms/United States/004F21A.json
+++ b/docs/data/histograms/United States/004F21A.json
@@ -1 +1 @@
-{"batchcode": "004F21A", "histograms": [{"batchcodes": ["004F21A", "1805029"], "histogram": {"COVID-19": 1, "Pruritus": 1, "Urticaria": 1}}, {"batchcodes": ["004F21A"], "histogram": {"Headache": 7, "Pyrexia": 7, "Chills": 5, "Expired product administered": 5, "Paraesthesia": 5, "Arthralgia": 4, "Body temperature": 4, "Fatigue": 4, "Feeling abnormal": 4, "Illness": 4, "Myalgia": 4, "Pain in extremity": 4, "Product administered to patient of inappropriate age": 4, "Product storage error": 4, "Dizziness": 3, "Head discomfort": 3, "Insomnia": 3, "Nodule": 3, "Oropharyngeal pain": 3, "Pain": 3, "Vaccination site erythema": 3, "Vaccination site swelling": 3, "Asthenia": 2, "Bedridden": 2, "Burning sensation": 2, "COVID-19": 2, "Diarrhoea": 2, "Eye pain": 2, "Gait disturbance": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Inflammation": 2, "Influenza": 2, "Nausea": 2, "Parosmia": 2, "Peripheral swelling": 2, "Product dose omission issue": 2, "Rash pruritic": 2, "SARS-CoV-2 test": 2, "Somnolence": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Vaccination site reaction": 2, "Vision blurred": 2, "Abdominal pain upper": 1, "Ageusia": 1, "Anosmia": 1, "Antibody test": 1, "Anxiety": 1, "Axillary pain": 1, "Back pain": 1, "Blindness": 1, "Blister": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Breast pain": 1, "Cerebral disorder": 1, "Chest wall cyst": 1, "Chromatopsia": 1, "Confusional state": 1, "Contusion": 1, "Depression": 1, "Diplopia": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Erythema": 1, "Eye discharge": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Formication": 1, "General physical health deterioration": 1, "Hallucination": 1, "Head banging": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Joint stiffness": 1, "Lethargy": 1, "Lichen planus": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Malaise": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Mouth haemorrhage": 1, "Neck pain": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Photophobia": 1, "Platelet count": 1, "Product temperature excursion issue": 1, "Pruritus": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sarcoidosis": 1, "Sensory loss": 1, "Sinus pain": 1, "Sinusitis": 1, "Swelling": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Vaccination complication": 1, "Vaccination site rash": 1, "Vaginal discharge": 1, "Vertigo": 1, "Visual impairment": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "004F21A", "histograms": [{"histogram": {"COVID-19": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["004F21A", "1805029"]}, {"histogram": {"Headache": 7, "Pyrexia": 7, "Chills": 5, "Expired product administered": 5, "Paraesthesia": 5, "Arthralgia": 4, "Body temperature": 4, "Fatigue": 4, "Feeling abnormal": 4, "Illness": 4, "Myalgia": 4, "Pain in extremity": 4, "Product administered to patient of inappropriate age": 4, "Product storage error": 4, "Dizziness": 3, "Head discomfort": 3, "Insomnia": 3, "Nodule": 3, "Oropharyngeal pain": 3, "Pain": 3, "Vaccination site erythema": 3, "Vaccination site swelling": 3, "Asthenia": 2, "Bedridden": 2, "Burning sensation": 2, "COVID-19": 2, "Diarrhoea": 2, "Eye pain": 2, "Gait disturbance": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Inflammation": 2, "Influenza": 2, "Nausea": 2, "Parosmia": 2, "Peripheral swelling": 2, "Product dose omission issue": 2, "Rash pruritic": 2, "SARS-CoV-2 test": 2, "Somnolence": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Vaccination site reaction": 2, "Vision blurred": 2, "Abdominal pain upper": 1, "Ageusia": 1, "Anosmia": 1, "Antibody test": 1, "Anxiety": 1, "Axillary pain": 1, "Back pain": 1, "Blindness": 1, "Blister": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Breast pain": 1, "Cerebral disorder": 1, "Chest wall cyst": 1, "Chromatopsia": 1, "Confusional state": 1, "Contusion": 1, "Depression": 1, "Diplopia": 1, "Dyspnoea": 1, "Electric shock sensation": 1, "Erythema": 1, "Eye discharge": 1, "Eye movement disorder": 1, "Eye pruritus": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Formication": 1, "General physical health deterioration": 1, "Hallucination": 1, "Head banging": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Joint stiffness": 1, "Lethargy": 1, "Lichen planus": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Malaise": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Mouth haemorrhage": 1, "Neck pain": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Photophobia": 1, "Platelet count": 1, "Product temperature excursion issue": 1, "Pruritus": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sarcoidosis": 1, "Sensory loss": 1, "Sinus pain": 1, "Sinusitis": 1, "Swelling": 1, "Taste disorder": 1, "Thrombocytopenia": 1, "Tinnitus": 1, "Vaccination complication": 1, "Vaccination site rash": 1, "Vaginal discharge": 1, "Vertigo": 1, "Visual impairment": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["004F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004FC1A.json b/docs/data/histograms/United States/004FC1A.json
index 0e7a49801ab..1f2dab9f5af 100644
--- a/docs/data/histograms/United States/004FC1A.json
+++ b/docs/data/histograms/United States/004FC1A.json
@@ -1 +1 @@
-{"batchcode": "004FC1A", "histograms": [{"batchcodes": ["004FC1A"], "histogram": {"Body temperature": 1, "Chills": 1, "Feeling cold": 1, "Feeling hot": 1, "Induration": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "004FC1A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Feeling cold": 1, "Feeling hot": 1, "Induration": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["004FC1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004FZ1A.json b/docs/data/histograms/United States/004FZ1A.json
index a1992910026..03e942b97ae 100644
--- a/docs/data/histograms/United States/004FZ1A.json
+++ b/docs/data/histograms/United States/004FZ1A.json
@@ -1 +1 @@
-{"batchcode": "004FZ1A", "histograms": [{"batchcodes": ["004FZ1A"], "histogram": {"Asthenia": 1, "Dysstasia": 1, "Fall": 1, "Head injury": 1, "Illness": 1, "Inflammation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "004FZ1A", "histograms": [{"histogram": {"Asthenia": 1, "Dysstasia": 1, "Fall": 1, "Head injury": 1, "Illness": 1, "Inflammation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination complication": 1}, "batchcodes": ["004FZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004L20A.json b/docs/data/histograms/United States/004L20A.json
index 1a095b319ce..ef244ad4634 100644
--- a/docs/data/histograms/United States/004L20A.json
+++ b/docs/data/histograms/United States/004L20A.json
@@ -1 +1 @@
-{"batchcode": "004L20A", "histograms": [{"batchcodes": ["004L20A"], "histogram": {"Chills": 1, "Coronavirus infection": 1, "Dyspnoea": 1, "Fatigue": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "004L20A", "histograms": [{"histogram": {"Chills": 1, "Coronavirus infection": 1, "Dyspnoea": 1, "Fatigue": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["004L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004L21A.json b/docs/data/histograms/United States/004L21A.json
index 68c65163cbf..4f8f2c7a87a 100644
--- a/docs/data/histograms/United States/004L21A.json
+++ b/docs/data/histograms/United States/004L21A.json
@@ -1 +1 @@
-{"batchcode": "004L21A", "histograms": [{"batchcodes": ["004L21A"], "histogram": {"Fatigue": 1, "Hallucination": 1, "Hot flush": 1}}]}
\ No newline at end of file
+{"batchcode": "004L21A", "histograms": [{"histogram": {"Fatigue": 1, "Hallucination": 1, "Hot flush": 1}, "batchcodes": ["004L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M10A.json b/docs/data/histograms/United States/004M10A.json
index 7c4f352ea89..b43fd1b18a8 100644
--- a/docs/data/histograms/United States/004M10A.json
+++ b/docs/data/histograms/United States/004M10A.json
@@ -1 +1 @@
-{"batchcode": "004M10A", "histograms": [{"batchcodes": ["004M10A"], "histogram": {"Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "004M10A", "histograms": [{"histogram": {"Fatigue": 1}, "batchcodes": ["004M10A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M2/(Z)0(O)A.json b/docs/data/histograms/United States/004M2/(Z)0(O)A.json
index b3ad0393e7b..48ddfe1c07d 100644
--- a/docs/data/histograms/United States/004M2/(Z)0(O)A.json
+++ b/docs/data/histograms/United States/004M2/(Z)0(O)A.json
@@ -1 +1 @@
-{"batchcode": "004M2/(Z)0(O)A", "histograms": [{"batchcodes": ["004M2/(Z)0(O)A"], "histogram": {"Insomnia": 1, "Pain": 1, "Tension": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "004M2/(Z)0(O)A", "histograms": [{"histogram": {"Insomnia": 1, "Pain": 1, "Tension": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["004M2/(Z)0(O)A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M20.json b/docs/data/histograms/United States/004M20.json
index 4fbd2ff0a4a..e181aa11de1 100644
--- a/docs/data/histograms/United States/004M20.json
+++ b/docs/data/histograms/United States/004M20.json
@@ -1 +1 @@
-{"batchcode": "004M20", "histograms": [{"batchcodes": ["004M20"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "004M20", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["004M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M2014.json b/docs/data/histograms/United States/004M2014.json
index 115b3c14819..b11c8b98ede 100644
--- a/docs/data/histograms/United States/004M2014.json
+++ b/docs/data/histograms/United States/004M2014.json
@@ -1 +1 @@
-{"batchcode": "004M2014", "histograms": [{"batchcodes": ["004M2014"], "histogram": {"Fatigue": 2, "Headache": 2, "Contusion": 1, "Muscle tightness": 1, "Neck pain": 1, "Pain in extremity": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "004M2014", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Contusion": 1, "Muscle tightness": 1, "Neck pain": 1, "Pain in extremity": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["004M2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M204.json b/docs/data/histograms/United States/004M204.json
index a311ce20558..3b8de8ebf79 100644
--- a/docs/data/histograms/United States/004M204.json
+++ b/docs/data/histograms/United States/004M204.json
@@ -1 +1 @@
-{"batchcode": "004M204", "histograms": [{"batchcodes": ["004M204"], "histogram": {"Blister": 1, "Expired product administered": 1, "Lymphadenopathy": 1, "Mass": 1, "Oral herpes": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "004M204", "histograms": [{"histogram": {"Blister": 1, "Expired product administered": 1, "Lymphadenopathy": 1, "Mass": 1, "Oral herpes": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["004M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M2077.json b/docs/data/histograms/United States/004M2077.json
index 8534bfdf0a2..36aa78611d4 100644
--- a/docs/data/histograms/United States/004M2077.json
+++ b/docs/data/histograms/United States/004M2077.json
@@ -1 +1 @@
-{"batchcode": "004M2077", "histograms": [{"batchcodes": ["004M2077"], "histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "004M2077", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["004M2077"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M20A.json b/docs/data/histograms/United States/004M20A.json
index e91207d9b74..f59e4e81a93 100644
--- a/docs/data/histograms/United States/004M20A.json
+++ b/docs/data/histograms/United States/004M20A.json
@@ -1 +1 @@
-{"batchcode": "004M20A", "histograms": [{"batchcodes": ["004M20A"], "histogram": {"Fatigue": 96, "Pyrexia": 88, "Headache": 81, "Pain in extremity": 75, "Chills": 73, "Myalgia": 58, "Vaccination site pain": 55, "Arthralgia": 44, "Pain": 43, "Vaccination site erythema": 37, "Vaccination site pruritus": 32, "Dizziness": 31, "Rash": 31, "Pruritus": 29, "Feeling abnormal": 28, "Body temperature": 26, "Vaccination site swelling": 26, "Asthenia": 23, "Nausea": 23, "Vaccination site rash": 22, "Erythema": 20, "Maternal exposure during pregnancy": 18, "Peripheral swelling": 18, "Vaccination site warmth": 18, "SARS-CoV-2 test": 17, "Exposure during pregnancy": 16, "Product dose omission issue": 16, "Diarrhoea": 14, "Influenza like illness": 14, "Injection site erythema": 13, "Pregnancy test": 13, "COVID-19": 12, "Cough": 12, "Dyspnoea": 12, "Gait disturbance": 12, "Injection site pain": 11, "Injection site pruritus": 11, "Malaise": 11, "Tremor": 11, "Vaccination site reaction": 11, "Vomiting": 11, "Hypoaesthesia": 10, "Illness": 10, "Paraesthesia": 10, "Urticaria": 10, "Heart rate increased": 9, "Hyperhidrosis": 9, "Lymphadenopathy": 9, "Swelling": 9, "Anxiety": 8, "Ultrasound scan": 8, "Blood pressure measurement": 7, "Decreased appetite": 7, "Heart rate": 7, "Hypertension": 7, "Lethargy": 7, "Oropharyngeal pain": 7, "Rash erythematous": 7, "Vaccination complication": 7, "Abdominal pain upper": 6, "Biopsy": 6, "Computerised tomogram": 6, "Expired product administered": 6, "Feeling hot": 6, "Inappropriate schedule of product administration": 6, "Injection site swelling": 6, "Injection site warmth": 6, "Insomnia": 6, "Limb discomfort": 6, "Muscular weakness": 6, "Neck pain": 6, "Palpitations": 6, "Rash pruritic": 6, "Thrombosis": 6, "Vaccination site bruising": 6, "Vaccination site induration": 6, "Anosmia": 5, "Back pain": 5, "Blood glucose": 5, "Blood test": 5, "Chest discomfort": 5, "Chest pain": 5, "Hypersensitivity": 5, "Loss of consciousness": 5, "Musculoskeletal stiffness": 5, "Nasopharyngitis": 5, "Rash macular": 5, "Somnolence": 5, "Vertigo": 5, "Ageusia": 4, "Bell's palsy": 4, "Condition aggravated": 4, "Head discomfort": 4, "Injection site rash": 4, "Mobility decreased": 4, "Pain in jaw": 4, "Vaccination site movement impairment": 4, "Vision blurred": 4, "X-ray": 4, "Abdominal discomfort": 3, "Abdominal pain": 3, "Accidental underdose": 3, "Blood pressure increased": 3, "Device connection issue": 3, "Disorientation": 3, "Disturbance in attention": 3, "Electrocardiogram": 3, "Eye pain": 3, "Fall": 3, "Feeling cold": 3, "Herpes zoster": 3, "Hypokinesia": 3, "Incorrect route of product administration": 3, "Irritability": 3, "Joint swelling": 3, "Lacrimation increased": 3, "Loss of personal independence in daily activities": 3, "Magnetic resonance imaging": 3, "Migraine": 3, "Movement disorder": 3, "Muscle spasms": 3, "Nasal congestion": 3, "Paraesthesia oral": 3, "Product administered to patient of inappropriate age": 3, "Skin burning sensation": 3, "Sleep disorder": 3, "Speech disorder": 3, "Tachycardia": 3, "Tinnitus": 3, "Ultrasound foetal": 3, "Underdose": 3, "Alopecia": 2, "Amniocentesis normal": 2, "Antibody test": 2, "Arrhythmia": 2, "Atrial fibrillation": 2, "Balance disorder": 2, "Blepharospasm": 2, "Blister": 2, "Bone pain": 2, "Breast pain": 2, "Breast tenderness": 2, "Burning sensation": 2, "Cerebrovascular accident": 2, "Contusion": 2, "Dehydration": 2, "Depression": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Dysphonia": 2, "Extra dose administered": 2, "Feeling of body temperature change": 2, "Fluid retention": 2, "Gait inability": 2, "Glucose tolerance test": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Inflammation": 2, "Influenza": 2, "Injection site mass": 2, "Injection site urticaria": 2, "Intentional product use issue": 2, "Investigation": 2, "Laboratory test": 2, "Muscle tightness": 2, "Muscle twitching": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oral discomfort": 2, "Oropharyngeal discomfort": 2, "Physical examination": 2, "Pollakiuria": 2, "Rash morbilliform": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "Skin discolouration": 2, "Sneezing": 2, "Tenderness": 2, "Ultrasound abdomen": 2, "Upper respiratory tract infection": 2, "Urinary tract infection": 2, "Vaccination site inflammation": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site mass": 2, "Vaccination site urticaria": 2, "Visual impairment": 2, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Adverse reaction": 1, "Akathisia": 1, "Anaemia": 1, "Angioedema": 1, "Appendicitis": 1, "Arthritis": 1, "Arthritis reactive": 1, "Asthma": 1, "Atrioventricular block": 1, "Autoimmune disorder": 1, "Autoimmune haemolytic anaemia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed rest": 1, "Blindness unilateral": 1, "Blood cholesterol": 1, "Blood pressure fluctuation": 1, "Blood pressure inadequately controlled": 1, "Blood test normal": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Burns third degree": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cardiac fibrillation": 1, "Carotid pulse": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Choking sensation": 1, "Chromaturia": 1, "Chromosome analysis normal": 1, "Colitis": 1, "Colitis ulcerative": 1, "Complication associated with device": 1, "Confusional state": 1, "Costochondritis": 1, "Culture urine": 1, "Deafness": 1, "Decreased activity": 1, "Dementia": 1, "Dermatitis allergic": 1, "Diplopia": 1, "Disorganised speech": 1, "Dry mouth": 1, "Dry skin": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eating disorder symptom": 1, "Echocardiogram": 1, "Emergency care examination": 1, "Excessive cerumen production": 1, "Excessive eye blinking": 1, "Exfoliative rash": 1, "Exposure via skin contact": 1, "Extrapyramidal disorder": 1, "Eye haemorrhage": 1, "Eye inflammation": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid sensory disorder": 1, "Faeces discoloured": 1, "Feeding disorder": 1, "Flatulence": 1, "Freezing phenomenon": 1, "Full blood count abnormal": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "General symptom": 1, "Gestational diabetes": 1, "Gingival pain": 1, "Granuloma annulare": 1, "Haematochezia": 1, "Haemoptysis": 1, "Heart rate irregular": 1, "Hiccups": 1, "Hyperglycaemia": 1, "Hypersomnia": 1, "Hypoacusis": 1, "Hypogeusia": 1, "Hypotension": 1, "Immunisation": 1, "Impaired driving ability": 1, "Impaired healing": 1, "Impaired work ability": 1, "Inappropriate affect": 1, "Induration": 1, "Influenza virus test": 1, "Injection site discomfort": 1, "Injection site induration": 1, "Injection site vesicles": 1, "Intentional dose omission": 1, "International normalised ratio": 1, "International normalised ratio decreased": 1, "Lip swelling": 1, "Listless": 1, "Mass": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Middle insomnia": 1, "Monoplegia": 1, "Mood altered": 1, "Multiple sclerosis": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myositis": 1, "Nervousness": 1, "Neuralgia": 1, "Night sweats": 1, "Nocturia": 1, "Noninfective gingivitis": 1, "Nonspecific reaction": 1, "Oesophageal discomfort": 1, "Oesophageal irritation": 1, "Oesophageal pain": 1, "Oligomenorrhoea": 1, "Oral pain": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Panic attack": 1, "Parosmia": 1, "Peripheral coldness": 1, "Personality disorder": 1, "Photosensitivity reaction": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Positron emission tomogram": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Product administration error": 1, "Product contamination physical": 1, "Product quality issue": 1, "Product storage error": 1, "Protein S": 1, "Pseudolymphoma": 1, "Psychomotor hyperactivity": 1, "Pulmonary pain": 1, "Pulmonary thrombosis": 1, "Pustule": 1, "Respiratory rate": 1, "Retching": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "Scan": 1, "Scratch": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Sputum discoloured": 1, "Sticky skin": 1, "Stoma site hypergranulation": 1, "Stoma site pain": 1, "Stool analysis": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Sudden hearing loss": 1, "Syncope": 1, "Thalamic infarction": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat tightness": 1, "Thyroid function test": 1, "Time perception altered": 1, "Toothache": 1, "Treatment noncompliance": 1, "Trigger finger": 1, "Ulcer": 1, "Ultrasound abdomen normal": 1, "Ultrasound scan normal": 1, "Ultrasound testes": 1, "Unevaluable event": 1, "Urosepsis": 1, "Uterine disorder": 1, "Uterine pain": 1, "Vaccination site cellulitis": 1, "Vaccination site discomfort": 1, "Vaccination site hypersensitivity": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site irritation": 1, "Vocal cord disorder": 1, "Walking aid user": 1, "Weight": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "004M20A", "histograms": [{"histogram": {"Fatigue": 96, "Pyrexia": 88, "Headache": 81, "Pain in extremity": 75, "Chills": 73, "Myalgia": 58, "Vaccination site pain": 55, "Arthralgia": 44, "Pain": 43, "Vaccination site erythema": 37, "Vaccination site pruritus": 32, "Dizziness": 31, "Rash": 31, "Pruritus": 29, "Feeling abnormal": 28, "Body temperature": 26, "Vaccination site swelling": 26, "Asthenia": 23, "Nausea": 23, "Vaccination site rash": 22, "Erythema": 20, "Maternal exposure during pregnancy": 18, "Peripheral swelling": 18, "Vaccination site warmth": 18, "SARS-CoV-2 test": 17, "Exposure during pregnancy": 16, "Product dose omission issue": 16, "Diarrhoea": 14, "Influenza like illness": 14, "Injection site erythema": 13, "Pregnancy test": 13, "COVID-19": 12, "Cough": 12, "Dyspnoea": 12, "Gait disturbance": 12, "Injection site pain": 11, "Injection site pruritus": 11, "Malaise": 11, "Tremor": 11, "Vaccination site reaction": 11, "Vomiting": 11, "Hypoaesthesia": 10, "Illness": 10, "Paraesthesia": 10, "Urticaria": 10, "Heart rate increased": 9, "Hyperhidrosis": 9, "Lymphadenopathy": 9, "Swelling": 9, "Anxiety": 8, "Ultrasound scan": 8, "Blood pressure measurement": 7, "Decreased appetite": 7, "Heart rate": 7, "Hypertension": 7, "Lethargy": 7, "Oropharyngeal pain": 7, "Rash erythematous": 7, "Vaccination complication": 7, "Abdominal pain upper": 6, "Biopsy": 6, "Computerised tomogram": 6, "Expired product administered": 6, "Feeling hot": 6, "Inappropriate schedule of product administration": 6, "Injection site swelling": 6, "Injection site warmth": 6, "Insomnia": 6, "Limb discomfort": 6, "Muscular weakness": 6, "Neck pain": 6, "Palpitations": 6, "Rash pruritic": 6, "Thrombosis": 6, "Vaccination site bruising": 6, "Vaccination site induration": 6, "Anosmia": 5, "Back pain": 5, "Blood glucose": 5, "Blood test": 5, "Chest discomfort": 5, "Chest pain": 5, "Hypersensitivity": 5, "Loss of consciousness": 5, "Musculoskeletal stiffness": 5, "Nasopharyngitis": 5, "Rash macular": 5, "Somnolence": 5, "Vertigo": 5, "Ageusia": 4, "Bell's palsy": 4, "Condition aggravated": 4, "Head discomfort": 4, "Injection site rash": 4, "Mobility decreased": 4, "Pain in jaw": 4, "Vaccination site movement impairment": 4, "Vision blurred": 4, "X-ray": 4, "Abdominal discomfort": 3, "Abdominal pain": 3, "Accidental underdose": 3, "Blood pressure increased": 3, "Device connection issue": 3, "Disorientation": 3, "Disturbance in attention": 3, "Electrocardiogram": 3, "Eye pain": 3, "Fall": 3, "Feeling cold": 3, "Herpes zoster": 3, "Hypokinesia": 3, "Incorrect route of product administration": 3, "Irritability": 3, "Joint swelling": 3, "Lacrimation increased": 3, "Loss of personal independence in daily activities": 3, "Magnetic resonance imaging": 3, "Migraine": 3, "Movement disorder": 3, "Muscle spasms": 3, "Nasal congestion": 3, "Paraesthesia oral": 3, "Product administered to patient of inappropriate age": 3, "Skin burning sensation": 3, "Sleep disorder": 3, "Speech disorder": 3, "Tachycardia": 3, "Tinnitus": 3, "Ultrasound foetal": 3, "Underdose": 3, "Alopecia": 2, "Amniocentesis normal": 2, "Antibody test": 2, "Arrhythmia": 2, "Atrial fibrillation": 2, "Balance disorder": 2, "Blepharospasm": 2, "Blister": 2, "Bone pain": 2, "Breast pain": 2, "Breast tenderness": 2, "Burning sensation": 2, "Cerebrovascular accident": 2, "Contusion": 2, "Dehydration": 2, "Depression": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Dysphonia": 2, "Extra dose administered": 2, "Feeling of body temperature change": 2, "Fluid retention": 2, "Gait inability": 2, "Glucose tolerance test": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Inflammation": 2, "Influenza": 2, "Injection site mass": 2, "Injection site urticaria": 2, "Intentional product use issue": 2, "Investigation": 2, "Laboratory test": 2, "Muscle tightness": 2, "Muscle twitching": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oral discomfort": 2, "Oropharyngeal discomfort": 2, "Physical examination": 2, "Pollakiuria": 2, "Rash morbilliform": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "Skin discolouration": 2, "Sneezing": 2, "Tenderness": 2, "Ultrasound abdomen": 2, "Upper respiratory tract infection": 2, "Urinary tract infection": 2, "Vaccination site inflammation": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site mass": 2, "Vaccination site urticaria": 2, "Visual impairment": 2, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Adverse reaction": 1, "Akathisia": 1, "Anaemia": 1, "Angioedema": 1, "Appendicitis": 1, "Arthritis": 1, "Arthritis reactive": 1, "Asthma": 1, "Atrioventricular block": 1, "Autoimmune disorder": 1, "Autoimmune haemolytic anaemia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed rest": 1, "Blindness unilateral": 1, "Blood cholesterol": 1, "Blood pressure fluctuation": 1, "Blood pressure inadequately controlled": 1, "Blood test normal": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Burns third degree": 1, "C-reactive protein": 1, "COVID-19 pneumonia": 1, "Cardiac fibrillation": 1, "Carotid pulse": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Choking sensation": 1, "Chromaturia": 1, "Chromosome analysis normal": 1, "Colitis": 1, "Colitis ulcerative": 1, "Complication associated with device": 1, "Confusional state": 1, "Costochondritis": 1, "Culture urine": 1, "Deafness": 1, "Decreased activity": 1, "Dementia": 1, "Dermatitis allergic": 1, "Diplopia": 1, "Disorganised speech": 1, "Dry mouth": 1, "Dry skin": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eating disorder symptom": 1, "Echocardiogram": 1, "Emergency care examination": 1, "Excessive cerumen production": 1, "Excessive eye blinking": 1, "Exfoliative rash": 1, "Exposure via skin contact": 1, "Extrapyramidal disorder": 1, "Eye haemorrhage": 1, "Eye inflammation": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid sensory disorder": 1, "Faeces discoloured": 1, "Feeding disorder": 1, "Flatulence": 1, "Freezing phenomenon": 1, "Full blood count abnormal": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "General symptom": 1, "Gestational diabetes": 1, "Gingival pain": 1, "Granuloma annulare": 1, "Haematochezia": 1, "Haemoptysis": 1, "Heart rate irregular": 1, "Hiccups": 1, "Hyperglycaemia": 1, "Hypersomnia": 1, "Hypoacusis": 1, "Hypogeusia": 1, "Hypotension": 1, "Immunisation": 1, "Impaired driving ability": 1, "Impaired healing": 1, "Impaired work ability": 1, "Inappropriate affect": 1, "Induration": 1, "Influenza virus test": 1, "Injection site discomfort": 1, "Injection site induration": 1, "Injection site vesicles": 1, "Intentional dose omission": 1, "International normalised ratio": 1, "International normalised ratio decreased": 1, "Lip swelling": 1, "Listless": 1, "Mass": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Middle insomnia": 1, "Monoplegia": 1, "Mood altered": 1, "Multiple sclerosis": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myositis": 1, "Nervousness": 1, "Neuralgia": 1, "Night sweats": 1, "Nocturia": 1, "Noninfective gingivitis": 1, "Nonspecific reaction": 1, "Oesophageal discomfort": 1, "Oesophageal irritation": 1, "Oesophageal pain": 1, "Oligomenorrhoea": 1, "Oral pain": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Panic attack": 1, "Parosmia": 1, "Peripheral coldness": 1, "Personality disorder": 1, "Photosensitivity reaction": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Positron emission tomogram": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Product administration error": 1, "Product contamination physical": 1, "Product quality issue": 1, "Product storage error": 1, "Protein S": 1, "Pseudolymphoma": 1, "Psychomotor hyperactivity": 1, "Pulmonary pain": 1, "Pulmonary thrombosis": 1, "Pustule": 1, "Respiratory rate": 1, "Retching": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "Scan": 1, "Scratch": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensory disturbance": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Sputum discoloured": 1, "Sticky skin": 1, "Stoma site hypergranulation": 1, "Stoma site pain": 1, "Stool analysis": 1, "Stress": 1, "Stress cardiomyopathy": 1, "Sudden hearing loss": 1, "Syncope": 1, "Thalamic infarction": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat tightness": 1, "Thyroid function test": 1, "Time perception altered": 1, "Toothache": 1, "Treatment noncompliance": 1, "Trigger finger": 1, "Ulcer": 1, "Ultrasound abdomen normal": 1, "Ultrasound scan normal": 1, "Ultrasound testes": 1, "Unevaluable event": 1, "Urosepsis": 1, "Uterine disorder": 1, "Uterine pain": 1, "Vaccination site cellulitis": 1, "Vaccination site discomfort": 1, "Vaccination site hypersensitivity": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site irritation": 1, "Vocal cord disorder": 1, "Walking aid user": 1, "Weight": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["004M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M20A/004M204.json b/docs/data/histograms/United States/004M20A/004M204.json
index 0ce9beaf062..be0203a9445 100644
--- a/docs/data/histograms/United States/004M20A/004M204.json
+++ b/docs/data/histograms/United States/004M20A/004M204.json
@@ -1 +1 @@
-{"batchcode": "004M20A/004M204", "histograms": [{"batchcodes": ["004M20A/004M204"], "histogram": {"Condition aggravated": 1, "Myalgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "004M20A/004M204", "histograms": [{"histogram": {"Condition aggravated": 1, "Myalgia": 1, "Vaccination site pain": 1}, "batchcodes": ["004M20A/004M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M20A004M20A.json b/docs/data/histograms/United States/004M20A004M20A.json
index 8858d2a7fcf..29011feda7c 100644
--- a/docs/data/histograms/United States/004M20A004M20A.json
+++ b/docs/data/histograms/United States/004M20A004M20A.json
@@ -1 +1 @@
-{"batchcode": "004M20A004M20A", "histograms": [{"batchcodes": ["004M20A004M20A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "004M20A004M20A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["004M20A004M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M21.json b/docs/data/histograms/United States/004M21.json
index 8c8f1257751..01794169cfc 100644
--- a/docs/data/histograms/United States/004M21.json
+++ b/docs/data/histograms/United States/004M21.json
@@ -1 +1 @@
-{"batchcode": "004M21", "histograms": [{"batchcodes": ["004M21"], "histogram": {"Expired product administered": 2, "No adverse event": 2}}]}
\ No newline at end of file
+{"batchcode": "004M21", "histograms": [{"histogram": {"Expired product administered": 2, "No adverse event": 2}, "batchcodes": ["004M21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M21A.json b/docs/data/histograms/United States/004M21A.json
index 6d340fad003..599eff4d878 100644
--- a/docs/data/histograms/United States/004M21A.json
+++ b/docs/data/histograms/United States/004M21A.json
@@ -1 +1 @@
-{"batchcode": "004M21A", "histograms": [{"batchcodes": ["004M21A"], "histogram": {"Expired product administered": 81, "No adverse event": 57, "Product storage error": 13, "Product temperature excursion issue": 6, "Headache": 3, "Inappropriate schedule of product administration": 3, "Poor quality product administered": 3, "SARS-CoV-2 test": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Disorientation": 1, "Dry eye": 1, "Dry mouth": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1, "Rash": 1, "Somnolence": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "004M21A", "histograms": [{"histogram": {"Expired product administered": 81, "No adverse event": 57, "Product storage error": 13, "Product temperature excursion issue": 6, "Headache": 3, "Inappropriate schedule of product administration": 3, "Poor quality product administered": 3, "SARS-CoV-2 test": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Disorientation": 1, "Dry eye": 1, "Dry mouth": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1, "Rash": 1, "Somnolence": 1, "Tinnitus": 1}, "batchcodes": ["004M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M22A.json b/docs/data/histograms/United States/004M22A.json
index 33e2f9c9126..3e1db79ceb9 100644
--- a/docs/data/histograms/United States/004M22A.json
+++ b/docs/data/histograms/United States/004M22A.json
@@ -1 +1 @@
-{"batchcode": "004M22A", "histograms": [{"batchcodes": ["004M22A"], "histogram": {"Erythema": 1, "Fatigue": 1, "Influenza like illness": 1, "Nasopharyngitis": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "004M22A", "histograms": [{"histogram": {"Erythema": 1, "Fatigue": 1, "Influenza like illness": 1, "Nasopharyngitis": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1}, "batchcodes": ["004M22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M2A.json b/docs/data/histograms/United States/004M2A.json
index a9acc18bf14..b5c5220f6d7 100644
--- a/docs/data/histograms/United States/004M2A.json
+++ b/docs/data/histograms/United States/004M2A.json
@@ -1 +1 @@
-{"batchcode": "004M2A", "histograms": [{"batchcodes": ["004M2A"], "histogram": {"Facial pain": 1, "Headache": 1, "Herpes zoster": 1, "Paraesthesia": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "004M2A", "histograms": [{"histogram": {"Facial pain": 1, "Headache": 1, "Herpes zoster": 1, "Paraesthesia": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["004M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004M820A.json b/docs/data/histograms/United States/004M820A.json
index ab7a96e5e49..8e3040f85ed 100644
--- a/docs/data/histograms/United States/004M820A.json
+++ b/docs/data/histograms/United States/004M820A.json
@@ -1 +1 @@
-{"batchcode": "004M820A", "histograms": [{"batchcodes": ["004M820A"], "histogram": {"Gastroenteritis": 1}}]}
\ No newline at end of file
+{"batchcode": "004M820A", "histograms": [{"histogram": {"Gastroenteritis": 1}, "batchcodes": ["004M820A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004MDOA.json b/docs/data/histograms/United States/004MDOA.json
index 21a21c477b3..df204c5f9cf 100644
--- a/docs/data/histograms/United States/004MDOA.json
+++ b/docs/data/histograms/United States/004MDOA.json
@@ -1 +1 @@
-{"batchcode": "004MDOA", "histograms": [{"batchcodes": ["004MDOA"], "histogram": {"Injection site vesicles": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "004MDOA", "histograms": [{"histogram": {"Injection site vesicles": 1, "Vaccination site erythema": 1}, "batchcodes": ["004MDOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004MZ 'O OR 0'.json b/docs/data/histograms/United States/004MZ 'O OR 0'.json
index 7f21653182e..5932dd782dc 100644
--- a/docs/data/histograms/United States/004MZ 'O OR 0'.json
+++ b/docs/data/histograms/United States/004MZ 'O OR 0'.json
@@ -1 +1 @@
-{"batchcode": "004MZ 'O OR 0'", "histograms": [{"batchcodes": ["004MZ 'O OR 0'"], "histogram": {"Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "004MZ 'O OR 0'", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1}, "batchcodes": ["004MZ 'O OR 0'"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004MZ('0' OR 'O.json b/docs/data/histograms/United States/004MZ('0' OR 'O.json
index f2955db0fb6..dd3a2af9859 100644
--- a/docs/data/histograms/United States/004MZ('0' OR 'O.json
+++ b/docs/data/histograms/United States/004MZ('0' OR 'O.json
@@ -1 +1 @@
-{"batchcode": "004MZ('0' OR 'O", "histograms": [{"batchcodes": ["004MZ('0' OR 'O"], "histogram": {"Body temperature": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "004MZ('0' OR 'O", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["004MZ('0' OR 'O"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004MZ0A.json b/docs/data/histograms/United States/004MZ0A.json
index 415d1de84ee..1a33878c5a3 100644
--- a/docs/data/histograms/United States/004MZ0A.json
+++ b/docs/data/histograms/United States/004MZ0A.json
@@ -1 +1 @@
-{"batchcode": "004MZ0A", "histograms": [{"batchcodes": ["004MZ0A"], "histogram": {"Vaccination site pain": 3, "Fall": 2, "Nausea": 2, "Pyrexia": 2, "Aphonia": 1, "Arthralgia": 1, "Bronchitis": 1, "Chest discomfort": 1, "Chills": 1, "Choking": 1, "Cough": 1, "Discomfort": 1, "Dysphonia": 1, "Exposure during pregnancy": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Laryngitis": 1, "Malaise": 1, "Muscular weakness": 1, "Respiratory tract infection": 1, "Restless legs syndrome": 1, "Rhinorrhoea": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "004MZ0A", "histograms": [{"histogram": {"Vaccination site pain": 3, "Fall": 2, "Nausea": 2, "Pyrexia": 2, "Aphonia": 1, "Arthralgia": 1, "Bronchitis": 1, "Chest discomfort": 1, "Chills": 1, "Choking": 1, "Cough": 1, "Discomfort": 1, "Dysphonia": 1, "Exposure during pregnancy": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Laryngitis": 1, "Malaise": 1, "Muscular weakness": 1, "Respiratory tract infection": 1, "Restless legs syndrome": 1, "Rhinorrhoea": 1, "Ultrasound scan": 1}, "batchcodes": ["004MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004MZUA.json b/docs/data/histograms/United States/004MZUA.json
index da434f3fa6e..0136dfda085 100644
--- a/docs/data/histograms/United States/004MZUA.json
+++ b/docs/data/histograms/United States/004MZUA.json
@@ -1 +1 @@
-{"batchcode": "004MZUA", "histograms": [{"batchcodes": ["004MZUA"], "histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Heart rate": 1, "Heart rate increased": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "004MZUA", "histograms": [{"histogram": {"Asthenia": 1, "Decreased appetite": 1, "Dizziness": 1, "Heart rate": 1, "Heart rate increased": 1, "Pain in extremity": 1}, "batchcodes": ["004MZUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004N20A.json b/docs/data/histograms/United States/004N20A.json
index fbde563f8e8..a68838aee4a 100644
--- a/docs/data/histograms/United States/004N20A.json
+++ b/docs/data/histograms/United States/004N20A.json
@@ -1 +1 @@
-{"batchcode": "004N20A", "histograms": [{"batchcodes": ["004N20A"], "histogram": {"Asthenia": 1, "Biopsy": 1, "Dizziness": 1, "Dyspnoea": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Premature labour": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "004N20A", "histograms": [{"histogram": {"Asthenia": 1, "Biopsy": 1, "Dizziness": 1, "Dyspnoea": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Premature labour": 1, "Rash": 1}, "batchcodes": ["004N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/004NI20A.json b/docs/data/histograms/United States/004NI20A.json
index 1f50f26851f..c74571de4a2 100644
--- a/docs/data/histograms/United States/004NI20A.json
+++ b/docs/data/histograms/United States/004NI20A.json
@@ -1 +1 @@
-{"batchcode": "004NI20A", "histograms": [{"batchcodes": ["004NI20A"], "histogram": {"Fatigue": 1, "Influenza like illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "004NI20A", "histograms": [{"histogram": {"Fatigue": 1, "Influenza like illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["004NI20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005021A.json b/docs/data/histograms/United States/005021A.json
index 623092efd03..c653c45d830 100644
--- a/docs/data/histograms/United States/005021A.json
+++ b/docs/data/histograms/United States/005021A.json
@@ -1 +1 @@
-{"batchcode": "005021A", "histograms": [{"batchcodes": ["005021A"], "histogram": {"Fatigue": 2, "Tinnitus": 2, "Intentional dose omission": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "005021A", "histograms": [{"histogram": {"Fatigue": 2, "Tinnitus": 2, "Intentional dose omission": 1, "Pyrexia": 1}, "batchcodes": ["005021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00521A.json b/docs/data/histograms/United States/00521A.json
index bd170be6a1f..b8f0cc4f65f 100644
--- a/docs/data/histograms/United States/00521A.json
+++ b/docs/data/histograms/United States/00521A.json
@@ -1 +1 @@
-{"batchcode": "00521A", "histograms": [{"batchcodes": ["00521A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00521A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["00521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0056021A.json b/docs/data/histograms/United States/0056021A.json
index 242b206cfc4..1e3d5175049 100644
--- a/docs/data/histograms/United States/0056021A.json
+++ b/docs/data/histograms/United States/0056021A.json
@@ -1 +1 @@
-{"batchcode": "0056021A", "histograms": [{"batchcodes": ["0056021A"], "histogram": {"Chills": 1, "Headache": 1, "Insomnia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0056021A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Insomnia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["0056021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005621A.json b/docs/data/histograms/United States/005621A.json
index 2076ebbd189..3d43029ab89 100644
--- a/docs/data/histograms/United States/005621A.json
+++ b/docs/data/histograms/United States/005621A.json
@@ -1 +1 @@
-{"batchcode": "005621A", "histograms": [{"batchcodes": ["005621A"], "histogram": {"Erythema": 1, "Fatigue": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "005621A", "histograms": [{"histogram": {"Erythema": 1, "Fatigue": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["005621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005821A.json b/docs/data/histograms/United States/005821A.json
index 2e98f93dadf..fe5ebe50db5 100644
--- a/docs/data/histograms/United States/005821A.json
+++ b/docs/data/histograms/United States/005821A.json
@@ -1 +1 @@
-{"batchcode": "005821A", "histograms": [{"batchcodes": ["005821A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "005821A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["005821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005A21A.json b/docs/data/histograms/United States/005A21A.json
index af84ae673fc..8c0a6499cca 100644
--- a/docs/data/histograms/United States/005A21A.json
+++ b/docs/data/histograms/United States/005A21A.json
@@ -1 +1 @@
-{"batchcode": "005A21A", "histograms": [{"batchcodes": ["005A21A"], "histogram": {"Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "005A21A", "histograms": [{"histogram": {"Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["005A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005C21.json b/docs/data/histograms/United States/005C21.json
index da50dff60e4..9af466343e6 100644
--- a/docs/data/histograms/United States/005C21.json
+++ b/docs/data/histograms/United States/005C21.json
@@ -1 +1 @@
-{"batchcode": "005C21", "histograms": [{"batchcodes": ["005C21"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "005C21", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Tenderness": 1}, "batchcodes": ["005C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005C21A.json b/docs/data/histograms/United States/005C21A.json
index 57cd61d1fc5..63542aa39f4 100644
--- a/docs/data/histograms/United States/005C21A.json
+++ b/docs/data/histograms/United States/005C21A.json
@@ -1 +1 @@
-{"batchcode": "005C21A", "histograms": [{"batchcodes": ["005C21A"], "histogram": {"Expired product administered": 54, "Product storage error": 36, "No adverse event": 31, "Headache": 24, "Fatigue": 18, "Pyrexia": 18, "Vaccination site pain": 16, "Chills": 12, "Pain in extremity": 12, "Myalgia": 11, "Asthenia": 8, "Arthralgia": 7, "Nausea": 7, "Product administered to patient of inappropriate age": 7, "Vaccination site erythema": 7, "Body temperature": 6, "Lymphadenopathy": 6, "Pruritus": 6, "Chest pain": 5, "Diarrhoea": 5, "Dizziness": 5, "Feeling abnormal": 5, "Illness": 5, "Malaise": 5, "Neck pain": 5, "Pain": 5, "Vaccination site rash": 5, "Vaccination site swelling": 5, "Abdominal pain upper": 4, "Anxiety": 4, "Blood pressure measurement": 4, "Blood test": 4, "Bone pain": 4, "Decreased appetite": 4, "Dyspnoea": 4, "Gait disturbance": 4, "Inappropriate schedule of product administration": 4, "Influenza like illness": 4, "Limb discomfort": 4, "Peripheral swelling": 4, "Product dose omission issue": 4, "Rash": 4, "Urticaria": 4, "Burning sensation": 3, "Contusion": 3, "Cough": 3, "Hypoaesthesia": 3, "Interchange of vaccine products": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Paraesthesia": 3, "Product preparation issue": 3, "SARS-CoV-2 test": 3, "Swelling": 3, "Vaccination site mass": 3, "Vaccination site pruritus": 3, "Vomiting": 3, "Abdominal discomfort": 2, "COVID-19": 2, "Condition aggravated": 2, "Electrocardiogram": 2, "Erythema": 2, "Expired device used": 2, "Hyperhidrosis": 2, "Hypersomnia": 2, "Migraine": 2, "Movement disorder": 2, "Off label use": 2, "Oral pain": 2, "Pain of skin": 2, "Paraesthesia oral": 2, "Product expiration date issue": 2, "Product label issue": 2, "Product temperature excursion issue": 2, "Rash pruritic": 2, "Swollen tongue": 2, "Tenderness": 2, "Thrombosis": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site warmth": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal pain": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse drug reaction": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Anosmia": 1, "Application site erythema": 1, "Axillary pain": 1, "Back pain": 1, "Blister": 1, "Body temperature decreased": 1, "Bone densitometry": 1, "Carbon dioxide": 1, "Cardiac stress test": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Claustrophobia": 1, "Computerised tomogram": 1, "Constipation": 1, "Dehydration": 1, "Discomfort": 1, "Drooling": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysuria": 1, "Ear pain": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Enlarged uvula": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eye pruritus": 1, "Facial pain": 1, "Fall": 1, "Feeling hot": 1, "Flatulence": 1, "Furuncle": 1, "Gastritis": 1, "Gingival swelling": 1, "Glossodynia": 1, "Head discomfort": 1, "Heart rate": 1, "Herpes zoster": 1, "Hyperpyrexia": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Lactation disorder": 1, "Left ventricular failure": 1, "Limb mass": 1, "Lip swelling": 1, "Lipids normal": 1, "Liver injury": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Mouth swelling": 1, "Multiple organ dysfunction syndrome": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Neuralgia": 1, "Night sweats": 1, "Oedema": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Perioral dermatitis": 1, "Pharyngeal swelling": 1, "Poor quality product administered": 1, "Product administered at inappropriate site": 1, "Rash erythematous": 1, "Renal failure": 1, "Scar": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin test": 1, "Skin tightness": 1, "Sleep disorder": 1, "Sluggishness": 1, "Smear cervix": 1, "Somnolence": 1, "Stomatitis": 1, "Stress": 1, "Suspected COVID-19": 1, "Syringe issue": 1, "Taste disorder": 1, "Therapeutic response unexpected": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Underdose": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vascular pain": 1, "Walking aid user": 1}}]}
\ No newline at end of file
+{"batchcode": "005C21A", "histograms": [{"histogram": {"Expired product administered": 54, "Product storage error": 36, "No adverse event": 31, "Headache": 24, "Fatigue": 18, "Pyrexia": 18, "Vaccination site pain": 16, "Chills": 12, "Pain in extremity": 12, "Myalgia": 11, "Asthenia": 8, "Arthralgia": 7, "Nausea": 7, "Product administered to patient of inappropriate age": 7, "Vaccination site erythema": 7, "Body temperature": 6, "Lymphadenopathy": 6, "Pruritus": 6, "Chest pain": 5, "Diarrhoea": 5, "Dizziness": 5, "Feeling abnormal": 5, "Illness": 5, "Malaise": 5, "Neck pain": 5, "Pain": 5, "Vaccination site rash": 5, "Vaccination site swelling": 5, "Abdominal pain upper": 4, "Anxiety": 4, "Blood pressure measurement": 4, "Blood test": 4, "Bone pain": 4, "Decreased appetite": 4, "Dyspnoea": 4, "Gait disturbance": 4, "Inappropriate schedule of product administration": 4, "Influenza like illness": 4, "Limb discomfort": 4, "Peripheral swelling": 4, "Product dose omission issue": 4, "Rash": 4, "Urticaria": 4, "Burning sensation": 3, "Contusion": 3, "Cough": 3, "Hypoaesthesia": 3, "Interchange of vaccine products": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Paraesthesia": 3, "Product preparation issue": 3, "SARS-CoV-2 test": 3, "Swelling": 3, "Vaccination site mass": 3, "Vaccination site pruritus": 3, "Vomiting": 3, "Abdominal discomfort": 2, "COVID-19": 2, "Condition aggravated": 2, "Electrocardiogram": 2, "Erythema": 2, "Expired device used": 2, "Hyperhidrosis": 2, "Hypersomnia": 2, "Migraine": 2, "Movement disorder": 2, "Off label use": 2, "Oral pain": 2, "Pain of skin": 2, "Paraesthesia oral": 2, "Product expiration date issue": 2, "Product label issue": 2, "Product temperature excursion issue": 2, "Rash pruritic": 2, "Swollen tongue": 2, "Tenderness": 2, "Thrombosis": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site warmth": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal pain": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse drug reaction": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Anosmia": 1, "Application site erythema": 1, "Axillary pain": 1, "Back pain": 1, "Blister": 1, "Body temperature decreased": 1, "Bone densitometry": 1, "Carbon dioxide": 1, "Cardiac stress test": 1, "Cardiovascular disorder": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Claustrophobia": 1, "Computerised tomogram": 1, "Constipation": 1, "Dehydration": 1, "Discomfort": 1, "Drooling": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysuria": 1, "Ear pain": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Enlarged uvula": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eye pruritus": 1, "Facial pain": 1, "Fall": 1, "Feeling hot": 1, "Flatulence": 1, "Furuncle": 1, "Gastritis": 1, "Gingival swelling": 1, "Glossodynia": 1, "Head discomfort": 1, "Heart rate": 1, "Herpes zoster": 1, "Hyperpyrexia": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Lactation disorder": 1, "Left ventricular failure": 1, "Limb mass": 1, "Lip swelling": 1, "Lipids normal": 1, "Liver injury": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Mouth swelling": 1, "Multiple organ dysfunction syndrome": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Neuralgia": 1, "Night sweats": 1, "Oedema": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Perioral dermatitis": 1, "Pharyngeal swelling": 1, "Poor quality product administered": 1, "Product administered at inappropriate site": 1, "Rash erythematous": 1, "Renal failure": 1, "Scar": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin test": 1, "Skin tightness": 1, "Sleep disorder": 1, "Sluggishness": 1, "Smear cervix": 1, "Somnolence": 1, "Stomatitis": 1, "Stress": 1, "Suspected COVID-19": 1, "Syringe issue": 1, "Taste disorder": 1, "Therapeutic response unexpected": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Underdose": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vascular pain": 1, "Walking aid user": 1}, "batchcodes": ["005C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005C21AAAAA.json b/docs/data/histograms/United States/005C21AAAAA.json
index 1b9068b78bd..daf464357fa 100644
--- a/docs/data/histograms/United States/005C21AAAAA.json
+++ b/docs/data/histograms/United States/005C21AAAAA.json
@@ -1 +1 @@
-{"batchcode": "005C21AAAAA", "histograms": [{"batchcodes": ["005C21AAAAA"], "histogram": {"Blood pressure measurement": 1, "Deep vein thrombosis": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Joint swelling": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Panic reaction": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Tenderness": 1, "Thrombophlebitis superficial": 1, "Thrombosis": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "005C21AAAAA", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Deep vein thrombosis": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Joint swelling": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Panic reaction": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Tenderness": 1, "Thrombophlebitis superficial": 1, "Thrombosis": 1, "Vaccination complication": 1}, "batchcodes": ["005C21AAAAA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005M20A.json b/docs/data/histograms/United States/005M20A.json
index 8e12c733318..2a9662a6e17 100644
--- a/docs/data/histograms/United States/005M20A.json
+++ b/docs/data/histograms/United States/005M20A.json
@@ -1 +1 @@
-{"batchcode": "005M20A", "histograms": [{"batchcodes": ["005M20A"], "histogram": {"Electrocardiogram": 1, "Fatigue": 1, "Magnetic resonance imaging": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "005M20A", "histograms": [{"histogram": {"Electrocardiogram": 1, "Fatigue": 1, "Magnetic resonance imaging": 1, "Myalgia": 1}, "batchcodes": ["005M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005M21.json b/docs/data/histograms/United States/005M21.json
index bd874ed810f..547ac6af5f5 100644
--- a/docs/data/histograms/United States/005M21.json
+++ b/docs/data/histograms/United States/005M21.json
@@ -1 +1 @@
-{"batchcode": "005M21", "histograms": [{"batchcodes": ["005M21"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "005M21", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["005M21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005M21A.json b/docs/data/histograms/United States/005M21A.json
index 0ac30566522..ff70951875a 100644
--- a/docs/data/histograms/United States/005M21A.json
+++ b/docs/data/histograms/United States/005M21A.json
@@ -1 +1 @@
-{"batchcode": "005M21A", "histograms": [{"batchcodes": ["005M21A", "071 F21A", "1805022"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["005M21A"], "histogram": {"Expired product administered": 7, "Product storage error": 6, "COVID-19": 5, "SARS-CoV-2 test": 4, "Headache": 3, "Cough": 2, "Drug ineffective": 2, "Feeling abnormal": 2, "Interchange of vaccine products": 2, "Swelling": 2, "Swollen tongue": 2, "Abdominal pain upper": 1, "Body temperature": 1, "Dysphagia": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pain": 1, "Ear swelling": 1, "Feeding disorder": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Lip swelling": 1, "Muscle spasms": 1, "Nasal congestion": 1, "Nausea": 1, "No adverse event": 1, "Pain": 1, "Papule": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Rash": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test positive": 1, "Sinusitis": 1, "Somnolence": 1, "Swelling face": 1, "Tenderness": 1, "Therapeutic product ineffective": 1, "Tinnitus": 1, "Toothache": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "005M21A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["005M21A", "071 F21A", "1805022"]}, {"histogram": {"Expired product administered": 7, "Product storage error": 6, "COVID-19": 5, "SARS-CoV-2 test": 4, "Headache": 3, "Cough": 2, "Drug ineffective": 2, "Feeling abnormal": 2, "Interchange of vaccine products": 2, "Swelling": 2, "Swollen tongue": 2, "Abdominal pain upper": 1, "Body temperature": 1, "Dysphagia": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pain": 1, "Ear swelling": 1, "Feeding disorder": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Lip swelling": 1, "Muscle spasms": 1, "Nasal congestion": 1, "Nausea": 1, "No adverse event": 1, "Pain": 1, "Papule": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Rash": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test positive": 1, "Sinusitis": 1, "Somnolence": 1, "Swelling face": 1, "Tenderness": 1, "Therapeutic product ineffective": 1, "Tinnitus": 1, "Toothache": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1}, "batchcodes": ["005M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/005M51A.json b/docs/data/histograms/United States/005M51A.json
index bdd3638129b..aab931c9480 100644
--- a/docs/data/histograms/United States/005M51A.json
+++ b/docs/data/histograms/United States/005M51A.json
@@ -1 +1 @@
-{"batchcode": "005M51A", "histograms": [{"batchcodes": ["005M51A", "071F21A", "1805020"], "histogram": {"Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "005M51A", "histograms": [{"histogram": {"Suspected COVID-19": 1}, "batchcodes": ["005M51A", "071F21A", "1805020"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006-C21A.json b/docs/data/histograms/United States/006-C21A.json
index fd46dce9a94..c7e09aa0b0b 100644
--- a/docs/data/histograms/United States/006-C21A.json
+++ b/docs/data/histograms/United States/006-C21A.json
@@ -1 +1 @@
-{"batchcode": "006-C21A", "histograms": [{"batchcodes": ["006-C21A"], "histogram": {"Asthenia": 1, "Blood pressure decreased": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Somnolence": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "006-C21A", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure decreased": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Somnolence": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}, "batchcodes": ["006-C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006021A.json b/docs/data/histograms/United States/006021A.json
index 3e4e3990a5a..6fd752554a6 100644
--- a/docs/data/histograms/United States/006021A.json
+++ b/docs/data/histograms/United States/006021A.json
@@ -1 +1 @@
-{"batchcode": "006021A", "histograms": [{"batchcodes": ["006021A"], "histogram": {"Headache": 2, "Pain in extremity": 2, "Chest discomfort": 1, "Chest pain": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Eructation": 1, "Feeling hot": 1, "Myalgia": 1, "Nausea": 1, "Non-cardiac chest pain": 1, "On and off phenomenon": 1, "Pyrexia": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "006021A", "histograms": [{"histogram": {"Headache": 2, "Pain in extremity": 2, "Chest discomfort": 1, "Chest pain": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Ear discomfort": 1, "Eructation": 1, "Feeling hot": 1, "Myalgia": 1, "Nausea": 1, "Non-cardiac chest pain": 1, "On and off phenomenon": 1, "Pyrexia": 1, "Sleep disorder": 1}, "batchcodes": ["006021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006121B.json b/docs/data/histograms/United States/006121B.json
index 624ff924007..cab48d3bf16 100644
--- a/docs/data/histograms/United States/006121B.json
+++ b/docs/data/histograms/United States/006121B.json
@@ -1 +1 @@
-{"batchcode": "006121B", "histograms": [{"batchcodes": ["006121B"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "006121B", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["006121B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0061321A.json b/docs/data/histograms/United States/0061321A.json
index 4ef9677b036..d75d53ad436 100644
--- a/docs/data/histograms/United States/0061321A.json
+++ b/docs/data/histograms/United States/0061321A.json
@@ -1 +1 @@
-{"batchcode": "0061321A", "histograms": [{"batchcodes": ["0061321A"], "histogram": {"Dermatitis acneiform": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Paraesthesia": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "0061321A", "histograms": [{"histogram": {"Dermatitis acneiform": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Paraesthesia": 1, "Vaccination site erythema": 1}, "batchcodes": ["0061321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00620.json b/docs/data/histograms/United States/00620.json
index 4f7a071d58a..a89420b8b69 100644
--- a/docs/data/histograms/United States/00620.json
+++ b/docs/data/histograms/United States/00620.json
@@ -1 +1 @@
-{"batchcode": "00620", "histograms": [{"batchcodes": ["00620"], "histogram": {"Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "00620", "histograms": [{"histogram": {"Transient ischaemic attack": 1}, "batchcodes": ["00620"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00621A.json b/docs/data/histograms/United States/00621A.json
index aacc2e20b2d..6d1607ec8c3 100644
--- a/docs/data/histograms/United States/00621A.json
+++ b/docs/data/histograms/United States/00621A.json
@@ -1 +1 @@
-{"batchcode": "00621A", "histograms": [{"batchcodes": ["00621A"], "histogram": {"Blood cholesterol": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Expired product administered": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "00621A", "histograms": [{"histogram": {"Blood cholesterol": 1, "Blood pressure measurement": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Chest pain": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Expired product administered": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "X-ray": 1}, "batchcodes": ["00621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00621CA.json b/docs/data/histograms/United States/00621CA.json
index d4bc8e0e053..3401349de28 100644
--- a/docs/data/histograms/United States/00621CA.json
+++ b/docs/data/histograms/United States/00621CA.json
@@ -1 +1 @@
-{"batchcode": "00621CA", "histograms": [{"batchcodes": ["00621CA"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "00621CA", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["00621CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006221A.json b/docs/data/histograms/United States/006221A.json
index 8004985be26..2b4d0443260 100644
--- a/docs/data/histograms/United States/006221A.json
+++ b/docs/data/histograms/United States/006221A.json
@@ -1 +1 @@
-{"batchcode": "006221A", "histograms": [{"batchcodes": ["006221A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "006221A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["006221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006321A.json b/docs/data/histograms/United States/006321A.json
index 94dc19e6007..2e7d99765a5 100644
--- a/docs/data/histograms/United States/006321A.json
+++ b/docs/data/histograms/United States/006321A.json
@@ -1 +1 @@
-{"batchcode": "006321A", "histograms": [{"batchcodes": ["006321A"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006321A", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["006321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00638B21A.json b/docs/data/histograms/United States/00638B21A.json
index c284a8103d9..eb0c25901fa 100644
--- a/docs/data/histograms/United States/00638B21A.json
+++ b/docs/data/histograms/United States/00638B21A.json
@@ -1 +1 @@
-{"batchcode": "00638B21A", "histograms": [{"batchcodes": ["00638B21A"], "histogram": {"Abdominal discomfort": 1, "Fatigue": 1, "Hypokinesia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00638B21A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Fatigue": 1, "Hypokinesia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["00638B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0066H21A.json b/docs/data/histograms/United States/0066H21A.json
index 62ee5d7e3a2..585ea2392e9 100644
--- a/docs/data/histograms/United States/0066H21A.json
+++ b/docs/data/histograms/United States/0066H21A.json
@@ -1 +1 @@
-{"batchcode": "0066H21A", "histograms": [{"batchcodes": ["0066H21A"], "histogram": {"Back pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0066H21A", "histograms": [{"histogram": {"Back pain": 1}, "batchcodes": ["0066H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006821A.json b/docs/data/histograms/United States/006821A.json
index c7226a70c47..120393a356b 100644
--- a/docs/data/histograms/United States/006821A.json
+++ b/docs/data/histograms/United States/006821A.json
@@ -1 +1 @@
-{"batchcode": "006821A", "histograms": [{"batchcodes": ["006821A"], "histogram": {"Myalgia": 4, "Pain in extremity": 4, "Headache": 3, "Chills": 2, "Fatigue": 2, "Pain": 2, "Product storage error": 2, "Cough": 1, "Expired product administered": 1, "Feeling hot": 1, "Illness": 1, "Insomnia": 1, "Malaise": 1, "Nasal congestion": 1, "Nausea": 1, "Palpitations": 1, "Peripheral swelling": 1, "Poor quality product administered": 1, "Product administration error": 1, "Pyrexia": 1, "Tinnitus": 1, "Urinary tract infection": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006821A", "histograms": [{"histogram": {"Myalgia": 4, "Pain in extremity": 4, "Headache": 3, "Chills": 2, "Fatigue": 2, "Pain": 2, "Product storage error": 2, "Cough": 1, "Expired product administered": 1, "Feeling hot": 1, "Illness": 1, "Insomnia": 1, "Malaise": 1, "Nasal congestion": 1, "Nausea": 1, "Palpitations": 1, "Peripheral swelling": 1, "Poor quality product administered": 1, "Product administration error": 1, "Pyrexia": 1, "Tinnitus": 1, "Urinary tract infection": 1, "Vaccination site pain": 1}, "batchcodes": ["006821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006A20A.json b/docs/data/histograms/United States/006A20A.json
index bbee120bf88..722385fd25e 100644
--- a/docs/data/histograms/United States/006A20A.json
+++ b/docs/data/histograms/United States/006A20A.json
@@ -1 +1 @@
-{"batchcode": "006A20A", "histograms": [{"batchcodes": ["006A20A"], "histogram": {"Malaise": 2, "Chills": 1, "Feeling abnormal": 1, "Insomnia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "006A20A", "histograms": [{"histogram": {"Malaise": 2, "Chills": 1, "Feeling abnormal": 1, "Insomnia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1}, "batchcodes": ["006A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006A21A.json b/docs/data/histograms/United States/006A21A.json
index 13b52f423ac..1ac91d459ac 100644
--- a/docs/data/histograms/United States/006A21A.json
+++ b/docs/data/histograms/United States/006A21A.json
@@ -1 +1 @@
-{"batchcode": "006A21A", "histograms": [{"batchcodes": ["006A21A"], "histogram": {"Fatigue": 2, "Blood urine present": 1, "Bronchitis bacterial": 1, "Chills": 1, "Dysuria": 1, "Headache": 1, "Limb discomfort": 1, "Pyrexia": 1, "Somnolence": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006A21A", "histograms": [{"histogram": {"Fatigue": 2, "Blood urine present": 1, "Bronchitis bacterial": 1, "Chills": 1, "Dysuria": 1, "Headache": 1, "Limb discomfort": 1, "Pyrexia": 1, "Somnolence": 1, "Vaccination site pain": 1}, "batchcodes": ["006A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B2(Z)1A.json b/docs/data/histograms/United States/006B2(Z)1A.json
index ba6c74b8604..002fd47018e 100644
--- a/docs/data/histograms/United States/006B2(Z)1A.json
+++ b/docs/data/histograms/United States/006B2(Z)1A.json
@@ -1 +1 @@
-{"batchcode": "006B2(Z)1A", "histograms": [{"batchcodes": ["006B2(Z)1A"], "histogram": {"Hypoaesthesia": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "006B2(Z)1A", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["006B2(Z)1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B2-A.json b/docs/data/histograms/United States/006B2-A.json
index 42f1ebc1132..196cb8696f5 100644
--- a/docs/data/histograms/United States/006B2-A.json
+++ b/docs/data/histograms/United States/006B2-A.json
@@ -1 +1 @@
-{"batchcode": "006B2-A", "histograms": [{"batchcodes": ["006B2-A"], "histogram": {"Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "006B2-A", "histograms": [{"histogram": {"Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["006B2-A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B21.json b/docs/data/histograms/United States/006B21.json
index 9a56a6c5538..4b75b21896e 100644
--- a/docs/data/histograms/United States/006B21.json
+++ b/docs/data/histograms/United States/006B21.json
@@ -1 +1 @@
-{"batchcode": "006B21", "histograms": [{"batchcodes": ["006B21"], "histogram": {"Deafness unilateral": 1, "Presbyacusis": 1}}]}
\ No newline at end of file
+{"batchcode": "006B21", "histograms": [{"histogram": {"Deafness unilateral": 1, "Presbyacusis": 1}, "batchcodes": ["006B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B2117.json b/docs/data/histograms/United States/006B2117.json
index 7d9c67e319c..48cf3259205 100644
--- a/docs/data/histograms/United States/006B2117.json
+++ b/docs/data/histograms/United States/006B2117.json
@@ -1 +1 @@
-{"batchcode": "006B2117", "histograms": [{"batchcodes": ["006B2117"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "006B2117", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["006B2117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B211A.json b/docs/data/histograms/United States/006B211A.json
index d4c2e5cd05a..6140bf97348 100644
--- a/docs/data/histograms/United States/006B211A.json
+++ b/docs/data/histograms/United States/006B211A.json
@@ -1 +1 @@
-{"batchcode": "006B211A", "histograms": [{"batchcodes": ["006B211A"], "histogram": {"Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Vaccination site induration": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "006B211A", "histograms": [{"histogram": {"Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Vaccination site induration": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1}, "batchcodes": ["006B211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B214.json b/docs/data/histograms/United States/006B214.json
index d058de549ae..cf782b92536 100644
--- a/docs/data/histograms/United States/006B214.json
+++ b/docs/data/histograms/United States/006B214.json
@@ -1 +1 @@
-{"batchcode": "006B214", "histograms": [{"batchcodes": ["006B214"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "006B214", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1, "Vaccination site reaction": 1}, "batchcodes": ["006B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B219.json b/docs/data/histograms/United States/006B219.json
index f93ac852b24..bc594afca96 100644
--- a/docs/data/histograms/United States/006B219.json
+++ b/docs/data/histograms/United States/006B219.json
@@ -1 +1 @@
-{"batchcode": "006B219", "histograms": [{"batchcodes": ["006B219"], "histogram": {"Rash": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "006B219", "histograms": [{"histogram": {"Rash": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["006B219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B21A 4/10/63.json b/docs/data/histograms/United States/006B21A 4/10/63.json
index 61a8493b5d2..44e3ef1ef10 100644
--- a/docs/data/histograms/United States/006B21A 4/10/63.json
+++ b/docs/data/histograms/United States/006B21A 4/10/63.json
@@ -1 +1 @@
-{"batchcode": "006B21A 4/10/63", "histograms": [{"batchcodes": ["006B21A 4/10/63"], "histogram": {"Herpes zoster": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "006B21A 4/10/63", "histograms": [{"histogram": {"Herpes zoster": 1, "Pruritus": 1}, "batchcodes": ["006B21A 4/10/63"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B21A OR 006B.json b/docs/data/histograms/United States/006B21A OR 006B.json
index bfb976a3f79..cf70dbc7654 100644
--- a/docs/data/histograms/United States/006B21A OR 006B.json
+++ b/docs/data/histograms/United States/006B21A OR 006B.json
@@ -1 +1 @@
-{"batchcode": "006B21A OR 006B", "histograms": [{"batchcodes": ["006B21A OR 006B"], "histogram": {"Lip swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "006B21A OR 006B", "histograms": [{"histogram": {"Lip swelling": 1, "Swelling face": 1}, "batchcodes": ["006B21A OR 006B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B21A.json b/docs/data/histograms/United States/006B21A.json
index 6341383d08e..e36ddd8f34e 100644
--- a/docs/data/histograms/United States/006B21A.json
+++ b/docs/data/histograms/United States/006B21A.json
@@ -1 +1 @@
-{"batchcode": "006B21A", "histograms": [{"batchcodes": ["006B21A"], "histogram": {"Pyrexia": 61, "Fatigue": 59, "Headache": 57, "Pain in extremity": 51, "Myalgia": 50, "Vaccination site pain": 46, "Chills": 44, "Pain": 30, "Dizziness": 29, "Nausea": 29, "Vaccination site erythema": 27, "Pruritus": 19, "Rash": 19, "Vaccination site swelling": 19, "Body temperature": 18, "COVID-19": 18, "Vaccination site warmth": 18, "Influenza like illness": 17, "Asthenia": 15, "Paraesthesia": 15, "Erythema": 14, "Hypoaesthesia": 14, "SARS-CoV-2 test": 14, "Vaccination site pruritus": 14, "Arthralgia": 13, "Product dose omission issue": 13, "Diarrhoea": 12, "Dyspnoea": 12, "Feeling abnormal": 11, "Vomiting": 11, "Vaccination site rash": 10, "Blood pressure measurement": 9, "Computerised tomogram": 9, "Gait disturbance": 9, "Illness": 9, "Malaise": 9, "Urticaria": 9, "Feeling hot": 8, "Muscle spasms": 8, "Peripheral swelling": 8, "Product administered to patient of inappropriate age": 8, "Vaccination complication": 8, "Chest pain": 7, "Cough": 7, "Ear pain": 7, "Inappropriate schedule of product administration": 7, "Injection site pain": 7, "Limb discomfort": 7, "Lymphadenopathy": 7, "Palpitations": 7, "Abdominal pain upper": 6, "Decreased appetite": 6, "Expired product administered": 6, "Heart rate increased": 6, "Hyperhidrosis": 6, "Migraine": 6, "Musculoskeletal stiffness": 6, "Neck pain": 6, "Vaccination site reaction": 6, "Ageusia": 5, "Swelling": 5, "Abdominal discomfort": 4, "Back pain": 4, "Blood test": 4, "Chest discomfort": 4, "Cold sweat": 4, "Discomfort": 4, "Insomnia": 4, "Rash macular": 4, "Rhinorrhoea": 4, "Seizure": 4, "Tinnitus": 4, "Vision blurred": 4, "X-ray": 4, "Appendicitis": 3, "Burning sensation": 3, "Condition aggravated": 3, "Contusion": 3, "Drug ineffective": 3, "Dry mouth": 3, "Eating disorder": 3, "Eye pain": 3, "Herpes zoster": 3, "Hypertension": 3, "Impaired work ability": 3, "Injection site swelling": 3, "Lip swelling": 3, "Mobility decreased": 3, "Movement disorder": 3, "Nasal congestion": 3, "Oropharyngeal pain": 3, "Paraesthesia oral": 3, "Parosmia": 3, "Pneumonia": 3, "SARS-CoV-2 test positive": 3, "Sinusitis": 3, "Skin discolouration": 3, "Somnolence": 3, "Tenderness": 3, "Underdose": 3, "Urine analysis": 3, "Vaccination site induration": 3, "Vaccination site mass": 3, "Vertigo": 3, "Alopecia": 2, "Anosmia": 2, "Anxiety": 2, "Bedridden": 2, "Blister": 2, "Blood culture": 2, "Blood triglycerides": 2, "Breast pain": 2, "Cerebrovascular accident": 2, "Confusional state": 2, "Dry skin": 2, "Dysgeusia": 2, "Dysphagia": 2, "Dysphonia": 2, "Dysstasia": 2, "Ear discomfort": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Fibromyalgia": 2, "Flatulence": 2, "Heart rate": 2, "Hot flush": 2, "Hypokinesia": 2, "Inflammation": 2, "Influenza": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Intentional product use issue": 2, "Joint range of motion decreased": 2, "Lethargy": 2, "Motor dysfunction": 2, "Muscle twitching": 2, "Nervousness": 2, "Pain in jaw": 2, "Poor quality sleep": 2, "Product administration error": 2, "Product storage error": 2, "Productive cough": 2, "Sleep disorder": 2, "Swelling face": 2, "Swelling of eyelid": 2, "Syncope": 2, "Tachycardia": 2, "Thrombosis": 2, "Ultrasound abdomen": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Accidental underdose": 1, "Acute left ventricular failure": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Anaemia": 1, "Anal incontinence": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Arteriovenous fistula site haemorrhage": 1, "Arthropod bite": 1, "Asthma": 1, "Axillary pain": 1, "Balance disorder": 1, "Bell's palsy": 1, "Biliary colic": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bone pain": 1, "Breast discomfort": 1, "Bronchitis": 1, "Bursitis": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Choking sensation": 1, "Cluster headache": 1, "Coma": 1, "Computerised tomogram thorax": 1, "Conjunctival hyperaemia": 1, "Coordination abnormal": 1, "Creatinine renal clearance": 1, "Death": 1, "Decreased immune responsiveness": 1, "Decreased interest": 1, "Depression": 1, "Dermatitis": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Dry throat": 1, "Ejection fraction": 1, "Electrophoresis": 1, "Emotional distress": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Exposure during pregnancy": 1, "Eye disorder": 1, "Eye haemorrhage": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Foot operation": 1, "Freezing phenomenon": 1, "Full blood count": 1, "Gait inability": 1, "Gastroenteritis viral": 1, "Gastrointestinal disorder": 1, "Gastrooesophageal reflux disease": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Glomerulonephritis minimal lesion": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Hormone level abnormal": 1, "Hospitalisation": 1, "Hyperlipidaemia": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypoaesthesia oral": 1, "Hypoalbuminaemia": 1, "Hypophagia": 1, "Hypotension": 1, "Hypoxia": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Induration": 1, "Influenza virus test": 1, "Infrequent bowel movements": 1, "Injection site discolouration": 1, "Injection site inflammation": 1, "Injection site warmth": 1, "Interchange of vaccine products": 1, "Jaw disorder": 1, "Joint swelling": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Left ventricular hypertrophy": 1, "Legionella test": 1, "Ligament sprain": 1, "Loss of consciousness": 1, "Lung neoplasm malignant": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Menstruation irregular": 1, "Metabolic function test": 1, "Metastases to central nervous system": 1, "Multiple sclerosis": 1, "Muscle strain": 1, "Musculoskeletal chest pain": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Nephrotic syndrome": 1, "Nerve injury": 1, "Night sweats": 1, "Nightmare": 1, "No adverse event": 1, "Ocular discomfort": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oxygen saturation": 1, "Pallor": 1, "Paralysis": 1, "Pelvic pain": 1, "Periorbital oedema": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Proteinuria": 1, "Pulmonary mass": 1, "Rash erythematous": 1, "Red blood cell sedimentation rate": 1, "Reduced facial expression": 1, "Renal disorder": 1, "Renal tubular injury": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "Salivary hypersecretion": 1, "Sciatica": 1, "Secretion discharge": 1, "Sensitisation": 1, "Sensory loss": 1, "Sinus congestion": 1, "Sinus headache": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin irritation": 1, "Skin odour abnormal": 1, "Skin test": 1, "Skin tightness": 1, "Skin warm": 1, "Smear cervix": 1, "Sneezing": 1, "Stress": 1, "Therapeutic response unexpected": 1, "Throat clearing": 1, "Throat tightness": 1, "Thyroid function test": 1, "Toothache": 1, "Tremor": 1, "Tubulointerstitial nephritis": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound chest": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine abnormality": 1, "Uterine leiomyoma": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discharge": 1, "Vaccination site discolouration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Vaginal haemorrhage": 1, "Visual impairment": 1, "Vitamin D": 1, "Vitamin D deficiency": 1, "Walking aid user": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "006B21A", "histograms": [{"histogram": {"Pyrexia": 61, "Fatigue": 59, "Headache": 57, "Pain in extremity": 51, "Myalgia": 50, "Vaccination site pain": 46, "Chills": 44, "Pain": 30, "Dizziness": 29, "Nausea": 29, "Vaccination site erythema": 27, "Pruritus": 19, "Rash": 19, "Vaccination site swelling": 19, "Body temperature": 18, "COVID-19": 18, "Vaccination site warmth": 18, "Influenza like illness": 17, "Asthenia": 15, "Paraesthesia": 15, "Erythema": 14, "Hypoaesthesia": 14, "SARS-CoV-2 test": 14, "Vaccination site pruritus": 14, "Arthralgia": 13, "Product dose omission issue": 13, "Diarrhoea": 12, "Dyspnoea": 12, "Feeling abnormal": 11, "Vomiting": 11, "Vaccination site rash": 10, "Blood pressure measurement": 9, "Computerised tomogram": 9, "Gait disturbance": 9, "Illness": 9, "Malaise": 9, "Urticaria": 9, "Feeling hot": 8, "Muscle spasms": 8, "Peripheral swelling": 8, "Product administered to patient of inappropriate age": 8, "Vaccination complication": 8, "Chest pain": 7, "Cough": 7, "Ear pain": 7, "Inappropriate schedule of product administration": 7, "Injection site pain": 7, "Limb discomfort": 7, "Lymphadenopathy": 7, "Palpitations": 7, "Abdominal pain upper": 6, "Decreased appetite": 6, "Expired product administered": 6, "Heart rate increased": 6, "Hyperhidrosis": 6, "Migraine": 6, "Musculoskeletal stiffness": 6, "Neck pain": 6, "Vaccination site reaction": 6, "Ageusia": 5, "Swelling": 5, "Abdominal discomfort": 4, "Back pain": 4, "Blood test": 4, "Chest discomfort": 4, "Cold sweat": 4, "Discomfort": 4, "Insomnia": 4, "Rash macular": 4, "Rhinorrhoea": 4, "Seizure": 4, "Tinnitus": 4, "Vision blurred": 4, "X-ray": 4, "Appendicitis": 3, "Burning sensation": 3, "Condition aggravated": 3, "Contusion": 3, "Drug ineffective": 3, "Dry mouth": 3, "Eating disorder": 3, "Eye pain": 3, "Herpes zoster": 3, "Hypertension": 3, "Impaired work ability": 3, "Injection site swelling": 3, "Lip swelling": 3, "Mobility decreased": 3, "Movement disorder": 3, "Nasal congestion": 3, "Oropharyngeal pain": 3, "Paraesthesia oral": 3, "Parosmia": 3, "Pneumonia": 3, "SARS-CoV-2 test positive": 3, "Sinusitis": 3, "Skin discolouration": 3, "Somnolence": 3, "Tenderness": 3, "Underdose": 3, "Urine analysis": 3, "Vaccination site induration": 3, "Vaccination site mass": 3, "Vertigo": 3, "Alopecia": 2, "Anosmia": 2, "Anxiety": 2, "Bedridden": 2, "Blister": 2, "Blood culture": 2, "Blood triglycerides": 2, "Breast pain": 2, "Cerebrovascular accident": 2, "Confusional state": 2, "Dry skin": 2, "Dysgeusia": 2, "Dysphagia": 2, "Dysphonia": 2, "Dysstasia": 2, "Ear discomfort": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Fibromyalgia": 2, "Flatulence": 2, "Heart rate": 2, "Hot flush": 2, "Hypokinesia": 2, "Inflammation": 2, "Influenza": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Intentional product use issue": 2, "Joint range of motion decreased": 2, "Lethargy": 2, "Motor dysfunction": 2, "Muscle twitching": 2, "Nervousness": 2, "Pain in jaw": 2, "Poor quality sleep": 2, "Product administration error": 2, "Product storage error": 2, "Productive cough": 2, "Sleep disorder": 2, "Swelling face": 2, "Swelling of eyelid": 2, "Syncope": 2, "Tachycardia": 2, "Thrombosis": 2, "Ultrasound abdomen": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Accidental underdose": 1, "Acute left ventricular failure": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Anaemia": 1, "Anal incontinence": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Arteriovenous fistula site haemorrhage": 1, "Arthropod bite": 1, "Asthma": 1, "Axillary pain": 1, "Balance disorder": 1, "Bell's palsy": 1, "Biliary colic": 1, "Biopsy kidney": 1, "Blood albumin": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bone pain": 1, "Breast discomfort": 1, "Bronchitis": 1, "Bursitis": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cellulitis": 1, "Central nervous system lesion": 1, "Choking sensation": 1, "Cluster headache": 1, "Coma": 1, "Computerised tomogram thorax": 1, "Conjunctival hyperaemia": 1, "Coordination abnormal": 1, "Creatinine renal clearance": 1, "Death": 1, "Decreased immune responsiveness": 1, "Decreased interest": 1, "Depression": 1, "Dermatitis": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Dry throat": 1, "Ejection fraction": 1, "Electrophoresis": 1, "Emotional distress": 1, "Epigastric discomfort": 1, "Epilepsy": 1, "Exposure during pregnancy": 1, "Eye disorder": 1, "Eye haemorrhage": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Foot operation": 1, "Freezing phenomenon": 1, "Full blood count": 1, "Gait inability": 1, "Gastroenteritis viral": 1, "Gastrointestinal disorder": 1, "Gastrooesophageal reflux disease": 1, "Generalised oedema": 1, "Generalised tonic-clonic seizure": 1, "Glomerulonephritis minimal lesion": 1, "Guillain-Barre syndrome": 1, "Head discomfort": 1, "Heavy menstrual bleeding": 1, "Hormone level abnormal": 1, "Hospitalisation": 1, "Hyperlipidaemia": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hypoaesthesia oral": 1, "Hypoalbuminaemia": 1, "Hypophagia": 1, "Hypotension": 1, "Hypoxia": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Induration": 1, "Influenza virus test": 1, "Infrequent bowel movements": 1, "Injection site discolouration": 1, "Injection site inflammation": 1, "Injection site warmth": 1, "Interchange of vaccine products": 1, "Jaw disorder": 1, "Joint swelling": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Left ventricular hypertrophy": 1, "Legionella test": 1, "Ligament sprain": 1, "Loss of consciousness": 1, "Lung neoplasm malignant": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Menstruation irregular": 1, "Metabolic function test": 1, "Metastases to central nervous system": 1, "Multiple sclerosis": 1, "Muscle strain": 1, "Musculoskeletal chest pain": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Nephrotic syndrome": 1, "Nerve injury": 1, "Night sweats": 1, "Nightmare": 1, "No adverse event": 1, "Ocular discomfort": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oxygen saturation": 1, "Pallor": 1, "Paralysis": 1, "Pelvic pain": 1, "Periorbital oedema": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Proteinuria": 1, "Pulmonary mass": 1, "Rash erythematous": 1, "Red blood cell sedimentation rate": 1, "Reduced facial expression": 1, "Renal disorder": 1, "Renal tubular injury": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "Salivary hypersecretion": 1, "Sciatica": 1, "Secretion discharge": 1, "Sensitisation": 1, "Sensory loss": 1, "Sinus congestion": 1, "Sinus headache": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin irritation": 1, "Skin odour abnormal": 1, "Skin test": 1, "Skin tightness": 1, "Skin warm": 1, "Smear cervix": 1, "Sneezing": 1, "Stress": 1, "Therapeutic response unexpected": 1, "Throat clearing": 1, "Throat tightness": 1, "Thyroid function test": 1, "Toothache": 1, "Tremor": 1, "Tubulointerstitial nephritis": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound chest": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Urine abnormality": 1, "Uterine leiomyoma": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discharge": 1, "Vaccination site discolouration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Vaginal haemorrhage": 1, "Visual impairment": 1, "Vitamin D": 1, "Vitamin D deficiency": 1, "Walking aid user": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong product administered": 1}, "batchcodes": ["006B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B21N.json b/docs/data/histograms/United States/006B21N.json
index b391fb84278..253141eda39 100644
--- a/docs/data/histograms/United States/006B21N.json
+++ b/docs/data/histograms/United States/006B21N.json
@@ -1 +1 @@
-{"batchcode": "006B21N", "histograms": [{"batchcodes": ["006B21N"], "histogram": {"Back pain": 1, "Pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006B21N", "histograms": [{"histogram": {"Back pain": 1, "Pain": 1, "Vaccination site pain": 1}, "batchcodes": ["006B21N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B2HA.json b/docs/data/histograms/United States/006B2HA.json
index 2fd27e5801b..f0f01e88fd2 100644
--- a/docs/data/histograms/United States/006B2HA.json
+++ b/docs/data/histograms/United States/006B2HA.json
@@ -1 +1 @@
-{"batchcode": "006B2HA", "histograms": [{"batchcodes": ["006B2HA"], "histogram": {"Discomfort": 1, "Myalgia": 1, "Vaccination site joint pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006B2HA", "histograms": [{"histogram": {"Discomfort": 1, "Myalgia": 1, "Vaccination site joint pain": 1}, "batchcodes": ["006B2HA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006B71A.json b/docs/data/histograms/United States/006B71A.json
index e11b132e7b5..76ed15f8115 100644
--- a/docs/data/histograms/United States/006B71A.json
+++ b/docs/data/histograms/United States/006B71A.json
@@ -1 +1 @@
-{"batchcode": "006B71A", "histograms": [{"batchcodes": ["006B71A"], "histogram": {"Chest pain": 1, "Feeling hot": 1, "Hot flush": 1, "Insomnia": 1, "Medication error": 1}}]}
\ No newline at end of file
+{"batchcode": "006B71A", "histograms": [{"histogram": {"Chest pain": 1, "Feeling hot": 1, "Hot flush": 1, "Insomnia": 1, "Medication error": 1}, "batchcodes": ["006B71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006BUA.json b/docs/data/histograms/United States/006BUA.json
index 4ab47875064..498408e9316 100644
--- a/docs/data/histograms/United States/006BUA.json
+++ b/docs/data/histograms/United States/006BUA.json
@@ -1 +1 @@
-{"batchcode": "006BUA", "histograms": [{"batchcodes": ["006BUA"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Feeling abnormal": 1, "Pyrexia": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "006BUA", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Feeling abnormal": 1, "Pyrexia": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["006BUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006BZ1A.json b/docs/data/histograms/United States/006BZ1A.json
index 0abd6ad9c25..a9e59405f8a 100644
--- a/docs/data/histograms/United States/006BZ1A.json
+++ b/docs/data/histograms/United States/006BZ1A.json
@@ -1 +1 @@
-{"batchcode": "006BZ1A", "histograms": [{"batchcodes": ["006BZ1A"], "histogram": {"Illness": 2, "Dysphonia": 1, "Extra dose administered": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Malaise": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "006BZ1A", "histograms": [{"histogram": {"Illness": 2, "Dysphonia": 1, "Extra dose administered": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Impaired work ability": 1, "Malaise": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1, "Vaccination complication": 1}, "batchcodes": ["006BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006C21A.json b/docs/data/histograms/United States/006C21A.json
index d5345710963..a16a8e187b2 100644
--- a/docs/data/histograms/United States/006C21A.json
+++ b/docs/data/histograms/United States/006C21A.json
@@ -1 +1 @@
-{"batchcode": "006C21A", "histograms": [{"batchcodes": ["006C21A"], "histogram": {"Expired product administered": 334, "Fatigue": 24, "Vaccination site pain": 20, "Headache": 18, "Nausea": 18, "Myalgia": 16, "Dizziness": 14, "Product dose omission issue": 13, "Product storage error": 13, "Pyrexia": 13, "Pain in extremity": 11, "Vaccination site erythema": 11, "Chills": 10, "Feeling abnormal": 10, "Pruritus": 8, "Dyspnoea": 7, "Hypoaesthesia": 7, "Peripheral swelling": 7, "Erythema": 6, "Pain": 6, "Paraesthesia": 6, "SARS-CoV-2 test": 6, "Arthralgia": 5, "Asthenia": 5, "Rash": 5, "Vaccination site reaction": 5, "Vaccination site swelling": 5, "Vaccination site warmth": 5, "Somnolence": 4, "Urticaria": 4, "Vaccination site pruritus": 4, "Blood pressure measurement": 3, "Cough": 3, "Diarrhoea": 3, "Feeling hot": 3, "Insomnia": 3, "Loss of consciousness": 3, "Product administered to patient of inappropriate age": 3, "Rash macular": 3, "Vaccination complication": 3, "Vaccination site induration": 3, "Vomiting": 3, "Abdominal distension": 2, "Anxiety": 2, "Body temperature": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Discomfort": 2, "Eye swelling": 2, "Hallucination": 2, "Hyperhidrosis": 2, "Inappropriate schedule of product administration": 2, "Influenza like illness": 2, "Loss of personal independence in daily activities": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Neck pain": 2, "Neuralgia": 2, "Oropharyngeal pain": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "SARS-CoV-2 antibody test": 2, "Sinus congestion": 2, "Swelling face": 2, "Syncope": 2, "Tenderness": 2, "Vaccination site mass": 2, "Vaccination site rash": 2, "Visual impairment": 2, "Weight decreased": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Asthenopia": 1, "Asymptomatic COVID-19": 1, "Back pain": 1, "Bacterial test": 1, "Bacterial test positive": 1, "Balance disorder": 1, "Bladder spasm": 1, "Blood glucose": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood urine": 1, "Blood urine present": 1, "Body temperature increased": 1, "Burns second degree": 1, "Burns third degree": 1, "Carbon dioxide": 1, "Cardiac disorder": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Choking sensation": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Confusional state": 1, "Constipation": 1, "Contusion": 1, "Depression": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Dry mouth": 1, "Eating disorder": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Emotional distress": 1, "Erythema infectiosum": 1, "Exposure via breast milk": 1, "Feeling cold": 1, "Feeling jittery": 1, "Flank pain": 1, "Flatulence": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hospitalisation": 1, "Hyperglycaemia": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Ill-defined disorder": 1, "Illness": 1, "Immune system disorder": 1, "Impaired work ability": 1, "Induration": 1, "Injection site pain": 1, "Interchange of vaccine products": 1, "Intracranial aneurysm": 1, "Irritability": 1, "Joint swelling": 1, "Kidney infection": 1, "Lethargy": 1, "Limb discomfort": 1, "Limb injury": 1, "Lung disorder": 1, "Lymph node pain": 1, "Lymphatic disorder": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Mental impairment": 1, "Muscle strain": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Myocarditis": 1, "Oedematous kidney": 1, "Pallor": 1, "Paranoia": 1, "Pneumonia": 1, "Productive cough": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal cancer": 1, "Renal failure": 1, "Renal mass": 1, "Renal pain": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Sensation of foreign body": 1, "Sensory loss": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin fissures": 1, "Skin mass": 1, "Skin warm": 1, "Sleep disorder": 1, "Stab wound": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Therapeutic product effect variable": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Transient ischaemic attack": 1, "Underdose": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vitreous floaters": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "006C21A", "histograms": [{"histogram": {"Expired product administered": 334, "Fatigue": 24, "Vaccination site pain": 20, "Headache": 18, "Nausea": 18, "Myalgia": 16, "Dizziness": 14, "Product dose omission issue": 13, "Product storage error": 13, "Pyrexia": 13, "Pain in extremity": 11, "Vaccination site erythema": 11, "Chills": 10, "Feeling abnormal": 10, "Pruritus": 8, "Dyspnoea": 7, "Hypoaesthesia": 7, "Peripheral swelling": 7, "Erythema": 6, "Pain": 6, "Paraesthesia": 6, "SARS-CoV-2 test": 6, "Arthralgia": 5, "Asthenia": 5, "Rash": 5, "Vaccination site reaction": 5, "Vaccination site swelling": 5, "Vaccination site warmth": 5, "Somnolence": 4, "Urticaria": 4, "Vaccination site pruritus": 4, "Blood pressure measurement": 3, "Cough": 3, "Diarrhoea": 3, "Feeling hot": 3, "Insomnia": 3, "Loss of consciousness": 3, "Product administered to patient of inappropriate age": 3, "Rash macular": 3, "Vaccination complication": 3, "Vaccination site induration": 3, "Vomiting": 3, "Abdominal distension": 2, "Anxiety": 2, "Body temperature": 2, "Condition aggravated": 2, "Decreased appetite": 2, "Discomfort": 2, "Eye swelling": 2, "Hallucination": 2, "Hyperhidrosis": 2, "Inappropriate schedule of product administration": 2, "Influenza like illness": 2, "Loss of personal independence in daily activities": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Neck pain": 2, "Neuralgia": 2, "Oropharyngeal pain": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "SARS-CoV-2 antibody test": 2, "Sinus congestion": 2, "Swelling face": 2, "Syncope": 2, "Tenderness": 2, "Vaccination site mass": 2, "Vaccination site rash": 2, "Visual impairment": 2, "Weight decreased": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal behaviour": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Asthenopia": 1, "Asymptomatic COVID-19": 1, "Back pain": 1, "Bacterial test": 1, "Bacterial test positive": 1, "Balance disorder": 1, "Bladder spasm": 1, "Blood glucose": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood urine": 1, "Blood urine present": 1, "Body temperature increased": 1, "Burns second degree": 1, "Burns third degree": 1, "Carbon dioxide": 1, "Cardiac disorder": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Choking sensation": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Confusional state": 1, "Constipation": 1, "Contusion": 1, "Depression": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Dry mouth": 1, "Eating disorder": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Emotional distress": 1, "Erythema infectiosum": 1, "Exposure via breast milk": 1, "Feeling cold": 1, "Feeling jittery": 1, "Flank pain": 1, "Flatulence": 1, "Flushing": 1, "Gait disturbance": 1, "Gait inability": 1, "Guillain-Barre syndrome": 1, "Heart rate": 1, "Heart rate increased": 1, "Hemiparesis": 1, "Hospitalisation": 1, "Hyperglycaemia": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Ill-defined disorder": 1, "Illness": 1, "Immune system disorder": 1, "Impaired work ability": 1, "Induration": 1, "Injection site pain": 1, "Interchange of vaccine products": 1, "Intracranial aneurysm": 1, "Irritability": 1, "Joint swelling": 1, "Kidney infection": 1, "Lethargy": 1, "Limb discomfort": 1, "Limb injury": 1, "Lung disorder": 1, "Lymph node pain": 1, "Lymphatic disorder": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Mental impairment": 1, "Muscle strain": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Myocarditis": 1, "Oedematous kidney": 1, "Pallor": 1, "Paranoia": 1, "Pneumonia": 1, "Productive cough": 1, "Pulmonary embolism": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal cancer": 1, "Renal failure": 1, "Renal mass": 1, "Renal pain": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "Sensation of foreign body": 1, "Sensory loss": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin fissures": 1, "Skin mass": 1, "Skin warm": 1, "Sleep disorder": 1, "Stab wound": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Therapeutic product effect variable": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Transient ischaemic attack": 1, "Underdose": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vitreous floaters": 1, "Wheezing": 1}, "batchcodes": ["006C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006C27A.json b/docs/data/histograms/United States/006C27A.json
index e2fa33f5926..6431d4f18b2 100644
--- a/docs/data/histograms/United States/006C27A.json
+++ b/docs/data/histograms/United States/006C27A.json
@@ -1 +1 @@
-{"batchcode": "006C27A", "histograms": [{"batchcodes": ["006C27A"], "histogram": {"Lymphadenopathy": 1, "Myalgia": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "006C27A", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Myalgia": 1, "Throat irritation": 1}, "batchcodes": ["006C27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006CZ1A.json b/docs/data/histograms/United States/006CZ1A.json
index 7db8f404b9b..cf8c8ced59e 100644
--- a/docs/data/histograms/United States/006CZ1A.json
+++ b/docs/data/histograms/United States/006CZ1A.json
@@ -1 +1 @@
-{"batchcode": "006CZ1A", "histograms": [{"batchcodes": ["006CZ1A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006CZ1A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["006CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006CZIA.json b/docs/data/histograms/United States/006CZIA.json
index ed4bd36dbba..b0e8a2ce141 100644
--- a/docs/data/histograms/United States/006CZIA.json
+++ b/docs/data/histograms/United States/006CZIA.json
@@ -1 +1 @@
-{"batchcode": "006CZIA", "histograms": [{"batchcodes": ["006CZIA"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Oropharyngeal discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "006CZIA", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Oropharyngeal discomfort": 1}, "batchcodes": ["006CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006D2114.json b/docs/data/histograms/United States/006D2114.json
index c7be0a68141..a1d2326bcf7 100644
--- a/docs/data/histograms/United States/006D2114.json
+++ b/docs/data/histograms/United States/006D2114.json
@@ -1 +1 @@
-{"batchcode": "006D2114", "histograms": [{"batchcodes": ["006D2114"], "histogram": {"Ankylosing spondylitis": 2, "Anxiety": 2, "Cough": 2, "Muscular weakness": 2, "Pain in extremity": 2, "Respiratory tract congestion": 2, "Urticaria": 2, "Discomfort": 1, "Dyspnoea": 1, "Dysstasia": 1, "Gait inability": 1, "Grip strength decreased": 1, "Impaired healing": 1, "Joint range of motion decreased": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Pain": 1, "Peripheral swelling": 1, "Thyroid disorder": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1}}]}
\ No newline at end of file
+{"batchcode": "006D2114", "histograms": [{"histogram": {"Ankylosing spondylitis": 2, "Anxiety": 2, "Cough": 2, "Muscular weakness": 2, "Pain in extremity": 2, "Respiratory tract congestion": 2, "Urticaria": 2, "Discomfort": 1, "Dyspnoea": 1, "Dysstasia": 1, "Gait inability": 1, "Grip strength decreased": 1, "Impaired healing": 1, "Joint range of motion decreased": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Pain": 1, "Peripheral swelling": 1, "Thyroid disorder": 1, "Ultrasound scan": 1, "Ultrasound thyroid": 1}, "batchcodes": ["006D2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006D21A.json b/docs/data/histograms/United States/006D21A.json
index d8fae195ca1..c761c976f94 100644
--- a/docs/data/histograms/United States/006D21A.json
+++ b/docs/data/histograms/United States/006D21A.json
@@ -1 +1 @@
-{"batchcode": "006D21A", "histograms": [{"batchcodes": ["006D21A", "1805018"], "histogram": {"Angioedema": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Muscle discomfort": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["006D21A"], "histogram": {"Expired product administered": 19, "Pyrexia": 15, "Myalgia": 12, "Chills": 11, "Vaccination site pain": 10, "Headache": 8, "Pain in extremity": 8, "Arthralgia": 7, "Body temperature": 7, "Fatigue": 7, "Product storage error": 7, "Rash": 7, "Illness": 6, "Vaccination complication": 6, "COVID-19": 5, "Diarrhoea": 5, "Feeling abnormal": 5, "Influenza like illness": 5, "Nausea": 5, "Oropharyngeal pain": 5, "Pain": 5, "Pruritus": 5, "SARS-CoV-2 test": 5, "Vaccination site erythema": 5, "Vaccination site swelling": 5, "Vomiting": 5, "Asthenia": 4, "Insomnia": 4, "Vaccination site pruritus": 4, "Accidental overdose": 3, "Burning sensation": 3, "Cough": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Inappropriate schedule of product administration": 3, "Nervousness": 3, "Pain of skin": 3, "Paraesthesia": 3, "Product administered to patient of inappropriate age": 3, "Vaccination site warmth": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Ageusia": 2, "Chest discomfort": 2, "Chest pain": 2, "Depression": 2, "Dizziness": 2, "Erythema": 2, "Feeling hot": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Limb discomfort": 2, "Malaise": 2, "Night sweats": 2, "Ocular discomfort": 2, "Periorbital swelling": 2, "Product dose omission issue": 2, "Ultrasound scan": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Acute kidney injury": 1, "Aneurysm": 1, "Anosmia": 1, "Aphasia": 1, "Aphonia": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Biliary colic": 1, "Blister": 1, "Blood creatine increased": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Cerebrovascular accident": 1, "Cold sweat": 1, "Condition aggravated": 1, "Constipation": 1, "Dehydration": 1, "Drooling": 1, "Dry throat": 1, "Dysarthria": 1, "Dyspepsia": 1, "Electrophoresis protein": 1, "Eructation": 1, "Exposure to SARS-CoV-2": 1, "Eye pruritus": 1, "Eye swelling": 1, "Fall": 1, "Feeding disorder": 1, "Gallbladder disorder": 1, "Haemorrhage": 1, "Heart rate": 1, "Hepatic pain": 1, "Hyperlipasaemia": 1, "Hyperproteinaemia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypertransaminasaemia": 1, "Hypoaesthesia oral": 1, "Impaired work ability": 1, "Induration": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Lactic acidosis": 1, "Limb injury": 1, "Lipase": 1, "Liver disorder": 1, "Migraine": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Nasal dryness": 1, "Neck pain": 1, "Odynophagia": 1, "Oesophageal irritation": 1, "Oral pain": 1, "Oropharyngeal blistering": 1, "Oxygen saturation": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Petechiae": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product label issue": 1, "Rash erythematous": 1, "Rash macular": 1, "Renal pain": 1, "Rhinorrhoea": 1, "Screaming": 1, "Sensitive skin": 1, "Sepsis": 1, "Sinusitis": 1, "Skin exfoliation": 1, "Skin irritation": 1, "Sneezing": 1, "Somnolence": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Taste disorder": 1, "Throat irritation": 1, "Tongue discomfort": 1, "Transaminases": 1, "Urinary incontinence": 1, "Vaccination site coldness": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Wheezing": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "006D21A", "histograms": [{"histogram": {"Angioedema": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Maternal exposure before pregnancy": 1, "Muscle discomfort": 1, "Suspected COVID-19": 1}, "batchcodes": ["006D21A", "1805018"]}, {"histogram": {"Expired product administered": 19, "Pyrexia": 15, "Myalgia": 12, "Chills": 11, "Vaccination site pain": 10, "Headache": 8, "Pain in extremity": 8, "Arthralgia": 7, "Body temperature": 7, "Fatigue": 7, "Product storage error": 7, "Rash": 7, "Illness": 6, "Vaccination complication": 6, "COVID-19": 5, "Diarrhoea": 5, "Feeling abnormal": 5, "Influenza like illness": 5, "Nausea": 5, "Oropharyngeal pain": 5, "Pain": 5, "Pruritus": 5, "SARS-CoV-2 test": 5, "Vaccination site erythema": 5, "Vaccination site swelling": 5, "Vomiting": 5, "Asthenia": 4, "Insomnia": 4, "Vaccination site pruritus": 4, "Accidental overdose": 3, "Burning sensation": 3, "Cough": 3, "Gait disturbance": 3, "Hyperhidrosis": 3, "Inappropriate schedule of product administration": 3, "Nervousness": 3, "Pain of skin": 3, "Paraesthesia": 3, "Product administered to patient of inappropriate age": 3, "Vaccination site warmth": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Ageusia": 2, "Chest discomfort": 2, "Chest pain": 2, "Depression": 2, "Dizziness": 2, "Erythema": 2, "Feeling hot": 2, "Hypoaesthesia": 2, "Interchange of vaccine products": 2, "Limb discomfort": 2, "Malaise": 2, "Night sweats": 2, "Ocular discomfort": 2, "Periorbital swelling": 2, "Product dose omission issue": 2, "Ultrasound scan": 2, "Abdominal distension": 1, "Abdominal pain upper": 1, "Acute kidney injury": 1, "Aneurysm": 1, "Anosmia": 1, "Aphasia": 1, "Aphonia": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Biliary colic": 1, "Blister": 1, "Blood creatine increased": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Cerebrovascular accident": 1, "Cold sweat": 1, "Condition aggravated": 1, "Constipation": 1, "Dehydration": 1, "Drooling": 1, "Dry throat": 1, "Dysarthria": 1, "Dyspepsia": 1, "Electrophoresis protein": 1, "Eructation": 1, "Exposure to SARS-CoV-2": 1, "Eye pruritus": 1, "Eye swelling": 1, "Fall": 1, "Feeding disorder": 1, "Gallbladder disorder": 1, "Haemorrhage": 1, "Heart rate": 1, "Hepatic pain": 1, "Hyperlipasaemia": 1, "Hyperproteinaemia": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypertransaminasaemia": 1, "Hypoaesthesia oral": 1, "Impaired work ability": 1, "Induration": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Lactic acidosis": 1, "Limb injury": 1, "Lipase": 1, "Liver disorder": 1, "Migraine": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Nasal dryness": 1, "Neck pain": 1, "Odynophagia": 1, "Oesophageal irritation": 1, "Oral pain": 1, "Oropharyngeal blistering": 1, "Oxygen saturation": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Petechiae": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product label issue": 1, "Rash erythematous": 1, "Rash macular": 1, "Renal pain": 1, "Rhinorrhoea": 1, "Screaming": 1, "Sensitive skin": 1, "Sepsis": 1, "Sinusitis": 1, "Skin exfoliation": 1, "Skin irritation": 1, "Sneezing": 1, "Somnolence": 1, "Swelling": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Taste disorder": 1, "Throat irritation": 1, "Tongue discomfort": 1, "Transaminases": 1, "Urinary incontinence": 1, "Vaccination site coldness": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Wheezing": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["006D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006DZ1A.json b/docs/data/histograms/United States/006DZ1A.json
index a0d9ec2625e..ce3f4927e3e 100644
--- a/docs/data/histograms/United States/006DZ1A.json
+++ b/docs/data/histograms/United States/006DZ1A.json
@@ -1 +1 @@
-{"batchcode": "006DZ1A", "histograms": [{"batchcodes": ["006DZ1A"], "histogram": {"Nausea": 2, "Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "006DZ1A", "histograms": [{"histogram": {"Nausea": 2, "Menstruation irregular": 1}, "batchcodes": ["006DZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006E21A.json b/docs/data/histograms/United States/006E21A.json
index c92e736ba61..c9e1b8e9a75 100644
--- a/docs/data/histograms/United States/006E21A.json
+++ b/docs/data/histograms/United States/006E21A.json
@@ -1 +1 @@
-{"batchcode": "006E21A", "histograms": [{"batchcodes": ["006E21A"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Mobility decreased": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "006E21A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Mobility decreased": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["006E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006F21A.json b/docs/data/histograms/United States/006F21A.json
index 1fe469dcc14..2af743537f3 100644
--- a/docs/data/histograms/United States/006F21A.json
+++ b/docs/data/histograms/United States/006F21A.json
@@ -1 +1 @@
-{"batchcode": "006F21A", "histograms": [{"batchcodes": ["006F21A"], "histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "006F21A", "histograms": [{"histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1, "Product storage error": 1}, "batchcodes": ["006F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006H20A.json b/docs/data/histograms/United States/006H20A.json
index 11ab3664f77..cd847dcafba 100644
--- a/docs/data/histograms/United States/006H20A.json
+++ b/docs/data/histograms/United States/006H20A.json
@@ -1 +1 @@
-{"batchcode": "006H20A", "histograms": [{"batchcodes": ["006H20A"], "histogram": {"Lymph node pain": 2, "Night sweats": 2, "Pulse abnormal": 2, "Skin odour abnormal": 2, "Vaccination site pain": 2, "Blood count": 1, "Erythema": 1, "Hyperhidrosis": 1, "Incorrect route of product administration": 1, "Insomnia": 1, "Sleep deficit": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site vesicles": 1}}]}
\ No newline at end of file
+{"batchcode": "006H20A", "histograms": [{"histogram": {"Lymph node pain": 2, "Night sweats": 2, "Pulse abnormal": 2, "Skin odour abnormal": 2, "Vaccination site pain": 2, "Blood count": 1, "Erythema": 1, "Hyperhidrosis": 1, "Incorrect route of product administration": 1, "Insomnia": 1, "Sleep deficit": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site vesicles": 1}, "batchcodes": ["006H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006H21A.json b/docs/data/histograms/United States/006H21A.json
index b0d7ed9f4e6..50ddbbe7c79 100644
--- a/docs/data/histograms/United States/006H21A.json
+++ b/docs/data/histograms/United States/006H21A.json
@@ -1 +1 @@
-{"batchcode": "006H21A", "histograms": [{"batchcodes": ["006H21A"], "histogram": {"Accidental overdose": 1, "Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "006H21A", "histograms": [{"histogram": {"Accidental overdose": 1, "Expired product administered": 1}, "batchcodes": ["006H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006LUA.json b/docs/data/histograms/United States/006LUA.json
index 7dff4e08c0c..f5ac9e15c1f 100644
--- a/docs/data/histograms/United States/006LUA.json
+++ b/docs/data/histograms/United States/006LUA.json
@@ -1 +1 @@
-{"batchcode": "006LUA", "histograms": [{"batchcodes": ["006LUA"], "histogram": {"Exposure during pregnancy": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "006LUA", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["006LUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006LZ1A.json b/docs/data/histograms/United States/006LZ1A.json
index a8168f1d6c4..7a0d741474c 100644
--- a/docs/data/histograms/United States/006LZ1A.json
+++ b/docs/data/histograms/United States/006LZ1A.json
@@ -1 +1 @@
-{"batchcode": "006LZ1A", "histograms": [{"batchcodes": ["006LZ1A"], "histogram": {"Fatigue": 1, "Feeling hot": 1, "Laziness": 1}}]}
\ No newline at end of file
+{"batchcode": "006LZ1A", "histograms": [{"histogram": {"Fatigue": 1, "Feeling hot": 1, "Laziness": 1}, "batchcodes": ["006LZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M00A.json b/docs/data/histograms/United States/006M00A.json
index fdb74275b21..3d0aa890d70 100644
--- a/docs/data/histograms/United States/006M00A.json
+++ b/docs/data/histograms/United States/006M00A.json
@@ -1 +1 @@
-{"batchcode": "006M00A", "histograms": [{"batchcodes": ["006M00A"], "histogram": {"Heart rate": 1, "Oropharyngeal pain": 1, "Pharyngeal swelling": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "006M00A", "histograms": [{"histogram": {"Heart rate": 1, "Oropharyngeal pain": 1, "Pharyngeal swelling": 1, "Tachycardia": 1}, "batchcodes": ["006M00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M029.json b/docs/data/histograms/United States/006M029.json
index ab5ba26859a..207e0baa1ca 100644
--- a/docs/data/histograms/United States/006M029.json
+++ b/docs/data/histograms/United States/006M029.json
@@ -1 +1 @@
-{"batchcode": "006M029", "histograms": [{"batchcodes": ["006M029"], "histogram": {"Erythema": 1, "Feeling hot": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "006M029", "histograms": [{"histogram": {"Erythema": 1, "Feeling hot": 1, "Pruritus": 1}, "batchcodes": ["006M029"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M02A.json b/docs/data/histograms/United States/006M02A.json
index 19b621aff5e..0c292a55fb4 100644
--- a/docs/data/histograms/United States/006M02A.json
+++ b/docs/data/histograms/United States/006M02A.json
@@ -1 +1 @@
-{"batchcode": "006M02A", "histograms": [{"batchcodes": ["006M02A"], "histogram": {"Balance disorder": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "006M02A", "histograms": [{"histogram": {"Balance disorder": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Vertigo": 1}, "batchcodes": ["006M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M0A.json b/docs/data/histograms/United States/006M0A.json
index f1d3b84fba1..4ce15bf5c9b 100644
--- a/docs/data/histograms/United States/006M0A.json
+++ b/docs/data/histograms/United States/006M0A.json
@@ -1 +1 @@
-{"batchcode": "006M0A", "histograms": [{"batchcodes": ["006M0A"], "histogram": {"Arthralgia": 1, "Eczema": 1, "Erythema": 1, "Erythrasma": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "006M0A", "histograms": [{"histogram": {"Arthralgia": 1, "Eczema": 1, "Erythema": 1, "Erythrasma": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["006M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20.json b/docs/data/histograms/United States/006M20.json
index 9df50384cb3..23b117dd9f3 100644
--- a/docs/data/histograms/United States/006M20.json
+++ b/docs/data/histograms/United States/006M20.json
@@ -1 +1 @@
-{"batchcode": "006M20", "histograms": [{"batchcodes": ["006M20"], "histogram": {"Arthralgia": 1, "Headache": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20", "histograms": [{"histogram": {"Arthralgia": 1, "Headache": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["006M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M201A.json b/docs/data/histograms/United States/006M201A.json
index 1646edb64c5..56f20aa9a39 100644
--- a/docs/data/histograms/United States/006M201A.json
+++ b/docs/data/histograms/United States/006M201A.json
@@ -1 +1 @@
-{"batchcode": "006M201A", "histograms": [{"batchcodes": ["006M201A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Chest discomfort": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006M201A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Chest discomfort": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain": 1}, "batchcodes": ["006M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M204.json b/docs/data/histograms/United States/006M204.json
index c6b23d44ffa..e56b9595ed7 100644
--- a/docs/data/histograms/United States/006M204.json
+++ b/docs/data/histograms/United States/006M204.json
@@ -1 +1 @@
-{"batchcode": "006M204", "histograms": [{"batchcodes": ["006M204"], "histogram": {"Pruritus": 1, "Rash erythematous": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "006M204", "histograms": [{"histogram": {"Pruritus": 1, "Rash erythematous": 1, "Rash pruritic": 1}, "batchcodes": ["006M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M2049.json b/docs/data/histograms/United States/006M2049.json
index 05ce2ef72b9..4a8c463a39b 100644
--- a/docs/data/histograms/United States/006M2049.json
+++ b/docs/data/histograms/United States/006M2049.json
@@ -1 +1 @@
-{"batchcode": "006M2049", "histograms": [{"batchcodes": ["006M2049"], "histogram": {"Abdominal pain upper": 1, "Appendicitis perforated": 1, "Diarrhoea": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "006M2049", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Appendicitis perforated": 1, "Diarrhoea": 1, "Product dose omission issue": 1}, "batchcodes": ["006M2049"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M207J.json b/docs/data/histograms/United States/006M207J.json
index 96da3ac8723..95cbfa5cbdd 100644
--- a/docs/data/histograms/United States/006M207J.json
+++ b/docs/data/histograms/United States/006M207J.json
@@ -1 +1 @@
-{"batchcode": "006M207J", "histograms": [{"batchcodes": ["006M207J"], "histogram": {"Blood glucose increased": 2, "Fatigue": 2, "Pain in extremity": 2, "Blood glucose": 1, "Cognitive disorder": 1, "Coordination abnormal": 1, "Decreased appetite": 1, "Headache": 1, "Nausea": 1, "Night sweats": 1, "Pain": 1, "Thirst": 1}}]}
\ No newline at end of file
+{"batchcode": "006M207J", "histograms": [{"histogram": {"Blood glucose increased": 2, "Fatigue": 2, "Pain in extremity": 2, "Blood glucose": 1, "Cognitive disorder": 1, "Coordination abnormal": 1, "Decreased appetite": 1, "Headache": 1, "Nausea": 1, "Night sweats": 1, "Pain": 1, "Thirst": 1}, "batchcodes": ["006M207J"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20A OR 001M.json b/docs/data/histograms/United States/006M20A OR 001M.json
index 556a0147ceb..1a339f85a61 100644
--- a/docs/data/histograms/United States/006M20A OR 001M.json
+++ b/docs/data/histograms/United States/006M20A OR 001M.json
@@ -1 +1 @@
-{"batchcode": "006M20A OR 001M", "histograms": [{"batchcodes": ["006M20A OR 001M"], "histogram": {"Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20A OR 001M", "histograms": [{"histogram": {"Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Rash erythematous": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["006M20A OR 001M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20A OR 066M.json b/docs/data/histograms/United States/006M20A OR 066M.json
index f9bd2738eea..f105a275d8e 100644
--- a/docs/data/histograms/United States/006M20A OR 066M.json
+++ b/docs/data/histograms/United States/006M20A OR 066M.json
@@ -1 +1 @@
-{"batchcode": "006M20A OR 066M", "histograms": [{"batchcodes": ["006M20A OR 066M"], "histogram": {"Erythema": 1, "Headache": 1, "Oropharyngeal pain": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20A OR 066M", "histograms": [{"histogram": {"Erythema": 1, "Headache": 1, "Oropharyngeal pain": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["006M20A OR 066M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20A, 026A21.json b/docs/data/histograms/United States/006M20A, 026A21.json
index 626dcff1942..94a90ceb5db 100644
--- a/docs/data/histograms/United States/006M20A, 026A21.json
+++ b/docs/data/histograms/United States/006M20A, 026A21.json
@@ -1 +1 @@
-{"batchcode": "006M20A, 026A21", "histograms": [{"batchcodes": ["006M20A, 026A21"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20A, 026A21", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["006M20A, 026A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20A.json b/docs/data/histograms/United States/006M20A.json
index e5b92d3b214..53d1d0b9631 100644
--- a/docs/data/histograms/United States/006M20A.json
+++ b/docs/data/histograms/United States/006M20A.json
@@ -1 +1 @@
-{"batchcode": "006M20A", "histograms": [{"batchcodes": ["006M20A", "FF2593"], "histogram": {"Acute kidney injury": 1, "Acute respiratory failure": 1, "Blood creatinine": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Body temperature": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Confusional state": 1, "Embolism venous": 1, "Heart rate": 1, "Hypernatraemia": 1, "Hypophagia": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Mental status changes": 1, "Mydriasis": 1, "Oxygen saturation": 1, "Pupil fixed": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "SARS-CoV-1 test": 1, "Staphylococcal bacteraemia": 1, "Troponin": 1, "Unresponsive to stimuli": 1, "White blood cell count": 1}}, {"batchcodes": ["006M20A"], "histogram": {"Fatigue": 81, "Pyrexia": 72, "Headache": 67, "Pain in extremity": 66, "Chills": 64, "Myalgia": 54, "Vaccination site pain": 42, "Pain": 39, "Arthralgia": 36, "Nausea": 35, "Vaccination site erythema": 34, "Dizziness": 27, "Rash": 26, "Body temperature": 25, "Pruritus": 25, "Asthenia": 24, "Feeling abnormal": 24, "Vaccination site pruritus": 22, "Diarrhoea": 20, "Erythema": 20, "Peripheral swelling": 17, "Vaccination site rash": 15, "Injection site pain": 14, "Vaccination site swelling": 14, "Vaccination site warmth": 14, "SARS-CoV-2 test": 13, "Vomiting": 13, "COVID-19": 12, "Decreased appetite": 12, "Injection site erythema": 12, "Limb discomfort": 12, "Product dose omission issue": 12, "Vaccination complication": 12, "Back pain": 11, "Feeling hot": 11, "Neck pain": 11, "Tremor": 10, "Abdominal discomfort": 9, "Dyspnoea": 9, "Inappropriate schedule of product administration": 9, "Malaise": 9, "Paraesthesia": 9, "Somnolence": 9, "Cough": 8, "Hypoaesthesia": 8, "Insomnia": 8, "Muscular weakness": 8, "Palpitations": 8, "Rash pruritic": 8, "Swelling": 8, "Blood pressure measurement": 7, "Discomfort": 7, "Heart rate increased": 7, "Hyperhidrosis": 7, "Lymphadenopathy": 7, "Nasopharyngitis": 7, "Influenza like illness": 6, "Musculoskeletal stiffness": 6, "Urticaria": 6, "Vaccination site mass": 6, "Ageusia": 5, "Amnesia": 5, "Blood test": 5, "Chest discomfort": 5, "Herpes zoster": 5, "Injection site pruritus": 5, "Lethargy": 5, "Memory impairment": 5, "Paraesthesia oral": 5, "Rash erythematous": 5, "Rash macular": 5, "Tachycardia": 5, "Abdominal distension": 4, "Balance disorder": 4, "Condition aggravated": 4, "Eye pain": 4, "Gait disturbance": 4, "Gait inability": 4, "Heart rate": 4, "Hot flush": 4, "Hypersensitivity": 4, "Hypertension": 4, "Induration": 4, "Injection site swelling": 4, "Injection site warmth": 4, "Muscle spasms": 4, "Musculoskeletal discomfort": 4, "Neuralgia": 4, "Oropharyngeal pain": 4, "Oxygen saturation": 4, "Pharyngeal swelling": 4, "Sciatica": 4, "Vaccination site reaction": 4, "Abdominal pain": 3, "Abdominal pain upper": 3, "Anxiety": 3, "Arthritis": 3, "Burning sensation": 3, "Chest pain": 3, "Dry mouth": 3, "Feeding disorder": 3, "Hypokinesia": 3, "Illness": 3, "Influenza": 3, "Limb injury": 3, "Lip swelling": 3, "Loss of consciousness": 3, "Migraine": 3, "Rhinorrhoea": 3, "SARS-CoV-2 antibody test": 3, "Sleep disorder": 3, "Speech disorder": 3, "Swelling face": 3, "Swollen tongue": 3, "Tenderness": 3, "Thirst": 3, "Urinary tract infection": 3, "Vaccination site induration": 3, "Vaccination site movement impairment": 3, "Vision blurred": 3, "Accidental underdose": 2, "Anosmia": 2, "Antibody test": 2, "Axillary pain": 2, "Blister": 2, "Blood pressure increased": 2, "Body temperature increased": 2, "Bone pain": 2, "Breast pain": 2, "Cellulitis": 2, "Constipation": 2, "Contusion": 2, "Dehydration": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Dysuria": 2, "Electrocardiogram": 2, "Expired product administered": 2, "Exposure during pregnancy": 2, "Hypoaesthesia oral": 2, "Immunisation reaction": 2, "Impaired work ability": 2, "Inflammation": 2, "Injection site discolouration": 2, "Lymph node pain": 2, "Mechanical urticaria": 2, "Mobility decreased": 2, "Movement disorder": 2, "Muscle strain": 2, "Muscle tightness": 2, "Nasal congestion": 2, "Neuropathy peripheral": 2, "Night sweats": 2, "Ocular hyperaemia": 2, "Oropharyngeal discomfort": 2, "Parosmia": 2, "Presyncope": 2, "SARS-CoV-2 test positive": 2, "Sepsis": 2, "Therapeutic response unexpected": 2, "Thinking abnormal": 2, "Throat irritation": 2, "Trigeminal neuralgia": 2, "Ultrasound scan": 2, "Underdose": 2, "Vertigo": 2, "Weight decreased": 2, "X-ray": 2, "Abdominal tenderness": 1, "Accidental overdose": 1, "Adverse event": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Arthropathy": 1, "Aspartate aminotransferase": 1, "Asthenopia": 1, "Atrial fibrillation": 1, "Back disorder": 1, "Bedridden": 1, "Birth mark": 1, "Bladder pain": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Bone scan": 1, "Breast discomfort": 1, "Breast swelling": 1, "Breast tenderness": 1, "Bruxism": 1, "Cerebrovascular accident": 1, "Chest wall abscess": 1, "Chronic sinusitis": 1, "Coccydynia": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Confusional state": 1, "Conjunctivitis": 1, "Decreased activity": 1, "Device connection issue": 1, "Diverticulitis": 1, "Dry skin": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Eczema": 1, "Enzyme level increased": 1, "Epistaxis": 1, "Eructation": 1, "Exposure to SARS-CoV-2": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial pain": 1, "Feeling cold": 1, "Flushing": 1, "Frequent bowel movements": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "Gestational diabetes": 1, "Gingival pain": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heat exhaustion": 1, "Hepatic enzyme increased": 1, "Hepatomegaly": 1, "Hyperaesthesia": 1, "Hypersomnia": 1, "Hypertensive crisis": 1, "Hypopnoea": 1, "Hypotension": 1, "Immune system disorder": 1, "Immunoglobulins": 1, "Impaired quality of life": 1, "Incontinence": 1, "Incorrect dose administered": 1, "Infection": 1, "Injection site bruising": 1, "Injection site haemorrhage": 1, "Injection site lymphadenopathy": 1, "Injection site urticaria": 1, "Injury associated with device": 1, "Limb mass": 1, "Lip disorder": 1, "Lip erythema": 1, "Loss of personal independence in daily activities": 1, "Lymph node haemorrhage": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Mastication disorder": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Meningism": 1, "Mental impairment": 1, "Micturition disorder": 1, "Mucosal dryness": 1, "Muscle spasticity": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Nasal discomfort": 1, "Nasal inflammation": 1, "Neuromyopathy": 1, "Nodule": 1, "Oedema": 1, "Oliguria": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oral mucosal roughening": 1, "Osteoporosis": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pancreatitis": 1, "Panic attack": 1, "Paralysis": 1, "Pathology test": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Personality change": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Platelet morphology": 1, "Pleurisy": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test": 1, "Product administration error": 1, "Product complaint": 1, "Productive cough": 1, "Psychomotor hyperactivity": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "Pulmonary oedema": 1, "Rash morbilliform": 1, "Rash papular": 1, "Rectal haemorrhage": 1, "Renal pain": 1, "Respiratory tract congestion": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rosacea": 1, "Sacral pain": 1, "Saliva altered": 1, "Scar": 1, "Scratch": 1, "Sensation of foreign body": 1, "Shoulder deformity": 1, "Sinus congestion": 1, "Sinusitis": 1, "Skin discomfort": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin mass": 1, "Skin reaction": 1, "Skin swelling": 1, "Skin warm": 1, "Sleep talking": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Taste disorder": 1, "Temporomandibular joint syndrome": 1, "Tendon disorder": 1, "Tendon laxity": 1, "Thirst decreased": 1, "Tinnitus": 1, "Tooth infection": 1, "Tooth injury": 1, "Toothache": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Urinary tract disorder": 1, "Uveitis": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Ventricular extrasystoles": 1, "Vitreous floaters": 1, "Vulvovaginal burning sensation": 1, "Vulvovaginal pain": 1, "Vulvovaginal pruritus": 1, "Vulvovaginal swelling": 1, "Walking aid user": 1, "Whole body scan": 1, "Zika virus infection": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20A", "histograms": [{"histogram": {"Acute kidney injury": 1, "Acute respiratory failure": 1, "Blood creatinine": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Body temperature": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Cardiac arrest": 1, "Confusional state": 1, "Embolism venous": 1, "Heart rate": 1, "Hypernatraemia": 1, "Hypophagia": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Mental status changes": 1, "Mydriasis": 1, "Oxygen saturation": 1, "Pupil fixed": 1, "Respiratory arrest": 1, "Respiratory rate": 1, "SARS-CoV-1 test": 1, "Staphylococcal bacteraemia": 1, "Troponin": 1, "Unresponsive to stimuli": 1, "White blood cell count": 1}, "batchcodes": ["006M20A", "FF2593"]}, {"histogram": {"Fatigue": 81, "Pyrexia": 72, "Headache": 67, "Pain in extremity": 66, "Chills": 64, "Myalgia": 54, "Vaccination site pain": 42, "Pain": 39, "Arthralgia": 36, "Nausea": 35, "Vaccination site erythema": 34, "Dizziness": 27, "Rash": 26, "Body temperature": 25, "Pruritus": 25, "Asthenia": 24, "Feeling abnormal": 24, "Vaccination site pruritus": 22, "Diarrhoea": 20, "Erythema": 20, "Peripheral swelling": 17, "Vaccination site rash": 15, "Injection site pain": 14, "Vaccination site swelling": 14, "Vaccination site warmth": 14, "SARS-CoV-2 test": 13, "Vomiting": 13, "COVID-19": 12, "Decreased appetite": 12, "Injection site erythema": 12, "Limb discomfort": 12, "Product dose omission issue": 12, "Vaccination complication": 12, "Back pain": 11, "Feeling hot": 11, "Neck pain": 11, "Tremor": 10, "Abdominal discomfort": 9, "Dyspnoea": 9, "Inappropriate schedule of product administration": 9, "Malaise": 9, "Paraesthesia": 9, "Somnolence": 9, "Cough": 8, "Hypoaesthesia": 8, "Insomnia": 8, "Muscular weakness": 8, "Palpitations": 8, "Rash pruritic": 8, "Swelling": 8, "Blood pressure measurement": 7, "Discomfort": 7, "Heart rate increased": 7, "Hyperhidrosis": 7, "Lymphadenopathy": 7, "Nasopharyngitis": 7, "Influenza like illness": 6, "Musculoskeletal stiffness": 6, "Urticaria": 6, "Vaccination site mass": 6, "Ageusia": 5, "Amnesia": 5, "Blood test": 5, "Chest discomfort": 5, "Herpes zoster": 5, "Injection site pruritus": 5, "Lethargy": 5, "Memory impairment": 5, "Paraesthesia oral": 5, "Rash erythematous": 5, "Rash macular": 5, "Tachycardia": 5, "Abdominal distension": 4, "Balance disorder": 4, "Condition aggravated": 4, "Eye pain": 4, "Gait disturbance": 4, "Gait inability": 4, "Heart rate": 4, "Hot flush": 4, "Hypersensitivity": 4, "Hypertension": 4, "Induration": 4, "Injection site swelling": 4, "Injection site warmth": 4, "Muscle spasms": 4, "Musculoskeletal discomfort": 4, "Neuralgia": 4, "Oropharyngeal pain": 4, "Oxygen saturation": 4, "Pharyngeal swelling": 4, "Sciatica": 4, "Vaccination site reaction": 4, "Abdominal pain": 3, "Abdominal pain upper": 3, "Anxiety": 3, "Arthritis": 3, "Burning sensation": 3, "Chest pain": 3, "Dry mouth": 3, "Feeding disorder": 3, "Hypokinesia": 3, "Illness": 3, "Influenza": 3, "Limb injury": 3, "Lip swelling": 3, "Loss of consciousness": 3, "Migraine": 3, "Rhinorrhoea": 3, "SARS-CoV-2 antibody test": 3, "Sleep disorder": 3, "Speech disorder": 3, "Swelling face": 3, "Swollen tongue": 3, "Tenderness": 3, "Thirst": 3, "Urinary tract infection": 3, "Vaccination site induration": 3, "Vaccination site movement impairment": 3, "Vision blurred": 3, "Accidental underdose": 2, "Anosmia": 2, "Antibody test": 2, "Axillary pain": 2, "Blister": 2, "Blood pressure increased": 2, "Body temperature increased": 2, "Bone pain": 2, "Breast pain": 2, "Cellulitis": 2, "Constipation": 2, "Contusion": 2, "Dehydration": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Dysuria": 2, "Electrocardiogram": 2, "Expired product administered": 2, "Exposure during pregnancy": 2, "Hypoaesthesia oral": 2, "Immunisation reaction": 2, "Impaired work ability": 2, "Inflammation": 2, "Injection site discolouration": 2, "Lymph node pain": 2, "Mechanical urticaria": 2, "Mobility decreased": 2, "Movement disorder": 2, "Muscle strain": 2, "Muscle tightness": 2, "Nasal congestion": 2, "Neuropathy peripheral": 2, "Night sweats": 2, "Ocular hyperaemia": 2, "Oropharyngeal discomfort": 2, "Parosmia": 2, "Presyncope": 2, "SARS-CoV-2 test positive": 2, "Sepsis": 2, "Therapeutic response unexpected": 2, "Thinking abnormal": 2, "Throat irritation": 2, "Trigeminal neuralgia": 2, "Ultrasound scan": 2, "Underdose": 2, "Vertigo": 2, "Weight decreased": 2, "X-ray": 2, "Abdominal tenderness": 1, "Accidental overdose": 1, "Adverse event": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Arthropathy": 1, "Aspartate aminotransferase": 1, "Asthenopia": 1, "Atrial fibrillation": 1, "Back disorder": 1, "Bedridden": 1, "Birth mark": 1, "Bladder pain": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Bone scan": 1, "Breast discomfort": 1, "Breast swelling": 1, "Breast tenderness": 1, "Bruxism": 1, "Cerebrovascular accident": 1, "Chest wall abscess": 1, "Chronic sinusitis": 1, "Coccydynia": 1, "Computerised tomogram": 1, "Computerised tomogram abdomen": 1, "Confusional state": 1, "Conjunctivitis": 1, "Decreased activity": 1, "Device connection issue": 1, "Diverticulitis": 1, "Dry skin": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Eczema": 1, "Enzyme level increased": 1, "Epistaxis": 1, "Eructation": 1, "Exposure to SARS-CoV-2": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial pain": 1, "Feeling cold": 1, "Flushing": 1, "Frequent bowel movements": 1, "Gastrointestinal pain": 1, "Gastrooesophageal reflux disease": 1, "Gestational diabetes": 1, "Gingival pain": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heat exhaustion": 1, "Hepatic enzyme increased": 1, "Hepatomegaly": 1, "Hyperaesthesia": 1, "Hypersomnia": 1, "Hypertensive crisis": 1, "Hypopnoea": 1, "Hypotension": 1, "Immune system disorder": 1, "Immunoglobulins": 1, "Impaired quality of life": 1, "Incontinence": 1, "Incorrect dose administered": 1, "Infection": 1, "Injection site bruising": 1, "Injection site haemorrhage": 1, "Injection site lymphadenopathy": 1, "Injection site urticaria": 1, "Injury associated with device": 1, "Limb mass": 1, "Lip disorder": 1, "Lip erythema": 1, "Loss of personal independence in daily activities": 1, "Lymph node haemorrhage": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Mastication disorder": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Meningism": 1, "Mental impairment": 1, "Micturition disorder": 1, "Mucosal dryness": 1, "Muscle spasticity": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Nasal discomfort": 1, "Nasal inflammation": 1, "Neuromyopathy": 1, "Nodule": 1, "Oedema": 1, "Oliguria": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oral mucosal roughening": 1, "Osteoporosis": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pancreatitis": 1, "Panic attack": 1, "Paralysis": 1, "Pathology test": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Personality change": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Platelet morphology": 1, "Pleurisy": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test": 1, "Product administration error": 1, "Product complaint": 1, "Productive cough": 1, "Psychomotor hyperactivity": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "Pulmonary oedema": 1, "Rash morbilliform": 1, "Rash papular": 1, "Rectal haemorrhage": 1, "Renal pain": 1, "Respiratory tract congestion": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Rosacea": 1, "Sacral pain": 1, "Saliva altered": 1, "Scar": 1, "Scratch": 1, "Sensation of foreign body": 1, "Shoulder deformity": 1, "Sinus congestion": 1, "Sinusitis": 1, "Skin discomfort": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin mass": 1, "Skin reaction": 1, "Skin swelling": 1, "Skin warm": 1, "Sleep talking": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Taste disorder": 1, "Temporomandibular joint syndrome": 1, "Tendon disorder": 1, "Tendon laxity": 1, "Thirst decreased": 1, "Tinnitus": 1, "Tooth infection": 1, "Tooth injury": 1, "Toothache": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Urinary tract disorder": 1, "Uveitis": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Ventricular extrasystoles": 1, "Vitreous floaters": 1, "Vulvovaginal burning sensation": 1, "Vulvovaginal pain": 1, "Vulvovaginal pruritus": 1, "Vulvovaginal swelling": 1, "Walking aid user": 1, "Whole body scan": 1, "Zika virus infection": 1}, "batchcodes": ["006M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20A/006W20A.json b/docs/data/histograms/United States/006M20A/006W20A.json
index 3c34baf2a04..52dd7b8ff28 100644
--- a/docs/data/histograms/United States/006M20A/006W20A.json
+++ b/docs/data/histograms/United States/006M20A/006W20A.json
@@ -1 +1 @@
-{"batchcode": "006M20A/006W20A", "histograms": [{"batchcodes": ["006M20A/006W20A"], "histogram": {"Dysphagia": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20A/006W20A", "histograms": [{"histogram": {"Dysphagia": 1}, "batchcodes": ["006M20A/006W20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20A029L20A.json b/docs/data/histograms/United States/006M20A029L20A.json
index 81e2ab56bed..532d088a79c 100644
--- a/docs/data/histograms/United States/006M20A029L20A.json
+++ b/docs/data/histograms/United States/006M20A029L20A.json
@@ -1 +1 @@
-{"batchcode": "006M20A029L20A", "histograms": [{"batchcodes": ["006M20A029L20A"], "histogram": {"Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Neuropathy peripheral": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20A029L20A", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Neuropathy peripheral": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["006M20A029L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20K.json b/docs/data/histograms/United States/006M20K.json
index ddc907fa79b..ce8f7f2dff8 100644
--- a/docs/data/histograms/United States/006M20K.json
+++ b/docs/data/histograms/United States/006M20K.json
@@ -1 +1 @@
-{"batchcode": "006M20K", "histograms": [{"batchcodes": ["006M20K"], "histogram": {"Injection site rash": 1, "Pruritus": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20K", "histograms": [{"histogram": {"Injection site rash": 1, "Pruritus": 1, "Skin discolouration": 1}, "batchcodes": ["006M20K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M20N.json b/docs/data/histograms/United States/006M20N.json
index 4a6dcd9c121..b777b428744 100644
--- a/docs/data/histograms/United States/006M20N.json
+++ b/docs/data/histograms/United States/006M20N.json
@@ -1 +1 @@
-{"batchcode": "006M20N", "histograms": [{"batchcodes": ["006M20N"], "histogram": {"Arthralgia": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Back pain": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Myalgia": 1, "Neck pain": 1, "Pain": 1, "Somnolence": 1, "Weight bearing difficulty": 1}}]}
\ No newline at end of file
+{"batchcode": "006M20N", "histograms": [{"histogram": {"Arthralgia": 2, "Pain in extremity": 2, "Paraesthesia": 2, "Back pain": 1, "Head discomfort": 1, "Hypoaesthesia": 1, "Inflammation": 1, "Myalgia": 1, "Neck pain": 1, "Pain": 1, "Somnolence": 1, "Weight bearing difficulty": 1}, "batchcodes": ["006M20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M21A.json b/docs/data/histograms/United States/006M21A.json
index 8cf847e009b..1a47957960f 100644
--- a/docs/data/histograms/United States/006M21A.json
+++ b/docs/data/histograms/United States/006M21A.json
@@ -1 +1 @@
-{"batchcode": "006M21A", "histograms": [{"batchcodes": ["006M21A"], "histogram": {"Expired product administered": 38, "No adverse event": 37, "Product storage error": 14, "Fatigue": 2, "Pain in extremity": 2, "Wrong product administered": 2, "Ageusia": 1, "Antibody test": 1, "Arthralgia": 1, "Asthenia": 1, "Dysphonia": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Night sweats": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "006M21A", "histograms": [{"histogram": {"Expired product administered": 38, "No adverse event": 37, "Product storage error": 14, "Fatigue": 2, "Pain in extremity": 2, "Wrong product administered": 2, "Ageusia": 1, "Antibody test": 1, "Arthralgia": 1, "Asthenia": 1, "Dysphonia": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Night sweats": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["006M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M2CA.json b/docs/data/histograms/United States/006M2CA.json
index 3892db2ab0d..699fd6b8736 100644
--- a/docs/data/histograms/United States/006M2CA.json
+++ b/docs/data/histograms/United States/006M2CA.json
@@ -1 +1 @@
-{"batchcode": "006M2CA", "histograms": [{"batchcodes": ["006M2CA"], "histogram": {"Dyskinesia": 1}}]}
\ No newline at end of file
+{"batchcode": "006M2CA", "histograms": [{"histogram": {"Dyskinesia": 1}, "batchcodes": ["006M2CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006M70A.json b/docs/data/histograms/United States/006M70A.json
index c2e9aff2aea..d6a3ea63fb6 100644
--- a/docs/data/histograms/United States/006M70A.json
+++ b/docs/data/histograms/United States/006M70A.json
@@ -1 +1 @@
-{"batchcode": "006M70A", "histograms": [{"batchcodes": ["006M70A"], "histogram": {"Computerised tomogram": 1, "Condition aggravated": 1, "Eczema": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "006M70A", "histograms": [{"histogram": {"Computerised tomogram": 1, "Condition aggravated": 1, "Eczema": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Seizure": 1}, "batchcodes": ["006M70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006MNA.json b/docs/data/histograms/United States/006MNA.json
index ccdf15eb125..5804192209a 100644
--- a/docs/data/histograms/United States/006MNA.json
+++ b/docs/data/histograms/United States/006MNA.json
@@ -1 +1 @@
-{"batchcode": "006MNA", "histograms": [{"batchcodes": ["006MNA"], "histogram": {"Cough": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "006MNA", "histograms": [{"histogram": {"Cough": 1, "Malaise": 1}, "batchcodes": ["006MNA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006MR0A.json b/docs/data/histograms/United States/006MR0A.json
index ad5c33a02b1..417c6ff56c8 100644
--- a/docs/data/histograms/United States/006MR0A.json
+++ b/docs/data/histograms/United States/006MR0A.json
@@ -1 +1 @@
-{"batchcode": "006MR0A", "histograms": [{"batchcodes": ["006MR0A"], "histogram": {"Pain in extremity": 1, "Pruritus": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "006MR0A", "histograms": [{"histogram": {"Pain in extremity": 1, "Pruritus": 1, "Vaccination site erythema": 1}, "batchcodes": ["006MR0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006MZ0A.json b/docs/data/histograms/United States/006MZ0A.json
index 1ef64e7a37c..34494c6410d 100644
--- a/docs/data/histograms/United States/006MZ0A.json
+++ b/docs/data/histograms/United States/006MZ0A.json
@@ -1 +1 @@
-{"batchcode": "006MZ0A", "histograms": [{"batchcodes": ["006MZ0A"], "histogram": {"Rash": 3, "Pruritus": 2, "Vaccination site pain": 2, "Asthma": 1, "Blood glucose abnormal": 1, "Bronchitis": 1, "Chest X-ray": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "006MZ0A", "histograms": [{"histogram": {"Rash": 3, "Pruritus": 2, "Vaccination site pain": 2, "Asthma": 1, "Blood glucose abnormal": 1, "Bronchitis": 1, "Chest X-ray": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Erythema": 1, "Nausea": 1, "Pain in extremity": 1, "Palpitations": 1, "Presyncope": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Urticaria": 1}, "batchcodes": ["006MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006MZOA.json b/docs/data/histograms/United States/006MZOA.json
index d6ea7a2dc34..de2a2c5e8cb 100644
--- a/docs/data/histograms/United States/006MZOA.json
+++ b/docs/data/histograms/United States/006MZOA.json
@@ -1 +1 @@
-{"batchcode": "006MZOA", "histograms": [{"batchcodes": ["006MZOA"], "histogram": {"Pyrexia": 2, "Vaccination site erythema": 2, "Accidental overdose": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Illness": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1, "Vaccination complication": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "006MZOA", "histograms": [{"histogram": {"Pyrexia": 2, "Vaccination site erythema": 2, "Accidental overdose": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Illness": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1, "Vaccination complication": 1, "Vaccination site mass": 1}, "batchcodes": ["006MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006N20A.json b/docs/data/histograms/United States/006N20A.json
index feae076eeb0..e3f959f7d2d 100644
--- a/docs/data/histograms/United States/006N20A.json
+++ b/docs/data/histograms/United States/006N20A.json
@@ -1 +1 @@
-{"batchcode": "006N20A", "histograms": [{"batchcodes": ["006N20A"], "histogram": {"Rash": 2, "Arthralgia": 1, "Chapped lips": 1, "Headache": 1, "Insomnia": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "006N20A", "histograms": [{"histogram": {"Rash": 2, "Arthralgia": 1, "Chapped lips": 1, "Headache": 1, "Insomnia": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Tenderness": 1}, "batchcodes": ["006N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006O21A.json b/docs/data/histograms/United States/006O21A.json
index 515e4821ca0..80e9d538017 100644
--- a/docs/data/histograms/United States/006O21A.json
+++ b/docs/data/histograms/United States/006O21A.json
@@ -1 +1 @@
-{"batchcode": "006O21A", "histograms": [{"batchcodes": ["006O21A"], "histogram": {"Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "006O21A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["006O21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006Y21A.json b/docs/data/histograms/United States/006Y21A.json
index 7eca12fa765..82a8d9e58be 100644
--- a/docs/data/histograms/United States/006Y21A.json
+++ b/docs/data/histograms/United States/006Y21A.json
@@ -1 +1 @@
-{"batchcode": "006Y21A", "histograms": [{"batchcodes": ["006Y21A"], "histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "006Y21A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["006Y21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006ZDIA.json b/docs/data/histograms/United States/006ZDIA.json
index d24e564c0d9..98ac85741aa 100644
--- a/docs/data/histograms/United States/006ZDIA.json
+++ b/docs/data/histograms/United States/006ZDIA.json
@@ -1 +1 @@
-{"batchcode": "006ZDIA", "histograms": [{"batchcodes": ["006ZDIA"], "histogram": {"Feeling hot": 1, "Interchange of vaccine products": 1, "Mass": 1}}]}
\ No newline at end of file
+{"batchcode": "006ZDIA", "histograms": [{"histogram": {"Feeling hot": 1, "Interchange of vaccine products": 1, "Mass": 1}, "batchcodes": ["006ZDIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/006_321A.json b/docs/data/histograms/United States/006_321A.json
index 470e4c50a82..06dc320a102 100644
--- a/docs/data/histograms/United States/006_321A.json
+++ b/docs/data/histograms/United States/006_321A.json
@@ -1 +1 @@
-{"batchcode": "006_321A", "histograms": [{"batchcodes": ["006_321A"], "histogram": {"Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Full blood count": 1, "Heart rate": 1, "Myalgia": 1, "Pain in extremity": 1, "Palpitations": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "006_321A", "histograms": [{"histogram": {"Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Full blood count": 1, "Heart rate": 1, "Myalgia": 1, "Pain in extremity": 1, "Palpitations": 1, "Pyrexia": 1}, "batchcodes": ["006_321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007-M20A.json b/docs/data/histograms/United States/007-M20A.json
index e1671dab85d..10a793de425 100644
--- a/docs/data/histograms/United States/007-M20A.json
+++ b/docs/data/histograms/United States/007-M20A.json
@@ -1 +1 @@
-{"batchcode": "007-M20A", "histograms": [{"batchcodes": ["007-M20A"], "histogram": {"Swelling": 2, "Tenderness": 2, "Vaccination site pain": 2}}]}
\ No newline at end of file
+{"batchcode": "007-M20A", "histograms": [{"histogram": {"Swelling": 2, "Tenderness": 2, "Vaccination site pain": 2}, "batchcodes": ["007-M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007.json b/docs/data/histograms/United States/007.json
index 308684c8dec..e29018762a3 100644
--- a/docs/data/histograms/United States/007.json
+++ b/docs/data/histograms/United States/007.json
@@ -1 +1 @@
-{"batchcode": "007", "histograms": [{"batchcodes": ["007"], "histogram": {"Fatigue": 1, "Hallucination, auditory": 1, "Nightmare": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007", "histograms": [{"histogram": {"Fatigue": 1, "Hallucination, auditory": 1, "Nightmare": 1, "Pain in extremity": 1}, "batchcodes": ["007"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007021-2A.json b/docs/data/histograms/United States/007021-2A.json
index afb6773c893..21e994b01b7 100644
--- a/docs/data/histograms/United States/007021-2A.json
+++ b/docs/data/histograms/United States/007021-2A.json
@@ -1 +1 @@
-{"batchcode": "007021-2A", "histograms": [{"batchcodes": ["007021-2A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Erythema": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Insomnia": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Secretion discharge": 1, "Vaccination site pain": 1, "Vaginal discharge": 1}}]}
\ No newline at end of file
+{"batchcode": "007021-2A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Erythema": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Insomnia": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Secretion discharge": 1, "Vaccination site pain": 1, "Vaginal discharge": 1}, "batchcodes": ["007021-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007021A.json b/docs/data/histograms/United States/007021A.json
index 8f67997bd24..9f86369d8c7 100644
--- a/docs/data/histograms/United States/007021A.json
+++ b/docs/data/histograms/United States/007021A.json
@@ -1 +1 @@
-{"batchcode": "007021A", "histograms": [{"batchcodes": ["007021A"], "histogram": {"Asthenia": 1, "COVID-19": 1, "Chills": 1, "Decreased appetite": 1, "Malaise": 1, "Off label use": 1, "Product administration error": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "007021A", "histograms": [{"histogram": {"Asthenia": 1, "COVID-19": 1, "Chills": 1, "Decreased appetite": 1, "Malaise": 1, "Off label use": 1, "Product administration error": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["007021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0071321A.json b/docs/data/histograms/United States/0071321A.json
index 8b870d56ab2..7f53919adaa 100644
--- a/docs/data/histograms/United States/0071321A.json
+++ b/docs/data/histograms/United States/0071321A.json
@@ -1 +1 @@
-{"batchcode": "0071321A", "histograms": [{"batchcodes": ["0071321A"], "histogram": {"Cold sweat": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Vaccination site rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0071321A", "histograms": [{"histogram": {"Cold sweat": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Vaccination site rash": 1, "Vomiting": 1}, "batchcodes": ["0071321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0071A21A.json b/docs/data/histograms/United States/0071A21A.json
index dbcff029a4d..a022f9c463f 100644
--- a/docs/data/histograms/United States/0071A21A.json
+++ b/docs/data/histograms/United States/0071A21A.json
@@ -1 +1 @@
-{"batchcode": "0071A21A", "histograms": [{"batchcodes": ["0071A21A"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "0071A21A", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["0071A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00721-2A.json b/docs/data/histograms/United States/00721-2A.json
index 4e3bf7f9ecd..d62a5a0aa63 100644
--- a/docs/data/histograms/United States/00721-2A.json
+++ b/docs/data/histograms/United States/00721-2A.json
@@ -1 +1 @@
-{"batchcode": "00721-2A", "histograms": [{"batchcodes": ["00721-2A"], "histogram": {"Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00721-2A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["00721-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00721A.json b/docs/data/histograms/United States/00721A.json
index 63ca46e97c3..1a3badc87bf 100644
--- a/docs/data/histograms/United States/00721A.json
+++ b/docs/data/histograms/United States/00721A.json
@@ -1 +1 @@
-{"batchcode": "00721A", "histograms": [{"batchcodes": ["00721A"], "histogram": {"Product administered to patient of inappropriate age": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "00721A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1, "Vaccination complication": 1}, "batchcodes": ["00721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0072C21A.json b/docs/data/histograms/United States/0072C21A.json
index 773ba96006c..76b85e00414 100644
--- a/docs/data/histograms/United States/0072C21A.json
+++ b/docs/data/histograms/United States/0072C21A.json
@@ -1 +1 @@
-{"batchcode": "0072C21A", "histograms": [{"batchcodes": ["0072C21A"], "histogram": {"Fatigue": 1, "Intentional product use issue": 1}}]}
\ No newline at end of file
+{"batchcode": "0072C21A", "histograms": [{"histogram": {"Fatigue": 1, "Intentional product use issue": 1}, "batchcodes": ["0072C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007320A.json b/docs/data/histograms/United States/007320A.json
index 8a7d82c86c7..5ea6d4905af 100644
--- a/docs/data/histograms/United States/007320A.json
+++ b/docs/data/histograms/United States/007320A.json
@@ -1 +1 @@
-{"batchcode": "007320A", "histograms": [{"batchcodes": ["007320A"], "histogram": {"Exposure during pregnancy": 2}}]}
\ No newline at end of file
+{"batchcode": "007320A", "histograms": [{"histogram": {"Exposure during pregnancy": 2}, "batchcodes": ["007320A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007321A.json b/docs/data/histograms/United States/007321A.json
index b4102265334..96698ce5e20 100644
--- a/docs/data/histograms/United States/007321A.json
+++ b/docs/data/histograms/United States/007321A.json
@@ -1 +1 @@
-{"batchcode": "007321A", "histograms": [{"batchcodes": ["007321A"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "COVID-19": 1, "Dyspnoea": 1, "Musculoskeletal discomfort": 1, "SARS-CoV-2 test": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "007321A", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "COVID-19": 1, "Dyspnoea": 1, "Musculoskeletal discomfort": 1, "SARS-CoV-2 test": 1, "X-ray": 1}, "batchcodes": ["007321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007521A.json b/docs/data/histograms/United States/007521A.json
index d05f60a27e0..ef5db3e2ff7 100644
--- a/docs/data/histograms/United States/007521A.json
+++ b/docs/data/histograms/United States/007521A.json
@@ -1 +1 @@
-{"batchcode": "007521A", "histograms": [{"batchcodes": ["007521A"], "histogram": {"Fatigue": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "007521A", "histograms": [{"histogram": {"Fatigue": 1, "Myalgia": 1}, "batchcodes": ["007521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007621A.json b/docs/data/histograms/United States/007621A.json
index 608b6d5e59c..6fe2f0d667c 100644
--- a/docs/data/histograms/United States/007621A.json
+++ b/docs/data/histograms/United States/007621A.json
@@ -1 +1 @@
-{"batchcode": "007621A", "histograms": [{"batchcodes": ["007621A"], "histogram": {"Vaccination site pain": 2, "Arthralgia": 1, "Excessive cerumen production": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Myalgia": 1, "Oropharyngeal discomfort": 1, "Taste disorder": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "007621A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Arthralgia": 1, "Excessive cerumen production": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Myalgia": 1, "Oropharyngeal discomfort": 1, "Taste disorder": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["007621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0077727399/012M.json b/docs/data/histograms/United States/0077727399/012M.json
index f197e04f028..a7b5a012d9e 100644
--- a/docs/data/histograms/United States/0077727399/012M.json
+++ b/docs/data/histograms/United States/0077727399/012M.json
@@ -1 +1 @@
-{"batchcode": "0077727399/012M", "histograms": [{"batchcodes": ["0077727399/012M"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "0077727399/012M", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Oxygen saturation": 1, "Product administered to patient of inappropriate age": 1, "Pyrexia": 1, "Tachycardia": 1}, "batchcodes": ["0077727399/012M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0077M20A.json b/docs/data/histograms/United States/0077M20A.json
index ebbe968383c..fac16142c5b 100644
--- a/docs/data/histograms/United States/0077M20A.json
+++ b/docs/data/histograms/United States/0077M20A.json
@@ -1 +1 @@
-{"batchcode": "0077M20A", "histograms": [{"batchcodes": ["0077M20A"], "histogram": {"Eyelid ptosis": 1, "Facial paralysis": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "0077M20A", "histograms": [{"histogram": {"Eyelid ptosis": 1, "Facial paralysis": 1, "Headache": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["0077M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0078(OR B)21A.json b/docs/data/histograms/United States/0078(OR B)21A.json
index f7a5416dcea..e3adeb3b7d9 100644
--- a/docs/data/histograms/United States/0078(OR B)21A.json
+++ b/docs/data/histograms/United States/0078(OR B)21A.json
@@ -1 +1 @@
-{"batchcode": "0078(OR B)21A", "histograms": [{"batchcodes": ["0078(OR B)21A"], "histogram": {"Headache": 1, "Night sweats": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0078(OR B)21A", "histograms": [{"histogram": {"Headache": 1, "Night sweats": 1, "Pain in extremity": 1}, "batchcodes": ["0078(OR B)21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007821A.json b/docs/data/histograms/United States/007821A.json
index fe1bad55127..9e903ae9c2f 100644
--- a/docs/data/histograms/United States/007821A.json
+++ b/docs/data/histograms/United States/007821A.json
@@ -1 +1 @@
-{"batchcode": "007821A", "histograms": [{"batchcodes": ["007821A"], "histogram": {"COVID-19": 2, "Product dose omission issue": 2, "Pruritus": 2, "Rash": 2, "Blood pressure measurement": 1, "Dizziness": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Piloerection": 1, "Pyrexia": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Tremor": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "007821A", "histograms": [{"histogram": {"COVID-19": 2, "Product dose omission issue": 2, "Pruritus": 2, "Rash": 2, "Blood pressure measurement": 1, "Dizziness": 1, "Dysgeusia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Electrocardiogram": 1, "Fatigue": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Piloerection": 1, "Pyrexia": 1, "Road traffic accident": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Tremor": 1, "Vertigo": 1}, "batchcodes": ["007821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00782LA.json b/docs/data/histograms/United States/00782LA.json
index 8e5b8455398..9b7ff99dcf7 100644
--- a/docs/data/histograms/United States/00782LA.json
+++ b/docs/data/histograms/United States/00782LA.json
@@ -1 +1 @@
-{"batchcode": "00782LA", "histograms": [{"batchcodes": ["00782LA"], "histogram": {"Ear infection": 1, "Hypoacusis": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "00782LA", "histograms": [{"histogram": {"Ear infection": 1, "Hypoacusis": 1, "Pain in extremity": 1}, "batchcodes": ["00782LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007A20A.json b/docs/data/histograms/United States/007A20A.json
index 22c1328e76e..768f257d914 100644
--- a/docs/data/histograms/United States/007A20A.json
+++ b/docs/data/histograms/United States/007A20A.json
@@ -1 +1 @@
-{"batchcode": "007A20A", "histograms": [{"batchcodes": ["007A20A"], "histogram": {"Burning sensation": 1, "Joint warmth": 1, "Rash erythematous": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "007A20A", "histograms": [{"histogram": {"Burning sensation": 1, "Joint warmth": 1, "Rash erythematous": 1, "Swelling": 1}, "batchcodes": ["007A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007A21A.json b/docs/data/histograms/United States/007A21A.json
index c40f5d4c453..2994ac03351 100644
--- a/docs/data/histograms/United States/007A21A.json
+++ b/docs/data/histograms/United States/007A21A.json
@@ -1 +1 @@
-{"batchcode": "007A21A", "histograms": [{"batchcodes": ["007A21A"], "histogram": {"Vision blurred": 3, "Arthralgia": 2, "Asthenia": 2, "Dizziness": 2, "Fatigue": 2, "Myalgia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Ear pain": 1, "Feeling abnormal": 1, "Giant cell arteritis": 1, "Hypertensive crisis": 1, "Intentional product use issue": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Musculoskeletal chest pain": 1, "Nasopharyngitis": 1, "Night sweats": 1, "Polymyalgia rheumatica": 1, "SARS-CoV-1 test": 1, "Sinus congestion": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "007A21A", "histograms": [{"histogram": {"Vision blurred": 3, "Arthralgia": 2, "Asthenia": 2, "Dizziness": 2, "Fatigue": 2, "Myalgia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Condition aggravated": 1, "Dyspnoea": 1, "Ear pain": 1, "Feeling abnormal": 1, "Giant cell arteritis": 1, "Hypertensive crisis": 1, "Intentional product use issue": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Musculoskeletal chest pain": 1, "Nasopharyngitis": 1, "Night sweats": 1, "Polymyalgia rheumatica": 1, "SARS-CoV-1 test": 1, "Sinus congestion": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["007A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007A71A.json b/docs/data/histograms/United States/007A71A.json
index d30bf0fbeeb..0670ed324dd 100644
--- a/docs/data/histograms/United States/007A71A.json
+++ b/docs/data/histograms/United States/007A71A.json
@@ -1 +1 @@
-{"batchcode": "007A71A", "histograms": [{"batchcodes": ["007A71A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Blepharospasm": 1, "Burning sensation": 1, "Chemical burn": 1, "Dermatitis": 1, "Erythema": 1, "Head discomfort": 1, "Insomnia": 1, "Muscle twitching": 1, "Peripheral swelling": 1, "Sunburn": 1, "Vascular pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007A71A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Blepharospasm": 1, "Burning sensation": 1, "Chemical burn": 1, "Dermatitis": 1, "Erythema": 1, "Head discomfort": 1, "Insomnia": 1, "Muscle twitching": 1, "Peripheral swelling": 1, "Sunburn": 1, "Vascular pain": 1}, "batchcodes": ["007A71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007AM20A.json b/docs/data/histograms/United States/007AM20A.json
index 3d9457cc23b..346807b9bce 100644
--- a/docs/data/histograms/United States/007AM20A.json
+++ b/docs/data/histograms/United States/007AM20A.json
@@ -1 +1 @@
-{"batchcode": "007AM20A", "histograms": [{"batchcodes": ["007AM20A"], "histogram": {"Back pain": 1, "Chest pain": 1, "Dyspepsia": 1, "Fear": 1, "Feeling abnormal": 1, "Mobility decreased": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007AM20A", "histograms": [{"histogram": {"Back pain": 1, "Chest pain": 1, "Dyspepsia": 1, "Fear": 1, "Feeling abnormal": 1, "Mobility decreased": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["007AM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007B2114.json b/docs/data/histograms/United States/007B2114.json
index de205f09dd2..a5f481bd5d4 100644
--- a/docs/data/histograms/United States/007B2114.json
+++ b/docs/data/histograms/United States/007B2114.json
@@ -1 +1 @@
-{"batchcode": "007B2114", "histograms": [{"batchcodes": ["007B2114"], "histogram": {"Chills": 1, "Cough": 1, "Fatigue": 1, "Heart rate irregular": 1, "Infection": 1, "Influenza like illness": 1, "Myalgia": 1, "Pyrexia": 1, "Sneezing": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "007B2114", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Fatigue": 1, "Heart rate irregular": 1, "Infection": 1, "Influenza like illness": 1, "Myalgia": 1, "Pyrexia": 1, "Sneezing": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1}, "batchcodes": ["007B2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007B211A.json b/docs/data/histograms/United States/007B211A.json
index 0d84de93c25..ae3602709b5 100644
--- a/docs/data/histograms/United States/007B211A.json
+++ b/docs/data/histograms/United States/007B211A.json
@@ -1 +1 @@
-{"batchcode": "007B211A", "histograms": [{"batchcodes": ["007B211A"], "histogram": {"Diarrhoea": 2, "Vomiting": 2, "Cough": 1, "Intentional product use issue": 1, "Limb mass": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "007B211A", "histograms": [{"histogram": {"Diarrhoea": 2, "Vomiting": 2, "Cough": 1, "Intentional product use issue": 1, "Limb mass": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Vaccination site erythema": 1}, "batchcodes": ["007B211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007B212A.json b/docs/data/histograms/United States/007B212A.json
index 39a56402cda..b6c8ae0bf7d 100644
--- a/docs/data/histograms/United States/007B212A.json
+++ b/docs/data/histograms/United States/007B212A.json
@@ -1 +1 @@
-{"batchcode": "007B212A", "histograms": [{"batchcodes": ["007B212A"], "histogram": {"Hypoaesthesia": 1, "Myalgia": 1, "Neuromyopathy": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007B212A", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Myalgia": 1, "Neuromyopathy": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1}, "batchcodes": ["007B212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007B21A,.json b/docs/data/histograms/United States/007B21A,.json
index ce33ce33e02..4f472417cdc 100644
--- a/docs/data/histograms/United States/007B21A,.json
+++ b/docs/data/histograms/United States/007B21A,.json
@@ -1 +1 @@
-{"batchcode": "007B21A,", "histograms": [{"batchcodes": ["007B21A,"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "007B21A,", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["007B21A,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007B21A.json b/docs/data/histograms/United States/007B21A.json
index a28acc70907..9675e41aed0 100644
--- a/docs/data/histograms/United States/007B21A.json
+++ b/docs/data/histograms/United States/007B21A.json
@@ -1 +1 @@
-{"batchcode": "007B21A", "histograms": [{"batchcodes": ["007B21A"], "histogram": {"Expired product administered": 83, "Headache": 60, "Fatigue": 59, "Pyrexia": 58, "Pain in extremity": 52, "Chills": 44, "Myalgia": 37, "Nausea": 35, "Vaccination site pain": 31, "Pain": 28, "Pruritus": 25, "Rash": 25, "COVID-19": 24, "Vaccination site erythema": 23, "Asthenia": 22, "Dizziness": 22, "Arthralgia": 20, "Dyspnoea": 16, "Feeling abnormal": 16, "Cough": 14, "SARS-CoV-2 test": 14, "Erythema": 13, "Peripheral swelling": 12, "Inappropriate schedule of product administration": 11, "Malaise": 11, "Oropharyngeal pain": 11, "Vaccination site rash": 11, "Vaccination site swelling": 11, "Neck pain": 10, "Product dose omission issue": 10, "Body temperature": 9, "Chest pain": 9, "Illness": 9, "Lymphadenopathy": 9, "Somnolence": 9, "Vaccination site pruritus": 9, "Vomiting": 9, "Back pain": 8, "Diarrhoea": 8, "Feeling cold": 8, "Hyperhidrosis": 8, "Product administered to patient of inappropriate age": 8, "Blood pressure measurement": 7, "Influenza like illness": 7, "Urticaria": 7, "Feeling hot": 6, "Heart rate": 6, "Insomnia": 6, "Rhinorrhoea": 6, "Burning sensation": 5, "Eye pain": 5, "Gait disturbance": 5, "Heart rate increased": 5, "Hypoaesthesia": 5, "Palpitations": 5, "Rash erythematous": 5, "Vaccination complication": 5, "Ageusia": 4, "Epistaxis": 4, "Flushing": 4, "Limb discomfort": 4, "Maternal exposure during pregnancy": 4, "Mobility decreased": 4, "Nasal congestion": 4, "Rash macular": 4, "SARS-CoV-2 test positive": 4, "Seizure": 4, "Sinusitis": 4, "Tinnitus": 4, "Tremor": 4, "Vaccination site discolouration": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Arthritis": 3, "Blister": 3, "Blood test": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Dehydration": 3, "Discomfort": 3, "Dry mouth": 3, "Hot flush": 3, "Hypersomnia": 3, "Injection site induration": 3, "Injection site pain": 3, "Lip swelling": 3, "Magnetic resonance imaging": 3, "Muscle spasms": 3, "Nasopharyngitis": 3, "Ocular discomfort": 3, "Paraesthesia": 3, "Paraesthesia oral": 3, "Rash pruritic": 3, "Skin discolouration": 3, "Swelling": 3, "Syncope": 3, "Tachycardia": 3, "Tenderness": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Vaccination site urticaria": 3, "Vaccination site warmth": 3, "Vision blurred": 3, "Anosmia": 2, "Balance disorder": 2, "Blood pressure decreased": 2, "Chronic inflammatory demyelinating polyradiculoneuropathy": 2, "Condition aggravated": 2, "Confusional state": 2, "Cyst": 2, "Drug ineffective": 2, "Dyskinesia": 2, "Dyspepsia": 2, "Ear pain": 2, "Electrocardiogram": 2, "Fall": 2, "Feeling of body temperature change": 2, "Head discomfort": 2, "Herpes zoster": 2, "Hypertension": 2, "Hypotension": 2, "Inflammation": 2, "Injection site warmth": 2, "Intentional product use issue": 2, "Lethargy": 2, "Lumbar puncture": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Neuralgia": 2, "No adverse event": 2, "Oxygen saturation decreased": 2, "Product storage error": 2, "Scab": 2, "Stomatitis": 2, "Swelling face": 2, "Swelling of eyelid": 2, "Thrombosis": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site induration": 2, "Weight increased": 2, "Wheezing": 2, "Accidental underdose": 1, "Acne": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Appendicitis": 1, "Appetite disorder": 1, "Autonomic nervous system imbalance": 1, "Axillary pain": 1, "Bed rest": 1, "Biopsy": 1, "Bladder discomfort": 1, "Blepharospasm": 1, "Blood glucose": 1, "Blood glucose fluctuation": 1, "Brain oedema": 1, "Breast tenderness": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Chapped lips": 1, "Chest X-ray": 1, "Choking": 1, "Chromatopsia": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Conjunctivitis": 1, "Contusion": 1, "Coronavirus test": 1, "Cytomegalovirus infection": 1, "Depression": 1, "Dermatitis acneiform": 1, "Device connection issue": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug interaction": 1, "Dry eye": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Eczema": 1, "Electromyogram": 1, "Electromyogram abnormal": 1, "Emphysema": 1, "Endocrine disorder": 1, "Energy increased": 1, "Enzyme level test": 1, "Epilepsy": 1, "Epstein-Barr virus infection": 1, "Erythema multiforme": 1, "Exposure to SARS-CoV-2": 1, "Eye haemorrhage": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid pain": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paralysis": 1, "Foaming at mouth": 1, "Foreign body sensation in eyes": 1, "Gait inability": 1, "Gastroenteritis viral": 1, "Generalised tonic-clonic seizure": 1, "Gingival swelling": 1, "Hand deformity": 1, "Hangover": 1, "Head injury": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Hypotonia": 1, "Immune system disorder": 1, "Induration": 1, "Influenza": 1, "Injection site discomfort": 1, "Injection site rash": 1, "Interchange of vaccine products": 1, "Intervertebral disc degeneration": 1, "Irritable bowel syndrome": 1, "Joint swelling": 1, "Kyphosis": 1, "Lacrimation increased": 1, "Laziness": 1, "Limb injury": 1, "Lip exfoliation": 1, "Lipoprotein (a) increased": 1, "Localised oedema": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph nodes scan abnormal": 1, "Lymphoedema": 1, "Magnetic resonance imaging heart": 1, "Mass": 1, "Mastoid disorder": 1, "Memory impairment": 1, "Mouth haemorrhage": 1, "Movement disorder": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Needle issue": 1, "Nerve compression": 1, "Nervousness": 1, "Oral discomfort": 1, "Oral mucosal eruption": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain in jaw": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pneumonia": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test": 1, "Presyncope": 1, "Product administration error": 1, "Product availability issue": 1, "Productive cough": 1, "Pulmonary oedema": 1, "Rash pustular": 1, "Road traffic accident": 1, "SARS-CoV-1 test": 1, "Scar": 1, "Scleroderma": 1, "Scratch": 1, "Sinus congestion": 1, "Sinus disorder": 1, "Sinus headache": 1, "Skin burning sensation": 1, "Skin discharge": 1, "Skin exfoliation": 1, "Skin lesion": 1, "Skin warm": 1, "Sluggishness": 1, "Spinal pain": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Systemic lupus erythematosus": 1, "Tendon rupture": 1, "Therapeutic response unexpected": 1, "Throat tightness": 1, "Tongue discomfort": 1, "Tongue pruritus": 1, "Tooth infection": 1, "Ultrasound foetal": 1, "Ultrasound joint": 1, "Upper respiratory tract infection": 1, "Upper-airway cough syndrome": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Vertigo": 1, "Vitamin D": 1}}]}
\ No newline at end of file
+{"batchcode": "007B21A", "histograms": [{"histogram": {"Expired product administered": 83, "Headache": 60, "Fatigue": 59, "Pyrexia": 58, "Pain in extremity": 52, "Chills": 44, "Myalgia": 37, "Nausea": 35, "Vaccination site pain": 31, "Pain": 28, "Pruritus": 25, "Rash": 25, "COVID-19": 24, "Vaccination site erythema": 23, "Asthenia": 22, "Dizziness": 22, "Arthralgia": 20, "Dyspnoea": 16, "Feeling abnormal": 16, "Cough": 14, "SARS-CoV-2 test": 14, "Erythema": 13, "Peripheral swelling": 12, "Inappropriate schedule of product administration": 11, "Malaise": 11, "Oropharyngeal pain": 11, "Vaccination site rash": 11, "Vaccination site swelling": 11, "Neck pain": 10, "Product dose omission issue": 10, "Body temperature": 9, "Chest pain": 9, "Illness": 9, "Lymphadenopathy": 9, "Somnolence": 9, "Vaccination site pruritus": 9, "Vomiting": 9, "Back pain": 8, "Diarrhoea": 8, "Feeling cold": 8, "Hyperhidrosis": 8, "Product administered to patient of inappropriate age": 8, "Blood pressure measurement": 7, "Influenza like illness": 7, "Urticaria": 7, "Feeling hot": 6, "Heart rate": 6, "Insomnia": 6, "Rhinorrhoea": 6, "Burning sensation": 5, "Eye pain": 5, "Gait disturbance": 5, "Heart rate increased": 5, "Hypoaesthesia": 5, "Palpitations": 5, "Rash erythematous": 5, "Vaccination complication": 5, "Ageusia": 4, "Epistaxis": 4, "Flushing": 4, "Limb discomfort": 4, "Maternal exposure during pregnancy": 4, "Mobility decreased": 4, "Nasal congestion": 4, "Rash macular": 4, "SARS-CoV-2 test positive": 4, "Seizure": 4, "Sinusitis": 4, "Tinnitus": 4, "Tremor": 4, "Vaccination site discolouration": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Arthritis": 3, "Blister": 3, "Blood test": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Decreased appetite": 3, "Dehydration": 3, "Discomfort": 3, "Dry mouth": 3, "Hot flush": 3, "Hypersomnia": 3, "Injection site induration": 3, "Injection site pain": 3, "Lip swelling": 3, "Magnetic resonance imaging": 3, "Muscle spasms": 3, "Nasopharyngitis": 3, "Ocular discomfort": 3, "Paraesthesia": 3, "Paraesthesia oral": 3, "Rash pruritic": 3, "Skin discolouration": 3, "Swelling": 3, "Syncope": 3, "Tachycardia": 3, "Tenderness": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Vaccination site urticaria": 3, "Vaccination site warmth": 3, "Vision blurred": 3, "Anosmia": 2, "Balance disorder": 2, "Blood pressure decreased": 2, "Chronic inflammatory demyelinating polyradiculoneuropathy": 2, "Condition aggravated": 2, "Confusional state": 2, "Cyst": 2, "Drug ineffective": 2, "Dyskinesia": 2, "Dyspepsia": 2, "Ear pain": 2, "Electrocardiogram": 2, "Fall": 2, "Feeling of body temperature change": 2, "Head discomfort": 2, "Herpes zoster": 2, "Hypertension": 2, "Hypotension": 2, "Inflammation": 2, "Injection site warmth": 2, "Intentional product use issue": 2, "Lethargy": 2, "Lumbar puncture": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Neuralgia": 2, "No adverse event": 2, "Oxygen saturation decreased": 2, "Product storage error": 2, "Scab": 2, "Stomatitis": 2, "Swelling face": 2, "Swelling of eyelid": 2, "Thrombosis": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site induration": 2, "Weight increased": 2, "Wheezing": 2, "Accidental underdose": 1, "Acne": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Appendicitis": 1, "Appetite disorder": 1, "Autonomic nervous system imbalance": 1, "Axillary pain": 1, "Bed rest": 1, "Biopsy": 1, "Bladder discomfort": 1, "Blepharospasm": 1, "Blood glucose": 1, "Blood glucose fluctuation": 1, "Brain oedema": 1, "Breast tenderness": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Chapped lips": 1, "Chest X-ray": 1, "Choking": 1, "Chromatopsia": 1, "Cold sweat": 1, "Computerised tomogram head": 1, "Conjunctivitis": 1, "Contusion": 1, "Coronavirus test": 1, "Cytomegalovirus infection": 1, "Depression": 1, "Dermatitis acneiform": 1, "Device connection issue": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug interaction": 1, "Dry eye": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear discomfort": 1, "Eating disorder": 1, "Eczema": 1, "Electromyogram": 1, "Electromyogram abnormal": 1, "Emphysema": 1, "Endocrine disorder": 1, "Energy increased": 1, "Enzyme level test": 1, "Epilepsy": 1, "Epstein-Barr virus infection": 1, "Erythema multiforme": 1, "Exposure to SARS-CoV-2": 1, "Eye haemorrhage": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid pain": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paralysis": 1, "Foaming at mouth": 1, "Foreign body sensation in eyes": 1, "Gait inability": 1, "Gastroenteritis viral": 1, "Generalised tonic-clonic seizure": 1, "Gingival swelling": 1, "Hand deformity": 1, "Hangover": 1, "Head injury": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Hypotonia": 1, "Immune system disorder": 1, "Induration": 1, "Influenza": 1, "Injection site discomfort": 1, "Injection site rash": 1, "Interchange of vaccine products": 1, "Intervertebral disc degeneration": 1, "Irritable bowel syndrome": 1, "Joint swelling": 1, "Kyphosis": 1, "Lacrimation increased": 1, "Laziness": 1, "Limb injury": 1, "Lip exfoliation": 1, "Lipoprotein (a) increased": 1, "Localised oedema": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph nodes scan abnormal": 1, "Lymphoedema": 1, "Magnetic resonance imaging heart": 1, "Mass": 1, "Mastoid disorder": 1, "Memory impairment": 1, "Mouth haemorrhage": 1, "Movement disorder": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Myocardial ischaemia": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Needle issue": 1, "Nerve compression": 1, "Nervousness": 1, "Oral discomfort": 1, "Oral mucosal eruption": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain in jaw": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pneumonia": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test": 1, "Presyncope": 1, "Product administration error": 1, "Product availability issue": 1, "Productive cough": 1, "Pulmonary oedema": 1, "Rash pustular": 1, "Road traffic accident": 1, "SARS-CoV-1 test": 1, "Scar": 1, "Scleroderma": 1, "Scratch": 1, "Sinus congestion": 1, "Sinus disorder": 1, "Sinus headache": 1, "Skin burning sensation": 1, "Skin discharge": 1, "Skin exfoliation": 1, "Skin lesion": 1, "Skin warm": 1, "Sluggishness": 1, "Spinal pain": 1, "Supraventricular extrasystoles": 1, "Suspected COVID-19": 1, "Systemic lupus erythematosus": 1, "Tendon rupture": 1, "Therapeutic response unexpected": 1, "Throat tightness": 1, "Tongue discomfort": 1, "Tongue pruritus": 1, "Tooth infection": 1, "Ultrasound foetal": 1, "Ultrasound joint": 1, "Upper respiratory tract infection": 1, "Upper-airway cough syndrome": 1, "Vaccination site inflammation": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Vertigo": 1, "Vitamin D": 1}, "batchcodes": ["007B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007B2A.json b/docs/data/histograms/United States/007B2A.json
index 76c2d475824..d3a4da29755 100644
--- a/docs/data/histograms/United States/007B2A.json
+++ b/docs/data/histograms/United States/007B2A.json
@@ -1 +1 @@
-{"batchcode": "007B2A", "histograms": [{"batchcodes": ["007B2A"], "histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007B2A", "histograms": [{"histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Vaccination site pain": 1}, "batchcodes": ["007B2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007B2I1A.json b/docs/data/histograms/United States/007B2I1A.json
index feccc55570b..5c44b609c33 100644
--- a/docs/data/histograms/United States/007B2I1A.json
+++ b/docs/data/histograms/United States/007B2I1A.json
@@ -1 +1 @@
-{"batchcode": "007B2I1A", "histograms": [{"batchcodes": ["007B2I1A"], "histogram": {"Inappropriate schedule of product administration": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "007B2I1A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Tinnitus": 1}, "batchcodes": ["007B2I1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007BZ1A.json b/docs/data/histograms/United States/007BZ1A.json
index fac5fe5ab90..d7c78a7e055 100644
--- a/docs/data/histograms/United States/007BZ1A.json
+++ b/docs/data/histograms/United States/007BZ1A.json
@@ -1 +1 @@
-{"batchcode": "007BZ1A", "histograms": [{"batchcodes": ["007BZ1A"], "histogram": {"Adverse event": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Insomnia": 1, "Irregular breathing": 1, "Lip swelling": 1, "Lymph node pain": 1, "Muscle spasms": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Rhinorrhoea": 1, "Speech disorder": 1, "Swollen tongue": 1, "Throat tightness": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "007BZ1A", "histograms": [{"histogram": {"Adverse event": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Insomnia": 1, "Irregular breathing": 1, "Lip swelling": 1, "Lymph node pain": 1, "Muscle spasms": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Rhinorrhoea": 1, "Speech disorder": 1, "Swollen tongue": 1, "Throat tightness": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["007BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C1A.json b/docs/data/histograms/United States/007C1A.json
index 8f0daaccce3..968f6cca5c1 100644
--- a/docs/data/histograms/United States/007C1A.json
+++ b/docs/data/histograms/United States/007C1A.json
@@ -1 +1 @@
-{"batchcode": "007C1A", "histograms": [{"batchcodes": ["007C1A"], "histogram": {"Chills": 1, "Erythema": 1, "Injection site reaction": 1, "Paraesthesia": 1, "Pruritus": 1, "Pyrexia": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007C1A", "histograms": [{"histogram": {"Chills": 1, "Erythema": 1, "Injection site reaction": 1, "Paraesthesia": 1, "Pruritus": 1, "Pyrexia": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["007C1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C2114OR9A.json b/docs/data/histograms/United States/007C2114OR9A.json
index 1bf57321026..cdabc2c86da 100644
--- a/docs/data/histograms/United States/007C2114OR9A.json
+++ b/docs/data/histograms/United States/007C2114OR9A.json
@@ -1 +1 @@
-{"batchcode": "007C2114OR9A", "histograms": [{"batchcodes": ["007C2114OR9A"], "histogram": {"Asthenia": 1, "Chest pain": 1, "Disorientation": 1, "Dysarthria": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "007C2114OR9A", "histograms": [{"histogram": {"Asthenia": 1, "Chest pain": 1, "Disorientation": 1, "Dysarthria": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Paraesthesia": 1}, "batchcodes": ["007C2114OR9A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C2119.json b/docs/data/histograms/United States/007C2119.json
index 3d446caee45..9306855a165 100644
--- a/docs/data/histograms/United States/007C2119.json
+++ b/docs/data/histograms/United States/007C2119.json
@@ -1 +1 @@
-{"batchcode": "007C2119", "histograms": [{"batchcodes": ["007C2119"], "histogram": {"Back pain": 1, "Headache": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "007C2119", "histograms": [{"histogram": {"Back pain": 1, "Headache": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1}, "batchcodes": ["007C2119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C211A.json b/docs/data/histograms/United States/007C211A.json
index 32e6ccca9c7..fbb94735e6d 100644
--- a/docs/data/histograms/United States/007C211A.json
+++ b/docs/data/histograms/United States/007C211A.json
@@ -1 +1 @@
-{"batchcode": "007C211A", "histograms": [{"batchcodes": ["007C211A"], "histogram": {"Body temperature": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "007C211A", "histograms": [{"histogram": {"Body temperature": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Swelling": 1}, "batchcodes": ["007C211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C21A OR 003C.json b/docs/data/histograms/United States/007C21A OR 003C.json
index 73e885e29b2..4d547cef5df 100644
--- a/docs/data/histograms/United States/007C21A OR 003C.json
+++ b/docs/data/histograms/United States/007C21A OR 003C.json
@@ -1 +1 @@
-{"batchcode": "007C21A OR 003C", "histograms": [{"batchcodes": ["007C21A OR 003C"], "histogram": {"Accidental overdose": 1, "Fatigue": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "007C21A OR 003C", "histograms": [{"histogram": {"Accidental overdose": 1, "Fatigue": 1, "Headache": 1}, "batchcodes": ["007C21A OR 003C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C21A.json b/docs/data/histograms/United States/007C21A.json
index 7ee19182058..04d8b818220 100644
--- a/docs/data/histograms/United States/007C21A.json
+++ b/docs/data/histograms/United States/007C21A.json
@@ -1 +1 @@
-{"batchcode": "007C21A", "histograms": [{"batchcodes": ["007C21A"], "histogram": {"Poor quality product administered": 119, "Product temperature excursion issue": 119, "Expired product administered": 35, "Headache": 31, "Pyrexia": 27, "Fatigue": 26, "Myalgia": 25, "Chills": 20, "Vaccination site pain": 18, "Inappropriate schedule of product administration": 14, "Pain in extremity": 14, "Rash": 13, "Nausea": 11, "Pruritus": 11, "Vaccination site erythema": 11, "Vomiting": 11, "Dizziness": 10, "Pain": 10, "Decreased appetite": 8, "Feeling abnormal": 8, "Paraesthesia": 8, "Product administered to patient of inappropriate age": 8, "Product storage error": 8, "Arthralgia": 7, "Illness": 7, "Influenza like illness": 7, "Vaccination site pruritus": 7, "Vaccination site swelling": 7, "Asthenia": 6, "Cough": 6, "Hyperhidrosis": 6, "Hypoaesthesia": 6, "Somnolence": 6, "Vaccination site rash": 6, "Vaccination site warmth": 6, "Blood pressure measurement": 5, "Chest pain": 5, "Dyspnoea": 5, "Erythema": 5, "Feeling hot": 5, "Insomnia": 5, "Malaise": 5, "Product dose omission issue": 5, "Rash pruritic": 5, "Swelling": 5, "Vaccination site induration": 5, "Vaccination site reaction": 5, "Ageusia": 4, "Body temperature": 4, "Heart rate": 4, "Migraine": 4, "Neck pain": 4, "Ocular discomfort": 4, "Peripheral swelling": 4, "Urticaria": 4, "Vaccination complication": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Anosmia": 3, "Burning sensation": 3, "Diarrhoea": 3, "Dysarthria": 3, "Exposure during pregnancy": 3, "Heart rate increased": 3, "Herpes zoster": 3, "Hypoaesthesia oral": 3, "Interchange of vaccine products": 3, "Joint swelling": 3, "Lethargy": 3, "Lymphadenopathy": 3, "Musculoskeletal discomfort": 3, "Palpitations": 3, "Rash erythematous": 3, "SARS-CoV-2 test": 3, "Sleep disorder": 3, "Swelling face": 3, "Abdominal distension": 2, "Anxiety": 2, "Back pain": 2, "Chest discomfort": 2, "Cold sweat": 2, "Device connection issue": 2, "Eczema": 2, "Electrocardiogram": 2, "Eye swelling": 2, "Facial paralysis": 2, "Head discomfort": 2, "Heavy menstrual bleeding": 2, "Hot flush": 2, "Hypersensitivity": 2, "Impaired work ability": 2, "Influenza": 2, "Injection site erythema": 2, "Lacrimation increased": 2, "Limb discomfort": 2, "Lip swelling": 2, "Maternal exposure during pregnancy": 2, "Menstruation irregular": 2, "Musculoskeletal stiffness": 2, "Pain in jaw": 2, "Pharyngeal swelling": 2, "Seizure": 2, "Sensitive skin": 2, "Syringe issue": 2, "Tinnitus": 2, "Tremor": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site mass": 2, "Weight decreased": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Allergy test": 1, "Alopecia": 1, "Anion gap": 1, "Arthritis": 1, "Arthropod bite": 1, "Asphyxia": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blepharospasm": 1, "Blindness unilateral": 1, "Blister": 1, "Blood loss anaemia": 1, "Blood test": 1, "Bone pain": 1, "Bronchitis": 1, "C-reactive protein": 1, "Cerebrovascular accident": 1, "Circadian rhythm sleep disorder": 1, "Computerised tomogram": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Contusion": 1, "Costochondritis": 1, "Deafness unilateral": 1, "Death": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Depressed mood": 1, "Discomfort": 1, "Dry mouth": 1, "Dysacusis": 1, "Dysgeusia": 1, "Dysphagia": 1, "Ear congestion": 1, "Ear pain": 1, "Ear, nose and throat examination": 1, "Exposure to SARS-CoV-2": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paresis": 1, "Facial spasm": 1, "Fall": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling drunk": 1, "Flatulence": 1, "Formication": 1, "Fungal infection": 1, "Gait inability": 1, "Haemorrhage": 1, "Hallucination": 1, "Helicobacter test": 1, "Hemiplegia": 1, "Hepatitis viral test": 1, "Hospitalisation": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Hypotension": 1, "Incomplete course of vaccination": 1, "Inflammation": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Injection site rash": 1, "Joint lock": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Metabolic function test": 1, "Mobility decreased": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Mydriasis": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Nightmare": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Otitis media": 1, "Pain assessment": 1, "Paternal exposure before pregnancy": 1, "Pericardial effusion": 1, "Photophobia": 1, "Photopsia": 1, "Physical examination": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Product administration interrupted": 1, "Productive cough": 1, "Rash papular": 1, "Rectal haemorrhage": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin irritation": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Symptom recurrence": 1, "Syncope": 1, "Throat irritation": 1, "Tonsillar hypertrophy": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Unevaluable event": 1, "Urinary tract infection": 1, "Vaccination site movement impairment": 1, "Vaccination site urticaria": 1, "Vision blurred": 1, "Vitreous floaters": 1}}]}
\ No newline at end of file
+{"batchcode": "007C21A", "histograms": [{"histogram": {"Poor quality product administered": 119, "Product temperature excursion issue": 119, "Expired product administered": 35, "Headache": 31, "Pyrexia": 27, "Fatigue": 26, "Myalgia": 25, "Chills": 20, "Vaccination site pain": 18, "Inappropriate schedule of product administration": 14, "Pain in extremity": 14, "Rash": 13, "Nausea": 11, "Pruritus": 11, "Vaccination site erythema": 11, "Vomiting": 11, "Dizziness": 10, "Pain": 10, "Decreased appetite": 8, "Feeling abnormal": 8, "Paraesthesia": 8, "Product administered to patient of inappropriate age": 8, "Product storage error": 8, "Arthralgia": 7, "Illness": 7, "Influenza like illness": 7, "Vaccination site pruritus": 7, "Vaccination site swelling": 7, "Asthenia": 6, "Cough": 6, "Hyperhidrosis": 6, "Hypoaesthesia": 6, "Somnolence": 6, "Vaccination site rash": 6, "Vaccination site warmth": 6, "Blood pressure measurement": 5, "Chest pain": 5, "Dyspnoea": 5, "Erythema": 5, "Feeling hot": 5, "Insomnia": 5, "Malaise": 5, "Product dose omission issue": 5, "Rash pruritic": 5, "Swelling": 5, "Vaccination site induration": 5, "Vaccination site reaction": 5, "Ageusia": 4, "Body temperature": 4, "Heart rate": 4, "Migraine": 4, "Neck pain": 4, "Ocular discomfort": 4, "Peripheral swelling": 4, "Urticaria": 4, "Vaccination complication": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Anosmia": 3, "Burning sensation": 3, "Diarrhoea": 3, "Dysarthria": 3, "Exposure during pregnancy": 3, "Heart rate increased": 3, "Herpes zoster": 3, "Hypoaesthesia oral": 3, "Interchange of vaccine products": 3, "Joint swelling": 3, "Lethargy": 3, "Lymphadenopathy": 3, "Musculoskeletal discomfort": 3, "Palpitations": 3, "Rash erythematous": 3, "SARS-CoV-2 test": 3, "Sleep disorder": 3, "Swelling face": 3, "Abdominal distension": 2, "Anxiety": 2, "Back pain": 2, "Chest discomfort": 2, "Cold sweat": 2, "Device connection issue": 2, "Eczema": 2, "Electrocardiogram": 2, "Eye swelling": 2, "Facial paralysis": 2, "Head discomfort": 2, "Heavy menstrual bleeding": 2, "Hot flush": 2, "Hypersensitivity": 2, "Impaired work ability": 2, "Influenza": 2, "Injection site erythema": 2, "Lacrimation increased": 2, "Limb discomfort": 2, "Lip swelling": 2, "Maternal exposure during pregnancy": 2, "Menstruation irregular": 2, "Musculoskeletal stiffness": 2, "Pain in jaw": 2, "Pharyngeal swelling": 2, "Seizure": 2, "Sensitive skin": 2, "Syringe issue": 2, "Tinnitus": 2, "Tremor": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site mass": 2, "Weight decreased": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Allergy test": 1, "Alopecia": 1, "Anion gap": 1, "Arthritis": 1, "Arthropod bite": 1, "Asphyxia": 1, "Axillary pain": 1, "Bell's palsy": 1, "Blepharospasm": 1, "Blindness unilateral": 1, "Blister": 1, "Blood loss anaemia": 1, "Blood test": 1, "Bone pain": 1, "Bronchitis": 1, "C-reactive protein": 1, "Cerebrovascular accident": 1, "Circadian rhythm sleep disorder": 1, "Computerised tomogram": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Contusion": 1, "Costochondritis": 1, "Deafness unilateral": 1, "Death": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Depressed mood": 1, "Discomfort": 1, "Dry mouth": 1, "Dysacusis": 1, "Dysgeusia": 1, "Dysphagia": 1, "Ear congestion": 1, "Ear pain": 1, "Ear, nose and throat examination": 1, "Exposure to SARS-CoV-2": 1, "Eye pain": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paresis": 1, "Facial spasm": 1, "Fall": 1, "Feeding disorder": 1, "Feeling cold": 1, "Feeling drunk": 1, "Flatulence": 1, "Formication": 1, "Fungal infection": 1, "Gait inability": 1, "Haemorrhage": 1, "Hallucination": 1, "Helicobacter test": 1, "Hemiplegia": 1, "Hepatitis viral test": 1, "Hospitalisation": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Hypotension": 1, "Incomplete course of vaccination": 1, "Inflammation": 1, "Injection site hypoaesthesia": 1, "Injection site pain": 1, "Injection site rash": 1, "Joint lock": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Metabolic function test": 1, "Mobility decreased": 1, "Muscle atrophy": 1, "Muscle spasms": 1, "Mydriasis": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Nightmare": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral discomfort": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Otitis media": 1, "Pain assessment": 1, "Paternal exposure before pregnancy": 1, "Pericardial effusion": 1, "Photophobia": 1, "Photopsia": 1, "Physical examination": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Product administration interrupted": 1, "Productive cough": 1, "Rash papular": 1, "Rectal haemorrhage": 1, "Respiratory rate": 1, "SARS-CoV-2 antibody test": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin irritation": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Symptom recurrence": 1, "Syncope": 1, "Throat irritation": 1, "Tonsillar hypertrophy": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Unevaluable event": 1, "Urinary tract infection": 1, "Vaccination site movement impairment": 1, "Vaccination site urticaria": 1, "Vision blurred": 1, "Vitreous floaters": 1}, "batchcodes": ["007C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C2A.json b/docs/data/histograms/United States/007C2A.json
index b76a5fd98fc..6307fa898b6 100644
--- a/docs/data/histograms/United States/007C2A.json
+++ b/docs/data/histograms/United States/007C2A.json
@@ -1 +1 @@
-{"batchcode": "007C2A", "histograms": [{"batchcodes": ["007C2A"], "histogram": {"Abdominal pain upper": 1, "Chest discomfort": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dysstasia": 1, "Euphoric mood": 1, "Feeling hot": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Restlessness": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "007C2A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Chest discomfort": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Dysstasia": 1, "Euphoric mood": 1, "Feeling hot": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Restlessness": 1, "Vomiting": 1}, "batchcodes": ["007C2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007C2LA.json b/docs/data/histograms/United States/007C2LA.json
index 735eab58bb5..76dc7fa67ea 100644
--- a/docs/data/histograms/United States/007C2LA.json
+++ b/docs/data/histograms/United States/007C2LA.json
@@ -1 +1 @@
-{"batchcode": "007C2LA", "histograms": [{"batchcodes": ["007C2LA"], "histogram": {"Anxiety": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "007C2LA", "histograms": [{"histogram": {"Anxiety": 1, "Dyspnoea": 1, "Loss of consciousness": 1, "Nausea": 1}, "batchcodes": ["007C2LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007CZ1A.json b/docs/data/histograms/United States/007CZ1A.json
index f09feaa4fe4..f9f9b293963 100644
--- a/docs/data/histograms/United States/007CZ1A.json
+++ b/docs/data/histograms/United States/007CZ1A.json
@@ -1 +1 @@
-{"batchcode": "007CZ1A", "histograms": [{"batchcodes": ["007CZ1A"], "histogram": {"Fatigue": 2, "Colitis ulcerative": 1, "Diarrhoea": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Tooth fracture": 1}}]}
\ No newline at end of file
+{"batchcode": "007CZ1A", "histograms": [{"histogram": {"Fatigue": 2, "Colitis ulcerative": 1, "Diarrhoea": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Tooth fracture": 1}, "batchcodes": ["007CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007CZ4.json b/docs/data/histograms/United States/007CZ4.json
index 201684da3dd..d90c536f063 100644
--- a/docs/data/histograms/United States/007CZ4.json
+++ b/docs/data/histograms/United States/007CZ4.json
@@ -1 +1 @@
-{"batchcode": "007CZ4", "histograms": [{"batchcodes": ["007CZ4"], "histogram": {"Nasal congestion": 1, "Rhinorrhoea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007CZ4", "histograms": [{"histogram": {"Nasal congestion": 1, "Rhinorrhoea": 1, "Vaccination site pain": 1}, "batchcodes": ["007CZ4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007CZIA.json b/docs/data/histograms/United States/007CZIA.json
index 2c0e3e52923..fd70e766c56 100644
--- a/docs/data/histograms/United States/007CZIA.json
+++ b/docs/data/histograms/United States/007CZIA.json
@@ -1 +1 @@
-{"batchcode": "007CZIA", "histograms": [{"batchcodes": ["007CZIA"], "histogram": {"Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "007CZIA", "histograms": [{"histogram": {"Underdose": 1}, "batchcodes": ["007CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007D21A.json b/docs/data/histograms/United States/007D21A.json
index 88bc87b1f52..675234371e8 100644
--- a/docs/data/histograms/United States/007D21A.json
+++ b/docs/data/histograms/United States/007D21A.json
@@ -1 +1 @@
-{"batchcode": "007D21A", "histograms": [{"batchcodes": ["007D21A"], "histogram": {"Expired product administered": 11, "Vaccination site pain": 5, "Interchange of vaccine products": 3, "Nausea": 3, "Paraesthesia": 3, "Product administered to patient of inappropriate age": 3, "Product storage error": 3, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Pain in extremity": 2, "Product dose omission issue": 2, "Pruritus": 2, "Pyrexia": 2, "Somnolence": 2, "Vaccination complication": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Accidental overdose": 1, "Arthralgia": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coating in mouth": 1, "Diarrhoea": 1, "Dysphagia": 1, "Eye haemorrhage": 1, "Heart rate increased": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site rash": 1, "Limb discomfort": 1, "Malaise": 1, "Menstruation delayed": 1, "No adverse event": 1, "Oral discomfort": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pregnancy test": 1, "Rash": 1, "Respiratory disorder": 1, "SARS-CoV-2 test": 1, "Throat tightness": 1, "Thrombosis": 1, "Unevaluable event": 1, "Urinary tract infection": 1, "Urticaria": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Weight increased": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "007D21A", "histograms": [{"histogram": {"Expired product administered": 11, "Vaccination site pain": 5, "Interchange of vaccine products": 3, "Nausea": 3, "Paraesthesia": 3, "Product administered to patient of inappropriate age": 3, "Product storage error": 3, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Pain in extremity": 2, "Product dose omission issue": 2, "Pruritus": 2, "Pyrexia": 2, "Somnolence": 2, "Vaccination complication": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Accidental overdose": 1, "Arthralgia": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Coating in mouth": 1, "Diarrhoea": 1, "Dysphagia": 1, "Eye haemorrhage": 1, "Heart rate increased": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site rash": 1, "Limb discomfort": 1, "Malaise": 1, "Menstruation delayed": 1, "No adverse event": 1, "Oral discomfort": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pregnancy test": 1, "Rash": 1, "Respiratory disorder": 1, "SARS-CoV-2 test": 1, "Throat tightness": 1, "Thrombosis": 1, "Unevaluable event": 1, "Urinary tract infection": 1, "Urticaria": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Weight increased": 1, "Wrong product administered": 1}, "batchcodes": ["007D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007DZ10.json b/docs/data/histograms/United States/007DZ10.json
index 0502634b296..2f8270df2d2 100644
--- a/docs/data/histograms/United States/007DZ10.json
+++ b/docs/data/histograms/United States/007DZ10.json
@@ -1 +1 @@
-{"batchcode": "007DZ10", "histograms": [{"batchcodes": ["007DZ10"], "histogram": {"Illness": 1}}]}
\ No newline at end of file
+{"batchcode": "007DZ10", "histograms": [{"histogram": {"Illness": 1}, "batchcodes": ["007DZ10"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007G21A.json b/docs/data/histograms/United States/007G21A.json
index 41f07b7081c..4688a7abd34 100644
--- a/docs/data/histograms/United States/007G21A.json
+++ b/docs/data/histograms/United States/007G21A.json
@@ -1 +1 @@
-{"batchcode": "007G21A", "histograms": [{"batchcodes": ["007G21A"], "histogram": {"Fatigue": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "007G21A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["007G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007H21A.json b/docs/data/histograms/United States/007H21A.json
index 1e57ea0a977..8aa0a34e5dd 100644
--- a/docs/data/histograms/United States/007H21A.json
+++ b/docs/data/histograms/United States/007H21A.json
@@ -1 +1 @@
-{"batchcode": "007H21A", "histograms": [{"batchcodes": ["007H21A"], "histogram": {"Menopause delayed": 1}}]}
\ No newline at end of file
+{"batchcode": "007H21A", "histograms": [{"histogram": {"Menopause delayed": 1}, "batchcodes": ["007H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007J21-21.json b/docs/data/histograms/United States/007J21-21.json
index 38b902ce525..4c067499094 100644
--- a/docs/data/histograms/United States/007J21-21.json
+++ b/docs/data/histograms/United States/007J21-21.json
@@ -1 +1 @@
-{"batchcode": "007J21-21", "histograms": [{"batchcodes": ["007J21-21"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "007J21-21", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["007J21-21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007J21-2A.json b/docs/data/histograms/United States/007J21-2A.json
index 1c9e8f16b09..3176326afd2 100644
--- a/docs/data/histograms/United States/007J21-2A.json
+++ b/docs/data/histograms/United States/007J21-2A.json
@@ -1 +1 @@
-{"batchcode": "007J21-2A", "histograms": [{"batchcodes": ["007J21-2A", "050C21A", "1805018"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["007J21-2A"], "histogram": {"Expired product administered": 50, "Product storage error": 14, "Accidental overdose": 7, "Feeling abnormal": 2, "Inappropriate schedule of product administration": 2, "SARS-CoV-2 test": 2, "Accidental underdose": 1, "Anxiety": 1, "Chest pain": 1, "Conversion disorder": 1, "Dizziness": 1, "Erythema": 1, "Eye movement disorder": 1, "Hallucination": 1, "Headache": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Injection site extravasation": 1, "Injection site pain": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oxygen saturation": 1, "Pregnancy test": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Skin warm": 1, "Swelling face": 1, "Thrombosis": 1, "Triple positive breast cancer": 1, "Vaginal haemorrhage": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "007J21-2A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["007J21-2A", "050C21A", "1805018"]}, {"histogram": {"Expired product administered": 50, "Product storage error": 14, "Accidental overdose": 7, "Feeling abnormal": 2, "Inappropriate schedule of product administration": 2, "SARS-CoV-2 test": 2, "Accidental underdose": 1, "Anxiety": 1, "Chest pain": 1, "Conversion disorder": 1, "Dizziness": 1, "Erythema": 1, "Eye movement disorder": 1, "Hallucination": 1, "Headache": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hot flush": 1, "Injection site extravasation": 1, "Injection site pain": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Oxygen saturation": 1, "Pregnancy test": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Skin warm": 1, "Swelling face": 1, "Thrombosis": 1, "Triple positive breast cancer": 1, "Vaginal haemorrhage": 1, "Vomiting": 1}, "batchcodes": ["007J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007J21.json b/docs/data/histograms/United States/007J21.json
index 82f45d9c6ea..862ef5e7679 100644
--- a/docs/data/histograms/United States/007J21.json
+++ b/docs/data/histograms/United States/007J21.json
@@ -1 +1 @@
-{"batchcode": "007J21", "histograms": [{"batchcodes": ["007J21"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "007J21", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["007J21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007J212A.json b/docs/data/histograms/United States/007J212A.json
index 15228c28326..ae717f3057b 100644
--- a/docs/data/histograms/United States/007J212A.json
+++ b/docs/data/histograms/United States/007J212A.json
@@ -1 +1 @@
-{"batchcode": "007J212A", "histograms": [{"batchcodes": ["007J212A"], "histogram": {"Inappropriate schedule of product administration": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "007J212A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Tinnitus": 1}, "batchcodes": ["007J212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007J21A.json b/docs/data/histograms/United States/007J21A.json
index bb3a2e83935..d187aa9a4d1 100644
--- a/docs/data/histograms/United States/007J21A.json
+++ b/docs/data/histograms/United States/007J21A.json
@@ -1 +1 @@
-{"batchcode": "007J21A", "histograms": [{"batchcodes": ["007J21A"], "histogram": {"Feeling abnormal": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "007J21A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Swelling face": 1}, "batchcodes": ["007J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007L20A.json b/docs/data/histograms/United States/007L20A.json
index 43e294fee7c..cdb524bba3c 100644
--- a/docs/data/histograms/United States/007L20A.json
+++ b/docs/data/histograms/United States/007L20A.json
@@ -1 +1 @@
-{"batchcode": "007L20A", "histograms": [{"batchcodes": ["007L20A"], "histogram": {"Body temperature": 1, "Chills": 1, "Malaise": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007L20A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Malaise": 1, "Off label use": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["007L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M(2/Z)0A.json b/docs/data/histograms/United States/007M(2/Z)0A.json
index a46bdaccd1f..52a8bcaa1a5 100644
--- a/docs/data/histograms/United States/007M(2/Z)0A.json
+++ b/docs/data/histograms/United States/007M(2/Z)0A.json
@@ -1 +1 @@
-{"batchcode": "007M(2/Z)0A", "histograms": [{"batchcodes": ["007M(2/Z)0A"], "histogram": {"Rotator cuff syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "007M(2/Z)0A", "histograms": [{"histogram": {"Rotator cuff syndrome": 1}, "batchcodes": ["007M(2/Z)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M00A.json b/docs/data/histograms/United States/007M00A.json
index 2c7c9081194..f99f0c5a0b0 100644
--- a/docs/data/histograms/United States/007M00A.json
+++ b/docs/data/histograms/United States/007M00A.json
@@ -1 +1 @@
-{"batchcode": "007M00A", "histograms": [{"batchcodes": ["007M00A"], "histogram": {"Erythema": 1, "Feeling abnormal": 1, "Pain": 1, "Pruritus": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "007M00A", "histograms": [{"histogram": {"Erythema": 1, "Feeling abnormal": 1, "Pain": 1, "Pruritus": 1, "Vaccination site reaction": 1}, "batchcodes": ["007M00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M0A.json b/docs/data/histograms/United States/007M0A.json
index 0dbbdf2456c..049f4da2a0b 100644
--- a/docs/data/histograms/United States/007M0A.json
+++ b/docs/data/histograms/United States/007M0A.json
@@ -1 +1 @@
-{"batchcode": "007M0A", "histograms": [{"batchcodes": ["007M0A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007M0A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["007M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M120A.json b/docs/data/histograms/United States/007M120A.json
index 1fe69a92e68..14664eadc4e 100644
--- a/docs/data/histograms/United States/007M120A.json
+++ b/docs/data/histograms/United States/007M120A.json
@@ -1 +1 @@
-{"batchcode": "007M120A", "histograms": [{"batchcodes": ["007M120A"], "histogram": {"Limb discomfort": 1, "Pain in extremity": 1, "Vaccination site discolouration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "007M120A", "histograms": [{"histogram": {"Limb discomfort": 1, "Pain in extremity": 1, "Vaccination site discolouration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["007M120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20.json b/docs/data/histograms/United States/007M20.json
index 7ec03a625c6..0b746ecdc96 100644
--- a/docs/data/histograms/United States/007M20.json
+++ b/docs/data/histograms/United States/007M20.json
@@ -1 +1 @@
-{"batchcode": "007M20", "histograms": [{"batchcodes": ["007M20"], "histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20", "histograms": [{"histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1}, "batchcodes": ["007M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M201.json b/docs/data/histograms/United States/007M201.json
index 92e70d4e963..87a58188e64 100644
--- a/docs/data/histograms/United States/007M201.json
+++ b/docs/data/histograms/United States/007M201.json
@@ -1 +1 @@
-{"batchcode": "007M201", "histograms": [{"batchcodes": ["007M201"], "histogram": {"Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "007M201", "histograms": [{"histogram": {"Headache": 1, "Pyrexia": 1}, "batchcodes": ["007M201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M201A.json b/docs/data/histograms/United States/007M201A.json
index 0fdeb9a35d0..eb690fb837f 100644
--- a/docs/data/histograms/United States/007M201A.json
+++ b/docs/data/histograms/United States/007M201A.json
@@ -1 +1 @@
-{"batchcode": "007M201A", "histograms": [{"batchcodes": ["007M201A"], "histogram": {"Erythema": 1, "Fatigue": 1, "Headache": 1, "Injection site warmth": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Swelling": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "007M201A", "histograms": [{"histogram": {"Erythema": 1, "Fatigue": 1, "Headache": 1, "Injection site warmth": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Swelling": 1, "Tenderness": 1}, "batchcodes": ["007M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M204.json b/docs/data/histograms/United States/007M204.json
index f70a56fe356..737c1f951f7 100644
--- a/docs/data/histograms/United States/007M204.json
+++ b/docs/data/histograms/United States/007M204.json
@@ -1 +1 @@
-{"batchcode": "007M204", "histograms": [{"batchcodes": ["007M204"], "histogram": {"Chills": 3, "Arthralgia": 2, "Burning sensation": 2, "Erythema": 2, "Headache": 2, "Nausea": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Pyrexia": 2, "Back pain": 1, "Fatigue": 1, "Flushing": 1, "Gait inability": 1, "Incomplete course of vaccination": 1, "Intervertebral disc protrusion": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Somnolence": 1, "Vaccination complication": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "007M204", "histograms": [{"histogram": {"Chills": 3, "Arthralgia": 2, "Burning sensation": 2, "Erythema": 2, "Headache": 2, "Nausea": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Pyrexia": 2, "Back pain": 1, "Fatigue": 1, "Flushing": 1, "Gait inability": 1, "Incomplete course of vaccination": 1, "Intervertebral disc protrusion": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Somnolence": 1, "Vaccination complication": 1, "Vomiting": 1}, "batchcodes": ["007M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M208.json b/docs/data/histograms/United States/007M208.json
index 0ba02f0efce..f846d258be7 100644
--- a/docs/data/histograms/United States/007M208.json
+++ b/docs/data/histograms/United States/007M208.json
@@ -1 +1 @@
-{"batchcode": "007M208", "histograms": [{"batchcodes": ["007M208"], "histogram": {"Adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "007M208", "histograms": [{"histogram": {"Adverse event": 1}, "batchcodes": ["007M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M209.json b/docs/data/histograms/United States/007M209.json
index fc14b2dd3f1..c8b47ea9e2b 100644
--- a/docs/data/histograms/United States/007M209.json
+++ b/docs/data/histograms/United States/007M209.json
@@ -1 +1 @@
-{"batchcode": "007M209", "histograms": [{"batchcodes": ["007M209"], "histogram": {"Chest pain": 1, "Pain in extremity": 1, "Vaccination site bruising": 1}}]}
\ No newline at end of file
+{"batchcode": "007M209", "histograms": [{"histogram": {"Chest pain": 1, "Pain in extremity": 1, "Vaccination site bruising": 1}, "batchcodes": ["007M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20A E.json b/docs/data/histograms/United States/007M20A E.json
index a271496196c..ebd343e5d72 100644
--- a/docs/data/histograms/United States/007M20A E.json
+++ b/docs/data/histograms/United States/007M20A E.json
@@ -1 +1 @@
-{"batchcode": "007M20A E", "histograms": [{"batchcodes": ["007M20A E"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A E", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["007M20A E"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20A OR 001M.json b/docs/data/histograms/United States/007M20A OR 001M.json
index 934d78c415a..4f441162490 100644
--- a/docs/data/histograms/United States/007M20A OR 001M.json
+++ b/docs/data/histograms/United States/007M20A OR 001M.json
@@ -1 +1 @@
-{"batchcode": "007M20A OR 001M", "histograms": [{"batchcodes": ["007M20A OR 001M"], "histogram": {"Musculoskeletal discomfort": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A OR 001M", "histograms": [{"histogram": {"Musculoskeletal discomfort": 1, "Product dose omission issue": 1}, "batchcodes": ["007M20A OR 001M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20A OR MRN4.json b/docs/data/histograms/United States/007M20A OR MRN4.json
index a39a00f9436..d6df7cc6897 100644
--- a/docs/data/histograms/United States/007M20A OR MRN4.json
+++ b/docs/data/histograms/United States/007M20A OR MRN4.json
@@ -1 +1 @@
-{"batchcode": "007M20A OR MRN4", "histograms": [{"batchcodes": ["007M20A OR MRN4"], "histogram": {"Chills": 2, "Erythema": 2, "Fatigue": 2, "Pyrexia": 2, "Rash": 2, "Rash pruritic": 2, "Arthralgia": 1, "Feeling hot": 1, "Myalgia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A OR MRN4", "histograms": [{"histogram": {"Chills": 2, "Erythema": 2, "Fatigue": 2, "Pyrexia": 2, "Rash": 2, "Rash pruritic": 2, "Arthralgia": 1, "Feeling hot": 1, "Myalgia": 1, "Swelling": 1}, "batchcodes": ["007M20A OR MRN4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20A, 024M20.json b/docs/data/histograms/United States/007M20A, 024M20.json
index f967aa62c57..30b7667baa2 100644
--- a/docs/data/histograms/United States/007M20A, 024M20.json
+++ b/docs/data/histograms/United States/007M20A, 024M20.json
@@ -1 +1 @@
-{"batchcode": "007M20A, 024M20", "histograms": [{"batchcodes": ["007M20A, 024M20"], "histogram": {"Fatigue": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A, 024M20", "histograms": [{"histogram": {"Fatigue": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["007M20A, 024M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20A,.json b/docs/data/histograms/United States/007M20A,.json
index b4c10d24e19..0cf25cf642b 100644
--- a/docs/data/histograms/United States/007M20A,.json
+++ b/docs/data/histograms/United States/007M20A,.json
@@ -1 +1 @@
-{"batchcode": "007M20A,", "histograms": [{"batchcodes": ["007M20A,"], "histogram": {"Injection site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A,", "histograms": [{"histogram": {"Injection site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["007M20A,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20A..json b/docs/data/histograms/United States/007M20A..json
index f2e5fe6f488..76294398251 100644
--- a/docs/data/histograms/United States/007M20A..json
+++ b/docs/data/histograms/United States/007M20A..json
@@ -1 +1 @@
-{"batchcode": "007M20A.", "histograms": [{"batchcodes": ["007M20A."], "histogram": {"Asthenia": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A.", "histograms": [{"histogram": {"Asthenia": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["007M20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20A.json b/docs/data/histograms/United States/007M20A.json
index cb6b35672a1..62fc28388de 100644
--- a/docs/data/histograms/United States/007M20A.json
+++ b/docs/data/histograms/United States/007M20A.json
@@ -1 +1 @@
-{"batchcode": "007M20A", "histograms": [{"batchcodes": ["007M20A"], "histogram": {"Fatigue": 136, "Headache": 129, "Pain in extremity": 122, "Pyrexia": 114, "Chills": 111, "Vaccination site pain": 99, "Vaccination site erythema": 79, "Myalgia": 78, "Pain": 67, "Nausea": 66, "Vaccination site pruritus": 60, "Pruritus": 57, "Erythema": 52, "Rash": 47, "Dizziness": 46, "Vaccination site swelling": 43, "Asthenia": 41, "Arthralgia": 40, "Vaccination site warmth": 40, "Peripheral swelling": 35, "Diarrhoea": 34, "Dyspnoea": 34, "Feeling abnormal": 31, "Body temperature": 30, "Urticaria": 27, "Feeling hot": 25, "Malaise": 25, "Vaccination site rash": 25, "COVID-19": 22, "Lymphadenopathy": 22, "SARS-CoV-2 test": 21, "Vaccination complication": 21, "Vomiting": 21, "Blood pressure measurement": 20, "Cough": 20, "Inappropriate schedule of product administration": 20, "Swelling": 20, "Influenza like illness": 16, "Limb discomfort": 16, "Paraesthesia": 16, "Insomnia": 15, "Burning sensation": 14, "Decreased appetite": 14, "Hyperhidrosis": 14, "Injection site pain": 13, "Product dose omission issue": 13, "Somnolence": 13, "Vaccination site induration": 13, "Chest discomfort": 12, "Chest pain": 12, "Gait disturbance": 12, "Injection site pruritus": 12, "Hypersensitivity": 11, "Illness": 11, "Injection site erythema": 11, "Rash erythematous": 11, "Tremor": 11, "Vertigo": 11, "Balance disorder": 10, "Injection site swelling": 10, "Musculoskeletal stiffness": 10, "Nasal congestion": 10, "Neck pain": 10, "Rash pruritic": 10, "Rhinorrhoea": 10, "Condition aggravated": 9, "Discomfort": 9, "Feeling cold": 9, "Heart rate": 9, "Hypoaesthesia": 9, "Muscular weakness": 9, "Oropharyngeal pain": 9, "Rash macular": 9, "Throat irritation": 9, "Abdominal discomfort": 8, "Abdominal pain upper": 8, "Drug ineffective": 8, "Joint swelling": 8, "Nasopharyngitis": 8, "Pharyngeal swelling": 8, "Swelling face": 8, "Tachycardia": 8, "Tenderness": 8, "Vaccination site reaction": 8, "Ageusia": 7, "Back pain": 7, "Flushing": 7, "Hypertension": 7, "Inflammation": 7, "Loss of personal independence in daily activities": 7, "Mobility decreased": 7, "Palpitations": 7, "Tinnitus": 7, "Vaccination site mass": 7, "Blood pressure increased": 6, "Electrocardiogram": 6, "Heart rate increased": 6, "Herpes zoster": 6, "Injection site rash": 6, "Injection site warmth": 6, "Retching": 6, "Accidental underdose": 5, "Blood test": 5, "Death": 5, "Dysphagia": 5, "Ear pain": 5, "Expired product administered": 5, "Hypotension": 5, "Loss of consciousness": 5, "Maternal exposure during pregnancy": 5, "Migraine": 5, "No adverse event": 5, "Swollen tongue": 5, "Urinary tract infection": 5, "Vision blurred": 5, "X-ray": 5, "Accidental overdose": 4, "Anosmia": 4, "Anxiety": 4, "Contusion": 4, "Depression": 4, "Dysgeusia": 4, "Exposure during pregnancy": 4, "Exposure via skin contact": 4, "Gait inability": 4, "Gastrooesophageal reflux disease": 4, "Head discomfort": 4, "Immunisation reaction": 4, "Influenza": 4, "Magnetic resonance imaging": 4, "Muscle spasms": 4, "Muscle twitching": 4, "Neuralgia": 4, "Oxygen saturation": 4, "Paraesthesia oral": 4, "Peripheral coldness": 4, "Poor quality product administered": 4, "Presyncope": 4, "Product administered at inappropriate site": 4, "Product temperature excursion issue": 4, "SARS-CoV-2 antibody test": 4, "Thrombosis": 4, "Underdose": 4, "Vaccination site bruising": 4, "Vaccination site discolouration": 4, "Vaccination site inflammation": 4, "Vaccination site lymphadenopathy": 4, "Vaccination site urticaria": 4, "Visual impairment": 4, "Atrial fibrillation": 3, "Axillary pain": 3, "Blister": 3, "Blood glucose": 3, "Bone pain": 3, "Breast pain": 3, "Dyspepsia": 3, "Dysstasia": 3, "Extra dose administered": 3, "Fall": 3, "Feeling of body temperature change": 3, "Hypokinesia": 3, "Incorrect route of product administration": 3, "Induration": 3, "Injection site induration": 3, "Injection site mass": 3, "Lacrimation increased": 3, "Lethargy": 3, "Limb injury": 3, "Muscle tightness": 3, "Nervousness": 3, "Parosmia": 3, "Platelet count": 3, "Pollakiuria": 3, "Pulmonary congestion": 3, "SARS-CoV-2 test positive": 3, "Sinusitis": 3, "Skin irritation": 3, "Sneezing": 3, "Syncope": 3, "Therapeutic response unexpected": 3, "Throat tightness": 3, "Vaccination site discomfort": 3, "Vaccination site movement impairment": 3, "Abdominal pain": 2, "Adverse reaction": 2, "Agitation": 2, "Allergy to vaccine": 2, "Angiogram": 2, "Arthritis": 2, "Asthma": 2, "Bedridden": 2, "Bell's palsy": 2, "Biopsy": 2, "Blood glucose increased": 2, "Blood immunoglobulin G": 2, "C-reactive protein": 2, "Cataract": 2, "Chest X-ray": 2, "Chronic obstructive pulmonary disease": 2, "Cluster headache": 2, "Computerised tomogram": 2, "Confusional state": 2, "Cystitis": 2, "Device connection issue": 2, "Dysphonia": 2, "Ear discomfort": 2, "Eating disorder": 2, "Electric shock sensation": 2, "Eye swelling": 2, "Gingival pain": 2, "Glossodynia": 2, "Glucose tolerance test": 2, "Haemoglobin": 2, "Heart rate irregular": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Incorrect dose administered": 2, "Injection site reaction": 2, "Lip swelling": 2, "Lymph node pain": 2, "Mouth swelling": 2, "Movement disorder": 2, "Nasal dryness": 2, "Oral discomfort": 2, "Oral herpes": 2, "Oral pain": 2, "Osteoarthritis": 2, "Overdose": 2, "Oxygen saturation decreased": 2, "Pain of skin": 2, "Pallor": 2, "Panic attack": 2, "Product preparation error": 2, "Productive cough": 2, "Psychotic disorder": 2, "Pulse abnormal": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Skin discolouration": 2, "Stomatitis": 2, "Toothache": 2, "Vaccination site discharge": 2, "Vaccination site haemorrhage": 2, "Vaccination site infection": 2, "Vaccination site pustule": 2, "Ventricular extrasystoles": 2, "Ventricular tachycardia": 2, "Abdominal distension": 1, "Abnormal dreams": 1, "Abnormal loss of weight": 1, "Accident at home": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Acute sinusitis": 1, "Administration site warmth": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Alopecia": 1, "Alpha 1 foetoprotein normal": 1, "Alpha 1 globulin": 1, "Anaemia": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Aphasia": 1, "Arterial catheterisation normal": 1, "Arthritis reactive": 1, "Axillary mass": 1, "Blindness": 1, "Blood albumin": 1, "Blood cholesterol": 1, "Blood glucose decreased": 1, "Blood iron": 1, "Body temperature increased": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "COVID-19 pneumonia": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Coeliac disease": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Corneal abrasion": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased interest": 1, "Dehydration": 1, "Delusion": 1, "Dental examination": 1, "Dermatitis allergic": 1, "Dermatomyositis": 1, "Diarrhoea haemorrhagic": 1, "Disability": 1, "Disorientation": 1, "Diverticulitis": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysuria": 1, "Ear congestion": 1, "Ear disorder": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Emotional disorder": 1, "Energy increased": 1, "Eosinophil count": 1, "Erythema of eyelid": 1, "Essential hypertension": 1, "Exposure to SARS-CoV-2": 1, "Eye contusion": 1, "Eye haemorrhage": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid irritation": 1, "Facial paralysis": 1, "Fear": 1, "Feeding disorder": 1, "Feeling of relaxation": 1, "Flatulence": 1, "Frustration tolerance decreased": 1, "Furuncle": 1, "Gastric disorder": 1, "Gastrointestinal pain": 1, "Genital swelling": 1, "Gingival discolouration": 1, "Gingival erythema": 1, "Glossitis": 1, "Glycosylated haemoglobin increased": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin decreased": 1, "Haemorrhage": 1, "Hallucination": 1, "Hangover": 1, "Head injury": 1, "Heart rate decreased": 1, "Heart rate variability increased": 1, "Heavy menstrual bleeding": 1, "Hyperacusis": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperphagia": 1, "Hypertensive emergency": 1, "Hyperthyroidism": 1, "Hypertrophic cardiomyopathy": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Immune thrombocytopenia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered by product": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site movement impairment": 1, "Injection site scar": 1, "Joint injury": 1, "Joint instability": 1, "Keratosis pilaris": 1, "Lichen planus": 1, "Limb deformity": 1, "Limb mass": 1, "Liver function test": 1, "Liver function test increased": 1, "Lung hyperinflation": 1, "Lung opacity": 1, "Lymphoedema": 1, "Lymphoma": 1, "Macule": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Mass": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Memory impairment": 1, "Meningitis": 1, "Mental disorder": 1, "Middle insomnia": 1, "Motion sickness": 1, "Multiple sclerosis relapse": 1, "Muscle contractions involuntary": 1, "Muscle disorder": 1, "Musculoskeletal discomfort": 1, "Myokymia": 1, "Nasal discomfort": 1, "Nervous system disorder": 1, "Neuropathy peripheral": 1, "Non-cardiac chest pain": 1, "Noninfective gingivitis": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmological examination": 1, "Oral disorder": 1, "Oral mucosal eruption": 1, "Oral mucosal erythema": 1, "Oropharyngeal discomfort": 1, "Pain in jaw": 1, "Pelvic pain": 1, "Peptic ulcer": 1, "Periarthritis": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumonitis": 1, "Polymerase chain reaction": 1, "Postprandial hypoglycaemia": 1, "Pre-existing condition improved": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Product administered to patient of inappropriate age": 1, "Product packaging issue": 1, "Product storage error": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulmonary pain": 1, "Pustule": 1, "Quality of life decreased": 1, "Rash papular": 1, "Raynaud's phenomenon": 1, "Rectal tenesmus": 1, "Red blood cell abnormality": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate increased": 1, "Red cell distribution width increased": 1, "Renal artery thrombosis": 1, "Renal function test": 1, "Renal impairment": 1, "Renal pain": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Retinal migraine": 1, "Rheumatological examination": 1, "Road traffic accident": 1, "Rotator cuff syndrome": 1, "Salivary hypersecretion": 1, "Scab": 1, "Scan": 1, "Scar": 1, "Scratch": 1, "Seizure": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Sick relative": 1, "Sinus arrhythmia": 1, "Sinus disorder": 1, "Sinus headache": 1, "Sinus pain": 1, "Skin burning sensation": 1, "Skin depigmentation": 1, "Skin warm": 1, "Sleep apnoea syndrome": 1, "Sluggishness": 1, "Stress": 1, "Swelling of eyelid": 1, "Synovial cyst": 1, "Syringe issue": 1, "Tachyarrhythmia": 1, "Tendonitis": 1, "Tension": 1, "Testicular pain": 1, "Thyroid function test": 1, "Tongue blistering": 1, "Trigeminal neuralgia": 1, "Tunnel vision": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen normal": 1, "Ultrasound breast": 1, "Ultrasound uterus": 1, "Unevaluable event": 1, "Urinary incontinence": 1, "Urine abnormality": 1, "Urine analysis normal": 1, "Urticaria papular": 1, "Vaccination site anaesthesia": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site vesicles": 1, "Varicella": 1, "Viral load": 1, "Vitiligo": 1, "Walking disability": 1, "Weight decreased": 1, "Weight increased": 1, "Wheezing": 1, "White blood cell count": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20A", "histograms": [{"histogram": {"Fatigue": 136, "Headache": 129, "Pain in extremity": 122, "Pyrexia": 114, "Chills": 111, "Vaccination site pain": 99, "Vaccination site erythema": 79, "Myalgia": 78, "Pain": 67, "Nausea": 66, "Vaccination site pruritus": 60, "Pruritus": 57, "Erythema": 52, "Rash": 47, "Dizziness": 46, "Vaccination site swelling": 43, "Asthenia": 41, "Arthralgia": 40, "Vaccination site warmth": 40, "Peripheral swelling": 35, "Diarrhoea": 34, "Dyspnoea": 34, "Feeling abnormal": 31, "Body temperature": 30, "Urticaria": 27, "Feeling hot": 25, "Malaise": 25, "Vaccination site rash": 25, "COVID-19": 22, "Lymphadenopathy": 22, "SARS-CoV-2 test": 21, "Vaccination complication": 21, "Vomiting": 21, "Blood pressure measurement": 20, "Cough": 20, "Inappropriate schedule of product administration": 20, "Swelling": 20, "Influenza like illness": 16, "Limb discomfort": 16, "Paraesthesia": 16, "Insomnia": 15, "Burning sensation": 14, "Decreased appetite": 14, "Hyperhidrosis": 14, "Injection site pain": 13, "Product dose omission issue": 13, "Somnolence": 13, "Vaccination site induration": 13, "Chest discomfort": 12, "Chest pain": 12, "Gait disturbance": 12, "Injection site pruritus": 12, "Hypersensitivity": 11, "Illness": 11, "Injection site erythema": 11, "Rash erythematous": 11, "Tremor": 11, "Vertigo": 11, "Balance disorder": 10, "Injection site swelling": 10, "Musculoskeletal stiffness": 10, "Nasal congestion": 10, "Neck pain": 10, "Rash pruritic": 10, "Rhinorrhoea": 10, "Condition aggravated": 9, "Discomfort": 9, "Feeling cold": 9, "Heart rate": 9, "Hypoaesthesia": 9, "Muscular weakness": 9, "Oropharyngeal pain": 9, "Rash macular": 9, "Throat irritation": 9, "Abdominal discomfort": 8, "Abdominal pain upper": 8, "Drug ineffective": 8, "Joint swelling": 8, "Nasopharyngitis": 8, "Pharyngeal swelling": 8, "Swelling face": 8, "Tachycardia": 8, "Tenderness": 8, "Vaccination site reaction": 8, "Ageusia": 7, "Back pain": 7, "Flushing": 7, "Hypertension": 7, "Inflammation": 7, "Loss of personal independence in daily activities": 7, "Mobility decreased": 7, "Palpitations": 7, "Tinnitus": 7, "Vaccination site mass": 7, "Blood pressure increased": 6, "Electrocardiogram": 6, "Heart rate increased": 6, "Herpes zoster": 6, "Injection site rash": 6, "Injection site warmth": 6, "Retching": 6, "Accidental underdose": 5, "Blood test": 5, "Death": 5, "Dysphagia": 5, "Ear pain": 5, "Expired product administered": 5, "Hypotension": 5, "Loss of consciousness": 5, "Maternal exposure during pregnancy": 5, "Migraine": 5, "No adverse event": 5, "Swollen tongue": 5, "Urinary tract infection": 5, "Vision blurred": 5, "X-ray": 5, "Accidental overdose": 4, "Anosmia": 4, "Anxiety": 4, "Contusion": 4, "Depression": 4, "Dysgeusia": 4, "Exposure during pregnancy": 4, "Exposure via skin contact": 4, "Gait inability": 4, "Gastrooesophageal reflux disease": 4, "Head discomfort": 4, "Immunisation reaction": 4, "Influenza": 4, "Magnetic resonance imaging": 4, "Muscle spasms": 4, "Muscle twitching": 4, "Neuralgia": 4, "Oxygen saturation": 4, "Paraesthesia oral": 4, "Peripheral coldness": 4, "Poor quality product administered": 4, "Presyncope": 4, "Product administered at inappropriate site": 4, "Product temperature excursion issue": 4, "SARS-CoV-2 antibody test": 4, "Thrombosis": 4, "Underdose": 4, "Vaccination site bruising": 4, "Vaccination site discolouration": 4, "Vaccination site inflammation": 4, "Vaccination site lymphadenopathy": 4, "Vaccination site urticaria": 4, "Visual impairment": 4, "Atrial fibrillation": 3, "Axillary pain": 3, "Blister": 3, "Blood glucose": 3, "Bone pain": 3, "Breast pain": 3, "Dyspepsia": 3, "Dysstasia": 3, "Extra dose administered": 3, "Fall": 3, "Feeling of body temperature change": 3, "Hypokinesia": 3, "Incorrect route of product administration": 3, "Induration": 3, "Injection site induration": 3, "Injection site mass": 3, "Lacrimation increased": 3, "Lethargy": 3, "Limb injury": 3, "Muscle tightness": 3, "Nervousness": 3, "Parosmia": 3, "Platelet count": 3, "Pollakiuria": 3, "Pulmonary congestion": 3, "SARS-CoV-2 test positive": 3, "Sinusitis": 3, "Skin irritation": 3, "Sneezing": 3, "Syncope": 3, "Therapeutic response unexpected": 3, "Throat tightness": 3, "Vaccination site discomfort": 3, "Vaccination site movement impairment": 3, "Abdominal pain": 2, "Adverse reaction": 2, "Agitation": 2, "Allergy to vaccine": 2, "Angiogram": 2, "Arthritis": 2, "Asthma": 2, "Bedridden": 2, "Bell's palsy": 2, "Biopsy": 2, "Blood glucose increased": 2, "Blood immunoglobulin G": 2, "C-reactive protein": 2, "Cataract": 2, "Chest X-ray": 2, "Chronic obstructive pulmonary disease": 2, "Cluster headache": 2, "Computerised tomogram": 2, "Confusional state": 2, "Cystitis": 2, "Device connection issue": 2, "Dysphonia": 2, "Ear discomfort": 2, "Eating disorder": 2, "Electric shock sensation": 2, "Eye swelling": 2, "Gingival pain": 2, "Glossodynia": 2, "Glucose tolerance test": 2, "Haemoglobin": 2, "Heart rate irregular": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Incorrect dose administered": 2, "Injection site reaction": 2, "Lip swelling": 2, "Lymph node pain": 2, "Mouth swelling": 2, "Movement disorder": 2, "Nasal dryness": 2, "Oral discomfort": 2, "Oral herpes": 2, "Oral pain": 2, "Osteoarthritis": 2, "Overdose": 2, "Oxygen saturation decreased": 2, "Pain of skin": 2, "Pallor": 2, "Panic attack": 2, "Product preparation error": 2, "Productive cough": 2, "Psychotic disorder": 2, "Pulse abnormal": 2, "Respiratory rate": 2, "Sensory disturbance": 2, "Skin discolouration": 2, "Stomatitis": 2, "Toothache": 2, "Vaccination site discharge": 2, "Vaccination site haemorrhage": 2, "Vaccination site infection": 2, "Vaccination site pustule": 2, "Ventricular extrasystoles": 2, "Ventricular tachycardia": 2, "Abdominal distension": 1, "Abnormal dreams": 1, "Abnormal loss of weight": 1, "Accident at home": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Acute sinusitis": 1, "Administration site warmth": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Alopecia": 1, "Alpha 1 foetoprotein normal": 1, "Alpha 1 globulin": 1, "Anaemia": 1, "Antinuclear antibody": 1, "Antinuclear antibody positive": 1, "Aphasia": 1, "Arterial catheterisation normal": 1, "Arthritis reactive": 1, "Axillary mass": 1, "Blindness": 1, "Blood albumin": 1, "Blood cholesterol": 1, "Blood glucose decreased": 1, "Blood iron": 1, "Body temperature increased": 1, "Bronchitis": 1, "C-reactive protein increased": 1, "COVID-19 pneumonia": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Coeliac disease": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Corneal abrasion": 1, "Deafness": 1, "Deafness unilateral": 1, "Decreased interest": 1, "Dehydration": 1, "Delusion": 1, "Dental examination": 1, "Dermatitis allergic": 1, "Dermatomyositis": 1, "Diarrhoea haemorrhagic": 1, "Disability": 1, "Disorientation": 1, "Diverticulitis": 1, "Drug reaction with eosinophilia and systemic symptoms": 1, "Dry mouth": 1, "Dyskinesia": 1, "Dysuria": 1, "Ear congestion": 1, "Ear disorder": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Emotional disorder": 1, "Energy increased": 1, "Eosinophil count": 1, "Erythema of eyelid": 1, "Essential hypertension": 1, "Exposure to SARS-CoV-2": 1, "Eye contusion": 1, "Eye haemorrhage": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid irritation": 1, "Facial paralysis": 1, "Fear": 1, "Feeding disorder": 1, "Feeling of relaxation": 1, "Flatulence": 1, "Frustration tolerance decreased": 1, "Furuncle": 1, "Gastric disorder": 1, "Gastrointestinal pain": 1, "Genital swelling": 1, "Gingival discolouration": 1, "Gingival erythema": 1, "Glossitis": 1, "Glycosylated haemoglobin increased": 1, "Guillain-Barre syndrome": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin decreased": 1, "Haemorrhage": 1, "Hallucination": 1, "Hangover": 1, "Head injury": 1, "Heart rate decreased": 1, "Heart rate variability increased": 1, "Heavy menstrual bleeding": 1, "Hyperacusis": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperphagia": 1, "Hypertensive emergency": 1, "Hyperthyroidism": 1, "Hypertrophic cardiomyopathy": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Immune thrombocytopenia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered by product": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site movement impairment": 1, "Injection site scar": 1, "Joint injury": 1, "Joint instability": 1, "Keratosis pilaris": 1, "Lichen planus": 1, "Limb deformity": 1, "Limb mass": 1, "Liver function test": 1, "Liver function test increased": 1, "Lung hyperinflation": 1, "Lung opacity": 1, "Lymphoedema": 1, "Lymphoma": 1, "Macule": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging spinal": 1, "Mass": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Memory impairment": 1, "Meningitis": 1, "Mental disorder": 1, "Middle insomnia": 1, "Motion sickness": 1, "Multiple sclerosis relapse": 1, "Muscle contractions involuntary": 1, "Muscle disorder": 1, "Musculoskeletal discomfort": 1, "Myokymia": 1, "Nasal discomfort": 1, "Nervous system disorder": 1, "Neuropathy peripheral": 1, "Non-cardiac chest pain": 1, "Noninfective gingivitis": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmological examination": 1, "Oral disorder": 1, "Oral mucosal eruption": 1, "Oral mucosal erythema": 1, "Oropharyngeal discomfort": 1, "Pain in jaw": 1, "Pelvic pain": 1, "Peptic ulcer": 1, "Periarthritis": 1, "Pleural effusion": 1, "Pleurisy": 1, "Pneumonitis": 1, "Polymerase chain reaction": 1, "Postprandial hypoglycaemia": 1, "Pre-existing condition improved": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Product administered to patient of inappropriate age": 1, "Product packaging issue": 1, "Product storage error": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulmonary pain": 1, "Pustule": 1, "Quality of life decreased": 1, "Rash papular": 1, "Raynaud's phenomenon": 1, "Rectal tenesmus": 1, "Red blood cell abnormality": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate increased": 1, "Red cell distribution width increased": 1, "Renal artery thrombosis": 1, "Renal function test": 1, "Renal impairment": 1, "Renal pain": 1, "Respiratory disorder": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Retinal migraine": 1, "Rheumatological examination": 1, "Road traffic accident": 1, "Rotator cuff syndrome": 1, "Salivary hypersecretion": 1, "Scab": 1, "Scan": 1, "Scar": 1, "Scratch": 1, "Seizure": 1, "Sensation of foreign body": 1, "Serum ferritin": 1, "Sick relative": 1, "Sinus arrhythmia": 1, "Sinus disorder": 1, "Sinus headache": 1, "Sinus pain": 1, "Skin burning sensation": 1, "Skin depigmentation": 1, "Skin warm": 1, "Sleep apnoea syndrome": 1, "Sluggishness": 1, "Stress": 1, "Swelling of eyelid": 1, "Synovial cyst": 1, "Syringe issue": 1, "Tachyarrhythmia": 1, "Tendonitis": 1, "Tension": 1, "Testicular pain": 1, "Thyroid function test": 1, "Tongue blistering": 1, "Trigeminal neuralgia": 1, "Tunnel vision": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen normal": 1, "Ultrasound breast": 1, "Ultrasound uterus": 1, "Unevaluable event": 1, "Urinary incontinence": 1, "Urine abnormality": 1, "Urine analysis normal": 1, "Urticaria papular": 1, "Vaccination site anaesthesia": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site vesicles": 1, "Varicella": 1, "Viral load": 1, "Vitiligo": 1, "Walking disability": 1, "Weight decreased": 1, "Weight increased": 1, "Wheezing": 1, "White blood cell count": 1, "Yawning": 1}, "batchcodes": ["007M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20B.json b/docs/data/histograms/United States/007M20B.json
index a76ee917b4a..73071e7e16c 100644
--- a/docs/data/histograms/United States/007M20B.json
+++ b/docs/data/histograms/United States/007M20B.json
@@ -1 +1 @@
-{"batchcode": "007M20B", "histograms": [{"batchcodes": ["007M20B"], "histogram": {"Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20B", "histograms": [{"histogram": {"Headache": 1, "Pain in extremity": 1}, "batchcodes": ["007M20B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20D.json b/docs/data/histograms/United States/007M20D.json
index 3dd75fb4c6c..716a9fb2de5 100644
--- a/docs/data/histograms/United States/007M20D.json
+++ b/docs/data/histograms/United States/007M20D.json
@@ -1 +1 @@
-{"batchcode": "007M20D", "histograms": [{"batchcodes": ["007M20D"], "histogram": {"Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20D", "histograms": [{"histogram": {"Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["007M20D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20F.json b/docs/data/histograms/United States/007M20F.json
index b4bfb060f6e..ccf20a8fad1 100644
--- a/docs/data/histograms/United States/007M20F.json
+++ b/docs/data/histograms/United States/007M20F.json
@@ -1 +1 @@
-{"batchcode": "007M20F", "histograms": [{"batchcodes": ["007M20F"], "histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20F", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["007M20F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20H.json b/docs/data/histograms/United States/007M20H.json
index 36fdb3b3d5e..d3d0553cdbd 100644
--- a/docs/data/histograms/United States/007M20H.json
+++ b/docs/data/histograms/United States/007M20H.json
@@ -1 +1 @@
-{"batchcode": "007M20H", "histograms": [{"batchcodes": ["007M20H"], "histogram": {"Pain in extremity": 2, "Hyperhidrosis": 1, "Syncope": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20H", "histograms": [{"histogram": {"Pain in extremity": 2, "Hyperhidrosis": 1, "Syncope": 1, "Vomiting": 1}, "batchcodes": ["007M20H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20N.json b/docs/data/histograms/United States/007M20N.json
index 263f5dad4d5..772540329d1 100644
--- a/docs/data/histograms/United States/007M20N.json
+++ b/docs/data/histograms/United States/007M20N.json
@@ -1 +1 @@
-{"batchcode": "007M20N", "histograms": [{"batchcodes": ["007M20N"], "histogram": {"Pain": 1, "Pain in extremity": 1, "Therapeutic response unexpected": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20N", "histograms": [{"histogram": {"Pain": 1, "Pain in extremity": 1, "Therapeutic response unexpected": 1}, "batchcodes": ["007M20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M20X.json b/docs/data/histograms/United States/007M20X.json
index 93382e2a485..fd75138ea36 100644
--- a/docs/data/histograms/United States/007M20X.json
+++ b/docs/data/histograms/United States/007M20X.json
@@ -1 +1 @@
-{"batchcode": "007M20X", "histograms": [{"batchcodes": ["007M20X"], "histogram": {"Vaccination site pruritus": 2, "Rash macular": 1, "Swelling": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "007M20X", "histograms": [{"histogram": {"Vaccination site pruritus": 2, "Rash macular": 1, "Swelling": 1, "Vaccination complication": 1}, "batchcodes": ["007M20X"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M214.json b/docs/data/histograms/United States/007M214.json
index 8f0d08011ff..956f64d73c6 100644
--- a/docs/data/histograms/United States/007M214.json
+++ b/docs/data/histograms/United States/007M214.json
@@ -1 +1 @@
-{"batchcode": "007M214", "histograms": [{"batchcodes": ["007M214"], "histogram": {"Abdominal discomfort": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "007M214", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["007M214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M219.json b/docs/data/histograms/United States/007M219.json
index 14313ffad7b..04b641031a0 100644
--- a/docs/data/histograms/United States/007M219.json
+++ b/docs/data/histograms/United States/007M219.json
@@ -1 +1 @@
-{"batchcode": "007M219", "histograms": [{"batchcodes": ["007M219"], "histogram": {"Arthralgia": 1, "Chills": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "007M219", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Nausea": 1}, "batchcodes": ["007M219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M21A.json b/docs/data/histograms/United States/007M21A.json
index 427609b38a4..b10b24031c9 100644
--- a/docs/data/histograms/United States/007M21A.json
+++ b/docs/data/histograms/United States/007M21A.json
@@ -1 +1 @@
-{"batchcode": "007M21A", "histograms": [{"batchcodes": ["007M21A"], "histogram": {"Arthralgia": 2, "Chills": 2, "Headache": 2, "Pain in extremity": 2, "Pyrexia": 2, "Agitation": 1, "Cough": 1, "Dental caries": 1, "Diarrhoea": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain": 1, "Pharyngeal swelling": 1, "Toothache": 1}}]}
\ No newline at end of file
+{"batchcode": "007M21A", "histograms": [{"histogram": {"Arthralgia": 2, "Chills": 2, "Headache": 2, "Pain in extremity": 2, "Pyrexia": 2, "Agitation": 1, "Cough": 1, "Dental caries": 1, "Diarrhoea": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pain": 1, "Pharyngeal swelling": 1, "Toothache": 1}, "batchcodes": ["007M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M28A.json b/docs/data/histograms/United States/007M28A.json
index 50f8be57be3..9a51bd909d3 100644
--- a/docs/data/histograms/United States/007M28A.json
+++ b/docs/data/histograms/United States/007M28A.json
@@ -1 +1 @@
-{"batchcode": "007M28A", "histograms": [{"batchcodes": ["007M28A"], "histogram": {"Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "007M28A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["007M28A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M29.json b/docs/data/histograms/United States/007M29.json
index c1ab9b88ff3..d75e6cd757d 100644
--- a/docs/data/histograms/United States/007M29.json
+++ b/docs/data/histograms/United States/007M29.json
@@ -1 +1 @@
-{"batchcode": "007M29", "histograms": [{"batchcodes": ["007M29"], "histogram": {"Coordination abnormal": 1, "Hypoaesthesia": 1, "Multiple sclerosis relapse": 1}}]}
\ No newline at end of file
+{"batchcode": "007M29", "histograms": [{"histogram": {"Coordination abnormal": 1, "Hypoaesthesia": 1, "Multiple sclerosis relapse": 1}, "batchcodes": ["007M29"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M2A.json b/docs/data/histograms/United States/007M2A.json
index fb6a2787651..3b2ff41630a 100644
--- a/docs/data/histograms/United States/007M2A.json
+++ b/docs/data/histograms/United States/007M2A.json
@@ -1 +1 @@
-{"batchcode": "007M2A", "histograms": [{"batchcodes": ["007M2A"], "histogram": {"Neuropathy peripheral": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "007M2A", "histograms": [{"histogram": {"Neuropathy peripheral": 1, "Vaccination site erythema": 1}, "batchcodes": ["007M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M2DA.json b/docs/data/histograms/United States/007M2DA.json
index 91f9118d564..2203bd8189c 100644
--- a/docs/data/histograms/United States/007M2DA.json
+++ b/docs/data/histograms/United States/007M2DA.json
@@ -1 +1 @@
-{"batchcode": "007M2DA", "histograms": [{"batchcodes": ["007M2DA"], "histogram": {"Abdominal pain upper": 1, "Body temperature": 1, "Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "007M2DA", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Body temperature": 1, "Diarrhoea": 1}, "batchcodes": ["007M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M2EA.json b/docs/data/histograms/United States/007M2EA.json
index d52a47987c6..b3106c3a494 100644
--- a/docs/data/histograms/United States/007M2EA.json
+++ b/docs/data/histograms/United States/007M2EA.json
@@ -1 +1 @@
-{"batchcode": "007M2EA", "histograms": [{"batchcodes": ["007M2EA"], "histogram": {"Dyspnoea": 1, "Intentional product use issue": 1, "Seasonal allergy": 1}}]}
\ No newline at end of file
+{"batchcode": "007M2EA", "histograms": [{"histogram": {"Dyspnoea": 1, "Intentional product use issue": 1, "Seasonal allergy": 1}, "batchcodes": ["007M2EA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M2OA.json b/docs/data/histograms/United States/007M2OA.json
index 82e6c516c3b..845d61afaab 100644
--- a/docs/data/histograms/United States/007M2OA.json
+++ b/docs/data/histograms/United States/007M2OA.json
@@ -1 +1 @@
-{"batchcode": "007M2OA", "histograms": [{"batchcodes": ["007M2OA"], "histogram": {"Headache": 3, "Fatigue": 2, "Vaccination site pruritus": 2, "Abdominal pain upper": 1, "Chills": 1, "Dyspnoea": 1, "Erythema": 1, "Gait disturbance": 1, "Heart rate increased": 1, "Injection site pain": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007M2OA", "histograms": [{"histogram": {"Headache": 3, "Fatigue": 2, "Vaccination site pruritus": 2, "Abdominal pain upper": 1, "Chills": 1, "Dyspnoea": 1, "Erythema": 1, "Gait disturbance": 1, "Heart rate increased": 1, "Injection site pain": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["007M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M2UA.json b/docs/data/histograms/United States/007M2UA.json
index 395c4adbf07..4d852cf5e4a 100644
--- a/docs/data/histograms/United States/007M2UA.json
+++ b/docs/data/histograms/United States/007M2UA.json
@@ -1 +1 @@
-{"batchcode": "007M2UA", "histograms": [{"batchcodes": ["007M2UA"], "histogram": {"Abdominal discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "007M2UA", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["007M2UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007M30A.json b/docs/data/histograms/United States/007M30A.json
index e1541066b7c..95c778f3738 100644
--- a/docs/data/histograms/United States/007M30A.json
+++ b/docs/data/histograms/United States/007M30A.json
@@ -1 +1 @@
-{"batchcode": "007M30A", "histograms": [{"batchcodes": ["007M30A"], "histogram": {"Asthenia": 1, "Chills": 1, "Headache": 1, "Influenza": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007M30A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Headache": 1, "Influenza": 1, "Pain in extremity": 1}, "batchcodes": ["007M30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MC08.json b/docs/data/histograms/United States/007MC08.json
index 9be2b1b8bbe..47d28004b6f 100644
--- a/docs/data/histograms/United States/007MC08.json
+++ b/docs/data/histograms/United States/007MC08.json
@@ -1 +1 @@
-{"batchcode": "007MC08", "histograms": [{"batchcodes": ["007MC08"], "histogram": {"Atrial fibrillation": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "007MC08", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["007MC08"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MD0A.json b/docs/data/histograms/United States/007MD0A.json
index 50abba40348..961084550fd 100644
--- a/docs/data/histograms/United States/007MD0A.json
+++ b/docs/data/histograms/United States/007MD0A.json
@@ -1 +1 @@
-{"batchcode": "007MD0A", "histograms": [{"batchcodes": ["007MD0A"], "histogram": {"Ocular hyperaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "007MD0A", "histograms": [{"histogram": {"Ocular hyperaemia": 1}, "batchcodes": ["007MD0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007ML0A.json b/docs/data/histograms/United States/007ML0A.json
index bf617cfb504..693f176b548 100644
--- a/docs/data/histograms/United States/007ML0A.json
+++ b/docs/data/histograms/United States/007ML0A.json
@@ -1 +1 @@
-{"batchcode": "007ML0A", "histograms": [{"batchcodes": ["007ML0A"], "histogram": {"Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "007ML0A", "histograms": [{"histogram": {"Tremor": 1}, "batchcodes": ["007ML0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MWA.json b/docs/data/histograms/United States/007MWA.json
index dbfc15807f1..cc2335874b3 100644
--- a/docs/data/histograms/United States/007MWA.json
+++ b/docs/data/histograms/United States/007MWA.json
@@ -1 +1 @@
-{"batchcode": "007MWA", "histograms": [{"batchcodes": ["007MWA"], "histogram": {"Contusion": 1, "Injection site haemorrhage": 1, "Rash erythematous": 1, "Rash macular": 1}}]}
\ No newline at end of file
+{"batchcode": "007MWA", "histograms": [{"histogram": {"Contusion": 1, "Injection site haemorrhage": 1, "Rash erythematous": 1, "Rash macular": 1}, "batchcodes": ["007MWA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MZ04.json b/docs/data/histograms/United States/007MZ04.json
index 876ffd80427..87ad9af5f83 100644
--- a/docs/data/histograms/United States/007MZ04.json
+++ b/docs/data/histograms/United States/007MZ04.json
@@ -1 +1 @@
-{"batchcode": "007MZ04", "histograms": [{"batchcodes": ["007MZ04"], "histogram": {"Dizziness": 1, "Erythema": 1, "Headache": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "007MZ04", "histograms": [{"histogram": {"Dizziness": 1, "Erythema": 1, "Headache": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["007MZ04"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MZ0A.json b/docs/data/histograms/United States/007MZ0A.json
index d467cd2c42a..5ffcb22735a 100644
--- a/docs/data/histograms/United States/007MZ0A.json
+++ b/docs/data/histograms/United States/007MZ0A.json
@@ -1 +1 @@
-{"batchcode": "007MZ0A", "histograms": [{"batchcodes": ["007MZ0A"], "histogram": {"Pyrexia": 7, "Fatigue": 5, "Chills": 3, "Headache": 3, "Myalgia": 3, "Tremor": 3, "Asthenia": 2, "Back pain": 2, "Body temperature": 2, "COVID-19": 2, "Feeling cold": 2, "Gait inability": 2, "Hyperhidrosis": 2, "Injection site erythema": 2, "Injection site pain": 2, "Malaise": 2, "Pain in extremity": 2, "Pruritus": 2, "Rash": 2, "Bedridden": 1, "Bell's palsy": 1, "Confusional state": 1, "Contusion": 1, "Dizziness": 1, "Erythema": 1, "Hallucination": 1, "Illness": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Injection site warmth": 1, "Insomnia": 1, "Limb discomfort": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Nodule": 1, "Off label use": 1, "Pain": 1, "Photophobia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Somnolence": 1, "Swelling": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombosis": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "007MZ0A", "histograms": [{"histogram": {"Pyrexia": 7, "Fatigue": 5, "Chills": 3, "Headache": 3, "Myalgia": 3, "Tremor": 3, "Asthenia": 2, "Back pain": 2, "Body temperature": 2, "COVID-19": 2, "Feeling cold": 2, "Gait inability": 2, "Hyperhidrosis": 2, "Injection site erythema": 2, "Injection site pain": 2, "Malaise": 2, "Pain in extremity": 2, "Pruritus": 2, "Rash": 2, "Bedridden": 1, "Bell's palsy": 1, "Confusional state": 1, "Contusion": 1, "Dizziness": 1, "Erythema": 1, "Hallucination": 1, "Illness": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Injection site warmth": 1, "Insomnia": 1, "Limb discomfort": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Nodule": 1, "Off label use": 1, "Pain": 1, "Photophobia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sensation of foreign body": 1, "Somnolence": 1, "Swelling": 1, "Tenderness": 1, "Throat tightness": 1, "Thrombosis": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vomiting": 1}, "batchcodes": ["007MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MZ0H.json b/docs/data/histograms/United States/007MZ0H.json
index a38b8f0f3f4..433f9369516 100644
--- a/docs/data/histograms/United States/007MZ0H.json
+++ b/docs/data/histograms/United States/007MZ0H.json
@@ -1 +1 @@
-{"batchcode": "007MZ0H", "histograms": [{"batchcodes": ["007MZ0H"], "histogram": {"Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "007MZ0H", "histograms": [{"histogram": {"Diarrhoea": 1}, "batchcodes": ["007MZ0H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MZOA.json b/docs/data/histograms/United States/007MZOA.json
index bb35dad4028..fe4625f5140 100644
--- a/docs/data/histograms/United States/007MZOA.json
+++ b/docs/data/histograms/United States/007MZOA.json
@@ -1 +1 @@
-{"batchcode": "007MZOA", "histograms": [{"batchcodes": ["007MZOA"], "histogram": {"Joint swelling": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "007MZOA", "histograms": [{"histogram": {"Joint swelling": 1, "Peripheral swelling": 1}, "batchcodes": ["007MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007MZUA.json b/docs/data/histograms/United States/007MZUA.json
index d28438b79f4..848d78f5604 100644
--- a/docs/data/histograms/United States/007MZUA.json
+++ b/docs/data/histograms/United States/007MZUA.json
@@ -1 +1 @@
-{"batchcode": "007MZUA", "histograms": [{"batchcodes": ["007MZUA"], "histogram": {"Nasopharyngitis": 1}}]}
\ No newline at end of file
+{"batchcode": "007MZUA", "histograms": [{"histogram": {"Nasopharyngitis": 1}, "batchcodes": ["007MZUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007N204.json b/docs/data/histograms/United States/007N204.json
index 4ea691cff16..0d428c0f177 100644
--- a/docs/data/histograms/United States/007N204.json
+++ b/docs/data/histograms/United States/007N204.json
@@ -1 +1 @@
-{"batchcode": "007N204", "histograms": [{"batchcodes": ["007N204"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007N204", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1}, "batchcodes": ["007N204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007N20A.json b/docs/data/histograms/United States/007N20A.json
index a8c6502e044..bfbcaa1edd1 100644
--- a/docs/data/histograms/United States/007N20A.json
+++ b/docs/data/histograms/United States/007N20A.json
@@ -1 +1 @@
-{"batchcode": "007N20A", "histograms": [{"batchcodes": ["007N20A"], "histogram": {"Blood urine present": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination complication": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "007N20A", "histograms": [{"histogram": {"Blood urine present": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination complication": 1, "Vaccination site erythema": 1}, "batchcodes": ["007N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007N28.json b/docs/data/histograms/United States/007N28.json
index 471e3c8e241..0bba5d43a4a 100644
--- a/docs/data/histograms/United States/007N28.json
+++ b/docs/data/histograms/United States/007N28.json
@@ -1 +1 @@
-{"batchcode": "007N28", "histograms": [{"batchcodes": ["007N28"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "007N28", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["007N28"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007N29A.json b/docs/data/histograms/United States/007N29A.json
index 38000107179..e427e311509 100644
--- a/docs/data/histograms/United States/007N29A.json
+++ b/docs/data/histograms/United States/007N29A.json
@@ -1 +1 @@
-{"batchcode": "007N29A", "histograms": [{"batchcodes": ["007N29A"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "007N29A", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["007N29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007N2OA.json b/docs/data/histograms/United States/007N2OA.json
index 6e75257afa6..92abc9de1e0 100644
--- a/docs/data/histograms/United States/007N2OA.json
+++ b/docs/data/histograms/United States/007N2OA.json
@@ -1 +1 @@
-{"batchcode": "007N2OA", "histograms": [{"batchcodes": ["007N2OA"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "007N2OA", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["007N2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007NL20A.json b/docs/data/histograms/United States/007NL20A.json
index ba84a4ef1bf..b0f73d642c5 100644
--- a/docs/data/histograms/United States/007NL20A.json
+++ b/docs/data/histograms/United States/007NL20A.json
@@ -1 +1 @@
-{"batchcode": "007NL20A", "histograms": [{"batchcodes": ["007NL20A"], "histogram": {"Vaccination site hypersensitivity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007NL20A", "histograms": [{"histogram": {"Vaccination site hypersensitivity": 1, "Vaccination site pain": 1}, "batchcodes": ["007NL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007S21A.json b/docs/data/histograms/United States/007S21A.json
index 9431222ecaa..b3259125e6d 100644
--- a/docs/data/histograms/United States/007S21A.json
+++ b/docs/data/histograms/United States/007S21A.json
@@ -1 +1 @@
-{"batchcode": "007S21A", "histograms": [{"batchcodes": ["007S21A"], "histogram": {"Back pain": 1, "Bone pain": 1, "Cardiac disorder": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "007S21A", "histograms": [{"histogram": {"Back pain": 1, "Bone pain": 1, "Cardiac disorder": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Product dose omission issue": 1}, "batchcodes": ["007S21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/007Z21A.json b/docs/data/histograms/United States/007Z21A.json
index 6af167e02b7..8389abddf29 100644
--- a/docs/data/histograms/United States/007Z21A.json
+++ b/docs/data/histograms/United States/007Z21A.json
@@ -1 +1 @@
-{"batchcode": "007Z21A", "histograms": [{"batchcodes": ["007Z21A"], "histogram": {"Feeling abnormal": 1, "Insomnia": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "007Z21A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Insomnia": 1, "Neck pain": 1}, "batchcodes": ["007Z21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008021A.json b/docs/data/histograms/United States/008021A.json
index 85388d21d4e..06d94481eb9 100644
--- a/docs/data/histograms/United States/008021A.json
+++ b/docs/data/histograms/United States/008021A.json
@@ -1 +1 @@
-{"batchcode": "008021A", "histograms": [{"batchcodes": ["008021A"], "histogram": {"Expired product administered": 2, "Blood pressure increased": 1, "Cough": 1, "Dizziness": 1, "Dyspepsia": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Hot flush": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Thinking abnormal": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "008021A", "histograms": [{"histogram": {"Expired product administered": 2, "Blood pressure increased": 1, "Cough": 1, "Dizziness": 1, "Dyspepsia": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Hot flush": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Thinking abnormal": 1, "Vaccination complication": 1}, "batchcodes": ["008021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00813.json b/docs/data/histograms/United States/00813.json
index 7c4c0e281d8..8c3030f3cfd 100644
--- a/docs/data/histograms/United States/00813.json
+++ b/docs/data/histograms/United States/00813.json
@@ -1 +1 @@
-{"batchcode": "00813", "histograms": [{"batchcodes": ["00813"], "histogram": {"Injection site rash": 1, "Injection site swelling": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "00813", "histograms": [{"histogram": {"Injection site rash": 1, "Injection site swelling": 1, "Injection site warmth": 1}, "batchcodes": ["00813"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0081321-2A.json b/docs/data/histograms/United States/0081321-2A.json
index 4dcf89a41fe..39c2c1c61b3 100644
--- a/docs/data/histograms/United States/0081321-2A.json
+++ b/docs/data/histograms/United States/0081321-2A.json
@@ -1 +1 @@
-{"batchcode": "0081321-2A", "histograms": [{"batchcodes": ["0081321-2A"], "histogram": {"Alopecia": 1}}]}
\ No newline at end of file
+{"batchcode": "0081321-2A", "histograms": [{"histogram": {"Alopecia": 1}, "batchcodes": ["0081321-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00813212A.json b/docs/data/histograms/United States/00813212A.json
index c23ef73e049..41f8b8dc316 100644
--- a/docs/data/histograms/United States/00813212A.json
+++ b/docs/data/histograms/United States/00813212A.json
@@ -1 +1 @@
-{"batchcode": "00813212A", "histograms": [{"batchcodes": ["00813212A"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Epstein-Barr virus test": 1, "Hot flush": 1, "Hypotension": 1, "Myalgia": 1, "Pyrexia": 1, "Tremor": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "00813212A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Epstein-Barr virus test": 1, "Hot flush": 1, "Hypotension": 1, "Myalgia": 1, "Pyrexia": 1, "Tremor": 1, "Vomiting": 1}, "batchcodes": ["00813212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0081321A.json b/docs/data/histograms/United States/0081321A.json
index 2015dd58a5b..0c60170a517 100644
--- a/docs/data/histograms/United States/0081321A.json
+++ b/docs/data/histograms/United States/0081321A.json
@@ -1 +1 @@
-{"batchcode": "0081321A", "histograms": [{"batchcodes": ["0081321A"], "histogram": {"Pain in extremity": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Feeling abnormal": 1, "Heart rate abnormal": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Skin discolouration": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0081321A", "histograms": [{"histogram": {"Pain in extremity": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Feeling abnormal": 1, "Heart rate abnormal": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Skin discolouration": 1, "Vaccination site swelling": 1}, "batchcodes": ["0081321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008620A.json b/docs/data/histograms/United States/008620A.json
index 7b3fb248b7d..891bc6352ff 100644
--- a/docs/data/histograms/United States/008620A.json
+++ b/docs/data/histograms/United States/008620A.json
@@ -1 +1 @@
-{"batchcode": "008620A", "histograms": [{"batchcodes": ["008620A"], "histogram": {"Arthralgia": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "008620A", "histograms": [{"histogram": {"Arthralgia": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["008620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008621-2A.json b/docs/data/histograms/United States/008621-2A.json
index 7360b176a6b..613a5a612a6 100644
--- a/docs/data/histograms/United States/008621-2A.json
+++ b/docs/data/histograms/United States/008621-2A.json
@@ -1 +1 @@
-{"batchcode": "008621-2A", "histograms": [{"batchcodes": ["008621-2A"], "histogram": {"Muscle spasms": 1, "Paraesthesia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "008621-2A", "histograms": [{"histogram": {"Muscle spasms": 1, "Paraesthesia": 1, "Tremor": 1}, "batchcodes": ["008621-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008821-2A.json b/docs/data/histograms/United States/008821-2A.json
index d7b512d10a6..2bc2913be4a 100644
--- a/docs/data/histograms/United States/008821-2A.json
+++ b/docs/data/histograms/United States/008821-2A.json
@@ -1 +1 @@
-{"batchcode": "008821-2A", "histograms": [{"batchcodes": ["008821-2A"], "histogram": {"Dizziness": 1, "Pruritus": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "008821-2A", "histograms": [{"histogram": {"Dizziness": 1, "Pruritus": 1, "Vaccination site pain": 1}, "batchcodes": ["008821-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008821A.json b/docs/data/histograms/United States/008821A.json
index 99134f269e0..0be5a5e0084 100644
--- a/docs/data/histograms/United States/008821A.json
+++ b/docs/data/histograms/United States/008821A.json
@@ -1 +1 @@
-{"batchcode": "008821A", "histograms": [{"batchcodes": ["008821A"], "histogram": {"Cough": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "008821A", "histograms": [{"histogram": {"Cough": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Nausea": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["008821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008821AA.json b/docs/data/histograms/United States/008821AA.json
index 05bec89ab6d..9f0b3cc142f 100644
--- a/docs/data/histograms/United States/008821AA.json
+++ b/docs/data/histograms/United States/008821AA.json
@@ -1 +1 @@
-{"batchcode": "008821AA", "histograms": [{"batchcodes": ["008821AA"], "histogram": {"Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "008821AA", "histograms": [{"histogram": {"Pulmonary embolism": 1}, "batchcodes": ["008821AA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0088B21-21A.json b/docs/data/histograms/United States/0088B21-21A.json
index 688cc71abf6..76d683c41f1 100644
--- a/docs/data/histograms/United States/0088B21-21A.json
+++ b/docs/data/histograms/United States/0088B21-21A.json
@@ -1 +1 @@
-{"batchcode": "0088B21-21A", "histograms": [{"batchcodes": ["0088B21-21A"], "histogram": {"Chills": 3, "Fatigue": 3, "Pyrexia": 3, "Blister": 2, "Dizziness": 2, "Gingival swelling": 2, "Headache": 1, "Lymphadenopathy": 1, "Temporomandibular joint syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "0088B21-21A", "histograms": [{"histogram": {"Chills": 3, "Fatigue": 3, "Pyrexia": 3, "Blister": 2, "Dizziness": 2, "Gingival swelling": 2, "Headache": 1, "Lymphadenopathy": 1, "Temporomandibular joint syndrome": 1}, "batchcodes": ["0088B21-21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0088B21-2A.json b/docs/data/histograms/United States/0088B21-2A.json
index e6c7865a65c..df94687b76f 100644
--- a/docs/data/histograms/United States/0088B21-2A.json
+++ b/docs/data/histograms/United States/0088B21-2A.json
@@ -1 +1 @@
-{"batchcode": "0088B21-2A", "histograms": [{"batchcodes": ["0088B21-2A"], "histogram": {"Nasopharyngitis": 1, "Pharyngitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Upper-airway cough syndrome": 1, "Viral upper respiratory tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "0088B21-2A", "histograms": [{"histogram": {"Nasopharyngitis": 1, "Pharyngitis": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Upper-airway cough syndrome": 1, "Viral upper respiratory tract infection": 1}, "batchcodes": ["0088B21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0088B21.json b/docs/data/histograms/United States/0088B21.json
index cdc7499bdbd..30943531dfd 100644
--- a/docs/data/histograms/United States/0088B21.json
+++ b/docs/data/histograms/United States/0088B21.json
@@ -1 +1 @@
-{"batchcode": "0088B21", "histograms": [{"batchcodes": ["0088B21"], "histogram": {"Chills": 1, "Fatigue": 1, "Gingival blister": 1, "Gingivitis": 1, "Headache": 1, "Lymphadenopathy": 1, "Pain in jaw": 1, "Pyrexia": 1, "Temporomandibular joint syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "0088B21", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Gingival blister": 1, "Gingivitis": 1, "Headache": 1, "Lymphadenopathy": 1, "Pain in jaw": 1, "Pyrexia": 1, "Temporomandibular joint syndrome": 1}, "batchcodes": ["0088B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008A21A.json b/docs/data/histograms/United States/008A21A.json
index fbdd58aea2b..d697607be7a 100644
--- a/docs/data/histograms/United States/008A21A.json
+++ b/docs/data/histograms/United States/008A21A.json
@@ -1 +1 @@
-{"batchcode": "008A21A", "histograms": [{"batchcodes": ["008A21A"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "008A21A", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["008A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008AMA.json b/docs/data/histograms/United States/008AMA.json
index 898662e2119..e97fa520fff 100644
--- a/docs/data/histograms/United States/008AMA.json
+++ b/docs/data/histograms/United States/008AMA.json
@@ -1 +1 @@
-{"batchcode": "008AMA", "histograms": [{"batchcodes": ["008AMA"], "histogram": {"Asthenia": 1, "Energy increased": 1, "Euphoric mood": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "008AMA", "histograms": [{"histogram": {"Asthenia": 1, "Energy increased": 1, "Euphoric mood": 1, "Vaccination site pain": 1}, "batchcodes": ["008AMA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B-2A.json b/docs/data/histograms/United States/008B-2A.json
index 9fb165c2379..6654af8a7fd 100644
--- a/docs/data/histograms/United States/008B-2A.json
+++ b/docs/data/histograms/United States/008B-2A.json
@@ -1 +1 @@
-{"batchcode": "008B-2A", "histograms": [{"batchcodes": ["008B-2A"], "histogram": {"Bedridden": 1, "Breath odour": 1, "Disability": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hot flush": 1, "Inflammation": 1, "Insomnia": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "008B-2A", "histograms": [{"histogram": {"Bedridden": 1, "Breath odour": 1, "Disability": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Hot flush": 1, "Inflammation": 1, "Insomnia": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["008B-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B20A.json b/docs/data/histograms/United States/008B20A.json
index 947db1d6d58..181ac217d81 100644
--- a/docs/data/histograms/United States/008B20A.json
+++ b/docs/data/histograms/United States/008B20A.json
@@ -1 +1 @@
-{"batchcode": "008B20A", "histograms": [{"batchcodes": ["008B20A"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "008B20A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["008B20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21-2A.json b/docs/data/histograms/United States/008B21-2A.json
index 4fd5cb13b39..8a0d66635ca 100644
--- a/docs/data/histograms/United States/008B21-2A.json
+++ b/docs/data/histograms/United States/008B21-2A.json
@@ -1 +1 @@
-{"batchcode": "008B21-2A", "histograms": [{"batchcodes": ["008B21-2A", "040A21A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["008B21-2A"], "histogram": {"Fatigue": 8, "Headache": 8, "Pain in extremity": 8, "Chills": 7, "Pyrexia": 7, "Vaccination site pain": 6, "Malaise": 4, "Nausea": 4, "Pain": 4, "Asthenia": 3, "Feeling abnormal": 3, "Feeling hot": 3, "Heart rate increased": 3, "Hypoaesthesia": 3, "Illness": 3, "Myalgia": 3, "Paraesthesia": 3, "Product administered to patient of inappropriate age": 3, "Rash": 3, "Tinnitus": 3, "Adverse reaction": 2, "Back pain": 2, "Chest discomfort": 2, "Chest pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Epistaxis": 2, "Hyperhidrosis": 2, "Lymphadenopathy": 2, "Nasal congestion": 2, "Nerve injury": 2, "Pruritus": 2, "Swelling": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Alopecia": 1, "Anxiety": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood glucose increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Cataract": 1, "Confusional state": 1, "Cystoid macular oedema": 1, "Depression": 1, "Dermatitis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dry eye": 1, "Dry mouth": 1, "Dry skin": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Electromyogram": 1, "Emotional distress": 1, "Exposure during pregnancy": 1, "Facial pain": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Groin pain": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hyperglycaemia": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Injection site haemorrhage": 1, "Injection site pain": 1, "Injection site urticaria": 1, "Injection site warmth": 1, "Insomnia": 1, "Laboratory test": 1, "Lethargy": 1, "Macular fibrosis": 1, "Neuralgia": 1, "Oligomenorrhoea": 1, "Oropharyngeal pain": 1, "Phimosis": 1, "Rash erythematous": 1, "Rash follicular": 1, "Sinus headache": 1, "Skin lesion": 1, "Skin sensitisation": 1, "Skin striae": 1, "Skin tightness": 1, "Somnolence": 1, "Spinal pain": 1, "Syncope": 1, "Tenderness": 1, "Thirst": 1, "Throat irritation": 1, "Tremor": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Uveitis": 1, "Vaccination site induration": 1, "Visual impairment": 1, "Vitreous degeneration": 1, "Weight decreased": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21-2A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["008B21-2A", "040A21A"]}, {"histogram": {"Fatigue": 8, "Headache": 8, "Pain in extremity": 8, "Chills": 7, "Pyrexia": 7, "Vaccination site pain": 6, "Malaise": 4, "Nausea": 4, "Pain": 4, "Asthenia": 3, "Feeling abnormal": 3, "Feeling hot": 3, "Heart rate increased": 3, "Hypoaesthesia": 3, "Illness": 3, "Myalgia": 3, "Paraesthesia": 3, "Product administered to patient of inappropriate age": 3, "Rash": 3, "Tinnitus": 3, "Adverse reaction": 2, "Back pain": 2, "Chest discomfort": 2, "Chest pain": 2, "Dizziness": 2, "Dyspnoea": 2, "Epistaxis": 2, "Hyperhidrosis": 2, "Lymphadenopathy": 2, "Nasal congestion": 2, "Nerve injury": 2, "Pruritus": 2, "Swelling": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Alopecia": 1, "Anxiety": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood glucose increased": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Cataract": 1, "Confusional state": 1, "Cystoid macular oedema": 1, "Depression": 1, "Dermatitis": 1, "Diarrhoea": 1, "Disturbance in attention": 1, "Dry eye": 1, "Dry mouth": 1, "Dry skin": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Electromyogram": 1, "Emotional distress": 1, "Exposure during pregnancy": 1, "Facial pain": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Groin pain": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hyperglycaemia": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Injection site haemorrhage": 1, "Injection site pain": 1, "Injection site urticaria": 1, "Injection site warmth": 1, "Insomnia": 1, "Laboratory test": 1, "Lethargy": 1, "Macular fibrosis": 1, "Neuralgia": 1, "Oligomenorrhoea": 1, "Oropharyngeal pain": 1, "Phimosis": 1, "Rash erythematous": 1, "Rash follicular": 1, "Sinus headache": 1, "Skin lesion": 1, "Skin sensitisation": 1, "Skin striae": 1, "Skin tightness": 1, "Somnolence": 1, "Spinal pain": 1, "Syncope": 1, "Tenderness": 1, "Thirst": 1, "Throat irritation": 1, "Tremor": 1, "Unresponsive to stimuli": 1, "Urinary incontinence": 1, "Uveitis": 1, "Vaccination site induration": 1, "Visual impairment": 1, "Vitreous degeneration": 1, "Weight decreased": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["008B21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21.json b/docs/data/histograms/United States/008B21.json
index bc2682bf698..95dff453adb 100644
--- a/docs/data/histograms/United States/008B21.json
+++ b/docs/data/histograms/United States/008B21.json
@@ -1 +1 @@
-{"batchcode": "008B21", "histograms": [{"batchcodes": ["008B21"], "histogram": {"Arthralgia": 1, "Chest pain": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21", "histograms": [{"histogram": {"Arthralgia": 1, "Chest pain": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["008B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B2114.json b/docs/data/histograms/United States/008B2114.json
index 17fd4ee0dfa..d806721d6c2 100644
--- a/docs/data/histograms/United States/008B2114.json
+++ b/docs/data/histograms/United States/008B2114.json
@@ -1 +1 @@
-{"batchcode": "008B2114", "histograms": [{"batchcodes": ["008B2114"], "histogram": {"Diarrhoea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "008B2114", "histograms": [{"histogram": {"Diarrhoea": 1, "Pain in extremity": 1}, "batchcodes": ["008B2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B211A.json b/docs/data/histograms/United States/008B211A.json
index f4e1cf914d5..394cf6ed6f8 100644
--- a/docs/data/histograms/United States/008B211A.json
+++ b/docs/data/histograms/United States/008B211A.json
@@ -1 +1 @@
-{"batchcode": "008B211A", "histograms": [{"batchcodes": ["008B211A"], "histogram": {"Influenza like illness": 1}}]}
\ No newline at end of file
+{"batchcode": "008B211A", "histograms": [{"histogram": {"Influenza like illness": 1}, "batchcodes": ["008B211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B2121A.json b/docs/data/histograms/United States/008B2121A.json
index e6ad1c8022e..20953bb79a0 100644
--- a/docs/data/histograms/United States/008B2121A.json
+++ b/docs/data/histograms/United States/008B2121A.json
@@ -1 +1 @@
-{"batchcode": "008B2121A", "histograms": [{"batchcodes": ["008B2121A"], "histogram": {"Anaphylactic reaction": 1, "Dysphagia": 1, "Orbital swelling": 1, "Swelling face": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "008B2121A", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Dysphagia": 1, "Orbital swelling": 1, "Swelling face": 1, "Swollen tongue": 1}, "batchcodes": ["008B2121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B2124.json b/docs/data/histograms/United States/008B2124.json
index e0d856a0990..fa27c57d59d 100644
--- a/docs/data/histograms/United States/008B2124.json
+++ b/docs/data/histograms/United States/008B2124.json
@@ -1 +1 @@
-{"batchcode": "008B2124", "histograms": [{"batchcodes": ["008B2124"], "histogram": {"Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "008B2124", "histograms": [{"histogram": {"Rash": 1, "Rash pruritic": 1}, "batchcodes": ["008B2124"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B212A TCP#4.json b/docs/data/histograms/United States/008B212A TCP#4.json
index bb311d565ea..62be4cde593 100644
--- a/docs/data/histograms/United States/008B212A TCP#4.json
+++ b/docs/data/histograms/United States/008B212A TCP#4.json
@@ -1 +1 @@
-{"batchcode": "008B212A TCP#4", "histograms": [{"batchcodes": ["008B212A TCP#4"], "histogram": {"Chills": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Inflammation": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "008B212A TCP#4", "histograms": [{"histogram": {"Chills": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Inflammation": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["008B212A TCP#4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B212A.json b/docs/data/histograms/United States/008B212A.json
index 6b3a7bdaf5e..3570784406b 100644
--- a/docs/data/histograms/United States/008B212A.json
+++ b/docs/data/histograms/United States/008B212A.json
@@ -1 +1 @@
-{"batchcode": "008B212A", "histograms": [{"batchcodes": ["008B212A"], "histogram": {"Fatigue": 14, "Headache": 12, "Chills": 9, "Pyrexia": 9, "Myalgia": 7, "Feeling abnormal": 6, "Pain in extremity": 6, "Diarrhoea": 5, "Dizziness": 5, "Nausea": 5, "Dyspnoea": 4, "Vaccination site pain": 4, "Abdominal discomfort": 3, "Arthralgia": 3, "Hot flush": 3, "Injection site pain": 3, "Pain": 3, "Asthenia": 2, "Chest pain": 2, "Gait disturbance": 2, "Injection site swelling": 2, "Injection site warmth": 2, "Joint swelling": 2, "Mobility decreased": 2, "Product dose omission issue": 2, "SARS-CoV-2 test": 2, "Anxiety": 1, "Aphonia": 1, "Arthritis": 1, "Autoimmune haemolytic anaemia": 1, "Back pain": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Breast feeding": 1, "COVID-19": 1, "Cardiac flutter": 1, "Chest discomfort": 1, "Condition aggravated": 1, "Confusional state": 1, "Drug ineffective": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eye colour change": 1, "Feeling hot": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Illness": 1, "Immune thrombocytopenia": 1, "Induration": 1, "Influenza like illness": 1, "Injection site induration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Migraine": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Petechiae": 1, "Platelet count decreased": 1, "Rash": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red blood cell count abnormal": 1, "Retching": 1, "Rhinorrhoea": 1, "Skin mass": 1, "Sleep disorder": 1, "Suspected COVID-19": 1, "Tongue discomfort": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site joint erythema": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "008B212A", "histograms": [{"histogram": {"Fatigue": 14, "Headache": 12, "Chills": 9, "Pyrexia": 9, "Myalgia": 7, "Feeling abnormal": 6, "Pain in extremity": 6, "Diarrhoea": 5, "Dizziness": 5, "Nausea": 5, "Dyspnoea": 4, "Vaccination site pain": 4, "Abdominal discomfort": 3, "Arthralgia": 3, "Hot flush": 3, "Injection site pain": 3, "Pain": 3, "Asthenia": 2, "Chest pain": 2, "Gait disturbance": 2, "Injection site swelling": 2, "Injection site warmth": 2, "Joint swelling": 2, "Mobility decreased": 2, "Product dose omission issue": 2, "SARS-CoV-2 test": 2, "Anxiety": 1, "Aphonia": 1, "Arthritis": 1, "Autoimmune haemolytic anaemia": 1, "Back pain": 1, "Bell's palsy": 1, "Blood pressure measurement": 1, "Breast feeding": 1, "COVID-19": 1, "Cardiac flutter": 1, "Chest discomfort": 1, "Condition aggravated": 1, "Confusional state": 1, "Drug ineffective": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Eye colour change": 1, "Feeling hot": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Illness": 1, "Immune thrombocytopenia": 1, "Induration": 1, "Influenza like illness": 1, "Injection site induration": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Migraine": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Petechiae": 1, "Platelet count decreased": 1, "Rash": 1, "Rash pruritic": 1, "Red blood cell count": 1, "Red blood cell count abnormal": 1, "Retching": 1, "Rhinorrhoea": 1, "Skin mass": 1, "Sleep disorder": 1, "Suspected COVID-19": 1, "Tongue discomfort": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site joint erythema": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["008B212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B212ATCP4.json b/docs/data/histograms/United States/008B212ATCP4.json
index 7f18e0e3868..2b0d412d53c 100644
--- a/docs/data/histograms/United States/008B212ATCP4.json
+++ b/docs/data/histograms/United States/008B212ATCP4.json
@@ -1 +1 @@
-{"batchcode": "008B212ATCP4", "histograms": [{"batchcodes": ["008B212ATCP4"], "histogram": {"Erythema": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "008B212ATCP4", "histograms": [{"histogram": {"Erythema": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["008B212ATCP4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21A-2A.json b/docs/data/histograms/United States/008B21A-2A.json
index 5096f3a2b25..30f959303c9 100644
--- a/docs/data/histograms/United States/008B21A-2A.json
+++ b/docs/data/histograms/United States/008B21A-2A.json
@@ -1 +1 @@
-{"batchcode": "008B21A-2A", "histograms": [{"batchcodes": ["008B21A-2A"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hypotension": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21A-2A", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hypotension": 1, "Vaccination site urticaria": 1}, "batchcodes": ["008B21A-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21A..json b/docs/data/histograms/United States/008B21A..json
index bfe07eb0880..a2c3cb1174b 100644
--- a/docs/data/histograms/United States/008B21A..json
+++ b/docs/data/histograms/United States/008B21A..json
@@ -1 +1 @@
-{"batchcode": "008B21A.", "histograms": [{"batchcodes": ["008B21A."], "histogram": {"Rash": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21A.", "histograms": [{"histogram": {"Rash": 1, "Rash erythematous": 1}, "batchcodes": ["008B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21A.json b/docs/data/histograms/United States/008B21A.json
index 484b047c783..589246d3993 100644
--- a/docs/data/histograms/United States/008B21A.json
+++ b/docs/data/histograms/United States/008B21A.json
@@ -1 +1 @@
-{"batchcode": "008B21A", "histograms": [{"batchcodes": ["008B21A"], "histogram": {"Pyrexia": 40, "Headache": 36, "Fatigue": 34, "Chills": 33, "Myalgia": 27, "Vaccination site pain": 25, "Pain in extremity": 24, "Pain": 18, "Arthralgia": 17, "Erythema": 16, "Dizziness": 15, "Body temperature": 12, "Feeling abnormal": 12, "Hyperhidrosis": 12, "Nausea": 12, "Peripheral swelling": 11, "Vaccination site swelling": 11, "Cough": 10, "Pruritus": 10, "Rash": 10, "Vaccination site pruritus": 10, "Dyspnoea": 9, "SARS-CoV-2 test": 9, "Paraesthesia": 8, "Swelling": 7, "COVID-19": 6, "Diarrhoea": 6, "Heart rate increased": 6, "Hypoaesthesia": 6, "Insomnia": 6, "Malaise": 6, "Nasal congestion": 6, "Product dose omission issue": 6, "Vaccination complication": 6, "Vaccination site erythema": 6, "Asthenia": 5, "Chest discomfort": 5, "Heart rate": 5, "Illness": 5, "Lymphadenopathy": 5, "Blood test": 4, "Decreased appetite": 4, "Expired product administered": 4, "Gait disturbance": 4, "Inappropriate schedule of product administration": 4, "Migraine": 4, "Palpitations": 4, "Product administered to patient of inappropriate age": 4, "Swelling face": 4, "Tinnitus": 4, "Vaccination site bruising": 4, "Vaccination site induration": 4, "Abdominal discomfort": 3, "Anxiety": 3, "Back pain": 3, "Blood pressure measurement": 3, "Dehydration": 3, "Hypertension": 3, "Influenza": 3, "Limb discomfort": 3, "Maternal exposure during pregnancy": 3, "Muscular weakness": 3, "Musculoskeletal stiffness": 3, "Somnolence": 3, "Tremor": 3, "Urticaria": 3, "Vaccination site rash": 3, "Vaccination site warmth": 3, "Vision blurred": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Blister": 2, "Bone pain": 2, "Chest pain": 2, "Confusional state": 2, "Contusion": 2, "Disorientation": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Electrocardiogram": 2, "Facial paralysis": 2, "Flushing": 2, "Groin pain": 2, "Hallucination": 2, "Head discomfort": 2, "Herpes zoster": 2, "Influenza like illness": 2, "Injection site pain": 2, "Injection site pruritus": 2, "Intentional product use issue": 2, "Lethargy": 2, "Loss of personal independence in daily activities": 2, "Muscle twitching": 2, "Nasopharyngitis": 2, "Oropharyngeal pain": 2, "Poor quality sleep": 2, "Pregnancy test": 2, "Productive cough": 2, "Rash erythematous": 2, "Rash pruritic": 2, "SARS-CoV-2 test positive": 2, "Tachycardia": 2, "Type IV hypersensitivity reaction": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "Vaccination site reaction": 2, "Vaccination site urticaria": 2, "Abdominal pain": 1, "Abnormal dreams": 1, "Accidental underdose": 1, "Administration site bruise": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Ankle fracture": 1, "Arrhythmia": 1, "Arthritis": 1, "Balance disorder": 1, "Basedow's disease": 1, "Bedridden": 1, "Biopsy": 1, "Blood pressure increased": 1, "Body temperature fluctuation": 1, "Breast pain": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Conjunctivitis": 1, "Death": 1, "Dermatitis acneiform": 1, "Discomfort": 1, "Dissociation": 1, "Drug hypersensitivity": 1, "Dry mouth": 1, "Dry skin": 1, "Ear swelling": 1, "Eczema": 1, "Emotional disorder": 1, "Emotional distress": 1, "Epilepsy": 1, "Exposure during pregnancy": 1, "Exposure via breast milk": 1, "Eye pain": 1, "Facial pain": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Formication": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Head injury": 1, "Heat exhaustion": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme": 1, "Hormone level abnormal": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hyperthyroidism": 1, "Immunisation reaction": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site rash": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Injection site urticaria": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint swelling": 1, "Laboratory test": 1, "Lip swelling": 1, "Liver function test": 1, "Loss of consciousness": 1, "Lymphoma": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Middle insomnia": 1, "Miliaria": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neuropathy peripheral": 1, "No adverse event": 1, "Nuchal rigidity": 1, "Ocular discomfort": 1, "Oropharyngeal discomfort": 1, "Ovulation pain": 1, "Pain of skin": 1, "Pallor": 1, "Panic attack": 1, "Pharyngeal swelling": 1, "Physical assault": 1, "Pneumonia": 1, "Poor quality product administered": 1, "Posture abnormal": 1, "Product administration interrupted": 1, "Product temperature excursion issue": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary function test": 1, "Rash macular": 1, "Refraction disorder": 1, "Renal disorder": 1, "Renal function test": 1, "Renal pain": 1, "Restlessness": 1, "Sensory disturbance": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin irritation": 1, "Skin swelling": 1, "Skin warm": 1, "Sluggishness": 1, "Soft tissue mass": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Syncope": 1, "Tension headache": 1, "Throat tightness": 1, "Thrombosis": 1, "Tonsillar disorder": 1, "Trismus": 1, "Troponin": 1, "Ultrasound scan": 1, "Vaccination site discolouration": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Vaccination site vesicles": 1, "Vertigo": 1, "Visual impairment": 1, "Weight": 1, "Weight increased": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21A", "histograms": [{"histogram": {"Pyrexia": 40, "Headache": 36, "Fatigue": 34, "Chills": 33, "Myalgia": 27, "Vaccination site pain": 25, "Pain in extremity": 24, "Pain": 18, "Arthralgia": 17, "Erythema": 16, "Dizziness": 15, "Body temperature": 12, "Feeling abnormal": 12, "Hyperhidrosis": 12, "Nausea": 12, "Peripheral swelling": 11, "Vaccination site swelling": 11, "Cough": 10, "Pruritus": 10, "Rash": 10, "Vaccination site pruritus": 10, "Dyspnoea": 9, "SARS-CoV-2 test": 9, "Paraesthesia": 8, "Swelling": 7, "COVID-19": 6, "Diarrhoea": 6, "Heart rate increased": 6, "Hypoaesthesia": 6, "Insomnia": 6, "Malaise": 6, "Nasal congestion": 6, "Product dose omission issue": 6, "Vaccination complication": 6, "Vaccination site erythema": 6, "Asthenia": 5, "Chest discomfort": 5, "Heart rate": 5, "Illness": 5, "Lymphadenopathy": 5, "Blood test": 4, "Decreased appetite": 4, "Expired product administered": 4, "Gait disturbance": 4, "Inappropriate schedule of product administration": 4, "Migraine": 4, "Palpitations": 4, "Product administered to patient of inappropriate age": 4, "Swelling face": 4, "Tinnitus": 4, "Vaccination site bruising": 4, "Vaccination site induration": 4, "Abdominal discomfort": 3, "Anxiety": 3, "Back pain": 3, "Blood pressure measurement": 3, "Dehydration": 3, "Hypertension": 3, "Influenza": 3, "Limb discomfort": 3, "Maternal exposure during pregnancy": 3, "Muscular weakness": 3, "Musculoskeletal stiffness": 3, "Somnolence": 3, "Tremor": 3, "Urticaria": 3, "Vaccination site rash": 3, "Vaccination site warmth": 3, "Vision blurred": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Blister": 2, "Bone pain": 2, "Chest pain": 2, "Confusional state": 2, "Contusion": 2, "Disorientation": 2, "Drug ineffective": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Electrocardiogram": 2, "Facial paralysis": 2, "Flushing": 2, "Groin pain": 2, "Hallucination": 2, "Head discomfort": 2, "Herpes zoster": 2, "Influenza like illness": 2, "Injection site pain": 2, "Injection site pruritus": 2, "Intentional product use issue": 2, "Lethargy": 2, "Loss of personal independence in daily activities": 2, "Muscle twitching": 2, "Nasopharyngitis": 2, "Oropharyngeal pain": 2, "Poor quality sleep": 2, "Pregnancy test": 2, "Productive cough": 2, "Rash erythematous": 2, "Rash pruritic": 2, "SARS-CoV-2 test positive": 2, "Tachycardia": 2, "Type IV hypersensitivity reaction": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "Vaccination site reaction": 2, "Vaccination site urticaria": 2, "Abdominal pain": 1, "Abnormal dreams": 1, "Accidental underdose": 1, "Administration site bruise": 1, "Ageusia": 1, "Allergy to vaccine": 1, "Ankle fracture": 1, "Arrhythmia": 1, "Arthritis": 1, "Balance disorder": 1, "Basedow's disease": 1, "Bedridden": 1, "Biopsy": 1, "Blood pressure increased": 1, "Body temperature fluctuation": 1, "Breast pain": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Conjunctivitis": 1, "Death": 1, "Dermatitis acneiform": 1, "Discomfort": 1, "Dissociation": 1, "Drug hypersensitivity": 1, "Dry mouth": 1, "Dry skin": 1, "Ear swelling": 1, "Eczema": 1, "Emotional disorder": 1, "Emotional distress": 1, "Epilepsy": 1, "Exposure during pregnancy": 1, "Exposure via breast milk": 1, "Eye pain": 1, "Facial pain": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Formication": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Head injury": 1, "Heat exhaustion": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme": 1, "Hormone level abnormal": 1, "Hot flush": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Hyperthyroidism": 1, "Immunisation reaction": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site rash": 1, "Injection site reaction": 1, "Injection site swelling": 1, "Injection site urticaria": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint swelling": 1, "Laboratory test": 1, "Lip swelling": 1, "Liver function test": 1, "Loss of consciousness": 1, "Lymphoma": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Middle insomnia": 1, "Miliaria": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Muscle spasms": 1, "Musculoskeletal pain": 1, "Neck pain": 1, "Nervous system disorder": 1, "Neuropathy peripheral": 1, "No adverse event": 1, "Nuchal rigidity": 1, "Ocular discomfort": 1, "Oropharyngeal discomfort": 1, "Ovulation pain": 1, "Pain of skin": 1, "Pallor": 1, "Panic attack": 1, "Pharyngeal swelling": 1, "Physical assault": 1, "Pneumonia": 1, "Poor quality product administered": 1, "Posture abnormal": 1, "Product administration interrupted": 1, "Product temperature excursion issue": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary function test": 1, "Rash macular": 1, "Refraction disorder": 1, "Renal disorder": 1, "Renal function test": 1, "Renal pain": 1, "Restlessness": 1, "Sensory disturbance": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin irritation": 1, "Skin swelling": 1, "Skin warm": 1, "Sluggishness": 1, "Soft tissue mass": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Syncope": 1, "Tension headache": 1, "Throat tightness": 1, "Thrombosis": 1, "Tonsillar disorder": 1, "Trismus": 1, "Troponin": 1, "Ultrasound scan": 1, "Vaccination site discolouration": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Vaccination site vesicles": 1, "Vertigo": 1, "Visual impairment": 1, "Weight": 1, "Weight increased": 1, "Wrong product administered": 1}, "batchcodes": ["008B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21A;.json b/docs/data/histograms/United States/008B21A;.json
index f0c9a5792ec..ae1d7f37832 100644
--- a/docs/data/histograms/United States/008B21A;.json
+++ b/docs/data/histograms/United States/008B21A;.json
@@ -1 +1 @@
-{"batchcode": "008B21A;", "histograms": [{"batchcodes": ["008B21A;"], "histogram": {"Aphasia": 1, "Feeling abnormal": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21A;", "histograms": [{"histogram": {"Aphasia": 1, "Feeling abnormal": 1, "Vision blurred": 1}, "batchcodes": ["008B21A;"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21D1A.json b/docs/data/histograms/United States/008B21D1A.json
index 8f22b3a9567..c0e42bce1b3 100644
--- a/docs/data/histograms/United States/008B21D1A.json
+++ b/docs/data/histograms/United States/008B21D1A.json
@@ -1 +1 @@
-{"batchcode": "008B21D1A", "histograms": [{"batchcodes": ["008B21D1A"], "histogram": {"Dizziness": 1, "Eye pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21D1A", "histograms": [{"histogram": {"Dizziness": 1, "Eye pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site pain": 1}, "batchcodes": ["008B21D1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B21H.json b/docs/data/histograms/United States/008B21H.json
index 564d1561c39..d31b2adca97 100644
--- a/docs/data/histograms/United States/008B21H.json
+++ b/docs/data/histograms/United States/008B21H.json
@@ -1 +1 @@
-{"batchcode": "008B21H", "histograms": [{"batchcodes": ["008B21H"], "histogram": {"Inappropriate schedule of product administration": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "008B21H", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Pain in extremity": 1}, "batchcodes": ["008B21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B2A.json b/docs/data/histograms/United States/008B2A.json
index d3dbe383576..f3ae7ff17c2 100644
--- a/docs/data/histograms/United States/008B2A.json
+++ b/docs/data/histograms/United States/008B2A.json
@@ -1 +1 @@
-{"batchcode": "008B2A", "histograms": [{"batchcodes": ["008B2A"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "008B2A", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["008B2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B41A.json b/docs/data/histograms/United States/008B41A.json
index af7e0fb8368..3675b4258bb 100644
--- a/docs/data/histograms/United States/008B41A.json
+++ b/docs/data/histograms/United States/008B41A.json
@@ -1 +1 @@
-{"batchcode": "008B41A", "histograms": [{"batchcodes": ["008B41A"], "histogram": {"Ear swelling": 1, "Gingival swelling": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "008B41A", "histograms": [{"histogram": {"Ear swelling": 1, "Gingival swelling": 1, "Headache": 1}, "batchcodes": ["008B41A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B421A.json b/docs/data/histograms/United States/008B421A.json
index 91d73b13739..e7f3bbfdb1d 100644
--- a/docs/data/histograms/United States/008B421A.json
+++ b/docs/data/histograms/United States/008B421A.json
@@ -1 +1 @@
-{"batchcode": "008B421A", "histograms": [{"batchcodes": ["008B421A"], "histogram": {"Influenza like illness": 1, "Myalgia": 1, "Skin mass": 1}}]}
\ No newline at end of file
+{"batchcode": "008B421A", "histograms": [{"histogram": {"Influenza like illness": 1, "Myalgia": 1, "Skin mass": 1}, "batchcodes": ["008B421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008B81A.json b/docs/data/histograms/United States/008B81A.json
index 4a18012feb2..f00c7cde040 100644
--- a/docs/data/histograms/United States/008B81A.json
+++ b/docs/data/histograms/United States/008B81A.json
@@ -1 +1 @@
-{"batchcode": "008B81A", "histograms": [{"batchcodes": ["008B81A"], "histogram": {"Erythema": 1, "Headache": 1, "Hot flush": 1, "Lymphadenopathy": 1, "Menopausal disorder": 1, "Oral herpes": 1, "Palpitations": 1, "Scar": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "008B81A", "histograms": [{"histogram": {"Erythema": 1, "Headache": 1, "Hot flush": 1, "Lymphadenopathy": 1, "Menopausal disorder": 1, "Oral herpes": 1, "Palpitations": 1, "Scar": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["008B81A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008BA1.json b/docs/data/histograms/United States/008BA1.json
index 1de5fda44ff..950a6a6fcba 100644
--- a/docs/data/histograms/United States/008BA1.json
+++ b/docs/data/histograms/United States/008BA1.json
@@ -1 +1 @@
-{"batchcode": "008BA1", "histograms": [{"batchcodes": ["008BA1"], "histogram": {"Feeling abnormal": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "008BA1", "histograms": [{"histogram": {"Feeling abnormal": 1, "Vision blurred": 1}, "batchcodes": ["008BA1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008BT1A.json b/docs/data/histograms/United States/008BT1A.json
index 69aa742282b..f416546382f 100644
--- a/docs/data/histograms/United States/008BT1A.json
+++ b/docs/data/histograms/United States/008BT1A.json
@@ -1 +1 @@
-{"batchcode": "008BT1A", "histograms": [{"batchcodes": ["008BT1A"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "008BT1A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["008BT1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008BZIA.json b/docs/data/histograms/United States/008BZIA.json
index bc868fc3779..38f7e851ddf 100644
--- a/docs/data/histograms/United States/008BZIA.json
+++ b/docs/data/histograms/United States/008BZIA.json
@@ -1 +1 @@
-{"batchcode": "008BZIA", "histograms": [{"batchcodes": ["008BZIA"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "008BZIA", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["008BZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008C21.json b/docs/data/histograms/United States/008C21.json
index 2790d7d6481..293e026e241 100644
--- a/docs/data/histograms/United States/008C21.json
+++ b/docs/data/histograms/United States/008C21.json
@@ -1 +1 @@
-{"batchcode": "008C21", "histograms": [{"batchcodes": ["008C21"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "008C21", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["008C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008C21A..json b/docs/data/histograms/United States/008C21A..json
index bec0d86c9c7..6cb2e3ea8b8 100644
--- a/docs/data/histograms/United States/008C21A..json
+++ b/docs/data/histograms/United States/008C21A..json
@@ -1 +1 @@
-{"batchcode": "008C21A.", "histograms": [{"batchcodes": ["008C21A."], "histogram": {"Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "008C21A.", "histograms": [{"histogram": {"Product storage error": 1}, "batchcodes": ["008C21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008C21A.json b/docs/data/histograms/United States/008C21A.json
index 41d3c73f42f..39f05c4b52a 100644
--- a/docs/data/histograms/United States/008C21A.json
+++ b/docs/data/histograms/United States/008C21A.json
@@ -1 +1 @@
-{"batchcode": "008C21A", "histograms": [{"batchcodes": ["008C21A"], "histogram": {"Expired product administered": 407, "Product storage error": 283, "Product temperature excursion issue": 44, "Poor quality product administered": 38, "Pyrexia": 23, "Headache": 16, "Myalgia": 14, "Fatigue": 13, "Chills": 12, "Product administered to patient of inappropriate age": 12, "Nausea": 10, "Pain in extremity": 9, "Rash": 9, "Inappropriate schedule of product administration": 7, "Vaccination site pain": 7, "Dizziness": 6, "Influenza like illness": 6, "Pain": 6, "Paraesthesia": 6, "Pruritus": 6, "Body temperature": 5, "COVID-19": 5, "Injection site erythema": 5, "Malaise": 5, "SARS-CoV-2 test": 5, "Vaccination site pruritus": 5, "Asthenia": 4, "Diarrhoea": 4, "Feeling abnormal": 4, "Illness": 4, "Vaccination site erythema": 4, "Accidental overdose": 3, "Burning sensation": 3, "Dyspnoea": 3, "Feeling hot": 3, "Gait disturbance": 3, "Hypoaesthesia": 3, "Incorrect dose administered": 3, "Injection site pain": 3, "Injection site warmth": 3, "Insomnia": 3, "Loss of consciousness": 3, "Migraine": 3, "Muscle tightness": 3, "Somnolence": 3, "Urticaria": 3, "Vomiting": 3, "Arthralgia": 2, "Back pain": 2, "Confusional state": 2, "Cough": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Feeling of body temperature change": 2, "Hyperhidrosis": 2, "Hypoaesthesia oral": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Product dose omission issue": 2, "Swelling": 2, "Taste disorder": 2, "Tinnitus": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site induration": 2, "Vaccination site swelling": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Abnormal dreams": 1, "Abscess": 1, "Abscess limb": 1, "Alopecia": 1, "Aphasia": 1, "Aura": 1, "Bacterial infection": 1, "Bedridden": 1, "Bell's palsy": 1, "Bladder discomfort": 1, "Blister": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Chest discomfort": 1, "Cold sweat": 1, "Deep vein thrombosis": 1, "Depressed mood": 1, "Dermatitis contact": 1, "Disorientation": 1, "Dysgeusia": 1, "Dysstasia": 1, "Ear pruritus": 1, "Ear swelling": 1, "Epilepsy": 1, "Erythema": 1, "Eye infection": 1, "Eye pruritus": 1, "Eyelid rash": 1, "Eyelids pruritus": 1, "Fall": 1, "Fear": 1, "Feeding disorder": 1, "Flushing": 1, "Gastroenteritis viral": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hyperaesthesia": 1, "Hypersensitivity": 1, "Hypotension": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Joint stiffness": 1, "Joint swelling": 1, "Lip pruritus": 1, "Lip swelling": 1, "Lower respiratory tract infection": 1, "Malabsorption": 1, "Memory impairment": 1, "Muscle twitching": 1, "Myocarditis": 1, "Neck pain": 1, "Nervous system disorder": 1, "No adverse event": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oral mucosal eruption": 1, "Pallor": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Plantar fasciitis": 1, "Pollakiuria": 1, "Pregnancy test": 1, "Presyncope": 1, "Pulmonary embolism": 1, "Scratch": 1, "Seizure": 1, "Sinusitis": 1, "Sneezing": 1, "Speech disorder": 1, "Subcutaneous abscess": 1, "Swelling of eyelid": 1, "Syncope": 1, "Tenderness": 1, "Thirst": 1, "Throat tightness": 1, "Thrombosis": 1, "Tunnel vision": 1, "Ultrasound scan": 1, "Umbilical granuloma": 1, "Vaccination error": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site irritation": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Viral infection": 1, "Vision blurred": 1, "Weight decreased": 1, "Weight increased": 1, "Wound": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "008C21A", "histograms": [{"histogram": {"Expired product administered": 407, "Product storage error": 283, "Product temperature excursion issue": 44, "Poor quality product administered": 38, "Pyrexia": 23, "Headache": 16, "Myalgia": 14, "Fatigue": 13, "Chills": 12, "Product administered to patient of inappropriate age": 12, "Nausea": 10, "Pain in extremity": 9, "Rash": 9, "Inappropriate schedule of product administration": 7, "Vaccination site pain": 7, "Dizziness": 6, "Influenza like illness": 6, "Pain": 6, "Paraesthesia": 6, "Pruritus": 6, "Body temperature": 5, "COVID-19": 5, "Injection site erythema": 5, "Malaise": 5, "SARS-CoV-2 test": 5, "Vaccination site pruritus": 5, "Asthenia": 4, "Diarrhoea": 4, "Feeling abnormal": 4, "Illness": 4, "Vaccination site erythema": 4, "Accidental overdose": 3, "Burning sensation": 3, "Dyspnoea": 3, "Feeling hot": 3, "Gait disturbance": 3, "Hypoaesthesia": 3, "Incorrect dose administered": 3, "Injection site pain": 3, "Injection site warmth": 3, "Insomnia": 3, "Loss of consciousness": 3, "Migraine": 3, "Muscle tightness": 3, "Somnolence": 3, "Urticaria": 3, "Vomiting": 3, "Arthralgia": 2, "Back pain": 2, "Confusional state": 2, "Cough": 2, "Decreased appetite": 2, "Drug ineffective": 2, "Feeling of body temperature change": 2, "Hyperhidrosis": 2, "Hypoaesthesia oral": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "Neuropathy peripheral": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Product dose omission issue": 2, "Swelling": 2, "Taste disorder": 2, "Tinnitus": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site induration": 2, "Vaccination site swelling": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Abnormal dreams": 1, "Abscess": 1, "Abscess limb": 1, "Alopecia": 1, "Aphasia": 1, "Aura": 1, "Bacterial infection": 1, "Bedridden": 1, "Bell's palsy": 1, "Bladder discomfort": 1, "Blister": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Chest discomfort": 1, "Cold sweat": 1, "Deep vein thrombosis": 1, "Depressed mood": 1, "Dermatitis contact": 1, "Disorientation": 1, "Dysgeusia": 1, "Dysstasia": 1, "Ear pruritus": 1, "Ear swelling": 1, "Epilepsy": 1, "Erythema": 1, "Eye infection": 1, "Eye pruritus": 1, "Eyelid rash": 1, "Eyelids pruritus": 1, "Fall": 1, "Fear": 1, "Feeding disorder": 1, "Flushing": 1, "Gastroenteritis viral": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Heart rate": 1, "Hyperaesthesia": 1, "Hypersensitivity": 1, "Hypotension": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Joint stiffness": 1, "Joint swelling": 1, "Lip pruritus": 1, "Lip swelling": 1, "Lower respiratory tract infection": 1, "Malabsorption": 1, "Memory impairment": 1, "Muscle twitching": 1, "Myocarditis": 1, "Neck pain": 1, "Nervous system disorder": 1, "No adverse event": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oral mucosal eruption": 1, "Pallor": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Plantar fasciitis": 1, "Pollakiuria": 1, "Pregnancy test": 1, "Presyncope": 1, "Pulmonary embolism": 1, "Scratch": 1, "Seizure": 1, "Sinusitis": 1, "Sneezing": 1, "Speech disorder": 1, "Subcutaneous abscess": 1, "Swelling of eyelid": 1, "Syncope": 1, "Tenderness": 1, "Thirst": 1, "Throat tightness": 1, "Thrombosis": 1, "Tunnel vision": 1, "Ultrasound scan": 1, "Umbilical granuloma": 1, "Vaccination error": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site irritation": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Viral infection": 1, "Vision blurred": 1, "Weight decreased": 1, "Weight increased": 1, "Wound": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["008C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008C21H.json b/docs/data/histograms/United States/008C21H.json
index 8edb3b35245..1e67d2ff1b0 100644
--- a/docs/data/histograms/United States/008C21H.json
+++ b/docs/data/histograms/United States/008C21H.json
@@ -1 +1 @@
-{"batchcode": "008C21H", "histograms": [{"batchcodes": ["008C21H"], "histogram": {"Vaccination site pain": 2, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "008C21H", "histograms": [{"histogram": {"Vaccination site pain": 2, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["008C21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008CA1A.json b/docs/data/histograms/United States/008CA1A.json
index e745bcbaba8..37547f528d7 100644
--- a/docs/data/histograms/United States/008CA1A.json
+++ b/docs/data/histograms/United States/008CA1A.json
@@ -1 +1 @@
-{"batchcode": "008CA1A", "histograms": [{"batchcodes": ["008CA1A"], "histogram": {"Pruritus": 1, "Rash": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "008CA1A", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["008CA1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008CZ1A.json b/docs/data/histograms/United States/008CZ1A.json
index de23c56d8db..8319bb162d1 100644
--- a/docs/data/histograms/United States/008CZ1A.json
+++ b/docs/data/histograms/United States/008CZ1A.json
@@ -1 +1 @@
-{"batchcode": "008CZ1A", "histograms": [{"batchcodes": ["008CZ1A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "008CZ1A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["008CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008CZIA.json b/docs/data/histograms/United States/008CZIA.json
index d8b9dbdb643..54b270310c5 100644
--- a/docs/data/histograms/United States/008CZIA.json
+++ b/docs/data/histograms/United States/008CZIA.json
@@ -1 +1 @@
-{"batchcode": "008CZIA", "histograms": [{"batchcodes": ["008CZIA"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "008CZIA", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["008CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008D21A.json b/docs/data/histograms/United States/008D21A.json
index 5e7d5d5fb7d..cb25a04e69f 100644
--- a/docs/data/histograms/United States/008D21A.json
+++ b/docs/data/histograms/United States/008D21A.json
@@ -1 +1 @@
-{"batchcode": "008D21A", "histograms": [{"batchcodes": ["008D21A"], "histogram": {"Muscle spasms": 2, "Myalgia": 2, "Pyrexia": 2, "Angioedema": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Chills": 1, "Dehydration": 1, "Dizziness": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Lip swelling": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "Swollen tongue": 1, "Throat irritation": 1, "Throat tightness": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "008D21A", "histograms": [{"histogram": {"Muscle spasms": 2, "Myalgia": 2, "Pyrexia": 2, "Angioedema": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest discomfort": 1, "Chills": 1, "Dehydration": 1, "Dizziness": 1, "Dysarthria": 1, "Dysphagia": 1, "Dysphonia": 1, "Dyspnoea": 1, "Dysstasia": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Lip swelling": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Pruritus": 1, "Rash": 1, "Respiratory rate": 1, "Swollen tongue": 1, "Throat irritation": 1, "Throat tightness": 1, "Urticaria": 1}, "batchcodes": ["008D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008D2VA.json b/docs/data/histograms/United States/008D2VA.json
index 7208d6602d9..48bfe2b99b9 100644
--- a/docs/data/histograms/United States/008D2VA.json
+++ b/docs/data/histograms/United States/008D2VA.json
@@ -1 +1 @@
-{"batchcode": "008D2VA", "histograms": [{"batchcodes": ["008D2VA"], "histogram": {"Back pain": 1, "Bone pain": 1, "Dizziness": 1, "Feeling hot": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "008D2VA", "histograms": [{"histogram": {"Back pain": 1, "Bone pain": 1, "Dizziness": 1, "Feeling hot": 1, "Vaccination site pain": 1}, "batchcodes": ["008D2VA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008E21A.json b/docs/data/histograms/United States/008E21A.json
index df96008ba1b..db86e85f77b 100644
--- a/docs/data/histograms/United States/008E21A.json
+++ b/docs/data/histograms/United States/008E21A.json
@@ -1 +1 @@
-{"batchcode": "008E21A", "histograms": [{"batchcodes": ["008E21A"], "histogram": {"COVID-19": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Neck pain": 1, "SARS-CoV-2 antibody test": 1, "Thrombosis": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "008E21A", "histograms": [{"histogram": {"COVID-19": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Neck pain": 1, "SARS-CoV-2 antibody test": 1, "Thrombosis": 1, "Weight decreased": 1}, "batchcodes": ["008E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/008L20A.json b/docs/data/histograms/United States/008L20A.json
index 141152adfed..a8df4cf2784 100644
--- a/docs/data/histograms/United States/008L20A.json
+++ b/docs/data/histograms/United States/008L20A.json
@@ -1 +1 @@
-{"batchcode": "008L20A", "histograms": [{"batchcodes": ["008L20A"], "histogram": {"Blood test": 2, "Balance disorder": 1, "Bone scan": 1, "Cold-stimulus headache": 1, "Dysphonia": 1, "Ear, nose and throat examination": 1, "Headache": 1, "Inflammation": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Middle ear effusion": 1, "Migraine": 1, "Myalgia": 1, "Neuralgia": 1, "Ophthalmological examination": 1, "Pain": 1, "Pain in extremity": 1, "Swallow study": 1, "Tooth fracture": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "008L20A", "histograms": [{"histogram": {"Blood test": 2, "Balance disorder": 1, "Bone scan": 1, "Cold-stimulus headache": 1, "Dysphonia": 1, "Ear, nose and throat examination": 1, "Headache": 1, "Inflammation": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Middle ear effusion": 1, "Migraine": 1, "Myalgia": 1, "Neuralgia": 1, "Ophthalmological examination": 1, "Pain": 1, "Pain in extremity": 1, "Swallow study": 1, "Tooth fracture": 1, "Visual impairment": 1}, "batchcodes": ["008L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009021A.json b/docs/data/histograms/United States/009021A.json
index bc9b1560d3e..fcbc9c5739c 100644
--- a/docs/data/histograms/United States/009021A.json
+++ b/docs/data/histograms/United States/009021A.json
@@ -1 +1 @@
-{"batchcode": "009021A", "histograms": [{"batchcodes": ["009021A"], "histogram": {"Fatigue": 2, "Headache": 2, "Chills": 1, "Contusion": 1, "Heart rate": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "009021A", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Chills": 1, "Contusion": 1, "Heart rate": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Somnolence": 1}, "batchcodes": ["009021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0090T1A.json b/docs/data/histograms/United States/0090T1A.json
index 6ff363fb51c..cfb13fcb215 100644
--- a/docs/data/histograms/United States/0090T1A.json
+++ b/docs/data/histograms/United States/0090T1A.json
@@ -1 +1 @@
-{"batchcode": "0090T1A", "histograms": [{"batchcodes": ["0090T1A"], "histogram": {"Unevaluable event": 1}}]}
\ No newline at end of file
+{"batchcode": "0090T1A", "histograms": [{"histogram": {"Unevaluable event": 1}, "batchcodes": ["0090T1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0091D21A.json b/docs/data/histograms/United States/0091D21A.json
index 779c1f7c1b6..a0085c80442 100644
--- a/docs/data/histograms/United States/0091D21A.json
+++ b/docs/data/histograms/United States/0091D21A.json
@@ -1 +1 @@
-{"batchcode": "0091D21A", "histograms": [{"batchcodes": ["0091D21A", "1805018"], "histogram": {"COVID-19": 1, "Deep vein thrombosis": 1, "Interchange of vaccine products": 1, "Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "0091D21A", "histograms": [{"histogram": {"COVID-19": 1, "Deep vein thrombosis": 1, "Interchange of vaccine products": 1, "Pulmonary embolism": 1}, "batchcodes": ["0091D21A", "1805018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00921A.json b/docs/data/histograms/United States/00921A.json
index 2d2cae3b7a1..c23176df4db 100644
--- a/docs/data/histograms/United States/00921A.json
+++ b/docs/data/histograms/United States/00921A.json
@@ -1 +1 @@
-{"batchcode": "00921A", "histograms": [{"batchcodes": ["00921A"], "histogram": {"Asthenopia": 1, "Balance disorder": 1, "Blindness": 1, "Headache": 1, "Intentional dose omission": 1, "Optic nerve injury": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "00921A", "histograms": [{"histogram": {"Asthenopia": 1, "Balance disorder": 1, "Blindness": 1, "Headache": 1, "Intentional dose omission": 1, "Optic nerve injury": 1, "Visual impairment": 1}, "batchcodes": ["00921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009621A.json b/docs/data/histograms/United States/009621A.json
index 91081ae62d7..f5eba569cb0 100644
--- a/docs/data/histograms/United States/009621A.json
+++ b/docs/data/histograms/United States/009621A.json
@@ -1 +1 @@
-{"batchcode": "009621A", "histograms": [{"batchcodes": ["009621A"], "histogram": {"Fatigue": 1, "Hypersomnia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "009621A", "histograms": [{"histogram": {"Fatigue": 1, "Hypersomnia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["009621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0096B21A.json b/docs/data/histograms/United States/0096B21A.json
index 54534542c31..c9c2d31e6de 100644
--- a/docs/data/histograms/United States/0096B21A.json
+++ b/docs/data/histograms/United States/0096B21A.json
@@ -1 +1 @@
-{"batchcode": "0096B21A", "histograms": [{"batchcodes": ["0096B21A"], "histogram": {"Lymphadenopathy": 1, "Oral pain": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0096B21A", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Oral pain": 1, "Rash": 1}, "batchcodes": ["0096B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009A21A.json b/docs/data/histograms/United States/009A21A.json
index 9d527d0bdc8..3c54bc1ab68 100644
--- a/docs/data/histograms/United States/009A21A.json
+++ b/docs/data/histograms/United States/009A21A.json
@@ -1 +1 @@
-{"batchcode": "009A21A", "histograms": [{"batchcodes": ["009A21A"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Ill-defined disorder": 1, "Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "009A21A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Ill-defined disorder": 1, "Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["009A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009B21A.json b/docs/data/histograms/United States/009B21A.json
index aa320e3269f..39155476506 100644
--- a/docs/data/histograms/United States/009B21A.json
+++ b/docs/data/histograms/United States/009B21A.json
@@ -1 +1 @@
-{"batchcode": "009B21A", "histograms": [{"batchcodes": ["009B21A"], "histogram": {"Vaccination site pain": 2, "Back pain": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Expired product administered": 1, "Flushing": 1, "Headache": 1, "Hypoaesthesia": 1, "Illness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pneumonia": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site discharge": 1}}]}
\ No newline at end of file
+{"batchcode": "009B21A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Back pain": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Expired product administered": 1, "Flushing": 1, "Headache": 1, "Hypoaesthesia": 1, "Illness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pneumonia": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site discharge": 1}, "batchcodes": ["009B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009C2 1A.json b/docs/data/histograms/United States/009C2 1A.json
index 40175c358c4..945b8a1472f 100644
--- a/docs/data/histograms/United States/009C2 1A.json
+++ b/docs/data/histograms/United States/009C2 1A.json
@@ -1 +1 @@
-{"batchcode": "009C2 1A", "histograms": [{"batchcodes": ["009C2 1A"], "histogram": {"Chills": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "009C2 1A", "histograms": [{"histogram": {"Chills": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["009C2 1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009C2117.json b/docs/data/histograms/United States/009C2117.json
index cf4a6c22c10..a596992741d 100644
--- a/docs/data/histograms/United States/009C2117.json
+++ b/docs/data/histograms/United States/009C2117.json
@@ -1 +1 @@
-{"batchcode": "009C2117", "histograms": [{"batchcodes": ["009C2117"], "histogram": {"Death": 1, "Fatigue": 1, "Flushing": 1, "Pain in extremity": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "009C2117", "histograms": [{"histogram": {"Death": 1, "Fatigue": 1, "Flushing": 1, "Pain in extremity": 1, "Vaccination complication": 1}, "batchcodes": ["009C2117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009C211A.json b/docs/data/histograms/United States/009C211A.json
index f88f5b0e22d..a5e22357c77 100644
--- a/docs/data/histograms/United States/009C211A.json
+++ b/docs/data/histograms/United States/009C211A.json
@@ -1 +1 @@
-{"batchcode": "009C211A", "histograms": [{"batchcodes": ["009C211A"], "histogram": {"Back pain": 1, "Body temperature": 1, "Bone pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "009C211A", "histograms": [{"histogram": {"Back pain": 1, "Body temperature": 1, "Bone pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["009C211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009C219.json b/docs/data/histograms/United States/009C219.json
index 922e6b16dc1..969322d36d2 100644
--- a/docs/data/histograms/United States/009C219.json
+++ b/docs/data/histograms/United States/009C219.json
@@ -1 +1 @@
-{"batchcode": "009C219", "histograms": [{"batchcodes": ["009C219"], "histogram": {"Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "009C219", "histograms": [{"histogram": {"Chills": 1}, "batchcodes": ["009C219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009C21A..json b/docs/data/histograms/United States/009C21A..json
index ccc60a414e4..b3653e984a1 100644
--- a/docs/data/histograms/United States/009C21A..json
+++ b/docs/data/histograms/United States/009C21A..json
@@ -1 +1 @@
-{"batchcode": "009C21A.", "histograms": [{"batchcodes": ["009C21A."], "histogram": {"Back pain": 1, "Blood pressure increased": 1, "Diarrhoea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "009C21A.", "histograms": [{"histogram": {"Back pain": 1, "Blood pressure increased": 1, "Diarrhoea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["009C21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009C21A.json b/docs/data/histograms/United States/009C21A.json
index ba2cda5aae9..54e68625b05 100644
--- a/docs/data/histograms/United States/009C21A.json
+++ b/docs/data/histograms/United States/009C21A.json
@@ -1 +1 @@
-{"batchcode": "009C21A", "histograms": [{"batchcodes": ["009C21A"], "histogram": {"Expired product administered": 59, "Vaccination site pain": 30, "Fatigue": 25, "Myalgia": 25, "Headache": 23, "Pyrexia": 21, "Chills": 17, "Pain in extremity": 15, "Product dose omission issue": 15, "Dyspnoea": 14, "Nausea": 13, "Rash": 13, "Inappropriate schedule of product administration": 12, "Product administered to patient of inappropriate age": 12, "Diarrhoea": 11, "Feeling abnormal": 11, "Asthenia": 10, "Vaccination site erythema": 10, "Burning sensation": 9, "Chest pain": 9, "Dizziness": 9, "SARS-CoV-2 test": 9, "Vaccination site pruritus": 9, "Cough": 8, "Body temperature": 7, "Chest discomfort": 7, "Peripheral swelling": 7, "Product storage error": 7, "Pruritus": 7, "COVID-19": 6, "Pain": 6, "Vaccination site swelling": 6, "Arthralgia": 5, "Heart rate": 5, "Hyperhidrosis": 5, "Illness": 5, "Influenza like illness": 5, "Lymphadenopathy": 5, "Paraesthesia": 5, "Urticaria": 5, "Ageusia": 4, "Anosmia": 4, "Contusion": 4, "Decreased appetite": 4, "Feeling hot": 4, "Malaise": 4, "Musculoskeletal stiffness": 4, "Nasal congestion": 4, "Vomiting": 4, "Abdominal discomfort": 3, "Erythema": 3, "Feeling cold": 3, "Formication": 3, "Heart rate increased": 3, "Herpes zoster": 3, "Hypoaesthesia": 3, "Insomnia": 3, "Joint swelling": 3, "Limb discomfort": 3, "Migraine": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Nasopharyngitis": 3, "Wheezing": 3, "Asthma": 2, "Back pain": 2, "Blood pressure measurement": 2, "Body temperature decreased": 2, "Breast pain": 2, "Computerised tomogram": 2, "Eczema": 2, "Gait disturbance": 2, "Hypersensitivity": 2, "Lethargy": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Menstrual disorder": 2, "Muscular weakness": 2, "Neck pain": 2, "Ocular discomfort": 2, "Oropharyngeal pain": 2, "Pain of skin": 2, "Paralysis": 2, "Rash pruritic": 2, "Rectal haemorrhage": 2, "Rhinorrhoea": 2, "Seasonal allergy": 2, "Somnolence": 2, "Swelling": 2, "Throat irritation": 2, "Toothache": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Aortic dissection": 1, "Audiogram": 1, "Axillary mass": 1, "Blister": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood test": 1, "Blood urea nitrogen/creatinine ratio": 1, "Body temperature abnormal": 1, "Breast discharge": 1, "Breast swelling": 1, "Bursitis": 1, "Cachexia": 1, "Condition aggravated": 1, "Dental discomfort": 1, "Diplegia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysentery": 1, "Dyspepsia": 1, "Dysphagia": 1, "Electrocardiogram": 1, "Face oedema": 1, "Fear": 1, "Fear of death": 1, "Fluid imbalance": 1, "Flushing": 1, "Haemorrhage": 1, "Hyperlipidaemia": 1, "Hypersomnia": 1, "Hypertension": 1, "Impaired fasting glucose": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site pain": 1, "Intracranial pressure increased": 1, "Irritability": 1, "Lip erythema": 1, "Lip swelling": 1, "Lymph node pain": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle fatigue": 1, "Muscle tightness": 1, "Nasal pruritus": 1, "Nervousness": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Palpitations": 1, "Panic attack": 1, "Pityriasis rosea": 1, "Pneumonia": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Protein total increased": 1, "Psoriasis": 1, "Rash macular": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Skin discolouration": 1, "Skin irritation": 1, "Sluggishness": 1, "Speech disorder": 1, "Swelling face": 1, "Tachycardia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Tinnitus": 1, "Tooth loss": 1, "Underdose": 1, "Vaccination failure": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Vaginal haemorrhage": 1, "Vestibular disorder": 1, "Vibratory sense increased": 1, "Vocal cord disorder": 1, "Weight decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "009C21A", "histograms": [{"histogram": {"Expired product administered": 59, "Vaccination site pain": 30, "Fatigue": 25, "Myalgia": 25, "Headache": 23, "Pyrexia": 21, "Chills": 17, "Pain in extremity": 15, "Product dose omission issue": 15, "Dyspnoea": 14, "Nausea": 13, "Rash": 13, "Inappropriate schedule of product administration": 12, "Product administered to patient of inappropriate age": 12, "Diarrhoea": 11, "Feeling abnormal": 11, "Asthenia": 10, "Vaccination site erythema": 10, "Burning sensation": 9, "Chest pain": 9, "Dizziness": 9, "SARS-CoV-2 test": 9, "Vaccination site pruritus": 9, "Cough": 8, "Body temperature": 7, "Chest discomfort": 7, "Peripheral swelling": 7, "Product storage error": 7, "Pruritus": 7, "COVID-19": 6, "Pain": 6, "Vaccination site swelling": 6, "Arthralgia": 5, "Heart rate": 5, "Hyperhidrosis": 5, "Illness": 5, "Influenza like illness": 5, "Lymphadenopathy": 5, "Paraesthesia": 5, "Urticaria": 5, "Ageusia": 4, "Anosmia": 4, "Contusion": 4, "Decreased appetite": 4, "Feeling hot": 4, "Malaise": 4, "Musculoskeletal stiffness": 4, "Nasal congestion": 4, "Vomiting": 4, "Abdominal discomfort": 3, "Erythema": 3, "Feeling cold": 3, "Formication": 3, "Heart rate increased": 3, "Herpes zoster": 3, "Hypoaesthesia": 3, "Insomnia": 3, "Joint swelling": 3, "Limb discomfort": 3, "Migraine": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Nasopharyngitis": 3, "Wheezing": 3, "Asthma": 2, "Back pain": 2, "Blood pressure measurement": 2, "Body temperature decreased": 2, "Breast pain": 2, "Computerised tomogram": 2, "Eczema": 2, "Gait disturbance": 2, "Hypersensitivity": 2, "Lethargy": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Menstrual disorder": 2, "Muscular weakness": 2, "Neck pain": 2, "Ocular discomfort": 2, "Oropharyngeal pain": 2, "Pain of skin": 2, "Paralysis": 2, "Rash pruritic": 2, "Rectal haemorrhage": 2, "Rhinorrhoea": 2, "Seasonal allergy": 2, "Somnolence": 2, "Swelling": 2, "Throat irritation": 2, "Toothache": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Aortic dissection": 1, "Audiogram": 1, "Axillary mass": 1, "Blister": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood test": 1, "Blood urea nitrogen/creatinine ratio": 1, "Body temperature abnormal": 1, "Breast discharge": 1, "Breast swelling": 1, "Bursitis": 1, "Cachexia": 1, "Condition aggravated": 1, "Dental discomfort": 1, "Diplegia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dysarthria": 1, "Dysentery": 1, "Dyspepsia": 1, "Dysphagia": 1, "Electrocardiogram": 1, "Face oedema": 1, "Fear": 1, "Fear of death": 1, "Fluid imbalance": 1, "Flushing": 1, "Haemorrhage": 1, "Hyperlipidaemia": 1, "Hypersomnia": 1, "Hypertension": 1, "Impaired fasting glucose": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Inflammation": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site pain": 1, "Intracranial pressure increased": 1, "Irritability": 1, "Lip erythema": 1, "Lip swelling": 1, "Lymph node pain": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle fatigue": 1, "Muscle tightness": 1, "Nasal pruritus": 1, "Nervousness": 1, "Oedema peripheral": 1, "Oxygen saturation": 1, "Palpitations": 1, "Panic attack": 1, "Pityriasis rosea": 1, "Pneumonia": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Protein total increased": 1, "Psoriasis": 1, "Rash macular": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Skin discolouration": 1, "Skin irritation": 1, "Sluggishness": 1, "Speech disorder": 1, "Swelling face": 1, "Tachycardia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Tinnitus": 1, "Tooth loss": 1, "Underdose": 1, "Vaccination failure": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Vaginal haemorrhage": 1, "Vestibular disorder": 1, "Vibratory sense increased": 1, "Vocal cord disorder": 1, "Weight decreased": 1, "X-ray": 1}, "batchcodes": ["009C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009C21D.json b/docs/data/histograms/United States/009C21D.json
index 91663f4cfb0..5de0a7e536d 100644
--- a/docs/data/histograms/United States/009C21D.json
+++ b/docs/data/histograms/United States/009C21D.json
@@ -1 +1 @@
-{"batchcode": "009C21D", "histograms": [{"batchcodes": ["009C21D"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "009C21D", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1}, "batchcodes": ["009C21D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009CUA.json b/docs/data/histograms/United States/009CUA.json
index 085c4c8f14e..87ae95e4a42 100644
--- a/docs/data/histograms/United States/009CUA.json
+++ b/docs/data/histograms/United States/009CUA.json
@@ -1 +1 @@
-{"batchcode": "009CUA", "histograms": [{"batchcodes": ["009CUA"], "histogram": {"Hypoaesthesia": 1, "Muscle twitching": 1, "Ocular discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "009CUA", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Muscle twitching": 1, "Ocular discomfort": 1}, "batchcodes": ["009CUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009CZ1A.json b/docs/data/histograms/United States/009CZ1A.json
index d106fd6ba35..27f29c3f65e 100644
--- a/docs/data/histograms/United States/009CZ1A.json
+++ b/docs/data/histograms/United States/009CZ1A.json
@@ -1 +1 @@
-{"batchcode": "009CZ1A", "histograms": [{"batchcodes": ["009CZ1A"], "histogram": {"COVID-19": 1, "Chest discomfort": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "009CZ1A", "histograms": [{"histogram": {"COVID-19": 1, "Chest discomfort": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["009CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009D21A.json b/docs/data/histograms/United States/009D21A.json
index 6de5c1f688a..889007afd04 100644
--- a/docs/data/histograms/United States/009D21A.json
+++ b/docs/data/histograms/United States/009D21A.json
@@ -1 +1 @@
-{"batchcode": "009D21A", "histograms": [{"batchcodes": ["009D21A"], "histogram": {"Expired product administered": 10, "Fatigue": 10, "Dyspnoea": 5, "Arthralgia": 4, "Headache": 4, "Pyrexia": 4, "Urticaria": 4, "Inappropriate schedule of product administration": 3, "Myalgia": 3, "Pain": 3, "Pain in extremity": 3, "Product administered to patient of inappropriate age": 3, "Pruritus": 3, "Swelling": 3, "Back pain": 2, "Contusion": 2, "Dizziness": 2, "Erythema": 2, "Eye swelling": 2, "Feeling abnormal": 2, "Hypersensitivity": 2, "Joint swelling": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Menstruation delayed": 2, "Paraesthesia": 2, "Product dose omission issue": 2, "SARS-CoV-2 test": 2, "Swelling face": 2, "Tongue disorder": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Air embolism": 1, "Asthenia": 1, "Balance disorder": 1, "Bed rest": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Bone pain": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram": 1, "Cough": 1, "Deafness": 1, "Decreased appetite": 1, "Device connection issue": 1, "Diarrhoea": 1, "Ear haemorrhage": 1, "Electrocardiogram": 1, "Extra dose administered": 1, "Groin pain": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Induration": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mass": 1, "Mastication disorder": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Nausea": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Neuritis": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Otorrhoea": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Rash": 1, "Rash pruritic": 1, "Sitting disability": 1, "Skin discolouration": 1, "Sneezing": 1, "Somnolence": 1, "Tinnitus": 1, "Toothache": 1, "Tremor": 1, "Underdose": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site mass": 1, "Vaccination site nodule": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Vomiting": 1, "Walking aid user": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "009D21A", "histograms": [{"histogram": {"Expired product administered": 10, "Fatigue": 10, "Dyspnoea": 5, "Arthralgia": 4, "Headache": 4, "Pyrexia": 4, "Urticaria": 4, "Inappropriate schedule of product administration": 3, "Myalgia": 3, "Pain": 3, "Pain in extremity": 3, "Product administered to patient of inappropriate age": 3, "Pruritus": 3, "Swelling": 3, "Back pain": 2, "Contusion": 2, "Dizziness": 2, "Erythema": 2, "Eye swelling": 2, "Feeling abnormal": 2, "Hypersensitivity": 2, "Joint swelling": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Menstruation delayed": 2, "Paraesthesia": 2, "Product dose omission issue": 2, "SARS-CoV-2 test": 2, "Swelling face": 2, "Tongue disorder": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Air embolism": 1, "Asthenia": 1, "Balance disorder": 1, "Bed rest": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Bone pain": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Computerised tomogram": 1, "Cough": 1, "Deafness": 1, "Decreased appetite": 1, "Device connection issue": 1, "Diarrhoea": 1, "Ear haemorrhage": 1, "Electrocardiogram": 1, "Extra dose administered": 1, "Groin pain": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Induration": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mass": 1, "Mastication disorder": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Nausea": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Neuritis": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Otorrhoea": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Rash": 1, "Rash pruritic": 1, "Sitting disability": 1, "Skin discolouration": 1, "Sneezing": 1, "Somnolence": 1, "Tinnitus": 1, "Toothache": 1, "Tremor": 1, "Underdose": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vaccination site mass": 1, "Vaccination site nodule": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Vomiting": 1, "Walking aid user": 1, "X-ray": 1}, "batchcodes": ["009D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009D27A.json b/docs/data/histograms/United States/009D27A.json
index 91113ba4fd7..0a3c296ec3c 100644
--- a/docs/data/histograms/United States/009D27A.json
+++ b/docs/data/histograms/United States/009D27A.json
@@ -1 +1 @@
-{"batchcode": "009D27A", "histograms": [{"batchcodes": ["009D27A"], "histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Blood test": 1, "Breast pain": 1, "Breast swelling": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Haemorrhage": 1, "Headache": 1, "Menopausal disorder": 1, "Nausea": 1, "Ovulation disorder": 1, "Pregnancy test": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1, "Uterine disorder": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "009D27A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Blood test": 1, "Breast pain": 1, "Breast swelling": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Haemorrhage": 1, "Headache": 1, "Menopausal disorder": 1, "Nausea": 1, "Ovulation disorder": 1, "Pregnancy test": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Suspected COVID-19": 1, "Uterine disorder": 1, "Vaccination site reaction": 1}, "batchcodes": ["009D27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009M20A.json b/docs/data/histograms/United States/009M20A.json
index ddb9e24a1fe..8b7581db6e7 100644
--- a/docs/data/histograms/United States/009M20A.json
+++ b/docs/data/histograms/United States/009M20A.json
@@ -1 +1 @@
-{"batchcode": "009M20A", "histograms": [{"batchcodes": ["009M20A"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "009M20A", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1}, "batchcodes": ["009M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/009O21A.json b/docs/data/histograms/United States/009O21A.json
index 6ebea1f0286..aee73427cfb 100644
--- a/docs/data/histograms/United States/009O21A.json
+++ b/docs/data/histograms/United States/009O21A.json
@@ -1 +1 @@
-{"batchcode": "009O21A", "histograms": [{"batchcodes": ["009O21A"], "histogram": {"Body temperature": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "009O21A", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1}, "batchcodes": ["009O21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00A21A.json b/docs/data/histograms/United States/00A21A.json
index b23455c1157..fa13c2fa62c 100644
--- a/docs/data/histograms/United States/00A21A.json
+++ b/docs/data/histograms/United States/00A21A.json
@@ -1 +1 @@
-{"batchcode": "00A21A", "histograms": [{"batchcodes": ["00A21A"], "histogram": {"Chills": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "00A21A", "histograms": [{"histogram": {"Chills": 1, "Pain in extremity": 1}, "batchcodes": ["00A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00A2L1A.json b/docs/data/histograms/United States/00A2L1A.json
index b9059665990..9bd5f38bdef 100644
--- a/docs/data/histograms/United States/00A2L1A.json
+++ b/docs/data/histograms/United States/00A2L1A.json
@@ -1 +1 @@
-{"batchcode": "00A2L1A", "histograms": [{"batchcodes": ["00A2L1A"], "histogram": {"Hypersensitivity": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "00A2L1A", "histograms": [{"histogram": {"Hypersensitivity": 1, "Rhinorrhoea": 1}, "batchcodes": ["00A2L1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00A3217.json b/docs/data/histograms/United States/00A3217.json
index 780b9569ae2..b62d64b3d04 100644
--- a/docs/data/histograms/United States/00A3217.json
+++ b/docs/data/histograms/United States/00A3217.json
@@ -1 +1 @@
-{"batchcode": "00A3217", "histograms": [{"batchcodes": ["00A3217"], "histogram": {"Feeling cold": 1, "Pain in extremity": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "00A3217", "histograms": [{"histogram": {"Feeling cold": 1, "Pain in extremity": 1, "Paraesthesia": 1}, "batchcodes": ["00A3217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00A4212.json b/docs/data/histograms/United States/00A4212.json
index 498e4776599..6f3f77f50ea 100644
--- a/docs/data/histograms/United States/00A4212.json
+++ b/docs/data/histograms/United States/00A4212.json
@@ -1 +1 @@
-{"batchcode": "00A4212", "histograms": [{"batchcodes": ["00A4212"], "histogram": {"Erythema": 1, "Scab": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "00A4212", "histograms": [{"histogram": {"Erythema": 1, "Scab": 1, "Vaccination site erythema": 1}, "batchcodes": ["00A4212"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00A42A.json b/docs/data/histograms/United States/00A42A.json
index 00b84d62ffe..9f896841a64 100644
--- a/docs/data/histograms/United States/00A42A.json
+++ b/docs/data/histograms/United States/00A42A.json
@@ -1 +1 @@
-{"batchcode": "00A42A", "histograms": [{"batchcodes": ["00A42A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "00A42A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["00A42A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00AB212A.json b/docs/data/histograms/United States/00AB212A.json
index 4098a12ada3..54e31f24ef5 100644
--- a/docs/data/histograms/United States/00AB212A.json
+++ b/docs/data/histograms/United States/00AB212A.json
@@ -1 +1 @@
-{"batchcode": "00AB212A", "histograms": [{"batchcodes": ["00AB212A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "00AB212A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["00AB212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00AC21A.json b/docs/data/histograms/United States/00AC21A.json
index 05730ef5112..832fe848fd1 100644
--- a/docs/data/histograms/United States/00AC21A.json
+++ b/docs/data/histograms/United States/00AC21A.json
@@ -1 +1 @@
-{"batchcode": "00AC21A", "histograms": [{"batchcodes": ["00AC21A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Movement disorder": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "00AC21A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Movement disorder": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Visual impairment": 1}, "batchcodes": ["00AC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00B212A.json b/docs/data/histograms/United States/00B212A.json
index 1eb7f974c22..bbde4d1237c 100644
--- a/docs/data/histograms/United States/00B212A.json
+++ b/docs/data/histograms/United States/00B212A.json
@@ -1 +1 @@
-{"batchcode": "00B212A", "histograms": [{"batchcodes": ["00B212A"], "histogram": {"Chest pain": 1, "Lymphadenopathy": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "00B212A", "histograms": [{"histogram": {"Chest pain": 1, "Lymphadenopathy": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["00B212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00B21A.json b/docs/data/histograms/United States/00B21A.json
index 7a194337150..ba92ef6ec54 100644
--- a/docs/data/histograms/United States/00B21A.json
+++ b/docs/data/histograms/United States/00B21A.json
@@ -1 +1 @@
-{"batchcode": "00B21A", "histograms": [{"batchcodes": ["00B21A"], "histogram": {"Axillary pain": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Lip swelling": 1, "Musculoskeletal stiffness": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "00B21A", "histograms": [{"histogram": {"Axillary pain": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Lip swelling": 1, "Musculoskeletal stiffness": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["00B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00BB21A.json b/docs/data/histograms/United States/00BB21A.json
index da989362c9d..6cf9b6d8e94 100644
--- a/docs/data/histograms/United States/00BB21A.json
+++ b/docs/data/histograms/United States/00BB21A.json
@@ -1 +1 @@
-{"batchcode": "00BB21A", "histograms": [{"batchcodes": ["00BB21A"], "histogram": {"Pain in extremity": 1, "Pruritus": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "00BB21A", "histograms": [{"histogram": {"Pain in extremity": 1, "Pruritus": 1, "Rash pruritic": 1}, "batchcodes": ["00BB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00C21A.json b/docs/data/histograms/United States/00C21A.json
index a1e1c347589..a73c480d128 100644
--- a/docs/data/histograms/United States/00C21A.json
+++ b/docs/data/histograms/United States/00C21A.json
@@ -1 +1 @@
-{"batchcode": "00C21A", "histograms": [{"batchcodes": ["00C21A"], "histogram": {"Cerebrovascular accident": 1, "Dyspnoea": 1, "Headache": 1, "Hemiparesis": 1, "Myalgia": 1, "Seizure": 1, "Tongue movement disturbance": 1}}]}
\ No newline at end of file
+{"batchcode": "00C21A", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Dyspnoea": 1, "Headache": 1, "Hemiparesis": 1, "Myalgia": 1, "Seizure": 1, "Tongue movement disturbance": 1}, "batchcodes": ["00C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00C21A2.json b/docs/data/histograms/United States/00C21A2.json
index 085730b1411..a7db94823ee 100644
--- a/docs/data/histograms/United States/00C21A2.json
+++ b/docs/data/histograms/United States/00C21A2.json
@@ -1 +1 @@
-{"batchcode": "00C21A2", "histograms": [{"batchcodes": ["00C21A2"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "00C21A2", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["00C21A2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00C421A.json b/docs/data/histograms/United States/00C421A.json
index 336091c38d1..1c041ebaaa6 100644
--- a/docs/data/histograms/United States/00C421A.json
+++ b/docs/data/histograms/United States/00C421A.json
@@ -1 +1 @@
-{"batchcode": "00C421A", "histograms": [{"batchcodes": ["00C421A"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Hot flush": 1}}]}
\ No newline at end of file
+{"batchcode": "00C421A", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Hot flush": 1}, "batchcodes": ["00C421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00CD21A.json b/docs/data/histograms/United States/00CD21A.json
index 9b135d165c8..376a60778a2 100644
--- a/docs/data/histograms/United States/00CD21A.json
+++ b/docs/data/histograms/United States/00CD21A.json
@@ -1 +1 @@
-{"batchcode": "00CD21A", "histograms": [{"batchcodes": ["00CD21A"], "histogram": {"Insomnia": 1, "Musculoskeletal stiffness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00CD21A", "histograms": [{"histogram": {"Insomnia": 1, "Musculoskeletal stiffness": 1, "Vaccination site pain": 1}, "batchcodes": ["00CD21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00DDZ1A.json b/docs/data/histograms/United States/00DDZ1A.json
index ddc7ad7f8cc..d449f2631ff 100644
--- a/docs/data/histograms/United States/00DDZ1A.json
+++ b/docs/data/histograms/United States/00DDZ1A.json
@@ -1 +1 @@
-{"batchcode": "00DDZ1A", "histograms": [{"batchcodes": ["00DDZ1A"], "histogram": {"Back pain": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Guillain-Barre syndrome": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "00DDZ1A", "histograms": [{"histogram": {"Back pain": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Guillain-Barre syndrome": 1, "Oral pain": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["00DDZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00F20A.json b/docs/data/histograms/United States/00F20A.json
index e703d842027..d8e4f1afdd8 100644
--- a/docs/data/histograms/United States/00F20A.json
+++ b/docs/data/histograms/United States/00F20A.json
@@ -1 +1 @@
-{"batchcode": "00F20A", "histograms": [{"batchcodes": ["00F20A"], "histogram": {"Asthenia": 1, "Chills": 1, "Cold sweat": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "00F20A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Cold sweat": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["00F20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00F21A.json b/docs/data/histograms/United States/00F21A.json
index 68b4064c2c9..feea4285b94 100644
--- a/docs/data/histograms/United States/00F21A.json
+++ b/docs/data/histograms/United States/00F21A.json
@@ -1 +1 @@
-{"batchcode": "00F21A", "histograms": [{"batchcodes": ["00F21A"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Confusional state": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Pallor": 1, "Seizure": 1, "Somnolence": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "00F21A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Confusional state": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Pallor": 1, "Seizure": 1, "Somnolence": 1, "Vision blurred": 1}, "batchcodes": ["00F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00FBZ1A.json b/docs/data/histograms/United States/00FBZ1A.json
index 2fb5be15231..4eb0c93c350 100644
--- a/docs/data/histograms/United States/00FBZ1A.json
+++ b/docs/data/histograms/United States/00FBZ1A.json
@@ -1 +1 @@
-{"batchcode": "00FBZ1A", "histograms": [{"batchcodes": ["00FBZ1A"], "histogram": {"Abdominal discomfort": 1, "Balance disorder": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Rhinorrhoea": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "00FBZ1A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Balance disorder": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Rhinorrhoea": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["00FBZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00FM201.json b/docs/data/histograms/United States/00FM201.json
index f1cf9c538d6..f4e0969c20e 100644
--- a/docs/data/histograms/United States/00FM201.json
+++ b/docs/data/histograms/United States/00FM201.json
@@ -1 +1 @@
-{"batchcode": "00FM201", "histograms": [{"batchcodes": ["00FM201"], "histogram": {"Hair growth rate abnormal": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "00FM201", "histograms": [{"histogram": {"Hair growth rate abnormal": 1, "Myalgia": 1}, "batchcodes": ["00FM201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00GM20A.json b/docs/data/histograms/United States/00GM20A.json
index 657c6a540da..cb9380975b4 100644
--- a/docs/data/histograms/United States/00GM20A.json
+++ b/docs/data/histograms/United States/00GM20A.json
@@ -1 +1 @@
-{"batchcode": "00GM20A", "histograms": [{"batchcodes": ["00GM20A"], "histogram": {"Headache": 1, "Malaise": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "00GM20A", "histograms": [{"histogram": {"Headache": 1, "Malaise": 1, "Rash": 1}, "batchcodes": ["00GM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00HC21A.json b/docs/data/histograms/United States/00HC21A.json
index 1aa2a375e6d..5b453da6278 100644
--- a/docs/data/histograms/United States/00HC21A.json
+++ b/docs/data/histograms/United States/00HC21A.json
@@ -1 +1 @@
-{"batchcode": "00HC21A", "histograms": [{"batchcodes": ["00HC21A"], "histogram": {"Rash": 1, "Sensitive skin": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "00HC21A", "histograms": [{"histogram": {"Rash": 1, "Sensitive skin": 1, "Tenderness": 1}, "batchcodes": ["00HC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00HN02A.json b/docs/data/histograms/United States/00HN02A.json
index 09d5913a288..6e89de0a173 100644
--- a/docs/data/histograms/United States/00HN02A.json
+++ b/docs/data/histograms/United States/00HN02A.json
@@ -1 +1 @@
-{"batchcode": "00HN02A", "histograms": [{"batchcodes": ["00HN02A"], "histogram": {"Erythema": 1, "Injection site warmth": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "00HN02A", "histograms": [{"histogram": {"Erythema": 1, "Injection site warmth": 1, "Rash": 1}, "batchcodes": ["00HN02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00J20A.json b/docs/data/histograms/United States/00J20A.json
index 695e211de8e..77b59bf30e1 100644
--- a/docs/data/histograms/United States/00J20A.json
+++ b/docs/data/histograms/United States/00J20A.json
@@ -1 +1 @@
-{"batchcode": "00J20A", "histograms": [{"batchcodes": ["00J20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "00J20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1}, "batchcodes": ["00J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00J21-2A.json b/docs/data/histograms/United States/00J21-2A.json
index e76ffa01db7..d1919d4d7b3 100644
--- a/docs/data/histograms/United States/00J21-2A.json
+++ b/docs/data/histograms/United States/00J21-2A.json
@@ -1 +1 @@
-{"batchcode": "00J21-2A", "histograms": [{"batchcodes": ["00J21-2A"], "histogram": {"Expired product administered": 2, "Product storage error": 2}}]}
\ No newline at end of file
+{"batchcode": "00J21-2A", "histograms": [{"histogram": {"Expired product administered": 2, "Product storage error": 2}, "batchcodes": ["00J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00JAZ1A.json b/docs/data/histograms/United States/00JAZ1A.json
index 2e883cd3ec4..5fe8cd4de39 100644
--- a/docs/data/histograms/United States/00JAZ1A.json
+++ b/docs/data/histograms/United States/00JAZ1A.json
@@ -1 +1 @@
-{"batchcode": "00JAZ1A", "histograms": [{"batchcodes": ["00JAZ1A"], "histogram": {"Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "00JAZ1A", "histograms": [{"histogram": {"Vaccination site rash": 1}, "batchcodes": ["00JAZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00LCA1A.json b/docs/data/histograms/United States/00LCA1A.json
index 39e73f7a09f..386f9483da3 100644
--- a/docs/data/histograms/United States/00LCA1A.json
+++ b/docs/data/histograms/United States/00LCA1A.json
@@ -1 +1 @@
-{"batchcode": "00LCA1A", "histograms": [{"batchcodes": ["00LCA1A"], "histogram": {"Agitation": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "00LCA1A", "histograms": [{"histogram": {"Agitation": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["00LCA1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00LEZ0A.json b/docs/data/histograms/United States/00LEZ0A.json
index 9206c91308f..a5201413446 100644
--- a/docs/data/histograms/United States/00LEZ0A.json
+++ b/docs/data/histograms/United States/00LEZ0A.json
@@ -1 +1 @@
-{"batchcode": "00LEZ0A", "histograms": [{"batchcodes": ["00LEZ0A"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00LEZ0A", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["00LEZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00M00A.json b/docs/data/histograms/United States/00M00A.json
index 59c14c1af9e..56e9cc16927 100644
--- a/docs/data/histograms/United States/00M00A.json
+++ b/docs/data/histograms/United States/00M00A.json
@@ -1 +1 @@
-{"batchcode": "00M00A", "histograms": [{"batchcodes": ["00M00A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00M00A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["00M00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00M20A.json b/docs/data/histograms/United States/00M20A.json
index 05285f28452..72f1e2a4d2a 100644
--- a/docs/data/histograms/United States/00M20A.json
+++ b/docs/data/histograms/United States/00M20A.json
@@ -1 +1 @@
-{"batchcode": "00M20A", "histograms": [{"batchcodes": ["00M20A"], "histogram": {"Aphasia": 1, "Cerebrovascular accident": 1, "Expired product administered": 1, "Fatigue": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "00M20A", "histograms": [{"histogram": {"Aphasia": 1, "Cerebrovascular accident": 1, "Expired product administered": 1, "Fatigue": 1, "Vaccination site erythema": 1}, "batchcodes": ["00M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00RB21A.json b/docs/data/histograms/United States/00RB21A.json
index 6acd06d25e0..a1b99bb9b1b 100644
--- a/docs/data/histograms/United States/00RB21A.json
+++ b/docs/data/histograms/United States/00RB21A.json
@@ -1 +1 @@
-{"batchcode": "00RB21A", "histograms": [{"batchcodes": ["00RB21A"], "histogram": {"Balance disorder": 1, "Bone pain": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Gait inability": 1, "Gastritis": 1, "Headache": 1, "Hypotension": 1, "Paresis": 1, "Sinusitis": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "00RB21A", "histograms": [{"histogram": {"Balance disorder": 1, "Bone pain": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Gait inability": 1, "Gastritis": 1, "Headache": 1, "Hypotension": 1, "Paresis": 1, "Sinusitis": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["00RB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00SC212.json b/docs/data/histograms/United States/00SC212.json
index 4dbfafe040b..2f3c9515661 100644
--- a/docs/data/histograms/United States/00SC212.json
+++ b/docs/data/histograms/United States/00SC212.json
@@ -1 +1 @@
-{"batchcode": "00SC212", "histograms": [{"batchcodes": ["00SC212"], "histogram": {"Pyrexia": 2, "Asthenia": 1, "Diarrhoea": 1, "Dysstasia": 1, "Induration": 1, "Myalgia": 1, "Peripheral swelling": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00SC212", "histograms": [{"histogram": {"Pyrexia": 2, "Asthenia": 1, "Diarrhoea": 1, "Dysstasia": 1, "Induration": 1, "Myalgia": 1, "Peripheral swelling": 1, "Vaccination site swelling": 1}, "batchcodes": ["00SC212"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00SC21A.json b/docs/data/histograms/United States/00SC21A.json
index f23a7a698a2..fcfb93e67f5 100644
--- a/docs/data/histograms/United States/00SC21A.json
+++ b/docs/data/histograms/United States/00SC21A.json
@@ -1 +1 @@
-{"batchcode": "00SC21A", "histograms": [{"batchcodes": ["00SC21A"], "histogram": {"Fatigue": 2, "Ageusia": 1, "Arthralgia": 1, "Blood glucose": 1, "Body temperature": 1, "Decreased appetite": 1, "Feeling of body temperature change": 1, "Headache": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Lacrimation increased": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sneezing": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00SC21A", "histograms": [{"histogram": {"Fatigue": 2, "Ageusia": 1, "Arthralgia": 1, "Blood glucose": 1, "Body temperature": 1, "Decreased appetite": 1, "Feeling of body temperature change": 1, "Headache": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Lacrimation increased": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Sneezing": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["00SC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00SM20A.json b/docs/data/histograms/United States/00SM20A.json
index 2c460351a26..3099e5b09dd 100644
--- a/docs/data/histograms/United States/00SM20A.json
+++ b/docs/data/histograms/United States/00SM20A.json
@@ -1 +1 @@
-{"batchcode": "00SM20A", "histograms": [{"batchcodes": ["00SM20A"], "histogram": {"Abdominal pain upper": 1, "Dizziness": 1, "Fatigue": 1, "Musculoskeletal stiffness": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "00SM20A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Dizziness": 1, "Fatigue": 1, "Musculoskeletal stiffness": 1, "Vomiting": 1}, "batchcodes": ["00SM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00TM200A.json b/docs/data/histograms/United States/00TM200A.json
index e2cd08d0eef..c8eb8ced35d 100644
--- a/docs/data/histograms/United States/00TM200A.json
+++ b/docs/data/histograms/United States/00TM200A.json
@@ -1 +1 @@
-{"batchcode": "00TM200A", "histograms": [{"batchcodes": ["00TM200A"], "histogram": {"Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "00TM200A", "histograms": [{"histogram": {"Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["00TM200A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00TM20A.json b/docs/data/histograms/United States/00TM20A.json
index a1b72ed4bb9..ae17c99dc80 100644
--- a/docs/data/histograms/United States/00TM20A.json
+++ b/docs/data/histograms/United States/00TM20A.json
@@ -1 +1 @@
-{"batchcode": "00TM20A", "histograms": [{"batchcodes": ["00TM20A"], "histogram": {"Ear pain": 1, "Hypersensitivity": 1, "Injection site pain": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "00TM20A", "histograms": [{"histogram": {"Ear pain": 1, "Hypersensitivity": 1, "Injection site pain": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Seizure": 1}, "batchcodes": ["00TM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00UB21H.json b/docs/data/histograms/United States/00UB21H.json
index 6633b078636..4fd1febe8b4 100644
--- a/docs/data/histograms/United States/00UB21H.json
+++ b/docs/data/histograms/United States/00UB21H.json
@@ -1 +1 @@
-{"batchcode": "00UB21H", "histograms": [{"batchcodes": ["00UB21H"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "00UB21H", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["00UB21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00UM20A.json b/docs/data/histograms/United States/00UM20A.json
index f9f838491b1..35301fa4210 100644
--- a/docs/data/histograms/United States/00UM20A.json
+++ b/docs/data/histograms/United States/00UM20A.json
@@ -1 +1 @@
-{"batchcode": "00UM20A", "histograms": [{"batchcodes": ["00UM20A"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hypokinesia": 1, "Illness": 1, "Nausea": 1, "Pain in extremity": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "00UM20A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Hypokinesia": 1, "Illness": 1, "Nausea": 1, "Pain in extremity": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["00UM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00VF21A.json b/docs/data/histograms/United States/00VF21A.json
index 69248dd4699..e972ca8fb48 100644
--- a/docs/data/histograms/United States/00VF21A.json
+++ b/docs/data/histograms/United States/00VF21A.json
@@ -1 +1 @@
-{"batchcode": "00VF21A", "histograms": [{"batchcodes": ["00VF21A"], "histogram": {"Erythema": 1, "Feeling hot": 1, "Inappropriate schedule of product administration": 1, "Peripheral swelling": 1, "Pruritus": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "00VF21A", "histograms": [{"histogram": {"Erythema": 1, "Feeling hot": 1, "Inappropriate schedule of product administration": 1, "Peripheral swelling": 1, "Pruritus": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1}, "batchcodes": ["00VF21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00ZAZ1A.json b/docs/data/histograms/United States/00ZAZ1A.json
index acba5ffd329..ca55ae3fb4f 100644
--- a/docs/data/histograms/United States/00ZAZ1A.json
+++ b/docs/data/histograms/United States/00ZAZ1A.json
@@ -1 +1 @@
-{"batchcode": "00ZAZ1A", "histograms": [{"batchcodes": ["00ZAZ1A"], "histogram": {"Chills": 2, "Diarrhoea": 2, "Injection site warmth": 2, "Pyrexia": 2, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "00ZAZ1A", "histograms": [{"histogram": {"Chills": 2, "Diarrhoea": 2, "Injection site warmth": 2, "Pyrexia": 2, "Vaccination complication": 1}, "batchcodes": ["00ZAZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00ZAZIA.json b/docs/data/histograms/United States/00ZAZIA.json
index 3ed33e53a9a..4da150c30e7 100644
--- a/docs/data/histograms/United States/00ZAZIA.json
+++ b/docs/data/histograms/United States/00ZAZIA.json
@@ -1 +1 @@
-{"batchcode": "00ZAZIA", "histograms": [{"batchcodes": ["00ZAZIA"], "histogram": {"Headache": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "00ZAZIA", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["00ZAZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00ZB21A.json b/docs/data/histograms/United States/00ZB21A.json
index a4bb0512226..d3c33f4c507 100644
--- a/docs/data/histograms/United States/00ZB21A.json
+++ b/docs/data/histograms/United States/00ZB21A.json
@@ -1 +1 @@
-{"batchcode": "00ZB21A", "histograms": [{"batchcodes": ["00ZB21A"], "histogram": {"Axillary pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "00ZB21A", "histograms": [{"histogram": {"Axillary pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1, "Swelling": 1}, "batchcodes": ["00ZB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00ZC ZIA.json b/docs/data/histograms/United States/00ZC ZIA.json
index 6ff4fcf10d8..f9f26c29322 100644
--- a/docs/data/histograms/United States/00ZC ZIA.json
+++ b/docs/data/histograms/United States/00ZC ZIA.json
@@ -1 +1 @@
-{"batchcode": "00ZC ZIA", "histograms": [{"batchcodes": ["00ZC ZIA"], "histogram": {"Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "00ZC ZIA", "histograms": [{"histogram": {"Injection site pruritus": 1}, "batchcodes": ["00ZC ZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/00ZM21A.json b/docs/data/histograms/United States/00ZM21A.json
index c0eb809f129..3ba59616ed0 100644
--- a/docs/data/histograms/United States/00ZM21A.json
+++ b/docs/data/histograms/United States/00ZM21A.json
@@ -1 +1 @@
-{"batchcode": "00ZM21A", "histograms": [{"batchcodes": ["00ZM21A", "EL892Z"], "histogram": {"COVID-19 immunisation": 1, "Cerebrovascular accident": 1, "Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "00ZM21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Cerebrovascular accident": 1, "Interchange of vaccine products": 1}, "batchcodes": ["00ZM21A", "EL892Z"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01-A214.json b/docs/data/histograms/United States/01-A214.json
index c96847e84c7..94315999a85 100644
--- a/docs/data/histograms/United States/01-A214.json
+++ b/docs/data/histograms/United States/01-A214.json
@@ -1 +1 @@
-{"batchcode": "01-A214", "histograms": [{"batchcodes": ["01-A214"], "histogram": {"Pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "01-A214", "histograms": [{"histogram": {"Pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["01-A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01/A2A.json b/docs/data/histograms/United States/01/A2A.json
index 3292bce9cda..c761b6a6ca7 100644
--- a/docs/data/histograms/United States/01/A2A.json
+++ b/docs/data/histograms/United States/01/A2A.json
@@ -1 +1 @@
-{"batchcode": "01/A2A", "histograms": [{"batchcodes": ["01/A2A"], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "01/A2A", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["01/A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010'N' 120A.json b/docs/data/histograms/United States/010'N' 120A.json
index 01f2a276abb..48254799b54 100644
--- a/docs/data/histograms/United States/010'N' 120A.json
+++ b/docs/data/histograms/United States/010'N' 120A.json
@@ -1 +1 @@
-{"batchcode": "010'N' 120A", "histograms": [{"batchcodes": ["010'N' 120A"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Mobility decreased": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Periarthritis": 1}}]}
\ No newline at end of file
+{"batchcode": "010'N' 120A", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Mobility decreased": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Periarthritis": 1}, "batchcodes": ["010'N' 120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010021A.json b/docs/data/histograms/United States/010021A.json
index 8d0b03bc6b9..4520876c888 100644
--- a/docs/data/histograms/United States/010021A.json
+++ b/docs/data/histograms/United States/010021A.json
@@ -1 +1 @@
-{"batchcode": "010021A", "histograms": [{"batchcodes": ["010021A"], "histogram": {"Abdominal pain": 1, "Asthenia": 1, "Computerised tomogram": 1, "Headache": 1, "Illness": 1, "Joint noise": 1, "Myalgia": 1, "Pericardial effusion": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "010021A", "histograms": [{"histogram": {"Abdominal pain": 1, "Asthenia": 1, "Computerised tomogram": 1, "Headache": 1, "Illness": 1, "Joint noise": 1, "Myalgia": 1, "Pericardial effusion": 1, "Pyrexia": 1}, "batchcodes": ["010021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010038077727399.json b/docs/data/histograms/United States/010038077727399.json
index 12912c89c48..3675581f4fa 100644
--- a/docs/data/histograms/United States/010038077727399.json
+++ b/docs/data/histograms/United States/010038077727399.json
@@ -1 +1 @@
-{"batchcode": "010038077727399", "histograms": [{"batchcodes": ["010038077727399"], "histogram": {"Discomfort": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Myocardial infarction": 1, "Nausea": 1, "Pain in extremity": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "010038077727399", "histograms": [{"histogram": {"Discomfort": 1, "Dyspnoea": 1, "Hypoaesthesia": 1, "Myocardial infarction": 1, "Nausea": 1, "Pain in extremity": 1, "Vomiting": 1}, "batchcodes": ["010038077727399"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0100A21A.json b/docs/data/histograms/United States/0100A21A.json
index 8cb21f4b50e..37e2136258e 100644
--- a/docs/data/histograms/United States/0100A21A.json
+++ b/docs/data/histograms/United States/0100A21A.json
@@ -1 +1 @@
-{"batchcode": "0100A21A", "histograms": [{"batchcodes": ["0100A21A"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "0100A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Paraesthesia": 1}, "batchcodes": ["0100A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01010H21A.json b/docs/data/histograms/United States/01010H21A.json
index c8a528fd19d..f048e8b49b7 100644
--- a/docs/data/histograms/United States/01010H21A.json
+++ b/docs/data/histograms/United States/01010H21A.json
@@ -1 +1 @@
-{"batchcode": "01010H21A", "histograms": [{"batchcodes": ["01010H21A"], "histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "01010H21A", "histograms": [{"histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1, "Underdose": 1}, "batchcodes": ["01010H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0101421A.json b/docs/data/histograms/United States/0101421A.json
index 06a7dd0f3ec..a816366787a 100644
--- a/docs/data/histograms/United States/0101421A.json
+++ b/docs/data/histograms/United States/0101421A.json
@@ -1 +1 @@
-{"batchcode": "0101421A", "histograms": [{"batchcodes": ["0101421A"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "0101421A", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["0101421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0101720A.json b/docs/data/histograms/United States/0101720A.json
index 7f96731503c..494e1b7c911 100644
--- a/docs/data/histograms/United States/0101720A.json
+++ b/docs/data/histograms/United States/0101720A.json
@@ -1 +1 @@
-{"batchcode": "0101720A", "histograms": [{"batchcodes": ["0101720A"], "histogram": {"Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0101720A", "histograms": [{"histogram": {"Vaccination site rash": 1}, "batchcodes": ["0101720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0101921A.json b/docs/data/histograms/United States/0101921A.json
index 1cd67779233..77f7b1e7c0b 100644
--- a/docs/data/histograms/United States/0101921A.json
+++ b/docs/data/histograms/United States/0101921A.json
@@ -1 +1 @@
-{"batchcode": "0101921A", "histograms": [{"batchcodes": ["0101921A"], "histogram": {"Arthralgia": 1, "Mobility decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "0101921A", "histograms": [{"histogram": {"Arthralgia": 1, "Mobility decreased": 1}, "batchcodes": ["0101921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0101A21A.json b/docs/data/histograms/United States/0101A21A.json
index cb0c25b62b6..c534d31ad98 100644
--- a/docs/data/histograms/United States/0101A21A.json
+++ b/docs/data/histograms/United States/0101A21A.json
@@ -1 +1 @@
-{"batchcode": "0101A21A", "histograms": [{"batchcodes": ["0101A21A"], "histogram": {"Blood test": 2, "Nausea": 2, "Vomiting": 2, "Adverse reaction": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Decreased appetite": 1, "Diplopia": 1, "Dizziness": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gastritis": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Injection site pain": 1, "Migraine": 1, "Muscle spasms": 1, "Musculoskeletal chest pain": 1, "Nervous system disorder": 1, "No adverse event": 1, "Off label use": 1, "Oxygen saturation": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Rheumatoid arthritis": 1, "Somnolence": 1, "Thirst": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "0101A21A", "histograms": [{"histogram": {"Blood test": 2, "Nausea": 2, "Vomiting": 2, "Adverse reaction": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Decreased appetite": 1, "Diplopia": 1, "Dizziness": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gastritis": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Injection site pain": 1, "Migraine": 1, "Muscle spasms": 1, "Musculoskeletal chest pain": 1, "Nervous system disorder": 1, "No adverse event": 1, "Off label use": 1, "Oxygen saturation": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Rheumatoid arthritis": 1, "Somnolence": 1, "Thirst": 1, "Vertigo": 1}, "batchcodes": ["0101A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01020A.json b/docs/data/histograms/United States/01020A.json
index 90c9b7f4988..d8f71272165 100644
--- a/docs/data/histograms/United States/01020A.json
+++ b/docs/data/histograms/United States/01020A.json
@@ -1 +1 @@
-{"batchcode": "01020A", "histograms": [{"batchcodes": ["01020A"], "histogram": {"Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "01020A", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["01020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0102A1A.json b/docs/data/histograms/United States/0102A1A.json
index c82914dd13d..47609e616f6 100644
--- a/docs/data/histograms/United States/0102A1A.json
+++ b/docs/data/histograms/United States/0102A1A.json
@@ -1 +1 @@
-{"batchcode": "0102A1A", "histograms": [{"batchcodes": ["0102A1A"], "histogram": {"Heart rate increased": 1}}]}
\ No newline at end of file
+{"batchcode": "0102A1A", "histograms": [{"histogram": {"Heart rate increased": 1}, "batchcodes": ["0102A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0104214.json b/docs/data/histograms/United States/0104214.json
index ae55ebbacf2..898e476ace0 100644
--- a/docs/data/histograms/United States/0104214.json
+++ b/docs/data/histograms/United States/0104214.json
@@ -1 +1 @@
-{"batchcode": "0104214", "histograms": [{"batchcodes": ["0104214"], "histogram": {"Maternal exposure during pregnancy": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0104214", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1, "Pain in extremity": 1}, "batchcodes": ["0104214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0104217.json b/docs/data/histograms/United States/0104217.json
index 847296dade6..7f214402990 100644
--- a/docs/data/histograms/United States/0104217.json
+++ b/docs/data/histograms/United States/0104217.json
@@ -1 +1 @@
-{"batchcode": "0104217", "histograms": [{"batchcodes": ["0104217"], "histogram": {"Discomfort": 1, "Injection site swelling": 1, "Injection site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0104217", "histograms": [{"histogram": {"Discomfort": 1, "Injection site swelling": 1, "Injection site urticaria": 1}, "batchcodes": ["0104217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010421A.json b/docs/data/histograms/United States/010421A.json
index 61621cd0404..a38a50cc7d5 100644
--- a/docs/data/histograms/United States/010421A.json
+++ b/docs/data/histograms/United States/010421A.json
@@ -1 +1 @@
-{"batchcode": "010421A", "histograms": [{"batchcodes": ["010421A"], "histogram": {"Fatigue": 2, "Chills": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Spinal pain": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "010421A", "histograms": [{"histogram": {"Fatigue": 2, "Chills": 1, "Headache": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Spinal pain": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["010421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0104M20A.json b/docs/data/histograms/United States/0104M20A.json
index de379560f7e..c02df7469fc 100644
--- a/docs/data/histograms/United States/0104M20A.json
+++ b/docs/data/histograms/United States/0104M20A.json
@@ -1 +1 @@
-{"batchcode": "0104M20A", "histograms": [{"batchcodes": ["0104M20A"], "histogram": {"Deafness neurosensory": 1}}]}
\ No newline at end of file
+{"batchcode": "0104M20A", "histograms": [{"histogram": {"Deafness neurosensory": 1}, "batchcodes": ["0104M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0108214.json b/docs/data/histograms/United States/0108214.json
index 2ad7d80d293..7e54e7159fa 100644
--- a/docs/data/histograms/United States/0108214.json
+++ b/docs/data/histograms/United States/0108214.json
@@ -1 +1 @@
-{"batchcode": "0108214", "histograms": [{"batchcodes": ["0108214"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "0108214", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["0108214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010821A.json b/docs/data/histograms/United States/010821A.json
index 8b7ba0ee5b9..a2c688ed88d 100644
--- a/docs/data/histograms/United States/010821A.json
+++ b/docs/data/histograms/United States/010821A.json
@@ -1 +1 @@
-{"batchcode": "010821A", "histograms": [{"batchcodes": ["010821A"], "histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Asthenia": 1, "Dysgeusia": 1, "Fatigue": 1, "Flatulence": 1, "Insomnia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Swollen tongue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010821A", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Asthenia": 1, "Dysgeusia": 1, "Fatigue": 1, "Flatulence": 1, "Insomnia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Swollen tongue": 1, "Vaccination site pain": 1}, "batchcodes": ["010821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0108AZ1A.json b/docs/data/histograms/United States/0108AZ1A.json
index d6d232fb35c..dfae0c36055 100644
--- a/docs/data/histograms/United States/0108AZ1A.json
+++ b/docs/data/histograms/United States/0108AZ1A.json
@@ -1 +1 @@
-{"batchcode": "0108AZ1A", "histograms": [{"batchcodes": ["0108AZ1A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0108AZ1A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["0108AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010921A.json b/docs/data/histograms/United States/010921A.json
index eee65d5723b..65c49c76778 100644
--- a/docs/data/histograms/United States/010921A.json
+++ b/docs/data/histograms/United States/010921A.json
@@ -1 +1 @@
-{"batchcode": "010921A", "histograms": [{"batchcodes": ["010921A"], "histogram": {"Diarrhoea": 1, "Erythema": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "010921A", "histograms": [{"histogram": {"Diarrhoea": 1, "Erythema": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1}, "batchcodes": ["010921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A20A.json b/docs/data/histograms/United States/010A20A.json
index fa6f42c8c20..b77505783a3 100644
--- a/docs/data/histograms/United States/010A20A.json
+++ b/docs/data/histograms/United States/010A20A.json
@@ -1 +1 @@
-{"batchcode": "010A20A", "histograms": [{"batchcodes": ["010A20A"], "histogram": {"Pain in extremity": 3, "Fatigue": 2, "Myalgia": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Injection site pain": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "010A20A", "histograms": [{"histogram": {"Pain in extremity": 3, "Fatigue": 2, "Myalgia": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Injection site pain": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["010A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A21.json b/docs/data/histograms/United States/010A21.json
index 910250b9000..d5bb2af9f4f 100644
--- a/docs/data/histograms/United States/010A21.json
+++ b/docs/data/histograms/United States/010A21.json
@@ -1 +1 @@
-{"batchcode": "010A21", "histograms": [{"batchcodes": ["010A21"], "histogram": {"Discomfort": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Presyncope": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010A21", "histograms": [{"histogram": {"Discomfort": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Presyncope": 1, "Vaccination site pain": 1}, "batchcodes": ["010A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A211A.json b/docs/data/histograms/United States/010A211A.json
index 2b81a33c85e..02e26c63d10 100644
--- a/docs/data/histograms/United States/010A211A.json
+++ b/docs/data/histograms/United States/010A211A.json
@@ -1 +1 @@
-{"batchcode": "010A211A", "histograms": [{"batchcodes": ["010A211A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Limb discomfort": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "010A211A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Limb discomfort": 1, "Myalgia": 1}, "batchcodes": ["010A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A214.json b/docs/data/histograms/United States/010A214.json
index 78c4d815f55..0a325bc0fac 100644
--- a/docs/data/histograms/United States/010A214.json
+++ b/docs/data/histograms/United States/010A214.json
@@ -1 +1 @@
-{"batchcode": "010A214", "histograms": [{"batchcodes": ["010A214"], "histogram": {"Rash": 2, "Atrial flutter": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site rash": 1, "Injection site swelling": 1, "Mass": 1, "Rash pruritic": 1, "Urticaria": 1, "Vaccination site induration": 1}}]}
\ No newline at end of file
+{"batchcode": "010A214", "histograms": [{"histogram": {"Rash": 2, "Atrial flutter": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site rash": 1, "Injection site swelling": 1, "Mass": 1, "Rash pruritic": 1, "Urticaria": 1, "Vaccination site induration": 1}, "batchcodes": ["010A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A218A.json b/docs/data/histograms/United States/010A218A.json
index 16d0700f6d4..cf16f41af8e 100644
--- a/docs/data/histograms/United States/010A218A.json
+++ b/docs/data/histograms/United States/010A218A.json
@@ -1 +1 @@
-{"batchcode": "010A218A", "histograms": [{"batchcodes": ["010A218A"], "histogram": {"Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "010A218A", "histograms": [{"histogram": {"Throat irritation": 1}, "batchcodes": ["010A218A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A21A.json b/docs/data/histograms/United States/010A21A.json
index 2572b9cae51..85cd1d0d692 100644
--- a/docs/data/histograms/United States/010A21A.json
+++ b/docs/data/histograms/United States/010A21A.json
@@ -1 +1 @@
-{"batchcode": "010A21A", "histograms": [{"batchcodes": ["010A21A", "048B21A"], "histogram": {"Product administration error": 1}}, {"batchcodes": ["010A21A"], "histogram": {"Fatigue": 127, "Headache": 124, "Pyrexia": 94, "Pain in extremity": 88, "Chills": 82, "Myalgia": 77, "Nausea": 72, "Vaccination site pain": 64, "Pain": 57, "Dizziness": 45, "Arthralgia": 44, "Pruritus": 44, "Vaccination site erythema": 44, "Diarrhoea": 35, "Vaccination site pruritus": 34, "Asthenia": 33, "Erythema": 33, "Expired product administered": 33, "Rash": 33, "Feeling abnormal": 31, "Vaccination site swelling": 31, "Body temperature": 24, "Vaccination site warmth": 23, "Vaccination site rash": 22, "Insomnia": 21, "Peripheral swelling": 21, "Inappropriate schedule of product administration": 19, "Decreased appetite": 18, "Dyspnoea": 18, "SARS-CoV-2 test": 18, "Vomiting": 18, "Feeling hot": 17, "Urticaria": 16, "Back pain": 15, "Hypoaesthesia": 15, "Blood pressure measurement": 14, "COVID-19": 14, "Abdominal discomfort": 13, "Injection site pain": 13, "Blood test": 12, "Cough": 12, "Illness": 12, "Influenza like illness": 12, "Neck pain": 12, "Palpitations": 12, "Somnolence": 12, "Lymphadenopathy": 11, "Malaise": 11, "Muscle spasms": 11, "Product dose omission issue": 11, "Rhinorrhoea": 11, "Vaccination complication": 11, "Vertigo": 11, "Gait disturbance": 10, "Head discomfort": 10, "Paraesthesia": 10, "Swelling face": 10, "Tremor": 10, "Abdominal pain": 9, "Abdominal pain upper": 9, "Balance disorder": 9, "Condition aggravated": 9, "Heart rate": 9, "Injection site swelling": 9, "Rash macular": 9, "Chest pain": 8, "Hyperhidrosis": 8, "Hypersensitivity": 8, "Magnetic resonance imaging": 8, "Migraine": 8, "Swelling": 8, "Tinnitus": 8, "Vaccination site mass": 8, "Anxiety": 7, "Computerised tomogram": 7, "Electrocardiogram": 7, "Herpes zoster": 7, "Joint swelling": 7, "Musculoskeletal stiffness": 7, "Oropharyngeal pain": 7, "Paraesthesia oral": 7, "Product storage error": 7, "Vaccination site induration": 7, "Ageusia": 6, "Feeling cold": 6, "Inflammation": 6, "Injection site erythema": 6, "Loss of consciousness": 6, "Mobility decreased": 6, "Nasopharyngitis": 6, "Rash pruritic": 6, "Tenderness": 6, "Therapeutic response unexpected": 6, "Visual impairment": 6, "Bone pain": 5, "Chest X-ray": 5, "Chest discomfort": 5, "Eye swelling": 5, "Fall": 5, "Injection site rash": 5, "Limb discomfort": 5, "Loss of personal independence in daily activities": 5, "Off label use": 5, "Rash erythematous": 5, "Skin discolouration": 5, "Sluggishness": 5, "Vaccination site reaction": 5, "Vision blurred": 5, "Anaemia": 4, "Burning sensation": 4, "Contusion": 4, "Eye pain": 4, "Hypertension": 4, "Hypoaesthesia oral": 4, "Incorrect route of product administration": 4, "Injection site pruritus": 4, "Injection site warmth": 4, "Maternal exposure during pregnancy": 4, "Memory impairment": 4, "Nervousness": 4, "Neuralgia": 4, "Ocular hyperaemia": 4, "Product administered to patient of inappropriate age": 4, "Restlessness": 4, "SARS-CoV-2 test positive": 4, "Sneezing": 4, "Taste disorder": 4, "Anosmia": 3, "Axillary pain": 3, "Body temperature decreased": 3, "Dehydration": 3, "Dysarthria": 3, "Dysgeusia": 3, "Feeding disorder": 3, "Flatulence": 3, "Flushing": 3, "Gait inability": 3, "Hypokinesia": 3, "Lethargy": 3, "Lymphoedema": 3, "Menstruation irregular": 3, "Muscular weakness": 3, "Musculoskeletal discomfort": 3, "Night sweats": 3, "Oral herpes": 3, "Pain in jaw": 3, "Panic attack": 3, "SARS-CoV-2 antibody test": 3, "Sleep disorder": 3, "Tachycardia": 3, "Throat irritation": 3, "Vaccination site bruising": 3, "Vaccination site haemorrhage": 3, "Acne": 2, "Allergy to vaccine": 2, "Antibody test": 2, "Arthritis": 2, "Autoimmune disorder": 2, "Axillary mass": 2, "Biopsy": 2, "Blister": 2, "Blood glucose": 2, "Blood glucose decreased": 2, "Blood pressure increased": 2, "Body temperature fluctuation": 2, "Body temperature increased": 2, "Breast pain": 2, "Cerebrovascular accident": 2, "Circumoral swelling": 2, "Confusional state": 2, "Dermatitis contact": 2, "Disorientation": 2, "Dyskinesia": 2, "Dyspepsia": 2, "Dysphonia": 2, "Dysstasia": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Embolic stroke": 2, "Energy increased": 2, "Exposure during pregnancy": 2, "Eye haemorrhage": 2, "Feeling jittery": 2, "Full blood count": 2, "Haemoptysis": 2, "Heart rate increased": 2, "Hyperlipidaemia": 2, "Hypersomnia": 2, "Injection site bruising": 2, "Injection site hypoaesthesia": 2, "Injection site induration": 2, "Injection site mass": 2, "Injection site paraesthesia": 2, "Injection site reaction": 2, "Intermenstrual bleeding": 2, "Iron deficiency": 2, "Lacrimation increased": 2, "Lip blister": 2, "Lip pruritus": 2, "Lip swelling": 2, "Mass": 2, "Menstrual disorder": 2, "Movement disorder": 2, "Nasal congestion": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oral mucosal blistering": 2, "Oropharyngeal discomfort": 2, "Otitis externa": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Pigmentation disorder": 2, "Pneumonia": 2, "Pulmonary embolism": 2, "Renal pain": 2, "Seizure": 2, "Sensitive skin": 2, "Thinking abnormal": 2, "Thirst": 2, "Transient global amnesia": 2, "Ultrasound scan": 2, "Underdose": 2, "Urinary incontinence": 2, "Vaccination site discharge": 2, "Vaccination site discomfort": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vital signs measurement": 2, "Wheezing": 2, "Wrong technique in product usage process": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal sensation in eye": 1, "Abortion of ectopic pregnancy": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Adnexa uteri pain": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Adverse reaction": 1, "Alanine aminotransferase increased": 1, "Ammonia": 1, "Ammonia increased": 1, "Amnesia": 1, "Anger": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Aphonia": 1, "Appetite disorder": 1, "Arthritis reactive": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Asthma": 1, "Back injury": 1, "Bedridden": 1, "Biopsy lung": 1, "Blepharospasm": 1, "Blindness": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood sodium increased": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Bone swelling": 1, "Brain neoplasm": 1, "Brain oedema": 1, "Breast cancer": 1, "Bronchitis chronic": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Central nervous system vasculitis": 1, "Cholelithiasis": 1, "Chromatopsia": 1, "Chromaturia": 1, "Clostridium difficile colitis": 1, "Clumsiness": 1, "Cluster headache": 1, "Coagulopathy": 1, "Coeliac artery compression syndrome": 1, "Cognitive disorder": 1, "Cold-stimulus headache": 1, "Colitis": 1, "Complication associated with device": 1, "Computerised tomogram thorax": 1, "Cyst": 1, "Cystitis": 1, "Deafness": 1, "Delusion": 1, "Diplopia": 1, "Discomfort": 1, "Dissociation": 1, "Disturbance in attention": 1, "Drug abuse": 1, "Drug ineffective": 1, "Drug interaction": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysphemia": 1, "Eating disorder": 1, "Epistaxis": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Facial discomfort": 1, "Facial pain": 1, "Faeces discoloured": 1, "Fluid retention": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gastrointestinal inflammation": 1, "Gingival pruritus": 1, "Gingival ulceration": 1, "Globulin": 1, "Gout": 1, "Guttate psoriasis": 1, "Haemoglobin decreased": 1, "Haemorrhoids": 1, "Head injury": 1, "Head titubation": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hiccups": 1, "Hot flush": 1, "Hunger": 1, "Hyperacusis": 1, "Hypotension": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Incoherent": 1, "Incorrect dose administered": 1, "Infection": 1, "Infection prophylaxis": 1, "Inflammatory marker test": 1, "Influenza": 1, "Influenza virus test positive": 1, "Injected limb mobility decreased": 1, "Injection related reaction": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site inflammation": 1, "Injection site joint warmth": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Irritability": 1, "Limb injury": 1, "Lip dry": 1, "Lip haemorrhage": 1, "Listless": 1, "Liver disorder": 1, "Lung adenocarcinoma": 1, "Lung cyst": 1, "Lymph node pain": 1, "Magnetic resonance imaging head": 1, "Malabsorption": 1, "Mammogram": 1, "Mammogram abnormal": 1, "Mass excision": 1, "Maternal exposure during breast feeding": 1, "Mental impairment": 1, "Meralgia paraesthetica": 1, "Metastases to oesophagus": 1, "Metastases to trachea": 1, "Miosis": 1, "Motion sickness": 1, "Mouth swelling": 1, "Mucosal inflammation": 1, "Muscle contractions involuntary": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle swelling": 1, "Musculoskeletal disorder": 1, "Myocardial infarction": 1, "Nerve compression": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Noninfective gingivitis": 1, "Noninfective sialoadenitis": 1, "Odynophagia": 1, "Ophthalmic migraine": 1, "Oral discomfort": 1, "Oral mucosal erythema": 1, "Oral pain": 1, "Osteoarthritis": 1, "Oxygen saturation": 1, "Pancreatitis acute": 1, "Paranoia": 1, "Parosmia": 1, "Parotid gland enlargement": 1, "Periarthritis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Philadelphia chromosome positive": 1, "Pollakiuria": 1, "Postmenopausal haemorrhage": 1, "Pre-existing condition improved": 1, "Pregnancy": 1, "Pregnancy test": 1, "Premenstrual syndrome": 1, "Presyncope": 1, "Product administration error": 1, "Product administration interrupted": 1, "Product use in unapproved indication": 1, "Productive cough": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "Pulmonary oedema": 1, "Pulmonary pain": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red blood cell sedimentation rate": 1, "Respiratory rate": 1, "Retinal tear": 1, "Retracted nipple": 1, "Rheumatoid arthritis": 1, "Rosacea": 1, "SARS-CoV-2 test negative": 1, "Salivary hypersecretion": 1, "Scratch": 1, "Sensitivity to weather change": 1, "Sensory loss": 1, "Shoulder injury related to vaccine administration": 1, "Sinus disorder": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin mass": 1, "Skin warm": 1, "Spinal pain": 1, "Stomatitis": 1, "Stool analysis": 1, "Sunburn": 1, "Surgery": 1, "Suspected COVID-19": 1, "Swollen tear duct": 1, "Swollen tongue": 1, "Syncope": 1, "Tachyphrenia": 1, "Tearfulness": 1, "Tendon pain": 1, "Tension": 1, "Thrombosis": 1, "Thyroid calcification": 1, "Tongue discomfort": 1, "Tongue pruritus": 1, "Tooth disorder": 1, "Tracheal neoplasm": 1, "Transfusion": 1, "Transient ischaemic attack": 1, "Ultrasound chest": 1, "Urinary tract infection": 1, "VIth nerve paralysis": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site haematoma": 1, "Vaccination site joint movement impairment": 1, "Vaccination site oedema": 1, "Vaginal haemorrhage": 1, "Varicella": 1, "Ventricular extrasystoles": 1, "Vomiting projectile": 1, "Weight": 1, "White blood cell count": 1, "White blood cell count increased": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "010A21A", "histograms": [{"histogram": {"Product administration error": 1}, "batchcodes": ["010A21A", "048B21A"]}, {"histogram": {"Fatigue": 127, "Headache": 124, "Pyrexia": 94, "Pain in extremity": 88, "Chills": 82, "Myalgia": 77, "Nausea": 72, "Vaccination site pain": 64, "Pain": 57, "Dizziness": 45, "Arthralgia": 44, "Pruritus": 44, "Vaccination site erythema": 44, "Diarrhoea": 35, "Vaccination site pruritus": 34, "Asthenia": 33, "Erythema": 33, "Expired product administered": 33, "Rash": 33, "Feeling abnormal": 31, "Vaccination site swelling": 31, "Body temperature": 24, "Vaccination site warmth": 23, "Vaccination site rash": 22, "Insomnia": 21, "Peripheral swelling": 21, "Inappropriate schedule of product administration": 19, "Decreased appetite": 18, "Dyspnoea": 18, "SARS-CoV-2 test": 18, "Vomiting": 18, "Feeling hot": 17, "Urticaria": 16, "Back pain": 15, "Hypoaesthesia": 15, "Blood pressure measurement": 14, "COVID-19": 14, "Abdominal discomfort": 13, "Injection site pain": 13, "Blood test": 12, "Cough": 12, "Illness": 12, "Influenza like illness": 12, "Neck pain": 12, "Palpitations": 12, "Somnolence": 12, "Lymphadenopathy": 11, "Malaise": 11, "Muscle spasms": 11, "Product dose omission issue": 11, "Rhinorrhoea": 11, "Vaccination complication": 11, "Vertigo": 11, "Gait disturbance": 10, "Head discomfort": 10, "Paraesthesia": 10, "Swelling face": 10, "Tremor": 10, "Abdominal pain": 9, "Abdominal pain upper": 9, "Balance disorder": 9, "Condition aggravated": 9, "Heart rate": 9, "Injection site swelling": 9, "Rash macular": 9, "Chest pain": 8, "Hyperhidrosis": 8, "Hypersensitivity": 8, "Magnetic resonance imaging": 8, "Migraine": 8, "Swelling": 8, "Tinnitus": 8, "Vaccination site mass": 8, "Anxiety": 7, "Computerised tomogram": 7, "Electrocardiogram": 7, "Herpes zoster": 7, "Joint swelling": 7, "Musculoskeletal stiffness": 7, "Oropharyngeal pain": 7, "Paraesthesia oral": 7, "Product storage error": 7, "Vaccination site induration": 7, "Ageusia": 6, "Feeling cold": 6, "Inflammation": 6, "Injection site erythema": 6, "Loss of consciousness": 6, "Mobility decreased": 6, "Nasopharyngitis": 6, "Rash pruritic": 6, "Tenderness": 6, "Therapeutic response unexpected": 6, "Visual impairment": 6, "Bone pain": 5, "Chest X-ray": 5, "Chest discomfort": 5, "Eye swelling": 5, "Fall": 5, "Injection site rash": 5, "Limb discomfort": 5, "Loss of personal independence in daily activities": 5, "Off label use": 5, "Rash erythematous": 5, "Skin discolouration": 5, "Sluggishness": 5, "Vaccination site reaction": 5, "Vision blurred": 5, "Anaemia": 4, "Burning sensation": 4, "Contusion": 4, "Eye pain": 4, "Hypertension": 4, "Hypoaesthesia oral": 4, "Incorrect route of product administration": 4, "Injection site pruritus": 4, "Injection site warmth": 4, "Maternal exposure during pregnancy": 4, "Memory impairment": 4, "Nervousness": 4, "Neuralgia": 4, "Ocular hyperaemia": 4, "Product administered to patient of inappropriate age": 4, "Restlessness": 4, "SARS-CoV-2 test positive": 4, "Sneezing": 4, "Taste disorder": 4, "Anosmia": 3, "Axillary pain": 3, "Body temperature decreased": 3, "Dehydration": 3, "Dysarthria": 3, "Dysgeusia": 3, "Feeding disorder": 3, "Flatulence": 3, "Flushing": 3, "Gait inability": 3, "Hypokinesia": 3, "Lethargy": 3, "Lymphoedema": 3, "Menstruation irregular": 3, "Muscular weakness": 3, "Musculoskeletal discomfort": 3, "Night sweats": 3, "Oral herpes": 3, "Pain in jaw": 3, "Panic attack": 3, "SARS-CoV-2 antibody test": 3, "Sleep disorder": 3, "Tachycardia": 3, "Throat irritation": 3, "Vaccination site bruising": 3, "Vaccination site haemorrhage": 3, "Acne": 2, "Allergy to vaccine": 2, "Antibody test": 2, "Arthritis": 2, "Autoimmune disorder": 2, "Axillary mass": 2, "Biopsy": 2, "Blister": 2, "Blood glucose": 2, "Blood glucose decreased": 2, "Blood pressure increased": 2, "Body temperature fluctuation": 2, "Body temperature increased": 2, "Breast pain": 2, "Cerebrovascular accident": 2, "Circumoral swelling": 2, "Confusional state": 2, "Dermatitis contact": 2, "Disorientation": 2, "Dyskinesia": 2, "Dyspepsia": 2, "Dysphonia": 2, "Dysstasia": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Embolic stroke": 2, "Energy increased": 2, "Exposure during pregnancy": 2, "Eye haemorrhage": 2, "Feeling jittery": 2, "Full blood count": 2, "Haemoptysis": 2, "Heart rate increased": 2, "Hyperlipidaemia": 2, "Hypersomnia": 2, "Injection site bruising": 2, "Injection site hypoaesthesia": 2, "Injection site induration": 2, "Injection site mass": 2, "Injection site paraesthesia": 2, "Injection site reaction": 2, "Intermenstrual bleeding": 2, "Iron deficiency": 2, "Lacrimation increased": 2, "Lip blister": 2, "Lip pruritus": 2, "Lip swelling": 2, "Mass": 2, "Menstrual disorder": 2, "Movement disorder": 2, "Nasal congestion": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oral mucosal blistering": 2, "Oropharyngeal discomfort": 2, "Otitis externa": 2, "Oxygen saturation decreased": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Pigmentation disorder": 2, "Pneumonia": 2, "Pulmonary embolism": 2, "Renal pain": 2, "Seizure": 2, "Sensitive skin": 2, "Thinking abnormal": 2, "Thirst": 2, "Transient global amnesia": 2, "Ultrasound scan": 2, "Underdose": 2, "Urinary incontinence": 2, "Vaccination site discharge": 2, "Vaccination site discomfort": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vital signs measurement": 2, "Wheezing": 2, "Wrong technique in product usage process": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain lower": 1, "Abnormal sensation in eye": 1, "Abortion of ectopic pregnancy": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Activated partial thromboplastin time": 1, "Adnexa uteri pain": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Adverse reaction": 1, "Alanine aminotransferase increased": 1, "Ammonia": 1, "Ammonia increased": 1, "Amnesia": 1, "Anger": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Aphonia": 1, "Appetite disorder": 1, "Arthritis reactive": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Asthma": 1, "Back injury": 1, "Bedridden": 1, "Biopsy lung": 1, "Blepharospasm": 1, "Blindness": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood calcium": 1, "Blood cholesterol": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood sodium increased": 1, "Blood uric acid": 1, "Blood uric acid increased": 1, "Bone swelling": 1, "Brain neoplasm": 1, "Brain oedema": 1, "Breast cancer": 1, "Bronchitis chronic": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Central nervous system vasculitis": 1, "Cholelithiasis": 1, "Chromatopsia": 1, "Chromaturia": 1, "Clostridium difficile colitis": 1, "Clumsiness": 1, "Cluster headache": 1, "Coagulopathy": 1, "Coeliac artery compression syndrome": 1, "Cognitive disorder": 1, "Cold-stimulus headache": 1, "Colitis": 1, "Complication associated with device": 1, "Computerised tomogram thorax": 1, "Cyst": 1, "Cystitis": 1, "Deafness": 1, "Delusion": 1, "Diplopia": 1, "Discomfort": 1, "Dissociation": 1, "Disturbance in attention": 1, "Drug abuse": 1, "Drug ineffective": 1, "Drug interaction": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysphemia": 1, "Eating disorder": 1, "Epistaxis": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Facial discomfort": 1, "Facial pain": 1, "Faeces discoloured": 1, "Fluid retention": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gastrointestinal inflammation": 1, "Gingival pruritus": 1, "Gingival ulceration": 1, "Globulin": 1, "Gout": 1, "Guttate psoriasis": 1, "Haemoglobin decreased": 1, "Haemorrhoids": 1, "Head injury": 1, "Head titubation": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hiccups": 1, "Hot flush": 1, "Hunger": 1, "Hyperacusis": 1, "Hypotension": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Incoherent": 1, "Incorrect dose administered": 1, "Infection": 1, "Infection prophylaxis": 1, "Inflammatory marker test": 1, "Influenza": 1, "Influenza virus test positive": 1, "Injected limb mobility decreased": 1, "Injection related reaction": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site inflammation": 1, "Injection site joint warmth": 1, "International normalised ratio": 1, "Interstitial lung disease": 1, "Intervertebral disc protrusion": 1, "Irritability": 1, "Limb injury": 1, "Lip dry": 1, "Lip haemorrhage": 1, "Listless": 1, "Liver disorder": 1, "Lung adenocarcinoma": 1, "Lung cyst": 1, "Lymph node pain": 1, "Magnetic resonance imaging head": 1, "Malabsorption": 1, "Mammogram": 1, "Mammogram abnormal": 1, "Mass excision": 1, "Maternal exposure during breast feeding": 1, "Mental impairment": 1, "Meralgia paraesthetica": 1, "Metastases to oesophagus": 1, "Metastases to trachea": 1, "Miosis": 1, "Motion sickness": 1, "Mouth swelling": 1, "Mucosal inflammation": 1, "Muscle contractions involuntary": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle swelling": 1, "Musculoskeletal disorder": 1, "Myocardial infarction": 1, "Nerve compression": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Nodule": 1, "Noninfective gingivitis": 1, "Noninfective sialoadenitis": 1, "Odynophagia": 1, "Ophthalmic migraine": 1, "Oral discomfort": 1, "Oral mucosal erythema": 1, "Oral pain": 1, "Osteoarthritis": 1, "Oxygen saturation": 1, "Pancreatitis acute": 1, "Paranoia": 1, "Parosmia": 1, "Parotid gland enlargement": 1, "Periarthritis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Pharyngeal swelling": 1, "Philadelphia chromosome positive": 1, "Pollakiuria": 1, "Postmenopausal haemorrhage": 1, "Pre-existing condition improved": 1, "Pregnancy": 1, "Pregnancy test": 1, "Premenstrual syndrome": 1, "Presyncope": 1, "Product administration error": 1, "Product administration interrupted": 1, "Product use in unapproved indication": 1, "Productive cough": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "Pulmonary oedema": 1, "Pulmonary pain": 1, "Rash papular": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red blood cell sedimentation rate": 1, "Respiratory rate": 1, "Retinal tear": 1, "Retracted nipple": 1, "Rheumatoid arthritis": 1, "Rosacea": 1, "SARS-CoV-2 test negative": 1, "Salivary hypersecretion": 1, "Scratch": 1, "Sensitivity to weather change": 1, "Sensory loss": 1, "Shoulder injury related to vaccine administration": 1, "Sinus disorder": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin mass": 1, "Skin warm": 1, "Spinal pain": 1, "Stomatitis": 1, "Stool analysis": 1, "Sunburn": 1, "Surgery": 1, "Suspected COVID-19": 1, "Swollen tear duct": 1, "Swollen tongue": 1, "Syncope": 1, "Tachyphrenia": 1, "Tearfulness": 1, "Tendon pain": 1, "Tension": 1, "Thrombosis": 1, "Thyroid calcification": 1, "Tongue discomfort": 1, "Tongue pruritus": 1, "Tooth disorder": 1, "Tracheal neoplasm": 1, "Transfusion": 1, "Transient ischaemic attack": 1, "Ultrasound chest": 1, "Urinary tract infection": 1, "VIth nerve paralysis": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site haematoma": 1, "Vaccination site joint movement impairment": 1, "Vaccination site oedema": 1, "Vaginal haemorrhage": 1, "Varicella": 1, "Ventricular extrasystoles": 1, "Vomiting projectile": 1, "Weight": 1, "White blood cell count": 1, "White blood cell count increased": 1, "Wrong product administered": 1}, "batchcodes": ["010A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A221B.json b/docs/data/histograms/United States/010A221B.json
index 67e9ca6c456..21eb9ba0cc6 100644
--- a/docs/data/histograms/United States/010A221B.json
+++ b/docs/data/histograms/United States/010A221B.json
@@ -1 +1 @@
-{"batchcode": "010A221B", "histograms": [{"batchcodes": ["010A221B"], "histogram": {"Body temperature": 1, "Chills": 1, "Formication": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Skin discomfort": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "010A221B", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Formication": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Skin discomfort": 1, "Somnolence": 1}, "batchcodes": ["010A221B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A27A.json b/docs/data/histograms/United States/010A27A.json
index 7b81bb4320d..1522517e80b 100644
--- a/docs/data/histograms/United States/010A27A.json
+++ b/docs/data/histograms/United States/010A27A.json
@@ -1 +1 @@
-{"batchcode": "010A27A", "histograms": [{"batchcodes": ["010A27A"], "histogram": {"Discomfort": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "010A27A", "histograms": [{"histogram": {"Discomfort": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["010A27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A2A.json b/docs/data/histograms/United States/010A2A.json
index d1817f817aa..66b65a56974 100644
--- a/docs/data/histograms/United States/010A2A.json
+++ b/docs/data/histograms/United States/010A2A.json
@@ -1 +1 @@
-{"batchcode": "010A2A", "histograms": [{"batchcodes": ["010A2A"], "histogram": {"Acoustic stimulation tests": 1, "Body temperature increased": 1, "Chills": 1, "Feeling abnormal": 1, "Hypoacusis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "010A2A", "histograms": [{"histogram": {"Acoustic stimulation tests": 1, "Body temperature increased": 1, "Chills": 1, "Feeling abnormal": 1, "Hypoacusis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tinnitus": 1}, "batchcodes": ["010A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010A71A.json b/docs/data/histograms/United States/010A71A.json
index 7b5c53651df..39787d547e6 100644
--- a/docs/data/histograms/United States/010A71A.json
+++ b/docs/data/histograms/United States/010A71A.json
@@ -1 +1 @@
-{"batchcode": "010A71A", "histograms": [{"batchcodes": ["010A71A"], "histogram": {"Arthralgia": 2, "Dry mouth": 1, "Fatigue": 1, "Herpes zoster": 1, "Influenza like illness": 1, "Migraine": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "010A71A", "histograms": [{"histogram": {"Arthralgia": 2, "Dry mouth": 1, "Fatigue": 1, "Herpes zoster": 1, "Influenza like illness": 1, "Migraine": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vomiting": 1}, "batchcodes": ["010A71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010AC1A.json b/docs/data/histograms/United States/010AC1A.json
index 58245e72820..554df6a6e55 100644
--- a/docs/data/histograms/United States/010AC1A.json
+++ b/docs/data/histograms/United States/010AC1A.json
@@ -1 +1 @@
-{"batchcode": "010AC1A", "histograms": [{"batchcodes": ["010AC1A"], "histogram": {"Pain in extremity": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "010AC1A", "histograms": [{"histogram": {"Pain in extremity": 1, "Product dose omission issue": 1}, "batchcodes": ["010AC1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010AE1A.json b/docs/data/histograms/United States/010AE1A.json
index 0ece7871a95..bce57be3419 100644
--- a/docs/data/histograms/United States/010AE1A.json
+++ b/docs/data/histograms/United States/010AE1A.json
@@ -1 +1 @@
-{"batchcode": "010AE1A", "histograms": [{"batchcodes": ["010AE1A"], "histogram": {"Anxiety": 1, "Discomfort": 1, "Formication": 1, "Nervousness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "010AE1A", "histograms": [{"histogram": {"Anxiety": 1, "Discomfort": 1, "Formication": 1, "Nervousness": 1, "Pain in extremity": 1}, "batchcodes": ["010AE1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010AQ1A.json b/docs/data/histograms/United States/010AQ1A.json
index 202c06b0438..ffe698ccc6a 100644
--- a/docs/data/histograms/United States/010AQ1A.json
+++ b/docs/data/histograms/United States/010AQ1A.json
@@ -1 +1 @@
-{"batchcode": "010AQ1A", "histograms": [{"batchcodes": ["010AQ1A"], "histogram": {"Pain in extremity": 2, "Neck pain": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "010AQ1A", "histograms": [{"histogram": {"Pain in extremity": 2, "Neck pain": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["010AQ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010AZ(ORL)IA.json b/docs/data/histograms/United States/010AZ(ORL)IA.json
index 221dc8a1654..1be85679b54 100644
--- a/docs/data/histograms/United States/010AZ(ORL)IA.json
+++ b/docs/data/histograms/United States/010AZ(ORL)IA.json
@@ -1 +1 @@
-{"batchcode": "010AZ(ORL)IA", "histograms": [{"batchcodes": ["010AZ(ORL)IA"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "010AZ(ORL)IA", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["010AZ(ORL)IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010AZ1A..json b/docs/data/histograms/United States/010AZ1A..json
index f401ea231a2..e97ff7b8117 100644
--- a/docs/data/histograms/United States/010AZ1A..json
+++ b/docs/data/histograms/United States/010AZ1A..json
@@ -1 +1 @@
-{"batchcode": "010AZ1A.", "histograms": [{"batchcodes": ["010AZ1A."], "histogram": {"Feeling abnormal": 1, "Incorrect route of product administration": 1, "Vaccination site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "010AZ1A.", "histograms": [{"histogram": {"Feeling abnormal": 1, "Incorrect route of product administration": 1, "Vaccination site haemorrhage": 1}, "batchcodes": ["010AZ1A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010AZ1A.json b/docs/data/histograms/United States/010AZ1A.json
index 27aa21c1179..d96b467fd55 100644
--- a/docs/data/histograms/United States/010AZ1A.json
+++ b/docs/data/histograms/United States/010AZ1A.json
@@ -1 +1 @@
-{"batchcode": "010AZ1A", "histograms": [{"batchcodes": ["010AZ1A"], "histogram": {"Feeling abnormal": 2, "Adverse drug reaction": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Eye disorder": 1, "Feeling hot": 1, "Limb discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pruritus": 1, "Rash": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "010AZ1A", "histograms": [{"histogram": {"Feeling abnormal": 2, "Adverse drug reaction": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Eye disorder": 1, "Feeling hot": 1, "Limb discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pruritus": 1, "Rash": 1, "Vaccination site reaction": 1}, "batchcodes": ["010AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010AZIA.json b/docs/data/histograms/United States/010AZIA.json
index 7cbb3c56f1b..b5979964bbd 100644
--- a/docs/data/histograms/United States/010AZIA.json
+++ b/docs/data/histograms/United States/010AZIA.json
@@ -1 +1 @@
-{"batchcode": "010AZIA", "histograms": [{"batchcodes": ["010AZIA"], "histogram": {"Blood pressure measurement": 1, "Chills": 1, "Electrocardiogram": 1, "Erythema": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "010AZIA", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Chills": 1, "Electrocardiogram": 1, "Erythema": 1, "Hyperhidrosis": 1, "Loss of consciousness": 1}, "batchcodes": ["010AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010B21A.json b/docs/data/histograms/United States/010B21A.json
index 0c66cb48576..5b012b29a7f 100644
--- a/docs/data/histograms/United States/010B21A.json
+++ b/docs/data/histograms/United States/010B21A.json
@@ -1 +1 @@
-{"batchcode": "010B21A", "histograms": [{"batchcodes": ["010B21A"], "histogram": {"Myalgia": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "010B21A", "histograms": [{"histogram": {"Myalgia": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["010B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010DM20.json b/docs/data/histograms/United States/010DM20.json
index 8844a62bbb5..5ca5b6090f9 100644
--- a/docs/data/histograms/United States/010DM20.json
+++ b/docs/data/histograms/United States/010DM20.json
@@ -1 +1 @@
-{"batchcode": "010DM20", "histograms": [{"batchcodes": ["010DM20"], "histogram": {"Adverse reaction": 1, "Incomplete course of vaccination": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "010DM20", "histograms": [{"histogram": {"Adverse reaction": 1, "Incomplete course of vaccination": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1}, "batchcodes": ["010DM20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010H22A.json b/docs/data/histograms/United States/010H22A.json
index 81fb8c1547c..d74a94b81d8 100644
--- a/docs/data/histograms/United States/010H22A.json
+++ b/docs/data/histograms/United States/010H22A.json
@@ -1 +1 @@
-{"batchcode": "010H22A", "histograms": [{"batchcodes": ["010H22A"], "histogram": {"No adverse event": 6, "Inappropriate schedule of product administration": 2, "Wrong product administered": 2, "Abdominal pain": 1, "Accidental underdose": 1, "Chills": 1, "Circumstance or information capable of leading to medication error": 1, "Dizziness": 1, "Expired product administered": 1, "Fatigue": 1, "Flatulence": 1, "Headache": 1, "Influenza like illness": 1, "Loss of personal independence in daily activities": 1, "Nausea": 1, "Overdose": 1, "Pertussis": 1, "Rash": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "010H22A", "histograms": [{"histogram": {"No adverse event": 6, "Inappropriate schedule of product administration": 2, "Wrong product administered": 2, "Abdominal pain": 1, "Accidental underdose": 1, "Chills": 1, "Circumstance or information capable of leading to medication error": 1, "Dizziness": 1, "Expired product administered": 1, "Fatigue": 1, "Flatulence": 1, "Headache": 1, "Influenza like illness": 1, "Loss of personal independence in daily activities": 1, "Nausea": 1, "Overdose": 1, "Pertussis": 1, "Rash": 1, "Syncope": 1, "Tremor": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["010H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M(OR N)20A.json b/docs/data/histograms/United States/010M(OR N)20A.json
index ad60b5f1d5d..f2ab14cf132 100644
--- a/docs/data/histograms/United States/010M(OR N)20A.json
+++ b/docs/data/histograms/United States/010M(OR N)20A.json
@@ -1 +1 @@
-{"batchcode": "010M(OR N)20A", "histograms": [{"batchcodes": ["010M(OR N)20A"], "histogram": {"Angiogram": 1, "Renal cancer": 1}}]}
\ No newline at end of file
+{"batchcode": "010M(OR N)20A", "histograms": [{"histogram": {"Angiogram": 1, "Renal cancer": 1}, "batchcodes": ["010M(OR N)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M020A.json b/docs/data/histograms/United States/010M020A.json
index 40b202783d1..e82c61caeb0 100644
--- a/docs/data/histograms/United States/010M020A.json
+++ b/docs/data/histograms/United States/010M020A.json
@@ -1 +1 @@
-{"batchcode": "010M020A", "histograms": [{"batchcodes": ["010M020A"], "histogram": {"Back pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010M020A", "histograms": [{"histogram": {"Back pain": 1, "Vaccination site pain": 1}, "batchcodes": ["010M020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M120A.json b/docs/data/histograms/United States/010M120A.json
index c1415546781..7cba2bcb80b 100644
--- a/docs/data/histograms/United States/010M120A.json
+++ b/docs/data/histograms/United States/010M120A.json
@@ -1 +1 @@
-{"batchcode": "010M120A", "histograms": [{"batchcodes": ["010M120A"], "histogram": {"Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "010M120A", "histograms": [{"histogram": {"Rash": 1, "Rash pruritic": 1}, "batchcodes": ["010M120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M2(ORZ)20A.json b/docs/data/histograms/United States/010M2(ORZ)20A.json
index cb19f52e4a9..1ad196fca5e 100644
--- a/docs/data/histograms/United States/010M2(ORZ)20A.json
+++ b/docs/data/histograms/United States/010M2(ORZ)20A.json
@@ -1 +1 @@
-{"batchcode": "010M2(ORZ)20A", "histograms": [{"batchcodes": ["010M2(ORZ)20A"], "histogram": {"Dizziness": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Nausea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010M2(ORZ)20A", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Nausea": 1, "Vaccination site pain": 1}, "batchcodes": ["010M2(ORZ)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M20.json b/docs/data/histograms/United States/010M20.json
index e4c1148f8d9..eeb3fd8d1ca 100644
--- a/docs/data/histograms/United States/010M20.json
+++ b/docs/data/histograms/United States/010M20.json
@@ -1 +1 @@
-{"batchcode": "010M20", "histograms": [{"batchcodes": ["010M20"], "histogram": {"Flushing": 1}}]}
\ No newline at end of file
+{"batchcode": "010M20", "histograms": [{"histogram": {"Flushing": 1}, "batchcodes": ["010M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M2019.json b/docs/data/histograms/United States/010M2019.json
index 2af87459b3f..c7c870898f8 100644
--- a/docs/data/histograms/United States/010M2019.json
+++ b/docs/data/histograms/United States/010M2019.json
@@ -1 +1 @@
-{"batchcode": "010M2019", "histograms": [{"batchcodes": ["010M2019"], "histogram": {"Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "010M2019", "histograms": [{"histogram": {"Fatigue": 1}, "batchcodes": ["010M2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M201A.json b/docs/data/histograms/United States/010M201A.json
index 42291537414..90270c903df 100644
--- a/docs/data/histograms/United States/010M201A.json
+++ b/docs/data/histograms/United States/010M201A.json
@@ -1 +1 @@
-{"batchcode": "010M201A", "histograms": [{"batchcodes": ["010M201A"], "histogram": {"Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "010M201A", "histograms": [{"histogram": {"Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["010M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M204.json b/docs/data/histograms/United States/010M204.json
index 437f4e7c24c..bb42e4054a9 100644
--- a/docs/data/histograms/United States/010M204.json
+++ b/docs/data/histograms/United States/010M204.json
@@ -1 +1 @@
-{"batchcode": "010M204", "histograms": [{"batchcodes": ["010M204"], "histogram": {"Diarrhoea": 2, "Asthenia": 1, "Back pain": 1, "Dizziness": 1, "Exposure during pregnancy": 1, "Glucose tolerance test": 1, "Injection site erythema": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Oropharyngeal discomfort": 1, "Somnolence": 1, "Ultrasound foetal": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "010M204", "histograms": [{"histogram": {"Diarrhoea": 2, "Asthenia": 1, "Back pain": 1, "Dizziness": 1, "Exposure during pregnancy": 1, "Glucose tolerance test": 1, "Injection site erythema": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Oropharyngeal discomfort": 1, "Somnolence": 1, "Ultrasound foetal": 1, "Vertigo": 1}, "batchcodes": ["010M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M208.json b/docs/data/histograms/United States/010M208.json
index 9b84fc8b4fd..bcd9d1b80c6 100644
--- a/docs/data/histograms/United States/010M208.json
+++ b/docs/data/histograms/United States/010M208.json
@@ -1 +1 @@
-{"batchcode": "010M208", "histograms": [{"batchcodes": ["010M208"], "histogram": {"Chest X-ray": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Dysarthria": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Magnetic resonance imaging": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Subarachnoid haemorrhage": 1, "Tongue disorder": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "010M208", "histograms": [{"histogram": {"Chest X-ray": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Dysarthria": 1, "Fatigue": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Magnetic resonance imaging": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Subarachnoid haemorrhage": 1, "Tongue disorder": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["010M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M20A OR 016M.json b/docs/data/histograms/United States/010M20A OR 016M.json
index 1d30c4cd659..8055d052fb4 100644
--- a/docs/data/histograms/United States/010M20A OR 016M.json
+++ b/docs/data/histograms/United States/010M20A OR 016M.json
@@ -1 +1 @@
-{"batchcode": "010M20A OR 016M", "histograms": [{"batchcodes": ["010M20A OR 016M"], "histogram": {"Vaccination site pain": 2}}]}
\ No newline at end of file
+{"batchcode": "010M20A OR 016M", "histograms": [{"histogram": {"Vaccination site pain": 2}, "batchcodes": ["010M20A OR 016M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M20A..json b/docs/data/histograms/United States/010M20A..json
index 6e5d6f8899e..d41dce0dae4 100644
--- a/docs/data/histograms/United States/010M20A..json
+++ b/docs/data/histograms/United States/010M20A..json
@@ -1 +1 @@
-{"batchcode": "010M20A.", "histograms": [{"batchcodes": ["010M20A."], "histogram": {"Arthralgia": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac failure": 1, "Fluid retention": 1, "Herpes zoster": 1, "Injection site hypersensitivity": 1, "Platelet count": 1, "Platelet count abnormal": 1, "Platelet disorder": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "010M20A.", "histograms": [{"histogram": {"Arthralgia": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac failure": 1, "Fluid retention": 1, "Herpes zoster": 1, "Injection site hypersensitivity": 1, "Platelet count": 1, "Platelet count abnormal": 1, "Platelet disorder": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["010M20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M20A.json b/docs/data/histograms/United States/010M20A.json
index 629f2615945..0bb9ce01b9e 100644
--- a/docs/data/histograms/United States/010M20A.json
+++ b/docs/data/histograms/United States/010M20A.json
@@ -1 +1 @@
-{"batchcode": "010M20A", "histograms": [{"batchcodes": ["010M20A"], "histogram": {"Pain in extremity": 108, "Headache": 107, "Pyrexia": 95, "Fatigue": 87, "Chills": 82, "Vaccination site pain": 61, "Myalgia": 55, "Pain": 48, "Pruritus": 47, "Vaccination site erythema": 45, "Nausea": 44, "Dizziness": 42, "Rash": 40, "Vaccination site swelling": 37, "Arthralgia": 33, "Body temperature": 33, "Feeling abnormal": 33, "Vaccination site pruritus": 30, "Asthenia": 26, "Vomiting": 24, "Erythema": 23, "Peripheral swelling": 23, "Malaise": 22, "Vaccination site warmth": 22, "Inappropriate schedule of product administration": 21, "SARS-CoV-2 test": 21, "Urticaria": 20, "Diarrhoea": 19, "Blood pressure measurement": 18, "Dyspnoea": 17, "COVID-19": 16, "Lymphadenopathy": 16, "Vaccination complication": 16, "Cough": 15, "Product dose omission issue": 15, "Hypertension": 14, "Hypoaesthesia": 14, "Decreased appetite": 13, "Feeling hot": 13, "Illness": 13, "Insomnia": 13, "Vaccination site induration": 13, "Influenza like illness": 12, "Lethargy": 12, "Paraesthesia": 12, "Vaccination site mass": 12, "Ageusia": 11, "Rash pruritic": 11, "Swelling": 11, "Heart rate": 10, "Heart rate increased": 10, "Injection site pain": 10, "Vaccination site rash": 10, "Back pain": 9, "Injection site erythema": 9, "Hyperhidrosis": 8, "Hypersensitivity": 8, "Incorrect dose administered": 8, "Injection site warmth": 8, "Muscle spasms": 8, "Neck pain": 8, "Palpitations": 8, "Rhinorrhoea": 8, "Tenderness": 8, "Anosmia": 7, "Chest pain": 7, "Feeling cold": 7, "Joint swelling": 7, "Lip swelling": 7, "Oropharyngeal pain": 7, "Tremor": 7, "Abdominal pain upper": 6, "Drug ineffective": 6, "Dysgeusia": 6, "Gait disturbance": 6, "Herpes zoster": 6, "Hot flush": 6, "Maternal exposure during pregnancy": 6, "Mobility decreased": 6, "Oxygen saturation": 6, "Expired product administered": 5, "Fall": 5, "Injection site pruritus": 5, "Injection site swelling": 5, "Musculoskeletal stiffness": 5, "Pregnancy test": 5, "Rash erythematous": 5, "SARS-CoV-2 test positive": 5, "Sinusitis": 5, "Swollen tongue": 5, "Vertigo": 5, "Weight decreased": 5, "Abdominal discomfort": 4, "Abdominal pain": 4, "Balance disorder": 4, "Bell's palsy": 4, "Blood glucose": 4, "Body temperature increased": 4, "Bone pain": 4, "Burning sensation": 4, "Computerised tomogram": 4, "Condition aggravated": 4, "Discomfort": 4, "Dry mouth": 4, "Electrocardiogram": 4, "Exposure during pregnancy": 4, "Inflammation": 4, "Influenza": 4, "Loss of personal independence in daily activities": 4, "Lymph node pain": 4, "Muscular weakness": 4, "Nasal congestion": 4, "Nasopharyngitis": 4, "Oral herpes": 4, "Pain in jaw": 4, "Pharyngeal swelling": 4, "Product administered to patient of inappropriate age": 4, "Swelling face": 4, "Tachycardia": 4, "Taste disorder": 4, "Tinnitus": 4, "Vaccination site discolouration": 4, "Vaccination site lymphadenopathy": 4, "Vaccination site reaction": 4, "Blood pressure increased": 3, "Cellulitis": 3, "Chest discomfort": 3, "Confusional state": 3, "Disorientation": 3, "Dysphonia": 3, "Dysstasia": 3, "Ear pain": 3, "Echocardiogram": 3, "Eye pain": 3, "Eye swelling": 3, "Head discomfort": 3, "Heart rate abnormal": 3, "Hypokinesia": 3, "Intentional dose omission": 3, "Limb discomfort": 3, "Loss of consciousness": 3, "Menstruation irregular": 3, "Migraine": 3, "Musculoskeletal pain": 3, "Neuropathy peripheral": 3, "Night sweats": 3, "Skin discolouration": 3, "Sleep disorder": 3, "Somnolence": 3, "Ultrasound scan": 3, "Vaccination site discomfort": 3, "Vision blurred": 3, "Visual impairment": 3, "Anxiety": 2, "Asthma": 2, "Axillary pain": 2, "Blister": 2, "Blood cholesterol": 2, "Blood test": 2, "Carcinoembryonic antigen": 2, "Cardiac disorder": 2, "Cardiomegaly": 2, "Cerebrovascular accident": 2, "Coronavirus test": 2, "Dermatitis allergic": 2, "Dysphagia": 2, "Dysuria": 2, "Ear discomfort": 2, "Feeding disorder": 2, "Full blood count": 2, "Gait inability": 2, "Hyperaesthesia teeth": 2, "Hypoaesthesia oral": 2, "Incoherent": 2, "Induration": 2, "Injection site induration": 2, "Irritability": 2, "Joint stiffness": 2, "Lacrimation increased": 2, "Loose tooth": 2, "Magnetic resonance imaging": 2, "Muscle atrophy": 2, "Muscle tightness": 2, "Musculoskeletal discomfort": 2, "Nerve injury": 2, "Nervousness": 2, "No adverse event": 2, "Oedema peripheral": 2, "Oral pain": 2, "Papule": 2, "Paraesthesia oral": 2, "Parosmia": 2, "Photophobia": 2, "Platelet count": 2, "Pneumonitis": 2, "Poor quality product administered": 2, "Presyncope": 2, "Product administration interrupted": 2, "Product availability issue": 2, "Psoriasis": 2, "Rash morbilliform": 2, "Retching": 2, "Sensitive skin": 2, "Sinus congestion": 2, "Sluggishness": 2, "Stress": 2, "Thrombosis": 2, "Underdose": 2, "Urinary tract infection": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Weight": 2, "Weight increased": 2, "White blood cell count": 2, "Wrong product administered": 2, "Abnormal dreams": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse event": 1, "Alopecia": 1, "Amenorrhoea": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Antinuclear antibody": 1, "Anxiety disorder": 1, "Aortic stenosis": 1, "Aphasia": 1, "Aphonia": 1, "Appendicitis": 1, "Ataxia": 1, "Bedridden": 1, "Biopsy lymph gland": 1, "Blepharospasm": 1, "Blindness unilateral": 1, "Blood blister": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Breast pain": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Cataract": 1, "Chest X-ray": 1, "Choking": 1, "Chronic lymphocytic leukaemia": 1, "Circulatory collapse": 1, "Clostridium difficile colitis": 1, "Clostridium test": 1, "Cluster headache": 1, "Cold sweat": 1, "Complement factor": 1, "Connective tissue disorder": 1, "Constipation": 1, "Contusion": 1, "Coordination abnormal": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Depression": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Dry skin": 1, "Dyschezia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Ear infection": 1, "Eating disorder": 1, "Electroencephalogram": 1, "Emphysema": 1, "Eosinophil count increased": 1, "Epilepsy": 1, "Epistaxis": 1, "Exploding head syndrome": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Eye infection": 1, "Eye injury": 1, "Facial bones fracture": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Fear of death": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Flushing": 1, "Gastroenteritis viral": 1, "Gastrooesophageal reflux disease": 1, "Gingival pain": 1, "Glucose tolerance test": 1, "Gout": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Hallucination": 1, "Hand fracture": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Herpes virus infection": 1, "Hip fracture": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperthyroidism": 1, "Hypomenorrhoea": 1, "Hypotension": 1, "Immune system disorder": 1, "Immune-mediated adverse reaction": 1, "Immunisation reaction": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Injection site mass": 1, "Injection site rash": 1, "Intentional product use issue": 1, "Intestinal obstruction": 1, "Joint injury": 1, "Laboratory test": 1, "Limb mass": 1, "Lip disorder": 1, "Lip injury": 1, "Lip pain": 1, "Lip pruritus": 1, "Lower respiratory tract infection": 1, "Lymphadenitis": 1, "Lymphoedema": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Mass": 1, "Mast cell degranulation test": 1, "Mean cell volume": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Metabolic function test": 1, "Micturition urgency": 1, "Mitral valve prolapse": 1, "Motion sickness": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle discomfort": 1, "Muscle fatigue": 1, "Muscle injury": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Myocarditis": 1, "Near death experience": 1, "Neoplasm malignant": 1, "Nervous system injury": 1, "Neuralgia": 1, "Nipple pain": 1, "Off label use": 1, "Oral candidiasis": 1, "Oral surgery": 1, "Oropharyngeal discomfort": 1, "Ovarian mass": 1, "Pain of skin": 1, "Panic attack": 1, "Paralysis": 1, "Paranasal sinus discomfort": 1, "Pelvic pain": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Planning to become pregnant": 1, "Pleurisy": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Product administered at inappropriate site": 1, "Product contamination physical": 1, "Product storage error": 1, "Product temperature excursion issue": 1, "Pulmonary function test": 1, "Pulse abnormal": 1, "Quadriplegia": 1, "Rash macular": 1, "Rash papular": 1, "Rash vesicular": 1, "Renal cancer": 1, "Renal colic": 1, "Respiratory rate": 1, "Respiratory tract congestion": 1, "Rheumatoid factor": 1, "Root canal infection": 1, "SARS-CoV-1 test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Salivary hypersecretion": 1, "Scintillating scotoma": 1, "Secretion discharge": 1, "Sensory disturbance": 1, "Sinus disorder": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin lesion inflammation": 1, "Skin reaction": 1, "Skin warm": 1, "Sleep deficit": 1, "Speech disorder": 1, "Stomatitis": 1, "Streptococcal infection": 1, "Suspected COVID-19": 1, "Syringe issue": 1, "Tendon disorder": 1, "Therapeutic product effect decreased": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Throat tightness": 1, "Tongue disorder": 1, "Tonsillar hypertrophy": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine analysis": 1, "Vaccination site coldness": 1, "Vaccination site extravasation": 1, "Vaccination site infection": 1, "Vaccination site joint movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaccine breakthrough infection": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Walking aid user": 1, "Wrist fracture": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "010M20A", "histograms": [{"histogram": {"Pain in extremity": 108, "Headache": 107, "Pyrexia": 95, "Fatigue": 87, "Chills": 82, "Vaccination site pain": 61, "Myalgia": 55, "Pain": 48, "Pruritus": 47, "Vaccination site erythema": 45, "Nausea": 44, "Dizziness": 42, "Rash": 40, "Vaccination site swelling": 37, "Arthralgia": 33, "Body temperature": 33, "Feeling abnormal": 33, "Vaccination site pruritus": 30, "Asthenia": 26, "Vomiting": 24, "Erythema": 23, "Peripheral swelling": 23, "Malaise": 22, "Vaccination site warmth": 22, "Inappropriate schedule of product administration": 21, "SARS-CoV-2 test": 21, "Urticaria": 20, "Diarrhoea": 19, "Blood pressure measurement": 18, "Dyspnoea": 17, "COVID-19": 16, "Lymphadenopathy": 16, "Vaccination complication": 16, "Cough": 15, "Product dose omission issue": 15, "Hypertension": 14, "Hypoaesthesia": 14, "Decreased appetite": 13, "Feeling hot": 13, "Illness": 13, "Insomnia": 13, "Vaccination site induration": 13, "Influenza like illness": 12, "Lethargy": 12, "Paraesthesia": 12, "Vaccination site mass": 12, "Ageusia": 11, "Rash pruritic": 11, "Swelling": 11, "Heart rate": 10, "Heart rate increased": 10, "Injection site pain": 10, "Vaccination site rash": 10, "Back pain": 9, "Injection site erythema": 9, "Hyperhidrosis": 8, "Hypersensitivity": 8, "Incorrect dose administered": 8, "Injection site warmth": 8, "Muscle spasms": 8, "Neck pain": 8, "Palpitations": 8, "Rhinorrhoea": 8, "Tenderness": 8, "Anosmia": 7, "Chest pain": 7, "Feeling cold": 7, "Joint swelling": 7, "Lip swelling": 7, "Oropharyngeal pain": 7, "Tremor": 7, "Abdominal pain upper": 6, "Drug ineffective": 6, "Dysgeusia": 6, "Gait disturbance": 6, "Herpes zoster": 6, "Hot flush": 6, "Maternal exposure during pregnancy": 6, "Mobility decreased": 6, "Oxygen saturation": 6, "Expired product administered": 5, "Fall": 5, "Injection site pruritus": 5, "Injection site swelling": 5, "Musculoskeletal stiffness": 5, "Pregnancy test": 5, "Rash erythematous": 5, "SARS-CoV-2 test positive": 5, "Sinusitis": 5, "Swollen tongue": 5, "Vertigo": 5, "Weight decreased": 5, "Abdominal discomfort": 4, "Abdominal pain": 4, "Balance disorder": 4, "Bell's palsy": 4, "Blood glucose": 4, "Body temperature increased": 4, "Bone pain": 4, "Burning sensation": 4, "Computerised tomogram": 4, "Condition aggravated": 4, "Discomfort": 4, "Dry mouth": 4, "Electrocardiogram": 4, "Exposure during pregnancy": 4, "Inflammation": 4, "Influenza": 4, "Loss of personal independence in daily activities": 4, "Lymph node pain": 4, "Muscular weakness": 4, "Nasal congestion": 4, "Nasopharyngitis": 4, "Oral herpes": 4, "Pain in jaw": 4, "Pharyngeal swelling": 4, "Product administered to patient of inappropriate age": 4, "Swelling face": 4, "Tachycardia": 4, "Taste disorder": 4, "Tinnitus": 4, "Vaccination site discolouration": 4, "Vaccination site lymphadenopathy": 4, "Vaccination site reaction": 4, "Blood pressure increased": 3, "Cellulitis": 3, "Chest discomfort": 3, "Confusional state": 3, "Disorientation": 3, "Dysphonia": 3, "Dysstasia": 3, "Ear pain": 3, "Echocardiogram": 3, "Eye pain": 3, "Eye swelling": 3, "Head discomfort": 3, "Heart rate abnormal": 3, "Hypokinesia": 3, "Intentional dose omission": 3, "Limb discomfort": 3, "Loss of consciousness": 3, "Menstruation irregular": 3, "Migraine": 3, "Musculoskeletal pain": 3, "Neuropathy peripheral": 3, "Night sweats": 3, "Skin discolouration": 3, "Sleep disorder": 3, "Somnolence": 3, "Ultrasound scan": 3, "Vaccination site discomfort": 3, "Vision blurred": 3, "Visual impairment": 3, "Anxiety": 2, "Asthma": 2, "Axillary pain": 2, "Blister": 2, "Blood cholesterol": 2, "Blood test": 2, "Carcinoembryonic antigen": 2, "Cardiac disorder": 2, "Cardiomegaly": 2, "Cerebrovascular accident": 2, "Coronavirus test": 2, "Dermatitis allergic": 2, "Dysphagia": 2, "Dysuria": 2, "Ear discomfort": 2, "Feeding disorder": 2, "Full blood count": 2, "Gait inability": 2, "Hyperaesthesia teeth": 2, "Hypoaesthesia oral": 2, "Incoherent": 2, "Induration": 2, "Injection site induration": 2, "Irritability": 2, "Joint stiffness": 2, "Lacrimation increased": 2, "Loose tooth": 2, "Magnetic resonance imaging": 2, "Muscle atrophy": 2, "Muscle tightness": 2, "Musculoskeletal discomfort": 2, "Nerve injury": 2, "Nervousness": 2, "No adverse event": 2, "Oedema peripheral": 2, "Oral pain": 2, "Papule": 2, "Paraesthesia oral": 2, "Parosmia": 2, "Photophobia": 2, "Platelet count": 2, "Pneumonitis": 2, "Poor quality product administered": 2, "Presyncope": 2, "Product administration interrupted": 2, "Product availability issue": 2, "Psoriasis": 2, "Rash morbilliform": 2, "Retching": 2, "Sensitive skin": 2, "Sinus congestion": 2, "Sluggishness": 2, "Stress": 2, "Thrombosis": 2, "Underdose": 2, "Urinary tract infection": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Weight": 2, "Weight increased": 2, "White blood cell count": 2, "Wrong product administered": 2, "Abnormal dreams": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse event": 1, "Alopecia": 1, "Amenorrhoea": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Antinuclear antibody": 1, "Anxiety disorder": 1, "Aortic stenosis": 1, "Aphasia": 1, "Aphonia": 1, "Appendicitis": 1, "Ataxia": 1, "Bedridden": 1, "Biopsy lymph gland": 1, "Blepharospasm": 1, "Blindness unilateral": 1, "Blood blister": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood immunoglobulin E": 1, "Blood magnesium": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood urine present": 1, "Breast pain": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Cataract": 1, "Chest X-ray": 1, "Choking": 1, "Chronic lymphocytic leukaemia": 1, "Circulatory collapse": 1, "Clostridium difficile colitis": 1, "Clostridium test": 1, "Cluster headache": 1, "Cold sweat": 1, "Complement factor": 1, "Connective tissue disorder": 1, "Constipation": 1, "Contusion": 1, "Coordination abnormal": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Depression": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Dry skin": 1, "Dyschezia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dyspnoea exertional": 1, "Ear infection": 1, "Eating disorder": 1, "Electroencephalogram": 1, "Emphysema": 1, "Eosinophil count increased": 1, "Epilepsy": 1, "Epistaxis": 1, "Exploding head syndrome": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Eye infection": 1, "Eye injury": 1, "Facial bones fracture": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Fear of death": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Flushing": 1, "Gastroenteritis viral": 1, "Gastrooesophageal reflux disease": 1, "Gingival pain": 1, "Glucose tolerance test": 1, "Gout": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemorrhage": 1, "Hallucination": 1, "Hand fracture": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Herpes virus infection": 1, "Hip fracture": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hyperthyroidism": 1, "Hypomenorrhoea": 1, "Hypotension": 1, "Immune system disorder": 1, "Immune-mediated adverse reaction": 1, "Immunisation reaction": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Injection site mass": 1, "Injection site rash": 1, "Intentional product use issue": 1, "Intestinal obstruction": 1, "Joint injury": 1, "Laboratory test": 1, "Limb mass": 1, "Lip disorder": 1, "Lip injury": 1, "Lip pain": 1, "Lip pruritus": 1, "Lower respiratory tract infection": 1, "Lymphadenitis": 1, "Lymphoedema": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Mass": 1, "Mast cell degranulation test": 1, "Mean cell volume": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Metabolic function test": 1, "Micturition urgency": 1, "Mitral valve prolapse": 1, "Motion sickness": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Multiple sclerosis": 1, "Muscle discomfort": 1, "Muscle fatigue": 1, "Muscle injury": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Myocarditis": 1, "Near death experience": 1, "Neoplasm malignant": 1, "Nervous system injury": 1, "Neuralgia": 1, "Nipple pain": 1, "Off label use": 1, "Oral candidiasis": 1, "Oral surgery": 1, "Oropharyngeal discomfort": 1, "Ovarian mass": 1, "Pain of skin": 1, "Panic attack": 1, "Paralysis": 1, "Paranasal sinus discomfort": 1, "Pelvic pain": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Planning to become pregnant": 1, "Pleurisy": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Product administered at inappropriate site": 1, "Product contamination physical": 1, "Product storage error": 1, "Product temperature excursion issue": 1, "Pulmonary function test": 1, "Pulse abnormal": 1, "Quadriplegia": 1, "Rash macular": 1, "Rash papular": 1, "Rash vesicular": 1, "Renal cancer": 1, "Renal colic": 1, "Respiratory rate": 1, "Respiratory tract congestion": 1, "Rheumatoid factor": 1, "Root canal infection": 1, "SARS-CoV-1 test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Salivary hypersecretion": 1, "Scintillating scotoma": 1, "Secretion discharge": 1, "Sensory disturbance": 1, "Sinus disorder": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin lesion inflammation": 1, "Skin reaction": 1, "Skin warm": 1, "Sleep deficit": 1, "Speech disorder": 1, "Stomatitis": 1, "Streptococcal infection": 1, "Suspected COVID-19": 1, "Syringe issue": 1, "Tendon disorder": 1, "Therapeutic product effect decreased": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Throat tightness": 1, "Tongue disorder": 1, "Tonsillar hypertrophy": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine analysis": 1, "Vaccination site coldness": 1, "Vaccination site extravasation": 1, "Vaccination site infection": 1, "Vaccination site joint movement impairment": 1, "Vaccination site oedema": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaccine breakthrough infection": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Walking aid user": 1, "Wrist fracture": 1, "X-ray": 1}, "batchcodes": ["010M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M20M.json b/docs/data/histograms/United States/010M20M.json
index 9057807908b..6a29d42f6f1 100644
--- a/docs/data/histograms/United States/010M20M.json
+++ b/docs/data/histograms/United States/010M20M.json
@@ -1 +1 @@
-{"batchcode": "010M20M", "histograms": [{"batchcodes": ["010M20M"], "histogram": {"Arthralgia": 1, "Chills": 1, "Migraine": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "010M20M", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Migraine": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pyrexia": 1}, "batchcodes": ["010M20M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M20N.json b/docs/data/histograms/United States/010M20N.json
index 1544bd58b81..0443fa5d751 100644
--- a/docs/data/histograms/United States/010M20N.json
+++ b/docs/data/histograms/United States/010M20N.json
@@ -1 +1 @@
-{"batchcode": "010M20N", "histograms": [{"batchcodes": ["010M20N"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "Headache": 1, "Hypokinesia": 1, "Inflammation": 1, "Myalgia": 1, "Peripheral swelling": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "010M20N", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "Headache": 1, "Hypokinesia": 1, "Inflammation": 1, "Myalgia": 1, "Peripheral swelling": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["010M20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M21A.json b/docs/data/histograms/United States/010M21A.json
index b9b906d39ef..a1fc18bf630 100644
--- a/docs/data/histograms/United States/010M21A.json
+++ b/docs/data/histograms/United States/010M21A.json
@@ -1 +1 @@
-{"batchcode": "010M21A", "histograms": [{"batchcodes": ["010M21A"], "histogram": {"Chills": 4, "Back pain": 2, "Chromaturia": 2, "Endoscopy": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Nausea": 2, "Pain": 2, "Pyrexia": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Aortic stenosis": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Blood test": 1, "Computerised tomogram": 1, "Coordination abnormal": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Hypertension": 1, "Influenza like illness": 1, "Mass": 1, "Mitral valve prolapse": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Oxygen saturation": 1, "Palpitations": 1, "Tremor": 1, "Vomiting": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "010M21A", "histograms": [{"histogram": {"Chills": 4, "Back pain": 2, "Chromaturia": 2, "Endoscopy": 2, "Fatigue": 2, "Headache": 2, "Myalgia": 2, "Nausea": 2, "Pain": 2, "Pyrexia": 2, "Urine analysis": 2, "Vaccination site pain": 2, "Aortic stenosis": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Blood test": 1, "Computerised tomogram": 1, "Coordination abnormal": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dyspnoea exertional": 1, "Echocardiogram": 1, "Hypertension": 1, "Influenza like illness": 1, "Mass": 1, "Mitral valve prolapse": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Oxygen saturation": 1, "Palpitations": 1, "Tremor": 1, "Vomiting": 1, "Weight decreased": 1}, "batchcodes": ["010M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M220A.json b/docs/data/histograms/United States/010M220A.json
index 46b3d7e1cb9..090dff9babd 100644
--- a/docs/data/histograms/United States/010M220A.json
+++ b/docs/data/histograms/United States/010M220A.json
@@ -1 +1 @@
-{"batchcode": "010M220A", "histograms": [{"batchcodes": ["010M220A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010M220A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["010M220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M22A.json b/docs/data/histograms/United States/010M22A.json
index c7636ceb67f..42fb443b39a 100644
--- a/docs/data/histograms/United States/010M22A.json
+++ b/docs/data/histograms/United States/010M22A.json
@@ -1 +1 @@
-{"batchcode": "010M22A", "histograms": [{"batchcodes": ["010M22A"], "histogram": {"Blister": 1, "Blood blister": 1, "Erythema": 1, "Skin abrasion": 1, "Skin atrophy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010M22A", "histograms": [{"histogram": {"Blister": 1, "Blood blister": 1, "Erythema": 1, "Skin abrasion": 1, "Skin atrophy": 1, "Vaccination site pain": 1}, "batchcodes": ["010M22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M24.json b/docs/data/histograms/United States/010M24.json
index e382edcfe82..7c77fe24926 100644
--- a/docs/data/histograms/United States/010M24.json
+++ b/docs/data/histograms/United States/010M24.json
@@ -1 +1 @@
-{"batchcode": "010M24", "histograms": [{"batchcodes": ["010M24"], "histogram": {"Abdominal pain": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Muscle strain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010M24", "histograms": [{"histogram": {"Abdominal pain": 1, "Gastrooesophageal reflux disease": 1, "Headache": 1, "Muscle strain": 1, "Vaccination site pain": 1}, "batchcodes": ["010M24"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M2A.json b/docs/data/histograms/United States/010M2A.json
index 941c03c0721..c40388f6f86 100644
--- a/docs/data/histograms/United States/010M2A.json
+++ b/docs/data/histograms/United States/010M2A.json
@@ -1 +1 @@
-{"batchcode": "010M2A", "histograms": [{"batchcodes": ["010M2A"], "histogram": {"Balance disorder": 1, "Condition aggravated": 1, "Confusional state": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate increased": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010M2A", "histograms": [{"histogram": {"Balance disorder": 1, "Condition aggravated": 1, "Confusional state": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate increased": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["010M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010M2DA.json b/docs/data/histograms/United States/010M2DA.json
index 054f8f1a9c3..3aa36049b40 100644
--- a/docs/data/histograms/United States/010M2DA.json
+++ b/docs/data/histograms/United States/010M2DA.json
@@ -1 +1 @@
-{"batchcode": "010M2DA", "histograms": [{"batchcodes": ["010M2DA"], "histogram": {"Chills": 1, "Feeling cold": 1, "Headache": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "010M2DA", "histograms": [{"histogram": {"Chills": 1, "Feeling cold": 1, "Headache": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["010M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010MC0A.json b/docs/data/histograms/United States/010MC0A.json
index fd058967516..3350edafae9 100644
--- a/docs/data/histograms/United States/010MC0A.json
+++ b/docs/data/histograms/United States/010MC0A.json
@@ -1 +1 @@
-{"batchcode": "010MC0A", "histograms": [{"batchcodes": ["010MC0A"], "histogram": {"Chills": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "010MC0A", "histograms": [{"histogram": {"Chills": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Tremor": 1}, "batchcodes": ["010MC0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010MZ08.json b/docs/data/histograms/United States/010MZ08.json
index a6a68e06bc2..f90638d2f48 100644
--- a/docs/data/histograms/United States/010MZ08.json
+++ b/docs/data/histograms/United States/010MZ08.json
@@ -1 +1 @@
-{"batchcode": "010MZ08", "histograms": [{"batchcodes": ["010MZ08"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "010MZ08", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["010MZ08"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010MZ0A.json b/docs/data/histograms/United States/010MZ0A.json
index 326243a33aa..864f1d94913 100644
--- a/docs/data/histograms/United States/010MZ0A.json
+++ b/docs/data/histograms/United States/010MZ0A.json
@@ -1 +1 @@
-{"batchcode": "010MZ0A", "histograms": [{"batchcodes": ["010MZ0A"], "histogram": {"Nausea": 4, "Fatigue": 3, "Headache": 3, "Feeling abnormal": 2, "Feeling hot": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Abnormal behaviour": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Body temperature": 1, "Body temperature decreased": 1, "Burning sensation": 1, "Cerebrovascular accident": 1, "Coordination abnormal": 1, "Dementia": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysarthria": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear pain": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperaesthesia teeth": 1, "Hypertension": 1, "Hypokinesia": 1, "Malaise": 1, "Mania": 1, "Myalgia": 1, "Tachycardia": 1, "Thrombosis": 1, "Toothache": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "010MZ0A", "histograms": [{"histogram": {"Nausea": 4, "Fatigue": 3, "Headache": 3, "Feeling abnormal": 2, "Feeling hot": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Abnormal behaviour": 1, "Arthralgia": 1, "Asthenia": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Body temperature": 1, "Body temperature decreased": 1, "Burning sensation": 1, "Cerebrovascular accident": 1, "Coordination abnormal": 1, "Dementia": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysarthria": 1, "Dysphonia": 1, "Dysstasia": 1, "Ear pain": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperaesthesia teeth": 1, "Hypertension": 1, "Hypokinesia": 1, "Malaise": 1, "Mania": 1, "Myalgia": 1, "Tachycardia": 1, "Thrombosis": 1, "Toothache": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["010MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010MZOA.json b/docs/data/histograms/United States/010MZOA.json
index 01cb95a1cbe..33b9eb4e799 100644
--- a/docs/data/histograms/United States/010MZOA.json
+++ b/docs/data/histograms/United States/010MZOA.json
@@ -1 +1 @@
-{"batchcode": "010MZOA", "histograms": [{"batchcodes": ["010MZOA"], "histogram": {"COVID-19": 1, "Dermal cyst": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "010MZOA", "histograms": [{"histogram": {"COVID-19": 1, "Dermal cyst": 1, "Pain in extremity": 1}, "batchcodes": ["010MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010MZU(ORV)7.json b/docs/data/histograms/United States/010MZU(ORV)7.json
index f649e084e19..12d60e2b402 100644
--- a/docs/data/histograms/United States/010MZU(ORV)7.json
+++ b/docs/data/histograms/United States/010MZU(ORV)7.json
@@ -1 +1 @@
-{"batchcode": "010MZU(ORV)7", "histograms": [{"batchcodes": ["010MZU(ORV)7"], "histogram": {"Headache": 1, "Inflammation": 1, "Rash erythematous": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "010MZU(ORV)7", "histograms": [{"histogram": {"Headache": 1, "Inflammation": 1, "Rash erythematous": 1, "Sensitive skin": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}, "batchcodes": ["010MZU(ORV)7"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010N120A.json b/docs/data/histograms/United States/010N120A.json
index e9cd1191066..20b76751a4d 100644
--- a/docs/data/histograms/United States/010N120A.json
+++ b/docs/data/histograms/United States/010N120A.json
@@ -1 +1 @@
-{"batchcode": "010N120A", "histograms": [{"batchcodes": ["010N120A"], "histogram": {"Body temperature": 1, "Dysstasia": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "010N120A", "histograms": [{"histogram": {"Body temperature": 1, "Dysstasia": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Pyrexia": 1, "Syncope": 1}, "batchcodes": ["010N120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010N20A.json b/docs/data/histograms/United States/010N20A.json
index 1278e834518..17464d8dfe1 100644
--- a/docs/data/histograms/United States/010N20A.json
+++ b/docs/data/histograms/United States/010N20A.json
@@ -1 +1 @@
-{"batchcode": "010N20A", "histograms": [{"batchcodes": ["010N20A"], "histogram": {"COVID-19": 1, "Off label use": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "010N20A", "histograms": [{"histogram": {"COVID-19": 1, "Off label use": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["010N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010NZ0A.json b/docs/data/histograms/United States/010NZ0A.json
index e982c9b3ad2..688dcd213b4 100644
--- a/docs/data/histograms/United States/010NZ0A.json
+++ b/docs/data/histograms/United States/010NZ0A.json
@@ -1 +1 @@
-{"batchcode": "010NZ0A", "histograms": [{"batchcodes": ["010NZ0A"], "histogram": {"Chills": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010NZ0A", "histograms": [{"histogram": {"Chills": 1, "Vaccination site pain": 1}, "batchcodes": ["010NZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010T00A21A.json b/docs/data/histograms/United States/010T00A21A.json
index cdd6d37608d..649f0029ee6 100644
--- a/docs/data/histograms/United States/010T00A21A.json
+++ b/docs/data/histograms/United States/010T00A21A.json
@@ -1 +1 @@
-{"batchcode": "010T00A21A", "histograms": [{"batchcodes": ["010T00A21A"], "histogram": {"Constipation": 1, "Nasopharyngitis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "010T00A21A", "histograms": [{"histogram": {"Constipation": 1, "Nasopharyngitis": 1, "Vomiting": 1}, "batchcodes": ["010T00A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/010W20A.json b/docs/data/histograms/United States/010W20A.json
index fb3cb82a1e3..197be7243c5 100644
--- a/docs/data/histograms/United States/010W20A.json
+++ b/docs/data/histograms/United States/010W20A.json
@@ -1 +1 @@
-{"batchcode": "010W20A", "histograms": [{"batchcodes": ["010W20A"], "histogram": {"Dizziness": 1, "Eye swelling": 1, "Mobility decreased": 1, "Nausea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "010W20A", "histograms": [{"histogram": {"Dizziness": 1, "Eye swelling": 1, "Mobility decreased": 1, "Nausea": 1, "Vaccination site pain": 1}, "batchcodes": ["010W20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011(J/5)20A.json b/docs/data/histograms/United States/011(J/5)20A.json
index 6ae6f475004..c9854a21164 100644
--- a/docs/data/histograms/United States/011(J/5)20A.json
+++ b/docs/data/histograms/United States/011(J/5)20A.json
@@ -1 +1 @@
-{"batchcode": "011(J/5)20A", "histograms": [{"batchcodes": ["011(J/5)20A"], "histogram": {"Anaphylactic reaction": 1, "Cough": 1, "Pain in extremity": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "011(J/5)20A", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Cough": 1, "Pain in extremity": 1, "Rhinorrhoea": 1}, "batchcodes": ["011(J/5)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011-20A.json b/docs/data/histograms/United States/011-20A.json
index 75e974ccf85..779ca10af4e 100644
--- a/docs/data/histograms/United States/011-20A.json
+++ b/docs/data/histograms/United States/011-20A.json
@@ -1 +1 @@
-{"batchcode": "011-20A", "histograms": [{"batchcodes": ["011-20A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011-20A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Dizziness": 1, "Fatigue": 1, "Feeling cold": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1}, "batchcodes": ["011-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011-J208.json b/docs/data/histograms/United States/011-J208.json
index 7c755995630..ea8f47e0cbb 100644
--- a/docs/data/histograms/United States/011-J208.json
+++ b/docs/data/histograms/United States/011-J208.json
@@ -1 +1 @@
-{"batchcode": "011-J208", "histograms": [{"batchcodes": ["011-J208"], "histogram": {"Pharyngeal swelling": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "011-J208", "histograms": [{"histogram": {"Pharyngeal swelling": 1, "Throat irritation": 1}, "batchcodes": ["011-J208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011-J20A.json b/docs/data/histograms/United States/011-J20A.json
index d880050efd6..24874f691b1 100644
--- a/docs/data/histograms/United States/011-J20A.json
+++ b/docs/data/histograms/United States/011-J20A.json
@@ -1 +1 @@
-{"batchcode": "011-J20A", "histograms": [{"batchcodes": ["011-J20A"], "histogram": {"Vaccination site pain": 2, "Asthenia": 1, "COVID-19": 1, "Dizziness": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Myalgia": 1, "SARS-CoV-2 test": 1, "Tenderness": 1, "Throat tightness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011-J20A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Asthenia": 1, "COVID-19": 1, "Dizziness": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Myalgia": 1, "SARS-CoV-2 test": 1, "Tenderness": 1, "Throat tightness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["011-J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011.json b/docs/data/histograms/United States/011.json
index c4ba5cad401..b6c996c5583 100644
--- a/docs/data/histograms/United States/011.json
+++ b/docs/data/histograms/United States/011.json
@@ -1 +1 @@
-{"batchcode": "011", "histograms": [{"batchcodes": ["011"], "histogram": {"Abdominal discomfort": 1, "Blood pressure fluctuation": 1, "Bradycardia": 1, "Cardiac disorder": 1, "Cardiac infection": 1, "Chest discomfort": 1, "Chills": 1, "Death": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Myocardial infarction": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Tachycardia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "011", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Blood pressure fluctuation": 1, "Bradycardia": 1, "Cardiac disorder": 1, "Cardiac infection": 1, "Chest discomfort": 1, "Chills": 1, "Death": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Myocardial infarction": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Tachycardia": 1, "Vaccination complication": 1}, "batchcodes": ["011"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011020A.json b/docs/data/histograms/United States/011020A.json
index 2831773b5d7..0b4b8635a1a 100644
--- a/docs/data/histograms/United States/011020A.json
+++ b/docs/data/histograms/United States/011020A.json
@@ -1 +1 @@
-{"batchcode": "011020A", "histograms": [{"batchcodes": ["011020A"], "histogram": {"Exposure via skin contact": 1, "Product administered at inappropriate site": 1, "Product leakage": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011020A", "histograms": [{"histogram": {"Exposure via skin contact": 1, "Product administered at inappropriate site": 1, "Product leakage": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["011020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0110214.json b/docs/data/histograms/United States/0110214.json
index 805f50f718b..a3c3661f70a 100644
--- a/docs/data/histograms/United States/0110214.json
+++ b/docs/data/histograms/United States/0110214.json
@@ -1 +1 @@
-{"batchcode": "0110214", "histograms": [{"batchcodes": ["0110214"], "histogram": {"Abdominal discomfort": 1, "Asthenia": 1, "Body temperature": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Movement disorder": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Secretion discharge": 1, "Seizure": 1, "Vaccination complication": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0110214", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Asthenia": 1, "Body temperature": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Movement disorder": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Secretion discharge": 1, "Seizure": 1, "Vaccination complication": 1, "Vomiting": 1}, "batchcodes": ["0110214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011021A.json b/docs/data/histograms/United States/011021A.json
index 77fe04fd51b..7f6cf43c39f 100644
--- a/docs/data/histograms/United States/011021A.json
+++ b/docs/data/histograms/United States/011021A.json
@@ -1 +1 @@
-{"batchcode": "011021A", "histograms": [{"batchcodes": ["011021A"], "histogram": {"Asthenia": 1, "Cardiac failure congestive": 1, "Computerised tomogram": 1, "Fatigue": 1, "Flushing": 1, "Fungal infection": 1, "Glycosylated haemoglobin": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Insomnia": 1, "Muscle twitching": 1, "Psychotic disorder": 1, "Vaccination site pruritus": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1}}]}
\ No newline at end of file
+{"batchcode": "011021A", "histograms": [{"histogram": {"Asthenia": 1, "Cardiac failure congestive": 1, "Computerised tomogram": 1, "Fatigue": 1, "Flushing": 1, "Fungal infection": 1, "Glycosylated haemoglobin": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Incontinence": 1, "Insomnia": 1, "Muscle twitching": 1, "Psychotic disorder": 1, "Vaccination site pruritus": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1}, "batchcodes": ["011021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01102QA.json b/docs/data/histograms/United States/01102QA.json
index 2ce32f7bbe1..4bf61149690 100644
--- a/docs/data/histograms/United States/01102QA.json
+++ b/docs/data/histograms/United States/01102QA.json
@@ -1 +1 @@
-{"batchcode": "01102QA", "histograms": [{"batchcodes": ["01102QA"], "histogram": {"Headache": 2, "Myalgia": 2, "Arthralgia": 1, "Bone pain": 1, "Feeling cold": 1, "Infusion site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "01102QA", "histograms": [{"histogram": {"Headache": 2, "Myalgia": 2, "Arthralgia": 1, "Bone pain": 1, "Feeling cold": 1, "Infusion site warmth": 1}, "batchcodes": ["01102QA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0111-20A.json b/docs/data/histograms/United States/0111-20A.json
index 2e3f1405fc9..e1195e00ec9 100644
--- a/docs/data/histograms/United States/0111-20A.json
+++ b/docs/data/histograms/United States/0111-20A.json
@@ -1 +1 @@
-{"batchcode": "0111-20A", "histograms": [{"batchcodes": ["0111-20A"], "histogram": {"Chest pain": 1, "Epistaxis": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0111-20A", "histograms": [{"histogram": {"Chest pain": 1, "Epistaxis": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["0111-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011120A.json b/docs/data/histograms/United States/011120A.json
index d5408614c3d..7b0c994c3b6 100644
--- a/docs/data/histograms/United States/011120A.json
+++ b/docs/data/histograms/United States/011120A.json
@@ -1 +1 @@
-{"batchcode": "011120A", "histograms": [{"batchcodes": ["011120A"], "histogram": {"Headache": 6, "Myalgia": 3, "Pyrexia": 3, "Chest discomfort": 2, "Vaccination complication": 2, "Arthralgia": 1, "Back pain": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Body temperature": 1, "Chills": 1, "Eye disorder": 1, "Heart rate increased": 1, "Joint swelling": 1, "Limb discomfort": 1, "Maternal exposure during pregnancy": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Rhinorrhoea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011120A", "histograms": [{"histogram": {"Headache": 6, "Myalgia": 3, "Pyrexia": 3, "Chest discomfort": 2, "Vaccination complication": 2, "Arthralgia": 1, "Back pain": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Body temperature": 1, "Chills": 1, "Eye disorder": 1, "Heart rate increased": 1, "Joint swelling": 1, "Limb discomfort": 1, "Maternal exposure during pregnancy": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Rhinorrhoea": 1, "Vaccination site pain": 1}, "batchcodes": ["011120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01119121.json b/docs/data/histograms/United States/01119121.json
index 630ef3d1313..476e4ee0342 100644
--- a/docs/data/histograms/United States/01119121.json
+++ b/docs/data/histograms/United States/01119121.json
@@ -1 +1 @@
-{"batchcode": "01119121", "histograms": [{"batchcodes": ["01119121"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Fatigue": 1, "Illness": 1, "Injection site pain": 1, "Injection site swelling": 1, "Joint stiffness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "01119121", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Fatigue": 1, "Illness": 1, "Injection site pain": 1, "Injection site swelling": 1, "Joint stiffness": 1, "Pain in extremity": 1}, "batchcodes": ["01119121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0111A21A.json b/docs/data/histograms/United States/0111A21A.json
index 04970b5ea21..caf378f3a21 100644
--- a/docs/data/histograms/United States/0111A21A.json
+++ b/docs/data/histograms/United States/0111A21A.json
@@ -1 +1 @@
-{"batchcode": "0111A21A", "histograms": [{"batchcodes": ["0111A21A"], "histogram": {"Arthralgia": 1, "Injection site erythema": 1, "Injection site warmth": 1, "Neck pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0111A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Injection site erythema": 1, "Injection site warmth": 1, "Neck pain": 1, "Pain in extremity": 1}, "batchcodes": ["0111A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0111J20A.json b/docs/data/histograms/United States/0111J20A.json
index 9888294d6f4..b97087ae3f5 100644
--- a/docs/data/histograms/United States/0111J20A.json
+++ b/docs/data/histograms/United States/0111J20A.json
@@ -1 +1 @@
-{"batchcode": "0111J20A", "histograms": [{"batchcodes": ["0111J20A"], "histogram": {"Blister": 1, "Chills": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Peripheral swelling": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0111J20A", "histograms": [{"histogram": {"Blister": 1, "Chills": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Peripheral swelling": 1, "Rash": 1}, "batchcodes": ["0111J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0111Z0A.json b/docs/data/histograms/United States/0111Z0A.json
index 981330aa1fe..b359f4764fd 100644
--- a/docs/data/histograms/United States/0111Z0A.json
+++ b/docs/data/histograms/United States/0111Z0A.json
@@ -1 +1 @@
-{"batchcode": "0111Z0A", "histograms": [{"batchcodes": ["0111Z0A"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Cerebrovascular accident": 1, "Erythema": 1, "Heart rate": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0111Z0A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Cerebrovascular accident": 1, "Erythema": 1, "Heart rate": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["0111Z0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01120A (?).json b/docs/data/histograms/United States/01120A (?).json
index ea77ff07326..b58b7858b89 100644
--- a/docs/data/histograms/United States/01120A (?).json
+++ b/docs/data/histograms/United States/01120A (?).json
@@ -1 +1 @@
-{"batchcode": "01120A (?)", "histograms": [{"batchcodes": ["01120A (?)"], "histogram": {"Asthenia": 1, "Feeling abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "01120A (?)", "histograms": [{"histogram": {"Asthenia": 1, "Feeling abnormal": 1}, "batchcodes": ["01120A (?)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01120A.json b/docs/data/histograms/United States/01120A.json
index 7645139dce9..3e008087ad9 100644
--- a/docs/data/histograms/United States/01120A.json
+++ b/docs/data/histograms/United States/01120A.json
@@ -1 +1 @@
-{"batchcode": "01120A", "histograms": [{"batchcodes": ["01120A"], "histogram": {"Asthenia": 2, "Pain in extremity": 2, "Back pain": 1, "Bladder cancer": 1, "Blood test": 1, "Blood urine present": 1, "COVID-19": 1, "Drug ineffective": 1, "Dysphagia": 1, "Dysstasia": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hernia": 1, "Incorrect dose administered": 1, "Injection site pruritus": 1, "Mobility decreased": 1, "Obstruction": 1, "Pain": 1, "Product administered to patient of inappropriate age": 1, "Sinus headache": 1, "Urine abnormality": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "01120A", "histograms": [{"histogram": {"Asthenia": 2, "Pain in extremity": 2, "Back pain": 1, "Bladder cancer": 1, "Blood test": 1, "Blood urine present": 1, "COVID-19": 1, "Drug ineffective": 1, "Dysphagia": 1, "Dysstasia": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hernia": 1, "Incorrect dose administered": 1, "Injection site pruritus": 1, "Mobility decreased": 1, "Obstruction": 1, "Pain": 1, "Product administered to patient of inappropriate age": 1, "Sinus headache": 1, "Urine abnormality": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["01120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01120MA.json b/docs/data/histograms/United States/01120MA.json
index e1eebe2fc45..39de8fbbaf9 100644
--- a/docs/data/histograms/United States/01120MA.json
+++ b/docs/data/histograms/United States/01120MA.json
@@ -1 +1 @@
-{"batchcode": "01120MA", "histograms": [{"batchcodes": ["01120MA"], "histogram": {"Epistaxis": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "01120MA", "histograms": [{"histogram": {"Epistaxis": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["01120MA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0112196.json b/docs/data/histograms/United States/0112196.json
index 1f64bb03901..e2290f0425a 100644
--- a/docs/data/histograms/United States/0112196.json
+++ b/docs/data/histograms/United States/0112196.json
@@ -1 +1 @@
-{"batchcode": "0112196", "histograms": [{"batchcodes": ["0112196"], "histogram": {"Infection": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "0112196", "histograms": [{"histogram": {"Infection": 1, "Product dose omission issue": 1}, "batchcodes": ["0112196"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01122019.json b/docs/data/histograms/United States/01122019.json
index 5b2038a5d6b..564b8f1cfd6 100644
--- a/docs/data/histograms/United States/01122019.json
+++ b/docs/data/histograms/United States/01122019.json
@@ -1 +1 @@
-{"batchcode": "01122019", "histograms": [{"batchcodes": ["01122019"], "histogram": {"Anaphylactic shock": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hypotension": 1, "Nasal congestion": 1, "Nausea": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "01122019", "histograms": [{"histogram": {"Anaphylactic shock": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hypotension": 1, "Nasal congestion": 1, "Nausea": 1, "Urticaria": 1}, "batchcodes": ["01122019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0112204.json b/docs/data/histograms/United States/0112204.json
index 01d20a333e6..320a35b8119 100644
--- a/docs/data/histograms/United States/0112204.json
+++ b/docs/data/histograms/United States/0112204.json
@@ -1 +1 @@
-{"batchcode": "0112204", "histograms": [{"batchcodes": ["0112204"], "histogram": {"Dizziness": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "0112204", "histograms": [{"histogram": {"Dizziness": 1, "Paraesthesia": 1}, "batchcodes": ["0112204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011220A.json b/docs/data/histograms/United States/011220A.json
index e273840bab1..34d75e8a643 100644
--- a/docs/data/histograms/United States/011220A.json
+++ b/docs/data/histograms/United States/011220A.json
@@ -1 +1 @@
-{"batchcode": "011220A", "histograms": [{"batchcodes": ["011220A"], "histogram": {"Paraesthesia oral": 4, "Urticaria": 3, "Eye pruritus": 2, "Eye swelling": 2, "Pain in extremity": 2, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood test": 1, "Chills": 1, "Discomfort": 1, "Dizziness": 1, "Dysuria": 1, "Eye irritation": 1, "Feeling cold": 1, "Headache": 1, "Hypertension": 1, "Inflammation": 1, "Injection site erythema": 1, "Lip swelling": 1, "Maternal exposure before pregnancy": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain": 1, "Paraesthesia": 1, "Pruritus": 1, "Sleep disorder": 1, "Swelling of eyelid": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011220A", "histograms": [{"histogram": {"Paraesthesia oral": 4, "Urticaria": 3, "Eye pruritus": 2, "Eye swelling": 2, "Pain in extremity": 2, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood test": 1, "Chills": 1, "Discomfort": 1, "Dizziness": 1, "Dysuria": 1, "Eye irritation": 1, "Feeling cold": 1, "Headache": 1, "Hypertension": 1, "Inflammation": 1, "Injection site erythema": 1, "Lip swelling": 1, "Maternal exposure before pregnancy": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain": 1, "Paraesthesia": 1, "Pruritus": 1, "Sleep disorder": 1, "Swelling of eyelid": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["011220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0112A01.json b/docs/data/histograms/United States/0112A01.json
index 7851d8255b8..346e710c34c 100644
--- a/docs/data/histograms/United States/0112A01.json
+++ b/docs/data/histograms/United States/0112A01.json
@@ -1 +1 @@
-{"batchcode": "0112A01", "histograms": [{"batchcodes": ["0112A01"], "histogram": {"Chills": 1, "Headache": 1, "Incorrect route of product administration": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0112A01", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Incorrect route of product administration": 1, "Swelling": 1}, "batchcodes": ["0112A01"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0112L0A.json b/docs/data/histograms/United States/0112L0A.json
index e222a694d7f..0141837d1b6 100644
--- a/docs/data/histograms/United States/0112L0A.json
+++ b/docs/data/histograms/United States/0112L0A.json
@@ -1 +1 @@
-{"batchcode": "0112L0A", "histograms": [{"batchcodes": ["0112L0A"], "histogram": {"Pyrexia": 2, "Arthralgia": 1, "Bedridden": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Malaise": 1, "Pain in extremity": 1, "Pulmonary congestion": 1, "Skin discolouration": 1, "Suspected COVID-19": 1, "Tremor": 1, "Vein disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0112L0A", "histograms": [{"histogram": {"Pyrexia": 2, "Arthralgia": 1, "Bedridden": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Malaise": 1, "Pain in extremity": 1, "Pulmonary congestion": 1, "Skin discolouration": 1, "Suspected COVID-19": 1, "Tremor": 1, "Vein disorder": 1, "Vomiting": 1}, "batchcodes": ["0112L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0112L20A.json b/docs/data/histograms/United States/0112L20A.json
index d9bae5e1172..c614cf88e3e 100644
--- a/docs/data/histograms/United States/0112L20A.json
+++ b/docs/data/histograms/United States/0112L20A.json
@@ -1 +1 @@
-{"batchcode": "0112L20A", "histograms": [{"batchcodes": ["0112L20A"], "histogram": {"Incorrect dose administered": 1, "Incorrect route of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "0112L20A", "histograms": [{"histogram": {"Incorrect dose administered": 1, "Incorrect route of product administration": 1}, "batchcodes": ["0112L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011320A.json b/docs/data/histograms/United States/011320A.json
index 087c0e9ccbd..c04b2e70980 100644
--- a/docs/data/histograms/United States/011320A.json
+++ b/docs/data/histograms/United States/011320A.json
@@ -1 +1 @@
-{"batchcode": "011320A", "histograms": [{"batchcodes": ["011320A"], "histogram": {"Chills": 4, "Pyrexia": 3, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "COVID-19": 1, "Head discomfort": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Muscle twitching": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Sluggishness": 1, "Upper-airway cough syndrome": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011320A", "histograms": [{"histogram": {"Chills": 4, "Pyrexia": 3, "Asthenia": 1, "Back pain": 1, "Body temperature": 1, "COVID-19": 1, "Head discomfort": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Muscle twitching": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Sluggishness": 1, "Upper-airway cough syndrome": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["011320A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0113I20A.json b/docs/data/histograms/United States/0113I20A.json
index e41289434d3..2edf8657ec8 100644
--- a/docs/data/histograms/United States/0113I20A.json
+++ b/docs/data/histograms/United States/0113I20A.json
@@ -1 +1 @@
-{"batchcode": "0113I20A", "histograms": [{"batchcodes": ["0113I20A"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "0113I20A", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["0113I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0113J0A.json b/docs/data/histograms/United States/0113J0A.json
index 9ff7ac99c95..4bd874975a4 100644
--- a/docs/data/histograms/United States/0113J0A.json
+++ b/docs/data/histograms/United States/0113J0A.json
@@ -1 +1 @@
-{"batchcode": "0113J0A", "histograms": [{"batchcodes": ["0113J0A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0113J0A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0113J0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0114214 OR 011A.json b/docs/data/histograms/United States/0114214 OR 011A.json
index 65925741533..29874776a92 100644
--- a/docs/data/histograms/United States/0114214 OR 011A.json
+++ b/docs/data/histograms/United States/0114214 OR 011A.json
@@ -1 +1 @@
-{"batchcode": "0114214 OR 011A", "histograms": [{"batchcodes": ["0114214 OR 011A"], "histogram": {"Hyperhidrosis": 1, "Skin odour abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "0114214 OR 011A", "histograms": [{"histogram": {"Hyperhidrosis": 1, "Skin odour abnormal": 1}, "batchcodes": ["0114214 OR 011A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0114214.json b/docs/data/histograms/United States/0114214.json
index c898eef781f..f6bf1c5d350 100644
--- a/docs/data/histograms/United States/0114214.json
+++ b/docs/data/histograms/United States/0114214.json
@@ -1 +1 @@
-{"batchcode": "0114214", "histograms": [{"batchcodes": ["0114214"], "histogram": {"COVID-19": 1, "Influenza like illness": 1, "Lymphadenopathy": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "0114214", "histograms": [{"histogram": {"COVID-19": 1, "Influenza like illness": 1, "Lymphadenopathy": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["0114214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011421A.json b/docs/data/histograms/United States/011421A.json
index fffadc891b5..e09869a5e10 100644
--- a/docs/data/histograms/United States/011421A.json
+++ b/docs/data/histograms/United States/011421A.json
@@ -1 +1 @@
-{"batchcode": "011421A", "histograms": [{"batchcodes": ["011421A"], "histogram": {"Chills": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Head discomfort": 1, "Headache": 1, "Lethargy": 1, "Musculoskeletal discomfort": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011421A", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Head discomfort": 1, "Headache": 1, "Lethargy": 1, "Musculoskeletal discomfort": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["011421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0115120A.json b/docs/data/histograms/United States/0115120A.json
index d4f52e3b4d0..f7b68875c7e 100644
--- a/docs/data/histograms/United States/0115120A.json
+++ b/docs/data/histograms/United States/0115120A.json
@@ -1 +1 @@
-{"batchcode": "0115120A", "histograms": [{"batchcodes": ["0115120A"], "histogram": {"Fatigue": 1, "Injection site rash": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0115120A", "histograms": [{"histogram": {"Fatigue": 1, "Injection site rash": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0115120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011520.json b/docs/data/histograms/United States/011520.json
index cbf3717a767..71930c75b41 100644
--- a/docs/data/histograms/United States/011520.json
+++ b/docs/data/histograms/United States/011520.json
@@ -1 +1 @@
-{"batchcode": "011520", "histograms": [{"batchcodes": ["011520"], "histogram": {"Blood pressure measurement": 1, "Cardiac disorder": 1, "Dyspnoea": 1, "Heart rate": 1, "Hypertension": 1, "Pruritus": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011520", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Cardiac disorder": 1, "Dyspnoea": 1, "Heart rate": 1, "Hypertension": 1, "Pruritus": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["011520"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011520A OR 011G.json b/docs/data/histograms/United States/011520A OR 011G.json
index 9a12a05374e..d41ec3e6d70 100644
--- a/docs/data/histograms/United States/011520A OR 011G.json
+++ b/docs/data/histograms/United States/011520A OR 011G.json
@@ -1 +1 @@
-{"batchcode": "011520A OR 011G", "histograms": [{"batchcodes": ["011520A OR 011G"], "histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Insomnia": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011520A OR 011G", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Insomnia": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["011520A OR 011G"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011520A.json b/docs/data/histograms/United States/011520A.json
index 139a30fbd16..b3ed978bb3f 100644
--- a/docs/data/histograms/United States/011520A.json
+++ b/docs/data/histograms/United States/011520A.json
@@ -1 +1 @@
-{"batchcode": "011520A", "histograms": [{"batchcodes": ["011520A"], "histogram": {"Pain in extremity": 4, "Pyrexia": 3, "COVID-19": 2, "Injection site erythema": 2, "Pain": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Adverse reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Ear pain": 1, "Electrocardiogram": 1, "Eructation": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Gastrooesophageal reflux disease": 1, "Head discomfort": 1, "Headache": 1, "Influenza like illness": 1, "Injection site pain": 1, "Injection site swelling": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "Product administered to patient of inappropriate age": 1, "Rash": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011520A", "histograms": [{"histogram": {"Pain in extremity": 4, "Pyrexia": 3, "COVID-19": 2, "Injection site erythema": 2, "Pain": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Adverse reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Dizziness": 1, "Drug ineffective": 1, "Ear pain": 1, "Electrocardiogram": 1, "Eructation": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Gastrooesophageal reflux disease": 1, "Head discomfort": 1, "Headache": 1, "Influenza like illness": 1, "Injection site pain": 1, "Injection site swelling": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "Product administered to patient of inappropriate age": 1, "Rash": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["011520A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011620A.json b/docs/data/histograms/United States/011620A.json
index f902c016ff0..bbd86aff4c4 100644
--- a/docs/data/histograms/United States/011620A.json
+++ b/docs/data/histograms/United States/011620A.json
@@ -1 +1 @@
-{"batchcode": "011620A", "histograms": [{"batchcodes": ["011620A"], "histogram": {"Headache": 5, "Vaccination site pain": 4, "Myalgia": 3, "Pain in extremity": 3, "Arthralgia": 2, "Chest pain": 2, "Fatigue": 2, "Illness": 2, "Malaise": 2, "Nausea": 2, "Pyrexia": 2, "Rash": 2, "Tachycardia": 2, "Vaccination site erythema": 2, "Vaccination site warmth": 2, "Arthritis": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Mobility decreased": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Plantar fasciitis": 1, "Product dose omission issue": 1, "Pruritus": 1, "Skin mass": 1, "Suspected COVID-19": 1, "Thermal burn": 1, "Tremor": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vasculitis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011620A", "histograms": [{"histogram": {"Headache": 5, "Vaccination site pain": 4, "Myalgia": 3, "Pain in extremity": 3, "Arthralgia": 2, "Chest pain": 2, "Fatigue": 2, "Illness": 2, "Malaise": 2, "Nausea": 2, "Pyrexia": 2, "Rash": 2, "Tachycardia": 2, "Vaccination site erythema": 2, "Vaccination site warmth": 2, "Arthritis": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Mobility decreased": 1, "Muscle atrophy": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Oropharyngeal discomfort": 1, "Pain": 1, "Plantar fasciitis": 1, "Product dose omission issue": 1, "Pruritus": 1, "Skin mass": 1, "Suspected COVID-19": 1, "Thermal burn": 1, "Tremor": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site nodule": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "Vasculitis": 1, "Vomiting": 1}, "batchcodes": ["011620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01162OA.json b/docs/data/histograms/United States/01162OA.json
index f070a0f0ca6..d8a259b09cb 100644
--- a/docs/data/histograms/United States/01162OA.json
+++ b/docs/data/histograms/United States/01162OA.json
@@ -1 +1 @@
-{"batchcode": "01162OA", "histograms": [{"batchcodes": ["01162OA"], "histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Hand fracture": 1, "Headache": 1, "Road traffic accident": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01162OA", "histograms": [{"histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Hand fracture": 1, "Headache": 1, "Road traffic accident": 1, "Vaccination site pain": 1}, "batchcodes": ["01162OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011770A.json b/docs/data/histograms/United States/011770A.json
index be3de724150..8921181620c 100644
--- a/docs/data/histograms/United States/011770A.json
+++ b/docs/data/histograms/United States/011770A.json
@@ -1 +1 @@
-{"batchcode": "011770A", "histograms": [{"batchcodes": ["011770A"], "histogram": {"Chills": 2, "COVID-19": 1, "Headache": 1, "Oropharyngeal pain": 1, "Rash": 1, "SARS-CoV-2 antibody test positive": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "011770A", "histograms": [{"histogram": {"Chills": 2, "COVID-19": 1, "Headache": 1, "Oropharyngeal pain": 1, "Rash": 1, "SARS-CoV-2 antibody test positive": 1, "Vaccination complication": 1}, "batchcodes": ["011770A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011821A.json b/docs/data/histograms/United States/011821A.json
index 8ac4fd75e9e..49d79aca819 100644
--- a/docs/data/histograms/United States/011821A.json
+++ b/docs/data/histograms/United States/011821A.json
@@ -1 +1 @@
-{"batchcode": "011821A", "histograms": [{"batchcodes": ["011821A"], "histogram": {"Asthenia": 1, "Bedridden": 1, "Chills": 1, "Dizziness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011821A", "histograms": [{"histogram": {"Asthenia": 1, "Bedridden": 1, "Chills": 1, "Dizziness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["011821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A1A.json b/docs/data/histograms/United States/011A1A.json
index 3653c62b20b..d017482e3b3 100644
--- a/docs/data/histograms/United States/011A1A.json
+++ b/docs/data/histograms/United States/011A1A.json
@@ -1 +1 @@
-{"batchcode": "011A1A", "histograms": [{"batchcodes": ["011A1A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "011A1A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["011A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A20A.json b/docs/data/histograms/United States/011A20A.json
index 683c6884b40..f8bf0d302d0 100644
--- a/docs/data/histograms/United States/011A20A.json
+++ b/docs/data/histograms/United States/011A20A.json
@@ -1 +1 @@
-{"batchcode": "011A20A", "histograms": [{"batchcodes": ["011A20A"], "histogram": {"Extra dose administered": 1, "Rash erythematous": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "011A20A", "histograms": [{"histogram": {"Extra dose administered": 1, "Rash erythematous": 1, "Rash pruritic": 1}, "batchcodes": ["011A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A21.json b/docs/data/histograms/United States/011A21.json
index 333b2136f94..961b3c7b31a 100644
--- a/docs/data/histograms/United States/011A21.json
+++ b/docs/data/histograms/United States/011A21.json
@@ -1 +1 @@
-{"batchcode": "011A21", "histograms": [{"batchcodes": ["011A21"], "histogram": {"Headache": 1, "Skin warm": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21", "histograms": [{"histogram": {"Headache": 1, "Skin warm": 1, "Vaccination site erythema": 1}, "batchcodes": ["011A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A210.json b/docs/data/histograms/United States/011A210.json
index 69f36a7568e..a169e9fb64b 100644
--- a/docs/data/histograms/United States/011A210.json
+++ b/docs/data/histograms/United States/011A210.json
@@ -1 +1 @@
-{"batchcode": "011A210", "histograms": [{"batchcodes": ["011A210"], "histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Dizziness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "011A210", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Dizziness": 1, "Pain in extremity": 1}, "batchcodes": ["011A210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A214.json b/docs/data/histograms/United States/011A214.json
index c425c76359a..be292550fc7 100644
--- a/docs/data/histograms/United States/011A214.json
+++ b/docs/data/histograms/United States/011A214.json
@@ -1 +1 @@
-{"batchcode": "011A214", "histograms": [{"batchcodes": ["011A214"], "histogram": {"Chills": 3, "Headache": 3, "Pyrexia": 3, "Arthralgia": 2, "Fatigue": 2, "Myalgia": 2, "COVID-19": 1, "Diarrhoea": 1, "Dizziness": 1, "Injection site pain": 1, "Nausea": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011A214", "histograms": [{"histogram": {"Chills": 3, "Headache": 3, "Pyrexia": 3, "Arthralgia": 2, "Fatigue": 2, "Myalgia": 2, "COVID-19": 1, "Diarrhoea": 1, "Dizziness": 1, "Injection site pain": 1, "Nausea": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["011A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A21A).json b/docs/data/histograms/United States/011A21A).json
index 45885fdb45b..0ded073a045 100644
--- a/docs/data/histograms/United States/011A21A).json
+++ b/docs/data/histograms/United States/011A21A).json
@@ -1 +1 @@
-{"batchcode": "011A21A)", "histograms": [{"batchcodes": ["011A21A)"], "histogram": {"Diarrhoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21A)", "histograms": [{"histogram": {"Diarrhoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["011A21A)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A21A..json b/docs/data/histograms/United States/011A21A..json
index d6120193c6b..118486437a7 100644
--- a/docs/data/histograms/United States/011A21A..json
+++ b/docs/data/histograms/United States/011A21A..json
@@ -1 +1 @@
-{"batchcode": "011A21A.", "histograms": [{"batchcodes": ["011A21A."], "histogram": {"Arthralgia": 1, "Chest pain": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Non-cardiac chest pain": 1, "Peripheral swelling": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21A.", "histograms": [{"histogram": {"Arthralgia": 1, "Chest pain": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Non-cardiac chest pain": 1, "Peripheral swelling": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["011A21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A21A.json b/docs/data/histograms/United States/011A21A.json
index 1c2dd28bd84..6fc145c7504 100644
--- a/docs/data/histograms/United States/011A21A.json
+++ b/docs/data/histograms/United States/011A21A.json
@@ -1 +1 @@
-{"batchcode": "011A21A", "histograms": [{"batchcodes": ["011A21A", "012M20A"], "histogram": {"Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}, {"batchcodes": ["011A21A"], "histogram": {"Pain in extremity": 100, "Headache": 97, "Pyrexia": 93, "Fatigue": 90, "Chills": 77, "Expired product administered": 76, "Myalgia": 59, "Pruritus": 58, "Nausea": 56, "Vaccination site pain": 56, "Dizziness": 53, "Erythema": 45, "Pain": 45, "Feeling abnormal": 40, "Rash": 40, "Arthralgia": 36, "Vaccination site erythema": 36, "Asthenia": 32, "Vaccination site pruritus": 30, "Vaccination site warmth": 30, "Diarrhoea": 28, "Peripheral swelling": 27, "Body temperature": 26, "Malaise": 25, "Dyspnoea": 22, "Vaccination site swelling": 21, "Vomiting": 20, "Vaccination site rash": 19, "Cough": 18, "Decreased appetite": 18, "Illness": 16, "Urticaria": 16, "Vaccination complication": 16, "Blood pressure measurement": 14, "Feeling hot": 13, "COVID-19": 12, "Swelling": 12, "Influenza like illness": 11, "Lymphadenopathy": 11, "Product dose omission issue": 11, "Heart rate increased": 10, "Hyperhidrosis": 10, "Injection site pain": 10, "SARS-CoV-2 test": 10, "Abdominal pain upper": 9, "Heart rate": 9, "Nasal congestion": 9, "Neck pain": 9, "Palpitations": 9, "Paraesthesia": 9, "Somnolence": 9, "Chest pain": 8, "Insomnia": 8, "Lip swelling": 8, "Loss of consciousness": 8, "Rhinorrhoea": 8, "Tremor": 8, "Abdominal discomfort": 7, "Chest discomfort": 7, "Flushing": 7, "Gait disturbance": 7, "Injection site erythema": 7, "Limb discomfort": 7, "Rash erythematous": 7, "Back pain": 6, "Fall": 6, "Herpes zoster": 6, "Inappropriate schedule of product administration": 6, "Mobility decreased": 6, "Oropharyngeal pain": 6, "Rash macular": 6, "Sinusitis": 6, "Swelling face": 6, "Ultrasound scan": 6, "Vertigo": 6, "Adverse reaction": 5, "Ageusia": 5, "Anosmia": 5, "Balance disorder": 5, "Cerebrovascular accident": 5, "Computerised tomogram": 5, "Condition aggravated": 5, "Confusional state": 5, "Constipation": 5, "Electrocardiogram": 5, "Maternal exposure during pregnancy": 5, "Muscle spasms": 5, "Rash pruritic": 5, "Tachycardia": 5, "Tenderness": 5, "Therapeutic response unexpected": 5, "Tinnitus": 5, "Vaccination site induration": 5, "Vaccination site reaction": 5, "Vision blurred": 5, "Anxiety": 4, "Blister": 4, "Blood glucose": 4, "Dysgeusia": 4, "Feeling cold": 4, "Hypertension": 4, "Hypoaesthesia": 4, "Lethargy": 4, "Musculoskeletal stiffness": 4, "Ocular hyperaemia": 4, "Pallor": 4, "Pregnancy test": 4, "Presyncope": 4, "Product storage error": 4, "Sleep disorder": 4, "Swollen tongue": 4, "Axillary pain": 3, "Bell's palsy": 3, "Blood glucose increased": 3, "Blood test": 3, "Bone pain": 3, "Burning sensation": 3, "Chest X-ray": 3, "Device connection issue": 3, "Ear discomfort": 3, "Feeding disorder": 3, "Head discomfort": 3, "Hypotension": 3, "Immunisation reaction": 3, "Incorrect dose administered": 3, "Induration": 3, "Injection site warmth": 3, "Joint stiffness": 3, "Loss of personal independence in daily activities": 3, "Memory impairment": 3, "Muscle twitching": 3, "Muscular weakness": 3, "Neuralgia": 3, "Oral discomfort": 3, "Productive cough": 3, "SARS-CoV-2 test positive": 3, "Skin warm": 3, "Syncope": 3, "Underdose": 3, "Weight decreased": 3, "Accidental underdose": 2, "Allergy to vaccine": 2, "Amenorrhoea": 2, "Amnesia": 2, "Anaemia": 2, "Arthritis": 2, "Blood pressure increased": 2, "Body temperature increased": 2, "Breast pain": 2, "Depressed mood": 2, "Discomfort": 2, "Disorientation": 2, "Dysarthria": 2, "Exposure during pregnancy": 2, "Eye swelling": 2, "Feeling of body temperature change": 2, "Gait inability": 2, "Gastrooesophageal reflux disease": 2, "Groin pain": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hypopnoea": 2, "Hypotonia": 2, "Incoherent": 2, "Inflammation": 2, "Influenza": 2, "Injection site mass": 2, "Injection site swelling": 2, "Intentional product use issue": 2, "Joint swelling": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Myocardial infarction": 2, "Nasopharyngitis": 2, "No adverse event": 2, "Oxygen saturation": 2, "Pain of skin": 2, "Petechiae": 2, "Pharyngeal swelling": 2, "Pneumonia": 2, "Poor quality sleep": 2, "Product administered to patient of inappropriate age": 2, "Respiratory rate": 2, "Restlessness": 2, "Sensation of foreign body": 2, "Skin burning sensation": 2, "Skin discolouration": 2, "Skin disorder": 2, "Sneezing": 2, "Suspected COVID-19": 2, "Thirst": 2, "Toothache": 2, "Urinary tract infection": 2, "Vaccination site bruising": 2, "Vaccination site discolouration": 2, "Vaccination site movement impairment": 2, "Vasculitis": 2, "Visual impairment": 2, "Accidental overdose": 1, "Acne": 1, "Acute haemorrhagic ulcerative colitis": 1, "Agitation": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Arthropod sting": 1, "Asthma": 1, "Ataxia": 1, "Autoimmune disorder": 1, "Aversion": 1, "Bedridden": 1, "Biopsy kidney": 1, "Blindness transient": 1, "Blister rupture": 1, "Blood glucose fluctuation": 1, "Blood pressure diastolic decreased": 1, "Blood thyroid stimulating hormone": 1, "Body mass index": 1, "Breath sounds abnormal": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cataract": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Colitis": 1, "Colitis microscopic": 1, "Contusion": 1, "Coordination abnormal": 1, "Cyanosis": 1, "Deafness": 1, "Deafness unilateral": 1, "Dehydration": 1, "Dental discomfort": 1, "Diplopia": 1, "Dissociation": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dry throat": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Dysuria": 1, "Ear congestion": 1, "Ear infection": 1, "Eosinophil count": 1, "Eructation": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Eye contusion": 1, "Eye discharge": 1, "Eye disorder": 1, "Eye infection": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid function disorder": 1, "Facial discomfort": 1, "Facial spasm": 1, "Feeling jittery": 1, "Freezing phenomenon": 1, "Gastritis": 1, "Gastrointestinal infection": 1, "General physical health deterioration": 1, "Genital herpes": 1, "Genital pain": 1, "Glaucoma": 1, "Granulomatosis with polyangiitis": 1, "Guttate psoriasis": 1, "Haematuria": 1, "Hallucination": 1, "Head injury": 1, "Heart rate irregular": 1, "Hernia repair": 1, "Herpes virus infection": 1, "Hip fracture": 1, "Hypersomnia": 1, "Hyperthyroidism": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypoaesthesia eye": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Inflammatory marker test": 1, "Infusion related reaction": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Injection site movement impairment": 1, "Injection site paraesthesia": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site reaction": 1, "Intentional dose omission": 1, "Intentional underdose": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Irritability": 1, "Ischaemic stroke": 1, "Laryngitis": 1, "Ligament sprain": 1, "Limb mass": 1, "Lip discolouration": 1, "Lip disorder": 1, "Lung disorder": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Mental impairment": 1, "Mood altered": 1, "Mouth swelling": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Myocardial necrosis marker": 1, "Nasal discharge discolouration": 1, "Nasal inflammation": 1, "Nervous system disorder": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nodule": 1, "Nystagmus": 1, "Oesophageal carcinoma": 1, "Off label use": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Pain in jaw": 1, "Pancreatic cyst": 1, "Panic attack": 1, "Papule": 1, "Paraesthesia oral": 1, "Paranasal sinus hypersecretion": 1, "Paraplegia": 1, "Parosmia": 1, "Peripheral coldness": 1, "Peripheral sensory neuropathy": 1, "Peroneal nerve palsy": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Photopsia": 1, "Piloerection": 1, "Plasma cell myeloma": 1, "Plasmapheresis": 1, "Pleural effusion": 1, "Polyuria": 1, "Potentiating drug interaction": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Prostatic specific antigen": 1, "Psoriasis": 1, "Pulmonary imaging procedure abnormal": 1, "Pulmonary mass": 1, "Rash morbilliform": 1, "Rash vesicular": 1, "Renal failure": 1, "Renal impairment": 1, "Restless legs syndrome": 1, "Retching": 1, "Rheumatoid arthritis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test negative": 1, "Sciatica": 1, "Scratch": 1, "Seizure": 1, "Seizure like phenomena": 1, "Sensitive skin": 1, "Sinus congestion": 1, "Sinus headache": 1, "Skin exfoliation": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin mass": 1, "Skin tightness": 1, "Skin weeping": 1, "Skin wrinkling": 1, "Sleep deficit": 1, "Sleep paralysis": 1, "Sluggishness": 1, "Speech disorder": 1, "Staphylococcal infection": 1, "Streptococcus test": 1, "Syringe issue": 1, "Taste disorder": 1, "Teething": 1, "Temperature perception test increased": 1, "Thinking abnormal": 1, "Throat tightness": 1, "Thrombosis": 1, "Tongue blistering": 1, "Tongue disorder": 1, "Tonsillitis": 1, "Transient ischaemic attack": 1, "Trichorrhexis": 1, "Troponin": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound testes": 1, "Upper-airway cough syndrome": 1, "Urticaria papular": 1, "Vaccination site inflammation": 1, "Vaccination site joint pain": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vein disorder": 1, "Vestibular neuronitis": 1, "Vitamin B12 deficiency": 1, "Vulvovaginal pain": 1, "Weight": 1, "White blood cell count": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21A", "histograms": [{"histogram": {"Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["011A21A", "012M20A"]}, {"histogram": {"Pain in extremity": 100, "Headache": 97, "Pyrexia": 93, "Fatigue": 90, "Chills": 77, "Expired product administered": 76, "Myalgia": 59, "Pruritus": 58, "Nausea": 56, "Vaccination site pain": 56, "Dizziness": 53, "Erythema": 45, "Pain": 45, "Feeling abnormal": 40, "Rash": 40, "Arthralgia": 36, "Vaccination site erythema": 36, "Asthenia": 32, "Vaccination site pruritus": 30, "Vaccination site warmth": 30, "Diarrhoea": 28, "Peripheral swelling": 27, "Body temperature": 26, "Malaise": 25, "Dyspnoea": 22, "Vaccination site swelling": 21, "Vomiting": 20, "Vaccination site rash": 19, "Cough": 18, "Decreased appetite": 18, "Illness": 16, "Urticaria": 16, "Vaccination complication": 16, "Blood pressure measurement": 14, "Feeling hot": 13, "COVID-19": 12, "Swelling": 12, "Influenza like illness": 11, "Lymphadenopathy": 11, "Product dose omission issue": 11, "Heart rate increased": 10, "Hyperhidrosis": 10, "Injection site pain": 10, "SARS-CoV-2 test": 10, "Abdominal pain upper": 9, "Heart rate": 9, "Nasal congestion": 9, "Neck pain": 9, "Palpitations": 9, "Paraesthesia": 9, "Somnolence": 9, "Chest pain": 8, "Insomnia": 8, "Lip swelling": 8, "Loss of consciousness": 8, "Rhinorrhoea": 8, "Tremor": 8, "Abdominal discomfort": 7, "Chest discomfort": 7, "Flushing": 7, "Gait disturbance": 7, "Injection site erythema": 7, "Limb discomfort": 7, "Rash erythematous": 7, "Back pain": 6, "Fall": 6, "Herpes zoster": 6, "Inappropriate schedule of product administration": 6, "Mobility decreased": 6, "Oropharyngeal pain": 6, "Rash macular": 6, "Sinusitis": 6, "Swelling face": 6, "Ultrasound scan": 6, "Vertigo": 6, "Adverse reaction": 5, "Ageusia": 5, "Anosmia": 5, "Balance disorder": 5, "Cerebrovascular accident": 5, "Computerised tomogram": 5, "Condition aggravated": 5, "Confusional state": 5, "Constipation": 5, "Electrocardiogram": 5, "Maternal exposure during pregnancy": 5, "Muscle spasms": 5, "Rash pruritic": 5, "Tachycardia": 5, "Tenderness": 5, "Therapeutic response unexpected": 5, "Tinnitus": 5, "Vaccination site induration": 5, "Vaccination site reaction": 5, "Vision blurred": 5, "Anxiety": 4, "Blister": 4, "Blood glucose": 4, "Dysgeusia": 4, "Feeling cold": 4, "Hypertension": 4, "Hypoaesthesia": 4, "Lethargy": 4, "Musculoskeletal stiffness": 4, "Ocular hyperaemia": 4, "Pallor": 4, "Pregnancy test": 4, "Presyncope": 4, "Product storage error": 4, "Sleep disorder": 4, "Swollen tongue": 4, "Axillary pain": 3, "Bell's palsy": 3, "Blood glucose increased": 3, "Blood test": 3, "Bone pain": 3, "Burning sensation": 3, "Chest X-ray": 3, "Device connection issue": 3, "Ear discomfort": 3, "Feeding disorder": 3, "Head discomfort": 3, "Hypotension": 3, "Immunisation reaction": 3, "Incorrect dose administered": 3, "Induration": 3, "Injection site warmth": 3, "Joint stiffness": 3, "Loss of personal independence in daily activities": 3, "Memory impairment": 3, "Muscle twitching": 3, "Muscular weakness": 3, "Neuralgia": 3, "Oral discomfort": 3, "Productive cough": 3, "SARS-CoV-2 test positive": 3, "Skin warm": 3, "Syncope": 3, "Underdose": 3, "Weight decreased": 3, "Accidental underdose": 2, "Allergy to vaccine": 2, "Amenorrhoea": 2, "Amnesia": 2, "Anaemia": 2, "Arthritis": 2, "Blood pressure increased": 2, "Body temperature increased": 2, "Breast pain": 2, "Depressed mood": 2, "Discomfort": 2, "Disorientation": 2, "Dysarthria": 2, "Exposure during pregnancy": 2, "Eye swelling": 2, "Feeling of body temperature change": 2, "Gait inability": 2, "Gastrooesophageal reflux disease": 2, "Groin pain": 2, "Hot flush": 2, "Hypersensitivity": 2, "Hypopnoea": 2, "Hypotonia": 2, "Incoherent": 2, "Inflammation": 2, "Influenza": 2, "Injection site mass": 2, "Injection site swelling": 2, "Intentional product use issue": 2, "Joint swelling": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Myocardial infarction": 2, "Nasopharyngitis": 2, "No adverse event": 2, "Oxygen saturation": 2, "Pain of skin": 2, "Petechiae": 2, "Pharyngeal swelling": 2, "Pneumonia": 2, "Poor quality sleep": 2, "Product administered to patient of inappropriate age": 2, "Respiratory rate": 2, "Restlessness": 2, "Sensation of foreign body": 2, "Skin burning sensation": 2, "Skin discolouration": 2, "Skin disorder": 2, "Sneezing": 2, "Suspected COVID-19": 2, "Thirst": 2, "Toothache": 2, "Urinary tract infection": 2, "Vaccination site bruising": 2, "Vaccination site discolouration": 2, "Vaccination site movement impairment": 2, "Vasculitis": 2, "Visual impairment": 2, "Accidental overdose": 1, "Acne": 1, "Acute haemorrhagic ulcerative colitis": 1, "Agitation": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Arthropod sting": 1, "Asthma": 1, "Ataxia": 1, "Autoimmune disorder": 1, "Aversion": 1, "Bedridden": 1, "Biopsy kidney": 1, "Blindness transient": 1, "Blister rupture": 1, "Blood glucose fluctuation": 1, "Blood pressure diastolic decreased": 1, "Blood thyroid stimulating hormone": 1, "Body mass index": 1, "Breath sounds abnormal": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cataract": 1, "Cellulitis": 1, "Cerebral haemorrhage": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Colitis": 1, "Colitis microscopic": 1, "Contusion": 1, "Coordination abnormal": 1, "Cyanosis": 1, "Deafness": 1, "Deafness unilateral": 1, "Dehydration": 1, "Dental discomfort": 1, "Diplopia": 1, "Dissociation": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dry throat": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Dysuria": 1, "Ear congestion": 1, "Ear infection": 1, "Eosinophil count": 1, "Eructation": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Eye contusion": 1, "Eye discharge": 1, "Eye disorder": 1, "Eye infection": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid function disorder": 1, "Facial discomfort": 1, "Facial spasm": 1, "Feeling jittery": 1, "Freezing phenomenon": 1, "Gastritis": 1, "Gastrointestinal infection": 1, "General physical health deterioration": 1, "Genital herpes": 1, "Genital pain": 1, "Glaucoma": 1, "Granulomatosis with polyangiitis": 1, "Guttate psoriasis": 1, "Haematuria": 1, "Hallucination": 1, "Head injury": 1, "Heart rate irregular": 1, "Hernia repair": 1, "Herpes virus infection": 1, "Hip fracture": 1, "Hypersomnia": 1, "Hyperthyroidism": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypoaesthesia eye": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Inflammatory marker test": 1, "Infusion related reaction": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Injection site movement impairment": 1, "Injection site paraesthesia": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site reaction": 1, "Intentional dose omission": 1, "Intentional underdose": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Investigation": 1, "Irritability": 1, "Ischaemic stroke": 1, "Laryngitis": 1, "Ligament sprain": 1, "Limb mass": 1, "Lip discolouration": 1, "Lip disorder": 1, "Lung disorder": 1, "Lymphocyte count": 1, "Magnetic resonance imaging head": 1, "Mental impairment": 1, "Mood altered": 1, "Mouth swelling": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Myocardial necrosis marker": 1, "Nasal discharge discolouration": 1, "Nasal inflammation": 1, "Nervous system disorder": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nodule": 1, "Nystagmus": 1, "Oesophageal carcinoma": 1, "Off label use": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Pain in jaw": 1, "Pancreatic cyst": 1, "Panic attack": 1, "Papule": 1, "Paraesthesia oral": 1, "Paranasal sinus hypersecretion": 1, "Paraplegia": 1, "Parosmia": 1, "Peripheral coldness": 1, "Peripheral sensory neuropathy": 1, "Peroneal nerve palsy": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Photopsia": 1, "Piloerection": 1, "Plasma cell myeloma": 1, "Plasmapheresis": 1, "Pleural effusion": 1, "Polyuria": 1, "Potentiating drug interaction": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Prostatic specific antigen": 1, "Psoriasis": 1, "Pulmonary imaging procedure abnormal": 1, "Pulmonary mass": 1, "Rash morbilliform": 1, "Rash vesicular": 1, "Renal failure": 1, "Renal impairment": 1, "Restless legs syndrome": 1, "Retching": 1, "Rheumatoid arthritis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 antibody test positive": 1, "SARS-CoV-2 test negative": 1, "Sciatica": 1, "Scratch": 1, "Seizure": 1, "Seizure like phenomena": 1, "Sensitive skin": 1, "Sinus congestion": 1, "Sinus headache": 1, "Skin exfoliation": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin mass": 1, "Skin tightness": 1, "Skin weeping": 1, "Skin wrinkling": 1, "Sleep deficit": 1, "Sleep paralysis": 1, "Sluggishness": 1, "Speech disorder": 1, "Staphylococcal infection": 1, "Streptococcus test": 1, "Syringe issue": 1, "Taste disorder": 1, "Teething": 1, "Temperature perception test increased": 1, "Thinking abnormal": 1, "Throat tightness": 1, "Thrombosis": 1, "Tongue blistering": 1, "Tongue disorder": 1, "Tonsillitis": 1, "Transient ischaemic attack": 1, "Trichorrhexis": 1, "Troponin": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound testes": 1, "Upper-airway cough syndrome": 1, "Urticaria papular": 1, "Vaccination site inflammation": 1, "Vaccination site joint pain": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vein disorder": 1, "Vestibular neuronitis": 1, "Vitamin B12 deficiency": 1, "Vulvovaginal pain": 1, "Weight": 1, "White blood cell count": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["011A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A21H.json b/docs/data/histograms/United States/011A21H.json
index 9e1c139916b..16f1bf194a2 100644
--- a/docs/data/histograms/United States/011A21H.json
+++ b/docs/data/histograms/United States/011A21H.json
@@ -1 +1 @@
-{"batchcode": "011A21H", "histograms": [{"batchcodes": ["011A21H"], "histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011A21H", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["011A21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A2A.json b/docs/data/histograms/United States/011A2A.json
index fba8d39f260..95c29f5dc89 100644
--- a/docs/data/histograms/United States/011A2A.json
+++ b/docs/data/histograms/United States/011A2A.json
@@ -1 +1 @@
-{"batchcode": "011A2A", "histograms": [{"batchcodes": ["011A2A"], "histogram": {"Headache": 1, "Hypoaesthesia": 1, "Lip swelling": 1, "Oropharyngeal discomfort": 1, "Vaccination complication": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site scar": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011A2A", "histograms": [{"histogram": {"Headache": 1, "Hypoaesthesia": 1, "Lip swelling": 1, "Oropharyngeal discomfort": 1, "Vaccination complication": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site scar": 1, "Vaccination site warmth": 1}, "batchcodes": ["011A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A2A1A.json b/docs/data/histograms/United States/011A2A1A.json
index 03fa03f248a..98c8414ecde 100644
--- a/docs/data/histograms/United States/011A2A1A.json
+++ b/docs/data/histograms/United States/011A2A1A.json
@@ -1 +1 @@
-{"batchcode": "011A2A1A", "histograms": [{"batchcodes": ["011A2A1A"], "histogram": {"Chest pain": 1, "Dyspepsia": 1, "Implant site pain": 1, "Lymph node pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011A2A1A", "histograms": [{"histogram": {"Chest pain": 1, "Dyspepsia": 1, "Implant site pain": 1, "Lymph node pain": 1}, "batchcodes": ["011A2A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A2IA.json b/docs/data/histograms/United States/011A2IA.json
index 4d252c45b11..dfb495300e3 100644
--- a/docs/data/histograms/United States/011A2IA.json
+++ b/docs/data/histograms/United States/011A2IA.json
@@ -1 +1 @@
-{"batchcode": "011A2IA", "histograms": [{"batchcodes": ["011A2IA"], "histogram": {"Dysgeusia": 1}}]}
\ No newline at end of file
+{"batchcode": "011A2IA", "histograms": [{"histogram": {"Dysgeusia": 1}, "batchcodes": ["011A2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A2JA OR 011A.json b/docs/data/histograms/United States/011A2JA OR 011A.json
index be009a9f081..f2fa393a0fa 100644
--- a/docs/data/histograms/United States/011A2JA OR 011A.json
+++ b/docs/data/histograms/United States/011A2JA OR 011A.json
@@ -1 +1 @@
-{"batchcode": "011A2JA OR 011A", "histograms": [{"batchcodes": ["011A2JA OR 011A"], "histogram": {"Erythema": 1, "Piloerection": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011A2JA OR 011A", "histograms": [{"histogram": {"Erythema": 1, "Piloerection": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["011A2JA OR 011A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011A4N.json b/docs/data/histograms/United States/011A4N.json
index 97a87ea604a..d2a852a1eaf 100644
--- a/docs/data/histograms/United States/011A4N.json
+++ b/docs/data/histograms/United States/011A4N.json
@@ -1 +1 @@
-{"batchcode": "011A4N", "histograms": [{"batchcodes": ["011A4N"], "histogram": {"Feeling hot": 1, "Pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011A4N", "histograms": [{"histogram": {"Feeling hot": 1, "Pain": 1, "Vomiting": 1}, "batchcodes": ["011A4N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011AZ1A.json b/docs/data/histograms/United States/011AZ1A.json
index 227b2e71063..b89fc496cdb 100644
--- a/docs/data/histograms/United States/011AZ1A.json
+++ b/docs/data/histograms/United States/011AZ1A.json
@@ -1 +1 @@
-{"batchcode": "011AZ1A", "histograms": [{"batchcodes": ["011AZ1A"], "histogram": {"Dizziness": 4, "Headache": 3, "Pain": 3, "Abdominal discomfort": 2, "Asthenia": 2, "Fatigue": 2, "Illness": 2, "Nausea": 2, "Pain in extremity": 2, "Vaccination site erythema": 2, "Chills": 1, "Dermatitis allergic": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Hypersensitivity": 1, "Loss of consciousness": 1, "Migraine": 1, "Movement disorder": 1, "Muscle twitching": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Swelling": 1, "Tremor": 1, "Vaccination site mass": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011AZ1A", "histograms": [{"histogram": {"Dizziness": 4, "Headache": 3, "Pain": 3, "Abdominal discomfort": 2, "Asthenia": 2, "Fatigue": 2, "Illness": 2, "Nausea": 2, "Pain in extremity": 2, "Vaccination site erythema": 2, "Chills": 1, "Dermatitis allergic": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Hypersensitivity": 1, "Loss of consciousness": 1, "Migraine": 1, "Movement disorder": 1, "Muscle twitching": 1, "Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Swelling": 1, "Tremor": 1, "Vaccination site mass": 1, "Vaccination site pain": 1}, "batchcodes": ["011AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011AZIA.json b/docs/data/histograms/United States/011AZIA.json
index dc81361be1e..a902e3e9500 100644
--- a/docs/data/histograms/United States/011AZIA.json
+++ b/docs/data/histograms/United States/011AZIA.json
@@ -1 +1 @@
-{"batchcode": "011AZIA", "histograms": [{"batchcodes": ["011AZIA"], "histogram": {"Agitation": 1, "Insomnia": 1, "Peripheral swelling": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "011AZIA", "histograms": [{"histogram": {"Agitation": 1, "Insomnia": 1, "Peripheral swelling": 1, "Tremor": 1}, "batchcodes": ["011AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011B21A.json b/docs/data/histograms/United States/011B21A.json
index e52f23fd393..a3ab17155ec 100644
--- a/docs/data/histograms/United States/011B21A.json
+++ b/docs/data/histograms/United States/011B21A.json
@@ -1 +1 @@
-{"batchcode": "011B21A", "histograms": [{"batchcodes": ["011B21A"], "histogram": {"Pain in extremity": 2, "Anxiety": 1, "Asthenia": 1, "Axillary pain": 1, "Bedridden": 1, "Coma": 1, "Computerised tomogram": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Mesenteric vein thrombosis": 1, "Mobility decreased": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "Splenic vein thrombosis": 1, "Tendon injury": 1, "Throat tightness": 1, "Vaccination complication": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "011B21A", "histograms": [{"histogram": {"Pain in extremity": 2, "Anxiety": 1, "Asthenia": 1, "Axillary pain": 1, "Bedridden": 1, "Coma": 1, "Computerised tomogram": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Mesenteric vein thrombosis": 1, "Mobility decreased": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Paraesthesia": 1, "Splenic vein thrombosis": 1, "Tendon injury": 1, "Throat tightness": 1, "Vaccination complication": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Visual impairment": 1}, "batchcodes": ["011B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011B221.json b/docs/data/histograms/United States/011B221.json
index cf53d1adf66..a7ab48de494 100644
--- a/docs/data/histograms/United States/011B221.json
+++ b/docs/data/histograms/United States/011B221.json
@@ -1 +1 @@
-{"batchcode": "011B221", "histograms": [{"batchcodes": ["011B221"], "histogram": {"Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "011B221", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["011B221"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011B22A.json b/docs/data/histograms/United States/011B22A.json
index 21ac76414bc..3c3eed9b2db 100644
--- a/docs/data/histograms/United States/011B22A.json
+++ b/docs/data/histograms/United States/011B22A.json
@@ -1 +1 @@
-{"batchcode": "011B22A", "histograms": [{"batchcodes": ["011B22A"], "histogram": {"Expired product administered": 13, "No adverse event": 12, "Product storage error": 10, "Product temperature excursion issue": 4, "Poor quality product administered": 2, "Chills": 1, "Eczema": 1, "Frustration tolerance decreased": 1, "Hyperhidrosis": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site dryness": 1, "Vaccination site exfoliation": 1, "Vaccination site pain": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "011B22A", "histograms": [{"histogram": {"Expired product administered": 13, "No adverse event": 12, "Product storage error": 10, "Product temperature excursion issue": 4, "Poor quality product administered": 2, "Chills": 1, "Eczema": 1, "Frustration tolerance decreased": 1, "Hyperhidrosis": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site dryness": 1, "Vaccination site exfoliation": 1, "Vaccination site pain": 1, "Wrong product administered": 1}, "batchcodes": ["011B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011C20A.json b/docs/data/histograms/United States/011C20A.json
index 3af53a29eb2..c0f9b23f413 100644
--- a/docs/data/histograms/United States/011C20A.json
+++ b/docs/data/histograms/United States/011C20A.json
@@ -1 +1 @@
-{"batchcode": "011C20A", "histograms": [{"batchcodes": ["011C20A"], "histogram": {"Accidental overdose": 1, "Chills": 1, "Fatigue": 1, "Pain in extremity": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Tension": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "011C20A", "histograms": [{"histogram": {"Accidental overdose": 1, "Chills": 1, "Fatigue": 1, "Pain in extremity": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Tension": 1, "Tremor": 1}, "batchcodes": ["011C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011CZ0A.json b/docs/data/histograms/United States/011CZ0A.json
index f75a9ef4715..6fa6276f3e9 100644
--- a/docs/data/histograms/United States/011CZ0A.json
+++ b/docs/data/histograms/United States/011CZ0A.json
@@ -1 +1 @@
-{"batchcode": "011CZ0A", "histograms": [{"batchcodes": ["011CZ0A"], "histogram": {"Headache": 1, "Pain in extremity": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011CZ0A", "histograms": [{"histogram": {"Headache": 1, "Pain in extremity": 1, "Vaccination site rash": 1}, "batchcodes": ["011CZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011D.json b/docs/data/histograms/United States/011D.json
index d799b82cb2a..2c42b7a980b 100644
--- a/docs/data/histograms/United States/011D.json
+++ b/docs/data/histograms/United States/011D.json
@@ -1 +1 @@
-{"batchcode": "011D", "histograms": [{"batchcodes": ["011D"], "histogram": {"Erythema": 1, "Feeling abnormal": 1, "Heat illness": 1, "Hypersensitivity": 1}}]}
\ No newline at end of file
+{"batchcode": "011D", "histograms": [{"histogram": {"Erythema": 1, "Feeling abnormal": 1, "Heat illness": 1, "Hypersensitivity": 1}, "batchcodes": ["011D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011D20A.json b/docs/data/histograms/United States/011D20A.json
index 197a16ea510..38c5ce24bb7 100644
--- a/docs/data/histograms/United States/011D20A.json
+++ b/docs/data/histograms/United States/011D20A.json
@@ -1 +1 @@
-{"batchcode": "011D20A", "histograms": [{"batchcodes": ["011D20A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011D20A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["011D20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011D21A EXP11-2.json b/docs/data/histograms/United States/011D21A EXP11-2.json
index 01052d3b2ea..0306445900d 100644
--- a/docs/data/histograms/United States/011D21A EXP11-2.json
+++ b/docs/data/histograms/United States/011D21A EXP11-2.json
@@ -1 +1 @@
-{"batchcode": "011D21A EXP11-2", "histograms": [{"batchcodes": ["011D21A EXP11-2"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "011D21A EXP11-2", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["011D21A EXP11-2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011D21A.json b/docs/data/histograms/United States/011D21A.json
index 6ca927fd52e..9d2f2d838a9 100644
--- a/docs/data/histograms/United States/011D21A.json
+++ b/docs/data/histograms/United States/011D21A.json
@@ -1 +1 @@
-{"batchcode": "011D21A", "histograms": [{"batchcodes": ["011D21A"], "histogram": {"Myalgia": 11, "Vaccination site pain": 10, "Fatigue": 5, "Pyrexia": 5, "Chills": 4, "Expired product administered": 4, "Inappropriate schedule of product administration": 4, "Insomnia": 4, "Peripheral swelling": 4, "Product dose omission issue": 4, "Pruritus": 4, "Rash": 4, "Vaccination complication": 4, "Burning sensation": 3, "COVID-19": 3, "Diarrhoea": 3, "Erythema": 3, "Illness": 3, "Nausea": 3, "Pain in extremity": 3, "Vaccination site pruritus": 3, "Vaccination site rash": 3, "Vaccination site swelling": 3, "Arthralgia": 2, "Asthenia": 2, "Chest pain": 2, "Device connection issue": 2, "Dizziness": 2, "Dyspnoea": 2, "Feeling hot": 2, "Headache": 2, "Hypoaesthesia": 2, "Lymphadenopathy": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Pain": 2, "Product administered to patient of inappropriate age": 2, "SARS-CoV-2 test": 2, "Somnolence": 2, "Swelling face": 2, "Underdose": 2, "Vaccination site mass": 2, "Vaccination site warmth": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal dreams": 1, "Ageusia": 1, "Anosmia": 1, "Antibody test": 1, "Anxiety": 1, "Aphonia": 1, "Axillary pain": 1, "Balance disorder": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Body temperature increased": 1, "COVID-19 pneumonia": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Contusion": 1, "Cough": 1, "Crying": 1, "Deafness": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Eczema": 1, "Eye swelling": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flatulence": 1, "Fluid retention": 1, "Food intolerance": 1, "Gait disturbance": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Immunisation reaction": 1, "Impaired self-care": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Induration": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site rash": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Joint swelling": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nerve root injury": 1, "Overdose": 1, "Pain in jaw": 1, "Palpitations": 1, "Pancreatitis": 1, "Panic attack": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pollakiuria": 1, "Product storage error": 1, "Rhinorrhoea": 1, "Skin warm": 1, "Staphylococcal infection": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Thyroid disorder": 1, "Transient ischaemic attack": 1, "Urticaria": 1, "Vaccination error": 1, "Vaccination site erythema": 1, "Varicella": 1, "Vitreous detachment": 1, "Vitreous floaters": 1, "Weight": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "011D21A", "histograms": [{"histogram": {"Myalgia": 11, "Vaccination site pain": 10, "Fatigue": 5, "Pyrexia": 5, "Chills": 4, "Expired product administered": 4, "Inappropriate schedule of product administration": 4, "Insomnia": 4, "Peripheral swelling": 4, "Product dose omission issue": 4, "Pruritus": 4, "Rash": 4, "Vaccination complication": 4, "Burning sensation": 3, "COVID-19": 3, "Diarrhoea": 3, "Erythema": 3, "Illness": 3, "Nausea": 3, "Pain in extremity": 3, "Vaccination site pruritus": 3, "Vaccination site rash": 3, "Vaccination site swelling": 3, "Arthralgia": 2, "Asthenia": 2, "Chest pain": 2, "Device connection issue": 2, "Dizziness": 2, "Dyspnoea": 2, "Feeling hot": 2, "Headache": 2, "Hypoaesthesia": 2, "Lymphadenopathy": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Oropharyngeal pain": 2, "Pain": 2, "Product administered to patient of inappropriate age": 2, "SARS-CoV-2 test": 2, "Somnolence": 2, "Swelling face": 2, "Underdose": 2, "Vaccination site mass": 2, "Vaccination site warmth": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Abnormal dreams": 1, "Ageusia": 1, "Anosmia": 1, "Antibody test": 1, "Anxiety": 1, "Aphonia": 1, "Axillary pain": 1, "Balance disorder": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Body temperature": 1, "Body temperature increased": 1, "COVID-19 pneumonia": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Contusion": 1, "Cough": 1, "Crying": 1, "Deafness": 1, "Decreased appetite": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Eczema": 1, "Eye swelling": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Flatulence": 1, "Fluid retention": 1, "Food intolerance": 1, "Gait disturbance": 1, "Haemorrhage": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Immunisation reaction": 1, "Impaired self-care": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Induration": 1, "Inflammation": 1, "Injection site pain": 1, "Injection site rash": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Joint swelling": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Nerve root injury": 1, "Overdose": 1, "Pain in jaw": 1, "Palpitations": 1, "Pancreatitis": 1, "Panic attack": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pollakiuria": 1, "Product storage error": 1, "Rhinorrhoea": 1, "Skin warm": 1, "Staphylococcal infection": 1, "Swelling": 1, "Systemic lupus erythematosus": 1, "Thyroid disorder": 1, "Transient ischaemic attack": 1, "Urticaria": 1, "Vaccination error": 1, "Vaccination site erythema": 1, "Varicella": 1, "Vitreous detachment": 1, "Vitreous floaters": 1, "Weight": 1, "X-ray": 1}, "batchcodes": ["011D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011D2NA.json b/docs/data/histograms/United States/011D2NA.json
index 1b15e661708..b5a24f701fa 100644
--- a/docs/data/histograms/United States/011D2NA.json
+++ b/docs/data/histograms/United States/011D2NA.json
@@ -1 +1 @@
-{"batchcode": "011D2NA", "histograms": [{"batchcodes": ["011D2NA"], "histogram": {"Myalgia": 2, "Chest pain": 1, "Dysgeusia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Illness": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011D2NA", "histograms": [{"histogram": {"Myalgia": 2, "Chest pain": 1, "Dysgeusia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Illness": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["011D2NA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011DZ1A.json b/docs/data/histograms/United States/011DZ1A.json
index 64a5e50eed0..aaf579fc1f1 100644
--- a/docs/data/histograms/United States/011DZ1A.json
+++ b/docs/data/histograms/United States/011DZ1A.json
@@ -1 +1 @@
-{"batchcode": "011DZ1A", "histograms": [{"batchcodes": ["011DZ1A"], "histogram": {"Arthralgia": 1, "Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "011DZ1A", "histograms": [{"histogram": {"Arthralgia": 1, "Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["011DZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011DZIA.json b/docs/data/histograms/United States/011DZIA.json
index 0cc6b9eb9c5..fd4b3ca82d7 100644
--- a/docs/data/histograms/United States/011DZIA.json
+++ b/docs/data/histograms/United States/011DZIA.json
@@ -1 +1 @@
-{"batchcode": "011DZIA", "histograms": [{"batchcodes": ["011DZIA"], "histogram": {"Headache": 1, "Pain in extremity": 1, "Retching": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011DZIA", "histograms": [{"histogram": {"Headache": 1, "Pain in extremity": 1, "Retching": 1, "Vomiting": 1}, "batchcodes": ["011DZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011F.json b/docs/data/histograms/United States/011F.json
index d8bfcbb7d0b..bbb3822fc5d 100644
--- a/docs/data/histograms/United States/011F.json
+++ b/docs/data/histograms/United States/011F.json
@@ -1 +1 @@
-{"batchcode": "011F", "histograms": [{"batchcodes": ["011F"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "011F", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["011F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011F2114.json b/docs/data/histograms/United States/011F2114.json
index 13d5e89c6fa..95b7e96a6de 100644
--- a/docs/data/histograms/United States/011F2114.json
+++ b/docs/data/histograms/United States/011F2114.json
@@ -1 +1 @@
-{"batchcode": "011F2114", "histograms": [{"batchcodes": ["011F2114"], "histogram": {"Allergy to vaccine": 1, "Myalgia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "011F2114", "histograms": [{"histogram": {"Allergy to vaccine": 1, "Myalgia": 1, "Urticaria": 1}, "batchcodes": ["011F2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011F21A-B.json b/docs/data/histograms/United States/011F21A-B.json
index 55336d356a6..5ddea267517 100644
--- a/docs/data/histograms/United States/011F21A-B.json
+++ b/docs/data/histograms/United States/011F21A-B.json
@@ -1 +1 @@
-{"batchcode": "011F21A-B", "histograms": [{"batchcodes": ["011F21A-B"], "histogram": {"Abdominal pain upper": 1, "Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011F21A-B", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Vomiting": 1}, "batchcodes": ["011F21A-B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011F21A.json b/docs/data/histograms/United States/011F21A.json
index 46f2168638d..9a900c1524f 100644
--- a/docs/data/histograms/United States/011F21A.json
+++ b/docs/data/histograms/United States/011F21A.json
@@ -1 +1 @@
-{"batchcode": "011F21A", "histograms": [{"batchcodes": ["011F21A"], "histogram": {"Expired product administered": 64, "Product storage error": 32, "Pyrexia": 10, "Myalgia": 9, "Vaccination site pain": 8, "Accidental overdose": 6, "Feeling abnormal": 6, "Chills": 5, "Fatigue": 5, "Vaccination site erythema": 5, "Body temperature": 4, "COVID-19": 4, "Headache": 4, "Pain": 4, "Erythema": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Nausea": 3, "Pain in extremity": 3, "Palpitations": 3, "Poor quality product administered": 3, "Product temperature excursion issue": 3, "SARS-CoV-2 test": 3, "Vaccination site rash": 3, "Vaccination site swelling": 3, "Back pain": 2, "Dizziness": 2, "Electrocardiogram": 2, "Inappropriate schedule of product administration": 2, "Inflammation": 2, "Injection site pain": 2, "Insomnia": 2, "Neck pain": 2, "Paraesthesia": 2, "Product administered to patient of inappropriate age": 2, "Rash": 2, "Tremor": 2, "Vaccination site pruritus": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Blood test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cold sweat": 1, "Daydreaming": 1, "Death": 1, "Dizziness postural": 1, "Dysgeusia": 1, "Dysphagia": 1, "Echocardiogram": 1, "Energy increased": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Flank pain": 1, "Gout": 1, "Haematuria": 1, "Head discomfort": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hospitalisation": 1, "Hypersensitivity": 1, "Hypopnoea": 1, "Illness": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Polymenorrhoea": 1, "Product administration error": 1, "Rash erythematous": 1, "Sleep disorder": 1, "Tachycardia": 1, "Thinking abnormal": 1, "Throat tightness": 1, "Ultrasound scan": 1, "Vaccination complication": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011F21A", "histograms": [{"histogram": {"Expired product administered": 64, "Product storage error": 32, "Pyrexia": 10, "Myalgia": 9, "Vaccination site pain": 8, "Accidental overdose": 6, "Feeling abnormal": 6, "Chills": 5, "Fatigue": 5, "Vaccination site erythema": 5, "Body temperature": 4, "COVID-19": 4, "Headache": 4, "Pain": 4, "Erythema": 3, "Hyperhidrosis": 3, "Hypoaesthesia": 3, "Nausea": 3, "Pain in extremity": 3, "Palpitations": 3, "Poor quality product administered": 3, "Product temperature excursion issue": 3, "SARS-CoV-2 test": 3, "Vaccination site rash": 3, "Vaccination site swelling": 3, "Back pain": 2, "Dizziness": 2, "Electrocardiogram": 2, "Inappropriate schedule of product administration": 2, "Inflammation": 2, "Injection site pain": 2, "Insomnia": 2, "Neck pain": 2, "Paraesthesia": 2, "Product administered to patient of inappropriate age": 2, "Rash": 2, "Tremor": 2, "Vaccination site pruritus": 2, "Abdominal pain": 1, "Arthralgia": 1, "Asthenia": 1, "Balance disorder": 1, "Blood test": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cold sweat": 1, "Daydreaming": 1, "Death": 1, "Dizziness postural": 1, "Dysgeusia": 1, "Dysphagia": 1, "Echocardiogram": 1, "Energy increased": 1, "Eye pain": 1, "Eye swelling": 1, "Fall": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Flank pain": 1, "Gout": 1, "Haematuria": 1, "Head discomfort": 1, "Heart rate": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hospitalisation": 1, "Hypersensitivity": 1, "Hypopnoea": 1, "Illness": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mobility decreased": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Nervous system disorder": 1, "Neurological symptom": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Polymenorrhoea": 1, "Product administration error": 1, "Rash erythematous": 1, "Sleep disorder": 1, "Tachycardia": 1, "Thinking abnormal": 1, "Throat tightness": 1, "Ultrasound scan": 1, "Vaccination complication": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["011F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011F24A.json b/docs/data/histograms/United States/011F24A.json
index 015ae6d1dc2..c74bd2a5486 100644
--- a/docs/data/histograms/United States/011F24A.json
+++ b/docs/data/histograms/United States/011F24A.json
@@ -1 +1 @@
-{"batchcode": "011F24A", "histograms": [{"batchcodes": ["011F24A"], "histogram": {"Balance disorder": 1, "Blood pressure increased": 1, "Computerised tomogram": 1, "Dizziness": 1, "Feeling abnormal": 1, "Headache": 1, "Lacunar infarction": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "011F24A", "histograms": [{"histogram": {"Balance disorder": 1, "Blood pressure increased": 1, "Computerised tomogram": 1, "Dizziness": 1, "Feeling abnormal": 1, "Headache": 1, "Lacunar infarction": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Vaccination complication": 1}, "batchcodes": ["011F24A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011F3H1.json b/docs/data/histograms/United States/011F3H1.json
index ed33547ed7e..f1851a89c4c 100644
--- a/docs/data/histograms/United States/011F3H1.json
+++ b/docs/data/histograms/United States/011F3H1.json
@@ -1 +1 @@
-{"batchcode": "011F3H1", "histograms": [{"batchcodes": ["011F3H1"], "histogram": {"Fatigue": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "011F3H1", "histograms": [{"histogram": {"Fatigue": 1, "Myalgia": 1}, "batchcodes": ["011F3H1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011FZ1A.json b/docs/data/histograms/United States/011FZ1A.json
index 374f3497fa4..875b03996d8 100644
--- a/docs/data/histograms/United States/011FZ1A.json
+++ b/docs/data/histograms/United States/011FZ1A.json
@@ -1 +1 @@
-{"batchcode": "011FZ1A", "histograms": [{"batchcodes": ["011FZ1A"], "histogram": {"Arthralgia": 1, "Burning sensation": 1, "Discomfort": 1, "Pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011FZ1A", "histograms": [{"histogram": {"Arthralgia": 1, "Burning sensation": 1, "Discomfort": 1, "Pain": 1, "Vaccination site pain": 1}, "batchcodes": ["011FZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011G20 7 OR 8.json b/docs/data/histograms/United States/011G20 7 OR 8.json
index 668479c159a..907e6151202 100644
--- a/docs/data/histograms/United States/011G20 7 OR 8.json
+++ b/docs/data/histograms/United States/011G20 7 OR 8.json
@@ -1 +1 @@
-{"batchcode": "011G20 7 OR 8", "histograms": [{"batchcodes": ["011G20 7 OR 8"], "histogram": {"Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "011G20 7 OR 8", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1}, "batchcodes": ["011G20 7 OR 8"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011G20A.json b/docs/data/histograms/United States/011G20A.json
index 8037b563368..10b8677f3ac 100644
--- a/docs/data/histograms/United States/011G20A.json
+++ b/docs/data/histograms/United States/011G20A.json
@@ -1 +1 @@
-{"batchcode": "011G20A", "histograms": [{"batchcodes": ["011G20A"], "histogram": {"Arthralgia": 1, "Headache": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Neuralgia": 1, "Paraesthesia": 1, "Tremor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011G20A", "histograms": [{"histogram": {"Arthralgia": 1, "Headache": 1, "Hypoaesthesia": 1, "Myalgia": 1, "Neuralgia": 1, "Paraesthesia": 1, "Tremor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["011G20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011G25A.json b/docs/data/histograms/United States/011G25A.json
index dd7680f6424..25829d91eb1 100644
--- a/docs/data/histograms/United States/011G25A.json
+++ b/docs/data/histograms/United States/011G25A.json
@@ -1 +1 @@
-{"batchcode": "011G25A", "histograms": [{"batchcodes": ["011G25A"], "histogram": {"Eructation": 1, "Insomnia": 1, "Nasal discharge discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "011G25A", "histograms": [{"histogram": {"Eructation": 1, "Insomnia": 1, "Nasal discharge discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["011G25A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011G28.json b/docs/data/histograms/United States/011G28.json
index d8973a65493..b24f2733019 100644
--- a/docs/data/histograms/United States/011G28.json
+++ b/docs/data/histograms/United States/011G28.json
@@ -1 +1 @@
-{"batchcode": "011G28", "histograms": [{"batchcodes": ["011G28"], "histogram": {"Asthenia": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "011G28", "histograms": [{"histogram": {"Asthenia": 1, "Sleep disorder due to general medical condition, insomnia type": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["011G28"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011H21A.json b/docs/data/histograms/United States/011H21A.json
index b4be6ef4b38..bfe0f9114fe 100644
--- a/docs/data/histograms/United States/011H21A.json
+++ b/docs/data/histograms/United States/011H21A.json
@@ -1 +1 @@
-{"batchcode": "011H21A", "histograms": [{"batchcodes": ["011H21A"], "histogram": {"Immunisation reaction": 1, "Lip swelling": 1, "Oral discomfort": 1, "Oral herpes": 1, "Paraesthesia oral": 1, "Tongue discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "011H21A", "histograms": [{"histogram": {"Immunisation reaction": 1, "Lip swelling": 1, "Oral discomfort": 1, "Oral herpes": 1, "Paraesthesia oral": 1, "Tongue discomfort": 1}, "batchcodes": ["011H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011H22A.json b/docs/data/histograms/United States/011H22A.json
index de678c16337..8f148c4d436 100644
--- a/docs/data/histograms/United States/011H22A.json
+++ b/docs/data/histograms/United States/011H22A.json
@@ -1 +1 @@
-{"batchcode": "011H22A", "histograms": [{"batchcodes": ["011H22A"], "histogram": {"No adverse event": 6, "Expired product administered": 3, "Product temperature excursion issue": 3, "Poor quality product administered": 2, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "011H22A", "histograms": [{"histogram": {"No adverse event": 6, "Expired product administered": 3, "Product temperature excursion issue": 3, "Poor quality product administered": 2, "Product storage error": 1}, "batchcodes": ["011H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011HZ0A.json b/docs/data/histograms/United States/011HZ0A.json
index b950afb9bed..683109d5373 100644
--- a/docs/data/histograms/United States/011HZ0A.json
+++ b/docs/data/histograms/United States/011HZ0A.json
@@ -1 +1 @@
-{"batchcode": "011HZ0A", "histograms": [{"batchcodes": ["011HZ0A"], "histogram": {"Feeling abnormal": 1, "Headache": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011HZ0A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Headache": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin swelling": 1}, "batchcodes": ["011HZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011I-20A.json b/docs/data/histograms/United States/011I-20A.json
index 7640a1c98f3..ee06d4e43f6 100644
--- a/docs/data/histograms/United States/011I-20A.json
+++ b/docs/data/histograms/United States/011I-20A.json
@@ -1 +1 @@
-{"batchcode": "011I-20A", "histograms": [{"batchcodes": ["011I-20A"], "histogram": {"Diarrhoea": 2, "Feeling abnormal": 1, "Injection site rash": 1, "Malaise": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011I-20A", "histograms": [{"histogram": {"Diarrhoea": 2, "Feeling abnormal": 1, "Injection site rash": 1, "Malaise": 1, "Rash": 1}, "batchcodes": ["011I-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011I20A.json b/docs/data/histograms/United States/011I20A.json
index 082a0050ca7..f9c1da91291 100644
--- a/docs/data/histograms/United States/011I20A.json
+++ b/docs/data/histograms/United States/011I20A.json
@@ -1 +1 @@
-{"batchcode": "011I20A", "histograms": [{"batchcodes": ["011I20A"], "histogram": {"Injection site bruising": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "011I20A", "histograms": [{"histogram": {"Injection site bruising": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["011I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J-20A.json b/docs/data/histograms/United States/011J-20A.json
index 4d6bb489272..df64c2b5828 100644
--- a/docs/data/histograms/United States/011J-20A.json
+++ b/docs/data/histograms/United States/011J-20A.json
@@ -1 +1 @@
-{"batchcode": "011J-20A", "histograms": [{"batchcodes": ["011J-20A"], "histogram": {"Glucose tolerance test": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Ultrasound scan": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011J-20A", "histograms": [{"histogram": {"Glucose tolerance test": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Ultrasound scan": 1, "Vaccination site pain": 1}, "batchcodes": ["011J-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J00A.json b/docs/data/histograms/United States/011J00A.json
index dd631c23a9b..99f5b54d739 100644
--- a/docs/data/histograms/United States/011J00A.json
+++ b/docs/data/histograms/United States/011J00A.json
@@ -1 +1 @@
-{"batchcode": "011J00A", "histograms": [{"batchcodes": ["011J00A"], "histogram": {"Body temperature": 1, "Influenza like illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011J00A", "histograms": [{"histogram": {"Body temperature": 1, "Influenza like illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["011J00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J020A.json b/docs/data/histograms/United States/011J020A.json
index 34e18f419aa..bdabf2e595a 100644
--- a/docs/data/histograms/United States/011J020A.json
+++ b/docs/data/histograms/United States/011J020A.json
@@ -1 +1 @@
-{"batchcode": "011J020A", "histograms": [{"batchcodes": ["011J020A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011J020A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["011J020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J02A.json b/docs/data/histograms/United States/011J02A.json
index 47607e3b99b..ecebe1a4dac 100644
--- a/docs/data/histograms/United States/011J02A.json
+++ b/docs/data/histograms/United States/011J02A.json
@@ -1 +1 @@
-{"batchcode": "011J02A", "histograms": [{"batchcodes": ["011J02A"], "histogram": {"Headache": 2, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Anxiety": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Chest discomfort": 1, "Chills": 1, "Confusional state": 1, "Disorientation": 1, "Dry skin": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Heart rate decreased": 1, "Hot flush": 1, "Irritability": 1, "Malaise": 1, "Muscle swelling": 1, "Myalgia": 1, "Pain in extremity": 1, "Pallor": 1, "Vaccination site calcification": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011J02A", "histograms": [{"histogram": {"Headache": 2, "Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Anxiety": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Chest discomfort": 1, "Chills": 1, "Confusional state": 1, "Disorientation": 1, "Dry skin": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Heart rate decreased": 1, "Hot flush": 1, "Irritability": 1, "Malaise": 1, "Muscle swelling": 1, "Myalgia": 1, "Pain in extremity": 1, "Pallor": 1, "Vaccination site calcification": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["011J02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J0A.json b/docs/data/histograms/United States/011J0A.json
index 68ec6188923..ce036ad56cb 100644
--- a/docs/data/histograms/United States/011J0A.json
+++ b/docs/data/histograms/United States/011J0A.json
@@ -1 +1 @@
-{"batchcode": "011J0A", "histograms": [{"batchcodes": ["011J0A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Injection site bruising": 1, "Pain in jaw": 1, "Vaccination site erythema": 1, "Vaccination site hypersensitivity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011J0A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Injection site bruising": 1, "Pain in jaw": 1, "Vaccination site erythema": 1, "Vaccination site hypersensitivity": 1, "Vaccination site pain": 1}, "batchcodes": ["011J0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20-A.json b/docs/data/histograms/United States/011J20-A.json
index a35d4b53549..14e15d8b135 100644
--- a/docs/data/histograms/United States/011J20-A.json
+++ b/docs/data/histograms/United States/011J20-A.json
@@ -1 +1 @@
-{"batchcode": "011J20-A", "histograms": [{"batchcodes": ["011J20-A"], "histogram": {"Chills": 1, "Facial discomfort": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20-A", "histograms": [{"histogram": {"Chills": 1, "Facial discomfort": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["011J20-A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20.json b/docs/data/histograms/United States/011J20.json
index 863c802351a..c5488d2d3c0 100644
--- a/docs/data/histograms/United States/011J20.json
+++ b/docs/data/histograms/United States/011J20.json
@@ -1 +1 @@
-{"batchcode": "011J20", "histograms": [{"batchcodes": ["011J20"], "histogram": {"Inappropriate schedule of product administration": 1, "Syringe issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Syringe issue": 1, "Underdose": 1}, "batchcodes": ["011J20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J200A.json b/docs/data/histograms/United States/011J200A.json
index 001f3938bd8..48ff2d1495d 100644
--- a/docs/data/histograms/United States/011J200A.json
+++ b/docs/data/histograms/United States/011J200A.json
@@ -1 +1 @@
-{"batchcode": "011J200A", "histograms": [{"batchcodes": ["011J200A"], "histogram": {"Arthralgia": 1, "Hypokinesia": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011J200A", "histograms": [{"histogram": {"Arthralgia": 1, "Hypokinesia": 1, "Injection site pain": 1}, "batchcodes": ["011J200A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J2014.json b/docs/data/histograms/United States/011J2014.json
index 44a1c7ec04a..c41e3aaa303 100644
--- a/docs/data/histograms/United States/011J2014.json
+++ b/docs/data/histograms/United States/011J2014.json
@@ -1 +1 @@
-{"batchcode": "011J2014", "histograms": [{"batchcodes": ["011J2014"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "011J2014", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["011J2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J2018.json b/docs/data/histograms/United States/011J2018.json
index 828c7c9a184..bbae3c8813a 100644
--- a/docs/data/histograms/United States/011J2018.json
+++ b/docs/data/histograms/United States/011J2018.json
@@ -1 +1 @@
-{"batchcode": "011J2018", "histograms": [{"batchcodes": ["011J2018"], "histogram": {"Lymphadenopathy": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011J2018", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Pain": 1}, "batchcodes": ["011J2018"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J204.json b/docs/data/histograms/United States/011J204.json
index bf2b65ef067..6aafd89b38d 100644
--- a/docs/data/histograms/United States/011J204.json
+++ b/docs/data/histograms/United States/011J204.json
@@ -1 +1 @@
-{"batchcode": "011J204", "histograms": [{"batchcodes": ["011J204"], "histogram": {"Headache": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Body temperature increased": 1, "Chest discomfort": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Pneumomediastinum": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011J204", "histograms": [{"histogram": {"Headache": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Body temperature increased": 1, "Chest discomfort": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Pneumomediastinum": 1, "Pyrexia": 1}, "batchcodes": ["011J204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J205A.json b/docs/data/histograms/United States/011J205A.json
index 8bc55d4ad6f..521f76daf9d 100644
--- a/docs/data/histograms/United States/011J205A.json
+++ b/docs/data/histograms/United States/011J205A.json
@@ -1 +1 @@
-{"batchcode": "011J205A", "histograms": [{"batchcodes": ["011J205A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011J205A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["011J205A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J208.json b/docs/data/histograms/United States/011J208.json
index a7ece63d133..a3591a9ab49 100644
--- a/docs/data/histograms/United States/011J208.json
+++ b/docs/data/histograms/United States/011J208.json
@@ -1 +1 @@
-{"batchcode": "011J208", "histograms": [{"batchcodes": ["011J208"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Bone pain": 1, "Chills": 1, "Myalgia": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011J208", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Bone pain": 1, "Chills": 1, "Myalgia": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["011J208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J208A.json b/docs/data/histograms/United States/011J208A.json
index 25d142833c9..c507cb2f025 100644
--- a/docs/data/histograms/United States/011J208A.json
+++ b/docs/data/histograms/United States/011J208A.json
@@ -1 +1 @@
-{"batchcode": "011J208A", "histograms": [{"batchcodes": ["011J208A"], "histogram": {"Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011J208A", "histograms": [{"histogram": {"Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["011J208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J209.json b/docs/data/histograms/United States/011J209.json
index 73fdfc51214..cf84dc82718 100644
--- a/docs/data/histograms/United States/011J209.json
+++ b/docs/data/histograms/United States/011J209.json
@@ -1 +1 @@
-{"batchcode": "011J209", "histograms": [{"batchcodes": ["011J209"], "histogram": {"Pruritus": 2, "Flushing": 1, "Maternal exposure before pregnancy": 1, "Pain": 1, "Peripheral swelling": 1, "Rash": 1, "Rash erythematous": 1, "Skin irritation": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011J209", "histograms": [{"histogram": {"Pruritus": 2, "Flushing": 1, "Maternal exposure before pregnancy": 1, "Pain": 1, "Peripheral swelling": 1, "Rash": 1, "Rash erythematous": 1, "Skin irritation": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["011J209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20A OR 011J.json b/docs/data/histograms/United States/011J20A OR 011J.json
index 49ba9079b4a..077e2a89506 100644
--- a/docs/data/histograms/United States/011J20A OR 011J.json
+++ b/docs/data/histograms/United States/011J20A OR 011J.json
@@ -1 +1 @@
-{"batchcode": "011J20A OR 011J", "histograms": [{"batchcodes": ["011J20A OR 011J"], "histogram": {"Erythema": 1, "Feeling hot": 1, "Injection site pain": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A OR 011J", "histograms": [{"histogram": {"Erythema": 1, "Feeling hot": 1, "Injection site pain": 1, "Peripheral swelling": 1}, "batchcodes": ["011J20A OR 011J"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20A, 028L20.json b/docs/data/histograms/United States/011J20A, 028L20.json
index 99b50c10b5a..74d830e8743 100644
--- a/docs/data/histograms/United States/011J20A, 028L20.json
+++ b/docs/data/histograms/United States/011J20A, 028L20.json
@@ -1 +1 @@
-{"batchcode": "011J20A, 028L20", "histograms": [{"batchcodes": ["011J20A, 028L20"], "histogram": {"Injection site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A, 028L20", "histograms": [{"histogram": {"Injection site haemorrhage": 1}, "batchcodes": ["011J20A, 028L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20A..json b/docs/data/histograms/United States/011J20A..json
index 09ac17b9f07..d45e3f88ce6 100644
--- a/docs/data/histograms/United States/011J20A..json
+++ b/docs/data/histograms/United States/011J20A..json
@@ -1 +1 @@
-{"batchcode": "011J20A.", "histograms": [{"batchcodes": ["011J20A."], "histogram": {"Chills": 2, "Injection site erythema": 2, "Injection site swelling": 2, "Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Mouth swelling": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1, "Swelling of eyelid": 1, "Unevaluable event": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A.", "histograms": [{"histogram": {"Chills": 2, "Injection site erythema": 2, "Injection site swelling": 2, "Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Mouth swelling": 1, "Myalgia": 1, "Nausea": 1, "Off label use": 1, "Swelling of eyelid": 1, "Unevaluable event": 1, "Vomiting": 1}, "batchcodes": ["011J20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20A.json b/docs/data/histograms/United States/011J20A.json
index 2f4c61e910e..1b5da67679b 100644
--- a/docs/data/histograms/United States/011J20A.json
+++ b/docs/data/histograms/United States/011J20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A", "histograms": [{"batchcodes": ["011J20A"], "histogram": {"Vaccination site pain": 143, "Fatigue": 138, "Headache": 137, "Pyrexia": 131, "Expired product administered": 123, "Chills": 113, "Vaccination site erythema": 113, "Pain in extremity": 104, "Nausea": 92, "Myalgia": 80, "Vaccination site swelling": 71, "Vaccination site pruritus": 64, "Pain": 63, "Vaccination site warmth": 56, "Pruritus": 54, "Rash": 54, "COVID-19": 50, "Dizziness": 47, "Arthralgia": 46, "Erythema": 44, "SARS-CoV-2 test": 43, "Injection site erythema": 42, "Dyspnoea": 38, "Injection site pain": 35, "Body temperature": 34, "Lymphadenopathy": 34, "Diarrhoea": 33, "Urticaria": 33, "Malaise": 29, "Feeling abnormal": 28, "Vaccination site rash": 28, "Maternal exposure during pregnancy": 27, "Exposure during pregnancy": 26, "Vaccination site induration": 26, "Heart rate": 25, "Peripheral swelling": 25, "Hyperhidrosis": 24, "Injection site swelling": 24, "Pregnancy test": 23, "Vomiting": 23, "Blood pressure measurement": 22, "Feeling hot": 22, "Product storage error": 22, "Injection site warmth": 19, "Chest discomfort": 18, "Injection site pruritus": 18, "Cough": 17, "Influenza like illness": 16, "Vaccination complication": 16, "Ageusia": 15, "Hypoaesthesia": 15, "Paraesthesia": 15, "Tachycardia": 15, "Decreased appetite": 14, "Heart rate increased": 14, "Inappropriate schedule of product administration": 14, "Swelling": 14, "Back pain": 13, "Palpitations": 13, "Axillary pain": 12, "SARS-CoV-2 test positive": 12, "Tremor": 12, "Ultrasound scan": 12, "Asthenia": 11, "Contusion": 11, "Hypersensitivity": 11, "Product dose omission issue": 11, "Vaccination site mass": 11, "Herpes zoster": 10, "Insomnia": 10, "Rash pruritic": 10, "Somnolence": 10, "Swelling face": 10, "Dysgeusia": 9, "Feeling cold": 9, "Injection site rash": 9, "Limb discomfort": 9, "Muscle spasms": 9, "Oropharyngeal pain": 9, "Tinnitus": 9, "Abdominal pain": 8, "Anosmia": 8, "Burning sensation": 8, "Computerised tomogram": 8, "Flushing": 8, "Gait disturbance": 8, "Hypertension": 8, "Incorrect dose administered": 8, "Nasal congestion": 8, "Neck pain": 8, "Oxygen saturation": 8, "Rash macular": 8, "Rhinorrhoea": 8, "Ultrasound foetal": 8, "Vaccination site lymphadenopathy": 8, "Blood pressure increased": 7, "Discomfort": 7, "Glucose tolerance test": 7, "Illness": 7, "Musculoskeletal stiffness": 7, "Paraesthesia oral": 7, "Swollen tongue": 7, "Vaccination site bruising": 7, "Vertigo": 7, "Abdominal discomfort": 6, "Condition aggravated": 6, "Hypotension": 6, "Off label use": 6, "Syncope": 6, "Tenderness": 6, "Vaccination site movement impairment": 6, "Vaccination site urticaria": 6, "Antibody test": 5, "Anxiety": 5, "Blood glucose": 5, "Blood test": 5, "Electrocardiogram": 5, "Eye swelling": 5, "Hot flush": 5, "Hypoaesthesia oral": 5, "Injection site mass": 5, "Injection site reaction": 5, "Lymph node pain": 5, "Muscle twitching": 5, "Oedema peripheral": 5, "Rash erythematous": 5, "Respiratory rate": 5, "Skin burning sensation": 5, "Throat irritation": 5, "Throat tightness": 5, "Vaccination site reaction": 5, "X-ray": 5, "Abdominal pain upper": 4, "Anaphylactic reaction": 4, "Aphasia": 4, "Asthma": 4, "Balance disorder": 4, "Blister": 4, "Body temperature increased": 4, "Breast pain": 4, "Cellulitis": 4, "Chest pain": 4, "Disorientation": 4, "Drug ineffective": 4, "Dysphonia": 4, "Ear pain": 4, "Incorrect route of product administration": 4, "Injection site induration": 4, "Joint swelling": 4, "Loss of consciousness": 4, "Memory impairment": 4, "Mobility decreased": 4, "Muscular weakness": 4, "Musculoskeletal chest pain": 4, "Oropharyngeal discomfort": 4, "Product administered to patient of inappropriate age": 4, "Vision blurred": 4, "Abortion spontaneous": 3, "Cardiac flutter": 3, "Confusional state": 3, "Deep vein thrombosis": 3, "Dysstasia": 3, "Fall": 3, "Gait inability": 3, "Haemoglobin": 3, "Head discomfort": 3, "Hypoacusis": 3, "Influenza": 3, "Influenza virus test": 3, "Lethargy": 3, "Lip swelling": 3, "Migraine": 3, "Mouth ulceration": 3, "Musculoskeletal discomfort": 3, "Nasopharyngitis": 3, "Nervousness": 3, "Ocular discomfort": 3, "Pallor": 3, "Prenatal screening test": 3, "Red blood cell count": 3, "SARS-CoV-2 antibody test": 3, "Skin discolouration": 3, "Skin warm": 3, "Thrombosis": 3, "Ultrasound Doppler": 3, "Vaccination site discomfort": 3, "Accidental overdose": 2, "Accidental underdose": 2, "Acoustic stimulation tests": 2, "Adverse reaction": 2, "Agitation": 2, "Allergy to vaccine": 2, "Alopecia": 2, "Amnesia": 2, "Antibody test negative": 2, "Autoimmune disorder": 2, "Axillary mass": 2, "Bone pain": 2, "Breast mass": 2, "Breast swelling": 2, "Breast tenderness": 2, "Cerebrovascular accident": 2, "Corneal irritation": 2, "Dehydration": 2, "Delirium": 2, "Depression": 2, "Dry eye": 2, "Dry mouth": 2, "Dry skin": 2, "Dysphagia": 2, "Echocardiogram": 2, "Extra dose administered": 2, "Facial pain": 2, "Fibrin D dimer": 2, "Fluid retention": 2, "Heart rate irregular": 2, "Hyperventilation": 2, "Hypokinesia": 2, "Induration": 2, "Injection site abscess": 2, "Injection site haemorrhage": 2, "Injection site hypersensitivity": 2, "Injection site inflammation": 2, "Injection site urticaria": 2, "Intentional dose omission": 2, "Intentional product use issue": 2, "Irritability": 2, "Joint stiffness": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Ligament sprain": 2, "Magnetic resonance imaging": 2, "Mammogram": 2, "Mass": 2, "Mental disorder": 2, "Mouth swelling": 2, "Movement disorder": 2, "Neuralgia": 2, "Night sweats": 2, "Pain in jaw": 2, "Parkinson's disease": 2, "Physical examination": 2, "Platelet count": 2, "Poor quality product administered": 2, "Presyncope": 2, "Pulmonary embolism": 2, "Quality of life decreased": 2, "Raynaud's phenomenon": 2, "Restless legs syndrome": 2, "Restlessness": 2, "Retching": 2, "SARS-CoV-2 test negative": 2, "Salivary hypersecretion": 2, "Scan": 2, "Sinus disorder": 2, "Skin test negative": 2, "Skin tightness": 2, "Sleep disorder": 2, "Sluggishness": 2, "Syringe issue": 2, "Thyroiditis": 2, "Toothache": 2, "Underdose": 2, "Urinary tract infection": 2, "Vaccination site cellulitis": 2, "Vaccination site haemorrhage": 2, "Vaccination site hypoaesthesia": 2, "Vaginal haemorrhage": 2, "White blood cell count": 2, "Wrong technique in device usage process": 2, "Abnormal loss of weight": 1, "Abnormal sensation in eye": 1, "Achlorhydria": 1, "Alanine aminotransferase normal": 1, "Albumin globulin ratio": 1, "Amenorrhoea": 1, "Amniocentesis": 1, "Angioedema": 1, "Anion gap": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aphthous ulcer": 1, "Appendicitis": 1, "Arthritis": 1, "Aspartate aminotransferase decreased": 1, "Atrial tachycardia": 1, "Autoantibody test": 1, "Autoscopy": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood disorder": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Breast discomfort": 1, "Breast enlargement": 1, "Bronchitis": 1, "Bursitis": 1, "C-reactive protein": 1, "Candida infection": 1, "Carbon dioxide": 1, "Cardiac disorder": 1, "Cardiac stress test": 1, "Chest X-ray": 1, "Clumsiness": 1, "Cluster headache": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Computerised tomogram abdomen abnormal": 1, "Computerised tomogram thorax": 1, "Concussion": 1, "Constipation": 1, "Cyst": 1, "Cystitis": 1, "Deafness": 1, "Decreased activity": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Diarrhoea haemorrhagic": 1, "Dissociation": 1, "Disturbance in attention": 1, "Dreamy state": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphemia": 1, "Ear discomfort": 1, "Electromyogram": 1, "Emotional disorder": 1, "Encephalitis": 1, "Enzyme level test": 1, "Eosinophil count": 1, "Epicondylitis": 1, "Epinephrine": 1, "Euphoric mood": 1, "Exercise tolerance decreased": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Exposure via skin contact": 1, "External ear pain": 1, "Extrasystoles": 1, "Eye irritation": 1, "Eyelid ptosis": 1, "Eyelid sensory disorder": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Fear": 1, "Femur fracture": 1, "Fibroadenoma of breast": 1, "Flatulence": 1, "Formication": 1, "Gastroenteritis viral": 1, "Gastrooesophageal reflux disease": 1, "Genital rash": 1, "Giant cell arteritis": 1, "Gingival blister": 1, "Gingival discomfort": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Glossodynia": 1, "Glucose tolerance impaired": 1, "HIV antibody": 1, "Haematocrit": 1, "Haemorrhoids": 1, "Hallucination, visual": 1, "Heart rate decreased": 1, "Hip arthroplasty": 1, "Histamine intolerance": 1, "Horner's syndrome": 1, "Hyperglycaemia": 1, "Hypersomnia": 1, "Hypoglycaemia": 1, "Hyposmia": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Inappropriate affect": 1, "Incoherent": 1, "Incomplete course of vaccination": 1, "Incontinence": 1, "Infection": 1, "Inflammation": 1, "Infusion": 1, "Injection site discolouration": 1, "Injection site movement impairment": 1, "Injection site scab": 1, "Injection site scar": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lower respiratory tract infection": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lung neoplasm malignant": 1, "Lymphocyte count": 1, "Magnetic resonance imaging brain": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Magnetic resonance imaging thoracic": 1, "Maternal exposure before pregnancy": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meniere's disease": 1, "Menstruation irregular": 1, "Mental impairment": 1, "Middle insomnia": 1, "Monocyte count": 1, "Muscle atrophy": 1, "Muscle strain": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Myelitis transverse": 1, "Nasal dryness": 1, "Neoplasm malignant": 1, "Nerve injury": 1, "Nervous system disorder": 1, "Neuropathic pruritus": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Nightmare": 1, "No adverse event": 1, "Obstructive airways disorder": 1, "Ocular hyperaemia": 1, "Oesophagitis": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Panic reaction": 1, "Paranasal sinus discomfort": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Pharyngitis": 1, "Photosensitivity reaction": 1, "Pneumonia mycoplasmal": 1, "Pollakiuria": 1, "Polyhydramnios": 1, "Poor quality sleep": 1, "Post laminectomy syndrome": 1, "Post procedural complication": 1, "Precipitate labour": 1, "Pregnancy test positive": 1, "Product administered at inappropriate site": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product leakage": 1, "Product temperature excursion issue": 1, "Protein total": 1, "Pruritus allergic": 1, "Psoriasis": 1, "Pulmonary function test": 1, "Rales": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Red blood cell sedimentation rate decreased": 1, "Red cell distribution width increased": 1, "Resorption bone increased": 1, "Rheumatoid factor positive": 1, "Rhinitis": 1, "Secretion discharge": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Skin disorder": 1, "Skin mass": 1, "Skin reaction": 1, "Sneezing": 1, "Spinal stenosis": 1, "Spirometry": 1, "Staphylococcal infection": 1, "Stomatitis": 1, "Sudden hearing loss": 1, "Swelling of eyelid": 1, "Taste disorder": 1, "Temperature difference of extremities": 1, "Tendonitis": 1, "Therapeutic response unexpected": 1, "Therapy non-responder": 1, "Thinking abnormal": 1, "Thirst": 1, "Thyroid function test": 1, "Thyroid hormones increased": 1, "Tongue coated": 1, "Tongue discomfort": 1, "Tongue spasm": 1, "Transient global amnesia": 1, "Tryptase": 1, "Type III immune complex mediated reaction": 1, "Type IV hypersensitivity reaction": 1, "Typical aura without headache": 1, "Ultrasound abdomen": 1, "Ultrasound breast": 1, "Ultrasound scan normal": 1, "Ultrasound thyroid": 1, "Upper respiratory tract congestion": 1, "Upper-airway cough syndrome": 1, "Vaccination failure": 1, "Vaccination site discharge": 1, "Vaccination site dysaesthesia": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site joint warmth": 1, "Vaccination site necrosis": 1, "Vaccination site scar": 1, "Vaccination site streaking": 1, "Venous thrombosis": 1, "Ventricular tachycardia": 1, "Vital signs measurement": 1, "Weight decreased": 1, "Wheezing": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A", "histograms": [{"histogram": {"Vaccination site pain": 143, "Fatigue": 138, "Headache": 137, "Pyrexia": 131, "Expired product administered": 123, "Chills": 113, "Vaccination site erythema": 113, "Pain in extremity": 104, "Nausea": 92, "Myalgia": 80, "Vaccination site swelling": 71, "Vaccination site pruritus": 64, "Pain": 63, "Vaccination site warmth": 56, "Pruritus": 54, "Rash": 54, "COVID-19": 50, "Dizziness": 47, "Arthralgia": 46, "Erythema": 44, "SARS-CoV-2 test": 43, "Injection site erythema": 42, "Dyspnoea": 38, "Injection site pain": 35, "Body temperature": 34, "Lymphadenopathy": 34, "Diarrhoea": 33, "Urticaria": 33, "Malaise": 29, "Feeling abnormal": 28, "Vaccination site rash": 28, "Maternal exposure during pregnancy": 27, "Exposure during pregnancy": 26, "Vaccination site induration": 26, "Heart rate": 25, "Peripheral swelling": 25, "Hyperhidrosis": 24, "Injection site swelling": 24, "Pregnancy test": 23, "Vomiting": 23, "Blood pressure measurement": 22, "Feeling hot": 22, "Product storage error": 22, "Injection site warmth": 19, "Chest discomfort": 18, "Injection site pruritus": 18, "Cough": 17, "Influenza like illness": 16, "Vaccination complication": 16, "Ageusia": 15, "Hypoaesthesia": 15, "Paraesthesia": 15, "Tachycardia": 15, "Decreased appetite": 14, "Heart rate increased": 14, "Inappropriate schedule of product administration": 14, "Swelling": 14, "Back pain": 13, "Palpitations": 13, "Axillary pain": 12, "SARS-CoV-2 test positive": 12, "Tremor": 12, "Ultrasound scan": 12, "Asthenia": 11, "Contusion": 11, "Hypersensitivity": 11, "Product dose omission issue": 11, "Vaccination site mass": 11, "Herpes zoster": 10, "Insomnia": 10, "Rash pruritic": 10, "Somnolence": 10, "Swelling face": 10, "Dysgeusia": 9, "Feeling cold": 9, "Injection site rash": 9, "Limb discomfort": 9, "Muscle spasms": 9, "Oropharyngeal pain": 9, "Tinnitus": 9, "Abdominal pain": 8, "Anosmia": 8, "Burning sensation": 8, "Computerised tomogram": 8, "Flushing": 8, "Gait disturbance": 8, "Hypertension": 8, "Incorrect dose administered": 8, "Nasal congestion": 8, "Neck pain": 8, "Oxygen saturation": 8, "Rash macular": 8, "Rhinorrhoea": 8, "Ultrasound foetal": 8, "Vaccination site lymphadenopathy": 8, "Blood pressure increased": 7, "Discomfort": 7, "Glucose tolerance test": 7, "Illness": 7, "Musculoskeletal stiffness": 7, "Paraesthesia oral": 7, "Swollen tongue": 7, "Vaccination site bruising": 7, "Vertigo": 7, "Abdominal discomfort": 6, "Condition aggravated": 6, "Hypotension": 6, "Off label use": 6, "Syncope": 6, "Tenderness": 6, "Vaccination site movement impairment": 6, "Vaccination site urticaria": 6, "Antibody test": 5, "Anxiety": 5, "Blood glucose": 5, "Blood test": 5, "Electrocardiogram": 5, "Eye swelling": 5, "Hot flush": 5, "Hypoaesthesia oral": 5, "Injection site mass": 5, "Injection site reaction": 5, "Lymph node pain": 5, "Muscle twitching": 5, "Oedema peripheral": 5, "Rash erythematous": 5, "Respiratory rate": 5, "Skin burning sensation": 5, "Throat irritation": 5, "Throat tightness": 5, "Vaccination site reaction": 5, "X-ray": 5, "Abdominal pain upper": 4, "Anaphylactic reaction": 4, "Aphasia": 4, "Asthma": 4, "Balance disorder": 4, "Blister": 4, "Body temperature increased": 4, "Breast pain": 4, "Cellulitis": 4, "Chest pain": 4, "Disorientation": 4, "Drug ineffective": 4, "Dysphonia": 4, "Ear pain": 4, "Incorrect route of product administration": 4, "Injection site induration": 4, "Joint swelling": 4, "Loss of consciousness": 4, "Memory impairment": 4, "Mobility decreased": 4, "Muscular weakness": 4, "Musculoskeletal chest pain": 4, "Oropharyngeal discomfort": 4, "Product administered to patient of inappropriate age": 4, "Vision blurred": 4, "Abortion spontaneous": 3, "Cardiac flutter": 3, "Confusional state": 3, "Deep vein thrombosis": 3, "Dysstasia": 3, "Fall": 3, "Gait inability": 3, "Haemoglobin": 3, "Head discomfort": 3, "Hypoacusis": 3, "Influenza": 3, "Influenza virus test": 3, "Lethargy": 3, "Lip swelling": 3, "Migraine": 3, "Mouth ulceration": 3, "Musculoskeletal discomfort": 3, "Nasopharyngitis": 3, "Nervousness": 3, "Ocular discomfort": 3, "Pallor": 3, "Prenatal screening test": 3, "Red blood cell count": 3, "SARS-CoV-2 antibody test": 3, "Skin discolouration": 3, "Skin warm": 3, "Thrombosis": 3, "Ultrasound Doppler": 3, "Vaccination site discomfort": 3, "Accidental overdose": 2, "Accidental underdose": 2, "Acoustic stimulation tests": 2, "Adverse reaction": 2, "Agitation": 2, "Allergy to vaccine": 2, "Alopecia": 2, "Amnesia": 2, "Antibody test negative": 2, "Autoimmune disorder": 2, "Axillary mass": 2, "Bone pain": 2, "Breast mass": 2, "Breast swelling": 2, "Breast tenderness": 2, "Cerebrovascular accident": 2, "Corneal irritation": 2, "Dehydration": 2, "Delirium": 2, "Depression": 2, "Dry eye": 2, "Dry mouth": 2, "Dry skin": 2, "Dysphagia": 2, "Echocardiogram": 2, "Extra dose administered": 2, "Facial pain": 2, "Fibrin D dimer": 2, "Fluid retention": 2, "Heart rate irregular": 2, "Hyperventilation": 2, "Hypokinesia": 2, "Induration": 2, "Injection site abscess": 2, "Injection site haemorrhage": 2, "Injection site hypersensitivity": 2, "Injection site inflammation": 2, "Injection site urticaria": 2, "Intentional dose omission": 2, "Intentional product use issue": 2, "Irritability": 2, "Joint stiffness": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Ligament sprain": 2, "Magnetic resonance imaging": 2, "Mammogram": 2, "Mass": 2, "Mental disorder": 2, "Mouth swelling": 2, "Movement disorder": 2, "Neuralgia": 2, "Night sweats": 2, "Pain in jaw": 2, "Parkinson's disease": 2, "Physical examination": 2, "Platelet count": 2, "Poor quality product administered": 2, "Presyncope": 2, "Pulmonary embolism": 2, "Quality of life decreased": 2, "Raynaud's phenomenon": 2, "Restless legs syndrome": 2, "Restlessness": 2, "Retching": 2, "SARS-CoV-2 test negative": 2, "Salivary hypersecretion": 2, "Scan": 2, "Sinus disorder": 2, "Skin test negative": 2, "Skin tightness": 2, "Sleep disorder": 2, "Sluggishness": 2, "Syringe issue": 2, "Thyroiditis": 2, "Toothache": 2, "Underdose": 2, "Urinary tract infection": 2, "Vaccination site cellulitis": 2, "Vaccination site haemorrhage": 2, "Vaccination site hypoaesthesia": 2, "Vaginal haemorrhage": 2, "White blood cell count": 2, "Wrong technique in device usage process": 2, "Abnormal loss of weight": 1, "Abnormal sensation in eye": 1, "Achlorhydria": 1, "Alanine aminotransferase normal": 1, "Albumin globulin ratio": 1, "Amenorrhoea": 1, "Amniocentesis": 1, "Angioedema": 1, "Anion gap": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aphthous ulcer": 1, "Appendicitis": 1, "Arthritis": 1, "Aspartate aminotransferase decreased": 1, "Atrial tachycardia": 1, "Autoantibody test": 1, "Autoscopy": 1, "Basophil count": 1, "Bell's palsy": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood disorder": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Breast discomfort": 1, "Breast enlargement": 1, "Bronchitis": 1, "Bursitis": 1, "C-reactive protein": 1, "Candida infection": 1, "Carbon dioxide": 1, "Cardiac disorder": 1, "Cardiac stress test": 1, "Chest X-ray": 1, "Clumsiness": 1, "Cluster headache": 1, "Cold sweat": 1, "Colitis ulcerative": 1, "Computerised tomogram abdomen abnormal": 1, "Computerised tomogram thorax": 1, "Concussion": 1, "Constipation": 1, "Cyst": 1, "Cystitis": 1, "Deafness": 1, "Decreased activity": 1, "Dementia": 1, "Depressed level of consciousness": 1, "Dermatitis": 1, "Dermatitis allergic": 1, "Diarrhoea haemorrhagic": 1, "Dissociation": 1, "Disturbance in attention": 1, "Dreamy state": 1, "Dysarthria": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dysphemia": 1, "Ear discomfort": 1, "Electromyogram": 1, "Emotional disorder": 1, "Encephalitis": 1, "Enzyme level test": 1, "Eosinophil count": 1, "Epicondylitis": 1, "Epinephrine": 1, "Euphoric mood": 1, "Exercise tolerance decreased": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Exposure via skin contact": 1, "External ear pain": 1, "Extrasystoles": 1, "Eye irritation": 1, "Eyelid ptosis": 1, "Eyelid sensory disorder": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Fear": 1, "Femur fracture": 1, "Fibroadenoma of breast": 1, "Flatulence": 1, "Formication": 1, "Gastroenteritis viral": 1, "Gastrooesophageal reflux disease": 1, "Genital rash": 1, "Giant cell arteritis": 1, "Gingival blister": 1, "Gingival discomfort": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Glossodynia": 1, "Glucose tolerance impaired": 1, "HIV antibody": 1, "Haematocrit": 1, "Haemorrhoids": 1, "Hallucination, visual": 1, "Heart rate decreased": 1, "Hip arthroplasty": 1, "Histamine intolerance": 1, "Horner's syndrome": 1, "Hyperglycaemia": 1, "Hypersomnia": 1, "Hypoglycaemia": 1, "Hyposmia": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Inappropriate affect": 1, "Incoherent": 1, "Incomplete course of vaccination": 1, "Incontinence": 1, "Infection": 1, "Inflammation": 1, "Infusion": 1, "Injection site discolouration": 1, "Injection site movement impairment": 1, "Injection site scab": 1, "Injection site scar": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lower respiratory tract infection": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lung neoplasm malignant": 1, "Lymphocyte count": 1, "Magnetic resonance imaging brain": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Magnetic resonance imaging thoracic": 1, "Maternal exposure before pregnancy": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meniere's disease": 1, "Menstruation irregular": 1, "Mental impairment": 1, "Middle insomnia": 1, "Monocyte count": 1, "Muscle atrophy": 1, "Muscle strain": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Myelitis transverse": 1, "Nasal dryness": 1, "Neoplasm malignant": 1, "Nerve injury": 1, "Nervous system disorder": 1, "Neuropathic pruritus": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Nightmare": 1, "No adverse event": 1, "Obstructive airways disorder": 1, "Ocular hyperaemia": 1, "Oesophagitis": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Panic reaction": 1, "Paranasal sinus discomfort": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Pharyngitis": 1, "Photosensitivity reaction": 1, "Pneumonia mycoplasmal": 1, "Pollakiuria": 1, "Polyhydramnios": 1, "Poor quality sleep": 1, "Post laminectomy syndrome": 1, "Post procedural complication": 1, "Precipitate labour": 1, "Pregnancy test positive": 1, "Product administered at inappropriate site": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product leakage": 1, "Product temperature excursion issue": 1, "Protein total": 1, "Pruritus allergic": 1, "Psoriasis": 1, "Pulmonary function test": 1, "Rales": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Red blood cell sedimentation rate decreased": 1, "Red cell distribution width increased": 1, "Resorption bone increased": 1, "Rheumatoid factor positive": 1, "Rhinitis": 1, "Secretion discharge": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Skin disorder": 1, "Skin mass": 1, "Skin reaction": 1, "Sneezing": 1, "Spinal stenosis": 1, "Spirometry": 1, "Staphylococcal infection": 1, "Stomatitis": 1, "Sudden hearing loss": 1, "Swelling of eyelid": 1, "Taste disorder": 1, "Temperature difference of extremities": 1, "Tendonitis": 1, "Therapeutic response unexpected": 1, "Therapy non-responder": 1, "Thinking abnormal": 1, "Thirst": 1, "Thyroid function test": 1, "Thyroid hormones increased": 1, "Tongue coated": 1, "Tongue discomfort": 1, "Tongue spasm": 1, "Transient global amnesia": 1, "Tryptase": 1, "Type III immune complex mediated reaction": 1, "Type IV hypersensitivity reaction": 1, "Typical aura without headache": 1, "Ultrasound abdomen": 1, "Ultrasound breast": 1, "Ultrasound scan normal": 1, "Ultrasound thyroid": 1, "Upper respiratory tract congestion": 1, "Upper-airway cough syndrome": 1, "Vaccination failure": 1, "Vaccination site discharge": 1, "Vaccination site dysaesthesia": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site joint warmth": 1, "Vaccination site necrosis": 1, "Vaccination site scar": 1, "Vaccination site streaking": 1, "Venous thrombosis": 1, "Ventricular tachycardia": 1, "Vital signs measurement": 1, "Weight decreased": 1, "Wheezing": 1, "Wound": 1}, "batchcodes": ["011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20A/011T20A.json b/docs/data/histograms/United States/011J20A/011T20A.json
index d925b766a0a..0c0b8ca7855 100644
--- a/docs/data/histograms/United States/011J20A/011T20A.json
+++ b/docs/data/histograms/United States/011J20A/011T20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A/011T20A", "histograms": [{"batchcodes": ["011J20A/011T20A"], "histogram": {"Muscle discomfort": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A/011T20A", "histograms": [{"histogram": {"Muscle discomfort": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["011J20A/011T20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20A011J20A.json b/docs/data/histograms/United States/011J20A011J20A.json
index 7beff433513..b35932d52f3 100644
--- a/docs/data/histograms/United States/011J20A011J20A.json
+++ b/docs/data/histograms/United States/011J20A011J20A.json
@@ -1 +1 @@
-{"batchcode": "011J20A011J20A", "histograms": [{"batchcodes": ["011J20A011J20A"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Balance disorder": 1, "Dizziness": 1, "Hypoaesthesia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A011J20A", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Balance disorder": 1, "Dizziness": 1, "Hypoaesthesia": 1, "Pain in extremity": 1}, "batchcodes": ["011J20A011J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J20A1.json b/docs/data/histograms/United States/011J20A1.json
index 38d188a516c..115cc1d359b 100644
--- a/docs/data/histograms/United States/011J20A1.json
+++ b/docs/data/histograms/United States/011J20A1.json
@@ -1 +1 @@
-{"batchcode": "011J20A1", "histograms": [{"batchcodes": ["011J20A1"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "011J20A1", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["011J20A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J2A.json b/docs/data/histograms/United States/011J2A.json
index 45acf7e8e04..0d01c1a6fda 100644
--- a/docs/data/histograms/United States/011J2A.json
+++ b/docs/data/histograms/United States/011J2A.json
@@ -1 +1 @@
-{"batchcode": "011J2A", "histograms": [{"batchcodes": ["011J2A"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011J2A", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["011J2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J2AO.json b/docs/data/histograms/United States/011J2AO.json
index a44d10ae4f8..90969b524d8 100644
--- a/docs/data/histograms/United States/011J2AO.json
+++ b/docs/data/histograms/United States/011J2AO.json
@@ -1 +1 @@
-{"batchcode": "011J2AO", "histograms": [{"batchcodes": ["011J2AO"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011J2AO", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["011J2AO"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J2DA.json b/docs/data/histograms/United States/011J2DA.json
index a3fd4e4aeef..17ed96d9697 100644
--- a/docs/data/histograms/United States/011J2DA.json
+++ b/docs/data/histograms/United States/011J2DA.json
@@ -1 +1 @@
-{"batchcode": "011J2DA", "histograms": [{"batchcodes": ["011J2DA"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "011J2DA", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["011J2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011J2OA.json b/docs/data/histograms/United States/011J2OA.json
index 361b08de872..06236ff0a4b 100644
--- a/docs/data/histograms/United States/011J2OA.json
+++ b/docs/data/histograms/United States/011J2OA.json
@@ -1 +1 @@
-{"batchcode": "011J2OA", "histograms": [{"batchcodes": ["011J2OA"], "histogram": {"Coordination abnormal": 1, "Dizziness": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011J2OA", "histograms": [{"histogram": {"Coordination abnormal": 1, "Dizziness": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["011J2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011JQ0A.json b/docs/data/histograms/United States/011JQ0A.json
index 0a7e02cb53c..2ebe1254e9f 100644
--- a/docs/data/histograms/United States/011JQ0A.json
+++ b/docs/data/histograms/United States/011JQ0A.json
@@ -1 +1 @@
-{"batchcode": "011JQ0A", "histograms": [{"batchcodes": ["011JQ0A"], "histogram": {"Abdominal pain": 1, "Appendicitis": 1, "Asthenia": 1, "Decreased appetite": 1, "Fall": 1, "Pyrexia": 1, "Swelling face": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011JQ0A", "histograms": [{"histogram": {"Abdominal pain": 1, "Appendicitis": 1, "Asthenia": 1, "Decreased appetite": 1, "Fall": 1, "Pyrexia": 1, "Swelling face": 1, "Vomiting": 1}, "batchcodes": ["011JQ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011JZ0A.json b/docs/data/histograms/United States/011JZ0A.json
index 9963a21dcf5..b6bca155934 100644
--- a/docs/data/histograms/United States/011JZ0A.json
+++ b/docs/data/histograms/United States/011JZ0A.json
@@ -1 +1 @@
-{"batchcode": "011JZ0A", "histograms": [{"batchcodes": ["011JZ0A"], "histogram": {"Injection site swelling": 2, "Pain": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "011JZ0A", "histograms": [{"histogram": {"Injection site swelling": 2, "Pain": 1, "Pruritus": 1}, "batchcodes": ["011JZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011JZOA.json b/docs/data/histograms/United States/011JZOA.json
index 4211cf7cb77..4ee12c90420 100644
--- a/docs/data/histograms/United States/011JZOA.json
+++ b/docs/data/histograms/United States/011JZOA.json
@@ -1 +1 @@
-{"batchcode": "011JZOA", "histograms": [{"batchcodes": ["011JZOA"], "histogram": {"Pruritus": 2, "Body temperature increased": 1, "Eye swelling": 1, "Fatigue": 1, "Injection site discolouration": 1, "Injection site mass": 1, "Pain": 1, "Rash": 1, "Swelling face": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "011JZOA", "histograms": [{"histogram": {"Pruritus": 2, "Body temperature increased": 1, "Eye swelling": 1, "Fatigue": 1, "Injection site discolouration": 1, "Injection site mass": 1, "Pain": 1, "Rash": 1, "Swelling face": 1, "Urticaria": 1}, "batchcodes": ["011JZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011K20A.json b/docs/data/histograms/United States/011K20A.json
index 60648f589cc..e11e416f9ca 100644
--- a/docs/data/histograms/United States/011K20A.json
+++ b/docs/data/histograms/United States/011K20A.json
@@ -1 +1 @@
-{"batchcode": "011K20A", "histograms": [{"batchcodes": ["011K20A"], "histogram": {"Heart rate": 1, "Heart rate increased": 1}}]}
\ No newline at end of file
+{"batchcode": "011K20A", "histograms": [{"histogram": {"Heart rate": 1, "Heart rate increased": 1}, "batchcodes": ["011K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011KL20A.json b/docs/data/histograms/United States/011KL20A.json
index 9b16249a6ae..8c58fe3cf43 100644
--- a/docs/data/histograms/United States/011KL20A.json
+++ b/docs/data/histograms/United States/011KL20A.json
@@ -1 +1 @@
-{"batchcode": "011KL20A", "histograms": [{"batchcodes": ["011KL20A"], "histogram": {"Fatigue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011KL20A", "histograms": [{"histogram": {"Fatigue": 1, "Vaccination site pain": 1}, "batchcodes": ["011KL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L-20A.json b/docs/data/histograms/United States/011L-20A.json
index ed4c4afcf0b..8bea9686078 100644
--- a/docs/data/histograms/United States/011L-20A.json
+++ b/docs/data/histograms/United States/011L-20A.json
@@ -1 +1 @@
-{"batchcode": "011L-20A", "histograms": [{"batchcodes": ["011L-20A"], "histogram": {"Activated partial thromboplastin time": 1, "Blood gases": 1, "Bradycardia": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Dry mouth": 1, "Electrocardiogram": 1, "Foreign body sensation in eyes": 1, "Full blood count": 1, "Metabolic function test": 1}}]}
\ No newline at end of file
+{"batchcode": "011L-20A", "histograms": [{"histogram": {"Activated partial thromboplastin time": 1, "Blood gases": 1, "Bradycardia": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Dry mouth": 1, "Electrocardiogram": 1, "Foreign body sensation in eyes": 1, "Full blood count": 1, "Metabolic function test": 1}, "batchcodes": ["011L-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L01A.json b/docs/data/histograms/United States/011L01A.json
index 89219765bb2..ad2c811e335 100644
--- a/docs/data/histograms/United States/011L01A.json
+++ b/docs/data/histograms/United States/011L01A.json
@@ -1 +1 @@
-{"batchcode": "011L01A", "histograms": [{"batchcodes": ["011L01A"], "histogram": {"Rash pruritic": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011L01A", "histograms": [{"histogram": {"Rash pruritic": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["011L01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L020A.json b/docs/data/histograms/United States/011L020A.json
index 7461288af0e..4a0c03ad60b 100644
--- a/docs/data/histograms/United States/011L020A.json
+++ b/docs/data/histograms/United States/011L020A.json
@@ -1 +1 @@
-{"batchcode": "011L020A", "histograms": [{"batchcodes": ["011L020A"], "histogram": {"Eyelid sensory disorder": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "011L020A", "histograms": [{"histogram": {"Eyelid sensory disorder": 1, "Hypoaesthesia": 1}, "batchcodes": ["011L020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L02A.json b/docs/data/histograms/United States/011L02A.json
index 59d9ac506f0..7e66d762b2d 100644
--- a/docs/data/histograms/United States/011L02A.json
+++ b/docs/data/histograms/United States/011L02A.json
@@ -1 +1 @@
-{"batchcode": "011L02A", "histograms": [{"batchcodes": ["011L02A"], "histogram": {"Blood count": 1, "Body temperature": 1, "Chills": 1, "Clinomania": 1, "Headache": 1, "Incorrect dose administered": 1, "Pain in extremity": 1, "Pyrexia": 1, "White blood cell count": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "011L02A", "histograms": [{"histogram": {"Blood count": 1, "Body temperature": 1, "Chills": 1, "Clinomania": 1, "Headache": 1, "Incorrect dose administered": 1, "Pain in extremity": 1, "Pyrexia": 1, "White blood cell count": 1, "White blood cell count decreased": 1}, "batchcodes": ["011L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L20.json b/docs/data/histograms/United States/011L20.json
index 473c6812652..a4400d31e57 100644
--- a/docs/data/histograms/United States/011L20.json
+++ b/docs/data/histograms/United States/011L20.json
@@ -1 +1 @@
-{"batchcode": "011L20", "histograms": [{"batchcodes": ["011L20"], "histogram": {"Hypersensitivity": 1, "Rash": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011L20", "histograms": [{"histogram": {"Hypersensitivity": 1, "Rash": 1, "Vaccination site rash": 1}, "batchcodes": ["011L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L201A.json b/docs/data/histograms/United States/011L201A.json
index 33aea9a88b3..f590120bf26 100644
--- a/docs/data/histograms/United States/011L201A.json
+++ b/docs/data/histograms/United States/011L201A.json
@@ -1 +1 @@
-{"batchcode": "011L201A", "histograms": [{"batchcodes": ["011L201A"], "histogram": {"Feeling cold": 2, "Headache": 2, "Chills": 1, "Discomfort": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Feeling hot": 1, "Lethargy": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011L201A", "histograms": [{"histogram": {"Feeling cold": 2, "Headache": 2, "Chills": 1, "Discomfort": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Feeling hot": 1, "Lethargy": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1}, "batchcodes": ["011L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L204.json b/docs/data/histograms/United States/011L204.json
index 1453231c5ed..7d938b506c3 100644
--- a/docs/data/histograms/United States/011L204.json
+++ b/docs/data/histograms/United States/011L204.json
@@ -1 +1 @@
-{"batchcode": "011L204", "histograms": [{"batchcodes": ["011L204"], "histogram": {"Abdominal pain upper": 1, "Anxiety": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disorientation": 1, "Dysgeusia": 1, "Fatigue": 1, "Feeling hot": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hypersensitivity": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Insomnia": 1, "Myalgia": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Paraesthesia": 1, "Pruritus": 1, "Respiratory rate": 1, "Sinusitis": 1, "Tachycardia": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011L204", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Anxiety": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Decreased appetite": 1, "Dehydration": 1, "Depressed level of consciousness": 1, "Diarrhoea": 1, "Disorientation": 1, "Dysgeusia": 1, "Fatigue": 1, "Feeling hot": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hypersensitivity": 1, "Influenza A virus test": 1, "Influenza B virus test": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Insomnia": 1, "Myalgia": 1, "Nausea": 1, "Neuropathy peripheral": 1, "Palpitations": 1, "Paraesthesia": 1, "Pruritus": 1, "Respiratory rate": 1, "Sinusitis": 1, "Tachycardia": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["011L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L208A.json b/docs/data/histograms/United States/011L208A.json
index bfd08dfb5c1..f743e0fc7ff 100644
--- a/docs/data/histograms/United States/011L208A.json
+++ b/docs/data/histograms/United States/011L208A.json
@@ -1 +1 @@
-{"batchcode": "011L208A", "histograms": [{"batchcodes": ["011L208A"], "histogram": {"Blood glucose": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "011L208A", "histograms": [{"histogram": {"Blood glucose": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["011L208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L20A (OR) 01.json b/docs/data/histograms/United States/011L20A (OR) 01.json
index 4d068bee3a5..10a6a5ff7d8 100644
--- a/docs/data/histograms/United States/011L20A (OR) 01.json
+++ b/docs/data/histograms/United States/011L20A (OR) 01.json
@@ -1 +1 @@
-{"batchcode": "011L20A (OR) 01", "histograms": [{"batchcodes": ["011L20A (OR) 01"], "histogram": {"Burning sensation": 1, "Dizziness": 1, "Headache": 1, "Hyperhidrosis": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Paraesthesia": 1, "Product dose omission issue": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "011L20A (OR) 01", "histograms": [{"histogram": {"Burning sensation": 1, "Dizziness": 1, "Headache": 1, "Hyperhidrosis": 1, "Muscle spasms": 1, "Myalgia": 1, "Nausea": 1, "Paraesthesia": 1, "Product dose omission issue": 1, "Rash": 1}, "batchcodes": ["011L20A (OR) 01"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L20A.json b/docs/data/histograms/United States/011L20A.json
index 58131b712e6..bd861641629 100644
--- a/docs/data/histograms/United States/011L20A.json
+++ b/docs/data/histograms/United States/011L20A.json
@@ -1 +1 @@
-{"batchcode": "011L20A", "histograms": [{"batchcodes": ["011L20A", "FIC9729"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["011L20A"], "histogram": {"Fatigue": 137, "Headache": 133, "Pyrexia": 124, "Pain in extremity": 119, "Chills": 91, "Vaccination site pain": 91, "Expired product administered": 81, "Vaccination site erythema": 78, "Myalgia": 72, "Pain": 56, "Vaccination site pruritus": 50, "Nausea": 47, "Arthralgia": 45, "Vaccination site swelling": 45, "Dizziness": 43, "Pruritus": 40, "COVID-19": 39, "Rash": 38, "SARS-CoV-2 test": 38, "Body temperature": 36, "Vaccination site warmth": 36, "Asthenia": 34, "Erythema": 31, "Cough": 28, "Injection site pain": 26, "Diarrhoea": 24, "Malaise": 22, "Vaccination site rash": 22, "Dyspnoea": 20, "Exposure during pregnancy": 20, "Hypoaesthesia": 19, "Injection site erythema": 19, "Vomiting": 19, "Feeling hot": 18, "Peripheral swelling": 18, "Urticaria": 18, "Feeling abnormal": 17, "Lymphadenopathy": 17, "Decreased appetite": 16, "Neck pain": 16, "Paraesthesia": 16, "Inappropriate schedule of product administration": 15, "Back pain": 14, "Influenza like illness": 14, "Maternal exposure during pregnancy": 14, "Hyperhidrosis": 13, "Vaccination complication": 13, "Blood pressure measurement": 12, "SARS-CoV-2 test positive": 12, "Hypertension": 11, "Illness": 11, "Insomnia": 11, "Palpitations": 11, "Product dose omission issue": 11, "Vaccination site induration": 11, "Vaccination site mass": 11, "Heart rate": 10, "Influenza": 10, "Musculoskeletal stiffness": 10, "Nasopharyngitis": 10, "Pregnancy test": 10, "Somnolence": 10, "Swelling": 10, "Ageusia": 9, "Ear pain": 9, "Gait disturbance": 9, "Incorrect dose administered": 9, "Limb discomfort": 9, "SARS-CoV-2 antibody test": 9, "Anxiety": 8, "Chest discomfort": 8, "Drug ineffective": 8, "Flushing": 8, "Heart rate increased": 8, "Injection site swelling": 8, "Injection site warmth": 8, "Magnetic resonance imaging": 8, "Vaccination site reaction": 8, "Burning sensation": 7, "Head discomfort": 7, "Hypersensitivity": 7, "Injection site pruritus": 7, "Mobility decreased": 7, "Rhinorrhoea": 7, "Tinnitus": 7, "Wheezing": 7, "Axillary pain": 6, "Blood test": 6, "Computerised tomogram": 6, "Condition aggravated": 6, "Ear discomfort": 6, "Herpes zoster": 6, "Migraine": 6, "Muscle spasms": 6, "Muscular weakness": 6, "Rash erythematous": 6, "Rash pruritic": 6, "Tremor": 6, "Ultrasound scan": 6, "Alopecia": 5, "Balance disorder": 5, "Chest pain": 5, "Echocardiogram": 5, "Hot flush": 5, "Induration": 5, "Injection site induration": 5, "Loss of consciousness": 5, "Loss of personal independence in daily activities": 5, "Muscle tightness": 5, "Product administered at inappropriate site": 5, "Cellulitis": 4, "Depression": 4, "Dry mouth": 4, "Dry throat": 4, "Extra dose administered": 4, "Eye pain": 4, "Eye swelling": 4, "Facial pain": 4, "Inflammation": 4, "Irritability": 4, "Lip swelling": 4, "Oropharyngeal pain": 4, "Paraesthesia oral": 4, "Peripheral coldness": 4, "Product administered to patient of inappropriate age": 4, "Productive cough": 4, "Rash macular": 4, "Seizure": 4, "Sinus congestion": 4, "Skin warm": 4, "Vaccination site urticaria": 4, "Vertigo": 4, "Weight decreased": 4, "Anaphylactic reaction": 3, "Anosmia": 3, "Biopsy": 3, "Blepharospasm": 3, "Confusional state": 3, "Contusion": 3, "Dehydration": 3, "Discomfort": 3, "Dysphagia": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling cold": 3, "Glucose tolerance test": 3, "Hypersomnia": 3, "Hypoacusis": 3, "Hypoaesthesia oral": 3, "Incorrect route of product administration": 3, "Injection site infection": 3, "Injection site rash": 3, "Menstruation irregular": 3, "Muscle twitching": 3, "Musculoskeletal discomfort": 3, "Nasal congestion": 3, "Neuralgia": 3, "Oral discomfort": 3, "Oral herpes": 3, "Periorbital swelling": 3, "Pulmonary congestion": 3, "Retching": 3, "Rheumatoid arthritis": 3, "Skin reaction": 3, "Tenderness": 3, "Throat tightness": 3, "Tongue discomfort": 3, "Vaccination site lymphadenopathy": 3, "Abdominal pain": 2, "Abdominal pain upper": 2, "Abnormal dreams": 2, "Accidental overdose": 2, "Acne": 2, "Acoustic stimulation tests": 2, "Agitation": 2, "Anger": 2, "Antibody test": 2, "Autoimmune disorder": 2, "Axillary mass": 2, "Bedridden": 2, "Blood glucose decreased": 2, "Blood pressure increased": 2, "Blood urine present": 2, "Body temperature increased": 2, "Bone pain": 2, "Cognitive disorder": 2, "Cystitis": 2, "Dermatitis allergic": 2, "Dry eye": 2, "Dysgeusia": 2, "Dyskinesia": 2, "Ear infection": 2, "Endoscopy": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Fibromyalgia": 2, "Frustration tolerance decreased": 2, "Haematuria": 2, "Heart rate irregular": 2, "Human chorionic gonadotropin": 2, "Immune system disorder": 2, "Injection site inflammation": 2, "Injection site mass": 2, "Joint swelling": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Lethargy": 2, "Lumbar puncture": 2, "Lymph node pain": 2, "Mechanical urticaria": 2, "Memory impairment": 2, "Menstrual disorder": 2, "Nervous system disorder": 2, "Nodule": 2, "Off label use": 2, "Oral pain": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Platelet count": 2, "Pneumonia": 2, "Presyncope": 2, "Product administration error": 2, "Product storage error": 2, "Product temperature excursion issue": 2, "Protein total": 2, "Pulmonary embolism": 2, "Pulmonary fibrosis": 2, "Sinus disorder": 2, "Skin burning sensation": 2, "Skin exfoliation": 2, "Sleep deficit": 2, "Sleep disorder": 2, "Therapeutic response unexpected": 2, "Throat irritation": 2, "Thrombosis": 2, "Ultrasound foetal": 2, "Unevaluable event": 2, "Upper respiratory tract congestion": 2, "Upper-airway cough syndrome": 2, "Urinary tract infection": 2, "Urine analysis": 2, "Vaccination site bruising": 2, "Vaccination site movement impairment": 2, "Vision blurred": 2, "Visual impairment": 2, "Walking aid user": 2, "White blood cell count": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Accident": 1, "Accidental exposure to product": 1, "Accidental underdose": 1, "Acute respiratory failure": 1, "Adverse event": 1, "Affect lability": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Allergy test": 1, "Amnesia": 1, "Anaemia": 1, "Antibody test negative": 1, "Aortic valve stenosis": 1, "Aphonia": 1, "Arthritis": 1, "Asthma": 1, "Autoimmune pericarditis": 1, "Balanoposthitis": 1, "Bell's palsy": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood potassium increased": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic": 1, "Bradyphrenia": 1, "Brain oedema": 1, "Breast feeding": 1, "Breast swelling": 1, "Breech delivery": 1, "Bronchiectasis": 1, "Bronchitis": 1, "Bronchoscopy": 1, "Bronchospasm": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Chronic kidney disease": 1, "Colonoscopy": 1, "Conjunctival hyperaemia": 1, "Crying": 1, "Culture": 1, "Culture urine": 1, "Deafness": 1, "Death": 1, "Decubitus ulcer": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Dermatitis atopic": 1, "Dermatologic examination": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Drug interaction": 1, "Dysarthria": 1, "Dysphonia": 1, "Dysuria": 1, "Ear pruritus": 1, "Eczema": 1, "Electromyogram": 1, "Energy increased": 1, "Epistaxis": 1, "Exercise tolerance decreased": 1, "Exertional headache": 1, "Exposure to SARS-CoV-2": 1, "Eye injury": 1, "Eyelid irritation": 1, "Eyelid pain": 1, "Eyelids pruritus": 1, "Face oedema": 1, "Food intolerance": 1, "Formication": 1, "Full blood count": 1, "Fungal skin infection": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Genetic counselling": 1, "Giant cell arteritis": 1, "Gingival pain": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Glossitis": 1, "Guttate psoriasis": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoglobin abnormal": 1, "Head injury": 1, "Heart rate decreased": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Herpes simplex": 1, "High density lipoprotein increased": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hypogeusia": 1, "Hypokinesia": 1, "Hyposmia": 1, "Hypotension": 1, "Hypotonia": 1, "Immune-mediated adverse reaction": 1, "Impaired driving ability": 1, "Implant site swelling": 1, "Incorrect dosage administered": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site cellulitis": 1, "Injection site discolouration": 1, "Injection site discomfort": 1, "Injection site movement impairment": 1, "Injection site nodule": 1, "Injection site reaction": 1, "Injection site urticaria": 1, "International normalised ratio decreased": 1, "Interstitial lung disease": 1, "Intestinal obstruction": 1, "Irritable bowel syndrome": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Joint vibration": 1, "Kidney infection": 1, "Knuckle pads": 1, "Laparoscopy": 1, "Leukaemia": 1, "Low density lipoprotein increased": 1, "Lower respiratory tract infection": 1, "Mass": 1, "Maternal exposure before pregnancy": 1, "Mean cell volume": 1, "Menstrual cycle management": 1, "Metamorphopsia": 1, "Mitral valve incompetence": 1, "Monoplegia": 1, "Muscle rigidity": 1, "Muscle strain": 1, "Musculoskeletal disorder": 1, "Musculoskeletal pain": 1, "Myeloid leukaemia": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasal discomfort": 1, "Nasal dryness": 1, "Near death experience": 1, "Nerve injury": 1, "Nervousness": 1, "Neuralgic amyotrophy": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nightmare": 1, "No adverse event": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Oral disorder": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Ovulation disorder": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Panic attack": 1, "Parosmia": 1, "Pelvic pain": 1, "Pericarditis": 1, "Petechiae": 1, "Plasma cell myeloma": 1, "Platelet count decreased": 1, "Platelet count normal": 1, "Pleural effusion": 1, "Pneumonitis": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Poor quality product administered": 1, "Pregnancy": 1, "Pregnancy test urine": 1, "Prenatal screening test": 1, "Product colour issue": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Psoriasis": 1, "Psoriatic arthropathy": 1, "Pulmonary function test": 1, "Pulmonary infarction": 1, "Pulmonary mass": 1, "Pulmonary thrombosis": 1, "Radicular pain": 1, "Rash papular": 1, "Rash pustular": 1, "Renal artery thrombosis": 1, "Renal failure": 1, "Renal pain": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restrictive pulmonary disease": 1, "Retinal haemorrhage": 1, "Retinal migraine": 1, "Rhinitis allergic": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Scan": 1, "Scratch": 1, "Scrotal swelling": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sinusitis": 1, "Skin discharge": 1, "Skin discolouration": 1, "Skin haemorrhage": 1, "Skin induration": 1, "Skin mass": 1, "Skin plaque": 1, "Skin texture abnormal": 1, "Sleep apnoea syndrome": 1, "Sleep talking": 1, "Spinal fracture": 1, "Sputum increased": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Syncope": 1, "Tachycardia": 1, "Taste disorder": 1, "Tissue injury": 1, "Tongue pruritus": 1, "Toothache": 1, "Trigeminal neuralgia": 1, "Trismus": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound Doppler": 1, "Urinary incontinence": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site dysaesthesia": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site scar": 1, "Vaccine breakthrough infection": 1, "Vaginal haemorrhage": 1, "Varicose vein": 1, "Vasculitis": 1, "Vein disorder": 1, "Viral infection": 1, "Vitreous floaters": 1, "Weight increased": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "011L20A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["011L20A", "FIC9729"]}, {"histogram": {"Fatigue": 137, "Headache": 133, "Pyrexia": 124, "Pain in extremity": 119, "Chills": 91, "Vaccination site pain": 91, "Expired product administered": 81, "Vaccination site erythema": 78, "Myalgia": 72, "Pain": 56, "Vaccination site pruritus": 50, "Nausea": 47, "Arthralgia": 45, "Vaccination site swelling": 45, "Dizziness": 43, "Pruritus": 40, "COVID-19": 39, "Rash": 38, "SARS-CoV-2 test": 38, "Body temperature": 36, "Vaccination site warmth": 36, "Asthenia": 34, "Erythema": 31, "Cough": 28, "Injection site pain": 26, "Diarrhoea": 24, "Malaise": 22, "Vaccination site rash": 22, "Dyspnoea": 20, "Exposure during pregnancy": 20, "Hypoaesthesia": 19, "Injection site erythema": 19, "Vomiting": 19, "Feeling hot": 18, "Peripheral swelling": 18, "Urticaria": 18, "Feeling abnormal": 17, "Lymphadenopathy": 17, "Decreased appetite": 16, "Neck pain": 16, "Paraesthesia": 16, "Inappropriate schedule of product administration": 15, "Back pain": 14, "Influenza like illness": 14, "Maternal exposure during pregnancy": 14, "Hyperhidrosis": 13, "Vaccination complication": 13, "Blood pressure measurement": 12, "SARS-CoV-2 test positive": 12, "Hypertension": 11, "Illness": 11, "Insomnia": 11, "Palpitations": 11, "Product dose omission issue": 11, "Vaccination site induration": 11, "Vaccination site mass": 11, "Heart rate": 10, "Influenza": 10, "Musculoskeletal stiffness": 10, "Nasopharyngitis": 10, "Pregnancy test": 10, "Somnolence": 10, "Swelling": 10, "Ageusia": 9, "Ear pain": 9, "Gait disturbance": 9, "Incorrect dose administered": 9, "Limb discomfort": 9, "SARS-CoV-2 antibody test": 9, "Anxiety": 8, "Chest discomfort": 8, "Drug ineffective": 8, "Flushing": 8, "Heart rate increased": 8, "Injection site swelling": 8, "Injection site warmth": 8, "Magnetic resonance imaging": 8, "Vaccination site reaction": 8, "Burning sensation": 7, "Head discomfort": 7, "Hypersensitivity": 7, "Injection site pruritus": 7, "Mobility decreased": 7, "Rhinorrhoea": 7, "Tinnitus": 7, "Wheezing": 7, "Axillary pain": 6, "Blood test": 6, "Computerised tomogram": 6, "Condition aggravated": 6, "Ear discomfort": 6, "Herpes zoster": 6, "Migraine": 6, "Muscle spasms": 6, "Muscular weakness": 6, "Rash erythematous": 6, "Rash pruritic": 6, "Tremor": 6, "Ultrasound scan": 6, "Alopecia": 5, "Balance disorder": 5, "Chest pain": 5, "Echocardiogram": 5, "Hot flush": 5, "Induration": 5, "Injection site induration": 5, "Loss of consciousness": 5, "Loss of personal independence in daily activities": 5, "Muscle tightness": 5, "Product administered at inappropriate site": 5, "Cellulitis": 4, "Depression": 4, "Dry mouth": 4, "Dry throat": 4, "Extra dose administered": 4, "Eye pain": 4, "Eye swelling": 4, "Facial pain": 4, "Inflammation": 4, "Irritability": 4, "Lip swelling": 4, "Oropharyngeal pain": 4, "Paraesthesia oral": 4, "Peripheral coldness": 4, "Product administered to patient of inappropriate age": 4, "Productive cough": 4, "Rash macular": 4, "Seizure": 4, "Sinus congestion": 4, "Skin warm": 4, "Vaccination site urticaria": 4, "Vertigo": 4, "Weight decreased": 4, "Anaphylactic reaction": 3, "Anosmia": 3, "Biopsy": 3, "Blepharospasm": 3, "Confusional state": 3, "Contusion": 3, "Dehydration": 3, "Discomfort": 3, "Dysphagia": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling cold": 3, "Glucose tolerance test": 3, "Hypersomnia": 3, "Hypoacusis": 3, "Hypoaesthesia oral": 3, "Incorrect route of product administration": 3, "Injection site infection": 3, "Injection site rash": 3, "Menstruation irregular": 3, "Muscle twitching": 3, "Musculoskeletal discomfort": 3, "Nasal congestion": 3, "Neuralgia": 3, "Oral discomfort": 3, "Oral herpes": 3, "Periorbital swelling": 3, "Pulmonary congestion": 3, "Retching": 3, "Rheumatoid arthritis": 3, "Skin reaction": 3, "Tenderness": 3, "Throat tightness": 3, "Tongue discomfort": 3, "Vaccination site lymphadenopathy": 3, "Abdominal pain": 2, "Abdominal pain upper": 2, "Abnormal dreams": 2, "Accidental overdose": 2, "Acne": 2, "Acoustic stimulation tests": 2, "Agitation": 2, "Anger": 2, "Antibody test": 2, "Autoimmune disorder": 2, "Axillary mass": 2, "Bedridden": 2, "Blood glucose decreased": 2, "Blood pressure increased": 2, "Blood urine present": 2, "Body temperature increased": 2, "Bone pain": 2, "Cognitive disorder": 2, "Cystitis": 2, "Dermatitis allergic": 2, "Dry eye": 2, "Dysgeusia": 2, "Dyskinesia": 2, "Ear infection": 2, "Endoscopy": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Fibromyalgia": 2, "Frustration tolerance decreased": 2, "Haematuria": 2, "Heart rate irregular": 2, "Human chorionic gonadotropin": 2, "Immune system disorder": 2, "Injection site inflammation": 2, "Injection site mass": 2, "Joint swelling": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Lethargy": 2, "Lumbar puncture": 2, "Lymph node pain": 2, "Mechanical urticaria": 2, "Memory impairment": 2, "Menstrual disorder": 2, "Nervous system disorder": 2, "Nodule": 2, "Off label use": 2, "Oral pain": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Platelet count": 2, "Pneumonia": 2, "Presyncope": 2, "Product administration error": 2, "Product storage error": 2, "Product temperature excursion issue": 2, "Protein total": 2, "Pulmonary embolism": 2, "Pulmonary fibrosis": 2, "Sinus disorder": 2, "Skin burning sensation": 2, "Skin exfoliation": 2, "Sleep deficit": 2, "Sleep disorder": 2, "Therapeutic response unexpected": 2, "Throat irritation": 2, "Thrombosis": 2, "Ultrasound foetal": 2, "Unevaluable event": 2, "Upper respiratory tract congestion": 2, "Upper-airway cough syndrome": 2, "Urinary tract infection": 2, "Urine analysis": 2, "Vaccination site bruising": 2, "Vaccination site movement impairment": 2, "Vision blurred": 2, "Visual impairment": 2, "Walking aid user": 2, "White blood cell count": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Accident": 1, "Accidental exposure to product": 1, "Accidental underdose": 1, "Acute respiratory failure": 1, "Adverse event": 1, "Affect lability": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Allergy test": 1, "Amnesia": 1, "Anaemia": 1, "Antibody test negative": 1, "Aortic valve stenosis": 1, "Aphonia": 1, "Arthritis": 1, "Asthma": 1, "Autoimmune pericarditis": 1, "Balanoposthitis": 1, "Bell's palsy": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood potassium increased": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic": 1, "Bradyphrenia": 1, "Brain oedema": 1, "Breast feeding": 1, "Breast swelling": 1, "Breech delivery": 1, "Bronchiectasis": 1, "Bronchitis": 1, "Bronchoscopy": 1, "Bronchospasm": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Chronic kidney disease": 1, "Colonoscopy": 1, "Conjunctival hyperaemia": 1, "Crying": 1, "Culture": 1, "Culture urine": 1, "Deafness": 1, "Death": 1, "Decubitus ulcer": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Dermatitis atopic": 1, "Dermatologic examination": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Drug interaction": 1, "Dysarthria": 1, "Dysphonia": 1, "Dysuria": 1, "Ear pruritus": 1, "Eczema": 1, "Electromyogram": 1, "Energy increased": 1, "Epistaxis": 1, "Exercise tolerance decreased": 1, "Exertional headache": 1, "Exposure to SARS-CoV-2": 1, "Eye injury": 1, "Eyelid irritation": 1, "Eyelid pain": 1, "Eyelids pruritus": 1, "Face oedema": 1, "Food intolerance": 1, "Formication": 1, "Full blood count": 1, "Fungal skin infection": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Genetic counselling": 1, "Giant cell arteritis": 1, "Gingival pain": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Glossitis": 1, "Guttate psoriasis": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoglobin abnormal": 1, "Head injury": 1, "Heart rate decreased": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Herpes simplex": 1, "High density lipoprotein increased": 1, "Hyperaesthesia": 1, "Hyperglycaemia": 1, "Hypogeusia": 1, "Hypokinesia": 1, "Hyposmia": 1, "Hypotension": 1, "Hypotonia": 1, "Immune-mediated adverse reaction": 1, "Impaired driving ability": 1, "Implant site swelling": 1, "Incorrect dosage administered": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site cellulitis": 1, "Injection site discolouration": 1, "Injection site discomfort": 1, "Injection site movement impairment": 1, "Injection site nodule": 1, "Injection site reaction": 1, "Injection site urticaria": 1, "International normalised ratio decreased": 1, "Interstitial lung disease": 1, "Intestinal obstruction": 1, "Irritable bowel syndrome": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Joint vibration": 1, "Kidney infection": 1, "Knuckle pads": 1, "Laparoscopy": 1, "Leukaemia": 1, "Low density lipoprotein increased": 1, "Lower respiratory tract infection": 1, "Mass": 1, "Maternal exposure before pregnancy": 1, "Mean cell volume": 1, "Menstrual cycle management": 1, "Metamorphopsia": 1, "Mitral valve incompetence": 1, "Monoplegia": 1, "Muscle rigidity": 1, "Muscle strain": 1, "Musculoskeletal disorder": 1, "Musculoskeletal pain": 1, "Myeloid leukaemia": 1, "N-terminal prohormone brain natriuretic peptide increased": 1, "Nasal discomfort": 1, "Nasal dryness": 1, "Near death experience": 1, "Nerve injury": 1, "Nervousness": 1, "Neuralgic amyotrophy": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nightmare": 1, "No adverse event": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Optic neuritis": 1, "Oral disorder": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Ovulation disorder": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Panic attack": 1, "Parosmia": 1, "Pelvic pain": 1, "Pericarditis": 1, "Petechiae": 1, "Plasma cell myeloma": 1, "Platelet count decreased": 1, "Platelet count normal": 1, "Pleural effusion": 1, "Pneumonitis": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Poor quality product administered": 1, "Pregnancy": 1, "Pregnancy test urine": 1, "Prenatal screening test": 1, "Product colour issue": 1, "Prostatic specific antigen": 1, "Prostatic specific antigen increased": 1, "Psoriasis": 1, "Psoriatic arthropathy": 1, "Pulmonary function test": 1, "Pulmonary infarction": 1, "Pulmonary mass": 1, "Pulmonary thrombosis": 1, "Radicular pain": 1, "Rash papular": 1, "Rash pustular": 1, "Renal artery thrombosis": 1, "Renal failure": 1, "Renal pain": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restrictive pulmonary disease": 1, "Retinal haemorrhage": 1, "Retinal migraine": 1, "Rhinitis allergic": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Scan": 1, "Scratch": 1, "Scrotal swelling": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sinusitis": 1, "Skin discharge": 1, "Skin discolouration": 1, "Skin haemorrhage": 1, "Skin induration": 1, "Skin mass": 1, "Skin plaque": 1, "Skin texture abnormal": 1, "Sleep apnoea syndrome": 1, "Sleep talking": 1, "Spinal fracture": 1, "Sputum increased": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Syncope": 1, "Tachycardia": 1, "Taste disorder": 1, "Tissue injury": 1, "Tongue pruritus": 1, "Toothache": 1, "Trigeminal neuralgia": 1, "Trismus": 1, "Troponin": 1, "Troponin increased": 1, "Ultrasound Doppler": 1, "Urinary incontinence": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site dysaesthesia": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site scar": 1, "Vaccine breakthrough infection": 1, "Vaginal haemorrhage": 1, "Varicose vein": 1, "Vasculitis": 1, "Vein disorder": 1, "Viral infection": 1, "Vitreous floaters": 1, "Weight increased": 1, "White blood cell count decreased": 1}, "batchcodes": ["011L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L20B.json b/docs/data/histograms/United States/011L20B.json
index 51698897a52..a50b3ef0910 100644
--- a/docs/data/histograms/United States/011L20B.json
+++ b/docs/data/histograms/United States/011L20B.json
@@ -1 +1 @@
-{"batchcode": "011L20B", "histograms": [{"batchcodes": ["011L20B"], "histogram": {"Anxiety": 1, "Asthenia": 1, "Back disorder": 1, "Blood triglycerides": 1, "Condition aggravated": 1, "Depression": 1, "Dizziness": 1, "Fatigue": 1, "Magnetic resonance imaging head": 1, "Musculoskeletal discomfort": 1, "Tremor": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "011L20B", "histograms": [{"histogram": {"Anxiety": 1, "Asthenia": 1, "Back disorder": 1, "Blood triglycerides": 1, "Condition aggravated": 1, "Depression": 1, "Dizziness": 1, "Fatigue": 1, "Magnetic resonance imaging head": 1, "Musculoskeletal discomfort": 1, "Tremor": 1, "White blood cell count": 1}, "batchcodes": ["011L20B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L210A.json b/docs/data/histograms/United States/011L210A.json
index 0bccd2c6d2e..8c194053937 100644
--- a/docs/data/histograms/United States/011L210A.json
+++ b/docs/data/histograms/United States/011L210A.json
@@ -1 +1 @@
-{"batchcode": "011L210A", "histograms": [{"batchcodes": ["011L210A"], "histogram": {"Pain in extremity": 2, "Erythema": 1, "Immunisation reaction": 1, "Influenza like illness": 1, "Neck pain": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011L210A", "histograms": [{"histogram": {"Pain in extremity": 2, "Erythema": 1, "Immunisation reaction": 1, "Influenza like illness": 1, "Neck pain": 1, "Peripheral swelling": 1}, "batchcodes": ["011L210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L21A.json b/docs/data/histograms/United States/011L21A.json
index 5c5e7eaef9d..a92633d5f7f 100644
--- a/docs/data/histograms/United States/011L21A.json
+++ b/docs/data/histograms/United States/011L21A.json
@@ -1 +1 @@
-{"batchcode": "011L21A", "histograms": [{"batchcodes": ["011L21A"], "histogram": {"COVID-19": 1, "Pain": 1, "Peripheral swelling": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "011L21A", "histograms": [{"histogram": {"COVID-19": 1, "Pain": 1, "Peripheral swelling": 1, "Vaccination site erythema": 1}, "batchcodes": ["011L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L220A.json b/docs/data/histograms/United States/011L220A.json
index 76af5b2ac8b..a42b502858c 100644
--- a/docs/data/histograms/United States/011L220A.json
+++ b/docs/data/histograms/United States/011L220A.json
@@ -1 +1 @@
-{"batchcode": "011L220A", "histograms": [{"batchcodes": ["011L220A"], "histogram": {"Pain in extremity": 4, "Chills": 2, "Injection site rash": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Limb discomfort": 1, "Pyrexia": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "011L220A", "histograms": [{"histogram": {"Pain in extremity": 4, "Chills": 2, "Injection site rash": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Limb discomfort": 1, "Pyrexia": 1, "Rash pruritic": 1}, "batchcodes": ["011L220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L22A.json b/docs/data/histograms/United States/011L22A.json
index b456b1d6bb0..cdcaef07d4b 100644
--- a/docs/data/histograms/United States/011L22A.json
+++ b/docs/data/histograms/United States/011L22A.json
@@ -1 +1 @@
-{"batchcode": "011L22A", "histograms": [{"batchcodes": ["011L22A"], "histogram": {"Chills": 1, "Eye irritation": 1, "Fatigue": 1, "Feeling of body temperature change": 1, "Influenza like illness": 1, "Pain in extremity": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011L22A", "histograms": [{"histogram": {"Chills": 1, "Eye irritation": 1, "Fatigue": 1, "Feeling of body temperature change": 1, "Influenza like illness": 1, "Pain in extremity": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Vaccination site pain": 1}, "batchcodes": ["011L22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L2A.json b/docs/data/histograms/United States/011L2A.json
index 3f59eab1d9e..61b070d69ea 100644
--- a/docs/data/histograms/United States/011L2A.json
+++ b/docs/data/histograms/United States/011L2A.json
@@ -1 +1 @@
-{"batchcode": "011L2A", "histograms": [{"batchcodes": ["011L2A"], "histogram": {"COVID-19": 1, "Maternal exposure during pregnancy": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "011L2A", "histograms": [{"histogram": {"COVID-19": 1, "Maternal exposure during pregnancy": 1, "Ultrasound scan": 1}, "batchcodes": ["011L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L2DA.json b/docs/data/histograms/United States/011L2DA.json
index e48918b5269..473c8ea271c 100644
--- a/docs/data/histograms/United States/011L2DA.json
+++ b/docs/data/histograms/United States/011L2DA.json
@@ -1 +1 @@
-{"batchcode": "011L2DA", "histograms": [{"batchcodes": ["011L2DA"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Headache": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011L2DA", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Headache": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["011L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011L2OA.json b/docs/data/histograms/United States/011L2OA.json
index 46aed9bd375..78a3cf89a4e 100644
--- a/docs/data/histograms/United States/011L2OA.json
+++ b/docs/data/histograms/United States/011L2OA.json
@@ -1 +1 @@
-{"batchcode": "011L2OA", "histograms": [{"batchcodes": ["011L2OA"], "histogram": {"Feeling hot": 1, "Insomnia": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011L2OA", "histograms": [{"histogram": {"Feeling hot": 1, "Insomnia": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["011L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LL0A.json b/docs/data/histograms/United States/011LL0A.json
index 5b64ebc45e5..be961e07e67 100644
--- a/docs/data/histograms/United States/011LL0A.json
+++ b/docs/data/histograms/United States/011LL0A.json
@@ -1 +1 @@
-{"batchcode": "011LL0A", "histograms": [{"batchcodes": ["011LL0A"], "histogram": {"Oropharyngeal discomfort": 1, "Pain": 1, "Presyncope": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011LL0A", "histograms": [{"histogram": {"Oropharyngeal discomfort": 1, "Pain": 1, "Presyncope": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["011LL0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LT0A.json b/docs/data/histograms/United States/011LT0A.json
index 102a25ebc17..6c2dee979b0 100644
--- a/docs/data/histograms/United States/011LT0A.json
+++ b/docs/data/histograms/United States/011LT0A.json
@@ -1 +1 @@
-{"batchcode": "011LT0A", "histograms": [{"batchcodes": ["011LT0A"], "histogram": {"Injection site pain": 1, "Myalgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011LT0A", "histograms": [{"histogram": {"Injection site pain": 1, "Myalgia": 1, "Vaccination site pain": 1}, "batchcodes": ["011LT0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LV0A OR 011L.json b/docs/data/histograms/United States/011LV0A OR 011L.json
index 341b1dac879..1cc5e5ecc40 100644
--- a/docs/data/histograms/United States/011LV0A OR 011L.json
+++ b/docs/data/histograms/United States/011LV0A OR 011L.json
@@ -1 +1 @@
-{"batchcode": "011LV0A OR 011L", "histograms": [{"batchcodes": ["011LV0A OR 011L"], "histogram": {"Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "011LV0A OR 011L", "histograms": [{"histogram": {"Vision blurred": 1}, "batchcodes": ["011LV0A OR 011L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LZ014.json b/docs/data/histograms/United States/011LZ014.json
index 3fff9df7395..9b2a62949d4 100644
--- a/docs/data/histograms/United States/011LZ014.json
+++ b/docs/data/histograms/United States/011LZ014.json
@@ -1 +1 @@
-{"batchcode": "011LZ014", "histograms": [{"batchcodes": ["011LZ014"], "histogram": {"Dyspnoea": 3, "Electrocardiogram": 3, "Palpitations": 3, "Allergy test": 1, "Cardiac disorder": 1, "Eczema": 1, "Mobility decreased": 1, "Rash": 1, "Tendonitis": 1}}]}
\ No newline at end of file
+{"batchcode": "011LZ014", "histograms": [{"histogram": {"Dyspnoea": 3, "Electrocardiogram": 3, "Palpitations": 3, "Allergy test": 1, "Cardiac disorder": 1, "Eczema": 1, "Mobility decreased": 1, "Rash": 1, "Tendonitis": 1}, "batchcodes": ["011LZ014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LZ0A.json b/docs/data/histograms/United States/011LZ0A.json
index 23a0f4842c5..e98eb4ba8ea 100644
--- a/docs/data/histograms/United States/011LZ0A.json
+++ b/docs/data/histograms/United States/011LZ0A.json
@@ -1 +1 @@
-{"batchcode": "011LZ0A", "histograms": [{"batchcodes": ["011LZ0A"], "histogram": {"Pruritus": 3, "Rash": 2, "Abortion spontaneous": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cerebral haemorrhage": 1, "Cold sweat": 1, "Ear swelling": 1, "Exposure during pregnancy": 1, "Eye swelling": 1, "Feeling hot": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Induration": 1, "Infection": 1, "Injection site bruising": 1, "Injection site erythema": 1, "Intentional dose omission": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Nausea": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash erythematous": 1, "Rash vesicular": 1, "Swelling face": 1, "Ultrasound scan": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vaginal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "011LZ0A", "histograms": [{"histogram": {"Pruritus": 3, "Rash": 2, "Abortion spontaneous": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "Cerebral haemorrhage": 1, "Cold sweat": 1, "Ear swelling": 1, "Exposure during pregnancy": 1, "Eye swelling": 1, "Feeling hot": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Induration": 1, "Infection": 1, "Injection site bruising": 1, "Injection site erythema": 1, "Intentional dose omission": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Nausea": 1, "Pain": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash erythematous": 1, "Rash vesicular": 1, "Swelling face": 1, "Ultrasound scan": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vaginal haemorrhage": 1}, "batchcodes": ["011LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LZ0N.json b/docs/data/histograms/United States/011LZ0N.json
index 5eaf71127d4..3c0e8f1690b 100644
--- a/docs/data/histograms/United States/011LZ0N.json
+++ b/docs/data/histograms/United States/011LZ0N.json
@@ -1 +1 @@
-{"batchcode": "011LZ0N", "histograms": [{"batchcodes": ["011LZ0N"], "histogram": {"Chills": 1, "Headache": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011LZ0N", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["011LZ0N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LZCA.json b/docs/data/histograms/United States/011LZCA.json
index 925b536b403..4fdfe7bc680 100644
--- a/docs/data/histograms/United States/011LZCA.json
+++ b/docs/data/histograms/United States/011LZCA.json
@@ -1 +1 @@
-{"batchcode": "011LZCA", "histograms": [{"batchcodes": ["011LZCA"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011LZCA", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["011LZCA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011LZOA.json b/docs/data/histograms/United States/011LZOA.json
index 3cd5f0f8604..66432273505 100644
--- a/docs/data/histograms/United States/011LZOA.json
+++ b/docs/data/histograms/United States/011LZOA.json
@@ -1 +1 @@
-{"batchcode": "011LZOA", "histograms": [{"batchcodes": ["011LZOA"], "histogram": {"Fatigue": 1, "Influenza like illness": 1}}]}
\ No newline at end of file
+{"batchcode": "011LZOA", "histograms": [{"histogram": {"Fatigue": 1, "Influenza like illness": 1}, "batchcodes": ["011LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M-20A.json b/docs/data/histograms/United States/011M-20A.json
index 5ef7506d758..e94ecb11457 100644
--- a/docs/data/histograms/United States/011M-20A.json
+++ b/docs/data/histograms/United States/011M-20A.json
@@ -1 +1 @@
-{"batchcode": "011M-20A", "histograms": [{"batchcodes": ["011M-20A"], "histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011M-20A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1, "Pyrexia": 1}, "batchcodes": ["011M-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M02A.json b/docs/data/histograms/United States/011M02A.json
index 6c50110b761..8ad136a37c8 100644
--- a/docs/data/histograms/United States/011M02A.json
+++ b/docs/data/histograms/United States/011M02A.json
@@ -1 +1 @@
-{"batchcode": "011M02A", "histograms": [{"batchcodes": ["011M02A"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011M02A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["011M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M10A.json b/docs/data/histograms/United States/011M10A.json
index 93a6e6995e4..ce84c7e1d2f 100644
--- a/docs/data/histograms/United States/011M10A.json
+++ b/docs/data/histograms/United States/011M10A.json
@@ -1 +1 @@
-{"batchcode": "011M10A", "histograms": [{"batchcodes": ["011M10A"], "histogram": {"Influenza like illness": 1}}]}
\ No newline at end of file
+{"batchcode": "011M10A", "histograms": [{"histogram": {"Influenza like illness": 1}, "batchcodes": ["011M10A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M20.json b/docs/data/histograms/United States/011M20.json
index ef890b6eb84..792b0d38372 100644
--- a/docs/data/histograms/United States/011M20.json
+++ b/docs/data/histograms/United States/011M20.json
@@ -1 +1 @@
-{"batchcode": "011M20", "histograms": [{"batchcodes": ["011M20"], "histogram": {"Decreased appetite": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Night sweats": 2}}]}
\ No newline at end of file
+{"batchcode": "011M20", "histograms": [{"histogram": {"Decreased appetite": 2, "Dizziness": 2, "Fatigue": 2, "Headache": 2, "Night sweats": 2}, "batchcodes": ["011M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M2017.json b/docs/data/histograms/United States/011M2017.json
index a1b521bf916..8757251e777 100644
--- a/docs/data/histograms/United States/011M2017.json
+++ b/docs/data/histograms/United States/011M2017.json
@@ -1 +1 @@
-{"batchcode": "011M2017", "histograms": [{"batchcodes": ["011M2017"], "histogram": {"COVID-19": 1, "Immunisation reaction": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "011M2017", "histograms": [{"histogram": {"COVID-19": 1, "Immunisation reaction": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1}, "batchcodes": ["011M2017"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M201A.json b/docs/data/histograms/United States/011M201A.json
index aad1e1df56f..f69aba73a0f 100644
--- a/docs/data/histograms/United States/011M201A.json
+++ b/docs/data/histograms/United States/011M201A.json
@@ -1 +1 @@
-{"batchcode": "011M201A", "histograms": [{"batchcodes": ["011M201A"], "histogram": {"Fatigue": 2, "Vaccination site pain": 2, "Chills": 1, "Contusion": 1, "Headache": 1, "Incorrect dose administered": 1, "Pain": 1, "Poor quality sleep": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011M201A", "histograms": [{"histogram": {"Fatigue": 2, "Vaccination site pain": 2, "Chills": 1, "Contusion": 1, "Headache": 1, "Incorrect dose administered": 1, "Pain": 1, "Poor quality sleep": 1, "Pyrexia": 1}, "batchcodes": ["011M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M203.json b/docs/data/histograms/United States/011M203.json
index c255d2ac2f2..c257e593f63 100644
--- a/docs/data/histograms/United States/011M203.json
+++ b/docs/data/histograms/United States/011M203.json
@@ -1 +1 @@
-{"batchcode": "011M203", "histograms": [{"batchcodes": ["011M203"], "histogram": {"Chills": 2, "Disturbance in attention": 2, "Feeling abnormal": 2, "Headache": 2, "Influenza like illness": 2, "Myalgia": 2, "Anger": 1, "Bradykinesia": 1, "Dizziness": 1, "Emotional distress": 1, "Fatigue": 1, "Memory impairment": 1, "Pain": 1, "Sluggishness": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "011M203", "histograms": [{"histogram": {"Chills": 2, "Disturbance in attention": 2, "Feeling abnormal": 2, "Headache": 2, "Influenza like illness": 2, "Myalgia": 2, "Anger": 1, "Bradykinesia": 1, "Dizziness": 1, "Emotional distress": 1, "Fatigue": 1, "Memory impairment": 1, "Pain": 1, "Sluggishness": 1, "Tinnitus": 1}, "batchcodes": ["011M203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M204.json b/docs/data/histograms/United States/011M204.json
index 601b6eaf6ef..7dee78ed058 100644
--- a/docs/data/histograms/United States/011M204.json
+++ b/docs/data/histograms/United States/011M204.json
@@ -1 +1 @@
-{"batchcode": "011M204", "histograms": [{"batchcodes": ["011M204"], "histogram": {"Anosmia": 1, "Epistaxis": 1, "Fatigue": 1, "Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "011M204", "histograms": [{"histogram": {"Anosmia": 1, "Epistaxis": 1, "Fatigue": 1, "Hypertension": 1}, "batchcodes": ["011M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M207.json b/docs/data/histograms/United States/011M207.json
index bcc1af2556e..5efbd359a8a 100644
--- a/docs/data/histograms/United States/011M207.json
+++ b/docs/data/histograms/United States/011M207.json
@@ -1 +1 @@
-{"batchcode": "011M207", "histograms": [{"batchcodes": ["011M207"], "histogram": {"Dyspnoea": 2, "Feeling abnormal": 2, "Arthralgia": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Dry mouth": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Myalgia": 1, "Palpitations": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "011M207", "histograms": [{"histogram": {"Dyspnoea": 2, "Feeling abnormal": 2, "Arthralgia": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Dry mouth": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Myalgia": 1, "Palpitations": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}, "batchcodes": ["011M207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M208A.json b/docs/data/histograms/United States/011M208A.json
index 10c812cfb4e..48373fe809c 100644
--- a/docs/data/histograms/United States/011M208A.json
+++ b/docs/data/histograms/United States/011M208A.json
@@ -1 +1 @@
-{"batchcode": "011M208A", "histograms": [{"batchcodes": ["011M208A"], "histogram": {"Maternal exposure during pregnancy": 1, "Ultrasound foetal": 1}}]}
\ No newline at end of file
+{"batchcode": "011M208A", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1, "Ultrasound foetal": 1}, "batchcodes": ["011M208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M209.json b/docs/data/histograms/United States/011M209.json
index 8aa170c2d32..af5a3c4cf64 100644
--- a/docs/data/histograms/United States/011M209.json
+++ b/docs/data/histograms/United States/011M209.json
@@ -1 +1 @@
-{"batchcode": "011M209", "histograms": [{"batchcodes": ["011M209"], "histogram": {"Dysphagia": 1, "Fatigue": 1, "Headache": 1, "Incorrect dose administered": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "011M209", "histograms": [{"histogram": {"Dysphagia": 1, "Fatigue": 1, "Headache": 1, "Incorrect dose administered": 1, "Lymphadenopathy": 1}, "batchcodes": ["011M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M20A.json b/docs/data/histograms/United States/011M20A.json
index 8dec86e2c17..736f83a6bd2 100644
--- a/docs/data/histograms/United States/011M20A.json
+++ b/docs/data/histograms/United States/011M20A.json
@@ -1 +1 @@
-{"batchcode": "011M20A", "histograms": [{"batchcodes": ["011M20A", "FJ9943"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["011M20A"], "histogram": {"Headache": 90, "Chills": 86, "Pyrexia": 84, "Vaccination site pain": 82, "Pain in extremity": 70, "Fatigue": 61, "Vaccination site erythema": 56, "Myalgia": 51, "Nausea": 49, "Pruritus": 46, "Rash": 45, "Pain": 40, "Vaccination site pruritus": 34, "Arthralgia": 33, "Dizziness": 33, "Asthenia": 27, "Erythema": 25, "Vaccination site warmth": 25, "Feeling abnormal": 23, "Illness": 23, "Vaccination site swelling": 21, "Vomiting": 21, "Vaccination site rash": 20, "Diarrhoea": 19, "COVID-19": 18, "Dyspnoea": 18, "Urticaria": 18, "Peripheral swelling": 17, "Rash erythematous": 15, "Body temperature": 13, "Injection site pain": 13, "Malaise": 13, "Tremor": 13, "Influenza like illness": 12, "Product dose omission issue": 12, "SARS-CoV-2 test": 12, "Back pain": 11, "Decreased appetite": 11, "Injection site pruritus": 11, "Paraesthesia": 11, "Hypoaesthesia": 10, "Inappropriate schedule of product administration": 10, "Neck pain": 10, "Vaccination site reaction": 10, "Feeling hot": 9, "Injection site erythema": 9, "Insomnia": 9, "Lip swelling": 9, "Vaccination complication": 9, "Burning sensation": 8, "Rash pruritic": 8, "Somnolence": 8, "Swelling": 8, "Abdominal discomfort": 7, "Chest discomfort": 7, "Chest pain": 7, "Cough": 7, "Hyperhidrosis": 7, "Injection site rash": 7, "Limb discomfort": 7, "Blood pressure measurement": 6, "Blood test": 6, "Exposure during pregnancy": 6, "Gait disturbance": 6, "Heart rate": 6, "Hypertension": 6, "Lymphadenopathy": 6, "Pregnancy test": 6, "Rash macular": 6, "Swollen tongue": 6, "Therapeutic response unexpected": 6, "Tinnitus": 6, "Ultrasound scan": 6, "Vaccination site induration": 6, "Anxiety": 5, "Dysgeusia": 5, "Dysstasia": 5, "Fall": 5, "Feeling cold": 5, "Hypersensitivity": 5, "Hypokinesia": 5, "Influenza": 5, "Joint swelling": 5, "Loss of consciousness": 5, "Maternal exposure during pregnancy": 5, "Migraine": 5, "Mobility decreased": 5, "Muscular weakness": 5, "Palpitations": 5, "Swelling face": 5, "Vision blurred": 5, "Abdominal pain": 4, "Ageusia": 4, "Blood pressure increased": 4, "Breast pain": 4, "Computerised tomogram": 4, "Condition aggravated": 4, "Discomfort": 4, "Drug ineffective": 4, "Expired product administered": 4, "Heart rate increased": 4, "Herpes zoster": 4, "Hypersomnia": 4, "Loss of personal independence in daily activities": 4, "Night sweats": 4, "Oropharyngeal pain": 4, "Paraesthesia oral": 4, "Pharyngeal swelling": 4, "Rhinorrhoea": 4, "Vaccination site mass": 4, "Atrial fibrillation": 3, "Balance disorder": 3, "Blister": 3, "Bone pain": 3, "Cheilitis": 3, "Confusional state": 3, "Dry mouth": 3, "Dyspepsia": 3, "Dysuria": 3, "Electrocardiogram": 3, "Eye irritation": 3, "Flushing": 3, "Gait inability": 3, "Hypotension": 3, "Incorrect dose administered": 3, "Induration": 3, "Injection site warmth": 3, "Lethargy": 3, "Muscle spasms": 3, "Musculoskeletal stiffness": 3, "Neuralgia": 3, "Ocular hyperaemia": 3, "Oxygen saturation": 3, "Presyncope": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Sinusitis": 3, "Skin discolouration": 3, "Skin exfoliation": 3, "Suspected COVID-19": 3, "Underdose": 3, "Vaccination site urticaria": 3, "X-ray": 3, "Abdominal pain upper": 2, "Abnormal dreams": 2, "Adverse reaction": 2, "Allergy to vaccine": 2, "Alopecia": 2, "Anosmia": 2, "Arthropod bite": 2, "Asthma": 2, "Blood glucose": 2, "Blood glucose decreased": 2, "Cerebrovascular accident": 2, "Chapped lips": 2, "Death": 2, "Depressed mood": 2, "Device connection issue": 2, "Dry skin": 2, "Dysarthria": 2, "Eating disorder": 2, "Echocardiogram": 2, "Epistaxis": 2, "Exposure to SARS-CoV-2": 2, "Exposure via skin contact": 2, "Eye pain": 2, "Eyelid rash": 2, "Facial pain": 2, "Hallucination": 2, "Hospitalisation": 2, "Hypoaesthesia oral": 2, "Injection site cellulitis": 2, "Injection site mass": 2, "Injection site swelling": 2, "Laboratory test": 2, "Mass": 2, "Muscle fatigue": 2, "Myocardial infarction": 2, "Nasal congestion": 2, "Nodule": 2, "Parosmia": 2, "Pneumonia": 2, "SARS-CoV-2 antibody test negative": 2, "Sciatica": 2, "Skin mass": 2, "Skin warm": 2, "Sneezing": 2, "Tachycardia": 2, "Tenderness": 2, "Throat tightness": 2, "Vaccination site inflammation": 2, "Vulvovaginal pain": 2, "Weight decreased": 2, "Wrong technique in device usage process": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Acne": 1, "Adverse event": 1, "Allergy to arthropod bite": 1, "Amniocentesis": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Ankle brachial index": 1, "Arthritis": 1, "Asthenopia": 1, "Axillary pain": 1, "Bed rest": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy": 1, "Blindness": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood urine present": 1, "Bradycardia": 1, "Bradykinesia": 1, "Bronchitis": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure congestive": 1, "Cardiac infection": 1, "Cellulitis": 1, "Chest X-ray": 1, "Constipation": 1, "Contusion": 1, "Cystitis": 1, "Dandruff": 1, "Dementia": 1, "Dermatitis exfoliative generalised": 1, "Device malfunction": 1, "Diabetes mellitus": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ear disorder": 1, "Ear infection": 1, "Eosinophil count": 1, "Eructation": 1, "Excessive eye blinking": 1, "Eye swelling": 1, "Eyelid infection": 1, "Eyelid thickening": 1, "Facial paralysis": 1, "Fear": 1, "Fear of disease": 1, "Feeding disorder": 1, "Fluid retention": 1, "Gastrointestinal disorder": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Glucose tolerance test": 1, "Gluten sensitivity": 1, "Granulocyte count increased": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate abnormal": 1, "Heart valve incompetence": 1, "Hepatic enzyme increased": 1, "Herpes simplex test": 1, "Herpes virus infection": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Immunisation reaction": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Infection": 1, "Infective glossitis": 1, "Inflammation": 1, "Inflammatory marker test": 1, "Injection site cyst": 1, "Injection site discolouration": 1, "Injection site muscle weakness": 1, "Injection site reaction": 1, "Injury": 1, "Intentional dose omission": 1, "International normalised ratio increased": 1, "Intracardiac thrombus": 1, "Joint injury": 1, "Joint range of motion decreased": 1, "Laryngitis": 1, "Left ventricular dysfunction": 1, "Lip blister": 1, "Lip dry": 1, "Lip erythema": 1, "Lip haemorrhage": 1, "Lip infection": 1, "Lip pain": 1, "Lung disorder": 1, "Lymph node pain": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Maternal exposure before pregnancy": 1, "Mean arterial pressure": 1, "Mental fatigue": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle strain": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Nail disorder": 1, "Nail psoriasis": 1, "Narcolepsy": 1, "Nasal dryness": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Nephrolithiasis": 1, "Neuritis": 1, "Neurological symptom": 1, "No adverse event": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral candidiasis": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Panic attack": 1, "Paralysis": 1, "Periarthritis": 1, "Pericarditis": 1, "Pharyngeal mass": 1, "Pharyngitis streptococcal": 1, "Photopsia": 1, "Pityriasis rosea": 1, "Pleural effusion": 1, "Pneumonitis": 1, "Pregnancy test positive": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Product administration error": 1, "Product physical issue": 1, "Product storage error": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Rash maculo-papular": 1, "Rash papular": 1, "Red blood cell sedimentation rate increased": 1, "Refusal of vaccination": 1, "Renal failure": 1, "Respiratory rate": 1, "Retching": 1, "Rheumatoid arthritis": 1, "Scratch": 1, "Secretion discharge": 1, "Sensitive skin": 1, "Sepsis": 1, "Sinus headache": 1, "Sitting disability": 1, "Skin abrasion": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin irritation": 1, "Skin swelling": 1, "Sleep disorder": 1, "Speech sound disorder": 1, "Spinal stenosis": 1, "Sunburn": 1, "Symptom recurrence": 1, "Taste disorder": 1, "Tearfulness": 1, "Tendonitis": 1, "Tension": 1, "Tension headache": 1, "Thinking abnormal": 1, "Throat irritation": 1, "Tooth abscess": 1, "Troponin": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen normal": 1, "Unevaluable event": 1, "Urine analysis abnormal": 1, "Vaccination site discharge": 1, "Vaccination site discolouration": 1, "Vaccination site haematoma": 1, "Vaccination site haemorrhage": 1, "Vaccination site infection": 1, "Vaccination site joint movement impairment": 1, "Vaccination site nodule": 1, "Vaccination site scab": 1, "Vaccination site scar": 1, "Vaginal disorder": 1, "Vaginal haemorrhage": 1, "Vein discolouration": 1, "Vertigo": 1, "Vitiligo": 1, "Vomiting projectile": 1, "Vulvovaginal pruritus": 1, "Vulvovaginal rash": 1, "Weight": 1, "White blood cell count": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "011M20A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["011M20A", "FJ9943"]}, {"histogram": {"Headache": 90, "Chills": 86, "Pyrexia": 84, "Vaccination site pain": 82, "Pain in extremity": 70, "Fatigue": 61, "Vaccination site erythema": 56, "Myalgia": 51, "Nausea": 49, "Pruritus": 46, "Rash": 45, "Pain": 40, "Vaccination site pruritus": 34, "Arthralgia": 33, "Dizziness": 33, "Asthenia": 27, "Erythema": 25, "Vaccination site warmth": 25, "Feeling abnormal": 23, "Illness": 23, "Vaccination site swelling": 21, "Vomiting": 21, "Vaccination site rash": 20, "Diarrhoea": 19, "COVID-19": 18, "Dyspnoea": 18, "Urticaria": 18, "Peripheral swelling": 17, "Rash erythematous": 15, "Body temperature": 13, "Injection site pain": 13, "Malaise": 13, "Tremor": 13, "Influenza like illness": 12, "Product dose omission issue": 12, "SARS-CoV-2 test": 12, "Back pain": 11, "Decreased appetite": 11, "Injection site pruritus": 11, "Paraesthesia": 11, "Hypoaesthesia": 10, "Inappropriate schedule of product administration": 10, "Neck pain": 10, "Vaccination site reaction": 10, "Feeling hot": 9, "Injection site erythema": 9, "Insomnia": 9, "Lip swelling": 9, "Vaccination complication": 9, "Burning sensation": 8, "Rash pruritic": 8, "Somnolence": 8, "Swelling": 8, "Abdominal discomfort": 7, "Chest discomfort": 7, "Chest pain": 7, "Cough": 7, "Hyperhidrosis": 7, "Injection site rash": 7, "Limb discomfort": 7, "Blood pressure measurement": 6, "Blood test": 6, "Exposure during pregnancy": 6, "Gait disturbance": 6, "Heart rate": 6, "Hypertension": 6, "Lymphadenopathy": 6, "Pregnancy test": 6, "Rash macular": 6, "Swollen tongue": 6, "Therapeutic response unexpected": 6, "Tinnitus": 6, "Ultrasound scan": 6, "Vaccination site induration": 6, "Anxiety": 5, "Dysgeusia": 5, "Dysstasia": 5, "Fall": 5, "Feeling cold": 5, "Hypersensitivity": 5, "Hypokinesia": 5, "Influenza": 5, "Joint swelling": 5, "Loss of consciousness": 5, "Maternal exposure during pregnancy": 5, "Migraine": 5, "Mobility decreased": 5, "Muscular weakness": 5, "Palpitations": 5, "Swelling face": 5, "Vision blurred": 5, "Abdominal pain": 4, "Ageusia": 4, "Blood pressure increased": 4, "Breast pain": 4, "Computerised tomogram": 4, "Condition aggravated": 4, "Discomfort": 4, "Drug ineffective": 4, "Expired product administered": 4, "Heart rate increased": 4, "Herpes zoster": 4, "Hypersomnia": 4, "Loss of personal independence in daily activities": 4, "Night sweats": 4, "Oropharyngeal pain": 4, "Paraesthesia oral": 4, "Pharyngeal swelling": 4, "Rhinorrhoea": 4, "Vaccination site mass": 4, "Atrial fibrillation": 3, "Balance disorder": 3, "Blister": 3, "Bone pain": 3, "Cheilitis": 3, "Confusional state": 3, "Dry mouth": 3, "Dyspepsia": 3, "Dysuria": 3, "Electrocardiogram": 3, "Eye irritation": 3, "Flushing": 3, "Gait inability": 3, "Hypotension": 3, "Incorrect dose administered": 3, "Induration": 3, "Injection site warmth": 3, "Lethargy": 3, "Muscle spasms": 3, "Musculoskeletal stiffness": 3, "Neuralgia": 3, "Ocular hyperaemia": 3, "Oxygen saturation": 3, "Presyncope": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Sinusitis": 3, "Skin discolouration": 3, "Skin exfoliation": 3, "Suspected COVID-19": 3, "Underdose": 3, "Vaccination site urticaria": 3, "X-ray": 3, "Abdominal pain upper": 2, "Abnormal dreams": 2, "Adverse reaction": 2, "Allergy to vaccine": 2, "Alopecia": 2, "Anosmia": 2, "Arthropod bite": 2, "Asthma": 2, "Blood glucose": 2, "Blood glucose decreased": 2, "Cerebrovascular accident": 2, "Chapped lips": 2, "Death": 2, "Depressed mood": 2, "Device connection issue": 2, "Dry skin": 2, "Dysarthria": 2, "Eating disorder": 2, "Echocardiogram": 2, "Epistaxis": 2, "Exposure to SARS-CoV-2": 2, "Exposure via skin contact": 2, "Eye pain": 2, "Eyelid rash": 2, "Facial pain": 2, "Hallucination": 2, "Hospitalisation": 2, "Hypoaesthesia oral": 2, "Injection site cellulitis": 2, "Injection site mass": 2, "Injection site swelling": 2, "Laboratory test": 2, "Mass": 2, "Muscle fatigue": 2, "Myocardial infarction": 2, "Nasal congestion": 2, "Nodule": 2, "Parosmia": 2, "Pneumonia": 2, "SARS-CoV-2 antibody test negative": 2, "Sciatica": 2, "Skin mass": 2, "Skin warm": 2, "Sneezing": 2, "Tachycardia": 2, "Tenderness": 2, "Throat tightness": 2, "Vaccination site inflammation": 2, "Vulvovaginal pain": 2, "Weight decreased": 2, "Wrong technique in device usage process": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Acne": 1, "Adverse event": 1, "Allergy to arthropod bite": 1, "Amniocentesis": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Ankle brachial index": 1, "Arthritis": 1, "Asthenopia": 1, "Axillary pain": 1, "Bed rest": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy": 1, "Blindness": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood urine present": 1, "Bradycardia": 1, "Bradykinesia": 1, "Bronchitis": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure congestive": 1, "Cardiac infection": 1, "Cellulitis": 1, "Chest X-ray": 1, "Constipation": 1, "Contusion": 1, "Cystitis": 1, "Dandruff": 1, "Dementia": 1, "Dermatitis exfoliative generalised": 1, "Device malfunction": 1, "Diabetes mellitus": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ear disorder": 1, "Ear infection": 1, "Eosinophil count": 1, "Eructation": 1, "Excessive eye blinking": 1, "Eye swelling": 1, "Eyelid infection": 1, "Eyelid thickening": 1, "Facial paralysis": 1, "Fear": 1, "Fear of disease": 1, "Feeding disorder": 1, "Fluid retention": 1, "Gastrointestinal disorder": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Glucose tolerance test": 1, "Gluten sensitivity": 1, "Granulocyte count increased": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate abnormal": 1, "Heart valve incompetence": 1, "Hepatic enzyme increased": 1, "Herpes simplex test": 1, "Herpes virus infection": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Immunisation reaction": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Infection": 1, "Infective glossitis": 1, "Inflammation": 1, "Inflammatory marker test": 1, "Injection site cyst": 1, "Injection site discolouration": 1, "Injection site muscle weakness": 1, "Injection site reaction": 1, "Injury": 1, "Intentional dose omission": 1, "International normalised ratio increased": 1, "Intracardiac thrombus": 1, "Joint injury": 1, "Joint range of motion decreased": 1, "Laryngitis": 1, "Left ventricular dysfunction": 1, "Lip blister": 1, "Lip dry": 1, "Lip erythema": 1, "Lip haemorrhage": 1, "Lip infection": 1, "Lip pain": 1, "Lung disorder": 1, "Lymph node pain": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Maternal exposure before pregnancy": 1, "Mean arterial pressure": 1, "Mental fatigue": 1, "Monoplegia": 1, "Movement disorder": 1, "Muscle strain": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Nail disorder": 1, "Nail psoriasis": 1, "Narcolepsy": 1, "Nasal dryness": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Nephrolithiasis": 1, "Neuritis": 1, "Neurological symptom": 1, "No adverse event": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral candidiasis": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal eruption": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Panic attack": 1, "Paralysis": 1, "Periarthritis": 1, "Pericarditis": 1, "Pharyngeal mass": 1, "Pharyngitis streptococcal": 1, "Photopsia": 1, "Pityriasis rosea": 1, "Pleural effusion": 1, "Pneumonitis": 1, "Pregnancy test positive": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Product administration error": 1, "Product physical issue": 1, "Product storage error": 1, "Pulmonary embolism": 1, "Pulse abnormal": 1, "Rash maculo-papular": 1, "Rash papular": 1, "Red blood cell sedimentation rate increased": 1, "Refusal of vaccination": 1, "Renal failure": 1, "Respiratory rate": 1, "Retching": 1, "Rheumatoid arthritis": 1, "Scratch": 1, "Secretion discharge": 1, "Sensitive skin": 1, "Sepsis": 1, "Sinus headache": 1, "Sitting disability": 1, "Skin abrasion": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin irritation": 1, "Skin swelling": 1, "Sleep disorder": 1, "Speech sound disorder": 1, "Spinal stenosis": 1, "Sunburn": 1, "Symptom recurrence": 1, "Taste disorder": 1, "Tearfulness": 1, "Tendonitis": 1, "Tension": 1, "Tension headache": 1, "Thinking abnormal": 1, "Throat irritation": 1, "Tooth abscess": 1, "Troponin": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen normal": 1, "Unevaluable event": 1, "Urine analysis abnormal": 1, "Vaccination site discharge": 1, "Vaccination site discolouration": 1, "Vaccination site haematoma": 1, "Vaccination site haemorrhage": 1, "Vaccination site infection": 1, "Vaccination site joint movement impairment": 1, "Vaccination site nodule": 1, "Vaccination site scab": 1, "Vaccination site scar": 1, "Vaginal disorder": 1, "Vaginal haemorrhage": 1, "Vein discolouration": 1, "Vertigo": 1, "Vitiligo": 1, "Vomiting projectile": 1, "Vulvovaginal pruritus": 1, "Vulvovaginal rash": 1, "Weight": 1, "White blood cell count": 1, "Wrong product administered": 1}, "batchcodes": ["011M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M20K.json b/docs/data/histograms/United States/011M20K.json
index 113f98b3134..469a5e1f6ff 100644
--- a/docs/data/histograms/United States/011M20K.json
+++ b/docs/data/histograms/United States/011M20K.json
@@ -1 +1 @@
-{"batchcode": "011M20K", "histograms": [{"batchcodes": ["011M20K"], "histogram": {"Retinal artery occlusion": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "011M20K", "histograms": [{"histogram": {"Retinal artery occlusion": 1, "Visual impairment": 1}, "batchcodes": ["011M20K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M210A.json b/docs/data/histograms/United States/011M210A.json
index 697bdd10b38..34bed8d3016 100644
--- a/docs/data/histograms/United States/011M210A.json
+++ b/docs/data/histograms/United States/011M210A.json
@@ -1 +1 @@
-{"batchcode": "011M210A", "histograms": [{"batchcodes": ["011M210A"], "histogram": {"Blood pressure abnormal": 1, "Body temperature": 1, "Dehydration": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate decreased": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "011M210A", "histograms": [{"histogram": {"Blood pressure abnormal": 1, "Body temperature": 1, "Dehydration": 1, "Fatigue": 1, "Heart rate": 1, "Heart rate decreased": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["011M210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M21A.json b/docs/data/histograms/United States/011M21A.json
index cff554ff34a..2c745f78fd9 100644
--- a/docs/data/histograms/United States/011M21A.json
+++ b/docs/data/histograms/United States/011M21A.json
@@ -1 +1 @@
-{"batchcode": "011M21A", "histograms": [{"batchcodes": ["011M21A"], "histogram": {"Accidental overdose": 2, "Pain in extremity": 2, "Pyrexia": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dysstasia": 1, "Erythema": 1, "Fatigue": 1, "Gait disturbance": 1, "Illness": 1, "Myalgia": 1, "Nausea": 1, "Pruritus": 1, "Tenderness": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "011M21A", "histograms": [{"histogram": {"Accidental overdose": 2, "Pain in extremity": 2, "Pyrexia": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dysstasia": 1, "Erythema": 1, "Fatigue": 1, "Gait disturbance": 1, "Illness": 1, "Myalgia": 1, "Nausea": 1, "Pruritus": 1, "Tenderness": 1, "Vaccination complication": 1}, "batchcodes": ["011M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M22A.json b/docs/data/histograms/United States/011M22A.json
index b32b54cbf25..e04b908e8da 100644
--- a/docs/data/histograms/United States/011M22A.json
+++ b/docs/data/histograms/United States/011M22A.json
@@ -1 +1 @@
-{"batchcode": "011M22A", "histograms": [{"batchcodes": ["011M22A"], "histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "011M22A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1, "Thrombosis": 1, "Vaccination site erythema": 1}, "batchcodes": ["011M22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M2DA.json b/docs/data/histograms/United States/011M2DA.json
index 13da9ed0902..f1744a5a02e 100644
--- a/docs/data/histograms/United States/011M2DA.json
+++ b/docs/data/histograms/United States/011M2DA.json
@@ -1 +1 @@
-{"batchcode": "011M2DA", "histograms": [{"batchcodes": ["011M2DA"], "histogram": {"Fatigue": 1, "Hypersomnia": 1, "Listless": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011M2DA", "histograms": [{"histogram": {"Fatigue": 1, "Hypersomnia": 1, "Listless": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["011M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M2EA.json b/docs/data/histograms/United States/011M2EA.json
index 09ef2443afd..87ec56a1293 100644
--- a/docs/data/histograms/United States/011M2EA.json
+++ b/docs/data/histograms/United States/011M2EA.json
@@ -1 +1 @@
-{"batchcode": "011M2EA", "histograms": [{"batchcodes": ["011M2EA"], "histogram": {"Arthritis": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Sinusitis": 1}}]}
\ No newline at end of file
+{"batchcode": "011M2EA", "histograms": [{"histogram": {"Arthritis": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Sinusitis": 1}, "batchcodes": ["011M2EA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011M2OA.json b/docs/data/histograms/United States/011M2OA.json
index 0016c561514..6183e9a5ed3 100644
--- a/docs/data/histograms/United States/011M2OA.json
+++ b/docs/data/histograms/United States/011M2OA.json
@@ -1 +1 @@
-{"batchcode": "011M2OA", "histograms": [{"batchcodes": ["011M2OA"], "histogram": {"Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "011M2OA", "histograms": [{"histogram": {"Incorrect dose administered": 1}, "batchcodes": ["011M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011ML(ORC)0A.json b/docs/data/histograms/United States/011ML(ORC)0A.json
index 51893334c64..fe19a362005 100644
--- a/docs/data/histograms/United States/011ML(ORC)0A.json
+++ b/docs/data/histograms/United States/011ML(ORC)0A.json
@@ -1 +1 @@
-{"batchcode": "011ML(ORC)0A", "histograms": [{"batchcodes": ["011ML(ORC)0A"], "histogram": {"Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011ML(ORC)0A", "histograms": [{"histogram": {"Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["011ML(ORC)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011MZ0A.json b/docs/data/histograms/United States/011MZ0A.json
index 864a35cf1ff..df2f70e328f 100644
--- a/docs/data/histograms/United States/011MZ0A.json
+++ b/docs/data/histograms/United States/011MZ0A.json
@@ -1 +1 @@
-{"batchcode": "011MZ0A", "histograms": [{"batchcodes": ["011MZ0A"], "histogram": {"Fatigue": 2, "Vaccination site pruritus": 2, "Amniocentesis": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Blood pressure increased": 1, "Diarrhoea": 1, "Dizziness": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate increased": 1, "Lymph node pain": 1, "Malaise": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Stress": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011MZ0A", "histograms": [{"histogram": {"Fatigue": 2, "Vaccination site pruritus": 2, "Amniocentesis": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Blood pressure increased": 1, "Diarrhoea": 1, "Dizziness": 1, "Erythema": 1, "Exposure during pregnancy": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate increased": 1, "Lymph node pain": 1, "Malaise": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Stress": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["011MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011MZVA.json b/docs/data/histograms/United States/011MZVA.json
index 53eec6398d1..764f5971d5a 100644
--- a/docs/data/histograms/United States/011MZVA.json
+++ b/docs/data/histograms/United States/011MZVA.json
@@ -1 +1 @@
-{"batchcode": "011MZVA", "histograms": [{"batchcodes": ["011MZVA"], "histogram": {"Abdominal pain upper": 1, "Cystitis": 1, "Discomfort": 1, "Nausea": 1, "Pain": 1, "Retching": 1}}]}
\ No newline at end of file
+{"batchcode": "011MZVA", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Cystitis": 1, "Discomfort": 1, "Nausea": 1, "Pain": 1, "Retching": 1}, "batchcodes": ["011MZVA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011N20A.json b/docs/data/histograms/United States/011N20A.json
index 867d58e9ba3..e76893032b2 100644
--- a/docs/data/histograms/United States/011N20A.json
+++ b/docs/data/histograms/United States/011N20A.json
@@ -1 +1 @@
-{"batchcode": "011N20A", "histograms": [{"batchcodes": ["011N20A"], "histogram": {"Chills": 2, "Pain in extremity": 2, "Pyrexia": 2}}]}
\ No newline at end of file
+{"batchcode": "011N20A", "histograms": [{"histogram": {"Chills": 2, "Pain in extremity": 2, "Pyrexia": 2}, "batchcodes": ["011N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011O21A.json b/docs/data/histograms/United States/011O21A.json
index 368ecf634bf..bf66f465347 100644
--- a/docs/data/histograms/United States/011O21A.json
+++ b/docs/data/histograms/United States/011O21A.json
@@ -1 +1 @@
-{"batchcode": "011O21A", "histograms": [{"batchcodes": ["011O21A"], "histogram": {"Cough": 2, "Dry throat": 2, "Asthenia": 1, "Chest pain": 1, "Decreased appetite": 1, "Facial paralysis": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pain in jaw": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "011O21A", "histograms": [{"histogram": {"Cough": 2, "Dry throat": 2, "Asthenia": 1, "Chest pain": 1, "Decreased appetite": 1, "Facial paralysis": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pain in jaw": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["011O21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011P21A.json b/docs/data/histograms/United States/011P21A.json
index 273acf5841b..e18ef9aa37c 100644
--- a/docs/data/histograms/United States/011P21A.json
+++ b/docs/data/histograms/United States/011P21A.json
@@ -1 +1 @@
-{"batchcode": "011P21A", "histograms": [{"batchcodes": ["011P21A"], "histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Pain in extremity": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "011P21A", "histograms": [{"histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Pain in extremity": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1}, "batchcodes": ["011P21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011QJ0A.json b/docs/data/histograms/United States/011QJ0A.json
index 14297ba3f88..3603e077d67 100644
--- a/docs/data/histograms/United States/011QJ0A.json
+++ b/docs/data/histograms/United States/011QJ0A.json
@@ -1 +1 @@
-{"batchcode": "011QJ0A", "histograms": [{"batchcodes": ["011QJ0A"], "histogram": {"Chills": 1, "Fatigue": 1, "Full blood count": 1, "Headache": 1, "Hepatic enzyme increased": 1, "Nausea": 1, "Pyrexia": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "011QJ0A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Full blood count": 1, "Headache": 1, "Hepatic enzyme increased": 1, "Nausea": 1, "Pyrexia": 1, "X-ray": 1}, "batchcodes": ["011QJ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011S20A.json b/docs/data/histograms/United States/011S20A.json
index 2e464e7f0bf..c0ac1b47ea0 100644
--- a/docs/data/histograms/United States/011S20A.json
+++ b/docs/data/histograms/United States/011S20A.json
@@ -1 +1 @@
-{"batchcode": "011S20A", "histograms": [{"batchcodes": ["011S20A"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "011S20A", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["011S20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011S20G.json b/docs/data/histograms/United States/011S20G.json
index 618046c765f..b1d08d74320 100644
--- a/docs/data/histograms/United States/011S20G.json
+++ b/docs/data/histograms/United States/011S20G.json
@@ -1 +1 @@
-{"batchcode": "011S20G", "histograms": [{"batchcodes": ["011S20G"], "histogram": {"Diverticulitis": 1}}]}
\ No newline at end of file
+{"batchcode": "011S20G", "histograms": [{"histogram": {"Diverticulitis": 1}, "batchcodes": ["011S20G"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011S211A.json b/docs/data/histograms/United States/011S211A.json
index fde543e00f6..ef30554a22e 100644
--- a/docs/data/histograms/United States/011S211A.json
+++ b/docs/data/histograms/United States/011S211A.json
@@ -1 +1 @@
-{"batchcode": "011S211A", "histograms": [{"batchcodes": ["011S211A"], "histogram": {"Diarrhoea": 1, "Myalgia": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "011S211A", "histograms": [{"histogram": {"Diarrhoea": 1, "Myalgia": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["011S211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011T20A.json b/docs/data/histograms/United States/011T20A.json
index cae144c5688..b3203574667 100644
--- a/docs/data/histograms/United States/011T20A.json
+++ b/docs/data/histograms/United States/011T20A.json
@@ -1 +1 @@
-{"batchcode": "011T20A", "histograms": [{"batchcodes": ["011T20A"], "histogram": {"Fatigue": 1, "Pain in extremity": 1, "Pruritus": 1, "Skin warm": 1, "Swelling": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "011T20A", "histograms": [{"histogram": {"Fatigue": 1, "Pain in extremity": 1, "Pruritus": 1, "Skin warm": 1, "Swelling": 1, "Vaccination site mass": 1}, "batchcodes": ["011T20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011V201A.json b/docs/data/histograms/United States/011V201A.json
index bae631b5a0d..38988ac13b6 100644
--- a/docs/data/histograms/United States/011V201A.json
+++ b/docs/data/histograms/United States/011V201A.json
@@ -1 +1 @@
-{"batchcode": "011V201A", "histograms": [{"batchcodes": ["011V201A"], "histogram": {"Chills": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011V201A", "histograms": [{"histogram": {"Chills": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["011V201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011V20A.json b/docs/data/histograms/United States/011V20A.json
index c59d2ef83d3..95290e6b629 100644
--- a/docs/data/histograms/United States/011V20A.json
+++ b/docs/data/histograms/United States/011V20A.json
@@ -1 +1 @@
-{"batchcode": "011V20A", "histograms": [{"batchcodes": ["011V20A"], "histogram": {"Cardiac stress test": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Erythema": 1, "Hypersensitivity": 1, "Peripheral swelling": 1, "Ultrasound Doppler": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "011V20A", "histograms": [{"histogram": {"Cardiac stress test": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Erythema": 1, "Hypersensitivity": 1, "Peripheral swelling": 1, "Ultrasound Doppler": 1, "Vaccination complication": 1}, "batchcodes": ["011V20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011Y20A.json b/docs/data/histograms/United States/011Y20A.json
index 528f2fb5e3f..b8b302890b5 100644
--- a/docs/data/histograms/United States/011Y20A.json
+++ b/docs/data/histograms/United States/011Y20A.json
@@ -1 +1 @@
-{"batchcode": "011Y20A", "histograms": [{"batchcodes": ["011Y20A"], "histogram": {"Erythema": 1, "Lymphoedema": 1, "Swelling": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "011Y20A", "histograms": [{"histogram": {"Erythema": 1, "Lymphoedema": 1, "Swelling": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["011Y20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/011ZLOA.json b/docs/data/histograms/United States/011ZLOA.json
index cf4297bb8c5..6530f66e746 100644
--- a/docs/data/histograms/United States/011ZLOA.json
+++ b/docs/data/histograms/United States/011ZLOA.json
@@ -1 +1 @@
-{"batchcode": "011ZLOA", "histograms": [{"batchcodes": ["011ZLOA"], "histogram": {"Vaccination site pain": 2, "Incorrect route of product administration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "011ZLOA", "histograms": [{"histogram": {"Vaccination site pain": 2, "Incorrect route of product administration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["011ZLOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012(M OR H)20A.json b/docs/data/histograms/United States/012(M OR H)20A.json
index cc362ad9b0b..7a2697e6789 100644
--- a/docs/data/histograms/United States/012(M OR H)20A.json
+++ b/docs/data/histograms/United States/012(M OR H)20A.json
@@ -1 +1 @@
-{"batchcode": "012(M OR H)20A", "histograms": [{"batchcodes": ["012(M OR H)20A"], "histogram": {"Device leakage": 1, "Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "012(M OR H)20A", "histograms": [{"histogram": {"Device leakage": 1, "Incorrect dose administered": 1}, "batchcodes": ["012(M OR H)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012.M00M.json b/docs/data/histograms/United States/012.M00M.json
index 5c1c03d9ed1..492a9f42d4c 100644
--- a/docs/data/histograms/United States/012.M00M.json
+++ b/docs/data/histograms/United States/012.M00M.json
@@ -1 +1 @@
-{"batchcode": "012.M00M", "histograms": [{"batchcodes": ["012.M00M"], "histogram": {"Erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site vesicles": 1}}]}
\ No newline at end of file
+{"batchcode": "012.M00M", "histograms": [{"histogram": {"Erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site vesicles": 1}, "batchcodes": ["012.M00M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012020A.json b/docs/data/histograms/United States/012020A.json
index bf7d1be2fef..7b7eb03970f 100644
--- a/docs/data/histograms/United States/012020A.json
+++ b/docs/data/histograms/United States/012020A.json
@@ -1 +1 @@
-{"batchcode": "012020A", "histograms": [{"batchcodes": ["012020A"], "histogram": {"Expired product administered": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012020A", "histograms": [{"histogram": {"Expired product administered": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["012020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121.20A.json b/docs/data/histograms/United States/0121.20A.json
index 7fd25fcd466..2cc92e9250d 100644
--- a/docs/data/histograms/United States/0121.20A.json
+++ b/docs/data/histograms/United States/0121.20A.json
@@ -1 +1 @@
-{"batchcode": "0121.20A", "histograms": [{"batchcodes": ["0121.20A"], "histogram": {"Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0121.20A", "histograms": [{"histogram": {"Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["0121.20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121120.json b/docs/data/histograms/United States/0121120.json
index 6af3f3d9eb4..69dce7d8bcd 100644
--- a/docs/data/histograms/United States/0121120.json
+++ b/docs/data/histograms/United States/0121120.json
@@ -1 +1 @@
-{"batchcode": "0121120", "histograms": [{"batchcodes": ["0121120"], "histogram": {"Fatigue": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0121120", "histograms": [{"histogram": {"Fatigue": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site swelling": 1}, "batchcodes": ["0121120"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121120A.json b/docs/data/histograms/United States/0121120A.json
index 8eea1fe9aaf..e0817ba3228 100644
--- a/docs/data/histograms/United States/0121120A.json
+++ b/docs/data/histograms/United States/0121120A.json
@@ -1 +1 @@
-{"batchcode": "0121120A", "histograms": [{"batchcodes": ["0121120A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0121120A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["0121120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012120.json b/docs/data/histograms/United States/012120.json
index be7f2bf4043..e9bf48fee2b 100644
--- a/docs/data/histograms/United States/012120.json
+++ b/docs/data/histograms/United States/012120.json
@@ -1 +1 @@
-{"batchcode": "012120", "histograms": [{"batchcodes": ["012120"], "histogram": {"Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012120", "histograms": [{"histogram": {"Nausea": 1, "Vomiting": 1}, "batchcodes": ["012120"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121204.json b/docs/data/histograms/United States/0121204.json
index 0a687769089..83f7e046af4 100644
--- a/docs/data/histograms/United States/0121204.json
+++ b/docs/data/histograms/United States/0121204.json
@@ -1 +1 @@
-{"batchcode": "0121204", "histograms": [{"batchcodes": ["0121204"], "histogram": {"Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "0121204", "histograms": [{"histogram": {"Pruritus": 1}, "batchcodes": ["0121204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121209.json b/docs/data/histograms/United States/0121209.json
index 506ead6815e..bea7fc7ba21 100644
--- a/docs/data/histograms/United States/0121209.json
+++ b/docs/data/histograms/United States/0121209.json
@@ -1 +1 @@
-{"batchcode": "0121209", "histograms": [{"batchcodes": ["0121209"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0121209", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site warmth": 1}, "batchcodes": ["0121209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012120A.json b/docs/data/histograms/United States/012120A.json
index 86e3cd7c0c3..77c37bc79e7 100644
--- a/docs/data/histograms/United States/012120A.json
+++ b/docs/data/histograms/United States/012120A.json
@@ -1 +1 @@
-{"batchcode": "012120A", "histograms": [{"batchcodes": ["012120A"], "histogram": {"Chills": 6, "Pyrexia": 5, "Headache": 3, "Pain in extremity": 3, "Rash": 3, "Vaccination site pain": 3, "Abdominal pain upper": 2, "Diarrhoea": 2, "Erythema": 2, "Fatigue": 2, "Injection site erythema": 2, "Myalgia": 2, "Nausea": 2, "Pain": 2, "Pruritus": 2, "SARS-CoV-2 test positive": 2, "Vaccination site erythema": 2, "Vaccination site rash": 2, "Arthralgia": 1, "Back pain": 1, "Balance disorder": 1, "Blister": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Cough": 1, "Dizziness postural": 1, "Dyspnoea": 1, "Eye irritation": 1, "Feeling cold": 1, "Illness": 1, "Influenza like illness": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Lacrimation increased": 1, "Lethargy": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Nocturia": 1, "Oxygen saturation decreased": 1, "Peripheral swelling": 1, "Rash macular": 1, "SARS-CoV-2 test negative": 1, "Shoulder injury related to vaccine administration": 1, "Skin reaction": 1, "Somnolence": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site oedema": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012120A", "histograms": [{"histogram": {"Chills": 6, "Pyrexia": 5, "Headache": 3, "Pain in extremity": 3, "Rash": 3, "Vaccination site pain": 3, "Abdominal pain upper": 2, "Diarrhoea": 2, "Erythema": 2, "Fatigue": 2, "Injection site erythema": 2, "Myalgia": 2, "Nausea": 2, "Pain": 2, "Pruritus": 2, "SARS-CoV-2 test positive": 2, "Vaccination site erythema": 2, "Vaccination site rash": 2, "Arthralgia": 1, "Back pain": 1, "Balance disorder": 1, "Blister": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Cough": 1, "Dizziness postural": 1, "Dyspnoea": 1, "Eye irritation": 1, "Feeling cold": 1, "Illness": 1, "Influenza like illness": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Lacrimation increased": 1, "Lethargy": 1, "Lymphadenopathy": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Nocturia": 1, "Oxygen saturation decreased": 1, "Peripheral swelling": 1, "Rash macular": 1, "SARS-CoV-2 test negative": 1, "Shoulder injury related to vaccine administration": 1, "Skin reaction": 1, "Somnolence": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site oedema": 1, "Vomiting": 1}, "batchcodes": ["012120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121220A.json b/docs/data/histograms/United States/0121220A.json
index ec2095172b9..507307b85ed 100644
--- a/docs/data/histograms/United States/0121220A.json
+++ b/docs/data/histograms/United States/0121220A.json
@@ -1 +1 @@
-{"batchcode": "0121220A", "histograms": [{"batchcodes": ["0121220A"], "histogram": {"Chills": 1, "Cough": 1, "Dizziness": 1, "Illness": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Syncope": 1, "Urticaria": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "0121220A", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Dizziness": 1, "Illness": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Syncope": 1, "Urticaria": 1, "Vaccination site erythema": 1}, "batchcodes": ["0121220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121A0A/ 012NE0.json b/docs/data/histograms/United States/0121A0A/ 012NE0.json
index 180e5868c11..a0ceaff8f10 100644
--- a/docs/data/histograms/United States/0121A0A/ 012NE0.json
+++ b/docs/data/histograms/United States/0121A0A/ 012NE0.json
@@ -1 +1 @@
-{"batchcode": "0121A0A/ 012NE0", "histograms": [{"batchcodes": ["0121A0A/ 012NE0"], "histogram": {"Erythema": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash papular": 1}}]}
\ No newline at end of file
+{"batchcode": "0121A0A/ 012NE0", "histograms": [{"histogram": {"Erythema": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash papular": 1}, "batchcodes": ["0121A0A/ 012NE0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121A21A.json b/docs/data/histograms/United States/0121A21A.json
index 51b7495a6dc..25b5d57dafb 100644
--- a/docs/data/histograms/United States/0121A21A.json
+++ b/docs/data/histograms/United States/0121A21A.json
@@ -1 +1 @@
-{"batchcode": "0121A21A", "histograms": [{"batchcodes": ["0121A21A"], "histogram": {"Rash": 1, "Scab": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0121A21A", "histograms": [{"histogram": {"Rash": 1, "Scab": 1, "Urticaria": 1}, "batchcodes": ["0121A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121L20A.json b/docs/data/histograms/United States/0121L20A.json
index bab551bd579..325cb3a2e4e 100644
--- a/docs/data/histograms/United States/0121L20A.json
+++ b/docs/data/histograms/United States/0121L20A.json
@@ -1 +1 @@
-{"batchcode": "0121L20A", "histograms": [{"batchcodes": ["0121L20A"], "histogram": {"Burning sensation": 2, "Feeling hot": 2, "Hypokinesia": 2, "Pain": 2, "Peripheral swelling": 2, "Pruritus": 2, "Body temperature": 1, "Chills": 1, "Pyrexia": 1, "Rash erythematous": 1, "Temperature intolerance": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0121L20A", "histograms": [{"histogram": {"Burning sensation": 2, "Feeling hot": 2, "Hypokinesia": 2, "Pain": 2, "Peripheral swelling": 2, "Pruritus": 2, "Body temperature": 1, "Chills": 1, "Pyrexia": 1, "Rash erythematous": 1, "Temperature intolerance": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0121L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0121M20A.json b/docs/data/histograms/United States/0121M20A.json
index 33ca6e58139..a5b25a5aca8 100644
--- a/docs/data/histograms/United States/0121M20A.json
+++ b/docs/data/histograms/United States/0121M20A.json
@@ -1 +1 @@
-{"batchcode": "0121M20A", "histograms": [{"batchcodes": ["0121M20A"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0121M20A", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["0121M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012220A.json b/docs/data/histograms/United States/012220A.json
index 4b34355e157..fc0625f85af 100644
--- a/docs/data/histograms/United States/012220A.json
+++ b/docs/data/histograms/United States/012220A.json
@@ -1 +1 @@
-{"batchcode": "012220A", "histograms": [{"batchcodes": ["012220A"], "histogram": {"Pain": 4, "Fatigue": 2, "Illness": 2, "Acne": 1, "Asthenia": 1, "Bedridden": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Heart rate increased": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Malaise": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Rash": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "012220A", "histograms": [{"histogram": {"Pain": 4, "Fatigue": 2, "Illness": 2, "Acne": 1, "Asthenia": 1, "Bedridden": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Cough": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Erythema": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Heart rate increased": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Malaise": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Rash": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1}, "batchcodes": ["012220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012420A.json b/docs/data/histograms/United States/012420A.json
index a89cb7bd43d..fef053bbaa6 100644
--- a/docs/data/histograms/United States/012420A.json
+++ b/docs/data/histograms/United States/012420A.json
@@ -1 +1 @@
-{"batchcode": "012420A", "histograms": [{"batchcodes": ["012420A"], "histogram": {"Headache": 2, "Antibody test": 1, "Anxiety": 1, "Back pain": 1, "Breast pain": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Limb discomfort": 1, "Migraine": 1, "Nasopharyngitis": 1, "Nausea": 1, "Panic disorder": 1, "Pyrexia": 1, "Urticaria": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012420A", "histograms": [{"histogram": {"Headache": 2, "Antibody test": 1, "Anxiety": 1, "Back pain": 1, "Breast pain": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Discomfort": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Limb discomfort": 1, "Migraine": 1, "Nasopharyngitis": 1, "Nausea": 1, "Panic disorder": 1, "Pyrexia": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["012420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012421A.json b/docs/data/histograms/United States/012421A.json
index 649b2afcc04..33f7c29d712 100644
--- a/docs/data/histograms/United States/012421A.json
+++ b/docs/data/histograms/United States/012421A.json
@@ -1 +1 @@
-{"batchcode": "012421A", "histograms": [{"batchcodes": ["012421A"], "histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "012421A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["012421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0125L20A.json b/docs/data/histograms/United States/0125L20A.json
index c014f8e46af..da2fdbb7e50 100644
--- a/docs/data/histograms/United States/0125L20A.json
+++ b/docs/data/histograms/United States/0125L20A.json
@@ -1 +1 @@
-{"batchcode": "0125L20A", "histograms": [{"batchcodes": ["0125L20A"], "histogram": {"Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "0125L20A", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1}, "batchcodes": ["0125L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0126020A.json b/docs/data/histograms/United States/0126020A.json
index 376857ca4e5..741bbbc4797 100644
--- a/docs/data/histograms/United States/0126020A.json
+++ b/docs/data/histograms/United States/0126020A.json
@@ -1 +1 @@
-{"batchcode": "0126020A", "histograms": [{"batchcodes": ["0126020A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0126020A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}, "batchcodes": ["0126020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0126201A.json b/docs/data/histograms/United States/0126201A.json
index 72f4c1bec9b..9f4be49444b 100644
--- a/docs/data/histograms/United States/0126201A.json
+++ b/docs/data/histograms/United States/0126201A.json
@@ -1 +1 @@
-{"batchcode": "0126201A", "histograms": [{"batchcodes": ["0126201A"], "histogram": {"Diarrhoea": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Palmar erythema": 1, "Paraesthesia": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "0126201A", "histograms": [{"histogram": {"Diarrhoea": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Palmar erythema": 1, "Paraesthesia": 1, "Presyncope": 1}, "batchcodes": ["0126201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012620A.json b/docs/data/histograms/United States/012620A.json
index 29cf541ae3b..3fff24c7296 100644
--- a/docs/data/histograms/United States/012620A.json
+++ b/docs/data/histograms/United States/012620A.json
@@ -1 +1 @@
-{"batchcode": "012620A", "histograms": [{"batchcodes": ["012620A"], "histogram": {"Chills": 5, "Fatigue": 4, "Pain in extremity": 4, "Pyrexia": 4, "Vaccination site swelling": 4, "Headache": 3, "Nausea": 3, "Vaccination site erythema": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Myalgia": 2, "Vaccination site pruritus": 2, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Decreased appetite": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Hypertension": 1, "Injection site erythema": 1, "Injection site pain": 1, "Migraine": 1, "Ocular discomfort": 1, "Peripheral swelling": 1, "Photophobia": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Swelling": 1, "Vaccination site discomfort": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012620A", "histograms": [{"histogram": {"Chills": 5, "Fatigue": 4, "Pain in extremity": 4, "Pyrexia": 4, "Vaccination site swelling": 4, "Headache": 3, "Nausea": 3, "Vaccination site erythema": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Myalgia": 2, "Vaccination site pruritus": 2, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19": 1, "Decreased appetite": 1, "Dermatitis": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Hypertension": 1, "Injection site erythema": 1, "Injection site pain": 1, "Migraine": 1, "Ocular discomfort": 1, "Peripheral swelling": 1, "Photophobia": 1, "SARS-CoV-2 test": 1, "Somnolence": 1, "Swelling": 1, "Vaccination site discomfort": 1, "Vaccination site warmth": 1}, "batchcodes": ["012620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012629A.json b/docs/data/histograms/United States/012629A.json
index ef2e046cd79..fd3e741f049 100644
--- a/docs/data/histograms/United States/012629A.json
+++ b/docs/data/histograms/United States/012629A.json
@@ -1 +1 @@
-{"batchcode": "012629A", "histograms": [{"batchcodes": ["012629A"], "histogram": {"Pruritus": 1, "Rash maculo-papular": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012629A", "histograms": [{"histogram": {"Pruritus": 1, "Rash maculo-papular": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["012629A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01262CA.json b/docs/data/histograms/United States/01262CA.json
index 673572fc1b8..2de3d1128f4 100644
--- a/docs/data/histograms/United States/01262CA.json
+++ b/docs/data/histograms/United States/01262CA.json
@@ -1 +1 @@
-{"batchcode": "01262CA", "histograms": [{"batchcodes": ["01262CA"], "histogram": {"Rash": 1, "Rash pruritic": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "01262CA", "histograms": [{"histogram": {"Rash": 1, "Rash pruritic": 1, "Swelling": 1}, "batchcodes": ["01262CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0126ZOA.json b/docs/data/histograms/United States/0126ZOA.json
index 553d4b9d1b9..367b199068e 100644
--- a/docs/data/histograms/United States/0126ZOA.json
+++ b/docs/data/histograms/United States/0126ZOA.json
@@ -1 +1 @@
-{"batchcode": "0126ZOA", "histograms": [{"batchcodes": ["0126ZOA"], "histogram": {"Injection site reaction": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Pyrexia": 1, "Trismus": 1}}]}
\ No newline at end of file
+{"batchcode": "0126ZOA", "histograms": [{"histogram": {"Injection site reaction": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Pyrexia": 1, "Trismus": 1}, "batchcodes": ["0126ZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0127A21A.json b/docs/data/histograms/United States/0127A21A.json
index ada70066964..d375e31537e 100644
--- a/docs/data/histograms/United States/0127A21A.json
+++ b/docs/data/histograms/United States/0127A21A.json
@@ -1 +1 @@
-{"batchcode": "0127A21A", "histograms": [{"batchcodes": ["0127A21A"], "histogram": {"Incorrect route of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "0127A21A", "histograms": [{"histogram": {"Incorrect route of product administration": 1}, "batchcodes": ["0127A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0128AZIA.json b/docs/data/histograms/United States/0128AZIA.json
index 54450309e7c..01a7fe094a1 100644
--- a/docs/data/histograms/United States/0128AZIA.json
+++ b/docs/data/histograms/United States/0128AZIA.json
@@ -1 +1 @@
-{"batchcode": "0128AZIA", "histograms": [{"batchcodes": ["0128AZIA"], "histogram": {"Arthralgia": 2, "Joint swelling": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0128AZIA", "histograms": [{"histogram": {"Arthralgia": 2, "Joint swelling": 1, "Swelling": 1}, "batchcodes": ["0128AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0128L20A.json b/docs/data/histograms/United States/0128L20A.json
index 0eb5d3d6000..7ee79dd1652 100644
--- a/docs/data/histograms/United States/0128L20A.json
+++ b/docs/data/histograms/United States/0128L20A.json
@@ -1 +1 @@
-{"batchcode": "0128L20A", "histograms": [{"batchcodes": ["0128L20A"], "histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1}}]}
\ No newline at end of file
+{"batchcode": "0128L20A", "histograms": [{"histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1}, "batchcodes": ["0128L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A.json b/docs/data/histograms/United States/012A.json
index b7c1b3c8e02..a893d8661bc 100644
--- a/docs/data/histograms/United States/012A.json
+++ b/docs/data/histograms/United States/012A.json
@@ -1 +1 @@
-{"batchcode": "012A", "histograms": [{"batchcodes": ["012A"], "histogram": {"SARS-CoV-2 test": 3, "COVID-19 pneumonia": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Pain": 2, "Pyrexia": 2, "Weight decreased": 2, "Ageusia": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Myalgia": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "012A", "histograms": [{"histogram": {"SARS-CoV-2 test": 3, "COVID-19 pneumonia": 2, "Chest X-ray": 2, "Computerised tomogram": 2, "Pain": 2, "Pyrexia": 2, "Weight decreased": 2, "Ageusia": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Myalgia": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["012A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A01A.json b/docs/data/histograms/United States/012A01A.json
index 101efd3e439..b4ddb0b4344 100644
--- a/docs/data/histograms/United States/012A01A.json
+++ b/docs/data/histograms/United States/012A01A.json
@@ -1 +1 @@
-{"batchcode": "012A01A", "histograms": [{"batchcodes": ["012A01A"], "histogram": {"Injection site pruritus": 1, "Vaccination site bruising": 1, "Vaccination site discomfort": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "012A01A", "histograms": [{"histogram": {"Injection site pruritus": 1, "Vaccination site bruising": 1, "Vaccination site discomfort": 1, "Vaccination site mass": 1}, "batchcodes": ["012A01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A2-A.json b/docs/data/histograms/United States/012A2-A.json
index 237b4bcf0d3..e4b6b4e84b2 100644
--- a/docs/data/histograms/United States/012A2-A.json
+++ b/docs/data/histograms/United States/012A2-A.json
@@ -1 +1 @@
-{"batchcode": "012A2-A", "histograms": [{"batchcodes": ["012A2-A"], "histogram": {"Pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "012A2-A", "histograms": [{"histogram": {"Pregnancy": 1}, "batchcodes": ["012A2-A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A20A.json b/docs/data/histograms/United States/012A20A.json
index df93d7d73b4..9b7e07f261c 100644
--- a/docs/data/histograms/United States/012A20A.json
+++ b/docs/data/histograms/United States/012A20A.json
@@ -1 +1 @@
-{"batchcode": "012A20A", "histograms": [{"batchcodes": ["012A20A"], "histogram": {"Asthenia": 2, "Burning sensation": 2, "Dizziness": 2, "Erythema": 2, "Pain in extremity": 2, "Pruritus": 2, "Rash": 2, "Dry skin": 1, "Facial pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Lip dry": 1, "Loss of personal independence in daily activities": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin lesion": 1, "Staphylococcus test": 1}}]}
\ No newline at end of file
+{"batchcode": "012A20A", "histograms": [{"histogram": {"Asthenia": 2, "Burning sensation": 2, "Dizziness": 2, "Erythema": 2, "Pain in extremity": 2, "Pruritus": 2, "Rash": 2, "Dry skin": 1, "Facial pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Lip dry": 1, "Loss of personal independence in daily activities": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin lesion": 1, "Staphylococcus test": 1}, "batchcodes": ["012A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A21.json b/docs/data/histograms/United States/012A21.json
index fe6bd5fdcc0..30498e498c4 100644
--- a/docs/data/histograms/United States/012A21.json
+++ b/docs/data/histograms/United States/012A21.json
@@ -1 +1 @@
-{"batchcode": "012A21", "histograms": [{"batchcodes": ["012A21"], "histogram": {"COVID-19": 2, "Drug ineffective": 2, "Vaccination site swelling": 2, "Asthenia": 1, "Body temperature": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Injection site pruritus": 1, "Joint stiffness": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012A21", "histograms": [{"histogram": {"COVID-19": 2, "Drug ineffective": 2, "Vaccination site swelling": 2, "Asthenia": 1, "Body temperature": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Hypersensitivity": 1, "Hypersomnia": 1, "Injection site pruritus": 1, "Joint stiffness": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["012A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A211A.json b/docs/data/histograms/United States/012A211A.json
index 9ca196f9450..4fed5a1ba1b 100644
--- a/docs/data/histograms/United States/012A211A.json
+++ b/docs/data/histograms/United States/012A211A.json
@@ -1 +1 @@
-{"batchcode": "012A211A", "histograms": [{"batchcodes": ["012A211A"], "histogram": {"Exposure during pregnancy": 1, "Glucose tolerance test": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "012A211A", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "Glucose tolerance test": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["012A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A214.json b/docs/data/histograms/United States/012A214.json
index 8821cb2fccf..64a32e8f4ad 100644
--- a/docs/data/histograms/United States/012A214.json
+++ b/docs/data/histograms/United States/012A214.json
@@ -1 +1 @@
-{"batchcode": "012A214", "histograms": [{"batchcodes": ["012A214"], "histogram": {"Insomnia": 1, "Oral mucosal erythema": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012A214", "histograms": [{"histogram": {"Insomnia": 1, "Oral mucosal erythema": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["012A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A21A.json b/docs/data/histograms/United States/012A21A.json
index bf1f1b5a464..a3ad80af801 100644
--- a/docs/data/histograms/United States/012A21A.json
+++ b/docs/data/histograms/United States/012A21A.json
@@ -1 +1 @@
-{"batchcode": "012A21A", "histograms": [{"batchcodes": ["012A21A"], "histogram": {"Pyrexia": 103, "Headache": 94, "Fatigue": 82, "Chills": 80, "Pain in extremity": 71, "Myalgia": 62, "Nausea": 54, "Vaccination site pain": 52, "Pain": 49, "Dizziness": 40, "Pruritus": 32, "Vaccination site erythema": 32, "Body temperature": 28, "Rash": 28, "Arthralgia": 27, "Feeling abnormal": 25, "Vaccination site pruritus": 25, "Dyspnoea": 24, "Erythema": 24, "Vaccination site swelling": 22, "Diarrhoea": 21, "Asthenia": 20, "Vaccination site warmth": 18, "Vaccination site rash": 17, "Vomiting": 17, "Malaise": 16, "SARS-CoV-2 test": 16, "Urticaria": 16, "Inappropriate schedule of product administration": 15, "Maternal exposure during pregnancy": 15, "Paraesthesia": 15, "Peripheral swelling": 15, "Hypoaesthesia": 14, "Illness": 14, "Cough": 13, "Somnolence": 13, "Vaccination complication": 13, "COVID-19": 12, "Pregnancy test": 12, "Rash pruritic": 12, "Injection site pain": 11, "Insomnia": 11, "Product dose omission issue": 11, "Swelling": 11, "Abdominal pain upper": 10, "Blood pressure measurement": 10, "Hypertension": 10, "Influenza like illness": 10, "Lymphadenopathy": 10, "Vertigo": 10, "Exposure during pregnancy": 9, "Fall": 9, "Feeling hot": 9, "Hyperhidrosis": 9, "Injection site erythema": 8, "Joint swelling": 8, "Vaccination site induration": 8, "Cerebrovascular accident": 7, "Heart rate increased": 7, "Limb discomfort": 7, "Loss of consciousness": 7, "Night sweats": 7, "Tinnitus": 7, "Vaccination site mass": 7, "Abdominal pain": 6, "Back pain": 6, "Balance disorder": 6, "Chest discomfort": 6, "Decreased appetite": 6, "Ear pain": 6, "Expired product administered": 6, "Gait disturbance": 6, "Herpes zoster": 6, "Hypersensitivity": 6, "Migraine": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Neck pain": 6, "Oropharyngeal pain": 6, "Palpitations": 6, "Swelling face": 6, "Tremor": 6, "Vaccination site reaction": 6, "Abdominal discomfort": 5, "Arthritis": 5, "Blood pressure increased": 5, "Bone pain": 5, "Chest pain": 5, "Dysgeusia": 5, "Influenza": 5, "Injection site swelling": 5, "Magnetic resonance imaging": 5, "Oral herpes": 5, "Throat irritation": 5, "Ageusia": 4, "Anxiety": 4, "Blister": 4, "Blood glucose": 4, "Computerised tomogram": 4, "Confusional state": 4, "Dysstasia": 4, "Hypersomnia": 4, "Injection site rash": 4, "Musculoskeletal stiffness": 4, "Paraesthesia oral": 4, "Rash erythematous": 4, "Syncope": 4, "Toothache": 4, "Ultrasound scan": 4, "Amnesia": 3, "Aphonia": 3, "Axillary pain": 3, "Constipation": 3, "Discomfort": 3, "Drug ineffective": 3, "Electrocardiogram": 3, "Extra dose administered": 3, "Eye pain": 3, "Feeling jittery": 3, "Feeling of body temperature change": 3, "Gait inability": 3, "Heart rate": 3, "Hypoaesthesia oral": 3, "Hypokinesia": 3, "Immunisation reaction": 3, "Injection site pruritus": 3, "Loss of personal independence in daily activities": 3, "Memory impairment": 3, "Nasopharyngitis": 3, "Nervousness": 3, "Off label use": 3, "Platelet count": 3, "Product administered to patient of inappropriate age": 3, "Product storage error": 3, "Rhinorrhoea": 3, "Sleep disorder": 3, "Tenderness": 3, "Ultrasound foetal": 3, "Vaccination site bruising": 3, "Vaccination site urticaria": 3, "Vision blurred": 3, "Abdominal distension": 2, "Adverse reaction": 2, "Anosmia": 2, "Atrial fibrillation": 2, "Bedridden": 2, "Bell's palsy": 2, "Blindness": 2, "Blood glucose increased": 2, "Breast pain": 2, "Breast swelling": 2, "Burning sensation": 2, "Chest X-ray": 2, "Costochondritis": 2, "Dehydration": 2, "Dental discomfort": 2, "Depression": 2, "Dyskinesia": 2, "Dyspepsia": 2, "Dysphagia": 2, "Epistaxis": 2, "Facial paralysis": 2, "Gingival bleeding": 2, "Haemoglobin": 2, "Hot flush": 2, "Injection site urticaria": 2, "Intentional product use issue": 2, "Lethargy": 2, "Menstrual disorder": 2, "Mouth ulceration": 2, "Muscle spasms": 2, "Musculoskeletal discomfort": 2, "Oral disorder": 2, "Oral pain": 2, "Oropharyngeal discomfort": 2, "Pain in jaw": 2, "Paranasal sinus discomfort": 2, "Parosmia": 2, "Pharyngeal swelling": 2, "Photophobia": 2, "Photopsia": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Sensitive skin": 2, "Sneezing": 2, "Speech disorder": 2, "Stomatitis": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Thirst": 2, "Thrombosis": 2, "Transient ischaemic attack": 2, "Urinary incontinence": 2, "Urinary tract infection": 2, "Vaccination site discolouration": 2, "Vaccination site movement impairment": 2, "Vaccination site papule": 2, "X-ray": 2, "Abdominal pain lower": 1, "Abdominal rigidity": 1, "Abnormal dreams": 1, "Accidental overdose": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Allergy to vaccine": 1, "Anaemia": 1, "Anger": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Aphthous ulcer": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Ataxia": 1, "Atypical pneumonia": 1, "Back injury": 1, "Bacterial gingivitis": 1, "Basal cell carcinoma": 1, "Biliary obstruction": 1, "Biopsy": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood blister": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood count": 1, "Blood creatinine": 1, "Blood glucose fluctuation": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature abnormal": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Breast cyst": 1, "Breast discomfort": 1, "Breast mass": 1, "Breast tenderness": 1, "Breath odour": 1, "Bronchospasm": 1, "Carbon dioxide": 1, "Chest injury": 1, "Cholelithiasis": 1, "Chronic obstructive pulmonary disease": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Coma": 1, "Computerised tomogram thorax": 1, "Concussion": 1, "Condition aggravated": 1, "Contusion": 1, "Cyst": 1, "Depressed mood": 1, "Device connection issue": 1, "Diabetes mellitus inadequate control": 1, "Diplopia": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drooling": 1, "Drug interaction": 1, "Dry eye": 1, "Dry throat": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Ear discomfort": 1, "Eating disorder": 1, "Echocardiogram": 1, "Endoscopy": 1, "Energy increased": 1, "Eructation": 1, "Exposure via breast milk": 1, "Eye inflammation": 1, "Eye pruritus": 1, "Eyelid irritation": 1, "Eyelid pain": 1, "Facial discomfort": 1, "Fallot's tetralogy": 1, "Fear": 1, "Feeding disorder": 1, "Feeding tube user": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Flatulence": 1, "Foetal growth restriction": 1, "Full blood count": 1, "Gastric disorder": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Glucose tolerance test": 1, "Glucose tolerance test normal": 1, "Haematocrit": 1, "Haemorrhage": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Herpes zoster oticus": 1, "Hypogeusia": 1, "Hypotension": 1, "Hypoxia": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Inappropriate affect": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Inflammatory marker test": 1, "Injection site mass": 1, "Injection site warmth": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Joint injury": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Knee deformity": 1, "Knee operation": 1, "Lacrimation increased": 1, "Leukaemia": 1, "Leukocytosis": 1, "Lip pain": 1, "Lip swelling": 1, "Lip ulceration": 1, "Livedo reticularis": 1, "Localised infection": 1, "Lung hyperinflation": 1, "Lymph node pain": 1, "Mammogram": 1, "Maternal exposure during breast feeding": 1, "Menopause": 1, "Motion sickness": 1, "Movement disorder": 1, "Mucosal discolouration": 1, "Muscle fatigue": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal disorder": 1, "Nasal congestion": 1, "Near death experience": 1, "Nephrolithiasis": 1, "Nerve injury": 1, "Neuralgia": 1, "Neurological symptom": 1, "No adverse event": 1, "Ocular discomfort": 1, "Oral discomfort": 1, "Orthostatic hypotension": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pelvic pain": 1, "Peripheral coldness": 1, "Petechiae": 1, "Pharyngitis": 1, "Pigmentation disorder": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonitis": 1, "Pollakiuria": 1, "Polydipsia": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Post procedural discharge": 1, "Posture abnormal": 1, "Product dose omission in error": 1, "Product physical issue": 1, "Productive cough": 1, "Protein total": 1, "Rash macular": 1, "Respiration abnormal": 1, "Respiratory rate decreased": 1, "Retinal haemorrhage": 1, "Rheumatoid arthritis": 1, "Rhinitis": 1, "Rhinitis allergic": 1, "SARS-CoV-2 test negative": 1, "Salivary hypersecretion": 1, "Scab": 1, "Sensory loss": 1, "Sepsis": 1, "Skeletal injury": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin disorder": 1, "Skin warm": 1, "Sluggishness": 1, "Sunburn": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Thyroid disorder": 1, "Tongue coated": 1, "Tongue ulceration": 1, "Tooth disorder": 1, "Tooth infection": 1, "Trisomy 22": 1, "Troponin I": 1, "Ultrasound Doppler": 1, "Underdose": 1, "Uveitis": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Visual impairment": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong patient received product": 1}}]}
\ No newline at end of file
+{"batchcode": "012A21A", "histograms": [{"histogram": {"Pyrexia": 103, "Headache": 94, "Fatigue": 82, "Chills": 80, "Pain in extremity": 71, "Myalgia": 62, "Nausea": 54, "Vaccination site pain": 52, "Pain": 49, "Dizziness": 40, "Pruritus": 32, "Vaccination site erythema": 32, "Body temperature": 28, "Rash": 28, "Arthralgia": 27, "Feeling abnormal": 25, "Vaccination site pruritus": 25, "Dyspnoea": 24, "Erythema": 24, "Vaccination site swelling": 22, "Diarrhoea": 21, "Asthenia": 20, "Vaccination site warmth": 18, "Vaccination site rash": 17, "Vomiting": 17, "Malaise": 16, "SARS-CoV-2 test": 16, "Urticaria": 16, "Inappropriate schedule of product administration": 15, "Maternal exposure during pregnancy": 15, "Paraesthesia": 15, "Peripheral swelling": 15, "Hypoaesthesia": 14, "Illness": 14, "Cough": 13, "Somnolence": 13, "Vaccination complication": 13, "COVID-19": 12, "Pregnancy test": 12, "Rash pruritic": 12, "Injection site pain": 11, "Insomnia": 11, "Product dose omission issue": 11, "Swelling": 11, "Abdominal pain upper": 10, "Blood pressure measurement": 10, "Hypertension": 10, "Influenza like illness": 10, "Lymphadenopathy": 10, "Vertigo": 10, "Exposure during pregnancy": 9, "Fall": 9, "Feeling hot": 9, "Hyperhidrosis": 9, "Injection site erythema": 8, "Joint swelling": 8, "Vaccination site induration": 8, "Cerebrovascular accident": 7, "Heart rate increased": 7, "Limb discomfort": 7, "Loss of consciousness": 7, "Night sweats": 7, "Tinnitus": 7, "Vaccination site mass": 7, "Abdominal pain": 6, "Back pain": 6, "Balance disorder": 6, "Chest discomfort": 6, "Decreased appetite": 6, "Ear pain": 6, "Expired product administered": 6, "Gait disturbance": 6, "Herpes zoster": 6, "Hypersensitivity": 6, "Migraine": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Neck pain": 6, "Oropharyngeal pain": 6, "Palpitations": 6, "Swelling face": 6, "Tremor": 6, "Vaccination site reaction": 6, "Abdominal discomfort": 5, "Arthritis": 5, "Blood pressure increased": 5, "Bone pain": 5, "Chest pain": 5, "Dysgeusia": 5, "Influenza": 5, "Injection site swelling": 5, "Magnetic resonance imaging": 5, "Oral herpes": 5, "Throat irritation": 5, "Ageusia": 4, "Anxiety": 4, "Blister": 4, "Blood glucose": 4, "Computerised tomogram": 4, "Confusional state": 4, "Dysstasia": 4, "Hypersomnia": 4, "Injection site rash": 4, "Musculoskeletal stiffness": 4, "Paraesthesia oral": 4, "Rash erythematous": 4, "Syncope": 4, "Toothache": 4, "Ultrasound scan": 4, "Amnesia": 3, "Aphonia": 3, "Axillary pain": 3, "Constipation": 3, "Discomfort": 3, "Drug ineffective": 3, "Electrocardiogram": 3, "Extra dose administered": 3, "Eye pain": 3, "Feeling jittery": 3, "Feeling of body temperature change": 3, "Gait inability": 3, "Heart rate": 3, "Hypoaesthesia oral": 3, "Hypokinesia": 3, "Immunisation reaction": 3, "Injection site pruritus": 3, "Loss of personal independence in daily activities": 3, "Memory impairment": 3, "Nasopharyngitis": 3, "Nervousness": 3, "Off label use": 3, "Platelet count": 3, "Product administered to patient of inappropriate age": 3, "Product storage error": 3, "Rhinorrhoea": 3, "Sleep disorder": 3, "Tenderness": 3, "Ultrasound foetal": 3, "Vaccination site bruising": 3, "Vaccination site urticaria": 3, "Vision blurred": 3, "Abdominal distension": 2, "Adverse reaction": 2, "Anosmia": 2, "Atrial fibrillation": 2, "Bedridden": 2, "Bell's palsy": 2, "Blindness": 2, "Blood glucose increased": 2, "Breast pain": 2, "Breast swelling": 2, "Burning sensation": 2, "Chest X-ray": 2, "Costochondritis": 2, "Dehydration": 2, "Dental discomfort": 2, "Depression": 2, "Dyskinesia": 2, "Dyspepsia": 2, "Dysphagia": 2, "Epistaxis": 2, "Facial paralysis": 2, "Gingival bleeding": 2, "Haemoglobin": 2, "Hot flush": 2, "Injection site urticaria": 2, "Intentional product use issue": 2, "Lethargy": 2, "Menstrual disorder": 2, "Mouth ulceration": 2, "Muscle spasms": 2, "Musculoskeletal discomfort": 2, "Oral disorder": 2, "Oral pain": 2, "Oropharyngeal discomfort": 2, "Pain in jaw": 2, "Paranasal sinus discomfort": 2, "Parosmia": 2, "Pharyngeal swelling": 2, "Photophobia": 2, "Photopsia": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Sensitive skin": 2, "Sneezing": 2, "Speech disorder": 2, "Stomatitis": 2, "Suspected COVID-19": 2, "Tachycardia": 2, "Thirst": 2, "Thrombosis": 2, "Transient ischaemic attack": 2, "Urinary incontinence": 2, "Urinary tract infection": 2, "Vaccination site discolouration": 2, "Vaccination site movement impairment": 2, "Vaccination site papule": 2, "X-ray": 2, "Abdominal pain lower": 1, "Abdominal rigidity": 1, "Abnormal dreams": 1, "Accidental overdose": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Allergy to vaccine": 1, "Anaemia": 1, "Anger": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Aphthous ulcer": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Ataxia": 1, "Atypical pneumonia": 1, "Back injury": 1, "Bacterial gingivitis": 1, "Basal cell carcinoma": 1, "Biliary obstruction": 1, "Biopsy": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood blister": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood count": 1, "Blood creatinine": 1, "Blood glucose fluctuation": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Body temperature abnormal": 1, "Brain natriuretic peptide": 1, "Brain oedema": 1, "Breast cyst": 1, "Breast discomfort": 1, "Breast mass": 1, "Breast tenderness": 1, "Breath odour": 1, "Bronchospasm": 1, "Carbon dioxide": 1, "Chest injury": 1, "Cholelithiasis": 1, "Chronic obstructive pulmonary disease": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Coma": 1, "Computerised tomogram thorax": 1, "Concussion": 1, "Condition aggravated": 1, "Contusion": 1, "Cyst": 1, "Depressed mood": 1, "Device connection issue": 1, "Diabetes mellitus inadequate control": 1, "Diplopia": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drooling": 1, "Drug interaction": 1, "Dry eye": 1, "Dry throat": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Ear discomfort": 1, "Eating disorder": 1, "Echocardiogram": 1, "Endoscopy": 1, "Energy increased": 1, "Eructation": 1, "Exposure via breast milk": 1, "Eye inflammation": 1, "Eye pruritus": 1, "Eyelid irritation": 1, "Eyelid pain": 1, "Facial discomfort": 1, "Fallot's tetralogy": 1, "Fear": 1, "Feeding disorder": 1, "Feeding tube user": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Flatulence": 1, "Foetal growth restriction": 1, "Full blood count": 1, "Gastric disorder": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Glucose tolerance test": 1, "Glucose tolerance test normal": 1, "Haematocrit": 1, "Haemorrhage": 1, "Heavy menstrual bleeding": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Herpes zoster oticus": 1, "Hypogeusia": 1, "Hypotension": 1, "Hypoxia": 1, "Impaired quality of life": 1, "Impaired work ability": 1, "Inappropriate affect": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Inflammatory marker test": 1, "Injection site mass": 1, "Injection site warmth": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Joint injury": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Knee deformity": 1, "Knee operation": 1, "Lacrimation increased": 1, "Leukaemia": 1, "Leukocytosis": 1, "Lip pain": 1, "Lip swelling": 1, "Lip ulceration": 1, "Livedo reticularis": 1, "Localised infection": 1, "Lung hyperinflation": 1, "Lymph node pain": 1, "Mammogram": 1, "Maternal exposure during breast feeding": 1, "Menopause": 1, "Motion sickness": 1, "Movement disorder": 1, "Mucosal discolouration": 1, "Muscle fatigue": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal disorder": 1, "Nasal congestion": 1, "Near death experience": 1, "Nephrolithiasis": 1, "Nerve injury": 1, "Neuralgia": 1, "Neurological symptom": 1, "No adverse event": 1, "Ocular discomfort": 1, "Oral discomfort": 1, "Orthostatic hypotension": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pelvic pain": 1, "Peripheral coldness": 1, "Petechiae": 1, "Pharyngitis": 1, "Pigmentation disorder": 1, "Platelet count decreased": 1, "Pneumonia": 1, "Pneumonitis": 1, "Pollakiuria": 1, "Polydipsia": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Post procedural discharge": 1, "Posture abnormal": 1, "Product dose omission in error": 1, "Product physical issue": 1, "Productive cough": 1, "Protein total": 1, "Rash macular": 1, "Respiration abnormal": 1, "Respiratory rate decreased": 1, "Retinal haemorrhage": 1, "Rheumatoid arthritis": 1, "Rhinitis": 1, "Rhinitis allergic": 1, "SARS-CoV-2 test negative": 1, "Salivary hypersecretion": 1, "Scab": 1, "Sensory loss": 1, "Sepsis": 1, "Skeletal injury": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin disorder": 1, "Skin warm": 1, "Sluggishness": 1, "Sunburn": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Thyroid disorder": 1, "Tongue coated": 1, "Tongue ulceration": 1, "Tooth disorder": 1, "Tooth infection": 1, "Trisomy 22": 1, "Troponin I": 1, "Ultrasound Doppler": 1, "Underdose": 1, "Uveitis": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Visual impairment": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong patient received product": 1}, "batchcodes": ["012A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A2A.json b/docs/data/histograms/United States/012A2A.json
index ac1464af556..fb4f25703f2 100644
--- a/docs/data/histograms/United States/012A2A.json
+++ b/docs/data/histograms/United States/012A2A.json
@@ -1 +1 @@
-{"batchcode": "012A2A", "histograms": [{"batchcodes": ["012A2A"], "histogram": {"Balance disorder": 1, "Dizziness": 1, "Hepatic enzyme increased": 1, "Insomnia": 1, "Migraine": 1, "Nausea": 1, "Pruritus": 1, "Tinnitus": 1, "Vertigo": 1, "Vestibular disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "012A2A", "histograms": [{"histogram": {"Balance disorder": 1, "Dizziness": 1, "Hepatic enzyme increased": 1, "Insomnia": 1, "Migraine": 1, "Nausea": 1, "Pruritus": 1, "Tinnitus": 1, "Vertigo": 1, "Vestibular disorder": 1}, "batchcodes": ["012A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A2IA.json b/docs/data/histograms/United States/012A2IA.json
index 0a3d2e636dc..1875c40f267 100644
--- a/docs/data/histograms/United States/012A2IA.json
+++ b/docs/data/histograms/United States/012A2IA.json
@@ -1 +1 @@
-{"batchcode": "012A2IA", "histograms": [{"batchcodes": ["012A2IA"], "histogram": {"Burning sensation": 1, "Headache": 1, "Injection site mass": 1, "Migraine": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "012A2IA", "histograms": [{"histogram": {"Burning sensation": 1, "Headache": 1, "Injection site mass": 1, "Migraine": 1, "Pyrexia": 1}, "batchcodes": ["012A2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012A71H.json b/docs/data/histograms/United States/012A71H.json
index 0f1ce686b00..f449e1e0c63 100644
--- a/docs/data/histograms/United States/012A71H.json
+++ b/docs/data/histograms/United States/012A71H.json
@@ -1 +1 @@
-{"batchcode": "012A71H", "histograms": [{"batchcodes": ["012A71H"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "012A71H", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["012A71H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012AUA.json b/docs/data/histograms/United States/012AUA.json
index e1ab5843d3d..53beee85432 100644
--- a/docs/data/histograms/United States/012AUA.json
+++ b/docs/data/histograms/United States/012AUA.json
@@ -1 +1 @@
-{"batchcode": "012AUA", "histograms": [{"batchcodes": ["012AUA"], "histogram": {"Autoimmune disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "012AUA", "histograms": [{"histogram": {"Autoimmune disorder": 1}, "batchcodes": ["012AUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012AZ1A.json b/docs/data/histograms/United States/012AZ1A.json
index 3988a20e794..11720926aba 100644
--- a/docs/data/histograms/United States/012AZ1A.json
+++ b/docs/data/histograms/United States/012AZ1A.json
@@ -1 +1 @@
-{"batchcode": "012AZ1A", "histograms": [{"batchcodes": ["012AZ1A"], "histogram": {"Pain": 2, "Arthralgia": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Contusion": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Influenza like illness": 1, "Insomnia": 1, "Peripheral swelling": 1, "Platelet count": 1, "Platelet count decreased": 1, "Platelet disorder": 1, "Pyrexia": 1, "Rash": 1, "Restlessness": 1, "Vaccination complication": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "012AZ1A", "histograms": [{"histogram": {"Pain": 2, "Arthralgia": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Contusion": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Influenza like illness": 1, "Insomnia": 1, "Peripheral swelling": 1, "Platelet count": 1, "Platelet count decreased": 1, "Platelet disorder": 1, "Pyrexia": 1, "Rash": 1, "Restlessness": 1, "Vaccination complication": 1, "Vision blurred": 1}, "batchcodes": ["012AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012AZIA.json b/docs/data/histograms/United States/012AZIA.json
index 3b7115e6303..2aea731a8c2 100644
--- a/docs/data/histograms/United States/012AZIA.json
+++ b/docs/data/histograms/United States/012AZIA.json
@@ -1 +1 @@
-{"batchcode": "012AZIA", "histograms": [{"batchcodes": ["012AZIA"], "histogram": {"Abdominal pain upper": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Nausea": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012AZIA", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Nausea": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["012AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012C20A OR 012L.json b/docs/data/histograms/United States/012C20A OR 012L.json
index d0a9fac7231..b576fc2cff3 100644
--- a/docs/data/histograms/United States/012C20A OR 012L.json
+++ b/docs/data/histograms/United States/012C20A OR 012L.json
@@ -1 +1 @@
-{"batchcode": "012C20A OR 012L", "histograms": [{"batchcodes": ["012C20A OR 012L"], "histogram": {"Arthralgia": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "012C20A OR 012L", "histograms": [{"histogram": {"Arthralgia": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site urticaria": 1}, "batchcodes": ["012C20A OR 012L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012C20A.json b/docs/data/histograms/United States/012C20A.json
index d1f397a831e..3833b9d66aa 100644
--- a/docs/data/histograms/United States/012C20A.json
+++ b/docs/data/histograms/United States/012C20A.json
@@ -1 +1 @@
-{"batchcode": "012C20A", "histograms": [{"batchcodes": ["012C20A"], "histogram": {"Therapeutic response unexpected": 1}}]}
\ No newline at end of file
+{"batchcode": "012C20A", "histograms": [{"histogram": {"Therapeutic response unexpected": 1}, "batchcodes": ["012C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012C20I.json b/docs/data/histograms/United States/012C20I.json
index 95ce160ad6a..bf2478ffe04 100644
--- a/docs/data/histograms/United States/012C20I.json
+++ b/docs/data/histograms/United States/012C20I.json
@@ -1 +1 @@
-{"batchcode": "012C20I", "histograms": [{"batchcodes": ["012C20I"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012C20I", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["012C20I"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012C26A.json b/docs/data/histograms/United States/012C26A.json
index 8546a910a42..752f28133fb 100644
--- a/docs/data/histograms/United States/012C26A.json
+++ b/docs/data/histograms/United States/012C26A.json
@@ -1 +1 @@
-{"batchcode": "012C26A", "histograms": [{"batchcodes": ["012C26A"], "histogram": {"Amenorrhoea": 1, "Vaccination site lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "012C26A", "histograms": [{"histogram": {"Amenorrhoea": 1, "Vaccination site lymphadenopathy": 1}, "batchcodes": ["012C26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012D20A.json b/docs/data/histograms/United States/012D20A.json
index 770ab3f557d..6574a2c7cd0 100644
--- a/docs/data/histograms/United States/012D20A.json
+++ b/docs/data/histograms/United States/012D20A.json
@@ -1 +1 @@
-{"batchcode": "012D20A", "histograms": [{"batchcodes": ["012D20A"], "histogram": {"Pulmonary embolism": 1}}]}
\ No newline at end of file
+{"batchcode": "012D20A", "histograms": [{"histogram": {"Pulmonary embolism": 1}, "batchcodes": ["012D20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012E21A.json b/docs/data/histograms/United States/012E21A.json
index f25ddd0ed9d..6b04c3f7295 100644
--- a/docs/data/histograms/United States/012E21A.json
+++ b/docs/data/histograms/United States/012E21A.json
@@ -1 +1 @@
-{"batchcode": "012E21A", "histograms": [{"batchcodes": ["012E21A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "012E21A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["012E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012F.json b/docs/data/histograms/United States/012F.json
index f6783694749..03a7f1dc980 100644
--- a/docs/data/histograms/United States/012F.json
+++ b/docs/data/histograms/United States/012F.json
@@ -1 +1 @@
-{"batchcode": "012F", "histograms": [{"batchcodes": ["012F", "042A"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["012F"], "histogram": {"Asthenia": 1, "Decreased appetite": 1, "Headache": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "012F", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["012F", "042A"]}, {"histogram": {"Asthenia": 1, "Decreased appetite": 1, "Headache": 1, "Vaccination complication": 1}, "batchcodes": ["012F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012F1IA.json b/docs/data/histograms/United States/012F1IA.json
index 953f0bb4910..b0fe13da817 100644
--- a/docs/data/histograms/United States/012F1IA.json
+++ b/docs/data/histograms/United States/012F1IA.json
@@ -1 +1 @@
-{"batchcode": "012F1IA", "histograms": [{"batchcodes": ["012F1IA"], "histogram": {"Fatigue": 1, "Lymphadenopathy": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "012F1IA", "histograms": [{"histogram": {"Fatigue": 1, "Lymphadenopathy": 1, "Malaise": 1}, "batchcodes": ["012F1IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012F21 A.json b/docs/data/histograms/United States/012F21 A.json
index 72a29d355ab..667f493d0dd 100644
--- a/docs/data/histograms/United States/012F21 A.json
+++ b/docs/data/histograms/United States/012F21 A.json
@@ -1 +1 @@
-{"batchcode": "012F21 A", "histograms": [{"batchcodes": ["012F21 A"], "histogram": {"Dizziness": 1, "Dysgeusia": 1, "Dysphonia": 1}}]}
\ No newline at end of file
+{"batchcode": "012F21 A", "histograms": [{"histogram": {"Dizziness": 1, "Dysgeusia": 1, "Dysphonia": 1}, "batchcodes": ["012F21 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012F211A.json b/docs/data/histograms/United States/012F211A.json
index db9798c7654..c64a3646fdc 100644
--- a/docs/data/histograms/United States/012F211A.json
+++ b/docs/data/histograms/United States/012F211A.json
@@ -1 +1 @@
-{"batchcode": "012F211A", "histograms": [{"batchcodes": ["012F211A"], "histogram": {"Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "012F211A", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["012F211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012F21A CVS#151.json b/docs/data/histograms/United States/012F21A CVS#151.json
index 575a079a9e1..ff878d38007 100644
--- a/docs/data/histograms/United States/012F21A CVS#151.json
+++ b/docs/data/histograms/United States/012F21A CVS#151.json
@@ -1 +1 @@
-{"batchcode": "012F21A CVS#151", "histograms": [{"batchcodes": ["012F21A CVS#151", "1805022", "GJ2524 GIANT 34"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1}}]}
\ No newline at end of file
+{"batchcode": "012F21A CVS#151", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1}, "batchcodes": ["012F21A CVS#151", "1805022", "GJ2524 GIANT 34"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012F21A.json b/docs/data/histograms/United States/012F21A.json
index 41f21589e34..6a52470a553 100644
--- a/docs/data/histograms/United States/012F21A.json
+++ b/docs/data/histograms/United States/012F21A.json
@@ -1 +1 @@
-{"batchcode": "012F21A", "histograms": [{"batchcodes": ["012F21A"], "histogram": {"Expired product administered": 9, "Chills": 6, "Myalgia": 6, "Accidental overdose": 5, "Vaccination site pain": 5, "Headache": 4, "Product storage error": 4, "Dizziness": 3, "Fatigue": 3, "Inappropriate schedule of product administration": 3, "Pyrexia": 3, "Vaccination site erythema": 3, "Asthenia": 2, "Body temperature": 2, "Diarrhoea": 2, "Feeling abnormal": 2, "Lymphadenopathy": 2, "Malaise": 2, "Nausea": 2, "Pain in extremity": 2, "Product administered to patient of inappropriate age": 2, "Rash": 2, "Vaccination complication": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Accidental underdose": 1, "Allergy to vaccine": 1, "Back pain": 1, "COVID-19": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Erythema": 1, "Eye swelling": 1, "Feeling hot": 1, "Gait inability": 1, "Gastrointestinal pain": 1, "Genital tract inflammation": 1, "Hot flush": 1, "Illness": 1, "Incorrect dosage administered": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Influenza": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Mass": 1, "Mouth swelling": 1, "Muscular weakness": 1, "Neck pain": 1, "Ocular discomfort": 1, "Oropharyngeal pain": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product temperature excursion issue": 1, "Pruritus": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Somnolence": 1, "Spinal pain": 1, "Swollen tongue": 1, "Thinking abnormal": 1, "Tremor": 1, "Vaccination site discolouration": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Wrong product administered": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "012F21A", "histograms": [{"histogram": {"Expired product administered": 9, "Chills": 6, "Myalgia": 6, "Accidental overdose": 5, "Vaccination site pain": 5, "Headache": 4, "Product storage error": 4, "Dizziness": 3, "Fatigue": 3, "Inappropriate schedule of product administration": 3, "Pyrexia": 3, "Vaccination site erythema": 3, "Asthenia": 2, "Body temperature": 2, "Diarrhoea": 2, "Feeling abnormal": 2, "Lymphadenopathy": 2, "Malaise": 2, "Nausea": 2, "Pain in extremity": 2, "Product administered to patient of inappropriate age": 2, "Rash": 2, "Vaccination complication": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Accidental underdose": 1, "Allergy to vaccine": 1, "Back pain": 1, "COVID-19": 1, "Drug ineffective": 1, "Dyskinesia": 1, "Dyspnoea": 1, "Erythema": 1, "Eye swelling": 1, "Feeling hot": 1, "Gait inability": 1, "Gastrointestinal pain": 1, "Genital tract inflammation": 1, "Hot flush": 1, "Illness": 1, "Incorrect dosage administered": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Influenza": 1, "Influenza like illness": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Mass": 1, "Mouth swelling": 1, "Muscular weakness": 1, "Neck pain": 1, "Ocular discomfort": 1, "Oropharyngeal pain": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product temperature excursion issue": 1, "Pruritus": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Somnolence": 1, "Spinal pain": 1, "Swollen tongue": 1, "Thinking abnormal": 1, "Tremor": 1, "Vaccination site discolouration": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Wrong product administered": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["012F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012F2A.json b/docs/data/histograms/United States/012F2A.json
index 5b88b4cb27d..e87ea3ee469 100644
--- a/docs/data/histograms/United States/012F2A.json
+++ b/docs/data/histograms/United States/012F2A.json
@@ -1 +1 @@
-{"batchcode": "012F2A", "histograms": [{"batchcodes": ["012F2A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "012F2A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["012F2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012FZ11A.json b/docs/data/histograms/United States/012FZ11A.json
index 15732c86522..e949322ff62 100644
--- a/docs/data/histograms/United States/012FZ11A.json
+++ b/docs/data/histograms/United States/012FZ11A.json
@@ -1 +1 @@
-{"batchcode": "012FZ11A", "histograms": [{"batchcodes": ["012FZ11A"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012FZ11A", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Pain": 1, "Vomiting": 1}, "batchcodes": ["012FZ11A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012H20.json b/docs/data/histograms/United States/012H20.json
index 53b6e7674f2..93d5fde4d67 100644
--- a/docs/data/histograms/United States/012H20.json
+++ b/docs/data/histograms/United States/012H20.json
@@ -1 +1 @@
-{"batchcode": "012H20", "histograms": [{"batchcodes": ["012H20"], "histogram": {"Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Type IV hypersensitivity reaction": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "012H20", "histograms": [{"histogram": {"Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Type IV hypersensitivity reaction": 1, "Urticaria": 1}, "batchcodes": ["012H20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012H20A.json b/docs/data/histograms/United States/012H20A.json
index a34c15ffdc2..2f651c42973 100644
--- a/docs/data/histograms/United States/012H20A.json
+++ b/docs/data/histograms/United States/012H20A.json
@@ -1 +1 @@
-{"batchcode": "012H20A", "histograms": [{"batchcodes": ["012H20A"], "histogram": {"Body temperature": 1, "Cough": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "012H20A", "histograms": [{"histogram": {"Body temperature": 1, "Cough": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["012H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012H2113.json b/docs/data/histograms/United States/012H2113.json
index f735353837e..0c89d9b6fda 100644
--- a/docs/data/histograms/United States/012H2113.json
+++ b/docs/data/histograms/United States/012H2113.json
@@ -1 +1 @@
-{"batchcode": "012H2113", "histograms": [{"batchcodes": ["012H2113"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "012H2113", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["012H2113"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012H213.json b/docs/data/histograms/United States/012H213.json
index d3616bf9604..010ee791c96 100644
--- a/docs/data/histograms/United States/012H213.json
+++ b/docs/data/histograms/United States/012H213.json
@@ -1 +1 @@
-{"batchcode": "012H213", "histograms": [{"batchcodes": ["012H213"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "012H213", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["012H213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012H21B.json b/docs/data/histograms/United States/012H21B.json
index 7cad28ffa78..897e503374b 100644
--- a/docs/data/histograms/United States/012H21B.json
+++ b/docs/data/histograms/United States/012H21B.json
@@ -1 +1 @@
-{"batchcode": "012H21B", "histograms": [{"batchcodes": ["012H21B", "041A21A"], "histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["012H21B", "1805022"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["012H21B"], "histogram": {"Expired product administered": 114, "Accidental overdose": 19, "Pyrexia": 13, "Fatigue": 9, "Product quality issue": 9, "Pain in extremity": 8, "Myalgia": 7, "Product administration error": 6, "SARS-CoV-2 test": 6, "Inappropriate schedule of product administration": 5, "Vaccination complication": 5, "COVID-19": 4, "Chills": 4, "Headache": 4, "Arthralgia": 3, "Body temperature": 3, "Dyspnoea": 3, "Liquid product physical issue": 3, "Nausea": 3, "Pain": 3, "Poor quality product administered": 3, "Tremor": 3, "Ageusia": 2, "Anosmia": 2, "Cough": 2, "Decreased appetite": 2, "Dizziness": 2, "Electrocardiogram": 2, "Heart rate": 2, "Interchange of vaccine products": 2, "Loss of personal independence in daily activities": 2, "No adverse event": 2, "Palpitations": 2, "Urticaria": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Alanine aminotransferase": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Axillary pain": 1, "Back pain": 1, "Bedridden": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Bone pain": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "COVID-19 screening": 1, "Cardiac disorder": 1, "Cardiac function test": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Constipation": 1, "Differential white blood cell count": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysphagia": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Flushing": 1, "Full blood count": 1, "Grip strength decreased": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypokinesia": 1, "Illness": 1, "Impaired work ability": 1, "Influenza": 1, "Injection site swelling": 1, "Insomnia": 1, "Joint stiffness": 1, "Lethargy": 1, "Limb discomfort": 1, "Lipase": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Migraine": 1, "Myocardial necrosis marker": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Postural orthostatic tachycardia syndrome": 1, "Product administered to patient of inappropriate age": 1, "Product administration interrupted": 1, "Product physical issue": 1, "Product storage error": 1, "Rash": 1, "Rash pruritic": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sleep disorder": 1, "Swelling": 1, "Tachycardia": 1, "Tenderness": 1, "Troponin I": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012H21B", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["012H21B", "041A21A"]}, {"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["012H21B", "1805022"]}, {"histogram": {"Expired product administered": 114, "Accidental overdose": 19, "Pyrexia": 13, "Fatigue": 9, "Product quality issue": 9, "Pain in extremity": 8, "Myalgia": 7, "Product administration error": 6, "SARS-CoV-2 test": 6, "Inappropriate schedule of product administration": 5, "Vaccination complication": 5, "COVID-19": 4, "Chills": 4, "Headache": 4, "Arthralgia": 3, "Body temperature": 3, "Dyspnoea": 3, "Liquid product physical issue": 3, "Nausea": 3, "Pain": 3, "Poor quality product administered": 3, "Tremor": 3, "Ageusia": 2, "Anosmia": 2, "Cough": 2, "Decreased appetite": 2, "Dizziness": 2, "Electrocardiogram": 2, "Heart rate": 2, "Interchange of vaccine products": 2, "Loss of personal independence in daily activities": 2, "No adverse event": 2, "Palpitations": 2, "Urticaria": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Alanine aminotransferase": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Axillary pain": 1, "Back pain": 1, "Bedridden": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood glucose": 1, "Blood lactic acid": 1, "Blood magnesium": 1, "Blood phosphorus": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood test": 1, "Blood thyroid stimulating hormone": 1, "Blood urea": 1, "Bone pain": 1, "Brain natriuretic peptide": 1, "C-reactive protein": 1, "COVID-19 screening": 1, "Cardiac disorder": 1, "Cardiac function test": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Chest pain": 1, "Constipation": 1, "Differential white blood cell count": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysphagia": 1, "Echocardiogram": 1, "Electrocardiogram ambulatory": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Flushing": 1, "Full blood count": 1, "Grip strength decreased": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypokinesia": 1, "Illness": 1, "Impaired work ability": 1, "Influenza": 1, "Injection site swelling": 1, "Insomnia": 1, "Joint stiffness": 1, "Lethargy": 1, "Limb discomfort": 1, "Lipase": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Migraine": 1, "Myocardial necrosis marker": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oropharyngeal pain": 1, "Postural orthostatic tachycardia syndrome": 1, "Product administered to patient of inappropriate age": 1, "Product administration interrupted": 1, "Product physical issue": 1, "Product storage error": 1, "Rash": 1, "Rash pruritic": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 antibody test": 1, "Seizure": 1, "Sleep disorder": 1, "Swelling": 1, "Tachycardia": 1, "Tenderness": 1, "Troponin I": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vomiting": 1}, "batchcodes": ["012H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012K20A.json b/docs/data/histograms/United States/012K20A.json
index cb31f068399..0d5ed8f36f8 100644
--- a/docs/data/histograms/United States/012K20A.json
+++ b/docs/data/histograms/United States/012K20A.json
@@ -1 +1 @@
-{"batchcode": "012K20A", "histograms": [{"batchcodes": ["012K20A"], "histogram": {"Lip dry": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "012K20A", "histograms": [{"histogram": {"Lip dry": 1, "Pruritus": 1}, "batchcodes": ["012K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L/626A.json b/docs/data/histograms/United States/012L/626A.json
index 89037d21c67..f5a2a8140d7 100644
--- a/docs/data/histograms/United States/012L/626A.json
+++ b/docs/data/histograms/United States/012L/626A.json
@@ -1 +1 @@
-{"batchcode": "012L/626A", "histograms": [{"batchcodes": ["012L/626A"], "histogram": {"Dysphagia": 1}}]}
\ No newline at end of file
+{"batchcode": "012L/626A", "histograms": [{"histogram": {"Dysphagia": 1}, "batchcodes": ["012L/626A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L02A.json b/docs/data/histograms/United States/012L02A.json
index fc5b3af5e19..65fbefa05fe 100644
--- a/docs/data/histograms/United States/012L02A.json
+++ b/docs/data/histograms/United States/012L02A.json
@@ -1 +1 @@
-{"batchcode": "012L02A", "histograms": [{"batchcodes": ["012L02A"], "histogram": {"Migraine": 2, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "012L02A", "histograms": [{"histogram": {"Migraine": 2, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["012L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L0A.json b/docs/data/histograms/United States/012L0A.json
index 1e555622701..b12105b5866 100644
--- a/docs/data/histograms/United States/012L0A.json
+++ b/docs/data/histograms/United States/012L0A.json
@@ -1 +1 @@
-{"batchcode": "012L0A", "histograms": [{"batchcodes": ["012L0A"], "histogram": {"Body temperature": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012L0A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["012L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L10A.json b/docs/data/histograms/United States/012L10A.json
index e537614d35f..4cc300ce62e 100644
--- a/docs/data/histograms/United States/012L10A.json
+++ b/docs/data/histograms/United States/012L10A.json
@@ -1 +1 @@
-{"batchcode": "012L10A", "histograms": [{"batchcodes": ["012L10A"], "histogram": {"Alopecia": 2, "Rash": 1, "Sepsis": 1}}]}
\ No newline at end of file
+{"batchcode": "012L10A", "histograms": [{"histogram": {"Alopecia": 2, "Rash": 1, "Sepsis": 1}, "batchcodes": ["012L10A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L120A.json b/docs/data/histograms/United States/012L120A.json
index cfc5839f220..c52e7ed4f2c 100644
--- a/docs/data/histograms/United States/012L120A.json
+++ b/docs/data/histograms/United States/012L120A.json
@@ -1 +1 @@
-{"batchcode": "012L120A", "histograms": [{"batchcodes": ["012L120A"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "012L120A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["012L120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L20.json b/docs/data/histograms/United States/012L20.json
index 2f432f824c2..ecd9ab85ca5 100644
--- a/docs/data/histograms/United States/012L20.json
+++ b/docs/data/histograms/United States/012L20.json
@@ -1 +1 @@
-{"batchcode": "012L20", "histograms": [{"batchcodes": ["012L20"], "histogram": {"Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Body temperature": 1, "COVID-19": 1, "Dizziness": 1, "Dizziness postural": 1, "Headache": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Visceral pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Pyrexia": 2, "Body temperature": 1, "COVID-19": 1, "Dizziness": 1, "Dizziness postural": 1, "Headache": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Visceral pain": 1}, "batchcodes": ["012L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L2004.json b/docs/data/histograms/United States/012L2004.json
index 4883c62907b..5fbb0ca8b70 100644
--- a/docs/data/histograms/United States/012L2004.json
+++ b/docs/data/histograms/United States/012L2004.json
@@ -1 +1 @@
-{"batchcode": "012L2004", "histograms": [{"batchcodes": ["012L2004"], "histogram": {"Blister": 1, "Infection": 1, "Injection site erythema": 1, "Injection site pain": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "012L2004", "histograms": [{"histogram": {"Blister": 1, "Infection": 1, "Injection site erythema": 1, "Injection site pain": 1, "Product dose omission issue": 1}, "batchcodes": ["012L2004"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L201A.json b/docs/data/histograms/United States/012L201A.json
index ff60b54e725..1537259bfb3 100644
--- a/docs/data/histograms/United States/012L201A.json
+++ b/docs/data/histograms/United States/012L201A.json
@@ -1 +1 @@
-{"batchcode": "012L201A", "histograms": [{"batchcodes": ["012L201A"], "histogram": {"Aphasia": 1, "Blood glucose increased": 1, "Cerebrovascular accident": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "012L201A", "histograms": [{"histogram": {"Aphasia": 1, "Blood glucose increased": 1, "Cerebrovascular accident": 1, "Fatigue": 1}, "batchcodes": ["012L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L204.json b/docs/data/histograms/United States/012L204.json
index e7d7779ce06..99593cbe4d4 100644
--- a/docs/data/histograms/United States/012L204.json
+++ b/docs/data/histograms/United States/012L204.json
@@ -1 +1 @@
-{"batchcode": "012L204", "histograms": [{"batchcodes": ["012L204"], "histogram": {"Dermatitis allergic": 1, "Headache": 1, "Pain in extremity": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012L204", "histograms": [{"histogram": {"Dermatitis allergic": 1, "Headache": 1, "Pain in extremity": 1, "Rash": 1}, "batchcodes": ["012L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L204A.json b/docs/data/histograms/United States/012L204A.json
index 6655787b440..89043b01c66 100644
--- a/docs/data/histograms/United States/012L204A.json
+++ b/docs/data/histograms/United States/012L204A.json
@@ -1 +1 @@
-{"batchcode": "012L204A", "histograms": [{"batchcodes": ["012L204A"], "histogram": {"Lymphadenopathy": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012L204A", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["012L204A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L207.json b/docs/data/histograms/United States/012L207.json
index c9166a3c617..ceddb3d9513 100644
--- a/docs/data/histograms/United States/012L207.json
+++ b/docs/data/histograms/United States/012L207.json
@@ -1 +1 @@
-{"batchcode": "012L207", "histograms": [{"batchcodes": ["012L207"], "histogram": {"Anosmia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "012L207", "histograms": [{"histogram": {"Anosmia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["012L207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L20?- EITHER.json b/docs/data/histograms/United States/012L20?- EITHER.json
index b4b52d0ca10..20316eca487 100644
--- a/docs/data/histograms/United States/012L20?- EITHER.json
+++ b/docs/data/histograms/United States/012L20?- EITHER.json
@@ -1 +1 @@
-{"batchcode": "012L20?- EITHER", "histograms": [{"batchcodes": ["012L20?- EITHER"], "histogram": {"Peripheral coldness": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20?- EITHER", "histograms": [{"histogram": {"Peripheral coldness": 1}, "batchcodes": ["012L20?- EITHER"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L20A..json b/docs/data/histograms/United States/012L20A..json
index 027bb61f3f7..096820a64a5 100644
--- a/docs/data/histograms/United States/012L20A..json
+++ b/docs/data/histograms/United States/012L20A..json
@@ -1 +1 @@
-{"batchcode": "012L20A.", "histograms": [{"batchcodes": ["012L20A."], "histogram": {"Injection site erythema": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20A.", "histograms": [{"histogram": {"Injection site erythema": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["012L20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L20A.json b/docs/data/histograms/United States/012L20A.json
index 36622da65bb..61f3a795fd1 100644
--- a/docs/data/histograms/United States/012L20A.json
+++ b/docs/data/histograms/United States/012L20A.json
@@ -1 +1 @@
-{"batchcode": "012L20A", "histograms": [{"batchcodes": ["012L20A"], "histogram": {"Fatigue": 150, "Pyrexia": 139, "Headache": 133, "Pain in extremity": 130, "Chills": 129, "Vaccination site pain": 120, "Myalgia": 100, "Vaccination site erythema": 95, "Nausea": 66, "Pain": 66, "Pruritus": 64, "Rash": 62, "Arthralgia": 58, "Vaccination site swelling": 58, "Vaccination site pruritus": 57, "Dizziness": 54, "COVID-19": 51, "Erythema": 50, "SARS-CoV-2 test": 48, "Body temperature": 45, "Vaccination site warmth": 45, "Asthenia": 42, "Feeling abnormal": 40, "Diarrhoea": 36, "Cough": 31, "Vaccination complication": 30, "Vaccination site rash": 30, "Dyspnoea": 29, "Vomiting": 29, "Urticaria": 27, "Peripheral swelling": 25, "Injection site erythema": 24, "Injection site pain": 24, "Lymphadenopathy": 24, "Tremor": 24, "Malaise": 23, "Paraesthesia": 20, "Back pain": 19, "Blood pressure measurement": 19, "Illness": 18, "Heart rate increased": 17, "Product dose omission issue": 17, "Abdominal discomfort": 16, "Heart rate": 16, "Influenza like illness": 16, "Ageusia": 15, "Hypoaesthesia": 15, "Hyperhidrosis": 14, "Injection site pruritus": 14, "Injection site swelling": 14, "Oropharyngeal pain": 14, "Vaccination site induration": 14, "Blood test": 13, "Injection site warmth": 13, "Maternal exposure during pregnancy": 13, "Nasopharyngitis": 13, "Swelling": 13, "Anosmia": 12, "Gait disturbance": 12, "Limb discomfort": 12, "Musculoskeletal stiffness": 12, "Nasal congestion": 12, "Rash pruritic": 12, "Vaccination site reaction": 12, "Chest pain": 11, "Insomnia": 11, "Palpitations": 11, "Pregnancy test": 11, "Feeling cold": 10, "Feeling hot": 10, "Inappropriate schedule of product administration": 10, "Muscle spasms": 10, "Neck pain": 10, "SARS-CoV-2 test positive": 10, "Vertigo": 10, "Drug ineffective": 9, "Epistaxis": 9, "Hypersensitivity": 9, "Lethargy": 9, "Rash erythematous": 9, "Rhinorrhoea": 9, "Somnolence": 9, "Tinnitus": 9, "Vision blurred": 9, "Abdominal pain upper": 8, "Decreased appetite": 8, "Hot flush": 8, "Hypertension": 8, "Injection site rash": 8, "Joint swelling": 8, "Loss of personal independence in daily activities": 8, "Migraine": 8, "Abdominal pain": 7, "Computerised tomogram": 7, "Electrocardiogram": 7, "Expired product administered": 7, "Exposure during pregnancy": 7, "Herpes zoster": 7, "Incorrect route of product administration": 7, "Mobility decreased": 7, "Product administered to patient of inappropriate age": 7, "Tenderness": 7, "Ultrasound scan": 7, "Vaccination site mass": 7, "Vaccination site urticaria": 7, "Cellulitis": 6, "Chest X-ray": 6, "Chest discomfort": 6, "Gait inability": 6, "Hypoaesthesia oral": 6, "Inflammation": 6, "Lip swelling": 6, "Muscular weakness": 6, "No adverse event": 6, "Rash macular": 6, "SARS-CoV-2 antibody test": 6, "Sneezing": 6, "Throat irritation": 6, "Burning sensation": 5, "Contusion": 5, "Discomfort": 5, "Flushing": 5, "Heart rate irregular": 5, "Hypersomnia": 5, "Incorrect dose administered": 5, "Loss of consciousness": 5, "Oxygen saturation": 5, "Periarthritis": 5, "Pharyngeal swelling": 5, "Pneumonia": 5, "Swelling face": 5, "Axillary pain": 4, "Blood glucose": 4, "Blood pressure increased": 4, "Bone pain": 4, "Dehydration": 4, "Dysphagia": 4, "Ear pain": 4, "Echocardiogram": 4, "Extra dose administered": 4, "Hypotension": 4, "Paraesthesia oral": 4, "Skin discolouration": 4, "Skin reaction": 4, "Vaccination site movement impairment": 4, "Weight decreased": 4, "Accidental overdose": 3, "Allergy to vaccine": 3, "Anaphylactic reaction": 3, "Antibody test": 3, "Balance disorder": 3, "Biopsy": 3, "Body temperature increased": 3, "Cardiac stress test": 3, "Dry skin": 3, "Dysgeusia": 3, "Dyspepsia": 3, "Dysphonia": 3, "Ear discomfort": 3, "Eczema": 3, "Eye pain": 3, "Eye swelling": 3, "Gastrooesophageal reflux disease": 3, "Head discomfort": 3, "Hypokinesia": 3, "Influenza": 3, "Injection site urticaria": 3, "Joint stiffness": 3, "Liver function test": 3, "Magnetic resonance imaging": 3, "Night sweats": 3, "Pallor": 3, "Presyncope": 3, "Product storage error": 3, "Rash papular": 3, "Respiratory rate": 3, "Retching": 3, "SARS-CoV-2 test negative": 3, "Scratch": 3, "Stress": 3, "Tachycardia": 3, "Therapeutic response unexpected": 3, "Thrombosis": 3, "Vaccination site inflammation": 3, "Abdominal distension": 2, "Abscess": 2, "Accidental underdose": 2, "Adverse drug reaction": 2, "Alopecia": 2, "Arrhythmia": 2, "Atrial fibrillation": 2, "Blood potassium": 2, "Blood potassium decreased": 2, "Blood pressure fluctuation": 2, "Blood pressure systolic": 2, "Bronchitis": 2, "Bursitis": 2, "C-reactive protein": 2, "Cerebrovascular accident": 2, "Chromaturia": 2, "Constipation": 2, "Deafness": 2, "Disorientation": 2, "Dry eye": 2, "Dry mouth": 2, "Dyskinesia": 2, "Eating disorder": 2, "Endocrine ophthalmopathy": 2, "Exophthalmos": 2, "Exposure via skin contact": 2, "Facial paralysis": 2, "Faeces discoloured": 2, "Fall": 2, "Feeding disorder": 2, "Gastrointestinal tract irritation": 2, "Glomerular filtration rate": 2, "Glucose tolerance test": 2, "Haematemesis": 2, "Hepatic enzyme increased": 2, "Hyperaesthesia": 2, "Hypoacusis": 2, "Immunisation reaction": 2, "Impaired work ability": 2, "Infection": 2, "Injected limb mobility decreased": 2, "Injection site bruising": 2, "Injection site mass": 2, "Injection site paraesthesia": 2, "Injection site reaction": 2, "Irritability": 2, "Laboratory test": 2, "Laryngitis": 2, "Lymph node pain": 2, "Musculoskeletal discomfort": 2, "Nervousness": 2, "Neuralgia": 2, "Neutrophil count": 2, "Ocular hyperaemia": 2, "Oedema peripheral": 2, "Off label use": 2, "Oral herpes": 2, "Overdose": 2, "Paralysis": 2, "Pharyngeal hypoaesthesia": 2, "Polymyalgia rheumatica": 2, "Poor quality sleep": 2, "Product administered at inappropriate site": 2, "Pulmonary congestion": 2, "Pulmonary embolism": 2, "Pulmonary pain": 2, "Rash vesicular": 2, "Rectal haemorrhage": 2, "Renal pain": 2, "Restlessness": 2, "Rheumatoid arthritis": 2, "Scan brain": 2, "Sensory disturbance": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Sudden hearing loss": 2, "Syncope": 2, "Taste disorder": 2, "Thinking abnormal": 2, "Tongue discomfort": 2, "Ultrasound abdomen": 2, "Underdose": 2, "Urticaria chronic": 2, "Vaccination site bruising": 2, "Vaccination site discolouration": 2, "Vaccination site discomfort": 2, "Visual impairment": 2, "X-ray": 2, "Abnormal dreams": 1, "Acne": 1, "Acute myocardial infarction": 1, "Administration site discomfort": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Altered state of consciousness": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Antibody test negative": 1, "Aphasia": 1, "Arterial disorder": 1, "Arthritis": 1, "Arthritis reactive": 1, "Arthropathy": 1, "Arthropod sting": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Asthma": 1, "Atypical pneumonia": 1, "Bacterial test positive": 1, "Ballismus": 1, "Basophil count": 1, "Bedridden": 1, "Behaviour disorder": 1, "Bell's palsy": 1, "Belligerence": 1, "Bladder discomfort": 1, "Bladder disorder": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood calcium decreased": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood iron": 1, "Blood iron increased": 1, "Blood potassium increased": 1, "Blood pressure decreased": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood urine": 1, "Body temperature decreased": 1, "Body temperature fluctuation": 1, "Bowel movement irregularity": 1, "Breast cancer": 1, "Breast feeding": 1, "Breast oedema": 1, "Breast pain": 1, "Breast swelling": 1, "Breast tenderness": 1, "C-reactive protein increased": 1, "COVID-19 pneumonia": 1, "Candida infection": 1, "Carbon dioxide": 1, "Carcinoid tumour": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac function test": 1, "Cerebral haemorrhage": 1, "Chorea": 1, "Chronic fatigue syndrome": 1, "Chronic kidney disease": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Corneal oedema": 1, "Cyanosis": 1, "Cytogenetic abnormality": 1, "Deafness unilateral": 1, "Death": 1, "Decreased gait velocity": 1, "Deformity": 1, "Delusion": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Depression": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Diarrhoea haemorrhagic": 1, "Diplegia": 1, "Diplopia": 1, "Disability": 1, "Disease progression": 1, "Disorganised speech": 1, "Dizziness postural": 1, "Dry throat": 1, "Ear pruritus": 1, "Ejection fraction": 1, "Electric shock sensation": 1, "Energy increased": 1, "Eosinophil count": 1, "Epigastric discomfort": 1, "Euphoric mood": 1, "Exposure to SARS-CoV-2": 1, "Extrasystoles": 1, "Eye disorder": 1, "Eye inflammation": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid disorder": 1, "Eyelid ptosis": 1, "Facial bones fracture": 1, "Faeces pale": 1, "Feeling jittery": 1, "Fluid retention": 1, "Foreign body sensation in eyes": 1, "Full blood count": 1, "Gastrointestinal disorder": 1, "Gastrointestinal hypermotility": 1, "Gastrointestinal viral infection": 1, "General physical health deterioration": 1, "Gingival bleeding": 1, "Gingival discolouration": 1, "Gingivitis": 1, "Globulin": 1, "Glomerular filtration rate decreased": 1, "Glossodynia": 1, "Glucose tolerance impaired": 1, "Gout": 1, "HIV test": 1, "HIV test false positive": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhoids": 1, "Heart rate normal": 1, "Heart rate variability increased": 1, "Hepatic enzyme": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis C virus test": 1, "Herpes simplex": 1, "Hordeolum": 1, "Hypercoagulation": 1, "Hyperglycaemia": 1, "Hyperventilation": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoxia": 1, "Idiosyncratic drug reaction": 1, "Immature granulocyte count": 1, "Immobile": 1, "Ingrown hair": 1, "Injection": 1, "Injection site cellulitis": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site hypoaesthesia": 1, "Injection site inflammation": 1, "Injection site irritation": 1, "Injection site nodule": 1, "Injection site oedema": 1, "Injection site scar": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "International normalised ratio decreased": 1, "Intervertebral disc protrusion": 1, "Joint warmth": 1, "Kidney infection": 1, "Laryngomalacia": 1, "Leukoplakia oral": 1, "Limb mass": 1, "Lip dry": 1, "Lip haemorrhage": 1, "Lip ulceration": 1, "Liver function test increased": 1, "Lower respiratory tract infection": 1, "Lymphocyte count": 1, "Lymphoedema": 1, "Mammogram": 1, "Manufacturing issue": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mechanical urticaria": 1, "Medication error": 1, "Memory impairment": 1, "Metabolic function test": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Motion sickness": 1, "Mouth haemorrhage": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Muscle contusion": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Mycobacterium avium complex infection": 1, "Nasal dryness": 1, "Nasal oedema": 1, "Neck mass": 1, "Nephrolithiasis": 1, "Nerve compression": 1, "Nocturnal dyspnoea": 1, "Nodule": 1, "Non-cardiac chest pain": 1, "Ocular discomfort": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Orthopnoea": 1, "Out of specification product use": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pain threshold decreased": 1, "Painful respiration": 1, "Pancreatic enzymes increased": 1, "Panic attack": 1, "Paranoia": 1, "Parosmia": 1, "Pemphigus": 1, "Petechiae": 1, "Pharyngeal erythema": 1, "Phlebitis superficial": 1, "Photophobia": 1, "Photopsia": 1, "Platelet count": 1, "Pleurisy": 1, "Pollakiuria": 1, "Polyarteritis nodosa": 1, "Product availability issue": 1, "Product quality issue": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary function test": 1, "Quality of life decreased": 1, "Recurrent cancer": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate normal": 1, "Renal function test": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Restless legs syndrome": 1, "Retinal detachment": 1, "Rib fracture": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Scab": 1, "Scan": 1, "Scar": 1, "Sciatica": 1, "Secretion discharge": 1, "Semen analysis": 1, "Semen liquefaction": 1, "Sinus disorder": 1, "Sinus pain": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Skin mass": 1, "Skin swelling": 1, "Skin warm": 1, "Sleep disorder": 1, "Sluggishness": 1, "Specific gravity urine": 1, "Speech disorder": 1, "Spinal pain": 1, "Stomatitis": 1, "Supraventricular tachycardia": 1, "Swollen tongue": 1, "Syringe issue": 1, "Tachypnoea": 1, "Tendonitis": 1, "Tension": 1, "Therapy interrupted": 1, "Thirst": 1, "Throat tightness": 1, "Tongue pruritus": 1, "Tooth disorder": 1, "Troponin": 1, "Tuberculosis": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound antenatal screen": 1, "Ultrasound foetal": 1, "Upper-airway cough syndrome": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine odour abnormal": 1, "Urticarial vasculitis": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site cellulitis": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1, "Vertigo positional": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count increased": 1, "Whole body scan": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20A", "histograms": [{"histogram": {"Fatigue": 150, "Pyrexia": 139, "Headache": 133, "Pain in extremity": 130, "Chills": 129, "Vaccination site pain": 120, "Myalgia": 100, "Vaccination site erythema": 95, "Nausea": 66, "Pain": 66, "Pruritus": 64, "Rash": 62, "Arthralgia": 58, "Vaccination site swelling": 58, "Vaccination site pruritus": 57, "Dizziness": 54, "COVID-19": 51, "Erythema": 50, "SARS-CoV-2 test": 48, "Body temperature": 45, "Vaccination site warmth": 45, "Asthenia": 42, "Feeling abnormal": 40, "Diarrhoea": 36, "Cough": 31, "Vaccination complication": 30, "Vaccination site rash": 30, "Dyspnoea": 29, "Vomiting": 29, "Urticaria": 27, "Peripheral swelling": 25, "Injection site erythema": 24, "Injection site pain": 24, "Lymphadenopathy": 24, "Tremor": 24, "Malaise": 23, "Paraesthesia": 20, "Back pain": 19, "Blood pressure measurement": 19, "Illness": 18, "Heart rate increased": 17, "Product dose omission issue": 17, "Abdominal discomfort": 16, "Heart rate": 16, "Influenza like illness": 16, "Ageusia": 15, "Hypoaesthesia": 15, "Hyperhidrosis": 14, "Injection site pruritus": 14, "Injection site swelling": 14, "Oropharyngeal pain": 14, "Vaccination site induration": 14, "Blood test": 13, "Injection site warmth": 13, "Maternal exposure during pregnancy": 13, "Nasopharyngitis": 13, "Swelling": 13, "Anosmia": 12, "Gait disturbance": 12, "Limb discomfort": 12, "Musculoskeletal stiffness": 12, "Nasal congestion": 12, "Rash pruritic": 12, "Vaccination site reaction": 12, "Chest pain": 11, "Insomnia": 11, "Palpitations": 11, "Pregnancy test": 11, "Feeling cold": 10, "Feeling hot": 10, "Inappropriate schedule of product administration": 10, "Muscle spasms": 10, "Neck pain": 10, "SARS-CoV-2 test positive": 10, "Vertigo": 10, "Drug ineffective": 9, "Epistaxis": 9, "Hypersensitivity": 9, "Lethargy": 9, "Rash erythematous": 9, "Rhinorrhoea": 9, "Somnolence": 9, "Tinnitus": 9, "Vision blurred": 9, "Abdominal pain upper": 8, "Decreased appetite": 8, "Hot flush": 8, "Hypertension": 8, "Injection site rash": 8, "Joint swelling": 8, "Loss of personal independence in daily activities": 8, "Migraine": 8, "Abdominal pain": 7, "Computerised tomogram": 7, "Electrocardiogram": 7, "Expired product administered": 7, "Exposure during pregnancy": 7, "Herpes zoster": 7, "Incorrect route of product administration": 7, "Mobility decreased": 7, "Product administered to patient of inappropriate age": 7, "Tenderness": 7, "Ultrasound scan": 7, "Vaccination site mass": 7, "Vaccination site urticaria": 7, "Cellulitis": 6, "Chest X-ray": 6, "Chest discomfort": 6, "Gait inability": 6, "Hypoaesthesia oral": 6, "Inflammation": 6, "Lip swelling": 6, "Muscular weakness": 6, "No adverse event": 6, "Rash macular": 6, "SARS-CoV-2 antibody test": 6, "Sneezing": 6, "Throat irritation": 6, "Burning sensation": 5, "Contusion": 5, "Discomfort": 5, "Flushing": 5, "Heart rate irregular": 5, "Hypersomnia": 5, "Incorrect dose administered": 5, "Loss of consciousness": 5, "Oxygen saturation": 5, "Periarthritis": 5, "Pharyngeal swelling": 5, "Pneumonia": 5, "Swelling face": 5, "Axillary pain": 4, "Blood glucose": 4, "Blood pressure increased": 4, "Bone pain": 4, "Dehydration": 4, "Dysphagia": 4, "Ear pain": 4, "Echocardiogram": 4, "Extra dose administered": 4, "Hypotension": 4, "Paraesthesia oral": 4, "Skin discolouration": 4, "Skin reaction": 4, "Vaccination site movement impairment": 4, "Weight decreased": 4, "Accidental overdose": 3, "Allergy to vaccine": 3, "Anaphylactic reaction": 3, "Antibody test": 3, "Balance disorder": 3, "Biopsy": 3, "Body temperature increased": 3, "Cardiac stress test": 3, "Dry skin": 3, "Dysgeusia": 3, "Dyspepsia": 3, "Dysphonia": 3, "Ear discomfort": 3, "Eczema": 3, "Eye pain": 3, "Eye swelling": 3, "Gastrooesophageal reflux disease": 3, "Head discomfort": 3, "Hypokinesia": 3, "Influenza": 3, "Injection site urticaria": 3, "Joint stiffness": 3, "Liver function test": 3, "Magnetic resonance imaging": 3, "Night sweats": 3, "Pallor": 3, "Presyncope": 3, "Product storage error": 3, "Rash papular": 3, "Respiratory rate": 3, "Retching": 3, "SARS-CoV-2 test negative": 3, "Scratch": 3, "Stress": 3, "Tachycardia": 3, "Therapeutic response unexpected": 3, "Thrombosis": 3, "Vaccination site inflammation": 3, "Abdominal distension": 2, "Abscess": 2, "Accidental underdose": 2, "Adverse drug reaction": 2, "Alopecia": 2, "Arrhythmia": 2, "Atrial fibrillation": 2, "Blood potassium": 2, "Blood potassium decreased": 2, "Blood pressure fluctuation": 2, "Blood pressure systolic": 2, "Bronchitis": 2, "Bursitis": 2, "C-reactive protein": 2, "Cerebrovascular accident": 2, "Chromaturia": 2, "Constipation": 2, "Deafness": 2, "Disorientation": 2, "Dry eye": 2, "Dry mouth": 2, "Dyskinesia": 2, "Eating disorder": 2, "Endocrine ophthalmopathy": 2, "Exophthalmos": 2, "Exposure via skin contact": 2, "Facial paralysis": 2, "Faeces discoloured": 2, "Fall": 2, "Feeding disorder": 2, "Gastrointestinal tract irritation": 2, "Glomerular filtration rate": 2, "Glucose tolerance test": 2, "Haematemesis": 2, "Hepatic enzyme increased": 2, "Hyperaesthesia": 2, "Hypoacusis": 2, "Immunisation reaction": 2, "Impaired work ability": 2, "Infection": 2, "Injected limb mobility decreased": 2, "Injection site bruising": 2, "Injection site mass": 2, "Injection site paraesthesia": 2, "Injection site reaction": 2, "Irritability": 2, "Laboratory test": 2, "Laryngitis": 2, "Lymph node pain": 2, "Musculoskeletal discomfort": 2, "Nervousness": 2, "Neuralgia": 2, "Neutrophil count": 2, "Ocular hyperaemia": 2, "Oedema peripheral": 2, "Off label use": 2, "Oral herpes": 2, "Overdose": 2, "Paralysis": 2, "Pharyngeal hypoaesthesia": 2, "Polymyalgia rheumatica": 2, "Poor quality sleep": 2, "Product administered at inappropriate site": 2, "Pulmonary congestion": 2, "Pulmonary embolism": 2, "Pulmonary pain": 2, "Rash vesicular": 2, "Rectal haemorrhage": 2, "Renal pain": 2, "Restlessness": 2, "Rheumatoid arthritis": 2, "Scan brain": 2, "Sensory disturbance": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Sudden hearing loss": 2, "Syncope": 2, "Taste disorder": 2, "Thinking abnormal": 2, "Tongue discomfort": 2, "Ultrasound abdomen": 2, "Underdose": 2, "Urticaria chronic": 2, "Vaccination site bruising": 2, "Vaccination site discolouration": 2, "Vaccination site discomfort": 2, "Visual impairment": 2, "X-ray": 2, "Abnormal dreams": 1, "Acne": 1, "Acute myocardial infarction": 1, "Administration site discomfort": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Albumin globulin ratio": 1, "Altered state of consciousness": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Antibody test negative": 1, "Aphasia": 1, "Arterial disorder": 1, "Arthritis": 1, "Arthritis reactive": 1, "Arthropathy": 1, "Arthropod sting": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Asthma": 1, "Atypical pneumonia": 1, "Bacterial test positive": 1, "Ballismus": 1, "Basophil count": 1, "Bedridden": 1, "Behaviour disorder": 1, "Bell's palsy": 1, "Belligerence": 1, "Bladder discomfort": 1, "Bladder disorder": 1, "Blister": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood calcium decreased": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood iron": 1, "Blood iron increased": 1, "Blood potassium increased": 1, "Blood pressure decreased": 1, "Blood sodium decreased": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood urine": 1, "Body temperature decreased": 1, "Body temperature fluctuation": 1, "Bowel movement irregularity": 1, "Breast cancer": 1, "Breast feeding": 1, "Breast oedema": 1, "Breast pain": 1, "Breast swelling": 1, "Breast tenderness": 1, "C-reactive protein increased": 1, "COVID-19 pneumonia": 1, "Candida infection": 1, "Carbon dioxide": 1, "Carcinoid tumour": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac function test": 1, "Cerebral haemorrhage": 1, "Chorea": 1, "Chronic fatigue syndrome": 1, "Chronic kidney disease": 1, "Cognitive disorder": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Corneal oedema": 1, "Cyanosis": 1, "Cytogenetic abnormality": 1, "Deafness unilateral": 1, "Death": 1, "Decreased gait velocity": 1, "Deformity": 1, "Delusion": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Depression": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Diarrhoea haemorrhagic": 1, "Diplegia": 1, "Diplopia": 1, "Disability": 1, "Disease progression": 1, "Disorganised speech": 1, "Dizziness postural": 1, "Dry throat": 1, "Ear pruritus": 1, "Ejection fraction": 1, "Electric shock sensation": 1, "Energy increased": 1, "Eosinophil count": 1, "Epigastric discomfort": 1, "Euphoric mood": 1, "Exposure to SARS-CoV-2": 1, "Extrasystoles": 1, "Eye disorder": 1, "Eye inflammation": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid disorder": 1, "Eyelid ptosis": 1, "Facial bones fracture": 1, "Faeces pale": 1, "Feeling jittery": 1, "Fluid retention": 1, "Foreign body sensation in eyes": 1, "Full blood count": 1, "Gastrointestinal disorder": 1, "Gastrointestinal hypermotility": 1, "Gastrointestinal viral infection": 1, "General physical health deterioration": 1, "Gingival bleeding": 1, "Gingival discolouration": 1, "Gingivitis": 1, "Globulin": 1, "Glomerular filtration rate decreased": 1, "Glossodynia": 1, "Glucose tolerance impaired": 1, "Gout": 1, "HIV test": 1, "HIV test false positive": 1, "Haematocrit": 1, "Haemoglobin": 1, "Haemoptysis": 1, "Haemorrhage": 1, "Haemorrhoids": 1, "Heart rate normal": 1, "Heart rate variability increased": 1, "Hepatic enzyme": 1, "Hepatitis B surface antibody": 1, "Hepatitis B surface antigen": 1, "Hepatitis C antibody": 1, "Hepatitis C virus test": 1, "Herpes simplex": 1, "Hordeolum": 1, "Hypercoagulation": 1, "Hyperglycaemia": 1, "Hyperventilation": 1, "Hypoglycaemia": 1, "Hypothermia": 1, "Hypoxia": 1, "Idiosyncratic drug reaction": 1, "Immature granulocyte count": 1, "Immobile": 1, "Ingrown hair": 1, "Injection": 1, "Injection site cellulitis": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site hypoaesthesia": 1, "Injection site inflammation": 1, "Injection site irritation": 1, "Injection site nodule": 1, "Injection site oedema": 1, "Injection site scar": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "International normalised ratio": 1, "International normalised ratio decreased": 1, "Intervertebral disc protrusion": 1, "Joint warmth": 1, "Kidney infection": 1, "Laryngomalacia": 1, "Leukoplakia oral": 1, "Limb mass": 1, "Lip dry": 1, "Lip haemorrhage": 1, "Lip ulceration": 1, "Liver function test increased": 1, "Lower respiratory tract infection": 1, "Lymphocyte count": 1, "Lymphoedema": 1, "Mammogram": 1, "Manufacturing issue": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mechanical urticaria": 1, "Medication error": 1, "Memory impairment": 1, "Metabolic function test": 1, "Mitral valve incompetence": 1, "Monocyte count": 1, "Motion sickness": 1, "Mouth haemorrhage": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Muscle contusion": 1, "Muscle twitching": 1, "Musculoskeletal pain": 1, "Mycobacterium avium complex infection": 1, "Nasal dryness": 1, "Nasal oedema": 1, "Neck mass": 1, "Nephrolithiasis": 1, "Nerve compression": 1, "Nocturnal dyspnoea": 1, "Nodule": 1, "Non-cardiac chest pain": 1, "Ocular discomfort": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Orthopnoea": 1, "Out of specification product use": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pain threshold decreased": 1, "Painful respiration": 1, "Pancreatic enzymes increased": 1, "Panic attack": 1, "Paranoia": 1, "Parosmia": 1, "Pemphigus": 1, "Petechiae": 1, "Pharyngeal erythema": 1, "Phlebitis superficial": 1, "Photophobia": 1, "Photopsia": 1, "Platelet count": 1, "Pleurisy": 1, "Pollakiuria": 1, "Polyarteritis nodosa": 1, "Product availability issue": 1, "Product quality issue": 1, "Protein total": 1, "Prothrombin time": 1, "Pulmonary function test": 1, "Quality of life decreased": 1, "Recurrent cancer": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate normal": 1, "Renal function test": 1, "Respiratory failure": 1, "Respiratory rate increased": 1, "Restless legs syndrome": 1, "Retinal detachment": 1, "Rib fracture": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Scab": 1, "Scan": 1, "Scar": 1, "Sciatica": 1, "Secretion discharge": 1, "Semen analysis": 1, "Semen liquefaction": 1, "Sinus disorder": 1, "Sinus pain": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Skin mass": 1, "Skin swelling": 1, "Skin warm": 1, "Sleep disorder": 1, "Sluggishness": 1, "Specific gravity urine": 1, "Speech disorder": 1, "Spinal pain": 1, "Stomatitis": 1, "Supraventricular tachycardia": 1, "Swollen tongue": 1, "Syringe issue": 1, "Tachypnoea": 1, "Tendonitis": 1, "Tension": 1, "Therapy interrupted": 1, "Thirst": 1, "Throat tightness": 1, "Tongue pruritus": 1, "Tooth disorder": 1, "Troponin": 1, "Tuberculosis": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound antenatal screen": 1, "Ultrasound foetal": 1, "Upper-airway cough syndrome": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine odour abnormal": 1, "Urticarial vasculitis": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site cellulitis": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1, "Vertigo positional": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count increased": 1, "Whole body scan": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["012L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L20M.json b/docs/data/histograms/United States/012L20M.json
index bc0b4a2c119..bae9b2aa829 100644
--- a/docs/data/histograms/United States/012L20M.json
+++ b/docs/data/histograms/United States/012L20M.json
@@ -1 +1 @@
-{"batchcode": "012L20M", "histograms": [{"batchcodes": ["012L20M"], "histogram": {"Fatigue": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "012L20M", "histograms": [{"histogram": {"Fatigue": 1, "Nasopharyngitis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["012L20M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L21A.json b/docs/data/histograms/United States/012L21A.json
index 56b9cac08ff..43c8b73416a 100644
--- a/docs/data/histograms/United States/012L21A.json
+++ b/docs/data/histograms/United States/012L21A.json
@@ -1 +1 @@
-{"batchcode": "012L21A", "histograms": [{"batchcodes": ["012L21A"], "histogram": {"Tinnitus": 2, "Abdominal pain upper": 1, "Dizziness": 1, "Fatigue": 1, "Feeding disorder": 1, "Headache": 1, "Loss of personal independence in daily activities": 1, "Mobility decreased": 1, "Myalgia": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "012L21A", "histograms": [{"histogram": {"Tinnitus": 2, "Abdominal pain upper": 1, "Dizziness": 1, "Fatigue": 1, "Feeding disorder": 1, "Headache": 1, "Loss of personal independence in daily activities": 1, "Mobility decreased": 1, "Myalgia": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["012L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L28.json b/docs/data/histograms/United States/012L28.json
index 3815ceb085d..d99cf34b2df 100644
--- a/docs/data/histograms/United States/012L28.json
+++ b/docs/data/histograms/United States/012L28.json
@@ -1 +1 @@
-{"batchcode": "012L28", "histograms": [{"batchcodes": ["012L28"], "histogram": {"Erythema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Skin exfoliation": 1}}]}
\ No newline at end of file
+{"batchcode": "012L28", "histograms": [{"histogram": {"Erythema": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Skin exfoliation": 1}, "batchcodes": ["012L28"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L29A.json b/docs/data/histograms/United States/012L29A.json
index 0525075bf92..257e62078e5 100644
--- a/docs/data/histograms/United States/012L29A.json
+++ b/docs/data/histograms/United States/012L29A.json
@@ -1 +1 @@
-{"batchcode": "012L29A", "histograms": [{"batchcodes": ["012L29A"], "histogram": {"Contusion": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "012L29A", "histograms": [{"histogram": {"Contusion": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1}, "batchcodes": ["012L29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L2A.json b/docs/data/histograms/United States/012L2A.json
index 9efd5f04e55..cf1d3b125b7 100644
--- a/docs/data/histograms/United States/012L2A.json
+++ b/docs/data/histograms/United States/012L2A.json
@@ -1 +1 @@
-{"batchcode": "012L2A", "histograms": [{"batchcodes": ["012L2A"], "histogram": {"Headache": 2, "Pyrexia": 2, "Body temperature": 1, "Fatigue": 1, "Influenza B virus test": 1, "Influenza like illness": 1, "Nausea": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "012L2A", "histograms": [{"histogram": {"Headache": 2, "Pyrexia": 2, "Body temperature": 1, "Fatigue": 1, "Influenza B virus test": 1, "Influenza like illness": 1, "Nausea": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["012L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L2D8.json b/docs/data/histograms/United States/012L2D8.json
index 7bea9e69fc8..1844f92fa56 100644
--- a/docs/data/histograms/United States/012L2D8.json
+++ b/docs/data/histograms/United States/012L2D8.json
@@ -1 +1 @@
-{"batchcode": "012L2D8", "histograms": [{"batchcodes": ["012L2D8"], "histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Mouth breathing": 1}}]}
\ No newline at end of file
+{"batchcode": "012L2D8", "histograms": [{"histogram": {"Chest discomfort": 1, "Dyspnoea": 1, "Mouth breathing": 1}, "batchcodes": ["012L2D8"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L2DA.json b/docs/data/histograms/United States/012L2DA.json
index c257be01e5f..23abbbd9fbb 100644
--- a/docs/data/histograms/United States/012L2DA.json
+++ b/docs/data/histograms/United States/012L2DA.json
@@ -1 +1 @@
-{"batchcode": "012L2DA", "histograms": [{"batchcodes": ["012L2DA"], "histogram": {"Back pain": 1, "Fatigue": 1, "Headache": 1, "Intentional dose omission": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "012L2DA", "histograms": [{"histogram": {"Back pain": 1, "Fatigue": 1, "Headache": 1, "Intentional dose omission": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Tremor": 1}, "batchcodes": ["012L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012L2OA.json b/docs/data/histograms/United States/012L2OA.json
index fb1267c387e..9f4bbca3ba0 100644
--- a/docs/data/histograms/United States/012L2OA.json
+++ b/docs/data/histograms/United States/012L2OA.json
@@ -1 +1 @@
-{"batchcode": "012L2OA", "histograms": [{"batchcodes": ["012L2OA"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Myalgia": 1, "Oral pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain of skin": 1, "Pyrexia": 1, "Tinnitus": 1, "Upper-airway cough syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "012L2OA", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Myalgia": 1, "Oral pain": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain of skin": 1, "Pyrexia": 1, "Tinnitus": 1, "Upper-airway cough syndrome": 1}, "batchcodes": ["012L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LA0A.json b/docs/data/histograms/United States/012LA0A.json
index e769871d473..ef33a31b769 100644
--- a/docs/data/histograms/United States/012LA0A.json
+++ b/docs/data/histograms/United States/012LA0A.json
@@ -1 +1 @@
-{"batchcode": "012LA0A", "histograms": [{"batchcodes": ["012LA0A"], "histogram": {"Chills": 3, "Dizziness": 3, "Fatigue": 3, "Feeling cold": 3, "Hyperhidrosis": 3, "Pyrexia": 3, "Body temperature": 2, "Feeling abnormal": 2, "Influenza": 2, "Vaccination complication": 2, "Depressed mood": 1, "Influenza like illness": 1}}]}
\ No newline at end of file
+{"batchcode": "012LA0A", "histograms": [{"histogram": {"Chills": 3, "Dizziness": 3, "Fatigue": 3, "Feeling cold": 3, "Hyperhidrosis": 3, "Pyrexia": 3, "Body temperature": 2, "Feeling abnormal": 2, "Influenza": 2, "Vaccination complication": 2, "Depressed mood": 1, "Influenza like illness": 1}, "batchcodes": ["012LA0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LD00A.json b/docs/data/histograms/United States/012LD00A.json
index 0282c4642c5..82f2c2d2f87 100644
--- a/docs/data/histograms/United States/012LD00A.json
+++ b/docs/data/histograms/United States/012LD00A.json
@@ -1 +1 @@
-{"batchcode": "012LD00A", "histograms": [{"batchcodes": ["012LD00A"], "histogram": {"Magnetic resonance imaging": 1, "Ultrasound scan": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012LD00A", "histograms": [{"histogram": {"Magnetic resonance imaging": 1, "Ultrasound scan": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["012LD00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LD0A.json b/docs/data/histograms/United States/012LD0A.json
index 3ab3538f425..5bd406d2658 100644
--- a/docs/data/histograms/United States/012LD0A.json
+++ b/docs/data/histograms/United States/012LD0A.json
@@ -1 +1 @@
-{"batchcode": "012LD0A", "histograms": [{"batchcodes": ["012LD0A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012LD0A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["012LD0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LM0A.json b/docs/data/histograms/United States/012LM0A.json
index 123772835b2..535c0b3c9eb 100644
--- a/docs/data/histograms/United States/012LM0A.json
+++ b/docs/data/histograms/United States/012LM0A.json
@@ -1 +1 @@
-{"batchcode": "012LM0A", "histograms": [{"batchcodes": ["012LM0A"], "histogram": {"Lactose intolerance": 1}}]}
\ No newline at end of file
+{"batchcode": "012LM0A", "histograms": [{"histogram": {"Lactose intolerance": 1}, "batchcodes": ["012LM0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LZ0A OR 017L.json b/docs/data/histograms/United States/012LZ0A OR 017L.json
index 50de0ae6743..d63abb9a120 100644
--- a/docs/data/histograms/United States/012LZ0A OR 017L.json
+++ b/docs/data/histograms/United States/012LZ0A OR 017L.json
@@ -1 +1 @@
-{"batchcode": "012LZ0A OR 017L", "histograms": [{"batchcodes": ["012LZ0A OR 017L"], "histogram": {"Arthralgia": 1, "Cardiac pacemaker insertion": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "012LZ0A OR 017L", "histograms": [{"histogram": {"Arthralgia": 1, "Cardiac pacemaker insertion": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["012LZ0A OR 017L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LZ0A.json b/docs/data/histograms/United States/012LZ0A.json
index b56978c5866..46ec1ee7c49 100644
--- a/docs/data/histograms/United States/012LZ0A.json
+++ b/docs/data/histograms/United States/012LZ0A.json
@@ -1 +1 @@
-{"batchcode": "012LZ0A", "histograms": [{"batchcodes": ["012LZ0A"], "histogram": {"Fatigue": 3, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Acute respiratory failure": 1, "Alopecia": 1, "Body temperature": 1, "Chest X-ray": 1, "Chills": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Feeling abnormal": 1, "Food poisoning": 1, "Illness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Pain": 1, "Pneumonia": 1, "Pulmonary embolism": 1, "Thrombosis": 1, "Ultrasound Doppler": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012LZ0A", "histograms": [{"histogram": {"Fatigue": 3, "Headache": 2, "Nausea": 2, "Pyrexia": 2, "Acute respiratory failure": 1, "Alopecia": 1, "Body temperature": 1, "Chest X-ray": 1, "Chills": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Feeling abnormal": 1, "Food poisoning": 1, "Illness": 1, "Myalgia": 1, "Myocardial infarction": 1, "Pain": 1, "Pneumonia": 1, "Pulmonary embolism": 1, "Thrombosis": 1, "Ultrasound Doppler": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["012LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LZCA.json b/docs/data/histograms/United States/012LZCA.json
index 95320c6a45a..9d581696bec 100644
--- a/docs/data/histograms/United States/012LZCA.json
+++ b/docs/data/histograms/United States/012LZCA.json
@@ -1 +1 @@
-{"batchcode": "012LZCA", "histograms": [{"batchcodes": ["012LZCA"], "histogram": {"Balance disorder": 1, "Dizziness": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012LZCA", "histograms": [{"histogram": {"Balance disorder": 1, "Dizziness": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["012LZCA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012LZOA.json b/docs/data/histograms/United States/012LZOA.json
index ef1fcb26093..cee7850d7d9 100644
--- a/docs/data/histograms/United States/012LZOA.json
+++ b/docs/data/histograms/United States/012LZOA.json
@@ -1 +1 @@
-{"batchcode": "012LZOA", "histograms": [{"batchcodes": ["012LZOA"], "histogram": {"Antibody test": 1, "Bedridden": 1, "Cardiopulmonary exercise test": 1, "Chills": 1, "Fatigue": 1, "Hypersomnia": 1, "Memory impairment": 1, "Mobility decreased": 1, "Myalgia": 1, "Pain": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "012LZOA", "histograms": [{"histogram": {"Antibody test": 1, "Bedridden": 1, "Cardiopulmonary exercise test": 1, "Chills": 1, "Fatigue": 1, "Hypersomnia": 1, "Memory impairment": 1, "Mobility decreased": 1, "Myalgia": 1, "Pain": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["012LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M(Z/2)01.json b/docs/data/histograms/United States/012M(Z/2)01.json
index e76d141c136..534684e5712 100644
--- a/docs/data/histograms/United States/012M(Z/2)01.json
+++ b/docs/data/histograms/United States/012M(Z/2)01.json
@@ -1 +1 @@
-{"batchcode": "012M(Z/2)01", "histograms": [{"batchcodes": ["012M(Z/2)01"], "histogram": {"Faeces discoloured": 1}}]}
\ No newline at end of file
+{"batchcode": "012M(Z/2)01", "histograms": [{"histogram": {"Faeces discoloured": 1}, "batchcodes": ["012M(Z/2)01"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M00A.json b/docs/data/histograms/United States/012M00A.json
index 8efba400a9b..8934200de8c 100644
--- a/docs/data/histograms/United States/012M00A.json
+++ b/docs/data/histograms/United States/012M00A.json
@@ -1 +1 @@
-{"batchcode": "012M00A", "histograms": [{"batchcodes": ["012M00A"], "histogram": {"Abscess limb": 1, "Antibody test": 1, "Burning sensation": 1, "Erythema": 1, "Glossitis": 1, "Mouth ulceration": 1, "Pain": 1, "Peripheral swelling": 1, "Tongue discolouration": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "012M00A", "histograms": [{"histogram": {"Abscess limb": 1, "Antibody test": 1, "Burning sensation": 1, "Erythema": 1, "Glossitis": 1, "Mouth ulceration": 1, "Pain": 1, "Peripheral swelling": 1, "Tongue discolouration": 1, "Weight decreased": 1}, "batchcodes": ["012M00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M020A.json b/docs/data/histograms/United States/012M020A.json
index e98ad707cae..191d7dbf18f 100644
--- a/docs/data/histograms/United States/012M020A.json
+++ b/docs/data/histograms/United States/012M020A.json
@@ -1 +1 @@
-{"batchcode": "012M020A", "histograms": [{"batchcodes": ["012M020A"], "histogram": {"Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012M020A", "histograms": [{"histogram": {"Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["012M020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M0A.json b/docs/data/histograms/United States/012M0A.json
index e887f754d80..d8f402cd2fd 100644
--- a/docs/data/histograms/United States/012M0A.json
+++ b/docs/data/histograms/United States/012M0A.json
@@ -1 +1 @@
-{"batchcode": "012M0A", "histograms": [{"batchcodes": ["012M0A"], "histogram": {"Vaccination site erythema": 2, "Vaccination site warmth": 2, "Device connection issue": 1, "Headache": 1, "Underdose": 1, "Vaccination site irritation": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "012M0A", "histograms": [{"histogram": {"Vaccination site erythema": 2, "Vaccination site warmth": 2, "Device connection issue": 1, "Headache": 1, "Underdose": 1, "Vaccination site irritation": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["012M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M120A.json b/docs/data/histograms/United States/012M120A.json
index 1722d4090f2..08309d8c07a 100644
--- a/docs/data/histograms/United States/012M120A.json
+++ b/docs/data/histograms/United States/012M120A.json
@@ -1 +1 @@
-{"batchcode": "012M120A", "histograms": [{"batchcodes": ["012M120A"], "histogram": {"Pain in extremity": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "012M120A", "histograms": [{"histogram": {"Pain in extremity": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["012M120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M18.json b/docs/data/histograms/United States/012M18.json
index 57849113ac1..34ba6288bec 100644
--- a/docs/data/histograms/United States/012M18.json
+++ b/docs/data/histograms/United States/012M18.json
@@ -1 +1 @@
-{"batchcode": "012M18", "histograms": [{"batchcodes": ["012M18"], "histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Contusion": 1, "Erythema": 1, "Fall": 1, "Hypertension": 1, "Joint swelling": 1, "Musculoskeletal disorder": 1, "Neck mass": 1, "Nervousness": 1, "Peripheral swelling": 1, "Pruritus": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "012M18", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Contusion": 1, "Erythema": 1, "Fall": 1, "Hypertension": 1, "Joint swelling": 1, "Musculoskeletal disorder": 1, "Neck mass": 1, "Nervousness": 1, "Peripheral swelling": 1, "Pruritus": 1, "Vaccination failure": 1}, "batchcodes": ["012M18"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2(OR 7)0A.json b/docs/data/histograms/United States/012M2(OR 7)0A.json
index 8bff00be85d..affa51d73ec 100644
--- a/docs/data/histograms/United States/012M2(OR 7)0A.json
+++ b/docs/data/histograms/United States/012M2(OR 7)0A.json
@@ -1 +1 @@
-{"batchcode": "012M2(OR 7)0A", "histograms": [{"batchcodes": ["012M2(OR 7)0A"], "histogram": {"Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2(OR 7)0A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Urinary tract infection": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["012M2(OR 7)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2-0A.json b/docs/data/histograms/United States/012M2-0A.json
index e175b70bfb2..bba389fd390 100644
--- a/docs/data/histograms/United States/012M2-0A.json
+++ b/docs/data/histograms/United States/012M2-0A.json
@@ -1 +1 @@
-{"batchcode": "012M2-0A", "histograms": [{"batchcodes": ["012M2-0A"], "histogram": {"Maternal exposure during pregnancy": 1, "Pregnancy test": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2-0A", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1, "Pregnancy test": 1}, "batchcodes": ["012M2-0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2-20A.json b/docs/data/histograms/United States/012M2-20A.json
index 4971779579f..ce477cf864c 100644
--- a/docs/data/histograms/United States/012M2-20A.json
+++ b/docs/data/histograms/United States/012M2-20A.json
@@ -1 +1 @@
-{"batchcode": "012M2-20A", "histograms": [{"batchcodes": ["012M2-20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2-20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["012M2-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M20.json b/docs/data/histograms/United States/012M20.json
index f702202d5e1..dc5304d6dbc 100644
--- a/docs/data/histograms/United States/012M20.json
+++ b/docs/data/histograms/United States/012M20.json
@@ -1 +1 @@
-{"batchcode": "012M20", "histograms": [{"batchcodes": ["012M20"], "histogram": {"Anaphylactic reaction": 1, "Device connection issue": 1, "Exposure via skin contact": 1, "Renal infarct": 1, "Renal vein thrombosis": 1, "SARS-CoV-2 antibody test": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Device connection issue": 1, "Exposure via skin contact": 1, "Renal infarct": 1, "Renal vein thrombosis": 1, "SARS-CoV-2 antibody test": 1, "Underdose": 1}, "batchcodes": ["012M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M20/A.json b/docs/data/histograms/United States/012M20/A.json
index 827c4aab00a..9732a83cd24 100644
--- a/docs/data/histograms/United States/012M20/A.json
+++ b/docs/data/histograms/United States/012M20/A.json
@@ -1 +1 @@
-{"batchcode": "012M20/A", "histograms": [{"batchcodes": ["012M20/A"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20/A", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["012M20/A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M201.json b/docs/data/histograms/United States/012M201.json
index a8ad7209021..50c12e8e822 100644
--- a/docs/data/histograms/United States/012M201.json
+++ b/docs/data/histograms/United States/012M201.json
@@ -1 +1 @@
-{"batchcode": "012M201", "histograms": [{"batchcodes": ["012M201"], "histogram": {"Product administered at inappropriate site": 1}}]}
\ No newline at end of file
+{"batchcode": "012M201", "histograms": [{"histogram": {"Product administered at inappropriate site": 1}, "batchcodes": ["012M201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2019.json b/docs/data/histograms/United States/012M2019.json
index da00545dcc2..e8c8d65e966 100644
--- a/docs/data/histograms/United States/012M2019.json
+++ b/docs/data/histograms/United States/012M2019.json
@@ -1 +1 @@
-{"batchcode": "012M2019", "histograms": [{"batchcodes": ["012M2019"], "histogram": {"Pain in extremity": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2019", "histograms": [{"histogram": {"Pain in extremity": 1, "Pruritus": 1}, "batchcodes": ["012M2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M201A.json b/docs/data/histograms/United States/012M201A.json
index e66b224735a..dd5d4006a8d 100644
--- a/docs/data/histograms/United States/012M201A.json
+++ b/docs/data/histograms/United States/012M201A.json
@@ -1 +1 @@
-{"batchcode": "012M201A", "histograms": [{"batchcodes": ["012M201A"], "histogram": {"Pruritus": 2, "Erythema": 1, "Fatigue": 1, "Foot deformity": 1, "Gait disturbance": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rash macular": 1, "Rash papular": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012M201A", "histograms": [{"histogram": {"Pruritus": 2, "Erythema": 1, "Fatigue": 1, "Foot deformity": 1, "Gait disturbance": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rash macular": 1, "Rash papular": 1, "Vaccination site pain": 1}, "batchcodes": ["012M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M204.json b/docs/data/histograms/United States/012M204.json
index 72619c396d5..acc430c53f5 100644
--- a/docs/data/histograms/United States/012M204.json
+++ b/docs/data/histograms/United States/012M204.json
@@ -1 +1 @@
-{"batchcode": "012M204", "histograms": [{"batchcodes": ["012M204"], "histogram": {"Diarrhoea": 2, "Eructation": 1, "Erythema": 1, "Fatigue": 1, "Feeling hot": 1, "Flatulence": 1, "Glossodynia": 1, "Incorrect dose administered": 1, "Infection": 1, "Inflammation": 1, "Magnetic resonance imaging": 1, "Nightmare": 1, "Oropharyngeal pain": 1, "Pulmonary mass": 1, "Rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012M204", "histograms": [{"histogram": {"Diarrhoea": 2, "Eructation": 1, "Erythema": 1, "Fatigue": 1, "Feeling hot": 1, "Flatulence": 1, "Glossodynia": 1, "Incorrect dose administered": 1, "Infection": 1, "Inflammation": 1, "Magnetic resonance imaging": 1, "Nightmare": 1, "Oropharyngeal pain": 1, "Pulmonary mass": 1, "Rash": 1, "Vomiting": 1}, "batchcodes": ["012M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M208.json b/docs/data/histograms/United States/012M208.json
index 1e6a1ff2925..594e6253187 100644
--- a/docs/data/histograms/United States/012M208.json
+++ b/docs/data/histograms/United States/012M208.json
@@ -1 +1 @@
-{"batchcode": "012M208", "histograms": [{"batchcodes": ["012M208"], "histogram": {"Vomiting": 2, "Abdominal discomfort": 1, "Body temperature": 1, "Chills": 1, "Headache": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Motion sickness": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "012M208", "histograms": [{"histogram": {"Vomiting": 2, "Abdominal discomfort": 1, "Body temperature": 1, "Chills": 1, "Headache": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Motion sickness": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["012M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M209.json b/docs/data/histograms/United States/012M209.json
index 3705549bcc2..e31cf09279b 100644
--- a/docs/data/histograms/United States/012M209.json
+++ b/docs/data/histograms/United States/012M209.json
@@ -1 +1 @@
-{"batchcode": "012M209", "histograms": [{"batchcodes": ["012M209"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "012M209", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["012M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M20A MTTDT.json b/docs/data/histograms/United States/012M20A MTTDT.json
index 6711d5dcb2e..faae9eceb99 100644
--- a/docs/data/histograms/United States/012M20A MTTDT.json
+++ b/docs/data/histograms/United States/012M20A MTTDT.json
@@ -1 +1 @@
-{"batchcode": "012M20A MTTDT", "histograms": [{"batchcodes": ["012M20A MTTDT"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20A MTTDT", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["012M20A MTTDT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M20A-72021.json b/docs/data/histograms/United States/012M20A-72021.json
index 13e9f37178e..79cf59e3f32 100644
--- a/docs/data/histograms/United States/012M20A-72021.json
+++ b/docs/data/histograms/United States/012M20A-72021.json
@@ -1 +1 @@
-{"batchcode": "012M20A-72021", "histograms": [{"batchcodes": ["012M20A-72021"], "histogram": {"Asthenia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20A-72021", "histograms": [{"histogram": {"Asthenia": 1, "Pain in extremity": 1}, "batchcodes": ["012M20A-72021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M20A..json b/docs/data/histograms/United States/012M20A..json
index 7b376eabdf9..8a8ec1fcc44 100644
--- a/docs/data/histograms/United States/012M20A..json
+++ b/docs/data/histograms/United States/012M20A..json
@@ -1 +1 @@
-{"batchcode": "012M20A.", "histograms": [{"batchcodes": ["012M20A."], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20A.", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["012M20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M20A.json b/docs/data/histograms/United States/012M20A.json
index 08fc4446860..9c1bfcbc1ef 100644
--- a/docs/data/histograms/United States/012M20A.json
+++ b/docs/data/histograms/United States/012M20A.json
@@ -1 +1 @@
-{"batchcode": "012M20A", "histograms": [{"batchcodes": ["011A21A", "012M20A"], "histogram": {"Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}, {"batchcodes": ["012M20A"], "histogram": {"Headache": 145, "Pyrexia": 143, "Fatigue": 134, "Chills": 125, "Pain in extremity": 116, "Vaccination site pain": 97, "Myalgia": 93, "Nausea": 74, "Pain": 72, "Rash": 69, "Vaccination site erythema": 66, "Dizziness": 63, "Pruritus": 55, "Vaccination site swelling": 51, "Body temperature": 45, "Erythema": 39, "Arthralgia": 38, "Asthenia": 38, "SARS-CoV-2 test": 36, "Vaccination site pruritus": 36, "Vaccination site warmth": 36, "Diarrhoea": 34, "Vaccination site rash": 34, "Feeling abnormal": 33, "COVID-19": 32, "Dyspnoea": 28, "Vomiting": 25, "Blood pressure measurement": 23, "Influenza like illness": 23, "Malaise": 23, "Urticaria": 23, "Injection site erythema": 21, "Peripheral swelling": 21, "Paraesthesia": 20, "Expired product administered": 18, "Lymphadenopathy": 18, "Illness": 16, "Injection site pain": 16, "Swelling": 16, "Vaccination site induration": 16, "Hypoaesthesia": 15, "Injection site swelling": 15, "Decreased appetite": 14, "Heart rate": 14, "Injection site pruritus": 14, "Back pain": 13, "Feeling hot": 13, "Hyperhidrosis": 13, "Somnolence": 13, "Inappropriate schedule of product administration": 12, "Oropharyngeal pain": 12, "Tachycardia": 12, "Chest pain": 11, "Cough": 11, "Herpes zoster": 11, "Limb discomfort": 11, "Maternal exposure during pregnancy": 11, "Product dose omission issue": 11, "Blood test": 10, "Chest discomfort": 10, "Gait disturbance": 10, "Injection site warmth": 10, "Rash erythematous": 10, "Tenderness": 10, "Drug ineffective": 9, "Fall": 9, "Hypersensitivity": 9, "Muscle spasms": 9, "Musculoskeletal stiffness": 9, "Rash macular": 9, "Rash pruritic": 9, "Vaccination site mass": 9, "Computerised tomogram": 8, "Tremor": 8, "Vaccination complication": 8, "Abdominal pain": 7, "Ageusia": 7, "Antibody test": 7, "Balance disorder": 7, "Discomfort": 7, "Heart rate increased": 7, "Hypertension": 7, "Lethargy": 7, "Pregnancy test": 7, "Vaccination site reaction": 7, "Burning sensation": 6, "Dysphagia": 6, "Neck pain": 6, "Palpitations": 6, "Product administered to patient of inappropriate age": 6, "SARS-CoV-2 test positive": 6, "Swelling face": 6, "X-ray": 6, "Abdominal pain upper": 5, "Anosmia": 5, "Extra dose administered": 5, "Feeling cold": 5, "Hypersomnia": 5, "Insomnia": 5, "Joint swelling": 5, "Migraine": 5, "Off label use": 5, "Paraesthesia oral": 5, "Pharyngeal swelling": 5, "Product storage error": 5, "SARS-CoV-2 antibody test": 5, "Ultrasound scan": 5, "Vaccination site lymphadenopathy": 5, "Vertigo": 5, "Abdominal discomfort": 4, "Axillary pain": 4, "Blister": 4, "Body temperature increased": 4, "Cold sweat": 4, "Dehydration": 4, "Electrocardiogram": 4, "Eye swelling": 4, "Flushing": 4, "Hypoaesthesia oral": 4, "Hypokinesia": 4, "Incorrect dose administered": 4, "Injection site discolouration": 4, "Injection site induration": 4, "Mobility decreased": 4, "Muscle twitching": 4, "Nasal congestion": 4, "Nervousness": 4, "Neuralgia": 4, "No adverse event": 4, "Oxygen saturation": 4, "Pain in jaw": 4, "Syncope": 4, "Tinnitus": 4, "Vaccination site bruising": 4, "Bell's palsy": 3, "Blood glucose": 3, "Blood glucose increased": 3, "Blood pressure decreased": 3, "Blood pressure increased": 3, "Condition aggravated": 3, "Confusional state": 3, "Contusion": 3, "Device connection issue": 3, "Ear pain": 3, "Exposure during pregnancy": 3, "Glucose tolerance test": 3, "Injection site mass": 3, "Loss of consciousness": 3, "Memory impairment": 3, "Movement disorder": 3, "Musculoskeletal discomfort": 3, "Myocardial necrosis marker": 3, "Oedema": 3, "Oedema peripheral": 3, "Platelet count": 3, "Pneumonia": 3, "Presyncope": 3, "Rhinorrhoea": 3, "Sensitive skin": 3, "Skin discolouration": 3, "Sleep disorder": 3, "Throat irritation": 3, "Thrombosis": 3, "Underdose": 3, "Vaccination site discolouration": 3, "Vaccination site inflammation": 3, "Vaccination site urticaria": 3, "Accidental overdose": 2, "Accidental underdose": 2, "Adverse reaction": 2, "Alanine aminotransferase": 2, "Alopecia": 2, "Amnesia": 2, "Angioedema": 2, "Anxiety": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Bedridden": 2, "Biopsy": 2, "Blood cholesterol": 2, "Blood creatinine": 2, "Blood pressure fluctuation": 2, "Bone pain": 2, "C-reactive protein": 2, "Counterfeit product administered": 2, "Diplopia": 2, "Discharge": 2, "Disorientation": 2, "Dry skin": 2, "Dysgeusia": 2, "Dysphonia": 2, "Dysuria": 2, "Ear discomfort": 2, "Exposure via breast milk": 2, "Exposure via skin contact": 2, "Eye pain": 2, "Fear": 2, "Feeling of body temperature change": 2, "Fibrin D dimer": 2, "Gait inability": 2, "Gastritis": 2, "Glomerular filtration rate": 2, "Glossodynia": 2, "Groin pain": 2, "Haematocrit": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Hair texture abnormal": 2, "Head discomfort": 2, "Head injury": 2, "Hot flush": 2, "Hypoacusis": 2, "Hypotension": 2, "Incoherent": 2, "Incorrect route of product administration": 2, "Induration": 2, "Inflammation": 2, "Influenza": 2, "Injection site extravasation": 2, "Injection site inflammation": 2, "Injection site rash": 2, "Laryngitis": 2, "Limb mass": 2, "Lymph node pain": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Mean cell volume": 2, "Muscular weakness": 2, "Myocardial infarction": 2, "Neck mass": 2, "Oral discomfort": 2, "Oral herpes": 2, "Oral pain": 2, "Oropharyngeal discomfort": 2, "Panic attack": 2, "Peripheral coldness": 2, "Poor quality product administered": 2, "Post herpetic neuralgia": 2, "Product administered at inappropriate site": 2, "Product temperature excursion issue": 2, "Pulmonary congestion": 2, "Pulmonary embolism": 2, "Pustule": 2, "Rash papular": 2, "Rash vesicular": 2, "Rheumatoid arthritis": 2, "Secretion discharge": 2, "Sinusitis": 2, "Skin laceration": 2, "Skin mass": 2, "Skin reaction": 2, "Sleep deficit": 2, "Speech disorder": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Taste disorder": 2, "Thinking abnormal": 2, "Urinary incontinence": 2, "Urine odour abnormal": 2, "Vaccination site discomfort": 2, "Vaccination site movement impairment": 2, "Vision blurred": 2, "Visual impairment": 2, "White blood cell count": 2, "Abdominal pain lower": 1, "Abnormal faeces": 1, "Abscess limb": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Age-related macular degeneration": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Anion gap": 1, "Antibody test negative": 1, "Aphthous ulcer": 1, "Arrhythmia": 1, "Arthropathy": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Autoimmune disorder": 1, "Behavioural therapy": 1, "Blepharitis": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood culture": 1, "Blood glucose decreased": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blue toe syndrome": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac function test": 1, "Cardiac infection": 1, "Cardiac stress test": 1, "Cardiomegaly": 1, "Cataract": 1, "Catheter management": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cheilitis": 1, "Chest X-ray": 1, "Chlamydia test negative": 1, "Coagulation factor": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Computerised tomogram normal": 1, "Coronavirus test": 1, "Coronavirus test positive": 1, "Culture urine": 1, "Cyanosis": 1, "Cystic fibrosis": 1, "Deafness": 1, "Deafness unilateral": 1, "Death": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diabetes mellitus": 1, "Disturbance in attention": 1, "Dry eye": 1, "Dry mouth": 1, "Dry throat": 1, "Dysarthria": 1, "Ear infection": 1, "Ear infection viral": 1, "Ear swelling": 1, "Eating disorder": 1, "Electrolyte imbalance": 1, "Enamel anomaly": 1, "Epinephrine increased": 1, "Epstein-Barr virus antibody positive": 1, "Essential hypertension": 1, "Exposure to SARS-CoV-2": 1, "Eye disorder": 1, "Eye infection": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid thickening": 1, "Facial pain": 1, "Fear of death": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Feeling jittery": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Fracture": 1, "Freezing phenomenon": 1, "Full blood count": 1, "Gastrooesophageal reflux disease": 1, "Gingival bleeding": 1, "Gingival pain": 1, "Gingival swelling": 1, "Gonorrhoea": 1, "Gout": 1, "Group B streptococcus neonatal sepsis": 1, "HIV antibody": 1, "Haemoglobin abnormal": 1, "Haemoglobin electrophoresis": 1, "Hair injury": 1, "Heart rate decreased": 1, "Hepatic enzyme": 1, "Hepatitis B surface antigen": 1, "Herpes simplex": 1, "Herpes virus infection": 1, "High density lipoprotein": 1, "Hordeolum": 1, "Hypermetabolism": 1, "Hypophagia": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impetigo": 1, "Incorrect product administration duration": 1, "Influenza virus test": 1, "Injection site bruising": 1, "Injection site discomfort": 1, "Injection site lymphadenopathy": 1, "Injection site reaction": 1, "Intervertebral disc degeneration": 1, "Irritability": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Keratosis pilaris": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Lacunar infarction": 1, "Lacunar stroke": 1, "Large intestinal obstruction": 1, "Laryngoscopy": 1, "Lip pain": 1, "Lip swelling": 1, "Liver function test": 1, "Logorrhoea": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lower limb fracture": 1, "Lymphatic disorder": 1, "Magnetic resonance imaging heart": 1, "Mass": 1, "Mastication disorder": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Miosis": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Mucosal inflammation": 1, "Muscle strain": 1, "Nasal discharge discolouration": 1, "Nasal discomfort": 1, "Nasopharyngitis": 1, "Neoplasm": 1, "Neoplasm malignant": 1, "Nerve injury": 1, "Neuroma": 1, "Neuropsychiatric symptoms": 1, "Neutropenia": 1, "Night sweats": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oedema mouth": 1, "Oral candidiasis": 1, "Oropharyngeal blistering": 1, "Orthopnoea": 1, "Osteoarthritis": 1, "Oxygen saturation decreased": 1, "Painful respiration": 1, "Pallor": 1, "Pancreatic carcinoma": 1, "Pancreatic enlargement": 1, "Paralysis": 1, "Parosmia": 1, "Petechiae": 1, "Pharyngitis": 1, "Pharyngitis bacterial": 1, "Photophobia": 1, "Physical examination": 1, "Plague": 1, "Platelet count decreased": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Poor quality sleep": 1, "Prenatal screening test": 1, "Product administration error": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product colour issue": 1, "Productive cough": 1, "Protein total normal": 1, "Pulmonary hypertension": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Rash pustular": 1, "Red blood cell count": 1, "Renal disorder": 1, "Respiratory rate": 1, "Restlessness": 1, "Retching": 1, "Rhesus antigen negative": 1, "Rubella": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Salt craving": 1, "Seborrhoea": 1, "Sensory disturbance": 1, "Sinus congestion": 1, "Sinus disorder": 1, "Sinus pain": 1, "Skin burning sensation": 1, "Skin depigmentation": 1, "Skin discharge": 1, "Skin exfoliation": 1, "Skin induration": 1, "Skin irritation": 1, "Skin swelling": 1, "Skin warm": 1, "Skin wrinkling": 1, "Sleep apnoea syndrome": 1, "Smear cervix": 1, "Sneezing": 1, "Spinal muscular atrophy": 1, "Spinal pain": 1, "Splenomegaly": 1, "Sunburn": 1, "Systemic lupus erythematosus": 1, "Therapeutic response unexpected": 1, "Thyroid gland scan abnormal": 1, "Tongue discolouration": 1, "Tongue disorder": 1, "Tongue pigmentation": 1, "Tooth disorder": 1, "Tooth fracture": 1, "Tooth injury": 1, "Toothache": 1, "Treponema test": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound abdomen": 1, "Upper respiratory tract congestion": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine output increased": 1, "Vaccination failure": 1, "Vaccination site haemorrhage": 1, "Vaccination site nodule": 1, "Vaccination site scab": 1, "Vertebral end plate inflammation": 1, "Vertigo positional": 1, "Weight": 1, "Weight decreased": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20A", "histograms": [{"histogram": {"Diarrhoea": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["011A21A", "012M20A"]}, {"histogram": {"Headache": 145, "Pyrexia": 143, "Fatigue": 134, "Chills": 125, "Pain in extremity": 116, "Vaccination site pain": 97, "Myalgia": 93, "Nausea": 74, "Pain": 72, "Rash": 69, "Vaccination site erythema": 66, "Dizziness": 63, "Pruritus": 55, "Vaccination site swelling": 51, "Body temperature": 45, "Erythema": 39, "Arthralgia": 38, "Asthenia": 38, "SARS-CoV-2 test": 36, "Vaccination site pruritus": 36, "Vaccination site warmth": 36, "Diarrhoea": 34, "Vaccination site rash": 34, "Feeling abnormal": 33, "COVID-19": 32, "Dyspnoea": 28, "Vomiting": 25, "Blood pressure measurement": 23, "Influenza like illness": 23, "Malaise": 23, "Urticaria": 23, "Injection site erythema": 21, "Peripheral swelling": 21, "Paraesthesia": 20, "Expired product administered": 18, "Lymphadenopathy": 18, "Illness": 16, "Injection site pain": 16, "Swelling": 16, "Vaccination site induration": 16, "Hypoaesthesia": 15, "Injection site swelling": 15, "Decreased appetite": 14, "Heart rate": 14, "Injection site pruritus": 14, "Back pain": 13, "Feeling hot": 13, "Hyperhidrosis": 13, "Somnolence": 13, "Inappropriate schedule of product administration": 12, "Oropharyngeal pain": 12, "Tachycardia": 12, "Chest pain": 11, "Cough": 11, "Herpes zoster": 11, "Limb discomfort": 11, "Maternal exposure during pregnancy": 11, "Product dose omission issue": 11, "Blood test": 10, "Chest discomfort": 10, "Gait disturbance": 10, "Injection site warmth": 10, "Rash erythematous": 10, "Tenderness": 10, "Drug ineffective": 9, "Fall": 9, "Hypersensitivity": 9, "Muscle spasms": 9, "Musculoskeletal stiffness": 9, "Rash macular": 9, "Rash pruritic": 9, "Vaccination site mass": 9, "Computerised tomogram": 8, "Tremor": 8, "Vaccination complication": 8, "Abdominal pain": 7, "Ageusia": 7, "Antibody test": 7, "Balance disorder": 7, "Discomfort": 7, "Heart rate increased": 7, "Hypertension": 7, "Lethargy": 7, "Pregnancy test": 7, "Vaccination site reaction": 7, "Burning sensation": 6, "Dysphagia": 6, "Neck pain": 6, "Palpitations": 6, "Product administered to patient of inappropriate age": 6, "SARS-CoV-2 test positive": 6, "Swelling face": 6, "X-ray": 6, "Abdominal pain upper": 5, "Anosmia": 5, "Extra dose administered": 5, "Feeling cold": 5, "Hypersomnia": 5, "Insomnia": 5, "Joint swelling": 5, "Migraine": 5, "Off label use": 5, "Paraesthesia oral": 5, "Pharyngeal swelling": 5, "Product storage error": 5, "SARS-CoV-2 antibody test": 5, "Ultrasound scan": 5, "Vaccination site lymphadenopathy": 5, "Vertigo": 5, "Abdominal discomfort": 4, "Axillary pain": 4, "Blister": 4, "Body temperature increased": 4, "Cold sweat": 4, "Dehydration": 4, "Electrocardiogram": 4, "Eye swelling": 4, "Flushing": 4, "Hypoaesthesia oral": 4, "Hypokinesia": 4, "Incorrect dose administered": 4, "Injection site discolouration": 4, "Injection site induration": 4, "Mobility decreased": 4, "Muscle twitching": 4, "Nasal congestion": 4, "Nervousness": 4, "Neuralgia": 4, "No adverse event": 4, "Oxygen saturation": 4, "Pain in jaw": 4, "Syncope": 4, "Tinnitus": 4, "Vaccination site bruising": 4, "Bell's palsy": 3, "Blood glucose": 3, "Blood glucose increased": 3, "Blood pressure decreased": 3, "Blood pressure increased": 3, "Condition aggravated": 3, "Confusional state": 3, "Contusion": 3, "Device connection issue": 3, "Ear pain": 3, "Exposure during pregnancy": 3, "Glucose tolerance test": 3, "Injection site mass": 3, "Loss of consciousness": 3, "Memory impairment": 3, "Movement disorder": 3, "Musculoskeletal discomfort": 3, "Myocardial necrosis marker": 3, "Oedema": 3, "Oedema peripheral": 3, "Platelet count": 3, "Pneumonia": 3, "Presyncope": 3, "Rhinorrhoea": 3, "Sensitive skin": 3, "Skin discolouration": 3, "Sleep disorder": 3, "Throat irritation": 3, "Thrombosis": 3, "Underdose": 3, "Vaccination site discolouration": 3, "Vaccination site inflammation": 3, "Vaccination site urticaria": 3, "Accidental overdose": 2, "Accidental underdose": 2, "Adverse reaction": 2, "Alanine aminotransferase": 2, "Alopecia": 2, "Amnesia": 2, "Angioedema": 2, "Anxiety": 2, "Arthritis": 2, "Aspartate aminotransferase": 2, "Bedridden": 2, "Biopsy": 2, "Blood cholesterol": 2, "Blood creatinine": 2, "Blood pressure fluctuation": 2, "Bone pain": 2, "C-reactive protein": 2, "Counterfeit product administered": 2, "Diplopia": 2, "Discharge": 2, "Disorientation": 2, "Dry skin": 2, "Dysgeusia": 2, "Dysphonia": 2, "Dysuria": 2, "Ear discomfort": 2, "Exposure via breast milk": 2, "Exposure via skin contact": 2, "Eye pain": 2, "Fear": 2, "Feeling of body temperature change": 2, "Fibrin D dimer": 2, "Gait inability": 2, "Gastritis": 2, "Glomerular filtration rate": 2, "Glossodynia": 2, "Groin pain": 2, "Haematocrit": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Hair texture abnormal": 2, "Head discomfort": 2, "Head injury": 2, "Hot flush": 2, "Hypoacusis": 2, "Hypotension": 2, "Incoherent": 2, "Incorrect route of product administration": 2, "Induration": 2, "Inflammation": 2, "Influenza": 2, "Injection site extravasation": 2, "Injection site inflammation": 2, "Injection site rash": 2, "Laryngitis": 2, "Limb mass": 2, "Lymph node pain": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Mean cell volume": 2, "Muscular weakness": 2, "Myocardial infarction": 2, "Neck mass": 2, "Oral discomfort": 2, "Oral herpes": 2, "Oral pain": 2, "Oropharyngeal discomfort": 2, "Panic attack": 2, "Peripheral coldness": 2, "Poor quality product administered": 2, "Post herpetic neuralgia": 2, "Product administered at inappropriate site": 2, "Product temperature excursion issue": 2, "Pulmonary congestion": 2, "Pulmonary embolism": 2, "Pustule": 2, "Rash papular": 2, "Rash vesicular": 2, "Rheumatoid arthritis": 2, "Secretion discharge": 2, "Sinusitis": 2, "Skin laceration": 2, "Skin mass": 2, "Skin reaction": 2, "Sleep deficit": 2, "Speech disorder": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Taste disorder": 2, "Thinking abnormal": 2, "Urinary incontinence": 2, "Urine odour abnormal": 2, "Vaccination site discomfort": 2, "Vaccination site movement impairment": 2, "Vision blurred": 2, "Visual impairment": 2, "White blood cell count": 2, "Abdominal pain lower": 1, "Abnormal faeces": 1, "Abscess limb": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Age-related macular degeneration": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Anion gap": 1, "Antibody test negative": 1, "Aphthous ulcer": 1, "Arrhythmia": 1, "Arthropathy": 1, "Atrial fibrillation": 1, "Audiogram": 1, "Autoimmune disorder": 1, "Behavioural therapy": 1, "Blepharitis": 1, "Blindness transient": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood culture": 1, "Blood glucose decreased": 1, "Blood potassium": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood triglycerides": 1, "Blood urea": 1, "Blue toe syndrome": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "C-reactive protein increased": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac function test": 1, "Cardiac infection": 1, "Cardiac stress test": 1, "Cardiomegaly": 1, "Cataract": 1, "Catheter management": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cheilitis": 1, "Chest X-ray": 1, "Chlamydia test negative": 1, "Coagulation factor": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Computerised tomogram normal": 1, "Coronavirus test": 1, "Coronavirus test positive": 1, "Culture urine": 1, "Cyanosis": 1, "Cystic fibrosis": 1, "Deafness": 1, "Deafness unilateral": 1, "Death": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Diabetes mellitus": 1, "Disturbance in attention": 1, "Dry eye": 1, "Dry mouth": 1, "Dry throat": 1, "Dysarthria": 1, "Ear infection": 1, "Ear infection viral": 1, "Ear swelling": 1, "Eating disorder": 1, "Electrolyte imbalance": 1, "Enamel anomaly": 1, "Epinephrine increased": 1, "Epstein-Barr virus antibody positive": 1, "Essential hypertension": 1, "Exposure to SARS-CoV-2": 1, "Eye disorder": 1, "Eye infection": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eyelid thickening": 1, "Facial pain": 1, "Fear of death": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Feeling jittery": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Fracture": 1, "Freezing phenomenon": 1, "Full blood count": 1, "Gastrooesophageal reflux disease": 1, "Gingival bleeding": 1, "Gingival pain": 1, "Gingival swelling": 1, "Gonorrhoea": 1, "Gout": 1, "Group B streptococcus neonatal sepsis": 1, "HIV antibody": 1, "Haemoglobin abnormal": 1, "Haemoglobin electrophoresis": 1, "Hair injury": 1, "Heart rate decreased": 1, "Hepatic enzyme": 1, "Hepatitis B surface antigen": 1, "Herpes simplex": 1, "Herpes virus infection": 1, "High density lipoprotein": 1, "Hordeolum": 1, "Hypermetabolism": 1, "Hypophagia": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impetigo": 1, "Incorrect product administration duration": 1, "Influenza virus test": 1, "Injection site bruising": 1, "Injection site discomfort": 1, "Injection site lymphadenopathy": 1, "Injection site reaction": 1, "Intervertebral disc degeneration": 1, "Irritability": 1, "Joint range of motion decreased": 1, "Joint stiffness": 1, "Keratosis pilaris": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Lacunar infarction": 1, "Lacunar stroke": 1, "Large intestinal obstruction": 1, "Laryngoscopy": 1, "Lip pain": 1, "Lip swelling": 1, "Liver function test": 1, "Logorrhoea": 1, "Loss of personal independence in daily activities": 1, "Low density lipoprotein": 1, "Lower limb fracture": 1, "Lymphatic disorder": 1, "Magnetic resonance imaging heart": 1, "Mass": 1, "Mastication disorder": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Miosis": 1, "Motor dysfunction": 1, "Mouth swelling": 1, "Mucosal inflammation": 1, "Muscle strain": 1, "Nasal discharge discolouration": 1, "Nasal discomfort": 1, "Nasopharyngitis": 1, "Neoplasm": 1, "Neoplasm malignant": 1, "Nerve injury": 1, "Neuroma": 1, "Neuropsychiatric symptoms": 1, "Neutropenia": 1, "Night sweats": 1, "Nodule": 1, "Ocular hyperaemia": 1, "Oedema mouth": 1, "Oral candidiasis": 1, "Oropharyngeal blistering": 1, "Orthopnoea": 1, "Osteoarthritis": 1, "Oxygen saturation decreased": 1, "Painful respiration": 1, "Pallor": 1, "Pancreatic carcinoma": 1, "Pancreatic enlargement": 1, "Paralysis": 1, "Parosmia": 1, "Petechiae": 1, "Pharyngitis": 1, "Pharyngitis bacterial": 1, "Photophobia": 1, "Physical examination": 1, "Plague": 1, "Platelet count decreased": 1, "Pollakiuria": 1, "Polymerase chain reaction": 1, "Poor quality sleep": 1, "Prenatal screening test": 1, "Product administration error": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product colour issue": 1, "Productive cough": 1, "Protein total normal": 1, "Pulmonary hypertension": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Rash pustular": 1, "Red blood cell count": 1, "Renal disorder": 1, "Respiratory rate": 1, "Restlessness": 1, "Retching": 1, "Rhesus antigen negative": 1, "Rubella": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 antibody test positive": 1, "Salt craving": 1, "Seborrhoea": 1, "Sensory disturbance": 1, "Sinus congestion": 1, "Sinus disorder": 1, "Sinus pain": 1, "Skin burning sensation": 1, "Skin depigmentation": 1, "Skin discharge": 1, "Skin exfoliation": 1, "Skin induration": 1, "Skin irritation": 1, "Skin swelling": 1, "Skin warm": 1, "Skin wrinkling": 1, "Sleep apnoea syndrome": 1, "Smear cervix": 1, "Sneezing": 1, "Spinal muscular atrophy": 1, "Spinal pain": 1, "Splenomegaly": 1, "Sunburn": 1, "Systemic lupus erythematosus": 1, "Therapeutic response unexpected": 1, "Thyroid gland scan abnormal": 1, "Tongue discolouration": 1, "Tongue disorder": 1, "Tongue pigmentation": 1, "Tooth disorder": 1, "Tooth fracture": 1, "Tooth injury": 1, "Toothache": 1, "Treponema test": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound abdomen": 1, "Upper respiratory tract congestion": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine output increased": 1, "Vaccination failure": 1, "Vaccination site haemorrhage": 1, "Vaccination site nodule": 1, "Vaccination site scab": 1, "Vertebral end plate inflammation": 1, "Vertigo positional": 1, "Weight": 1, "Weight decreased": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["012M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M20M.json b/docs/data/histograms/United States/012M20M.json
index 69885d7977b..51cf03fbe15 100644
--- a/docs/data/histograms/United States/012M20M.json
+++ b/docs/data/histograms/United States/012M20M.json
@@ -1 +1 @@
-{"batchcode": "012M20M", "histograms": [{"batchcodes": ["012M20M"], "histogram": {"Asthma": 1, "Cardiac flutter": 1, "Chest discomfort": 1, "Chills": 1, "Facial asymmetry": 1, "Fatigue": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Tremor": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "012M20M", "histograms": [{"histogram": {"Asthma": 1, "Cardiac flutter": 1, "Chest discomfort": 1, "Chills": 1, "Facial asymmetry": 1, "Fatigue": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Tremor": 1, "Vaccination complication": 1}, "batchcodes": ["012M20M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M21A.json b/docs/data/histograms/United States/012M21A.json
index 777facb6c51..71d5ec0d8bd 100644
--- a/docs/data/histograms/United States/012M21A.json
+++ b/docs/data/histograms/United States/012M21A.json
@@ -1 +1 @@
-{"batchcode": "012M21A", "histograms": [{"batchcodes": ["012M21A"], "histogram": {"Body temperature": 2, "Dizziness": 2, "Pyrexia": 2, "Accidental overdose": 1, "Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "012M21A", "histograms": [{"histogram": {"Body temperature": 2, "Dizziness": 2, "Pyrexia": 2, "Accidental overdose": 1, "Expired product administered": 1}, "batchcodes": ["012M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M26A.json b/docs/data/histograms/United States/012M26A.json
index 1c0c71b59b4..f3079850a3b 100644
--- a/docs/data/histograms/United States/012M26A.json
+++ b/docs/data/histograms/United States/012M26A.json
@@ -1 +1 @@
-{"batchcode": "012M26A", "histograms": [{"batchcodes": ["012M26A"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "012M26A", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["012M26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M28.json b/docs/data/histograms/United States/012M28.json
index 8257ceb32d9..0cffff56c81 100644
--- a/docs/data/histograms/United States/012M28.json
+++ b/docs/data/histograms/United States/012M28.json
@@ -1 +1 @@
-{"batchcode": "012M28", "histograms": [{"batchcodes": ["012M28"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Rash macular": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "012M28", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Rash macular": 1, "Rash pruritic": 1}, "batchcodes": ["012M28"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M29A.json b/docs/data/histograms/United States/012M29A.json
index 6e44e438f9c..e3ffbfe873d 100644
--- a/docs/data/histograms/United States/012M29A.json
+++ b/docs/data/histograms/United States/012M29A.json
@@ -1 +1 @@
-{"batchcode": "012M29A", "histograms": [{"batchcodes": ["012M29A"], "histogram": {"Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "012M29A", "histograms": [{"histogram": {"Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["012M29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2BA.json b/docs/data/histograms/United States/012M2BA.json
index 70fed0578bc..89139ab620e 100644
--- a/docs/data/histograms/United States/012M2BA.json
+++ b/docs/data/histograms/United States/012M2BA.json
@@ -1 +1 @@
-{"batchcode": "012M2BA", "histograms": [{"batchcodes": ["012M2BA"], "histogram": {"Asthenia": 1, "Balance disorder": 1, "Dyspnoea exertional": 1, "Nausea": 1, "Nervousness": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2BA", "histograms": [{"histogram": {"Asthenia": 1, "Balance disorder": 1, "Dyspnoea exertional": 1, "Nausea": 1, "Nervousness": 1, "Pain": 1}, "batchcodes": ["012M2BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2DA.json b/docs/data/histograms/United States/012M2DA.json
index 144f37ab353..dffea968a20 100644
--- a/docs/data/histograms/United States/012M2DA.json
+++ b/docs/data/histograms/United States/012M2DA.json
@@ -1 +1 @@
-{"batchcode": "012M2DA", "histograms": [{"batchcodes": ["012M2DA"], "histogram": {"Alopecia": 1, "Cataract": 1, "Furuncle": 1, "Ophthalmological examination": 1, "Pain in extremity": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2DA", "histograms": [{"histogram": {"Alopecia": 1, "Cataract": 1, "Furuncle": 1, "Ophthalmological examination": 1, "Pain in extremity": 1, "Urticaria": 1}, "batchcodes": ["012M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2O.json b/docs/data/histograms/United States/012M2O.json
index 30a36bc779f..f461bb15743 100644
--- a/docs/data/histograms/United States/012M2O.json
+++ b/docs/data/histograms/United States/012M2O.json
@@ -1 +1 @@
-{"batchcode": "012M2O", "histograms": [{"batchcodes": ["012M2O"], "histogram": {"COVID-19 immunisation": 1, "Dizziness": 1, "Fall": 1, "Gastrooesophageal reflux disease": 1, "Head injury": 1, "Interchange of vaccine products": 1, "Parkinson's disease": 1, "Stoma site infection": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2O", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Dizziness": 1, "Fall": 1, "Gastrooesophageal reflux disease": 1, "Head injury": 1, "Interchange of vaccine products": 1, "Parkinson's disease": 1, "Stoma site infection": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["012M2O"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M2OA.json b/docs/data/histograms/United States/012M2OA.json
index f2821b5b35f..f8fb496fb39 100644
--- a/docs/data/histograms/United States/012M2OA.json
+++ b/docs/data/histograms/United States/012M2OA.json
@@ -1 +1 @@
-{"batchcode": "012M2OA", "histograms": [{"batchcodes": ["012M2OA"], "histogram": {"Asthenia": 2, "Dyspnoea": 2, "Dry throat": 1, "Dysgeusia": 1, "Feeling abnormal": 1, "Product after taste": 1, "Syringe issue": 1, "Throat tightness": 1, "Underdose": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "012M2OA", "histograms": [{"histogram": {"Asthenia": 2, "Dyspnoea": 2, "Dry throat": 1, "Dysgeusia": 1, "Feeling abnormal": 1, "Product after taste": 1, "Syringe issue": 1, "Throat tightness": 1, "Underdose": 1, "Vision blurred": 1}, "batchcodes": ["012M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M420A.json b/docs/data/histograms/United States/012M420A.json
index 3259839d8db..59a1a7b2178 100644
--- a/docs/data/histograms/United States/012M420A.json
+++ b/docs/data/histograms/United States/012M420A.json
@@ -1 +1 @@
-{"batchcode": "012M420A", "histograms": [{"batchcodes": ["012M420A"], "histogram": {"Gait inability": 1, "Sleep disorder": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012M420A", "histograms": [{"histogram": {"Gait inability": 1, "Sleep disorder": 1, "Vaccination site bruising": 1, "Vaccination site erythema": 1, "Vaccination site haemorrhage": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["012M420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012M70A.json b/docs/data/histograms/United States/012M70A.json
index 800cd2ae20e..c872180beb4 100644
--- a/docs/data/histograms/United States/012M70A.json
+++ b/docs/data/histograms/United States/012M70A.json
@@ -1 +1 @@
-{"batchcode": "012M70A", "histograms": [{"batchcodes": ["012M70A"], "histogram": {"Vaccination site bruising": 1}}]}
\ No newline at end of file
+{"batchcode": "012M70A", "histograms": [{"histogram": {"Vaccination site bruising": 1}, "batchcodes": ["012M70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012MA20A.json b/docs/data/histograms/United States/012MA20A.json
index d73012c310f..1f2f6bcb6f5 100644
--- a/docs/data/histograms/United States/012MA20A.json
+++ b/docs/data/histograms/United States/012MA20A.json
@@ -1 +1 @@
-{"batchcode": "012MA20A", "histograms": [{"batchcodes": ["012MA20A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "012MA20A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["012MA20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012MQ0A.json b/docs/data/histograms/United States/012MQ0A.json
index 9fc6e5ee35a..4df0a720ddf 100644
--- a/docs/data/histograms/United States/012MQ0A.json
+++ b/docs/data/histograms/United States/012MQ0A.json
@@ -1 +1 @@
-{"batchcode": "012MQ0A", "histograms": [{"batchcodes": ["012MQ0A"], "histogram": {"Balance disorder": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "012MQ0A", "histograms": [{"histogram": {"Balance disorder": 1, "Hypoaesthesia": 1}, "batchcodes": ["012MQ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012MZ0A.json b/docs/data/histograms/United States/012MZ0A.json
index 02ab9313011..7a0ff003cb7 100644
--- a/docs/data/histograms/United States/012MZ0A.json
+++ b/docs/data/histograms/United States/012MZ0A.json
@@ -1 +1 @@
-{"batchcode": "012MZ0A", "histograms": [{"batchcodes": ["012MZ0A"], "histogram": {"Dizziness": 2, "Amnesia": 1, "Apraxia": 1, "Arthralgia": 1, "Attention deficit hyperactivity disorder": 1, "Chills": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Contusion": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Limbic encephalitis": 1, "Muscular weakness": 1, "Off label use": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sleep apnoea syndrome": 1, "Tremor": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site irritation": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "012MZ0A", "histograms": [{"histogram": {"Dizziness": 2, "Amnesia": 1, "Apraxia": 1, "Arthralgia": 1, "Attention deficit hyperactivity disorder": 1, "Chills": 1, "Cognitive disorder": 1, "Condition aggravated": 1, "Contusion": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Limbic encephalitis": 1, "Muscular weakness": 1, "Off label use": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Sleep apnoea syndrome": 1, "Tremor": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site irritation": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vomiting": 1}, "batchcodes": ["012MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012MZ0A/012M20A.json b/docs/data/histograms/United States/012MZ0A/012M20A.json
index 28d73cffb78..9112f8b177a 100644
--- a/docs/data/histograms/United States/012MZ0A/012M20A.json
+++ b/docs/data/histograms/United States/012MZ0A/012M20A.json
@@ -1 +1 @@
-{"batchcode": "012MZ0A/012M20A", "histograms": [{"batchcodes": ["012MZ0A/012M20A"], "histogram": {"Device connection issue": 1, "Extra dose administered": 1, "Incorrect dose administered": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012MZ0A/012M20A", "histograms": [{"histogram": {"Device connection issue": 1, "Extra dose administered": 1, "Incorrect dose administered": 1, "Injection site pain": 1}, "batchcodes": ["012MZ0A/012M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012MZ0P.json b/docs/data/histograms/United States/012MZ0P.json
index 4a4d8b1bcc1..41c6a844be0 100644
--- a/docs/data/histograms/United States/012MZ0P.json
+++ b/docs/data/histograms/United States/012MZ0P.json
@@ -1 +1 @@
-{"batchcode": "012MZ0P", "histograms": [{"batchcodes": ["012MZ0P"], "histogram": {"Blood glucose": 1, "Blood glucose increased": 1, "Headache": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "012MZ0P", "histograms": [{"histogram": {"Blood glucose": 1, "Blood glucose increased": 1, "Headache": 1, "Vaccination site pain": 1}, "batchcodes": ["012MZ0P"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012N20A.json b/docs/data/histograms/United States/012N20A.json
index d67b49513e1..89febb901ab 100644
--- a/docs/data/histograms/United States/012N20A.json
+++ b/docs/data/histograms/United States/012N20A.json
@@ -1 +1 @@
-{"batchcode": "012N20A", "histograms": [{"batchcodes": ["012N20A"], "histogram": {"Neck pain": 2, "Pain": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nodule": 1, "Pain in extremity": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Swelling face": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "012N20A", "histograms": [{"histogram": {"Neck pain": 2, "Pain": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nodule": 1, "Pain in extremity": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Swelling face": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["012N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012NM20A.json b/docs/data/histograms/United States/012NM20A.json
index b190ff2bad1..b29520c4a05 100644
--- a/docs/data/histograms/United States/012NM20A.json
+++ b/docs/data/histograms/United States/012NM20A.json
@@ -1 +1 @@
-{"batchcode": "012NM20A", "histograms": [{"batchcodes": ["012NM20A"], "histogram": {"Chills": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "012NM20A", "histograms": [{"histogram": {"Chills": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["012NM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012O20A.json b/docs/data/histograms/United States/012O20A.json
index 305b96e3716..52cbe387b91 100644
--- a/docs/data/histograms/United States/012O20A.json
+++ b/docs/data/histograms/United States/012O20A.json
@@ -1 +1 @@
-{"batchcode": "012O20A", "histograms": [{"batchcodes": ["012O20A"], "histogram": {"Dizziness": 1, "Gait disturbance": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "012O20A", "histograms": [{"histogram": {"Dizziness": 1, "Gait disturbance": 1, "Pain in extremity": 1}, "batchcodes": ["012O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/012O42A.json b/docs/data/histograms/United States/012O42A.json
index 084b0f34174..e45be481877 100644
--- a/docs/data/histograms/United States/012O42A.json
+++ b/docs/data/histograms/United States/012O42A.json
@@ -1 +1 @@
-{"batchcode": "012O42A", "histograms": [{"batchcodes": ["012O42A"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "012O42A", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["012O42A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013-204.json b/docs/data/histograms/United States/013-204.json
index 1084fb0631f..2269a6470e0 100644
--- a/docs/data/histograms/United States/013-204.json
+++ b/docs/data/histograms/United States/013-204.json
@@ -1 +1 @@
-{"batchcode": "013-204", "histograms": [{"batchcodes": ["013-204"], "histogram": {"Chills": 1, "Fatigue": 1, "Injection site mass": 1, "Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "013-204", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Injection site mass": 1, "Injection site pruritus": 1}, "batchcodes": ["013-204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013-M20A.json b/docs/data/histograms/United States/013-M20A.json
index 63a84d53899..8a1ed04a4a7 100644
--- a/docs/data/histograms/United States/013-M20A.json
+++ b/docs/data/histograms/United States/013-M20A.json
@@ -1 +1 @@
-{"batchcode": "013-M20A", "histograms": [{"batchcodes": ["013-M20A"], "histogram": {"Blood cholesterol": 1, "Cholesterosis": 1}}]}
\ No newline at end of file
+{"batchcode": "013-M20A", "histograms": [{"histogram": {"Blood cholesterol": 1, "Cholesterosis": 1}, "batchcodes": ["013-M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013020A.json b/docs/data/histograms/United States/013020A.json
index 8ee13dae344..b30af06ceae 100644
--- a/docs/data/histograms/United States/013020A.json
+++ b/docs/data/histograms/United States/013020A.json
@@ -1 +1 @@
-{"batchcode": "013020A", "histograms": [{"batchcodes": ["013020A"], "histogram": {"Alpha 1 foetoprotein normal": 1, "Asthenia": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Nausea": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "013020A", "histograms": [{"histogram": {"Alpha 1 foetoprotein normal": 1, "Asthenia": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Nausea": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Ultrasound scan": 1}, "batchcodes": ["013020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131.20A.json b/docs/data/histograms/United States/0131.20A.json
index dc8dffe8c87..e4de5385611 100644
--- a/docs/data/histograms/United States/0131.20A.json
+++ b/docs/data/histograms/United States/0131.20A.json
@@ -1 +1 @@
-{"batchcode": "0131.20A", "histograms": [{"batchcodes": ["0131.20A"], "histogram": {"Erythema": 1, "Feeling hot": 1, "Rash": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0131.20A", "histograms": [{"histogram": {"Erythema": 1, "Feeling hot": 1, "Rash": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["0131.20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131020A.json b/docs/data/histograms/United States/0131020A.json
index 337ac233b15..ddc029e6361 100644
--- a/docs/data/histograms/United States/0131020A.json
+++ b/docs/data/histograms/United States/0131020A.json
@@ -1 +1 @@
-{"batchcode": "0131020A", "histograms": [{"batchcodes": ["0131020A"], "histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0131020A", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["0131020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131204.json b/docs/data/histograms/United States/0131204.json
index fd5cb007ad1..fc7620fa5da 100644
--- a/docs/data/histograms/United States/0131204.json
+++ b/docs/data/histograms/United States/0131204.json
@@ -1 +1 @@
-{"batchcode": "0131204", "histograms": [{"batchcodes": ["0131204"], "histogram": {"Lip swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0131204", "histograms": [{"histogram": {"Lip swelling": 1}, "batchcodes": ["0131204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013120A OR 013W.json b/docs/data/histograms/United States/013120A OR 013W.json
index d83264e5695..aa054588182 100644
--- a/docs/data/histograms/United States/013120A OR 013W.json
+++ b/docs/data/histograms/United States/013120A OR 013W.json
@@ -1 +1 @@
-{"batchcode": "013120A OR 013W", "histograms": [{"batchcodes": ["013120A OR 013W"], "histogram": {"Injection site pruritus": 1, "Injection site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "013120A OR 013W", "histograms": [{"histogram": {"Injection site pruritus": 1, "Injection site rash": 1}, "batchcodes": ["013120A OR 013W"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013120A.json b/docs/data/histograms/United States/013120A.json
index 426f7e09a47..9f74336f8eb 100644
--- a/docs/data/histograms/United States/013120A.json
+++ b/docs/data/histograms/United States/013120A.json
@@ -1 +1 @@
-{"batchcode": "013120A", "histograms": [{"batchcodes": ["013120A"], "histogram": {"Fatigue": 4, "Headache": 3, "Peripheral swelling": 3, "Vaccination site rash": 3, "Body temperature": 2, "Computerised tomogram": 2, "Dizziness": 2, "Erythema": 2, "Insomnia": 2, "Pain": 2, "Pyrexia": 2, "Rash": 2, "Abdominal pain": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "COVID-19": 1, "Chest X-ray": 1, "Cluster headache": 1, "Confusional state": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysuria": 1, "Facial pain": 1, "Feeling jittery": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Joint swelling": 1, "Memory impairment": 1, "Myalgia": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Panic attack": 1, "Paraesthesia": 1, "Phantom limb syndrome": 1, "Pollakiuria": 1, "Pulmonary function test": 1, "Retching": 1, "Scan myocardial perfusion": 1, "Stress echocardiogram": 1, "Swelling": 1, "Trigeminal neuralgia": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "013120A", "histograms": [{"histogram": {"Fatigue": 4, "Headache": 3, "Peripheral swelling": 3, "Vaccination site rash": 3, "Body temperature": 2, "Computerised tomogram": 2, "Dizziness": 2, "Erythema": 2, "Insomnia": 2, "Pain": 2, "Pyrexia": 2, "Rash": 2, "Abdominal pain": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Balance disorder": 1, "COVID-19": 1, "Chest X-ray": 1, "Cluster headache": 1, "Confusional state": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Dysuria": 1, "Facial pain": 1, "Feeling jittery": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Joint swelling": 1, "Memory impairment": 1, "Myalgia": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Panic attack": 1, "Paraesthesia": 1, "Phantom limb syndrome": 1, "Pollakiuria": 1, "Pulmonary function test": 1, "Retching": 1, "Scan myocardial perfusion": 1, "Stress echocardiogram": 1, "Swelling": 1, "Trigeminal neuralgia": 1, "Vaccination site discomfort": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1}, "batchcodes": ["013120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01312O8.json b/docs/data/histograms/United States/01312O8.json
index 27f1c86e4f9..7182d510b21 100644
--- a/docs/data/histograms/United States/01312O8.json
+++ b/docs/data/histograms/United States/01312O8.json
@@ -1 +1 @@
-{"batchcode": "01312O8", "histograms": [{"batchcodes": ["01312O8"], "histogram": {"Eye haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "01312O8", "histograms": [{"histogram": {"Eye haemorrhage": 1}, "batchcodes": ["01312O8"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131322A.json b/docs/data/histograms/United States/0131322A.json
index 969c7dce376..3c78fe35f46 100644
--- a/docs/data/histograms/United States/0131322A.json
+++ b/docs/data/histograms/United States/0131322A.json
@@ -1 +1 @@
-{"batchcode": "0131322A", "histograms": [{"batchcodes": ["0131322A"], "histogram": {"Allergy to vaccine": 1, "COVID-19 immunisation": 1, "Ear pain": 1, "Ear swelling": 1, "Hypoacusis": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "0131322A", "histograms": [{"histogram": {"Allergy to vaccine": 1, "COVID-19 immunisation": 1, "Ear pain": 1, "Ear swelling": 1, "Hypoacusis": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1, "Swelling face": 1}, "batchcodes": ["0131322A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01314209.json b/docs/data/histograms/United States/01314209.json
index 67607d85876..0a1e5f4eb40 100644
--- a/docs/data/histograms/United States/01314209.json
+++ b/docs/data/histograms/United States/01314209.json
@@ -1 +1 @@
-{"batchcode": "01314209", "histograms": [{"batchcodes": ["01314209"], "histogram": {"Chills": 1, "Ear pain": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "01314209", "histograms": [{"histogram": {"Chills": 1, "Ear pain": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["01314209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131420A.json b/docs/data/histograms/United States/0131420A.json
index 368c95d2cd8..00b973d4603 100644
--- a/docs/data/histograms/United States/0131420A.json
+++ b/docs/data/histograms/United States/0131420A.json
@@ -1 +1 @@
-{"batchcode": "0131420A", "histograms": [{"batchcodes": ["0131420A"], "histogram": {"Chills": 1, "Cough": 1, "Fatigue": 1, "Feeling cold": 1, "Injection site pain": 1, "Rhinorrhoea": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "0131420A", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Fatigue": 1, "Feeling cold": 1, "Injection site pain": 1, "Rhinorrhoea": 1, "Sneezing": 1}, "batchcodes": ["0131420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131720A.json b/docs/data/histograms/United States/0131720A.json
index 7015e2dc8ac..17ea2b2c19d 100644
--- a/docs/data/histograms/United States/0131720A.json
+++ b/docs/data/histograms/United States/0131720A.json
@@ -1 +1 @@
-{"batchcode": "0131720A", "histograms": [{"batchcodes": ["0131720A"], "histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "0131720A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Diarrhoea": 1}, "batchcodes": ["0131720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131921A.json b/docs/data/histograms/United States/0131921A.json
index 051ee9e5491..3e64936a6a0 100644
--- a/docs/data/histograms/United States/0131921A.json
+++ b/docs/data/histograms/United States/0131921A.json
@@ -1 +1 @@
-{"batchcode": "0131921A", "histograms": [{"batchcodes": ["0131921A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0131921A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["0131921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131B21A.json b/docs/data/histograms/United States/0131B21A.json
index 5ba04a9a2b9..8c60eeac8cb 100644
--- a/docs/data/histograms/United States/0131B21A.json
+++ b/docs/data/histograms/United States/0131B21A.json
@@ -1 +1 @@
-{"batchcode": "0131B21A", "histograms": [{"batchcodes": ["0131B21A"], "histogram": {"Swelling": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0131B21A", "histograms": [{"histogram": {"Swelling": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["0131B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0131L20A.json b/docs/data/histograms/United States/0131L20A.json
index 46a5f6d88c5..0720f51a225 100644
--- a/docs/data/histograms/United States/0131L20A.json
+++ b/docs/data/histograms/United States/0131L20A.json
@@ -1 +1 @@
-{"batchcode": "0131L20A", "histograms": [{"batchcodes": ["0131L20A"], "histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0131L20A", "histograms": [{"histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Pain": 1}, "batchcodes": ["0131L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013203A.json b/docs/data/histograms/United States/013203A.json
index b1508139907..2014b22882a 100644
--- a/docs/data/histograms/United States/013203A.json
+++ b/docs/data/histograms/United States/013203A.json
@@ -1 +1 @@
-{"batchcode": "013203A", "histograms": [{"batchcodes": ["013203A"], "histogram": {"Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "013203A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["013203A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01320A.json b/docs/data/histograms/United States/01320A.json
index 8fabec094d3..61ed6632fa6 100644
--- a/docs/data/histograms/United States/01320A.json
+++ b/docs/data/histograms/United States/01320A.json
@@ -1 +1 @@
-{"batchcode": "01320A", "histograms": [{"batchcodes": ["01320A"], "histogram": {"Dizziness": 3, "Nausea": 2, "Chills": 1, "Condition aggravated": 1, "Exposure via breast milk": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Swelling face": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "01320A", "histograms": [{"histogram": {"Dizziness": 3, "Nausea": 2, "Chills": 1, "Condition aggravated": 1, "Exposure via breast milk": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Swelling face": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["01320A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01320MA.json b/docs/data/histograms/United States/01320MA.json
index 298601726b4..31e59dd7089 100644
--- a/docs/data/histograms/United States/01320MA.json
+++ b/docs/data/histograms/United States/01320MA.json
@@ -1 +1 @@
-{"batchcode": "01320MA", "histograms": [{"batchcodes": ["01320MA"], "histogram": {"Diarrhoea": 1, "Haematuria": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "01320MA", "histograms": [{"histogram": {"Diarrhoea": 1, "Haematuria": 1, "Pain in extremity": 1}, "batchcodes": ["01320MA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01321A.json b/docs/data/histograms/United States/01321A.json
index cbd0aa09f9a..c50a4117529 100644
--- a/docs/data/histograms/United States/01321A.json
+++ b/docs/data/histograms/United States/01321A.json
@@ -1 +1 @@
-{"batchcode": "01321A", "histograms": [{"batchcodes": ["01321A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "01321A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["01321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0132204 OR 0132.json b/docs/data/histograms/United States/0132204 OR 0132.json
index c81d50ec878..960c5992399 100644
--- a/docs/data/histograms/United States/0132204 OR 0132.json
+++ b/docs/data/histograms/United States/0132204 OR 0132.json
@@ -1 +1 @@
-{"batchcode": "0132204 OR 0132", "histograms": [{"batchcodes": ["0132204 OR 0132"], "histogram": {"Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "0132204 OR 0132", "histograms": [{"histogram": {"Vaccination site hypoaesthesia": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["0132204 OR 0132"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013220A.json b/docs/data/histograms/United States/013220A.json
index 83a0985f3af..b4ddd3f5c56 100644
--- a/docs/data/histograms/United States/013220A.json
+++ b/docs/data/histograms/United States/013220A.json
@@ -1 +1 @@
-{"batchcode": "013220A", "histograms": [{"batchcodes": ["013220A"], "histogram": {"Pain in extremity": 3, "Fatigue": 2, "Insomnia": 2, "Oropharyngeal pain": 2, "Arthralgia": 1, "Back pain": 1, "Burning sensation": 1, "Electrocardiogram ambulatory": 1, "Injection site mass": 1, "Magnetic resonance imaging heart": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Ventricular extrasystoles": 1}}]}
\ No newline at end of file
+{"batchcode": "013220A", "histograms": [{"histogram": {"Pain in extremity": 3, "Fatigue": 2, "Insomnia": 2, "Oropharyngeal pain": 2, "Arthralgia": 1, "Back pain": 1, "Burning sensation": 1, "Electrocardiogram ambulatory": 1, "Injection site mass": 1, "Magnetic resonance imaging heart": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Ventricular extrasystoles": 1}, "batchcodes": ["013220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01322OA OR 0115.json b/docs/data/histograms/United States/01322OA OR 0115.json
index c4910bbfdc7..796414facf2 100644
--- a/docs/data/histograms/United States/01322OA OR 0115.json
+++ b/docs/data/histograms/United States/01322OA OR 0115.json
@@ -1 +1 @@
-{"batchcode": "01322OA OR 0115", "histograms": [{"batchcodes": ["01322OA OR 0115"], "histogram": {"Chills": 1, "Headache": 1, "Lymphadenopathy": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "01322OA OR 0115", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Lymphadenopathy": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site erythema": 1}, "batchcodes": ["01322OA OR 0115"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0132A21A.json b/docs/data/histograms/United States/0132A21A.json
index 542ea02da4b..69f2c0d7066 100644
--- a/docs/data/histograms/United States/0132A21A.json
+++ b/docs/data/histograms/United States/0132A21A.json
@@ -1 +1 @@
-{"batchcode": "0132A21A", "histograms": [{"batchcodes": ["0132A21A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "0132A21A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}, "batchcodes": ["0132A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0132L20A.json b/docs/data/histograms/United States/0132L20A.json
index 7ff00292911..b6166b26657 100644
--- a/docs/data/histograms/United States/0132L20A.json
+++ b/docs/data/histograms/United States/0132L20A.json
@@ -1 +1 @@
-{"batchcode": "0132L20A", "histograms": [{"batchcodes": ["0132L20A"], "histogram": {"Body temperature": 1, "Burning sensation": 1, "Cold-stimulus headache": 1, "Head discomfort": 1, "Headache": 1, "Nervousness": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0132L20A", "histograms": [{"histogram": {"Body temperature": 1, "Burning sensation": 1, "Cold-stimulus headache": 1, "Head discomfort": 1, "Headache": 1, "Nervousness": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["0132L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0132LOA.json b/docs/data/histograms/United States/0132LOA.json
index eeb30d01697..c324c77bae6 100644
--- a/docs/data/histograms/United States/0132LOA.json
+++ b/docs/data/histograms/United States/0132LOA.json
@@ -1 +1 @@
-{"batchcode": "0132LOA", "histograms": [{"batchcodes": ["0132LOA", "030M2OA"], "histogram": {"Chills": 2, "Erythema": 2, "Headache": 2, "Injection site induration": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2}}]}
\ No newline at end of file
+{"batchcode": "0132LOA", "histograms": [{"histogram": {"Chills": 2, "Erythema": 2, "Headache": 2, "Injection site induration": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2}, "batchcodes": ["0132LOA", "030M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013421A.json b/docs/data/histograms/United States/013421A.json
index ab76adb76d1..e5f237079fa 100644
--- a/docs/data/histograms/United States/013421A.json
+++ b/docs/data/histograms/United States/013421A.json
@@ -1 +1 @@
-{"batchcode": "013421A", "histograms": [{"batchcodes": ["013421A"], "histogram": {"Fatigue": 2, "Myalgia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Body temperature": 1, "Immunisation reaction": 1, "Insomnia": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "013421A", "histograms": [{"histogram": {"Fatigue": 2, "Myalgia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Body temperature": 1, "Immunisation reaction": 1, "Insomnia": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1}, "batchcodes": ["013421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01362019.json b/docs/data/histograms/United States/01362019.json
index e7e5ddead17..3b7e6e1abb2 100644
--- a/docs/data/histograms/United States/01362019.json
+++ b/docs/data/histograms/United States/01362019.json
@@ -1 +1 @@
-{"batchcode": "01362019", "histograms": [{"batchcodes": ["01362019"], "histogram": {"Abdominal pain upper": 1, "Agitation": 1, "Back pain": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Tachycardia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "01362019", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Agitation": 1, "Back pain": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Tachycardia": 1, "Tremor": 1}, "batchcodes": ["01362019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0136204.json b/docs/data/histograms/United States/0136204.json
index 00003a8a6c0..14d240d0b7d 100644
--- a/docs/data/histograms/United States/0136204.json
+++ b/docs/data/histograms/United States/0136204.json
@@ -1 +1 @@
-{"batchcode": "0136204", "histograms": [{"batchcodes": ["0136204"], "histogram": {"Depressed mood": 1, "Dizziness": 1, "Pain": 1, "Product dose omission issue": 1, "Sleep disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0136204", "histograms": [{"histogram": {"Depressed mood": 1, "Dizziness": 1, "Pain": 1, "Product dose omission issue": 1, "Sleep disorder": 1, "Vomiting": 1}, "batchcodes": ["0136204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013620A.json b/docs/data/histograms/United States/013620A.json
index cf6006a8d26..f3dff3816cd 100644
--- a/docs/data/histograms/United States/013620A.json
+++ b/docs/data/histograms/United States/013620A.json
@@ -1 +1 @@
-{"batchcode": "013620A", "histograms": [{"batchcodes": ["013620A"], "histogram": {"Arthralgia": 5, "Nausea": 4, "Pain in extremity": 4, "Vaccination site pain": 4, "Headache": 3, "Asthenia": 2, "Chills": 2, "Dizziness": 2, "Dyspnoea": 2, "Erythema": 2, "Fatigue": 2, "Gait disturbance": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Injection site swelling": 2, "Pain": 2, "Peripheral swelling": 2, "Pyrexia": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Vomiting": 2, "Arthritis": 1, "Body temperature": 1, "Bone pain": 1, "Computerised tomogram head": 1, "Death": 1, "Diarrhoea": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Injection site warmth": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oral mucosal erythema": 1, "Paraesthesia": 1, "Seizure": 1, "Sluggishness": 1, "Stomatitis": 1, "Surgical failure": 1, "Swelling face": 1, "Thrombosis": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "013620A", "histograms": [{"histogram": {"Arthralgia": 5, "Nausea": 4, "Pain in extremity": 4, "Vaccination site pain": 4, "Headache": 3, "Asthenia": 2, "Chills": 2, "Dizziness": 2, "Dyspnoea": 2, "Erythema": 2, "Fatigue": 2, "Gait disturbance": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Injection site swelling": 2, "Pain": 2, "Peripheral swelling": 2, "Pyrexia": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Vomiting": 2, "Arthritis": 1, "Body temperature": 1, "Bone pain": 1, "Computerised tomogram head": 1, "Death": 1, "Diarrhoea": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Injection site warmth": 1, "Joint swelling": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oral mucosal erythema": 1, "Paraesthesia": 1, "Seizure": 1, "Sluggishness": 1, "Stomatitis": 1, "Surgical failure": 1, "Swelling face": 1, "Thrombosis": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}, "batchcodes": ["013620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013626A.json b/docs/data/histograms/United States/013626A.json
index 9c3fe2dcce5..a6a7c32d1e7 100644
--- a/docs/data/histograms/United States/013626A.json
+++ b/docs/data/histograms/United States/013626A.json
@@ -1 +1 @@
-{"batchcode": "013626A", "histograms": [{"batchcodes": ["013626A"], "histogram": {"Vision blurred": 3, "Chills": 1, "Dizziness": 1, "Impaired driving ability": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013626A", "histograms": [{"histogram": {"Vision blurred": 3, "Chills": 1, "Dizziness": 1, "Impaired driving ability": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["013626A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013720A.json b/docs/data/histograms/United States/013720A.json
index 706fbc536d7..502c1319da7 100644
--- a/docs/data/histograms/United States/013720A.json
+++ b/docs/data/histograms/United States/013720A.json
@@ -1 +1 @@
-{"batchcode": "013720A", "histograms": [{"batchcodes": ["013720A"], "histogram": {"Chest pain": 1, "Headache": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013720A", "histograms": [{"histogram": {"Chest pain": 1, "Headache": 1, "Neck pain": 1}, "batchcodes": ["013720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0137K20A.json b/docs/data/histograms/United States/0137K20A.json
index ef9b036677e..8c2609a9722 100644
--- a/docs/data/histograms/United States/0137K20A.json
+++ b/docs/data/histograms/United States/0137K20A.json
@@ -1 +1 @@
-{"batchcode": "0137K20A", "histograms": [{"batchcodes": ["0137K20A"], "histogram": {"Pain in extremity": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "0137K20A", "histograms": [{"histogram": {"Pain in extremity": 1, "Somnolence": 1}, "batchcodes": ["0137K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0138.json b/docs/data/histograms/United States/0138.json
index 7b8dbd62ddc..4cac60ec1f5 100644
--- a/docs/data/histograms/United States/0138.json
+++ b/docs/data/histograms/United States/0138.json
@@ -1 +1 @@
-{"batchcode": "0138", "histograms": [{"batchcodes": ["0138"], "histogram": {"Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "0138", "histograms": [{"histogram": {"Pneumonia": 1}, "batchcodes": ["0138"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013821A.json b/docs/data/histograms/United States/013821A.json
index 4c5c64d0d4e..db10688702b 100644
--- a/docs/data/histograms/United States/013821A.json
+++ b/docs/data/histograms/United States/013821A.json
@@ -1 +1 @@
-{"batchcode": "013821A", "histograms": [{"batchcodes": ["013821A"], "histogram": {"Vaccination site swelling": 2, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013821A", "histograms": [{"histogram": {"Vaccination site swelling": 2, "Body temperature": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["013821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0139406.json b/docs/data/histograms/United States/0139406.json
index 1ba16cd4e51..6240243d744 100644
--- a/docs/data/histograms/United States/0139406.json
+++ b/docs/data/histograms/United States/0139406.json
@@ -1 +1 @@
-{"batchcode": "0139406", "histograms": [{"batchcodes": ["0139406", "026L21A"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Gastric disorder": 1, "Memory impairment": 1, "Migraine": 1, "Palpitations": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Vaccination failure": 1}}, {"batchcodes": ["0139406"], "histogram": {"Abdominal discomfort": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Chills": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Headache": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Migraine": 1, "Pain": 1, "Palpitations": 1, "Post-acute COVID-19 syndrome": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "0139406", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Gastric disorder": 1, "Memory impairment": 1, "Migraine": 1, "Palpitations": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Vaccination failure": 1}, "batchcodes": ["0139406", "026L21A"]}, {"histogram": {"Abdominal discomfort": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Chills": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Headache": 1, "Heart rate": 1, "Interchange of vaccine products": 1, "Loss of personal independence in daily activities": 1, "Memory impairment": 1, "Migraine": 1, "Pain": 1, "Palpitations": 1, "Post-acute COVID-19 syndrome": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1}, "batchcodes": ["0139406"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013?20A.json b/docs/data/histograms/United States/013?20A.json
index ad324f070d7..81b74a6a973 100644
--- a/docs/data/histograms/United States/013?20A.json
+++ b/docs/data/histograms/United States/013?20A.json
@@ -1 +1 @@
-{"batchcode": "013?20A", "histograms": [{"batchcodes": ["013?20A"], "histogram": {"Erythema": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "013?20A", "histograms": [{"histogram": {"Erythema": 1, "Peripheral swelling": 1}, "batchcodes": ["013?20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A12A.json b/docs/data/histograms/United States/013A12A.json
index 060cc7c0087..584c832fe6c 100644
--- a/docs/data/histograms/United States/013A12A.json
+++ b/docs/data/histograms/United States/013A12A.json
@@ -1 +1 @@
-{"batchcode": "013A12A", "histograms": [{"batchcodes": ["013A12A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013A12A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["013A12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A2/A.json b/docs/data/histograms/United States/013A2/A.json
index 9d6c046c250..d95eb15f1b3 100644
--- a/docs/data/histograms/United States/013A2/A.json
+++ b/docs/data/histograms/United States/013A2/A.json
@@ -1 +1 @@
-{"batchcode": "013A2/A", "histograms": [{"batchcodes": ["013A2/A"], "histogram": {"Chills": 1, "Fatigue": 1, "Lethargy": 1, "Malaise": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013A2/A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Lethargy": 1, "Malaise": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["013A2/A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A20A.json b/docs/data/histograms/United States/013A20A.json
index 2e0d4827d10..7f0e3059d53 100644
--- a/docs/data/histograms/United States/013A20A.json
+++ b/docs/data/histograms/United States/013A20A.json
@@ -1 +1 @@
-{"batchcode": "013A20A", "histograms": [{"batchcodes": ["013A20A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Erythema": 1, "Fatigue": 1, "Feeling hot": 1, "Hypersomnia": 1, "Illness": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Thermal burn": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site vesicles": 1}}]}
\ No newline at end of file
+{"batchcode": "013A20A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Erythema": 1, "Fatigue": 1, "Feeling hot": 1, "Hypersomnia": 1, "Illness": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Thermal burn": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site vesicles": 1}, "batchcodes": ["013A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A21.json b/docs/data/histograms/United States/013A21.json
index e1d259e0a03..d65947b80e2 100644
--- a/docs/data/histograms/United States/013A21.json
+++ b/docs/data/histograms/United States/013A21.json
@@ -1 +1 @@
-{"batchcode": "013A21", "histograms": [{"batchcodes": ["013A21"], "histogram": {"Fatigue": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013A21", "histograms": [{"histogram": {"Fatigue": 1, "Pain": 1}, "batchcodes": ["013A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A2119.json b/docs/data/histograms/United States/013A2119.json
index befbb4408bd..ddf977d1263 100644
--- a/docs/data/histograms/United States/013A2119.json
+++ b/docs/data/histograms/United States/013A2119.json
@@ -1 +1 @@
-{"batchcode": "013A2119", "histograms": [{"batchcodes": ["013A2119"], "histogram": {"Antibody test": 1, "Body temperature": 1, "Illness": 1, "Nausea": 1, "Product dose omission issue": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "013A2119", "histograms": [{"histogram": {"Antibody test": 1, "Body temperature": 1, "Illness": 1, "Nausea": 1, "Product dose omission issue": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}, "batchcodes": ["013A2119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A211A.json b/docs/data/histograms/United States/013A211A.json
index ab840f5cc17..f4e32591f3a 100644
--- a/docs/data/histograms/United States/013A211A.json
+++ b/docs/data/histograms/United States/013A211A.json
@@ -1 +1 @@
-{"batchcode": "013A211A", "histograms": [{"batchcodes": ["013A211A"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013A211A", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["013A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A214.json b/docs/data/histograms/United States/013A214.json
index 50c92a7d100..beee08ac071 100644
--- a/docs/data/histograms/United States/013A214.json
+++ b/docs/data/histograms/United States/013A214.json
@@ -1 +1 @@
-{"batchcode": "013A214", "histograms": [{"batchcodes": ["013A214"], "histogram": {"Vaccination site pruritus": 3, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Adverse event": 1, "Cellulitis": 1, "Condition aggravated": 1, "Erythema": 1, "Feeling hot": 1, "Joint swelling": 1, "Pruritus": 1, "Rash": 1, "Urticaria": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "013A214", "histograms": [{"histogram": {"Vaccination site pruritus": 3, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Adverse event": 1, "Cellulitis": 1, "Condition aggravated": 1, "Erythema": 1, "Feeling hot": 1, "Joint swelling": 1, "Pruritus": 1, "Rash": 1, "Urticaria": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}, "batchcodes": ["013A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A219.json b/docs/data/histograms/United States/013A219.json
index 79b0699c3e7..00878662f78 100644
--- a/docs/data/histograms/United States/013A219.json
+++ b/docs/data/histograms/United States/013A219.json
@@ -1 +1 @@
-{"batchcode": "013A219", "histograms": [{"batchcodes": ["013A219"], "histogram": {"Bone pain": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Myalgia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "013A219", "histograms": [{"histogram": {"Bone pain": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Myalgia": 1, "Rash": 1}, "batchcodes": ["013A219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A21A.json b/docs/data/histograms/United States/013A21A.json
index 4cca16175c3..ed847dba5b1 100644
--- a/docs/data/histograms/United States/013A21A.json
+++ b/docs/data/histograms/United States/013A21A.json
@@ -1 +1 @@
-{"batchcode": "013A21A", "histograms": [{"batchcodes": ["013A21A", "FK9895"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["013A21A"], "histogram": {"Headache": 89, "Chills": 83, "Pain in extremity": 83, "Pyrexia": 77, "Fatigue": 71, "Vaccination site pain": 61, "Pain": 53, "Nausea": 48, "Myalgia": 40, "Dizziness": 39, "Pruritus": 39, "Asthenia": 36, "Arthralgia": 35, "Feeling abnormal": 34, "Rash": 34, "Vaccination site erythema": 34, "Peripheral swelling": 28, "Vaccination site swelling": 28, "Vaccination site pruritus": 26, "Diarrhoea": 22, "Erythema": 22, "Vomiting": 21, "Dyspnoea": 19, "Cough": 16, "COVID-19": 15, "Tremor": 15, "Body temperature": 14, "Insomnia": 14, "Limb discomfort": 13, "Lymphadenopathy": 13, "SARS-CoV-2 test": 13, "Urticaria": 13, "Malaise": 12, "Paraesthesia": 12, "Vaccination site rash": 12, "Hypoaesthesia": 11, "Vaccination site warmth": 11, "Gait disturbance": 10, "Hyperhidrosis": 10, "Influenza like illness": 10, "Swelling": 10, "Vaccination site reaction": 10, "Back pain": 9, "Blood pressure measurement": 9, "Decreased appetite": 9, "Feeling hot": 9, "Hypertension": 9, "Neck pain": 9, "Somnolence": 9, "Heart rate increased": 8, "Illness": 8, "Product administered to patient of inappropriate age": 8, "Product dose omission issue": 8, "Vaccination site induration": 8, "Abdominal discomfort": 7, "Abdominal pain upper": 7, "Feeling cold": 7, "Heart rate": 7, "Inappropriate schedule of product administration": 7, "Nasopharyngitis": 7, "Rash pruritic": 7, "Tinnitus": 7, "Vaccination complication": 7, "Chest pain": 6, "Exposure during pregnancy": 6, "Fall": 6, "Injection site erythema": 6, "Injection site swelling": 6, "Lip swelling": 6, "Loss of consciousness": 6, "Muscular weakness": 6, "Oropharyngeal pain": 6, "Rash erythematous": 6, "Swollen tongue": 6, "Taste disorder": 6, "Vaccination site mass": 6, "Vertigo": 6, "Contusion": 5, "Expired product administered": 5, "Herpes zoster": 5, "Hypersomnia": 5, "Nasal congestion": 5, "Pharyngeal swelling": 5, "Swelling face": 5, "Blister": 4, "Computerised tomogram": 4, "Dehydration": 4, "Disorientation": 4, "Dysgeusia": 4, "Electrocardiogram": 4, "Musculoskeletal stiffness": 4, "Neuralgia": 4, "Palpitations": 4, "Pregnancy test": 4, "Therapeutic response unexpected": 4, "Ultrasound scan": 4, "Abdominal pain": 3, "Ageusia": 3, "Axillary pain": 3, "Blood pressure increased": 3, "Bone pain": 3, "Burning sensation": 3, "Condition aggravated": 3, "Confusional state": 3, "Constipation": 3, "Discomfort": 3, "Drug ineffective": 3, "Dysstasia": 3, "Eczema": 3, "Eye irritation": 3, "Eye pain": 3, "Eye swelling": 3, "Feeling of body temperature change": 3, "Flatulence": 3, "Gout": 3, "Hot flush": 3, "Hypersensitivity": 3, "Hypoacusis": 3, "Hypokinesia": 3, "Incorrect route of product administration": 3, "Injection site pain": 3, "Injection site rash": 3, "Injection site warmth": 3, "Lacrimation increased": 3, "Lethargy": 3, "Lymph node pain": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Neuropathy peripheral": 3, "Oropharyngeal discomfort": 3, "Product storage error": 3, "Retching": 3, "Rhinorrhoea": 3, "Vaccination site haemorrhage": 3, "Vaccination site urticaria": 3, "Vision blurred": 3, "Weight decreased": 3, "Accidental overdose": 2, "Accidental underdose": 2, "Anosmia": 2, "Arthritis": 2, "Bedridden": 2, "Blood test": 2, "Cardiac stress test": 2, "Chest discomfort": 2, "Depressed level of consciousness": 2, "Dyspepsia": 2, "Eye disorder": 2, "Fear": 2, "Feeding disorder": 2, "Flushing": 2, "Full blood count": 2, "Haemorrhoids": 2, "Head discomfort": 2, "Heart rate abnormal": 2, "Hypoglycaemia": 2, "Hypotension": 2, "Immobile": 2, "Influenza": 2, "Injection site pruritus": 2, "Maternal exposure during pregnancy": 2, "Meningitis viral": 2, "Musculoskeletal discomfort": 2, "Nervousness": 2, "Night sweats": 2, "No adverse event": 2, "Nodule": 2, "Ocular hyperaemia": 2, "Oral herpes": 2, "Paraesthesia oral": 2, "Parosmia": 2, "Psychotic disorder": 2, "Pulmonary congestion": 2, "Restlessness": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Skin discolouration": 2, "Sleep disorder": 2, "Syncope": 2, "Tachycardia": 2, "Throat irritation": 2, "Throat tightness": 2, "Vaccination site discolouration": 2, "Abdominal distension": 1, "Abnormal dreams": 1, "Adverse drug reaction": 1, "Allergy test": 1, "Alopecia": 1, "Anaemia vitamin B12 deficiency": 1, "Anaphylactic reaction": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Atrioventricular block complete": 1, "Balance disorder": 1, "Bed rest": 1, "Bladder discomfort": 1, "Blister rupture": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood potassium decreased": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Bowel movement irregularity": 1, "Cardiac murmur": 1, "Cardiac pacemaker insertion": 1, "Carditis": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chromaturia": 1, "Cold sweat": 1, "Colonoscopy": 1, "Crying": 1, "Culture urine": 1, "Deafness": 1, "Diabetes mellitus inadequate control": 1, "Diplegia": 1, "Disturbance in attention": 1, "Drug level decreased": 1, "Dry mouth": 1, "Dry skin": 1, "Dry throat": 1, "Dysphagia": 1, "Ear discomfort": 1, "Ear pain": 1, "Electric shock sensation": 1, "Emergency care": 1, "Emotional distress": 1, "Endoscopy": 1, "Enlarged uvula": 1, "Epistaxis": 1, "Erythema of eyelid": 1, "Exposure via breast milk": 1, "Eyelid disorder": 1, "Eyelid irritation": 1, "Faeces discoloured": 1, "Fibrin D dimer increased": 1, "Finger deformity": 1, "Fluid retention": 1, "Food refusal": 1, "Freezing phenomenon": 1, "Frequent bowel movements": 1, "Gait inability": 1, "Gastroenteritis viral": 1, "Gastrointestinal haemorrhage": 1, "General physical condition": 1, "General physical health deterioration": 1, "Gingival swelling": 1, "Growth accelerated": 1, "Guillain-Barre syndrome": 1, "Haematoma": 1, "Haematuria": 1, "Haemorrhage": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme": 1, "Hepatic fibrosis": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Immunisation reaction": 1, "Incoherent": 1, "Incontinence": 1, "Induration": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Injection site lymphadenopathy": 1, "Injection site reaction": 1, "Injection site urticaria": 1, "Intervertebral disc protrusion": 1, "Irritability": 1, "Jaundice": 1, "Joint injury": 1, "Joint stiffness": 1, "Joint swelling": 1, "Lacrimation decreased": 1, "Laryngeal oedema": 1, "Laziness": 1, "Lip dry": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Mass": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Migraine": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Myelitis transverse": 1, "Near death experience": 1, "Neonatal respiratory distress syndrome": 1, "Neuralgic amyotrophy": 1, "Oesophageal discomfort": 1, "Off label use": 1, "Oral lichen planus": 1, "Organising pneumonia": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pain of skin": 1, "Panic reaction": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Photopsia": 1, "Poor quality sleep": 1, "Pre-existing condition improved": 1, "Presyncope": 1, "Product packaging quantity issue": 1, "Product preparation error": 1, "Productive cough": 1, "Pulse abnormal": 1, "Rectal haemorrhage": 1, "Reduced facial expression": 1, "Respiratory tract oedema": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 test negative": 1, "Sciatica": 1, "Seasonal allergy": 1, "Seizure": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Sinus disorder": 1, "Skin discomfort": 1, "Skin disorder": 1, "Skin erosion": 1, "Skin fissures": 1, "Skin haemorrhage": 1, "Skin infection": 1, "Skin swelling": 1, "Skin temperature": 1, "Skin warm": 1, "Sleep deficit": 1, "Sneezing": 1, "Spinal X-ray": 1, "Spontaneous penile erection": 1, "Stent placement": 1, "Stress": 1, "Tendon discomfort": 1, "Tendon pain": 1, "Testicular swelling": 1, "Thrombosis": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Trigeminal neuralgia": 1, "Typical aura without headache": 1, "Ultrasound foetal": 1, "Underdose": 1, "Upper-airway cough syndrome": 1, "Urinary incontinence": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discharge": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Varicose vein": 1, "Ventricular extrasystoles": 1, "Viral infection": 1, "Visual impairment": 1, "Vulvovaginal dryness": 1, "Vulvovaginal pain": 1, "Walking disability": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1, "White blood cell disorder": 1, "Wrong technique in product usage process": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "013A21A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["013A21A", "FK9895"]}, {"histogram": {"Headache": 89, "Chills": 83, "Pain in extremity": 83, "Pyrexia": 77, "Fatigue": 71, "Vaccination site pain": 61, "Pain": 53, "Nausea": 48, "Myalgia": 40, "Dizziness": 39, "Pruritus": 39, "Asthenia": 36, "Arthralgia": 35, "Feeling abnormal": 34, "Rash": 34, "Vaccination site erythema": 34, "Peripheral swelling": 28, "Vaccination site swelling": 28, "Vaccination site pruritus": 26, "Diarrhoea": 22, "Erythema": 22, "Vomiting": 21, "Dyspnoea": 19, "Cough": 16, "COVID-19": 15, "Tremor": 15, "Body temperature": 14, "Insomnia": 14, "Limb discomfort": 13, "Lymphadenopathy": 13, "SARS-CoV-2 test": 13, "Urticaria": 13, "Malaise": 12, "Paraesthesia": 12, "Vaccination site rash": 12, "Hypoaesthesia": 11, "Vaccination site warmth": 11, "Gait disturbance": 10, "Hyperhidrosis": 10, "Influenza like illness": 10, "Swelling": 10, "Vaccination site reaction": 10, "Back pain": 9, "Blood pressure measurement": 9, "Decreased appetite": 9, "Feeling hot": 9, "Hypertension": 9, "Neck pain": 9, "Somnolence": 9, "Heart rate increased": 8, "Illness": 8, "Product administered to patient of inappropriate age": 8, "Product dose omission issue": 8, "Vaccination site induration": 8, "Abdominal discomfort": 7, "Abdominal pain upper": 7, "Feeling cold": 7, "Heart rate": 7, "Inappropriate schedule of product administration": 7, "Nasopharyngitis": 7, "Rash pruritic": 7, "Tinnitus": 7, "Vaccination complication": 7, "Chest pain": 6, "Exposure during pregnancy": 6, "Fall": 6, "Injection site erythema": 6, "Injection site swelling": 6, "Lip swelling": 6, "Loss of consciousness": 6, "Muscular weakness": 6, "Oropharyngeal pain": 6, "Rash erythematous": 6, "Swollen tongue": 6, "Taste disorder": 6, "Vaccination site mass": 6, "Vertigo": 6, "Contusion": 5, "Expired product administered": 5, "Herpes zoster": 5, "Hypersomnia": 5, "Nasal congestion": 5, "Pharyngeal swelling": 5, "Swelling face": 5, "Blister": 4, "Computerised tomogram": 4, "Dehydration": 4, "Disorientation": 4, "Dysgeusia": 4, "Electrocardiogram": 4, "Musculoskeletal stiffness": 4, "Neuralgia": 4, "Palpitations": 4, "Pregnancy test": 4, "Therapeutic response unexpected": 4, "Ultrasound scan": 4, "Abdominal pain": 3, "Ageusia": 3, "Axillary pain": 3, "Blood pressure increased": 3, "Bone pain": 3, "Burning sensation": 3, "Condition aggravated": 3, "Confusional state": 3, "Constipation": 3, "Discomfort": 3, "Drug ineffective": 3, "Dysstasia": 3, "Eczema": 3, "Eye irritation": 3, "Eye pain": 3, "Eye swelling": 3, "Feeling of body temperature change": 3, "Flatulence": 3, "Gout": 3, "Hot flush": 3, "Hypersensitivity": 3, "Hypoacusis": 3, "Hypokinesia": 3, "Incorrect route of product administration": 3, "Injection site pain": 3, "Injection site rash": 3, "Injection site warmth": 3, "Lacrimation increased": 3, "Lethargy": 3, "Lymph node pain": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Neuropathy peripheral": 3, "Oropharyngeal discomfort": 3, "Product storage error": 3, "Retching": 3, "Rhinorrhoea": 3, "Vaccination site haemorrhage": 3, "Vaccination site urticaria": 3, "Vision blurred": 3, "Weight decreased": 3, "Accidental overdose": 2, "Accidental underdose": 2, "Anosmia": 2, "Arthritis": 2, "Bedridden": 2, "Blood test": 2, "Cardiac stress test": 2, "Chest discomfort": 2, "Depressed level of consciousness": 2, "Dyspepsia": 2, "Eye disorder": 2, "Fear": 2, "Feeding disorder": 2, "Flushing": 2, "Full blood count": 2, "Haemorrhoids": 2, "Head discomfort": 2, "Heart rate abnormal": 2, "Hypoglycaemia": 2, "Hypotension": 2, "Immobile": 2, "Influenza": 2, "Injection site pruritus": 2, "Maternal exposure during pregnancy": 2, "Meningitis viral": 2, "Musculoskeletal discomfort": 2, "Nervousness": 2, "Night sweats": 2, "No adverse event": 2, "Nodule": 2, "Ocular hyperaemia": 2, "Oral herpes": 2, "Paraesthesia oral": 2, "Parosmia": 2, "Psychotic disorder": 2, "Pulmonary congestion": 2, "Restlessness": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Skin discolouration": 2, "Sleep disorder": 2, "Syncope": 2, "Tachycardia": 2, "Throat irritation": 2, "Throat tightness": 2, "Vaccination site discolouration": 2, "Abdominal distension": 1, "Abnormal dreams": 1, "Adverse drug reaction": 1, "Allergy test": 1, "Alopecia": 1, "Anaemia vitamin B12 deficiency": 1, "Anaphylactic reaction": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Atrial fibrillation": 1, "Atrioventricular block complete": 1, "Balance disorder": 1, "Bed rest": 1, "Bladder discomfort": 1, "Blister rupture": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood potassium decreased": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Bowel movement irregularity": 1, "Cardiac murmur": 1, "Cardiac pacemaker insertion": 1, "Carditis": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Chromaturia": 1, "Cold sweat": 1, "Colonoscopy": 1, "Crying": 1, "Culture urine": 1, "Deafness": 1, "Diabetes mellitus inadequate control": 1, "Diplegia": 1, "Disturbance in attention": 1, "Drug level decreased": 1, "Dry mouth": 1, "Dry skin": 1, "Dry throat": 1, "Dysphagia": 1, "Ear discomfort": 1, "Ear pain": 1, "Electric shock sensation": 1, "Emergency care": 1, "Emotional distress": 1, "Endoscopy": 1, "Enlarged uvula": 1, "Epistaxis": 1, "Erythema of eyelid": 1, "Exposure via breast milk": 1, "Eyelid disorder": 1, "Eyelid irritation": 1, "Faeces discoloured": 1, "Fibrin D dimer increased": 1, "Finger deformity": 1, "Fluid retention": 1, "Food refusal": 1, "Freezing phenomenon": 1, "Frequent bowel movements": 1, "Gait inability": 1, "Gastroenteritis viral": 1, "Gastrointestinal haemorrhage": 1, "General physical condition": 1, "General physical health deterioration": 1, "Gingival swelling": 1, "Growth accelerated": 1, "Guillain-Barre syndrome": 1, "Haematoma": 1, "Haematuria": 1, "Haemorrhage": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme": 1, "Hepatic fibrosis": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Immunisation reaction": 1, "Incoherent": 1, "Incontinence": 1, "Induration": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Injection site lymphadenopathy": 1, "Injection site reaction": 1, "Injection site urticaria": 1, "Intervertebral disc protrusion": 1, "Irritability": 1, "Jaundice": 1, "Joint injury": 1, "Joint stiffness": 1, "Joint swelling": 1, "Lacrimation decreased": 1, "Laryngeal oedema": 1, "Laziness": 1, "Lip dry": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Mass": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Migraine": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Myelitis transverse": 1, "Near death experience": 1, "Neonatal respiratory distress syndrome": 1, "Neuralgic amyotrophy": 1, "Oesophageal discomfort": 1, "Off label use": 1, "Oral lichen planus": 1, "Organising pneumonia": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pain of skin": 1, "Panic reaction": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Photopsia": 1, "Poor quality sleep": 1, "Pre-existing condition improved": 1, "Presyncope": 1, "Product packaging quantity issue": 1, "Product preparation error": 1, "Productive cough": 1, "Pulse abnormal": 1, "Rectal haemorrhage": 1, "Reduced facial expression": 1, "Respiratory tract oedema": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 test negative": 1, "Sciatica": 1, "Seasonal allergy": 1, "Seizure": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Sinus disorder": 1, "Skin discomfort": 1, "Skin disorder": 1, "Skin erosion": 1, "Skin fissures": 1, "Skin haemorrhage": 1, "Skin infection": 1, "Skin swelling": 1, "Skin temperature": 1, "Skin warm": 1, "Sleep deficit": 1, "Sneezing": 1, "Spinal X-ray": 1, "Spontaneous penile erection": 1, "Stent placement": 1, "Stress": 1, "Tendon discomfort": 1, "Tendon pain": 1, "Testicular swelling": 1, "Thrombosis": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Trigeminal neuralgia": 1, "Typical aura without headache": 1, "Ultrasound foetal": 1, "Underdose": 1, "Upper-airway cough syndrome": 1, "Urinary incontinence": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discharge": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Varicose vein": 1, "Ventricular extrasystoles": 1, "Viral infection": 1, "Visual impairment": 1, "Vulvovaginal dryness": 1, "Vulvovaginal pain": 1, "Walking disability": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1, "White blood cell disorder": 1, "Wrong technique in product usage process": 1, "X-ray": 1}, "batchcodes": ["013A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A21H.json b/docs/data/histograms/United States/013A21H.json
index c0c204523de..073011fe1a5 100644
--- a/docs/data/histograms/United States/013A21H.json
+++ b/docs/data/histograms/United States/013A21H.json
@@ -1 +1 @@
-{"batchcode": "013A21H", "histograms": [{"batchcodes": ["013A21H"], "histogram": {"COVID-19": 1, "Cough": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "013A21H", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["013A21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A221A.json b/docs/data/histograms/United States/013A221A.json
index 771c5fa1901..cba88d53c92 100644
--- a/docs/data/histograms/United States/013A221A.json
+++ b/docs/data/histograms/United States/013A221A.json
@@ -1 +1 @@
-{"batchcode": "013A221A", "histograms": [{"batchcodes": ["013A221A"], "histogram": {"Fall": 1, "Loss of consciousness": 1, "Musculoskeletal stiffness": 1}}]}
\ No newline at end of file
+{"batchcode": "013A221A", "histograms": [{"histogram": {"Fall": 1, "Loss of consciousness": 1, "Musculoskeletal stiffness": 1}, "batchcodes": ["013A221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A27A.json b/docs/data/histograms/United States/013A27A.json
index 4f3cba7ebc0..8a74c5d82d9 100644
--- a/docs/data/histograms/United States/013A27A.json
+++ b/docs/data/histograms/United States/013A27A.json
@@ -1 +1 @@
-{"batchcode": "013A27A", "histograms": [{"batchcodes": ["013A27A"], "histogram": {"Vaccination site pain": 3, "Headache": 2, "Myalgia": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Brachial plexus injury": 1, "Electromyogram": 1, "Glycosylated haemoglobin": 1, "Hypoaesthesia": 1, "Movement disorder": 1, "Nerve conduction studies": 1, "Neuralgic amyotrophy": 1, "Pain": 1, "Paraesthesia": 1, "Pyrexia": 1, "Radiculitis brachial": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "013A27A", "histograms": [{"histogram": {"Vaccination site pain": 3, "Headache": 2, "Myalgia": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Brachial plexus injury": 1, "Electromyogram": 1, "Glycosylated haemoglobin": 1, "Hypoaesthesia": 1, "Movement disorder": 1, "Nerve conduction studies": 1, "Neuralgic amyotrophy": 1, "Pain": 1, "Paraesthesia": 1, "Pyrexia": 1, "Radiculitis brachial": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["013A27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013A71A.json b/docs/data/histograms/United States/013A71A.json
index a1e9bfbf6ac..4a744e9cda4 100644
--- a/docs/data/histograms/United States/013A71A.json
+++ b/docs/data/histograms/United States/013A71A.json
@@ -1 +1 @@
-{"batchcode": "013A71A", "histograms": [{"batchcodes": ["013A71A"], "histogram": {"Asthenia": 1, "Balance disorder": 1, "Fall": 1}}]}
\ No newline at end of file
+{"batchcode": "013A71A", "histograms": [{"histogram": {"Asthenia": 1, "Balance disorder": 1, "Fall": 1}, "batchcodes": ["013A71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013AB1A.json b/docs/data/histograms/United States/013AB1A.json
index ed17935074b..bcd2d939549 100644
--- a/docs/data/histograms/United States/013AB1A.json
+++ b/docs/data/histograms/United States/013AB1A.json
@@ -1 +1 @@
-{"batchcode": "013AB1A", "histograms": [{"batchcodes": ["013AB1A"], "histogram": {"Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "013AB1A", "histograms": [{"histogram": {"Vaccination complication": 1}, "batchcodes": ["013AB1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013AZ(2)1A.json b/docs/data/histograms/United States/013AZ(2)1A.json
index 3ac422c1ed8..145ddb49e5b 100644
--- a/docs/data/histograms/United States/013AZ(2)1A.json
+++ b/docs/data/histograms/United States/013AZ(2)1A.json
@@ -1 +1 @@
-{"batchcode": "013AZ(2)1A", "histograms": [{"batchcodes": ["013AZ(2)1A"], "histogram": {"Asthenia": 2, "Illness": 2, "Myalgia": 2, "Pyrexia": 2, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Photophobia": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "013AZ(2)1A", "histograms": [{"histogram": {"Asthenia": 2, "Illness": 2, "Myalgia": 2, "Pyrexia": 2, "Chills": 1, "Diarrhoea": 1, "Headache": 1, "Hyperhidrosis": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1, "Photophobia": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Vomiting": 1}, "batchcodes": ["013AZ(2)1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013AZ119.json b/docs/data/histograms/United States/013AZ119.json
index 4c0961a2711..22bb752fd57 100644
--- a/docs/data/histograms/United States/013AZ119.json
+++ b/docs/data/histograms/United States/013AZ119.json
@@ -1 +1 @@
-{"batchcode": "013AZ119", "histograms": [{"batchcodes": ["013AZ119"], "histogram": {"Fatigue": 2, "Headache": 2, "Vaccination site pain": 2, "Mobility decreased": 1, "Vaccination site hypersensitivity": 1}}]}
\ No newline at end of file
+{"batchcode": "013AZ119", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Vaccination site pain": 2, "Mobility decreased": 1, "Vaccination site hypersensitivity": 1}, "batchcodes": ["013AZ119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013AZ1A.json b/docs/data/histograms/United States/013AZ1A.json
index dc9a72061a8..41abce94467 100644
--- a/docs/data/histograms/United States/013AZ1A.json
+++ b/docs/data/histograms/United States/013AZ1A.json
@@ -1 +1 @@
-{"batchcode": "013AZ1A", "histograms": [{"batchcodes": ["013AZ1A"], "histogram": {"Asthenia": 2, "Chills": 2, "Fatigue": 2, "Limb discomfort": 2, "Pyrexia": 2, "Ageusia": 1, "Anxiety": 1, "Back pain": 1, "Body temperature": 1, "Erythema": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Insomnia": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Rash pruritic": 1, "Tremor": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "013AZ1A", "histograms": [{"histogram": {"Asthenia": 2, "Chills": 2, "Fatigue": 2, "Limb discomfort": 2, "Pyrexia": 2, "Ageusia": 1, "Anxiety": 1, "Back pain": 1, "Body temperature": 1, "Erythema": 1, "Influenza like illness": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Insomnia": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Rash pruritic": 1, "Tremor": 1, "Vaccination site rash": 1}, "batchcodes": ["013AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013B12A.json b/docs/data/histograms/United States/013B12A.json
index 711255a4dbd..5e8b7b4590a 100644
--- a/docs/data/histograms/United States/013B12A.json
+++ b/docs/data/histograms/United States/013B12A.json
@@ -1 +1 @@
-{"batchcode": "013B12A", "histograms": [{"batchcodes": ["013B12A"], "histogram": {"Diverticulitis": 1, "Fatigue": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013B12A", "histograms": [{"histogram": {"Diverticulitis": 1, "Fatigue": 1, "Pain": 1}, "batchcodes": ["013B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013B20A.json b/docs/data/histograms/United States/013B20A.json
index ae3eeca113c..e3cc81dd340 100644
--- a/docs/data/histograms/United States/013B20A.json
+++ b/docs/data/histograms/United States/013B20A.json
@@ -1 +1 @@
-{"batchcode": "013B20A", "histograms": [{"batchcodes": ["013B20A"], "histogram": {"Fatigue": 2, "Feeling abnormal": 1, "Headache": 1, "Tremor": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "013B20A", "histograms": [{"histogram": {"Fatigue": 2, "Feeling abnormal": 1, "Headache": 1, "Tremor": 1, "Vaccination complication": 1}, "batchcodes": ["013B20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013B21A.json b/docs/data/histograms/United States/013B21A.json
index 3919557cbfc..15a0537c333 100644
--- a/docs/data/histograms/United States/013B21A.json
+++ b/docs/data/histograms/United States/013B21A.json
@@ -1 +1 @@
-{"batchcode": "013B21A", "histograms": [{"batchcodes": ["013B21A"], "histogram": {"Urticaria": 3, "Abdominal pain upper": 2, "Arthralgia": 2, "Constipation": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Headache": 2, "Myalgia": 2, "Neck pain": 2, "Palpitations": 2, "Purpura": 2, "Rash pruritic": 2, "Back pain": 1, "Bone pain": 1, "Cardiac stress test": 1, "Eczema": 1, "Eye swelling": 1, "Influenza": 1, "Lip swelling": 1, "Ocular hyperaemia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "013B21A", "histograms": [{"histogram": {"Urticaria": 3, "Abdominal pain upper": 2, "Arthralgia": 2, "Constipation": 2, "Diarrhoea": 2, "Electrocardiogram": 2, "Headache": 2, "Myalgia": 2, "Neck pain": 2, "Palpitations": 2, "Purpura": 2, "Rash pruritic": 2, "Back pain": 1, "Bone pain": 1, "Cardiac stress test": 1, "Eczema": 1, "Eye swelling": 1, "Influenza": 1, "Lip swelling": 1, "Ocular hyperaemia": 1, "Pain in extremity": 1}, "batchcodes": ["013B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013B22.json b/docs/data/histograms/United States/013B22.json
index 41c3a231e97..b74e3aee949 100644
--- a/docs/data/histograms/United States/013B22.json
+++ b/docs/data/histograms/United States/013B22.json
@@ -1 +1 @@
-{"batchcode": "013B22", "histograms": [{"batchcodes": ["013B22"], "histogram": {"COVID-19 immunisation": 1, "Dyspnoea": 1, "Erythema": 1, "Hypersensitivity": 1, "Illness": 1, "Immunisation reaction": 1, "Interchange of vaccine products": 1, "Jaw disorder": 1, "Loss of consciousness": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "013B22", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Dyspnoea": 1, "Erythema": 1, "Hypersensitivity": 1, "Illness": 1, "Immunisation reaction": 1, "Interchange of vaccine products": 1, "Jaw disorder": 1, "Loss of consciousness": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Seizure": 1}, "batchcodes": ["013B22"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013B22A.json b/docs/data/histograms/United States/013B22A.json
index b639ab66f6a..b505fa80a80 100644
--- a/docs/data/histograms/United States/013B22A.json
+++ b/docs/data/histograms/United States/013B22A.json
@@ -1 +1 @@
-{"batchcode": "013B22A", "histograms": [{"batchcodes": ["013B22A", "017E21H", "1808978"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["013B22A"], "histogram": {"No adverse event": 20, "Expired product administered": 11, "Poor quality product administered": 5, "Product storage error": 5, "Product temperature excursion issue": 5, "Wrong product administered": 3, "COVID-19": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Incorrect product formulation administered": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "013B22A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["013B22A", "017E21H", "1808978"]}, {"histogram": {"No adverse event": 20, "Expired product administered": 11, "Poor quality product administered": 5, "Product storage error": 5, "Product temperature excursion issue": 5, "Wrong product administered": 3, "COVID-19": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Incorrect product formulation administered": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["013B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013C20A.json b/docs/data/histograms/United States/013C20A.json
index bc983378430..c1363d71f3b 100644
--- a/docs/data/histograms/United States/013C20A.json
+++ b/docs/data/histograms/United States/013C20A.json
@@ -1 +1 @@
-{"batchcode": "013C20A", "histograms": [{"batchcodes": ["013C20A"], "histogram": {"Pyrexia": 4, "Pain in extremity": 3, "Arthralgia": 2, "Body temperature": 2, "COVID-19": 2, "Headache": 2, "Nausea": 2, "Pruritus": 2, "Vaccination site swelling": 2, "Abdominal discomfort": 1, "Anxiety": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Hypertension": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "013C20A", "histograms": [{"histogram": {"Pyrexia": 4, "Pain in extremity": 3, "Arthralgia": 2, "Body temperature": 2, "COVID-19": 2, "Headache": 2, "Nausea": 2, "Pruritus": 2, "Vaccination site swelling": 2, "Abdominal discomfort": 1, "Anxiety": 1, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Hypertension": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["013C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013C21A.json b/docs/data/histograms/United States/013C21A.json
index eee9dc9e22b..15b290fc3b4 100644
--- a/docs/data/histograms/United States/013C21A.json
+++ b/docs/data/histograms/United States/013C21A.json
@@ -1 +1 @@
-{"batchcode": "013C21A", "histograms": [{"batchcodes": ["013C21A"], "histogram": {"Abdominal pain": 1, "Abdominal pain lower": 1, "Bowel movement irregularity": 1, "Constipation": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013C21A", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain lower": 1, "Bowel movement irregularity": 1, "Constipation": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1}, "batchcodes": ["013C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013D720A.json b/docs/data/histograms/United States/013D720A.json
index 26a30bc5f60..ed7ee568659 100644
--- a/docs/data/histograms/United States/013D720A.json
+++ b/docs/data/histograms/United States/013D720A.json
@@ -1 +1 @@
-{"batchcode": "013D720A", "histograms": [{"batchcodes": ["013D720A"], "histogram": {"Herpes zoster": 1, "Neuralgia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "013D720A", "histograms": [{"histogram": {"Herpes zoster": 1, "Neuralgia": 1, "Vaccination complication": 1}, "batchcodes": ["013D720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013F20A.json b/docs/data/histograms/United States/013F20A.json
index 09e115b8f56..60ac1455650 100644
--- a/docs/data/histograms/United States/013F20A.json
+++ b/docs/data/histograms/United States/013F20A.json
@@ -1 +1 @@
-{"batchcode": "013F20A", "histograms": [{"batchcodes": ["013F20A"], "histogram": {"Fatigue": 1, "Muscle spasms": 1, "Pain": 1, "Phantom limb syndrome": 1, "Proctalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013F20A", "histograms": [{"histogram": {"Fatigue": 1, "Muscle spasms": 1, "Pain": 1, "Phantom limb syndrome": 1, "Proctalgia": 1, "Pyrexia": 1}, "batchcodes": ["013F20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013F21A..json b/docs/data/histograms/United States/013F21A..json
index 2283d1eb1bf..5dbae0f0ddc 100644
--- a/docs/data/histograms/United States/013F21A..json
+++ b/docs/data/histograms/United States/013F21A..json
@@ -1 +1 @@
-{"batchcode": "013F21A.", "histograms": [{"batchcodes": ["013F21A."], "histogram": {"Hordeolum": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "013F21A.", "histograms": [{"histogram": {"Hordeolum": 1, "Rash": 1}, "batchcodes": ["013F21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013F21A.json b/docs/data/histograms/United States/013F21A.json
index 03a0f6eb616..0cbd55bfd20 100644
--- a/docs/data/histograms/United States/013F21A.json
+++ b/docs/data/histograms/United States/013F21A.json
@@ -1 +1 @@
-{"batchcode": "013F21A", "histograms": [{"batchcodes": ["013F21A", "202A21A"], "histogram": {"SARS-CoV-2 test": 2, "COVID-19 immunisation": 1, "Cough": 1, "Product quality issue": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["013F21A"], "histogram": {"Expired product administered": 43, "Pyrexia": 11, "Vaccination site pain": 7, "Dyspnoea": 6, "Fatigue": 6, "Chills": 5, "Rash": 5, "Body temperature": 4, "COVID-19": 4, "Feeling abnormal": 4, "Inappropriate schedule of product administration": 4, "Pain": 4, "Pain in extremity": 4, "SARS-CoV-2 test": 4, "Vaccination site swelling": 4, "Vaccination site warmth": 4, "Accidental underdose": 3, "Anxiety": 3, "Blood pressure measurement": 3, "Feeling hot": 3, "Myalgia": 3, "Nausea": 3, "Product administration error": 3, "Pruritus": 3, "Urticaria": 3, "Vaccination site erythema": 3, "Vaccination site rash": 3, "Asthenia": 2, "Cough": 2, "Dizziness": 2, "Erythema": 2, "Flushing": 2, "Hypoaesthesia": 2, "Illness": 2, "Influenza like illness": 2, "Loss of personal independence in daily activities": 2, "Muscular weakness": 2, "Paraesthesia": 2, "Peripheral coldness": 2, "Product administered to patient of inappropriate age": 2, "Swelling": 2, "Throat tightness": 2, "Vaccination complication": 2, "Vaccination site induration": 2, "Vaccination site mass": 2, "X-ray": 2, "Accidental overdose": 1, "Anger": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Breakthrough COVID-19": 1, "Breast pain": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Cognitive disorder": 1, "Cold burn": 1, "Contusion": 1, "Depersonalisation/derealisation disorder": 1, "Depression": 1, "Diabetes mellitus inadequate control": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Echocardiogram": 1, "Fear of falling": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypotension": 1, "Impaired work ability": 1, "Injection site pain": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lip blister": 1, "Lip pain": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Memory impairment": 1, "Muscle twitching": 1, "Neck pain": 1, "No adverse event": 1, "Oropharyngeal discomfort": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Product temperature excursion issue": 1, "Pulmonary oedema": 1, "Rash erythematous": 1, "Rash macular": 1, "Retching": 1, "Seizure": 1, "Sinusitis": 1, "Skin mass": 1, "Syncope": 1, "Tachycardia": 1, "Tenderness": 1, "Tongue discomfort": 1, "Tremor": 1, "Ultrasound scan": 1, "Underdose": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "013F21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "COVID-19 immunisation": 1, "Cough": 1, "Product quality issue": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["013F21A", "202A21A"]}, {"histogram": {"Expired product administered": 43, "Pyrexia": 11, "Vaccination site pain": 7, "Dyspnoea": 6, "Fatigue": 6, "Chills": 5, "Rash": 5, "Body temperature": 4, "COVID-19": 4, "Feeling abnormal": 4, "Inappropriate schedule of product administration": 4, "Pain": 4, "Pain in extremity": 4, "SARS-CoV-2 test": 4, "Vaccination site swelling": 4, "Vaccination site warmth": 4, "Accidental underdose": 3, "Anxiety": 3, "Blood pressure measurement": 3, "Feeling hot": 3, "Myalgia": 3, "Nausea": 3, "Product administration error": 3, "Pruritus": 3, "Urticaria": 3, "Vaccination site erythema": 3, "Vaccination site rash": 3, "Asthenia": 2, "Cough": 2, "Dizziness": 2, "Erythema": 2, "Flushing": 2, "Hypoaesthesia": 2, "Illness": 2, "Influenza like illness": 2, "Loss of personal independence in daily activities": 2, "Muscular weakness": 2, "Paraesthesia": 2, "Peripheral coldness": 2, "Product administered to patient of inappropriate age": 2, "Swelling": 2, "Throat tightness": 2, "Vaccination complication": 2, "Vaccination site induration": 2, "Vaccination site mass": 2, "X-ray": 2, "Accidental overdose": 1, "Anger": 1, "Arthralgia": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Back pain": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Breakthrough COVID-19": 1, "Breast pain": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Chest pain": 1, "Cognitive disorder": 1, "Cold burn": 1, "Contusion": 1, "Depersonalisation/derealisation disorder": 1, "Depression": 1, "Diabetes mellitus inadequate control": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dyspnoea exertional": 1, "Ear pain": 1, "Echocardiogram": 1, "Fear of falling": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Gait disturbance": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypotension": 1, "Impaired work ability": 1, "Injection site pain": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Investigation": 1, "Lip blister": 1, "Lip pain": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Memory impairment": 1, "Muscle twitching": 1, "Neck pain": 1, "No adverse event": 1, "Oropharyngeal discomfort": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Periorbital swelling": 1, "Pharyngeal swelling": 1, "Product temperature excursion issue": 1, "Pulmonary oedema": 1, "Rash erythematous": 1, "Rash macular": 1, "Retching": 1, "Seizure": 1, "Sinusitis": 1, "Skin mass": 1, "Syncope": 1, "Tachycardia": 1, "Tenderness": 1, "Tongue discomfort": 1, "Tremor": 1, "Ultrasound scan": 1, "Underdose": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vision blurred": 1}, "batchcodes": ["013F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013FUA.json b/docs/data/histograms/United States/013FUA.json
index 8ccfe7a311d..10f693b9874 100644
--- a/docs/data/histograms/United States/013FUA.json
+++ b/docs/data/histograms/United States/013FUA.json
@@ -1 +1 @@
-{"batchcode": "013FUA", "histograms": [{"batchcodes": ["013FUA"], "histogram": {"Pain in extremity": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "013FUA", "histograms": [{"histogram": {"Pain in extremity": 1, "Tinnitus": 1}, "batchcodes": ["013FUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013H21A OR 013E.json b/docs/data/histograms/United States/013H21A OR 013E.json
index a39e0f8dbc8..4a4e5f31f7e 100644
--- a/docs/data/histograms/United States/013H21A OR 013E.json
+++ b/docs/data/histograms/United States/013H21A OR 013E.json
@@ -1 +1 @@
-{"batchcode": "013H21A OR 013E", "histograms": [{"batchcodes": ["013H21A OR 013E"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Fall": 1, "Joint injury": 1, "Loss of consciousness": 1}}]}
\ No newline at end of file
+{"batchcode": "013H21A OR 013E", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Fall": 1, "Joint injury": 1, "Loss of consciousness": 1}, "batchcodes": ["013H21A OR 013E"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013H21A.json b/docs/data/histograms/United States/013H21A.json
index 5c0155e2e51..c604ae022fe 100644
--- a/docs/data/histograms/United States/013H21A.json
+++ b/docs/data/histograms/United States/013H21A.json
@@ -1 +1 @@
-{"batchcode": "013H21A", "histograms": [{"batchcodes": ["013H21A"], "histogram": {"Alopecia": 1}}]}
\ No newline at end of file
+{"batchcode": "013H21A", "histograms": [{"histogram": {"Alopecia": 1}, "batchcodes": ["013H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013H21B.json b/docs/data/histograms/United States/013H21B.json
index 66b13be81ec..5d70218a1f4 100644
--- a/docs/data/histograms/United States/013H21B.json
+++ b/docs/data/histograms/United States/013H21B.json
@@ -1 +1 @@
-{"batchcode": "013H21B", "histograms": [{"batchcodes": ["013H21B"], "histogram": {"Expired product administered": 20, "Product storage error": 10, "Feeling abnormal": 3, "Body temperature": 2, "Eczema": 2, "Pyrexia": 2, "Accidental underdose": 1, "Asthenia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bone pain": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Erythema": 1, "Gait disturbance": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "No adverse event": 1, "Pain": 1, "Pain of skin": 1, "Pustule": 1, "Rash erythematous": 1, "SARS-CoV-2 test": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin reaction": 1, "Syncope": 1, "Tongue discomfort": 1, "Tongue pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "013H21B", "histograms": [{"histogram": {"Expired product administered": 20, "Product storage error": 10, "Feeling abnormal": 3, "Body temperature": 2, "Eczema": 2, "Pyrexia": 2, "Accidental underdose": 1, "Asthenia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bone pain": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Dizziness": 1, "Erythema": 1, "Gait disturbance": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "No adverse event": 1, "Pain": 1, "Pain of skin": 1, "Pustule": 1, "Rash erythematous": 1, "SARS-CoV-2 test": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin reaction": 1, "Syncope": 1, "Tongue discomfort": 1, "Tongue pruritus": 1}, "batchcodes": ["013H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013H21R.json b/docs/data/histograms/United States/013H21R.json
index 8089d07ddb1..026b4e5b0b9 100644
--- a/docs/data/histograms/United States/013H21R.json
+++ b/docs/data/histograms/United States/013H21R.json
@@ -1 +1 @@
-{"batchcode": "013H21R", "histograms": [{"batchcodes": ["013H21R"], "histogram": {"Hypoacusis": 1}}]}
\ No newline at end of file
+{"batchcode": "013H21R", "histograms": [{"histogram": {"Hypoacusis": 1}, "batchcodes": ["013H21R"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013H22A.json b/docs/data/histograms/United States/013H22A.json
index 7a1d7318967..6a3438e33cf 100644
--- a/docs/data/histograms/United States/013H22A.json
+++ b/docs/data/histograms/United States/013H22A.json
@@ -1 +1 @@
-{"batchcode": "013H22A", "histograms": [{"batchcodes": ["013H22A"], "histogram": {"No adverse event": 22, "Expired product administered": 17, "Product storage error": 12, "Wrong product administered": 3, "Axillary pain": 2, "Pain in extremity": 2, "Pruritus": 2, "Accidental underdose": 1, "Axillary mass": 1, "Body temperature": 1, "COVID-19": 1, "Feeling hot": 1, "Guttate psoriasis": 1, "Hepatic enzyme increased": 1, "Inappropriate schedule of product administration": 1, "Joint effusion": 1, "Joint swelling": 1, "Liver function test": 1, "Mass": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013H22A", "histograms": [{"histogram": {"No adverse event": 22, "Expired product administered": 17, "Product storage error": 12, "Wrong product administered": 3, "Axillary pain": 2, "Pain in extremity": 2, "Pruritus": 2, "Accidental underdose": 1, "Axillary mass": 1, "Body temperature": 1, "COVID-19": 1, "Feeling hot": 1, "Guttate psoriasis": 1, "Hepatic enzyme increased": 1, "Inappropriate schedule of product administration": 1, "Joint effusion": 1, "Joint swelling": 1, "Liver function test": 1, "Mass": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["013H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013HNA.json b/docs/data/histograms/United States/013HNA.json
index eeead1847ed..8cd1d79768f 100644
--- a/docs/data/histograms/United States/013HNA.json
+++ b/docs/data/histograms/United States/013HNA.json
@@ -1 +1 @@
-{"batchcode": "013HNA", "histograms": [{"batchcodes": ["013HNA"], "histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "013HNA", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Myalgia": 1}, "batchcodes": ["013HNA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013J201A.json b/docs/data/histograms/United States/013J201A.json
index 9797e9c1f80..7ef2f350787 100644
--- a/docs/data/histograms/United States/013J201A.json
+++ b/docs/data/histograms/United States/013J201A.json
@@ -1 +1 @@
-{"batchcode": "013J201A", "histograms": [{"batchcodes": ["013J201A"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013J201A", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["013J201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013J20A.json b/docs/data/histograms/United States/013J20A.json
index 07a944c7753..166ec8c1b66 100644
--- a/docs/data/histograms/United States/013J20A.json
+++ b/docs/data/histograms/United States/013J20A.json
@@ -1 +1 @@
-{"batchcode": "013J20A", "histograms": [{"batchcodes": ["013J20A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "013J20A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["013J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013K20A.json b/docs/data/histograms/United States/013K20A.json
index 79c77f7eb03..89e24978bc8 100644
--- a/docs/data/histograms/United States/013K20A.json
+++ b/docs/data/histograms/United States/013K20A.json
@@ -1 +1 @@
-{"batchcode": "013K20A", "histograms": [{"batchcodes": ["013K20A"], "histogram": {"Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "013K20A", "histograms": [{"histogram": {"Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site urticaria": 1}, "batchcodes": ["013K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013K21A.json b/docs/data/histograms/United States/013K21A.json
index e62d1505d1f..d60cac1771f 100644
--- a/docs/data/histograms/United States/013K21A.json
+++ b/docs/data/histograms/United States/013K21A.json
@@ -1 +1 @@
-{"batchcode": "013K21A", "histograms": [{"batchcodes": ["013K21A"], "histogram": {"Back pain": 1, "Erythema": 1, "Feeling hot": 1, "Injection site warmth": 1, "Peripheral swelling": 1, "Pruritus": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "013K21A", "histograms": [{"histogram": {"Back pain": 1, "Erythema": 1, "Feeling hot": 1, "Injection site warmth": 1, "Peripheral swelling": 1, "Pruritus": 1, "Swelling": 1}, "batchcodes": ["013K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013KL20A.json b/docs/data/histograms/United States/013KL20A.json
index c53a27aae8b..abeb5a70721 100644
--- a/docs/data/histograms/United States/013KL20A.json
+++ b/docs/data/histograms/United States/013KL20A.json
@@ -1 +1 @@
-{"batchcode": "013KL20A", "histograms": [{"batchcodes": ["013KL20A"], "histogram": {"Chills": 1, "Headache": 1, "Insomnia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "013KL20A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Insomnia": 1, "Tremor": 1}, "batchcodes": ["013KL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L02A.json b/docs/data/histograms/United States/013L02A.json
index 4e4eb921446..9a24d0aac7e 100644
--- a/docs/data/histograms/United States/013L02A.json
+++ b/docs/data/histograms/United States/013L02A.json
@@ -1 +1 @@
-{"batchcode": "013L02A", "histograms": [{"batchcodes": ["013L02A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013L02A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["013L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L10A.json b/docs/data/histograms/United States/013L10A.json
index 5637c5b0a28..c699f04de5b 100644
--- a/docs/data/histograms/United States/013L10A.json
+++ b/docs/data/histograms/United States/013L10A.json
@@ -1 +1 @@
-{"batchcode": "013L10A", "histograms": [{"batchcodes": ["013L10A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013L10A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["013L10A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L2.json b/docs/data/histograms/United States/013L2.json
index ef95b48d9dd..e929f090443 100644
--- a/docs/data/histograms/United States/013L2.json
+++ b/docs/data/histograms/United States/013L2.json
@@ -1 +1 @@
-{"batchcode": "013L2", "histograms": [{"batchcodes": ["013L2"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "013L2", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["013L2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20 NOT CLEA.json b/docs/data/histograms/United States/013L20 NOT CLEA.json
index 933911a2369..53f33a6701b 100644
--- a/docs/data/histograms/United States/013L20 NOT CLEA.json
+++ b/docs/data/histograms/United States/013L20 NOT CLEA.json
@@ -1 +1 @@
-{"batchcode": "013L20 NOT CLEA", "histograms": [{"batchcodes": ["013L20 NOT CLEA"], "histogram": {"Adverse reaction": 1, "Chills": 1, "Dizziness": 1, "Feeling of body temperature change": 1, "Illness": 1, "Mobility decreased": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20 NOT CLEA", "histograms": [{"histogram": {"Adverse reaction": 1, "Chills": 1, "Dizziness": 1, "Feeling of body temperature change": 1, "Illness": 1, "Mobility decreased": 1, "Visual impairment": 1}, "batchcodes": ["013L20 NOT CLEA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20(O)A.json b/docs/data/histograms/United States/013L20(O)A.json
index 242a9e70e64..5a6c892aff9 100644
--- a/docs/data/histograms/United States/013L20(O)A.json
+++ b/docs/data/histograms/United States/013L20(O)A.json
@@ -1 +1 @@
-{"batchcode": "013L20(O)A", "histograms": [{"batchcodes": ["013L20(O)A"], "histogram": {"Accidental overdose": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20(O)A", "histograms": [{"histogram": {"Accidental overdose": 1}, "batchcodes": ["013L20(O)A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20.json b/docs/data/histograms/United States/013L20.json
index e92a7e9fd50..b65d3651e4f 100644
--- a/docs/data/histograms/United States/013L20.json
+++ b/docs/data/histograms/United States/013L20.json
@@ -1 +1 @@
-{"batchcode": "013L20", "histograms": [{"batchcodes": ["013L20"], "histogram": {"Fatigue": 3, "Dizziness": 2, "Myalgia": 2, "Pyrexia": 2, "Balance disorder": 1, "Blood glucose": 1, "Chills": 1, "Dyspnoea": 1, "Heart rate": 1, "Herpes virus infection": 1, "Hypotension": 1, "Injection site erythema": 1, "Injection site pain": 1, "Intraocular pressure test": 1, "Nasopharyngitis": 1, "Oral herpes": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Photophobia": 1, "Rash pruritic": 1, "Vaccination site discomfort": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20", "histograms": [{"histogram": {"Fatigue": 3, "Dizziness": 2, "Myalgia": 2, "Pyrexia": 2, "Balance disorder": 1, "Blood glucose": 1, "Chills": 1, "Dyspnoea": 1, "Heart rate": 1, "Herpes virus infection": 1, "Hypotension": 1, "Injection site erythema": 1, "Injection site pain": 1, "Intraocular pressure test": 1, "Nasopharyngitis": 1, "Oral herpes": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Photophobia": 1, "Rash pruritic": 1, "Vaccination site discomfort": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["013L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L2019.json b/docs/data/histograms/United States/013L2019.json
index 0cc16b4f118..2e3aaac10f2 100644
--- a/docs/data/histograms/United States/013L2019.json
+++ b/docs/data/histograms/United States/013L2019.json
@@ -1 +1 @@
-{"batchcode": "013L2019", "histograms": [{"batchcodes": ["013L2019"], "histogram": {"Body temperature": 1, "Dizziness": 1, "Erythema": 1, "Nausea": 1, "Paraesthesia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013L2019", "histograms": [{"histogram": {"Body temperature": 1, "Dizziness": 1, "Erythema": 1, "Nausea": 1, "Paraesthesia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["013L2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L201A.json b/docs/data/histograms/United States/013L201A.json
index 0463c9feb5c..d39335fe1d9 100644
--- a/docs/data/histograms/United States/013L201A.json
+++ b/docs/data/histograms/United States/013L201A.json
@@ -1 +1 @@
-{"batchcode": "013L201A", "histograms": [{"batchcodes": ["013L201A"], "histogram": {"Rash": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013L201A", "histograms": [{"histogram": {"Rash": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["013L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L204.json b/docs/data/histograms/United States/013L204.json
index 7d98777ad4b..29177fefae6 100644
--- a/docs/data/histograms/United States/013L204.json
+++ b/docs/data/histograms/United States/013L204.json
@@ -1 +1 @@
-{"batchcode": "013L204", "histograms": [{"batchcodes": ["013L204"], "histogram": {"COVID-19": 2, "Headache": 2, "Nausea": 2, "Vaccination site erythema": 2, "Accidental overdose": 1, "Ageusia": 1, "Angular cheilitis": 1, "Cough": 1, "Dry throat": 1, "Dysphagia": 1, "Incorrect dose administered": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Polydipsia": 1, "Pyrexia": 1, "Rhinitis": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Stomatitis": 1, "Tongue injury": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013L204", "histograms": [{"histogram": {"COVID-19": 2, "Headache": 2, "Nausea": 2, "Vaccination site erythema": 2, "Accidental overdose": 1, "Ageusia": 1, "Angular cheilitis": 1, "Cough": 1, "Dry throat": 1, "Dysphagia": 1, "Incorrect dose administered": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Polydipsia": 1, "Pyrexia": 1, "Rhinitis": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Stomatitis": 1, "Tongue injury": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["013L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L208.json b/docs/data/histograms/United States/013L208.json
index a7f7b6cb319..9abfa8eb85a 100644
--- a/docs/data/histograms/United States/013L208.json
+++ b/docs/data/histograms/United States/013L208.json
@@ -1 +1 @@
-{"batchcode": "013L208", "histograms": [{"batchcodes": ["013L208"], "histogram": {"Pain in extremity": 2, "Vaccination site erythema": 2, "Chills": 1, "Fatigue": 1, "Myalgia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013L208", "histograms": [{"histogram": {"Pain in extremity": 2, "Vaccination site erythema": 2, "Chills": 1, "Fatigue": 1, "Myalgia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["013L208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L208A.json b/docs/data/histograms/United States/013L208A.json
index 9ea33bb63f1..b5363b36107 100644
--- a/docs/data/histograms/United States/013L208A.json
+++ b/docs/data/histograms/United States/013L208A.json
@@ -1 +1 @@
-{"batchcode": "013L208A", "histograms": [{"batchcodes": ["013L208A"], "histogram": {"Dizziness": 1, "International normalised ratio": 1, "International normalised ratio increased": 1}}]}
\ No newline at end of file
+{"batchcode": "013L208A", "histograms": [{"histogram": {"Dizziness": 1, "International normalised ratio": 1, "International normalised ratio increased": 1}, "batchcodes": ["013L208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L209.json b/docs/data/histograms/United States/013L209.json
index 4ffccfe488e..0f62c1c867b 100644
--- a/docs/data/histograms/United States/013L209.json
+++ b/docs/data/histograms/United States/013L209.json
@@ -1 +1 @@
-{"batchcode": "013L209", "histograms": [{"batchcodes": ["013L209"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "COVID-19": 1, "Hypokinesia": 1, "Myalgia": 1, "Pain in extremity": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "013L209", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "COVID-19": 1, "Hypokinesia": 1, "Myalgia": 1, "Pain in extremity": 1, "Paraesthesia": 1}, "batchcodes": ["013L209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20A,.json b/docs/data/histograms/United States/013L20A,.json
index 6f989aeb3f7..d6f341e7a9b 100644
--- a/docs/data/histograms/United States/013L20A,.json
+++ b/docs/data/histograms/United States/013L20A,.json
@@ -1 +1 @@
-{"batchcode": "013L20A,", "histograms": [{"batchcodes": ["013L20A,"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20A,", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["013L20A,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20A..json b/docs/data/histograms/United States/013L20A..json
index d7ff9e3f8c9..612e17e0724 100644
--- a/docs/data/histograms/United States/013L20A..json
+++ b/docs/data/histograms/United States/013L20A..json
@@ -1 +1 @@
-{"batchcode": "013L20A.", "histograms": [{"batchcodes": ["013L20A."], "histogram": {"Vaccination site erythema": 2, "Breast swelling": 1, "Injection site swelling": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20A.", "histograms": [{"histogram": {"Vaccination site erythema": 2, "Breast swelling": 1, "Injection site swelling": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1}, "batchcodes": ["013L20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20A.json b/docs/data/histograms/United States/013L20A.json
index b7f6f3e5dad..cc70135809c 100644
--- a/docs/data/histograms/United States/013L20A.json
+++ b/docs/data/histograms/United States/013L20A.json
@@ -1 +1 @@
-{"batchcode": "013L20A", "histograms": [{"batchcodes": ["013L20A", "EW0177"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Illness": 1, "Immunisation reaction": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}}, {"batchcodes": ["013L20A"], "histogram": {"Headache": 170, "Pyrexia": 162, "Pain in extremity": 161, "Vaccination site pain": 143, "Fatigue": 142, "Chills": 134, "Myalgia": 104, "Vaccination site erythema": 94, "Pain": 82, "Nausea": 81, "Vaccination site swelling": 73, "Pruritus": 69, "Rash": 67, "Arthralgia": 66, "Vaccination site pruritus": 57, "COVID-19": 52, "Dizziness": 52, "Asthenia": 49, "Body temperature": 48, "Erythema": 48, "Feeling abnormal": 46, "SARS-CoV-2 test": 46, "Vaccination site warmth": 40, "Peripheral swelling": 36, "Diarrhoea": 34, "Influenza like illness": 33, "Vaccination site rash": 32, "Urticaria": 31, "Malaise": 28, "Dyspnoea": 26, "Injection site erythema": 26, "Cough": 25, "Injection site pain": 25, "Paraesthesia": 22, "Injection site pruritus": 21, "Feeling hot": 20, "Heart rate": 19, "Hypoaesthesia": 18, "Inappropriate schedule of product administration": 18, "Lymphadenopathy": 18, "Tremor": 18, "Vaccination complication": 18, "Decreased appetite": 17, "Illness": 17, "Product dose omission issue": 17, "Rash pruritic": 17, "Rhinorrhoea": 17, "Insomnia": 16, "Nasal congestion": 16, "SARS-CoV-2 test positive": 16, "Swelling": 16, "Vomiting": 16, "Hypersensitivity": 15, "Injection site warmth": 15, "Limb discomfort": 15, "Blood pressure measurement": 14, "Blood test": 14, "Hyperhidrosis": 14, "Injection site swelling": 14, "Exposure during pregnancy": 13, "Somnolence": 13, "Heart rate increased": 12, "Anosmia": 11, "Gait disturbance": 11, "Lethargy": 11, "Maternal exposure during pregnancy": 11, "Vaccination site reaction": 11, "Ageusia": 10, "Back pain": 10, "Drug ineffective": 10, "Nasopharyngitis": 10, "Oropharyngeal pain": 10, "Palpitations": 10, "Vaccination site induration": 10, "Chest discomfort": 9, "Chest pain": 9, "Herpes zoster": 9, "Incorrect dose administered": 9, "Magnetic resonance imaging": 9, "Muscle spasms": 9, "Musculoskeletal stiffness": 9, "Abdominal discomfort": 8, "Balance disorder": 8, "Burning sensation": 8, "Condition aggravated": 8, "Electrocardiogram": 8, "Feeling cold": 8, "Hypertension": 8, "Injection site rash": 8, "Muscular weakness": 8, "Rash erythematous": 8, "Contusion": 7, "Expired product administered": 7, "Fall": 7, "Flushing": 7, "Lip swelling": 7, "Mobility decreased": 7, "Neck pain": 7, "Oxygen saturation": 7, "Pregnancy test": 7, "SARS-CoV-2 antibody test": 7, "Sneezing": 7, "Vaccination site mass": 7, "Abdominal pain": 6, "Discomfort": 6, "Dysgeusia": 6, "Dysphonia": 6, "Eye pain": 6, "Hypoaesthesia oral": 6, "Rash macular": 6, "Therapeutic response unexpected": 6, "Tinnitus": 6, "Ultrasound scan": 6, "Vaccination site movement impairment": 6, "Vaccination site urticaria": 6, "Abdominal pain upper": 5, "Computerised tomogram": 5, "Head discomfort": 5, "Injection site mass": 5, "Loss of consciousness": 5, "Musculoskeletal discomfort": 5, "Pneumonia": 5, "Product administered to patient of inappropriate age": 5, "Sinusitis": 5, "Swelling face": 5, "Swollen tongue": 5, "Vaccination site discolouration": 5, "X-ray": 5, "Anxiety": 4, "Blister": 4, "Blood pressure increased": 4, "Blood urine present": 4, "Bone pain": 4, "Cold sweat": 4, "Eye pruritus": 4, "Fear": 4, "Feeding disorder": 4, "Hot flush": 4, "Immunisation reaction": 4, "Incorrect route of product administration": 4, "Inflammation": 4, "Joint swelling": 4, "Loss of personal independence in daily activities": 4, "Migraine": 4, "Nervousness": 4, "Neuralgia": 4, "Ocular discomfort": 4, "Oropharyngeal discomfort": 4, "Paraesthesia oral": 4, "Skin exfoliation": 4, "Skin mass": 4, "Skin warm": 4, "Urinary tract infection": 4, "Vertigo": 4, "Antibody test": 3, "Arthritis": 3, "Bell's palsy": 3, "Blood cholesterol": 3, "Cellulitis": 3, "Chest X-ray": 3, "Chromaturia": 3, "Confusional state": 3, "Coronavirus test": 3, "Deep vein thrombosis": 3, "Dehydration": 3, "Device connection issue": 3, "Disorientation": 3, "Dry skin": 3, "Dysmenorrhoea": 3, "Dysstasia": 3, "Ear discomfort": 3, "Ear pain": 3, "Epistaxis": 3, "Extra dose administered": 3, "Fibrin D dimer": 3, "Flatulence": 3, "Hallucination": 3, "Incomplete course of vaccination": 3, "Induration": 3, "Injection site induration": 3, "Lacrimation increased": 3, "Lymph node pain": 3, "Night sweats": 3, "Ocular hyperaemia": 3, "Off label use": 3, "Oral herpes": 3, "Pain of skin": 3, "Pancreatitis": 3, "Panic attack": 3, "Pharyngeal swelling": 3, "Retching": 3, "Rheumatoid arthritis": 3, "Scab": 3, "Sinus disorder": 3, "Sinus headache": 3, "Skin burning sensation": 3, "Sleep disorder": 3, "Sunburn": 3, "Syncope": 3, "Tenderness": 3, "Tongue discomfort": 3, "Vaccination site bruising": 3, "Vision blurred": 3, "Walking aid user": 3, "Abdominal distension": 2, "Accidental overdose": 2, "Adverse drug reaction": 2, "Adverse event": 2, "Adverse reaction": 2, "Alopecia": 2, "Angioedema": 2, "Asthma": 2, "Atrial fibrillation": 2, "Bedridden": 2, "Blood glucose increased": 2, "Blood test abnormal": 2, "Body temperature increased": 2, "Bowel movement irregularity": 2, "Breast pain": 2, "Deafness unilateral": 2, "Dermatitis": 2, "Dermatitis allergic": 2, "Diplopia": 2, "Dry mouth": 2, "Dry throat": 2, "Dyspepsia": 2, "Eye irritation": 2, "Eyelid irritation": 2, "Facial pain": 2, "Faeces soft": 2, "Full blood count": 2, "Glucose tolerance test": 2, "Haemorrhage": 2, "Head injury": 2, "Heavy menstrual bleeding": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Injected limb mobility decreased": 2, "Injection site discolouration": 2, "Injection site reaction": 2, "Mass excision": 2, "Memory impairment": 2, "Metabolic function test": 2, "Muscle twitching": 2, "Myasthenia gravis": 2, "Myocardial necrosis marker": 2, "Nasal dryness": 2, "Periorbital swelling": 2, "Poor quality sleep": 2, "Product administered at inappropriate site": 2, "Product storage error": 2, "Rash vesicular": 2, "Respiratory rate": 2, "Secretion discharge": 2, "Sensory disturbance": 2, "Sinus congestion": 2, "Skin disorder": 2, "Swelling of eyelid": 2, "Symptom recurrence": 2, "Syringe issue": 2, "Tachycardia": 2, "Throat tightness": 2, "Thrombosis": 2, "Trigger finger": 2, "Ultrasound antenatal screen normal": 2, "Vaccination failure": 2, "Vaccination site discomfort": 2, "Vaccination site haemorrhage": 2, "Vaccination site hypersensitivity": 2, "Vaccination site lymphadenopathy": 2, "Vaccine positive rechallenge": 2, "Visual impairment": 2, "Weight decreased": 2, "Wheezing": 2, "Acute kidney injury": 1, "Agitation": 1, "Alpha 1 foetoprotein normal": 1, "Amnesia": 1, "Anaemia": 1, "Anal pruritus": 1, "Antibody test negative": 1, "Aortic aneurysm": 1, "Aphasia": 1, "Aphonia": 1, "Aphthous ulcer": 1, "Appendicitis": 1, "Aptyalism": 1, "Asthenopia": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed bug infestation": 1, "Bed rest": 1, "Biopsy": 1, "Biopsy cervix": 1, "Bite": 1, "Bladder cancer": 1, "Blindness unilateral": 1, "Blood creatine": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose": 1, "Blood immunoglobulin M": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Body temperature abnormal": 1, "Body temperature decreased": 1, "Bradycardia": 1, "Bradykinesia": 1, "Breast cancer": 1, "Breast mass": 1, "Bronchial hyperreactivity": 1, "Bronchospasm": 1, "Burning mouth syndrome": 1, "C1 esterase inhibitor test normal": 1, "COVID-19 pneumonia": 1, "COVID-19 screening": 1, "Candida infection": 1, "Cardiac failure acute": 1, "Cerebrovascular accident": 1, "Chondritis": 1, "Chronic obstructive pulmonary disease": 1, "Circumoral swelling": 1, "Cognitive disorder": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Conjunctival haemorrhage": 1, "Conjunctivitis": 1, "Corneal lesion": 1, "Costochondritis": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Cyst": 1, "Cystitis-like symptom": 1, "Demyelination": 1, "Depressed mood": 1, "Depression": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug hypersensitivity": 1, "Dyschromatopsia": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Ear infection": 1, "Ear swelling": 1, "Eating disorder symptom": 1, "Echocardiogram": 1, "Eczema": 1, "Eczema eyelids": 1, "Electromyogram": 1, "Encephalitis": 1, "Endoscopy": 1, "Energy increased": 1, "Epstein-Barr virus test": 1, "Erythema multiforme": 1, "Exercise electrocardiogram": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Extremity contracture": 1, "Eye colour change": 1, "Eye disorder": 1, "Eye inflammation": 1, "Eye swelling": 1, "Eyelid disorder": 1, "Eyelid oedema": 1, "Eyelid rash": 1, "Eyelids pruritus": 1, "Facial paralysis": 1, "Factor V Leiden carrier": 1, "Faeces discoloured": 1, "Feeling drunk": 1, "Feeling of body temperature change": 1, "Finger deformity": 1, "Fluid retention": 1, "Food allergy": 1, "Frequent bowel movements": 1, "Furuncle": 1, "Gait inability": 1, "Gallbladder disorder": 1, "Gallbladder operation": 1, "Gastrointestinal tract irritation": 1, "Gastrooesophageal reflux disease": 1, "Genital rash": 1, "Glossodynia": 1, "Haematoma": 1, "Haematuria": 1, "Haemoptysis": 1, "Haemorrhage urinary tract": 1, "Heat illness": 1, "Hepatic cirrhosis": 1, "Hepatitis B": 1, "Herpes simplex": 1, "Histamine level": 1, "Hyperaesthesia": 1, "Hypersomnia": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Hypothermia": 1, "Hypoxia": 1, "Idiopathic urticaria": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Inflammatory marker test": 1, "Influenza": 1, "Injection site bruising": 1, "Injection site haemorrhage": 1, "Injection site hyperaesthesia": 1, "Injection site hypersensitivity": 1, "Injection site inflammation": 1, "Injection site joint pain": 1, "Injection site joint warmth": 1, "Injection site urticaria": 1, "Injection site vesicles": 1, "Inner ear inflammation": 1, "Intentional overdose": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Iritis": 1, "Irritability": 1, "Jaundice": 1, "Joint lock": 1, "Limb mass": 1, "Lip blister": 1, "Lip pain": 1, "Local reaction": 1, "Localised infection": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lumbar puncture": 1, "Lyme disease": 1, "Lymphocyte count": 1, "Madarosis": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging head": 1, "Malignant hypertension": 1, "Mechanical urticaria": 1, "Menstrual disorder": 1, "Monoparesis": 1, "Monoplegia": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle discomfort": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Myasthenic syndrome": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Myositis": 1, "Nasal discomfort": 1, "Nasal pruritus": 1, "Near death experience": 1, "Nerve compression": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "No adverse event": 1, "Nonspecific reaction": 1, "Odynophagia": 1, "Oral candidiasis": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral mucosal discolouration": 1, "Oral pain": 1, "Oral pruritus": 1, "Osteoarthritis": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pallor": 1, "Pancreatic cyst": 1, "Paranasal sinus discomfort": 1, "Paraparesis": 1, "Parosmia": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Pharyngeal hypoaesthesia": 1, "Pityriasis rosea": 1, "Polymerase chain reaction": 1, "Post procedural haemorrhage": 1, "Postmenopausal haemorrhage": 1, "Pre-existing condition improved": 1, "Pregnancy": 1, "Pregnancy test positive": 1, "Prenatal screening test": 1, "Presyncope": 1, "Productive cough": 1, "Psoriasis": 1, "Psychomotor hyperactivity": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary mass": 1, "Pulmonary thrombosis": 1, "Rash morbilliform": 1, "Renal cyst": 1, "Renal pain": 1, "Respiration abnormal": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "Rotator cuff syndrome": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test negative": 1, "Saliva altered": 1, "Salivary hypersecretion": 1, "Scan": 1, "Seizure": 1, "Sensitive skin": 1, "Sensory loss": 1, "Sinus pain": 1, "Skin discolouration": 1, "Skin discomfort": 1, "Skin hypopigmentation": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin reaction": 1, "Skin swelling": 1, "Skin test": 1, "Skin tightness": 1, "Sleep apnoea syndrome": 1, "Sleep talking": 1, "Sluggishness": 1, "Speech disorder": 1, "Spinal pain": 1, "Splenic haemorrhage": 1, "Splenic rupture": 1, "Spondylitis": 1, "Supraventricular tachycardia": 1, "Suspected COVID-19": 1, "Tendon pain": 1, "Terminal insomnia": 1, "Testicular swelling": 1, "Therapeutic response delayed": 1, "Thirst": 1, "Throat irritation": 1, "Tooth loss": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Ultrasound scan abnormal": 1, "Underdose": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Uveitis": 1, "Vaccination site cellulitis": 1, "Vaccination site discharge": 1, "Vaccination site irritation": 1, "Vaccination site oedema": 1, "Vaccination site paraesthesia": 1, "Vaccination site scar": 1, "Vaccination site streaking": 1, "Varicose vein": 1, "Venous thrombosis limb": 1, "Ventricular extrasystoles": 1, "Viral test": 1, "Viral titre increased": 1, "Vitamin D deficiency": 1, "Vulvovaginal pruritus": 1, "Weight increased": 1, "White blood cell count": 1, "White blood cells urine positive": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Illness": 1, "Immunisation reaction": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}, "batchcodes": ["013L20A", "EW0177"]}, {"histogram": {"Headache": 170, "Pyrexia": 162, "Pain in extremity": 161, "Vaccination site pain": 143, "Fatigue": 142, "Chills": 134, "Myalgia": 104, "Vaccination site erythema": 94, "Pain": 82, "Nausea": 81, "Vaccination site swelling": 73, "Pruritus": 69, "Rash": 67, "Arthralgia": 66, "Vaccination site pruritus": 57, "COVID-19": 52, "Dizziness": 52, "Asthenia": 49, "Body temperature": 48, "Erythema": 48, "Feeling abnormal": 46, "SARS-CoV-2 test": 46, "Vaccination site warmth": 40, "Peripheral swelling": 36, "Diarrhoea": 34, "Influenza like illness": 33, "Vaccination site rash": 32, "Urticaria": 31, "Malaise": 28, "Dyspnoea": 26, "Injection site erythema": 26, "Cough": 25, "Injection site pain": 25, "Paraesthesia": 22, "Injection site pruritus": 21, "Feeling hot": 20, "Heart rate": 19, "Hypoaesthesia": 18, "Inappropriate schedule of product administration": 18, "Lymphadenopathy": 18, "Tremor": 18, "Vaccination complication": 18, "Decreased appetite": 17, "Illness": 17, "Product dose omission issue": 17, "Rash pruritic": 17, "Rhinorrhoea": 17, "Insomnia": 16, "Nasal congestion": 16, "SARS-CoV-2 test positive": 16, "Swelling": 16, "Vomiting": 16, "Hypersensitivity": 15, "Injection site warmth": 15, "Limb discomfort": 15, "Blood pressure measurement": 14, "Blood test": 14, "Hyperhidrosis": 14, "Injection site swelling": 14, "Exposure during pregnancy": 13, "Somnolence": 13, "Heart rate increased": 12, "Anosmia": 11, "Gait disturbance": 11, "Lethargy": 11, "Maternal exposure during pregnancy": 11, "Vaccination site reaction": 11, "Ageusia": 10, "Back pain": 10, "Drug ineffective": 10, "Nasopharyngitis": 10, "Oropharyngeal pain": 10, "Palpitations": 10, "Vaccination site induration": 10, "Chest discomfort": 9, "Chest pain": 9, "Herpes zoster": 9, "Incorrect dose administered": 9, "Magnetic resonance imaging": 9, "Muscle spasms": 9, "Musculoskeletal stiffness": 9, "Abdominal discomfort": 8, "Balance disorder": 8, "Burning sensation": 8, "Condition aggravated": 8, "Electrocardiogram": 8, "Feeling cold": 8, "Hypertension": 8, "Injection site rash": 8, "Muscular weakness": 8, "Rash erythematous": 8, "Contusion": 7, "Expired product administered": 7, "Fall": 7, "Flushing": 7, "Lip swelling": 7, "Mobility decreased": 7, "Neck pain": 7, "Oxygen saturation": 7, "Pregnancy test": 7, "SARS-CoV-2 antibody test": 7, "Sneezing": 7, "Vaccination site mass": 7, "Abdominal pain": 6, "Discomfort": 6, "Dysgeusia": 6, "Dysphonia": 6, "Eye pain": 6, "Hypoaesthesia oral": 6, "Rash macular": 6, "Therapeutic response unexpected": 6, "Tinnitus": 6, "Ultrasound scan": 6, "Vaccination site movement impairment": 6, "Vaccination site urticaria": 6, "Abdominal pain upper": 5, "Computerised tomogram": 5, "Head discomfort": 5, "Injection site mass": 5, "Loss of consciousness": 5, "Musculoskeletal discomfort": 5, "Pneumonia": 5, "Product administered to patient of inappropriate age": 5, "Sinusitis": 5, "Swelling face": 5, "Swollen tongue": 5, "Vaccination site discolouration": 5, "X-ray": 5, "Anxiety": 4, "Blister": 4, "Blood pressure increased": 4, "Blood urine present": 4, "Bone pain": 4, "Cold sweat": 4, "Eye pruritus": 4, "Fear": 4, "Feeding disorder": 4, "Hot flush": 4, "Immunisation reaction": 4, "Incorrect route of product administration": 4, "Inflammation": 4, "Joint swelling": 4, "Loss of personal independence in daily activities": 4, "Migraine": 4, "Nervousness": 4, "Neuralgia": 4, "Ocular discomfort": 4, "Oropharyngeal discomfort": 4, "Paraesthesia oral": 4, "Skin exfoliation": 4, "Skin mass": 4, "Skin warm": 4, "Urinary tract infection": 4, "Vertigo": 4, "Antibody test": 3, "Arthritis": 3, "Bell's palsy": 3, "Blood cholesterol": 3, "Cellulitis": 3, "Chest X-ray": 3, "Chromaturia": 3, "Confusional state": 3, "Coronavirus test": 3, "Deep vein thrombosis": 3, "Dehydration": 3, "Device connection issue": 3, "Disorientation": 3, "Dry skin": 3, "Dysmenorrhoea": 3, "Dysstasia": 3, "Ear discomfort": 3, "Ear pain": 3, "Epistaxis": 3, "Extra dose administered": 3, "Fibrin D dimer": 3, "Flatulence": 3, "Hallucination": 3, "Incomplete course of vaccination": 3, "Induration": 3, "Injection site induration": 3, "Lacrimation increased": 3, "Lymph node pain": 3, "Night sweats": 3, "Ocular hyperaemia": 3, "Off label use": 3, "Oral herpes": 3, "Pain of skin": 3, "Pancreatitis": 3, "Panic attack": 3, "Pharyngeal swelling": 3, "Retching": 3, "Rheumatoid arthritis": 3, "Scab": 3, "Sinus disorder": 3, "Sinus headache": 3, "Skin burning sensation": 3, "Sleep disorder": 3, "Sunburn": 3, "Syncope": 3, "Tenderness": 3, "Tongue discomfort": 3, "Vaccination site bruising": 3, "Vision blurred": 3, "Walking aid user": 3, "Abdominal distension": 2, "Accidental overdose": 2, "Adverse drug reaction": 2, "Adverse event": 2, "Adverse reaction": 2, "Alopecia": 2, "Angioedema": 2, "Asthma": 2, "Atrial fibrillation": 2, "Bedridden": 2, "Blood glucose increased": 2, "Blood test abnormal": 2, "Body temperature increased": 2, "Bowel movement irregularity": 2, "Breast pain": 2, "Deafness unilateral": 2, "Dermatitis": 2, "Dermatitis allergic": 2, "Diplopia": 2, "Dry mouth": 2, "Dry throat": 2, "Dyspepsia": 2, "Eye irritation": 2, "Eyelid irritation": 2, "Facial pain": 2, "Faeces soft": 2, "Full blood count": 2, "Glucose tolerance test": 2, "Haemorrhage": 2, "Head injury": 2, "Heavy menstrual bleeding": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Injected limb mobility decreased": 2, "Injection site discolouration": 2, "Injection site reaction": 2, "Mass excision": 2, "Memory impairment": 2, "Metabolic function test": 2, "Muscle twitching": 2, "Myasthenia gravis": 2, "Myocardial necrosis marker": 2, "Nasal dryness": 2, "Periorbital swelling": 2, "Poor quality sleep": 2, "Product administered at inappropriate site": 2, "Product storage error": 2, "Rash vesicular": 2, "Respiratory rate": 2, "Secretion discharge": 2, "Sensory disturbance": 2, "Sinus congestion": 2, "Skin disorder": 2, "Swelling of eyelid": 2, "Symptom recurrence": 2, "Syringe issue": 2, "Tachycardia": 2, "Throat tightness": 2, "Thrombosis": 2, "Trigger finger": 2, "Ultrasound antenatal screen normal": 2, "Vaccination failure": 2, "Vaccination site discomfort": 2, "Vaccination site haemorrhage": 2, "Vaccination site hypersensitivity": 2, "Vaccination site lymphadenopathy": 2, "Vaccine positive rechallenge": 2, "Visual impairment": 2, "Weight decreased": 2, "Wheezing": 2, "Acute kidney injury": 1, "Agitation": 1, "Alpha 1 foetoprotein normal": 1, "Amnesia": 1, "Anaemia": 1, "Anal pruritus": 1, "Antibody test negative": 1, "Aortic aneurysm": 1, "Aphasia": 1, "Aphonia": 1, "Aphthous ulcer": 1, "Appendicitis": 1, "Aptyalism": 1, "Asthenopia": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed bug infestation": 1, "Bed rest": 1, "Biopsy": 1, "Biopsy cervix": 1, "Bite": 1, "Bladder cancer": 1, "Blindness unilateral": 1, "Blood creatine": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood glucose": 1, "Blood immunoglobulin M": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Body temperature abnormal": 1, "Body temperature decreased": 1, "Bradycardia": 1, "Bradykinesia": 1, "Breast cancer": 1, "Breast mass": 1, "Bronchial hyperreactivity": 1, "Bronchospasm": 1, "Burning mouth syndrome": 1, "C1 esterase inhibitor test normal": 1, "COVID-19 pneumonia": 1, "COVID-19 screening": 1, "Candida infection": 1, "Cardiac failure acute": 1, "Cerebrovascular accident": 1, "Chondritis": 1, "Chronic obstructive pulmonary disease": 1, "Circumoral swelling": 1, "Cognitive disorder": 1, "Colonoscopy": 1, "Complement factor C3": 1, "Complement factor C4": 1, "Computerised tomogram abdomen": 1, "Conjunctival haemorrhage": 1, "Conjunctivitis": 1, "Corneal lesion": 1, "Costochondritis": 1, "Cutaneous symptom": 1, "Cyanosis": 1, "Cyst": 1, "Cystitis-like symptom": 1, "Demyelination": 1, "Depressed mood": 1, "Depression": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug hypersensitivity": 1, "Dyschromatopsia": 1, "Dysphagia": 1, "Dyspnoea at rest": 1, "Dyspnoea exertional": 1, "Dysuria": 1, "Ear infection": 1, "Ear swelling": 1, "Eating disorder symptom": 1, "Echocardiogram": 1, "Eczema": 1, "Eczema eyelids": 1, "Electromyogram": 1, "Encephalitis": 1, "Endoscopy": 1, "Energy increased": 1, "Epstein-Barr virus test": 1, "Erythema multiforme": 1, "Exercise electrocardiogram": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Extremity contracture": 1, "Eye colour change": 1, "Eye disorder": 1, "Eye inflammation": 1, "Eye swelling": 1, "Eyelid disorder": 1, "Eyelid oedema": 1, "Eyelid rash": 1, "Eyelids pruritus": 1, "Facial paralysis": 1, "Factor V Leiden carrier": 1, "Faeces discoloured": 1, "Feeling drunk": 1, "Feeling of body temperature change": 1, "Finger deformity": 1, "Fluid retention": 1, "Food allergy": 1, "Frequent bowel movements": 1, "Furuncle": 1, "Gait inability": 1, "Gallbladder disorder": 1, "Gallbladder operation": 1, "Gastrointestinal tract irritation": 1, "Gastrooesophageal reflux disease": 1, "Genital rash": 1, "Glossodynia": 1, "Haematoma": 1, "Haematuria": 1, "Haemoptysis": 1, "Haemorrhage urinary tract": 1, "Heat illness": 1, "Hepatic cirrhosis": 1, "Hepatitis B": 1, "Herpes simplex": 1, "Histamine level": 1, "Hyperaesthesia": 1, "Hypersomnia": 1, "Hyponatraemia": 1, "Hypophagia": 1, "Hypothermia": 1, "Hypoxia": 1, "Idiopathic urticaria": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Inflammatory marker test": 1, "Influenza": 1, "Injection site bruising": 1, "Injection site haemorrhage": 1, "Injection site hyperaesthesia": 1, "Injection site hypersensitivity": 1, "Injection site inflammation": 1, "Injection site joint pain": 1, "Injection site joint warmth": 1, "Injection site urticaria": 1, "Injection site vesicles": 1, "Inner ear inflammation": 1, "Intentional overdose": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Iritis": 1, "Irritability": 1, "Jaundice": 1, "Joint lock": 1, "Limb mass": 1, "Lip blister": 1, "Lip pain": 1, "Local reaction": 1, "Localised infection": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Lumbar puncture": 1, "Lyme disease": 1, "Lymphocyte count": 1, "Madarosis": 1, "Magnetic resonance imaging abnormal": 1, "Magnetic resonance imaging head": 1, "Malignant hypertension": 1, "Mechanical urticaria": 1, "Menstrual disorder": 1, "Monoparesis": 1, "Monoplegia": 1, "Mood altered": 1, "Movement disorder": 1, "Muscle contractions involuntary": 1, "Muscle discomfort": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Myasthenic syndrome": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Myositis": 1, "Nasal discomfort": 1, "Nasal pruritus": 1, "Near death experience": 1, "Nerve compression": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "No adverse event": 1, "Nonspecific reaction": 1, "Odynophagia": 1, "Oral candidiasis": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral mucosal discolouration": 1, "Oral pain": 1, "Oral pruritus": 1, "Osteoarthritis": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pallor": 1, "Pancreatic cyst": 1, "Paranasal sinus discomfort": 1, "Paraparesis": 1, "Parosmia": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Pharyngeal hypoaesthesia": 1, "Pityriasis rosea": 1, "Polymerase chain reaction": 1, "Post procedural haemorrhage": 1, "Postmenopausal haemorrhage": 1, "Pre-existing condition improved": 1, "Pregnancy": 1, "Pregnancy test positive": 1, "Prenatal screening test": 1, "Presyncope": 1, "Productive cough": 1, "Psoriasis": 1, "Psychomotor hyperactivity": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary mass": 1, "Pulmonary thrombosis": 1, "Rash morbilliform": 1, "Renal cyst": 1, "Renal pain": 1, "Respiration abnormal": 1, "Restlessness": 1, "Retinal artery occlusion": 1, "Rotator cuff syndrome": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test negative": 1, "Saliva altered": 1, "Salivary hypersecretion": 1, "Scan": 1, "Seizure": 1, "Sensitive skin": 1, "Sensory loss": 1, "Sinus pain": 1, "Skin discolouration": 1, "Skin discomfort": 1, "Skin hypopigmentation": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin reaction": 1, "Skin swelling": 1, "Skin test": 1, "Skin tightness": 1, "Sleep apnoea syndrome": 1, "Sleep talking": 1, "Sluggishness": 1, "Speech disorder": 1, "Spinal pain": 1, "Splenic haemorrhage": 1, "Splenic rupture": 1, "Spondylitis": 1, "Supraventricular tachycardia": 1, "Suspected COVID-19": 1, "Tendon pain": 1, "Terminal insomnia": 1, "Testicular swelling": 1, "Therapeutic response delayed": 1, "Thirst": 1, "Throat irritation": 1, "Tooth loss": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Ultrasound scan abnormal": 1, "Underdose": 1, "Urinary incontinence": 1, "Urine analysis": 1, "Uveitis": 1, "Vaccination site cellulitis": 1, "Vaccination site discharge": 1, "Vaccination site irritation": 1, "Vaccination site oedema": 1, "Vaccination site paraesthesia": 1, "Vaccination site scar": 1, "Vaccination site streaking": 1, "Varicose vein": 1, "Venous thrombosis limb": 1, "Ventricular extrasystoles": 1, "Viral test": 1, "Viral titre increased": 1, "Vitamin D deficiency": 1, "Vulvovaginal pruritus": 1, "Weight increased": 1, "White blood cell count": 1, "White blood cells urine positive": 1}, "batchcodes": ["013L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20AL.json b/docs/data/histograms/United States/013L20AL.json
index 1a3cfd1ab64..56665e170c7 100644
--- a/docs/data/histograms/United States/013L20AL.json
+++ b/docs/data/histograms/United States/013L20AL.json
@@ -1 +1 @@
-{"batchcode": "013L20AL", "histograms": [{"batchcodes": ["013L20AL"], "histogram": {"Lipoma": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20AL", "histograms": [{"histogram": {"Lipoma": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["013L20AL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20H.json b/docs/data/histograms/United States/013L20H.json
index 2a40c7aedfd..3ced54469bd 100644
--- a/docs/data/histograms/United States/013L20H.json
+++ b/docs/data/histograms/United States/013L20H.json
@@ -1 +1 @@
-{"batchcode": "013L20H", "histograms": [{"batchcodes": ["013L20H"], "histogram": {"Chills": 2, "Malaise": 2, "COVID-19": 1, "Fatigue": 1, "SARS-CoV-2 test": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20H", "histograms": [{"histogram": {"Chills": 2, "Malaise": 2, "COVID-19": 1, "Fatigue": 1, "SARS-CoV-2 test": 1, "Somnolence": 1}, "batchcodes": ["013L20H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20Q.json b/docs/data/histograms/United States/013L20Q.json
index 02e569e409f..1c408d34f5b 100644
--- a/docs/data/histograms/United States/013L20Q.json
+++ b/docs/data/histograms/United States/013L20Q.json
@@ -1 +1 @@
-{"batchcode": "013L20Q", "histograms": [{"batchcodes": ["013L20Q"], "histogram": {"Balance disorder": 1, "Body temperature": 1, "Exposure to SARS-CoV-2": 1, "Myalgia": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash erythematous": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20Q", "histograms": [{"histogram": {"Balance disorder": 1, "Body temperature": 1, "Exposure to SARS-CoV-2": 1, "Myalgia": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash erythematous": 1, "Vaccination site pruritus": 1}, "batchcodes": ["013L20Q"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L20X.json b/docs/data/histograms/United States/013L20X.json
index 25a91bc396a..b561b1c658d 100644
--- a/docs/data/histograms/United States/013L20X.json
+++ b/docs/data/histograms/United States/013L20X.json
@@ -1 +1 @@
-{"batchcode": "013L20X", "histograms": [{"batchcodes": ["013L20X"], "histogram": {"Fatigue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013L20X", "histograms": [{"histogram": {"Fatigue": 1, "Vaccination site pain": 1}, "batchcodes": ["013L20X"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L21A.json b/docs/data/histograms/United States/013L21A.json
index d8ee9453379..4cec16a6080 100644
--- a/docs/data/histograms/United States/013L21A.json
+++ b/docs/data/histograms/United States/013L21A.json
@@ -1 +1 @@
-{"batchcode": "013L21A", "histograms": [{"batchcodes": ["013L21A"], "histogram": {"Pain in extremity": 2, "Feeling hot": 1, "Injection site rash": 1, "Lymph node pain": 1, "Urticaria": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013L21A", "histograms": [{"histogram": {"Pain in extremity": 2, "Feeling hot": 1, "Injection site rash": 1, "Lymph node pain": 1, "Urticaria": 1, "Vaccination site oedema": 1, "Vaccination site pain": 1}, "batchcodes": ["013L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L29A.json b/docs/data/histograms/United States/013L29A.json
index bc90cdc5e49..c00845320c6 100644
--- a/docs/data/histograms/United States/013L29A.json
+++ b/docs/data/histograms/United States/013L29A.json
@@ -1 +1 @@
-{"batchcode": "013L29A", "histograms": [{"batchcodes": ["013L29A"], "histogram": {"Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "013L29A", "histograms": [{"histogram": {"Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["013L29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L2A.json b/docs/data/histograms/United States/013L2A.json
index d502caa6ba5..927c65c7254 100644
--- a/docs/data/histograms/United States/013L2A.json
+++ b/docs/data/histograms/United States/013L2A.json
@@ -1 +1 @@
-{"batchcode": "013L2A", "histograms": [{"batchcodes": ["013L2A"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "013L2A", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["013L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L2DA.json b/docs/data/histograms/United States/013L2DA.json
index 9684b3adc70..42c3bdae9ea 100644
--- a/docs/data/histograms/United States/013L2DA.json
+++ b/docs/data/histograms/United States/013L2DA.json
@@ -1 +1 @@
-{"batchcode": "013L2DA", "histograms": [{"batchcodes": ["013L2DA"], "histogram": {"Anxiety": 2, "Aphasia": 2, "Fall": 2, "Malaise": 2, "Memory impairment": 2, "Tremor": 2, "Balance disorder": 1, "Dysstasia": 1}}]}
\ No newline at end of file
+{"batchcode": "013L2DA", "histograms": [{"histogram": {"Anxiety": 2, "Aphasia": 2, "Fall": 2, "Malaise": 2, "Memory impairment": 2, "Tremor": 2, "Balance disorder": 1, "Dysstasia": 1}, "batchcodes": ["013L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L2GA.json b/docs/data/histograms/United States/013L2GA.json
index fd733c6ddd9..b80aa2c97d7 100644
--- a/docs/data/histograms/United States/013L2GA.json
+++ b/docs/data/histograms/United States/013L2GA.json
@@ -1 +1 @@
-{"batchcode": "013L2GA", "histograms": [{"batchcodes": ["013L2GA"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "013L2GA", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["013L2GA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L2OA.json b/docs/data/histograms/United States/013L2OA.json
index 2f04772c76a..d6c001a0615 100644
--- a/docs/data/histograms/United States/013L2OA.json
+++ b/docs/data/histograms/United States/013L2OA.json
@@ -1 +1 @@
-{"batchcode": "013L2OA", "histograms": [{"batchcodes": ["013L2OA"], "histogram": {"Abdominal discomfort": 2, "Nausea": 2, "Pain in extremity": 2, "Body temperature increased": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "013L2OA", "histograms": [{"histogram": {"Abdominal discomfort": 2, "Nausea": 2, "Pain in extremity": 2, "Body temperature increased": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["013L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L2UA.json b/docs/data/histograms/United States/013L2UA.json
index efae6c7f3e2..d3e7c65d86c 100644
--- a/docs/data/histograms/United States/013L2UA.json
+++ b/docs/data/histograms/United States/013L2UA.json
@@ -1 +1 @@
-{"batchcode": "013L2UA", "histograms": [{"batchcodes": ["013L2UA"], "histogram": {"Abdominal discomfort": 1, "Arrhythmia": 1, "Arthralgia": 1, "Cough": 1, "Disorientation": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersensitivity": 1, "Insomnia": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "013L2UA", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Arrhythmia": 1, "Arthralgia": 1, "Cough": 1, "Disorientation": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersensitivity": 1, "Insomnia": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1}, "batchcodes": ["013L2UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013L80A.json b/docs/data/histograms/United States/013L80A.json
index 18e51536a63..f2e4c4ff8dd 100644
--- a/docs/data/histograms/United States/013L80A.json
+++ b/docs/data/histograms/United States/013L80A.json
@@ -1 +1 @@
-{"batchcode": "013L80A", "histograms": [{"batchcodes": ["013L80A"], "histogram": {"Decreased appetite": 1}}]}
\ No newline at end of file
+{"batchcode": "013L80A", "histograms": [{"histogram": {"Decreased appetite": 1}, "batchcodes": ["013L80A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013LA20.json b/docs/data/histograms/United States/013LA20.json
index 64bfe99cb49..3d59d81d007 100644
--- a/docs/data/histograms/United States/013LA20.json
+++ b/docs/data/histograms/United States/013LA20.json
@@ -1 +1 @@
-{"batchcode": "013LA20", "histograms": [{"batchcodes": ["013LA20"], "histogram": {"Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "013LA20", "histograms": [{"histogram": {"Tinnitus": 1}, "batchcodes": ["013LA20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013LDA.json b/docs/data/histograms/United States/013LDA.json
index fe8d045c449..6eb672d756a 100644
--- a/docs/data/histograms/United States/013LDA.json
+++ b/docs/data/histograms/United States/013LDA.json
@@ -1 +1 @@
-{"batchcode": "013LDA", "histograms": [{"batchcodes": ["013LDA"], "histogram": {"COVID-19": 1, "Deafness": 1, "Erythema": 1, "Heart rate increased": 1, "Migraine": 1, "Ocular hyperaemia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "013LDA", "histograms": [{"histogram": {"COVID-19": 1, "Deafness": 1, "Erythema": 1, "Heart rate increased": 1, "Migraine": 1, "Ocular hyperaemia": 1, "Tinnitus": 1}, "batchcodes": ["013LDA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013LQ0A.json b/docs/data/histograms/United States/013LQ0A.json
index 6a2aee5e182..8fd6d2e7740 100644
--- a/docs/data/histograms/United States/013LQ0A.json
+++ b/docs/data/histograms/United States/013LQ0A.json
@@ -1 +1 @@
-{"batchcode": "013LQ0A", "histograms": [{"batchcodes": ["013LQ0A"], "histogram": {"Pruritus": 1, "Respiratory disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "013LQ0A", "histograms": [{"histogram": {"Pruritus": 1, "Respiratory disorder": 1}, "batchcodes": ["013LQ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013LVOA.json b/docs/data/histograms/United States/013LVOA.json
index fa0e6ba3db8..4826640856a 100644
--- a/docs/data/histograms/United States/013LVOA.json
+++ b/docs/data/histograms/United States/013LVOA.json
@@ -1 +1 @@
-{"batchcode": "013LVOA", "histograms": [{"batchcodes": ["013LVOA"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "013LVOA", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["013LVOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013LZ0A.json b/docs/data/histograms/United States/013LZ0A.json
index 1154d7e4533..560b03fda8d 100644
--- a/docs/data/histograms/United States/013LZ0A.json
+++ b/docs/data/histograms/United States/013LZ0A.json
@@ -1 +1 @@
-{"batchcode": "013LZ0A", "histograms": [{"batchcodes": ["013LZ0A"], "histogram": {"Vaccination site warmth": 2, "Erythema": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "013LZ0A", "histograms": [{"histogram": {"Vaccination site warmth": 2, "Erythema": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["013LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013LZOA.json b/docs/data/histograms/United States/013LZOA.json
index ed83b599303..6fe90e8e052 100644
--- a/docs/data/histograms/United States/013LZOA.json
+++ b/docs/data/histograms/United States/013LZOA.json
@@ -1 +1 @@
-{"batchcode": "013LZOA", "histograms": [{"batchcodes": ["013LZOA"], "histogram": {"Burning sensation": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lymphadenopathy": 1, "Muscle spasms": 1, "Oropharyngeal pain": 1, "Pharyngeal swelling": 1, "SARS-CoV-2 test positive": 1, "Ultrasound Doppler": 1}}]}
\ No newline at end of file
+{"batchcode": "013LZOA", "histograms": [{"histogram": {"Burning sensation": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lymphadenopathy": 1, "Muscle spasms": 1, "Oropharyngeal pain": 1, "Pharyngeal swelling": 1, "SARS-CoV-2 test positive": 1, "Ultrasound Doppler": 1}, "batchcodes": ["013LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M00A.json b/docs/data/histograms/United States/013M00A.json
index 7e37bdfcb26..39f3a2008d3 100644
--- a/docs/data/histograms/United States/013M00A.json
+++ b/docs/data/histograms/United States/013M00A.json
@@ -1 +1 @@
-{"batchcode": "013M00A", "histograms": [{"batchcodes": ["013M00A"], "histogram": {"Asthenia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "013M00A", "histograms": [{"histogram": {"Asthenia": 1, "Pyrexia": 1}, "batchcodes": ["013M00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M02A.json b/docs/data/histograms/United States/013M02A.json
index 2726a49ce4c..1cacb09691c 100644
--- a/docs/data/histograms/United States/013M02A.json
+++ b/docs/data/histograms/United States/013M02A.json
@@ -1 +1 @@
-{"batchcode": "013M02A", "histograms": [{"batchcodes": ["013M02A"], "histogram": {"Abdominal pain upper": 1, "Appendicitis perforated": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Nausea": 1, "Pain in extremity": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "013M02A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Appendicitis perforated": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Nausea": 1, "Pain in extremity": 1, "Vomiting": 1}, "batchcodes": ["013M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M20.json b/docs/data/histograms/United States/013M20.json
index 3c2571c2eb9..98223f704dc 100644
--- a/docs/data/histograms/United States/013M20.json
+++ b/docs/data/histograms/United States/013M20.json
@@ -1 +1 @@
-{"batchcode": "013M20", "histograms": [{"batchcodes": ["013M20"], "histogram": {"Dizziness": 1, "Erythema multiforme": 1, "Injection site reaction": 1, "Motion sickness": 1, "Nausea": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20", "histograms": [{"histogram": {"Dizziness": 1, "Erythema multiforme": 1, "Injection site reaction": 1, "Motion sickness": 1, "Nausea": 1, "Rash pruritic": 1}, "batchcodes": ["013M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M201.json b/docs/data/histograms/United States/013M201.json
index e033910d534..e0b3dd1ece3 100644
--- a/docs/data/histograms/United States/013M201.json
+++ b/docs/data/histograms/United States/013M201.json
@@ -1 +1 @@
-{"batchcode": "013M201", "histograms": [{"batchcodes": ["013M201"], "histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Dyspepsia": 1, "Ultrasound abdomen": 1}}]}
\ No newline at end of file
+{"batchcode": "013M201", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Dyspepsia": 1, "Ultrasound abdomen": 1}, "batchcodes": ["013M201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M2014.json b/docs/data/histograms/United States/013M2014.json
index 603fc761523..d2942a7654d 100644
--- a/docs/data/histograms/United States/013M2014.json
+++ b/docs/data/histograms/United States/013M2014.json
@@ -1 +1 @@
-{"batchcode": "013M2014", "histograms": [{"batchcodes": ["013M2014"], "histogram": {"Accidental underdose": 1, "Product colour issue": 1, "Pyrexia": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013M2014", "histograms": [{"histogram": {"Accidental underdose": 1, "Product colour issue": 1, "Pyrexia": 1, "Vaccination site warmth": 1}, "batchcodes": ["013M2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M2019.json b/docs/data/histograms/United States/013M2019.json
index 8738ebdded8..d694dd86ea6 100644
--- a/docs/data/histograms/United States/013M2019.json
+++ b/docs/data/histograms/United States/013M2019.json
@@ -1 +1 @@
-{"batchcode": "013M2019", "histograms": [{"batchcodes": ["013M2019"], "histogram": {"Erythema": 1, "Inflammation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "013M2019", "histograms": [{"histogram": {"Erythema": 1, "Inflammation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin warm": 1}, "batchcodes": ["013M2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M201A.json b/docs/data/histograms/United States/013M201A.json
index 788ffdfc1d2..9366add232c 100644
--- a/docs/data/histograms/United States/013M201A.json
+++ b/docs/data/histograms/United States/013M201A.json
@@ -1 +1 @@
-{"batchcode": "013M201A", "histograms": [{"batchcodes": ["013M201A"], "histogram": {"Basedow's disease": 1, "COVID-19": 1, "Concussion": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Hyperthyroidism": 1, "Neck pain": 1, "Nephrolithiasis": 1, "Oropharyngeal discomfort": 1, "Post-traumatic neck syndrome": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "013M201A", "histograms": [{"histogram": {"Basedow's disease": 1, "COVID-19": 1, "Concussion": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Hyperthyroidism": 1, "Neck pain": 1, "Nephrolithiasis": 1, "Oropharyngeal discomfort": 1, "Post-traumatic neck syndrome": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Scan": 1, "Sneezing": 1}, "batchcodes": ["013M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M204.json b/docs/data/histograms/United States/013M204.json
index 0e6776199e8..fac39271cba 100644
--- a/docs/data/histograms/United States/013M204.json
+++ b/docs/data/histograms/United States/013M204.json
@@ -1 +1 @@
-{"batchcode": "013M204", "histograms": [{"batchcodes": ["013M204"], "histogram": {"Dizziness": 2, "Myalgia": 2, "Administration site bruise": 1, "Bedridden": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Dental dysaesthesia": 1, "Fatigue": 1, "Headache": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Loss of consciousness": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013M204", "histograms": [{"histogram": {"Dizziness": 2, "Myalgia": 2, "Administration site bruise": 1, "Bedridden": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Dental dysaesthesia": 1, "Fatigue": 1, "Headache": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Loss of consciousness": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1}, "batchcodes": ["013M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M207.json b/docs/data/histograms/United States/013M207.json
index f137cacc835..5d825986f89 100644
--- a/docs/data/histograms/United States/013M207.json
+++ b/docs/data/histograms/United States/013M207.json
@@ -1 +1 @@
-{"batchcode": "013M207", "histograms": [{"batchcodes": ["013M207"], "histogram": {"Fatigue": 2, "Pyrexia": 2, "Arthralgia": 1, "Body temperature": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Vaccination site induration": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013M207", "histograms": [{"histogram": {"Fatigue": 2, "Pyrexia": 2, "Arthralgia": 1, "Body temperature": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Vaccination site induration": 1, "Vaccination site pain": 1}, "batchcodes": ["013M207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M208.json b/docs/data/histograms/United States/013M208.json
index 83fea9580c7..610986aecdf 100644
--- a/docs/data/histograms/United States/013M208.json
+++ b/docs/data/histograms/United States/013M208.json
@@ -1 +1 @@
-{"batchcode": "013M208", "histograms": [{"batchcodes": ["013M208"], "histogram": {"Pyrexia": 2, "Body temperature": 1, "Chills": 1, "Influenza like illness": 1, "Rhinorrhoea": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "013M208", "histograms": [{"histogram": {"Pyrexia": 2, "Body temperature": 1, "Chills": 1, "Influenza like illness": 1, "Rhinorrhoea": 1, "Sneezing": 1}, "batchcodes": ["013M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M20A OR 0BM2.json b/docs/data/histograms/United States/013M20A OR 0BM2.json
index de13d5a1dbe..2d489b8d25b 100644
--- a/docs/data/histograms/United States/013M20A OR 0BM2.json
+++ b/docs/data/histograms/United States/013M20A OR 0BM2.json
@@ -1 +1 @@
-{"batchcode": "013M20A OR 0BM2", "histograms": [{"batchcodes": ["013M20A OR 0BM2"], "histogram": {"Fatigue": 3, "Headache": 3, "Myalgia": 3, "Discomfort": 1, "Lymph node pain": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A OR 0BM2", "histograms": [{"histogram": {"Fatigue": 3, "Headache": 3, "Myalgia": 3, "Discomfort": 1, "Lymph node pain": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["013M20A OR 0BM2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M20A).json b/docs/data/histograms/United States/013M20A).json
index a370d37d6bc..c69d35ac900 100644
--- a/docs/data/histograms/United States/013M20A).json
+++ b/docs/data/histograms/United States/013M20A).json
@@ -1 +1 @@
-{"batchcode": "013M20A)", "histograms": [{"batchcodes": ["013M20A)"], "histogram": {"Antibody test negative": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A)", "histograms": [{"histogram": {"Antibody test negative": 1, "Pain in extremity": 1}, "batchcodes": ["013M20A)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M20A..json b/docs/data/histograms/United States/013M20A..json
index c68200950e7..345c0567e67 100644
--- a/docs/data/histograms/United States/013M20A..json
+++ b/docs/data/histograms/United States/013M20A..json
@@ -1 +1 @@
-{"batchcode": "013M20A.", "histograms": [{"batchcodes": ["013M20A."], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A.", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["013M20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M20A.json b/docs/data/histograms/United States/013M20A.json
index 8e5953080b7..c49b5b30c74 100644
--- a/docs/data/histograms/United States/013M20A.json
+++ b/docs/data/histograms/United States/013M20A.json
@@ -1 +1 @@
-{"batchcode": "013M20A", "histograms": [{"batchcodes": ["013M20A"], "histogram": {"Pain in extremity": 121, "Fatigue": 116, "Pyrexia": 113, "Vaccination site pain": 111, "Chills": 104, "Headache": 104, "Myalgia": 81, "Nausea": 70, "Vaccination site erythema": 70, "Pain": 68, "Vaccination site pruritus": 58, "Dizziness": 53, "Pruritus": 51, "Rash": 50, "Vaccination site swelling": 48, "Feeling abnormal": 41, "Erythema": 40, "Vaccination site warmth": 37, "Arthralgia": 36, "Asthenia": 35, "Diarrhoea": 35, "Body temperature": 30, "Malaise": 29, "Peripheral swelling": 27, "Vaccination site rash": 26, "Influenza like illness": 24, "Vomiting": 24, "Injection site pain": 23, "Cough": 22, "Dyspnoea": 22, "Urticaria": 22, "Paraesthesia": 18, "SARS-CoV-2 test": 18, "Insomnia": 17, "Illness": 16, "COVID-19": 15, "Decreased appetite": 15, "Injection site erythema": 15, "Lymphadenopathy": 15, "Feeling hot": 14, "Heart rate": 14, "Gait disturbance": 13, "Injection site pruritus": 13, "Injection site warmth": 13, "Rash erythematous": 13, "Chest pain": 12, "Hypoaesthesia": 12, "Nasal congestion": 12, "Somnolence": 12, "Swelling": 12, "Mobility decreased": 11, "Tremor": 11, "Vaccination site induration": 11, "Blood pressure measurement": 10, "Hypersomnia": 10, "Inappropriate schedule of product administration": 10, "Musculoskeletal stiffness": 10, "Rhinorrhoea": 10, "Back pain": 9, "Chest discomfort": 9, "Expired product administered": 9, "Hypertension": 9, "Injection site swelling": 9, "Muscle spasms": 9, "Nasopharyngitis": 9, "Palpitations": 9, "Vaccination complication": 9, "Abdominal discomfort": 8, "Abdominal pain upper": 8, "Balance disorder": 8, "Blood test": 8, "Computerised tomogram": 8, "Discomfort": 8, "Lethargy": 8, "Maternal exposure during pregnancy": 8, "Muscular weakness": 8, "Oropharyngeal pain": 8, "Vaccination site mass": 8, "Vaccination site reaction": 8, "Vertigo": 8, "Ageusia": 7, "Anosmia": 7, "Bone pain": 7, "Burning sensation": 7, "Hot flush": 7, "Hyperhidrosis": 7, "Limb discomfort": 7, "Lip swelling": 7, "Loss of consciousness": 7, "Neck pain": 7, "Swelling face": 7, "Tenderness": 7, "Vision blurred": 7, "Condition aggravated": 6, "Exposure during pregnancy": 6, "Fall": 6, "Mass": 6, "Pregnancy test": 6, "Product administered to patient of inappropriate age": 6, "Product dose omission issue": 6, "Rash macular": 6, "Vaccination site urticaria": 6, "Axillary pain": 5, "Bell's palsy": 5, "Device connection issue": 5, "Dysgeusia": 5, "Eye pruritus": 5, "Heart rate increased": 5, "Hypersensitivity": 5, "Joint swelling": 5, "Rash pruritic": 5, "Visual impairment": 5, "Wheezing": 5, "Abnormal dreams": 4, "Anxiety": 4, "Blister": 4, "Cold sweat": 4, "Drug ineffective": 4, "Dyspepsia": 4, "Ear pain": 4, "Extra dose administered": 4, "Feeling cold": 4, "Flushing": 4, "Herpes zoster": 4, "Injection site rash": 4, "Migraine": 4, "Ocular discomfort": 4, "Paraesthesia oral": 4, "Sneezing": 4, "Ultrasound scan": 4, "Urinary tract infection": 4, "Vaccination site discolouration": 4, "X-ray": 4, "Abdominal pain": 3, "Allergy to vaccine": 3, "Aphasia": 3, "Bedridden": 3, "Blood glucose increased": 3, "Blood pressure increased": 3, "Cerebrovascular accident": 3, "Chromaturia": 3, "Confusional state": 3, "Contusion": 3, "Dry mouth": 3, "Dysphagia": 3, "Dysphonia": 3, "Dysstasia": 3, "Electrocardiogram": 3, "Epistaxis": 3, "Exposure via breast milk": 3, "Full blood count": 3, "Gait inability": 3, "Glucose tolerance test": 3, "Hallucination": 3, "Head discomfort": 3, "Hypokinesia": 3, "Immunisation reaction": 3, "Influenza": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Memory impairment": 3, "Muscle twitching": 3, "Musculoskeletal chest pain": 3, "Nervousness": 3, "Pharyngeal swelling": 3, "Pollakiuria": 3, "Product temperature excursion issue": 3, "Productive cough": 3, "Skin exfoliation": 3, "Skin reaction": 3, "Swollen tongue": 3, "Tachycardia": 3, "Tinnitus": 3, "Underdose": 3, "Urinary incontinence": 3, "Vaccination site movement impairment": 3, "Accidental underdose": 2, "Alopecia": 2, "Amnesia": 2, "Angina pectoris": 2, "Angioedema": 2, "Arthritis": 2, "Asthma": 2, "Atrial fibrillation": 2, "Autoimmune inner ear disease": 2, "Blood thyroid stimulating hormone": 2, "Body temperature increased": 2, "Breast pain": 2, "C-reactive protein": 2, "Cardiac discomfort": 2, "Cardiac flutter": 2, "Chest X-ray": 2, "Colonoscopy": 2, "Crying": 2, "Deep vein thrombosis": 2, "Delusion": 2, "Disorientation": 2, "Dyskinesia": 2, "Ear infection": 2, "Ear swelling": 2, "Eosinophilia": 2, "Extrasystoles": 2, "Eye colour change": 2, "Eye swelling": 2, "Facial pain": 2, "Flatulence": 2, "Frequent bowel movements": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Impaired driving ability": 2, "Incomplete course of vaccination": 2, "Infected dermal cyst": 2, "Inflammation": 2, "Injection site discolouration": 2, "Injection site induration": 2, "Irritability": 2, "Irritable bowel syndrome": 2, "Laziness": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Musculoskeletal discomfort": 2, "Neck mass": 2, "Neoplasm": 2, "Nodule": 2, "Off label use": 2, "Oral pain": 2, "Overdose": 2, "Oxygen saturation": 2, "Pain in jaw": 2, "Periorbital swelling": 2, "Pneumonia": 2, "SARS-CoV-2 antibody test": 2, "Sensation of foreign body": 2, "Sinus headache": 2, "Skin discolouration": 2, "Sleep disorder": 2, "Sluggishness": 2, "Supraventricular extrasystoles": 2, "Syncope": 2, "Taste disorder": 2, "Therapeutic response unexpected": 2, "Thirst": 2, "Throat irritation": 2, "Thyroid mass": 2, "Treponema test": 2, "Type IV hypersensitivity reaction": 2, "Vaccination site coldness": 2, "Vaccination site discharge": 2, "Vaccination site hypersensitivity": 2, "Vaccination site lymphadenopathy": 2, "White blood cell count": 2, "Abdominal distension": 1, "Abnormal faeces": 1, "Accidental overdose": 1, "Acoustic neuritis": 1, "Administration site discolouration": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Alpha 1 foetoprotein": 1, "Alpha 1 foetoprotein amniotic fluid": 1, "Altered visual depth perception": 1, "Amylase": 1, "Anaphylactic reaction": 1, "Ankle fracture": 1, "Anti factor VIII antibody test": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-cyclic citrullinated peptide antibody positive": 1, "Antinuclear antibody": 1, "Antinuclear antibody increased": 1, "Aphonia": 1, "Arrhythmia": 1, "Arthropod bite": 1, "Asthenopia": 1, "Bacterial test": 1, "Basedow's disease": 1, "Biopsy": 1, "Biopsy skin": 1, "Blepharitis": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood glucose abnormal": 1, "Blood glucose fluctuation": 1, "Blood iron": 1, "Blood pressure systolic": 1, "Body temperature fluctuation": 1, "Bowel movement irregularity": 1, "Breast discomfort": 1, "Breast feeding": 1, "Breast mass": 1, "Breath sounds": 1, "Bronchitis": 1, "Candida infection": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac pacemaker insertion": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chillblains": 1, "Choking": 1, "Chromosomal analysis": 1, "Chronic fatigue syndrome": 1, "Chronic obstructive pulmonary disease": 1, "Colitis microscopic": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Conjunctivitis": 1, "Constipation": 1, "Cystitis": 1, "Death": 1, "Dehydration": 1, "Depressed mood": 1, "Depression": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Dyspnoea at rest": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Eczema": 1, "Electric shock sensation": 1, "Emotional distress": 1, "Endocarditis": 1, "Eosinophil count": 1, "Eructation": 1, "Exposure via skin contact": 1, "Eye disorder": 1, "Eye irritation": 1, "Eye pain": 1, "Face oedema": 1, "Factor V Leiden mutation": 1, "Faeces discoloured": 1, "Faeces soft": 1, "Fear of death": 1, "Feeding disorder": 1, "Feeling of relaxation": 1, "Fibrin D dimer": 1, "Foot deformity": 1, "Foot fracture": 1, "Freezing phenomenon": 1, "Gastric haemorrhage": 1, "Gastric ulcer": 1, "Gastrointestinal pain": 1, "Gingival blister": 1, "Gingival pain": 1, "Gout": 1, "HIV test": 1, "HIV test negative": 1, "Haemoglobin decreased": 1, "Haemorrhage": 1, "Hallucination, visual": 1, "Heart rate irregular": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatitis C virus test": 1, "Hyperglycaemia": 1, "Hyperkeratosis": 1, "Hyperpyrexia": 1, "Hypersensitivity vasculitis": 1, "Hypertensive emergency": 1, "Hyperventilation": 1, "Hypoalbuminaemia": 1, "Hypotension": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Incorrect dose administered by product": 1, "Incorrect route of product administration": 1, "Increased tendency to bruise": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site mass": 1, "Injection site movement impairment": 1, "Injection site reaction": 1, "Injection site scab": 1, "Injection site urticaria": 1, "Intraocular pressure test": 1, "Joint injury": 1, "Lacrimation increased": 1, "Lip oedema": 1, "Lipase": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Localised infection": 1, "Lower limb fracture": 1, "Lupus-like syndrome": 1, "Lyme disease": 1, "Lymphocyte count": 1, "Lymphoedema": 1, "Magnetic resonance imaging heart": 1, "Meniscus injury": 1, "Metamorphopsia": 1, "Middle ear effusion": 1, "Migraine with aura": 1, "Monoclonal immunoglobulin present": 1, "Mouth swelling": 1, "Mouth ulceration": 1, "Muscle discomfort": 1, "Muscle spasticity": 1, "Muscle strength abnormal": 1, "Muscle tightness": 1, "Musculoskeletal disorder": 1, "Musculoskeletal pain": 1, "Nail hypertrophy": 1, "Nephrolithiasis": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nightmare": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Oral candidiasis": 1, "Oral mucosal blistering": 1, "Orbital oedema": 1, "Oropharyngeal discomfort": 1, "Otosalpingitis": 1, "Pain of skin": 1, "Pancreatitis": 1, "Papule": 1, "Paranasal sinus discomfort": 1, "Parosmia": 1, "Pathology test": 1, "Pericarditis": 1, "Pharyngeal hypoaesthesia": 1, "Pityriasis rosea": 1, "Platelet count decreased": 1, "Pneumococcal immunisation": 1, "Polymerase chain reaction": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Presyncope": 1, "Procedural pain": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Product dose omission in error": 1, "Product storage error": 1, "Prostatic specific antigen": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary congestion": 1, "Pulmonary pain": 1, "Quality of life decreased": 1, "Rash papular": 1, "Renal cancer": 1, "Renal stone removal": 1, "Respiratory tract congestion": 1, "Respiratory tract irritation": 1, "Respiratory tract oedema": 1, "Rheumatoid factor": 1, "Rheumatoid factor decreased": 1, "Rib fracture": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test positive": 1, "Scan": 1, "Sciatica": 1, "Scratch": 1, "Secretion discharge": 1, "Seizure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sepsis": 1, "Sinus disorder": 1, "Sinus pain": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin mass": 1, "Skin tightness": 1, "Skin warm": 1, "Sleep deficit": 1, "Sleep talking": 1, "Somnambulism": 1, "Speech disorder": 1, "Spinal compression fracture": 1, "Stent placement": 1, "Stomatitis": 1, "Strabismus": 1, "Stress": 1, "Suicidal ideation": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Testicular pain": 1, "Testicular swelling": 1, "Therapy cessation": 1, "Throat tightness": 1, "Thrombosis": 1, "Thyroid cancer": 1, "Tooth extraction": 1, "Tooth infection": 1, "Toothache": 1, "Tri-iodothyronine": 1, "Trigger finger": 1, "Ulcer haemorrhage": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan normal": 1, "Unevaluable event": 1, "Unresponsive to stimuli": 1, "Uterine cancer": 1, "Vaccination site bruising": 1, "Vaccination site cellulitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site infection": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site pustule": 1, "Vaccination site vesicles": 1, "Vascular compression": 1, "Ventricular extrasystoles": 1, "Vestibular neuronitis": 1, "Viral infection": 1, "Vitamin B12": 1, "Vitiligo": 1, "Vitreous floaters": 1, "Vulvovaginal pruritus": 1, "Weight": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count decreased": 1, "Wrong product administered": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20A", "histograms": [{"histogram": {"Pain in extremity": 121, "Fatigue": 116, "Pyrexia": 113, "Vaccination site pain": 111, "Chills": 104, "Headache": 104, "Myalgia": 81, "Nausea": 70, "Vaccination site erythema": 70, "Pain": 68, "Vaccination site pruritus": 58, "Dizziness": 53, "Pruritus": 51, "Rash": 50, "Vaccination site swelling": 48, "Feeling abnormal": 41, "Erythema": 40, "Vaccination site warmth": 37, "Arthralgia": 36, "Asthenia": 35, "Diarrhoea": 35, "Body temperature": 30, "Malaise": 29, "Peripheral swelling": 27, "Vaccination site rash": 26, "Influenza like illness": 24, "Vomiting": 24, "Injection site pain": 23, "Cough": 22, "Dyspnoea": 22, "Urticaria": 22, "Paraesthesia": 18, "SARS-CoV-2 test": 18, "Insomnia": 17, "Illness": 16, "COVID-19": 15, "Decreased appetite": 15, "Injection site erythema": 15, "Lymphadenopathy": 15, "Feeling hot": 14, "Heart rate": 14, "Gait disturbance": 13, "Injection site pruritus": 13, "Injection site warmth": 13, "Rash erythematous": 13, "Chest pain": 12, "Hypoaesthesia": 12, "Nasal congestion": 12, "Somnolence": 12, "Swelling": 12, "Mobility decreased": 11, "Tremor": 11, "Vaccination site induration": 11, "Blood pressure measurement": 10, "Hypersomnia": 10, "Inappropriate schedule of product administration": 10, "Musculoskeletal stiffness": 10, "Rhinorrhoea": 10, "Back pain": 9, "Chest discomfort": 9, "Expired product administered": 9, "Hypertension": 9, "Injection site swelling": 9, "Muscle spasms": 9, "Nasopharyngitis": 9, "Palpitations": 9, "Vaccination complication": 9, "Abdominal discomfort": 8, "Abdominal pain upper": 8, "Balance disorder": 8, "Blood test": 8, "Computerised tomogram": 8, "Discomfort": 8, "Lethargy": 8, "Maternal exposure during pregnancy": 8, "Muscular weakness": 8, "Oropharyngeal pain": 8, "Vaccination site mass": 8, "Vaccination site reaction": 8, "Vertigo": 8, "Ageusia": 7, "Anosmia": 7, "Bone pain": 7, "Burning sensation": 7, "Hot flush": 7, "Hyperhidrosis": 7, "Limb discomfort": 7, "Lip swelling": 7, "Loss of consciousness": 7, "Neck pain": 7, "Swelling face": 7, "Tenderness": 7, "Vision blurred": 7, "Condition aggravated": 6, "Exposure during pregnancy": 6, "Fall": 6, "Mass": 6, "Pregnancy test": 6, "Product administered to patient of inappropriate age": 6, "Product dose omission issue": 6, "Rash macular": 6, "Vaccination site urticaria": 6, "Axillary pain": 5, "Bell's palsy": 5, "Device connection issue": 5, "Dysgeusia": 5, "Eye pruritus": 5, "Heart rate increased": 5, "Hypersensitivity": 5, "Joint swelling": 5, "Rash pruritic": 5, "Visual impairment": 5, "Wheezing": 5, "Abnormal dreams": 4, "Anxiety": 4, "Blister": 4, "Cold sweat": 4, "Drug ineffective": 4, "Dyspepsia": 4, "Ear pain": 4, "Extra dose administered": 4, "Feeling cold": 4, "Flushing": 4, "Herpes zoster": 4, "Injection site rash": 4, "Migraine": 4, "Ocular discomfort": 4, "Paraesthesia oral": 4, "Sneezing": 4, "Ultrasound scan": 4, "Urinary tract infection": 4, "Vaccination site discolouration": 4, "X-ray": 4, "Abdominal pain": 3, "Allergy to vaccine": 3, "Aphasia": 3, "Bedridden": 3, "Blood glucose increased": 3, "Blood pressure increased": 3, "Cerebrovascular accident": 3, "Chromaturia": 3, "Confusional state": 3, "Contusion": 3, "Dry mouth": 3, "Dysphagia": 3, "Dysphonia": 3, "Dysstasia": 3, "Electrocardiogram": 3, "Epistaxis": 3, "Exposure via breast milk": 3, "Full blood count": 3, "Gait inability": 3, "Glucose tolerance test": 3, "Hallucination": 3, "Head discomfort": 3, "Hypokinesia": 3, "Immunisation reaction": 3, "Influenza": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Memory impairment": 3, "Muscle twitching": 3, "Musculoskeletal chest pain": 3, "Nervousness": 3, "Pharyngeal swelling": 3, "Pollakiuria": 3, "Product temperature excursion issue": 3, "Productive cough": 3, "Skin exfoliation": 3, "Skin reaction": 3, "Swollen tongue": 3, "Tachycardia": 3, "Tinnitus": 3, "Underdose": 3, "Urinary incontinence": 3, "Vaccination site movement impairment": 3, "Accidental underdose": 2, "Alopecia": 2, "Amnesia": 2, "Angina pectoris": 2, "Angioedema": 2, "Arthritis": 2, "Asthma": 2, "Atrial fibrillation": 2, "Autoimmune inner ear disease": 2, "Blood thyroid stimulating hormone": 2, "Body temperature increased": 2, "Breast pain": 2, "C-reactive protein": 2, "Cardiac discomfort": 2, "Cardiac flutter": 2, "Chest X-ray": 2, "Colonoscopy": 2, "Crying": 2, "Deep vein thrombosis": 2, "Delusion": 2, "Disorientation": 2, "Dyskinesia": 2, "Ear infection": 2, "Ear swelling": 2, "Eosinophilia": 2, "Extrasystoles": 2, "Eye colour change": 2, "Eye swelling": 2, "Facial pain": 2, "Flatulence": 2, "Frequent bowel movements": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Impaired driving ability": 2, "Incomplete course of vaccination": 2, "Infected dermal cyst": 2, "Inflammation": 2, "Injection site discolouration": 2, "Injection site induration": 2, "Irritability": 2, "Irritable bowel syndrome": 2, "Laziness": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Musculoskeletal discomfort": 2, "Neck mass": 2, "Neoplasm": 2, "Nodule": 2, "Off label use": 2, "Oral pain": 2, "Overdose": 2, "Oxygen saturation": 2, "Pain in jaw": 2, "Periorbital swelling": 2, "Pneumonia": 2, "SARS-CoV-2 antibody test": 2, "Sensation of foreign body": 2, "Sinus headache": 2, "Skin discolouration": 2, "Sleep disorder": 2, "Sluggishness": 2, "Supraventricular extrasystoles": 2, "Syncope": 2, "Taste disorder": 2, "Therapeutic response unexpected": 2, "Thirst": 2, "Throat irritation": 2, "Thyroid mass": 2, "Treponema test": 2, "Type IV hypersensitivity reaction": 2, "Vaccination site coldness": 2, "Vaccination site discharge": 2, "Vaccination site hypersensitivity": 2, "Vaccination site lymphadenopathy": 2, "White blood cell count": 2, "Abdominal distension": 1, "Abnormal faeces": 1, "Accidental overdose": 1, "Acoustic neuritis": 1, "Administration site discolouration": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Alpha 1 foetoprotein": 1, "Alpha 1 foetoprotein amniotic fluid": 1, "Altered visual depth perception": 1, "Amylase": 1, "Anaphylactic reaction": 1, "Ankle fracture": 1, "Anti factor VIII antibody test": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-cyclic citrullinated peptide antibody positive": 1, "Antinuclear antibody": 1, "Antinuclear antibody increased": 1, "Aphonia": 1, "Arrhythmia": 1, "Arthropod bite": 1, "Asthenopia": 1, "Bacterial test": 1, "Basedow's disease": 1, "Biopsy": 1, "Biopsy skin": 1, "Blepharitis": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood glucose abnormal": 1, "Blood glucose fluctuation": 1, "Blood iron": 1, "Blood pressure systolic": 1, "Body temperature fluctuation": 1, "Bowel movement irregularity": 1, "Breast discomfort": 1, "Breast feeding": 1, "Breast mass": 1, "Breath sounds": 1, "Bronchitis": 1, "Candida infection": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cardiac pacemaker insertion": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chillblains": 1, "Choking": 1, "Chromosomal analysis": 1, "Chronic fatigue syndrome": 1, "Chronic obstructive pulmonary disease": 1, "Colitis microscopic": 1, "Computerised tomogram head": 1, "Computerised tomogram thorax": 1, "Conjunctivitis": 1, "Constipation": 1, "Cystitis": 1, "Death": 1, "Dehydration": 1, "Depressed mood": 1, "Depression": 1, "Diplopia": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Dyspnoea at rest": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Eczema": 1, "Electric shock sensation": 1, "Emotional distress": 1, "Endocarditis": 1, "Eosinophil count": 1, "Eructation": 1, "Exposure via skin contact": 1, "Eye disorder": 1, "Eye irritation": 1, "Eye pain": 1, "Face oedema": 1, "Factor V Leiden mutation": 1, "Faeces discoloured": 1, "Faeces soft": 1, "Fear of death": 1, "Feeding disorder": 1, "Feeling of relaxation": 1, "Fibrin D dimer": 1, "Foot deformity": 1, "Foot fracture": 1, "Freezing phenomenon": 1, "Gastric haemorrhage": 1, "Gastric ulcer": 1, "Gastrointestinal pain": 1, "Gingival blister": 1, "Gingival pain": 1, "Gout": 1, "HIV test": 1, "HIV test negative": 1, "Haemoglobin decreased": 1, "Haemorrhage": 1, "Hallucination, visual": 1, "Heart rate irregular": 1, "Hemiparaesthesia": 1, "Hemiparesis": 1, "Hepatic enzyme": 1, "Hepatitis C virus test": 1, "Hyperglycaemia": 1, "Hyperkeratosis": 1, "Hyperpyrexia": 1, "Hypersensitivity vasculitis": 1, "Hypertensive emergency": 1, "Hyperventilation": 1, "Hypoalbuminaemia": 1, "Hypotension": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Incorrect dose administered by product": 1, "Incorrect route of product administration": 1, "Increased tendency to bruise": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site mass": 1, "Injection site movement impairment": 1, "Injection site reaction": 1, "Injection site scab": 1, "Injection site urticaria": 1, "Intraocular pressure test": 1, "Joint injury": 1, "Lacrimation increased": 1, "Lip oedema": 1, "Lipase": 1, "Liver function test": 1, "Liver function test abnormal": 1, "Localised infection": 1, "Lower limb fracture": 1, "Lupus-like syndrome": 1, "Lyme disease": 1, "Lymphocyte count": 1, "Lymphoedema": 1, "Magnetic resonance imaging heart": 1, "Meniscus injury": 1, "Metamorphopsia": 1, "Middle ear effusion": 1, "Migraine with aura": 1, "Monoclonal immunoglobulin present": 1, "Mouth swelling": 1, "Mouth ulceration": 1, "Muscle discomfort": 1, "Muscle spasticity": 1, "Muscle strength abnormal": 1, "Muscle tightness": 1, "Musculoskeletal disorder": 1, "Musculoskeletal pain": 1, "Nail hypertrophy": 1, "Nephrolithiasis": 1, "Neuralgia": 1, "Neutrophil count": 1, "Nightmare": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Oral candidiasis": 1, "Oral mucosal blistering": 1, "Orbital oedema": 1, "Oropharyngeal discomfort": 1, "Otosalpingitis": 1, "Pain of skin": 1, "Pancreatitis": 1, "Papule": 1, "Paranasal sinus discomfort": 1, "Parosmia": 1, "Pathology test": 1, "Pericarditis": 1, "Pharyngeal hypoaesthesia": 1, "Pityriasis rosea": 1, "Platelet count decreased": 1, "Pneumococcal immunisation": 1, "Polymerase chain reaction": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Presyncope": 1, "Procedural pain": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Product dose omission in error": 1, "Product storage error": 1, "Prostatic specific antigen": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary congestion": 1, "Pulmonary pain": 1, "Quality of life decreased": 1, "Rash papular": 1, "Renal cancer": 1, "Renal stone removal": 1, "Respiratory tract congestion": 1, "Respiratory tract irritation": 1, "Respiratory tract oedema": 1, "Rheumatoid factor": 1, "Rheumatoid factor decreased": 1, "Rib fracture": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test positive": 1, "Scan": 1, "Sciatica": 1, "Scratch": 1, "Secretion discharge": 1, "Seizure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sepsis": 1, "Sinus disorder": 1, "Sinus pain": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin mass": 1, "Skin tightness": 1, "Skin warm": 1, "Sleep deficit": 1, "Sleep talking": 1, "Somnambulism": 1, "Speech disorder": 1, "Spinal compression fracture": 1, "Stent placement": 1, "Stomatitis": 1, "Strabismus": 1, "Stress": 1, "Suicidal ideation": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Testicular pain": 1, "Testicular swelling": 1, "Therapy cessation": 1, "Throat tightness": 1, "Thrombosis": 1, "Thyroid cancer": 1, "Tooth extraction": 1, "Tooth infection": 1, "Toothache": 1, "Tri-iodothyronine": 1, "Trigger finger": 1, "Ulcer haemorrhage": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan normal": 1, "Unevaluable event": 1, "Unresponsive to stimuli": 1, "Uterine cancer": 1, "Vaccination site bruising": 1, "Vaccination site cellulitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site infection": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site pustule": 1, "Vaccination site vesicles": 1, "Vascular compression": 1, "Ventricular extrasystoles": 1, "Vestibular neuronitis": 1, "Viral infection": 1, "Vitamin B12": 1, "Vitiligo": 1, "Vitreous floaters": 1, "Vulvovaginal pruritus": 1, "Weight": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count decreased": 1, "Wrong product administered": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["013M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M20P OR 013M.json b/docs/data/histograms/United States/013M20P OR 013M.json
index 2dd0067d548..a9d22391ae5 100644
--- a/docs/data/histograms/United States/013M20P OR 013M.json
+++ b/docs/data/histograms/United States/013M20P OR 013M.json
@@ -1 +1 @@
-{"batchcode": "013M20P OR 013M", "histograms": [{"batchcodes": ["013M20P OR 013M"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Malaise": 1, "Muscle tightness": 1, "Pyrexia": 1, "Vulvovaginal discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "013M20P OR 013M", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Dizziness": 1, "Malaise": 1, "Muscle tightness": 1, "Pyrexia": 1, "Vulvovaginal discomfort": 1}, "batchcodes": ["013M20P OR 013M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M210A.json b/docs/data/histograms/United States/013M210A.json
index 63e2aa1a0e8..f25c47d87e5 100644
--- a/docs/data/histograms/United States/013M210A.json
+++ b/docs/data/histograms/United States/013M210A.json
@@ -1 +1 @@
-{"batchcode": "013M210A", "histograms": [{"batchcodes": ["013M210A"], "histogram": {"Feeling hot": 1, "Illness": 1, "Neoplasm": 1, "Pain": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013M210A", "histograms": [{"histogram": {"Feeling hot": 1, "Illness": 1, "Neoplasm": 1, "Pain": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site pain": 1}, "batchcodes": ["013M210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M21A.json b/docs/data/histograms/United States/013M21A.json
index 904e1a94824..b6f75d648f1 100644
--- a/docs/data/histograms/United States/013M21A.json
+++ b/docs/data/histograms/United States/013M21A.json
@@ -1 +1 @@
-{"batchcode": "013M21A", "histograms": [{"batchcodes": ["013M21A"], "histogram": {"Pain in extremity": 1, "Poor quality product administered": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "013M21A", "histograms": [{"histogram": {"Pain in extremity": 1, "Poor quality product administered": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["013M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M23AA.json b/docs/data/histograms/United States/013M23AA.json
index 1e0beb43409..01c7db900cc 100644
--- a/docs/data/histograms/United States/013M23AA.json
+++ b/docs/data/histograms/United States/013M23AA.json
@@ -1 +1 @@
-{"batchcode": "013M23AA", "histograms": [{"batchcodes": ["013M23AA"], "histogram": {"Influenza like illness": 1, "Injection site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "013M23AA", "histograms": [{"histogram": {"Influenza like illness": 1, "Injection site mass": 1}, "batchcodes": ["013M23AA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M24A.json b/docs/data/histograms/United States/013M24A.json
index fe166b75b92..5b8134e0fbe 100644
--- a/docs/data/histograms/United States/013M24A.json
+++ b/docs/data/histograms/United States/013M24A.json
@@ -1 +1 @@
-{"batchcode": "013M24A", "histograms": [{"batchcodes": ["013M24A"], "histogram": {"Asthenia": 1, "Bone pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013M24A", "histograms": [{"histogram": {"Asthenia": 1, "Bone pain": 1}, "batchcodes": ["013M24A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M26A.json b/docs/data/histograms/United States/013M26A.json
index 99696f914d7..77c9914c3e0 100644
--- a/docs/data/histograms/United States/013M26A.json
+++ b/docs/data/histograms/United States/013M26A.json
@@ -1 +1 @@
-{"batchcode": "013M26A", "histograms": [{"batchcodes": ["013M26A"], "histogram": {"Back pain": 1, "Constipation": 1, "Dysuria": 1, "Feeling abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "013M26A", "histograms": [{"histogram": {"Back pain": 1, "Constipation": 1, "Dysuria": 1, "Feeling abnormal": 1}, "batchcodes": ["013M26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M2A.json b/docs/data/histograms/United States/013M2A.json
index ab8c6dc360a..5c40513f814 100644
--- a/docs/data/histograms/United States/013M2A.json
+++ b/docs/data/histograms/United States/013M2A.json
@@ -1 +1 @@
-{"batchcode": "013M2A", "histograms": [{"batchcodes": ["013M2A"], "histogram": {"Chills": 1, "Fatigue": 1, "Limb discomfort": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "Swelling": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013M2A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Limb discomfort": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "Swelling": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}, "batchcodes": ["013M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M2CA.json b/docs/data/histograms/United States/013M2CA.json
index 21685d232dc..6bc9f49c18e 100644
--- a/docs/data/histograms/United States/013M2CA.json
+++ b/docs/data/histograms/United States/013M2CA.json
@@ -1 +1 @@
-{"batchcode": "013M2CA", "histograms": [{"batchcodes": ["013M2CA"], "histogram": {"Chills": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "013M2CA", "histograms": [{"histogram": {"Chills": 1, "Underdose": 1}, "batchcodes": ["013M2CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M2OA.json b/docs/data/histograms/United States/013M2OA.json
index f9d8207345c..6e335e2b657 100644
--- a/docs/data/histograms/United States/013M2OA.json
+++ b/docs/data/histograms/United States/013M2OA.json
@@ -1 +1 @@
-{"batchcode": "013M2OA", "histograms": [{"batchcodes": ["013M2OA"], "histogram": {"Arthralgia": 1, "Chills": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test negative": 1}}]}
\ No newline at end of file
+{"batchcode": "013M2OA", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 test negative": 1}, "batchcodes": ["013M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M2VA OR 013M.json b/docs/data/histograms/United States/013M2VA OR 013M.json
index db7f49194d4..818e0e0f5ba 100644
--- a/docs/data/histograms/United States/013M2VA OR 013M.json
+++ b/docs/data/histograms/United States/013M2VA OR 013M.json
@@ -1 +1 @@
-{"batchcode": "013M2VA OR 013M", "histograms": [{"batchcodes": ["013M2VA OR 013M"], "histogram": {"Muscle spasms": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013M2VA OR 013M", "histograms": [{"histogram": {"Muscle spasms": 1, "Vaccination site pain": 1}, "batchcodes": ["013M2VA OR 013M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013M7.json b/docs/data/histograms/United States/013M7.json
index afa4a44f3ff..52e1fb0af0a 100644
--- a/docs/data/histograms/United States/013M7.json
+++ b/docs/data/histograms/United States/013M7.json
@@ -1 +1 @@
-{"batchcode": "013M7", "histograms": [{"batchcodes": ["013M7"], "histogram": {"Chest discomfort": 1, "Chest pain": 1, "Echocardiogram": 1, "Pericardial effusion": 1, "Pyrexia": 1, "Trismus": 1}}]}
\ No newline at end of file
+{"batchcode": "013M7", "histograms": [{"histogram": {"Chest discomfort": 1, "Chest pain": 1, "Echocardiogram": 1, "Pericardial effusion": 1, "Pyrexia": 1, "Trismus": 1}, "batchcodes": ["013M7"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013ML0A.json b/docs/data/histograms/United States/013ML0A.json
index 4bafdd67775..190fb818458 100644
--- a/docs/data/histograms/United States/013ML0A.json
+++ b/docs/data/histograms/United States/013ML0A.json
@@ -1 +1 @@
-{"batchcode": "013ML0A", "histograms": [{"batchcodes": ["013ML0A"], "histogram": {"Appetite disorder": 1, "Asthenia": 1, "Balance disorder": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Nausea": 1, "Respiratory rate decreased": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "013ML0A", "histograms": [{"histogram": {"Appetite disorder": 1, "Asthenia": 1, "Balance disorder": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate increased": 1, "Loss of consciousness": 1, "Nausea": 1, "Respiratory rate decreased": 1, "Vertigo": 1}, "batchcodes": ["013ML0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013MWA.json b/docs/data/histograms/United States/013MWA.json
index 493c3c574f4..bc31d1215ed 100644
--- a/docs/data/histograms/United States/013MWA.json
+++ b/docs/data/histograms/United States/013MWA.json
@@ -1 +1 @@
-{"batchcode": "013MWA", "histograms": [{"batchcodes": ["013MWA"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "013MWA", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["013MWA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013MZ0A.json b/docs/data/histograms/United States/013MZ0A.json
index c1926481f1d..dca455ba073 100644
--- a/docs/data/histograms/United States/013MZ0A.json
+++ b/docs/data/histograms/United States/013MZ0A.json
@@ -1 +1 @@
-{"batchcode": "013MZ0A", "histograms": [{"batchcodes": ["013MZ0A"], "histogram": {"Chills": 3, "Pain in extremity": 2, "Arthralgia": 1, "Fatigue": 1, "Injection site mass": 1, "Injection site nodule": 1, "Injection site swelling": 1, "Neck pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "013MZ0A", "histograms": [{"histogram": {"Chills": 3, "Pain in extremity": 2, "Arthralgia": 1, "Fatigue": 1, "Injection site mass": 1, "Injection site nodule": 1, "Injection site swelling": 1, "Neck pain": 1, "Oxygen saturation": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["013MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013MZOA.json b/docs/data/histograms/United States/013MZOA.json
index 791b4529456..efa7320ca1d 100644
--- a/docs/data/histograms/United States/013MZOA.json
+++ b/docs/data/histograms/United States/013MZOA.json
@@ -1 +1 @@
-{"batchcode": "013MZOA", "histograms": [{"batchcodes": ["013MZOA"], "histogram": {"Product dose omission issue": 2, "Antibody test": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate increased": 1, "Hospitalisation": 1, "Lower respiratory tract congestion": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Pallor": 1}}]}
\ No newline at end of file
+{"batchcode": "013MZOA", "histograms": [{"histogram": {"Product dose omission issue": 2, "Antibody test": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate increased": 1, "Hospitalisation": 1, "Lower respiratory tract congestion": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Pallor": 1}, "batchcodes": ["013MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013N20A..json b/docs/data/histograms/United States/013N20A..json
index 75bd73525c7..7fdd8a5fd52 100644
--- a/docs/data/histograms/United States/013N20A..json
+++ b/docs/data/histograms/United States/013N20A..json
@@ -1 +1 @@
-{"batchcode": "013N20A.", "histograms": [{"batchcodes": ["013N20A."], "histogram": {"Headache": 1, "Rash": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "013N20A.", "histograms": [{"histogram": {"Headache": 1, "Rash": 1, "Rash erythematous": 1}, "batchcodes": ["013N20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013N20A.json b/docs/data/histograms/United States/013N20A.json
index ec670b6b47b..752524b9585 100644
--- a/docs/data/histograms/United States/013N20A.json
+++ b/docs/data/histograms/United States/013N20A.json
@@ -1 +1 @@
-{"batchcode": "013N20A", "histograms": [{"batchcodes": ["013N20A"], "histogram": {"Headache": 3, "Chills": 2, "Fatigue": 2, "Malaise": 2, "Pyrexia": 2, "Alopecia": 1, "Asthenia": 1, "Body temperature": 1, "Discomfort": 1, "Lethargy": 1, "Pain in extremity": 1, "Rash": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013N20A", "histograms": [{"histogram": {"Headache": 3, "Chills": 2, "Fatigue": 2, "Malaise": 2, "Pyrexia": 2, "Alopecia": 1, "Asthenia": 1, "Body temperature": 1, "Discomfort": 1, "Lethargy": 1, "Pain in extremity": 1, "Rash": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["013N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013O20A.json b/docs/data/histograms/United States/013O20A.json
index c1e2105dbb2..7ef5536abcb 100644
--- a/docs/data/histograms/United States/013O20A.json
+++ b/docs/data/histograms/United States/013O20A.json
@@ -1 +1 @@
-{"batchcode": "013O20A", "histograms": [{"batchcodes": ["013O20A"], "histogram": {"Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Injection site bruising": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "013O20A", "histograms": [{"histogram": {"Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Injection site bruising": 1, "Injection site pain": 1}, "batchcodes": ["013O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013S20A.json b/docs/data/histograms/United States/013S20A.json
index bf8fde06db0..3cf0af4d3f0 100644
--- a/docs/data/histograms/United States/013S20A.json
+++ b/docs/data/histograms/United States/013S20A.json
@@ -1 +1 @@
-{"batchcode": "013S20A", "histograms": [{"batchcodes": ["013S20A"], "histogram": {"Dizziness": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "013S20A", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1}, "batchcodes": ["013S20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/013Z20A.json b/docs/data/histograms/United States/013Z20A.json
index 15f69411d17..320c35a4989 100644
--- a/docs/data/histograms/United States/013Z20A.json
+++ b/docs/data/histograms/United States/013Z20A.json
@@ -1 +1 @@
-{"batchcode": "013Z20A", "histograms": [{"batchcodes": ["013Z20A"], "histogram": {"Exposure via skin contact": 1, "Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "013Z20A", "histograms": [{"histogram": {"Exposure via skin contact": 1, "Incorrect dose administered": 1}, "batchcodes": ["013Z20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014-935.json b/docs/data/histograms/United States/014-935.json
index 17ac9ac770d..0ba3fc7b0b5 100644
--- a/docs/data/histograms/United States/014-935.json
+++ b/docs/data/histograms/United States/014-935.json
@@ -1 +1 @@
-{"batchcode": "014-935", "histograms": [{"batchcodes": ["014-935"], "histogram": {"Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "014-935", "histograms": [{"histogram": {"Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["014-935"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014-C21A.json b/docs/data/histograms/United States/014-C21A.json
index 8a9544f4a2e..2cb4bd62254 100644
--- a/docs/data/histograms/United States/014-C21A.json
+++ b/docs/data/histograms/United States/014-C21A.json
@@ -1 +1 @@
-{"batchcode": "014-C21A", "histograms": [{"batchcodes": ["014-C21A"], "histogram": {"Chills": 1, "Feeling abnormal": 1, "Headache": 1, "Mental impairment": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "014-C21A", "histograms": [{"histogram": {"Chills": 1, "Feeling abnormal": 1, "Headache": 1, "Mental impairment": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["014-C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014-M20A.json b/docs/data/histograms/United States/014-M20A.json
index 67099e073eb..db625b5a096 100644
--- a/docs/data/histograms/United States/014-M20A.json
+++ b/docs/data/histograms/United States/014-M20A.json
@@ -1 +1 @@
-{"batchcode": "014-M20A", "histograms": [{"batchcodes": ["014-M20A"], "histogram": {"Oropharyngeal pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "014-M20A", "histograms": [{"histogram": {"Oropharyngeal pain": 1, "Vaccination site pain": 1}, "batchcodes": ["014-M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0140.json b/docs/data/histograms/United States/0140.json
index 8197034d5c1..52884c02cdb 100644
--- a/docs/data/histograms/United States/0140.json
+++ b/docs/data/histograms/United States/0140.json
@@ -1 +1 @@
-{"batchcode": "0140", "histograms": [{"batchcodes": ["0140"], "histogram": {"Chills": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Lethargy": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "0140", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Lethargy": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["0140"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014021A.json b/docs/data/histograms/United States/014021A.json
index 3fab99e58be..d789e30a03a 100644
--- a/docs/data/histograms/United States/014021A.json
+++ b/docs/data/histograms/United States/014021A.json
@@ -1 +1 @@
-{"batchcode": "014021A", "histograms": [{"batchcodes": ["014021A"], "histogram": {"Injection site pain": 1, "Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "014021A", "histograms": [{"histogram": {"Injection site pain": 1, "Rash": 1, "Urticaria": 1}, "batchcodes": ["014021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014120A.json b/docs/data/histograms/United States/014120A.json
index 87cac103762..92c5f824066 100644
--- a/docs/data/histograms/United States/014120A.json
+++ b/docs/data/histograms/United States/014120A.json
@@ -1 +1 @@
-{"batchcode": "014120A", "histograms": [{"batchcodes": ["014120A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "014120A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["014120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014121A.json b/docs/data/histograms/United States/014121A.json
index 91c2cf988b0..9c7830bda32 100644
--- a/docs/data/histograms/United States/014121A.json
+++ b/docs/data/histograms/United States/014121A.json
@@ -1 +1 @@
-{"batchcode": "014121A", "histograms": [{"batchcodes": ["014121A"], "histogram": {"Skin warm": 1, "Swelling": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "014121A", "histograms": [{"histogram": {"Skin warm": 1, "Swelling": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1}, "batchcodes": ["014121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01417201A.json b/docs/data/histograms/United States/01417201A.json
index 6ac44fd5744..010ef7e6c17 100644
--- a/docs/data/histograms/United States/01417201A.json
+++ b/docs/data/histograms/United States/01417201A.json
@@ -1 +1 @@
-{"batchcode": "01417201A", "histograms": [{"batchcodes": ["01417201A"], "histogram": {"Movement disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "01417201A", "histograms": [{"histogram": {"Movement disorder": 1}, "batchcodes": ["01417201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0141720A.json b/docs/data/histograms/United States/0141720A.json
index 573f3767c9d..9fb660d7380 100644
--- a/docs/data/histograms/United States/0141720A.json
+++ b/docs/data/histograms/United States/0141720A.json
@@ -1 +1 @@
-{"batchcode": "0141720A", "histograms": [{"batchcodes": ["0141720A"], "histogram": {"Malaise": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0141720A", "histograms": [{"histogram": {"Malaise": 1, "Pain": 1}, "batchcodes": ["0141720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0141L20A.json b/docs/data/histograms/United States/0141L20A.json
index f0f4b20cce9..7b5ca642a84 100644
--- a/docs/data/histograms/United States/0141L20A.json
+++ b/docs/data/histograms/United States/0141L20A.json
@@ -1 +1 @@
-{"batchcode": "0141L20A", "histograms": [{"batchcodes": ["0141L20A"], "histogram": {"Myalgia": 3, "Pyrexia": 3, "Body temperature": 2}}]}
\ No newline at end of file
+{"batchcode": "0141L20A", "histograms": [{"histogram": {"Myalgia": 3, "Pyrexia": 3, "Body temperature": 2}, "batchcodes": ["0141L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0146204.json b/docs/data/histograms/United States/0146204.json
index 067c2075097..44a0df14919 100644
--- a/docs/data/histograms/United States/0146204.json
+++ b/docs/data/histograms/United States/0146204.json
@@ -1 +1 @@
-{"batchcode": "0146204", "histograms": [{"batchcodes": ["0146204"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0146204", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0146204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0149694.json b/docs/data/histograms/United States/0149694.json
index 8946d709f72..e18f398906d 100644
--- a/docs/data/histograms/United States/0149694.json
+++ b/docs/data/histograms/United States/0149694.json
@@ -1 +1 @@
-{"batchcode": "0149694", "histograms": [{"batchcodes": ["0149694"], "histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Product use issue": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "0149694", "histograms": [{"histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Interchange of vaccine products": 1, "Off label use": 1, "Product use issue": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["0149694"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0149853-18122.json b/docs/data/histograms/United States/0149853-18122.json
index f227162e915..80a0269e8b1 100644
--- a/docs/data/histograms/United States/0149853-18122.json
+++ b/docs/data/histograms/United States/0149853-18122.json
@@ -1 +1 @@
-{"batchcode": "0149853-18122", "histograms": [{"batchcodes": ["0149853-18122"], "histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "0149853-18122", "histograms": [{"histogram": {"Lymph node pain": 1, "Lymphadenopathy": 1}, "batchcodes": ["0149853-18122"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014A20A.json b/docs/data/histograms/United States/014A20A.json
index a803785f378..a948000240e 100644
--- a/docs/data/histograms/United States/014A20A.json
+++ b/docs/data/histograms/United States/014A20A.json
@@ -1 +1 @@
-{"batchcode": "014A20A", "histograms": [{"batchcodes": ["014A20A"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "014A20A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["014A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014A21A.json b/docs/data/histograms/United States/014A21A.json
index dc4c492b362..477713f8d5b 100644
--- a/docs/data/histograms/United States/014A21A.json
+++ b/docs/data/histograms/United States/014A21A.json
@@ -1 +1 @@
-{"batchcode": "014A21A", "histograms": [{"batchcodes": ["014A21A", "028K21A"], "histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "014A21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["014A21A", "028K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014A22A.json b/docs/data/histograms/United States/014A22A.json
index a8d9bfa32b3..7f711c756f1 100644
--- a/docs/data/histograms/United States/014A22A.json
+++ b/docs/data/histograms/United States/014A22A.json
@@ -1 +1 @@
-{"batchcode": "014A22A", "histograms": [{"batchcodes": ["014A22A"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "014A22A", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["014A22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014B21A.json b/docs/data/histograms/United States/014B21A.json
index 7451fa857c4..0cdf8bf1a42 100644
--- a/docs/data/histograms/United States/014B21A.json
+++ b/docs/data/histograms/United States/014B21A.json
@@ -1 +1 @@
-{"batchcode": "014B21A", "histograms": [{"batchcodes": ["014B21A"], "histogram": {"Fatigue": 2, "Headache": 2, "Pain in extremity": 2, "Arthralgia": 1, "Chest pain": 1, "Chills": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "014B21A", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Pain in extremity": 2, "Arthralgia": 1, "Chest pain": 1, "Chills": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Somnolence": 1}, "batchcodes": ["014B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014B22A.json b/docs/data/histograms/United States/014B22A.json
index 15495525c52..8074591750f 100644
--- a/docs/data/histograms/United States/014B22A.json
+++ b/docs/data/histograms/United States/014B22A.json
@@ -1 +1 @@
-{"batchcode": "014B22A", "histograms": [{"batchcodes": ["014B22A"], "histogram": {"Expired product administered": 29, "Product storage error": 25, "No adverse event": 24, "Product temperature excursion issue": 20, "Poor quality product administered": 17, "Underdose": 3, "Wrong product administered": 3, "Incorrect dose administered": 2, "Pain in extremity": 2, "Vaccination site warmth": 2, "Blood glucose": 1, "Blood test": 1, "Body temperature": 1, "Bone disorder": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Diabetes mellitus inadequate control": 1, "Disorientation": 1, "Dizziness": 1, "Dry skin": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Glossodynia": 1, "Hepatic cancer stage IV": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Peripheral swelling": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Pyrexia": 1, "Sensation of foreign body": 1, "Ultrasound scan": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "014B22A", "histograms": [{"histogram": {"Expired product administered": 29, "Product storage error": 25, "No adverse event": 24, "Product temperature excursion issue": 20, "Poor quality product administered": 17, "Underdose": 3, "Wrong product administered": 3, "Incorrect dose administered": 2, "Pain in extremity": 2, "Vaccination site warmth": 2, "Blood glucose": 1, "Blood test": 1, "Body temperature": 1, "Bone disorder": 1, "Chest discomfort": 1, "Computerised tomogram": 1, "Diabetes mellitus inadequate control": 1, "Disorientation": 1, "Dizziness": 1, "Dry skin": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Gait disturbance": 1, "Glossodynia": 1, "Hepatic cancer stage IV": 1, "Inappropriate schedule of product administration": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Peripheral swelling": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Pyrexia": 1, "Sensation of foreign body": 1, "Ultrasound scan": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["014B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014C211A.json b/docs/data/histograms/United States/014C211A.json
index a81c35887e1..5ab5bcee489 100644
--- a/docs/data/histograms/United States/014C211A.json
+++ b/docs/data/histograms/United States/014C211A.json
@@ -1 +1 @@
-{"batchcode": "014C211A", "histograms": [{"batchcodes": ["014C211A"], "histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "014C211A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["014C211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014C219.json b/docs/data/histograms/United States/014C219.json
index c385fa919a0..eeaaea51f84 100644
--- a/docs/data/histograms/United States/014C219.json
+++ b/docs/data/histograms/United States/014C219.json
@@ -1 +1 @@
-{"batchcode": "014C219", "histograms": [{"batchcodes": ["014C219"], "histogram": {"Arthralgia": 1, "Bedridden": 1, "Confusional state": 1, "Encephalitis": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "014C219", "histograms": [{"histogram": {"Arthralgia": 1, "Bedridden": 1, "Confusional state": 1, "Encephalitis": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1}, "batchcodes": ["014C219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014C21A.json b/docs/data/histograms/United States/014C21A.json
index e656c26fe83..2808d029574 100644
--- a/docs/data/histograms/United States/014C21A.json
+++ b/docs/data/histograms/United States/014C21A.json
@@ -1 +1 @@
-{"batchcode": "014C21A", "histograms": [{"batchcodes": ["014C21A"], "histogram": {"Expired product administered": 41, "Fatigue": 24, "Headache": 23, "Pyrexia": 22, "Myalgia": 18, "Chills": 16, "Pain in extremity": 15, "Product administered to patient of inappropriate age": 15, "Dizziness": 12, "Nausea": 12, "Vaccination site pain": 11, "SARS-CoV-2 test": 9, "Asthenia": 7, "Dyspnoea": 7, "Inappropriate schedule of product administration": 7, "Rash": 7, "Erythema": 6, "Pain": 6, "Vaccination site swelling": 6, "Feeling abnormal": 5, "Peripheral swelling": 5, "Pruritus": 5, "Urticaria": 5, "COVID-19": 4, "Cough": 4, "Feeling hot": 4, "Limb discomfort": 4, "Lymphadenopathy": 4, "Malaise": 4, "Nasopharyngitis": 4, "Product storage error": 4, "Rash erythematous": 4, "Rash pruritic": 4, "Arthralgia": 3, "Body temperature": 3, "Burning sensation": 3, "Chest discomfort": 3, "Chest pain": 3, "Heavy menstrual bleeding": 3, "Influenza like illness": 3, "Injection site erythema": 3, "Insomnia": 3, "Night sweats": 3, "Product dose omission issue": 3, "Swelling": 3, "Tremor": 3, "Vaccination complication": 3, "Vaccination site erythema": 3, "Vomiting": 3, "Back pain": 2, "Balance disorder": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Device connection issue": 2, "Diarrhoea": 2, "Eye swelling": 2, "Fall": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Injection site pain": 2, "Injection site rash": 2, "Injection site swelling": 2, "Injection site warmth": 2, "Nasal congestion": 2, "Paraesthesia": 2, "Skin discolouration": 2, "Underdose": 2, "Vaccination site pruritus": 2, "Weight decreased": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Antibody test": 1, "Arrhythmia": 1, "Bell's palsy": 1, "Blister": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Butterfly rash": 1, "Concussion": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Convalescent": 1, "Dehydration": 1, "Depressed mood": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dysgeusia": 1, "Dysphagia": 1, "Ear discomfort": 1, "Epistaxis": 1, "Eye pruritus": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Haemoptysis": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hot flush": 1, "Hyperventilation": 1, "Illness": 1, "Influenza": 1, "Injection site induration": 1, "Injection site mass": 1, "Joint swelling": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lung abscess": 1, "Lymph node pain": 1, "Mechanical urticaria": 1, "Muscle twitching": 1, "Myocardial infarction": 1, "Nail discolouration": 1, "Nephrostomy": 1, "No adverse event": 1, "Nodule": 1, "Non-Hodgkin's lymphoma": 1, "Off label use": 1, "Oligomenorrhoea": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Parosmia": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Pneumonia": 1, "Product temperature excursion issue": 1, "Pruritus genital": 1, "Rhinorrhoea": 1, "Scratch": 1, "Sinus congestion": 1, "Skin mass": 1, "Skin swelling": 1, "Somnolence": 1, "Spinal pain": 1, "Surgery": 1, "Tachycardia": 1, "Throat irritation": 1, "Throat tightness": 1, "Tinnitus": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Vascular pain": 1, "Vision blurred": 1, "Weight": 1, "White blood cell count": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "014C21A", "histograms": [{"histogram": {"Expired product administered": 41, "Fatigue": 24, "Headache": 23, "Pyrexia": 22, "Myalgia": 18, "Chills": 16, "Pain in extremity": 15, "Product administered to patient of inappropriate age": 15, "Dizziness": 12, "Nausea": 12, "Vaccination site pain": 11, "SARS-CoV-2 test": 9, "Asthenia": 7, "Dyspnoea": 7, "Inappropriate schedule of product administration": 7, "Rash": 7, "Erythema": 6, "Pain": 6, "Vaccination site swelling": 6, "Feeling abnormal": 5, "Peripheral swelling": 5, "Pruritus": 5, "Urticaria": 5, "COVID-19": 4, "Cough": 4, "Feeling hot": 4, "Limb discomfort": 4, "Lymphadenopathy": 4, "Malaise": 4, "Nasopharyngitis": 4, "Product storage error": 4, "Rash erythematous": 4, "Rash pruritic": 4, "Arthralgia": 3, "Body temperature": 3, "Burning sensation": 3, "Chest discomfort": 3, "Chest pain": 3, "Heavy menstrual bleeding": 3, "Influenza like illness": 3, "Injection site erythema": 3, "Insomnia": 3, "Night sweats": 3, "Product dose omission issue": 3, "Swelling": 3, "Tremor": 3, "Vaccination complication": 3, "Vaccination site erythema": 3, "Vomiting": 3, "Back pain": 2, "Balance disorder": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Device connection issue": 2, "Diarrhoea": 2, "Eye swelling": 2, "Fall": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypoaesthesia": 2, "Injection site pain": 2, "Injection site rash": 2, "Injection site swelling": 2, "Injection site warmth": 2, "Nasal congestion": 2, "Paraesthesia": 2, "Skin discolouration": 2, "Underdose": 2, "Vaccination site pruritus": 2, "Weight decreased": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Antibody test": 1, "Arrhythmia": 1, "Bell's palsy": 1, "Blister": 1, "Blood cholesterol": 1, "Blood glucose": 1, "Butterfly rash": 1, "Concussion": 1, "Condition aggravated": 1, "Conjunctivitis": 1, "Convalescent": 1, "Dehydration": 1, "Depressed mood": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dysgeusia": 1, "Dysphagia": 1, "Ear discomfort": 1, "Epistaxis": 1, "Eye pruritus": 1, "Feeling cold": 1, "Feeling of body temperature change": 1, "Haemoptysis": 1, "Heart rate": 1, "Heart rate irregular": 1, "Hot flush": 1, "Hyperventilation": 1, "Illness": 1, "Influenza": 1, "Injection site induration": 1, "Injection site mass": 1, "Joint swelling": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lung abscess": 1, "Lymph node pain": 1, "Mechanical urticaria": 1, "Muscle twitching": 1, "Myocardial infarction": 1, "Nail discolouration": 1, "Nephrostomy": 1, "No adverse event": 1, "Nodule": 1, "Non-Hodgkin's lymphoma": 1, "Off label use": 1, "Oligomenorrhoea": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Parosmia": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Pneumonia": 1, "Product temperature excursion issue": 1, "Pruritus genital": 1, "Rhinorrhoea": 1, "Scratch": 1, "Sinus congestion": 1, "Skin mass": 1, "Skin swelling": 1, "Somnolence": 1, "Spinal pain": 1, "Surgery": 1, "Tachycardia": 1, "Throat irritation": 1, "Throat tightness": 1, "Tinnitus": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Vascular pain": 1, "Vision blurred": 1, "Weight": 1, "White blood cell count": 1, "Wrong product administered": 1}, "batchcodes": ["014C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014CZ14.json b/docs/data/histograms/United States/014CZ14.json
index ea25a399d56..8a156b5fc78 100644
--- a/docs/data/histograms/United States/014CZ14.json
+++ b/docs/data/histograms/United States/014CZ14.json
@@ -1 +1 @@
-{"batchcode": "014CZ14", "histograms": [{"batchcodes": ["014CZ14"], "histogram": {"Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "014CZ14", "histograms": [{"histogram": {"Body temperature": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["014CZ14"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014CZIA.json b/docs/data/histograms/United States/014CZIA.json
index 3e416e44427..85eccce2cc0 100644
--- a/docs/data/histograms/United States/014CZIA.json
+++ b/docs/data/histograms/United States/014CZIA.json
@@ -1 +1 @@
-{"batchcode": "014CZIA", "histograms": [{"batchcodes": ["014CZIA"], "histogram": {"Fatigue": 2, "Pyrexia": 2, "Back pain": 1, "COVID-19": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "014CZIA", "histograms": [{"histogram": {"Fatigue": 2, "Pyrexia": 2, "Back pain": 1, "COVID-19": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["014CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014F21A.json b/docs/data/histograms/United States/014F21A.json
index a2cbb8b0c92..20114d3fe9e 100644
--- a/docs/data/histograms/United States/014F21A.json
+++ b/docs/data/histograms/United States/014F21A.json
@@ -1 +1 @@
-{"batchcode": "014F21A", "histograms": [{"batchcodes": ["014F21A", "1805022", "E49702"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["014F21A", "EL1284"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2}}, {"batchcodes": ["014F21A"], "histogram": {"Expired product administered": 18, "Headache": 10, "Pain in extremity": 9, "Vaccination site erythema": 9, "Fatigue": 8, "Vaccination site pain": 8, "Inappropriate schedule of product administration": 7, "Chills": 6, "Myalgia": 6, "Product storage error": 6, "Pyrexia": 5, "Vaccination site pruritus": 5, "Vaccination site swelling": 5, "Body temperature": 4, "Chest discomfort": 4, "Feeling abnormal": 4, "Hypoaesthesia": 4, "Lymphadenopathy": 4, "Accidental overdose": 3, "Dizziness": 3, "Feeling hot": 3, "Interchange of vaccine products": 3, "Pain": 3, "Vaccination site warmth": 3, "Vertigo": 3, "Accidental underdose": 2, "Arthralgia": 2, "COVID-19": 2, "Chest pain": 2, "Dyspnoea": 2, "Gait disturbance": 2, "Hypertension": 2, "Influenza like illness": 2, "Malaise": 2, "Product administered to patient of inappropriate age": 2, "Product temperature excursion issue": 2, "SARS-CoV-2 test": 2, "Tinnitus": 2, "Vaccination site mass": 2, "Vaccination site rash": 2, "Vision blurred": 2, "Acoustic stimulation tests": 1, "Allergy to vaccine": 1, "Asthenia": 1, "Asthma": 1, "Axillary pain": 1, "Bedridden": 1, "Blister": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bone pain": 1, "Burning sensation": 1, "Cardiac murmur": 1, "Contusion": 1, "Cough": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Erythema": 1, "Eustachian tube dysfunction": 1, "Feeling cold": 1, "Gastrointestinal inflammation": 1, "Head discomfort": 1, "Hyperhidrosis": 1, "Impaired quality of life": 1, "Inflammation": 1, "Influenza": 1, "Injection site induration": 1, "Insomnia": 1, "Joint stiffness": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Muscle spasms": 1, "Muscle strain": 1, "Muscle tightness": 1, "Nasal discomfort": 1, "Nausea": 1, "Neck pain": 1, "Neurological symptom": 1, "Night sweats": 1, "No adverse event": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Parosmia": 1, "Pharyngeal swelling": 1, "Pleurisy": 1, "Pneumonitis": 1, "Post-acute COVID-19 syndrome": 1, "Product administration error": 1, "Product dose omission issue": 1, "Product preparation error": 1, "Pruritus": 1, "Rash": 1, "Rib fracture": 1, "Seizure": 1, "Skin discolouration": 1, "Skin tightness": 1, "Somnolence": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Taste disorder": 1, "Therapeutic response unexpected": 1, "Tremor": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site irritation": 1, "Vaccination site reaction": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "014F21A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["014F21A", "1805022", "E49702"]}, {"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2}, "batchcodes": ["014F21A", "EL1284"]}, {"histogram": {"Expired product administered": 18, "Headache": 10, "Pain in extremity": 9, "Vaccination site erythema": 9, "Fatigue": 8, "Vaccination site pain": 8, "Inappropriate schedule of product administration": 7, "Chills": 6, "Myalgia": 6, "Product storage error": 6, "Pyrexia": 5, "Vaccination site pruritus": 5, "Vaccination site swelling": 5, "Body temperature": 4, "Chest discomfort": 4, "Feeling abnormal": 4, "Hypoaesthesia": 4, "Lymphadenopathy": 4, "Accidental overdose": 3, "Dizziness": 3, "Feeling hot": 3, "Interchange of vaccine products": 3, "Pain": 3, "Vaccination site warmth": 3, "Vertigo": 3, "Accidental underdose": 2, "Arthralgia": 2, "COVID-19": 2, "Chest pain": 2, "Dyspnoea": 2, "Gait disturbance": 2, "Hypertension": 2, "Influenza like illness": 2, "Malaise": 2, "Product administered to patient of inappropriate age": 2, "Product temperature excursion issue": 2, "SARS-CoV-2 test": 2, "Tinnitus": 2, "Vaccination site mass": 2, "Vaccination site rash": 2, "Vision blurred": 2, "Acoustic stimulation tests": 1, "Allergy to vaccine": 1, "Asthenia": 1, "Asthma": 1, "Axillary pain": 1, "Bedridden": 1, "Blister": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bone pain": 1, "Burning sensation": 1, "Cardiac murmur": 1, "Contusion": 1, "Cough": 1, "Deafness unilateral": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Erythema": 1, "Eustachian tube dysfunction": 1, "Feeling cold": 1, "Gastrointestinal inflammation": 1, "Head discomfort": 1, "Hyperhidrosis": 1, "Impaired quality of life": 1, "Inflammation": 1, "Influenza": 1, "Injection site induration": 1, "Insomnia": 1, "Joint stiffness": 1, "Joint swelling": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Magnetic resonance imaging": 1, "Muscle spasms": 1, "Muscle strain": 1, "Muscle tightness": 1, "Nasal discomfort": 1, "Nausea": 1, "Neck pain": 1, "Neurological symptom": 1, "Night sweats": 1, "No adverse event": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Parosmia": 1, "Pharyngeal swelling": 1, "Pleurisy": 1, "Pneumonitis": 1, "Post-acute COVID-19 syndrome": 1, "Product administration error": 1, "Product dose omission issue": 1, "Product preparation error": 1, "Pruritus": 1, "Rash": 1, "Rib fracture": 1, "Seizure": 1, "Skin discolouration": 1, "Skin tightness": 1, "Somnolence": 1, "Supraventricular tachycardia": 1, "Swelling": 1, "Taste disorder": 1, "Therapeutic response unexpected": 1, "Tremor": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site irritation": 1, "Vaccination site reaction": 1, "Visual impairment": 1}, "batchcodes": ["014F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014F2V9.json b/docs/data/histograms/United States/014F2V9.json
index b82da10570a..25b29721839 100644
--- a/docs/data/histograms/United States/014F2V9.json
+++ b/docs/data/histograms/United States/014F2V9.json
@@ -1 +1 @@
-{"batchcode": "014F2V9", "histograms": [{"batchcodes": ["014F2V9"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Migraine": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "014F2V9", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Migraine": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["014F2V9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014H22A.json b/docs/data/histograms/United States/014H22A.json
index ec3ea220854..bc78184fcf1 100644
--- a/docs/data/histograms/United States/014H22A.json
+++ b/docs/data/histograms/United States/014H22A.json
@@ -1 +1 @@
-{"batchcode": "014H22A", "histograms": [{"batchcodes": ["014H22A", "GJ6738"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}}, {"batchcodes": ["014H22A"], "histogram": {"No adverse event": 9, "Expired product administered": 6, "Product storage error": 3, "Body temperature": 2, "SARS-CoV-2 test": 2, "Wrong product administered": 2, "Abdominal discomfort": 1, "Acne": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "COVID-19": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fall": 1, "Feeding disorder": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Mouth ulceration": 1, "Nausea": 1, "Panic attack": 1, "Product dose omission issue": 1, "Pyrexia": 1, "SARS-CoV-2 test false positive": 1, "Somnolence": 1, "Stress": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "014H22A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1}, "batchcodes": ["014H22A", "GJ6738"]}, {"histogram": {"No adverse event": 9, "Expired product administered": 6, "Product storage error": 3, "Body temperature": 2, "SARS-CoV-2 test": 2, "Wrong product administered": 2, "Abdominal discomfort": 1, "Acne": 1, "Anxiety": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "COVID-19": 1, "Cardiac arrest": 1, "Chest X-ray": 1, "Chest discomfort": 1, "Cold sweat": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Fall": 1, "Feeding disorder": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Laboratory test": 1, "Loss of consciousness": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Mouth ulceration": 1, "Nausea": 1, "Panic attack": 1, "Product dose omission issue": 1, "Pyrexia": 1, "SARS-CoV-2 test false positive": 1, "Somnolence": 1, "Stress": 1, "Vaccination site induration": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["014H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014I20A.json b/docs/data/histograms/United States/014I20A.json
index 33d40047572..4075db0a634 100644
--- a/docs/data/histograms/United States/014I20A.json
+++ b/docs/data/histograms/United States/014I20A.json
@@ -1 +1 @@
-{"batchcode": "014I20A", "histograms": [{"batchcodes": ["014I20A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "014I20A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["014I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014L20A.json b/docs/data/histograms/United States/014L20A.json
index e95e7711edb..cad6450e40e 100644
--- a/docs/data/histograms/United States/014L20A.json
+++ b/docs/data/histograms/United States/014L20A.json
@@ -1 +1 @@
-{"batchcode": "014L20A", "histograms": [{"batchcodes": ["014L20A"], "histogram": {"Pain in extremity": 2, "Accidental overdose": 1, "Blister": 1, "Bone pain": 1, "COVID-19": 1, "Condition aggravated": 1, "Cough": 1, "Decreased appetite": 1, "Erythema": 1, "Fatigue": 1, "Feeling hot": 1, "Hypokinesia": 1, "Injection site erythema": 1, "Muscle fatigue": 1, "Myalgia": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "014L20A", "histograms": [{"histogram": {"Pain in extremity": 2, "Accidental overdose": 1, "Blister": 1, "Bone pain": 1, "COVID-19": 1, "Condition aggravated": 1, "Cough": 1, "Decreased appetite": 1, "Erythema": 1, "Fatigue": 1, "Feeling hot": 1, "Hypokinesia": 1, "Injection site erythema": 1, "Muscle fatigue": 1, "Myalgia": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Urticaria": 1}, "batchcodes": ["014L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014L21A.json b/docs/data/histograms/United States/014L21A.json
index fa81323a5a4..b210bc0be4c 100644
--- a/docs/data/histograms/United States/014L21A.json
+++ b/docs/data/histograms/United States/014L21A.json
@@ -1 +1 @@
-{"batchcode": "014L21A", "histograms": [{"batchcodes": ["014L21A"], "histogram": {"Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "014L21A", "histograms": [{"histogram": {"Palpitations": 1}, "batchcodes": ["014L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014L6204.json b/docs/data/histograms/United States/014L6204.json
index a5f1100be5a..d3ba48b33a9 100644
--- a/docs/data/histograms/United States/014L6204.json
+++ b/docs/data/histograms/United States/014L6204.json
@@ -1 +1 @@
-{"batchcode": "014L6204", "histograms": [{"batchcodes": ["014L6204"], "histogram": {"Fatigue": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "014L6204", "histograms": [{"histogram": {"Fatigue": 1, "Vaccination site rash": 1}, "batchcodes": ["014L6204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M02A.json b/docs/data/histograms/United States/014M02A.json
index 650f21fbeb7..a0692396a6f 100644
--- a/docs/data/histograms/United States/014M02A.json
+++ b/docs/data/histograms/United States/014M02A.json
@@ -1 +1 @@
-{"batchcode": "014M02A", "histograms": [{"batchcodes": ["014M02A"], "histogram": {"Headache": 2, "Pyrexia": 2, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Product dose omission issue": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "014M02A", "histograms": [{"histogram": {"Headache": 2, "Pyrexia": 2, "Asthenia": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Product dose omission issue": 1, "SARS-CoV-2 test": 1, "Vomiting": 1}, "batchcodes": ["014M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M20.json b/docs/data/histograms/United States/014M20.json
index e84fd0af309..a0ff2372954 100644
--- a/docs/data/histograms/United States/014M20.json
+++ b/docs/data/histograms/United States/014M20.json
@@ -1 +1 @@
-{"batchcode": "014M20", "histograms": [{"batchcodes": ["014M20"], "histogram": {"Arthralgia": 1, "Bursitis": 1, "Erythema": 1, "Feeling abnormal": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Product dose omission issue": 1, "Pruritus": 1, "Scratch": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "014M20", "histograms": [{"histogram": {"Arthralgia": 1, "Bursitis": 1, "Erythema": 1, "Feeling abnormal": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Product dose omission issue": 1, "Pruritus": 1, "Scratch": 1, "Tinnitus": 1}, "batchcodes": ["014M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M204.json b/docs/data/histograms/United States/014M204.json
index c02dcecf745..9ab9d4b83eb 100644
--- a/docs/data/histograms/United States/014M204.json
+++ b/docs/data/histograms/United States/014M204.json
@@ -1 +1 @@
-{"batchcode": "014M204", "histograms": [{"batchcodes": ["014M204"], "histogram": {"Back pain": 1, "Bedridden": 1, "Facial pain": 1, "Gait disturbance": 1, "Limb discomfort": 1, "Migraine": 1, "Pyrexia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "014M204", "histograms": [{"histogram": {"Back pain": 1, "Bedridden": 1, "Facial pain": 1, "Gait disturbance": 1, "Limb discomfort": 1, "Migraine": 1, "Pyrexia": 1, "Vision blurred": 1}, "batchcodes": ["014M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M204B.json b/docs/data/histograms/United States/014M204B.json
index 72d2b2eec83..afcb92f1bb1 100644
--- a/docs/data/histograms/United States/014M204B.json
+++ b/docs/data/histograms/United States/014M204B.json
@@ -1 +1 @@
-{"batchcode": "014M204B", "histograms": [{"batchcodes": ["014M204B"], "histogram": {"Chills": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "014M204B", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1}, "batchcodes": ["014M204B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M208.json b/docs/data/histograms/United States/014M208.json
index e9d12249195..a3c7509fef6 100644
--- a/docs/data/histograms/United States/014M208.json
+++ b/docs/data/histograms/United States/014M208.json
@@ -1 +1 @@
-{"batchcode": "014M208", "histograms": [{"batchcodes": ["014M208"], "histogram": {"Headache": 1, "Myalgia": 1, "Pruritus": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "014M208", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1, "Pruritus": 1, "Vaccination site erythema": 1}, "batchcodes": ["014M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M209.json b/docs/data/histograms/United States/014M209.json
index 081f8497cb0..2bca3aa6373 100644
--- a/docs/data/histograms/United States/014M209.json
+++ b/docs/data/histograms/United States/014M209.json
@@ -1 +1 @@
-{"batchcode": "014M209", "histograms": [{"batchcodes": ["014M209"], "histogram": {"Menstruation irregular": 1}}]}
\ No newline at end of file
+{"batchcode": "014M209", "histograms": [{"histogram": {"Menstruation irregular": 1}, "batchcodes": ["014M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M20A..json b/docs/data/histograms/United States/014M20A..json
index ce646847116..5c1ee1fb605 100644
--- a/docs/data/histograms/United States/014M20A..json
+++ b/docs/data/histograms/United States/014M20A..json
@@ -1 +1 @@
-{"batchcode": "014M20A.", "histograms": [{"batchcodes": ["014M20A."], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Insomnia": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "014M20A.", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Insomnia": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["014M20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M20A.json b/docs/data/histograms/United States/014M20A.json
index 2780009fef5..bdbfee5f694 100644
--- a/docs/data/histograms/United States/014M20A.json
+++ b/docs/data/histograms/United States/014M20A.json
@@ -1 +1 @@
-{"batchcode": "014M20A", "histograms": [{"batchcodes": ["014M20A"], "histogram": {"Product temperature excursion issue": 620, "Poor quality product administered": 619, "Fatigue": 102, "Pain in extremity": 88, "Pyrexia": 84, "Chills": 75, "Headache": 72, "Vaccination site pain": 56, "Pain": 54, "Myalgia": 53, "Nausea": 51, "Pruritus": 40, "Vaccination site erythema": 39, "Dizziness": 38, "Arthralgia": 37, "Rash": 36, "Erythema": 34, "Asthenia": 28, "Body temperature": 28, "Feeling abnormal": 25, "Vaccination site swelling": 23, "Vaccination site warmth": 20, "Dyspnoea": 19, "Expired product administered": 18, "Diarrhoea": 17, "Malaise": 17, "Swelling": 17, "Product dose omission issue": 16, "Vaccination site pruritus": 16, "Vaccination site rash": 16, "Lymphadenopathy": 14, "Peripheral swelling": 14, "SARS-CoV-2 test": 14, "Vomiting": 14, "Back pain": 13, "Feeling hot": 13, "Urticaria": 13, "Gait disturbance": 12, "Hyperhidrosis": 12, "Inappropriate schedule of product administration": 12, "Insomnia": 12, "Illness": 11, "Injection site pain": 11, "Palpitations": 11, "COVID-19": 10, "Chest pain": 10, "Cough": 10, "Decreased appetite": 10, "Hypoaesthesia": 10, "Influenza like illness": 10, "Abdominal discomfort": 9, "Heart rate increased": 9, "Paraesthesia": 9, "Product storage error": 9, "Vaccination complication": 9, "Vaccination site reaction": 9, "Blood pressure measurement": 8, "Chest discomfort": 8, "Limb discomfort": 8, "Oropharyngeal pain": 8, "Rash pruritic": 8, "Rhinorrhoea": 8, "Vertigo": 8, "Burning sensation": 7, "Injection site swelling": 7, "Muscle spasms": 7, "Muscular weakness": 7, "Musculoskeletal stiffness": 7, "Neck pain": 7, "Vaccination site mass": 7, "Accidental overdose": 6, "Ageusia": 6, "Computerised tomogram": 6, "Confusional state": 6, "Dysgeusia": 6, "Exposure during pregnancy": 6, "Hypersensitivity": 6, "Hypertension": 6, "Injection site erythema": 6, "Loss of consciousness": 6, "Migraine": 6, "Nasopharyngitis": 6, "Neuralgia": 6, "Somnolence": 6, "Tinnitus": 6, "Tremor": 6, "Vaccination site induration": 6, "Abdominal pain upper": 5, "Blood test": 5, "Contusion": 5, "Fall": 5, "Injection site warmth": 5, "Paraesthesia oral": 5, "Vision blurred": 5, "Axillary pain": 4, "Bone pain": 4, "Discomfort": 4, "Disorientation": 4, "Dysphagia": 4, "Electrocardiogram": 4, "Epistaxis": 4, "Feeling cold": 4, "Heart rate": 4, "Herpes zoster": 4, "Hypoaesthesia oral": 4, "Injection site pruritus": 4, "Mobility decreased": 4, "Musculoskeletal discomfort": 4, "Pharyngeal swelling": 4, "Pregnancy test": 4, "Product administered to patient of inappropriate age": 4, "Rash erythematous": 4, "Taste disorder": 4, "Ultrasound scan": 4, "Alopecia": 3, "Antibody test": 3, "Cardiac flutter": 3, "Dehydration": 3, "Ear pain": 3, "Energy increased": 3, "Extra dose administered": 3, "Flushing": 3, "Gout": 3, "Incorrect dose administered": 3, "Injection site rash": 3, "Joint stiffness": 3, "Lethargy": 3, "Loss of personal independence in daily activities": 3, "Magnetic resonance imaging": 3, "Movement disorder": 3, "Muscle tightness": 3, "Myasthenia gravis": 3, "Nasal congestion": 3, "Papule": 3, "Rash macular": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Seizure": 3, "Sneezing": 3, "Swelling face": 3, "Throat tightness": 3, "Underdose": 3, "Vaccination site bruising": 3, "Vaccination site discomfort": 3, "Abdominal pain": 2, "Abdominal pain lower": 2, "Adverse drug reaction": 2, "Anosmia": 2, "Appendicitis": 2, "Asthma": 2, "Bed rest": 2, "Blister": 2, "Blood glucose": 2, "Blood pressure increased": 2, "Cellulitis": 2, "Cerebrovascular accident": 2, "Chest X-ray": 2, "Depressed mood": 2, "Dysarthria": 2, "Dyspepsia": 2, "Dysphonia": 2, "Dysuria": 2, "Ear discomfort": 2, "Eye haemorrhage": 2, "Eye pruritus": 2, "Fear": 2, "Flatulence": 2, "Gait inability": 2, "Groin pain": 2, "Haemoptysis": 2, "Head discomfort": 2, "Induration": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Ligament sprain": 2, "Lip blister": 2, "Lymph node pain": 2, "Maternal exposure during breast feeding": 2, "Maternal exposure during pregnancy": 2, "Mouth swelling": 2, "Muscle twitching": 2, "No adverse event": 2, "Off label use": 2, "Oral discomfort": 2, "Pain in jaw": 2, "Peripheral coldness": 2, "Postmenopausal haemorrhage": 2, "Presyncope": 2, "Productive cough": 2, "Pulmonary embolism": 2, "Rash papular": 2, "Respiration abnormal": 2, "Sinusitis": 2, "Skin irritation": 2, "Skin warm": 2, "Sluggishness": 2, "Surgery": 2, "Syncope": 2, "Tenderness": 2, "Throat irritation": 2, "Vaccination site discolouration": 2, "Vaccination site vesicles": 2, "Visual impairment": 2, "X-ray": 2, "Abscess oral": 1, "Administration site pain": 1, "Allergic cough": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Angina pectoris": 1, "Ankylosing spondylitis": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Anxiety": 1, "Aphasia": 1, "Arrhythmia": 1, "Arthropod bite": 1, "Arthropod sting": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy endometrium": 1, "Blood cholesterol": 1, "Blood culture": 1, "Blood glucose decreased": 1, "Blood magnesium": 1, "Blood pressure decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body temperature fluctuation": 1, "C-reactive protein": 1, "Capillary fragility": 1, "Cardiac assistance device user": 1, "Cardiac failure chronic": 1, "Cardiac murmur": 1, "Cardiac stress test": 1, "Cardiomegaly": 1, "Catheterisation cardiac": 1, "Change of bowel habit": 1, "Cheilitis": 1, "Chronic obstructive pulmonary disease": 1, "Cluster headache": 1, "Cold sweat": 1, "Colitis": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Constipation": 1, "Crohn's disease": 1, "Crying": 1, "Culture urine": 1, "Cyanosis": 1, "Cyst": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Depression": 1, "Device connection issue": 1, "Diarrhoea haemorrhagic": 1, "Diplopia": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Drug screen": 1, "Dry eye": 1, "Dry mouth": 1, "Dry skin": 1, "Dyskinesia": 1, "Dysstasia": 1, "Ear pruritus": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Epinephrine increased": 1, "Euphoric mood": 1, "Eustachian tube dysfunction": 1, "Excessive eye blinking": 1, "Eye disorder": 1, "Eye infection": 1, "Eye pain": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces hard": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Food allergy": 1, "Food intolerance": 1, "Frequent bowel movements": 1, "Full blood count": 1, "Gastrointestinal disorder": 1, "Gastrointestinal pain": 1, "HIV antibody": 1, "Haemangioma": 1, "Haemangioma of skin": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemoglobinuria": 1, "Hearing disability": 1, "Heavy menstrual bleeding": 1, "Hepatitis B": 1, "Hepatitis C": 1, "Hiatus hernia": 1, "Hiccups": 1, "Histamine level": 1, "Hot flush": 1, "Hypersomnia": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Hypoxia": 1, "Hysteroscopy": 1, "Immune thrombocytopenia": 1, "Impaired healing": 1, "Impaired work ability": 1, "Influenza virus test": 1, "Injection site hypersensitivity": 1, "Injection site induration": 1, "Injection site joint warmth": 1, "Injection site mass": 1, "Intentional product use issue": 1, "Intervertebral disc degeneration": 1, "Intracranial aneurysm": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Lip haemorrhage": 1, "Lip swelling": 1, "Lymphadenitis": 1, "Mass": 1, "Mechanical urticaria": 1, "Muscle atrophy": 1, "Musculoskeletal pain": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Neck mass": 1, "Neoplasm": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nuchal rigidity": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Ocular vascular disorder": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Panic attack": 1, "Paralysis": 1, "Parasite blood test": 1, "Parosmia": 1, "Pericarditis": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Pleural effusion": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Poor quality sleep": 1, "Post herpetic neuralgia": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test positive": 1, "Product administration error": 1, "Pubic pain": 1, "Pustule": 1, "Radiculopathy": 1, "Rectal haemorrhage": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red blood cell sedimentation rate increased": 1, "Renal pain": 1, "Retching": 1, "Retinal detachment": 1, "Retinal haemorrhage": 1, "Rhinitis": 1, "Salivary hypersecretion": 1, "Scar": 1, "Screaming": 1, "Seasonal allergy": 1, "Sensitive skin": 1, "Sinus disorder": 1, "Skin discolouration": 1, "Skin erosion": 1, "Skin exfoliation": 1, "Skin texture abnormal": 1, "Skin tightness": 1, "Sleep disorder": 1, "Sleep terror": 1, "Speech disorder": 1, "Spider vein": 1, "Spinal pain": 1, "Stomatitis": 1, "Sunburn": 1, "Superficial vein thrombosis": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Syringe issue": 1, "Tachycardia": 1, "Temperature regulation disorder": 1, "Tension": 1, "Tetanus immunisation": 1, "Tic": 1, "Tongue dry": 1, "Tooth abscess": 1, "Uhthoff's phenomenon": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Uterine dilation and curettage": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vascular access site bruising": 1, "Vascular compression": 1, "Vein disorder": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1, "Wrong technique in product usage process": 1, "Yellow skin": 1}}]}
\ No newline at end of file
+{"batchcode": "014M20A", "histograms": [{"histogram": {"Product temperature excursion issue": 620, "Poor quality product administered": 619, "Fatigue": 102, "Pain in extremity": 88, "Pyrexia": 84, "Chills": 75, "Headache": 72, "Vaccination site pain": 56, "Pain": 54, "Myalgia": 53, "Nausea": 51, "Pruritus": 40, "Vaccination site erythema": 39, "Dizziness": 38, "Arthralgia": 37, "Rash": 36, "Erythema": 34, "Asthenia": 28, "Body temperature": 28, "Feeling abnormal": 25, "Vaccination site swelling": 23, "Vaccination site warmth": 20, "Dyspnoea": 19, "Expired product administered": 18, "Diarrhoea": 17, "Malaise": 17, "Swelling": 17, "Product dose omission issue": 16, "Vaccination site pruritus": 16, "Vaccination site rash": 16, "Lymphadenopathy": 14, "Peripheral swelling": 14, "SARS-CoV-2 test": 14, "Vomiting": 14, "Back pain": 13, "Feeling hot": 13, "Urticaria": 13, "Gait disturbance": 12, "Hyperhidrosis": 12, "Inappropriate schedule of product administration": 12, "Insomnia": 12, "Illness": 11, "Injection site pain": 11, "Palpitations": 11, "COVID-19": 10, "Chest pain": 10, "Cough": 10, "Decreased appetite": 10, "Hypoaesthesia": 10, "Influenza like illness": 10, "Abdominal discomfort": 9, "Heart rate increased": 9, "Paraesthesia": 9, "Product storage error": 9, "Vaccination complication": 9, "Vaccination site reaction": 9, "Blood pressure measurement": 8, "Chest discomfort": 8, "Limb discomfort": 8, "Oropharyngeal pain": 8, "Rash pruritic": 8, "Rhinorrhoea": 8, "Vertigo": 8, "Burning sensation": 7, "Injection site swelling": 7, "Muscle spasms": 7, "Muscular weakness": 7, "Musculoskeletal stiffness": 7, "Neck pain": 7, "Vaccination site mass": 7, "Accidental overdose": 6, "Ageusia": 6, "Computerised tomogram": 6, "Confusional state": 6, "Dysgeusia": 6, "Exposure during pregnancy": 6, "Hypersensitivity": 6, "Hypertension": 6, "Injection site erythema": 6, "Loss of consciousness": 6, "Migraine": 6, "Nasopharyngitis": 6, "Neuralgia": 6, "Somnolence": 6, "Tinnitus": 6, "Tremor": 6, "Vaccination site induration": 6, "Abdominal pain upper": 5, "Blood test": 5, "Contusion": 5, "Fall": 5, "Injection site warmth": 5, "Paraesthesia oral": 5, "Vision blurred": 5, "Axillary pain": 4, "Bone pain": 4, "Discomfort": 4, "Disorientation": 4, "Dysphagia": 4, "Electrocardiogram": 4, "Epistaxis": 4, "Feeling cold": 4, "Heart rate": 4, "Herpes zoster": 4, "Hypoaesthesia oral": 4, "Injection site pruritus": 4, "Mobility decreased": 4, "Musculoskeletal discomfort": 4, "Pharyngeal swelling": 4, "Pregnancy test": 4, "Product administered to patient of inappropriate age": 4, "Rash erythematous": 4, "Taste disorder": 4, "Ultrasound scan": 4, "Alopecia": 3, "Antibody test": 3, "Cardiac flutter": 3, "Dehydration": 3, "Ear pain": 3, "Energy increased": 3, "Extra dose administered": 3, "Flushing": 3, "Gout": 3, "Incorrect dose administered": 3, "Injection site rash": 3, "Joint stiffness": 3, "Lethargy": 3, "Loss of personal independence in daily activities": 3, "Magnetic resonance imaging": 3, "Movement disorder": 3, "Muscle tightness": 3, "Myasthenia gravis": 3, "Nasal congestion": 3, "Papule": 3, "Rash macular": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Seizure": 3, "Sneezing": 3, "Swelling face": 3, "Throat tightness": 3, "Underdose": 3, "Vaccination site bruising": 3, "Vaccination site discomfort": 3, "Abdominal pain": 2, "Abdominal pain lower": 2, "Adverse drug reaction": 2, "Anosmia": 2, "Appendicitis": 2, "Asthma": 2, "Bed rest": 2, "Blister": 2, "Blood glucose": 2, "Blood pressure increased": 2, "Cellulitis": 2, "Cerebrovascular accident": 2, "Chest X-ray": 2, "Depressed mood": 2, "Dysarthria": 2, "Dyspepsia": 2, "Dysphonia": 2, "Dysuria": 2, "Ear discomfort": 2, "Eye haemorrhage": 2, "Eye pruritus": 2, "Fear": 2, "Flatulence": 2, "Gait inability": 2, "Groin pain": 2, "Haemoptysis": 2, "Head discomfort": 2, "Induration": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Ligament sprain": 2, "Lip blister": 2, "Lymph node pain": 2, "Maternal exposure during breast feeding": 2, "Maternal exposure during pregnancy": 2, "Mouth swelling": 2, "Muscle twitching": 2, "No adverse event": 2, "Off label use": 2, "Oral discomfort": 2, "Pain in jaw": 2, "Peripheral coldness": 2, "Postmenopausal haemorrhage": 2, "Presyncope": 2, "Productive cough": 2, "Pulmonary embolism": 2, "Rash papular": 2, "Respiration abnormal": 2, "Sinusitis": 2, "Skin irritation": 2, "Skin warm": 2, "Sluggishness": 2, "Surgery": 2, "Syncope": 2, "Tenderness": 2, "Throat irritation": 2, "Vaccination site discolouration": 2, "Vaccination site vesicles": 2, "Visual impairment": 2, "X-ray": 2, "Abscess oral": 1, "Administration site pain": 1, "Allergic cough": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Angina pectoris": 1, "Ankylosing spondylitis": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Anxiety": 1, "Aphasia": 1, "Arrhythmia": 1, "Arthropod bite": 1, "Arthropod sting": 1, "Atrial fibrillation": 1, "Balance disorder": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy endometrium": 1, "Blood cholesterol": 1, "Blood culture": 1, "Blood glucose decreased": 1, "Blood magnesium": 1, "Blood pressure decreased": 1, "Blood pressure systolic": 1, "Blood pressure systolic increased": 1, "Body temperature fluctuation": 1, "C-reactive protein": 1, "Capillary fragility": 1, "Cardiac assistance device user": 1, "Cardiac failure chronic": 1, "Cardiac murmur": 1, "Cardiac stress test": 1, "Cardiomegaly": 1, "Catheterisation cardiac": 1, "Change of bowel habit": 1, "Cheilitis": 1, "Chronic obstructive pulmonary disease": 1, "Cluster headache": 1, "Cold sweat": 1, "Colitis": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Constipation": 1, "Crohn's disease": 1, "Crying": 1, "Culture urine": 1, "Cyanosis": 1, "Cyst": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Delirium": 1, "Depression": 1, "Device connection issue": 1, "Diarrhoea haemorrhagic": 1, "Diplopia": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Drug screen": 1, "Dry eye": 1, "Dry mouth": 1, "Dry skin": 1, "Dyskinesia": 1, "Dysstasia": 1, "Ear pruritus": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Epinephrine increased": 1, "Euphoric mood": 1, "Eustachian tube dysfunction": 1, "Excessive eye blinking": 1, "Eye disorder": 1, "Eye infection": 1, "Eye pain": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces hard": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibrin D dimer increased": 1, "Food allergy": 1, "Food intolerance": 1, "Frequent bowel movements": 1, "Full blood count": 1, "Gastrointestinal disorder": 1, "Gastrointestinal pain": 1, "HIV antibody": 1, "Haemangioma": 1, "Haemangioma of skin": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemoglobin decreased": 1, "Haemoglobinuria": 1, "Hearing disability": 1, "Heavy menstrual bleeding": 1, "Hepatitis B": 1, "Hepatitis C": 1, "Hiatus hernia": 1, "Hiccups": 1, "Histamine level": 1, "Hot flush": 1, "Hypersomnia": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Hypoxia": 1, "Hysteroscopy": 1, "Immune thrombocytopenia": 1, "Impaired healing": 1, "Impaired work ability": 1, "Influenza virus test": 1, "Injection site hypersensitivity": 1, "Injection site induration": 1, "Injection site joint warmth": 1, "Injection site mass": 1, "Intentional product use issue": 1, "Intervertebral disc degeneration": 1, "Intracranial aneurysm": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Joint swelling": 1, "Lip haemorrhage": 1, "Lip swelling": 1, "Lymphadenitis": 1, "Mass": 1, "Mechanical urticaria": 1, "Muscle atrophy": 1, "Musculoskeletal pain": 1, "Mycobacterium tuberculosis complex test": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Neck mass": 1, "Neoplasm": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nuchal rigidity": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Ocular vascular disorder": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Panic attack": 1, "Paralysis": 1, "Parasite blood test": 1, "Parosmia": 1, "Pericarditis": 1, "Petechiae": 1, "Pharyngeal paraesthesia": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Pleural effusion": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Poor quality sleep": 1, "Post herpetic neuralgia": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test positive": 1, "Product administration error": 1, "Pubic pain": 1, "Pustule": 1, "Radiculopathy": 1, "Rectal haemorrhage": 1, "Red blood cell count": 1, "Red blood cell count decreased": 1, "Red blood cell sedimentation rate increased": 1, "Renal pain": 1, "Retching": 1, "Retinal detachment": 1, "Retinal haemorrhage": 1, "Rhinitis": 1, "Salivary hypersecretion": 1, "Scar": 1, "Screaming": 1, "Seasonal allergy": 1, "Sensitive skin": 1, "Sinus disorder": 1, "Skin discolouration": 1, "Skin erosion": 1, "Skin exfoliation": 1, "Skin texture abnormal": 1, "Skin tightness": 1, "Sleep disorder": 1, "Sleep terror": 1, "Speech disorder": 1, "Spider vein": 1, "Spinal pain": 1, "Stomatitis": 1, "Sunburn": 1, "Superficial vein thrombosis": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Syringe issue": 1, "Tachycardia": 1, "Temperature regulation disorder": 1, "Tension": 1, "Tetanus immunisation": 1, "Tic": 1, "Tongue dry": 1, "Tooth abscess": 1, "Uhthoff's phenomenon": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Uterine dilation and curettage": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vascular access site bruising": 1, "Vascular compression": 1, "Vein disorder": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1, "Wrong technique in product usage process": 1, "Yellow skin": 1}, "batchcodes": ["014M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M20A014M20A.json b/docs/data/histograms/United States/014M20A014M20A.json
index 678d974f640..4244a52ac2c 100644
--- a/docs/data/histograms/United States/014M20A014M20A.json
+++ b/docs/data/histograms/United States/014M20A014M20A.json
@@ -1 +1 @@
-{"batchcode": "014M20A014M20A", "histograms": [{"batchcodes": ["014M20A014M20A"], "histogram": {"Erythema": 1, "Injection site inflammation": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Urticaria": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "014M20A014M20A", "histograms": [{"histogram": {"Erythema": 1, "Injection site inflammation": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Urticaria": 1, "Vaccination site warmth": 1}, "batchcodes": ["014M20A014M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M210A.json b/docs/data/histograms/United States/014M210A.json
index 2961caa60db..6ca98b4988e 100644
--- a/docs/data/histograms/United States/014M210A.json
+++ b/docs/data/histograms/United States/014M210A.json
@@ -1 +1 @@
-{"batchcode": "014M210A", "histograms": [{"batchcodes": ["014M210A"], "histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Migraine with aura": 1, "Rash": 1, "Skin burning sensation": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "014M210A", "histograms": [{"histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Migraine with aura": 1, "Rash": 1, "Skin burning sensation": 1, "Vomiting": 1}, "batchcodes": ["014M210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M21A.json b/docs/data/histograms/United States/014M21A.json
index fc0dcb9ce7d..6ea4e66cb86 100644
--- a/docs/data/histograms/United States/014M21A.json
+++ b/docs/data/histograms/United States/014M21A.json
@@ -1 +1 @@
-{"batchcode": "014M21A", "histograms": [{"batchcodes": ["014M21A"], "histogram": {"Pyrexia": 2, "Body temperature": 1, "Burning sensation": 1, "Chills": 1, "Ear discomfort": 1, "Electric shock sensation": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Mouth ulceration": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Stomatitis": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "014M21A", "histograms": [{"histogram": {"Pyrexia": 2, "Body temperature": 1, "Burning sensation": 1, "Chills": 1, "Ear discomfort": 1, "Electric shock sensation": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Mouth ulceration": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Stomatitis": 1, "Vaccination complication": 1}, "batchcodes": ["014M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M22A.json b/docs/data/histograms/United States/014M22A.json
index a0f6322fa71..1c295d464a0 100644
--- a/docs/data/histograms/United States/014M22A.json
+++ b/docs/data/histograms/United States/014M22A.json
@@ -1 +1 @@
-{"batchcode": "014M22A", "histograms": [{"batchcodes": ["014M22A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "014M22A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["014M22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M26A.json b/docs/data/histograms/United States/014M26A.json
index 2ac2acb6eba..6a570cc0d4c 100644
--- a/docs/data/histograms/United States/014M26A.json
+++ b/docs/data/histograms/United States/014M26A.json
@@ -1 +1 @@
-{"batchcode": "014M26A", "histograms": [{"batchcodes": ["014M26A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "014M26A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["014M26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M2A.json b/docs/data/histograms/United States/014M2A.json
index 561c99b0f50..21c61536de2 100644
--- a/docs/data/histograms/United States/014M2A.json
+++ b/docs/data/histograms/United States/014M2A.json
@@ -1 +1 @@
-{"batchcode": "014M2A", "histograms": [{"batchcodes": ["014M2A"], "histogram": {"Migraine": 2, "Myalgia": 2, "Nausea": 2, "Body temperature": 1, "Computerised tomogram": 1, "Confusional state": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Physical examination": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "014M2A", "histograms": [{"histogram": {"Migraine": 2, "Myalgia": 2, "Nausea": 2, "Body temperature": 1, "Computerised tomogram": 1, "Confusional state": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Fibrin D dimer": 1, "Physical examination": 1, "Pulmonary embolism": 1, "Pyrexia": 1, "Ultrasound scan": 1}, "batchcodes": ["014M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M2CA.json b/docs/data/histograms/United States/014M2CA.json
index 974575eb8c7..50f8cb5a863 100644
--- a/docs/data/histograms/United States/014M2CA.json
+++ b/docs/data/histograms/United States/014M2CA.json
@@ -1 +1 @@
-{"batchcode": "014M2CA", "histograms": [{"batchcodes": ["014M2CA"], "histogram": {"Asthenia": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Exposure during pregnancy": 1, "Feeding disorder": 1, "Headache": 1, "Lethargy": 1, "Myalgia": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "014M2CA", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Exposure during pregnancy": 1, "Feeding disorder": 1, "Headache": 1, "Lethargy": 1, "Myalgia": 1, "Nausea": 1}, "batchcodes": ["014M2CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M2DA.json b/docs/data/histograms/United States/014M2DA.json
index 419de05df98..7589417222a 100644
--- a/docs/data/histograms/United States/014M2DA.json
+++ b/docs/data/histograms/United States/014M2DA.json
@@ -1 +1 @@
-{"batchcode": "014M2DA", "histograms": [{"batchcodes": ["014M2DA"], "histogram": {"Chest pain": 1, "Fatigue": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "014M2DA", "histograms": [{"histogram": {"Chest pain": 1, "Fatigue": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["014M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M2OA.json b/docs/data/histograms/United States/014M2OA.json
index b9e23cb0627..cf2133d4001 100644
--- a/docs/data/histograms/United States/014M2OA.json
+++ b/docs/data/histograms/United States/014M2OA.json
@@ -1 +1 @@
-{"batchcode": "014M2OA", "histograms": [{"batchcodes": ["014M2OA"], "histogram": {"Scar": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "014M2OA", "histograms": [{"histogram": {"Scar": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["014M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M42A.json b/docs/data/histograms/United States/014M42A.json
index c297dd693e5..2a010927f1d 100644
--- a/docs/data/histograms/United States/014M42A.json
+++ b/docs/data/histograms/United States/014M42A.json
@@ -1 +1 @@
-{"batchcode": "014M42A", "histograms": [{"batchcodes": ["014M42A"], "histogram": {"Fatigue": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "014M42A", "histograms": [{"histogram": {"Fatigue": 1, "Somnolence": 1}, "batchcodes": ["014M42A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014M80A.json b/docs/data/histograms/United States/014M80A.json
index 7a9c765d102..7717d0e4353 100644
--- a/docs/data/histograms/United States/014M80A.json
+++ b/docs/data/histograms/United States/014M80A.json
@@ -1 +1 @@
-{"batchcode": "014M80A", "histograms": [{"batchcodes": ["014M80A"], "histogram": {"Arthralgia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "014M80A", "histograms": [{"histogram": {"Arthralgia": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}, "batchcodes": ["014M80A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014ML0A.json b/docs/data/histograms/United States/014ML0A.json
index c31b560cfe1..7a1a777ea6b 100644
--- a/docs/data/histograms/United States/014ML0A.json
+++ b/docs/data/histograms/United States/014ML0A.json
@@ -1 +1 @@
-{"batchcode": "014ML0A", "histograms": [{"batchcodes": ["014ML0A"], "histogram": {"Injection site swelling": 1, "Paraesthesia oral": 1}}]}
\ No newline at end of file
+{"batchcode": "014ML0A", "histograms": [{"histogram": {"Injection site swelling": 1, "Paraesthesia oral": 1}, "batchcodes": ["014ML0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014MOA.json b/docs/data/histograms/United States/014MOA.json
index 2e373f55573..45757715116 100644
--- a/docs/data/histograms/United States/014MOA.json
+++ b/docs/data/histograms/United States/014MOA.json
@@ -1 +1 @@
-{"batchcode": "014MOA", "histograms": [{"batchcodes": ["014MOA"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "014MOA", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["014MOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014MWA.json b/docs/data/histograms/United States/014MWA.json
index 5ae538b5917..5c66936f18e 100644
--- a/docs/data/histograms/United States/014MWA.json
+++ b/docs/data/histograms/United States/014MWA.json
@@ -1 +1 @@
-{"batchcode": "014MWA", "histograms": [{"batchcodes": ["014MWA"], "histogram": {"Arthralgia": 1, "Mobility decreased": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "014MWA", "histograms": [{"histogram": {"Arthralgia": 1, "Mobility decreased": 1, "Myalgia": 1}, "batchcodes": ["014MWA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014MZ01.json b/docs/data/histograms/United States/014MZ01.json
index 59a8bb0eeba..d7f0c0f08fb 100644
--- a/docs/data/histograms/United States/014MZ01.json
+++ b/docs/data/histograms/United States/014MZ01.json
@@ -1 +1 @@
-{"batchcode": "014MZ01", "histograms": [{"batchcodes": ["014MZ01"], "histogram": {"Fatigue": 2, "Blepharospasm": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Chills": 1, "Cough": 1, "Lyme disease": 1, "Myalgia": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Vaccination complication": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "014MZ01", "histograms": [{"histogram": {"Fatigue": 2, "Blepharospasm": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Chills": 1, "Cough": 1, "Lyme disease": 1, "Myalgia": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "Vaccination complication": 1, "Vaccination site pain": 1}, "batchcodes": ["014MZ01"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014MZ0A.json b/docs/data/histograms/United States/014MZ0A.json
index a332c0662aa..0c9f61757b9 100644
--- a/docs/data/histograms/United States/014MZ0A.json
+++ b/docs/data/histograms/United States/014MZ0A.json
@@ -1 +1 @@
-{"batchcode": "014MZ0A", "histograms": [{"batchcodes": ["014MZ0A"], "histogram": {"Feeling abnormal": 2, "Headache": 2, "Myalgia": 2, "Chills": 1, "Eye pain": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Lip swelling": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Pain": 1, "Paraesthesia oral": 1, "Periorbital swelling": 1, "Productive cough": 1, "Pruritus": 1, "Rash erythematous": 1, "Rash macular": 1, "Rhinorrhoea": 1, "Skin lesion": 1, "Swelling face": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "014MZ0A", "histograms": [{"histogram": {"Feeling abnormal": 2, "Headache": 2, "Myalgia": 2, "Chills": 1, "Eye pain": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Lip swelling": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Pain": 1, "Paraesthesia oral": 1, "Periorbital swelling": 1, "Productive cough": 1, "Pruritus": 1, "Rash erythematous": 1, "Rash macular": 1, "Rhinorrhoea": 1, "Skin lesion": 1, "Swelling face": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["014MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014N20A.json b/docs/data/histograms/United States/014N20A.json
index b25f213b006..2ca5d9e54cc 100644
--- a/docs/data/histograms/United States/014N20A.json
+++ b/docs/data/histograms/United States/014N20A.json
@@ -1 +1 @@
-{"batchcode": "014N20A", "histograms": [{"batchcodes": ["014N20A"], "histogram": {"Chest discomfort": 1, "Cyanosis": 1, "Dizziness": 1, "Fall": 1, "Malaise": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "014N20A", "histograms": [{"histogram": {"Chest discomfort": 1, "Cyanosis": 1, "Dizziness": 1, "Fall": 1, "Malaise": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["014N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014RH20A.json b/docs/data/histograms/United States/014RH20A.json
index 3f853bc1ec7..a6f103e459a 100644
--- a/docs/data/histograms/United States/014RH20A.json
+++ b/docs/data/histograms/United States/014RH20A.json
@@ -1 +1 @@
-{"batchcode": "014RH20A", "histograms": [{"batchcodes": ["014RH20A"], "histogram": {"Diarrhoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "014RH20A", "histograms": [{"histogram": {"Diarrhoea": 1, "Pyrexia": 1}, "batchcodes": ["014RH20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/014S21A.json b/docs/data/histograms/United States/014S21A.json
index 3e0a283a19a..02eceb4cf44 100644
--- a/docs/data/histograms/United States/014S21A.json
+++ b/docs/data/histograms/United States/014S21A.json
@@ -1 +1 @@
-{"batchcode": "014S21A", "histograms": [{"batchcodes": ["014S21A"], "histogram": {"Fatigue": 2, "Malaise": 2, "Myalgia": 2, "Abdominal pain upper": 1, "Back pain": 1, "Heart rate increased": 1, "Sinus disorder": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "014S21A", "histograms": [{"histogram": {"Fatigue": 2, "Malaise": 2, "Myalgia": 2, "Abdominal pain upper": 1, "Back pain": 1, "Heart rate increased": 1, "Sinus disorder": 1, "Somnolence": 1}, "batchcodes": ["014S21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015-M20A.json b/docs/data/histograms/United States/015-M20A.json
index 7c712b8b1f1..679b9134359 100644
--- a/docs/data/histograms/United States/015-M20A.json
+++ b/docs/data/histograms/United States/015-M20A.json
@@ -1 +1 @@
-{"batchcode": "015-M20A", "histograms": [{"batchcodes": ["015-M20A"], "histogram": {"COVID-19": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "015-M20A", "histograms": [{"histogram": {"COVID-19": 1, "Myalgia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["015-M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0151.json b/docs/data/histograms/United States/0151.json
index b30c060416c..70161cfe84e 100644
--- a/docs/data/histograms/United States/0151.json
+++ b/docs/data/histograms/United States/0151.json
@@ -1 +1 @@
-{"batchcode": "0151", "histograms": [{"batchcodes": ["0151"], "histogram": {"Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Lymphadenopathy": 1, "Nausea": 1, "Paraesthesia oral": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "0151", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Lymphadenopathy": 1, "Nausea": 1, "Paraesthesia oral": 1, "Visual impairment": 1}, "batchcodes": ["0151"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0152M0A.json b/docs/data/histograms/United States/0152M0A.json
index 3a1d89d6177..27b587961fb 100644
--- a/docs/data/histograms/United States/0152M0A.json
+++ b/docs/data/histograms/United States/0152M0A.json
@@ -1 +1 @@
-{"batchcode": "0152M0A", "histograms": [{"batchcodes": ["0152M0A"], "histogram": {"Breast pain": 1, "Musculoskeletal stiffness": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0152M0A", "histograms": [{"histogram": {"Breast pain": 1, "Musculoskeletal stiffness": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0152M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0152M20A.json b/docs/data/histograms/United States/0152M20A.json
index af32bc7bd9a..f33cb09fa64 100644
--- a/docs/data/histograms/United States/0152M20A.json
+++ b/docs/data/histograms/United States/0152M20A.json
@@ -1 +1 @@
-{"batchcode": "0152M20A", "histograms": [{"batchcodes": ["0152M20A"], "histogram": {"Adverse drug reaction": 1, "Arthralgia": 1, "Axillary pain": 1, "Gait disturbance": 1, "Haematoma": 1, "Mobility decreased": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "0152M20A", "histograms": [{"histogram": {"Adverse drug reaction": 1, "Arthralgia": 1, "Axillary pain": 1, "Gait disturbance": 1, "Haematoma": 1, "Mobility decreased": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Skin discolouration": 1}, "batchcodes": ["0152M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015621A OR 0512.json b/docs/data/histograms/United States/015621A OR 0512.json
index 9a043e1193f..0cbb340d227 100644
--- a/docs/data/histograms/United States/015621A OR 0512.json
+++ b/docs/data/histograms/United States/015621A OR 0512.json
@@ -1 +1 @@
-{"batchcode": "015621A OR 0512", "histograms": [{"batchcodes": ["015621A OR 0512"], "histogram": {"Vaccination site pain": 2, "Body temperature": 1, "Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "015621A OR 0512", "histograms": [{"histogram": {"Vaccination site pain": 2, "Body temperature": 1, "Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Muscle spasms": 1}, "batchcodes": ["015621A OR 0512"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0158.json b/docs/data/histograms/United States/0158.json
index 047b36086e3..8aa69594a3f 100644
--- a/docs/data/histograms/United States/0158.json
+++ b/docs/data/histograms/United States/0158.json
@@ -1 +1 @@
-{"batchcode": "0158", "histograms": [{"batchcodes": ["0158"], "histogram": {"Bedridden": 1, "Chills": 1, "Dyspnoea": 1, "Exposure to SARS-CoV-2": 1, "Headache": 1, "Limb discomfort": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0158", "histograms": [{"histogram": {"Bedridden": 1, "Chills": 1, "Dyspnoea": 1, "Exposure to SARS-CoV-2": 1, "Headache": 1, "Limb discomfort": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["0158"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015A21A.json b/docs/data/histograms/United States/015A21A.json
index 5bea7704f37..bf0bc123317 100644
--- a/docs/data/histograms/United States/015A21A.json
+++ b/docs/data/histograms/United States/015A21A.json
@@ -1 +1 @@
-{"batchcode": "015A21A", "histograms": [{"batchcodes": ["015A21A"], "histogram": {"Acoustic stimulation tests": 2, "Antinuclear antibody": 2, "Asthenia": 2, "Dizziness": 2, "Pain in extremity": 2, "Tinnitus": 2, "Antibody test": 1, "Headache": 1, "Hypoacusis": 1, "Lymphadenopathy": 1, "Product dose omission issue": 1, "Vaccination site lymphadenopathy": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "015A21A", "histograms": [{"histogram": {"Acoustic stimulation tests": 2, "Antinuclear antibody": 2, "Asthenia": 2, "Dizziness": 2, "Pain in extremity": 2, "Tinnitus": 2, "Antibody test": 1, "Headache": 1, "Hypoacusis": 1, "Lymphadenopathy": 1, "Product dose omission issue": 1, "Vaccination site lymphadenopathy": 1, "White blood cell count": 1}, "batchcodes": ["015A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015B20A.json b/docs/data/histograms/United States/015B20A.json
index 704c8ad5e78..d8bf8dadc7f 100644
--- a/docs/data/histograms/United States/015B20A.json
+++ b/docs/data/histograms/United States/015B20A.json
@@ -1 +1 @@
-{"batchcode": "015B20A", "histograms": [{"batchcodes": ["015B20A"], "histogram": {"Chills": 1, "Insomnia": 1, "Pain in extremity": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "015B20A", "histograms": [{"histogram": {"Chills": 1, "Insomnia": 1, "Pain in extremity": 1, "Pruritus": 1}, "batchcodes": ["015B20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015B22A.json b/docs/data/histograms/United States/015B22A.json
index 8d3f37bc562..1daa9740193 100644
--- a/docs/data/histograms/United States/015B22A.json
+++ b/docs/data/histograms/United States/015B22A.json
@@ -1 +1 @@
-{"batchcode": "015B22A", "histograms": [{"batchcodes": ["015B22A"], "histogram": {"No adverse event": 9, "Inappropriate schedule of product administration": 5, "Expired product administered": 2, "Asthenia": 1, "Dizziness": 1, "Lymph node pain": 1, "Nausea": 1, "Pain in extremity": 1, "Product storage error": 1, "SARS-CoV-2 test": 1, "Suspected product contamination": 1, "Suspected product quality issue": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "015B22A", "histograms": [{"histogram": {"No adverse event": 9, "Inappropriate schedule of product administration": 5, "Expired product administered": 2, "Asthenia": 1, "Dizziness": 1, "Lymph node pain": 1, "Nausea": 1, "Pain in extremity": 1, "Product storage error": 1, "SARS-CoV-2 test": 1, "Suspected product contamination": 1, "Suspected product quality issue": 1, "Wrong product administered": 1}, "batchcodes": ["015B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015E21A.json b/docs/data/histograms/United States/015E21A.json
index 66849cee664..b37ef2fb0d8 100644
--- a/docs/data/histograms/United States/015E21A.json
+++ b/docs/data/histograms/United States/015E21A.json
@@ -1 +1 @@
-{"batchcode": "015E21A", "histograms": [{"batchcodes": ["015E21A"], "histogram": {"Lymphadenopathy": 2, "Lymph node pain": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "015E21A", "histograms": [{"histogram": {"Lymphadenopathy": 2, "Lymph node pain": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["015E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015F21A.json b/docs/data/histograms/United States/015F21A.json
index f01baab7038..09429d105fc 100644
--- a/docs/data/histograms/United States/015F21A.json
+++ b/docs/data/histograms/United States/015F21A.json
@@ -1 +1 @@
-{"batchcode": "015F21A", "histograms": [{"batchcodes": ["015F21A"], "histogram": {"Expired product administered": 2}}]}
\ No newline at end of file
+{"batchcode": "015F21A", "histograms": [{"histogram": {"Expired product administered": 2}, "batchcodes": ["015F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015H22A.json b/docs/data/histograms/United States/015H22A.json
index 9c4619fe40b..7f5b1e5be45 100644
--- a/docs/data/histograms/United States/015H22A.json
+++ b/docs/data/histograms/United States/015H22A.json
@@ -1 +1 @@
-{"batchcode": "015H22A", "histograms": [{"batchcodes": ["015H22A"], "histogram": {"No adverse event": 18, "Expired product administered": 12, "Product storage error": 12, "Wrong product administered": 3, "Chills": 2, "Product temperature excursion issue": 2, "Arthralgia": 1, "Body temperature": 1, "Brain natriuretic peptide": 1, "Cough": 1, "Diarrhoea": 1, "Dysphagia": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Headache": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "Insomnia": 1, "Myalgia": 1, "Myocarditis": 1, "Nasal congestion": 1, "Neck pain": 1, "Overdose": 1, "Pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Productive cough": 1, "Pyrexia": 1, "Sinusitis": 1, "Therapeutic response unexpected": 1, "Troponin I": 1}}]}
\ No newline at end of file
+{"batchcode": "015H22A", "histograms": [{"histogram": {"No adverse event": 18, "Expired product administered": 12, "Product storage error": 12, "Wrong product administered": 3, "Chills": 2, "Product temperature excursion issue": 2, "Arthralgia": 1, "Body temperature": 1, "Brain natriuretic peptide": 1, "Cough": 1, "Diarrhoea": 1, "Dysphagia": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Headache": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "Insomnia": 1, "Myalgia": 1, "Myocarditis": 1, "Nasal congestion": 1, "Neck pain": 1, "Overdose": 1, "Pain": 1, "Pain in extremity": 1, "Pharyngeal swelling": 1, "Productive cough": 1, "Pyrexia": 1, "Sinusitis": 1, "Therapeutic response unexpected": 1, "Troponin I": 1}, "batchcodes": ["015H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015L20A.json b/docs/data/histograms/United States/015L20A.json
index 44f6acd6573..ba5b075ba29 100644
--- a/docs/data/histograms/United States/015L20A.json
+++ b/docs/data/histograms/United States/015L20A.json
@@ -1 +1 @@
-{"batchcode": "015L20A", "histograms": [{"batchcodes": ["015L20A"], "histogram": {"Arthralgia": 1, "Atrial fibrillation": 1, "Fatigue": 1, "Feeling of body temperature change": 1, "Influenza like illness": 1, "Injection site mass": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myalgia": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "015L20A", "histograms": [{"histogram": {"Arthralgia": 1, "Atrial fibrillation": 1, "Fatigue": 1, "Feeling of body temperature change": 1, "Influenza like illness": 1, "Injection site mass": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Malaise": 1, "Myalgia": 1, "Peripheral swelling": 1}, "batchcodes": ["015L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M(??)A.json b/docs/data/histograms/United States/015M(??)A.json
index 124d3ce2ef9..601280c2bb9 100644
--- a/docs/data/histograms/United States/015M(??)A.json
+++ b/docs/data/histograms/United States/015M(??)A.json
@@ -1 +1 @@
-{"batchcode": "015M(??)A", "histograms": [{"batchcodes": ["015M(??)A"], "histogram": {"Discomfort": 1, "Feeling abnormal": 1, "Nodule": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "015M(??)A", "histograms": [{"histogram": {"Discomfort": 1, "Feeling abnormal": 1, "Nodule": 1, "Pain": 1, "Pruritus": 1, "Rash": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["015M(??)A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M20.json b/docs/data/histograms/United States/015M20.json
index 609ab8d9426..5abdbb8431e 100644
--- a/docs/data/histograms/United States/015M20.json
+++ b/docs/data/histograms/United States/015M20.json
@@ -1 +1 @@
-{"batchcode": "015M20", "histograms": [{"batchcodes": ["015M20"], "histogram": {"Vaccination site pain": 2, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Muscle spasms": 1, "Pain": 1, "Pruritus": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20", "histograms": [{"histogram": {"Vaccination site pain": 2, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Muscle spasms": 1, "Pain": 1, "Pruritus": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}, "batchcodes": ["015M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M200.json b/docs/data/histograms/United States/015M200.json
index d8bf94ed412..564291d7a8e 100644
--- a/docs/data/histograms/United States/015M200.json
+++ b/docs/data/histograms/United States/015M200.json
@@ -1 +1 @@
-{"batchcode": "015M200", "histograms": [{"batchcodes": ["015M200"], "histogram": {"Abdominal discomfort": 1, "Asthenia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "015M200", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Asthenia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1}, "batchcodes": ["015M200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M201.json b/docs/data/histograms/United States/015M201.json
index f84bc279cee..c46c163ac67 100644
--- a/docs/data/histograms/United States/015M201.json
+++ b/docs/data/histograms/United States/015M201.json
@@ -1 +1 @@
-{"batchcode": "015M201", "histograms": [{"batchcodes": ["015M201"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "015M201", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["015M201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M201A.json b/docs/data/histograms/United States/015M201A.json
index 1c797faaac4..a7c8ca64fb8 100644
--- a/docs/data/histograms/United States/015M201A.json
+++ b/docs/data/histograms/United States/015M201A.json
@@ -1 +1 @@
-{"batchcode": "015M201A", "histograms": [{"batchcodes": ["015M201A"], "histogram": {"Asthenia": 1, "Chills": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "015M201A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["015M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M204.json b/docs/data/histograms/United States/015M204.json
index 863571e4f8b..b4b1b8a9a7b 100644
--- a/docs/data/histograms/United States/015M204.json
+++ b/docs/data/histograms/United States/015M204.json
@@ -1 +1 @@
-{"batchcode": "015M204", "histograms": [{"batchcodes": ["015M204"], "histogram": {"Vaccination site pain": 2, "Pain": 1, "Pain in extremity": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "015M204", "histograms": [{"histogram": {"Vaccination site pain": 2, "Pain": 1, "Pain in extremity": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1}, "batchcodes": ["015M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M20A OR O15M.json b/docs/data/histograms/United States/015M20A OR O15M.json
index 644a0f5adf7..ce976075585 100644
--- a/docs/data/histograms/United States/015M20A OR O15M.json
+++ b/docs/data/histograms/United States/015M20A OR O15M.json
@@ -1 +1 @@
-{"batchcode": "015M20A OR O15M", "histograms": [{"batchcodes": ["015M20A OR O15M"], "histogram": {"Chills": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20A OR O15M", "histograms": [{"histogram": {"Chills": 1, "Headache": 1}, "batchcodes": ["015M20A OR O15M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M20A, 044A21.json b/docs/data/histograms/United States/015M20A, 044A21.json
index d07f2fa18f6..e32c7a86a4b 100644
--- a/docs/data/histograms/United States/015M20A, 044A21.json
+++ b/docs/data/histograms/United States/015M20A, 044A21.json
@@ -1 +1 @@
-{"batchcode": "015M20A, 044A21", "histograms": [{"batchcodes": ["015M20A, 044A21"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20A, 044A21", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["015M20A, 044A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M20A.json b/docs/data/histograms/United States/015M20A.json
index 3d9e04f83a0..eb5bdf400f4 100644
--- a/docs/data/histograms/United States/015M20A.json
+++ b/docs/data/histograms/United States/015M20A.json
@@ -1 +1 @@
-{"batchcode": "015M20A", "histograms": [{"batchcodes": ["015M20A"], "histogram": {"Pyrexia": 116, "Headache": 107, "Pain in extremity": 107, "Fatigue": 104, "Vaccination site pain": 93, "Chills": 83, "Myalgia": 62, "Pain": 60, "Pruritus": 55, "Rash": 53, "Vaccination site erythema": 53, "Nausea": 48, "Vaccination site pruritus": 47, "Dizziness": 46, "Arthralgia": 44, "Vaccination site swelling": 39, "Erythema": 34, "Body temperature": 28, "Diarrhoea": 27, "Peripheral swelling": 27, "Vaccination site rash": 27, "Vaccination site warmth": 27, "Feeling abnormal": 24, "Urticaria": 24, "Swelling": 21, "Asthenia": 20, "Vomiting": 20, "COVID-19": 19, "Cough": 18, "Influenza like illness": 18, "SARS-CoV-2 test": 18, "Dyspnoea": 16, "Inappropriate schedule of product administration": 16, "Malaise": 16, "Rash pruritic": 15, "Decreased appetite": 14, "Insomnia": 14, "Product dose omission issue": 13, "Blood pressure measurement": 12, "Feeling hot": 12, "Illness": 12, "Injection site erythema": 12, "Limb discomfort": 12, "Vaccination site induration": 12, "Vaccination site reaction": 12, "Abdominal discomfort": 11, "Vaccination complication": 11, "Abdominal pain upper": 10, "Back pain": 10, "Hyperhidrosis": 10, "Injection site pain": 10, "Lymphadenopathy": 10, "Paraesthesia": 10, "Injection site pruritus": 9, "Rhinorrhoea": 9, "Vaccination site mass": 9, "Expired product administered": 8, "Gait disturbance": 8, "Injection site warmth": 8, "Oropharyngeal pain": 8, "Tremor": 8, "Computerised tomogram": 7, "Injection site swelling": 7, "Loss of consciousness": 7, "Mobility decreased": 7, "Muscle spasms": 7, "Nasopharyngitis": 7, "Paraesthesia oral": 7, "Vertigo": 7, "Blood test": 6, "Chest pain": 6, "Discomfort": 6, "Heart rate": 6, "Hypertension": 6, "Hypoaesthesia": 6, "Hypoaesthesia oral": 6, "Injection site rash": 6, "Migraine": 6, "Musculoskeletal stiffness": 6, "Nasal congestion": 6, "Palpitations": 6, "Rash macular": 6, "Sleep disorder": 6, "Swelling face": 6, "Burning sensation": 5, "Condition aggravated": 5, "Dysphagia": 5, "Feeling cold": 5, "Herpes zoster": 5, "Magnetic resonance imaging": 5, "Rash erythematous": 5, "Somnolence": 5, "Vaccination site lymphadenopathy": 5, "Ageusia": 4, "Bell's palsy": 4, "Chest X-ray": 4, "Confusional state": 4, "Disorientation": 4, "Drug ineffective": 4, "Ear pain": 4, "Heart rate increased": 4, "Lethargy": 4, "Maternal exposure during pregnancy": 4, "Muscular weakness": 4, "Neck pain": 4, "Nervousness": 4, "Oxygen saturation": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 test positive": 4, "Skin discolouration": 4, "Tenderness": 4, "Vaccination site urticaria": 4, "Blister": 3, "Cold sweat": 3, "Contusion": 3, "Electrocardiogram": 3, "Gait inability": 3, "Head discomfort": 3, "Hypersomnia": 3, "Induration": 3, "Intentional product use issue": 3, "Joint stiffness": 3, "Joint swelling": 3, "Ocular hyperaemia": 3, "Oropharyngeal discomfort": 3, "Poor quality product administered": 3, "Pregnancy test": 3, "Presyncope": 3, "Skin warm": 3, "Tinnitus": 3, "Toothache": 3, "Ultrasound scan": 3, "Vaccination site bruising": 3, "Vision blurred": 3, "Visual impairment": 3, "Weight decreased": 3, "X-ray": 3, "Abdominal distension": 2, "Abdominal pain": 2, "Anosmia": 2, "Antibody test": 2, "Arthritis": 2, "Blood glucose": 2, "Blood magnesium": 2, "Blood pressure increased": 2, "Blood thyroid stimulating hormone": 2, "Body temperature increased": 2, "Breast pain": 2, "Breast tenderness": 2, "Cardiac disorder": 2, "Cardiac flutter": 2, "Chest discomfort": 2, "Deafness": 2, "Dehydration": 2, "Dental discomfort": 2, "Disturbance in attention": 2, "Dry mouth": 2, "Dyspepsia": 2, "Dysstasia": 2, "Eating disorder": 2, "Endoscopy": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye disorder": 2, "Eye pain": 2, "Feeling of body temperature change": 2, "Fluid retention": 2, "Full blood count": 2, "Gastrointestinal pain": 2, "Glycosylated haemoglobin": 2, "Hypersensitivity": 2, "Hypokinesia": 2, "Hypoxia": 2, "Immunisation reaction": 2, "Inflammation": 2, "Injected limb mobility decreased": 2, "Injection site induration": 2, "Lacrimation increased": 2, "Lip swelling": 2, "Loss of personal independence in daily activities": 2, "Mastication disorder": 2, "Memory impairment": 2, "Movement disorder": 2, "Oral herpes": 2, "Pain in jaw": 2, "Panic attack": 2, "Periarthritis": 2, "Periorbital swelling": 2, "Peripheral coldness": 2, "Product contamination physical": 2, "Pulmonary function test": 2, "Rash papular": 2, "Root canal infection": 2, "Salivary gland enlargement": 2, "Scar": 2, "Sinusitis": 2, "Skin exfoliation": 2, "Swelling of eyelid": 2, "Swollen tongue": 2, "Tachycardia": 2, "Taste disorder": 2, "Throat irritation": 2, "Vaccination site haemorrhage": 2, "Vaccination site movement impairment": 2, "Vitamin D": 2, "Abdominal tenderness": 1, "Accident": 1, "Acute respiratory failure": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Alopecia totalis": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Antiphospholipid antibodies negative": 1, "Anxiety": 1, "Apathy": 1, "Arthropod bite": 1, "Ascites": 1, "Asthma": 1, "Atrial fibrillation": 1, "Attention deficit hyperactivity disorder": 1, "Axillary pain": 1, "Axonal neuropathy": 1, "Balance disorder": 1, "Bedridden": 1, "Biopsy abdominal wall": 1, "Bipolar disorder": 1, "Blepharospasm": 1, "Blindness": 1, "Blood albumin": 1, "Blood albumin increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose abnormal": 1, "Blood potassium": 1, "Blood sodium decreased": 1, "Blood urine present": 1, "Body temperature decreased": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Bradykinesia": 1, "Breast discharge": 1, "Breast mass": 1, "Breast swelling": 1, "Bronchitis": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiac stress test": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cervical spinal stenosis": 1, "Chromaturia": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Computerised tomogram spine": 1, "Conjunctival haemorrhage": 1, "Conjunctivitis": 1, "Constipation": 1, "Coronary artery disease": 1, "Coronavirus infection": 1, "Coronavirus test": 1, "Crying": 1, "Culture stool": 1, "Culture throat": 1, "Cyanosis": 1, "Daydreaming": 1, "Death": 1, "Deep vein thrombosis": 1, "Dementia": 1, "Dengue fever": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Depression": 1, "Device breakage": 1, "Diabetes mellitus": 1, "Diplopia": 1, "Dry eye": 1, "Dry skin": 1, "Dyskinesia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pruritus": 1, "Echocardiogram": 1, "Emotional distress": 1, "Endoscopic ultrasound": 1, "Epidemic polyarthritis": 1, "Euphoric mood": 1, "Extrasystoles": 1, "Eye haemorrhage": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Fall": 1, "Fear": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Flushing": 1, "Formication": 1, "Gastrointestinal haemorrhage": 1, "Haematochezia": 1, "Haemochromatosis": 1, "Haemoglobin decreased": 1, "Hallucination": 1, "Head injury": 1, "Heart rate irregular": 1, "Hemiparaesthesia": 1, "Hepatic enzyme": 1, "Hepatic function abnormal": 1, "Hepatitis viral test": 1, "Hunger": 1, "Hyperaesthesia teeth": 1, "Hyperkeratosis": 1, "Hyperpyrexia": 1, "Hypertensive urgency": 1, "Hypoacusis": 1, "Hypophagia": 1, "Hypotension": 1, "Hypothermia": 1, "Hypothyroidism": 1, "Immune system disorder": 1, "Immunology test": 1, "Inappropriate schedule of product discontinuation": 1, "Incoherent": 1, "Incontinence": 1, "Infection": 1, "Influenza": 1, "Influenza virus test": 1, "Injection site bruising": 1, "Injection site discomfort": 1, "Injection site haemorrhage": 1, "Injection site irritation": 1, "Injection site mass": 1, "Injection site reaction": 1, "Injection site urticaria": 1, "Intentional dose omission": 1, "International normalised ratio": 1, "Joint injury": 1, "Laboratory test": 1, "Lichen planus": 1, "Lip blister": 1, "Lip dry": 1, "Listless": 1, "Liver function test": 1, "Lower respiratory tract infection": 1, "Lyme disease": 1, "Lymph node pain": 1, "Macular degeneration": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Mass": 1, "Menstrual disorder": 1, "Metabolic function test": 1, "Miliaria": 1, "Miosis": 1, "Mitral valve incompetence": 1, "Morphoea": 1, "Motor dysfunction": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Myocardial infarction": 1, "Myoclonus": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Nightmare": 1, "No adverse event": 1, "Nodule": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Opiates positive": 1, "Oral discomfort": 1, "Osteoarthritis": 1, "Osteonecrosis of jaw": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain of skin": 1, "Pallor": 1, "Papule": 1, "Paralysis": 1, "Peau d'orange": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Photopsia": 1, "Pneumonia bacterial": 1, "Polymyalgia rheumatica": 1, "Pre-existing condition improved": 1, "Product administered at inappropriate site": 1, "Product dose omission in error": 1, "Product packaging quantity issue": 1, "Product quality issue": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary mass": 1, "Pulmonary pain": 1, "Renal pain": 1, "Respiratory disorder": 1, "Respiratory symptom": 1, "Retching": 1, "Rhinitis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "Scratch": 1, "Serum ferritin": 1, "Sinus arrhythmia": 1, "Sinus disorder": 1, "Sinus headache": 1, "Skin bacterial infection": 1, "Skin disorder": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin mass": 1, "Skin reaction": 1, "Skin tightness": 1, "Sleep deficit": 1, "Speech disorder": 1, "Stool analysis": 1, "Stress": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tendonitis": 1, "Thrombophlebitis superficial": 1, "Thyroid function test": 1, "Thyroiditis": 1, "Tongue blistering": 1, "Tongue disorder": 1, "Tooth abscess": 1, "Transferrin saturation": 1, "Transient ischaemic attack": 1, "Trichorrhexis": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Upper-airway cough syndrome": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site infection": 1, "Vaccination site paraesthesia": 1, "Vaccination site photosensitivity reaction": 1, "Varicella": 1, "Ventilation/perfusion scan": 1, "Visual brightness": 1, "Vitreous floaters": 1, "Volvulus": 1, "Wheezing": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20A", "histograms": [{"histogram": {"Pyrexia": 116, "Headache": 107, "Pain in extremity": 107, "Fatigue": 104, "Vaccination site pain": 93, "Chills": 83, "Myalgia": 62, "Pain": 60, "Pruritus": 55, "Rash": 53, "Vaccination site erythema": 53, "Nausea": 48, "Vaccination site pruritus": 47, "Dizziness": 46, "Arthralgia": 44, "Vaccination site swelling": 39, "Erythema": 34, "Body temperature": 28, "Diarrhoea": 27, "Peripheral swelling": 27, "Vaccination site rash": 27, "Vaccination site warmth": 27, "Feeling abnormal": 24, "Urticaria": 24, "Swelling": 21, "Asthenia": 20, "Vomiting": 20, "COVID-19": 19, "Cough": 18, "Influenza like illness": 18, "SARS-CoV-2 test": 18, "Dyspnoea": 16, "Inappropriate schedule of product administration": 16, "Malaise": 16, "Rash pruritic": 15, "Decreased appetite": 14, "Insomnia": 14, "Product dose omission issue": 13, "Blood pressure measurement": 12, "Feeling hot": 12, "Illness": 12, "Injection site erythema": 12, "Limb discomfort": 12, "Vaccination site induration": 12, "Vaccination site reaction": 12, "Abdominal discomfort": 11, "Vaccination complication": 11, "Abdominal pain upper": 10, "Back pain": 10, "Hyperhidrosis": 10, "Injection site pain": 10, "Lymphadenopathy": 10, "Paraesthesia": 10, "Injection site pruritus": 9, "Rhinorrhoea": 9, "Vaccination site mass": 9, "Expired product administered": 8, "Gait disturbance": 8, "Injection site warmth": 8, "Oropharyngeal pain": 8, "Tremor": 8, "Computerised tomogram": 7, "Injection site swelling": 7, "Loss of consciousness": 7, "Mobility decreased": 7, "Muscle spasms": 7, "Nasopharyngitis": 7, "Paraesthesia oral": 7, "Vertigo": 7, "Blood test": 6, "Chest pain": 6, "Discomfort": 6, "Heart rate": 6, "Hypertension": 6, "Hypoaesthesia": 6, "Hypoaesthesia oral": 6, "Injection site rash": 6, "Migraine": 6, "Musculoskeletal stiffness": 6, "Nasal congestion": 6, "Palpitations": 6, "Rash macular": 6, "Sleep disorder": 6, "Swelling face": 6, "Burning sensation": 5, "Condition aggravated": 5, "Dysphagia": 5, "Feeling cold": 5, "Herpes zoster": 5, "Magnetic resonance imaging": 5, "Rash erythematous": 5, "Somnolence": 5, "Vaccination site lymphadenopathy": 5, "Ageusia": 4, "Bell's palsy": 4, "Chest X-ray": 4, "Confusional state": 4, "Disorientation": 4, "Drug ineffective": 4, "Ear pain": 4, "Heart rate increased": 4, "Lethargy": 4, "Maternal exposure during pregnancy": 4, "Muscular weakness": 4, "Neck pain": 4, "Nervousness": 4, "Oxygen saturation": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 test positive": 4, "Skin discolouration": 4, "Tenderness": 4, "Vaccination site urticaria": 4, "Blister": 3, "Cold sweat": 3, "Contusion": 3, "Electrocardiogram": 3, "Gait inability": 3, "Head discomfort": 3, "Hypersomnia": 3, "Induration": 3, "Intentional product use issue": 3, "Joint stiffness": 3, "Joint swelling": 3, "Ocular hyperaemia": 3, "Oropharyngeal discomfort": 3, "Poor quality product administered": 3, "Pregnancy test": 3, "Presyncope": 3, "Skin warm": 3, "Tinnitus": 3, "Toothache": 3, "Ultrasound scan": 3, "Vaccination site bruising": 3, "Vision blurred": 3, "Visual impairment": 3, "Weight decreased": 3, "X-ray": 3, "Abdominal distension": 2, "Abdominal pain": 2, "Anosmia": 2, "Antibody test": 2, "Arthritis": 2, "Blood glucose": 2, "Blood magnesium": 2, "Blood pressure increased": 2, "Blood thyroid stimulating hormone": 2, "Body temperature increased": 2, "Breast pain": 2, "Breast tenderness": 2, "Cardiac disorder": 2, "Cardiac flutter": 2, "Chest discomfort": 2, "Deafness": 2, "Dehydration": 2, "Dental discomfort": 2, "Disturbance in attention": 2, "Dry mouth": 2, "Dyspepsia": 2, "Dysstasia": 2, "Eating disorder": 2, "Endoscopy": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye disorder": 2, "Eye pain": 2, "Feeling of body temperature change": 2, "Fluid retention": 2, "Full blood count": 2, "Gastrointestinal pain": 2, "Glycosylated haemoglobin": 2, "Hypersensitivity": 2, "Hypokinesia": 2, "Hypoxia": 2, "Immunisation reaction": 2, "Inflammation": 2, "Injected limb mobility decreased": 2, "Injection site induration": 2, "Lacrimation increased": 2, "Lip swelling": 2, "Loss of personal independence in daily activities": 2, "Mastication disorder": 2, "Memory impairment": 2, "Movement disorder": 2, "Oral herpes": 2, "Pain in jaw": 2, "Panic attack": 2, "Periarthritis": 2, "Periorbital swelling": 2, "Peripheral coldness": 2, "Product contamination physical": 2, "Pulmonary function test": 2, "Rash papular": 2, "Root canal infection": 2, "Salivary gland enlargement": 2, "Scar": 2, "Sinusitis": 2, "Skin exfoliation": 2, "Swelling of eyelid": 2, "Swollen tongue": 2, "Tachycardia": 2, "Taste disorder": 2, "Throat irritation": 2, "Vaccination site haemorrhage": 2, "Vaccination site movement impairment": 2, "Vitamin D": 2, "Abdominal tenderness": 1, "Accident": 1, "Acute respiratory failure": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Alopecia totalis": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Antiphospholipid antibodies negative": 1, "Anxiety": 1, "Apathy": 1, "Arthropod bite": 1, "Ascites": 1, "Asthma": 1, "Atrial fibrillation": 1, "Attention deficit hyperactivity disorder": 1, "Axillary pain": 1, "Axonal neuropathy": 1, "Balance disorder": 1, "Bedridden": 1, "Biopsy abdominal wall": 1, "Bipolar disorder": 1, "Blepharospasm": 1, "Blindness": 1, "Blood albumin": 1, "Blood albumin increased": 1, "Blood creatinine": 1, "Blood creatinine increased": 1, "Blood glucose abnormal": 1, "Blood potassium": 1, "Blood sodium decreased": 1, "Blood urine present": 1, "Body temperature decreased": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Bradykinesia": 1, "Breast discharge": 1, "Breast mass": 1, "Breast swelling": 1, "Bronchitis": 1, "Cardiac arrest": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiac stress test": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Cervical spinal stenosis": 1, "Chromaturia": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Computerised tomogram spine": 1, "Conjunctival haemorrhage": 1, "Conjunctivitis": 1, "Constipation": 1, "Coronary artery disease": 1, "Coronavirus infection": 1, "Coronavirus test": 1, "Crying": 1, "Culture stool": 1, "Culture throat": 1, "Cyanosis": 1, "Daydreaming": 1, "Death": 1, "Deep vein thrombosis": 1, "Dementia": 1, "Dengue fever": 1, "Depressed level of consciousness": 1, "Depressed mood": 1, "Depression": 1, "Device breakage": 1, "Diabetes mellitus": 1, "Diplopia": 1, "Dry eye": 1, "Dry skin": 1, "Dyskinesia": 1, "Dysphonia": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pruritus": 1, "Echocardiogram": 1, "Emotional distress": 1, "Endoscopic ultrasound": 1, "Epidemic polyarthritis": 1, "Euphoric mood": 1, "Extrasystoles": 1, "Eye haemorrhage": 1, "Eye pruritus": 1, "Eye swelling": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Fall": 1, "Fear": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Flushing": 1, "Formication": 1, "Gastrointestinal haemorrhage": 1, "Haematochezia": 1, "Haemochromatosis": 1, "Haemoglobin decreased": 1, "Hallucination": 1, "Head injury": 1, "Heart rate irregular": 1, "Hemiparaesthesia": 1, "Hepatic enzyme": 1, "Hepatic function abnormal": 1, "Hepatitis viral test": 1, "Hunger": 1, "Hyperaesthesia teeth": 1, "Hyperkeratosis": 1, "Hyperpyrexia": 1, "Hypertensive urgency": 1, "Hypoacusis": 1, "Hypophagia": 1, "Hypotension": 1, "Hypothermia": 1, "Hypothyroidism": 1, "Immune system disorder": 1, "Immunology test": 1, "Inappropriate schedule of product discontinuation": 1, "Incoherent": 1, "Incontinence": 1, "Infection": 1, "Influenza": 1, "Influenza virus test": 1, "Injection site bruising": 1, "Injection site discomfort": 1, "Injection site haemorrhage": 1, "Injection site irritation": 1, "Injection site mass": 1, "Injection site reaction": 1, "Injection site urticaria": 1, "Intentional dose omission": 1, "International normalised ratio": 1, "Joint injury": 1, "Laboratory test": 1, "Lichen planus": 1, "Lip blister": 1, "Lip dry": 1, "Listless": 1, "Liver function test": 1, "Lower respiratory tract infection": 1, "Lyme disease": 1, "Lymph node pain": 1, "Macular degeneration": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Mass": 1, "Menstrual disorder": 1, "Metabolic function test": 1, "Miliaria": 1, "Miosis": 1, "Mitral valve incompetence": 1, "Morphoea": 1, "Motor dysfunction": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Myocardial infarction": 1, "Myoclonus": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil count increased": 1, "Nightmare": 1, "No adverse event": 1, "Nodule": 1, "Odynophagia": 1, "Oedema peripheral": 1, "Opiates positive": 1, "Oral discomfort": 1, "Osteoarthritis": 1, "Osteonecrosis of jaw": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain of skin": 1, "Pallor": 1, "Papule": 1, "Paralysis": 1, "Peau d'orange": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Photopsia": 1, "Pneumonia bacterial": 1, "Polymyalgia rheumatica": 1, "Pre-existing condition improved": 1, "Product administered at inappropriate site": 1, "Product dose omission in error": 1, "Product packaging quantity issue": 1, "Product quality issue": 1, "Productive cough": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary mass": 1, "Pulmonary pain": 1, "Renal pain": 1, "Respiratory disorder": 1, "Respiratory symptom": 1, "Retching": 1, "Rhinitis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 test negative": 1, "Scratch": 1, "Serum ferritin": 1, "Sinus arrhythmia": 1, "Sinus disorder": 1, "Sinus headache": 1, "Skin bacterial infection": 1, "Skin disorder": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin mass": 1, "Skin reaction": 1, "Skin tightness": 1, "Sleep deficit": 1, "Speech disorder": 1, "Stool analysis": 1, "Stress": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tendonitis": 1, "Thrombophlebitis superficial": 1, "Thyroid function test": 1, "Thyroiditis": 1, "Tongue blistering": 1, "Tongue disorder": 1, "Tooth abscess": 1, "Transferrin saturation": 1, "Transient ischaemic attack": 1, "Trichorrhexis": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound foetal": 1, "Upper-airway cough syndrome": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site infection": 1, "Vaccination site paraesthesia": 1, "Vaccination site photosensitivity reaction": 1, "Varicella": 1, "Ventilation/perfusion scan": 1, "Visual brightness": 1, "Vitreous floaters": 1, "Volvulus": 1, "Wheezing": 1, "White blood cell count": 1}, "batchcodes": ["015M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M20H.json b/docs/data/histograms/United States/015M20H.json
index 5acf6a6f0a5..69760f8decc 100644
--- a/docs/data/histograms/United States/015M20H.json
+++ b/docs/data/histograms/United States/015M20H.json
@@ -1 +1 @@
-{"batchcode": "015M20H", "histograms": [{"batchcodes": ["015M20H"], "histogram": {"Injection site erythema": 1, "Injection site rash": 1, "Pruritus": 1, "Rash": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20H", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site rash": 1, "Pruritus": 1, "Rash": 1, "Skin discolouration": 1}, "batchcodes": ["015M20H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M20I.json b/docs/data/histograms/United States/015M20I.json
index be22191f19b..3ca25267f35 100644
--- a/docs/data/histograms/United States/015M20I.json
+++ b/docs/data/histograms/United States/015M20I.json
@@ -1 +1 @@
-{"batchcode": "015M20I", "histograms": [{"batchcodes": ["015M20I"], "histogram": {"Fatigue": 2, "Chills": 1, "Cold sweat": 1, "Cough": 1, "Ear swelling": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Sinus disorder": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "015M20I", "histograms": [{"histogram": {"Fatigue": 2, "Chills": 1, "Cold sweat": 1, "Cough": 1, "Ear swelling": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Sinus disorder": 1, "Swelling face": 1}, "batchcodes": ["015M20I"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M21A.json b/docs/data/histograms/United States/015M21A.json
index 65f46d61b74..112fdcd50fd 100644
--- a/docs/data/histograms/United States/015M21A.json
+++ b/docs/data/histograms/United States/015M21A.json
@@ -1 +1 @@
-{"batchcode": "015M21A", "histograms": [{"batchcodes": ["015M21A"], "histogram": {"Back pain": 1, "Headache": 1, "Muscle spasms": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "015M21A", "histograms": [{"histogram": {"Back pain": 1, "Headache": 1, "Muscle spasms": 1, "Pain in extremity": 1}, "batchcodes": ["015M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M2O8.json b/docs/data/histograms/United States/015M2O8.json
index c84517e340c..c8a34272f5a 100644
--- a/docs/data/histograms/United States/015M2O8.json
+++ b/docs/data/histograms/United States/015M2O8.json
@@ -1 +1 @@
-{"batchcode": "015M2O8", "histograms": [{"batchcodes": ["015M2O8"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Dizziness": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "015M2O8", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Dizziness": 1, "Nausea": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["015M2O8"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M2OA.json b/docs/data/histograms/United States/015M2OA.json
index 92b1dd77196..ac711a8fc1f 100644
--- a/docs/data/histograms/United States/015M2OA.json
+++ b/docs/data/histograms/United States/015M2OA.json
@@ -1 +1 @@
-{"batchcode": "015M2OA", "histograms": [{"batchcodes": ["015M2OA"], "histogram": {"Arthralgia": 1}}]}
\ No newline at end of file
+{"batchcode": "015M2OA", "histograms": [{"histogram": {"Arthralgia": 1}, "batchcodes": ["015M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015M70A.json b/docs/data/histograms/United States/015M70A.json
index b2a6cf11ac1..ec2ebf91172 100644
--- a/docs/data/histograms/United States/015M70A.json
+++ b/docs/data/histograms/United States/015M70A.json
@@ -1 +1 @@
-{"batchcode": "015M70A", "histograms": [{"batchcodes": ["015M70A"], "histogram": {"Fatigue": 2, "Ankle fracture": 1, "Arrhythmia": 1, "Disorientation": 1, "Fall": 1, "Hypersomnia": 1, "Myalgia": 1, "Renal failure": 1, "Respiratory arrest": 1, "Somnolence": 1, "Tibia fracture": 1}}]}
\ No newline at end of file
+{"batchcode": "015M70A", "histograms": [{"histogram": {"Fatigue": 2, "Ankle fracture": 1, "Arrhythmia": 1, "Disorientation": 1, "Fall": 1, "Hypersomnia": 1, "Myalgia": 1, "Renal failure": 1, "Respiratory arrest": 1, "Somnolence": 1, "Tibia fracture": 1}, "batchcodes": ["015M70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015MA0A.json b/docs/data/histograms/United States/015MA0A.json
index 9c1c626484d..c584ddd2764 100644
--- a/docs/data/histograms/United States/015MA0A.json
+++ b/docs/data/histograms/United States/015MA0A.json
@@ -1 +1 @@
-{"batchcode": "015MA0A", "histograms": [{"batchcodes": ["015MA0A"], "histogram": {"Blister": 1, "Erythema": 1, "Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "015MA0A", "histograms": [{"histogram": {"Blister": 1, "Erythema": 1, "Herpes zoster": 1}, "batchcodes": ["015MA0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015MC0A.json b/docs/data/histograms/United States/015MC0A.json
index 06238404376..1ffd30b46bb 100644
--- a/docs/data/histograms/United States/015MC0A.json
+++ b/docs/data/histograms/United States/015MC0A.json
@@ -1 +1 @@
-{"batchcode": "015MC0A", "histograms": [{"batchcodes": ["015MC0A"], "histogram": {"Body temperature increased": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Headache": 1, "Hypersomnia": 1, "Injection site warmth": 1, "Nausea": 1, "Pain": 1, "Pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "015MC0A", "histograms": [{"histogram": {"Body temperature increased": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Headache": 1, "Hypersomnia": 1, "Injection site warmth": 1, "Nausea": 1, "Pain": 1, "Pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["015MC0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015MCOA.json b/docs/data/histograms/United States/015MCOA.json
index 4421af56a17..4b994c644ca 100644
--- a/docs/data/histograms/United States/015MCOA.json
+++ b/docs/data/histograms/United States/015MCOA.json
@@ -1 +1 @@
-{"batchcode": "015MCOA", "histograms": [{"batchcodes": ["015MCOA"], "histogram": {"Musculoskeletal stiffness": 2, "Condition aggravated": 1, "Mass": 1, "Pruritus": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "015MCOA", "histograms": [{"histogram": {"Musculoskeletal stiffness": 2, "Condition aggravated": 1, "Mass": 1, "Pruritus": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["015MCOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015MM20A.json b/docs/data/histograms/United States/015MM20A.json
index 47cbc284057..a76d4518a9c 100644
--- a/docs/data/histograms/United States/015MM20A.json
+++ b/docs/data/histograms/United States/015MM20A.json
@@ -1 +1 @@
-{"batchcode": "015MM20A", "histograms": [{"batchcodes": ["015MM20A"], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "015MM20A", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["015MM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015MZ0A OR 015M.json b/docs/data/histograms/United States/015MZ0A OR 015M.json
index c8f4b621a5d..81aa402df4c 100644
--- a/docs/data/histograms/United States/015MZ0A OR 015M.json
+++ b/docs/data/histograms/United States/015MZ0A OR 015M.json
@@ -1 +1 @@
-{"batchcode": "015MZ0A OR 015M", "histograms": [{"batchcodes": ["015MZ0A OR 015M"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "015MZ0A OR 015M", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["015MZ0A OR 015M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015MZ0A.json b/docs/data/histograms/United States/015MZ0A.json
index e10f931b445..bc61baf71b4 100644
--- a/docs/data/histograms/United States/015MZ0A.json
+++ b/docs/data/histograms/United States/015MZ0A.json
@@ -1 +1 @@
-{"batchcode": "015MZ0A", "histograms": [{"batchcodes": ["015MZ0A"], "histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Body temperature": 1, "Dry skin": 1, "Erythema": 1, "Flushing": 1, "Injection site pain": 1, "Menstruation irregular": 1, "Nausea": 1, "Pyrexia": 1, "Urinary tract infection": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "015MZ0A", "histograms": [{"histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Body temperature": 1, "Dry skin": 1, "Erythema": 1, "Flushing": 1, "Injection site pain": 1, "Menstruation irregular": 1, "Nausea": 1, "Pyrexia": 1, "Urinary tract infection": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["015MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015MZOA.json b/docs/data/histograms/United States/015MZOA.json
index a0eed3e0602..66e59490513 100644
--- a/docs/data/histograms/United States/015MZOA.json
+++ b/docs/data/histograms/United States/015MZOA.json
@@ -1 +1 @@
-{"batchcode": "015MZOA", "histograms": [{"batchcodes": ["015MZOA"], "histogram": {"Lip swelling": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "015MZOA", "histograms": [{"histogram": {"Lip swelling": 1, "Vaccination site rash": 1}, "batchcodes": ["015MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015N20A.json b/docs/data/histograms/United States/015N20A.json
index 1b922283e56..d42833eca38 100644
--- a/docs/data/histograms/United States/015N20A.json
+++ b/docs/data/histograms/United States/015N20A.json
@@ -1 +1 @@
-{"batchcode": "015N20A", "histograms": [{"batchcodes": ["015N20A"], "histogram": {"Muscle tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "015N20A", "histograms": [{"histogram": {"Muscle tightness": 1}, "batchcodes": ["015N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015N2OA.json b/docs/data/histograms/United States/015N2OA.json
index aa4c4d49414..7cd1834a856 100644
--- a/docs/data/histograms/United States/015N2OA.json
+++ b/docs/data/histograms/United States/015N2OA.json
@@ -1 +1 @@
-{"batchcode": "015N2OA", "histograms": [{"batchcodes": ["015N2OA"], "histogram": {"Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "015N2OA", "histograms": [{"histogram": {"Pneumonia": 1}, "batchcodes": ["015N2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015U20A.json b/docs/data/histograms/United States/015U20A.json
index af864b30991..4f79414fe56 100644
--- a/docs/data/histograms/United States/015U20A.json
+++ b/docs/data/histograms/United States/015U20A.json
@@ -1 +1 @@
-{"batchcode": "015U20A", "histograms": [{"batchcodes": ["015U20A"], "histogram": {"Gait disturbance": 1, "Hiatus hernia": 1, "Loss of consciousness": 1, "Malaise": 1, "Memory impairment": 1, "Neuropathy peripheral": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "015U20A", "histograms": [{"histogram": {"Gait disturbance": 1, "Hiatus hernia": 1, "Loss of consciousness": 1, "Malaise": 1, "Memory impairment": 1, "Neuropathy peripheral": 1, "Pain": 1}, "batchcodes": ["015U20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/015Z20A.json b/docs/data/histograms/United States/015Z20A.json
index cd0701bb675..7cf920a9d6c 100644
--- a/docs/data/histograms/United States/015Z20A.json
+++ b/docs/data/histograms/United States/015Z20A.json
@@ -1 +1 @@
-{"batchcode": "015Z20A", "histograms": [{"batchcodes": ["015Z20A"], "histogram": {"Headache": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "015Z20A", "histograms": [{"histogram": {"Headache": 1, "Vaccination site pain": 1}, "batchcodes": ["015Z20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0161321A.json b/docs/data/histograms/United States/0161321A.json
index 1c62b3590e9..6d060d93150 100644
--- a/docs/data/histograms/United States/0161321A.json
+++ b/docs/data/histograms/United States/0161321A.json
@@ -1 +1 @@
-{"batchcode": "0161321A", "histograms": [{"batchcodes": ["0161321A"], "histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Erythema": 1, "Exposure via breast milk": 1, "Headache": 1, "Pain in extremity": 1, "Vaccination site injury": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0161321A", "histograms": [{"histogram": {"Abdominal pain": 1, "Diarrhoea": 1, "Erythema": 1, "Exposure via breast milk": 1, "Headache": 1, "Pain in extremity": 1, "Vaccination site injury": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["0161321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0161M20A.json b/docs/data/histograms/United States/0161M20A.json
index 10315702133..1e3044b8a3d 100644
--- a/docs/data/histograms/United States/0161M20A.json
+++ b/docs/data/histograms/United States/0161M20A.json
@@ -1 +1 @@
-{"batchcode": "0161M20A", "histograms": [{"batchcodes": ["0161M20A"], "histogram": {"Fatigue": 1, "Pallor": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0161M20A", "histograms": [{"histogram": {"Fatigue": 1, "Pallor": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0161M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0162348-18053.json b/docs/data/histograms/United States/0162348-18053.json
index 4e2d2ace5a4..dd0ffbe7d24 100644
--- a/docs/data/histograms/United States/0162348-18053.json
+++ b/docs/data/histograms/United States/0162348-18053.json
@@ -1 +1 @@
-{"batchcode": "0162348-18053", "histograms": [{"batchcodes": ["0162348-18053"], "histogram": {"Adnexa uteri pain": 1, "Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "0162348-18053", "histograms": [{"histogram": {"Adnexa uteri pain": 1, "Muscle spasms": 1}, "batchcodes": ["0162348-18053"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016320A.json b/docs/data/histograms/United States/016320A.json
index 92eb84861ca..74ee9def3ec 100644
--- a/docs/data/histograms/United States/016320A.json
+++ b/docs/data/histograms/United States/016320A.json
@@ -1 +1 @@
-{"batchcode": "016320A", "histograms": [{"batchcodes": ["016320A"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "016320A", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Fatigue": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["016320A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016321A.json b/docs/data/histograms/United States/016321A.json
index 1bc91c5f6b4..4930abed404 100644
--- a/docs/data/histograms/United States/016321A.json
+++ b/docs/data/histograms/United States/016321A.json
@@ -1 +1 @@
-{"batchcode": "016321A", "histograms": [{"batchcodes": ["016321A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Dyskinesia": 1, "Hypertension": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "016321A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Dyskinesia": 1, "Hypertension": 1, "Pain in extremity": 1}, "batchcodes": ["016321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0165.json b/docs/data/histograms/United States/0165.json
index 28d658fbd7f..5ea87b55610 100644
--- a/docs/data/histograms/United States/0165.json
+++ b/docs/data/histograms/United States/0165.json
@@ -1 +1 @@
-{"batchcode": "0165", "histograms": [{"batchcodes": ["0165"], "histogram": {"Rash": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "0165", "histograms": [{"histogram": {"Rash": 1, "Vaccination site erythema": 1}, "batchcodes": ["0165"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016522.json b/docs/data/histograms/United States/016522.json
index 29a6aea2aee..55394c22cb0 100644
--- a/docs/data/histograms/United States/016522.json
+++ b/docs/data/histograms/United States/016522.json
@@ -1 +1 @@
-{"batchcode": "016522", "histograms": [{"batchcodes": ["016522"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "016522", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["016522"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0165M20A.json b/docs/data/histograms/United States/0165M20A.json
index bcafd78b52e..7b623475d12 100644
--- a/docs/data/histograms/United States/0165M20A.json
+++ b/docs/data/histograms/United States/0165M20A.json
@@ -1 +1 @@
-{"batchcode": "0165M20A", "histograms": [{"batchcodes": ["0165M20A"], "histogram": {"Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "0165M20A", "histograms": [{"histogram": {"Diarrhoea": 1}, "batchcodes": ["0165M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0167.json b/docs/data/histograms/United States/0167.json
index 153d9fadf72..ca03ce59c2c 100644
--- a/docs/data/histograms/United States/0167.json
+++ b/docs/data/histograms/United States/0167.json
@@ -1 +1 @@
-{"batchcode": "0167", "histograms": [{"batchcodes": ["0167"], "histogram": {"Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0167", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Rash": 1}, "batchcodes": ["0167"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0167C21A.json b/docs/data/histograms/United States/0167C21A.json
index 58272e0a2ab..cb4a8554189 100644
--- a/docs/data/histograms/United States/0167C21A.json
+++ b/docs/data/histograms/United States/0167C21A.json
@@ -1 +1 @@
-{"batchcode": "0167C21A", "histograms": [{"batchcodes": ["0167C21A"], "histogram": {"Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "0167C21A", "histograms": [{"histogram": {"Underdose": 1}, "batchcodes": ["0167C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016821A.json b/docs/data/histograms/United States/016821A.json
index 071f176bd0a..c5899b4b140 100644
--- a/docs/data/histograms/United States/016821A.json
+++ b/docs/data/histograms/United States/016821A.json
@@ -1 +1 @@
-{"batchcode": "016821A", "histograms": [{"batchcodes": ["016821A"], "histogram": {"Chills": 2, "Fatigue": 2, "Myalgia": 2, "Pyrexia": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Balance disorder": 1, "Body temperature": 1, "Decreased appetite": 1, "Fall": 1, "Headache": 1, "Insomnia": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pollakiuria": 1}}]}
\ No newline at end of file
+{"batchcode": "016821A", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Myalgia": 2, "Pyrexia": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Balance disorder": 1, "Body temperature": 1, "Decreased appetite": 1, "Fall": 1, "Headache": 1, "Insomnia": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pollakiuria": 1}, "batchcodes": ["016821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016A21A.json b/docs/data/histograms/United States/016A21A.json
index b3fbaa0db06..0ca15be1395 100644
--- a/docs/data/histograms/United States/016A21A.json
+++ b/docs/data/histograms/United States/016A21A.json
@@ -1 +1 @@
-{"batchcode": "016A21A", "histograms": [{"batchcodes": ["016A21A"], "histogram": {"Fatigue": 2, "Lymphadenopathy": 2, "Pain": 2, "Asthenia": 1, "Balance disorder": 1, "Blood test": 1, "Computerised tomogram": 1, "Dizziness": 1, "Ear pain": 1, "Erythema": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Insomnia": 1, "Mobility decreased": 1, "Nausea": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash": 1, "Vaccination complication": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "016A21A", "histograms": [{"histogram": {"Fatigue": 2, "Lymphadenopathy": 2, "Pain": 2, "Asthenia": 1, "Balance disorder": 1, "Blood test": 1, "Computerised tomogram": 1, "Dizziness": 1, "Ear pain": 1, "Erythema": 1, "Feeling abnormal": 1, "Gait inability": 1, "Headache": 1, "Insomnia": 1, "Mobility decreased": 1, "Nausea": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash": 1, "Vaccination complication": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Visual impairment": 1}, "batchcodes": ["016A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B(OR8)21A.json b/docs/data/histograms/United States/016B(OR8)21A.json
index 33db48f2d56..b81cbc7ae2a 100644
--- a/docs/data/histograms/United States/016B(OR8)21A.json
+++ b/docs/data/histograms/United States/016B(OR8)21A.json
@@ -1 +1 @@
-{"batchcode": "016B(OR8)21A", "histograms": [{"batchcodes": ["016B(OR8)21A"], "histogram": {"Arthralgia": 1, "Back pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016B(OR8)21A", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1}, "batchcodes": ["016B(OR8)21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B12A)..json b/docs/data/histograms/United States/016B12A)..json
index ffc84b791b2..642deab6290 100644
--- a/docs/data/histograms/United States/016B12A)..json
+++ b/docs/data/histograms/United States/016B12A)..json
@@ -1 +1 @@
-{"batchcode": "016B12A).", "histograms": [{"batchcodes": ["016B12A)."], "histogram": {"Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "016B12A).", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["016B12A)."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B21.json b/docs/data/histograms/United States/016B21.json
index ea1f758146f..875aab3a09c 100644
--- a/docs/data/histograms/United States/016B21.json
+++ b/docs/data/histograms/United States/016B21.json
@@ -1 +1 @@
-{"batchcode": "016B21", "histograms": [{"batchcodes": ["016B21"], "histogram": {"Disturbance in attention": 1, "Dizziness": 1, "Ear discomfort": 1, "Ear pain": 1, "Fatigue": 1, "Hypoacusis": 1, "Nerve compression": 1, "Neuralgia": 1, "Product dose omission issue": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "016B21", "histograms": [{"histogram": {"Disturbance in attention": 1, "Dizziness": 1, "Ear discomfort": 1, "Ear pain": 1, "Fatigue": 1, "Hypoacusis": 1, "Nerve compression": 1, "Neuralgia": 1, "Product dose omission issue": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["016B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B212.json b/docs/data/histograms/United States/016B212.json
index d99d65ebb6e..3f6b8688bb3 100644
--- a/docs/data/histograms/United States/016B212.json
+++ b/docs/data/histograms/United States/016B212.json
@@ -1 +1 @@
-{"batchcode": "016B212", "histograms": [{"batchcodes": ["016B212"], "histogram": {"Vaccination site discolouration": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016B212", "histograms": [{"histogram": {"Vaccination site discolouration": 1, "Vaccination site pain": 1}, "batchcodes": ["016B212"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B214.json b/docs/data/histograms/United States/016B214.json
index 043ad9ee90c..4d81d58a8c8 100644
--- a/docs/data/histograms/United States/016B214.json
+++ b/docs/data/histograms/United States/016B214.json
@@ -1 +1 @@
-{"batchcode": "016B214", "histograms": [{"batchcodes": ["016B214"], "histogram": {"Arthralgia": 1, "COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016B214", "histograms": [{"histogram": {"Arthralgia": 1, "COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["016B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B218.json b/docs/data/histograms/United States/016B218.json
index d386128a95f..2f01b22ac6d 100644
--- a/docs/data/histograms/United States/016B218.json
+++ b/docs/data/histograms/United States/016B218.json
@@ -1 +1 @@
-{"batchcode": "016B218", "histograms": [{"batchcodes": ["016B218"], "histogram": {"Asthenia": 1, "Dysgeusia": 1}}]}
\ No newline at end of file
+{"batchcode": "016B218", "histograms": [{"histogram": {"Asthenia": 1, "Dysgeusia": 1}, "batchcodes": ["016B218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B21A.json b/docs/data/histograms/United States/016B21A.json
index a89279d1f0f..3dd0837b710 100644
--- a/docs/data/histograms/United States/016B21A.json
+++ b/docs/data/histograms/United States/016B21A.json
@@ -1 +1 @@
-{"batchcode": "016B21A", "histograms": [{"batchcodes": ["016B21A", "1822811"], "histogram": {"Dysgeusia": 1}}, {"batchcodes": ["016B21A"], "histogram": {"Fatigue": 42, "Pain in extremity": 36, "Pyrexia": 36, "Chills": 33, "Expired product administered": 31, "Headache": 29, "Myalgia": 29, "Vaccination site pain": 29, "Product administered to patient of inappropriate age": 24, "Pain": 20, "Arthralgia": 19, "Dizziness": 17, "Nausea": 16, "Feeling abnormal": 14, "Inappropriate schedule of product administration": 14, "Hypoaesthesia": 11, "Product dose omission issue": 11, "Paraesthesia": 10, "Pruritus": 10, "Vomiting": 10, "Body temperature": 9, "COVID-19": 9, "Rash": 9, "SARS-CoV-2 test": 8, "Swelling": 8, "Vaccination site erythema": 8, "Dyspnoea": 7, "Peripheral swelling": 7, "Product storage error": 7, "Swelling face": 7, "Asthenia": 6, "Cough": 6, "Feeling hot": 6, "Hyperhidrosis": 6, "Insomnia": 6, "Malaise": 6, "Mobility decreased": 6, "Oropharyngeal pain": 6, "Vaccination site swelling": 6, "Back pain": 5, "Chest discomfort": 5, "Chest pain": 5, "Diarrhoea": 5, "Electrocardiogram": 5, "Heart rate": 5, "Somnolence": 5, "Abdominal pain upper": 4, "Accidental overdose": 4, "Erythema": 4, "Illness": 4, "Lymphadenopathy": 4, "Palpitations": 4, "Product temperature excursion issue": 4, "Rash pruritic": 4, "Rhinorrhoea": 4, "Tinnitus": 4, "Vaccination site mass": 4, "Vaccination site pruritus": 4, "Vaccination site warmth": 4, "Abdominal pain": 3, "Accidental underdose": 3, "Ageusia": 3, "Anosmia": 3, "Axillary mass": 3, "Blood test": 3, "Computerised tomogram": 3, "Dehydration": 3, "Dysphonia": 3, "Eye swelling": 3, "Influenza": 3, "Loss of personal independence in daily activities": 3, "Nasal congestion": 3, "Paraesthesia oral": 3, "Poor quality product administered": 3, "Rash macular": 3, "Tenderness": 3, "Tremor": 3, "Underdose": 3, "Urticaria": 3, "Vaccination complication": 3, "Vaccination site induration": 3, "Vertigo": 3, "Acoustic stimulation tests": 2, "Balance disorder": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Bone pain": 2, "Burning sensation": 2, "Cardiac stress test": 2, "Colitis": 2, "Condition aggravated": 2, "Device connection issue": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Eczema": 2, "Feeling of body temperature change": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate increased": 2, "Herpes virus infection": 2, "Hypersensitivity": 2, "Hypokinesia": 2, "Impaired work ability": 2, "Influenza like illness": 2, "Injection site pain": 2, "Lethargy": 2, "Limb discomfort": 2, "Lip swelling": 2, "Loss of consciousness": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Memory impairment": 2, "Migraine": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Musculoskeletal stiffness": 2, "Nasopharyngitis": 2, "Oropharyngeal discomfort": 2, "Osteoarthritis": 2, "Pharyngeal swelling": 2, "Rhabdomyolysis": 2, "Stool analysis": 2, "Throat tightness": 2, "Vaccination site bruising": 2, "Vaccination site discomfort": 2, "Vaccination site reaction": 2, "Wrong technique in product usage process": 2, "X-ray": 2, "Abdominal pain lower": 1, "Adverse reaction": 1, "Alopecia": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Aphonia": 1, "Arthritis": 1, "Asthenopia": 1, "Asthma": 1, "Atrioventricular block": 1, "Autism spectrum disorder": 1, "Axillary pain": 1, "Bacterial test": 1, "Bedridden": 1, "Blister": 1, "Blood cholesterol": 1, "Blood creatine": 1, "Blood pressure fluctuation": 1, "Breast discomfort": 1, "CD4 lymphocytes": 1, "CD4 lymphocytes increased": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cartilage injury": 1, "Catheterisation cardiac": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Cerumen removal": 1, "Chest crushing": 1, "Cholelithiasis": 1, "Chromaturia": 1, "Clostridium difficile colitis": 1, "Clostridium difficile infection": 1, "Clostridium test": 1, "Cluster headache": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram abdomen": 1, "Confusional state": 1, "Coronary artery occlusion": 1, "Crohn's disease": 1, "Cyst drainage": 1, "Deafness unilateral": 1, "Delirium": 1, "Dermatitis contact": 1, "Diabetes mellitus": 1, "Discharge": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dry skin": 1, "Dry throat": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear pain": 1, "Echocardiogram": 1, "Eosinophilia": 1, "Epistaxis": 1, "Exposure via breast milk": 1, "Face oedema": 1, "Facial pain": 1, "Fall": 1, "Fluid overload": 1, "Food intolerance": 1, "Gait inability": 1, "Gastrointestinal wall thickening": 1, "Gastrooesophageal reflux disease": 1, "Grip strength decreased": 1, "Heart injury": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hunger": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Immunodeficiency": 1, "Impaired driving ability": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Injection site movement impairment": 1, "Injection site nodule": 1, "Injection site swelling": 1, "Intentional product misuse": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Joint injury": 1, "Leukopenia": 1, "Lhermitte's sign": 1, "Lip pruritus": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Mass": 1, "Maternal exposure timing unspecified": 1, "Menopause": 1, "Menstrual disorder": 1, "Muscle fatigue": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Nervousness": 1, "Night sweats": 1, "No adverse event": 1, "Occupational exposure to product": 1, "Oral herpes": 1, "Overdose": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Pleural disorder": 1, "Post procedural complication": 1, "Postmenopausal haemorrhage": 1, "Posture abnormal": 1, "Presyncope": 1, "Purulent discharge": 1, "Rash erythematous": 1, "Rash vesicular": 1, "Retching": 1, "SARS-CoV-1 test": 1, "Secretion discharge": 1, "Skin mass": 1, "Sleep deficit": 1, "Sleep disorder": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Streptococcus test": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Throat clearing": 1, "Throat irritation": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Unevaluable event": 1, "Urine analysis": 1, "Uterine pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Venous occlusion": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "016B21A", "histograms": [{"histogram": {"Dysgeusia": 1}, "batchcodes": ["016B21A", "1822811"]}, {"histogram": {"Fatigue": 42, "Pain in extremity": 36, "Pyrexia": 36, "Chills": 33, "Expired product administered": 31, "Headache": 29, "Myalgia": 29, "Vaccination site pain": 29, "Product administered to patient of inappropriate age": 24, "Pain": 20, "Arthralgia": 19, "Dizziness": 17, "Nausea": 16, "Feeling abnormal": 14, "Inappropriate schedule of product administration": 14, "Hypoaesthesia": 11, "Product dose omission issue": 11, "Paraesthesia": 10, "Pruritus": 10, "Vomiting": 10, "Body temperature": 9, "COVID-19": 9, "Rash": 9, "SARS-CoV-2 test": 8, "Swelling": 8, "Vaccination site erythema": 8, "Dyspnoea": 7, "Peripheral swelling": 7, "Product storage error": 7, "Swelling face": 7, "Asthenia": 6, "Cough": 6, "Feeling hot": 6, "Hyperhidrosis": 6, "Insomnia": 6, "Malaise": 6, "Mobility decreased": 6, "Oropharyngeal pain": 6, "Vaccination site swelling": 6, "Back pain": 5, "Chest discomfort": 5, "Chest pain": 5, "Diarrhoea": 5, "Electrocardiogram": 5, "Heart rate": 5, "Somnolence": 5, "Abdominal pain upper": 4, "Accidental overdose": 4, "Erythema": 4, "Illness": 4, "Lymphadenopathy": 4, "Palpitations": 4, "Product temperature excursion issue": 4, "Rash pruritic": 4, "Rhinorrhoea": 4, "Tinnitus": 4, "Vaccination site mass": 4, "Vaccination site pruritus": 4, "Vaccination site warmth": 4, "Abdominal pain": 3, "Accidental underdose": 3, "Ageusia": 3, "Anosmia": 3, "Axillary mass": 3, "Blood test": 3, "Computerised tomogram": 3, "Dehydration": 3, "Dysphonia": 3, "Eye swelling": 3, "Influenza": 3, "Loss of personal independence in daily activities": 3, "Nasal congestion": 3, "Paraesthesia oral": 3, "Poor quality product administered": 3, "Rash macular": 3, "Tenderness": 3, "Tremor": 3, "Underdose": 3, "Urticaria": 3, "Vaccination complication": 3, "Vaccination site induration": 3, "Vertigo": 3, "Acoustic stimulation tests": 2, "Balance disorder": 2, "Blood pressure increased": 2, "Blood pressure measurement": 2, "Bone pain": 2, "Burning sensation": 2, "Cardiac stress test": 2, "Colitis": 2, "Condition aggravated": 2, "Device connection issue": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Eczema": 2, "Feeling of body temperature change": 2, "Gait disturbance": 2, "Head discomfort": 2, "Heart rate increased": 2, "Herpes virus infection": 2, "Hypersensitivity": 2, "Hypokinesia": 2, "Impaired work ability": 2, "Influenza like illness": 2, "Injection site pain": 2, "Lethargy": 2, "Limb discomfort": 2, "Lip swelling": 2, "Loss of consciousness": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Memory impairment": 2, "Migraine": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Musculoskeletal stiffness": 2, "Nasopharyngitis": 2, "Oropharyngeal discomfort": 2, "Osteoarthritis": 2, "Pharyngeal swelling": 2, "Rhabdomyolysis": 2, "Stool analysis": 2, "Throat tightness": 2, "Vaccination site bruising": 2, "Vaccination site discomfort": 2, "Vaccination site reaction": 2, "Wrong technique in product usage process": 2, "X-ray": 2, "Abdominal pain lower": 1, "Adverse reaction": 1, "Alopecia": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Anxiety": 1, "Aphonia": 1, "Arthritis": 1, "Asthenopia": 1, "Asthma": 1, "Atrioventricular block": 1, "Autism spectrum disorder": 1, "Axillary pain": 1, "Bacterial test": 1, "Bedridden": 1, "Blister": 1, "Blood cholesterol": 1, "Blood creatine": 1, "Blood pressure fluctuation": 1, "Breast discomfort": 1, "CD4 lymphocytes": 1, "CD4 lymphocytes increased": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cartilage injury": 1, "Catheterisation cardiac": 1, "Cerebral venous sinus thrombosis": 1, "Cerebrovascular accident": 1, "Cerumen removal": 1, "Chest crushing": 1, "Cholelithiasis": 1, "Chromaturia": 1, "Clostridium difficile colitis": 1, "Clostridium difficile infection": 1, "Clostridium test": 1, "Cluster headache": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram abdomen": 1, "Confusional state": 1, "Coronary artery occlusion": 1, "Crohn's disease": 1, "Cyst drainage": 1, "Deafness unilateral": 1, "Delirium": 1, "Dermatitis contact": 1, "Diabetes mellitus": 1, "Discharge": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dry skin": 1, "Dry throat": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear pain": 1, "Echocardiogram": 1, "Eosinophilia": 1, "Epistaxis": 1, "Exposure via breast milk": 1, "Face oedema": 1, "Facial pain": 1, "Fall": 1, "Fluid overload": 1, "Food intolerance": 1, "Gait inability": 1, "Gastrointestinal wall thickening": 1, "Gastrooesophageal reflux disease": 1, "Grip strength decreased": 1, "Heart injury": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hunger": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypopnoea": 1, "Immunodeficiency": 1, "Impaired driving ability": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Injection site movement impairment": 1, "Injection site nodule": 1, "Injection site swelling": 1, "Intentional product misuse": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Joint injury": 1, "Leukopenia": 1, "Lhermitte's sign": 1, "Lip pruritus": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Mass": 1, "Maternal exposure timing unspecified": 1, "Menopause": 1, "Menstrual disorder": 1, "Muscle fatigue": 1, "Nerve conduction studies": 1, "Nerve injury": 1, "Nervousness": 1, "Night sweats": 1, "No adverse event": 1, "Occupational exposure to product": 1, "Oral herpes": 1, "Overdose": 1, "Pericardial effusion": 1, "Pericarditis": 1, "Pharyngeal erythema": 1, "Pleural disorder": 1, "Post procedural complication": 1, "Postmenopausal haemorrhage": 1, "Posture abnormal": 1, "Presyncope": 1, "Purulent discharge": 1, "Rash erythematous": 1, "Rash vesicular": 1, "Retching": 1, "SARS-CoV-1 test": 1, "Secretion discharge": 1, "Skin mass": 1, "Sleep deficit": 1, "Sleep disorder": 1, "Sluggishness": 1, "Sneezing": 1, "Speech disorder": 1, "Streptococcus test": 1, "Suspected COVID-19": 1, "Syncope": 1, "Tachycardia": 1, "Throat clearing": 1, "Throat irritation": 1, "Troponin": 1, "Ultrasound abdomen": 1, "Unevaluable event": 1, "Urine analysis": 1, "Uterine pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Venous occlusion": 1, "Vision blurred": 1}, "batchcodes": ["016B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B22A.json b/docs/data/histograms/United States/016B22A.json
index 9142e4540a8..6c264f51059 100644
--- a/docs/data/histograms/United States/016B22A.json
+++ b/docs/data/histograms/United States/016B22A.json
@@ -1 +1 @@
-{"batchcode": "016B22A", "histograms": [{"batchcodes": ["016B22A"], "histogram": {"Expired product administered": 15, "No adverse event": 15, "Product storage error": 14, "Pain": 2, "Pyrexia": 2, "Back pain": 1, "Balance disorder": 1, "Feeling abnormal": 1, "Headache": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain in extremity": 1, "Postmenopausal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "016B22A", "histograms": [{"histogram": {"Expired product administered": 15, "No adverse event": 15, "Product storage error": 14, "Pain": 2, "Pyrexia": 2, "Back pain": 1, "Balance disorder": 1, "Feeling abnormal": 1, "Headache": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain in extremity": 1, "Postmenopausal haemorrhage": 1}, "batchcodes": ["016B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016B27L.json b/docs/data/histograms/United States/016B27L.json
index b956391d1fa..b02f7455ac3 100644
--- a/docs/data/histograms/United States/016B27L.json
+++ b/docs/data/histograms/United States/016B27L.json
@@ -1 +1 @@
-{"batchcode": "016B27L", "histograms": [{"batchcodes": ["016B27L"], "histogram": {"Lymphadenopathy": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016B27L", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["016B27L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016BNA.json b/docs/data/histograms/United States/016BNA.json
index 0cc4b81a287..0f77299fb17 100644
--- a/docs/data/histograms/United States/016BNA.json
+++ b/docs/data/histograms/United States/016BNA.json
@@ -1 +1 @@
-{"batchcode": "016BNA", "histograms": [{"batchcodes": ["016BNA"], "histogram": {"Chills": 1, "Fatigue": 1, "Illness": 1, "Influenza": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "016BNA", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Illness": 1, "Influenza": 1, "Pain in extremity": 1}, "batchcodes": ["016BNA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016BZ1A.json b/docs/data/histograms/United States/016BZ1A.json
index b66fcd20ae0..e60c6c4559c 100644
--- a/docs/data/histograms/United States/016BZ1A.json
+++ b/docs/data/histograms/United States/016BZ1A.json
@@ -1 +1 @@
-{"batchcode": "016BZ1A", "histograms": [{"batchcodes": ["016BZ1A"], "histogram": {"Pain in extremity": 2, "Bone pain": 1, "Chills": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Hypokinesia": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Pain": 1, "Proctalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016BZ1A", "histograms": [{"histogram": {"Pain in extremity": 2, "Bone pain": 1, "Chills": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Hypokinesia": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Pain": 1, "Proctalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["016BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C2114.json b/docs/data/histograms/United States/016C2114.json
index 9093031c9d5..81945f32b94 100644
--- a/docs/data/histograms/United States/016C2114.json
+++ b/docs/data/histograms/United States/016C2114.json
@@ -1 +1 @@
-{"batchcode": "016C2114", "histograms": [{"batchcodes": ["016C2114"], "histogram": {"Aphasia": 1, "Illness": 1, "Kidney infection": 1, "Limb discomfort": 1, "Muscular weakness": 1, "Pain": 1, "Paralysis": 1, "Product dose omission issue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016C2114", "histograms": [{"histogram": {"Aphasia": 1, "Illness": 1, "Kidney infection": 1, "Limb discomfort": 1, "Muscular weakness": 1, "Pain": 1, "Paralysis": 1, "Product dose omission issue": 1, "Vaccination site pain": 1}, "batchcodes": ["016C2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C2119.json b/docs/data/histograms/United States/016C2119.json
index b8b94ab60e8..ecc111be8a8 100644
--- a/docs/data/histograms/United States/016C2119.json
+++ b/docs/data/histograms/United States/016C2119.json
@@ -1 +1 @@
-{"batchcode": "016C2119", "histograms": [{"batchcodes": ["016C2119"], "histogram": {"Body temperature": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "016C2119", "histograms": [{"histogram": {"Body temperature": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Nasopharyngitis": 1, "Pyrexia": 1, "Sneezing": 1}, "batchcodes": ["016C2119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C211A.json b/docs/data/histograms/United States/016C211A.json
index 2340c061b7e..16a59ed4587 100644
--- a/docs/data/histograms/United States/016C211A.json
+++ b/docs/data/histograms/United States/016C211A.json
@@ -1 +1 @@
-{"batchcode": "016C211A", "histograms": [{"batchcodes": ["016C211A"], "histogram": {"Chills": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Pyrexia": 1, "Sinus congestion": 1, "Sinus disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "016C211A", "histograms": [{"histogram": {"Chills": 1, "Feeling abnormal": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Pyrexia": 1, "Sinus congestion": 1, "Sinus disorder": 1}, "batchcodes": ["016C211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C214.json b/docs/data/histograms/United States/016C214.json
index 9f925ce8170..7a42ccc7995 100644
--- a/docs/data/histograms/United States/016C214.json
+++ b/docs/data/histograms/United States/016C214.json
@@ -1 +1 @@
-{"batchcode": "016C214", "histograms": [{"batchcodes": ["016C214"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016C214", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["016C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C218.json b/docs/data/histograms/United States/016C218.json
index 7e3ca5766df..0a5ee445d79 100644
--- a/docs/data/histograms/United States/016C218.json
+++ b/docs/data/histograms/United States/016C218.json
@@ -1 +1 @@
-{"batchcode": "016C218", "histograms": [{"batchcodes": ["016C218"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "016C218", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["016C218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C21A.json b/docs/data/histograms/United States/016C21A.json
index f3d6d9f735b..58fbcfa9b8b 100644
--- a/docs/data/histograms/United States/016C21A.json
+++ b/docs/data/histograms/United States/016C21A.json
@@ -1 +1 @@
-{"batchcode": "016C21A", "histograms": [{"batchcodes": ["016C21A"], "histogram": {"Fatigue": 29, "Headache": 23, "Pain in extremity": 22, "Myalgia": 21, "Chills": 19, "Pyrexia": 18, "Nausea": 17, "Dizziness": 13, "Vaccination site pain": 13, "Expired product administered": 12, "Feeling abnormal": 11, "Asthenia": 10, "Product storage error": 9, "Peripheral swelling": 8, "Cough": 7, "Influenza like illness": 7, "Pruritus": 7, "Vomiting": 7, "Arthralgia": 6, "Dyspnoea": 6, "Lymphadenopathy": 6, "Pain": 6, "Product dose omission issue": 6, "Paraesthesia": 5, "SARS-CoV-2 test": 5, "Diarrhoea": 4, "Erythema": 4, "Illness": 4, "Joint swelling": 4, "Product administered to patient of inappropriate age": 4, "Rhinorrhoea": 4, "Somnolence": 4, "Swelling": 4, "Vaccination site erythema": 4, "Vaccination site swelling": 4, "Abdominal pain upper": 3, "Anxiety": 3, "Back pain": 3, "Bedridden": 3, "Blood pressure measurement": 3, "Body temperature": 3, "Chest pain": 3, "Discomfort": 3, "Hypoaesthesia": 3, "Inappropriate schedule of product administration": 3, "Interchange of vaccine products": 3, "Limb discomfort": 3, "Malaise": 3, "Muscle spasms": 3, "Underdose": 3, "Urticaria": 3, "Vaccination complication": 3, "Vaccination site warmth": 3, "Chest discomfort": 2, "Computerised tomogram": 2, "Contusion": 2, "Decreased appetite": 2, "Epistaxis": 2, "Eye swelling": 2, "Feeding disorder": 2, "Feeling hot": 2, "Gait disturbance": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Impaired work ability": 2, "Induration": 2, "Insomnia": 2, "Oropharyngeal pain": 2, "Post-acute COVID-19 syndrome": 2, "Rash": 2, "Rash erythematous": 2, "Swelling face": 2, "Thrombosis": 2, "Vaccination site discomfort": 2, "Vaccination site movement impairment": 2, "Vaccination site pruritus": 2, "Vaccination site reaction": 2, "Vision blurred": 2, "Wrong technique in product usage process": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Ageusia": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Appetite disorder": 1, "Asymptomatic COVID-19": 1, "Atrophy": 1, "Bell's palsy": 1, "Blood pressure decreased": 1, "Bone marrow oedema": 1, "Bone pain": 1, "Breast pain": 1, "Bronchitis": 1, "COVID-19": 1, "Cardiac disorder": 1, "Carotid artery occlusion": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Cold sweat": 1, "Condition aggravated": 1, "Confusional state": 1, "Crying": 1, "Deafness bilateral": 1, "Dehydration": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Dysgeusia": 1, "Dysphonia": 1, "Ear pain": 1, "Eating disorder": 1, "Exercise tolerance decreased": 1, "Extra dose administered": 1, "Eye discharge": 1, "Facial paralysis": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Heart rate": 1, "Histamine level": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Immunisation reaction": 1, "Infection": 1, "Infectious mononucleosis": 1, "Injection site swelling": 1, "Laboratory test": 1, "Lethargy": 1, "Liver function test abnormal": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging normal": 1, "Mobility decreased": 1, "Motion sickness": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Night sweats": 1, "Ocular discomfort": 1, "Oral lichen planus": 1, "Osteoporosis": 1, "Overdose": 1, "Pallor": 1, "Palpitations": 1, "Periorbital swelling": 1, "Pneumonitis": 1, "Poor quality product administered": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Renal pain": 1, "Scan": 1, "Secretion discharge": 1, "Seizure": 1, "Skin discolouration": 1, "Skin reaction": 1, "Sneezing": 1, "Social avoidant behaviour": 1, "Swelling of eyelid": 1, "Syncope": 1, "Syringe issue": 1, "Tachycardia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Tinnitus": 1, "Tracheal obstruction": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination site bruising": 1, "Vaccination site mass": 1, "Vaccination site vesicles": 1, "Vertigo": 1, "Vitreous floaters": 1, "Vomiting projectile": 1, "Weight": 1, "Weight decreased": 1, "Wrong technique in device usage process": 1, "X-ray limb": 1}}]}
\ No newline at end of file
+{"batchcode": "016C21A", "histograms": [{"histogram": {"Fatigue": 29, "Headache": 23, "Pain in extremity": 22, "Myalgia": 21, "Chills": 19, "Pyrexia": 18, "Nausea": 17, "Dizziness": 13, "Vaccination site pain": 13, "Expired product administered": 12, "Feeling abnormal": 11, "Asthenia": 10, "Product storage error": 9, "Peripheral swelling": 8, "Cough": 7, "Influenza like illness": 7, "Pruritus": 7, "Vomiting": 7, "Arthralgia": 6, "Dyspnoea": 6, "Lymphadenopathy": 6, "Pain": 6, "Product dose omission issue": 6, "Paraesthesia": 5, "SARS-CoV-2 test": 5, "Diarrhoea": 4, "Erythema": 4, "Illness": 4, "Joint swelling": 4, "Product administered to patient of inappropriate age": 4, "Rhinorrhoea": 4, "Somnolence": 4, "Swelling": 4, "Vaccination site erythema": 4, "Vaccination site swelling": 4, "Abdominal pain upper": 3, "Anxiety": 3, "Back pain": 3, "Bedridden": 3, "Blood pressure measurement": 3, "Body temperature": 3, "Chest pain": 3, "Discomfort": 3, "Hypoaesthesia": 3, "Inappropriate schedule of product administration": 3, "Interchange of vaccine products": 3, "Limb discomfort": 3, "Malaise": 3, "Muscle spasms": 3, "Underdose": 3, "Urticaria": 3, "Vaccination complication": 3, "Vaccination site warmth": 3, "Chest discomfort": 2, "Computerised tomogram": 2, "Contusion": 2, "Decreased appetite": 2, "Epistaxis": 2, "Eye swelling": 2, "Feeding disorder": 2, "Feeling hot": 2, "Gait disturbance": 2, "Hot flush": 2, "Hyperhidrosis": 2, "Impaired work ability": 2, "Induration": 2, "Insomnia": 2, "Oropharyngeal pain": 2, "Post-acute COVID-19 syndrome": 2, "Rash": 2, "Rash erythematous": 2, "Swelling face": 2, "Thrombosis": 2, "Vaccination site discomfort": 2, "Vaccination site movement impairment": 2, "Vaccination site pruritus": 2, "Vaccination site reaction": 2, "Vision blurred": 2, "Wrong technique in product usage process": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abnormal dreams": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Ageusia": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Appetite disorder": 1, "Asymptomatic COVID-19": 1, "Atrophy": 1, "Bell's palsy": 1, "Blood pressure decreased": 1, "Bone marrow oedema": 1, "Bone pain": 1, "Breast pain": 1, "Bronchitis": 1, "COVID-19": 1, "Cardiac disorder": 1, "Carotid artery occlusion": 1, "Cerebral disorder": 1, "Chest X-ray": 1, "Cold sweat": 1, "Condition aggravated": 1, "Confusional state": 1, "Crying": 1, "Deafness bilateral": 1, "Dehydration": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Dysgeusia": 1, "Dysphonia": 1, "Ear pain": 1, "Eating disorder": 1, "Exercise tolerance decreased": 1, "Extra dose administered": 1, "Eye discharge": 1, "Facial paralysis": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Heart rate": 1, "Histamine level": 1, "Hypersomnia": 1, "Hypertension": 1, "Hypokinesia": 1, "Immunisation reaction": 1, "Infection": 1, "Infectious mononucleosis": 1, "Injection site swelling": 1, "Laboratory test": 1, "Lethargy": 1, "Liver function test abnormal": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging normal": 1, "Mobility decreased": 1, "Motion sickness": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscle twitching": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Night sweats": 1, "Ocular discomfort": 1, "Oral lichen planus": 1, "Osteoporosis": 1, "Overdose": 1, "Pallor": 1, "Palpitations": 1, "Periorbital swelling": 1, "Pneumonitis": 1, "Poor quality product administered": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Renal pain": 1, "Scan": 1, "Secretion discharge": 1, "Seizure": 1, "Skin discolouration": 1, "Skin reaction": 1, "Sneezing": 1, "Social avoidant behaviour": 1, "Swelling of eyelid": 1, "Syncope": 1, "Syringe issue": 1, "Tachycardia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Tinnitus": 1, "Tracheal obstruction": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination site bruising": 1, "Vaccination site mass": 1, "Vaccination site vesicles": 1, "Vertigo": 1, "Vitreous floaters": 1, "Vomiting projectile": 1, "Weight": 1, "Weight decreased": 1, "Wrong technique in device usage process": 1, "X-ray limb": 1}, "batchcodes": ["016C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C21F.json b/docs/data/histograms/United States/016C21F.json
index 3564cb6cf31..21afbcf81e3 100644
--- a/docs/data/histograms/United States/016C21F.json
+++ b/docs/data/histograms/United States/016C21F.json
@@ -1 +1 @@
-{"batchcode": "016C21F", "histograms": [{"batchcodes": ["016C21F"], "histogram": {"Limb discomfort": 1, "Sleep disorder": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016C21F", "histograms": [{"histogram": {"Limb discomfort": 1, "Sleep disorder": 1, "Vaccination site pain": 1}, "batchcodes": ["016C21F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016C221A.json b/docs/data/histograms/United States/016C221A.json
index a8357f6bb12..e0caad744ee 100644
--- a/docs/data/histograms/United States/016C221A.json
+++ b/docs/data/histograms/United States/016C221A.json
@@ -1 +1 @@
-{"batchcode": "016C221A", "histograms": [{"batchcodes": ["016C221A"], "histogram": {"Blindness": 1, "Blood pressure measurement": 1, "Cerebral cyst": 1, "Computerised tomogram": 1, "Dizziness": 1, "Eye movement disorder": 1, "Feeling abnormal": 1, "Hypotension": 1, "Pain in extremity": 1, "Pallor": 1, "Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "016C221A", "histograms": [{"histogram": {"Blindness": 1, "Blood pressure measurement": 1, "Cerebral cyst": 1, "Computerised tomogram": 1, "Dizziness": 1, "Eye movement disorder": 1, "Feeling abnormal": 1, "Hypotension": 1, "Pain in extremity": 1, "Pallor": 1, "Speech disorder": 1}, "batchcodes": ["016C221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016CA1A.json b/docs/data/histograms/United States/016CA1A.json
index fbff615cb6a..600f4834cca 100644
--- a/docs/data/histograms/United States/016CA1A.json
+++ b/docs/data/histograms/United States/016CA1A.json
@@ -1 +1 @@
-{"batchcode": "016CA1A", "histograms": [{"batchcodes": ["016CA1A"], "histogram": {"Hypersensitivity": 1, "Inflammation": 1, "Lip swelling": 1, "Swelling face": 1, "Throat tightness": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "016CA1A", "histograms": [{"histogram": {"Hypersensitivity": 1, "Inflammation": 1, "Lip swelling": 1, "Swelling face": 1, "Throat tightness": 1, "Urticaria": 1}, "batchcodes": ["016CA1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016CZ1A.json b/docs/data/histograms/United States/016CZ1A.json
index e0f1b8e2cf7..b9b4a1cf053 100644
--- a/docs/data/histograms/United States/016CZ1A.json
+++ b/docs/data/histograms/United States/016CZ1A.json
@@ -1 +1 @@
-{"batchcode": "016CZ1A", "histograms": [{"batchcodes": ["016CZ1A"], "histogram": {"Lethargy": 2, "Pyrexia": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Emotional poverty": 1, "Fatigue": 1, "Feeling hot": 1, "Hypersomnia": 1, "Hypokinesia": 1, "Nasopharyngitis": 1, "Pruritus": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016CZ1A", "histograms": [{"histogram": {"Lethargy": 2, "Pyrexia": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Emotional poverty": 1, "Fatigue": 1, "Feeling hot": 1, "Hypersomnia": 1, "Hypokinesia": 1, "Nasopharyngitis": 1, "Pruritus": 1, "Vaccination site pain": 1}, "batchcodes": ["016CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016CZI1.json b/docs/data/histograms/United States/016CZI1.json
index e5dd2dfbbd8..b6ba2852747 100644
--- a/docs/data/histograms/United States/016CZI1.json
+++ b/docs/data/histograms/United States/016CZI1.json
@@ -1 +1 @@
-{"batchcode": "016CZI1", "histograms": [{"batchcodes": ["016CZI1"], "histogram": {"Nasopharyngitis": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "016CZI1", "histograms": [{"histogram": {"Nasopharyngitis": 1, "Rhinorrhoea": 1}, "batchcodes": ["016CZI1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016CZIA.json b/docs/data/histograms/United States/016CZIA.json
index 6411554957d..075c8f19bac 100644
--- a/docs/data/histograms/United States/016CZIA.json
+++ b/docs/data/histograms/United States/016CZIA.json
@@ -1 +1 @@
-{"batchcode": "016CZIA", "histograms": [{"batchcodes": ["016CZIA"], "histogram": {"No adverse event": 2, "Bell's palsy": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "016CZIA", "histograms": [{"histogram": {"No adverse event": 2, "Bell's palsy": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Wrong product administered": 1}, "batchcodes": ["016CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016D21A.json b/docs/data/histograms/United States/016D21A.json
index 387a3d8898f..c85617e2339 100644
--- a/docs/data/histograms/United States/016D21A.json
+++ b/docs/data/histograms/United States/016D21A.json
@@ -1 +1 @@
-{"batchcode": "016D21A", "histograms": [{"batchcodes": ["016D21A"], "histogram": {"Chills": 1, "Hypersensitivity": 1, "Myalgia": 1, "Paraesthesia oral": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "016D21A", "histograms": [{"histogram": {"Chills": 1, "Hypersensitivity": 1, "Myalgia": 1, "Paraesthesia oral": 1, "Pyrexia": 1, "Urticaria": 1, "Vaccination site reaction": 1}, "batchcodes": ["016D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016E21A.json b/docs/data/histograms/United States/016E21A.json
index 05822f150e3..912c2356df5 100644
--- a/docs/data/histograms/United States/016E21A.json
+++ b/docs/data/histograms/United States/016E21A.json
@@ -1 +1 @@
-{"batchcode": "016E21A", "histograms": [{"batchcodes": ["016E21A"], "histogram": {"Expired product administered": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "016E21A", "histograms": [{"histogram": {"Expired product administered": 1, "Vaccination complication": 1}, "batchcodes": ["016E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016H22A.json b/docs/data/histograms/United States/016H22A.json
index 75cdbd0fa5e..04a662af76a 100644
--- a/docs/data/histograms/United States/016H22A.json
+++ b/docs/data/histograms/United States/016H22A.json
@@ -1 +1 @@
-{"batchcode": "016H22A", "histograms": [{"batchcodes": ["016H22A"], "histogram": {"No adverse event": 3, "Wrong product administered": 3, "Abdominal pain": 1, "Body temperature": 1, "Computerised tomogram": 1, "Haematuria": 1, "Hypoaesthesia": 1, "Positron emission tomogram": 1, "Pyrexia": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Sciatica": 1, "Skin warm": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "016H22A", "histograms": [{"histogram": {"No adverse event": 3, "Wrong product administered": 3, "Abdominal pain": 1, "Body temperature": 1, "Computerised tomogram": 1, "Haematuria": 1, "Hypoaesthesia": 1, "Positron emission tomogram": 1, "Pyrexia": 1, "Renal pain": 1, "SARS-CoV-2 test": 1, "Sciatica": 1, "Skin warm": 1, "Swelling": 1}, "batchcodes": ["016H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016J21-2A.json b/docs/data/histograms/United States/016J21-2A.json
index 7a00bf47475..17aacc7f231 100644
--- a/docs/data/histograms/United States/016J21-2A.json
+++ b/docs/data/histograms/United States/016J21-2A.json
@@ -1 +1 @@
-{"batchcode": "016J21-2A", "histograms": [{"batchcodes": ["016J21-2A"], "histogram": {"Expired product administered": 44, "Product storage error": 23, "Poor quality product administered": 5, "Product temperature excursion issue": 5, "Vaccination site erythema": 4, "Fatigue": 3, "Vaccination site pain": 3, "Accidental underdose": 2, "Chills": 2, "Feeling abnormal": 2, "Headache": 2, "Incorrect route of product administration": 2, "Insomnia": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Bone pain": 1, "Eye pain": 1, "Fear of death": 1, "Head titubation": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site discharge": 1, "Vaccination site infection": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "016J21-2A", "histograms": [{"histogram": {"Expired product administered": 44, "Product storage error": 23, "Poor quality product administered": 5, "Product temperature excursion issue": 5, "Vaccination site erythema": 4, "Fatigue": 3, "Vaccination site pain": 3, "Accidental underdose": 2, "Chills": 2, "Feeling abnormal": 2, "Headache": 2, "Incorrect route of product administration": 2, "Insomnia": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Bone pain": 1, "Eye pain": 1, "Fear of death": 1, "Head titubation": 1, "Inappropriate schedule of product administration": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site discharge": 1, "Vaccination site infection": 1, "Vaccination site reaction": 1}, "batchcodes": ["016J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016J212A.json b/docs/data/histograms/United States/016J212A.json
index 7c600dd6482..623ff9a916e 100644
--- a/docs/data/histograms/United States/016J212A.json
+++ b/docs/data/histograms/United States/016J212A.json
@@ -1 +1 @@
-{"batchcode": "016J212A", "histograms": [{"batchcodes": ["016J212A"], "histogram": {"Expired product administered": 3, "Product storage error": 3, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Accidental underdose": 1, "Arthralgia": 1, "Cough": 1, "Extra dose administered": 1, "Feeding disorder": 1, "Headache": 1, "Hyperhidrosis": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Somnolence": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "016J212A", "histograms": [{"histogram": {"Expired product administered": 3, "Product storage error": 3, "Fatigue": 2, "Inappropriate schedule of product administration": 2, "Accidental underdose": 1, "Arthralgia": 1, "Cough": 1, "Extra dose administered": 1, "Feeding disorder": 1, "Headache": 1, "Hyperhidrosis": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Somnolence": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["016J212A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016J21A-2A.json b/docs/data/histograms/United States/016J21A-2A.json
index 98400a0b852..6dae9cf5b40 100644
--- a/docs/data/histograms/United States/016J21A-2A.json
+++ b/docs/data/histograms/United States/016J21A-2A.json
@@ -1 +1 @@
-{"batchcode": "016J21A-2A", "histograms": [{"batchcodes": ["016J21A-2A"], "histogram": {"Expired product administered": 1, "Immunisation reaction": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "016J21A-2A", "histograms": [{"histogram": {"Expired product administered": 1, "Immunisation reaction": 1, "Product storage error": 1}, "batchcodes": ["016J21A-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016L20A.json b/docs/data/histograms/United States/016L20A.json
index c304a962adc..97f07b85854 100644
--- a/docs/data/histograms/United States/016L20A.json
+++ b/docs/data/histograms/United States/016L20A.json
@@ -1 +1 @@
-{"batchcode": "016L20A", "histograms": [{"batchcodes": ["016L20A"], "histogram": {"Abdominal pain upper": 1, "Aplastic anaemia": 1, "Chills": 1, "Feeling cold": 1, "Haemoglobin": 1, "Peripheral swelling": 1, "Platelet count": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell analysis": 1, "Thrombosis": 1, "Vaccination site swelling": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "016L20A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Aplastic anaemia": 1, "Chills": 1, "Feeling cold": 1, "Haemoglobin": 1, "Peripheral swelling": 1, "Platelet count": 1, "Pyrexia": 1, "Rash": 1, "Red blood cell analysis": 1, "Thrombosis": 1, "Vaccination site swelling": 1, "White blood cell count": 1}, "batchcodes": ["016L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016L21A.json b/docs/data/histograms/United States/016L21A.json
index a818416e324..831c3a78f11 100644
--- a/docs/data/histograms/United States/016L21A.json
+++ b/docs/data/histograms/United States/016L21A.json
@@ -1 +1 @@
-{"batchcode": "016L21A", "histograms": [{"batchcodes": ["016L21A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "016L21A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["016L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M020A.json b/docs/data/histograms/United States/016M020A.json
index 6f02da9c6c0..9a7ab39c10f 100644
--- a/docs/data/histograms/United States/016M020A.json
+++ b/docs/data/histograms/United States/016M020A.json
@@ -1 +1 @@
-{"batchcode": "016M020A", "histograms": [{"batchcodes": ["016M020A"], "histogram": {"Allergy to vaccine": 1, "Myalgia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "016M020A", "histograms": [{"histogram": {"Allergy to vaccine": 1, "Myalgia": 1, "Paraesthesia": 1}, "batchcodes": ["016M020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M024.json b/docs/data/histograms/United States/016M024.json
index 28b667b0a9d..3228473ea59 100644
--- a/docs/data/histograms/United States/016M024.json
+++ b/docs/data/histograms/United States/016M024.json
@@ -1 +1 @@
-{"batchcode": "016M024", "histograms": [{"batchcodes": ["016M024"], "histogram": {"COVID-19 immunisation": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate increased": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "016M024", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate increased": 1, "Myalgia": 1}, "batchcodes": ["016M024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M20.json b/docs/data/histograms/United States/016M20.json
index 00283b869af..e60fa8ad6a3 100644
--- a/docs/data/histograms/United States/016M20.json
+++ b/docs/data/histograms/United States/016M20.json
@@ -1 +1 @@
-{"batchcode": "016M20", "histograms": [{"batchcodes": ["016M20"], "histogram": {"Burning sensation": 1, "Irritability postvaccinal": 1, "Pruritus": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20", "histograms": [{"histogram": {"Burning sensation": 1, "Irritability postvaccinal": 1, "Pruritus": 1, "Rash erythematous": 1}, "batchcodes": ["016M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M200.json b/docs/data/histograms/United States/016M200.json
index f907f33be2b..07f08bafcf4 100644
--- a/docs/data/histograms/United States/016M200.json
+++ b/docs/data/histograms/United States/016M200.json
@@ -1 +1 @@
-{"batchcode": "016M200", "histograms": [{"batchcodes": ["016M200"], "histogram": {"Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "016M200", "histograms": [{"histogram": {"Thrombosis": 1}, "batchcodes": ["016M200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M2014.json b/docs/data/histograms/United States/016M2014.json
index 5ab046708fa..7cd386bb009 100644
--- a/docs/data/histograms/United States/016M2014.json
+++ b/docs/data/histograms/United States/016M2014.json
@@ -1 +1 @@
-{"batchcode": "016M2014", "histograms": [{"batchcodes": ["016M2014"], "histogram": {"Pain in extremity": 2, "Alopecia": 1, "Asthenia": 1, "Balance disorder": 1, "Cough": 1, "Deafness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Joint swelling": 1, "Sinus disorder": 1, "Swelling": 1, "Tenderness": 1, "Vasculitis": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "016M2014", "histograms": [{"histogram": {"Pain in extremity": 2, "Alopecia": 1, "Asthenia": 1, "Balance disorder": 1, "Cough": 1, "Deafness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Joint swelling": 1, "Sinus disorder": 1, "Swelling": 1, "Tenderness": 1, "Vasculitis": 1, "Weight decreased": 1}, "batchcodes": ["016M2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M201A.json b/docs/data/histograms/United States/016M201A.json
index 2041a652926..559b37af5bb 100644
--- a/docs/data/histograms/United States/016M201A.json
+++ b/docs/data/histograms/United States/016M201A.json
@@ -1 +1 @@
-{"batchcode": "016M201A", "histograms": [{"batchcodes": ["016M201A"], "histogram": {"Back pain": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "016M201A", "histograms": [{"histogram": {"Back pain": 1, "Chills": 1, "Decreased appetite": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["016M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M204.json b/docs/data/histograms/United States/016M204.json
index 214ea6bddc9..5b82b396bb2 100644
--- a/docs/data/histograms/United States/016M204.json
+++ b/docs/data/histograms/United States/016M204.json
@@ -1 +1 @@
-{"batchcode": "016M204", "histograms": [{"batchcodes": ["016M204"], "histogram": {"Fatigue": 3, "Dyspnoea": 2, "Swelling face": 2, "Chills": 1, "Dry skin": 1, "Erythema": 1, "Hypersensitivity": 1, "Malaise": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Skin induration": 1, "Somnolence": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "016M204", "histograms": [{"histogram": {"Fatigue": 3, "Dyspnoea": 2, "Swelling face": 2, "Chills": 1, "Dry skin": 1, "Erythema": 1, "Hypersensitivity": 1, "Malaise": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Skin induration": 1, "Somnolence": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["016M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M209.json b/docs/data/histograms/United States/016M209.json
index 2f7473b12c6..b3bbfdcc231 100644
--- a/docs/data/histograms/United States/016M209.json
+++ b/docs/data/histograms/United States/016M209.json
@@ -1 +1 @@
-{"batchcode": "016M209", "histograms": [{"batchcodes": ["016M209"], "histogram": {"Feeling cold": 1}}]}
\ No newline at end of file
+{"batchcode": "016M209", "histograms": [{"histogram": {"Feeling cold": 1}, "batchcodes": ["016M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M20A / 015M2.json b/docs/data/histograms/United States/016M20A / 015M2.json
index 402fa131f8e..23439fe7ab6 100644
--- a/docs/data/histograms/United States/016M20A / 015M2.json
+++ b/docs/data/histograms/United States/016M20A / 015M2.json
@@ -1 +1 @@
-{"batchcode": "016M20A / 015M2", "histograms": [{"batchcodes": ["016M20A / 015M2"], "histogram": {"Arthralgia": 1, "Haematoma": 1, "Headache": 1, "Nausea": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20A / 015M2", "histograms": [{"histogram": {"Arthralgia": 1, "Haematoma": 1, "Headache": 1, "Nausea": 1, "Pain": 1}, "batchcodes": ["016M20A / 015M2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M20A,.json b/docs/data/histograms/United States/016M20A,.json
index 0600bb6bf80..fd91f53bbf3 100644
--- a/docs/data/histograms/United States/016M20A,.json
+++ b/docs/data/histograms/United States/016M20A,.json
@@ -1 +1 @@
-{"batchcode": "016M20A,", "histograms": [{"batchcodes": ["016M20A,"], "histogram": {"Arthralgia": 1, "Erythema": 1, "Gait disturbance": 1, "Gout": 1, "Lymphatic disorder": 1, "Mobility decreased": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Rash": 1, "Skin warm": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20A,", "histograms": [{"histogram": {"Arthralgia": 1, "Erythema": 1, "Gait disturbance": 1, "Gout": 1, "Lymphatic disorder": 1, "Mobility decreased": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Rash": 1, "Skin warm": 1}, "batchcodes": ["016M20A,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M20A..json b/docs/data/histograms/United States/016M20A..json
index 3b8da4de07e..fd206ed1430 100644
--- a/docs/data/histograms/United States/016M20A..json
+++ b/docs/data/histograms/United States/016M20A..json
@@ -1 +1 @@
-{"batchcode": "016M20A.", "histograms": [{"batchcodes": ["016M20A."], "histogram": {"Discomfort": 1, "Fatigue": 1, "Joint swelling": 1, "Muscle discomfort": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20A.", "histograms": [{"histogram": {"Discomfort": 1, "Fatigue": 1, "Joint swelling": 1, "Muscle discomfort": 1, "Pruritus": 1}, "batchcodes": ["016M20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M20A.json b/docs/data/histograms/United States/016M20A.json
index 9cbb2e90121..755644bf102 100644
--- a/docs/data/histograms/United States/016M20A.json
+++ b/docs/data/histograms/United States/016M20A.json
@@ -1 +1 @@
-{"batchcode": "016M20A", "histograms": [{"batchcodes": ["016M20A"], "histogram": {"Headache": 93, "Fatigue": 92, "Pain in extremity": 88, "Pyrexia": 73, "Chills": 66, "Vaccination site pain": 62, "Myalgia": 56, "Vaccination site erythema": 45, "Pain": 43, "Arthralgia": 38, "Nausea": 36, "Rash": 34, "Vaccination site pruritus": 31, "Dizziness": 30, "Pruritus": 28, "Dyspnoea": 26, "Product temperature excursion issue": 26, "Vaccination site warmth": 26, "Asthenia": 25, "Poor quality product administered": 25, "Vaccination site swelling": 25, "Diarrhoea": 24, "Malaise": 23, "Erythema": 22, "Body temperature": 20, "Feeling abnormal": 20, "SARS-CoV-2 test": 20, "Vaccination site rash": 19, "Expired product administered": 17, "Peripheral swelling": 14, "Vomiting": 14, "Hypoaesthesia": 13, "COVID-19": 12, "Feeling hot": 12, "Lymphadenopathy": 12, "Paraesthesia": 12, "Vaccination complication": 12, "Cough": 11, "Oropharyngeal pain": 11, "Back pain": 10, "Heart rate": 10, "Illness": 10, "Injection site pain": 10, "Urticaria": 10, "Influenza like illness": 9, "Musculoskeletal stiffness": 9, "Neck pain": 9, "Product storage error": 9, "Somnolence": 9, "Tinnitus": 9, "Vaccination site induration": 9, "Abdominal discomfort": 8, "Gait disturbance": 8, "Heart rate increased": 8, "Maternal exposure during pregnancy": 8, "Rhinorrhoea": 8, "Swelling": 8, "Vaccination site mass": 8, "Ageusia": 7, "Chest pain": 7, "Decreased appetite": 7, "Hyperhidrosis": 7, "Insomnia": 7, "Palpitations": 7, "Pregnancy test": 7, "Rash erythematous": 7, "Accidental overdose": 6, "Blood pressure measurement": 6, "Feeling cold": 6, "Flushing": 6, "Mobility decreased": 6, "Product administered to patient of inappropriate age": 6, "Tenderness": 6, "Vaccination site reaction": 6, "Burning sensation": 5, "Chest discomfort": 5, "Contusion": 5, "Dyspepsia": 5, "Dysphagia": 5, "Injection site erythema": 5, "Injection site pruritus": 5, "Limb discomfort": 5, "Rash pruritic": 5, "Vertigo": 5, "Anosmia": 4, "Anxiety": 4, "Axillary pain": 4, "Blood test": 4, "Crying": 4, "Depressed mood": 4, "Hot flush": 4, "Inflammation": 4, "Injection site swelling": 4, "Injection site warmth": 4, "Lip swelling": 4, "Movement disorder": 4, "Nasopharyngitis": 4, "Product dose omission issue": 4, "Tremor": 4, "Ultrasound scan": 4, "Vaccination site movement impairment": 4, "Vision blurred": 4, "Abdominal pain": 3, "Accidental underdose": 3, "Adverse reaction": 3, "Blister": 3, "Cerebral disorder": 3, "Cerebrovascular accident": 3, "Computerised tomogram": 3, "Discomfort": 3, "Dysarthria": 3, "Dysstasia": 3, "Electrocardiogram": 3, "Epistaxis": 3, "Exposure during pregnancy": 3, "Herpes zoster": 3, "Hypersensitivity": 3, "Inappropriate schedule of product administration": 3, "Injection site rash": 3, "Magnetic resonance imaging": 3, "Mass": 3, "Muscular weakness": 3, "Nasal congestion": 3, "Night sweats": 3, "Nodule": 3, "Oxygen saturation": 3, "Presyncope": 3, "SARS-CoV-2 test positive": 3, "Swelling face": 3, "Swollen tongue": 3, "Throat tightness": 3, "Trigger finger": 3, "X-ray": 3, "Abdominal pain upper": 2, "Aphasia": 2, "Balance disorder": 2, "Bedridden": 2, "Blood count": 2, "Blood glucose": 2, "Blood glucose fluctuation": 2, "Condition aggravated": 2, "Disability": 2, "Drug ineffective": 2, "Dry mouth": 2, "Dysgeusia": 2, "Ear infection": 2, "Ear pain": 2, "Eye pain": 2, "Feeling of body temperature change": 2, "Gait inability": 2, "Haemoglobin": 2, "Hallucination": 2, "Hypersomnia": 2, "Hypotension": 2, "Incorrect route of product administration": 2, "Influenza": 2, "Injection site induration": 2, "Joint swelling": 2, "Loss of personal independence in daily activities": 2, "Migraine": 2, "Muscle spasms": 2, "Oral herpes": 2, "Osteoarthritis": 2, "Pharyngeal swelling": 2, "Sensitive skin": 2, "Sinusitis": 2, "Skin warm": 2, "Sleep deficit": 2, "Sleep disorder": 2, "Speech disorder": 2, "Syncope": 2, "Tachycardia": 2, "Throat irritation": 2, "Ultrasound foetal": 2, "Underdose": 2, "Vaccination site inflammation": 2, "Weight decreased": 2, "White blood cell count": 2, "Abnormal dreams": 1, "Abnormal sensation in eye": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Aggression": 1, "Agitation": 1, "Allergic reaction to excipient": 1, "Allergy test": 1, "Alopecia": 1, "Amnesia": 1, "Anaemia": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Aphonia": 1, "Arthritis": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Bell's palsy": 1, "Biopsy": 1, "Biopsy skin": 1, "Bite": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Body temperature abnormal": 1, "Body temperature decreased": 1, "Bradyphrenia": 1, "Breast swelling": 1, "Bronchitis": 1, "COVID-19 pneumonia": 1, "Candida infection": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Chronic left ventricular failure": 1, "Coating in mouth": 1, "Cold sweat": 1, "Concussion": 1, "Confusional state": 1, "Deafness unilateral": 1, "Delirium": 1, "Depression": 1, "Dermatitis psoriasiform": 1, "Disorientation": 1, "Dry skin": 1, "Dyschromatopsia": 1, "Dysentery": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dysuria": 1, "Eating disorder": 1, "Eczema": 1, "Endoscopy": 1, "Erythema of eyelid": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid pain": 1, "Eyelid sensory disorder": 1, "Eyelid skin dryness": 1, "Facial pain": 1, "Facial paralysis": 1, "Fall": 1, "Fear of disease": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Fluid retention": 1, "Frustration tolerance decreased": 1, "Full blood count": 1, "Full blood count abnormal": 1, "Glucose tolerance test": 1, "Haematoma": 1, "Haemophagocytic lymphohistiocytosis": 1, "Hand deformity": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate decreased": 1, "Hemiparesis": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Influenza virus test": 1, "Injection site discomfort": 1, "Injection site haemorrhage": 1, "Intentional dose omission": 1, "Intervertebral disc protrusion": 1, "Lacrimation increased": 1, "Lethargy": 1, "Lip blister": 1, "Lip injury": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Lymph node pain": 1, "Macule": 1, "Mammogram": 1, "Measles": 1, "Medical diet": 1, "Menstrual disorder": 1, "Micturition urgency": 1, "Muscle spasticity": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Nasal discomfort": 1, "Nasal dryness": 1, "Nerve injury": 1, "Neuralgia": 1, "No adverse event": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Odynophagia": 1, "Off label use": 1, "Ophthalmic migraine": 1, "Oral discomfort": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Papule": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Peripheral coldness": 1, "Peripheral nerve neurostimulation": 1, "Pharyngeal erythema": 1, "Photopsia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Platelet disorder": 1, "Pleurisy": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Poor quality sleep": 1, "Product colour issue": 1, "Productive cough": 1, "Pulmonary embolism": 1, "Rash macular": 1, "Red blood cell count": 1, "Respiratory tract congestion": 1, "Retinal haemorrhage": 1, "Retinal vascular occlusion": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test negative": 1, "Sciatica": 1, "Scratch": 1, "Secretion discharge": 1, "Sinus congestion": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin irritation": 1, "Skin mass": 1, "Slow speech": 1, "Spinal pain": 1, "Stupor": 1, "Sudden hearing loss": 1, "Taste disorder": 1, "Thirst": 1, "Tongue disorder": 1, "Tooth abscess": 1, "Trichoglossia": 1, "Ulcer haemorrhage": 1, "Urinary tract infection": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site eczema": 1, "Vaccination site haemorrhage": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site urticaria": 1, "Visual impairment": 1, "Walking aid user": 1, "Wound": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20A", "histograms": [{"histogram": {"Headache": 93, "Fatigue": 92, "Pain in extremity": 88, "Pyrexia": 73, "Chills": 66, "Vaccination site pain": 62, "Myalgia": 56, "Vaccination site erythema": 45, "Pain": 43, "Arthralgia": 38, "Nausea": 36, "Rash": 34, "Vaccination site pruritus": 31, "Dizziness": 30, "Pruritus": 28, "Dyspnoea": 26, "Product temperature excursion issue": 26, "Vaccination site warmth": 26, "Asthenia": 25, "Poor quality product administered": 25, "Vaccination site swelling": 25, "Diarrhoea": 24, "Malaise": 23, "Erythema": 22, "Body temperature": 20, "Feeling abnormal": 20, "SARS-CoV-2 test": 20, "Vaccination site rash": 19, "Expired product administered": 17, "Peripheral swelling": 14, "Vomiting": 14, "Hypoaesthesia": 13, "COVID-19": 12, "Feeling hot": 12, "Lymphadenopathy": 12, "Paraesthesia": 12, "Vaccination complication": 12, "Cough": 11, "Oropharyngeal pain": 11, "Back pain": 10, "Heart rate": 10, "Illness": 10, "Injection site pain": 10, "Urticaria": 10, "Influenza like illness": 9, "Musculoskeletal stiffness": 9, "Neck pain": 9, "Product storage error": 9, "Somnolence": 9, "Tinnitus": 9, "Vaccination site induration": 9, "Abdominal discomfort": 8, "Gait disturbance": 8, "Heart rate increased": 8, "Maternal exposure during pregnancy": 8, "Rhinorrhoea": 8, "Swelling": 8, "Vaccination site mass": 8, "Ageusia": 7, "Chest pain": 7, "Decreased appetite": 7, "Hyperhidrosis": 7, "Insomnia": 7, "Palpitations": 7, "Pregnancy test": 7, "Rash erythematous": 7, "Accidental overdose": 6, "Blood pressure measurement": 6, "Feeling cold": 6, "Flushing": 6, "Mobility decreased": 6, "Product administered to patient of inappropriate age": 6, "Tenderness": 6, "Vaccination site reaction": 6, "Burning sensation": 5, "Chest discomfort": 5, "Contusion": 5, "Dyspepsia": 5, "Dysphagia": 5, "Injection site erythema": 5, "Injection site pruritus": 5, "Limb discomfort": 5, "Rash pruritic": 5, "Vertigo": 5, "Anosmia": 4, "Anxiety": 4, "Axillary pain": 4, "Blood test": 4, "Crying": 4, "Depressed mood": 4, "Hot flush": 4, "Inflammation": 4, "Injection site swelling": 4, "Injection site warmth": 4, "Lip swelling": 4, "Movement disorder": 4, "Nasopharyngitis": 4, "Product dose omission issue": 4, "Tremor": 4, "Ultrasound scan": 4, "Vaccination site movement impairment": 4, "Vision blurred": 4, "Abdominal pain": 3, "Accidental underdose": 3, "Adverse reaction": 3, "Blister": 3, "Cerebral disorder": 3, "Cerebrovascular accident": 3, "Computerised tomogram": 3, "Discomfort": 3, "Dysarthria": 3, "Dysstasia": 3, "Electrocardiogram": 3, "Epistaxis": 3, "Exposure during pregnancy": 3, "Herpes zoster": 3, "Hypersensitivity": 3, "Inappropriate schedule of product administration": 3, "Injection site rash": 3, "Magnetic resonance imaging": 3, "Mass": 3, "Muscular weakness": 3, "Nasal congestion": 3, "Night sweats": 3, "Nodule": 3, "Oxygen saturation": 3, "Presyncope": 3, "SARS-CoV-2 test positive": 3, "Swelling face": 3, "Swollen tongue": 3, "Throat tightness": 3, "Trigger finger": 3, "X-ray": 3, "Abdominal pain upper": 2, "Aphasia": 2, "Balance disorder": 2, "Bedridden": 2, "Blood count": 2, "Blood glucose": 2, "Blood glucose fluctuation": 2, "Condition aggravated": 2, "Disability": 2, "Drug ineffective": 2, "Dry mouth": 2, "Dysgeusia": 2, "Ear infection": 2, "Ear pain": 2, "Eye pain": 2, "Feeling of body temperature change": 2, "Gait inability": 2, "Haemoglobin": 2, "Hallucination": 2, "Hypersomnia": 2, "Hypotension": 2, "Incorrect route of product administration": 2, "Influenza": 2, "Injection site induration": 2, "Joint swelling": 2, "Loss of personal independence in daily activities": 2, "Migraine": 2, "Muscle spasms": 2, "Oral herpes": 2, "Osteoarthritis": 2, "Pharyngeal swelling": 2, "Sensitive skin": 2, "Sinusitis": 2, "Skin warm": 2, "Sleep deficit": 2, "Sleep disorder": 2, "Speech disorder": 2, "Syncope": 2, "Tachycardia": 2, "Throat irritation": 2, "Ultrasound foetal": 2, "Underdose": 2, "Vaccination site inflammation": 2, "Weight decreased": 2, "White blood cell count": 2, "Abnormal dreams": 1, "Abnormal sensation in eye": 1, "Acne": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Aggression": 1, "Agitation": 1, "Allergic reaction to excipient": 1, "Allergy test": 1, "Alopecia": 1, "Amnesia": 1, "Anaemia": 1, "Angioedema": 1, "Angiogram": 1, "Antibody test": 1, "Aphonia": 1, "Arthritis": 1, "Ataxia": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Bell's palsy": 1, "Biopsy": 1, "Biopsy skin": 1, "Bite": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood pressure increased": 1, "Body temperature abnormal": 1, "Body temperature decreased": 1, "Bradyphrenia": 1, "Breast swelling": 1, "Bronchitis": 1, "COVID-19 pneumonia": 1, "Candida infection": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Chronic left ventricular failure": 1, "Coating in mouth": 1, "Cold sweat": 1, "Concussion": 1, "Confusional state": 1, "Deafness unilateral": 1, "Delirium": 1, "Depression": 1, "Dermatitis psoriasiform": 1, "Disorientation": 1, "Dry skin": 1, "Dyschromatopsia": 1, "Dysentery": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dysuria": 1, "Eating disorder": 1, "Eczema": 1, "Endoscopy": 1, "Erythema of eyelid": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Eye irritation": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid pain": 1, "Eyelid sensory disorder": 1, "Eyelid skin dryness": 1, "Facial pain": 1, "Facial paralysis": 1, "Fall": 1, "Fear of disease": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Fluid retention": 1, "Frustration tolerance decreased": 1, "Full blood count": 1, "Full blood count abnormal": 1, "Glucose tolerance test": 1, "Haematoma": 1, "Haemophagocytic lymphohistiocytosis": 1, "Hand deformity": 1, "Head discomfort": 1, "Head injury": 1, "Heart rate decreased": 1, "Hemiparesis": 1, "Hypertension": 1, "Hyperventilation": 1, "Hypoaesthesia oral": 1, "Hypothermia": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Influenza virus test": 1, "Injection site discomfort": 1, "Injection site haemorrhage": 1, "Intentional dose omission": 1, "Intervertebral disc protrusion": 1, "Lacrimation increased": 1, "Lethargy": 1, "Lip blister": 1, "Lip injury": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Lymph node pain": 1, "Macule": 1, "Mammogram": 1, "Measles": 1, "Medical diet": 1, "Menstrual disorder": 1, "Micturition urgency": 1, "Muscle spasticity": 1, "Muscle tightness": 1, "Musculoskeletal discomfort": 1, "Nasal discomfort": 1, "Nasal dryness": 1, "Nerve injury": 1, "Neuralgia": 1, "No adverse event": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Odynophagia": 1, "Off label use": 1, "Ophthalmic migraine": 1, "Oral discomfort": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Papule": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Peripheral coldness": 1, "Peripheral nerve neurostimulation": 1, "Pharyngeal erythema": 1, "Photopsia": 1, "Platelet count": 1, "Platelet count decreased": 1, "Platelet disorder": 1, "Pleurisy": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Poor quality sleep": 1, "Product colour issue": 1, "Productive cough": 1, "Pulmonary embolism": 1, "Rash macular": 1, "Red blood cell count": 1, "Respiratory tract congestion": 1, "Retinal haemorrhage": 1, "Retinal vascular occlusion": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test negative": 1, "Sciatica": 1, "Scratch": 1, "Secretion discharge": 1, "Sinus congestion": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin exfoliation": 1, "Skin irritation": 1, "Skin mass": 1, "Slow speech": 1, "Spinal pain": 1, "Stupor": 1, "Sudden hearing loss": 1, "Taste disorder": 1, "Thirst": 1, "Tongue disorder": 1, "Tooth abscess": 1, "Trichoglossia": 1, "Ulcer haemorrhage": 1, "Urinary tract infection": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site eczema": 1, "Vaccination site haemorrhage": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site urticaria": 1, "Visual impairment": 1, "Walking aid user": 1, "Wound": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["016M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M20H.json b/docs/data/histograms/United States/016M20H.json
index 59913551f75..a287233a865 100644
--- a/docs/data/histograms/United States/016M20H.json
+++ b/docs/data/histograms/United States/016M20H.json
@@ -1 +1 @@
-{"batchcode": "016M20H", "histograms": [{"batchcodes": ["016M20H"], "histogram": {"Ageusia": 2, "Anosmia": 2, "Dysgeusia": 2, "Urticaria": 2, "Chills": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Pruritus": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20H", "histograms": [{"histogram": {"Ageusia": 2, "Anosmia": 2, "Dysgeusia": 2, "Urticaria": 2, "Chills": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Pruritus": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination complication": 1}, "batchcodes": ["016M20H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M20V.json b/docs/data/histograms/United States/016M20V.json
index 70754a6d625..8ba52d632d9 100644
--- a/docs/data/histograms/United States/016M20V.json
+++ b/docs/data/histograms/United States/016M20V.json
@@ -1 +1 @@
-{"batchcode": "016M20V", "histograms": [{"batchcodes": ["016M20V"], "histogram": {"Erythema": 1, "Feeling hot": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "016M20V", "histograms": [{"histogram": {"Erythema": 1, "Feeling hot": 1, "Pruritus": 1}, "batchcodes": ["016M20V"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M21A.json b/docs/data/histograms/United States/016M21A.json
index 7d648761792..e202517570e 100644
--- a/docs/data/histograms/United States/016M21A.json
+++ b/docs/data/histograms/United States/016M21A.json
@@ -1 +1 @@
-{"batchcode": "016M21A", "histograms": [{"batchcodes": ["016M21A"], "histogram": {"Dizziness": 2, "Dyspnoea": 2, "Fatigue": 2, "Blood pressure measurement": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Pneumonitis": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site rash": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "016M21A", "histograms": [{"histogram": {"Dizziness": 2, "Dyspnoea": 2, "Fatigue": 2, "Blood pressure measurement": 1, "Chest pain": 1, "Chills": 1, "Cough": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Oxygen saturation": 1, "Peripheral swelling": 1, "Pneumonitis": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site rash": 1, "Vertigo": 1}, "batchcodes": ["016M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M2CA.json b/docs/data/histograms/United States/016M2CA.json
index 848f7497ab2..b061e86650e 100644
--- a/docs/data/histograms/United States/016M2CA.json
+++ b/docs/data/histograms/United States/016M2CA.json
@@ -1 +1 @@
-{"batchcode": "016M2CA", "histograms": [{"batchcodes": ["016M2CA"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "016M2CA", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["016M2CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M2UA.json b/docs/data/histograms/United States/016M2UA.json
index 3ed37c1e384..0d1db2ddf61 100644
--- a/docs/data/histograms/United States/016M2UA.json
+++ b/docs/data/histograms/United States/016M2UA.json
@@ -1 +1 @@
-{"batchcode": "016M2UA", "histograms": [{"batchcodes": ["016M2UA"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "016M2UA", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1, "Urinary tract infection": 1}, "batchcodes": ["016M2UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016M70A.json b/docs/data/histograms/United States/016M70A.json
index 0cd9f445939..8cba5b78c69 100644
--- a/docs/data/histograms/United States/016M70A.json
+++ b/docs/data/histograms/United States/016M70A.json
@@ -1 +1 @@
-{"batchcode": "016M70A", "histograms": [{"batchcodes": ["016M70A"], "histogram": {"Blood test": 1, "Dry mouth": 1, "Dysgeusia": 1}}]}
\ No newline at end of file
+{"batchcode": "016M70A", "histograms": [{"histogram": {"Blood test": 1, "Dry mouth": 1, "Dysgeusia": 1}, "batchcodes": ["016M70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016MZ(OR2)0A.json b/docs/data/histograms/United States/016MZ(OR2)0A.json
index 9fafd268188..227e0910556 100644
--- a/docs/data/histograms/United States/016MZ(OR2)0A.json
+++ b/docs/data/histograms/United States/016MZ(OR2)0A.json
@@ -1 +1 @@
-{"batchcode": "016MZ(OR2)0A", "histograms": [{"batchcodes": ["016MZ(OR2)0A"], "histogram": {"Feeling abnormal": 1, "Feeling cold": 1, "Limb discomfort": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "016MZ(OR2)0A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Feeling cold": 1, "Limb discomfort": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Tremor": 1}, "batchcodes": ["016MZ(OR2)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016MZ0A.json b/docs/data/histograms/United States/016MZ0A.json
index 138bb94f6a8..7461176eb6b 100644
--- a/docs/data/histograms/United States/016MZ0A.json
+++ b/docs/data/histograms/United States/016MZ0A.json
@@ -1 +1 @@
-{"batchcode": "016MZ0A", "histograms": [{"batchcodes": ["016MZ0A"], "histogram": {"Headache": 2, "Lymphadenopathy": 2, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Hypoacusis": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "016MZ0A", "histograms": [{"histogram": {"Headache": 2, "Lymphadenopathy": 2, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Hypoacusis": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urticaria": 1}, "batchcodes": ["016MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016MZ0M.json b/docs/data/histograms/United States/016MZ0M.json
index e3ff68c6bda..0fa04d4a699 100644
--- a/docs/data/histograms/United States/016MZ0M.json
+++ b/docs/data/histograms/United States/016MZ0M.json
@@ -1 +1 @@
-{"batchcode": "016MZ0M", "histograms": [{"batchcodes": ["016MZ0M"], "histogram": {"Overweight": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "SARS-CoV-2 test": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "016MZ0M", "histograms": [{"histogram": {"Overweight": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "SARS-CoV-2 test": 1, "Vaccination complication": 1}, "batchcodes": ["016MZ0M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016N20A - 016M2.json b/docs/data/histograms/United States/016N20A - 016M2.json
index a8505bd1e52..40191218bbc 100644
--- a/docs/data/histograms/United States/016N20A - 016M2.json
+++ b/docs/data/histograms/United States/016N20A - 016M2.json
@@ -1 +1 @@
-{"batchcode": "016N20A - 016M2", "histograms": [{"batchcodes": ["016N20A - 016M2"], "histogram": {"Erythema": 1, "Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "016N20A - 016M2", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["016N20A - 016M2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016N20A.json b/docs/data/histograms/United States/016N20A.json
index d0d7ad78abe..ef9e5a5e76d 100644
--- a/docs/data/histograms/United States/016N20A.json
+++ b/docs/data/histograms/United States/016N20A.json
@@ -1 +1 @@
-{"batchcode": "016N20A", "histograms": [{"batchcodes": ["016N20A"], "histogram": {"Arthralgia": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "016N20A", "histograms": [{"histogram": {"Arthralgia": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["016N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016R21A.json b/docs/data/histograms/United States/016R21A.json
index c33ea83ad55..aec9205d840 100644
--- a/docs/data/histograms/United States/016R21A.json
+++ b/docs/data/histograms/United States/016R21A.json
@@ -1 +1 @@
-{"batchcode": "016R21A", "histograms": [{"batchcodes": ["016R21A"], "histogram": {"Aphonia": 1, "Extrasystoles": 1, "Illness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "016R21A", "histograms": [{"histogram": {"Aphonia": 1, "Extrasystoles": 1, "Illness": 1, "Malaise": 1}, "batchcodes": ["016R21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016S21-29.json b/docs/data/histograms/United States/016S21-29.json
index 4370a0daede..fd93f0bdeb0 100644
--- a/docs/data/histograms/United States/016S21-29.json
+++ b/docs/data/histograms/United States/016S21-29.json
@@ -1 +1 @@
-{"batchcode": "016S21-29", "histograms": [{"batchcodes": ["016S21-29"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "016S21-29", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["016S21-29"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016T21A.json b/docs/data/histograms/United States/016T21A.json
index 7af2e57aa28..46ec619bb48 100644
--- a/docs/data/histograms/United States/016T21A.json
+++ b/docs/data/histograms/United States/016T21A.json
@@ -1 +1 @@
-{"batchcode": "016T21A", "histograms": [{"batchcodes": ["016T21A"], "histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Dry mouth": 1, "Erythema": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Injection site pain": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "016T21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Dry mouth": 1, "Erythema": 1, "Eyelid ptosis": 1, "Fatigue": 1, "Headache": 1, "Hypersensitivity": 1, "Injection site pain": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["016T21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/016ZMOA.json b/docs/data/histograms/United States/016ZMOA.json
index 4df790fe8c6..fbeeeee69ad 100644
--- a/docs/data/histograms/United States/016ZMOA.json
+++ b/docs/data/histograms/United States/016ZMOA.json
@@ -1 +1 @@
-{"batchcode": "016ZMOA", "histograms": [{"batchcodes": ["016ZMOA"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dyskinesia": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Memory impairment": 1, "Pain": 1, "Pain in jaw": 1, "Transient ischaemic attack": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "016ZMOA", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dyskinesia": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Memory impairment": 1, "Pain": 1, "Pain in jaw": 1, "Transient ischaemic attack": 1, "Tremor": 1}, "batchcodes": ["016ZMOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017121.json b/docs/data/histograms/United States/017121.json
index 8d090b54215..db937f0f4a0 100644
--- a/docs/data/histograms/United States/017121.json
+++ b/docs/data/histograms/United States/017121.json
@@ -1 +1 @@
-{"batchcode": "017121", "histograms": [{"batchcodes": ["017121"], "histogram": {"Arthralgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "017121", "histograms": [{"histogram": {"Arthralgia": 1, "Pyrexia": 1}, "batchcodes": ["017121"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0171321A.json b/docs/data/histograms/United States/0171321A.json
index 08d08505e73..f0f5724ba0a 100644
--- a/docs/data/histograms/United States/0171321A.json
+++ b/docs/data/histograms/United States/0171321A.json
@@ -1 +1 @@
-{"batchcode": "0171321A", "histograms": [{"batchcodes": ["0171321A"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "0171321A", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["0171321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0171B21A.json b/docs/data/histograms/United States/0171B21A.json
index 4a4191b3bcd..80dc05f7ca4 100644
--- a/docs/data/histograms/United States/0171B21A.json
+++ b/docs/data/histograms/United States/0171B21A.json
@@ -1 +1 @@
-{"batchcode": "0171B21A", "histograms": [{"batchcodes": ["0171B21A"], "histogram": {"Cough": 1, "Fungal infection": 1, "Hypertonic bladder": 1, "Renal impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "0171B21A", "histograms": [{"histogram": {"Cough": 1, "Fungal infection": 1, "Hypertonic bladder": 1, "Renal impairment": 1}, "batchcodes": ["0171B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0171F21A.json b/docs/data/histograms/United States/0171F21A.json
index 81a4f4113aa..a0557a5d305 100644
--- a/docs/data/histograms/United States/0171F21A.json
+++ b/docs/data/histograms/United States/0171F21A.json
@@ -1 +1 @@
-{"batchcode": "0171F21A", "histograms": [{"batchcodes": ["0171F21A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "0171F21A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["0171F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0172.json b/docs/data/histograms/United States/0172.json
index 2e6b37244d5..8ce86d3ce3c 100644
--- a/docs/data/histograms/United States/0172.json
+++ b/docs/data/histograms/United States/0172.json
@@ -1 +1 @@
-{"batchcode": "0172", "histograms": [{"batchcodes": ["0172"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0172", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["0172"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01721.json b/docs/data/histograms/United States/01721.json
index 0c8b1c984ad..ff39dea40cf 100644
--- a/docs/data/histograms/United States/01721.json
+++ b/docs/data/histograms/United States/01721.json
@@ -1 +1 @@
-{"batchcode": "01721", "histograms": [{"batchcodes": ["01721"], "histogram": {"Arthralgia": 1}}]}
\ No newline at end of file
+{"batchcode": "01721", "histograms": [{"histogram": {"Arthralgia": 1}, "batchcodes": ["01721"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01721A.json b/docs/data/histograms/United States/01721A.json
index 3085a2ff267..35dd4b8eeea 100644
--- a/docs/data/histograms/United States/01721A.json
+++ b/docs/data/histograms/United States/01721A.json
@@ -1 +1 @@
-{"batchcode": "01721A", "histograms": [{"batchcodes": ["01721A"], "histogram": {"Erythema of eyelid": 1, "Eye pruritus": 1, "Flushing": 1, "Ocular hyperaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "01721A", "histograms": [{"histogram": {"Erythema of eyelid": 1, "Eye pruritus": 1, "Flushing": 1, "Ocular hyperaemia": 1}, "batchcodes": ["01721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0175.json b/docs/data/histograms/United States/0175.json
index af5b8008057..94ec8c3991b 100644
--- a/docs/data/histograms/United States/0175.json
+++ b/docs/data/histograms/United States/0175.json
@@ -1 +1 @@
-{"batchcode": "0175", "histograms": [{"batchcodes": ["0175"], "histogram": {"Asthenia": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Discomfort": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "0175", "histograms": [{"histogram": {"Asthenia": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Discomfort": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate abnormal": 1}, "batchcodes": ["0175"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017621B.json b/docs/data/histograms/United States/017621B.json
index e1e0667d8eb..ab1fd66efbc 100644
--- a/docs/data/histograms/United States/017621B.json
+++ b/docs/data/histograms/United States/017621B.json
@@ -1 +1 @@
-{"batchcode": "017621B", "histograms": [{"batchcodes": ["017621B"], "histogram": {"Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "017621B", "histograms": [{"histogram": {"Pyrexia": 1, "Rash": 1}, "batchcodes": ["017621B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017821A.json b/docs/data/histograms/United States/017821A.json
index ccab1e59aa9..21cf56f0f13 100644
--- a/docs/data/histograms/United States/017821A.json
+++ b/docs/data/histograms/United States/017821A.json
@@ -1 +1 @@
-{"batchcode": "017821A", "histograms": [{"batchcodes": ["017821A"], "histogram": {"Feeling abnormal": 2, "Abdominal distension": 1, "Adverse drug reaction": 1, "Ageusia": 1, "Anosmia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "COVID-19": 1, "Contusion": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Eating disorder": 1, "Headache": 1, "Inflammation": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Joint swelling": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Nausea": 1, "Peripheral swelling": 1, "Polymerase chain reaction positive": 1, "Rhinorrhoea": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Varicose vein": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "017821A", "histograms": [{"histogram": {"Feeling abnormal": 2, "Abdominal distension": 1, "Adverse drug reaction": 1, "Ageusia": 1, "Anosmia": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Burning sensation": 1, "COVID-19": 1, "Contusion": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Eating disorder": 1, "Headache": 1, "Inflammation": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Joint swelling": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Nausea": 1, "Peripheral swelling": 1, "Polymerase chain reaction positive": 1, "Rhinorrhoea": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Varicose vein": 1, "Vomiting": 1}, "batchcodes": ["017821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0178B21A.json b/docs/data/histograms/United States/0178B21A.json
index af4bc49e221..1eb588f866e 100644
--- a/docs/data/histograms/United States/0178B21A.json
+++ b/docs/data/histograms/United States/0178B21A.json
@@ -1 +1 @@
-{"batchcode": "0178B21A", "histograms": [{"batchcodes": ["0178B21A"], "histogram": {"Abdominal discomfort": 1, "Arthralgia": 1, "Headache": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0178B21A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Arthralgia": 1, "Headache": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["0178B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0178H22A.json b/docs/data/histograms/United States/0178H22A.json
index 565727c2e1a..8ad24da1a43 100644
--- a/docs/data/histograms/United States/0178H22A.json
+++ b/docs/data/histograms/United States/0178H22A.json
@@ -1 +1 @@
-{"batchcode": "0178H22A", "histograms": [{"batchcodes": ["0178H22A"], "histogram": {"No adverse event": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "0178H22A", "histograms": [{"histogram": {"No adverse event": 1, "Wrong product administered": 1}, "batchcodes": ["0178H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017A21A.json b/docs/data/histograms/United States/017A21A.json
index e4a251d1b04..dd897dcc263 100644
--- a/docs/data/histograms/United States/017A21A.json
+++ b/docs/data/histograms/United States/017A21A.json
@@ -1 +1 @@
-{"batchcode": "017A21A", "histograms": [{"batchcodes": ["017A21A"], "histogram": {"Arthralgia": 1, "Burning sensation": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Nervousness": 1, "Pain": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Urticaria": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "017A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Burning sensation": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Heart rate": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Nervousness": 1, "Pain": 1, "Paraesthesia": 1, "Pyrexia": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Urticaria": 1, "Vertigo": 1}, "batchcodes": ["017A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B211A.json b/docs/data/histograms/United States/017B211A.json
index a444a213e33..424abaab630 100644
--- a/docs/data/histograms/United States/017B211A.json
+++ b/docs/data/histograms/United States/017B211A.json
@@ -1 +1 @@
-{"batchcode": "017B211A", "histograms": [{"batchcodes": ["017B211A"], "histogram": {"Blood pressure increased": 2, "Computerised tomogram": 2, "Dizziness": 2, "Headache": 2, "Magnetic resonance imaging": 2, "Vision blurred": 2, "Blood pressure measurement": 1, "Dyspnoea": 1, "Erythema": 1, "Joint swelling": 1, "Photopsia": 1, "Swelling": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "017B211A", "histograms": [{"histogram": {"Blood pressure increased": 2, "Computerised tomogram": 2, "Dizziness": 2, "Headache": 2, "Magnetic resonance imaging": 2, "Vision blurred": 2, "Blood pressure measurement": 1, "Dyspnoea": 1, "Erythema": 1, "Joint swelling": 1, "Photopsia": 1, "Swelling": 1, "Weight decreased": 1}, "batchcodes": ["017B211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B214.json b/docs/data/histograms/United States/017B214.json
index 477b223e0e8..b67b5552996 100644
--- a/docs/data/histograms/United States/017B214.json
+++ b/docs/data/histograms/United States/017B214.json
@@ -1 +1 @@
-{"batchcode": "017B214", "histograms": [{"batchcodes": ["017B214"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "017B214", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["017B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B21A-0ED9142.json b/docs/data/histograms/United States/017B21A-0ED9142.json
index 652f1db0288..c256f80a849 100644
--- a/docs/data/histograms/United States/017B21A-0ED9142.json
+++ b/docs/data/histograms/United States/017B21A-0ED9142.json
@@ -1 +1 @@
-{"batchcode": "017B21A-0ED9142", "histograms": [{"batchcodes": ["017B21A-0ED9142"], "histogram": {"Influenza like illness": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "017B21A-0ED9142", "histograms": [{"histogram": {"Influenza like illness": 1, "Oropharyngeal pain": 1}, "batchcodes": ["017B21A-0ED9142"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B21A.json b/docs/data/histograms/United States/017B21A.json
index b4e2869b9a0..c35ab1e0b0b 100644
--- a/docs/data/histograms/United States/017B21A.json
+++ b/docs/data/histograms/United States/017B21A.json
@@ -1 +1 @@
-{"batchcode": "017B21A", "histograms": [{"batchcodes": ["017B21A"], "histogram": {"Headache": 55, "Pain in extremity": 49, "Fatigue": 45, "Vaccination site pain": 45, "Pyrexia": 43, "Chills": 34, "Myalgia": 33, "Nausea": 30, "Pain": 29, "Vaccination site erythema": 22, "Dizziness": 21, "Arthralgia": 20, "Pruritus": 20, "Product dose omission issue": 19, "Peripheral swelling": 16, "Hypoaesthesia": 15, "Vaccination site swelling": 15, "Vomiting": 15, "Dyspnoea": 14, "Rash": 14, "Vaccination site warmth": 14, "Vaccination site pruritus": 13, "Body temperature": 12, "Diarrhoea": 11, "Feeling abnormal": 11, "Swelling": 10, "Urticaria": 10, "Vaccination site rash": 10, "Asthenia": 9, "Back pain": 9, "Expired product administered": 9, "Oropharyngeal pain": 9, "COVID-19": 8, "Cough": 8, "Erythema": 8, "Feeling hot": 8, "Inappropriate schedule of product administration": 7, "Paraesthesia": 7, "Product administered to patient of inappropriate age": 7, "SARS-CoV-2 test": 7, "Somnolence": 7, "Vaccination site reaction": 7, "Abdominal pain upper": 6, "Blood pressure measurement": 6, "Neck pain": 6, "Accidental overdose": 5, "Burning sensation": 5, "Feeling cold": 5, "Lymphadenopathy": 5, "Malaise": 5, "Rash macular": 5, "Rhinorrhoea": 5, "Swelling face": 5, "Tinnitus": 5, "Underdose": 5, "Chest pain": 4, "Condition aggravated": 4, "Contusion": 4, "Decreased appetite": 4, "Heart rate": 4, "Hypertension": 4, "Illness": 4, "Injection site swelling": 4, "Limb discomfort": 4, "Migraine": 4, "Nasal congestion": 4, "Palpitations": 4, "Presyncope": 4, "SARS-CoV-2 test positive": 4, "Skin disorder": 4, "Vaccination complication": 4, "Vaccination site induration": 4, "Abdominal discomfort": 3, "Accidental underdose": 3, "Balance disorder": 3, "Blister": 3, "Cerebrovascular accident": 3, "Chest discomfort": 3, "Dry mouth": 3, "Epistaxis": 3, "Eye pain": 3, "Eye swelling": 3, "Heart rate increased": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypersomnia": 3, "Incorrect dose administered": 3, "Influenza like illness": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Ocular hyperaemia": 3, "Oral discomfort": 3, "Product storage error": 3, "Rash erythematous": 3, "Taste disorder": 3, "Thrombosis": 3, "Tremor": 3, "Vaccination site movement impairment": 3, "Vertigo": 3, "Abdominal distension": 2, "Acne": 2, "Ageusia": 2, "Alopecia": 2, "Anosmia": 2, "Bell's palsy": 2, "Blood glucose": 2, "Blood pressure increased": 2, "Bone pain": 2, "Diplopia": 2, "Discomfort": 2, "Dry eye": 2, "Dysgeusia": 2, "Dysphagia": 2, "Electrocardiogram": 2, "Eye discharge": 2, "Eye irritation": 2, "Flatulence": 2, "Flushing": 2, "Gait disturbance": 2, "Herpes simplex": 2, "Hypoaesthesia oral": 2, "Incorrect route of product administration": 2, "Induration": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Injection site warmth": 2, "Intentional product use issue": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Lethargy": 2, "Lip swelling": 2, "Maternal exposure during pregnancy": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Myocardial infarction": 2, "Oral pain": 2, "Peripheral coldness": 2, "Scratch": 2, "Skin discolouration": 2, "Sneezing": 2, "Speech disorder": 2, "Sputum discoloured": 2, "Tachycardia": 2, "Therapeutic response unexpected": 2, "Ultrasound scan": 2, "Vaccination site irritation": 2, "Vaccination site nodule": 2, "Vision blurred": 2, "Abdominal pain lower": 1, "Abnormal faeces": 1, "Abnormal sensation in eye": 1, "Adverse event": 1, "Allergy test": 1, "Anticoagulant therapy": 1, "Anxiety": 1, "Aphasia": 1, "Arachnoid cyst": 1, "Arteriosclerosis": 1, "Arthritis reactive": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Blood urine present": 1, "Body temperature increased": 1, "Breast inflammation": 1, "Breast mass": 1, "Breast pain": 1, "Bronchitis": 1, "Calcium ionised": 1, "Cardiac disorder": 1, "Chapped lips": 1, "Chest X-ray": 1, "Cold burn": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Cystitis interstitial": 1, "Deafness": 1, "Depressed level of consciousness": 1, "Depression": 1, "Disability": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear infection": 1, "Eating disorder": 1, "Echocardiogram": 1, "Exposure during pregnancy": 1, "Eye colour change": 1, "Eye disorder": 1, "Eyelid irritation": 1, "Facial pain": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Feeling of relaxation": 1, "Full blood count": 1, "Gait inability": 1, "General physical health deterioration": 1, "Gingival swelling": 1, "Glossodynia": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Haematocrit": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hunger": 1, "Hypersensitivity pneumonitis": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hypotension": 1, "Incontinence": 1, "Infection": 1, "Inflammation": 1, "Injection site pain": 1, "Interstitial lung disease": 1, "Irritable bowel syndrome": 1, "Joint dislocation": 1, "Joint hyperextension": 1, "Lacrimation increased": 1, "Lip disorder": 1, "Lip haemorrhage": 1, "Localised oedema": 1, "Loss of personal independence in daily activities": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Mechanical urticaria": 1, "Mental impairment": 1, "Metabolic acidosis": 1, "Micturition disorder": 1, "Micturition urgency": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Night sweats": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmic herpes simplex": 1, "Optic nerve disorder": 1, "Oral herpes": 1, "Orbital swelling": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pallor": 1, "Parosmia": 1, "Periarthritis": 1, "Pharyngeal paraesthesia": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Post procedural complication": 1, "Product availability issue": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pulmonary granuloma": 1, "Purpura": 1, "Quadriplegia": 1, "Rash pruritic": 1, "Renal pain": 1, "Respiratory failure": 1, "Rhinalgia": 1, "Rib fracture": 1, "Rosacea": 1, "Seizure": 1, "Shoulder injury related to vaccine administration": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin hypertrophy": 1, "Skin lesion": 1, "Skin swelling": 1, "Skin warm": 1, "Spider vein": 1, "Spinal operation": 1, "Spinal pain": 1, "Staphylococcal infection": 1, "Staphylococcus test": 1, "Stomatitis": 1, "Streptococcus test": 1, "Superficial vein prominence": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Tenderness": 1, "Thirst": 1, "Throat irritation": 1, "Tinea infection": 1, "Tongue discolouration": 1, "Transfusion": 1, "Ultrasound antenatal screen": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Vaccination site bruising": 1, "Vaccination site coldness": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Varicose vein": 1, "Visual impairment": 1, "Weight decreased": 1, "Wound": 1, "Wound haemorrhage": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "017B21A", "histograms": [{"histogram": {"Headache": 55, "Pain in extremity": 49, "Fatigue": 45, "Vaccination site pain": 45, "Pyrexia": 43, "Chills": 34, "Myalgia": 33, "Nausea": 30, "Pain": 29, "Vaccination site erythema": 22, "Dizziness": 21, "Arthralgia": 20, "Pruritus": 20, "Product dose omission issue": 19, "Peripheral swelling": 16, "Hypoaesthesia": 15, "Vaccination site swelling": 15, "Vomiting": 15, "Dyspnoea": 14, "Rash": 14, "Vaccination site warmth": 14, "Vaccination site pruritus": 13, "Body temperature": 12, "Diarrhoea": 11, "Feeling abnormal": 11, "Swelling": 10, "Urticaria": 10, "Vaccination site rash": 10, "Asthenia": 9, "Back pain": 9, "Expired product administered": 9, "Oropharyngeal pain": 9, "COVID-19": 8, "Cough": 8, "Erythema": 8, "Feeling hot": 8, "Inappropriate schedule of product administration": 7, "Paraesthesia": 7, "Product administered to patient of inappropriate age": 7, "SARS-CoV-2 test": 7, "Somnolence": 7, "Vaccination site reaction": 7, "Abdominal pain upper": 6, "Blood pressure measurement": 6, "Neck pain": 6, "Accidental overdose": 5, "Burning sensation": 5, "Feeling cold": 5, "Lymphadenopathy": 5, "Malaise": 5, "Rash macular": 5, "Rhinorrhoea": 5, "Swelling face": 5, "Tinnitus": 5, "Underdose": 5, "Chest pain": 4, "Condition aggravated": 4, "Contusion": 4, "Decreased appetite": 4, "Heart rate": 4, "Hypertension": 4, "Illness": 4, "Injection site swelling": 4, "Limb discomfort": 4, "Migraine": 4, "Nasal congestion": 4, "Palpitations": 4, "Presyncope": 4, "SARS-CoV-2 test positive": 4, "Skin disorder": 4, "Vaccination complication": 4, "Vaccination site induration": 4, "Abdominal discomfort": 3, "Accidental underdose": 3, "Balance disorder": 3, "Blister": 3, "Cerebrovascular accident": 3, "Chest discomfort": 3, "Dry mouth": 3, "Epistaxis": 3, "Eye pain": 3, "Eye swelling": 3, "Heart rate increased": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypersomnia": 3, "Incorrect dose administered": 3, "Influenza like illness": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Ocular hyperaemia": 3, "Oral discomfort": 3, "Product storage error": 3, "Rash erythematous": 3, "Taste disorder": 3, "Thrombosis": 3, "Tremor": 3, "Vaccination site movement impairment": 3, "Vertigo": 3, "Abdominal distension": 2, "Acne": 2, "Ageusia": 2, "Alopecia": 2, "Anosmia": 2, "Bell's palsy": 2, "Blood glucose": 2, "Blood pressure increased": 2, "Bone pain": 2, "Diplopia": 2, "Discomfort": 2, "Dry eye": 2, "Dysgeusia": 2, "Dysphagia": 2, "Electrocardiogram": 2, "Eye discharge": 2, "Eye irritation": 2, "Flatulence": 2, "Flushing": 2, "Gait disturbance": 2, "Herpes simplex": 2, "Hypoaesthesia oral": 2, "Incorrect route of product administration": 2, "Induration": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Injection site warmth": 2, "Intentional product use issue": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Lethargy": 2, "Lip swelling": 2, "Maternal exposure during pregnancy": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Myocardial infarction": 2, "Oral pain": 2, "Peripheral coldness": 2, "Scratch": 2, "Skin discolouration": 2, "Sneezing": 2, "Speech disorder": 2, "Sputum discoloured": 2, "Tachycardia": 2, "Therapeutic response unexpected": 2, "Ultrasound scan": 2, "Vaccination site irritation": 2, "Vaccination site nodule": 2, "Vision blurred": 2, "Abdominal pain lower": 1, "Abnormal faeces": 1, "Abnormal sensation in eye": 1, "Adverse event": 1, "Allergy test": 1, "Anticoagulant therapy": 1, "Anxiety": 1, "Aphasia": 1, "Arachnoid cyst": 1, "Arteriosclerosis": 1, "Arthritis reactive": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood lactic acid": 1, "Blood potassium": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood test": 1, "Blood urea": 1, "Blood urine present": 1, "Body temperature increased": 1, "Breast inflammation": 1, "Breast mass": 1, "Breast pain": 1, "Bronchitis": 1, "Calcium ionised": 1, "Cardiac disorder": 1, "Chapped lips": 1, "Chest X-ray": 1, "Cold burn": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Cystitis interstitial": 1, "Deafness": 1, "Depressed level of consciousness": 1, "Depression": 1, "Disability": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dysgraphia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear infection": 1, "Eating disorder": 1, "Echocardiogram": 1, "Exposure during pregnancy": 1, "Eye colour change": 1, "Eye disorder": 1, "Eyelid irritation": 1, "Facial pain": 1, "Facial paralysis": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Feeling of relaxation": 1, "Full blood count": 1, "Gait inability": 1, "General physical health deterioration": 1, "Gingival swelling": 1, "Glossodynia": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Haematocrit": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hunger": 1, "Hypersensitivity pneumonitis": 1, "Hyperventilation": 1, "Hypokinesia": 1, "Hypotension": 1, "Incontinence": 1, "Infection": 1, "Inflammation": 1, "Injection site pain": 1, "Interstitial lung disease": 1, "Irritable bowel syndrome": 1, "Joint dislocation": 1, "Joint hyperextension": 1, "Lacrimation increased": 1, "Lip disorder": 1, "Lip haemorrhage": 1, "Localised oedema": 1, "Loss of personal independence in daily activities": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Lymph node pain": 1, "Lymphadenitis": 1, "Lymphoedema": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Mechanical urticaria": 1, "Mental impairment": 1, "Metabolic acidosis": 1, "Micturition disorder": 1, "Micturition urgency": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Night sweats": 1, "Ocular discomfort": 1, "Oedema peripheral": 1, "Off label use": 1, "Ophthalmic herpes simplex": 1, "Optic nerve disorder": 1, "Oral herpes": 1, "Orbital swelling": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Pain of skin": 1, "Pallor": 1, "Parosmia": 1, "Periarthritis": 1, "Pharyngeal paraesthesia": 1, "Pneumonia": 1, "Poor quality sleep": 1, "Post procedural complication": 1, "Product availability issue": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Pulmonary granuloma": 1, "Purpura": 1, "Quadriplegia": 1, "Rash pruritic": 1, "Renal pain": 1, "Respiratory failure": 1, "Rhinalgia": 1, "Rib fracture": 1, "Rosacea": 1, "Seizure": 1, "Shoulder injury related to vaccine administration": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin hypertrophy": 1, "Skin lesion": 1, "Skin swelling": 1, "Skin warm": 1, "Spider vein": 1, "Spinal operation": 1, "Spinal pain": 1, "Staphylococcal infection": 1, "Staphylococcus test": 1, "Stomatitis": 1, "Streptococcus test": 1, "Superficial vein prominence": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Tenderness": 1, "Thirst": 1, "Throat irritation": 1, "Tinea infection": 1, "Tongue discolouration": 1, "Transfusion": 1, "Ultrasound antenatal screen": 1, "Unresponsive to stimuli": 1, "Urinary tract infection": 1, "Vaccination site bruising": 1, "Vaccination site coldness": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Varicose vein": 1, "Visual impairment": 1, "Weight decreased": 1, "Wound": 1, "Wound haemorrhage": 1, "Wrong product administered": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["017B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B228.json b/docs/data/histograms/United States/017B228.json
index b1ddfff4cd8..14c8f929942 100644
--- a/docs/data/histograms/United States/017B228.json
+++ b/docs/data/histograms/United States/017B228.json
@@ -1 +1 @@
-{"batchcode": "017B228", "histograms": [{"batchcodes": ["017B228"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "017B228", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["017B228"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B22A.json b/docs/data/histograms/United States/017B22A.json
index 5bf4221b182..ef6374b2e01 100644
--- a/docs/data/histograms/United States/017B22A.json
+++ b/docs/data/histograms/United States/017B22A.json
@@ -1 +1 @@
-{"batchcode": "017B22A", "histograms": [{"batchcodes": ["017B22A"], "histogram": {"Expired product administered": 19, "Product storage error": 18, "No adverse event": 5, "Product temperature excursion issue": 5, "Poor quality product administered": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Off label use": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "017B22A", "histograms": [{"histogram": {"Expired product administered": 19, "Product storage error": 18, "No adverse event": 5, "Product temperature excursion issue": 5, "Poor quality product administered": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Off label use": 1, "Pain in extremity": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["017B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B2A.json b/docs/data/histograms/United States/017B2A.json
index f5154df9b8e..6d89b25fad9 100644
--- a/docs/data/histograms/United States/017B2A.json
+++ b/docs/data/histograms/United States/017B2A.json
@@ -1 +1 @@
-{"batchcode": "017B2A", "histograms": [{"batchcodes": ["017B2A"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "017B2A", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["017B2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017B2AA.json b/docs/data/histograms/United States/017B2AA.json
index 87d304813eb..8be36469100 100644
--- a/docs/data/histograms/United States/017B2AA.json
+++ b/docs/data/histograms/United States/017B2AA.json
@@ -1 +1 @@
-{"batchcode": "017B2AA", "histograms": [{"batchcodes": ["017B2AA"], "histogram": {"Incorrect dose administered": 1}}]}
\ No newline at end of file
+{"batchcode": "017B2AA", "histograms": [{"histogram": {"Incorrect dose administered": 1}, "batchcodes": ["017B2AA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017BZ1A.json b/docs/data/histograms/United States/017BZ1A.json
index cd0ae4d67d4..d9b49a5936f 100644
--- a/docs/data/histograms/United States/017BZ1A.json
+++ b/docs/data/histograms/United States/017BZ1A.json
@@ -1 +1 @@
-{"batchcode": "017BZ1A", "histograms": [{"batchcodes": ["017BZ1A"], "histogram": {"Blood glucose": 1, "Blood glucose increased": 1, "Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Tremor": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "017BZ1A", "histograms": [{"histogram": {"Blood glucose": 1, "Blood glucose increased": 1, "Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Tremor": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["017BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017BZIA.json b/docs/data/histograms/United States/017BZIA.json
index e84e23ab23e..de5cdd6b263 100644
--- a/docs/data/histograms/United States/017BZIA.json
+++ b/docs/data/histograms/United States/017BZIA.json
@@ -1 +1 @@
-{"batchcode": "017BZIA", "histograms": [{"batchcodes": ["017BZIA"], "histogram": {"Blister": 1, "Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "017BZIA", "histograms": [{"histogram": {"Blister": 1, "Dyspnoea": 1}, "batchcodes": ["017BZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017C21A.json b/docs/data/histograms/United States/017C21A.json
index cfab3d267ef..fd3dd003e87 100644
--- a/docs/data/histograms/United States/017C21A.json
+++ b/docs/data/histograms/United States/017C21A.json
@@ -1 +1 @@
-{"batchcode": "017C21A", "histograms": [{"batchcodes": ["00157558", "017C21A"], "histogram": {"Interchange of vaccine products": 1}}, {"batchcodes": ["017C21A", "ER8727"], "histogram": {"Interchange of vaccine products": 1}}, {"batchcodes": ["017C21A", "EW0169"], "histogram": {"Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Off label use": 1}}, {"batchcodes": ["017C21A", "EW0180"], "histogram": {"Product administration error": 1}}, {"batchcodes": ["017C21A", "FH8028"], "histogram": {"Bedridden": 1, "COVID-19 immunisation": 1, "Cardiac discomfort": 1, "Chest pain": 1, "Coagulopathy": 1, "Deep vein thrombosis": 1, "Fatigue": 1, "Illness": 1, "Immune system disorder": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Muscle spasms": 1, "Pain": 1, "Pharyngitis": 1, "Post-acute COVID-19 syndrome": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}}, {"batchcodes": ["017C21A"], "histogram": {"Expired product administered": 22, "Headache": 15, "Pyrexia": 14, "Chills": 12, "Product storage error": 11, "Vaccination site pain": 11, "Fatigue": 9, "Myalgia": 9, "Pain": 9, "Pain in extremity": 9, "Dizziness": 8, "Vaccination site erythema": 8, "Vaccination site pruritus": 8, "Inappropriate schedule of product administration": 7, "Dyspnoea": 6, "Feeling hot": 6, "Paraesthesia": 6, "Arthralgia": 5, "Interchange of vaccine products": 5, "Nausea": 5, "Vaccination site swelling": 5, "Asthenia": 4, "Chest pain": 4, "Erythema": 4, "Feeling abnormal": 4, "Feeling cold": 4, "Product temperature excursion issue": 4, "Rash": 4, "Vaccination complication": 4, "Vaccination site rash": 4, "Abdominal pain": 3, "Body temperature": 3, "Contusion": 3, "Diarrhoea": 3, "Heart rate": 3, "Hypoaesthesia": 3, "Illness": 3, "Influenza like illness": 3, "Musculoskeletal stiffness": 3, "Nasal congestion": 3, "Oropharyngeal pain": 3, "Peripheral swelling": 3, "Product administered to patient of inappropriate age": 3, "Product administration error": 3, "Pruritus": 3, "Vomiting": 3, "Anosmia": 2, "Bell's palsy": 2, "Chest discomfort": 2, "Ear pain": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye pruritus": 2, "Gait inability": 2, "Inflammation": 2, "Influenza": 2, "Injection site pain": 2, "Insomnia": 2, "Intentional product use issue": 2, "Irritability": 2, "Limb discomfort": 2, "Malaise": 2, "Mastitis": 2, "Neck pain": 2, "Palpitations": 2, "Product dose omission issue": 2, "Somnolence": 2, "Tinnitus": 2, "Urticaria": 2, "Vaccination site induration": 2, "Vaccination site warmth": 2, "Accidental underdose": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Back pain": 1, "Balance disorder": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood osmolarity": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bone pain": 1, "COVID-19": 1, "Carbon dioxide": 1, "Cellulitis": 1, "Choking": 1, "Circumstance or information capable of leading to medication error": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Discomfort": 1, "Dry throat": 1, "Dysarthria": 1, "Dysphagia": 1, "Ear discomfort": 1, "Erythema multiforme": 1, "Extrasystoles": 1, "Eye irritation": 1, "Full blood count": 1, "Gait disturbance": 1, "Gastroenteritis viral": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemolysis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Immunisation reaction": 1, "Incorrect dose administered": 1, "Injection site warmth": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Libido increased": 1, "Lipoma": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Mood altered": 1, "Nerve conduction studies": 1, "Ocular discomfort": 1, "Off label use": 1, "Oral discomfort": 1, "Parkinson's disease": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Postmenopausal haemorrhage": 1, "Pregnancy": 1, "Pustule": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Restlessness": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sense of oppression": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin warm": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Symptom recurrence": 1, "Taste disorder": 1, "Testicular pain": 1, "Tremor": 1, "Tularaemia": 1, "Urinary tract discomfort": 1, "Vaccination site cyst": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vision blurred": 1, "Visual impairment": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "017C21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["00157558", "017C21A"]}, {"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["017C21A", "ER8727"]}, {"histogram": {"Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Off label use": 1}, "batchcodes": ["017C21A", "EW0169"]}, {"histogram": {"Product administration error": 1}, "batchcodes": ["017C21A", "EW0180"]}, {"histogram": {"Bedridden": 1, "COVID-19 immunisation": 1, "Cardiac discomfort": 1, "Chest pain": 1, "Coagulopathy": 1, "Deep vein thrombosis": 1, "Fatigue": 1, "Illness": 1, "Immune system disorder": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Muscle spasms": 1, "Pain": 1, "Pharyngitis": 1, "Post-acute COVID-19 syndrome": 1, "Rhinitis": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1}, "batchcodes": ["017C21A", "FH8028"]}, {"histogram": {"Expired product administered": 22, "Headache": 15, "Pyrexia": 14, "Chills": 12, "Product storage error": 11, "Vaccination site pain": 11, "Fatigue": 9, "Myalgia": 9, "Pain": 9, "Pain in extremity": 9, "Dizziness": 8, "Vaccination site erythema": 8, "Vaccination site pruritus": 8, "Inappropriate schedule of product administration": 7, "Dyspnoea": 6, "Feeling hot": 6, "Paraesthesia": 6, "Arthralgia": 5, "Interchange of vaccine products": 5, "Nausea": 5, "Vaccination site swelling": 5, "Asthenia": 4, "Chest pain": 4, "Erythema": 4, "Feeling abnormal": 4, "Feeling cold": 4, "Product temperature excursion issue": 4, "Rash": 4, "Vaccination complication": 4, "Vaccination site rash": 4, "Abdominal pain": 3, "Body temperature": 3, "Contusion": 3, "Diarrhoea": 3, "Heart rate": 3, "Hypoaesthesia": 3, "Illness": 3, "Influenza like illness": 3, "Musculoskeletal stiffness": 3, "Nasal congestion": 3, "Oropharyngeal pain": 3, "Peripheral swelling": 3, "Product administered to patient of inappropriate age": 3, "Product administration error": 3, "Pruritus": 3, "Vomiting": 3, "Anosmia": 2, "Bell's palsy": 2, "Chest discomfort": 2, "Ear pain": 2, "Epistaxis": 2, "Exposure during pregnancy": 2, "Eye pruritus": 2, "Gait inability": 2, "Inflammation": 2, "Influenza": 2, "Injection site pain": 2, "Insomnia": 2, "Intentional product use issue": 2, "Irritability": 2, "Limb discomfort": 2, "Malaise": 2, "Mastitis": 2, "Neck pain": 2, "Palpitations": 2, "Product dose omission issue": 2, "Somnolence": 2, "Tinnitus": 2, "Urticaria": 2, "Vaccination site induration": 2, "Vaccination site warmth": 2, "Accidental underdose": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Anxiety": 1, "Aspartate aminotransferase": 1, "Back pain": 1, "Balance disorder": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood creatinine": 1, "Blood glucose": 1, "Blood osmolarity": 1, "Blood potassium": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bone pain": 1, "COVID-19": 1, "Carbon dioxide": 1, "Cellulitis": 1, "Choking": 1, "Circumstance or information capable of leading to medication error": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Discomfort": 1, "Dry throat": 1, "Dysarthria": 1, "Dysphagia": 1, "Ear discomfort": 1, "Erythema multiforme": 1, "Extrasystoles": 1, "Eye irritation": 1, "Full blood count": 1, "Gait disturbance": 1, "Gastroenteritis viral": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Haematocrit": 1, "Haemolysis": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Immune thrombocytopenia": 1, "Immunisation reaction": 1, "Incorrect dose administered": 1, "Injection site warmth": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Libido increased": 1, "Lipoma": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Magnetic resonance imaging neck": 1, "Mood altered": 1, "Nerve conduction studies": 1, "Ocular discomfort": 1, "Off label use": 1, "Oral discomfort": 1, "Parkinson's disease": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Postmenopausal haemorrhage": 1, "Pregnancy": 1, "Pustule": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Respiratory rate": 1, "Restlessness": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sense of oppression": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin warm": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Symptom recurrence": 1, "Taste disorder": 1, "Testicular pain": 1, "Tremor": 1, "Tularaemia": 1, "Urinary tract discomfort": 1, "Vaccination site cyst": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vision blurred": 1, "Visual impairment": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["017C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017C2A.json b/docs/data/histograms/United States/017C2A.json
index 5c84f39334a..f956b49e8df 100644
--- a/docs/data/histograms/United States/017C2A.json
+++ b/docs/data/histograms/United States/017C2A.json
@@ -1 +1 @@
-{"batchcode": "017C2A", "histograms": [{"batchcodes": ["017C2A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "017C2A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["017C2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017CZIA.json b/docs/data/histograms/United States/017CZIA.json
index 8e6dd87b654..cfd64c3b8e8 100644
--- a/docs/data/histograms/United States/017CZIA.json
+++ b/docs/data/histograms/United States/017CZIA.json
@@ -1 +1 @@
-{"batchcode": "017CZIA", "histograms": [{"batchcodes": ["017CZIA"], "histogram": {"Diarrhoea": 2, "Fatigue": 2, "Muscular weakness": 1, "Myalgia": 1, "Pain in extremity": 1, "Swelling": 1, "Tremor": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "017CZIA", "histograms": [{"histogram": {"Diarrhoea": 2, "Fatigue": 2, "Muscular weakness": 1, "Myalgia": 1, "Pain in extremity": 1, "Swelling": 1, "Tremor": 1, "Vomiting": 1}, "batchcodes": ["017CZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017D21A.json b/docs/data/histograms/United States/017D21A.json
index 83b57cf5826..a2325d484c4 100644
--- a/docs/data/histograms/United States/017D21A.json
+++ b/docs/data/histograms/United States/017D21A.json
@@ -1 +1 @@
-{"batchcode": "017D21A", "histograms": [{"batchcodes": ["017D21A"], "histogram": {"Erythema": 1, "Flushing": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "017D21A", "histograms": [{"histogram": {"Erythema": 1, "Flushing": 1, "Swelling face": 1}, "batchcodes": ["017D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017E OR F 21A.json b/docs/data/histograms/United States/017E OR F 21A.json
index 02724d35a45..d56371ed934 100644
--- a/docs/data/histograms/United States/017E OR F 21A.json
+++ b/docs/data/histograms/United States/017E OR F 21A.json
@@ -1 +1 @@
-{"batchcode": "017E OR F 21A", "histograms": [{"batchcodes": ["017E OR F 21A"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "017E OR F 21A", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["017E OR F 21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017E21A.json b/docs/data/histograms/United States/017E21A.json
index 343719e03c3..d9f5df5f607 100644
--- a/docs/data/histograms/United States/017E21A.json
+++ b/docs/data/histograms/United States/017E21A.json
@@ -1 +1 @@
-{"batchcode": "017E21A", "histograms": [{"batchcodes": ["017E21A", "026L21B", "1805018"], "histogram": {"Suspected COVID-19": 1}}, {"batchcodes": ["017E21A"], "histogram": {"Fatigue": 14, "Pain in extremity": 14, "Myalgia": 13, "Headache": 12, "Pyrexia": 11, "Expired product administered": 9, "Vaccination site pain": 8, "Chills": 6, "Illness": 6, "Pain": 6, "Peripheral swelling": 5, "Rash": 5, "Arthralgia": 4, "Feeling abnormal": 4, "Chest pain": 3, "Cough": 3, "Dyspnoea": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Muscle tightness": 3, "Product storage error": 3, "Vaccination site swelling": 3, "Asthenia": 2, "Body temperature": 2, "Burning sensation": 2, "Diarrhoea": 2, "Dizziness": 2, "Dysstasia": 2, "Dysuria": 2, "Erythema": 2, "Heart rate increased": 2, "Lethargy": 2, "Malaise": 2, "Mobility decreased": 2, "Nausea": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Pruritus": 2, "Rhinorrhoea": 2, "Tenderness": 2, "Urticaria": 2, "Vaccination site erythema": 2, "Vaccination site warmth": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Accidental exposure to product": 1, "Accidental underdose": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anger": 1, "Anosmia": 1, "Axillary pain": 1, "COVID-19": 1, "Cardiac flutter": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Device connection issue": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Exposure via skin contact": 1, "Fall": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin increased": 1, "Head injury": 1, "Heart rate": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Hyperventilation": 1, "Incorrect dose administered": 1, "Induration": 1, "Injection site erythema": 1, "Insomnia": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Miliaria": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Nasal mucosal discolouration": 1, "Night sweats": 1, "Paresis": 1, "Pelvic pain": 1, "Pharyngeal erythema": 1, "Pharyngeal pustule": 1, "Physical examination": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash vesicular": 1, "SARS-CoV-2 test": 1, "Sitting disability": 1, "Sneezing": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Swelling": 1, "Tachycardia": 1, "Testicular swelling": 1, "Therapeutic response unexpected": 1, "Underdose": 1, "Urinary tract infection": 1, "Vaccination site haemorrhage": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "017E21A", "histograms": [{"histogram": {"Suspected COVID-19": 1}, "batchcodes": ["017E21A", "026L21B", "1805018"]}, {"histogram": {"Fatigue": 14, "Pain in extremity": 14, "Myalgia": 13, "Headache": 12, "Pyrexia": 11, "Expired product administered": 9, "Vaccination site pain": 8, "Chills": 6, "Illness": 6, "Pain": 6, "Peripheral swelling": 5, "Rash": 5, "Arthralgia": 4, "Feeling abnormal": 4, "Chest pain": 3, "Cough": 3, "Dyspnoea": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Muscle tightness": 3, "Product storage error": 3, "Vaccination site swelling": 3, "Asthenia": 2, "Body temperature": 2, "Burning sensation": 2, "Diarrhoea": 2, "Dizziness": 2, "Dysstasia": 2, "Dysuria": 2, "Erythema": 2, "Heart rate increased": 2, "Lethargy": 2, "Malaise": 2, "Mobility decreased": 2, "Nausea": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Pruritus": 2, "Rhinorrhoea": 2, "Tenderness": 2, "Urticaria": 2, "Vaccination site erythema": 2, "Vaccination site warmth": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Accidental exposure to product": 1, "Accidental underdose": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anger": 1, "Anosmia": 1, "Axillary pain": 1, "COVID-19": 1, "Cardiac flutter": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Device connection issue": 1, "Dry throat": 1, "Dysphagia": 1, "Dysphonia": 1, "Exposure via skin contact": 1, "Fall": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gastrooesophageal reflux disease": 1, "Haemoglobin increased": 1, "Head injury": 1, "Heart rate": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Hyperventilation": 1, "Incorrect dose administered": 1, "Induration": 1, "Injection site erythema": 1, "Insomnia": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Miliaria": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Nasal mucosal discolouration": 1, "Night sweats": 1, "Paresis": 1, "Pelvic pain": 1, "Pharyngeal erythema": 1, "Pharyngeal pustule": 1, "Physical examination": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Rash erythematous": 1, "Rash macular": 1, "Rash vesicular": 1, "SARS-CoV-2 test": 1, "Sitting disability": 1, "Sneezing": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Swelling": 1, "Tachycardia": 1, "Testicular swelling": 1, "Therapeutic response unexpected": 1, "Underdose": 1, "Urinary tract infection": 1, "Vaccination site haemorrhage": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vision blurred": 1}, "batchcodes": ["017E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017E21H.json b/docs/data/histograms/United States/017E21H.json
index 326db5c757c..ac68bc9d08a 100644
--- a/docs/data/histograms/United States/017E21H.json
+++ b/docs/data/histograms/United States/017E21H.json
@@ -1 +1 @@
-{"batchcode": "017E21H", "histograms": [{"batchcodes": ["013B22A", "017E21H", "1808978"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "017E21H", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["013B22A", "017E21H", "1808978"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017ELIA.json b/docs/data/histograms/United States/017ELIA.json
index 953db9b19f6..a13fbdca84d 100644
--- a/docs/data/histograms/United States/017ELIA.json
+++ b/docs/data/histograms/United States/017ELIA.json
@@ -1 +1 @@
-{"batchcode": "017ELIA", "histograms": [{"batchcodes": ["017ELIA"], "histogram": {"Headache": 1, "Nausea": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "017ELIA", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["017ELIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017EZ1A.json b/docs/data/histograms/United States/017EZ1A.json
index f3cc314da76..34109ee5155 100644
--- a/docs/data/histograms/United States/017EZ1A.json
+++ b/docs/data/histograms/United States/017EZ1A.json
@@ -1 +1 @@
-{"batchcode": "017EZ1A", "histograms": [{"batchcodes": ["017EZ1A"], "histogram": {"Body temperature": 1, "Dyspnoea": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "017EZ1A", "histograms": [{"histogram": {"Body temperature": 1, "Dyspnoea": 1, "Pyrexia": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["017EZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017F11A.json b/docs/data/histograms/United States/017F11A.json
index f387dcacc8d..06498166ab3 100644
--- a/docs/data/histograms/United States/017F11A.json
+++ b/docs/data/histograms/United States/017F11A.json
@@ -1 +1 @@
-{"batchcode": "017F11A", "histograms": [{"batchcodes": ["017F11A"], "histogram": {"Asthenia": 1, "Burning sensation": 1, "Chills": 1, "Cold sweat": 1, "Dysstasia": 1, "Hyperhidrosis": 1, "Illness": 1, "Influenza like illness": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Skin burning sensation": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "017F11A", "histograms": [{"histogram": {"Asthenia": 1, "Burning sensation": 1, "Chills": 1, "Cold sweat": 1, "Dysstasia": 1, "Hyperhidrosis": 1, "Illness": 1, "Influenza like illness": 1, "Malaise": 1, "Muscle spasms": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Skin burning sensation": 1, "Tremor": 1}, "batchcodes": ["017F11A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017F21 A.json b/docs/data/histograms/United States/017F21 A.json
index 485d4234b0b..a2870de68cc 100644
--- a/docs/data/histograms/United States/017F21 A.json
+++ b/docs/data/histograms/United States/017F21 A.json
@@ -1 +1 @@
-{"batchcode": "017F21 A", "histograms": [{"batchcodes": ["017F21 A", "042A21A"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "017F21 A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["017F21 A", "042A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017F214.json b/docs/data/histograms/United States/017F214.json
index 3a49ca22cbf..e7c200444a2 100644
--- a/docs/data/histograms/United States/017F214.json
+++ b/docs/data/histograms/United States/017F214.json
@@ -1 +1 @@
-{"batchcode": "017F214", "histograms": [{"batchcodes": ["017F214"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "017F214", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["017F214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017F21A.json b/docs/data/histograms/United States/017F21A.json
index 1caabdb1d6d..d248a4ec436 100644
--- a/docs/data/histograms/United States/017F21A.json
+++ b/docs/data/histograms/United States/017F21A.json
@@ -1 +1 @@
-{"batchcode": "017F21A", "histograms": [{"batchcodes": ["017F21A", "1805022"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Vaccination failure": 1}}, {"batchcodes": ["017F21A"], "histogram": {"Expired product administered": 19, "Fatigue": 9, "Pyrexia": 8, "Chills": 7, "Headache": 5, "Nausea": 5, "Pain": 5, "Pain in extremity": 5, "Vaccination site pain": 5, "COVID-19": 3, "Arthralgia": 2, "Body temperature": 2, "Illness": 2, "Inappropriate schedule of product administration": 2, "Lip swelling": 2, "SARS-CoV-2 test": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Arthropod bite": 1, "Blister": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bursitis": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Condition aggravated": 1, "Constipation": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Erectile dysfunction": 1, "Eye swelling": 1, "Face injury": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Immunisation reaction": 1, "Impaired healing": 1, "Infected bite": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Joint range of motion decreased": 1, "Limb injury": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Nasopharyngeal swab": 1, "Nasopharyngitis": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Psoriasis": 1, "Psoriatic arthropathy": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Skin laceration": 1, "Sneezing": 1, "Sputum discoloured": 1, "Swelling face": 1, "Swollen tongue": 1, "Syncope": 1, "Throat irritation": 1, "Tremor": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Wound": 1, "Wound complication": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "017F21A", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "Vaccination failure": 1}, "batchcodes": ["017F21A", "1805022"]}, {"histogram": {"Expired product administered": 19, "Fatigue": 9, "Pyrexia": 8, "Chills": 7, "Headache": 5, "Nausea": 5, "Pain": 5, "Pain in extremity": 5, "Vaccination site pain": 5, "COVID-19": 3, "Arthralgia": 2, "Body temperature": 2, "Illness": 2, "Inappropriate schedule of product administration": 2, "Lip swelling": 2, "SARS-CoV-2 test": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site erythema": 2, "Vaccination site swelling": 2, "Accidental overdose": 1, "Accidental underdose": 1, "Arthropod bite": 1, "Blister": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Blood test": 1, "Bursitis": 1, "C-reactive protein": 1, "Chest X-ray": 1, "Condition aggravated": 1, "Constipation": 1, "Diarrhoea": 1, "Discomfort": 1, "Dizziness": 1, "Erectile dysfunction": 1, "Eye swelling": 1, "Face injury": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hyperhidrosis": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Immunisation reaction": 1, "Impaired healing": 1, "Infected bite": 1, "Inflammation": 1, "Influenza": 1, "Interchange of vaccine products": 1, "Joint range of motion decreased": 1, "Limb injury": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Nasopharyngeal swab": 1, "Nasopharyngitis": 1, "Neuralgia": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Pallor": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Psoriasis": 1, "Psoriatic arthropathy": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Skin laceration": 1, "Sneezing": 1, "Sputum discoloured": 1, "Swelling face": 1, "Swollen tongue": 1, "Syncope": 1, "Throat irritation": 1, "Tremor": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Wound": 1, "Wound complication": 1, "X-ray": 1}, "batchcodes": ["017F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017F21AFM9992.json b/docs/data/histograms/United States/017F21AFM9992.json
index 95e5dc51e02..ebe6e45aa5d 100644
--- a/docs/data/histograms/United States/017F21AFM9992.json
+++ b/docs/data/histograms/United States/017F21AFM9992.json
@@ -1 +1 @@
-{"batchcode": "017F21AFM9992", "histograms": [{"batchcodes": ["017F21AFM9992"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "017F21AFM9992", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["017F21AFM9992"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017FZ1A.json b/docs/data/histograms/United States/017FZ1A.json
index bd8d0a11a1e..01ef7ef7fcf 100644
--- a/docs/data/histograms/United States/017FZ1A.json
+++ b/docs/data/histograms/United States/017FZ1A.json
@@ -1 +1 @@
-{"batchcode": "017FZ1A", "histograms": [{"batchcodes": ["017FZ1A"], "histogram": {"C-reactive protein": 1, "Erythema": 1, "Metabolic function test": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "017FZ1A", "histograms": [{"histogram": {"C-reactive protein": 1, "Erythema": 1, "Metabolic function test": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "X-ray": 1}, "batchcodes": ["017FZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017H22A.json b/docs/data/histograms/United States/017H22A.json
index 7fbc7935b61..9ba59a30913 100644
--- a/docs/data/histograms/United States/017H22A.json
+++ b/docs/data/histograms/United States/017H22A.json
@@ -1 +1 @@
-{"batchcode": "017H22A", "histograms": [{"batchcodes": ["017H22A"], "histogram": {"Insomnia": 3, "No adverse event": 2, "Product administered to patient of inappropriate age": 2, "Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Decreased appetite": 1, "Disability": 1, "Dizziness": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Pain in extremity": 1, "Pyrexia": 1, "Ultrasound scan": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "017H22A", "histograms": [{"histogram": {"Insomnia": 3, "No adverse event": 2, "Product administered to patient of inappropriate age": 2, "Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Decreased appetite": 1, "Disability": 1, "Dizziness": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Pain in extremity": 1, "Pyrexia": 1, "Ultrasound scan": 1, "Underdose": 1}, "batchcodes": ["017H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017HZZA.json b/docs/data/histograms/United States/017HZZA.json
index ea366853957..e7b5591d970 100644
--- a/docs/data/histograms/United States/017HZZA.json
+++ b/docs/data/histograms/United States/017HZZA.json
@@ -1 +1 @@
-{"batchcode": "017HZZA", "histograms": [{"batchcodes": ["017HZZA"], "histogram": {"Accidental underdose": 1, "No adverse event": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "017HZZA", "histograms": [{"histogram": {"Accidental underdose": 1, "No adverse event": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["017HZZA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017L20.json b/docs/data/histograms/United States/017L20.json
index ca0f355cb50..67b499adb44 100644
--- a/docs/data/histograms/United States/017L20.json
+++ b/docs/data/histograms/United States/017L20.json
@@ -1 +1 @@
-{"batchcode": "017L20", "histograms": [{"batchcodes": ["017L20"], "histogram": {"Fatigue": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "017L20", "histograms": [{"histogram": {"Fatigue": 1, "Tinnitus": 1}, "batchcodes": ["017L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017L20A.json b/docs/data/histograms/United States/017L20A.json
index b25738a6623..82d0a23f874 100644
--- a/docs/data/histograms/United States/017L20A.json
+++ b/docs/data/histograms/United States/017L20A.json
@@ -1 +1 @@
-{"batchcode": "017L20A", "histograms": [{"batchcodes": ["017L20A"], "histogram": {"Penile discomfort": 1, "Prostatitis": 1}}]}
\ No newline at end of file
+{"batchcode": "017L20A", "histograms": [{"histogram": {"Penile discomfort": 1, "Prostatitis": 1}, "batchcodes": ["017L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017MODERNA.json b/docs/data/histograms/United States/017MODERNA.json
index 303b5ea63b4..ff9cde42c84 100644
--- a/docs/data/histograms/United States/017MODERNA.json
+++ b/docs/data/histograms/United States/017MODERNA.json
@@ -1 +1 @@
-{"batchcode": "017MODERNA", "histograms": [{"batchcodes": ["017MODERNA"], "histogram": {"Angina pectoris": 1, "Malaise": 1, "Nervousness": 1, "Panic attack": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "017MODERNA", "histograms": [{"histogram": {"Angina pectoris": 1, "Malaise": 1, "Nervousness": 1, "Panic attack": 1, "Vomiting": 1}, "batchcodes": ["017MODERNA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017S21A.json b/docs/data/histograms/United States/017S21A.json
index e3bb2bde5cf..9560ededbec 100644
--- a/docs/data/histograms/United States/017S21A.json
+++ b/docs/data/histograms/United States/017S21A.json
@@ -1 +1 @@
-{"batchcode": "017S21A", "histograms": [{"batchcodes": ["017S21A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "017S21A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["017S21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/017Z21A.json b/docs/data/histograms/United States/017Z21A.json
index 9f74ae64cbc..96aae4b9141 100644
--- a/docs/data/histograms/United States/017Z21A.json
+++ b/docs/data/histograms/United States/017Z21A.json
@@ -1 +1 @@
-{"batchcode": "017Z21A", "histograms": [{"batchcodes": ["017Z21A"], "histogram": {"Off label use": 1, "Product administration error": 1}}]}
\ No newline at end of file
+{"batchcode": "017Z21A", "histograms": [{"histogram": {"Off label use": 1, "Product administration error": 1}, "batchcodes": ["017Z21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018-B21A.json b/docs/data/histograms/United States/018-B21A.json
index fe2ef32ecf0..dc12b2e93a5 100644
--- a/docs/data/histograms/United States/018-B21A.json
+++ b/docs/data/histograms/United States/018-B21A.json
@@ -1 +1 @@
-{"batchcode": "018-B21A", "histograms": [{"batchcodes": ["018-B21A"], "histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Nausea": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "018-B21A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Nausea": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["018-B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01808978.json b/docs/data/histograms/United States/01808978.json
index 9ff89e99007..7fd196dae82 100644
--- a/docs/data/histograms/United States/01808978.json
+++ b/docs/data/histograms/United States/01808978.json
@@ -1 +1 @@
-{"batchcode": "01808978", "histograms": [{"batchcodes": ["01808978"], "histogram": {"Arthralgia": 1, "Chills": 1, "Eye pruritus": 1, "Fatigue": 1, "Headache": 1, "Hyperaesthesia": 1, "Influenza like illness": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01808978", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Eye pruritus": 1, "Fatigue": 1, "Headache": 1, "Hyperaesthesia": 1, "Influenza like illness": 1, "Pain": 1}, "batchcodes": ["01808978"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0181.json b/docs/data/histograms/United States/0181.json
index c592b1222ff..93a5f4580cc 100644
--- a/docs/data/histograms/United States/0181.json
+++ b/docs/data/histograms/United States/0181.json
@@ -1 +1 @@
-{"batchcode": "0181", "histograms": [{"batchcodes": ["0181"], "histogram": {"Breast pain": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "0181", "histograms": [{"histogram": {"Breast pain": 1, "Lymph node pain": 1, "Lymphadenopathy": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["0181"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0181321A.json b/docs/data/histograms/United States/0181321A.json
index 7f95f4ca73f..e061df4add1 100644
--- a/docs/data/histograms/United States/0181321A.json
+++ b/docs/data/histograms/United States/0181321A.json
@@ -1 +1 @@
-{"batchcode": "0181321A", "histograms": [{"batchcodes": ["0181321A"], "histogram": {"COVID-19": 1, "Heart rate": 1, "Hypertension": 1, "Postmenopausal haemorrhage": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "0181321A", "histograms": [{"histogram": {"COVID-19": 1, "Heart rate": 1, "Hypertension": 1, "Postmenopausal haemorrhage": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["0181321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0181321H.json b/docs/data/histograms/United States/0181321H.json
index c150b88e1ae..78d80e773c0 100644
--- a/docs/data/histograms/United States/0181321H.json
+++ b/docs/data/histograms/United States/0181321H.json
@@ -1 +1 @@
-{"batchcode": "0181321H", "histograms": [{"batchcodes": ["0181321H"], "histogram": {"Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Epistaxis": 1, "Fear": 1, "Immune thrombocytopenia": 1, "Pain": 1, "Petechiae": 1, "Platelet count": 1}}]}
\ No newline at end of file
+{"batchcode": "0181321H", "histograms": [{"histogram": {"Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Epistaxis": 1, "Fear": 1, "Immune thrombocytopenia": 1, "Pain": 1, "Petechiae": 1, "Platelet count": 1}, "batchcodes": ["0181321H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0183.json b/docs/data/histograms/United States/0183.json
index 5e02424680f..61a8df929dc 100644
--- a/docs/data/histograms/United States/0183.json
+++ b/docs/data/histograms/United States/0183.json
@@ -1 +1 @@
-{"batchcode": "0183", "histograms": [{"batchcodes": ["0183"], "histogram": {"Hyperaesthesia": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0183", "histograms": [{"histogram": {"Hyperaesthesia": 1, "Pain": 1}, "batchcodes": ["0183"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0183214.json b/docs/data/histograms/United States/0183214.json
index 83d1b2722eb..675550b357e 100644
--- a/docs/data/histograms/United States/0183214.json
+++ b/docs/data/histograms/United States/0183214.json
@@ -1 +1 @@
-{"batchcode": "0183214", "histograms": [{"batchcodes": ["0183214"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0183214", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["0183214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01832A.json b/docs/data/histograms/United States/01832A.json
index 845bea30202..4b2970955f8 100644
--- a/docs/data/histograms/United States/01832A.json
+++ b/docs/data/histograms/United States/01832A.json
@@ -1 +1 @@
-{"batchcode": "01832A", "histograms": [{"batchcodes": ["01832A"], "histogram": {"Eye pain": 1, "Fatigue": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "01832A", "histograms": [{"histogram": {"Eye pain": 1, "Fatigue": 1, "Headache": 1}, "batchcodes": ["01832A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018521A.json b/docs/data/histograms/United States/018521A.json
index b3732634fa4..b252f93b0c4 100644
--- a/docs/data/histograms/United States/018521A.json
+++ b/docs/data/histograms/United States/018521A.json
@@ -1 +1 @@
-{"batchcode": "018521A", "histograms": [{"batchcodes": ["018521A"], "histogram": {"Alopecia": 1, "Blood pressure measurement": 1, "Endoscopy gastrointestinal": 1, "Magnetic resonance imaging": 1}}]}
\ No newline at end of file
+{"batchcode": "018521A", "histograms": [{"histogram": {"Alopecia": 1, "Blood pressure measurement": 1, "Endoscopy gastrointestinal": 1, "Magnetic resonance imaging": 1}, "batchcodes": ["018521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018821A.json b/docs/data/histograms/United States/018821A.json
index 2e0e3d23d35..95c3f898b15 100644
--- a/docs/data/histograms/United States/018821A.json
+++ b/docs/data/histograms/United States/018821A.json
@@ -1 +1 @@
-{"batchcode": "018821A", "histograms": [{"batchcodes": ["018821A"], "histogram": {"Dizziness": 4, "Myalgia": 4, "Fatigue": 3, "Headache": 3, "Vaccination site pain": 3, "Chest pain": 2, "Grip strength decreased": 2, "Nausea": 2, "Pain": 2, "Chest discomfort": 1, "Chills": 1, "Extrasystoles": 1, "Fall": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersomnia": 1, "Hypotension": 1, "Laboratory test": 1, "Malaise": 1, "Neck pain": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Somnolence": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Vaccination site induration": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "018821A", "histograms": [{"histogram": {"Dizziness": 4, "Myalgia": 4, "Fatigue": 3, "Headache": 3, "Vaccination site pain": 3, "Chest pain": 2, "Grip strength decreased": 2, "Nausea": 2, "Pain": 2, "Chest discomfort": 1, "Chills": 1, "Extrasystoles": 1, "Fall": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersomnia": 1, "Hypotension": 1, "Laboratory test": 1, "Malaise": 1, "Neck pain": 1, "Nystagmus": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Somnolence": 1, "Syncope": 1, "Tachycardia": 1, "Throat irritation": 1, "Vaccination site induration": 1, "Vertigo": 1}, "batchcodes": ["018821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01896589.json b/docs/data/histograms/United States/01896589.json
index 6ca86dee8a7..2d6d969418d 100644
--- a/docs/data/histograms/United States/01896589.json
+++ b/docs/data/histograms/United States/01896589.json
@@ -1 +1 @@
-{"batchcode": "01896589", "histograms": [{"batchcodes": ["01896589"], "histogram": {"Fatigue": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01896589", "histograms": [{"histogram": {"Fatigue": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["01896589"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018A 21A.json b/docs/data/histograms/United States/018A 21A.json
index 72a122ef5d6..0351091e4c4 100644
--- a/docs/data/histograms/United States/018A 21A.json
+++ b/docs/data/histograms/United States/018A 21A.json
@@ -1 +1 @@
-{"batchcode": "018A 21A", "histograms": [{"batchcodes": ["018A 21A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "018A 21A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Vaccination site pain": 1}, "batchcodes": ["018A 21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018A21.json b/docs/data/histograms/United States/018A21.json
index 2e3d9ca6fa1..2d4be1c2999 100644
--- a/docs/data/histograms/United States/018A21.json
+++ b/docs/data/histograms/United States/018A21.json
@@ -1 +1 @@
-{"batchcode": "018A21", "histograms": [{"batchcodes": ["018A21"], "histogram": {"Fatigue": 1, "Headache": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "018A21", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Paraesthesia": 1}, "batchcodes": ["018A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018A21A.json b/docs/data/histograms/United States/018A21A.json
index c55b7ed4e31..40b66d5bef9 100644
--- a/docs/data/histograms/United States/018A21A.json
+++ b/docs/data/histograms/United States/018A21A.json
@@ -1 +1 @@
-{"batchcode": "018A21A", "histograms": [{"batchcodes": ["018A21A"], "histogram": {"Chills": 3, "Headache": 3, "Fatigue": 2, "Pain in extremity": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Body temperature": 1, "Chest pain": 1, "Condition aggravated": 1, "Dry eye": 1, "Dyspnoea": 1, "Feeling hot": 1, "Hypermetropia": 1, "Malaise": 1, "Nausea": 1, "Palpitations": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "018A21A", "histograms": [{"histogram": {"Chills": 3, "Headache": 3, "Fatigue": 2, "Pain in extremity": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Body temperature": 1, "Chest pain": 1, "Condition aggravated": 1, "Dry eye": 1, "Dyspnoea": 1, "Feeling hot": 1, "Hypermetropia": 1, "Malaise": 1, "Nausea": 1, "Palpitations": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["018A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018AZ1A.json b/docs/data/histograms/United States/018AZ1A.json
index a5e74ced21b..0450a81974d 100644
--- a/docs/data/histograms/United States/018AZ1A.json
+++ b/docs/data/histograms/United States/018AZ1A.json
@@ -1 +1 @@
-{"batchcode": "018AZ1A", "histograms": [{"batchcodes": ["018AZ1A"], "histogram": {"Chills": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "018AZ1A", "histograms": [{"histogram": {"Chills": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["018AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018B21A.json b/docs/data/histograms/United States/018B21A.json
index ce0f53e9997..4ea984c4a4b 100644
--- a/docs/data/histograms/United States/018B21A.json
+++ b/docs/data/histograms/United States/018B21A.json
@@ -1 +1 @@
-{"batchcode": "018B21A", "histograms": [{"batchcodes": ["018B21A"], "histogram": {"Headache": 82, "Pain in extremity": 82, "Fatigue": 70, "Pyrexia": 67, "Myalgia": 56, "Dizziness": 42, "Chills": 41, "Nausea": 40, "Pain": 34, "Vaccination site pain": 34, "Rash": 33, "Feeling abnormal": 26, "Arthralgia": 25, "Diarrhoea": 23, "Pruritus": 22, "Dyspnoea": 20, "Erythema": 19, "Asthenia": 18, "Malaise": 18, "Vaccination site erythema": 17, "Vomiting": 17, "SARS-CoV-2 test": 16, "COVID-19": 15, "Cough": 14, "Illness": 12, "Paraesthesia": 12, "Peripheral swelling": 12, "Product dose omission issue": 12, "Hypoaesthesia": 11, "Vaccination site pruritus": 11, "Vaccination site swelling": 11, "Body temperature": 10, "Inappropriate schedule of product administration": 10, "Product administered to patient of inappropriate age": 10, "Vaccination site warmth": 10, "Back pain": 9, "Insomnia": 9, "Muscle spasms": 9, "Somnolence": 9, "Tremor": 9, "Urticaria": 9, "Vaccination complication": 9, "Decreased appetite": 8, "Feeling hot": 8, "Gait disturbance": 8, "Hyperhidrosis": 8, "Lymphadenopathy": 8, "Oropharyngeal pain": 8, "SARS-CoV-2 test positive": 8, "Tinnitus": 8, "Vertigo": 8, "Blood pressure measurement": 7, "Burning sensation": 7, "Hypersensitivity": 7, "Vaccination site rash": 7, "Abdominal pain upper": 6, "Chest discomfort": 6, "Chest pain": 6, "Discomfort": 6, "Expired product administered": 6, "Limb discomfort": 6, "Nasopharyngitis": 6, "Palpitations": 6, "Rash pruritic": 6, "Vision blurred": 6, "Ageusia": 5, "Anosmia": 5, "Anxiety": 5, "Depression": 5, "Dysgeusia": 5, "Head discomfort": 5, "Hypertension": 5, "Injection site pain": 5, "Loss of consciousness": 5, "Maternal exposure during pregnancy": 5, "Mobility decreased": 5, "Muscular weakness": 5, "Musculoskeletal stiffness": 5, "Swelling": 5, "Thirst": 5, "Thrombosis": 5, "Vaccination site reaction": 5, "Abdominal pain": 4, "Balance disorder": 4, "Computerised tomogram": 4, "Dysstasia": 4, "Flushing": 4, "Heart rate increased": 4, "Injection site swelling": 4, "Neck pain": 4, "Night sweats": 4, "Off label use": 4, "Pain in jaw": 4, "Product storage error": 4, "Sinusitis": 4, "Swelling face": 4, "Vaccination site induration": 4, "Abdominal discomfort": 3, "Adverse reaction": 3, "Arthritis": 3, "Breast pain": 3, "Condition aggravated": 3, "Dyskinesia": 3, "Ear discomfort": 3, "Ear pain": 3, "Electrocardiogram": 3, "Epistaxis": 3, "Feeling cold": 3, "Heart rate": 3, "Impaired work ability": 3, "Incorrect dose administered": 3, "Induration": 3, "Influenza": 3, "Influenza like illness": 3, "Lymph node pain": 3, "Mass": 3, "Menstrual disorder": 3, "Migraine": 3, "Paraesthesia oral": 3, "Pharyngeal swelling": 3, "Presyncope": 3, "Rash erythematous": 3, "Vaccination site bruising": 3, "Vaccination site discolouration": 3, "Weight decreased": 3, "X-ray": 3, "Alopecia": 2, "Amnesia": 2, "Anaphylactic reaction": 2, "Antibody test": 2, "Atrial fibrillation": 2, "Axillary pain": 2, "Blood glucose increased": 2, "Blood pressure fluctuation": 2, "Blood pressure increased": 2, "Blood test": 2, "Blood urine present": 2, "Body temperature increased": 2, "Cardiac discomfort": 2, "Chest X-ray": 2, "Confusional state": 2, "Device malfunction": 2, "Dry skin": 2, "Dyspepsia": 2, "Dysphonia": 2, "Eczema": 2, "Exposure during pregnancy": 2, "Feeding disorder": 2, "Frequent bowel movements": 2, "Full blood count": 2, "Groin pain": 2, "Haemoptysis": 2, "Head titubation": 2, "Heavy menstrual bleeding": 2, "Hypersomnia": 2, "Hypertensive crisis": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Hypopnoea": 2, "Hypotension": 2, "Immune system disorder": 2, "Incorrect route of product administration": 2, "Injection site erythema": 2, "Irritability": 2, "Limb mass": 2, "Loss of personal independence in daily activities": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Musculoskeletal chest pain": 2, "Oral pain": 2, "Oxygen saturation": 2, "Pneumonia": 2, "Productive cough": 2, "Retching": 2, "SARS-CoV-2 test negative": 2, "Sinus congestion": 2, "Skin discolouration": 2, "Sleep disorder": 2, "Speech disorder": 2, "Stress": 2, "Tachycardia": 2, "Taste disorder": 2, "Therapeutic response unexpected": 2, "Ultrasound scan": 2, "Underdose": 2, "Vaccination site haemorrhage": 2, "Visual impairment": 2, "Abdominal distension": 1, "Abnormal dreams": 1, "Adverse event following immunisation": 1, "Amenorrhoea": 1, "Anger": 1, "Anxiety disorder": 1, "Aphonia": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Arthritis reactive": 1, "Blister": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood electrolytes": 1, "Blood electrolytes decreased": 1, "Blood glucose": 1, "Blood sodium decreased": 1, "Blood test abnormal": 1, "Blood thyroid stimulating hormone": 1, "Blood urine": 1, "Bone pain": 1, "Bursitis": 1, "Candida infection": 1, "Carbon dioxide": 1, "Cardiac murmur": 1, "Carotid artery disease": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cheilitis": 1, "Chronic obstructive pulmonary disease": 1, "Cold urticaria": 1, "Constipation": 1, "Contusion": 1, "Coordination abnormal": 1, "Crying": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Depressed mood": 1, "Dermatitis bullous": 1, "Diplopia": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drug interaction": 1, "Dry mouth": 1, "Dry throat": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysuria": 1, "Ear infection": 1, "Ear swelling": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Emphysema": 1, "Endoscopy": 1, "Epstein-Barr virus infection": 1, "Exercise tolerance decreased": 1, "Eye irritation": 1, "Eye oedema": 1, "Eye pain": 1, "Faeces discoloured": 1, "Fall": 1, "Feeling of relaxation": 1, "Gait inability": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gestational diabetes": 1, "Goitre": 1, "Grip strength decreased": 1, "Hallucination": 1, "Heart rate decreased": 1, "Hernia pain": 1, "Herpes virus infection": 1, "Herpes zoster": 1, "Hostility": 1, "Hot flush": 1, "Hunger": 1, "Hyperaesthesia": 1, "Hyperchlorhydria": 1, "Hyperlipidaemia": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Hypotonia": 1, "Hypoxia": 1, "Imaging procedure": 1, "Immunisation reaction": 1, "Incorrect drug administration rate": 1, "Increased appetite": 1, "Inflammation": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Injection site rash": 1, "Injection site vesicles": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Joint effusion": 1, "Joint injury": 1, "Joint stiffness": 1, "Lichen sclerosus": 1, "Limb injury": 1, "Lip pruritus": 1, "Lip swelling": 1, "Localised infection": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Metabolic function test": 1, "Metabolic function test normal": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Motion sickness": 1, "Mouth swelling": 1, "Movement disorder": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Nasal congestion": 1, "Nerve injury": 1, "Occupational exposure to product": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Oesophageal discomfort": 1, "Oral discomfort": 1, "Oral pruritus": 1, "Oropharyngeal discomfort": 1, "Peripheral coldness": 1, "Peroneal nerve palsy": 1, "Pharyngeal oedema": 1, "Physical examination": 1, "Plantar fasciitis": 1, "Pre-existing condition improved": 1, "Pregnancy test": 1, "Product administered at inappropriate site": 1, "Protein total abnormal": 1, "Psychological trauma": 1, "Rash macular": 1, "Renal disorder": 1, "Respiratory arrest": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rhinalgia": 1, "Rhinorrhoea": 1, "Salt craving": 1, "Scar": 1, "Secretion discharge": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin mass": 1, "Skin swelling": 1, "Skin tightness": 1, "Sluggishness": 1, "Spinal stenosis": 1, "Splenomegaly": 1, "Stomatitis": 1, "Swollen tongue": 1, "Syncope": 1, "Syringe issue": 1, "Temperature regulation disorder": 1, "Tenderness": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid function test": 1, "Tongue biting": 1, "Transient ischaemic attack": 1, "Ultrasound abdomen": 1, "Upper-airway cough syndrome": 1, "Urine odour abnormal": 1, "Urine output": 1, "Urine output increased": 1, "Uterine polyp": 1, "Vaccination failure": 1, "Vaccination site exfoliation": 1, "Vaccination site irritation": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Varicose vein": 1, "Ventricular tachycardia": 1, "Vitamin B12": 1, "Volume blood decreased": 1, "Weight": 1, "Weight increased": 1, "Wheelchair user": 1}}]}
\ No newline at end of file
+{"batchcode": "018B21A", "histograms": [{"histogram": {"Headache": 82, "Pain in extremity": 82, "Fatigue": 70, "Pyrexia": 67, "Myalgia": 56, "Dizziness": 42, "Chills": 41, "Nausea": 40, "Pain": 34, "Vaccination site pain": 34, "Rash": 33, "Feeling abnormal": 26, "Arthralgia": 25, "Diarrhoea": 23, "Pruritus": 22, "Dyspnoea": 20, "Erythema": 19, "Asthenia": 18, "Malaise": 18, "Vaccination site erythema": 17, "Vomiting": 17, "SARS-CoV-2 test": 16, "COVID-19": 15, "Cough": 14, "Illness": 12, "Paraesthesia": 12, "Peripheral swelling": 12, "Product dose omission issue": 12, "Hypoaesthesia": 11, "Vaccination site pruritus": 11, "Vaccination site swelling": 11, "Body temperature": 10, "Inappropriate schedule of product administration": 10, "Product administered to patient of inappropriate age": 10, "Vaccination site warmth": 10, "Back pain": 9, "Insomnia": 9, "Muscle spasms": 9, "Somnolence": 9, "Tremor": 9, "Urticaria": 9, "Vaccination complication": 9, "Decreased appetite": 8, "Feeling hot": 8, "Gait disturbance": 8, "Hyperhidrosis": 8, "Lymphadenopathy": 8, "Oropharyngeal pain": 8, "SARS-CoV-2 test positive": 8, "Tinnitus": 8, "Vertigo": 8, "Blood pressure measurement": 7, "Burning sensation": 7, "Hypersensitivity": 7, "Vaccination site rash": 7, "Abdominal pain upper": 6, "Chest discomfort": 6, "Chest pain": 6, "Discomfort": 6, "Expired product administered": 6, "Limb discomfort": 6, "Nasopharyngitis": 6, "Palpitations": 6, "Rash pruritic": 6, "Vision blurred": 6, "Ageusia": 5, "Anosmia": 5, "Anxiety": 5, "Depression": 5, "Dysgeusia": 5, "Head discomfort": 5, "Hypertension": 5, "Injection site pain": 5, "Loss of consciousness": 5, "Maternal exposure during pregnancy": 5, "Mobility decreased": 5, "Muscular weakness": 5, "Musculoskeletal stiffness": 5, "Swelling": 5, "Thirst": 5, "Thrombosis": 5, "Vaccination site reaction": 5, "Abdominal pain": 4, "Balance disorder": 4, "Computerised tomogram": 4, "Dysstasia": 4, "Flushing": 4, "Heart rate increased": 4, "Injection site swelling": 4, "Neck pain": 4, "Night sweats": 4, "Off label use": 4, "Pain in jaw": 4, "Product storage error": 4, "Sinusitis": 4, "Swelling face": 4, "Vaccination site induration": 4, "Abdominal discomfort": 3, "Adverse reaction": 3, "Arthritis": 3, "Breast pain": 3, "Condition aggravated": 3, "Dyskinesia": 3, "Ear discomfort": 3, "Ear pain": 3, "Electrocardiogram": 3, "Epistaxis": 3, "Feeling cold": 3, "Heart rate": 3, "Impaired work ability": 3, "Incorrect dose administered": 3, "Induration": 3, "Influenza": 3, "Influenza like illness": 3, "Lymph node pain": 3, "Mass": 3, "Menstrual disorder": 3, "Migraine": 3, "Paraesthesia oral": 3, "Pharyngeal swelling": 3, "Presyncope": 3, "Rash erythematous": 3, "Vaccination site bruising": 3, "Vaccination site discolouration": 3, "Weight decreased": 3, "X-ray": 3, "Alopecia": 2, "Amnesia": 2, "Anaphylactic reaction": 2, "Antibody test": 2, "Atrial fibrillation": 2, "Axillary pain": 2, "Blood glucose increased": 2, "Blood pressure fluctuation": 2, "Blood pressure increased": 2, "Blood test": 2, "Blood urine present": 2, "Body temperature increased": 2, "Cardiac discomfort": 2, "Chest X-ray": 2, "Confusional state": 2, "Device malfunction": 2, "Dry skin": 2, "Dyspepsia": 2, "Dysphonia": 2, "Eczema": 2, "Exposure during pregnancy": 2, "Feeding disorder": 2, "Frequent bowel movements": 2, "Full blood count": 2, "Groin pain": 2, "Haemoptysis": 2, "Head titubation": 2, "Heavy menstrual bleeding": 2, "Hypersomnia": 2, "Hypertensive crisis": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Hypopnoea": 2, "Hypotension": 2, "Immune system disorder": 2, "Incorrect route of product administration": 2, "Injection site erythema": 2, "Irritability": 2, "Limb mass": 2, "Loss of personal independence in daily activities": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Musculoskeletal chest pain": 2, "Oral pain": 2, "Oxygen saturation": 2, "Pneumonia": 2, "Productive cough": 2, "Retching": 2, "SARS-CoV-2 test negative": 2, "Sinus congestion": 2, "Skin discolouration": 2, "Sleep disorder": 2, "Speech disorder": 2, "Stress": 2, "Tachycardia": 2, "Taste disorder": 2, "Therapeutic response unexpected": 2, "Ultrasound scan": 2, "Underdose": 2, "Vaccination site haemorrhage": 2, "Visual impairment": 2, "Abdominal distension": 1, "Abnormal dreams": 1, "Adverse event following immunisation": 1, "Amenorrhoea": 1, "Anger": 1, "Anxiety disorder": 1, "Aphonia": 1, "Appendicitis": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Arthritis reactive": 1, "Blister": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood electrolytes": 1, "Blood electrolytes decreased": 1, "Blood glucose": 1, "Blood sodium decreased": 1, "Blood test abnormal": 1, "Blood thyroid stimulating hormone": 1, "Blood urine": 1, "Bone pain": 1, "Bursitis": 1, "Candida infection": 1, "Carbon dioxide": 1, "Cardiac murmur": 1, "Carotid artery disease": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cheilitis": 1, "Chronic obstructive pulmonary disease": 1, "Cold urticaria": 1, "Constipation": 1, "Contusion": 1, "Coordination abnormal": 1, "Crying": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Depressed mood": 1, "Dermatitis bullous": 1, "Diplopia": 1, "Disorientation": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Drug interaction": 1, "Dry mouth": 1, "Dry throat": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysuria": 1, "Ear infection": 1, "Ear swelling": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Emphysema": 1, "Endoscopy": 1, "Epstein-Barr virus infection": 1, "Exercise tolerance decreased": 1, "Eye irritation": 1, "Eye oedema": 1, "Eye pain": 1, "Faeces discoloured": 1, "Fall": 1, "Feeling of relaxation": 1, "Gait inability": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gestational diabetes": 1, "Goitre": 1, "Grip strength decreased": 1, "Hallucination": 1, "Heart rate decreased": 1, "Hernia pain": 1, "Herpes virus infection": 1, "Herpes zoster": 1, "Hostility": 1, "Hot flush": 1, "Hunger": 1, "Hyperaesthesia": 1, "Hyperchlorhydria": 1, "Hyperlipidaemia": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Hypotonia": 1, "Hypoxia": 1, "Imaging procedure": 1, "Immunisation reaction": 1, "Incorrect drug administration rate": 1, "Increased appetite": 1, "Inflammation": 1, "Inflammatory marker increased": 1, "Inflammatory marker test": 1, "Injection site rash": 1, "Injection site vesicles": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Joint effusion": 1, "Joint injury": 1, "Joint stiffness": 1, "Lichen sclerosus": 1, "Limb injury": 1, "Lip pruritus": 1, "Lip swelling": 1, "Localised infection": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Metabolic function test": 1, "Metabolic function test normal": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Motion sickness": 1, "Mouth swelling": 1, "Movement disorder": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Nasal congestion": 1, "Nerve injury": 1, "Occupational exposure to product": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema peripheral": 1, "Oesophageal discomfort": 1, "Oral discomfort": 1, "Oral pruritus": 1, "Oropharyngeal discomfort": 1, "Peripheral coldness": 1, "Peroneal nerve palsy": 1, "Pharyngeal oedema": 1, "Physical examination": 1, "Plantar fasciitis": 1, "Pre-existing condition improved": 1, "Pregnancy test": 1, "Product administered at inappropriate site": 1, "Protein total abnormal": 1, "Psychological trauma": 1, "Rash macular": 1, "Renal disorder": 1, "Respiratory arrest": 1, "Respiratory rate increased": 1, "Restlessness": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rhinalgia": 1, "Rhinorrhoea": 1, "Salt craving": 1, "Scar": 1, "Secretion discharge": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin mass": 1, "Skin swelling": 1, "Skin tightness": 1, "Sluggishness": 1, "Spinal stenosis": 1, "Splenomegaly": 1, "Stomatitis": 1, "Swollen tongue": 1, "Syncope": 1, "Syringe issue": 1, "Temperature regulation disorder": 1, "Tenderness": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid function test": 1, "Tongue biting": 1, "Transient ischaemic attack": 1, "Ultrasound abdomen": 1, "Upper-airway cough syndrome": 1, "Urine odour abnormal": 1, "Urine output": 1, "Urine output increased": 1, "Uterine polyp": 1, "Vaccination failure": 1, "Vaccination site exfoliation": 1, "Vaccination site irritation": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Varicose vein": 1, "Ventricular tachycardia": 1, "Vitamin B12": 1, "Volume blood decreased": 1, "Weight": 1, "Weight increased": 1, "Wheelchair user": 1}, "batchcodes": ["018B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018B22A.json b/docs/data/histograms/United States/018B22A.json
index bfa4cd55699..52b1fac27e7 100644
--- a/docs/data/histograms/United States/018B22A.json
+++ b/docs/data/histograms/United States/018B22A.json
@@ -1 +1 @@
-{"batchcode": "018B22A", "histograms": [{"batchcodes": ["018B22A"], "histogram": {"Accidental overdose": 1, "No adverse event": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "018B22A", "histograms": [{"histogram": {"Accidental overdose": 1, "No adverse event": 1, "Wrong product administered": 1}, "batchcodes": ["018B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018B2A.json b/docs/data/histograms/United States/018B2A.json
index 72436b8c45e..08c075c9ef6 100644
--- a/docs/data/histograms/United States/018B2A.json
+++ b/docs/data/histograms/United States/018B2A.json
@@ -1 +1 @@
-{"batchcode": "018B2A", "histograms": [{"batchcodes": ["018B2A"], "histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Fatigue": 1, "Nasal congestion": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "018B2A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Cough": 1, "Dizziness": 1, "Fatigue": 1, "Nasal congestion": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["018B2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018B2IA.json b/docs/data/histograms/United States/018B2IA.json
index f0fc5b78813..b97df3a78f4 100644
--- a/docs/data/histograms/United States/018B2IA.json
+++ b/docs/data/histograms/United States/018B2IA.json
@@ -1 +1 @@
-{"batchcode": "018B2IA", "histograms": [{"batchcodes": ["018B2IA"], "histogram": {"Irritability": 1, "Pain": 1, "Pulmonary pain": 1, "Pyrexia": 1, "Renal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "018B2IA", "histograms": [{"histogram": {"Irritability": 1, "Pain": 1, "Pulmonary pain": 1, "Pyrexia": 1, "Renal pain": 1}, "batchcodes": ["018B2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018BZ01A.json b/docs/data/histograms/United States/018BZ01A.json
index e443a3a0339..6205f3871bf 100644
--- a/docs/data/histograms/United States/018BZ01A.json
+++ b/docs/data/histograms/United States/018BZ01A.json
@@ -1 +1 @@
-{"batchcode": "018BZ01A", "histograms": [{"batchcodes": ["018BZ01A"], "histogram": {"Body temperature": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "018BZ01A", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["018BZ01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018BZ1A.json b/docs/data/histograms/United States/018BZ1A.json
index 36e81fae2f4..4f177cf580f 100644
--- a/docs/data/histograms/United States/018BZ1A.json
+++ b/docs/data/histograms/United States/018BZ1A.json
@@ -1 +1 @@
-{"batchcode": "018BZ1A", "histograms": [{"batchcodes": ["018BZ1A"], "histogram": {"Anaphylactic reaction": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Chest pain": 1, "Decreased appetite": 1, "Dreamy state": 1, "Dysphonia": 1, "Dyspnoea": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Seizure": 1, "Sensory loss": 1, "Stomatitis": 1, "Swelling": 1, "Tinnitus": 1, "Tongue disorder": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vision blurred": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "018BZ1A", "histograms": [{"histogram": {"Anaphylactic reaction": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Chest pain": 1, "Decreased appetite": 1, "Dreamy state": 1, "Dysphonia": 1, "Dyspnoea": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pain": 1, "Seizure": 1, "Sensory loss": 1, "Stomatitis": 1, "Swelling": 1, "Tinnitus": 1, "Tongue disorder": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site reaction": 1, "Vision blurred": 1, "Weight decreased": 1}, "batchcodes": ["018BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018BZIA.json b/docs/data/histograms/United States/018BZIA.json
index 7344d67fbd8..6b356607bfe 100644
--- a/docs/data/histograms/United States/018BZIA.json
+++ b/docs/data/histograms/United States/018BZIA.json
@@ -1 +1 @@
-{"batchcode": "018BZIA", "histograms": [{"batchcodes": ["018BZIA"], "histogram": {"Fatigue": 1, "Feeling hot": 1, "Glycosylated haemoglobin": 1, "Hyperhidrosis": 1, "Illness": 1, "Inflammation": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Somnolence": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "018BZIA", "histograms": [{"histogram": {"Fatigue": 1, "Feeling hot": 1, "Glycosylated haemoglobin": 1, "Hyperhidrosis": 1, "Illness": 1, "Inflammation": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Somnolence": 1, "Vaccination complication": 1}, "batchcodes": ["018BZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018C21A.json b/docs/data/histograms/United States/018C21A.json
index f6f4c995937..dafe9c3c12b 100644
--- a/docs/data/histograms/United States/018C21A.json
+++ b/docs/data/histograms/United States/018C21A.json
@@ -1 +1 @@
-{"batchcode": "018C21A", "histograms": [{"batchcodes": ["018C21A"], "histogram": {"Inappropriate schedule of product administration": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "018C21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["018C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018C22A.json b/docs/data/histograms/United States/018C22A.json
index b2c8fc66c95..31a5bdd7968 100644
--- a/docs/data/histograms/United States/018C22A.json
+++ b/docs/data/histograms/United States/018C22A.json
@@ -1 +1 @@
-{"batchcode": "018C22A", "histograms": [{"batchcodes": ["018C22A"], "histogram": {"No adverse event": 26, "Wrong product administered": 22, "Circumstance or information capable of leading to medication error": 2, "Incorrect dose administered": 2, "Accidental overdose": 1, "Product label issue": 1}}]}
\ No newline at end of file
+{"batchcode": "018C22A", "histograms": [{"histogram": {"No adverse event": 26, "Wrong product administered": 22, "Circumstance or information capable of leading to medication error": 2, "Incorrect dose administered": 2, "Accidental overdose": 1, "Product label issue": 1}, "batchcodes": ["018C22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018C621A.json b/docs/data/histograms/United States/018C621A.json
index e6395395cc6..7a1dab68dfa 100644
--- a/docs/data/histograms/United States/018C621A.json
+++ b/docs/data/histograms/United States/018C621A.json
@@ -1 +1 @@
-{"batchcode": "018C621A", "histograms": [{"batchcodes": ["018C621A"], "histogram": {"Blood test": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Insomnia": 1, "Menopause": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "018C621A", "histograms": [{"histogram": {"Blood test": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Insomnia": 1, "Menopause": 1, "Pyrexia": 1}, "batchcodes": ["018C621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018F21A.json b/docs/data/histograms/United States/018F21A.json
index 7e23106ef6b..b7768113cd6 100644
--- a/docs/data/histograms/United States/018F21A.json
+++ b/docs/data/histograms/United States/018F21A.json
@@ -1 +1 @@
-{"batchcode": "018F21A", "histograms": [{"batchcodes": ["018F21A"], "histogram": {"Accidental underdose": 3, "Expired product administered": 3, "Inappropriate schedule of product administration": 3, "SARS-CoV-2 test": 3, "COVID-19": 2, "Interchange of vaccine products": 2, "Asthenia": 1, "Chills": 1, "Concussion": 1, "Facial asymmetry": 1, "Fall": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Product storage error": 1, "Pyrexia": 1, "SARS-CoV-2 test positive": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vision blurred": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "018F21A", "histograms": [{"histogram": {"Accidental underdose": 3, "Expired product administered": 3, "Inappropriate schedule of product administration": 3, "SARS-CoV-2 test": 3, "COVID-19": 2, "Interchange of vaccine products": 2, "Asthenia": 1, "Chills": 1, "Concussion": 1, "Facial asymmetry": 1, "Fall": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Multiple sclerosis": 1, "Myalgia": 1, "Product storage error": 1, "Pyrexia": 1, "SARS-CoV-2 test positive": 1, "Urinary tract infection": 1, "Vaccination complication": 1, "Vision blurred": 1, "Visual impairment": 1}, "batchcodes": ["018F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018L20A.json b/docs/data/histograms/United States/018L20A.json
index 675a420aa4d..6af2afa4a53 100644
--- a/docs/data/histograms/United States/018L20A.json
+++ b/docs/data/histograms/United States/018L20A.json
@@ -1 +1 @@
-{"batchcode": "018L20A", "histograms": [{"batchcodes": ["018L20A"], "histogram": {"Back pain": 1, "Chills": 1, "Dyspnoea": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "018L20A", "histograms": [{"histogram": {"Back pain": 1, "Chills": 1, "Dyspnoea": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["018L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/018M20A.json b/docs/data/histograms/United States/018M20A.json
index dd6f9c4247f..4e86024b626 100644
--- a/docs/data/histograms/United States/018M20A.json
+++ b/docs/data/histograms/United States/018M20A.json
@@ -1 +1 @@
-{"batchcode": "018M20A", "histograms": [{"batchcodes": ["018M20A"], "histogram": {"Arthralgia": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Pain in extremity": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "018M20A", "histograms": [{"histogram": {"Arthralgia": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Pain in extremity": 1, "Pruritus": 1}, "batchcodes": ["018M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019021A.json b/docs/data/histograms/United States/019021A.json
index 7391a989f04..bf6ec1d8dbf 100644
--- a/docs/data/histograms/United States/019021A.json
+++ b/docs/data/histograms/United States/019021A.json
@@ -1 +1 @@
-{"batchcode": "019021A", "histograms": [{"batchcodes": ["019021A"], "histogram": {"Fatigue": 1, "Feeling hot": 1, "Hot flush": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "019021A", "histograms": [{"histogram": {"Fatigue": 1, "Feeling hot": 1, "Hot flush": 1, "Pyrexia": 1}, "batchcodes": ["019021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0191.json b/docs/data/histograms/United States/0191.json
index a0ee042e55f..21b264c93b4 100644
--- a/docs/data/histograms/United States/0191.json
+++ b/docs/data/histograms/United States/0191.json
@@ -1 +1 @@
-{"batchcode": "0191", "histograms": [{"batchcodes": ["0191"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Depression": 1, "Drug ineffective": 1, "Eating disorder": 1, "Illness": 1, "Malaise": 1, "Pain": 1, "Panic reaction": 1, "Suspected COVID-19": 1, "Ultrasound liver": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "0191", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Depression": 1, "Drug ineffective": 1, "Eating disorder": 1, "Illness": 1, "Malaise": 1, "Pain": 1, "Panic reaction": 1, "Suspected COVID-19": 1, "Ultrasound liver": 1, "Vomiting": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["0191"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01911219.json b/docs/data/histograms/United States/01911219.json
index d99c503c356..71d1ea30af0 100644
--- a/docs/data/histograms/United States/01911219.json
+++ b/docs/data/histograms/United States/01911219.json
@@ -1 +1 @@
-{"batchcode": "01911219", "histograms": [{"batchcodes": ["01911219"], "histogram": {"Dizziness": 1, "Dysgeusia": 1, "Intentional product use issue": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1, "Pelvic pain": 1, "Taste disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "01911219", "histograms": [{"histogram": {"Dizziness": 1, "Dysgeusia": 1, "Intentional product use issue": 1, "Lymphadenopathy": 1, "Pain": 1, "Pain in extremity": 1, "Pelvic pain": 1, "Taste disorder": 1}, "batchcodes": ["01911219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01932A.json b/docs/data/histograms/United States/01932A.json
index 33d3f107fdc..0693ac80219 100644
--- a/docs/data/histograms/United States/01932A.json
+++ b/docs/data/histograms/United States/01932A.json
@@ -1 +1 @@
-{"batchcode": "01932A", "histograms": [{"batchcodes": ["01932A"], "histogram": {"Dizziness": 1, "Feeling of body temperature change": 1, "Headache": 1, "Pain in extremity": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "01932A", "histograms": [{"histogram": {"Dizziness": 1, "Feeling of body temperature change": 1, "Headache": 1, "Pain in extremity": 1, "Vomiting": 1}, "batchcodes": ["01932A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019521A.json b/docs/data/histograms/United States/019521A.json
index fa0d1b403e0..ed52600bc1a 100644
--- a/docs/data/histograms/United States/019521A.json
+++ b/docs/data/histograms/United States/019521A.json
@@ -1 +1 @@
-{"batchcode": "019521A", "histograms": [{"batchcodes": ["019521A"], "histogram": {"Animal scratch": 1, "Arthralgia": 1, "Contusion": 1, "Feeling cold": 1, "Night sweats": 1, "Pain in extremity": 1, "Scab": 1}}]}
\ No newline at end of file
+{"batchcode": "019521A", "histograms": [{"histogram": {"Animal scratch": 1, "Arthralgia": 1, "Contusion": 1, "Feeling cold": 1, "Night sweats": 1, "Pain in extremity": 1, "Scab": 1}, "batchcodes": ["019521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019821A OR 0198.json b/docs/data/histograms/United States/019821A OR 0198.json
index e3102154281..caa860704f8 100644
--- a/docs/data/histograms/United States/019821A OR 0198.json
+++ b/docs/data/histograms/United States/019821A OR 0198.json
@@ -1 +1 @@
-{"batchcode": "019821A OR 0198", "histograms": [{"batchcodes": ["019821A OR 0198"], "histogram": {"Headache": 1, "Myalgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "019821A OR 0198", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1, "Vaccination site pain": 1}, "batchcodes": ["019821A OR 0198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019821A.json b/docs/data/histograms/United States/019821A.json
index 22e83b1dda6..c7a56000c4b 100644
--- a/docs/data/histograms/United States/019821A.json
+++ b/docs/data/histograms/United States/019821A.json
@@ -1 +1 @@
-{"batchcode": "019821A", "histograms": [{"batchcodes": ["019821A"], "histogram": {"Arthralgia": 2, "Muscle fatigue": 2, "Muscle spasms": 2, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Hypovitaminosis": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "019821A", "histograms": [{"histogram": {"Arthralgia": 2, "Muscle fatigue": 2, "Muscle spasms": 2, "Decreased appetite": 1, "Fatigue": 1, "Headache": 1, "Hypovitaminosis": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["019821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019A21A.json b/docs/data/histograms/United States/019A21A.json
index f50698f464b..ae4d102a0ee 100644
--- a/docs/data/histograms/United States/019A21A.json
+++ b/docs/data/histograms/United States/019A21A.json
@@ -1 +1 @@
-{"batchcode": "019A21A", "histograms": [{"batchcodes": ["019A21A"], "histogram": {"Chills": 2, "Fatigue": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Cold sweat": 1, "Dizziness": 1, "Dysgeusia": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Parosmia": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "019A21A", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Nausea": 2, "Pyrexia": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Cold sweat": 1, "Dizziness": 1, "Dysgeusia": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Myalgia": 1, "Pain in extremity": 1, "Parosmia": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["019A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019B01A.json b/docs/data/histograms/United States/019B01A.json
index c335f23a50a..343755a8cae 100644
--- a/docs/data/histograms/United States/019B01A.json
+++ b/docs/data/histograms/United States/019B01A.json
@@ -1 +1 @@
-{"batchcode": "019B01A", "histograms": [{"batchcodes": ["019B01A"], "histogram": {"Dyspnoea": 1, "Headache": 1, "Injection site pruritus": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "019B01A", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1, "Injection site pruritus": 1, "Oropharyngeal pain": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Vaccination site urticaria": 1}, "batchcodes": ["019B01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019B12A.json b/docs/data/histograms/United States/019B12A.json
index 44ed6252e52..a9f0dea2f0f 100644
--- a/docs/data/histograms/United States/019B12A.json
+++ b/docs/data/histograms/United States/019B12A.json
@@ -1 +1 @@
-{"batchcode": "019B12A", "histograms": [{"batchcodes": ["019B12A"], "histogram": {"Dizziness": 1, "Dysgeusia": 1, "Energy increased": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "019B12A", "histograms": [{"histogram": {"Dizziness": 1, "Dysgeusia": 1, "Energy increased": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1}, "batchcodes": ["019B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019B2114.json b/docs/data/histograms/United States/019B2114.json
index 35ec2b80dd8..39233e86364 100644
--- a/docs/data/histograms/United States/019B2114.json
+++ b/docs/data/histograms/United States/019B2114.json
@@ -1 +1 @@
-{"batchcode": "019B2114", "histograms": [{"batchcodes": ["019B2114"], "histogram": {"Urinary incontinence": 1}}]}
\ No newline at end of file
+{"batchcode": "019B2114", "histograms": [{"histogram": {"Urinary incontinence": 1}, "batchcodes": ["019B2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019B21A.json b/docs/data/histograms/United States/019B21A.json
index 23f0cc93eeb..34bc63e430c 100644
--- a/docs/data/histograms/United States/019B21A.json
+++ b/docs/data/histograms/United States/019B21A.json
@@ -1 +1 @@
-{"batchcode": "019B21A", "histograms": [{"batchcodes": ["019B21A"], "histogram": {"Product temperature excursion issue": 105, "Poor quality product administered": 104, "Headache": 50, "Pain in extremity": 46, "Fatigue": 40, "Pyrexia": 32, "Myalgia": 30, "Chills": 27, "Dizziness": 24, "Nausea": 23, "Vaccination site pain": 23, "Feeling abnormal": 22, "Arthralgia": 18, "Pain": 18, "Rash": 15, "Body temperature": 13, "Pruritus": 13, "Asthenia": 11, "Feeling hot": 11, "Influenza like illness": 11, "SARS-CoV-2 test": 11, "Diarrhoea": 10, "Erythema": 10, "Vaccination complication": 10, "Vaccination site erythema": 10, "Vomiting": 10, "Paraesthesia": 9, "Dyspnoea": 8, "Somnolence": 8, "Illness": 7, "Insomnia": 7, "Limb discomfort": 7, "Malaise": 7, "Product administered to patient of inappropriate age": 7, "Vaccination site swelling": 7, "Vaccination site warmth": 7, "Back pain": 6, "COVID-19": 6, "Cough": 6, "Expired product administered": 6, "Heart rate": 6, "Abdominal pain upper": 5, "Blood pressure measurement": 5, "Gait disturbance": 5, "Hypoaesthesia": 5, "Inappropriate schedule of product administration": 5, "Joint swelling": 5, "Peripheral swelling": 5, "Rash erythematous": 5, "Swelling": 5, "Tinnitus": 5, "Tremor": 5, "Vaccination site pruritus": 5, "Vaccination site rash": 5, "Heart rate increased": 4, "Hyperhidrosis": 4, "Lethargy": 4, "Loss of consciousness": 4, "Lymphadenopathy": 4, "Mobility decreased": 4, "Product dose omission issue": 4, "Rash pruritic": 4, "Swelling face": 4, "Urticaria": 4, "Blood test": 3, "Burning sensation": 3, "Chest X-ray": 3, "Decreased appetite": 3, "Disorientation": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling cold": 3, "Heavy menstrual bleeding": 3, "Herpes zoster": 3, "Hot flush": 3, "Hypotension": 3, "Magnetic resonance imaging": 3, "Menstrual disorder": 3, "Nasopharyngitis": 3, "Night sweats": 3, "Oropharyngeal pain": 3, "Pallor": 3, "Palpitations": 3, "SARS-CoV-2 test positive": 3, "Sneezing": 3, "Vaccination site induration": 3, "X-ray": 3, "Abdominal discomfort": 2, "Accidental overdose": 2, "Ageusia": 2, "Agitation": 2, "Anger": 2, "Anxiety": 2, "Asthma": 2, "Balance disorder": 2, "Blood pressure increased": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Confusional state": 2, "Depression": 2, "Dysstasia": 2, "Ear swelling": 2, "Eating disorder": 2, "Emotional disorder": 2, "Epistaxis": 2, "Essential tremor": 2, "Head discomfort": 2, "Hypersomnia": 2, "Interchange of vaccine products": 2, "Joint stiffness": 2, "Migraine": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Neck pain": 2, "Neoplasm": 2, "Nervous system disorder": 2, "Peripheral coldness": 2, "Product storage error": 2, "Productive cough": 2, "Pulmonary embolism": 2, "Rash macular": 2, "Renal pain": 2, "Rhinorrhoea": 2, "Sinus congestion": 2, "Skin discolouration": 2, "Skin warm": 2, "Sleep disorder": 2, "Swollen tongue": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "Vertigo": 2, "Visual impairment": 2, "Abdominal pain": 1, "Abnormal loss of weight": 1, "Acne": 1, "Allergy test": 1, "Anosmia": 1, "Antibody test": 1, "Aphasia": 1, "Arthritis": 1, "Asthenopia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed rest": 1, "Bedridden": 1, "Biopsy": 1, "Blindness transient": 1, "Blister": 1, "Blood calcium decreased": 1, "Blood creatine phosphokinase": 1, "Blood culture": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood uric acid": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Brain injury": 1, "Breast swelling": 1, "Breath sounds normal": 1, "Bronchospasm": 1, "C-reactive protein": 1, "Carotid artery aneurysm": 1, "Chest pain": 1, "Cold sweat": 1, "Constipation": 1, "Coordination abnormal": 1, "Crying": 1, "Culture urine": 1, "Deafness unilateral": 1, "Depressed mood": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dry skin": 1, "Dry throat": 1, "Dysgeusia": 1, "Ear infection": 1, "Ear pain": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Emotional distress": 1, "Eye discharge": 1, "Eye swelling": 1, "Facial discomfort": 1, "Fear": 1, "Feeling of body temperature change": 1, "Feelings of worthlessness": 1, "Flank pain": 1, "Flushing": 1, "Foot deformity": 1, "Full blood count": 1, "Gastrointestinal hypermotility": 1, "General physical condition normal": 1, "Gingival pain": 1, "Gout": 1, "Haematemesis": 1, "Haemoptysis": 1, "Hallucination, auditory": 1, "Head injury": 1, "Heart rate irregular": 1, "Hemiplegia": 1, "Hyperacusis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Injection site pain": 1, "Intentional dose omission": 1, "Intermenstrual bleeding": 1, "Intervertebral disc degeneration": 1, "Invasive breast carcinoma": 1, "Irritability": 1, "Joint dislocation": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menstruation delayed": 1, "Menstruation normal": 1, "Metastases to lymph nodes": 1, "Migraine with aura": 1, "Monoparesis": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle contractions involuntary": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nervousness": 1, "Ocular discomfort": 1, "Ocular hypertension": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Optic neuritis": 1, "Oral pain": 1, "Osteoarthritis": 1, "Pain in jaw": 1, "Panic attack": 1, "Panic reaction": 1, "Papilloma viral infection": 1, "Paraesthesia oral": 1, "Paranoia": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pituitary tumour benign": 1, "Positron emission tomogram": 1, "Pre-existing condition improved": 1, "Pregnancy test": 1, "Premenstrual dysphoric disorder": 1, "Premenstrual syndrome": 1, "Preoperative care": 1, "Presyncope": 1, "Product substitution issue": 1, "Psoriasis": 1, "Pulmonary thrombosis": 1, "Rash morbilliform": 1, "Rash scarlatiniform": 1, "Red blood cell sedimentation rate normal": 1, "Respiration abnormal": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 test negative": 1, "Seasonal allergy": 1, "Seizure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Serum ferritin": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin mass": 1, "Skin swelling": 1, "Sluggishness": 1, "Speech disorder": 1, "Speech sound disorder": 1, "Swelling of eyelid": 1, "Syringe issue": 1, "Tachyphrenia": 1, "Taste disorder": 1, "Tenderness": 1, "Tendon pain": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Treatment noncompliance": 1, "Troponin T": 1, "Tumour marker increased": 1, "Ultrasound scan": 1, "Ultrasound testes": 1, "Urinary incontinence": 1, "Vaccination site discolouration": 1, "Vaccination site hypersensitivity": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site nodule": 1, "Vaccination site reaction": 1, "Venous thrombosis limb": 1, "Ventricular enlargement": 1, "Vision blurred": 1, "Vitamin D": 1, "Vitamin D decreased": 1, "White blood cell count": 1, "White blood cells urine": 1}}]}
\ No newline at end of file
+{"batchcode": "019B21A", "histograms": [{"histogram": {"Product temperature excursion issue": 105, "Poor quality product administered": 104, "Headache": 50, "Pain in extremity": 46, "Fatigue": 40, "Pyrexia": 32, "Myalgia": 30, "Chills": 27, "Dizziness": 24, "Nausea": 23, "Vaccination site pain": 23, "Feeling abnormal": 22, "Arthralgia": 18, "Pain": 18, "Rash": 15, "Body temperature": 13, "Pruritus": 13, "Asthenia": 11, "Feeling hot": 11, "Influenza like illness": 11, "SARS-CoV-2 test": 11, "Diarrhoea": 10, "Erythema": 10, "Vaccination complication": 10, "Vaccination site erythema": 10, "Vomiting": 10, "Paraesthesia": 9, "Dyspnoea": 8, "Somnolence": 8, "Illness": 7, "Insomnia": 7, "Limb discomfort": 7, "Malaise": 7, "Product administered to patient of inappropriate age": 7, "Vaccination site swelling": 7, "Vaccination site warmth": 7, "Back pain": 6, "COVID-19": 6, "Cough": 6, "Expired product administered": 6, "Heart rate": 6, "Abdominal pain upper": 5, "Blood pressure measurement": 5, "Gait disturbance": 5, "Hypoaesthesia": 5, "Inappropriate schedule of product administration": 5, "Joint swelling": 5, "Peripheral swelling": 5, "Rash erythematous": 5, "Swelling": 5, "Tinnitus": 5, "Tremor": 5, "Vaccination site pruritus": 5, "Vaccination site rash": 5, "Heart rate increased": 4, "Hyperhidrosis": 4, "Lethargy": 4, "Loss of consciousness": 4, "Lymphadenopathy": 4, "Mobility decreased": 4, "Product dose omission issue": 4, "Rash pruritic": 4, "Swelling face": 4, "Urticaria": 4, "Blood test": 3, "Burning sensation": 3, "Chest X-ray": 3, "Decreased appetite": 3, "Disorientation": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling cold": 3, "Heavy menstrual bleeding": 3, "Herpes zoster": 3, "Hot flush": 3, "Hypotension": 3, "Magnetic resonance imaging": 3, "Menstrual disorder": 3, "Nasopharyngitis": 3, "Night sweats": 3, "Oropharyngeal pain": 3, "Pallor": 3, "Palpitations": 3, "SARS-CoV-2 test positive": 3, "Sneezing": 3, "Vaccination site induration": 3, "X-ray": 3, "Abdominal discomfort": 2, "Accidental overdose": 2, "Ageusia": 2, "Agitation": 2, "Anger": 2, "Anxiety": 2, "Asthma": 2, "Balance disorder": 2, "Blood pressure increased": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Confusional state": 2, "Depression": 2, "Dysstasia": 2, "Ear swelling": 2, "Eating disorder": 2, "Emotional disorder": 2, "Epistaxis": 2, "Essential tremor": 2, "Head discomfort": 2, "Hypersomnia": 2, "Interchange of vaccine products": 2, "Joint stiffness": 2, "Migraine": 2, "Muscle spasms": 2, "Muscular weakness": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Neck pain": 2, "Neoplasm": 2, "Nervous system disorder": 2, "Peripheral coldness": 2, "Product storage error": 2, "Productive cough": 2, "Pulmonary embolism": 2, "Rash macular": 2, "Renal pain": 2, "Rhinorrhoea": 2, "Sinus congestion": 2, "Skin discolouration": 2, "Skin warm": 2, "Sleep disorder": 2, "Swollen tongue": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "Vertigo": 2, "Visual impairment": 2, "Abdominal pain": 1, "Abnormal loss of weight": 1, "Acne": 1, "Allergy test": 1, "Anosmia": 1, "Antibody test": 1, "Aphasia": 1, "Arthritis": 1, "Asthenopia": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed rest": 1, "Bedridden": 1, "Biopsy": 1, "Blindness transient": 1, "Blister": 1, "Blood calcium decreased": 1, "Blood creatine phosphokinase": 1, "Blood culture": 1, "Blood glucose": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin M": 1, "Blood uric acid": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Brain injury": 1, "Breast swelling": 1, "Breath sounds normal": 1, "Bronchospasm": 1, "C-reactive protein": 1, "Carotid artery aneurysm": 1, "Chest pain": 1, "Cold sweat": 1, "Constipation": 1, "Coordination abnormal": 1, "Crying": 1, "Culture urine": 1, "Deafness unilateral": 1, "Depressed mood": 1, "Diplopia": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dry skin": 1, "Dry throat": 1, "Dysgeusia": 1, "Ear infection": 1, "Ear pain": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Emotional distress": 1, "Eye discharge": 1, "Eye swelling": 1, "Facial discomfort": 1, "Fear": 1, "Feeling of body temperature change": 1, "Feelings of worthlessness": 1, "Flank pain": 1, "Flushing": 1, "Foot deformity": 1, "Full blood count": 1, "Gastrointestinal hypermotility": 1, "General physical condition normal": 1, "Gingival pain": 1, "Gout": 1, "Haematemesis": 1, "Haemoptysis": 1, "Hallucination, auditory": 1, "Head injury": 1, "Heart rate irregular": 1, "Hemiplegia": 1, "Hyperacusis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Injection site pain": 1, "Intentional dose omission": 1, "Intermenstrual bleeding": 1, "Intervertebral disc degeneration": 1, "Invasive breast carcinoma": 1, "Irritability": 1, "Joint dislocation": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menstruation delayed": 1, "Menstruation normal": 1, "Metastases to lymph nodes": 1, "Migraine with aura": 1, "Monoparesis": 1, "Multisystem inflammatory syndrome in children": 1, "Muscle contractions involuntary": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nervousness": 1, "Ocular discomfort": 1, "Ocular hypertension": 1, "Off label use": 1, "Ophthalmic herpes zoster": 1, "Optic neuritis": 1, "Oral pain": 1, "Osteoarthritis": 1, "Pain in jaw": 1, "Panic attack": 1, "Panic reaction": 1, "Papilloma viral infection": 1, "Paraesthesia oral": 1, "Paranoia": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pituitary tumour benign": 1, "Positron emission tomogram": 1, "Pre-existing condition improved": 1, "Pregnancy test": 1, "Premenstrual dysphoric disorder": 1, "Premenstrual syndrome": 1, "Preoperative care": 1, "Presyncope": 1, "Product substitution issue": 1, "Psoriasis": 1, "Pulmonary thrombosis": 1, "Rash morbilliform": 1, "Rash scarlatiniform": 1, "Red blood cell sedimentation rate normal": 1, "Respiration abnormal": 1, "Rhabdomyolysis": 1, "SARS-CoV-2 test negative": 1, "Seasonal allergy": 1, "Seizure": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Serum ferritin": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin mass": 1, "Skin swelling": 1, "Sluggishness": 1, "Speech disorder": 1, "Speech sound disorder": 1, "Swelling of eyelid": 1, "Syringe issue": 1, "Tachyphrenia": 1, "Taste disorder": 1, "Tenderness": 1, "Tendon pain": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Treatment noncompliance": 1, "Troponin T": 1, "Tumour marker increased": 1, "Ultrasound scan": 1, "Ultrasound testes": 1, "Urinary incontinence": 1, "Vaccination site discolouration": 1, "Vaccination site hypersensitivity": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site nodule": 1, "Vaccination site reaction": 1, "Venous thrombosis limb": 1, "Ventricular enlargement": 1, "Vision blurred": 1, "Vitamin D": 1, "Vitamin D decreased": 1, "White blood cell count": 1, "White blood cells urine": 1}, "batchcodes": ["019B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019BA1A.json b/docs/data/histograms/United States/019BA1A.json
index 217ed1490e3..abb7e97741a 100644
--- a/docs/data/histograms/United States/019BA1A.json
+++ b/docs/data/histograms/United States/019BA1A.json
@@ -1 +1 @@
-{"batchcode": "019BA1A", "histograms": [{"batchcodes": ["019BA1A"], "histogram": {"Asthenia": 1}}]}
\ No newline at end of file
+{"batchcode": "019BA1A", "histograms": [{"histogram": {"Asthenia": 1}, "batchcodes": ["019BA1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019BZ1A.json b/docs/data/histograms/United States/019BZ1A.json
index 4a3dd775a4d..0ff4a013bb2 100644
--- a/docs/data/histograms/United States/019BZ1A.json
+++ b/docs/data/histograms/United States/019BZ1A.json
@@ -1 +1 @@
-{"batchcode": "019BZ1A", "histograms": [{"batchcodes": ["019BZ1A"], "histogram": {"Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "019BZ1A", "histograms": [{"histogram": {"Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["019BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019C21A.json b/docs/data/histograms/United States/019C21A.json
index 5e46fb32a18..6f48fd7b7b5 100644
--- a/docs/data/histograms/United States/019C21A.json
+++ b/docs/data/histograms/United States/019C21A.json
@@ -1 +1 @@
-{"batchcode": "019C21A", "histograms": [{"batchcodes": ["019C21A"], "histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "019C21A", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Paraesthesia": 1, "Vaccination site pain": 1}, "batchcodes": ["019C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019D21A.json b/docs/data/histograms/United States/019D21A.json
index e2ffa36560e..dba646c1185 100644
--- a/docs/data/histograms/United States/019D21A.json
+++ b/docs/data/histograms/United States/019D21A.json
@@ -1 +1 @@
-{"batchcode": "019D21A", "histograms": [{"batchcodes": ["019D21A"], "histogram": {"Fatigue": 2, "Nausea": 2, "Palpitations": 2, "Tenderness": 2, "Vaccination site erythema": 2, "Contusion": 1, "Dyspnoea": 1, "Eye swelling": 1, "Inflammation": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain in extremity": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "019D21A", "histograms": [{"histogram": {"Fatigue": 2, "Nausea": 2, "Palpitations": 2, "Tenderness": 2, "Vaccination site erythema": 2, "Contusion": 1, "Dyspnoea": 1, "Eye swelling": 1, "Inflammation": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Pain in extremity": 1, "Urticaria": 1}, "batchcodes": ["019D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019E21A.json b/docs/data/histograms/United States/019E21A.json
index 8ff0bf32009..ee8f9c50833 100644
--- a/docs/data/histograms/United States/019E21A.json
+++ b/docs/data/histograms/United States/019E21A.json
@@ -1 +1 @@
-{"batchcode": "019E21A", "histograms": [{"batchcodes": ["019E21A"], "histogram": {"Dizziness": 2, "Hypersensitivity": 1, "Meniere's disease": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Taste disorder": 1, "Throat irritation": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "019E21A", "histograms": [{"histogram": {"Dizziness": 2, "Hypersensitivity": 1, "Meniere's disease": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Taste disorder": 1, "Throat irritation": 1, "Tinnitus": 1}, "batchcodes": ["019E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019F21A.json b/docs/data/histograms/United States/019F21A.json
index 00f19f38b06..43ad3221135 100644
--- a/docs/data/histograms/United States/019F21A.json
+++ b/docs/data/histograms/United States/019F21A.json
@@ -1 +1 @@
-{"batchcode": "019F21A", "histograms": [{"batchcodes": ["019F21A", "1805031"], "histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["019F21A", "1805075 /180502"], "histogram": {"Asthenia": 1, "COVID-19 immunisation": 1, "Pain in extremity": 1, "Unevaluable event": 1}}, {"batchcodes": ["019F21A"], "histogram": {"Expired product administered": 9, "Accidental overdose": 3, "Fatigue": 3, "Vaccination site pain": 3, "Body temperature": 2, "Chills": 2, "Headache": 2, "Pain in extremity": 2, "Product storage error": 2, "Pyrexia": 2, "Rash": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Breast pain": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Gastritis": 1, "Heart rate": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Lethargy": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Myalgia": 1, "Pain": 1, "Palpitations": 1, "Product administered to patient of inappropriate age": 1, "Product dose omission issue": 1, "Rash erythematous": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Stress at work": 1, "Swelling": 1, "Tremor": 1, "Vaccination site mass": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "019F21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}, "batchcodes": ["019F21A", "1805031"]}, {"histogram": {"Asthenia": 1, "COVID-19 immunisation": 1, "Pain in extremity": 1, "Unevaluable event": 1}, "batchcodes": ["019F21A", "1805075 /180502"]}, {"histogram": {"Expired product administered": 9, "Accidental overdose": 3, "Fatigue": 3, "Vaccination site pain": 3, "Body temperature": 2, "Chills": 2, "Headache": 2, "Pain in extremity": 2, "Product storage error": 2, "Pyrexia": 2, "Rash": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Breast pain": 1, "Chest discomfort": 1, "Decreased appetite": 1, "Gastritis": 1, "Heart rate": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Lethargy": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Mobility decreased": 1, "Myalgia": 1, "Pain": 1, "Palpitations": 1, "Product administered to patient of inappropriate age": 1, "Product dose omission issue": 1, "Rash erythematous": 1, "SARS-CoV-2 test": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Stress at work": 1, "Swelling": 1, "Tremor": 1, "Vaccination site mass": 1, "Yawning": 1}, "batchcodes": ["019F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019H22A, 015H22.json b/docs/data/histograms/United States/019H22A, 015H22.json
index d816e50b7d9..f56b1890c4a 100644
--- a/docs/data/histograms/United States/019H22A, 015H22.json
+++ b/docs/data/histograms/United States/019H22A, 015H22.json
@@ -1 +1 @@
-{"batchcode": "019H22A, 015H22", "histograms": [{"batchcodes": ["019H22A, 015H22"], "histogram": {"Expired product administered": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "019H22A, 015H22", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1}, "batchcodes": ["019H22A, 015H22"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019H22A.json b/docs/data/histograms/United States/019H22A.json
index c430a8d8502..b61392532b4 100644
--- a/docs/data/histograms/United States/019H22A.json
+++ b/docs/data/histograms/United States/019H22A.json
@@ -1 +1 @@
-{"batchcode": "019H22A", "histograms": [{"batchcodes": ["019H22A"], "histogram": {"No adverse event": 29, "Expired product administered": 23, "Product storage error": 6, "Wrong product administered": 3, "Accidental overdose": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Chills": 1, "Computerised tomogram": 1, "Device connection issue": 1, "Erythema": 1, "Fatigue": 1, "Feeling cold": 1, "Groin pain": 1, "Headache": 1, "Herpes zoster": 1, "Hypertension": 1, "Impaired work ability": 1, "Interchange of vaccine products": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Muscle strain": 1, "Muscle twitching": 1, "Myalgia": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Skin burning sensation": 1, "Skin sensitisation": 1, "Swelling": 1, "Swelling face": 1, "Tremor": 1, "Underdose": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "019H22A", "histograms": [{"histogram": {"No adverse event": 29, "Expired product administered": 23, "Product storage error": 6, "Wrong product administered": 3, "Accidental overdose": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Chills": 1, "Computerised tomogram": 1, "Device connection issue": 1, "Erythema": 1, "Fatigue": 1, "Feeling cold": 1, "Groin pain": 1, "Headache": 1, "Herpes zoster": 1, "Hypertension": 1, "Impaired work ability": 1, "Interchange of vaccine products": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Muscle strain": 1, "Muscle twitching": 1, "Myalgia": 1, "Neck pain": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Skin burning sensation": 1, "Skin sensitisation": 1, "Swelling": 1, "Swelling face": 1, "Tremor": 1, "Underdose": 1, "Vaccination site pain": 1}, "batchcodes": ["019H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019J21A.json b/docs/data/histograms/United States/019J21A.json
index 8ea58dd4dbf..92e5e62e7ac 100644
--- a/docs/data/histograms/United States/019J21A.json
+++ b/docs/data/histograms/United States/019J21A.json
@@ -1 +1 @@
-{"batchcode": "019J21A", "histograms": [{"batchcodes": ["019J21A"], "histogram": {"Sleep disorder": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "019J21A", "histograms": [{"histogram": {"Sleep disorder": 1, "Vaccination site pain": 1}, "batchcodes": ["019J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019K20A.json b/docs/data/histograms/United States/019K20A.json
index 31a1fb76f29..1cda6433167 100644
--- a/docs/data/histograms/United States/019K20A.json
+++ b/docs/data/histograms/United States/019K20A.json
@@ -1 +1 @@
-{"batchcode": "019K20A", "histograms": [{"batchcodes": ["019K20A"], "histogram": {"Arthritis bacterial": 1}}]}
\ No newline at end of file
+{"batchcode": "019K20A", "histograms": [{"histogram": {"Arthritis bacterial": 1}, "batchcodes": ["019K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019M209.json b/docs/data/histograms/United States/019M209.json
index 4bd8a64d52b..c1551c2b874 100644
--- a/docs/data/histograms/United States/019M209.json
+++ b/docs/data/histograms/United States/019M209.json
@@ -1 +1 @@
-{"batchcode": "019M209", "histograms": [{"batchcodes": ["019M209"], "histogram": {"Disturbance in social behaviour": 1, "Feeling abnormal": 1, "Groin pain": 1, "Impaired driving ability": 1, "Joint injury": 1, "Muscular weakness": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "019M209", "histograms": [{"histogram": {"Disturbance in social behaviour": 1, "Feeling abnormal": 1, "Groin pain": 1, "Impaired driving ability": 1, "Joint injury": 1, "Muscular weakness": 1, "Myalgia": 1}, "batchcodes": ["019M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019M20A OR 014M.json b/docs/data/histograms/United States/019M20A OR 014M.json
index da8543fc776..242bda51f62 100644
--- a/docs/data/histograms/United States/019M20A OR 014M.json
+++ b/docs/data/histograms/United States/019M20A OR 014M.json
@@ -1 +1 @@
-{"batchcode": "019M20A OR 014M", "histograms": [{"batchcodes": ["019M20A OR 014M"], "histogram": {"Fatigue": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "019M20A OR 014M", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1}, "batchcodes": ["019M20A OR 014M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019M20A.json b/docs/data/histograms/United States/019M20A.json
index 016577c6810..d06b58f1a67 100644
--- a/docs/data/histograms/United States/019M20A.json
+++ b/docs/data/histograms/United States/019M20A.json
@@ -1 +1 @@
-{"batchcode": "019M20A", "histograms": [{"batchcodes": ["019M20A"], "histogram": {"Exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "019M20A", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["019M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019M20A/ 014M20.json b/docs/data/histograms/United States/019M20A/ 014M20.json
index a0b42607fdc..34b1c9da363 100644
--- a/docs/data/histograms/United States/019M20A/ 014M20.json
+++ b/docs/data/histograms/United States/019M20A/ 014M20.json
@@ -1 +1 @@
-{"batchcode": "019M20A/ 014M20", "histograms": [{"batchcodes": ["019M20A/ 014M20"], "histogram": {"Abdominal discomfort": 1, "Feeling abnormal": 1, "Headache": 1, "Herpes zoster": 1, "Malaise": 1, "Nausea": 1, "Rash": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "019M20A/ 014M20", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Feeling abnormal": 1, "Headache": 1, "Herpes zoster": 1, "Malaise": 1, "Nausea": 1, "Rash": 1, "Vaccination complication": 1}, "batchcodes": ["019M20A/ 014M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/019M20A/014M20A.json b/docs/data/histograms/United States/019M20A/014M20A.json
index bf42bd6a7ee..efa2f8185f6 100644
--- a/docs/data/histograms/United States/019M20A/014M20A.json
+++ b/docs/data/histograms/United States/019M20A/014M20A.json
@@ -1 +1 @@
-{"batchcode": "019M20A/014M20A", "histograms": [{"batchcodes": ["019M20A/014M20A"], "histogram": {"Abdominal discomfort": 1, "Chills": 1, "Fatigue": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "019M20A/014M20A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Chills": 1, "Fatigue": 1, "Vomiting": 1}, "batchcodes": ["019M20A/014M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01A21A.json b/docs/data/histograms/United States/01A21A.json
index 36f0a038222..2f82b132146 100644
--- a/docs/data/histograms/United States/01A21A.json
+++ b/docs/data/histograms/United States/01A21A.json
@@ -1 +1 @@
-{"batchcode": "01A21A", "histograms": [{"batchcodes": ["01A21A"], "histogram": {"Headache": 4, "Vaccination site pain": 3, "Asthenia": 2, "Dizziness": 2, "Chills": 1, "Fall": 1, "Gait disturbance": 1, "Head injury": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Insomnia": 1, "Malaise": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "01A21A", "histograms": [{"histogram": {"Headache": 4, "Vaccination site pain": 3, "Asthenia": 2, "Dizziness": 2, "Chills": 1, "Fall": 1, "Gait disturbance": 1, "Head injury": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Insomnia": 1, "Malaise": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["01A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01AB21A.json b/docs/data/histograms/United States/01AB21A.json
index 222de3793ea..5e17dbe7128 100644
--- a/docs/data/histograms/United States/01AB21A.json
+++ b/docs/data/histograms/United States/01AB21A.json
@@ -1 +1 @@
-{"batchcode": "01AB21A", "histograms": [{"batchcodes": ["01AB21A"], "histogram": {"Body temperature": 1, "Diarrhoea": 1, "Nausea": 1, "Pyrexia": 1, "Sleep disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "01AB21A", "histograms": [{"histogram": {"Body temperature": 1, "Diarrhoea": 1, "Nausea": 1, "Pyrexia": 1, "Sleep disorder": 1, "Vomiting": 1}, "batchcodes": ["01AB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01B21A.json b/docs/data/histograms/United States/01B21A.json
index 2449021869a..e8f71f5120f 100644
--- a/docs/data/histograms/United States/01B21A.json
+++ b/docs/data/histograms/United States/01B21A.json
@@ -1 +1 @@
-{"batchcode": "01B21A", "histograms": [{"batchcodes": ["01B21A"], "histogram": {"Fatigue": 2, "Pain in extremity": 2, "Pyrexia": 2, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nasal congestion": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "01B21A", "histograms": [{"histogram": {"Fatigue": 2, "Pain in extremity": 2, "Pyrexia": 2, "Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nasal congestion": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["01B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01B22A.json b/docs/data/histograms/United States/01B22A.json
index b1e4b565102..756e179c985 100644
--- a/docs/data/histograms/United States/01B22A.json
+++ b/docs/data/histograms/United States/01B22A.json
@@ -1 +1 @@
-{"batchcode": "01B22A", "histograms": [{"batchcodes": ["01B22A"], "histogram": {"Inappropriate schedule of product administration": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "01B22A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["01B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01BZ11A.json b/docs/data/histograms/United States/01BZ11A.json
index 099f2309f34..a473f6e1c19 100644
--- a/docs/data/histograms/United States/01BZ11A.json
+++ b/docs/data/histograms/United States/01BZ11A.json
@@ -1 +1 @@
-{"batchcode": "01BZ11A", "histograms": [{"batchcodes": ["01BZ11A"], "histogram": {"Device connection issue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01BZ11A", "histograms": [{"histogram": {"Device connection issue": 1, "Vaccination site pain": 1}, "batchcodes": ["01BZ11A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01CA21A.json b/docs/data/histograms/United States/01CA21A.json
index eb7059baee3..9ce37ae4b98 100644
--- a/docs/data/histograms/United States/01CA21A.json
+++ b/docs/data/histograms/United States/01CA21A.json
@@ -1 +1 @@
-{"batchcode": "01CA21A", "histograms": [{"batchcodes": ["01CA21A"], "histogram": {"Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "01CA21A", "histograms": [{"histogram": {"Rash erythematous": 1}, "batchcodes": ["01CA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01D021A.json b/docs/data/histograms/United States/01D021A.json
index 89244de1b62..e703e4621ac 100644
--- a/docs/data/histograms/United States/01D021A.json
+++ b/docs/data/histograms/United States/01D021A.json
@@ -1 +1 @@
-{"batchcode": "01D021A", "histograms": [{"batchcodes": ["01D021A"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "01D021A", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["01D021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01DA21A.json b/docs/data/histograms/United States/01DA21A.json
index e2b666fefed..a13ce3604f4 100644
--- a/docs/data/histograms/United States/01DA21A.json
+++ b/docs/data/histograms/United States/01DA21A.json
@@ -1 +1 @@
-{"batchcode": "01DA21A", "histograms": [{"batchcodes": ["01DA21A"], "histogram": {"Diarrhoea": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "01DA21A", "histograms": [{"histogram": {"Diarrhoea": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pruritus": 1}, "batchcodes": ["01DA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01DA2ZA.json b/docs/data/histograms/United States/01DA2ZA.json
index a0e7de529b5..2d634979350 100644
--- a/docs/data/histograms/United States/01DA2ZA.json
+++ b/docs/data/histograms/United States/01DA2ZA.json
@@ -1 +1 @@
-{"batchcode": "01DA2ZA", "histograms": [{"batchcodes": ["01DA2ZA"], "histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01DA2ZA", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["01DA2ZA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01DM20A.json b/docs/data/histograms/United States/01DM20A.json
index dbc13f4e371..d27a5574c2c 100644
--- a/docs/data/histograms/United States/01DM20A.json
+++ b/docs/data/histograms/United States/01DM20A.json
@@ -1 +1 @@
-{"batchcode": "01DM20A", "histograms": [{"batchcodes": ["01DM20A"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "01DM20A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["01DM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01EJ20A.json b/docs/data/histograms/United States/01EJ20A.json
index 974b17a8653..f2bf908a72c 100644
--- a/docs/data/histograms/United States/01EJ20A.json
+++ b/docs/data/histograms/United States/01EJ20A.json
@@ -1 +1 @@
-{"batchcode": "01EJ20A", "histograms": [{"batchcodes": ["01EJ20A"], "histogram": {"Headache": 1, "Injection site pain": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "01EJ20A", "histograms": [{"histogram": {"Headache": 1, "Injection site pain": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["01EJ20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01FE21A.json b/docs/data/histograms/United States/01FE21A.json
index a52444701a8..9000befa2aa 100644
--- a/docs/data/histograms/United States/01FE21A.json
+++ b/docs/data/histograms/United States/01FE21A.json
@@ -1 +1 @@
-{"batchcode": "01FE21A", "histograms": [{"batchcodes": ["01FE21A"], "histogram": {"Condition aggravated": 1, "Influenza": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site discomfort": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "01FE21A", "histograms": [{"histogram": {"Condition aggravated": 1, "Influenza": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site discomfort": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["01FE21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01IJ20A.json b/docs/data/histograms/United States/01IJ20A.json
index bc891bb0b2f..63c33fe8bcd 100644
--- a/docs/data/histograms/United States/01IJ20A.json
+++ b/docs/data/histograms/United States/01IJ20A.json
@@ -1 +1 @@
-{"batchcode": "01IJ20A", "histograms": [{"batchcodes": ["01IJ20A"], "histogram": {"Blood glucose decreased": 2, "Blood glucose abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "01IJ20A", "histograms": [{"histogram": {"Blood glucose decreased": 2, "Blood glucose abnormal": 1}, "batchcodes": ["01IJ20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01J20A.json b/docs/data/histograms/United States/01J20A.json
index ab3bc27ceb0..598c846738f 100644
--- a/docs/data/histograms/United States/01J20A.json
+++ b/docs/data/histograms/United States/01J20A.json
@@ -1 +1 @@
-{"batchcode": "01J20A", "histograms": [{"batchcodes": ["01J20A"], "histogram": {"Headache": 3, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Chills": 1, "Discomfort": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Muscle fatigue": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pregnancy": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site infection": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "01J20A", "histograms": [{"histogram": {"Headache": 3, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Chills": 1, "Discomfort": 1, "Exposure during pregnancy": 1, "Fatigue": 1, "Muscle fatigue": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pregnancy": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site infection": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["01J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01J21A.json b/docs/data/histograms/United States/01J21A.json
index 2709ae23ca2..a00278d04c1 100644
--- a/docs/data/histograms/United States/01J21A.json
+++ b/docs/data/histograms/United States/01J21A.json
@@ -1 +1 @@
-{"batchcode": "01J21A", "histograms": [{"batchcodes": ["01J21A"], "histogram": {"Dysgeusia": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Mastication disorder": 1, "Pain": 1, "Presyncope": 1, "Sensory loss": 1}}]}
\ No newline at end of file
+{"batchcode": "01J21A", "histograms": [{"histogram": {"Dysgeusia": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Mastication disorder": 1, "Pain": 1, "Presyncope": 1, "Sensory loss": 1}, "batchcodes": ["01J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01K20A.json b/docs/data/histograms/United States/01K20A.json
index 38f4e34b0dd..507bc6bc140 100644
--- a/docs/data/histograms/United States/01K20A.json
+++ b/docs/data/histograms/United States/01K20A.json
@@ -1 +1 @@
-{"batchcode": "01K20A", "histograms": [{"batchcodes": ["01K20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "01K20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["01K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01L20A.json b/docs/data/histograms/United States/01L20A.json
index f12cde87c94..0ba4cba353f 100644
--- a/docs/data/histograms/United States/01L20A.json
+++ b/docs/data/histograms/United States/01L20A.json
@@ -1 +1 @@
-{"batchcode": "01L20A", "histograms": [{"batchcodes": ["01L20A"], "histogram": {"Fatigue": 5, "Dyspnoea": 3, "Pyrexia": 3, "Chills": 2, "Feeding disorder": 2, "Gait disturbance": 2, "Pain in extremity": 2, "Asthenia": 1, "Axillary pain": 1, "Erythema": 1, "Headache": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Mammogram": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Night sweats": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01L20A", "histograms": [{"histogram": {"Fatigue": 5, "Dyspnoea": 3, "Pyrexia": 3, "Chills": 2, "Feeding disorder": 2, "Gait disturbance": 2, "Pain in extremity": 2, "Asthenia": 1, "Axillary pain": 1, "Erythema": 1, "Headache": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Mammogram": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Night sweats": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}, "batchcodes": ["01L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01LA21A.json b/docs/data/histograms/United States/01LA21A.json
index a8962c4e49c..864f4e1e116 100644
--- a/docs/data/histograms/United States/01LA21A.json
+++ b/docs/data/histograms/United States/01LA21A.json
@@ -1 +1 @@
-{"batchcode": "01LA21A", "histograms": [{"batchcodes": ["01LA21A"], "histogram": {"Fatigue": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "01LA21A", "histograms": [{"histogram": {"Fatigue": 1, "Myalgia": 1}, "batchcodes": ["01LA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01LJ20A.json b/docs/data/histograms/United States/01LJ20A.json
index ae9bdc26d81..f5e3730c2c4 100644
--- a/docs/data/histograms/United States/01LJ20A.json
+++ b/docs/data/histograms/United States/01LJ20A.json
@@ -1 +1 @@
-{"batchcode": "01LJ20A", "histograms": [{"batchcodes": ["01LJ20A"], "histogram": {"Body temperature": 1, "Headache": 1, "Lethargy": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test negative": 1, "Viral test negative": 1}}]}
\ No newline at end of file
+{"batchcode": "01LJ20A", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Lethargy": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test negative": 1, "Viral test negative": 1}, "batchcodes": ["01LJ20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01LZ0A.json b/docs/data/histograms/United States/01LZ0A.json
index 6ccf356a7e2..18ed0a165c5 100644
--- a/docs/data/histograms/United States/01LZ0A.json
+++ b/docs/data/histograms/United States/01LZ0A.json
@@ -1 +1 @@
-{"batchcode": "01LZ0A", "histograms": [{"batchcodes": ["01LZ0A"], "histogram": {"Hypoaesthesia": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "01LZ0A", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1}, "batchcodes": ["01LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01M20A.json b/docs/data/histograms/United States/01M20A.json
index f95397bfdbd..d8ded45c776 100644
--- a/docs/data/histograms/United States/01M20A.json
+++ b/docs/data/histograms/United States/01M20A.json
@@ -1 +1 @@
-{"batchcode": "01M20A", "histograms": [{"batchcodes": ["01M20A"], "histogram": {"Fatigue": 3, "Pyrexia": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Condition aggravated": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Injection site pain": 1, "Lymphoedema": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Rash": 1, "Rash erythematous": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "01M20A", "histograms": [{"histogram": {"Fatigue": 3, "Pyrexia": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Condition aggravated": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Injection site pain": 1, "Lymphoedema": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Rash": 1, "Rash erythematous": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["01M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01SL20A.json b/docs/data/histograms/United States/01SL20A.json
index 51322a5290b..c04e2603ed2 100644
--- a/docs/data/histograms/United States/01SL20A.json
+++ b/docs/data/histograms/United States/01SL20A.json
@@ -1 +1 @@
-{"batchcode": "01SL20A", "histograms": [{"batchcodes": ["01SL20A"], "histogram": {"Balance disorder": 1, "Gait disturbance": 1, "Insomnia": 1}}]}
\ No newline at end of file
+{"batchcode": "01SL20A", "histograms": [{"histogram": {"Balance disorder": 1, "Gait disturbance": 1, "Insomnia": 1}, "batchcodes": ["01SL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01SM20.json b/docs/data/histograms/United States/01SM20.json
index d0bdcaf2890..4c97c4ea7cd 100644
--- a/docs/data/histograms/United States/01SM20.json
+++ b/docs/data/histograms/United States/01SM20.json
@@ -1 +1 @@
-{"batchcode": "01SM20", "histograms": [{"batchcodes": ["01SM20"], "histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "01SM20", "histograms": [{"histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Pyrexia": 1}, "batchcodes": ["01SM20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01SM201A.json b/docs/data/histograms/United States/01SM201A.json
index 926400a2766..28a4180a7a8 100644
--- a/docs/data/histograms/United States/01SM201A.json
+++ b/docs/data/histograms/United States/01SM201A.json
@@ -1 +1 @@
-{"batchcode": "01SM201A", "histograms": [{"batchcodes": ["01SM201A"], "histogram": {"Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "01SM201A", "histograms": [{"histogram": {"Vaccination site mass": 1}, "batchcodes": ["01SM201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01SM264.json b/docs/data/histograms/United States/01SM264.json
index 8e76a2f4bb9..412f42cbfe8 100644
--- a/docs/data/histograms/United States/01SM264.json
+++ b/docs/data/histograms/United States/01SM264.json
@@ -1 +1 @@
-{"batchcode": "01SM264", "histograms": [{"batchcodes": ["01SM264"], "histogram": {"Fatigue": 1, "Lethargy": 1}}]}
\ No newline at end of file
+{"batchcode": "01SM264", "histograms": [{"histogram": {"Fatigue": 1, "Lethargy": 1}, "batchcodes": ["01SM264"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01SMZ0A.json b/docs/data/histograms/United States/01SMZ0A.json
index 683ac3cc62c..d79e100e1fd 100644
--- a/docs/data/histograms/United States/01SMZ0A.json
+++ b/docs/data/histograms/United States/01SMZ0A.json
@@ -1 +1 @@
-{"batchcode": "01SMZ0A", "histograms": [{"batchcodes": ["01SMZ0A"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Benign breast neoplasm": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Trigger finger": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "01SMZ0A", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Benign breast neoplasm": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Mobility decreased": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Trigger finger": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site swelling": 1}, "batchcodes": ["01SMZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01T21-2A.json b/docs/data/histograms/United States/01T21-2A.json
index d477b479175..e609e198824 100644
--- a/docs/data/histograms/United States/01T21-2A.json
+++ b/docs/data/histograms/United States/01T21-2A.json
@@ -1 +1 @@
-{"batchcode": "01T21-2A", "histograms": [{"batchcodes": ["01T21-2A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "01T21-2A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["01T21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01ZAZ1A.json b/docs/data/histograms/United States/01ZAZ1A.json
index 5b2f31f5e01..7492ab3ab9b 100644
--- a/docs/data/histograms/United States/01ZAZ1A.json
+++ b/docs/data/histograms/United States/01ZAZ1A.json
@@ -1 +1 @@
-{"batchcode": "01ZAZ1A", "histograms": [{"batchcodes": ["01ZAZ1A"], "histogram": {"Chlamydia test": 1, "Chlamydia test positive": 1, "Feeling cold": 1, "Incorrect dose administered": 1, "Vaccination site discharge": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01ZAZ1A", "histograms": [{"histogram": {"Chlamydia test": 1, "Chlamydia test positive": 1, "Feeling cold": 1, "Incorrect dose administered": 1, "Vaccination site discharge": 1, "Vaccination site pain": 1}, "batchcodes": ["01ZAZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01ZC207.json b/docs/data/histograms/United States/01ZC207.json
index 8fa37287b73..73076fa9d4a 100644
--- a/docs/data/histograms/United States/01ZC207.json
+++ b/docs/data/histograms/United States/01ZC207.json
@@ -1 +1 @@
-{"batchcode": "01ZC207", "histograms": [{"batchcodes": ["01ZC207"], "histogram": {"Abdominal discomfort": 1, "Fall": 1, "Flushing": 1, "Loss of consciousness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "01ZC207", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Fall": 1, "Flushing": 1, "Loss of consciousness": 1, "Vaccination site pain": 1}, "batchcodes": ["01ZC207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/01ZLZA.json b/docs/data/histograms/United States/01ZLZA.json
index 892d9a95fec..cbedf307410 100644
--- a/docs/data/histograms/United States/01ZLZA.json
+++ b/docs/data/histograms/United States/01ZLZA.json
@@ -1 +1 @@
-{"batchcode": "01ZLZA", "histograms": [{"batchcodes": ["01ZLZA"], "histogram": {"Cough": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain in extremity": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "01ZLZA", "histograms": [{"histogram": {"Cough": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain in extremity": 1, "Somnolence": 1}, "batchcodes": ["01ZLZA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02-2A20A.json b/docs/data/histograms/United States/02-2A20A.json
index 1ed2a33f401..68f0dcb03ac 100644
--- a/docs/data/histograms/United States/02-2A20A.json
+++ b/docs/data/histograms/United States/02-2A20A.json
@@ -1 +1 @@
-{"batchcode": "02-2A20A", "histograms": [{"batchcodes": ["02-2A20A"], "histogram": {"Asthenia": 1, "Bedridden": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling of relaxation": 1, "Headache": 1, "Hypoacusis": 1, "Illness": 1, "Myalgia": 1, "Tinnitus": 1, "Vertigo": 1, "Viral infection": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "02-2A20A", "histograms": [{"histogram": {"Asthenia": 1, "Bedridden": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling of relaxation": 1, "Headache": 1, "Hypoacusis": 1, "Illness": 1, "Myalgia": 1, "Tinnitus": 1, "Vertigo": 1, "Viral infection": 1, "Vomiting": 1}, "batchcodes": ["02-2A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020-821A.json b/docs/data/histograms/United States/020-821A.json
index 0d9b0b1abb2..9af69687e53 100644
--- a/docs/data/histograms/United States/020-821A.json
+++ b/docs/data/histograms/United States/020-821A.json
@@ -1 +1 @@
-{"batchcode": "020-821A", "histograms": [{"batchcodes": ["020-821A"], "histogram": {"Joint stiffness": 1}}]}
\ No newline at end of file
+{"batchcode": "020-821A", "histograms": [{"histogram": {"Joint stiffness": 1}, "batchcodes": ["020-821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020120A.json b/docs/data/histograms/United States/020120A.json
index 71741c63eb5..607bbb84858 100644
--- a/docs/data/histograms/United States/020120A.json
+++ b/docs/data/histograms/United States/020120A.json
@@ -1 +1 @@
-{"batchcode": "020120A", "histograms": [{"batchcodes": ["020120A"], "histogram": {"Fatigue": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "020120A", "histograms": [{"histogram": {"Fatigue": 1, "Pain in extremity": 1}, "batchcodes": ["020120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0201321A.json b/docs/data/histograms/United States/0201321A.json
index a2d456c9cf1..64bc67c27e2 100644
--- a/docs/data/histograms/United States/0201321A.json
+++ b/docs/data/histograms/United States/0201321A.json
@@ -1 +1 @@
-{"batchcode": "0201321A", "histograms": [{"batchcodes": ["0201321A"], "histogram": {"Dizziness": 1, "Headache": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pain in extremity": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "0201321A", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pain in extremity": 1, "Tremor": 1}, "batchcodes": ["0201321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02020M20A.json b/docs/data/histograms/United States/02020M20A.json
index e2dfd627f39..4884608c726 100644
--- a/docs/data/histograms/United States/02020M20A.json
+++ b/docs/data/histograms/United States/02020M20A.json
@@ -1 +1 @@
-{"batchcode": "02020M20A", "histograms": [{"batchcodes": ["02020M20A"], "histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Headache": 1, "Injection site pain": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02020M20A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Headache": 1, "Injection site pain": 1, "Pain": 1}, "batchcodes": ["02020M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0205L20A.json b/docs/data/histograms/United States/0205L20A.json
index 01223200a10..87cd280e9e2 100644
--- a/docs/data/histograms/United States/0205L20A.json
+++ b/docs/data/histograms/United States/0205L20A.json
@@ -1 +1 @@
-{"batchcode": "0205L20A", "histograms": [{"batchcodes": ["0205L20A"], "histogram": {"Gait disturbance": 1, "Myalgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0205L20A", "histograms": [{"histogram": {"Gait disturbance": 1, "Myalgia": 1, "Vaccination site pain": 1}, "batchcodes": ["0205L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020821A.json b/docs/data/histograms/United States/020821A.json
index ef01ebe6b90..c6b0ec837ca 100644
--- a/docs/data/histograms/United States/020821A.json
+++ b/docs/data/histograms/United States/020821A.json
@@ -1 +1 @@
-{"batchcode": "020821A", "histograms": [{"batchcodes": ["020821A"], "histogram": {"Feeling abnormal": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "020821A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Tinnitus": 1}, "batchcodes": ["020821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0208L20A.json b/docs/data/histograms/United States/0208L20A.json
index 77ad1679764..f16381c8b38 100644
--- a/docs/data/histograms/United States/0208L20A.json
+++ b/docs/data/histograms/United States/0208L20A.json
@@ -1 +1 @@
-{"batchcode": "0208L20A", "histograms": [{"batchcodes": ["0208L20A"], "histogram": {"Cold sweat": 1, "Exposure to SARS-CoV-2": 1, "Hyperhidrosis": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "0208L20A", "histograms": [{"histogram": {"Cold sweat": 1, "Exposure to SARS-CoV-2": 1, "Hyperhidrosis": 1, "Suspected COVID-19": 1}, "batchcodes": ["0208L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0209L20A.json b/docs/data/histograms/United States/0209L20A.json
index 1659c11970d..90465b25d6f 100644
--- a/docs/data/histograms/United States/0209L20A.json
+++ b/docs/data/histograms/United States/0209L20A.json
@@ -1 +1 @@
-{"batchcode": "0209L20A", "histograms": [{"batchcodes": ["0209L20A"], "histogram": {"Adverse reaction": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Myalgia": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site induration": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "0209L20A", "histograms": [{"histogram": {"Adverse reaction": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Myalgia": 1, "Pyrexia": 1, "Sensitive skin": 1, "Vaccination site induration": 1, "Vaccination site mass": 1}, "batchcodes": ["0209L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020A21A.json b/docs/data/histograms/United States/020A21A.json
index d8517bc3e03..f3beab46e52 100644
--- a/docs/data/histograms/United States/020A21A.json
+++ b/docs/data/histograms/United States/020A21A.json
@@ -1 +1 @@
-{"batchcode": "020A21A", "histograms": [{"batchcodes": ["020A21A"], "histogram": {"Headache": 2, "Pain": 2, "Pyrexia": 2, "Adverse drug reaction": 1, "Cough": 1, "Heart rate": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Insomnia": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "020A21A", "histograms": [{"histogram": {"Headache": 2, "Pain": 2, "Pyrexia": 2, "Adverse drug reaction": 1, "Cough": 1, "Heart rate": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Insomnia": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Tachycardia": 1}, "batchcodes": ["020A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020AB21A.json b/docs/data/histograms/United States/020AB21A.json
index a45bc53dec1..a86f51f3862 100644
--- a/docs/data/histograms/United States/020AB21A.json
+++ b/docs/data/histograms/United States/020AB21A.json
@@ -1 +1 @@
-{"batchcode": "020AB21A", "histograms": [{"batchcodes": ["020AB21A"], "histogram": {"Blood pressure measurement": 1, "Dyspnoea": 1, "Heart rate": 1, "Rash": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "020AB21A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Dyspnoea": 1, "Heart rate": 1, "Rash": 1, "Throat tightness": 1}, "batchcodes": ["020AB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B12A.json b/docs/data/histograms/United States/020B12A.json
index fcd37bb9716..8ba31958c5e 100644
--- a/docs/data/histograms/United States/020B12A.json
+++ b/docs/data/histograms/United States/020B12A.json
@@ -1 +1 @@
-{"batchcode": "020B12A", "histograms": [{"batchcodes": ["020B12A"], "histogram": {"Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "020B12A", "histograms": [{"histogram": {"Peripheral swelling": 1}, "batchcodes": ["020B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B20B.json b/docs/data/histograms/United States/020B20B.json
index 3c4b9a66805..19fc202589b 100644
--- a/docs/data/histograms/United States/020B20B.json
+++ b/docs/data/histograms/United States/020B20B.json
@@ -1 +1 @@
-{"batchcode": "020B20B", "histograms": [{"batchcodes": ["020B20B"], "histogram": {"Inappropriate schedule of product administration": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "020B20B", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["020B20B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B211A.json b/docs/data/histograms/United States/020B211A.json
index a37b5871911..517eaa7fb02 100644
--- a/docs/data/histograms/United States/020B211A.json
+++ b/docs/data/histograms/United States/020B211A.json
@@ -1 +1 @@
-{"batchcode": "020B211A", "histograms": [{"batchcodes": ["020B211A"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "020B211A", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["020B211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B214.json b/docs/data/histograms/United States/020B214.json
index 023a1ad7471..5f6f72f3d67 100644
--- a/docs/data/histograms/United States/020B214.json
+++ b/docs/data/histograms/United States/020B214.json
@@ -1 +1 @@
-{"batchcode": "020B214", "histograms": [{"batchcodes": ["020B214"], "histogram": {"Fatigue": 2, "Acne": 1, "Anosmia": 1, "Chest pain": 1, "Computerised tomogram": 1, "Hypersensitivity": 1, "Lethargy": 1, "Myalgia": 1, "Myocardial necrosis marker increased": 1, "Pyrexia": 1, "Rash": 1, "SARS-CoV-2 test positive": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "020B214", "histograms": [{"histogram": {"Fatigue": 2, "Acne": 1, "Anosmia": 1, "Chest pain": 1, "Computerised tomogram": 1, "Hypersensitivity": 1, "Lethargy": 1, "Myalgia": 1, "Myocardial necrosis marker increased": 1, "Pyrexia": 1, "Rash": 1, "SARS-CoV-2 test positive": 1, "Thrombosis": 1}, "batchcodes": ["020B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B217.json b/docs/data/histograms/United States/020B217.json
index 3ce8e665477..f3649174092 100644
--- a/docs/data/histograms/United States/020B217.json
+++ b/docs/data/histograms/United States/020B217.json
@@ -1 +1 @@
-{"batchcode": "020B217", "histograms": [{"batchcodes": ["020B217"], "histogram": {"Chills": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "020B217", "histograms": [{"histogram": {"Chills": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["020B217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B21A-1.json b/docs/data/histograms/United States/020B21A-1.json
index e9481ea4548..874bccba9b0 100644
--- a/docs/data/histograms/United States/020B21A-1.json
+++ b/docs/data/histograms/United States/020B21A-1.json
@@ -1 +1 @@
-{"batchcode": "020B21A-1", "histograms": [{"batchcodes": ["020B21A-1"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "020B21A-1", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["020B21A-1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B21A.json b/docs/data/histograms/United States/020B21A.json
index bbfd9f05446..37592220436 100644
--- a/docs/data/histograms/United States/020B21A.json
+++ b/docs/data/histograms/United States/020B21A.json
@@ -1 +1 @@
-{"batchcode": "020B21A", "histograms": [{"batchcodes": ["020B21A"], "histogram": {"Pain in extremity": 40, "Fatigue": 39, "Headache": 38, "Pyrexia": 33, "Vaccination site pain": 27, "Chills": 22, "Myalgia": 22, "Pain": 21, "Nausea": 19, "Vaccination site erythema": 18, "Rash": 17, "Pruritus": 16, "Dyspnoea": 15, "Erythema": 14, "SARS-CoV-2 test": 13, "Arthralgia": 12, "Peripheral swelling": 12, "Vaccination site warmth": 12, "Asthenia": 11, "Expired product administered": 11, "Vaccination site pruritus": 11, "Vaccination site swelling": 11, "Chest pain": 10, "Feeling abnormal": 10, "Diarrhoea": 9, "Dizziness": 9, "Blood pressure measurement": 7, "Blood test": 7, "Body temperature": 7, "COVID-19": 7, "Computerised tomogram": 7, "Influenza like illness": 6, "Malaise": 6, "Product administered to patient of inappropriate age": 6, "Product dose omission issue": 6, "Urticaria": 6, "Back pain": 5, "Heart rate": 5, "Hypoaesthesia": 5, "Magnetic resonance imaging": 5, "Maternal exposure during pregnancy": 5, "Muscle spasms": 5, "Product storage error": 5, "Swelling": 5, "Tinnitus": 5, "Vaccination complication": 5, "Vaccination site induration": 5, "Vomiting": 5, "Heart rate increased": 4, "Hypertension": 4, "Inappropriate schedule of product administration": 4, "Insomnia": 4, "Paraesthesia": 4, "Somnolence": 4, "Vaccination site rash": 4, "Vaccination site reaction": 4, "Abdominal pain upper": 3, "Anxiety": 3, "Cerebrovascular accident": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Decreased appetite": 3, "Dyskinesia": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypoaesthesia oral": 3, "Illness": 3, "Injection site pain": 3, "Lethargy": 3, "Loss of personal independence in daily activities": 3, "Muscular weakness": 3, "Neck pain": 3, "Skin swelling": 3, "Swelling face": 3, "Tachycardia": 3, "Tremor": 3, "Vision blurred": 3, "Blood glucose": 2, "Contusion": 2, "Cough": 2, "Dehydration": 2, "Electrocardiogram": 2, "Eustachian tube dysfunction": 2, "Eye swelling": 2, "Fall": 2, "Feeling hot": 2, "Head discomfort": 2, "Hot flush": 2, "Induration": 2, "Injection site erythema": 2, "Injection site warmth": 2, "Joint swelling": 2, "Limb discomfort": 2, "Lymphadenopathy": 2, "Maternal exposure during breast feeding": 2, "Mobility decreased": 2, "Nasopharyngitis": 2, "No adverse event": 2, "Ocular hyperaemia": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Pain assessment": 2, "Palpitations": 2, "Paralysis": 2, "Pregnancy test": 2, "Pulmonary embolism": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "Skin warm": 2, "Sleep disorder": 2, "Swollen tongue": 2, "Thrombosis": 2, "Vaccination site discolouration": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site mass": 2, "Vertigo": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Accidental overdose": 1, "Acne": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Alopecia": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Atrial septal defect": 1, "Axillary mass": 1, "Axillary pain": 1, "Balance disorder": 1, "Bedridden": 1, "Bell's palsy": 1, "Blister": 1, "Blood cholesterol": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Bone pain": 1, "Bronchospasm": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Choking": 1, "Cognitive disorder": 1, "Colon cancer stage IV": 1, "Colonoscopy": 1, "Condition aggravated": 1, "Confusional state": 1, "Crying": 1, "Death": 1, "Depressed level of consciousness": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Discomfort": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Endoscopy": 1, "Energy increased": 1, "Exfoliative rash": 1, "Extrasystoles": 1, "Eye irritation": 1, "Eye pain": 1, "Eye pruritus": 1, "Feeling cold": 1, "Feeling guilty": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastritis": 1, "Generalised tonic-clonic seizure": 1, "Gingival pain": 1, "Guillain-Barre syndrome": 1, "Hair disorder": 1, "Hepatic enzyme": 1, "Hunger": 1, "Hypersomnia": 1, "Hypervigilance": 1, "Immunisation reaction": 1, "Increased viscosity of upper respiratory secretion": 1, "Infection": 1, "Influenza": 1, "Injection site papule": 1, "Injection site pruritus": 1, "Intentional dose omission": 1, "Intentional product misuse": 1, "Intentional product use issue": 1, "Irritability": 1, "Ischaemic stroke": 1, "Joint range of motion decreased": 1, "Laboratory test": 1, "Lip swelling": 1, "Liver function test increased": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Major depression": 1, "Mass": 1, "Mass excision": 1, "Menstruation delayed": 1, "Miliaria": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Neuralgia": 1, "Ocular discomfort": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oropharyngeal discomfort": 1, "Oxygen consumption": 1, "Pain of skin": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Pharyngeal swelling": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Pleural effusion": 1, "Post viral fatigue syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Posture abnormal": 1, "Product temperature excursion issue": 1, "Productive cough": 1, "Psoriasis": 1, "Pulmonary thrombosis": 1, "Rash erythematous": 1, "Rash maculo-papular": 1, "Rash pruritic": 1, "Retching": 1, "Rhinitis": 1, "SARS-CoV-2 antibody test": 1, "Scan myocardial perfusion": 1, "Sinusitis": 1, "Skin discolouration": 1, "Sleep apnoea syndrome": 1, "Sluggishness": 1, "Stomatitis": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Temperature difference of extremities": 1, "Thirst": 1, "Throat tightness": 1, "Thrombophlebitis superficial": 1, "Tongue discomfort": 1, "Tunnel vision": 1, "Ultrasound antenatal screen": 1, "Underdose": 1, "Upper-airway cough syndrome": 1, "Urine analysis normal": 1, "Vaccination site discomfort": 1, "Vaccination site inflammation": 1, "Vaccination site macule": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Ventricular extrasystoles": 1, "Viral test": 1, "Vomiting projectile": 1, "Wheezing": 1, "X-ray of pelvis and hip": 1}}]}
\ No newline at end of file
+{"batchcode": "020B21A", "histograms": [{"histogram": {"Pain in extremity": 40, "Fatigue": 39, "Headache": 38, "Pyrexia": 33, "Vaccination site pain": 27, "Chills": 22, "Myalgia": 22, "Pain": 21, "Nausea": 19, "Vaccination site erythema": 18, "Rash": 17, "Pruritus": 16, "Dyspnoea": 15, "Erythema": 14, "SARS-CoV-2 test": 13, "Arthralgia": 12, "Peripheral swelling": 12, "Vaccination site warmth": 12, "Asthenia": 11, "Expired product administered": 11, "Vaccination site pruritus": 11, "Vaccination site swelling": 11, "Chest pain": 10, "Feeling abnormal": 10, "Diarrhoea": 9, "Dizziness": 9, "Blood pressure measurement": 7, "Blood test": 7, "Body temperature": 7, "COVID-19": 7, "Computerised tomogram": 7, "Influenza like illness": 6, "Malaise": 6, "Product administered to patient of inappropriate age": 6, "Product dose omission issue": 6, "Urticaria": 6, "Back pain": 5, "Heart rate": 5, "Hypoaesthesia": 5, "Magnetic resonance imaging": 5, "Maternal exposure during pregnancy": 5, "Muscle spasms": 5, "Product storage error": 5, "Swelling": 5, "Tinnitus": 5, "Vaccination complication": 5, "Vaccination site induration": 5, "Vomiting": 5, "Heart rate increased": 4, "Hypertension": 4, "Inappropriate schedule of product administration": 4, "Insomnia": 4, "Paraesthesia": 4, "Somnolence": 4, "Vaccination site rash": 4, "Vaccination site reaction": 4, "Abdominal pain upper": 3, "Anxiety": 3, "Cerebrovascular accident": 3, "Chest X-ray": 3, "Chest discomfort": 3, "Decreased appetite": 3, "Dyskinesia": 3, "Herpes zoster": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Hypoaesthesia oral": 3, "Illness": 3, "Injection site pain": 3, "Lethargy": 3, "Loss of personal independence in daily activities": 3, "Muscular weakness": 3, "Neck pain": 3, "Skin swelling": 3, "Swelling face": 3, "Tachycardia": 3, "Tremor": 3, "Vision blurred": 3, "Blood glucose": 2, "Contusion": 2, "Cough": 2, "Dehydration": 2, "Electrocardiogram": 2, "Eustachian tube dysfunction": 2, "Eye swelling": 2, "Fall": 2, "Feeling hot": 2, "Head discomfort": 2, "Hot flush": 2, "Induration": 2, "Injection site erythema": 2, "Injection site warmth": 2, "Joint swelling": 2, "Limb discomfort": 2, "Lymphadenopathy": 2, "Maternal exposure during breast feeding": 2, "Mobility decreased": 2, "Nasopharyngitis": 2, "No adverse event": 2, "Ocular hyperaemia": 2, "Oropharyngeal pain": 2, "Oxygen saturation": 2, "Pain assessment": 2, "Palpitations": 2, "Paralysis": 2, "Pregnancy test": 2, "Pulmonary embolism": 2, "Rhinorrhoea": 2, "SARS-CoV-2 test positive": 2, "Skin warm": 2, "Sleep disorder": 2, "Swollen tongue": 2, "Thrombosis": 2, "Vaccination site discolouration": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site mass": 2, "Vertigo": 2, "X-ray": 2, "Abdominal discomfort": 1, "Abdominal distension": 1, "Abdominal pain": 1, "Accidental overdose": 1, "Acne": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Alopecia": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Arrhythmia": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Atrial septal defect": 1, "Axillary mass": 1, "Axillary pain": 1, "Balance disorder": 1, "Bedridden": 1, "Bell's palsy": 1, "Blister": 1, "Blood cholesterol": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood sodium": 1, "Bone pain": 1, "Bronchospasm": 1, "Burning sensation": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Choking": 1, "Cognitive disorder": 1, "Colon cancer stage IV": 1, "Colonoscopy": 1, "Condition aggravated": 1, "Confusional state": 1, "Crying": 1, "Death": 1, "Depressed level of consciousness": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Discomfort": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dysphonia": 1, "Echocardiogram": 1, "Endoscopy": 1, "Energy increased": 1, "Exfoliative rash": 1, "Extrasystoles": 1, "Eye irritation": 1, "Eye pain": 1, "Eye pruritus": 1, "Feeling cold": 1, "Feeling guilty": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastritis": 1, "Generalised tonic-clonic seizure": 1, "Gingival pain": 1, "Guillain-Barre syndrome": 1, "Hair disorder": 1, "Hepatic enzyme": 1, "Hunger": 1, "Hypersomnia": 1, "Hypervigilance": 1, "Immunisation reaction": 1, "Increased viscosity of upper respiratory secretion": 1, "Infection": 1, "Influenza": 1, "Injection site papule": 1, "Injection site pruritus": 1, "Intentional dose omission": 1, "Intentional product misuse": 1, "Intentional product use issue": 1, "Irritability": 1, "Ischaemic stroke": 1, "Joint range of motion decreased": 1, "Laboratory test": 1, "Lip swelling": 1, "Liver function test increased": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Major depression": 1, "Mass": 1, "Mass excision": 1, "Menstruation delayed": 1, "Miliaria": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Nasal congestion": 1, "Neuralgia": 1, "Ocular discomfort": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oropharyngeal discomfort": 1, "Oxygen consumption": 1, "Pain of skin": 1, "Panic attack": 1, "Paraesthesia oral": 1, "Pericardial effusion": 1, "Pharyngeal swelling": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Pleural effusion": 1, "Post viral fatigue syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Posture abnormal": 1, "Product temperature excursion issue": 1, "Productive cough": 1, "Psoriasis": 1, "Pulmonary thrombosis": 1, "Rash erythematous": 1, "Rash maculo-papular": 1, "Rash pruritic": 1, "Retching": 1, "Rhinitis": 1, "SARS-CoV-2 antibody test": 1, "Scan myocardial perfusion": 1, "Sinusitis": 1, "Skin discolouration": 1, "Sleep apnoea syndrome": 1, "Sluggishness": 1, "Stomatitis": 1, "Swelling of eyelid": 1, "Systemic lupus erythematosus": 1, "Taste disorder": 1, "Temperature difference of extremities": 1, "Thirst": 1, "Throat tightness": 1, "Thrombophlebitis superficial": 1, "Tongue discomfort": 1, "Tunnel vision": 1, "Ultrasound antenatal screen": 1, "Underdose": 1, "Upper-airway cough syndrome": 1, "Urine analysis normal": 1, "Vaccination site discomfort": 1, "Vaccination site inflammation": 1, "Vaccination site macule": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Ventricular extrasystoles": 1, "Viral test": 1, "Vomiting projectile": 1, "Wheezing": 1, "X-ray of pelvis and hip": 1}, "batchcodes": ["020B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B2X.json b/docs/data/histograms/United States/020B2X.json
index d04fd3920be..ab1274403fc 100644
--- a/docs/data/histograms/United States/020B2X.json
+++ b/docs/data/histograms/United States/020B2X.json
@@ -1 +1 @@
-{"batchcode": "020B2X", "histograms": [{"batchcodes": ["020B2X"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "020B2X", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["020B2X"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020B31A.json b/docs/data/histograms/United States/020B31A.json
index 51556828ec2..97d589191d0 100644
--- a/docs/data/histograms/United States/020B31A.json
+++ b/docs/data/histograms/United States/020B31A.json
@@ -1 +1 @@
-{"batchcode": "020B31A", "histograms": [{"batchcodes": ["020B31A"], "histogram": {"Eye pruritus": 1, "Feeling hot": 1, "Hordeolum": 1}}]}
\ No newline at end of file
+{"batchcode": "020B31A", "histograms": [{"histogram": {"Eye pruritus": 1, "Feeling hot": 1, "Hordeolum": 1}, "batchcodes": ["020B31A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020BZ1A.json b/docs/data/histograms/United States/020BZ1A.json
index ad2cfb9eee7..4ea4116485e 100644
--- a/docs/data/histograms/United States/020BZ1A.json
+++ b/docs/data/histograms/United States/020BZ1A.json
@@ -1 +1 @@
-{"batchcode": "020BZ1A", "histograms": [{"batchcodes": ["020BZ1A"], "histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "020BZ1A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["020BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020C21A.json b/docs/data/histograms/United States/020C21A.json
index 4797b74ebb9..2646f266ea3 100644
--- a/docs/data/histograms/United States/020C21A.json
+++ b/docs/data/histograms/United States/020C21A.json
@@ -1 +1 @@
-{"batchcode": "020C21A", "histograms": [{"batchcodes": ["020C21A"], "histogram": {"Back pain": 1, "Expired product administered": 1, "Oropharyngeal pain": 1, "Product dose omission issue": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "020C21A", "histograms": [{"histogram": {"Back pain": 1, "Expired product administered": 1, "Oropharyngeal pain": 1, "Product dose omission issue": 1, "Vaccination site pruritus": 1}, "batchcodes": ["020C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020D21A.json b/docs/data/histograms/United States/020D21A.json
index cd7ee52ae25..5c63436de1e 100644
--- a/docs/data/histograms/United States/020D21A.json
+++ b/docs/data/histograms/United States/020D21A.json
@@ -1 +1 @@
-{"batchcode": "020D21A", "histograms": [{"batchcodes": ["020D21A"], "histogram": {"Asthenia": 1, "Burning sensation": 1, "Dysphagia": 1, "Erythema": 1, "Fatigue": 1, "Glossodynia": 1, "Illness": 1, "Oropharyngeal pain": 1, "Pulmonary pain": 1}}]}
\ No newline at end of file
+{"batchcode": "020D21A", "histograms": [{"histogram": {"Asthenia": 1, "Burning sensation": 1, "Dysphagia": 1, "Erythema": 1, "Fatigue": 1, "Glossodynia": 1, "Illness": 1, "Oropharyngeal pain": 1, "Pulmonary pain": 1}, "batchcodes": ["020D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020F211 (4 OR 9.json b/docs/data/histograms/United States/020F211 (4 OR 9.json
index 946067b16be..efcbbf28311 100644
--- a/docs/data/histograms/United States/020F211 (4 OR 9.json
+++ b/docs/data/histograms/United States/020F211 (4 OR 9.json
@@ -1 +1 @@
-{"batchcode": "020F211 (4 OR 9", "histograms": [{"batchcodes": ["020F211 (4 OR 9"], "histogram": {"Irritability": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "020F211 (4 OR 9", "histograms": [{"histogram": {"Irritability": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Vaccination error": 1, "Vaccination site haemorrhage": 1}, "batchcodes": ["020F211 (4 OR 9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020F21A.json b/docs/data/histograms/United States/020F21A.json
index 6240f629587..74b11a09808 100644
--- a/docs/data/histograms/United States/020F21A.json
+++ b/docs/data/histograms/United States/020F21A.json
@@ -1 +1 @@
-{"batchcode": "020F21A", "histograms": [{"batchcodes": ["020F21A", "FF8839"], "histogram": {"Interchange of vaccine products": 1}}, {"batchcodes": ["020F21A"], "histogram": {"Expired product administered": 43, "Headache": 19, "Pyrexia": 19, "Myalgia": 13, "Pain in extremity": 13, "Chills": 12, "Fatigue": 11, "Nausea": 11, "Vaccination site pain": 11, "Pain": 9, "Product storage error": 9, "Feeling abnormal": 8, "Product temperature excursion issue": 8, "Vaccination site erythema": 6, "Vomiting": 6, "Arthralgia": 5, "Asthenia": 5, "Diarrhoea": 5, "Dizziness": 5, "Feeling hot": 5, "Illness": 5, "Insomnia": 5, "Interchange of vaccine products": 4, "Malaise": 4, "Paraesthesia": 4, "Pruritus": 4, "Vaccination site swelling": 4, "Vaccination site warmth": 4, "Body temperature": 3, "Burning sensation": 3, "Chest pain": 3, "Decreased appetite": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Muscle spasms": 3, "Oropharyngeal pain": 3, "Product administered to patient of inappropriate age": 3, "Vaccination complication": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Abdominal discomfort": 2, "Ageusia": 2, "Blood pressure measurement": 2, "Confusional state": 2, "Dehydration": 2, "Dry mouth": 2, "Dysgeusia": 2, "Eye swelling": 2, "Feeling cold": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Lethargy": 2, "Maternal exposure during pregnancy": 2, "Memory impairment": 2, "Ocular hyperaemia": 2, "Peripheral swelling": 2, "Psychomotor hyperactivity": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Swelling": 2, "Tenderness": 2, "Vaccination site pruritus": 2, "Vaccination site rash": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Adverse reaction": 1, "Airway burns": 1, "Anosmia": 1, "Anxiety": 1, "Aphonia": 1, "Arrhythmia": 1, "Asthma": 1, "Atrioventricular block": 1, "Axillary mass": 1, "Axillary pain": 1, "Back pain": 1, "Bedridden": 1, "Bell's palsy": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood glucose fluctuation": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Bowel movement irregularity": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chromaturia": 1, "Coma": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Extra dose administered": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelids pruritus": 1, "Feeding disorder": 1, "Flushing": 1, "Formication": 1, "Groin pain": 1, "Head discomfort": 1, "Heart rate": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hunger": 1, "Hypersomnia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Influenza": 1, "Loss of personal independence in daily activities": 1, "Migraine": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Near death experience": 1, "Neck pain": 1, "Nervous system disorder": 1, "Off label use": 1, "Oral disorder": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Poor quality product administered": 1, "Rash macular": 1, "Renal disorder": 1, "Retching": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test positive": 1, "Sciatica": 1, "Sitting disability": 1, "Skin discolouration": 1, "Skin warm": 1, "Speech disorder": 1, "Stress": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Tremor": 1, "Vaccination site discomfort": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "020F21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["020F21A", "FF8839"]}, {"histogram": {"Expired product administered": 43, "Headache": 19, "Pyrexia": 19, "Myalgia": 13, "Pain in extremity": 13, "Chills": 12, "Fatigue": 11, "Nausea": 11, "Vaccination site pain": 11, "Pain": 9, "Product storage error": 9, "Feeling abnormal": 8, "Product temperature excursion issue": 8, "Vaccination site erythema": 6, "Vomiting": 6, "Arthralgia": 5, "Asthenia": 5, "Diarrhoea": 5, "Dizziness": 5, "Feeling hot": 5, "Illness": 5, "Insomnia": 5, "Interchange of vaccine products": 4, "Malaise": 4, "Paraesthesia": 4, "Pruritus": 4, "Vaccination site swelling": 4, "Vaccination site warmth": 4, "Body temperature": 3, "Burning sensation": 3, "Chest pain": 3, "Decreased appetite": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Muscle spasms": 3, "Oropharyngeal pain": 3, "Product administered to patient of inappropriate age": 3, "Vaccination complication": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Abdominal discomfort": 2, "Ageusia": 2, "Blood pressure measurement": 2, "Confusional state": 2, "Dehydration": 2, "Dry mouth": 2, "Dysgeusia": 2, "Eye swelling": 2, "Feeling cold": 2, "Gait disturbance": 2, "Heart rate increased": 2, "Hyperhidrosis": 2, "Hypoaesthesia": 2, "Lethargy": 2, "Maternal exposure during pregnancy": 2, "Memory impairment": 2, "Ocular hyperaemia": 2, "Peripheral swelling": 2, "Psychomotor hyperactivity": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Swelling": 2, "Tenderness": 2, "Vaccination site pruritus": 2, "Vaccination site rash": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Adverse reaction": 1, "Airway burns": 1, "Anosmia": 1, "Anxiety": 1, "Aphonia": 1, "Arrhythmia": 1, "Asthma": 1, "Atrioventricular block": 1, "Axillary mass": 1, "Axillary pain": 1, "Back pain": 1, "Bedridden": 1, "Bell's palsy": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood glucose fluctuation": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Bowel movement irregularity": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Chest discomfort": 1, "Chromaturia": 1, "Coma": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dyspepsia": 1, "Dyspnoea": 1, "Extra dose administered": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelids pruritus": 1, "Feeding disorder": 1, "Flushing": 1, "Formication": 1, "Groin pain": 1, "Head discomfort": 1, "Heart rate": 1, "Hepatitis": 1, "Herpes zoster": 1, "Hunger": 1, "Hypersomnia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Influenza": 1, "Loss of personal independence in daily activities": 1, "Migraine": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Near death experience": 1, "Neck pain": 1, "Nervous system disorder": 1, "Off label use": 1, "Oral disorder": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Pericarditis": 1, "Poor quality product administered": 1, "Rash macular": 1, "Renal disorder": 1, "Retching": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test positive": 1, "Sciatica": 1, "Sitting disability": 1, "Skin discolouration": 1, "Skin warm": 1, "Speech disorder": 1, "Stress": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Tremor": 1, "Vaccination site discomfort": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["020F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020F22A.json b/docs/data/histograms/United States/020F22A.json
index b78d0f4fea5..d5c8cb8478b 100644
--- a/docs/data/histograms/United States/020F22A.json
+++ b/docs/data/histograms/United States/020F22A.json
@@ -1 +1 @@
-{"batchcode": "020F22A", "histograms": [{"batchcodes": ["020F22A"], "histogram": {"Blood disorder": 1, "Investigation": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "020F22A", "histograms": [{"histogram": {"Blood disorder": 1, "Investigation": 1, "Product dose omission issue": 1}, "batchcodes": ["020F22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020H21A.json b/docs/data/histograms/United States/020H21A.json
index dee962118f2..2d335b428e6 100644
--- a/docs/data/histograms/United States/020H21A.json
+++ b/docs/data/histograms/United States/020H21A.json
@@ -1 +1 @@
-{"batchcode": "020H21A", "histograms": [{"batchcodes": ["020H21A"], "histogram": {"Blister": 1, "Pain in extremity": 1, "Rash erythematous": 1}}]}
\ No newline at end of file
+{"batchcode": "020H21A", "histograms": [{"histogram": {"Blister": 1, "Pain in extremity": 1, "Rash erythematous": 1}, "batchcodes": ["020H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020H22A.json b/docs/data/histograms/United States/020H22A.json
index c61cb515a86..2f72441c011 100644
--- a/docs/data/histograms/United States/020H22A.json
+++ b/docs/data/histograms/United States/020H22A.json
@@ -1 +1 @@
-{"batchcode": "020H22A", "histograms": [{"batchcodes": ["020H22A"], "histogram": {"No adverse event": 10, "Expired product administered": 5, "Product storage error": 4, "Wrong product administered": 2, "Accidental underdose": 1, "Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Chest X-ray": 1, "Cognitive disorder": 1, "Computerised tomogram thorax": 1, "Device connection issue": 1, "Echocardiogram": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Magnetic resonance imaging head": 1, "Pain": 1, "Pancreatitis chronic": 1, "Paraesthesia": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Upper respiratory tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "020H22A", "histograms": [{"histogram": {"No adverse event": 10, "Expired product administered": 5, "Product storage error": 4, "Wrong product administered": 2, "Accidental underdose": 1, "Arthralgia": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Chest X-ray": 1, "Cognitive disorder": 1, "Computerised tomogram thorax": 1, "Device connection issue": 1, "Echocardiogram": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Laboratory test": 1, "Magnetic resonance imaging head": 1, "Pain": 1, "Pancreatitis chronic": 1, "Paraesthesia": 1, "Pneumonia": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Upper respiratory tract infection": 1}, "batchcodes": ["020H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020L20A.json b/docs/data/histograms/United States/020L20A.json
index 59752df3265..01ec9422b58 100644
--- a/docs/data/histograms/United States/020L20A.json
+++ b/docs/data/histograms/United States/020L20A.json
@@ -1 +1 @@
-{"batchcode": "020L20A", "histograms": [{"batchcodes": ["020L20A"], "histogram": {"Myalgia": 3, "Pain in extremity": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Arthralgia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Deafness unilateral": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Head discomfort": 1, "Headache": 1, "Hypoacusis": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site pain": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "020L20A", "histograms": [{"histogram": {"Myalgia": 3, "Pain in extremity": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Arthralgia": 1, "Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chills": 1, "Deafness unilateral": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Head discomfort": 1, "Headache": 1, "Hypoacusis": 1, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Injection site pain": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["020L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020L25A.json b/docs/data/histograms/United States/020L25A.json
index 5fd43ae7da6..e15c65400ce 100644
--- a/docs/data/histograms/United States/020L25A.json
+++ b/docs/data/histograms/United States/020L25A.json
@@ -1 +1 @@
-{"batchcode": "020L25A", "histograms": [{"batchcodes": ["020L25A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "020L25A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["020L25A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020L270A.json b/docs/data/histograms/United States/020L270A.json
index 70b8877589c..1bf3ccfa15f 100644
--- a/docs/data/histograms/United States/020L270A.json
+++ b/docs/data/histograms/United States/020L270A.json
@@ -1 +1 @@
-{"batchcode": "020L270A", "histograms": [{"batchcodes": ["020L270A"], "histogram": {"Body temperature increased": 1, "Headache": 1, "Multiple fractures": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "020L270A", "histograms": [{"histogram": {"Body temperature increased": 1, "Headache": 1, "Multiple fractures": 1, "Pain in extremity": 1}, "batchcodes": ["020L270A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020M204.json b/docs/data/histograms/United States/020M204.json
index 74e3816305a..6f317fbb724 100644
--- a/docs/data/histograms/United States/020M204.json
+++ b/docs/data/histograms/United States/020M204.json
@@ -1 +1 @@
-{"batchcode": "020M204", "histograms": [{"batchcodes": ["020M204"], "histogram": {"Oropharyngeal pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "020M204", "histograms": [{"histogram": {"Oropharyngeal pain": 1, "Pyrexia": 1}, "batchcodes": ["020M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020M20A.json b/docs/data/histograms/United States/020M20A.json
index 3be9fc12318..8eaa290ce83 100644
--- a/docs/data/histograms/United States/020M20A.json
+++ b/docs/data/histograms/United States/020M20A.json
@@ -1 +1 @@
-{"batchcode": "020M20A", "histograms": [{"batchcodes": ["020M20A"], "histogram": {"Aphasia": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Disorientation": 1, "Erythema": 1, "Eye contusion": 1, "Inappropriate schedule of product administration": 1, "Memory impairment": 1, "Pain in extremity": 1, "Pruritus": 1, "Seborrhoeic dermatitis": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "020M20A", "histograms": [{"histogram": {"Aphasia": 1, "Blood test": 1, "Cerebrovascular accident": 1, "Confusional state": 1, "Disorientation": 1, "Erythema": 1, "Eye contusion": 1, "Inappropriate schedule of product administration": 1, "Memory impairment": 1, "Pain in extremity": 1, "Pruritus": 1, "Seborrhoeic dermatitis": 1, "Swelling": 1}, "batchcodes": ["020M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020M21A.json b/docs/data/histograms/United States/020M21A.json
index 6589c523939..3809b075fa7 100644
--- a/docs/data/histograms/United States/020M21A.json
+++ b/docs/data/histograms/United States/020M21A.json
@@ -1 +1 @@
-{"batchcode": "020M21A", "histograms": [{"batchcodes": ["020M21A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "020M21A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["020M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020N20A.json b/docs/data/histograms/United States/020N20A.json
index e8e82909859..7f2be5c0208 100644
--- a/docs/data/histograms/United States/020N20A.json
+++ b/docs/data/histograms/United States/020N20A.json
@@ -1 +1 @@
-{"batchcode": "020N20A", "histograms": [{"batchcodes": ["020N20A"], "histogram": {"Erythema": 1, "Nausea": 1, "Pain in extremity": 1, "Skin discolouration": 1, "Tenderness": 1}}]}
\ No newline at end of file
+{"batchcode": "020N20A", "histograms": [{"histogram": {"Erythema": 1, "Nausea": 1, "Pain in extremity": 1, "Skin discolouration": 1, "Tenderness": 1}, "batchcodes": ["020N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020P21A.json b/docs/data/histograms/United States/020P21A.json
index 5f81788e1ea..1e0fe163e91 100644
--- a/docs/data/histograms/United States/020P21A.json
+++ b/docs/data/histograms/United States/020P21A.json
@@ -1 +1 @@
-{"batchcode": "020P21A", "histograms": [{"batchcodes": ["020P21A"], "histogram": {"Product dose omission issue": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "020P21A", "histograms": [{"histogram": {"Product dose omission issue": 1, "Tinnitus": 1}, "batchcodes": ["020P21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020S21A.json b/docs/data/histograms/United States/020S21A.json
index a1d40be3513..03ee91e5aa4 100644
--- a/docs/data/histograms/United States/020S21A.json
+++ b/docs/data/histograms/United States/020S21A.json
@@ -1 +1 @@
-{"batchcode": "020S21A", "histograms": [{"batchcodes": ["020S21A"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "020S21A", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["020S21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/020V21A.json b/docs/data/histograms/United States/020V21A.json
index f0e2dbc14c3..a730e9a037c 100644
--- a/docs/data/histograms/United States/020V21A.json
+++ b/docs/data/histograms/United States/020V21A.json
@@ -1 +1 @@
-{"batchcode": "020V21A", "histograms": [{"batchcodes": ["020V21A"], "histogram": {"Abdominal discomfort": 1, "Blood pressure measurement": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Nausea": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "020V21A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Blood pressure measurement": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Nausea": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["020V21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021-B21A.json b/docs/data/histograms/United States/021-B21A.json
index 0abf83b1322..4a6c26a9593 100644
--- a/docs/data/histograms/United States/021-B21A.json
+++ b/docs/data/histograms/United States/021-B21A.json
@@ -1 +1 @@
-{"batchcode": "021-B21A", "histograms": [{"batchcodes": ["021-B21A"], "histogram": {"Headache": 1, "Injection site cellulitis": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "021-B21A", "histograms": [{"histogram": {"Headache": 1, "Injection site cellulitis": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["021-B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021/7A21A.json b/docs/data/histograms/United States/021/7A21A.json
index f6e42a4bf4f..2e9ba039cbd 100644
--- a/docs/data/histograms/United States/021/7A21A.json
+++ b/docs/data/histograms/United States/021/7A21A.json
@@ -1 +1 @@
-{"batchcode": "021/7A21A", "histograms": [{"batchcodes": ["021/7A21A"], "histogram": {"Chills": 1, "Headache": 1, "Illness": 1, "Insomnia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "021/7A21A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Illness": 1, "Insomnia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["021/7A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0211321A.json b/docs/data/histograms/United States/0211321A.json
index 110253a196f..5e850d50a59 100644
--- a/docs/data/histograms/United States/0211321A.json
+++ b/docs/data/histograms/United States/0211321A.json
@@ -1 +1 @@
-{"batchcode": "0211321A", "histograms": [{"batchcodes": ["0211321A"], "histogram": {"Swelling": 2, "Cartilage injury": 1, "Chills": 1, "Headache": 1, "Hypoaesthesia": 1, "Hypotonia": 1, "Muscular weakness": 1, "Nasal inflammation": 1, "Ocular discomfort": 1, "Polychondritis": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0211321A", "histograms": [{"histogram": {"Swelling": 2, "Cartilage injury": 1, "Chills": 1, "Headache": 1, "Hypoaesthesia": 1, "Hypotonia": 1, "Muscular weakness": 1, "Nasal inflammation": 1, "Ocular discomfort": 1, "Polychondritis": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0211321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02113A.json b/docs/data/histograms/United States/02113A.json
index 42f9f84bfd4..e17dce22a50 100644
--- a/docs/data/histograms/United States/02113A.json
+++ b/docs/data/histograms/United States/02113A.json
@@ -1 +1 @@
-{"batchcode": "02113A", "histograms": [{"batchcodes": ["02113A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "02113A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pruritus": 1}, "batchcodes": ["02113A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0211A21A.json b/docs/data/histograms/United States/0211A21A.json
index bf5f1c388ba..24f5da97c03 100644
--- a/docs/data/histograms/United States/0211A21A.json
+++ b/docs/data/histograms/United States/0211A21A.json
@@ -1 +1 @@
-{"batchcode": "0211A21A", "histograms": [{"batchcodes": ["0211A21A"], "histogram": {"Fatigue": 1, "Headache": 1, "Vaccination site induration": 1}}]}
\ No newline at end of file
+{"batchcode": "0211A21A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Vaccination site induration": 1}, "batchcodes": ["0211A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0211L20A.json b/docs/data/histograms/United States/0211L20A.json
index 5d756517514..5dd3729c703 100644
--- a/docs/data/histograms/United States/0211L20A.json
+++ b/docs/data/histograms/United States/0211L20A.json
@@ -1 +1 @@
-{"batchcode": "0211L20A", "histograms": [{"batchcodes": ["0211L20A"], "histogram": {"Pain": 2, "Injection site pain": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "0211L20A", "histograms": [{"histogram": {"Pain": 2, "Injection site pain": 1, "Myalgia": 1}, "batchcodes": ["0211L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021321A.json b/docs/data/histograms/United States/021321A.json
index 913ddec1b5b..a115d7430d7 100644
--- a/docs/data/histograms/United States/021321A.json
+++ b/docs/data/histograms/United States/021321A.json
@@ -1 +1 @@
-{"batchcode": "021321A", "histograms": [{"batchcodes": ["021321A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate increased": 1, "Inappropriate schedule of product administration": 1, "Laryngitis": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Peripheral swelling": 1, "Rash": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "021321A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Heart rate increased": 1, "Inappropriate schedule of product administration": 1, "Laryngitis": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Peripheral swelling": 1, "Rash": 1, "Vertigo": 1}, "batchcodes": ["021321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021821A.json b/docs/data/histograms/United States/021821A.json
index 6d7640b9089..a242da669a9 100644
--- a/docs/data/histograms/United States/021821A.json
+++ b/docs/data/histograms/United States/021821A.json
@@ -1 +1 @@
-{"batchcode": "021821A", "histograms": [{"batchcodes": ["021821A"], "histogram": {"Diarrhoea": 3, "Blister": 2, "Feeling abnormal": 2, "Headache": 2, "Pruritus": 2, "Psoriasis": 2, "Rash erythematous": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Anxiety": 1, "Asthenia": 1, "Burning sensation": 1, "Dyspnoea": 1, "Erythema": 1, "Excessive eye blinking": 1, "Haemorrhage": 1, "Heart rate irregular": 1, "Illness": 1, "Influenza like illness": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pain of skin": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Rash": 1, "Rash vesicular": 1, "Scab": 1, "Seborrhoeic dermatitis": 1, "Skin exfoliation": 1, "Skin haemorrhage": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "021821A", "histograms": [{"histogram": {"Diarrhoea": 3, "Blister": 2, "Feeling abnormal": 2, "Headache": 2, "Pruritus": 2, "Psoriasis": 2, "Rash erythematous": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Anxiety": 1, "Asthenia": 1, "Burning sensation": 1, "Dyspnoea": 1, "Erythema": 1, "Excessive eye blinking": 1, "Haemorrhage": 1, "Heart rate irregular": 1, "Illness": 1, "Influenza like illness": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pain of skin": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Rash": 1, "Rash vesicular": 1, "Scab": 1, "Seborrhoeic dermatitis": 1, "Skin exfoliation": 1, "Skin haemorrhage": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["021821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021921A.json b/docs/data/histograms/United States/021921A.json
index 1da38e0140c..8c07000e3cb 100644
--- a/docs/data/histograms/United States/021921A.json
+++ b/docs/data/histograms/United States/021921A.json
@@ -1 +1 @@
-{"batchcode": "021921A", "histograms": [{"batchcodes": ["021921A"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "021921A", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["021921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0219B21A.json b/docs/data/histograms/United States/0219B21A.json
index 5ba683b8750..ff67425ba00 100644
--- a/docs/data/histograms/United States/0219B21A.json
+++ b/docs/data/histograms/United States/0219B21A.json
@@ -1 +1 @@
-{"batchcode": "0219B21A", "histograms": [{"batchcodes": ["0219B21A"], "histogram": {"Fatigue": 1, "Vaccination site lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "0219B21A", "histograms": [{"histogram": {"Fatigue": 1, "Vaccination site lymphadenopathy": 1}, "batchcodes": ["0219B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021A12A.json b/docs/data/histograms/United States/021A12A.json
index c30c11a4d9b..3d7e241bb5b 100644
--- a/docs/data/histograms/United States/021A12A.json
+++ b/docs/data/histograms/United States/021A12A.json
@@ -1 +1 @@
-{"batchcode": "021A12A", "histograms": [{"batchcodes": ["021A12A"], "histogram": {"Dyspnoea": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "021A12A", "histograms": [{"histogram": {"Dyspnoea": 1, "Rash": 1}, "batchcodes": ["021A12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021A20A.json b/docs/data/histograms/United States/021A20A.json
index ef49e73ebb7..66ef2b5842e 100644
--- a/docs/data/histograms/United States/021A20A.json
+++ b/docs/data/histograms/United States/021A20A.json
@@ -1 +1 @@
-{"batchcode": "021A20A", "histograms": [{"batchcodes": ["021A20A"], "histogram": {"Fatigue": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "021A20A", "histograms": [{"histogram": {"Fatigue": 2, "Pyrexia": 2, "SARS-CoV-2 test": 2, "COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["021A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021A2114.json b/docs/data/histograms/United States/021A2114.json
index 1705589fb0a..fc396384a92 100644
--- a/docs/data/histograms/United States/021A2114.json
+++ b/docs/data/histograms/United States/021A2114.json
@@ -1 +1 @@
-{"batchcode": "021A2114", "histograms": [{"batchcodes": ["021A2114"], "histogram": {"Condition aggravated": 1, "Induration": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "021A2114", "histograms": [{"histogram": {"Condition aggravated": 1, "Induration": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["021A2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021A21A.json b/docs/data/histograms/United States/021A21A.json
index fc202e820af..3a14f0d40fe 100644
--- a/docs/data/histograms/United States/021A21A.json
+++ b/docs/data/histograms/United States/021A21A.json
@@ -1 +1 @@
-{"batchcode": "021A21A", "histograms": [{"batchcodes": ["021A21A"], "histogram": {"Arthralgia": 1, "Blood chloride": 1, "Carbon dioxide": 1, "Ear discomfort": 1, "Headache": 1, "Lipids": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Therapeutic response unexpected": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "021A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Blood chloride": 1, "Carbon dioxide": 1, "Ear discomfort": 1, "Headache": 1, "Lipids": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Therapeutic response unexpected": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["021A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B21.json b/docs/data/histograms/United States/021B21.json
index 732ca7b7e33..463e5332186 100644
--- a/docs/data/histograms/United States/021B21.json
+++ b/docs/data/histograms/United States/021B21.json
@@ -1 +1 @@
-{"batchcode": "021B21", "histograms": [{"batchcodes": ["021B21"], "histogram": {"Headache": 2, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "021B21", "histograms": [{"histogram": {"Headache": 2, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1}, "batchcodes": ["021B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B214A.json b/docs/data/histograms/United States/021B214A.json
index f60b92b6198..52f64cd9d82 100644
--- a/docs/data/histograms/United States/021B214A.json
+++ b/docs/data/histograms/United States/021B214A.json
@@ -1 +1 @@
-{"batchcode": "021B214A", "histograms": [{"batchcodes": ["021B214A"], "histogram": {"Abdominal pain": 1, "Chills": 1, "Haematochezia": 1, "Mucous stools": 1, "Myalgia": 1, "Oral herpes": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "021B214A", "histograms": [{"histogram": {"Abdominal pain": 1, "Chills": 1, "Haematochezia": 1, "Mucous stools": 1, "Myalgia": 1, "Oral herpes": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["021B214A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B21A OR 027B.json b/docs/data/histograms/United States/021B21A OR 027B.json
index a0f8c9fa139..07c453f04ae 100644
--- a/docs/data/histograms/United States/021B21A OR 027B.json
+++ b/docs/data/histograms/United States/021B21A OR 027B.json
@@ -1 +1 @@
-{"batchcode": "021B21A OR 027B", "histograms": [{"batchcodes": ["021B21A OR 027B"], "histogram": {"Dizziness": 1, "Drug interaction": 1, "Walking aid user": 1}}]}
\ No newline at end of file
+{"batchcode": "021B21A OR 027B", "histograms": [{"histogram": {"Dizziness": 1, "Drug interaction": 1, "Walking aid user": 1}, "batchcodes": ["021B21A OR 027B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B21A-1.json b/docs/data/histograms/United States/021B21A-1.json
index 7e0a1fa66cb..e07c0ec709f 100644
--- a/docs/data/histograms/United States/021B21A-1.json
+++ b/docs/data/histograms/United States/021B21A-1.json
@@ -1 +1 @@
-{"batchcode": "021B21A-1", "histograms": [{"batchcodes": ["021B21A-1"], "histogram": {"Dizziness": 2, "Hypoaesthesia": 2, "Myalgia": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Discomfort": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate increased": 1, "Menstruation irregular": 1, "Migraine": 1, "Oligomenorrhoea": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Pyrexia": 1, "Tenderness": 1, "Vaccination site anaesthesia": 1, "Vaccination site discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "021B21A-1", "histograms": [{"histogram": {"Dizziness": 2, "Hypoaesthesia": 2, "Myalgia": 2, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Discomfort": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate increased": 1, "Menstruation irregular": 1, "Migraine": 1, "Oligomenorrhoea": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia": 1, "Pyrexia": 1, "Tenderness": 1, "Vaccination site anaesthesia": 1, "Vaccination site discolouration": 1}, "batchcodes": ["021B21A-1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B21A.json b/docs/data/histograms/United States/021B21A.json
index 3a302a86961..800a20b8fa8 100644
--- a/docs/data/histograms/United States/021B21A.json
+++ b/docs/data/histograms/United States/021B21A.json
@@ -1 +1 @@
-{"batchcode": "021B21A", "histograms": [{"batchcodes": ["021B21A", "FF8841"], "histogram": {"COVID-19 immunisation": 1, "Circumstance or information capable of leading to medication error": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "No adverse event": 1}}, {"batchcodes": ["021B21A"], "histogram": {"Expired product administered": 44, "Pyrexia": 44, "Fatigue": 43, "Headache": 43, "Chills": 34, "Pain in extremity": 34, "Vaccination site pain": 34, "Arthralgia": 23, "Myalgia": 23, "Nausea": 23, "Dizziness": 19, "Pain": 18, "Asthenia": 16, "Feeling abnormal": 16, "Vaccination site erythema": 16, "Vaccination site swelling": 14, "Vaccination site warmth": 14, "Hyperhidrosis": 13, "Pruritus": 13, "Rash": 13, "Peripheral swelling": 12, "Body temperature": 10, "Lymphadenopathy": 10, "Vaccination site pruritus": 9, "Dyspnoea": 8, "Inappropriate schedule of product administration": 8, "Paraesthesia": 8, "COVID-19": 7, "Diarrhoea": 7, "Erythema": 7, "SARS-CoV-2 test": 7, "Somnolence": 7, "Vaccination site rash": 7, "Vomiting": 7, "Feeling hot": 6, "Heart rate": 6, "Hypoaesthesia": 6, "Influenza like illness": 6, "Malaise": 6, "Urticaria": 6, "Vaccination complication": 6, "Vertigo": 6, "Abdominal pain upper": 5, "Blood pressure measurement": 5, "Burning sensation": 5, "Discomfort": 5, "Illness": 5, "Inflammation": 5, "Limb discomfort": 5, "Neck pain": 5, "Tinnitus": 5, "Cough": 4, "Electrocardiogram": 4, "Heart rate increased": 4, "Injection site pain": 4, "Mobility decreased": 4, "Muscular weakness": 4, "Musculoskeletal stiffness": 4, "Palpitations": 4, "Product administered to patient of inappropriate age": 4, "Product dose omission issue": 4, "Tenderness": 4, "Acoustic stimulation tests": 3, "Back pain": 3, "Blister": 3, "Chest discomfort": 3, "Chest pain": 3, "Decreased appetite": 3, "Dysgeusia": 3, "Ear pain": 3, "Feeling cold": 3, "Feeling of body temperature change": 3, "Flushing": 3, "Gait disturbance": 3, "Head discomfort": 3, "Hypersomnia": 3, "Hypokinesia": 3, "Insomnia": 3, "Joint swelling": 3, "Migraine": 3, "Presyncope": 3, "Rash erythematous": 3, "Rhinorrhoea": 3, "Swollen tongue": 3, "Tremor": 3, "Underdose": 3, "Vaccination site induration": 3, "Weight decreased": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Adverse reaction": 2, "Asthma": 2, "Atrial fibrillation": 2, "Bladder dysfunction": 2, "Cardiac stress test": 2, "Colonoscopy": 2, "Computerised tomogram": 2, "Disorientation": 2, "Dysphagia": 2, "Dysstasia": 2, "Eye pain": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Impaired work ability": 2, "Induration": 2, "Influenza": 2, "Injection site erythema": 2, "Laboratory test": 2, "Lymphadenitis": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Night sweats": 2, "No adverse event": 2, "Oedema peripheral": 2, "Oral discomfort": 2, "Oral pain": 2, "Oropharyngeal pain": 2, "Pelvic floor dysfunction": 2, "Pharyngeal swelling": 2, "Rash pruritic": 2, "Sensitive skin": 2, "Speech disorder": 2, "Swelling": 2, "Swelling face": 2, "Syncope": 2, "Tachycardia": 2, "Ultrasound scan": 2, "Vaccination site bruising": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vaccination site reaction": 2, "Visual impairment": 2, "Abdominal distension": 1, "Accident": 1, "Acne": 1, "Adverse drug reaction": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arrhythmia": 1, "Bedridden": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Bone pain": 1, "Cardioversion": 1, "Cheilitis": 1, "Choking": 1, "Condition aggravated": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Constipation": 1, "Coordination abnormal": 1, "Crepitations": 1, "Crying": 1, "Deafness unilateral": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dry throat": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Ear discomfort": 1, "Eating disorder": 1, "Electromyogram": 1, "Epstein-Barr virus infection": 1, "Eye colour change": 1, "Eye irritation": 1, "Facial paralysis": 1, "Fall": 1, "Feeding disorder": 1, "Flatulence": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Haematoma infection": 1, "Haemochromatosis": 1, "Hallucination": 1, "Hemiparaesthesia": 1, "Hepatomegaly": 1, "Hunger": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypotension": 1, "Immunisation reaction": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Infectious mononucleosis": 1, "Injection site bruising": 1, "Injection site infection": 1, "Injection site pustule": 1, "Injection site scab": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Intertrigo": 1, "Lethargy": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Magnetic resonance imaging neck": 1, "Mass": 1, "Mechanical urticaria": 1, "Meniere's disease": 1, "Mental impairment": 1, "Muscle atrophy": 1, "Muscle disorder": 1, "Muscle spasticity": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myoclonus": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Nervousness": 1, "Oligomenorrhoea": 1, "Oral disorder": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Panic attack": 1, "Parosmia": 1, "Pelvic pain": 1, "Pharyngeal erythema": 1, "Pityriasis rosea": 1, "Pollakiuria": 1, "Product storage error": 1, "Product temperature excursion issue": 1, "Productive cough": 1, "Psoriasis": 1, "Pulmonary pain": 1, "Pustule": 1, "Rash macular": 1, "Reduced facial expression": 1, "Rheumatoid arthritis": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Serum ferritin": 1, "Sinus congestion": 1, "Sinus pain": 1, "Skin exfoliation": 1, "Sluggishness": 1, "Sneezing": 1, "Spinal pain": 1, "Systemic lupus erythematosus": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombosis": 1, "Tongue blistering": 1, "Transferrin saturation": 1, "Transient ischaemic attack": 1, "Upper respiratory tract infection": 1, "Urinary bladder haemorrhage": 1, "Vaccination site anaesthesia": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Vasculitis": 1, "Vitamin B12 deficiency": 1, "Wrong product administered": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "021B21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Circumstance or information capable of leading to medication error": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "No adverse event": 1}, "batchcodes": ["021B21A", "FF8841"]}, {"histogram": {"Expired product administered": 44, "Pyrexia": 44, "Fatigue": 43, "Headache": 43, "Chills": 34, "Pain in extremity": 34, "Vaccination site pain": 34, "Arthralgia": 23, "Myalgia": 23, "Nausea": 23, "Dizziness": 19, "Pain": 18, "Asthenia": 16, "Feeling abnormal": 16, "Vaccination site erythema": 16, "Vaccination site swelling": 14, "Vaccination site warmth": 14, "Hyperhidrosis": 13, "Pruritus": 13, "Rash": 13, "Peripheral swelling": 12, "Body temperature": 10, "Lymphadenopathy": 10, "Vaccination site pruritus": 9, "Dyspnoea": 8, "Inappropriate schedule of product administration": 8, "Paraesthesia": 8, "COVID-19": 7, "Diarrhoea": 7, "Erythema": 7, "SARS-CoV-2 test": 7, "Somnolence": 7, "Vaccination site rash": 7, "Vomiting": 7, "Feeling hot": 6, "Heart rate": 6, "Hypoaesthesia": 6, "Influenza like illness": 6, "Malaise": 6, "Urticaria": 6, "Vaccination complication": 6, "Vertigo": 6, "Abdominal pain upper": 5, "Blood pressure measurement": 5, "Burning sensation": 5, "Discomfort": 5, "Illness": 5, "Inflammation": 5, "Limb discomfort": 5, "Neck pain": 5, "Tinnitus": 5, "Cough": 4, "Electrocardiogram": 4, "Heart rate increased": 4, "Injection site pain": 4, "Mobility decreased": 4, "Muscular weakness": 4, "Musculoskeletal stiffness": 4, "Palpitations": 4, "Product administered to patient of inappropriate age": 4, "Product dose omission issue": 4, "Tenderness": 4, "Acoustic stimulation tests": 3, "Back pain": 3, "Blister": 3, "Chest discomfort": 3, "Chest pain": 3, "Decreased appetite": 3, "Dysgeusia": 3, "Ear pain": 3, "Feeling cold": 3, "Feeling of body temperature change": 3, "Flushing": 3, "Gait disturbance": 3, "Head discomfort": 3, "Hypersomnia": 3, "Hypokinesia": 3, "Insomnia": 3, "Joint swelling": 3, "Migraine": 3, "Presyncope": 3, "Rash erythematous": 3, "Rhinorrhoea": 3, "Swollen tongue": 3, "Tremor": 3, "Underdose": 3, "Vaccination site induration": 3, "Weight decreased": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Adverse reaction": 2, "Asthma": 2, "Atrial fibrillation": 2, "Bladder dysfunction": 2, "Cardiac stress test": 2, "Colonoscopy": 2, "Computerised tomogram": 2, "Disorientation": 2, "Dysphagia": 2, "Dysstasia": 2, "Eye pain": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Impaired work ability": 2, "Induration": 2, "Influenza": 2, "Injection site erythema": 2, "Laboratory test": 2, "Lymphadenitis": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Night sweats": 2, "No adverse event": 2, "Oedema peripheral": 2, "Oral discomfort": 2, "Oral pain": 2, "Oropharyngeal pain": 2, "Pelvic floor dysfunction": 2, "Pharyngeal swelling": 2, "Rash pruritic": 2, "Sensitive skin": 2, "Speech disorder": 2, "Swelling": 2, "Swelling face": 2, "Syncope": 2, "Tachycardia": 2, "Ultrasound scan": 2, "Vaccination site bruising": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vaccination site reaction": 2, "Visual impairment": 2, "Abdominal distension": 1, "Accident": 1, "Acne": 1, "Adverse drug reaction": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Arrhythmia": 1, "Bedridden": 1, "Blood glucose increased": 1, "Blood pressure increased": 1, "Bone pain": 1, "Cardioversion": 1, "Cheilitis": 1, "Choking": 1, "Condition aggravated": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Constipation": 1, "Coordination abnormal": 1, "Crepitations": 1, "Crying": 1, "Deafness unilateral": 1, "Device connection issue": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry mouth": 1, "Dry throat": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Ear discomfort": 1, "Eating disorder": 1, "Electromyogram": 1, "Epstein-Barr virus infection": 1, "Eye colour change": 1, "Eye irritation": 1, "Facial paralysis": 1, "Fall": 1, "Feeding disorder": 1, "Flatulence": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Haematoma infection": 1, "Haemochromatosis": 1, "Hallucination": 1, "Hemiparaesthesia": 1, "Hepatomegaly": 1, "Hunger": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypotension": 1, "Immunisation reaction": 1, "Incomplete course of vaccination": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Infectious mononucleosis": 1, "Injection site bruising": 1, "Injection site infection": 1, "Injection site pustule": 1, "Injection site scab": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Intertrigo": 1, "Lethargy": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymph node pain": 1, "Magnetic resonance imaging neck": 1, "Mass": 1, "Mechanical urticaria": 1, "Meniere's disease": 1, "Mental impairment": 1, "Muscle atrophy": 1, "Muscle disorder": 1, "Muscle spasticity": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Myoclonus": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Nervousness": 1, "Oligomenorrhoea": 1, "Oral disorder": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Panic attack": 1, "Parosmia": 1, "Pelvic pain": 1, "Pharyngeal erythema": 1, "Pityriasis rosea": 1, "Pollakiuria": 1, "Product storage error": 1, "Product temperature excursion issue": 1, "Productive cough": 1, "Psoriasis": 1, "Pulmonary pain": 1, "Pustule": 1, "Rash macular": 1, "Reduced facial expression": 1, "Rheumatoid arthritis": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 test positive": 1, "Seizure": 1, "Serum ferritin": 1, "Sinus congestion": 1, "Sinus pain": 1, "Skin exfoliation": 1, "Sluggishness": 1, "Sneezing": 1, "Spinal pain": 1, "Systemic lupus erythematosus": 1, "Throat irritation": 1, "Throat tightness": 1, "Thrombosis": 1, "Tongue blistering": 1, "Transferrin saturation": 1, "Transient ischaemic attack": 1, "Upper respiratory tract infection": 1, "Urinary bladder haemorrhage": 1, "Vaccination site anaesthesia": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Vasculitis": 1, "Vitamin B12 deficiency": 1, "Wrong product administered": 1, "X-ray": 1}, "batchcodes": ["021B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B21A/012B21A.json b/docs/data/histograms/United States/021B21A/012B21A.json
index bfab3dd4c56..13cc7fa6787 100644
--- a/docs/data/histograms/United States/021B21A/012B21A.json
+++ b/docs/data/histograms/United States/021B21A/012B21A.json
@@ -1 +1 @@
-{"batchcode": "021B21A/012B21A", "histograms": [{"batchcodes": ["021B21A/012B21A"], "histogram": {"Anxiety": 1, "Condition aggravated": 1, "Hyperaesthesia": 1, "Obsessive-compulsive disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "021B21A/012B21A", "histograms": [{"histogram": {"Anxiety": 1, "Condition aggravated": 1, "Hyperaesthesia": 1, "Obsessive-compulsive disorder": 1}, "batchcodes": ["021B21A/012B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B21A1.json b/docs/data/histograms/United States/021B21A1.json
index 28594477cf2..402842ebf82 100644
--- a/docs/data/histograms/United States/021B21A1.json
+++ b/docs/data/histograms/United States/021B21A1.json
@@ -1 +1 @@
-{"batchcode": "021B21A1", "histograms": [{"batchcodes": ["021B21A1"], "histogram": {"Vaccination site pain": 2, "Arthralgia": 1, "Dizziness": 1, "Injected limb mobility decreased": 1, "Neck pain": 1, "Pain in extremity": 1, "Swelling face": 1, "Toothache": 1}}]}
\ No newline at end of file
+{"batchcode": "021B21A1", "histograms": [{"histogram": {"Vaccination site pain": 2, "Arthralgia": 1, "Dizziness": 1, "Injected limb mobility decreased": 1, "Neck pain": 1, "Pain in extremity": 1, "Swelling face": 1, "Toothache": 1}, "batchcodes": ["021B21A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B21N.json b/docs/data/histograms/United States/021B21N.json
index a1edbe5403d..0fb52273634 100644
--- a/docs/data/histograms/United States/021B21N.json
+++ b/docs/data/histograms/United States/021B21N.json
@@ -1 +1 @@
-{"batchcode": "021B21N", "histograms": [{"batchcodes": ["021B21N"], "histogram": {"COVID-19": 1, "Feeling abnormal": 1, "Nausea": 1, "Pain": 1, "Productive cough": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "021B21N", "histograms": [{"histogram": {"COVID-19": 1, "Feeling abnormal": 1, "Nausea": 1, "Pain": 1, "Productive cough": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["021B21N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021B221A.json b/docs/data/histograms/United States/021B221A.json
index ea66ab13e02..181c09f58fc 100644
--- a/docs/data/histograms/United States/021B221A.json
+++ b/docs/data/histograms/United States/021B221A.json
@@ -1 +1 @@
-{"batchcode": "021B221A", "histograms": [{"batchcodes": ["021B221A"], "histogram": {"Asthenia": 2, "Cough": 2, "Dysphagia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Aphonia": 1, "Bedridden": 1, "Dysphonia": 1, "Gait disturbance": 1, "Mass": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Peripheral swelling": 1, "Productive cough": 1, "Rash": 1, "Rhinorrhoea": 1, "Sensation of foreign body": 1, "Synovial cyst": 1}}]}
\ No newline at end of file
+{"batchcode": "021B221A", "histograms": [{"histogram": {"Asthenia": 2, "Cough": 2, "Dysphagia": 2, "Pain in extremity": 2, "Pyrexia": 2, "Aphonia": 1, "Bedridden": 1, "Dysphonia": 1, "Gait disturbance": 1, "Mass": 1, "Odynophagia": 1, "Oropharyngeal pain": 1, "Peripheral swelling": 1, "Productive cough": 1, "Rash": 1, "Rhinorrhoea": 1, "Sensation of foreign body": 1, "Synovial cyst": 1}, "batchcodes": ["021B221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021BZ1A.json b/docs/data/histograms/United States/021BZ1A.json
index 91975d27d58..0c8f33553c9 100644
--- a/docs/data/histograms/United States/021BZ1A.json
+++ b/docs/data/histograms/United States/021BZ1A.json
@@ -1 +1 @@
-{"batchcode": "021BZ1A", "histograms": [{"batchcodes": ["021BZ1A"], "histogram": {"Vaccination site rash": 2, "Extremity contracture": 1, "Fatigue": 1, "Feeling cold": 1, "Hyperhidrosis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Tremor": 1, "Vaccination site dysaesthesia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "021BZ1A", "histograms": [{"histogram": {"Vaccination site rash": 2, "Extremity contracture": 1, "Fatigue": 1, "Feeling cold": 1, "Hyperhidrosis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Tremor": 1, "Vaccination site dysaesthesia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["021BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C021A.json b/docs/data/histograms/United States/021C021A.json
index d919fd3b285..497db1a31dc 100644
--- a/docs/data/histograms/United States/021C021A.json
+++ b/docs/data/histograms/United States/021C021A.json
@@ -1 +1 @@
-{"batchcode": "021C021A", "histograms": [{"batchcodes": ["021C021A"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "021C021A", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["021C021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C210.json b/docs/data/histograms/United States/021C210.json
index 7f646480a5e..dce9a9428cc 100644
--- a/docs/data/histograms/United States/021C210.json
+++ b/docs/data/histograms/United States/021C210.json
@@ -1 +1 @@
-{"batchcode": "021C210", "histograms": [{"batchcodes": ["021C210", "201A21A"], "histogram": {"Dizziness": 1, "Gait disturbance": 1, "Head injury": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "021C210", "histograms": [{"histogram": {"Dizziness": 1, "Gait disturbance": 1, "Head injury": 1, "Myalgia": 1}, "batchcodes": ["021C210", "201A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C211A.json b/docs/data/histograms/United States/021C211A.json
index 1b997b3a33d..fd86cf2d7cc 100644
--- a/docs/data/histograms/United States/021C211A.json
+++ b/docs/data/histograms/United States/021C211A.json
@@ -1 +1 @@
-{"batchcode": "021C211A", "histograms": [{"batchcodes": ["021C211A"], "histogram": {"Cerebrovascular accident": 1, "Chest pain": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate increased": 1, "Paraesthesia": 1, "Speech disorder": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "021C211A", "histograms": [{"histogram": {"Cerebrovascular accident": 1, "Chest pain": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Headache": 1, "Heart rate increased": 1, "Paraesthesia": 1, "Speech disorder": 1, "Visual impairment": 1}, "batchcodes": ["021C211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C214.json b/docs/data/histograms/United States/021C214.json
index 7535049fc13..c99cd895970 100644
--- a/docs/data/histograms/United States/021C214.json
+++ b/docs/data/histograms/United States/021C214.json
@@ -1 +1 @@
-{"batchcode": "021C214", "histograms": [{"batchcodes": ["021C214"], "histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Pyrexia": 1, "Rash pruritic": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "021C214", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Pyrexia": 1, "Rash pruritic": 1, "Vaccination site pain": 1}, "batchcodes": ["021C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C21A..json b/docs/data/histograms/United States/021C21A..json
index 97a8372a9d8..13e9144446f 100644
--- a/docs/data/histograms/United States/021C21A..json
+++ b/docs/data/histograms/United States/021C21A..json
@@ -1 +1 @@
-{"batchcode": "021C21A.", "histograms": [{"batchcodes": ["021C21A."], "histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "021C21A.", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Vaccination site pain": 1}, "batchcodes": ["021C21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C21A.json b/docs/data/histograms/United States/021C21A.json
index bb972368861..07fd857c736 100644
--- a/docs/data/histograms/United States/021C21A.json
+++ b/docs/data/histograms/United States/021C21A.json
@@ -1 +1 @@
-{"batchcode": "021C21A", "histograms": [{"batchcodes": ["021C21A", "023H22A", "042A21A", "FP7150"], "histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["021C21A", "027B21A"], "histogram": {"Chills": 1, "Dizziness": 1, "Ear discomfort": 1, "Fatigue": 1, "Influenza": 1, "Paraesthesia": 1, "Vaccination site pain": 1}}, {"batchcodes": ["021C21A", "EW0186"], "histogram": {"Off label use": 1}}, {"batchcodes": ["021C21A", "FB3181"], "histogram": {"Interchange of vaccine products": 1}}, {"batchcodes": ["021C21A"], "histogram": {"Expired product administered": 31, "Headache": 16, "Pyrexia": 13, "Myalgia": 11, "Fatigue": 10, "Vaccination site erythema": 10, "Pain in extremity": 9, "Asthenia": 6, "Dizziness": 6, "Malaise": 6, "Nausea": 6, "Pain": 6, "Vaccination site pain": 6, "Vaccination site swelling": 6, "Paraesthesia": 5, "Product administered to patient of inappropriate age": 5, "Pruritus": 5, "Vaccination complication": 5, "Vision blurred": 5, "Arthralgia": 4, "Chills": 4, "Feeling abnormal": 4, "Vaccination site pruritus": 4, "Blood pressure increased": 3, "Body temperature": 3, "Condition aggravated": 3, "Diarrhoea": 3, "Dyspnoea": 3, "Gait disturbance": 3, "Head discomfort": 3, "Hypoaesthesia": 3, "Inappropriate schedule of product administration": 3, "Insomnia": 3, "Magnetic resonance imaging": 3, "Nasal congestion": 3, "Rash": 3, "SARS-CoV-2 test": 3, "Vaccination site bruising": 3, "Vaccination site rash": 3, "Vaccination site warmth": 3, "Anxiety": 2, "Blood test": 2, "Burning sensation": 2, "Chest pain": 2, "Cough": 2, "Dehydration": 2, "Dry mouth": 2, "Electrocardiogram": 2, "Eructation": 2, "Eye disorder": 2, "Feeling hot": 2, "Hyperhidrosis": 2, "Hypokinesia": 2, "Illness": 2, "Influenza like illness": 2, "Injection site warmth": 2, "Joint swelling": 2, "Lethargy": 2, "Loss of consciousness": 2, "Lymphadenopathy": 2, "Mobility decreased": 2, "Movement disorder": 2, "Neuropathy peripheral": 2, "Peripheral swelling": 2, "Product administration error": 2, "Product storage error": 2, "SARS-CoV-2 test positive": 2, "Swelling": 2, "Vaccination site induration": 2, "Vaccination site mass": 2, "Vertigo": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Ageusia": 1, "Amenorrhoea": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antibody test": 1, "Arthritis": 1, "Back pain": 1, "Bedridden": 1, "Blindness": 1, "Blindness unilateral": 1, "Blister": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "COVID-19": 1, "Chromaturia": 1, "Computerised tomogram head": 1, "Contusion": 1, "Dementia": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear infection": 1, "Ear, nose and throat examination": 1, "Erythema": 1, "Extrasystoles": 1, "Eye pain": 1, "Eye swelling": 1, "Facial pain": 1, "Fear": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Feeling of relaxation": 1, "Fungal infection": 1, "Gait inability": 1, "Glycosylated haemoglobin": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypertension": 1, "Impaired work ability": 1, "Incorrect product administration duration": 1, "Incorrect route of product administration": 1, "Injection site erythema": 1, "Injection site induration": 1, "Injection site mass": 1, "Injection site swelling": 1, "Joint injury": 1, "Limb discomfort": 1, "Lip swelling": 1, "Magnetic resonance imaging head": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Mental disorder": 1, "Metabolic function test": 1, "Migraine": 1, "Mood swings": 1, "Mucous stools": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Mydriasis": 1, "Neck pain": 1, "Oligomenorrhoea": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Poor quality sleep": 1, "Product dose omission issue": 1, "Productive cough": 1, "Rhesus antigen negative": 1, "Sensation of foreign body": 1, "Sinusitis": 1, "Skin swelling": 1, "Thirst": 1, "Tinnitus": 1, "Tremor": 1, "Troponin": 1, "Urine odour abnormal": 1, "Urticaria": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Viral infection": 1, "Wrong technique in product usage process": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "021C21A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}, "batchcodes": ["021C21A", "023H22A", "042A21A", "FP7150"]}, {"histogram": {"Chills": 1, "Dizziness": 1, "Ear discomfort": 1, "Fatigue": 1, "Influenza": 1, "Paraesthesia": 1, "Vaccination site pain": 1}, "batchcodes": ["021C21A", "027B21A"]}, {"histogram": {"Off label use": 1}, "batchcodes": ["021C21A", "EW0186"]}, {"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["021C21A", "FB3181"]}, {"histogram": {"Expired product administered": 31, "Headache": 16, "Pyrexia": 13, "Myalgia": 11, "Fatigue": 10, "Vaccination site erythema": 10, "Pain in extremity": 9, "Asthenia": 6, "Dizziness": 6, "Malaise": 6, "Nausea": 6, "Pain": 6, "Vaccination site pain": 6, "Vaccination site swelling": 6, "Paraesthesia": 5, "Product administered to patient of inappropriate age": 5, "Pruritus": 5, "Vaccination complication": 5, "Vision blurred": 5, "Arthralgia": 4, "Chills": 4, "Feeling abnormal": 4, "Vaccination site pruritus": 4, "Blood pressure increased": 3, "Body temperature": 3, "Condition aggravated": 3, "Diarrhoea": 3, "Dyspnoea": 3, "Gait disturbance": 3, "Head discomfort": 3, "Hypoaesthesia": 3, "Inappropriate schedule of product administration": 3, "Insomnia": 3, "Magnetic resonance imaging": 3, "Nasal congestion": 3, "Rash": 3, "SARS-CoV-2 test": 3, "Vaccination site bruising": 3, "Vaccination site rash": 3, "Vaccination site warmth": 3, "Anxiety": 2, "Blood test": 2, "Burning sensation": 2, "Chest pain": 2, "Cough": 2, "Dehydration": 2, "Dry mouth": 2, "Electrocardiogram": 2, "Eructation": 2, "Eye disorder": 2, "Feeling hot": 2, "Hyperhidrosis": 2, "Hypokinesia": 2, "Illness": 2, "Influenza like illness": 2, "Injection site warmth": 2, "Joint swelling": 2, "Lethargy": 2, "Loss of consciousness": 2, "Lymphadenopathy": 2, "Mobility decreased": 2, "Movement disorder": 2, "Neuropathy peripheral": 2, "Peripheral swelling": 2, "Product administration error": 2, "Product storage error": 2, "SARS-CoV-2 test positive": 2, "Swelling": 2, "Vaccination site induration": 2, "Vaccination site mass": 2, "Vertigo": 2, "Vomiting": 2, "Abdominal discomfort": 1, "Ageusia": 1, "Amenorrhoea": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antibody test": 1, "Arthritis": 1, "Back pain": 1, "Bedridden": 1, "Blindness": 1, "Blindness unilateral": 1, "Blister": 1, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Blood pressure systolic increased": 1, "COVID-19": 1, "Chromaturia": 1, "Computerised tomogram head": 1, "Contusion": 1, "Dementia": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear infection": 1, "Ear, nose and throat examination": 1, "Erythema": 1, "Extrasystoles": 1, "Eye pain": 1, "Eye swelling": 1, "Facial pain": 1, "Fear": 1, "Feeding disorder": 1, "Feeling drunk": 1, "Feeling of relaxation": 1, "Fungal infection": 1, "Gait inability": 1, "Glycosylated haemoglobin": 1, "Heavy menstrual bleeding": 1, "Hypersensitivity": 1, "Hypertension": 1, "Impaired work ability": 1, "Incorrect product administration duration": 1, "Incorrect route of product administration": 1, "Injection site erythema": 1, "Injection site induration": 1, "Injection site mass": 1, "Injection site swelling": 1, "Joint injury": 1, "Limb discomfort": 1, "Lip swelling": 1, "Magnetic resonance imaging head": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Mental disorder": 1, "Metabolic function test": 1, "Migraine": 1, "Mood swings": 1, "Mucous stools": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Mydriasis": 1, "Neck pain": 1, "Oligomenorrhoea": 1, "Ophthalmological examination": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pain in jaw": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Poor quality sleep": 1, "Product dose omission issue": 1, "Productive cough": 1, "Rhesus antigen negative": 1, "Sensation of foreign body": 1, "Sinusitis": 1, "Skin swelling": 1, "Thirst": 1, "Tinnitus": 1, "Tremor": 1, "Troponin": 1, "Urine odour abnormal": 1, "Urticaria": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Viral infection": 1, "Wrong technique in product usage process": 1, "X-ray": 1}, "batchcodes": ["021C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C4A.json b/docs/data/histograms/United States/021C4A.json
index c0d99d46be7..b3652155afc 100644
--- a/docs/data/histograms/United States/021C4A.json
+++ b/docs/data/histograms/United States/021C4A.json
@@ -1 +1 @@
-{"batchcode": "021C4A", "histograms": [{"batchcodes": ["021C4A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "021C4A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["021C4A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021C71A.json b/docs/data/histograms/United States/021C71A.json
index 06c4e74c1bc..61912916c44 100644
--- a/docs/data/histograms/United States/021C71A.json
+++ b/docs/data/histograms/United States/021C71A.json
@@ -1 +1 @@
-{"batchcode": "021C71A", "histograms": [{"batchcodes": ["021C71A"], "histogram": {"Anxiety": 1, "Chills": 1, "Headache": 1, "Nausea": 1, "Premenstrual pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "021C71A", "histograms": [{"histogram": {"Anxiety": 1, "Chills": 1, "Headache": 1, "Nausea": 1, "Premenstrual pain": 1, "Vaccination site pain": 1}, "batchcodes": ["021C71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021D21A.json b/docs/data/histograms/United States/021D21A.json
index 1e61079b188..e8037764eed 100644
--- a/docs/data/histograms/United States/021D21A.json
+++ b/docs/data/histograms/United States/021D21A.json
@@ -1 +1 @@
-{"batchcode": "021D21A", "histograms": [{"batchcodes": ["021D21A"], "histogram": {"Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "021D21A", "histograms": [{"histogram": {"Vomiting": 1}, "batchcodes": ["021D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021E21A.json b/docs/data/histograms/United States/021E21A.json
index a5885b7fab6..20828bb4f8e 100644
--- a/docs/data/histograms/United States/021E21A.json
+++ b/docs/data/histograms/United States/021E21A.json
@@ -1 +1 @@
-{"batchcode": "021E21A", "histograms": [{"batchcodes": ["021E21A"], "histogram": {"COVID-19": 1, "Hyperhidrosis": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "021E21A", "histograms": [{"histogram": {"COVID-19": 1, "Hyperhidrosis": 1, "Pain in extremity": 1}, "batchcodes": ["021E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021F21A.json b/docs/data/histograms/United States/021F21A.json
index 7f9bd545c77..63d3c255f28 100644
--- a/docs/data/histograms/United States/021F21A.json
+++ b/docs/data/histograms/United States/021F21A.json
@@ -1 +1 @@
-{"batchcode": "021F21A", "histograms": [{"batchcodes": ["021F21A"], "histogram": {"Expired product administered": 7, "Product storage error": 7, "Fatigue": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "021F21A", "histograms": [{"histogram": {"Expired product administered": 7, "Product storage error": 7, "Fatigue": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["021F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021H22A.json b/docs/data/histograms/United States/021H22A.json
index df320b62ab4..6c6d8fefb37 100644
--- a/docs/data/histograms/United States/021H22A.json
+++ b/docs/data/histograms/United States/021H22A.json
@@ -1 +1 @@
-{"batchcode": "021H22A", "histograms": [{"batchcodes": ["021H22A"], "histogram": {"No adverse event": 28, "Expired product administered": 17, "Product storage error": 10, "Wrong product administered": 4, "Accidental underdose": 3, "Vaccination site pain": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Circumstance or information capable of leading to medication error": 1, "Dysarthria": 1, "Dysphonia": 1, "Extra dose administered": 1, "Eye pain": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Interchange of vaccine products": 1, "Migraine": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Vaccination site anaesthesia": 1, "Vaccination site discolouration": 1, "Vaccination site paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "021H22A", "histograms": [{"histogram": {"No adverse event": 28, "Expired product administered": 17, "Product storage error": 10, "Wrong product administered": 4, "Accidental underdose": 3, "Vaccination site pain": 2, "COVID-19": 1, "COVID-19 immunisation": 1, "Circumstance or information capable of leading to medication error": 1, "Dysarthria": 1, "Dysphonia": 1, "Extra dose administered": 1, "Eye pain": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Interchange of vaccine products": 1, "Migraine": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Vaccination site anaesthesia": 1, "Vaccination site discolouration": 1, "Vaccination site paraesthesia": 1}, "batchcodes": ["021H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021L20A.json b/docs/data/histograms/United States/021L20A.json
index 54065a76fa4..984cd7a3bba 100644
--- a/docs/data/histograms/United States/021L20A.json
+++ b/docs/data/histograms/United States/021L20A.json
@@ -1 +1 @@
-{"batchcode": "021L20A", "histograms": [{"batchcodes": ["021L20A"], "histogram": {"Pain in extremity": 4, "Peripheral swelling": 3, "Vaccination site pain": 3, "Erythema": 2, "Fatigue": 2, "Pyrexia": 2, "Rash": 2, "Rash erythematous": 2, "Vaccination site rash": 2, "Amnesia": 1, "Antinuclear antibody": 1, "Arthralgia": 1, "Autoimmune disorder": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Dermatitis": 1, "Dyspnoea": 1, "Groin pain": 1, "Headache": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Injection site urticaria": 1, "Interstitial lung disease": 1, "Lip dry": 1, "Muscular weakness": 1, "Pain": 1, "Paraesthesia": 1, "Pneumonia": 1, "Pruritus": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Syringe issue": 1, "Vaccination complication": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "021L20A", "histograms": [{"histogram": {"Pain in extremity": 4, "Peripheral swelling": 3, "Vaccination site pain": 3, "Erythema": 2, "Fatigue": 2, "Pyrexia": 2, "Rash": 2, "Rash erythematous": 2, "Vaccination site rash": 2, "Amnesia": 1, "Antinuclear antibody": 1, "Arthralgia": 1, "Autoimmune disorder": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chest X-ray": 1, "Chest pain": 1, "Computerised tomogram": 1, "Cough": 1, "Dermatitis": 1, "Dyspnoea": 1, "Groin pain": 1, "Headache": 1, "Heart rate": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Injection site urticaria": 1, "Interstitial lung disease": 1, "Lip dry": 1, "Muscular weakness": 1, "Pain": 1, "Paraesthesia": 1, "Pneumonia": 1, "Pruritus": 1, "Respiratory rate": 1, "SARS-CoV-2 test": 1, "Syringe issue": 1, "Vaccination complication": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["021L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021L21A.json b/docs/data/histograms/United States/021L21A.json
index 9185e05bc06..473b37942cc 100644
--- a/docs/data/histograms/United States/021L21A.json
+++ b/docs/data/histograms/United States/021L21A.json
@@ -1 +1 @@
-{"batchcode": "021L21A", "histograms": [{"batchcodes": ["021L21A", "FL3198"], "histogram": {"Erectile dysfunction": 1, "Product use issue": 1}}]}
\ No newline at end of file
+{"batchcode": "021L21A", "histograms": [{"histogram": {"Erectile dysfunction": 1, "Product use issue": 1}, "batchcodes": ["021L21A", "FL3198"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021M020A.json b/docs/data/histograms/United States/021M020A.json
index 03b82188195..ad463c29545 100644
--- a/docs/data/histograms/United States/021M020A.json
+++ b/docs/data/histograms/United States/021M020A.json
@@ -1 +1 @@
-{"batchcode": "021M020A", "histograms": [{"batchcodes": ["021M020A"], "histogram": {"Bedridden": 1, "Chills": 1, "Decreased appetite": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "021M020A", "histograms": [{"histogram": {"Bedridden": 1, "Chills": 1, "Decreased appetite": 1, "Pyrexia": 1}, "batchcodes": ["021M020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021M02A.json b/docs/data/histograms/United States/021M02A.json
index e69fd27bdc0..1285c8c4072 100644
--- a/docs/data/histograms/United States/021M02A.json
+++ b/docs/data/histograms/United States/021M02A.json
@@ -1 +1 @@
-{"batchcode": "021M02A", "histograms": [{"batchcodes": ["021M02A"], "histogram": {"Abdominal pain upper": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "021M02A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Vaccination site erythema": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["021M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/021M20A.json b/docs/data/histograms/United States/021M20A.json
index e0b3d0dfc9d..0f0a9ea146f 100644
--- a/docs/data/histograms/United States/021M20A.json
+++ b/docs/data/histograms/United States/021M20A.json
@@ -1 +1 @@
-{"batchcode": "021M20A", "histograms": [{"batchcodes": ["021M20A"], "histogram": {"Chills": 3, "Atrial fibrillation": 2, "Fatigue": 2, "Headache": 2, "Heart rate increased": 2, "Adverse event": 1, "Chest discomfort": 1, "Cough": 1, "Discomfort": 1, "Dizziness": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Illness": 1, "Injection site pain": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Nervousness": 1, "Palpitations": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Rash": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "021M20A", "histograms": [{"histogram": {"Chills": 3, "Atrial fibrillation": 2, "Fatigue": 2, "Headache": 2, "Heart rate increased": 2, "Adverse event": 1, "Chest discomfort": 1, "Cough": 1, "Discomfort": 1, "Dizziness": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Illness": 1, "Injection site pain": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Myalgia": 1, "Myocardial infarction": 1, "Nausea": 1, "Nervousness": 1, "Palpitations": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Rash": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["021M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022-B21A.json b/docs/data/histograms/United States/022-B21A.json
index 6b5527fe78d..86663dcb1ea 100644
--- a/docs/data/histograms/United States/022-B21A.json
+++ b/docs/data/histograms/United States/022-B21A.json
@@ -1 +1 @@
-{"batchcode": "022-B21A", "histograms": [{"batchcodes": ["022-B21A"], "histogram": {"Axillary mass": 1, "Chills": 1, "Influenza": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "022-B21A", "histograms": [{"histogram": {"Axillary mass": 1, "Chills": 1, "Influenza": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["022-B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02212022.json b/docs/data/histograms/United States/02212022.json
index 95e1ca1508d..bfcf05370ab 100644
--- a/docs/data/histograms/United States/02212022.json
+++ b/docs/data/histograms/United States/02212022.json
@@ -1 +1 @@
-{"batchcode": "02212022", "histograms": [{"batchcodes": ["02212022"], "histogram": {"Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02212022", "histograms": [{"histogram": {"Chills": 1, "Pyrexia": 1}, "batchcodes": ["02212022"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0221321A.json b/docs/data/histograms/United States/0221321A.json
index 7a5ced20fb3..2fbb615d3bc 100644
--- a/docs/data/histograms/United States/0221321A.json
+++ b/docs/data/histograms/United States/0221321A.json
@@ -1 +1 @@
-{"batchcode": "0221321A", "histograms": [{"batchcodes": ["0221321A"], "histogram": {"Chemical burn": 1, "Feeling hot": 1, "Pain": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "0221321A", "histograms": [{"histogram": {"Chemical burn": 1, "Feeling hot": 1, "Pain": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1}, "batchcodes": ["0221321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022321A.json b/docs/data/histograms/United States/022321A.json
index 5521d9e0ff4..16eadc45e8a 100644
--- a/docs/data/histograms/United States/022321A.json
+++ b/docs/data/histograms/United States/022321A.json
@@ -1 +1 @@
-{"batchcode": "022321A", "histograms": [{"batchcodes": ["022321A"], "histogram": {"Abdominal discomfort": 1, "Flatulence": 1, "Headache": 1, "Insomnia": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "022321A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Flatulence": 1, "Headache": 1, "Insomnia": 1, "Nausea": 1}, "batchcodes": ["022321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02242639.json b/docs/data/histograms/United States/02242639.json
index e3303105329..990261c71cc 100644
--- a/docs/data/histograms/United States/02242639.json
+++ b/docs/data/histograms/United States/02242639.json
@@ -1 +1 @@
-{"batchcode": "02242639", "histograms": [{"batchcodes": ["02242639"], "histogram": {"Computerised tomogram": 1, "Trigeminal neuralgia": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "02242639", "histograms": [{"histogram": {"Computerised tomogram": 1, "Trigeminal neuralgia": 1, "Urinary tract infection": 1}, "batchcodes": ["02242639"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0225A21A.json b/docs/data/histograms/United States/0225A21A.json
index 1404fe44dbf..6ec1f93a22f 100644
--- a/docs/data/histograms/United States/0225A21A.json
+++ b/docs/data/histograms/United States/0225A21A.json
@@ -1 +1 @@
-{"batchcode": "0225A21A", "histograms": [{"batchcodes": ["0225A21A"], "histogram": {"Heart rate increased": 1, "Hypersensitivity": 1, "Insomnia": 1, "Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "0225A21A", "histograms": [{"histogram": {"Heart rate increased": 1, "Hypersensitivity": 1, "Insomnia": 1, "Muscle spasms": 1}, "batchcodes": ["0225A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022A20A.json b/docs/data/histograms/United States/022A20A.json
index 609fd6396cb..519449cfefe 100644
--- a/docs/data/histograms/United States/022A20A.json
+++ b/docs/data/histograms/United States/022A20A.json
@@ -1 +1 @@
-{"batchcode": "022A20A", "histograms": [{"batchcodes": ["022A20A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Fall": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "022A20A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Fall": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Vertigo": 1}, "batchcodes": ["022A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022A21A.json b/docs/data/histograms/United States/022A21A.json
index 3ed27154d1a..d70b3c9ee80 100644
--- a/docs/data/histograms/United States/022A21A.json
+++ b/docs/data/histograms/United States/022A21A.json
@@ -1 +1 @@
-{"batchcode": "022A21A", "histograms": [{"batchcodes": ["022A21A"], "histogram": {"Vaccination site pain": 2, "Vaccination site swelling": 2, "Chills": 1, "Fatigue": 1, "Headache": 1, "Muscle tightness": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site mass": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "022A21A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Vaccination site swelling": 2, "Chills": 1, "Fatigue": 1, "Headache": 1, "Muscle tightness": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site mass": 1, "Vomiting": 1}, "batchcodes": ["022A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022B1A.json b/docs/data/histograms/United States/022B1A.json
index 25a003132ad..e1789d643c3 100644
--- a/docs/data/histograms/United States/022B1A.json
+++ b/docs/data/histograms/United States/022B1A.json
@@ -1 +1 @@
-{"batchcode": "022B1A", "histograms": [{"batchcodes": ["022B1A"], "histogram": {"Abdominal pain": 1, "Back pain": 1, "Cough": 1, "Dyspnoea": 1, "Pain": 1, "Painful respiration": 1, "Pulmonary pain": 1}}]}
\ No newline at end of file
+{"batchcode": "022B1A", "histograms": [{"histogram": {"Abdominal pain": 1, "Back pain": 1, "Cough": 1, "Dyspnoea": 1, "Pain": 1, "Painful respiration": 1, "Pulmonary pain": 1}, "batchcodes": ["022B1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022B218.json b/docs/data/histograms/United States/022B218.json
index ed996e11389..4515f96f91a 100644
--- a/docs/data/histograms/United States/022B218.json
+++ b/docs/data/histograms/United States/022B218.json
@@ -1 +1 @@
-{"batchcode": "022B218", "histograms": [{"batchcodes": ["022B218"], "histogram": {"Acute kidney injury": 1, "Blood pressure measurement": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Heart rate": 1, "Illness": 1, "Mental status changes": 1, "Myocarditis": 1, "Respiration abnormal": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "022B218", "histograms": [{"histogram": {"Acute kidney injury": 1, "Blood pressure measurement": 1, "Dysarthria": 1, "Electrocardiogram": 1, "Encephalitis": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Heart rate": 1, "Illness": 1, "Mental status changes": 1, "Myocarditis": 1, "Respiration abnormal": 1, "Urinary tract infection": 1}, "batchcodes": ["022B218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022B21A..json b/docs/data/histograms/United States/022B21A..json
index ae6202a1227..a00ec523b6f 100644
--- a/docs/data/histograms/United States/022B21A..json
+++ b/docs/data/histograms/United States/022B21A..json
@@ -1 +1 @@
-{"batchcode": "022B21A.", "histograms": [{"batchcodes": ["022B21A."], "histogram": {"Pain in extremity": 1, "Tooth extraction": 1, "Tooth infection": 1, "Toothache": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "022B21A.", "histograms": [{"histogram": {"Pain in extremity": 1, "Tooth extraction": 1, "Tooth infection": 1, "Toothache": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["022B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022B21A.json b/docs/data/histograms/United States/022B21A.json
index 6d11136cd9a..315c571970a 100644
--- a/docs/data/histograms/United States/022B21A.json
+++ b/docs/data/histograms/United States/022B21A.json
@@ -1 +1 @@
-{"batchcode": "022B21A", "histograms": [{"batchcodes": ["022B21A"], "histogram": {"Fatigue": 15, "Expired product administered": 14, "Headache": 11, "Myalgia": 11, "Pyrexia": 10, "Vaccination site pain": 10, "Dizziness": 9, "Dyspnoea": 8, "Asthenia": 6, "Chills": 6, "Feeling abnormal": 6, "Nausea": 6, "Pain in extremity": 6, "Heart rate": 5, "Vomiting": 5, "Body temperature": 4, "Diarrhoea": 4, "Inappropriate schedule of product administration": 4, "Product administered to patient of inappropriate age": 4, "Vaccination site swelling": 4, "Chest discomfort": 3, "Chest pain": 3, "Cough": 3, "Electrocardiogram": 3, "Erythema": 3, "Hyperhidrosis": 3, "Insomnia": 3, "Product dose omission issue": 3, "SARS-CoV-2 test": 3, "Seizure": 3, "Underdose": 3, "Vaccination site erythema": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Blood test": 2, "Device connection issue": 2, "Illness": 2, "Impaired work ability": 2, "Lethargy": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "Product storage error": 2, "Pruritus": 2, "Throat tightness": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site pruritus": 2, "Accidental underdose": 1, "Ageusia": 1, "Alcohol test": 1, "Alcohol test negative": 1, "Amenorrhoea": 1, "Anosmia": 1, "Anxiety": 1, "Arthralgia": 1, "Asthma": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac disorder": 1, "Cellulitis": 1, "Coating in mouth": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Confusional state": 1, "Contusion": 1, "Delirium": 1, "Discomfort": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Eructation": 1, "Eye movement disorder": 1, "Gait disturbance": 1, "Gastrointestinal pain": 1, "Generalised tonic-clonic seizure": 1, "Haematochezia": 1, "Hiccups": 1, "Hypersensitivity": 1, "Hypertension": 1, "Infection": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Intentional dose omission": 1, "Kidney infection": 1, "Ligament pain": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Medication error": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nephrolithiasis": 1, "Nervousness": 1, "Night sweats": 1, "Oxygen saturation": 1, "Pain": 1, "Pancreatic disorder": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Presyncope": 1, "Pulmonary pain": 1, "Rash": 1, "Rash papular": 1, "Rheumatoid arthritis": 1, "Sepsis": 1, "Spleen disorder": 1, "Splenic infarction": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Tendon rupture": 1, "Tinnitus": 1, "Vaccination site scab": 1, "Vaccination site warmth": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vision blurred": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "022B21A", "histograms": [{"histogram": {"Fatigue": 15, "Expired product administered": 14, "Headache": 11, "Myalgia": 11, "Pyrexia": 10, "Vaccination site pain": 10, "Dizziness": 9, "Dyspnoea": 8, "Asthenia": 6, "Chills": 6, "Feeling abnormal": 6, "Nausea": 6, "Pain in extremity": 6, "Heart rate": 5, "Vomiting": 5, "Body temperature": 4, "Diarrhoea": 4, "Inappropriate schedule of product administration": 4, "Product administered to patient of inappropriate age": 4, "Vaccination site swelling": 4, "Chest discomfort": 3, "Chest pain": 3, "Cough": 3, "Electrocardiogram": 3, "Erythema": 3, "Hyperhidrosis": 3, "Insomnia": 3, "Product dose omission issue": 3, "SARS-CoV-2 test": 3, "Seizure": 3, "Underdose": 3, "Vaccination site erythema": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Blood test": 2, "Device connection issue": 2, "Illness": 2, "Impaired work ability": 2, "Lethargy": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "Product storage error": 2, "Pruritus": 2, "Throat tightness": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site pruritus": 2, "Accidental underdose": 1, "Ageusia": 1, "Alcohol test": 1, "Alcohol test negative": 1, "Amenorrhoea": 1, "Anosmia": 1, "Anxiety": 1, "Arthralgia": 1, "Asthma": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Blood pressure systolic": 1, "Burning sensation": 1, "COVID-19": 1, "Cardiac disorder": 1, "Cellulitis": 1, "Coating in mouth": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Confusional state": 1, "Contusion": 1, "Delirium": 1, "Discomfort": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Eructation": 1, "Eye movement disorder": 1, "Gait disturbance": 1, "Gastrointestinal pain": 1, "Generalised tonic-clonic seizure": 1, "Haematochezia": 1, "Hiccups": 1, "Hypersensitivity": 1, "Hypertension": 1, "Infection": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Intentional dose omission": 1, "Kidney infection": 1, "Ligament pain": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Medication error": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Nephrolithiasis": 1, "Nervousness": 1, "Night sweats": 1, "Oxygen saturation": 1, "Pain": 1, "Pancreatic disorder": 1, "Pericarditis": 1, "Peripheral swelling": 1, "Presyncope": 1, "Pulmonary pain": 1, "Rash": 1, "Rash papular": 1, "Rheumatoid arthritis": 1, "Sepsis": 1, "Spleen disorder": 1, "Splenic infarction": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Tendon rupture": 1, "Tinnitus": 1, "Vaccination site scab": 1, "Vaccination site warmth": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Vision blurred": 1, "Wheezing": 1}, "batchcodes": ["022B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022B21H.json b/docs/data/histograms/United States/022B21H.json
index 0b3e35b85ad..30be626c657 100644
--- a/docs/data/histograms/United States/022B21H.json
+++ b/docs/data/histograms/United States/022B21H.json
@@ -1 +1 @@
-{"batchcode": "022B21H", "histograms": [{"batchcodes": ["022B21H"], "histogram": {"Arthralgia": 1, "Feeling cold": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "022B21H", "histograms": [{"histogram": {"Arthralgia": 1, "Feeling cold": 1, "Tremor": 1}, "batchcodes": ["022B21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022BZ1A.json b/docs/data/histograms/United States/022BZ1A.json
index f01c83d9dc0..cf61dfffd0b 100644
--- a/docs/data/histograms/United States/022BZ1A.json
+++ b/docs/data/histograms/United States/022BZ1A.json
@@ -1 +1 @@
-{"batchcode": "022BZ1A", "histograms": [{"batchcodes": ["022BZ1A"], "histogram": {"Dizziness": 1, "Lethargy": 1, "Malaise": 1, "Nausea": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "022BZ1A", "histograms": [{"histogram": {"Dizziness": 1, "Lethargy": 1, "Malaise": 1, "Nausea": 1, "Somnolence": 1}, "batchcodes": ["022BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022C01A.json b/docs/data/histograms/United States/022C01A.json
index 03e17b6a963..4dba0df949b 100644
--- a/docs/data/histograms/United States/022C01A.json
+++ b/docs/data/histograms/United States/022C01A.json
@@ -1 +1 @@
-{"batchcode": "022C01A", "histograms": [{"batchcodes": ["022C01A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "022C01A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["022C01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022C1A.json b/docs/data/histograms/United States/022C1A.json
index a98e26fddc0..7ba9040fce2 100644
--- a/docs/data/histograms/United States/022C1A.json
+++ b/docs/data/histograms/United States/022C1A.json
@@ -1 +1 @@
-{"batchcode": "022C1A", "histograms": [{"batchcodes": ["022C1A"], "histogram": {"Abdominal pain upper": 1, "Impaired work ability": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "022C1A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Impaired work ability": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["022C1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022C21A. EXPIRA.json b/docs/data/histograms/United States/022C21A. EXPIRA.json
index 5e6b07a92a6..a413a381c09 100644
--- a/docs/data/histograms/United States/022C21A. EXPIRA.json
+++ b/docs/data/histograms/United States/022C21A. EXPIRA.json
@@ -1 +1 @@
-{"batchcode": "022C21A. EXPIRA", "histograms": [{"batchcodes": ["022C21A. EXPIRA"], "histogram": {"Headache": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "022C21A. EXPIRA", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1, "Product administered to patient of inappropriate age": 1}, "batchcodes": ["022C21A. EXPIRA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022C21A.json b/docs/data/histograms/United States/022C21A.json
index 066df421a37..5e96d51d689 100644
--- a/docs/data/histograms/United States/022C21A.json
+++ b/docs/data/histograms/United States/022C21A.json
@@ -1 +1 @@
-{"batchcode": "022C21A", "histograms": [{"batchcodes": ["022C21A", "057F22A", "1805022"], "histogram": {"Abdominal pain": 1, "COVID-19 immunisation": 1, "Diarrhoea": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["022C21A"], "histogram": {"Headache": 20, "Myalgia": 18, "Fatigue": 16, "Expired product administered": 15, "Pyrexia": 14, "Pain in extremity": 12, "Vaccination site pain": 11, "Chills": 10, "Inappropriate schedule of product administration": 9, "SARS-CoV-2 test": 9, "Dyspnoea": 8, "Feeling abnormal": 8, "Pain": 7, "Arthralgia": 6, "Feeling hot": 6, "Vaccination site rash": 6, "Asthenia": 5, "Back pain": 5, "Body temperature": 5, "Dizziness": 5, "Erythema": 5, "Illness": 5, "Nausea": 5, "Product administered to patient of inappropriate age": 5, "Rash": 5, "Vaccination site erythema": 5, "Vaccination site pruritus": 5, "Blood pressure measurement": 4, "Confusional state": 4, "Hypoaesthesia": 4, "Injection site pain": 4, "Neck pain": 4, "Pruritus": 4, "Vaccination site warmth": 4, "Vomiting": 4, "Burning sensation": 3, "Chest pain": 3, "Cough": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Hypersensitivity": 3, "Hypertension": 3, "Limb discomfort": 3, "Loss of personal independence in daily activities": 3, "Vaccination site reaction": 3, "Vaccination site swelling": 3, "Abdominal pain upper": 2, "Accidental overdose": 2, "Acne": 2, "Asthma": 2, "Blood test": 2, "COVID-19": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Dysphonia": 2, "Electrocardiogram": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Influenza like illness": 2, "Insomnia": 2, "Interchange of vaccine products": 2, "Joint injury": 2, "Malaise": 2, "Muscle spasms": 2, "Nasopharyngitis": 2, "Oropharyngeal pain": 2, "Product administration error": 2, "Product storage error": 2, "Sluggishness": 2, "Somnolence": 2, "Throat tightness": 2, "Urticaria": 2, "Vaccination complication": 2, "Abdominal discomfort": 1, "Abnormal sensation in eye": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Angioedema": 1, "Autoimmune disorder": 1, "Axillary pain": 1, "Balance disorder": 1, "Blindness": 1, "Blood electrolytes decreased": 1, "Blood immunoglobulin G": 1, "Cerebrovascular accident": 1, "Colonoscopy": 1, "Dizziness postural": 1, "Dry skin": 1, "Dyspepsia": 1, "Eating disorder": 1, "Electrolyte imbalance": 1, "Euphoric mood": 1, "Exercise tolerance decreased": 1, "Eye pruritus": 1, "Fall": 1, "Fear": 1, "Gait disturbance": 1, "Glucose tolerance impaired": 1, "Gout": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hyperpyrexia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Inflammation": 1, "Initial insomnia": 1, "Iron deficiency": 1, "Iron deficiency anaemia": 1, "Joint swelling": 1, "Laboratory test": 1, "Large intestine polyp": 1, "Limb immobilisation": 1, "Lip pain": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasal discomfort": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Osteitis": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pancreatitis acute": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product administered at inappropriate site": 1, "Product contamination": 1, "Product dose omission issue": 1, "Rash macular": 1, "Rash pruritic": 1, "Renal pain": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Sinus disorder": 1, "Sinusitis": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Sleep disorder": 1, "Swelling": 1, "Swollen tongue": 1, "Syncope": 1, "Taste disorder": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Thirst decreased": 1, "Throat irritation": 1, "Thrombosis": 1, "Tongue ulceration": 1, "Transferrin saturation": 1, "Troponin": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discharge": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site scab": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Viral infection": 1, "Vitreous floaters": 1, "Wheezing": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "022C21A", "histograms": [{"histogram": {"Abdominal pain": 1, "COVID-19 immunisation": 1, "Diarrhoea": 1, "Suspected COVID-19": 1}, "batchcodes": ["022C21A", "057F22A", "1805022"]}, {"histogram": {"Headache": 20, "Myalgia": 18, "Fatigue": 16, "Expired product administered": 15, "Pyrexia": 14, "Pain in extremity": 12, "Vaccination site pain": 11, "Chills": 10, "Inappropriate schedule of product administration": 9, "SARS-CoV-2 test": 9, "Dyspnoea": 8, "Feeling abnormal": 8, "Pain": 7, "Arthralgia": 6, "Feeling hot": 6, "Vaccination site rash": 6, "Asthenia": 5, "Back pain": 5, "Body temperature": 5, "Dizziness": 5, "Erythema": 5, "Illness": 5, "Nausea": 5, "Product administered to patient of inappropriate age": 5, "Rash": 5, "Vaccination site erythema": 5, "Vaccination site pruritus": 5, "Blood pressure measurement": 4, "Confusional state": 4, "Hypoaesthesia": 4, "Injection site pain": 4, "Neck pain": 4, "Pruritus": 4, "Vaccination site warmth": 4, "Vomiting": 4, "Burning sensation": 3, "Chest pain": 3, "Cough": 3, "Decreased appetite": 3, "Diarrhoea": 3, "Hypersensitivity": 3, "Hypertension": 3, "Limb discomfort": 3, "Loss of personal independence in daily activities": 3, "Vaccination site reaction": 3, "Vaccination site swelling": 3, "Abdominal pain upper": 2, "Accidental overdose": 2, "Acne": 2, "Asthma": 2, "Blood test": 2, "COVID-19": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Dysphonia": 2, "Electrocardiogram": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Influenza like illness": 2, "Insomnia": 2, "Interchange of vaccine products": 2, "Joint injury": 2, "Malaise": 2, "Muscle spasms": 2, "Nasopharyngitis": 2, "Oropharyngeal pain": 2, "Product administration error": 2, "Product storage error": 2, "Sluggishness": 2, "Somnolence": 2, "Throat tightness": 2, "Urticaria": 2, "Vaccination complication": 2, "Abdominal discomfort": 1, "Abnormal sensation in eye": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Angioedema": 1, "Autoimmune disorder": 1, "Axillary pain": 1, "Balance disorder": 1, "Blindness": 1, "Blood electrolytes decreased": 1, "Blood immunoglobulin G": 1, "Cerebrovascular accident": 1, "Colonoscopy": 1, "Dizziness postural": 1, "Dry skin": 1, "Dyspepsia": 1, "Eating disorder": 1, "Electrolyte imbalance": 1, "Euphoric mood": 1, "Exercise tolerance decreased": 1, "Eye pruritus": 1, "Fall": 1, "Fear": 1, "Gait disturbance": 1, "Glucose tolerance impaired": 1, "Gout": 1, "Haemoglobin": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hyperpyrexia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Inflammation": 1, "Initial insomnia": 1, "Iron deficiency": 1, "Iron deficiency anaemia": 1, "Joint swelling": 1, "Laboratory test": 1, "Large intestine polyp": 1, "Limb immobilisation": 1, "Lip pain": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasal discomfort": 1, "No adverse event": 1, "Ocular hyperaemia": 1, "Osteitis": 1, "Oxygen saturation": 1, "Palpitations": 1, "Pancreatitis acute": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product administered at inappropriate site": 1, "Product contamination": 1, "Product dose omission issue": 1, "Rash macular": 1, "Rash pruritic": 1, "Renal pain": 1, "Respiratory rate": 1, "Rhinorrhoea": 1, "Sinus disorder": 1, "Sinusitis": 1, "Skin exfoliation": 1, "Skin laceration": 1, "Sleep disorder": 1, "Swelling": 1, "Swollen tongue": 1, "Syncope": 1, "Taste disorder": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Thirst decreased": 1, "Throat irritation": 1, "Thrombosis": 1, "Tongue ulceration": 1, "Transferrin saturation": 1, "Troponin": 1, "Vaccination failure": 1, "Vaccination site bruising": 1, "Vaccination site discharge": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site scab": 1, "Vaginal haemorrhage": 1, "Vertigo": 1, "Viral infection": 1, "Vitreous floaters": 1, "Wheezing": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["022C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022C24C.json b/docs/data/histograms/United States/022C24C.json
index 693f3623959..38b3a349a48 100644
--- a/docs/data/histograms/United States/022C24C.json
+++ b/docs/data/histograms/United States/022C24C.json
@@ -1 +1 @@
-{"batchcode": "022C24C", "histograms": [{"batchcodes": ["022C24C"], "histogram": {"Body temperature": 1, "Body temperature increased": 1, "Hyperhidrosis": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Myalgia": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "022C24C", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature increased": 1, "Hyperhidrosis": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Myalgia": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["022C24C"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022C2AA.json b/docs/data/histograms/United States/022C2AA.json
index fc6036e75ec..ece2c674ef2 100644
--- a/docs/data/histograms/United States/022C2AA.json
+++ b/docs/data/histograms/United States/022C2AA.json
@@ -1 +1 @@
-{"batchcode": "022C2AA", "histograms": [{"batchcodes": ["022C2AA"], "histogram": {"Expired product administered": 1, "No adverse event": 1, "Product temperature excursion issue": 1}}]}
\ No newline at end of file
+{"batchcode": "022C2AA", "histograms": [{"histogram": {"Expired product administered": 1, "No adverse event": 1, "Product temperature excursion issue": 1}, "batchcodes": ["022C2AA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022CZ1A.json b/docs/data/histograms/United States/022CZ1A.json
index 4217c7edab5..0efb16f2377 100644
--- a/docs/data/histograms/United States/022CZ1A.json
+++ b/docs/data/histograms/United States/022CZ1A.json
@@ -1 +1 @@
-{"batchcode": "022CZ1A", "histograms": [{"batchcodes": ["022CZ1A"], "histogram": {"Fatigue": 2, "Fibrin D dimer": 2, "Blood pressure measurement": 1, "Body temperature": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Heart rate": 1, "Herpes zoster": 1, "Limb discomfort": 1, "Musculoskeletal stiffness": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "022CZ1A", "histograms": [{"histogram": {"Fatigue": 2, "Fibrin D dimer": 2, "Blood pressure measurement": 1, "Body temperature": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Heart rate": 1, "Herpes zoster": 1, "Limb discomfort": 1, "Musculoskeletal stiffness": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Thrombosis": 1}, "batchcodes": ["022CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022D21A.json b/docs/data/histograms/United States/022D21A.json
index d334d11c591..9147aa7baae 100644
--- a/docs/data/histograms/United States/022D21A.json
+++ b/docs/data/histograms/United States/022D21A.json
@@ -1 +1 @@
-{"batchcode": "022D21A", "histograms": [{"batchcodes": ["022D21A"], "histogram": {"Dizziness": 2, "Fatigue": 2, "Muscle spasms": 2, "Myalgia": 2, "Abdominal discomfort": 1, "Blood pressure increased": 1, "Decreased appetite": 1, "Feeling abnormal": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Stress": 1, "Thrombosis": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "022D21A", "histograms": [{"histogram": {"Dizziness": 2, "Fatigue": 2, "Muscle spasms": 2, "Myalgia": 2, "Abdominal discomfort": 1, "Blood pressure increased": 1, "Decreased appetite": 1, "Feeling abnormal": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Stress": 1, "Thrombosis": 1, "Vaccination site swelling": 1}, "batchcodes": ["022D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022F21A.json b/docs/data/histograms/United States/022F21A.json
index 7c2b1308fcf..9ed8390acfa 100644
--- a/docs/data/histograms/United States/022F21A.json
+++ b/docs/data/histograms/United States/022F21A.json
@@ -1 +1 @@
-{"batchcode": "022F21A", "histograms": [{"batchcodes": ["022F21A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "022F21A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["022F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022H20A.json b/docs/data/histograms/United States/022H20A.json
index bd211a7bd0b..dbedc8044f4 100644
--- a/docs/data/histograms/United States/022H20A.json
+++ b/docs/data/histograms/United States/022H20A.json
@@ -1 +1 @@
-{"batchcode": "022H20A", "histograms": [{"batchcodes": ["022H20A"], "histogram": {"Vaccination site pain": 2, "Arthralgia": 1, "Breast pain": 1, "Headache": 1, "Neck pain": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "022H20A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Arthralgia": 1, "Breast pain": 1, "Headache": 1, "Neck pain": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1}, "batchcodes": ["022H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022H22A.json b/docs/data/histograms/United States/022H22A.json
index e338beae1d6..e58182fe8a5 100644
--- a/docs/data/histograms/United States/022H22A.json
+++ b/docs/data/histograms/United States/022H22A.json
@@ -1 +1 @@
-{"batchcode": "022H22A", "histograms": [{"batchcodes": ["022H22A"], "histogram": {"No adverse event": 3, "Product storage error": 3, "Product temperature excursion issue": 3, "Poor quality product administered": 2, "Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "022H22A", "histograms": [{"histogram": {"No adverse event": 3, "Product storage error": 3, "Product temperature excursion issue": 3, "Poor quality product administered": 2, "Expired product administered": 1}, "batchcodes": ["022H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022HPVP.json b/docs/data/histograms/United States/022HPVP.json
index 6ecb365906d..5d996f83792 100644
--- a/docs/data/histograms/United States/022HPVP.json
+++ b/docs/data/histograms/United States/022HPVP.json
@@ -1 +1 @@
-{"batchcode": "022HPVP", "histograms": [{"batchcodes": ["022HPVP"], "histogram": {"Fatigue": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "022HPVP", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["022HPVP"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022HPVP;.json b/docs/data/histograms/United States/022HPVP;.json
index 4648f161453..fdc81fc936a 100644
--- a/docs/data/histograms/United States/022HPVP;.json
+++ b/docs/data/histograms/United States/022HPVP;.json
@@ -1 +1 @@
-{"batchcode": "022HPVP;", "histograms": [{"batchcodes": ["022HPVP;"], "histogram": {"Arthralgia": 1, "Chills": 1, "Headache": 1, "Hypersomnia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "022HPVP;", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Headache": 1, "Hypersomnia": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["022HPVP;"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022IN20A.json b/docs/data/histograms/United States/022IN20A.json
index 032e67a6bbe..6dbfc12ede9 100644
--- a/docs/data/histograms/United States/022IN20A.json
+++ b/docs/data/histograms/United States/022IN20A.json
@@ -1 +1 @@
-{"batchcode": "022IN20A", "histograms": [{"batchcodes": ["022IN20A"], "histogram": {"Computerised tomogram": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vertigo": 1, "Vertigo positional": 1}}]}
\ No newline at end of file
+{"batchcode": "022IN20A", "histograms": [{"histogram": {"Computerised tomogram": 1, "Dizziness": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vertigo": 1, "Vertigo positional": 1}, "batchcodes": ["022IN20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022J21A.json b/docs/data/histograms/United States/022J21A.json
index 82aadce99e5..d126e0f177f 100644
--- a/docs/data/histograms/United States/022J21A.json
+++ b/docs/data/histograms/United States/022J21A.json
@@ -1 +1 @@
-{"batchcode": "022J21A", "histograms": [{"batchcodes": ["022J21A", "EM9810"], "histogram": {"Expired product administered": 1, "Maternal exposure during pregnancy": 1, "Product temperature excursion issue": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["022J21A"], "histogram": {"Expired product administered": 39, "Product storage error": 27, "No adverse event": 12, "Headache": 4, "SARS-CoV-2 test": 4, "Vaccination site pain": 4, "Arthralgia": 3, "Dizziness": 2, "Nausea": 2, "Pain in extremity": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Back pain": 1, "Bedridden": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Culture": 1, "Decreased appetite": 1, "Depressed mood": 1, "Dysgeusia": 1, "Eructation": 1, "Erythema": 1, "Extra dose administered": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Hidradenitis": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Limb discomfort": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pain": 1, "Poor quality product administered": 1, "Pruritus": 1, "Skin test": 1, "Swelling": 1, "Testicular abscess": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site swelling": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "022J21A", "histograms": [{"histogram": {"Expired product administered": 1, "Maternal exposure during pregnancy": 1, "Product temperature excursion issue": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["022J21A", "EM9810"]}, {"histogram": {"Expired product administered": 39, "Product storage error": 27, "No adverse event": 12, "Headache": 4, "SARS-CoV-2 test": 4, "Vaccination site pain": 4, "Arthralgia": 3, "Dizziness": 2, "Nausea": 2, "Pain in extremity": 2, "Abdominal discomfort": 1, "Abdominal pain": 1, "Back pain": 1, "Bedridden": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Culture": 1, "Decreased appetite": 1, "Depressed mood": 1, "Dysgeusia": 1, "Eructation": 1, "Erythema": 1, "Extra dose administered": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Hidradenitis": 1, "Insomnia": 1, "Interchange of vaccine products": 1, "Limb discomfort": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Pain": 1, "Poor quality product administered": 1, "Pruritus": 1, "Skin test": 1, "Swelling": 1, "Testicular abscess": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site swelling": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["022J21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022J221A.json b/docs/data/histograms/United States/022J221A.json
index de962198c0d..9b9c1fe33e3 100644
--- a/docs/data/histograms/United States/022J221A.json
+++ b/docs/data/histograms/United States/022J221A.json
@@ -1 +1 @@
-{"batchcode": "022J221A", "histograms": [{"batchcodes": ["022J221A"], "histogram": {"Insomnia": 1, "Mobility decreased": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "022J221A", "histograms": [{"histogram": {"Insomnia": 1, "Mobility decreased": 1, "Vaccination site pain": 1}, "batchcodes": ["022J221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022L0N/D.json b/docs/data/histograms/United States/022L0N/D.json
index 283ba6f663e..67668782043 100644
--- a/docs/data/histograms/United States/022L0N/D.json
+++ b/docs/data/histograms/United States/022L0N/D.json
@@ -1 +1 @@
-{"batchcode": "022L0N/D", "histograms": [{"batchcodes": ["022L0N/D"], "histogram": {"Chills": 1, "Inappropriate schedule of product administration": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "022L0N/D", "histograms": [{"histogram": {"Chills": 1, "Inappropriate schedule of product administration": 1, "Vaccination site pruritus": 1}, "batchcodes": ["022L0N/D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022L20A.json b/docs/data/histograms/United States/022L20A.json
index d322369dbfc..0bab534ff3a 100644
--- a/docs/data/histograms/United States/022L20A.json
+++ b/docs/data/histograms/United States/022L20A.json
@@ -1 +1 @@
-{"batchcode": "022L20A", "histograms": [{"batchcodes": ["022L20A"], "histogram": {"Headache": 3, "Pain in extremity": 3, "Chills": 2, "Pyrexia": 2, "Delirium": 1, "Erythema": 1, "Insomnia": 1, "Pruritus": 1, "Rash macular": 1, "Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "022L20A", "histograms": [{"histogram": {"Headache": 3, "Pain in extremity": 3, "Chills": 2, "Pyrexia": 2, "Delirium": 1, "Erythema": 1, "Insomnia": 1, "Pruritus": 1, "Rash macular": 1, "Speech disorder": 1}, "batchcodes": ["022L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M-20A..json b/docs/data/histograms/United States/022M-20A..json
index ff39f5a3e6d..14c49e356b3 100644
--- a/docs/data/histograms/United States/022M-20A..json
+++ b/docs/data/histograms/United States/022M-20A..json
@@ -1 +1 @@
-{"batchcode": "022M-20A.", "histograms": [{"batchcodes": ["022M-20A."], "histogram": {"Autoscopy": 1, "Back pain": 1, "Feeling abnormal": 1, "Hand deformity": 1, "Presyncope": 1}}]}
\ No newline at end of file
+{"batchcode": "022M-20A.", "histograms": [{"histogram": {"Autoscopy": 1, "Back pain": 1, "Feeling abnormal": 1, "Hand deformity": 1, "Presyncope": 1}, "batchcodes": ["022M-20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M014.json b/docs/data/histograms/United States/022M014.json
index 18d0e4eb1b6..de7c966cddc 100644
--- a/docs/data/histograms/United States/022M014.json
+++ b/docs/data/histograms/United States/022M014.json
@@ -1 +1 @@
-{"batchcode": "022M014", "histograms": [{"batchcodes": ["022M014"], "histogram": {"Chills": 1, "Headache": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "022M014", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Injection site pain": 1}, "batchcodes": ["022M014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M020A.json b/docs/data/histograms/United States/022M020A.json
index 825f79b038e..eba5b4b7d54 100644
--- a/docs/data/histograms/United States/022M020A.json
+++ b/docs/data/histograms/United States/022M020A.json
@@ -1 +1 @@
-{"batchcode": "022M020A", "histograms": [{"batchcodes": ["022M020A"], "histogram": {"Peripheral swelling": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "022M020A", "histograms": [{"histogram": {"Peripheral swelling": 1, "Pruritus": 1}, "batchcodes": ["022M020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M02A.json b/docs/data/histograms/United States/022M02A.json
index 9954fd0720f..c78751c2945 100644
--- a/docs/data/histograms/United States/022M02A.json
+++ b/docs/data/histograms/United States/022M02A.json
@@ -1 +1 @@
-{"batchcode": "022M02A", "histograms": [{"batchcodes": ["022M02A"], "histogram": {"Arthralgia": 2, "Back pain": 2, "Neck pain": 2, "Pain": 2, "Pain in extremity": 2, "Ear pain": 1, "Electroencephalogram": 1, "Hypoaesthesia": 1, "Paraesthesia": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "022M02A", "histograms": [{"histogram": {"Arthralgia": 2, "Back pain": 2, "Neck pain": 2, "Pain": 2, "Pain in extremity": 2, "Ear pain": 1, "Electroencephalogram": 1, "Hypoaesthesia": 1, "Paraesthesia": 1, "Seizure": 1}, "batchcodes": ["022M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M20.json b/docs/data/histograms/United States/022M20.json
index 9b9bbcf6be6..1ba71e60eda 100644
--- a/docs/data/histograms/United States/022M20.json
+++ b/docs/data/histograms/United States/022M20.json
@@ -1 +1 @@
-{"batchcode": "022M20", "histograms": [{"batchcodes": ["022M20"], "histogram": {"Burning sensation": 1, "Discomfort": 1, "Dyspnoea": 1, "Facial pain": 1, "Formication": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Inflammation": 1, "Migraine": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Postmenopausal haemorrhage": 1, "Vision blurred": 1, "Weight increased": 1}}]}
\ No newline at end of file
+{"batchcode": "022M20", "histograms": [{"histogram": {"Burning sensation": 1, "Discomfort": 1, "Dyspnoea": 1, "Facial pain": 1, "Formication": 1, "Headache": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Inflammation": 1, "Migraine": 1, "Neck pain": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Postmenopausal haemorrhage": 1, "Vision blurred": 1, "Weight increased": 1}, "batchcodes": ["022M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M2014.json b/docs/data/histograms/United States/022M2014.json
index 678aa1d20f8..61b0f4613ef 100644
--- a/docs/data/histograms/United States/022M2014.json
+++ b/docs/data/histograms/United States/022M2014.json
@@ -1 +1 @@
-{"batchcode": "022M2014", "histograms": [{"batchcodes": ["022M2014"], "histogram": {"Abdominal discomfort": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "022M2014", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Rhinorrhoea": 1}, "batchcodes": ["022M2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M201A.json b/docs/data/histograms/United States/022M201A.json
index 7ef9b27bedd..9d797ff7d7d 100644
--- a/docs/data/histograms/United States/022M201A.json
+++ b/docs/data/histograms/United States/022M201A.json
@@ -1 +1 @@
-{"batchcode": "022M201A", "histograms": [{"batchcodes": ["022M201A"], "histogram": {"Neck pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "022M201A", "histograms": [{"histogram": {"Neck pain": 1, "Vaccination site pain": 1}, "batchcodes": ["022M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M204 OR 022M.json b/docs/data/histograms/United States/022M204 OR 022M.json
index 25a39e8ab38..4fe1731fd84 100644
--- a/docs/data/histograms/United States/022M204 OR 022M.json
+++ b/docs/data/histograms/United States/022M204 OR 022M.json
@@ -1 +1 @@
-{"batchcode": "022M204 OR 022M", "histograms": [{"batchcodes": ["022M204 OR 022M"], "histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Pain in extremity": 1, "Tinnitus": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "022M204 OR 022M", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pain": 1, "Pain in extremity": 1, "Tinnitus": 1, "Vaccination site pain": 1}, "batchcodes": ["022M204 OR 022M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M204.json b/docs/data/histograms/United States/022M204.json
index d673ec2f6c1..340cb8c9d3a 100644
--- a/docs/data/histograms/United States/022M204.json
+++ b/docs/data/histograms/United States/022M204.json
@@ -1 +1 @@
-{"batchcode": "022M204", "histograms": [{"batchcodes": ["022M204"], "histogram": {"Fatigue": 2, "Anxiety": 1, "Back pain": 1, "Blood test": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Influenza like illness": 1, "Palpitations": 1, "Pyrexia": 1, "Skin sensitisation": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "022M204", "histograms": [{"histogram": {"Fatigue": 2, "Anxiety": 1, "Back pain": 1, "Blood test": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Electrocardiogram": 1, "Influenza like illness": 1, "Palpitations": 1, "Pyrexia": 1, "Skin sensitisation": 1, "Vaccination site erythema": 1}, "batchcodes": ["022M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M2077.json b/docs/data/histograms/United States/022M2077.json
index f134d064045..eb80f6f0389 100644
--- a/docs/data/histograms/United States/022M2077.json
+++ b/docs/data/histograms/United States/022M2077.json
@@ -1 +1 @@
-{"batchcode": "022M2077", "histograms": [{"batchcodes": ["022M2077"], "histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Cold sweat": 1, "Dizziness": 1, "Nausea": 1, "Thirst": 1}}]}
\ No newline at end of file
+{"batchcode": "022M2077", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Cold sweat": 1, "Dizziness": 1, "Nausea": 1, "Thirst": 1}, "batchcodes": ["022M2077"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M209.json b/docs/data/histograms/United States/022M209.json
index f0f49038e66..ec5147add12 100644
--- a/docs/data/histograms/United States/022M209.json
+++ b/docs/data/histograms/United States/022M209.json
@@ -1 +1 @@
-{"batchcode": "022M209", "histograms": [{"batchcodes": ["022M209"], "histogram": {"Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "022M209", "histograms": [{"histogram": {"Vaccination site pruritus": 1}, "batchcodes": ["022M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M20A.json b/docs/data/histograms/United States/022M20A.json
index 07622eb4c9a..832aca64cd9 100644
--- a/docs/data/histograms/United States/022M20A.json
+++ b/docs/data/histograms/United States/022M20A.json
@@ -1 +1 @@
-{"batchcode": "022M20A", "histograms": [{"batchcodes": ["022M20A"], "histogram": {"Pain in extremity": 76, "Pyrexia": 73, "Fatigue": 72, "Chills": 71, "Headache": 70, "Poor quality product administered": 56, "Product temperature excursion issue": 56, "Myalgia": 43, "Arthralgia": 42, "Nausea": 40, "Pruritus": 36, "Pain": 35, "Vaccination site erythema": 34, "Dizziness": 31, "Rash": 30, "Vaccination site pain": 30, "Vaccination site swelling": 26, "Asthenia": 24, "Body temperature": 22, "Peripheral swelling": 22, "Diarrhoea": 21, "Erythema": 21, "Vaccination site pruritus": 21, "Feeling abnormal": 20, "Vaccination site warmth": 17, "Heart rate": 16, "Back pain": 15, "Vomiting": 15, "Dyspnoea": 14, "Illness": 14, "Urticaria": 14, "Vaccination site rash": 13, "Blood pressure measurement": 12, "Feeling hot": 11, "Hypoaesthesia": 11, "Insomnia": 11, "Palpitations": 11, "Vision blurred": 11, "Abdominal discomfort": 10, "Cough": 10, "Paraesthesia": 10, "Product dose omission issue": 10, "Swelling": 10, "Expired product administered": 9, "Hyperhidrosis": 9, "Inappropriate schedule of product administration": 9, "Influenza like illness": 9, "COVID-19": 8, "Decreased appetite": 8, "Joint swelling": 8, "SARS-CoV-2 test": 8, "Tinnitus": 8, "Tremor": 8, "Hypertension": 7, "Malaise": 7, "Oropharyngeal pain": 7, "Swelling face": 7, "Blood test": 6, "Electrocardiogram": 6, "Gait disturbance": 6, "Herpes zoster": 6, "Injection site erythema": 6, "Injection site pain": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Therapeutic response unexpected": 6, "Vaccination site induration": 6, "Vertigo": 6, "Abdominal pain upper": 5, "Chest pain": 5, "Feeling cold": 5, "Heart rate increased": 5, "Limb discomfort": 5, "Lymphadenopathy": 5, "Migraine": 5, "Neck pain": 5, "Rash erythematous": 5, "Rash pruritic": 5, "Rhinorrhoea": 5, "Somnolence": 5, "Tenderness": 5, "Vaccination site reaction": 5, "X-ray": 5, "Blister": 4, "Contusion": 4, "Dysgeusia": 4, "Gait inability": 4, "Lacrimation increased": 4, "Lethargy": 4, "Rash macular": 4, "Thrombosis": 4, "Vaccination complication": 4, "Visual impairment": 4, "Axillary pain": 3, "Bell's palsy": 3, "Body temperature increased": 3, "Breast pain": 3, "Cardiac flutter": 3, "Chest discomfort": 3, "Condition aggravated": 3, "Confusional state": 3, "Dehydration": 3, "Dry mouth": 3, "Head discomfort": 3, "Hypersensitivity": 3, "Injection site swelling": 3, "Laboratory test": 3, "Maternal exposure during breast feeding": 3, "Muscle tightness": 3, "Musculoskeletal stiffness": 3, "Nasal congestion": 3, "Neuralgia": 3, "Nodule": 3, "Ocular discomfort": 3, "Pregnancy test": 3, "Product administered to patient of inappropriate age": 3, "SARS-CoV-2 test positive": 3, "Suspected COVID-19": 3, "Vaccination site mass": 3, "Wheezing": 3, "Accidental underdose": 2, "Ageusia": 2, "Arthritis": 2, "Balance disorder": 2, "Blindness transient": 2, "Blood cholesterol": 2, "Blood glucose": 2, "Burning sensation": 2, "Computerised tomogram": 2, "Dermatitis contact": 2, "Discomfort": 2, "Disorientation": 2, "Dry skin": 2, "Ear discomfort": 2, "Exposure during pregnancy": 2, "Extra dose administered": 2, "Fall": 2, "Feeling jittery": 2, "Flatulence": 2, "Flushing": 2, "Full blood count": 2, "Heart rate irregular": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Incorrect route of product administration": 2, "Inflammation": 2, "Injection site pruritus": 2, "Injection site rash": 2, "Injection site warmth": 2, "Loss of consciousness": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Maternal exposure during pregnancy": 2, "Middle ear effusion": 2, "Muscle spasms": 2, "Nasopharyngitis": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Oropharyngeal discomfort": 2, "Peripheral coldness": 2, "Photophobia": 2, "Pneumonia": 2, "Pre-existing condition improved": 2, "Presyncope": 2, "Proctalgia": 2, "Product storage error": 2, "Prostatic specific antigen": 2, "Renal pain": 2, "Swollen tongue": 2, "Tachycardia": 2, "Taste disorder": 2, "Thirst": 2, "Throat irritation": 2, "Ultrasound scan": 2, "Vaccination site bruising": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site movement impairment": 2, "Vaccination site scar": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal sensation in eye": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Affective disorder": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Angiopathy": 1, "Anxiety": 1, "Aphonia": 1, "Arrhythmia": 1, "Atrial fibrillation": 1, "Back injury": 1, "Bed rest": 1, "Bedridden": 1, "Biopsy bone marrow": 1, "Blood count": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood thyroid stimulating hormone": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Breast tenderness": 1, "Breath odour": 1, "Cardiac failure congestive": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Chest X-ray": 1, "Chromaturia": 1, "Coagulopathy": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram coronary artery abnormal": 1, "Coronavirus test negative": 1, "Cystitis": 1, "Deafness transitory": 1, "Decreased interest": 1, "Depressed mood": 1, "Depression": 1, "Device connection issue": 1, "Diplopia": 1, "Dissociation": 1, "Diverticulum": 1, "Drug ineffective": 1, "Dry eye": 1, "Dry throat": 1, "Dysarthria": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear pain": 1, "Ear pruritus": 1, "Ear swelling": 1, "Eating disorder": 1, "Eye irritation": 1, "Eye swelling": 1, "Facial pain": 1, "Facial paresis": 1, "Factitious disorder": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gastrointestinal inflammation": 1, "Generalised tonic-clonic seizure": 1, "Glassy eyes": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Hallucination": 1, "Heart rate abnormal": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hypotension": 1, "Ill-defined disorder": 1, "Incorrect dose administered": 1, "Induration": 1, "Infection": 1, "Influenza A virus test negative": 1, "Injected limb mobility decreased": 1, "Injection site induration": 1, "Injection site inflammation": 1, "Injection site irritation": 1, "Injection site mass": 1, "Injection site scab": 1, "Investigation": 1, "Joint lock": 1, "Joint stiffness": 1, "Laziness": 1, "Libido increased": 1, "Lip blister": 1, "Liver function test": 1, "Lung disorder": 1, "Movement disorder": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Mydriasis": 1, "Myocardial necrosis marker": 1, "Nasal discomfort": 1, "Neck mass": 1, "Nervousness": 1, "Neuritis": 1, "Neuropathy peripheral": 1, "No adverse event": 1, "Oesophagitis": 1, "Oral discomfort": 1, "Oral pain": 1, "Oropharyngeal blistering": 1, "Osteoarthritis": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Pelvic pain": 1, "Photopsia": 1, "Physical disability": 1, "Physical examination": 1, "Postmenopausal haemorrhage": 1, "Product administered at inappropriate site": 1, "Product dose omission in error": 1, "Prostatic specific antigen increased": 1, "Pulmonary pain": 1, "Rash morbilliform": 1, "Rectal haemorrhage": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Sensation of blood flow": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sepsis": 1, "Sinus congestion": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin tightness": 1, "Sleep disorder": 1, "Sluggishness": 1, "Sneezing": 1, "Stomatitis": 1, "Streptococcal infection": 1, "Sunburn": 1, "Synovial cyst": 1, "Thinking abnormal": 1, "Trismus": 1, "Troponin": 1, "Ultrasound foetal": 1, "Ultrasound kidney": 1, "Ultrasound pelvis": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site dryness": 1, "Vaccination site haemorrhage": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vitreous floaters": 1, "Vulvovaginal discomfort": 1, "Vulvovaginal erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "022M20A", "histograms": [{"histogram": {"Pain in extremity": 76, "Pyrexia": 73, "Fatigue": 72, "Chills": 71, "Headache": 70, "Poor quality product administered": 56, "Product temperature excursion issue": 56, "Myalgia": 43, "Arthralgia": 42, "Nausea": 40, "Pruritus": 36, "Pain": 35, "Vaccination site erythema": 34, "Dizziness": 31, "Rash": 30, "Vaccination site pain": 30, "Vaccination site swelling": 26, "Asthenia": 24, "Body temperature": 22, "Peripheral swelling": 22, "Diarrhoea": 21, "Erythema": 21, "Vaccination site pruritus": 21, "Feeling abnormal": 20, "Vaccination site warmth": 17, "Heart rate": 16, "Back pain": 15, "Vomiting": 15, "Dyspnoea": 14, "Illness": 14, "Urticaria": 14, "Vaccination site rash": 13, "Blood pressure measurement": 12, "Feeling hot": 11, "Hypoaesthesia": 11, "Insomnia": 11, "Palpitations": 11, "Vision blurred": 11, "Abdominal discomfort": 10, "Cough": 10, "Paraesthesia": 10, "Product dose omission issue": 10, "Swelling": 10, "Expired product administered": 9, "Hyperhidrosis": 9, "Inappropriate schedule of product administration": 9, "Influenza like illness": 9, "COVID-19": 8, "Decreased appetite": 8, "Joint swelling": 8, "SARS-CoV-2 test": 8, "Tinnitus": 8, "Tremor": 8, "Hypertension": 7, "Malaise": 7, "Oropharyngeal pain": 7, "Swelling face": 7, "Blood test": 6, "Electrocardiogram": 6, "Gait disturbance": 6, "Herpes zoster": 6, "Injection site erythema": 6, "Injection site pain": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Therapeutic response unexpected": 6, "Vaccination site induration": 6, "Vertigo": 6, "Abdominal pain upper": 5, "Chest pain": 5, "Feeling cold": 5, "Heart rate increased": 5, "Limb discomfort": 5, "Lymphadenopathy": 5, "Migraine": 5, "Neck pain": 5, "Rash erythematous": 5, "Rash pruritic": 5, "Rhinorrhoea": 5, "Somnolence": 5, "Tenderness": 5, "Vaccination site reaction": 5, "X-ray": 5, "Blister": 4, "Contusion": 4, "Dysgeusia": 4, "Gait inability": 4, "Lacrimation increased": 4, "Lethargy": 4, "Rash macular": 4, "Thrombosis": 4, "Vaccination complication": 4, "Visual impairment": 4, "Axillary pain": 3, "Bell's palsy": 3, "Body temperature increased": 3, "Breast pain": 3, "Cardiac flutter": 3, "Chest discomfort": 3, "Condition aggravated": 3, "Confusional state": 3, "Dehydration": 3, "Dry mouth": 3, "Head discomfort": 3, "Hypersensitivity": 3, "Injection site swelling": 3, "Laboratory test": 3, "Maternal exposure during breast feeding": 3, "Muscle tightness": 3, "Musculoskeletal stiffness": 3, "Nasal congestion": 3, "Neuralgia": 3, "Nodule": 3, "Ocular discomfort": 3, "Pregnancy test": 3, "Product administered to patient of inappropriate age": 3, "SARS-CoV-2 test positive": 3, "Suspected COVID-19": 3, "Vaccination site mass": 3, "Wheezing": 3, "Accidental underdose": 2, "Ageusia": 2, "Arthritis": 2, "Balance disorder": 2, "Blindness transient": 2, "Blood cholesterol": 2, "Blood glucose": 2, "Burning sensation": 2, "Computerised tomogram": 2, "Dermatitis contact": 2, "Discomfort": 2, "Disorientation": 2, "Dry skin": 2, "Ear discomfort": 2, "Exposure during pregnancy": 2, "Extra dose administered": 2, "Fall": 2, "Feeling jittery": 2, "Flatulence": 2, "Flushing": 2, "Full blood count": 2, "Heart rate irregular": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Incorrect route of product administration": 2, "Inflammation": 2, "Injection site pruritus": 2, "Injection site rash": 2, "Injection site warmth": 2, "Loss of consciousness": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Maternal exposure during pregnancy": 2, "Middle ear effusion": 2, "Muscle spasms": 2, "Nasopharyngitis": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Oropharyngeal discomfort": 2, "Peripheral coldness": 2, "Photophobia": 2, "Pneumonia": 2, "Pre-existing condition improved": 2, "Presyncope": 2, "Proctalgia": 2, "Product storage error": 2, "Prostatic specific antigen": 2, "Renal pain": 2, "Swollen tongue": 2, "Tachycardia": 2, "Taste disorder": 2, "Thirst": 2, "Throat irritation": 2, "Ultrasound scan": 2, "Vaccination site bruising": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site movement impairment": 2, "Vaccination site scar": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal sensation in eye": 1, "Acute kidney injury": 1, "Acute myocardial infarction": 1, "Affective disorder": 1, "Allergy to vaccine": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Angioedema": 1, "Angiopathy": 1, "Anxiety": 1, "Aphonia": 1, "Arrhythmia": 1, "Atrial fibrillation": 1, "Back injury": 1, "Bed rest": 1, "Bedridden": 1, "Biopsy bone marrow": 1, "Blood count": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Blood thyroid stimulating hormone": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Breast tenderness": 1, "Breath odour": 1, "Cardiac failure congestive": 1, "Cardio-respiratory arrest": 1, "Cardiovascular disorder": 1, "Carpal tunnel syndrome": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Chest X-ray": 1, "Chromaturia": 1, "Coagulopathy": 1, "Cold sweat": 1, "Colonoscopy": 1, "Computerised tomogram coronary artery abnormal": 1, "Coronavirus test negative": 1, "Cystitis": 1, "Deafness transitory": 1, "Decreased interest": 1, "Depressed mood": 1, "Depression": 1, "Device connection issue": 1, "Diplopia": 1, "Dissociation": 1, "Diverticulum": 1, "Drug ineffective": 1, "Dry eye": 1, "Dry throat": 1, "Dysarthria": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear pain": 1, "Ear pruritus": 1, "Ear swelling": 1, "Eating disorder": 1, "Eye irritation": 1, "Eye swelling": 1, "Facial pain": 1, "Facial paresis": 1, "Factitious disorder": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Gastrointestinal inflammation": 1, "Generalised tonic-clonic seizure": 1, "Glassy eyes": 1, "Groin pain": 1, "Guillain-Barre syndrome": 1, "Hallucination": 1, "Heart rate abnormal": 1, "Hot flush": 1, "Hyperaesthesia": 1, "Hypotension": 1, "Ill-defined disorder": 1, "Incorrect dose administered": 1, "Induration": 1, "Infection": 1, "Influenza A virus test negative": 1, "Injected limb mobility decreased": 1, "Injection site induration": 1, "Injection site inflammation": 1, "Injection site irritation": 1, "Injection site mass": 1, "Injection site scab": 1, "Investigation": 1, "Joint lock": 1, "Joint stiffness": 1, "Laziness": 1, "Libido increased": 1, "Lip blister": 1, "Liver function test": 1, "Lung disorder": 1, "Movement disorder": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Mydriasis": 1, "Myocardial necrosis marker": 1, "Nasal discomfort": 1, "Neck mass": 1, "Nervousness": 1, "Neuritis": 1, "Neuropathy peripheral": 1, "No adverse event": 1, "Oesophagitis": 1, "Oral discomfort": 1, "Oral pain": 1, "Oropharyngeal blistering": 1, "Osteoarthritis": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Pelvic pain": 1, "Photopsia": 1, "Physical disability": 1, "Physical examination": 1, "Postmenopausal haemorrhage": 1, "Product administered at inappropriate site": 1, "Product dose omission in error": 1, "Prostatic specific antigen increased": 1, "Pulmonary pain": 1, "Rash morbilliform": 1, "Rectal haemorrhage": 1, "Respiration abnormal": 1, "Respiratory distress": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Sensation of blood flow": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Sepsis": 1, "Sinus congestion": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin tightness": 1, "Sleep disorder": 1, "Sluggishness": 1, "Sneezing": 1, "Stomatitis": 1, "Streptococcal infection": 1, "Sunburn": 1, "Synovial cyst": 1, "Thinking abnormal": 1, "Trismus": 1, "Troponin": 1, "Ultrasound foetal": 1, "Ultrasound kidney": 1, "Ultrasound pelvis": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site dryness": 1, "Vaccination site haemorrhage": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vitreous floaters": 1, "Vulvovaginal discomfort": 1, "Vulvovaginal erythema": 1}, "batchcodes": ["022M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M20Q.json b/docs/data/histograms/United States/022M20Q.json
index 1149ff8b11d..b3e23d65e8f 100644
--- a/docs/data/histograms/United States/022M20Q.json
+++ b/docs/data/histograms/United States/022M20Q.json
@@ -1 +1 @@
-{"batchcode": "022M20Q", "histograms": [{"batchcodes": ["022M20Q"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "022M20Q", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["022M20Q"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M20T.json b/docs/data/histograms/United States/022M20T.json
index f6e3698c45a..f8ca75ff3b6 100644
--- a/docs/data/histograms/United States/022M20T.json
+++ b/docs/data/histograms/United States/022M20T.json
@@ -1 +1 @@
-{"batchcode": "022M20T", "histograms": [{"batchcodes": ["022M20T"], "histogram": {"Herpes zoster": 1, "Pain of skin": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "022M20T", "histograms": [{"histogram": {"Herpes zoster": 1, "Pain of skin": 1, "Vaccination site pain": 1}, "batchcodes": ["022M20T"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M21A.json b/docs/data/histograms/United States/022M21A.json
index c135017d3ff..64af394b945 100644
--- a/docs/data/histograms/United States/022M21A.json
+++ b/docs/data/histograms/United States/022M21A.json
@@ -1 +1 @@
-{"batchcode": "022M21A", "histograms": [{"batchcodes": ["022M21A"], "histogram": {"Dyspnoea": 1, "Intentional product use issue": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "022M21A", "histograms": [{"histogram": {"Dyspnoea": 1, "Intentional product use issue": 1, "Urinary tract infection": 1}, "batchcodes": ["022M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M28A.json b/docs/data/histograms/United States/022M28A.json
index 1e5f614f24d..508d57cd41e 100644
--- a/docs/data/histograms/United States/022M28A.json
+++ b/docs/data/histograms/United States/022M28A.json
@@ -1 +1 @@
-{"batchcode": "022M28A", "histograms": [{"batchcodes": ["022M28A"], "histogram": {"Asthenia": 1, "Chills": 1, "Confusional state": 1, "Fatigue": 1, "Hallucination": 1, "Headache": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "022M28A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Confusional state": 1, "Fatigue": 1, "Hallucination": 1, "Headache": 1, "Muscular weakness": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["022M28A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M2DA.json b/docs/data/histograms/United States/022M2DA.json
index 5fbb9a44030..5de2a7d8d66 100644
--- a/docs/data/histograms/United States/022M2DA.json
+++ b/docs/data/histograms/United States/022M2DA.json
@@ -1 +1 @@
-{"batchcode": "022M2DA", "histograms": [{"batchcodes": ["022M2DA"], "histogram": {"Pain": 2, "Abdominal pain upper": 1, "Alanine aminotransferase increased": 1, "Asthenia": 1, "Back pain": 1, "Burning feet syndrome": 1, "Burning sensation": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphonia": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Memory impairment": 1, "Muscle tightness": 1, "Swelling": 1, "Throat tightness": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "022M2DA", "histograms": [{"histogram": {"Pain": 2, "Abdominal pain upper": 1, "Alanine aminotransferase increased": 1, "Asthenia": 1, "Back pain": 1, "Burning feet syndrome": 1, "Burning sensation": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphonia": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Memory impairment": 1, "Muscle tightness": 1, "Swelling": 1, "Throat tightness": 1, "Weight decreased": 1}, "batchcodes": ["022M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M2O.json b/docs/data/histograms/United States/022M2O.json
index c5714a58eed..839a83b172b 100644
--- a/docs/data/histograms/United States/022M2O.json
+++ b/docs/data/histograms/United States/022M2O.json
@@ -1 +1 @@
-{"batchcode": "022M2O", "histograms": [{"batchcodes": ["022M2O"], "histogram": {"Feeling hot": 1, "Nausea": 1, "Pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "022M2O", "histograms": [{"histogram": {"Feeling hot": 1, "Nausea": 1, "Pain": 1, "Vomiting": 1}, "batchcodes": ["022M2O"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M2OT.json b/docs/data/histograms/United States/022M2OT.json
index 0ec8d90d1b5..668a98f1ed1 100644
--- a/docs/data/histograms/United States/022M2OT.json
+++ b/docs/data/histograms/United States/022M2OT.json
@@ -1 +1 @@
-{"batchcode": "022M2OT", "histograms": [{"batchcodes": ["022M2OT"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "022M2OT", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["022M2OT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022M2UA.json b/docs/data/histograms/United States/022M2UA.json
index fb4e957cb4f..b1b03102690 100644
--- a/docs/data/histograms/United States/022M2UA.json
+++ b/docs/data/histograms/United States/022M2UA.json
@@ -1 +1 @@
-{"batchcode": "022M2UA", "histograms": [{"batchcodes": ["022M2UA"], "histogram": {"Diarrhoea": 2, "Pyrexia": 2, "Body temperature": 1}}]}
\ No newline at end of file
+{"batchcode": "022M2UA", "histograms": [{"histogram": {"Diarrhoea": 2, "Pyrexia": 2, "Body temperature": 1}, "batchcodes": ["022M2UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022MA0N.json b/docs/data/histograms/United States/022MA0N.json
index 361ac7457b9..fd12cdb381a 100644
--- a/docs/data/histograms/United States/022MA0N.json
+++ b/docs/data/histograms/United States/022MA0N.json
@@ -1 +1 @@
-{"batchcode": "022MA0N", "histograms": [{"batchcodes": ["022MA0N"], "histogram": {"Allergy to vaccine": 1, "Chills": 1, "Dyspnoea": 1, "Dysstasia": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypokinesia": 1, "Pyrexia": 1, "Somnolence": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "022MA0N", "histograms": [{"histogram": {"Allergy to vaccine": 1, "Chills": 1, "Dyspnoea": 1, "Dysstasia": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Hyperhidrosis": 1, "Hypokinesia": 1, "Pyrexia": 1, "Somnolence": 1, "Vaccination site pruritus": 1}, "batchcodes": ["022MA0N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022MOA.json b/docs/data/histograms/United States/022MOA.json
index 15669c76fc0..8f0c55de3ae 100644
--- a/docs/data/histograms/United States/022MOA.json
+++ b/docs/data/histograms/United States/022MOA.json
@@ -1 +1 @@
-{"batchcode": "022MOA", "histograms": [{"batchcodes": ["022MOA"], "histogram": {"Alopecia": 1, "Aphonia": 1, "Erythema": 1, "Feeling hot": 1, "Hair texture abnormal": 1, "Pruritus": 1, "Sleep disorder": 1, "Trichorrhexis": 1}}]}
\ No newline at end of file
+{"batchcode": "022MOA", "histograms": [{"histogram": {"Alopecia": 1, "Aphonia": 1, "Erythema": 1, "Feeling hot": 1, "Hair texture abnormal": 1, "Pruritus": 1, "Sleep disorder": 1, "Trichorrhexis": 1}, "batchcodes": ["022MOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022MQ1A.json b/docs/data/histograms/United States/022MQ1A.json
index 02192c997ba..c4986d5af01 100644
--- a/docs/data/histograms/United States/022MQ1A.json
+++ b/docs/data/histograms/United States/022MQ1A.json
@@ -1 +1 @@
-{"batchcode": "022MQ1A", "histograms": [{"batchcodes": ["022MQ1A"], "histogram": {"Arthralgia": 1, "Neck pain": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "022MQ1A", "histograms": [{"histogram": {"Arthralgia": 1, "Neck pain": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["022MQ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022MZ0A.json b/docs/data/histograms/United States/022MZ0A.json
index 1fff3b8bff0..6aca3ee4ba0 100644
--- a/docs/data/histograms/United States/022MZ0A.json
+++ b/docs/data/histograms/United States/022MZ0A.json
@@ -1 +1 @@
-{"batchcode": "022MZ0A", "histograms": [{"batchcodes": ["022MZ0A"], "histogram": {"Allergy test": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "022MZ0A", "histograms": [{"histogram": {"Allergy test": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["022MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022N20A.json b/docs/data/histograms/United States/022N20A.json
index 2ddc3948f0c..c16cae04faa 100644
--- a/docs/data/histograms/United States/022N20A.json
+++ b/docs/data/histograms/United States/022N20A.json
@@ -1 +1 @@
-{"batchcode": "022N20A", "histograms": [{"batchcodes": ["022N20A"], "histogram": {"Chills": 2, "Blood iron": 1, "Blood iron decreased": 1, "Death": 1, "Decreased appetite": 1, "Kidney infection": 1, "Nasopharyngitis": 1, "Nausea": 1, "Night sweats": 1, "Pneumonia": 1, "Polymerase chain reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "022N20A", "histograms": [{"histogram": {"Chills": 2, "Blood iron": 1, "Blood iron decreased": 1, "Death": 1, "Decreased appetite": 1, "Kidney infection": 1, "Nasopharyngitis": 1, "Nausea": 1, "Night sweats": 1, "Pneumonia": 1, "Polymerase chain reaction": 1}, "batchcodes": ["022N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022N2QA.json b/docs/data/histograms/United States/022N2QA.json
index 81d194ce3ab..16123396944 100644
--- a/docs/data/histograms/United States/022N2QA.json
+++ b/docs/data/histograms/United States/022N2QA.json
@@ -1 +1 @@
-{"batchcode": "022N2QA", "histograms": [{"batchcodes": ["022N2QA"], "histogram": {"Joint swelling": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "022N2QA", "histograms": [{"histogram": {"Joint swelling": 1, "Vaccination site swelling": 1}, "batchcodes": ["022N2QA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022P21A.json b/docs/data/histograms/United States/022P21A.json
index bca4e197657..251bc39dfed 100644
--- a/docs/data/histograms/United States/022P21A.json
+++ b/docs/data/histograms/United States/022P21A.json
@@ -1 +1 @@
-{"batchcode": "022P21A", "histograms": [{"batchcodes": ["022P21A"], "histogram": {"Anxiety": 1, "Blood test": 1, "Cardiac discomfort": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Loss of personal independence in daily activities": 1, "Panic attack": 1, "Paraesthesia": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "022P21A", "histograms": [{"histogram": {"Anxiety": 1, "Blood test": 1, "Cardiac discomfort": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Loss of personal independence in daily activities": 1, "Panic attack": 1, "Paraesthesia": 1, "X-ray": 1}, "batchcodes": ["022P21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022T21A.json b/docs/data/histograms/United States/022T21A.json
index 0973111556c..9b3e325bde3 100644
--- a/docs/data/histograms/United States/022T21A.json
+++ b/docs/data/histograms/United States/022T21A.json
@@ -1 +1 @@
-{"batchcode": "022T21A", "histograms": [{"batchcodes": ["022T21A"], "histogram": {"COVID-19": 1, "Hypoaesthesia": 1, "Musculoskeletal stiffness": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "022T21A", "histograms": [{"histogram": {"COVID-19": 1, "Hypoaesthesia": 1, "Musculoskeletal stiffness": 1, "Paraesthesia": 1, "SARS-CoV-2 test": 1, "Skin discolouration": 1}, "batchcodes": ["022T21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/022V21A OR 02ZV.json b/docs/data/histograms/United States/022V21A OR 02ZV.json
index 4cb6d12a8e5..2ac48c3d561 100644
--- a/docs/data/histograms/United States/022V21A OR 02ZV.json
+++ b/docs/data/histograms/United States/022V21A OR 02ZV.json
@@ -1 +1 @@
-{"batchcode": "022V21A OR 02ZV", "histograms": [{"batchcodes": ["022V21A OR 02ZV"], "histogram": {"Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "022V21A OR 02ZV", "histograms": [{"histogram": {"Chest pain": 1, "Dyspnoea": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Pain in extremity": 1}, "batchcodes": ["022V21A OR 02ZV"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023021A.json b/docs/data/histograms/United States/023021A.json
index f40b25f9641..2427ae7ad0e 100644
--- a/docs/data/histograms/United States/023021A.json
+++ b/docs/data/histograms/United States/023021A.json
@@ -1 +1 @@
-{"batchcode": "023021A", "histograms": [{"batchcodes": ["023021A"], "histogram": {"Macule": 1}}]}
\ No newline at end of file
+{"batchcode": "023021A", "histograms": [{"histogram": {"Macule": 1}, "batchcodes": ["023021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0231A904.json b/docs/data/histograms/United States/0231A904.json
index d3e87ced659..b5073422a4e 100644
--- a/docs/data/histograms/United States/0231A904.json
+++ b/docs/data/histograms/United States/0231A904.json
@@ -1 +1 @@
-{"batchcode": "0231A904", "histograms": [{"batchcodes": ["0231A904"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0231A904", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nasopharyngitis": 1, "Nausea": 1, "Neck pain": 1}, "batchcodes": ["0231A904"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023621A.json b/docs/data/histograms/United States/023621A.json
index d1ccb3980c1..9220d75ba4c 100644
--- a/docs/data/histograms/United States/023621A.json
+++ b/docs/data/histograms/United States/023621A.json
@@ -1 +1 @@
-{"batchcode": "023621A", "histograms": [{"batchcodes": ["023621A"], "histogram": {"Abdominal pain upper": 1, "Depressed mood": 1, "Diarrhoea": 1, "Erythema": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "023621A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Depressed mood": 1, "Diarrhoea": 1, "Erythema": 1, "Pruritus": 1}, "batchcodes": ["023621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023721A.json b/docs/data/histograms/United States/023721A.json
index c4818f050de..40e0b83e216 100644
--- a/docs/data/histograms/United States/023721A.json
+++ b/docs/data/histograms/United States/023721A.json
@@ -1 +1 @@
-{"batchcode": "023721A", "histograms": [{"batchcodes": ["023721A"], "histogram": {"Axillary pain": 1, "Swelling": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "023721A", "histograms": [{"histogram": {"Axillary pain": 1, "Swelling": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["023721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0237L20A.json b/docs/data/histograms/United States/0237L20A.json
index 99ff4502870..51b60f16245 100644
--- a/docs/data/histograms/United States/0237L20A.json
+++ b/docs/data/histograms/United States/0237L20A.json
@@ -1 +1 @@
-{"batchcode": "0237L20A", "histograms": [{"batchcodes": ["0237L20A"], "histogram": {"Dyspnoea": 1, "Headache": 1, "Paraesthesia": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "0237L20A", "histograms": [{"histogram": {"Dyspnoea": 1, "Headache": 1, "Paraesthesia": 1, "Swelling face": 1}, "batchcodes": ["0237L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0238761-18090.json b/docs/data/histograms/United States/0238761-18090.json
index 91b3b36710c..949666b29d9 100644
--- a/docs/data/histograms/United States/0238761-18090.json
+++ b/docs/data/histograms/United States/0238761-18090.json
@@ -1 +1 @@
-{"batchcode": "0238761-18090", "histograms": [{"batchcodes": ["0238761-18090"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0238761-18090", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0238761-18090"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023A21A.json b/docs/data/histograms/United States/023A21A.json
index 409b5834062..b5bd8a09249 100644
--- a/docs/data/histograms/United States/023A21A.json
+++ b/docs/data/histograms/United States/023A21A.json
@@ -1 +1 @@
-{"batchcode": "023A21A", "histograms": [{"batchcodes": ["023A21A"], "histogram": {"COVID-19": 1, "Influenza like illness": 1, "Muscle spasms": 1, "Nausea": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paralysis": 1, "Poor quality product administered": 1, "SARS-CoV-2 test": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "023A21A", "histograms": [{"histogram": {"COVID-19": 1, "Influenza like illness": 1, "Muscle spasms": 1, "Nausea": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Paralysis": 1, "Poor quality product administered": 1, "SARS-CoV-2 test": 1, "Vaccination complication": 1}, "batchcodes": ["023A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023AZIA.json b/docs/data/histograms/United States/023AZIA.json
index eae4802a2eb..773a6c7be43 100644
--- a/docs/data/histograms/United States/023AZIA.json
+++ b/docs/data/histograms/United States/023AZIA.json
@@ -1 +1 @@
-{"batchcode": "023AZIA", "histograms": [{"batchcodes": ["023AZIA"], "histogram": {"Back pain": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Nausea": 1, "Psychomotor hyperactivity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "023AZIA", "histograms": [{"histogram": {"Back pain": 1, "Discomfort": 1, "Dizziness": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Nausea": 1, "Psychomotor hyperactivity": 1, "Pyrexia": 1}, "batchcodes": ["023AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023C214.json b/docs/data/histograms/United States/023C214.json
index 2b4a3a8cbd0..67096ce7b17 100644
--- a/docs/data/histograms/United States/023C214.json
+++ b/docs/data/histograms/United States/023C214.json
@@ -1 +1 @@
-{"batchcode": "023C214", "histograms": [{"batchcodes": ["023C214"], "histogram": {"Dyspnoea": 1}}]}
\ No newline at end of file
+{"batchcode": "023C214", "histograms": [{"histogram": {"Dyspnoea": 1}, "batchcodes": ["023C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023C219.json b/docs/data/histograms/United States/023C219.json
index 09ec8d6057a..549b60b2d2e 100644
--- a/docs/data/histograms/United States/023C219.json
+++ b/docs/data/histograms/United States/023C219.json
@@ -1 +1 @@
-{"batchcode": "023C219", "histograms": [{"batchcodes": ["023C219"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "023C219", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["023C219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023C21A.json b/docs/data/histograms/United States/023C21A.json
index b58cbfde380..91811e0207a 100644
--- a/docs/data/histograms/United States/023C21A.json
+++ b/docs/data/histograms/United States/023C21A.json
@@ -1 +1 @@
-{"batchcode": "023C21A", "histograms": [{"batchcodes": ["023C21A", "051C21A"], "histogram": {"Chest X-ray": 1, "Chest pain": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Full blood count": 1, "Impaired work ability": 1, "Myalgia": 1, "Neck pain": 1, "Odynophagia": 1, "Pleurisy": 1, "SARS-CoV-2 test": 1, "Sensitivity to weather change": 1}}, {"batchcodes": ["023C21A"], "histogram": {"Pyrexia": 22, "Fatigue": 19, "Expired product administered": 16, "Chills": 14, "Headache": 12, "Myalgia": 11, "Asthenia": 10, "Nausea": 10, "Pain in extremity": 9, "Pruritus": 9, "Body temperature": 8, "Dizziness": 8, "Feeling abnormal": 8, "Vaccination complication": 8, "Pain": 7, "Rash": 7, "Inappropriate schedule of product administration": 6, "Product dose omission issue": 6, "SARS-CoV-2 test": 6, "Vaccination site pain": 6, "Arthralgia": 5, "Chest pain": 5, "Erythema": 5, "Heart rate": 5, "COVID-19": 4, "Cough": 4, "Diarrhoea": 4, "Hypoaesthesia": 4, "Insomnia": 4, "Paraesthesia": 4, "Peripheral swelling": 4, "Swelling": 4, "Vaccination site swelling": 4, "Back pain": 3, "Blood pressure measurement": 3, "Dyspnoea": 3, "Feeling cold": 3, "Feeling hot": 3, "Hypersensitivity": 3, "Influenza like illness": 3, "Interchange of vaccine products": 3, "Lymphadenopathy": 3, "Migraine": 3, "Product storage error": 3, "Somnolence": 3, "Tremor": 3, "Vaccination site bruising": 3, "Vaccination site pruritus": 3, "Vomiting": 3, "Abdominal discomfort": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Alopecia": 2, "Balance disorder": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Contusion": 2, "Device connection issue": 2, "Dysphagia": 2, "Electrocardiogram": 2, "Eye pruritus": 2, "Fluid retention": 2, "Head discomfort": 2, "Illness": 2, "Injection site erythema": 2, "Loss of consciousness": 2, "Malaise": 2, "Menstrual disorder": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Neck pain": 2, "Neuralgia": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Pharyngeal swelling": 2, "Product administered to patient of inappropriate age": 2, "Rhinorrhoea": 2, "Throat irritation": 2, "Underdose": 2, "Urticaria": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abscess": 1, "Accidental exposure to product": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Bladder discomfort": 1, "Blindness": 1, "Bone pain": 1, "Bradycardia": 1, "Burning sensation": 1, "Cellulitis": 1, "Confusional state": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Discomfort": 1, "Dry eye": 1, "Dry throat": 1, "Dysgeusia": 1, "Ear pruritus": 1, "Eclampsia": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eye haemorrhage": 1, "Eye swelling": 1, "Fall": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Food intolerance": 1, "Full blood count": 1, "Gait inability": 1, "Gout": 1, "Hair texture abnormal": 1, "Heart rate normal": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hot flush": 1, "Hunger": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypokinesia": 1, "Induration": 1, "Infected cyst": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Intermenstrual bleeding": 1, "Joint stiffness": 1, "Joint swelling": 1, "Ligament sprain": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Mass": 1, "Metabolic function test": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Near death experience": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pericarditis": 1, "Pityriasis rosea": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Pulmonary mass": 1, "Pulmonary pain": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Seasonal allergy": 1, "Skin discolouration": 1, "Skin infection": 1, "Speech disorder": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Tachycardia": 1, "Throat tightness": 1, "Thyroid function test": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vaccination site coldness": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "023C21A", "histograms": [{"histogram": {"Chest X-ray": 1, "Chest pain": 1, "Cough": 1, "Dizziness": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Full blood count": 1, "Impaired work ability": 1, "Myalgia": 1, "Neck pain": 1, "Odynophagia": 1, "Pleurisy": 1, "SARS-CoV-2 test": 1, "Sensitivity to weather change": 1}, "batchcodes": ["023C21A", "051C21A"]}, {"histogram": {"Pyrexia": 22, "Fatigue": 19, "Expired product administered": 16, "Chills": 14, "Headache": 12, "Myalgia": 11, "Asthenia": 10, "Nausea": 10, "Pain in extremity": 9, "Pruritus": 9, "Body temperature": 8, "Dizziness": 8, "Feeling abnormal": 8, "Vaccination complication": 8, "Pain": 7, "Rash": 7, "Inappropriate schedule of product administration": 6, "Product dose omission issue": 6, "SARS-CoV-2 test": 6, "Vaccination site pain": 6, "Arthralgia": 5, "Chest pain": 5, "Erythema": 5, "Heart rate": 5, "COVID-19": 4, "Cough": 4, "Diarrhoea": 4, "Hypoaesthesia": 4, "Insomnia": 4, "Paraesthesia": 4, "Peripheral swelling": 4, "Swelling": 4, "Vaccination site swelling": 4, "Back pain": 3, "Blood pressure measurement": 3, "Dyspnoea": 3, "Feeling cold": 3, "Feeling hot": 3, "Hypersensitivity": 3, "Influenza like illness": 3, "Interchange of vaccine products": 3, "Lymphadenopathy": 3, "Migraine": 3, "Product storage error": 3, "Somnolence": 3, "Tremor": 3, "Vaccination site bruising": 3, "Vaccination site pruritus": 3, "Vomiting": 3, "Abdominal discomfort": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Alopecia": 2, "Balance disorder": 2, "Chest discomfort": 2, "Condition aggravated": 2, "Contusion": 2, "Device connection issue": 2, "Dysphagia": 2, "Electrocardiogram": 2, "Eye pruritus": 2, "Fluid retention": 2, "Head discomfort": 2, "Illness": 2, "Injection site erythema": 2, "Loss of consciousness": 2, "Malaise": 2, "Menstrual disorder": 2, "Mobility decreased": 2, "Muscle spasms": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Neck pain": 2, "Neuralgia": 2, "Oropharyngeal pain": 2, "Palpitations": 2, "Pharyngeal swelling": 2, "Product administered to patient of inappropriate age": 2, "Rhinorrhoea": 2, "Throat irritation": 2, "Underdose": 2, "Urticaria": 2, "Vaccination site erythema": 2, "Vision blurred": 2, "Abdominal pain": 1, "Abdominal pain lower": 1, "Abscess": 1, "Accidental exposure to product": 1, "Ageusia": 1, "Alanine aminotransferase": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Bladder discomfort": 1, "Blindness": 1, "Bone pain": 1, "Bradycardia": 1, "Burning sensation": 1, "Cellulitis": 1, "Confusional state": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Discomfort": 1, "Dry eye": 1, "Dry throat": 1, "Dysgeusia": 1, "Ear pruritus": 1, "Eclampsia": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eye haemorrhage": 1, "Eye swelling": 1, "Fall": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Food intolerance": 1, "Full blood count": 1, "Gait inability": 1, "Gout": 1, "Hair texture abnormal": 1, "Heart rate normal": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hot flush": 1, "Hunger": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypokinesia": 1, "Induration": 1, "Infected cyst": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Intermenstrual bleeding": 1, "Joint stiffness": 1, "Joint swelling": 1, "Ligament sprain": 1, "Lip swelling": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Mammogram": 1, "Mass": 1, "Metabolic function test": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Near death experience": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oropharyngeal discomfort": 1, "Orthopnoea": 1, "Oxygen saturation": 1, "Paraesthesia oral": 1, "Paralysis": 1, "Pericarditis": 1, "Pityriasis rosea": 1, "Polymenorrhoea": 1, "Presyncope": 1, "Pulmonary mass": 1, "Pulmonary pain": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Seasonal allergy": 1, "Skin discolouration": 1, "Skin infection": 1, "Speech disorder": 1, "Swelling face": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Tachycardia": 1, "Throat tightness": 1, "Thyroid function test": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Vaccination failure": 1, "Vaccination site coldness": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["023C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023C22A.json b/docs/data/histograms/United States/023C22A.json
index ceb3a0cd45b..0d6a9f26dcd 100644
--- a/docs/data/histograms/United States/023C22A.json
+++ b/docs/data/histograms/United States/023C22A.json
@@ -1 +1 @@
-{"batchcode": "023C22A", "histograms": [{"batchcodes": ["023C22A"], "histogram": {"Expired product administered": 15, "No adverse event": 15}}]}
\ No newline at end of file
+{"batchcode": "023C22A", "histograms": [{"histogram": {"Expired product administered": 15, "No adverse event": 15}, "batchcodes": ["023C22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023CRA.json b/docs/data/histograms/United States/023CRA.json
index 1966f0d14cb..e4b76e4e3b5 100644
--- a/docs/data/histograms/United States/023CRA.json
+++ b/docs/data/histograms/United States/023CRA.json
@@ -1 +1 @@
-{"batchcode": "023CRA", "histograms": [{"batchcodes": ["023CRA"], "histogram": {"Electrocardiogram": 1, "Heart rate": 1, "Hypertension": 1, "Pulmonary embolism": 1, "Restrictive pulmonary disease": 1}}]}
\ No newline at end of file
+{"batchcode": "023CRA", "histograms": [{"histogram": {"Electrocardiogram": 1, "Heart rate": 1, "Hypertension": 1, "Pulmonary embolism": 1, "Restrictive pulmonary disease": 1}, "batchcodes": ["023CRA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023D.json b/docs/data/histograms/United States/023D.json
index 33a881a17fb..7e05a179649 100644
--- a/docs/data/histograms/United States/023D.json
+++ b/docs/data/histograms/United States/023D.json
@@ -1 +1 @@
-{"batchcode": "023D", "histograms": [{"batchcodes": ["023D"], "histogram": {"Arthralgia": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023D", "histograms": [{"histogram": {"Arthralgia": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["023D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023D1A.json b/docs/data/histograms/United States/023D1A.json
index e0e1eff3d27..d48f57227f4 100644
--- a/docs/data/histograms/United States/023D1A.json
+++ b/docs/data/histograms/United States/023D1A.json
@@ -1 +1 @@
-{"batchcode": "023D1A", "histograms": [{"batchcodes": ["023D1A"], "histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "023D1A", "histograms": [{"histogram": {"Expired product administered": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["023D1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023D21A.json b/docs/data/histograms/United States/023D21A.json
index d4aaf5402c0..9fba9c3455d 100644
--- a/docs/data/histograms/United States/023D21A.json
+++ b/docs/data/histograms/United States/023D21A.json
@@ -1 +1 @@
-{"batchcode": "023D21A", "histograms": [{"batchcodes": ["023D21A"], "histogram": {"Expired product administered": 2, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Poor quality product administered": 1, "Product storage error": 1, "Urine odour abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "023D21A", "histograms": [{"histogram": {"Expired product administered": 2, "Inappropriate schedule of product administration": 1, "Influenza like illness": 1, "Poor quality product administered": 1, "Product storage error": 1, "Urine odour abnormal": 1}, "batchcodes": ["023D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023H0A.json b/docs/data/histograms/United States/023H0A.json
index f83c1ff6641..8f81762eb1e 100644
--- a/docs/data/histograms/United States/023H0A.json
+++ b/docs/data/histograms/United States/023H0A.json
@@ -1 +1 @@
-{"batchcode": "023H0A", "histograms": [{"batchcodes": ["023H0A"], "histogram": {"Hypoaesthesia": 1, "Pain": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "023H0A", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Pain": 1, "Paraesthesia": 1}, "batchcodes": ["023H0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023H20A.json b/docs/data/histograms/United States/023H20A.json
index 54e4937b8f6..7242eb8968e 100644
--- a/docs/data/histograms/United States/023H20A.json
+++ b/docs/data/histograms/United States/023H20A.json
@@ -1 +1 @@
-{"batchcode": "023H20A", "histograms": [{"batchcodes": ["023H20A"], "histogram": {"Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "023H20A", "histograms": [{"histogram": {"Fatigue": 1}, "batchcodes": ["023H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023H22A.json b/docs/data/histograms/United States/023H22A.json
index dd4514565d2..d514c840c36 100644
--- a/docs/data/histograms/United States/023H22A.json
+++ b/docs/data/histograms/United States/023H22A.json
@@ -1 +1 @@
-{"batchcode": "023H22A", "histograms": [{"batchcodes": ["021C21A", "023H22A", "042A21A", "FP7150"], "histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["023H22A"], "histogram": {"No adverse event": 34, "Poor quality product administered": 24, "Product temperature excursion issue": 24, "Expired product administered": 8, "Inappropriate schedule of product administration": 1, "Product storage error": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "023H22A", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}, "batchcodes": ["021C21A", "023H22A", "042A21A", "FP7150"]}, {"histogram": {"No adverse event": 34, "Poor quality product administered": 24, "Product temperature excursion issue": 24, "Expired product administered": 8, "Inappropriate schedule of product administration": 1, "Product storage error": 1, "Wrong product administered": 1}, "batchcodes": ["023H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023J202A.json b/docs/data/histograms/United States/023J202A.json
index d337f1643be..102f9645da0 100644
--- a/docs/data/histograms/United States/023J202A.json
+++ b/docs/data/histograms/United States/023J202A.json
@@ -1 +1 @@
-{"batchcode": "023J202A", "histograms": [{"batchcodes": ["023J202A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "023J202A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["023J202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023L20A.json b/docs/data/histograms/United States/023L20A.json
index b67cfb73860..0142a7ed268 100644
--- a/docs/data/histograms/United States/023L20A.json
+++ b/docs/data/histograms/United States/023L20A.json
@@ -1 +1 @@
-{"batchcode": "023L20A", "histograms": [{"batchcodes": ["023L20A"], "histogram": {"Headache": 3, "Chills": 2, "Fatigue": 2, "Nausea": 2, "Pyrexia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Ageusia": 1, "Arthralgia": 1, "Asthenia": 1, "Blister": 1, "Disability": 1, "Dyspnoea": 1, "Erythema": 1, "Fall": 1, "Influenza like illness": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Tremor": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "023L20A", "histograms": [{"histogram": {"Headache": 3, "Chills": 2, "Fatigue": 2, "Nausea": 2, "Pyrexia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Vaccination site warmth": 2, "Ageusia": 1, "Arthralgia": 1, "Asthenia": 1, "Blister": 1, "Disability": 1, "Dyspnoea": 1, "Erythema": 1, "Fall": 1, "Influenza like illness": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Tremor": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["023L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023LWA.json b/docs/data/histograms/United States/023LWA.json
index 1c0743299d2..0b538f76885 100644
--- a/docs/data/histograms/United States/023LWA.json
+++ b/docs/data/histograms/United States/023LWA.json
@@ -1 +1 @@
-{"batchcode": "023LWA", "histograms": [{"batchcodes": ["023LWA"], "histogram": {"Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Injection site pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023LWA", "histograms": [{"histogram": {"Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Injection site pain": 1, "Vaccination site pain": 1}, "batchcodes": ["023LWA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M02A.json b/docs/data/histograms/United States/023M02A.json
index f6e08ef959a..c5776535741 100644
--- a/docs/data/histograms/United States/023M02A.json
+++ b/docs/data/histograms/United States/023M02A.json
@@ -1 +1 @@
-{"batchcode": "023M02A", "histograms": [{"batchcodes": ["023M02A"], "histogram": {"Decreased appetite": 1, "Fatigue": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "023M02A", "histograms": [{"histogram": {"Decreased appetite": 1, "Fatigue": 1, "Nausea": 1}, "batchcodes": ["023M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M2 (ORQ)0A.json b/docs/data/histograms/United States/023M2 (ORQ)0A.json
index 96f3f625e9a..242bdc32798 100644
--- a/docs/data/histograms/United States/023M2 (ORQ)0A.json
+++ b/docs/data/histograms/United States/023M2 (ORQ)0A.json
@@ -1 +1 @@
-{"batchcode": "023M2 (ORQ)0A", "histograms": [{"batchcodes": ["023M2 (ORQ)0A"], "histogram": {"Abdominal discomfort": 1, "Nausea": 1, "Peripheral swelling": 1, "Regurgitation": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "023M2 (ORQ)0A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Nausea": 1, "Peripheral swelling": 1, "Regurgitation": 1, "Vomiting": 1}, "batchcodes": ["023M2 (ORQ)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M2(Z?)04.json b/docs/data/histograms/United States/023M2(Z?)04.json
index c3e5454e0a7..34ba5306152 100644
--- a/docs/data/histograms/United States/023M2(Z?)04.json
+++ b/docs/data/histograms/United States/023M2(Z?)04.json
@@ -1 +1 @@
-{"batchcode": "023M2(Z?)04", "histograms": [{"batchcodes": ["023M2(Z?)04"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023M2(Z?)04", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["023M2(Z?)04"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M20 A.json b/docs/data/histograms/United States/023M20 A.json
index 8bc258d1d71..732485c834e 100644
--- a/docs/data/histograms/United States/023M20 A.json
+++ b/docs/data/histograms/United States/023M20 A.json
@@ -1 +1 @@
-{"batchcode": "023M20 A", "histograms": [{"batchcodes": ["023M20 A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Feeling abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20 A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Feeling abnormal": 1}, "batchcodes": ["023M20 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M20.json b/docs/data/histograms/United States/023M20.json
index e350ba9d6db..8142ae13495 100644
--- a/docs/data/histograms/United States/023M20.json
+++ b/docs/data/histograms/United States/023M20.json
@@ -1 +1 @@
-{"batchcode": "023M20", "histograms": [{"batchcodes": ["023M20"], "histogram": {"Dysgeusia": 1, "Taste disorder": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20", "histograms": [{"histogram": {"Dysgeusia": 1, "Taste disorder": 1, "Weight decreased": 1}, "batchcodes": ["023M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M201.json b/docs/data/histograms/United States/023M201.json
index bc9cfc0d5fb..3b23859a134 100644
--- a/docs/data/histograms/United States/023M201.json
+++ b/docs/data/histograms/United States/023M201.json
@@ -1 +1 @@
-{"batchcode": "023M201", "histograms": [{"batchcodes": ["023M201"], "histogram": {"Hypoaesthesia": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1, "Skin burning sensation": 1}}]}
\ No newline at end of file
+{"batchcode": "023M201", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pruritus": 1, "Skin burning sensation": 1}, "batchcodes": ["023M201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M2017.json b/docs/data/histograms/United States/023M2017.json
index c672dd5575a..af4caf9bfcc 100644
--- a/docs/data/histograms/United States/023M2017.json
+++ b/docs/data/histograms/United States/023M2017.json
@@ -1 +1 @@
-{"batchcode": "023M2017", "histograms": [{"batchcodes": ["023M2017"], "histogram": {"Cardiac disorder": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1}}]}
\ No newline at end of file
+{"batchcode": "023M2017", "histograms": [{"histogram": {"Cardiac disorder": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1}, "batchcodes": ["023M2017"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M2019.json b/docs/data/histograms/United States/023M2019.json
index 22f5578bda3..ddf8b96a955 100644
--- a/docs/data/histograms/United States/023M2019.json
+++ b/docs/data/histograms/United States/023M2019.json
@@ -1 +1 @@
-{"batchcode": "023M2019", "histograms": [{"batchcodes": ["023M2019"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "023M2019", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["023M2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M201A.json b/docs/data/histograms/United States/023M201A.json
index 7efb5258465..92348b3079f 100644
--- a/docs/data/histograms/United States/023M201A.json
+++ b/docs/data/histograms/United States/023M201A.json
@@ -1 +1 @@
-{"batchcode": "023M201A", "histograms": [{"batchcodes": ["023M201A"], "histogram": {"Asthenia": 1, "Axillary pain": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023M201A", "histograms": [{"histogram": {"Asthenia": 1, "Axillary pain": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["023M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M204.json b/docs/data/histograms/United States/023M204.json
index 8a1759cff49..a8977a01af1 100644
--- a/docs/data/histograms/United States/023M204.json
+++ b/docs/data/histograms/United States/023M204.json
@@ -1 +1 @@
-{"batchcode": "023M204", "histograms": [{"batchcodes": ["023M204"], "histogram": {"COVID-19": 1, "Chest X-ray": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Pulmonary fibrosis": 1}}]}
\ No newline at end of file
+{"batchcode": "023M204", "histograms": [{"histogram": {"COVID-19": 1, "Chest X-ray": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Pulmonary fibrosis": 1}, "batchcodes": ["023M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M208.json b/docs/data/histograms/United States/023M208.json
index 261d7520386..c5b3ae22567 100644
--- a/docs/data/histograms/United States/023M208.json
+++ b/docs/data/histograms/United States/023M208.json
@@ -1 +1 @@
-{"batchcode": "023M208", "histograms": [{"batchcodes": ["023M208"], "histogram": {"Blood glucose increased": 1}}]}
\ No newline at end of file
+{"batchcode": "023M208", "histograms": [{"histogram": {"Blood glucose increased": 1}, "batchcodes": ["023M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M209.json b/docs/data/histograms/United States/023M209.json
index e2442d8c00a..023bdf84782 100644
--- a/docs/data/histograms/United States/023M209.json
+++ b/docs/data/histograms/United States/023M209.json
@@ -1 +1 @@
-{"batchcode": "023M209", "histograms": [{"batchcodes": ["023M209"], "histogram": {"Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "023M209", "histograms": [{"histogram": {"Myalgia": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination complication": 1}, "batchcodes": ["023M209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M20A.json b/docs/data/histograms/United States/023M20A.json
index de8c54746c8..81f7bb34a05 100644
--- a/docs/data/histograms/United States/023M20A.json
+++ b/docs/data/histograms/United States/023M20A.json
@@ -1 +1 @@
-{"batchcode": "023M20A", "histograms": [{"batchcodes": ["023M20A"], "histogram": {"Headache": 98, "Fatigue": 95, "Pyrexia": 90, "Chills": 85, "Pain in extremity": 80, "Vaccination site pain": 60, "Myalgia": 53, "Pain": 46, "Pruritus": 43, "Vaccination site erythema": 40, "Erythema": 37, "Nausea": 37, "Arthralgia": 36, "Body temperature": 33, "Rash": 31, "Dizziness": 30, "Vaccination site swelling": 30, "Vaccination site pruritus": 27, "Asthenia": 25, "Vomiting": 25, "Feeling abnormal": 22, "Peripheral swelling": 22, "Dyspnoea": 21, "Feeling hot": 17, "Illness": 17, "Diarrhoea": 16, "Vaccination site warmth": 16, "Decreased appetite": 14, "COVID-19": 13, "Malaise": 13, "Tinnitus": 13, "Influenza like illness": 12, "Injection site pruritus": 12, "SARS-CoV-2 test": 12, "Urticaria": 12, "Vaccination complication": 12, "Hyperhidrosis": 11, "Inappropriate schedule of product administration": 11, "Gait disturbance": 10, "Injection site erythema": 10, "Injection site pain": 10, "Lethargy": 10, "Oropharyngeal pain": 10, "Paraesthesia": 10, "Product dose omission issue": 10, "Vaccination site induration": 10, "Vaccination site rash": 10, "Abdominal pain upper": 9, "Back pain": 9, "Cough": 9, "Limb discomfort": 9, "Lymphadenopathy": 9, "Burning sensation": 8, "Chest pain": 8, "Heart rate increased": 8, "Somnolence": 8, "Swelling": 8, "Blood pressure measurement": 7, "Injection site warmth": 7, "Insomnia": 7, "Product administered to patient of inappropriate age": 7, "Swelling face": 7, "Ageusia": 6, "Anosmia": 6, "Blister": 6, "Feeling cold": 6, "Heart rate": 6, "Hypersensitivity": 6, "Hypoaesthesia": 6, "Injection site rash": 6, "Loss of consciousness": 6, "Neck pain": 6, "Rash erythematous": 6, "Tenderness": 6, "Vaccination site reaction": 6, "Abdominal discomfort": 5, "Arthritis": 5, "Blood test": 5, "Confusional state": 5, "Exposure during pregnancy": 5, "Flushing": 5, "Hypersomnia": 5, "Hypertension": 5, "Injection site swelling": 5, "Migraine": 5, "Nasal congestion": 5, "Palpitations": 5, "Rash pruritic": 5, "Throat tightness": 5, "Tremor": 5, "Underdose": 5, "Vaccination site mass": 5, "Vision blurred": 5, "Abdominal distension": 4, "Anxiety": 4, "Balance disorder": 4, "Bedridden": 4, "Blood glucose": 4, "Chest discomfort": 4, "Contusion": 4, "Discomfort": 4, "Dysgeusia": 4, "Expired product administered": 4, "Eye pain": 4, "Inflammation": 4, "Injection site induration": 4, "Injection site mass": 4, "Joint swelling": 4, "Magnetic resonance imaging": 4, "Maternal exposure during pregnancy": 4, "Muscle spasms": 4, "Paraesthesia oral": 4, "Productive cough": 4, "Rhinorrhoea": 4, "Taste disorder": 4, "Therapeutic response unexpected": 4, "Vertigo": 4, "Visual impairment": 4, "X-ray": 4, "Abdominal pain": 3, "Computerised tomogram": 3, "Device connection issue": 3, "Disorientation": 3, "Drug ineffective": 3, "Dyspepsia": 3, "Dysstasia": 3, "Ear discomfort": 3, "Fall": 3, "Influenza": 3, "Lymph node pain": 3, "Movement disorder": 3, "Muscular weakness": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Oral herpes": 3, "Rash macular": 3, "Sleep disorder": 3, "Sneezing": 3, "Syncope": 3, "Throat irritation": 3, "Tongue discomfort": 3, "Vaccination site lymphadenopathy": 3, "Weight decreased": 3, "Adverse reaction": 2, "Angioedema": 2, "Antibody test": 2, "Atrial fibrillation": 2, "Axillary pain": 2, "Bell's palsy": 2, "Blood pressure fluctuation": 2, "Blood pressure increased": 2, "Body temperature increased": 2, "Bone pain": 2, "Cerebrovascular accident": 2, "Chest X-ray": 2, "Condition aggravated": 2, "Constipation": 2, "Dysphagia": 2, "Dysphonia": 2, "Ear infection": 2, "Ear pain": 2, "Epistaxis": 2, "Extra dose administered": 2, "Eye disorder": 2, "Eye irritation": 2, "Eye swelling": 2, "Fungal infection": 2, "Gait inability": 2, "Gastrointestinal pain": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Hypotension": 2, "Impaired driving ability": 2, "Incontinence": 2, "Incorrect dose administered": 2, "Induration": 2, "Injection site discolouration": 2, "Injection site reaction": 2, "Intentional product use issue": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Nervousness": 2, "Neuralgia": 2, "Nodule": 2, "Ocular discomfort": 2, "Oxygen saturation": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Pelvic pain": 2, "Periorbital swelling": 2, "Pneumonia": 2, "Product storage error": 2, "SARS-CoV-2 test positive": 2, "Sinus disorder": 2, "Sinus headache": 2, "Sinus pain": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Skin reaction": 2, "Spinal pain": 2, "Swollen tongue": 2, "Tachycardia": 2, "Transient ischaemic attack": 2, "Urinary tract infection": 2, "Wheezing": 2, "Abortion spontaneous": 1, "Accidental underdose": 1, "Adnexa uteri pain": 1, "Adverse event following immunisation": 1, "Alopecia": 1, "Anal incontinence": 1, "Aortic valve replacement": 1, "Aphasia": 1, "Arrhythmia": 1, "Arthritis reactive": 1, "Aspiration": 1, "Asthma": 1, "Asymptomatic COVID-19": 1, "Axillary mass": 1, "Biopsy": 1, "Blepharospasm": 1, "Blindness": 1, "Blindness unilateral": 1, "Blood cholesterol": 1, "Blood glucose increased": 1, "Bone densitometry": 1, "Bradykinesia": 1, "Bronchospasm": 1, "COVID-19 immunisation": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Cardiac operation": 1, "Catheterisation cardiac": 1, "Cerebral vasoconstriction": 1, "Cold sweat": 1, "Conjunctival haemorrhage": 1, "Crepitations": 1, "Cystitis": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Dementia": 1, "Depressed mood": 1, "Depression": 1, "Diagnostic procedure": 1, "Diplegia": 1, "Dry skin": 1, "Dyskinesia": 1, "Ear inflammation": 1, "Ear swelling": 1, "Eating disorder symptom": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Eructation": 1, "Erythema multiforme": 1, "Excessive eye blinking": 1, "Exophthalmos": 1, "Exposure to SARS-CoV-2": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eyelid irritation": 1, "Facial discomfort": 1, "Facial pain": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Feeling of despair": 1, "Fracture": 1, "Full blood count": 1, "Gallbladder oedema": 1, "Gingival discomfort": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Gout": 1, "Granuloma annulare": 1, "Groin pain": 1, "Haemoptysis": 1, "Haemorrhage intracranial": 1, "Hallucination": 1, "Hangover": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Herpes virus infection": 1, "Hip fracture": 1, "Hot flush": 1, "Hydronephrosis": 1, "Hypermetropia": 1, "Hypertonic bladder": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypogeusia": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Increased viscosity of upper respiratory secretion": 1, "Injection site bruising": 1, "Injection site cellulitis": 1, "Injection site extravasation": 1, "Injection site nodule": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Intervertebral disc protrusion": 1, "Labyrinthitis": 1, "Lacrimation increased": 1, "Limb injury": 1, "Lip pruritus": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Metamorphopsia": 1, "Mobility decreased": 1, "Mood swings": 1, "Motor dysfunction": 1, "Mouth haemorrhage": 1, "Muscle discomfort": 1, "Muscle strain": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nerve injury": 1, "Night sweats": 1, "Nonspecific reaction": 1, "Off label use": 1, "Optic nerve disorder": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Pancreatitis": 1, "Papule": 1, "Parosmia": 1, "Peripheral coldness": 1, "Petechiae": 1, "Pharyngeal swelling": 1, "Phlebitis": 1, "Polymerase chain reaction": 1, "Poor peripheral circulation": 1, "Poor quality sleep": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Psoriasis": 1, "Pulmonary congestion": 1, "Rash papular": 1, "Retching": 1, "SARS-CoV-2 antibody test": 1, "Scar": 1, "Sciatica": 1, "Seizure": 1, "Sensory loss": 1, "Shock symptom": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin haemorrhage": 1, "Skin laceration": 1, "Skin swelling": 1, "Skin wrinkling": 1, "Sleep deficit": 1, "Speech disorder": 1, "Stomatitis": 1, "Sunburn": 1, "Temperature intolerance": 1, "Tendon discomfort": 1, "Thrombosis": 1, "Tooth abscess": 1, "Tooth infection": 1, "Toothache": 1, "Transient global amnesia": 1, "Trigger finger": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound scan": 1, "Underweight": 1, "Upper respiratory tract infection": 1, "Urethritis noninfective": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vascular graft": 1, "Vein disorder": 1, "Vitreous floaters": 1, "Weight fluctuation": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20A", "histograms": [{"histogram": {"Headache": 98, "Fatigue": 95, "Pyrexia": 90, "Chills": 85, "Pain in extremity": 80, "Vaccination site pain": 60, "Myalgia": 53, "Pain": 46, "Pruritus": 43, "Vaccination site erythema": 40, "Erythema": 37, "Nausea": 37, "Arthralgia": 36, "Body temperature": 33, "Rash": 31, "Dizziness": 30, "Vaccination site swelling": 30, "Vaccination site pruritus": 27, "Asthenia": 25, "Vomiting": 25, "Feeling abnormal": 22, "Peripheral swelling": 22, "Dyspnoea": 21, "Feeling hot": 17, "Illness": 17, "Diarrhoea": 16, "Vaccination site warmth": 16, "Decreased appetite": 14, "COVID-19": 13, "Malaise": 13, "Tinnitus": 13, "Influenza like illness": 12, "Injection site pruritus": 12, "SARS-CoV-2 test": 12, "Urticaria": 12, "Vaccination complication": 12, "Hyperhidrosis": 11, "Inappropriate schedule of product administration": 11, "Gait disturbance": 10, "Injection site erythema": 10, "Injection site pain": 10, "Lethargy": 10, "Oropharyngeal pain": 10, "Paraesthesia": 10, "Product dose omission issue": 10, "Vaccination site induration": 10, "Vaccination site rash": 10, "Abdominal pain upper": 9, "Back pain": 9, "Cough": 9, "Limb discomfort": 9, "Lymphadenopathy": 9, "Burning sensation": 8, "Chest pain": 8, "Heart rate increased": 8, "Somnolence": 8, "Swelling": 8, "Blood pressure measurement": 7, "Injection site warmth": 7, "Insomnia": 7, "Product administered to patient of inappropriate age": 7, "Swelling face": 7, "Ageusia": 6, "Anosmia": 6, "Blister": 6, "Feeling cold": 6, "Heart rate": 6, "Hypersensitivity": 6, "Hypoaesthesia": 6, "Injection site rash": 6, "Loss of consciousness": 6, "Neck pain": 6, "Rash erythematous": 6, "Tenderness": 6, "Vaccination site reaction": 6, "Abdominal discomfort": 5, "Arthritis": 5, "Blood test": 5, "Confusional state": 5, "Exposure during pregnancy": 5, "Flushing": 5, "Hypersomnia": 5, "Hypertension": 5, "Injection site swelling": 5, "Migraine": 5, "Nasal congestion": 5, "Palpitations": 5, "Rash pruritic": 5, "Throat tightness": 5, "Tremor": 5, "Underdose": 5, "Vaccination site mass": 5, "Vision blurred": 5, "Abdominal distension": 4, "Anxiety": 4, "Balance disorder": 4, "Bedridden": 4, "Blood glucose": 4, "Chest discomfort": 4, "Contusion": 4, "Discomfort": 4, "Dysgeusia": 4, "Expired product administered": 4, "Eye pain": 4, "Inflammation": 4, "Injection site induration": 4, "Injection site mass": 4, "Joint swelling": 4, "Magnetic resonance imaging": 4, "Maternal exposure during pregnancy": 4, "Muscle spasms": 4, "Paraesthesia oral": 4, "Productive cough": 4, "Rhinorrhoea": 4, "Taste disorder": 4, "Therapeutic response unexpected": 4, "Vertigo": 4, "Visual impairment": 4, "X-ray": 4, "Abdominal pain": 3, "Computerised tomogram": 3, "Device connection issue": 3, "Disorientation": 3, "Drug ineffective": 3, "Dyspepsia": 3, "Dysstasia": 3, "Ear discomfort": 3, "Fall": 3, "Influenza": 3, "Lymph node pain": 3, "Movement disorder": 3, "Muscular weakness": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Oral herpes": 3, "Rash macular": 3, "Sleep disorder": 3, "Sneezing": 3, "Syncope": 3, "Throat irritation": 3, "Tongue discomfort": 3, "Vaccination site lymphadenopathy": 3, "Weight decreased": 3, "Adverse reaction": 2, "Angioedema": 2, "Antibody test": 2, "Atrial fibrillation": 2, "Axillary pain": 2, "Bell's palsy": 2, "Blood pressure fluctuation": 2, "Blood pressure increased": 2, "Body temperature increased": 2, "Bone pain": 2, "Cerebrovascular accident": 2, "Chest X-ray": 2, "Condition aggravated": 2, "Constipation": 2, "Dysphagia": 2, "Dysphonia": 2, "Ear infection": 2, "Ear pain": 2, "Epistaxis": 2, "Extra dose administered": 2, "Eye disorder": 2, "Eye irritation": 2, "Eye swelling": 2, "Fungal infection": 2, "Gait inability": 2, "Gastrointestinal pain": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Hypotension": 2, "Impaired driving ability": 2, "Incontinence": 2, "Incorrect dose administered": 2, "Induration": 2, "Injection site discolouration": 2, "Injection site reaction": 2, "Intentional product use issue": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Nervousness": 2, "Neuralgia": 2, "Nodule": 2, "Ocular discomfort": 2, "Oxygen saturation": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Pelvic pain": 2, "Periorbital swelling": 2, "Pneumonia": 2, "Product storage error": 2, "SARS-CoV-2 test positive": 2, "Sinus disorder": 2, "Sinus headache": 2, "Sinus pain": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Skin reaction": 2, "Spinal pain": 2, "Swollen tongue": 2, "Tachycardia": 2, "Transient ischaemic attack": 2, "Urinary tract infection": 2, "Wheezing": 2, "Abortion spontaneous": 1, "Accidental underdose": 1, "Adnexa uteri pain": 1, "Adverse event following immunisation": 1, "Alopecia": 1, "Anal incontinence": 1, "Aortic valve replacement": 1, "Aphasia": 1, "Arrhythmia": 1, "Arthritis reactive": 1, "Aspiration": 1, "Asthma": 1, "Asymptomatic COVID-19": 1, "Axillary mass": 1, "Biopsy": 1, "Blepharospasm": 1, "Blindness": 1, "Blindness unilateral": 1, "Blood cholesterol": 1, "Blood glucose increased": 1, "Bone densitometry": 1, "Bradykinesia": 1, "Bronchospasm": 1, "COVID-19 immunisation": 1, "Cardiac discomfort": 1, "Cardiac failure": 1, "Cardiac flutter": 1, "Cardiac operation": 1, "Catheterisation cardiac": 1, "Cerebral vasoconstriction": 1, "Cold sweat": 1, "Conjunctival haemorrhage": 1, "Crepitations": 1, "Cystitis": 1, "Deafness unilateral": 1, "Deep vein thrombosis": 1, "Dementia": 1, "Depressed mood": 1, "Depression": 1, "Diagnostic procedure": 1, "Diplegia": 1, "Dry skin": 1, "Dyskinesia": 1, "Ear inflammation": 1, "Ear swelling": 1, "Eating disorder symptom": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Electrocardiogram": 1, "Eructation": 1, "Erythema multiforme": 1, "Excessive eye blinking": 1, "Exophthalmos": 1, "Exposure to SARS-CoV-2": 1, "Extrasystoles": 1, "Eye movement disorder": 1, "Eyelid irritation": 1, "Facial discomfort": 1, "Facial pain": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Feeling of despair": 1, "Fracture": 1, "Full blood count": 1, "Gallbladder oedema": 1, "Gingival discomfort": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "Gout": 1, "Granuloma annulare": 1, "Groin pain": 1, "Haemoptysis": 1, "Haemorrhage intracranial": 1, "Hallucination": 1, "Hangover": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Herpes virus infection": 1, "Hip fracture": 1, "Hot flush": 1, "Hydronephrosis": 1, "Hypermetropia": 1, "Hypertonic bladder": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypogeusia": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Increased viscosity of upper respiratory secretion": 1, "Injection site bruising": 1, "Injection site cellulitis": 1, "Injection site extravasation": 1, "Injection site nodule": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Intervertebral disc protrusion": 1, "Labyrinthitis": 1, "Lacrimation increased": 1, "Limb injury": 1, "Lip pruritus": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Magnetic resonance imaging head": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Metamorphopsia": 1, "Mobility decreased": 1, "Mood swings": 1, "Motor dysfunction": 1, "Mouth haemorrhage": 1, "Muscle discomfort": 1, "Muscle strain": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nerve injury": 1, "Night sweats": 1, "Nonspecific reaction": 1, "Off label use": 1, "Optic nerve disorder": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Pancreatitis": 1, "Papule": 1, "Parosmia": 1, "Peripheral coldness": 1, "Petechiae": 1, "Pharyngeal swelling": 1, "Phlebitis": 1, "Polymerase chain reaction": 1, "Poor peripheral circulation": 1, "Poor quality sleep": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Psoriasis": 1, "Pulmonary congestion": 1, "Rash papular": 1, "Retching": 1, "SARS-CoV-2 antibody test": 1, "Scar": 1, "Sciatica": 1, "Seizure": 1, "Sensory loss": 1, "Shock symptom": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin haemorrhage": 1, "Skin laceration": 1, "Skin swelling": 1, "Skin wrinkling": 1, "Sleep deficit": 1, "Speech disorder": 1, "Stomatitis": 1, "Sunburn": 1, "Temperature intolerance": 1, "Tendon discomfort": 1, "Thrombosis": 1, "Tooth abscess": 1, "Tooth infection": 1, "Toothache": 1, "Transient global amnesia": 1, "Trigger finger": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound scan": 1, "Underweight": 1, "Upper respiratory tract infection": 1, "Urethritis noninfective": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vascular graft": 1, "Vein disorder": 1, "Vitreous floaters": 1, "Weight fluctuation": 1, "White blood cell count": 1}, "batchcodes": ["023M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M20A023M20A.json b/docs/data/histograms/United States/023M20A023M20A.json
index b778828526d..9d891ee528a 100644
--- a/docs/data/histograms/United States/023M20A023M20A.json
+++ b/docs/data/histograms/United States/023M20A023M20A.json
@@ -1 +1 @@
-{"batchcode": "023M20A023M20A", "histograms": [{"batchcodes": ["023M20A023M20A"], "histogram": {"Balance disorder": 1, "Breast pain": 1, "Confusional state": 1, "Dehydration": 1, "Dyspepsia": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20A023M20A", "histograms": [{"histogram": {"Balance disorder": 1, "Breast pain": 1, "Confusional state": 1, "Dehydration": 1, "Dyspepsia": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Muscle spasms": 1, "Pain in extremity": 1, "Palpitations": 1}, "batchcodes": ["023M20A023M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M20K.json b/docs/data/histograms/United States/023M20K.json
index 04fc53fe7fd..3d7cf3e6629 100644
--- a/docs/data/histograms/United States/023M20K.json
+++ b/docs/data/histograms/United States/023M20K.json
@@ -1 +1 @@
-{"batchcode": "023M20K", "histograms": [{"batchcodes": ["023M20K"], "histogram": {"Arthralgia": 1, "Musculoskeletal discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "023M20K", "histograms": [{"histogram": {"Arthralgia": 1, "Musculoskeletal discomfort": 1}, "batchcodes": ["023M20K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M21A.json b/docs/data/histograms/United States/023M21A.json
index b3b63d73558..5a89f8645c2 100644
--- a/docs/data/histograms/United States/023M21A.json
+++ b/docs/data/histograms/United States/023M21A.json
@@ -1 +1 @@
-{"batchcode": "023M21A", "histograms": [{"batchcodes": ["023M21A"], "histogram": {"Headache": 2, "Pyrexia": 2, "Burning sensation": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Painful respiration": 1, "Product dose omission issue": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "023M21A", "histograms": [{"histogram": {"Headache": 2, "Pyrexia": 2, "Burning sensation": 1, "Chills": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Malaise": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Painful respiration": 1, "Product dose omission issue": 1, "Tremor": 1}, "batchcodes": ["023M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M23A.json b/docs/data/histograms/United States/023M23A.json
index 8399390c193..f1598dd162a 100644
--- a/docs/data/histograms/United States/023M23A.json
+++ b/docs/data/histograms/United States/023M23A.json
@@ -1 +1 @@
-{"batchcode": "023M23A", "histograms": [{"batchcodes": ["023M23A"], "histogram": {"Chills": 1, "Dyspnoea": 1, "Eye pain": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Ocular discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "023M23A", "histograms": [{"histogram": {"Chills": 1, "Dyspnoea": 1, "Eye pain": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Ocular discomfort": 1}, "batchcodes": ["023M23A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M24A.json b/docs/data/histograms/United States/023M24A.json
index 75e6452ca90..61b47101a95 100644
--- a/docs/data/histograms/United States/023M24A.json
+++ b/docs/data/histograms/United States/023M24A.json
@@ -1 +1 @@
-{"batchcode": "023M24A", "histograms": [{"batchcodes": ["023M24A"], "histogram": {"Chills": 1, "Cough": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "023M24A", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Dyspnoea": 1, "Oropharyngeal pain": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["023M24A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M26A.json b/docs/data/histograms/United States/023M26A.json
index 2aadb06863f..708d9550d35 100644
--- a/docs/data/histograms/United States/023M26A.json
+++ b/docs/data/histograms/United States/023M26A.json
@@ -1 +1 @@
-{"batchcode": "023M26A", "histograms": [{"batchcodes": ["023M26A"], "histogram": {"Erythema": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "023M26A", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1}, "batchcodes": ["023M26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M2A.json b/docs/data/histograms/United States/023M2A.json
index e9a09d35676..55a1ddc2f61 100644
--- a/docs/data/histograms/United States/023M2A.json
+++ b/docs/data/histograms/United States/023M2A.json
@@ -1 +1 @@
-{"batchcode": "023M2A", "histograms": [{"batchcodes": ["023M2A"], "histogram": {"Palpitations": 2, "Cystitis noninfective": 1, "Cystoscopy": 1, "Fatigue": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vasculitis": 1}}]}
\ No newline at end of file
+{"batchcode": "023M2A", "histograms": [{"histogram": {"Palpitations": 2, "Cystitis noninfective": 1, "Cystoscopy": 1, "Fatigue": 1, "Urinary tract infection": 1, "Urine analysis": 1, "Vasculitis": 1}, "batchcodes": ["023M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M2DA.json b/docs/data/histograms/United States/023M2DA.json
index 7bae3e1c773..e116cef0dbc 100644
--- a/docs/data/histograms/United States/023M2DA.json
+++ b/docs/data/histograms/United States/023M2DA.json
@@ -1 +1 @@
-{"batchcode": "023M2DA", "histograms": [{"batchcodes": ["023M2DA"], "histogram": {"Exposure via breast milk": 1}}]}
\ No newline at end of file
+{"batchcode": "023M2DA", "histograms": [{"histogram": {"Exposure via breast milk": 1}, "batchcodes": ["023M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M2OA.json b/docs/data/histograms/United States/023M2OA.json
index 04607a2d61b..de2b8676d96 100644
--- a/docs/data/histograms/United States/023M2OA.json
+++ b/docs/data/histograms/United States/023M2OA.json
@@ -1 +1 @@
-{"batchcode": "023M2OA", "histograms": [{"batchcodes": ["023M2OA"], "histogram": {"Pyrexia": 2, "Chest pain": 1, "Coronary artery dissection": 1, "Myocardial infarction": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023M2OA", "histograms": [{"histogram": {"Pyrexia": 2, "Chest pain": 1, "Coronary artery dissection": 1, "Myocardial infarction": 1, "Pain": 1}, "batchcodes": ["023M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M70.json b/docs/data/histograms/United States/023M70.json
index 59368831665..d3b3332cc3a 100644
--- a/docs/data/histograms/United States/023M70.json
+++ b/docs/data/histograms/United States/023M70.json
@@ -1 +1 @@
-{"batchcode": "023M70", "histograms": [{"batchcodes": ["023M70"], "histogram": {"Rash": 2, "Alopecia": 1, "Crying": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "023M70", "histograms": [{"histogram": {"Rash": 2, "Alopecia": 1, "Crying": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pruritus": 1}, "batchcodes": ["023M70"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023M70A.json b/docs/data/histograms/United States/023M70A.json
index 62fff5a976e..97343936598 100644
--- a/docs/data/histograms/United States/023M70A.json
+++ b/docs/data/histograms/United States/023M70A.json
@@ -1 +1 @@
-{"batchcode": "023M70A", "histograms": [{"batchcodes": ["023M70A"], "histogram": {"Headache": 2, "Nausea": 2, "Pain in extremity": 2, "Vomiting": 2, "Asthenia": 1, "Back pain": 1, "Body temperature decreased": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Myalgia": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023M70A", "histograms": [{"histogram": {"Headache": 2, "Nausea": 2, "Pain in extremity": 2, "Vomiting": 2, "Asthenia": 1, "Back pain": 1, "Body temperature decreased": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Fatigue": 1, "Influenza like illness": 1, "Loss of consciousness": 1, "Muscular weakness": 1, "Myalgia": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Vaccination site pain": 1}, "batchcodes": ["023M70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MCOA.json b/docs/data/histograms/United States/023MCOA.json
index ecf5b4b033d..a9558c26e2b 100644
--- a/docs/data/histograms/United States/023MCOA.json
+++ b/docs/data/histograms/United States/023MCOA.json
@@ -1 +1 @@
-{"batchcode": "023MCOA", "histograms": [{"batchcodes": ["023MCOA"], "histogram": {"Influenza like illness": 1, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023MCOA", "histograms": [{"histogram": {"Influenza like illness": 1, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["023MCOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MD20A.json b/docs/data/histograms/United States/023MD20A.json
index ad50c00b98d..e7b0a26a437 100644
--- a/docs/data/histograms/United States/023MD20A.json
+++ b/docs/data/histograms/United States/023MD20A.json
@@ -1 +1 @@
-{"batchcode": "023MD20A", "histograms": [{"batchcodes": ["023MD20A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "023MD20A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["023MD20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MDUA.json b/docs/data/histograms/United States/023MDUA.json
index 28ea3543652..bd1a6822e47 100644
--- a/docs/data/histograms/United States/023MDUA.json
+++ b/docs/data/histograms/United States/023MDUA.json
@@ -1 +1 @@
-{"batchcode": "023MDUA", "histograms": [{"batchcodes": ["023MDUA"], "histogram": {"Erythema": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "023MDUA", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["023MDUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MO4.json b/docs/data/histograms/United States/023MO4.json
index e2c41d4403f..5293e1bf0a2 100644
--- a/docs/data/histograms/United States/023MO4.json
+++ b/docs/data/histograms/United States/023MO4.json
@@ -1 +1 @@
-{"batchcode": "023MO4", "histograms": [{"batchcodes": ["023MO4"], "histogram": {"Abdominal pain": 1, "Allergy to vaccine": 1, "Blood immunoglobulin E": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Dysphagia": 1, "Dyspnoea": 1, "Eye pruritus": 1, "Feeling hot": 1, "Flushing": 1, "Gastritis": 1, "Histamine level": 1, "Hypoaesthesia": 1, "Ocular hyperaemia": 1, "Palpitations": 1, "Paraesthesia": 1, "Pruritus": 1, "Rash erythematous": 1, "Rhinorrhoea": 1, "Sneezing": 1, "White blood cell disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "023MO4", "histograms": [{"histogram": {"Abdominal pain": 1, "Allergy to vaccine": 1, "Blood immunoglobulin E": 1, "Chills": 1, "Cough": 1, "Diarrhoea": 1, "Dysphagia": 1, "Dyspnoea": 1, "Eye pruritus": 1, "Feeling hot": 1, "Flushing": 1, "Gastritis": 1, "Histamine level": 1, "Hypoaesthesia": 1, "Ocular hyperaemia": 1, "Palpitations": 1, "Paraesthesia": 1, "Pruritus": 1, "Rash erythematous": 1, "Rhinorrhoea": 1, "Sneezing": 1, "White blood cell disorder": 1}, "batchcodes": ["023MO4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MWA.json b/docs/data/histograms/United States/023MWA.json
index ea4577e241a..3bca4830e57 100644
--- a/docs/data/histograms/United States/023MWA.json
+++ b/docs/data/histograms/United States/023MWA.json
@@ -1 +1 @@
-{"batchcode": "023MWA", "histograms": [{"batchcodes": ["023MWA"], "histogram": {"Injection site bruising": 1, "Injection site pruritus": 1, "Injection site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "023MWA", "histograms": [{"histogram": {"Injection site bruising": 1, "Injection site pruritus": 1, "Injection site rash": 1}, "batchcodes": ["023MWA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MZ.json b/docs/data/histograms/United States/023MZ.json
index 56eb8242efd..77f006809e8 100644
--- a/docs/data/histograms/United States/023MZ.json
+++ b/docs/data/histograms/United States/023MZ.json
@@ -1 +1 @@
-{"batchcode": "023MZ", "histograms": [{"batchcodes": ["023MZ"], "histogram": {"Chills": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "023MZ", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["023MZ"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MZ04.json b/docs/data/histograms/United States/023MZ04.json
index f9209cb7a6a..bf3ea79dfe5 100644
--- a/docs/data/histograms/United States/023MZ04.json
+++ b/docs/data/histograms/United States/023MZ04.json
@@ -1 +1 @@
-{"batchcode": "023MZ04", "histograms": [{"batchcodes": ["023MZ04"], "histogram": {"Bone pain": 1, "Chills": 1, "Headache": 1, "Nasal congestion": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "023MZ04", "histograms": [{"histogram": {"Bone pain": 1, "Chills": 1, "Headache": 1, "Nasal congestion": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination complication": 1}, "batchcodes": ["023MZ04"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MZ0A.json b/docs/data/histograms/United States/023MZ0A.json
index ace18ec89f6..1e9d3bb1698 100644
--- a/docs/data/histograms/United States/023MZ0A.json
+++ b/docs/data/histograms/United States/023MZ0A.json
@@ -1 +1 @@
-{"batchcode": "023MZ0A", "histograms": [{"batchcodes": ["023MZ0A"], "histogram": {"Headache": 1, "Influenza": 1, "Injection site erythema": 1, "Injection site pain": 1, "Pain in extremity": 1, "Sinusitis": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "023MZ0A", "histograms": [{"histogram": {"Headache": 1, "Influenza": 1, "Injection site erythema": 1, "Injection site pain": 1, "Pain in extremity": 1, "Sinusitis": 1, "Vaccination site pain": 1}, "batchcodes": ["023MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MZ0A1.json b/docs/data/histograms/United States/023MZ0A1.json
index d0e56883d2c..97c7e1d0931 100644
--- a/docs/data/histograms/United States/023MZ0A1.json
+++ b/docs/data/histograms/United States/023MZ0A1.json
@@ -1 +1 @@
-{"batchcode": "023MZ0A1", "histograms": [{"batchcodes": ["023MZ0A1"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "023MZ0A1", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1}, "batchcodes": ["023MZ0A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023MZOA.json b/docs/data/histograms/United States/023MZOA.json
index 49f46be8d9d..fcc9e988102 100644
--- a/docs/data/histograms/United States/023MZOA.json
+++ b/docs/data/histograms/United States/023MZOA.json
@@ -1 +1 @@
-{"batchcode": "023MZOA", "histograms": [{"batchcodes": ["023MZOA"], "histogram": {"Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "023MZOA", "histograms": [{"histogram": {"Diarrhoea": 1}, "batchcodes": ["023MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023N20A.json b/docs/data/histograms/United States/023N20A.json
index 53853372a61..b3340563a87 100644
--- a/docs/data/histograms/United States/023N20A.json
+++ b/docs/data/histograms/United States/023N20A.json
@@ -1 +1 @@
-{"batchcode": "023N20A", "histograms": [{"batchcodes": ["023N20A"], "histogram": {"Asthenia": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Fatigue": 1, "Product administered to patient of inappropriate age": 1, "Seizure": 1, "Spinal fracture": 1}}]}
\ No newline at end of file
+{"batchcode": "023N20A", "histograms": [{"histogram": {"Asthenia": 1, "Condition aggravated": 1, "Decreased appetite": 1, "Fatigue": 1, "Product administered to patient of inappropriate age": 1, "Seizure": 1, "Spinal fracture": 1}, "batchcodes": ["023N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023U20A.json b/docs/data/histograms/United States/023U20A.json
index 094d8fe9919..e7d25191a43 100644
--- a/docs/data/histograms/United States/023U20A.json
+++ b/docs/data/histograms/United States/023U20A.json
@@ -1 +1 @@
-{"batchcode": "023U20A", "histograms": [{"batchcodes": ["023U20A"], "histogram": {"Headache": 1, "Limb discomfort": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "023U20A", "histograms": [{"histogram": {"Headache": 1, "Limb discomfort": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["023U20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/023V20A.json b/docs/data/histograms/United States/023V20A.json
index 560be211e63..c5cff0081db 100644
--- a/docs/data/histograms/United States/023V20A.json
+++ b/docs/data/histograms/United States/023V20A.json
@@ -1 +1 @@
-{"batchcode": "023V20A", "histograms": [{"batchcodes": ["023V20A"], "histogram": {"Rash": 2, "Erythema": 1, "Pruritus": 1, "Rash pruritic": 1, "Swelling": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "023V20A", "histograms": [{"histogram": {"Rash": 2, "Erythema": 1, "Pruritus": 1, "Rash pruritic": 1, "Swelling": 1, "Urticaria": 1}, "batchcodes": ["023V20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024021A.json b/docs/data/histograms/United States/024021A.json
index cfcd9ae229a..754a4214c42 100644
--- a/docs/data/histograms/United States/024021A.json
+++ b/docs/data/histograms/United States/024021A.json
@@ -1 +1 @@
-{"batchcode": "024021A", "histograms": [{"batchcodes": ["024021A"], "histogram": {"Abortion spontaneous": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Fear": 1, "Gait disturbance": 1, "Haemorrhage": 1, "Illness": 1, "Maternal exposure during pregnancy": 1, "Pain": 1, "Pain in extremity": 1, "Pregnancy test": 1, "Product administered to patient of inappropriate age": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "024021A", "histograms": [{"histogram": {"Abortion spontaneous": 1, "Deep vein thrombosis": 1, "Dizziness": 1, "Fear": 1, "Gait disturbance": 1, "Haemorrhage": 1, "Illness": 1, "Maternal exposure during pregnancy": 1, "Pain": 1, "Pain in extremity": 1, "Pregnancy test": 1, "Product administered to patient of inappropriate age": 1, "Ultrasound scan": 1}, "batchcodes": ["024021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0241420A.json b/docs/data/histograms/United States/0241420A.json
index 2d67c9861fa..e1717cacbfc 100644
--- a/docs/data/histograms/United States/0241420A.json
+++ b/docs/data/histograms/United States/0241420A.json
@@ -1 +1 @@
-{"batchcode": "0241420A", "histograms": [{"batchcodes": ["0241420A"], "histogram": {"Abdominal pain upper": 1, "Brain compression": 1, "Cerebellar haemorrhage": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Confusional state": 1, "Fall": 1, "Gait inability": 1, "Headache": 1, "Hydrocephalus": 1, "Hypertension": 1, "Intraventricular haemorrhage": 1, "Mental status changes": 1, "Mobility decreased": 1, "Thrombosis": 1, "Unresponsive to stimuli": 1, "Vomiting": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "0241420A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Brain compression": 1, "Cerebellar haemorrhage": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Confusional state": 1, "Fall": 1, "Gait inability": 1, "Headache": 1, "Hydrocephalus": 1, "Hypertension": 1, "Intraventricular haemorrhage": 1, "Mental status changes": 1, "Mobility decreased": 1, "Thrombosis": 1, "Unresponsive to stimuli": 1, "Vomiting": 1, "Weight decreased": 1}, "batchcodes": ["0241420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0242A21A.json b/docs/data/histograms/United States/0242A21A.json
index 6272392a4b1..051ceea5973 100644
--- a/docs/data/histograms/United States/0242A21A.json
+++ b/docs/data/histograms/United States/0242A21A.json
@@ -1 +1 @@
-{"batchcode": "0242A21A", "histograms": [{"batchcodes": ["0242A21A"], "histogram": {"Body temperature": 1, "Exposure via breast milk": 1, "Fatigue": 1, "Headache": 1, "Pain assessment": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0242A21A", "histograms": [{"histogram": {"Body temperature": 1, "Exposure via breast milk": 1, "Fatigue": 1, "Headache": 1, "Pain assessment": 1, "Pyrexia": 1}, "batchcodes": ["0242A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024320A.json b/docs/data/histograms/United States/024320A.json
index 73ba34e207a..27a642fdcb1 100644
--- a/docs/data/histograms/United States/024320A.json
+++ b/docs/data/histograms/United States/024320A.json
@@ -1 +1 @@
-{"batchcode": "024320A", "histograms": [{"batchcodes": ["024320A"], "histogram": {"Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "024320A", "histograms": [{"histogram": {"Peripheral swelling": 1}, "batchcodes": ["024320A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024A20A.json b/docs/data/histograms/United States/024A20A.json
index b15e5a6cb62..d8590e6fd68 100644
--- a/docs/data/histograms/United States/024A20A.json
+++ b/docs/data/histograms/United States/024A20A.json
@@ -1 +1 @@
-{"batchcode": "024A20A", "histograms": [{"batchcodes": ["024A20A"], "histogram": {"Asthenia": 1, "Ear pain": 1, "Erythema": 1, "Eye pain": 1, "Headache": 1, "Influenza like illness": 1, "Myalgia": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 antibody test positive": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "024A20A", "histograms": [{"histogram": {"Asthenia": 1, "Ear pain": 1, "Erythema": 1, "Eye pain": 1, "Headache": 1, "Influenza like illness": 1, "Myalgia": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 antibody test positive": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1}, "batchcodes": ["024A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024A21A.json b/docs/data/histograms/United States/024A21A.json
index 86127f2e282..ad9b25289c4 100644
--- a/docs/data/histograms/United States/024A21A.json
+++ b/docs/data/histograms/United States/024A21A.json
@@ -1 +1 @@
-{"batchcode": "024A21A", "histograms": [{"batchcodes": ["024A21A"], "histogram": {"Dizziness": 2, "Arthropathy": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Tongue dry": 1, "Vaccination site haemorrhage": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "024A21A", "histograms": [{"histogram": {"Dizziness": 2, "Arthropathy": 1, "Asthenia": 1, "Body temperature": 1, "COVID-19": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Magnetic resonance imaging": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Tongue dry": 1, "Vaccination site haemorrhage": 1, "Vertigo": 1}, "batchcodes": ["024A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024B21A.json b/docs/data/histograms/United States/024B21A.json
index f0b31d93dd5..272f3bb4932 100644
--- a/docs/data/histograms/United States/024B21A.json
+++ b/docs/data/histograms/United States/024B21A.json
@@ -1 +1 @@
-{"batchcode": "024B21A", "histograms": [{"batchcodes": ["024B21A"], "histogram": {"Musculoskeletal stiffness": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Accidental exposure to product": 1, "Device connection issue": 1, "Exposure during pregnancy": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Nuchal rigidity": 1, "Paraesthesia": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site movement impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "024B21A", "histograms": [{"histogram": {"Musculoskeletal stiffness": 2, "Vaccination site pain": 2, "Abdominal pain": 1, "Abortion spontaneous": 1, "Accidental exposure to product": 1, "Device connection issue": 1, "Exposure during pregnancy": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Nuchal rigidity": 1, "Paraesthesia": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site movement impairment": 1}, "batchcodes": ["024B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024C21A.json b/docs/data/histograms/United States/024C21A.json
index b6c5cd21714..dc0f6512774 100644
--- a/docs/data/histograms/United States/024C21A.json
+++ b/docs/data/histograms/United States/024C21A.json
@@ -1 +1 @@
-{"batchcode": "024C21A", "histograms": [{"batchcodes": ["024C21A"], "histogram": {"Expired product administered": 26, "Fatigue": 11, "Pain in extremity": 11, "Chills": 9, "Myalgia": 9, "Headache": 8, "Pruritus": 8, "Pyrexia": 8, "Product dose omission issue": 7, "Dyspnoea": 6, "Vaccination site pain": 6, "Arthralgia": 5, "Asthenia": 5, "Feeling abnormal": 5, "Malaise": 5, "Product administered to patient of inappropriate age": 5, "Urticaria": 5, "Dizziness": 4, "Erythema": 4, "Hyperhidrosis": 4, "Nausea": 4, "Product storage error": 4, "Rash": 4, "Vaccination site erythema": 4, "Blood pressure measurement": 3, "Chest pain": 3, "Feeling cold": 3, "Heart rate": 3, "Hypersensitivity": 3, "Illness": 3, "Peripheral swelling": 3, "Somnolence": 3, "Back pain": 2, "Bedridden": 2, "Cough": 2, "Diarrhoea": 2, "Extra dose administered": 2, "Eye pruritus": 2, "Influenza like illness": 2, "Limb discomfort": 2, "Musculoskeletal stiffness": 2, "Pain": 2, "SARS-CoV-2 test": 2, "Skin warm": 2, "Syncope": 2, "Tenderness": 2, "Tinnitus": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site swelling": 2, "Vision blurred": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Asthma": 1, "Axillary mass": 1, "Axillary pain": 1, "Blindness transient": 1, "Blister": 1, "Body temperature": 1, "Breast mass": 1, "Breast pain": 1, "COVID-19": 1, "Cardiac dysfunction": 1, "Cardiac function test": 1, "Catheterisation cardiac": 1, "Cervical radiculopathy": 1, "Contusion": 1, "Dacryocanaliculitis": 1, "Device connection issue": 1, "Dysgeusia": 1, "Ear pain": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Eye contusion": 1, "Eye infection": 1, "Eye pain": 1, "Eye swelling": 1, "Fear": 1, "Gait inability": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Joint swelling": 1, "Laboratory test": 1, "Lacrimation decreased": 1, "Lymphadenopathy": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Neuralgic amyotrophy": 1, "Nightmare": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory tract inflammation": 1, "Rhinorrhoea": 1, "Secretion discharge": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin mass": 1, "Skin reaction": 1, "Swelling": 1, "Tachycardia": 1, "Tension": 1, "Tonsillar inflammation": 1, "Underdose": 1, "Upper limb fracture": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Vomiting": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "024C21A", "histograms": [{"histogram": {"Expired product administered": 26, "Fatigue": 11, "Pain in extremity": 11, "Chills": 9, "Myalgia": 9, "Headache": 8, "Pruritus": 8, "Pyrexia": 8, "Product dose omission issue": 7, "Dyspnoea": 6, "Vaccination site pain": 6, "Arthralgia": 5, "Asthenia": 5, "Feeling abnormal": 5, "Malaise": 5, "Product administered to patient of inappropriate age": 5, "Urticaria": 5, "Dizziness": 4, "Erythema": 4, "Hyperhidrosis": 4, "Nausea": 4, "Product storage error": 4, "Rash": 4, "Vaccination site erythema": 4, "Blood pressure measurement": 3, "Chest pain": 3, "Feeling cold": 3, "Heart rate": 3, "Hypersensitivity": 3, "Illness": 3, "Peripheral swelling": 3, "Somnolence": 3, "Back pain": 2, "Bedridden": 2, "Cough": 2, "Diarrhoea": 2, "Extra dose administered": 2, "Eye pruritus": 2, "Influenza like illness": 2, "Limb discomfort": 2, "Musculoskeletal stiffness": 2, "Pain": 2, "SARS-CoV-2 test": 2, "Skin warm": 2, "Syncope": 2, "Tenderness": 2, "Tinnitus": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site swelling": 2, "Vision blurred": 2, "Abdominal pain upper": 1, "Angina pectoris": 1, "Asthma": 1, "Axillary mass": 1, "Axillary pain": 1, "Blindness transient": 1, "Blister": 1, "Body temperature": 1, "Breast mass": 1, "Breast pain": 1, "COVID-19": 1, "Cardiac dysfunction": 1, "Cardiac function test": 1, "Catheterisation cardiac": 1, "Cervical radiculopathy": 1, "Contusion": 1, "Dacryocanaliculitis": 1, "Device connection issue": 1, "Dysgeusia": 1, "Ear pain": 1, "Electrocardiogram": 1, "Electromyogram": 1, "Eye contusion": 1, "Eye infection": 1, "Eye pain": 1, "Eye swelling": 1, "Fear": 1, "Gait inability": 1, "Head discomfort": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Impaired work ability": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Joint swelling": 1, "Laboratory test": 1, "Lacrimation decreased": 1, "Lymphadenopathy": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Neuralgic amyotrophy": 1, "Nightmare": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory tract inflammation": 1, "Rhinorrhoea": 1, "Secretion discharge": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin mass": 1, "Skin reaction": 1, "Swelling": 1, "Tachycardia": 1, "Tension": 1, "Tonsillar inflammation": 1, "Underdose": 1, "Upper limb fracture": 1, "Vaccination failure": 1, "Vaccination site discolouration": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Vomiting": 1, "Wrong product administered": 1}, "batchcodes": ["024C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024C21N.json b/docs/data/histograms/United States/024C21N.json
index 858881b709c..aed191f769d 100644
--- a/docs/data/histograms/United States/024C21N.json
+++ b/docs/data/histograms/United States/024C21N.json
@@ -1 +1 @@
-{"batchcode": "024C21N", "histograms": [{"batchcodes": ["024C21N"], "histogram": {"Myalgia": 2, "Pain in extremity": 2, "Chills": 1, "Diarrhoea": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "024C21N", "histograms": [{"histogram": {"Myalgia": 2, "Pain in extremity": 2, "Chills": 1, "Diarrhoea": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["024C21N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024CZ1A.json b/docs/data/histograms/United States/024CZ1A.json
index 4bc5495c916..985bae94070 100644
--- a/docs/data/histograms/United States/024CZ1A.json
+++ b/docs/data/histograms/United States/024CZ1A.json
@@ -1 +1 @@
-{"batchcode": "024CZ1A", "histograms": [{"batchcodes": ["024CZ1A"], "histogram": {"Chills": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "COVID-19": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "024CZ1A", "histograms": [{"histogram": {"Chills": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "COVID-19": 1, "Inappropriate schedule of product administration": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["024CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024E21A.json b/docs/data/histograms/United States/024E21A.json
index a10e8714b43..ebf91a65bc1 100644
--- a/docs/data/histograms/United States/024E21A.json
+++ b/docs/data/histograms/United States/024E21A.json
@@ -1 +1 @@
-{"batchcode": "024E21A", "histograms": [{"batchcodes": ["024E21A"], "histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Lymphadenopathy": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "024E21A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Lymphadenopathy": 1, "Nausea": 1, "Neck pain": 1, "Pain in extremity": 1}, "batchcodes": ["024E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024H20A.json b/docs/data/histograms/United States/024H20A.json
index aa1c9b1684c..1cc613a7309 100644
--- a/docs/data/histograms/United States/024H20A.json
+++ b/docs/data/histograms/United States/024H20A.json
@@ -1 +1 @@
-{"batchcode": "024H20A", "histograms": [{"batchcodes": ["024H20A"], "histogram": {"Acne": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Muscle contractions involuntary": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Neuralgia": 1, "Vaccination site pain": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "024H20A", "histograms": [{"histogram": {"Acne": 1, "Fatigue": 1, "Lymphadenopathy": 1, "Muscle contractions involuntary": 1, "Musculoskeletal chest pain": 1, "Myalgia": 1, "Neuralgia": 1, "Vaccination site pain": 1, "Weight decreased": 1}, "batchcodes": ["024H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024H22A.json b/docs/data/histograms/United States/024H22A.json
index 778c22e34d8..1238b0a05e6 100644
--- a/docs/data/histograms/United States/024H22A.json
+++ b/docs/data/histograms/United States/024H22A.json
@@ -1 +1 @@
-{"batchcode": "024H22A", "histograms": [{"batchcodes": ["024H22A"], "histogram": {"No adverse event": 10, "Expired product administered": 9, "Vaccination site pruritus": 2, "Atrial fibrillation": 1, "COVID-19 immunisation": 1, "Condition aggravated": 1, "Cough": 1, "Dysgeusia": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Muscle spasms": 1, "Pain": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Skin mass": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "024H22A", "histograms": [{"histogram": {"No adverse event": 10, "Expired product administered": 9, "Vaccination site pruritus": 2, "Atrial fibrillation": 1, "COVID-19 immunisation": 1, "Condition aggravated": 1, "Cough": 1, "Dysgeusia": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Muscle spasms": 1, "Pain": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Skin mass": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Wrong product administered": 1}, "batchcodes": ["024H22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024J20A.json b/docs/data/histograms/United States/024J20A.json
index 3e8c062fa2d..b19be386c9a 100644
--- a/docs/data/histograms/United States/024J20A.json
+++ b/docs/data/histograms/United States/024J20A.json
@@ -1 +1 @@
-{"batchcode": "024J20A", "histograms": [{"batchcodes": ["024J20A"], "histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "024J20A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Headache": 1, "Myalgia": 1, "Vaccination site pain": 1}, "batchcodes": ["024J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024JQ0A.json b/docs/data/histograms/United States/024JQ0A.json
index be2eb3f3bd0..dd0ad99c4eb 100644
--- a/docs/data/histograms/United States/024JQ0A.json
+++ b/docs/data/histograms/United States/024JQ0A.json
@@ -1 +1 @@
-{"batchcode": "024JQ0A", "histograms": [{"batchcodes": ["024JQ0A"], "histogram": {"Maternal exposure during breast feeding": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "024JQ0A", "histograms": [{"histogram": {"Maternal exposure during breast feeding": 1, "Vaccination site erythema": 1, "Vaccination site inflammation": 1, "Vaccination site pruritus": 1}, "batchcodes": ["024JQ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024L204.json b/docs/data/histograms/United States/024L204.json
index 8217aec7ecb..140c21b9ab4 100644
--- a/docs/data/histograms/United States/024L204.json
+++ b/docs/data/histograms/United States/024L204.json
@@ -1 +1 @@
-{"batchcode": "024L204", "histograms": [{"batchcodes": ["024L204"], "histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Insomnia": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "024L204", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Hyperhidrosis": 1, "Injection site pain": 1, "Insomnia": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["024L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024L20A.json b/docs/data/histograms/United States/024L20A.json
index 2e2f61889e4..07deb650b18 100644
--- a/docs/data/histograms/United States/024L20A.json
+++ b/docs/data/histograms/United States/024L20A.json
@@ -1 +1 @@
-{"batchcode": "024L20A", "histograms": [{"batchcodes": ["024L20A"], "histogram": {"Pyrexia": 2, "Vaccination site pain": 2, "Chills": 1, "Ear disorder": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "024L20A", "histograms": [{"histogram": {"Pyrexia": 2, "Vaccination site pain": 2, "Chills": 1, "Ear disorder": 1, "Fatigue": 1, "Headache": 1, "Hypokinesia": 1, "Oropharyngeal discomfort": 1, "Paraesthesia": 1, "Tremor": 1}, "batchcodes": ["024L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024L26A.json b/docs/data/histograms/United States/024L26A.json
index b6ea81fea1b..94d7c05d53c 100644
--- a/docs/data/histograms/United States/024L26A.json
+++ b/docs/data/histograms/United States/024L26A.json
@@ -1 +1 @@
-{"batchcode": "024L26A", "histograms": [{"batchcodes": ["024L26A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "024L26A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["024L26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M020A.json b/docs/data/histograms/United States/024M020A.json
index 0f66a6dd0b8..3260099ae49 100644
--- a/docs/data/histograms/United States/024M020A.json
+++ b/docs/data/histograms/United States/024M020A.json
@@ -1 +1 @@
-{"batchcode": "024M020A", "histograms": [{"batchcodes": ["024M020A"], "histogram": {"Feeling cold": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "024M020A", "histograms": [{"histogram": {"Feeling cold": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["024M020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M02A.json b/docs/data/histograms/United States/024M02A.json
index 5d445094c8e..f6d12eb80f5 100644
--- a/docs/data/histograms/United States/024M02A.json
+++ b/docs/data/histograms/United States/024M02A.json
@@ -1 +1 @@
-{"batchcode": "024M02A", "histograms": [{"batchcodes": ["024M02A"], "histogram": {"Insomnia": 1, "Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "024M02A", "histograms": [{"histogram": {"Insomnia": 1, "Rash": 1, "Urticaria": 1}, "batchcodes": ["024M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M0A.json b/docs/data/histograms/United States/024M0A.json
index 73eb7dcf893..7352f09401e 100644
--- a/docs/data/histograms/United States/024M0A.json
+++ b/docs/data/histograms/United States/024M0A.json
@@ -1 +1 @@
-{"batchcode": "024M0A", "histograms": [{"batchcodes": ["024M0A"], "histogram": {"Adverse reaction": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Dizziness": 1, "Immune system disorder": 1, "Pruritus": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "024M0A", "histograms": [{"histogram": {"Adverse reaction": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Dizziness": 1, "Immune system disorder": 1, "Pruritus": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["024M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M20.json b/docs/data/histograms/United States/024M20.json
index adf9f479bf9..5e5499b969c 100644
--- a/docs/data/histograms/United States/024M20.json
+++ b/docs/data/histograms/United States/024M20.json
@@ -1 +1 @@
-{"batchcode": "024M20", "histograms": [{"batchcodes": ["024M20"], "histogram": {"Body temperature": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "024M20", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["024M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M204.json b/docs/data/histograms/United States/024M204.json
index 87e82132fb1..d1b347ab222 100644
--- a/docs/data/histograms/United States/024M204.json
+++ b/docs/data/histograms/United States/024M204.json
@@ -1 +1 @@
-{"batchcode": "024M204", "histograms": [{"batchcodes": ["024M204"], "histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "024M204", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "No adverse event": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1}, "batchcodes": ["024M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M207.json b/docs/data/histograms/United States/024M207.json
index 4ab6cf81edf..e8b7c76fbfa 100644
--- a/docs/data/histograms/United States/024M207.json
+++ b/docs/data/histograms/United States/024M207.json
@@ -1 +1 @@
-{"batchcode": "024M207", "histograms": [{"batchcodes": ["024M207"], "histogram": {"Erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "024M207", "histograms": [{"histogram": {"Erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["024M207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M208.json b/docs/data/histograms/United States/024M208.json
index 6ad654dbcde..34c658df9be 100644
--- a/docs/data/histograms/United States/024M208.json
+++ b/docs/data/histograms/United States/024M208.json
@@ -1 +1 @@
-{"batchcode": "024M208", "histograms": [{"batchcodes": ["024M208"], "histogram": {"Fatigue": 2, "Headache": 2, "Asthenia": 1, "Dysstasia": 1, "Heavy menstrual bleeding": 1, "Injection site pain": 1, "Injection site reaction": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Menstruation irregular": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "024M208", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 2, "Asthenia": 1, "Dysstasia": 1, "Heavy menstrual bleeding": 1, "Injection site pain": 1, "Injection site reaction": 1, "Joint swelling": 1, "Loss of personal independence in daily activities": 1, "Menstruation irregular": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1}, "batchcodes": ["024M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M20A /017B21.json b/docs/data/histograms/United States/024M20A /017B21.json
index 80cfaf7730e..1c58dfb1b70 100644
--- a/docs/data/histograms/United States/024M20A /017B21.json
+++ b/docs/data/histograms/United States/024M20A /017B21.json
@@ -1 +1 @@
-{"batchcode": "024M20A /017B21", "histograms": [{"batchcodes": ["024M20A /017B21"], "histogram": {"Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Lethargy": 1, "Myalgia": 1, "Pain of skin": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "024M20A /017B21", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Lethargy": 1, "Myalgia": 1, "Pain of skin": 1, "Pyrexia": 1}, "batchcodes": ["024M20A /017B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M20A OR 026M.json b/docs/data/histograms/United States/024M20A OR 026M.json
index e5ed1927f43..5028c1b525b 100644
--- a/docs/data/histograms/United States/024M20A OR 026M.json
+++ b/docs/data/histograms/United States/024M20A OR 026M.json
@@ -1 +1 @@
-{"batchcode": "024M20A OR 026M", "histograms": [{"batchcodes": ["024M20A OR 026M"], "histogram": {"Lip swelling": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "024M20A OR 026M", "histograms": [{"histogram": {"Lip swelling": 1, "Peripheral swelling": 1}, "batchcodes": ["024M20A OR 026M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M20A.json b/docs/data/histograms/United States/024M20A.json
index 5071c0a2eb5..40c1b5fcf55 100644
--- a/docs/data/histograms/United States/024M20A.json
+++ b/docs/data/histograms/United States/024M20A.json
@@ -1 +1 @@
-{"batchcode": "024M20A", "histograms": [{"batchcodes": ["024M20A"], "histogram": {"Headache": 113, "Pain in extremity": 110, "Fatigue": 107, "Chills": 97, "Pyrexia": 93, "Vaccination site pain": 84, "Myalgia": 72, "Nausea": 66, "Rash": 64, "Pain": 56, "Erythema": 44, "Pruritus": 44, "Vaccination site erythema": 43, "Dizziness": 42, "Feeling abnormal": 37, "Peripheral swelling": 36, "Arthralgia": 34, "Diarrhoea": 32, "Asthenia": 30, "Body temperature": 26, "Vaccination site pruritus": 26, "Vaccination site warmth": 23, "Vaccination site swelling": 22, "Vomiting": 22, "Dyspnoea": 21, "Feeling hot": 21, "Inappropriate schedule of product administration": 21, "COVID-19": 20, "Insomnia": 19, "Paraesthesia": 19, "Urticaria": 19, "Product dose omission issue": 17, "Injection site pain": 16, "SARS-CoV-2 test": 16, "Vaccination complication": 16, "Decreased appetite": 15, "Hypoaesthesia": 15, "Cough": 14, "Vaccination site rash": 14, "Blood pressure measurement": 13, "Burning sensation": 13, "Hyperhidrosis": 13, "Injection site erythema": 13, "Lethargy": 13, "Malaise": 13, "Oropharyngeal pain": 13, "Abdominal discomfort": 12, "Heart rate": 12, "Heart rate increased": 12, "Influenza like illness": 12, "Neck pain": 12, "Discomfort": 11, "Swelling": 11, "Gait disturbance": 10, "Illness": 10, "Lymphadenopathy": 10, "Tremor": 10, "Abdominal pain upper": 9, "Back pain": 9, "Expired product administered": 9, "Herpes zoster": 9, "Pregnancy test": 9, "Rash erythematous": 8, "Somnolence": 8, "Tenderness": 8, "Vaccination site reaction": 8, "Exposure during pregnancy": 7, "Feeling cold": 7, "Flushing": 7, "Injection site swelling": 7, "Limb discomfort": 7, "Muscle spasms": 7, "Musculoskeletal stiffness": 7, "Palpitations": 7, "Rash pruritic": 7, "Tachycardia": 7, "Tinnitus": 7, "Vaccination site mass": 7, "Vision blurred": 7, "Ageusia": 6, "Blood test": 6, "Computerised tomogram": 6, "Contusion": 6, "Feeding disorder": 6, "Head discomfort": 6, "Hot flush": 6, "Injection site pruritus": 6, "Maternal exposure during pregnancy": 6, "Migraine": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Nasal congestion": 6, "Night sweats": 6, "Rash macular": 6, "Swelling face": 6, "Blood pressure increased": 5, "Confusional state": 5, "Electrocardiogram": 5, "Hypersensitivity": 5, "Injection site warmth": 5, "Lip swelling": 5, "Mass": 5, "Retching": 5, "Accidental overdose": 4, "Aura": 4, "Bell's palsy": 4, "Biopsy": 4, "Chest pain": 4, "Condition aggravated": 4, "Eye pain": 4, "Hypersomnia": 4, "Injection site rash": 4, "Neuropathy peripheral": 4, "Rhinorrhoea": 4, "SARS-CoV-2 test positive": 4, "Skin burning sensation": 4, "Sluggishness": 4, "Urinary tract infection": 4, "Vaccination site induration": 4, "Vaccination site movement impairment": 4, "Vertigo": 4, "Weight decreased": 4, "Acne": 3, "Anxiety": 3, "Axillary pain": 3, "Blister": 3, "Breast swelling": 3, "Death": 3, "Disorientation": 3, "Disturbance in attention": 3, "Dry mouth": 3, "Dysgeusia": 3, "Dysstasia": 3, "Fall": 3, "Gait inability": 3, "Hypertension": 3, "Hypotension": 3, "Impaired work ability": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Memory impairment": 3, "Nasopharyngitis": 3, "Neck mass": 3, "Neuralgia": 3, "Pain of skin": 3, "Periarthritis": 3, "Pharyngeal swelling": 3, "Product administration error": 3, "Product storage error": 3, "SARS-CoV-2 antibody test": 3, "Sleep disorder": 3, "Sneezing": 3, "Throat irritation": 3, "Vaccination site bruising": 3, "Vaccination site discolouration": 3, "Wheezing": 3, "Anosmia": 2, "Arrhythmia": 2, "Arthritis": 2, "Autoimmune disorder": 2, "Balance disorder": 2, "Bedridden": 2, "Bone pain": 2, "Bowel movement irregularity": 2, "Cellulitis": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chromatopsia": 2, "Chromaturia": 2, "Cognitive disorder": 2, "Cold sweat": 2, "Colonoscopy": 2, "Dehydration": 2, "Depressed mood": 2, "Device connection issue": 2, "Drug ineffective": 2, "Dry throat": 2, "Dyskinesia": 2, "Ear discomfort": 2, "Epistaxis": 2, "Extra dose administered": 2, "Eye pruritus": 2, "Facial discomfort": 2, "Facial pain": 2, "Gastrointestinal pain": 2, "Haematocrit": 2, "Hypoacusis": 2, "Hypogeusia": 2, "Hypokinesia": 2, "Incorrect dose administered": 2, "Inflammation": 2, "Injection site bruising": 2, "Injection site discomfort": 2, "Joint swelling": 2, "Mammogram": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Nasal crusting": 2, "Nervousness": 2, "No adverse event": 2, "Nodule": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Pancreatitis acute": 2, "Paraesthesia oral": 2, "Photophobia": 2, "Pneumonia": 2, "Presyncope": 2, "Product temperature excursion issue": 2, "Scar": 2, "Sinusitis": 2, "Skin warm": 2, "Systemic lupus erythematosus": 2, "Therapeutic response unexpected": 2, "Thinking abnormal": 2, "Throat tightness": 2, "Thrombosis": 2, "Type IV hypersensitivity reaction": 2, "Ultrasound scan": 2, "Underdose": 2, "Vaccination site discomfort": 2, "Vaccination site haemorrhage": 2, "Vaccination site lymphadenopathy": 2, "Visual impairment": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abscess limb": 1, "Administration site inflammation": 1, "Adverse drug reaction": 1, "Allergy test": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Antibody test": 1, "Antibody test negative": 1, "Aphasia": 1, "Asthenopia": 1, "Asthma": 1, "Bed rest": 1, "Binocular eye movement disorder": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Body temperature abnormal": 1, "Body temperature fluctuation": 1, "Body temperature increased": 1, "Breast discharge": 1, "Breast feeding": 1, "Breast pain": 1, "Butterfly rash": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure congestive": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Chronic pigmented purpura": 1, "Colitis": 1, "Computerised tomogram head": 1, "Coronavirus test positive": 1, "Crying": 1, "Cystitis": 1, "Dark circles under eyes": 1, "Deafness neurosensory": 1, "Delirium": 1, "Dermatitis": 1, "Diarrhoea haemorrhagic": 1, "Diverticulum": 1, "Dysarthria": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear infection": 1, "Ear pain": 1, "Ear swelling": 1, "Endoscopy": 1, "Endoscopy small intestine": 1, "Erectile dysfunction": 1, "Excessive cerumen production": 1, "Exocrine pancreatic function test": 1, "Extraskeletal ossification": 1, "Eye haemorrhage": 1, "Eye swelling": 1, "Faeces soft": 1, "Fear": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Foot fracture": 1, "Formication": 1, "Functional gastrointestinal disorder": 1, "Furuncle": 1, "Gastric disorder": 1, "Gene sequencing": 1, "Glaucoma": 1, "Glucose tolerance test": 1, "Growth of eyelashes": 1, "HIV test": 1, "Haematochezia": 1, "Haemorrhage urinary tract": 1, "Haemorrhoids": 1, "Hallucination": 1, "Hangover": 1, "Heart rate abnormal": 1, "Hospitalisation": 1, "Hypoaesthesia oral": 1, "Immune system disorder": 1, "Impaired quality of life": 1, "Incoherent": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Injection site irritation": 1, "Injection site mass": 1, "Injection site nodule": 1, "Intentional product use issue": 1, "Intestinal obstruction": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Lacrimation increased": 1, "Left atrial enlargement": 1, "Lichen planus": 1, "Limb operation": 1, "Lip dry": 1, "Lipase": 1, "Liver disorder": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Low density lipoprotein": 1, "Lower limb fracture": 1, "Magnesium deficiency": 1, "Magnetic resonance imaging": 1, "Maternal exposure during breast feeding": 1, "Medication error": 1, "Meniere's disease": 1, "Mental fatigue": 1, "Middle insomnia": 1, "Migraine with aura": 1, "Movement disorder": 1, "Multisystem inflammatory syndrome": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle strain": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Myositis": 1, "Nephrolithiasis": 1, "Neurological symptom": 1, "Ocular hyperaemia": 1, "Odynophagia": 1, "Oesophageal discomfort": 1, "Oesophageal disorder": 1, "Off label use": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Overdose": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pancreatic failure": 1, "Paraesthesia ear": 1, "Paraesthesia mucosal": 1, "Penile haemorrhage": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Personality disorder": 1, "Pigmentation disorder": 1, "Positron emission tomogram": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Productive cough": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulmonary pain": 1, "Pulmonary thrombosis": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Reading disorder": 1, "Renal failure": 1, "Respiratory rate": 1, "Respiratory tract infection": 1, "Rheumatoid arthritis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test negative": 1, "Scan": 1, "Scratch": 1, "Secretion discharge": 1, "Seizure": 1, "Sensory disturbance": 1, "Sepsis": 1, "Shoulder injury related to vaccine administration": 1, "Sinus disorder": 1, "Sinus pain": 1, "Skin bacterial infection": 1, "Skin discolouration": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin papilloma": 1, "Skin reaction": 1, "Skin swelling": 1, "Spinal pain": 1, "Supraventricular tachycardia": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Syncope": 1, "T-lymphocyte count": 1, "Tachypnoea": 1, "Taste disorder": 1, "Therapeutic product ineffective": 1, "Thermal burn": 1, "Tongue erythema": 1, "Tunnel vision": 1, "Ulcer": 1, "Ultrasound scan normal": 1, "Urinary retention": 1, "Urinary tract obstruction": 1, "Urine analysis": 1, "Vaccination site discharge": 1, "Vaccination site laceration": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vascular pain": 1, "Vitamin B12": 1, "Vitreous detachment": 1, "Vitreous floaters": 1, "Vomiting projectile": 1, "Weight increased": 1, "White blood cell count": 1, "Wound haemorrhage": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "024M20A", "histograms": [{"histogram": {"Headache": 113, "Pain in extremity": 110, "Fatigue": 107, "Chills": 97, "Pyrexia": 93, "Vaccination site pain": 84, "Myalgia": 72, "Nausea": 66, "Rash": 64, "Pain": 56, "Erythema": 44, "Pruritus": 44, "Vaccination site erythema": 43, "Dizziness": 42, "Feeling abnormal": 37, "Peripheral swelling": 36, "Arthralgia": 34, "Diarrhoea": 32, "Asthenia": 30, "Body temperature": 26, "Vaccination site pruritus": 26, "Vaccination site warmth": 23, "Vaccination site swelling": 22, "Vomiting": 22, "Dyspnoea": 21, "Feeling hot": 21, "Inappropriate schedule of product administration": 21, "COVID-19": 20, "Insomnia": 19, "Paraesthesia": 19, "Urticaria": 19, "Product dose omission issue": 17, "Injection site pain": 16, "SARS-CoV-2 test": 16, "Vaccination complication": 16, "Decreased appetite": 15, "Hypoaesthesia": 15, "Cough": 14, "Vaccination site rash": 14, "Blood pressure measurement": 13, "Burning sensation": 13, "Hyperhidrosis": 13, "Injection site erythema": 13, "Lethargy": 13, "Malaise": 13, "Oropharyngeal pain": 13, "Abdominal discomfort": 12, "Heart rate": 12, "Heart rate increased": 12, "Influenza like illness": 12, "Neck pain": 12, "Discomfort": 11, "Swelling": 11, "Gait disturbance": 10, "Illness": 10, "Lymphadenopathy": 10, "Tremor": 10, "Abdominal pain upper": 9, "Back pain": 9, "Expired product administered": 9, "Herpes zoster": 9, "Pregnancy test": 9, "Rash erythematous": 8, "Somnolence": 8, "Tenderness": 8, "Vaccination site reaction": 8, "Exposure during pregnancy": 7, "Feeling cold": 7, "Flushing": 7, "Injection site swelling": 7, "Limb discomfort": 7, "Muscle spasms": 7, "Musculoskeletal stiffness": 7, "Palpitations": 7, "Rash pruritic": 7, "Tachycardia": 7, "Tinnitus": 7, "Vaccination site mass": 7, "Vision blurred": 7, "Ageusia": 6, "Blood test": 6, "Computerised tomogram": 6, "Contusion": 6, "Feeding disorder": 6, "Head discomfort": 6, "Hot flush": 6, "Injection site pruritus": 6, "Maternal exposure during pregnancy": 6, "Migraine": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Nasal congestion": 6, "Night sweats": 6, "Rash macular": 6, "Swelling face": 6, "Blood pressure increased": 5, "Confusional state": 5, "Electrocardiogram": 5, "Hypersensitivity": 5, "Injection site warmth": 5, "Lip swelling": 5, "Mass": 5, "Retching": 5, "Accidental overdose": 4, "Aura": 4, "Bell's palsy": 4, "Biopsy": 4, "Chest pain": 4, "Condition aggravated": 4, "Eye pain": 4, "Hypersomnia": 4, "Injection site rash": 4, "Neuropathy peripheral": 4, "Rhinorrhoea": 4, "SARS-CoV-2 test positive": 4, "Skin burning sensation": 4, "Sluggishness": 4, "Urinary tract infection": 4, "Vaccination site induration": 4, "Vaccination site movement impairment": 4, "Vertigo": 4, "Weight decreased": 4, "Acne": 3, "Anxiety": 3, "Axillary pain": 3, "Blister": 3, "Breast swelling": 3, "Death": 3, "Disorientation": 3, "Disturbance in attention": 3, "Dry mouth": 3, "Dysgeusia": 3, "Dysstasia": 3, "Fall": 3, "Gait inability": 3, "Hypertension": 3, "Hypotension": 3, "Impaired work ability": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Memory impairment": 3, "Nasopharyngitis": 3, "Neck mass": 3, "Neuralgia": 3, "Pain of skin": 3, "Periarthritis": 3, "Pharyngeal swelling": 3, "Product administration error": 3, "Product storage error": 3, "SARS-CoV-2 antibody test": 3, "Sleep disorder": 3, "Sneezing": 3, "Throat irritation": 3, "Vaccination site bruising": 3, "Vaccination site discolouration": 3, "Wheezing": 3, "Anosmia": 2, "Arrhythmia": 2, "Arthritis": 2, "Autoimmune disorder": 2, "Balance disorder": 2, "Bedridden": 2, "Bone pain": 2, "Bowel movement irregularity": 2, "Cellulitis": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chromatopsia": 2, "Chromaturia": 2, "Cognitive disorder": 2, "Cold sweat": 2, "Colonoscopy": 2, "Dehydration": 2, "Depressed mood": 2, "Device connection issue": 2, "Drug ineffective": 2, "Dry throat": 2, "Dyskinesia": 2, "Ear discomfort": 2, "Epistaxis": 2, "Extra dose administered": 2, "Eye pruritus": 2, "Facial discomfort": 2, "Facial pain": 2, "Gastrointestinal pain": 2, "Haematocrit": 2, "Hypoacusis": 2, "Hypogeusia": 2, "Hypokinesia": 2, "Incorrect dose administered": 2, "Inflammation": 2, "Injection site bruising": 2, "Injection site discomfort": 2, "Joint swelling": 2, "Mammogram": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Nasal crusting": 2, "Nervousness": 2, "No adverse event": 2, "Nodule": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Pancreatitis acute": 2, "Paraesthesia oral": 2, "Photophobia": 2, "Pneumonia": 2, "Presyncope": 2, "Product temperature excursion issue": 2, "Scar": 2, "Sinusitis": 2, "Skin warm": 2, "Systemic lupus erythematosus": 2, "Therapeutic response unexpected": 2, "Thinking abnormal": 2, "Throat tightness": 2, "Thrombosis": 2, "Type IV hypersensitivity reaction": 2, "Ultrasound scan": 2, "Underdose": 2, "Vaccination site discomfort": 2, "Vaccination site haemorrhage": 2, "Vaccination site lymphadenopathy": 2, "Visual impairment": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abscess limb": 1, "Administration site inflammation": 1, "Adverse drug reaction": 1, "Allergy test": 1, "Amnesia": 1, "Anaphylactic reaction": 1, "Antibody test": 1, "Antibody test negative": 1, "Aphasia": 1, "Asthenopia": 1, "Asthma": 1, "Bed rest": 1, "Binocular eye movement disorder": 1, "Blood cholesterol": 1, "Blood cholesterol increased": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood pressure decreased": 1, "Body temperature abnormal": 1, "Body temperature fluctuation": 1, "Body temperature increased": 1, "Breast discharge": 1, "Breast feeding": 1, "Breast pain": 1, "Butterfly rash": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure congestive": 1, "Cerebral haemorrhage": 1, "Cerebrovascular accident": 1, "Chronic pigmented purpura": 1, "Colitis": 1, "Computerised tomogram head": 1, "Coronavirus test positive": 1, "Crying": 1, "Cystitis": 1, "Dark circles under eyes": 1, "Deafness neurosensory": 1, "Delirium": 1, "Dermatitis": 1, "Diarrhoea haemorrhagic": 1, "Diverticulum": 1, "Dysarthria": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear infection": 1, "Ear pain": 1, "Ear swelling": 1, "Endoscopy": 1, "Endoscopy small intestine": 1, "Erectile dysfunction": 1, "Excessive cerumen production": 1, "Exocrine pancreatic function test": 1, "Extraskeletal ossification": 1, "Eye haemorrhage": 1, "Eye swelling": 1, "Faeces soft": 1, "Fear": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Foot fracture": 1, "Formication": 1, "Functional gastrointestinal disorder": 1, "Furuncle": 1, "Gastric disorder": 1, "Gene sequencing": 1, "Glaucoma": 1, "Glucose tolerance test": 1, "Growth of eyelashes": 1, "HIV test": 1, "Haematochezia": 1, "Haemorrhage urinary tract": 1, "Haemorrhoids": 1, "Hallucination": 1, "Hangover": 1, "Heart rate abnormal": 1, "Hospitalisation": 1, "Hypoaesthesia oral": 1, "Immune system disorder": 1, "Impaired quality of life": 1, "Incoherent": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Injected limb mobility decreased": 1, "Injection site hypoaesthesia": 1, "Injection site irritation": 1, "Injection site mass": 1, "Injection site nodule": 1, "Intentional product use issue": 1, "Intestinal obstruction": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Lacrimation increased": 1, "Left atrial enlargement": 1, "Lichen planus": 1, "Limb operation": 1, "Lip dry": 1, "Lipase": 1, "Liver disorder": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Low density lipoprotein": 1, "Lower limb fracture": 1, "Magnesium deficiency": 1, "Magnetic resonance imaging": 1, "Maternal exposure during breast feeding": 1, "Medication error": 1, "Meniere's disease": 1, "Mental fatigue": 1, "Middle insomnia": 1, "Migraine with aura": 1, "Movement disorder": 1, "Multisystem inflammatory syndrome": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle strain": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Myositis": 1, "Nephrolithiasis": 1, "Neurological symptom": 1, "Ocular hyperaemia": 1, "Odynophagia": 1, "Oesophageal discomfort": 1, "Oesophageal disorder": 1, "Off label use": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Overdose": 1, "Oxygen saturation": 1, "Pain assessment": 1, "Pancreatic failure": 1, "Paraesthesia ear": 1, "Paraesthesia mucosal": 1, "Penile haemorrhage": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Peripheral venous disease": 1, "Personality disorder": 1, "Pigmentation disorder": 1, "Positron emission tomogram": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Productive cough": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pulmonary pain": 1, "Pulmonary thrombosis": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Reading disorder": 1, "Renal failure": 1, "Respiratory rate": 1, "Respiratory tract infection": 1, "Rheumatoid arthritis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test negative": 1, "Scan": 1, "Scratch": 1, "Secretion discharge": 1, "Seizure": 1, "Sensory disturbance": 1, "Sepsis": 1, "Shoulder injury related to vaccine administration": 1, "Sinus disorder": 1, "Sinus pain": 1, "Skin bacterial infection": 1, "Skin discolouration": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin papilloma": 1, "Skin reaction": 1, "Skin swelling": 1, "Spinal pain": 1, "Supraventricular tachycardia": 1, "Swelling of eyelid": 1, "Swollen tongue": 1, "Syncope": 1, "T-lymphocyte count": 1, "Tachypnoea": 1, "Taste disorder": 1, "Therapeutic product ineffective": 1, "Thermal burn": 1, "Tongue erythema": 1, "Tunnel vision": 1, "Ulcer": 1, "Ultrasound scan normal": 1, "Urinary retention": 1, "Urinary tract obstruction": 1, "Urine analysis": 1, "Vaccination site discharge": 1, "Vaccination site laceration": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vascular pain": 1, "Vitamin B12": 1, "Vitreous detachment": 1, "Vitreous floaters": 1, "Vomiting projectile": 1, "Weight increased": 1, "White blood cell count": 1, "Wound haemorrhage": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["024M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M20A024M20A.json b/docs/data/histograms/United States/024M20A024M20A.json
index 8516e2a8d37..61e5c5cb2fd 100644
--- a/docs/data/histograms/United States/024M20A024M20A.json
+++ b/docs/data/histograms/United States/024M20A024M20A.json
@@ -1 +1 @@
-{"batchcode": "024M20A024M20A", "histograms": [{"batchcodes": ["024M20A024M20A"], "histogram": {"Blood glucose increased": 1, "Chills": 1, "Headache": 1, "Heart rate increased": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "024M20A024M20A", "histograms": [{"histogram": {"Blood glucose increased": 1, "Chills": 1, "Headache": 1, "Heart rate increased": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["024M20A024M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M20N.json b/docs/data/histograms/United States/024M20N.json
index 455fc0ff714..749087d5ddb 100644
--- a/docs/data/histograms/United States/024M20N.json
+++ b/docs/data/histograms/United States/024M20N.json
@@ -1 +1 @@
-{"batchcode": "024M20N", "histograms": [{"batchcodes": ["024M20N"], "histogram": {"Chills": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Nasopharyngitis": 1, "Oral herpes": 1, "Pain in extremity": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "024M20N", "histograms": [{"histogram": {"Chills": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Nasopharyngitis": 1, "Oral herpes": 1, "Pain in extremity": 1, "Tremor": 1}, "batchcodes": ["024M20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M21A.json b/docs/data/histograms/United States/024M21A.json
index 3dc3b4b49fc..1d4de66feaf 100644
--- a/docs/data/histograms/United States/024M21A.json
+++ b/docs/data/histograms/United States/024M21A.json
@@ -1 +1 @@
-{"batchcode": "024M21A", "histograms": [{"batchcodes": ["024M21A"], "histogram": {"Aphasia": 1, "Blood cholesterol": 1, "Cardiac flutter": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Feeling abnormal": 1, "Hypophagia": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "024M21A", "histograms": [{"histogram": {"Aphasia": 1, "Blood cholesterol": 1, "Cardiac flutter": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Feeling abnormal": 1, "Hypophagia": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1}, "batchcodes": ["024M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M2OA.json b/docs/data/histograms/United States/024M2OA.json
index 0faf059e11d..a5ff88c3266 100644
--- a/docs/data/histograms/United States/024M2OA.json
+++ b/docs/data/histograms/United States/024M2OA.json
@@ -1 +1 @@
-{"batchcode": "024M2OA", "histograms": [{"batchcodes": ["024M2OA"], "histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Limb discomfort": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "024M2OA", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Limb discomfort": 1, "Vaccination site swelling": 1}, "batchcodes": ["024M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024M30A.json b/docs/data/histograms/United States/024M30A.json
index 8c6815610fa..3c880bb630a 100644
--- a/docs/data/histograms/United States/024M30A.json
+++ b/docs/data/histograms/United States/024M30A.json
@@ -1 +1 @@
-{"batchcode": "024M30A", "histograms": [{"batchcodes": ["024M30A"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "024M30A", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["024M30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024MZ0A.json b/docs/data/histograms/United States/024MZ0A.json
index 7a20f6f5398..d6974f8f009 100644
--- a/docs/data/histograms/United States/024MZ0A.json
+++ b/docs/data/histograms/United States/024MZ0A.json
@@ -1 +1 @@
-{"batchcode": "024MZ0A", "histograms": [{"batchcodes": ["024MZ0A"], "histogram": {"Fatigue": 2, "Myalgia": 2, "Accidental overdose": 1, "Chills": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "024MZ0A", "histograms": [{"histogram": {"Fatigue": 2, "Myalgia": 2, "Accidental overdose": 1, "Chills": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["024MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024MZCA.json b/docs/data/histograms/United States/024MZCA.json
index a5efc3ed73c..afad568d6a8 100644
--- a/docs/data/histograms/United States/024MZCA.json
+++ b/docs/data/histograms/United States/024MZCA.json
@@ -1 +1 @@
-{"batchcode": "024MZCA", "histograms": [{"batchcodes": ["024MZCA"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Myalgia": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "024MZCA", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Headache": 1, "Myalgia": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1}, "batchcodes": ["024MZCA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024MZOA.json b/docs/data/histograms/United States/024MZOA.json
index c54d246473a..2f4d211ba54 100644
--- a/docs/data/histograms/United States/024MZOA.json
+++ b/docs/data/histograms/United States/024MZOA.json
@@ -1 +1 @@
-{"batchcode": "024MZOA", "histograms": [{"batchcodes": ["024MZOA"], "histogram": {"Pyrexia": 2, "COVID-19": 1, "Chest discomfort": 1, "Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1, "Vaccination site dysaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "024MZOA", "histograms": [{"histogram": {"Pyrexia": 2, "COVID-19": 1, "Chest discomfort": 1, "Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Myocarditis": 1, "SARS-CoV-2 test": 1, "Vaccination site dysaesthesia": 1}, "batchcodes": ["024MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024N20A.json b/docs/data/histograms/United States/024N20A.json
index d737dd40f57..90794ddf3b0 100644
--- a/docs/data/histograms/United States/024N20A.json
+++ b/docs/data/histograms/United States/024N20A.json
@@ -1 +1 @@
-{"batchcode": "024N20A", "histograms": [{"batchcodes": ["024N20A"], "histogram": {"Headache": 3, "Myalgia": 3, "Adverse event": 2, "Ageusia": 2, "Arthralgia": 2, "Arthritis": 2, "Diarrhoea": 2, "Fatigue": 2, "Feeling abnormal": 2, "Feeling cold": 2, "Hypokinesia": 2, "Joint swelling": 2, "Malaise": 2, "Aphonia": 1, "Bedridden": 1, "Blood test": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Liver function test": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Tremor": 1, "Urticaria": 1, "Vaccination complication": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "024N20A", "histograms": [{"histogram": {"Headache": 3, "Myalgia": 3, "Adverse event": 2, "Ageusia": 2, "Arthralgia": 2, "Arthritis": 2, "Diarrhoea": 2, "Fatigue": 2, "Feeling abnormal": 2, "Feeling cold": 2, "Hypokinesia": 2, "Joint swelling": 2, "Malaise": 2, "Aphonia": 1, "Bedridden": 1, "Blood test": 1, "Body temperature": 1, "Body temperature increased": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Liver function test": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Tremor": 1, "Urticaria": 1, "Vaccination complication": 1, "Visual impairment": 1}, "batchcodes": ["024N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/024W20A.json b/docs/data/histograms/United States/024W20A.json
index 4260da0becf..102f7414370 100644
--- a/docs/data/histograms/United States/024W20A.json
+++ b/docs/data/histograms/United States/024W20A.json
@@ -1 +1 @@
-{"batchcode": "024W20A", "histograms": [{"batchcodes": ["024W20A"], "histogram": {"Blood pressure measurement": 1, "Headache": 1, "Oxygen saturation": 1}}]}
\ No newline at end of file
+{"batchcode": "024W20A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Headache": 1, "Oxygen saturation": 1}, "batchcodes": ["024W20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025-520A.json b/docs/data/histograms/United States/025-520A.json
index 2e2a20b0634..56caf7442cb 100644
--- a/docs/data/histograms/United States/025-520A.json
+++ b/docs/data/histograms/United States/025-520A.json
@@ -1 +1 @@
-{"batchcode": "025-520A", "histograms": [{"batchcodes": ["025-520A"], "histogram": {"Dysgeusia": 1, "Lip swelling": 1, "Pruritus": 1, "Swelling": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "025-520A", "histograms": [{"histogram": {"Dysgeusia": 1, "Lip swelling": 1, "Pruritus": 1, "Swelling": 1, "Visual impairment": 1}, "batchcodes": ["025-520A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025-J20-2A.json b/docs/data/histograms/United States/025-J20-2A.json
index 02c59d4a9b1..a085782ec35 100644
--- a/docs/data/histograms/United States/025-J20-2A.json
+++ b/docs/data/histograms/United States/025-J20-2A.json
@@ -1 +1 @@
-{"batchcode": "025-J20-2A", "histograms": [{"batchcodes": ["025-J20-2A"], "histogram": {"COVID-19": 1, "Incomplete course of vaccination": 1, "SARS-CoV-2 test": 1, "Thyrotoxic crisis": 1}}]}
\ No newline at end of file
+{"batchcode": "025-J20-2A", "histograms": [{"histogram": {"COVID-19": 1, "Incomplete course of vaccination": 1, "SARS-CoV-2 test": 1, "Thyrotoxic crisis": 1}, "batchcodes": ["025-J20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025-J202A.json b/docs/data/histograms/United States/025-J202A.json
index 05aa16502fe..1c6822f990e 100644
--- a/docs/data/histograms/United States/025-J202A.json
+++ b/docs/data/histograms/United States/025-J202A.json
@@ -1 +1 @@
-{"batchcode": "025-J202A", "histograms": [{"batchcodes": ["025-J202A"], "histogram": {"Ageusia": 1, "Fatigue": 1, "Headache": 1, "Hypogeusia": 1, "Pyrexia": 1, "Upper-airway cough syndrome": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025-J202A", "histograms": [{"histogram": {"Ageusia": 1, "Fatigue": 1, "Headache": 1, "Hypogeusia": 1, "Pyrexia": 1, "Upper-airway cough syndrome": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["025-J202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025-J20A.json b/docs/data/histograms/United States/025-J20A.json
index e4c0291fb73..6d6d10fb572 100644
--- a/docs/data/histograms/United States/025-J20A.json
+++ b/docs/data/histograms/United States/025-J20A.json
@@ -1 +1 @@
-{"batchcode": "025-J20A", "histograms": [{"batchcodes": ["025-J20A"], "histogram": {"Injection site erythema": 1, "Injection site induration": 1, "Injection site pain": 1, "Injection site rash": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025-J20A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site induration": 1, "Injection site pain": 1, "Injection site rash": 1, "Peripheral swelling": 1}, "batchcodes": ["025-J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025002X.json b/docs/data/histograms/United States/025002X.json
index a7b75d66acd..720ee87964f 100644
--- a/docs/data/histograms/United States/025002X.json
+++ b/docs/data/histograms/United States/025002X.json
@@ -1 +1 @@
-{"batchcode": "025002X", "histograms": [{"batchcodes": ["025002X"], "histogram": {"Blood glucose increased": 1}}]}
\ No newline at end of file
+{"batchcode": "025002X", "histograms": [{"histogram": {"Blood glucose increased": 1}, "batchcodes": ["025002X"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025020A.json b/docs/data/histograms/United States/025020A.json
index 515b36c3ded..a504907a4d9 100644
--- a/docs/data/histograms/United States/025020A.json
+++ b/docs/data/histograms/United States/025020A.json
@@ -1 +1 @@
-{"batchcode": "025020A", "histograms": [{"batchcodes": ["025020A"], "histogram": {"Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Limb discomfort": 1, "Nausea": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Tremor": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "025020A", "histograms": [{"histogram": {"Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Limb discomfort": 1, "Nausea": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Tremor": 1, "Vaccination complication": 1}, "batchcodes": ["025020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025021.json b/docs/data/histograms/United States/025021.json
index 272830d62a3..68c63d6bcba 100644
--- a/docs/data/histograms/United States/025021.json
+++ b/docs/data/histograms/United States/025021.json
@@ -1 +1 @@
-{"batchcode": "025021", "histograms": [{"batchcodes": ["025021"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "025021", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["025021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0250L20A.json b/docs/data/histograms/United States/0250L20A.json
index c1e470e5666..3fd06580320 100644
--- a/docs/data/histograms/United States/0250L20A.json
+++ b/docs/data/histograms/United States/0250L20A.json
@@ -1 +1 @@
-{"batchcode": "0250L20A", "histograms": [{"batchcodes": ["0250L20A"], "histogram": {"Exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "0250L20A", "histograms": [{"histogram": {"Exposure during pregnancy": 1}, "batchcodes": ["0250L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251(L)20A.json b/docs/data/histograms/United States/0251(L)20A.json
index c79bd89ed5b..7de6db9d80d 100644
--- a/docs/data/histograms/United States/0251(L)20A.json
+++ b/docs/data/histograms/United States/0251(L)20A.json
@@ -1 +1 @@
-{"batchcode": "0251(L)20A", "histograms": [{"batchcodes": ["0251(L)20A"], "histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Illness": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0251(L)20A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Hypertension": 1, "Illness": 1, "Myalgia": 1, "Nausea": 1, "Palpitations": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["0251(L)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251-70A.json b/docs/data/histograms/United States/0251-70A.json
index ae615bf3a50..bc0f279c98e 100644
--- a/docs/data/histograms/United States/0251-70A.json
+++ b/docs/data/histograms/United States/0251-70A.json
@@ -1 +1 @@
-{"batchcode": "0251-70A", "histograms": [{"batchcodes": ["0251-70A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0251-70A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0251-70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251.20A.json b/docs/data/histograms/United States/0251.20A.json
index a0c37a78543..7defb0de7f5 100644
--- a/docs/data/histograms/United States/0251.20A.json
+++ b/docs/data/histograms/United States/0251.20A.json
@@ -1 +1 @@
-{"batchcode": "0251.20A", "histograms": [{"batchcodes": ["0251.20A"], "histogram": {"Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0251.20A", "histograms": [{"histogram": {"Vaccination site rash": 1}, "batchcodes": ["0251.20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025120-2A.json b/docs/data/histograms/United States/025120-2A.json
index 97dc2df145a..d5c5b1f1d5a 100644
--- a/docs/data/histograms/United States/025120-2A.json
+++ b/docs/data/histograms/United States/025120-2A.json
@@ -1 +1 @@
-{"batchcode": "025120-2A", "histograms": [{"batchcodes": ["025120-2A"], "histogram": {"Fatigue": 5, "Pyrexia": 5, "Vaccination site pain": 4, "Body temperature": 3, "Vaccination site erythema": 3, "Asthenia": 2, "COVID-19": 2, "Feeling hot": 2, "Inappropriate schedule of product administration": 2, "Myalgia": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Arthralgia": 1, "Back pain": 1, "Bedridden": 1, "Chills": 1, "Cough": 1, "Exposure to toxic agent": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersomnia": 1, "Illness": 1, "Immunosuppression": 1, "Injection site induration": 1, "Ligament rupture": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Meniscus injury": 1, "Mobility decreased": 1, "Oropharyngeal pain": 1, "Psoriasis": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Skin exfoliation": 1, "Therapeutic response shortened": 1, "Vaccination complication": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "025120-2A", "histograms": [{"histogram": {"Fatigue": 5, "Pyrexia": 5, "Vaccination site pain": 4, "Body temperature": 3, "Vaccination site erythema": 3, "Asthenia": 2, "COVID-19": 2, "Feeling hot": 2, "Inappropriate schedule of product administration": 2, "Myalgia": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Arthralgia": 1, "Back pain": 1, "Bedridden": 1, "Chills": 1, "Cough": 1, "Exposure to toxic agent": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersomnia": 1, "Illness": 1, "Immunosuppression": 1, "Injection site induration": 1, "Ligament rupture": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Meniscus injury": 1, "Mobility decreased": 1, "Oropharyngeal pain": 1, "Psoriasis": 1, "Rash": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1, "Skin exfoliation": 1, "Therapeutic response shortened": 1, "Vaccination complication": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site urticaria": 1, "X-ray": 1}, "batchcodes": ["025120-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251202A.json b/docs/data/histograms/United States/0251202A.json
index 53ee5e83e6a..fdedb00ac8c 100644
--- a/docs/data/histograms/United States/0251202A.json
+++ b/docs/data/histograms/United States/0251202A.json
@@ -1 +1 @@
-{"batchcode": "0251202A", "histograms": [{"batchcodes": ["0251202A"], "histogram": {"Blood pressure measurement": 2, "Erythema": 2, "Myalgia": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Chills": 1, "Computerised tomogram head": 1, "Fatigue": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Laboratory test": 1, "Nasal congestion": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0251202A", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Erythema": 2, "Myalgia": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Blood pressure fluctuation": 1, "Chills": 1, "Computerised tomogram head": 1, "Fatigue": 1, "Glycosylated haemoglobin": 1, "Haematochezia": 1, "Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Laboratory test": 1, "Nasal congestion": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["0251202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025120A.json b/docs/data/histograms/United States/025120A.json
index 53571b3821d..1a50849f360 100644
--- a/docs/data/histograms/United States/025120A.json
+++ b/docs/data/histograms/United States/025120A.json
@@ -1 +1 @@
-{"batchcode": "025120A", "histograms": [{"batchcodes": ["025120A"], "histogram": {"Pyrexia": 3, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Myalgia": 2, "Nausea": 2, "Pain in extremity": 2, "Asthenia": 1, "Body temperature": 1, "Chest discomfort": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Illness": 1, "Injection site pain": 1, "Insomnia": 1, "Limb discomfort": 1, "Malaise": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Neuralgia": 1, "Ocular discomfort": 1, "Off label use": 1, "Pain": 1, "Pharyngeal swelling": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025120A", "histograms": [{"histogram": {"Pyrexia": 3, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Myalgia": 2, "Nausea": 2, "Pain in extremity": 2, "Asthenia": 1, "Body temperature": 1, "Chest discomfort": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Illness": 1, "Injection site pain": 1, "Insomnia": 1, "Limb discomfort": 1, "Malaise": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Neuralgia": 1, "Ocular discomfort": 1, "Off label use": 1, "Pain": 1, "Pharyngeal swelling": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["025120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251321A.json b/docs/data/histograms/United States/0251321A.json
index ac155589610..98bfd36e723 100644
--- a/docs/data/histograms/United States/0251321A.json
+++ b/docs/data/histograms/United States/0251321A.json
@@ -1 +1 @@
-{"batchcode": "0251321A", "histograms": [{"batchcodes": ["0251321A"], "histogram": {"Gastrooesophageal reflux disease": 2, "Peripheral swelling": 2, "Adverse reaction": 1, "Limb discomfort": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0251321A", "histograms": [{"histogram": {"Gastrooesophageal reflux disease": 2, "Peripheral swelling": 2, "Adverse reaction": 1, "Limb discomfort": 1, "Pain in extremity": 1}, "batchcodes": ["0251321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251421A.json b/docs/data/histograms/United States/0251421A.json
index 88f2e5b1797..14c8b424bb4 100644
--- a/docs/data/histograms/United States/0251421A.json
+++ b/docs/data/histograms/United States/0251421A.json
@@ -1 +1 @@
-{"batchcode": "0251421A", "histograms": [{"batchcodes": ["0251421A"], "histogram": {"Back disorder": 1, "Condition aggravated": 1, "Incomplete course of vaccination": 1, "Musculoskeletal discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "0251421A", "histograms": [{"histogram": {"Back disorder": 1, "Condition aggravated": 1, "Incomplete course of vaccination": 1, "Musculoskeletal discomfort": 1}, "batchcodes": ["0251421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251921A.json b/docs/data/histograms/United States/0251921A.json
index 7a0aa3200c8..1f9f61f208a 100644
--- a/docs/data/histograms/United States/0251921A.json
+++ b/docs/data/histograms/United States/0251921A.json
@@ -1 +1 @@
-{"batchcode": "0251921A", "histograms": [{"batchcodes": ["0251921A"], "histogram": {"Dizziness": 2, "Nausea": 2, "Chills": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Headache": 1, "Injection site pruritus": 1, "Migraine": 1, "Oral herpes": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0251921A", "histograms": [{"histogram": {"Dizziness": 2, "Nausea": 2, "Chills": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Headache": 1, "Injection site pruritus": 1, "Migraine": 1, "Oral herpes": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["0251921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0251J20A.json b/docs/data/histograms/United States/0251J20A.json
index cfd80b38601..84ea01632dc 100644
--- a/docs/data/histograms/United States/0251J20A.json
+++ b/docs/data/histograms/United States/0251J20A.json
@@ -1 +1 @@
-{"batchcode": "0251J20A", "histograms": [{"batchcodes": ["0251J20A"], "histogram": {"Injection site pain": 1, "Pain in jaw": 1}}]}
\ No newline at end of file
+{"batchcode": "0251J20A", "histograms": [{"histogram": {"Injection site pain": 1, "Pain in jaw": 1}, "batchcodes": ["0251J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02520-2A.json b/docs/data/histograms/United States/02520-2A.json
index f8aa686e43b..cdaf72e673c 100644
--- a/docs/data/histograms/United States/02520-2A.json
+++ b/docs/data/histograms/United States/02520-2A.json
@@ -1 +1 @@
-{"batchcode": "02520-2A", "histograms": [{"batchcodes": ["02520-2A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "02520-2A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["02520-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02520A.json b/docs/data/histograms/United States/02520A.json
index 59f755cb504..d3afd92ef11 100644
--- a/docs/data/histograms/United States/02520A.json
+++ b/docs/data/histograms/United States/02520A.json
@@ -1 +1 @@
-{"batchcode": "02520A", "histograms": [{"batchcodes": ["02520A"], "histogram": {"Chills": 1, "Muscle spasms": 1}}]}
\ No newline at end of file
+{"batchcode": "02520A", "histograms": [{"histogram": {"Chills": 1, "Muscle spasms": 1}, "batchcodes": ["02520A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02521A.json b/docs/data/histograms/United States/02521A.json
index dc942f69653..b4adaa483de 100644
--- a/docs/data/histograms/United States/02521A.json
+++ b/docs/data/histograms/United States/02521A.json
@@ -1 +1 @@
-{"batchcode": "02521A", "histograms": [{"batchcodes": ["02521A"], "histogram": {"Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Mobility decreased": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02521A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Mobility decreased": 1, "Vaccination site pain": 1}, "batchcodes": ["02521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0252202A.json b/docs/data/histograms/United States/0252202A.json
index 87e9cf6e222..9354d04368a 100644
--- a/docs/data/histograms/United States/0252202A.json
+++ b/docs/data/histograms/United States/0252202A.json
@@ -1 +1 @@
-{"batchcode": "0252202A", "histograms": [{"batchcodes": ["0252202A"], "histogram": {"Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0252202A", "histograms": [{"histogram": {"Injection site pain": 1}, "batchcodes": ["0252202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025220A.json b/docs/data/histograms/United States/025220A.json
index d27d1492df4..47846f10898 100644
--- a/docs/data/histograms/United States/025220A.json
+++ b/docs/data/histograms/United States/025220A.json
@@ -1 +1 @@
-{"batchcode": "025220A", "histograms": [{"batchcodes": ["025220A"], "histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Confusional state": 1, "Dizziness": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Heart rate": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tenderness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025220A", "histograms": [{"histogram": {"Asthenia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Confusional state": 1, "Dizziness": 1, "Dyspnoea": 1, "Exposure during pregnancy": 1, "Heart rate": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tenderness": 1, "Vaccination site pain": 1}, "batchcodes": ["025220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0252264.json b/docs/data/histograms/United States/0252264.json
index 95b0944d53a..f9ea93fbbd9 100644
--- a/docs/data/histograms/United States/0252264.json
+++ b/docs/data/histograms/United States/0252264.json
@@ -1 +1 @@
-{"batchcode": "0252264", "histograms": [{"batchcodes": ["0252264"], "histogram": {"Arthralgia": 1, "Nausea": 1, "Pain": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "0252264", "histograms": [{"histogram": {"Arthralgia": 1, "Nausea": 1, "Pain": 1, "Rhinorrhoea": 1}, "batchcodes": ["0252264"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02523948.json b/docs/data/histograms/United States/02523948.json
index 2750afab18f..be9e40f0d2c 100644
--- a/docs/data/histograms/United States/02523948.json
+++ b/docs/data/histograms/United States/02523948.json
@@ -1 +1 @@
-{"batchcode": "02523948", "histograms": [{"batchcodes": ["02523948"], "histogram": {"Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02523948", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["02523948"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025302A.json b/docs/data/histograms/United States/025302A.json
index 4ba53fda3e7..c7d6ac8dbbc 100644
--- a/docs/data/histograms/United States/025302A.json
+++ b/docs/data/histograms/United States/025302A.json
@@ -1 +1 @@
-{"batchcode": "025302A", "histograms": [{"batchcodes": ["025302A"], "histogram": {"Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "025302A", "histograms": [{"histogram": {"Fatigue": 1}, "batchcodes": ["025302A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025320-24.json b/docs/data/histograms/United States/025320-24.json
index ec4b1b948c5..af5746d6d2a 100644
--- a/docs/data/histograms/United States/025320-24.json
+++ b/docs/data/histograms/United States/025320-24.json
@@ -1 +1 @@
-{"batchcode": "025320-24", "histograms": [{"batchcodes": ["025320-24"], "histogram": {"Asthenia": 1, "Condition aggravated": 1, "Haematochezia": 1}}]}
\ No newline at end of file
+{"batchcode": "025320-24", "histograms": [{"histogram": {"Asthenia": 1, "Condition aggravated": 1, "Haematochezia": 1}, "batchcodes": ["025320-24"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025320-2A.json b/docs/data/histograms/United States/025320-2A.json
index d45d7cb9b92..414b15d6cc7 100644
--- a/docs/data/histograms/United States/025320-2A.json
+++ b/docs/data/histograms/United States/025320-2A.json
@@ -1 +1 @@
-{"batchcode": "025320-2A", "histograms": [{"batchcodes": ["025320-2A"], "histogram": {"Angiocardiogram": 1, "Biopsy skin": 1, "Colonoscopy": 1, "Computerised tomogram thorax": 1, "Expired product administered": 1, "Prostatic specific antigen": 1, "Rectal examination": 1}}]}
\ No newline at end of file
+{"batchcode": "025320-2A", "histograms": [{"histogram": {"Angiocardiogram": 1, "Biopsy skin": 1, "Colonoscopy": 1, "Computerised tomogram thorax": 1, "Expired product administered": 1, "Prostatic specific antigen": 1, "Rectal examination": 1}, "batchcodes": ["025320-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025320A.json b/docs/data/histograms/United States/025320A.json
index 2bbf336618b..76e0117f813 100644
--- a/docs/data/histograms/United States/025320A.json
+++ b/docs/data/histograms/United States/025320A.json
@@ -1 +1 @@
-{"batchcode": "025320A", "histograms": [{"batchcodes": ["025320A"], "histogram": {"Weight decreased": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Mobility decreased": 1, "Myalgia": 1, "Neuralgic amyotrophy": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025320A", "histograms": [{"histogram": {"Weight decreased": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Mobility decreased": 1, "Myalgia": 1, "Neuralgic amyotrophy": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["025320A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025321A.json b/docs/data/histograms/United States/025321A.json
index c7e606c608c..edd668f1306 100644
--- a/docs/data/histograms/United States/025321A.json
+++ b/docs/data/histograms/United States/025321A.json
@@ -1 +1 @@
-{"batchcode": "025321A", "histograms": [{"batchcodes": ["025321A"], "histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "COVID-19": 1, "Tinnitus": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025321A", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "COVID-19": 1, "Tinnitus": 1, "Vaccination site pain": 1}, "batchcodes": ["025321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02532OA.json b/docs/data/histograms/United States/02532OA.json
index 5b3d4fb22ac..cea8a0371ab 100644
--- a/docs/data/histograms/United States/02532OA.json
+++ b/docs/data/histograms/United States/02532OA.json
@@ -1 +1 @@
-{"batchcode": "02532OA", "histograms": [{"batchcodes": ["02532OA"], "histogram": {"Diarrhoea": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "02532OA", "histograms": [{"histogram": {"Diarrhoea": 1, "Fatigue": 1}, "batchcodes": ["02532OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025520-28.json b/docs/data/histograms/United States/025520-28.json
index 90c6f734f5c..7b6618c5959 100644
--- a/docs/data/histograms/United States/025520-28.json
+++ b/docs/data/histograms/United States/025520-28.json
@@ -1 +1 @@
-{"batchcode": "025520-28", "histograms": [{"batchcodes": ["025520-28"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Rash": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025520-28", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Rash": 1, "Vaccination site pain": 1}, "batchcodes": ["025520-28"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025520-2A.json b/docs/data/histograms/United States/025520-2A.json
index d3b56875a2d..7768edd5c47 100644
--- a/docs/data/histograms/United States/025520-2A.json
+++ b/docs/data/histograms/United States/025520-2A.json
@@ -1 +1 @@
-{"batchcode": "025520-2A", "histograms": [{"batchcodes": ["025520-2A"], "histogram": {"Pain in extremity": 3, "Arthralgia": 2, "Headache": 2, "Actinic keratosis": 1, "Asthenia": 1, "Chills": 1, "Condition aggravated": 1, "Expired product administered": 1, "Fatigue": 1, "Feeling jittery": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Muscle tightness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash erythematous": 1, "Skin irritation": 1, "Therapeutic response unexpected": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025520-2A", "histograms": [{"histogram": {"Pain in extremity": 3, "Arthralgia": 2, "Headache": 2, "Actinic keratosis": 1, "Asthenia": 1, "Chills": 1, "Condition aggravated": 1, "Expired product administered": 1, "Fatigue": 1, "Feeling jittery": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Muscle tightness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Paraesthesia oral": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash erythematous": 1, "Skin irritation": 1, "Therapeutic response unexpected": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["025520-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025520/2A.json b/docs/data/histograms/United States/025520/2A.json
index 2137e1723ae..af790bf1cbc 100644
--- a/docs/data/histograms/United States/025520/2A.json
+++ b/docs/data/histograms/United States/025520/2A.json
@@ -1 +1 @@
-{"batchcode": "025520/2A", "histograms": [{"batchcodes": ["025520/2A"], "histogram": {"Injection site erythema": 1, "Injection site rash": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025520/2A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site rash": 1, "Injection site warmth": 1}, "batchcodes": ["025520/2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02552024.json b/docs/data/histograms/United States/02552024.json
index 1cd4803bf68..51307accd76 100644
--- a/docs/data/histograms/United States/02552024.json
+++ b/docs/data/histograms/United States/02552024.json
@@ -1 +1 @@
-{"batchcode": "02552024", "histograms": [{"batchcodes": ["02552024"], "histogram": {"Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "02552024", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1}, "batchcodes": ["02552024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0255202A.json b/docs/data/histograms/United States/0255202A.json
index 2c8e51805e1..491463010b9 100644
--- a/docs/data/histograms/United States/0255202A.json
+++ b/docs/data/histograms/United States/0255202A.json
@@ -1 +1 @@
-{"batchcode": "0255202A", "histograms": [{"batchcodes": ["0255202A"], "histogram": {"Herpes zoster": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "0255202A", "histograms": [{"histogram": {"Herpes zoster": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["0255202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025520A.json b/docs/data/histograms/United States/025520A.json
index 14fc3c2e57b..156a9e995e6 100644
--- a/docs/data/histograms/United States/025520A.json
+++ b/docs/data/histograms/United States/025520A.json
@@ -1 +1 @@
-{"batchcode": "025520A", "histograms": [{"batchcodes": ["025520A"], "histogram": {"Bronchitis": 3, "Headache": 3, "Pain in extremity": 3, "Blood pressure measurement": 2, "COVID-19": 2, "Hypertension": 2, "Myalgia": 2, "Nausea": 2, "Pyrexia": 2, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Dehydration": 1, "Diarrhoea": 1, "Erythema": 1, "Facial pain": 1, "Feeling abnormal": 1, "Hypokinesia": 1, "Illness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Pelvic pain": 1, "Pruritus": 1, "Rash": 1, "Tinnitus": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025520A", "histograms": [{"histogram": {"Bronchitis": 3, "Headache": 3, "Pain in extremity": 3, "Blood pressure measurement": 2, "COVID-19": 2, "Hypertension": 2, "Myalgia": 2, "Nausea": 2, "Pyrexia": 2, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Dehydration": 1, "Diarrhoea": 1, "Erythema": 1, "Facial pain": 1, "Feeling abnormal": 1, "Hypokinesia": 1, "Illness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Pelvic pain": 1, "Pruritus": 1, "Rash": 1, "Tinnitus": 1, "Vomiting": 1}, "batchcodes": ["025520A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02552E.json b/docs/data/histograms/United States/02552E.json
index 57e784e0e71..9d03f9b5243 100644
--- a/docs/data/histograms/United States/02552E.json
+++ b/docs/data/histograms/United States/02552E.json
@@ -1 +1 @@
-{"batchcode": "02552E", "histograms": [{"batchcodes": ["02552E"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02552E", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["02552E"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025597407089.json b/docs/data/histograms/United States/025597407089.json
index eae332b9ea4..b94688a96da 100644
--- a/docs/data/histograms/United States/025597407089.json
+++ b/docs/data/histograms/United States/025597407089.json
@@ -1 +1 @@
-{"batchcode": "025597407089", "histograms": [{"batchcodes": ["025597407089"], "histogram": {"Chills": 1, "Gastrointestinal pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Renal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025597407089", "histograms": [{"histogram": {"Chills": 1, "Gastrointestinal pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Renal pain": 1}, "batchcodes": ["025597407089"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0255J202A.json b/docs/data/histograms/United States/0255J202A.json
index 41c6affff97..76a8f16bbf6 100644
--- a/docs/data/histograms/United States/0255J202A.json
+++ b/docs/data/histograms/United States/0255J202A.json
@@ -1 +1 @@
-{"batchcode": "0255J202A", "histograms": [{"batchcodes": ["0255J202A"], "histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "0255J202A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Disorientation": 1, "Dizziness": 1, "Fatigue": 1}, "batchcodes": ["0255J202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025620-4.json b/docs/data/histograms/United States/025620-4.json
index 1ef73db225c..021f5193470 100644
--- a/docs/data/histograms/United States/025620-4.json
+++ b/docs/data/histograms/United States/025620-4.json
@@ -1 +1 @@
-{"batchcode": "025620-4", "histograms": [{"batchcodes": ["025620-4"], "histogram": {"Asthenia": 2, "Dizziness": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2}}]}
\ No newline at end of file
+{"batchcode": "025620-4", "histograms": [{"histogram": {"Asthenia": 2, "Dizziness": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2}, "batchcodes": ["025620-4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0256200.json b/docs/data/histograms/United States/0256200.json
index ce51bfd23c7..ad287f65eac 100644
--- a/docs/data/histograms/United States/0256200.json
+++ b/docs/data/histograms/United States/0256200.json
@@ -1 +1 @@
-{"batchcode": "0256200", "histograms": [{"batchcodes": ["0256200"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "0256200", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["0256200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025620A.json b/docs/data/histograms/United States/025620A.json
index c3ac0b5d594..739ff7f65b9 100644
--- a/docs/data/histograms/United States/025620A.json
+++ b/docs/data/histograms/United States/025620A.json
@@ -1 +1 @@
-{"batchcode": "025620A", "histograms": [{"batchcodes": ["025620A"], "histogram": {"Fatigue": 3, "Arthralgia": 2, "Headache": 2, "Myalgia": 2, "Pain": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Asthenopia": 1, "Bedridden": 1, "Bladder pain": 1, "COVID-19": 1, "Chills": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site reaction": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Muscular weakness": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Viral infection": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025620A", "histograms": [{"histogram": {"Fatigue": 3, "Arthralgia": 2, "Headache": 2, "Myalgia": 2, "Pain": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Asthenopia": 1, "Bedridden": 1, "Bladder pain": 1, "COVID-19": 1, "Chills": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site reaction": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Maternal exposure during pregnancy": 1, "Memory impairment": 1, "Muscular weakness": 1, "Palpitations": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Viral infection": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["025620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025621A.json b/docs/data/histograms/United States/025621A.json
index 36574827f3a..c09368b537b 100644
--- a/docs/data/histograms/United States/025621A.json
+++ b/docs/data/histograms/United States/025621A.json
@@ -1 +1 @@
-{"batchcode": "025621A", "histograms": [{"batchcodes": ["025621A"], "histogram": {"Arthralgia": 1, "Bone pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Nausea": 1, "Spinal pain": 1, "Suicidal ideation": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025621A", "histograms": [{"histogram": {"Arthralgia": 1, "Bone pain": 1, "Fatigue": 1, "Gait disturbance": 1, "Headache": 1, "Insomnia": 1, "Loss of personal independence in daily activities": 1, "Nausea": 1, "Spinal pain": 1, "Suicidal ideation": 1, "Vomiting": 1}, "batchcodes": ["025621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0256C1.json b/docs/data/histograms/United States/0256C1.json
index 71433bc832a..a72e357af8b 100644
--- a/docs/data/histograms/United States/0256C1.json
+++ b/docs/data/histograms/United States/0256C1.json
@@ -1 +1 @@
-{"batchcode": "0256C1", "histograms": [{"batchcodes": ["0256C1"], "histogram": {"Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0256C1", "histograms": [{"histogram": {"Vaccination site swelling": 1}, "batchcodes": ["0256C1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0257321A.json b/docs/data/histograms/United States/0257321A.json
index 7ef3e226f2c..520a8c25ba0 100644
--- a/docs/data/histograms/United States/0257321A.json
+++ b/docs/data/histograms/United States/0257321A.json
@@ -1 +1 @@
-{"batchcode": "0257321A", "histograms": [{"batchcodes": ["0257321A"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Migraine": 1, "Neck pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0257321A", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Migraine": 1, "Neck pain": 1, "Pain in extremity": 1}, "batchcodes": ["0257321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0258218.json b/docs/data/histograms/United States/0258218.json
index d8d9508d345..19d9816cec3 100644
--- a/docs/data/histograms/United States/0258218.json
+++ b/docs/data/histograms/United States/0258218.json
@@ -1 +1 @@
-{"batchcode": "0258218", "histograms": [{"batchcodes": ["0258218"], "histogram": {"Headache": 2, "Aneurysm": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0258218", "histograms": [{"histogram": {"Headache": 2, "Aneurysm": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Vomiting": 1}, "batchcodes": ["0258218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025821A.json b/docs/data/histograms/United States/025821A.json
index 6732f93f96d..8bdae6e0ffd 100644
--- a/docs/data/histograms/United States/025821A.json
+++ b/docs/data/histograms/United States/025821A.json
@@ -1 +1 @@
-{"batchcode": "025821A", "histograms": [{"batchcodes": ["025821A"], "histogram": {"Pain in extremity": 4, "Chills": 2, "Feeling cold": 2, "Headache": 2, "Pyrexia": 2, "Ageusia": 1, "Diarrhoea": 1, "Fatigue": 1, "Flatulence": 1, "Heart rate increased": 1, "Hypophagia": 1, "Illness": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Peripheral coldness": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Sluggishness": 1, "Sneezing": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "White blood cell count": 1, "White blood cell count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "025821A", "histograms": [{"histogram": {"Pain in extremity": 4, "Chills": 2, "Feeling cold": 2, "Headache": 2, "Pyrexia": 2, "Ageusia": 1, "Diarrhoea": 1, "Fatigue": 1, "Flatulence": 1, "Heart rate increased": 1, "Hypophagia": 1, "Illness": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Peripheral coldness": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Sluggishness": 1, "Sneezing": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "White blood cell count": 1, "White blood cell count decreased": 1}, "batchcodes": ["025821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A MA OR 3A.json b/docs/data/histograms/United States/025A MA OR 3A.json
index ce62d3986a9..a194515c562 100644
--- a/docs/data/histograms/United States/025A MA OR 3A.json
+++ b/docs/data/histograms/United States/025A MA OR 3A.json
@@ -1 +1 @@
-{"batchcode": "025A MA OR 3A", "histograms": [{"batchcodes": ["025A MA OR 3A"], "histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Arthralgia": 1, "Body temperature": 1, "Bone pain": 1, "Chills": 1, "Computerised tomogram": 1, "Eczema": 1, "Feeling abnormal": 1, "Groin pain": 1, "Herpes zoster": 1, "Illness": 1, "Lymphadenitis": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pelvic pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025A MA OR 3A", "histograms": [{"histogram": {"Abdominal pain": 1, "Abdominal pain upper": 1, "Arthralgia": 1, "Body temperature": 1, "Bone pain": 1, "Chills": 1, "Computerised tomogram": 1, "Eczema": 1, "Feeling abnormal": 1, "Groin pain": 1, "Herpes zoster": 1, "Illness": 1, "Lymphadenitis": 1, "Pain": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Pelvic pain": 1, "Pyrexia": 1}, "batchcodes": ["025A MA OR 3A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A121A.json b/docs/data/histograms/United States/025A121A.json
index 5848b2129d7..cc2b66ca03c 100644
--- a/docs/data/histograms/United States/025A121A.json
+++ b/docs/data/histograms/United States/025A121A.json
@@ -1 +1 @@
-{"batchcode": "025A121A", "histograms": [{"batchcodes": ["025A121A"], "histogram": {"Decreased appetite": 2, "Fatigue": 2, "Myalgia": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Bedridden": 1, "Chills": 1, "Dysgeusia": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Nausea": 1, "Paraesthesia oral": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025A121A", "histograms": [{"histogram": {"Decreased appetite": 2, "Fatigue": 2, "Myalgia": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Bedridden": 1, "Chills": 1, "Dysgeusia": 1, "Headache": 1, "Hypoaesthesia oral": 1, "Nausea": 1, "Paraesthesia oral": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["025A121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A12A.json b/docs/data/histograms/United States/025A12A.json
index 2d2b44c607a..0fb53a7be22 100644
--- a/docs/data/histograms/United States/025A12A.json
+++ b/docs/data/histograms/United States/025A12A.json
@@ -1 +1 @@
-{"batchcode": "025A12A", "histograms": [{"batchcodes": ["025A12A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Fatigue": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025A12A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Fatigue": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["025A12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A202A.json b/docs/data/histograms/United States/025A202A.json
index 2f6a8e11b44..4068ee6bcd1 100644
--- a/docs/data/histograms/United States/025A202A.json
+++ b/docs/data/histograms/United States/025A202A.json
@@ -1 +1 @@
-{"batchcode": "025A202A", "histograms": [{"batchcodes": ["025A202A"], "histogram": {"Vaccination site pain": 2, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Heart rate": 1, "Pyrexia": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "025A202A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Heart rate": 1, "Pyrexia": 1, "Tachycardia": 1}, "batchcodes": ["025A202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A20A.json b/docs/data/histograms/United States/025A20A.json
index 7c4de0a2025..ebab82baaac 100644
--- a/docs/data/histograms/United States/025A20A.json
+++ b/docs/data/histograms/United States/025A20A.json
@@ -1 +1 @@
-{"batchcode": "025A20A", "histograms": [{"batchcodes": ["025A20A"], "histogram": {"Pain in extremity": 3, "Vaccination site erythema": 2, "Acne": 1, "Ageusia": 1, "COVID-19": 1, "Chills": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025A20A", "histograms": [{"histogram": {"Pain in extremity": 3, "Vaccination site erythema": 2, "Acne": 1, "Ageusia": 1, "COVID-19": 1, "Chills": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["025A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A21.json b/docs/data/histograms/United States/025A21.json
index 94f317f2e7b..66a17130d93 100644
--- a/docs/data/histograms/United States/025A21.json
+++ b/docs/data/histograms/United States/025A21.json
@@ -1 +1 @@
-{"batchcode": "025A21", "histograms": [{"batchcodes": ["025A21"], "histogram": {"Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "025A21", "histograms": [{"histogram": {"Chills": 1}, "batchcodes": ["025A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A2114.json b/docs/data/histograms/United States/025A2114.json
index 83a3c1399ec..6ba3654bc3f 100644
--- a/docs/data/histograms/United States/025A2114.json
+++ b/docs/data/histograms/United States/025A2114.json
@@ -1 +1 @@
-{"batchcode": "025A2114", "histograms": [{"batchcodes": ["025A2114"], "histogram": {"Inappropriate schedule of product administration": 1, "Menstruation delayed": 1, "Pregnancy test": 1}}]}
\ No newline at end of file
+{"batchcode": "025A2114", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Menstruation delayed": 1, "Pregnancy test": 1}, "batchcodes": ["025A2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A2119.json b/docs/data/histograms/United States/025A2119.json
index 5d4bb3c2e53..21c936d2c59 100644
--- a/docs/data/histograms/United States/025A2119.json
+++ b/docs/data/histograms/United States/025A2119.json
@@ -1 +1 @@
-{"batchcode": "025A2119", "histograms": [{"batchcodes": ["025A2119"], "histogram": {"Abdominal discomfort": 1, "Chills": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "025A2119", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Chills": 1, "Malaise": 1}, "batchcodes": ["025A2119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A214.json b/docs/data/histograms/United States/025A214.json
index dccc5dd6353..f3dea826cc3 100644
--- a/docs/data/histograms/United States/025A214.json
+++ b/docs/data/histograms/United States/025A214.json
@@ -1 +1 @@
-{"batchcode": "025A214", "histograms": [{"batchcodes": ["025A214"], "histogram": {"Nausea": 2, "Abdominal discomfort": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Product dose omission issue": 1, "Tinnitus": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025A214", "histograms": [{"histogram": {"Nausea": 2, "Abdominal discomfort": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypoaesthesia": 1, "Lymphadenopathy": 1, "Musculoskeletal stiffness": 1, "Product dose omission issue": 1, "Tinnitus": 1, "Vertigo": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["025A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A21A OR H.json b/docs/data/histograms/United States/025A21A OR H.json
index 62d72d626b3..c935ebbf1ca 100644
--- a/docs/data/histograms/United States/025A21A OR H.json
+++ b/docs/data/histograms/United States/025A21A OR H.json
@@ -1 +1 @@
-{"batchcode": "025A21A OR H", "histograms": [{"batchcodes": ["025A21A OR H"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphonia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Limb discomfort": 1, "Nausea": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Tremor": 1, "Vaccination complication": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025A21A OR H", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Dysphonia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Limb discomfort": 1, "Nausea": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Tremor": 1, "Vaccination complication": 1, "Vomiting": 1}, "batchcodes": ["025A21A OR H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A21A).json b/docs/data/histograms/United States/025A21A).json
index 279da012209..69abbdd0bc5 100644
--- a/docs/data/histograms/United States/025A21A).json
+++ b/docs/data/histograms/United States/025A21A).json
@@ -1 +1 @@
-{"batchcode": "025A21A)", "histograms": [{"batchcodes": ["025A21A)"], "histogram": {"Abdominal pain upper": 1, "Headache": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "025A21A)", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Headache": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["025A21A)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A21A.json b/docs/data/histograms/United States/025A21A.json
index cbdb6060973..dd8f52e1f2c 100644
--- a/docs/data/histograms/United States/025A21A.json
+++ b/docs/data/histograms/United States/025A21A.json
@@ -1 +1 @@
-{"batchcode": "025A21A", "histograms": [{"batchcodes": ["025A21A", "028A21A"], "histogram": {"Chills": 1, "Injection site pain": 1, "Myalgia": 1, "Night sweats": 1, "Pyrexia": 1}}, {"batchcodes": ["025A21A", "FF2593"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["025A21A"], "histogram": {"Fatigue": 89, "Headache": 79, "Pyrexia": 77, "Pain in extremity": 64, "Vaccination site pain": 64, "Myalgia": 60, "Chills": 59, "Nausea": 43, "Pain": 43, "Arthralgia": 38, "Dizziness": 38, "Vaccination site erythema": 36, "Pruritus": 34, "Rash": 28, "Feeling abnormal": 25, "Vaccination site pruritus": 25, "Malaise": 23, "Peripheral swelling": 23, "Asthenia": 22, "Erythema": 21, "Dyspnoea": 20, "Vaccination site swelling": 20, "Body temperature": 19, "Vaccination site warmth": 19, "Vaccination site rash": 18, "Back pain": 17, "Expired product administered": 16, "Urticaria": 16, "Vomiting": 16, "Diarrhoea": 15, "Illness": 15, "Somnolence": 14, "COVID-19": 13, "Feeling hot": 13, "Hypoaesthesia": 13, "Paraesthesia": 13, "Heart rate": 11, "SARS-CoV-2 test": 11, "Heart rate increased": 10, "Inappropriate schedule of product administration": 10, "Influenza like illness": 10, "Palpitations": 10, "Swelling": 10, "Tinnitus": 10, "Burning sensation": 9, "Decreased appetite": 9, "Tremor": 9, "Blood pressure measurement": 8, "Chest pain": 8, "Cough": 8, "Gait disturbance": 8, "Hypersomnia": 8, "Insomnia": 8, "Abdominal pain upper": 7, "Dysgeusia": 7, "Lymphadenopathy": 7, "Migraine": 7, "Product dose omission issue": 7, "Vaccination complication": 7, "Vaccination site induration": 7, "Vertigo": 7, "Vision blurred": 7, "Condition aggravated": 6, "Electrocardiogram": 6, "Feeling cold": 6, "Hyperhidrosis": 6, "Muscular weakness": 6, "Musculoskeletal stiffness": 6, "Product storage error": 6, "Rash erythematous": 6, "Rash pruritic": 6, "Vaccination site reaction": 6, "Cellulitis": 5, "Dysphagia": 5, "Hypertension": 5, "Injection site pain": 5, "Lethargy": 5, "Limb discomfort": 5, "Maternal exposure during pregnancy": 5, "Mobility decreased": 5, "Nasopharyngitis": 5, "Oxygen saturation": 5, "Presyncope": 5, "Product administered to patient of inappropriate age": 5, "Sleep disorder": 5, "Swelling face": 5, "Therapeutic response unexpected": 5, "Abdominal discomfort": 4, "Abdominal pain": 4, "Bell's palsy": 4, "Blood test": 4, "Body temperature increased": 4, "Bone pain": 4, "Fall": 4, "Flushing": 4, "Loss of consciousness": 4, "Muscle spasms": 4, "Taste disorder": 4, "Tenderness": 4, "Throat irritation": 4, "Vaccination site mass": 4, "Anxiety": 3, "Arthritis": 3, "Bedridden": 3, "Blister": 3, "Blood glucose": 3, "Breast pain": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Discomfort": 3, "Drug ineffective": 3, "Eye pain": 3, "Herpes zoster": 3, "Hot flush": 3, "Hypersensitivity": 3, "Incorrect route of product administration": 3, "Injection site erythema": 3, "Lymph node pain": 3, "Nasal congestion": 3, "Ocular discomfort": 3, "Oropharyngeal pain": 3, "Paraesthesia oral": 3, "Pregnancy test": 3, "Product administered at inappropriate site": 3, "Rash macular": 3, "Rhinorrhoea": 3, "SARS-CoV-2 antibody test": 3, "Scan": 3, "Skin burning sensation": 3, "Vaccination site discolouration": 3, "Visual impairment": 3, "Weight decreased": 3, "Abdominal distension": 2, "Ageusia": 2, "Anaphylactic reaction": 2, "Arrhythmia": 2, "Blepharospasm": 2, "Blood glucose increased": 2, "Blood pressure increased": 2, "Breast swelling": 2, "Cardiac flutter": 2, "Confusional state": 2, "Dermatitis contact": 2, "Device connection issue": 2, "Diarrhoea haemorrhagic": 2, "Dry mouth": 2, "Dysphonia": 2, "Ear pain": 2, "Eating disorder": 2, "Echocardiogram": 2, "Exophthalmos": 2, "Extra dose administered": 2, "Eye irritation": 2, "Eye swelling": 2, "Gait inability": 2, "Haemorrhage": 2, "Heart rate irregular": 2, "Hepatic enzyme": 2, "Hyperacusis": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Hypotension": 2, "Induration": 2, "Inflammation": 2, "Injection site swelling": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Lip blister": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Mechanical urticaria": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Neck pain": 2, "No adverse event": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Paralysis": 2, "Poor peripheral circulation": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Respiratory rate": 2, "Restlessness": 2, "Salivary hypersecretion": 2, "Sinusitis": 2, "Skin swelling": 2, "Skin warm": 2, "Sneezing": 2, "Thirst": 2, "Throat tightness": 2, "Ultrasound kidney": 2, "Ultrasound scan": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site movement impairment": 2, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Abscess limb": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Adverse reaction": 1, "Agitation": 1, "Alopecia": 1, "Angioedema": 1, "Anorectal discomfort": 1, "Aphasia": 1, "Appendicitis": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Balance disorder": 1, "Bed rest": 1, "Blood glucose normal": 1, "Blood iron decreased": 1, "Blood potassium": 1, "Blood uric acid": 1, "Breast oedema": 1, "Breast tenderness": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac function test": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Chest X-ray": 1, "Circadian rhythm sleep disorder": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Contusion": 1, "Deafness": 1, "Deafness bilateral": 1, "Dental care": 1, "Depressed mood": 1, "Diplopia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Eating disorder symptom": 1, "Enuresis": 1, "Erythema of eyelid": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Extrapyramidal disorder": 1, "Extrasystoles": 1, "Eye discharge": 1, "Eye disorder": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces soft": 1, "Fear": 1, "Feeding tube user": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Food allergy": 1, "Food poisoning": 1, "Gastroenteritis viral": 1, "Gastrointestinal disorder": 1, "Gastrooesophageal reflux disease": 1, "Generalised oedema": 1, "Genital discomfort": 1, "Goitre": 1, "Gout": 1, "Haematoma": 1, "Haematopoietic neoplasm": 1, "Head discomfort": 1, "Hordeolum": 1, "Hydronephrosis": 1, "Hypoxia": 1, "Immune thrombocytopenia": 1, "Immunisation": 1, "Incorrect dose administered": 1, "Inhibiting antibodies": 1, "Injected limb mobility decreased": 1, "Injection site cellulitis": 1, "Injection site induration": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Joint lock": 1, "Lacrimation increased": 1, "Laziness": 1, "Lip disorder": 1, "Lip swelling": 1, "Mammogram": 1, "Memory impairment": 1, "Mood altered": 1, "Motion sickness": 1, "Muscle contractions involuntary": 1, "Muscle swelling": 1, "Musculoskeletal discomfort": 1, "Myasthenic syndrome": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Nephrotic syndrome": 1, "Nerve compression": 1, "Nervousness": 1, "Neuralgia": 1, "Neutropenia": 1, "Night sweats": 1, "Nodule": 1, "Oesophageal spasm": 1, "Oligomenorrhoea": 1, "Oral blood blister": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral pain": 1, "Osteitis": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Pain of skin": 1, "Panic reaction": 1, "Parosmia": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral paralysis": 1, "Pharyngeal swelling": 1, "Photosensitivity reaction": 1, "Plantar fasciitis": 1, "Platelet count": 1, "Pneumonia": 1, "Post-acute COVID-19 syndrome": 1, "Pregnancy": 1, "Renal pain": 1, "Restless legs syndrome": 1, "Retching": 1, "Retinal migraine": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Secretion discharge": 1, "Sinus headache": 1, "Skin exfoliation": 1, "Skin weeping": 1, "Sluggishness": 1, "Speech disorder": 1, "Streptobacillus test positive": 1, "Streptococcal infection": 1, "Suspected COVID-19": 1, "Thinking abnormal": 1, "Thrombocytopenia": 1, "Tongue pruritus": 1, "Tooth abscess": 1, "Treatment noncompliance": 1, "Trigeminal neuralgia": 1, "Trismus": 1, "Tunnel vision": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen": 1, "Underdose": 1, "Unevaluable event": 1, "Urinary tract discomfort": 1, "Urinary tract infection": 1, "Vaccination site bruising": 1, "Vaccination site hypersensitivity": 1, "Vaccination site inflammation": 1, "Vaccination site nerve damage": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vaccine breakthrough infection": 1, "Vitreous floaters": 1, "Wheezing": 1, "White blood cell count": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "025A21A", "histograms": [{"histogram": {"Chills": 1, "Injection site pain": 1, "Myalgia": 1, "Night sweats": 1, "Pyrexia": 1}, "batchcodes": ["025A21A", "028A21A"]}, {"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025A21A", "FF2593"]}, {"histogram": {"Fatigue": 89, "Headache": 79, "Pyrexia": 77, "Pain in extremity": 64, "Vaccination site pain": 64, "Myalgia": 60, "Chills": 59, "Nausea": 43, "Pain": 43, "Arthralgia": 38, "Dizziness": 38, "Vaccination site erythema": 36, "Pruritus": 34, "Rash": 28, "Feeling abnormal": 25, "Vaccination site pruritus": 25, "Malaise": 23, "Peripheral swelling": 23, "Asthenia": 22, "Erythema": 21, "Dyspnoea": 20, "Vaccination site swelling": 20, "Body temperature": 19, "Vaccination site warmth": 19, "Vaccination site rash": 18, "Back pain": 17, "Expired product administered": 16, "Urticaria": 16, "Vomiting": 16, "Diarrhoea": 15, "Illness": 15, "Somnolence": 14, "COVID-19": 13, "Feeling hot": 13, "Hypoaesthesia": 13, "Paraesthesia": 13, "Heart rate": 11, "SARS-CoV-2 test": 11, "Heart rate increased": 10, "Inappropriate schedule of product administration": 10, "Influenza like illness": 10, "Palpitations": 10, "Swelling": 10, "Tinnitus": 10, "Burning sensation": 9, "Decreased appetite": 9, "Tremor": 9, "Blood pressure measurement": 8, "Chest pain": 8, "Cough": 8, "Gait disturbance": 8, "Hypersomnia": 8, "Insomnia": 8, "Abdominal pain upper": 7, "Dysgeusia": 7, "Lymphadenopathy": 7, "Migraine": 7, "Product dose omission issue": 7, "Vaccination complication": 7, "Vaccination site induration": 7, "Vertigo": 7, "Vision blurred": 7, "Condition aggravated": 6, "Electrocardiogram": 6, "Feeling cold": 6, "Hyperhidrosis": 6, "Muscular weakness": 6, "Musculoskeletal stiffness": 6, "Product storage error": 6, "Rash erythematous": 6, "Rash pruritic": 6, "Vaccination site reaction": 6, "Cellulitis": 5, "Dysphagia": 5, "Hypertension": 5, "Injection site pain": 5, "Lethargy": 5, "Limb discomfort": 5, "Maternal exposure during pregnancy": 5, "Mobility decreased": 5, "Nasopharyngitis": 5, "Oxygen saturation": 5, "Presyncope": 5, "Product administered to patient of inappropriate age": 5, "Sleep disorder": 5, "Swelling face": 5, "Therapeutic response unexpected": 5, "Abdominal discomfort": 4, "Abdominal pain": 4, "Bell's palsy": 4, "Blood test": 4, "Body temperature increased": 4, "Bone pain": 4, "Fall": 4, "Flushing": 4, "Loss of consciousness": 4, "Muscle spasms": 4, "Taste disorder": 4, "Tenderness": 4, "Throat irritation": 4, "Vaccination site mass": 4, "Anxiety": 3, "Arthritis": 3, "Bedridden": 3, "Blister": 3, "Blood glucose": 3, "Breast pain": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Discomfort": 3, "Drug ineffective": 3, "Eye pain": 3, "Herpes zoster": 3, "Hot flush": 3, "Hypersensitivity": 3, "Incorrect route of product administration": 3, "Injection site erythema": 3, "Lymph node pain": 3, "Nasal congestion": 3, "Ocular discomfort": 3, "Oropharyngeal pain": 3, "Paraesthesia oral": 3, "Pregnancy test": 3, "Product administered at inappropriate site": 3, "Rash macular": 3, "Rhinorrhoea": 3, "SARS-CoV-2 antibody test": 3, "Scan": 3, "Skin burning sensation": 3, "Vaccination site discolouration": 3, "Visual impairment": 3, "Weight decreased": 3, "Abdominal distension": 2, "Ageusia": 2, "Anaphylactic reaction": 2, "Arrhythmia": 2, "Blepharospasm": 2, "Blood glucose increased": 2, "Blood pressure increased": 2, "Breast swelling": 2, "Cardiac flutter": 2, "Confusional state": 2, "Dermatitis contact": 2, "Device connection issue": 2, "Diarrhoea haemorrhagic": 2, "Dry mouth": 2, "Dysphonia": 2, "Ear pain": 2, "Eating disorder": 2, "Echocardiogram": 2, "Exophthalmos": 2, "Extra dose administered": 2, "Eye irritation": 2, "Eye swelling": 2, "Gait inability": 2, "Haemorrhage": 2, "Heart rate irregular": 2, "Hepatic enzyme": 2, "Hyperacusis": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Hypotension": 2, "Induration": 2, "Inflammation": 2, "Injection site swelling": 2, "Interchange of vaccine products": 2, "Joint swelling": 2, "Lip blister": 2, "Loss of personal independence in daily activities": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Mechanical urticaria": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Neck pain": 2, "No adverse event": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Paralysis": 2, "Poor peripheral circulation": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Respiratory rate": 2, "Restlessness": 2, "Salivary hypersecretion": 2, "Sinusitis": 2, "Skin swelling": 2, "Skin warm": 2, "Sneezing": 2, "Thirst": 2, "Throat tightness": 2, "Ultrasound kidney": 2, "Ultrasound scan": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site movement impairment": 2, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Abscess limb": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Adverse drug reaction": 1, "Adverse event": 1, "Adverse reaction": 1, "Agitation": 1, "Alopecia": 1, "Angioedema": 1, "Anorectal discomfort": 1, "Aphasia": 1, "Appendicitis": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Balance disorder": 1, "Bed rest": 1, "Blood glucose normal": 1, "Blood iron decreased": 1, "Blood potassium": 1, "Blood uric acid": 1, "Breast oedema": 1, "Breast tenderness": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiac function test": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Chest X-ray": 1, "Circadian rhythm sleep disorder": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Contusion": 1, "Deafness": 1, "Deafness bilateral": 1, "Dental care": 1, "Depressed mood": 1, "Diplopia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Eating disorder symptom": 1, "Enuresis": 1, "Erythema of eyelid": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Extrapyramidal disorder": 1, "Extrasystoles": 1, "Eye discharge": 1, "Eye disorder": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces soft": 1, "Fear": 1, "Feeding tube user": 1, "Feeling jittery": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Food allergy": 1, "Food poisoning": 1, "Gastroenteritis viral": 1, "Gastrointestinal disorder": 1, "Gastrooesophageal reflux disease": 1, "Generalised oedema": 1, "Genital discomfort": 1, "Goitre": 1, "Gout": 1, "Haematoma": 1, "Haematopoietic neoplasm": 1, "Head discomfort": 1, "Hordeolum": 1, "Hydronephrosis": 1, "Hypoxia": 1, "Immune thrombocytopenia": 1, "Immunisation": 1, "Incorrect dose administered": 1, "Inhibiting antibodies": 1, "Injected limb mobility decreased": 1, "Injection site cellulitis": 1, "Injection site induration": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site warmth": 1, "Joint lock": 1, "Lacrimation increased": 1, "Laziness": 1, "Lip disorder": 1, "Lip swelling": 1, "Mammogram": 1, "Memory impairment": 1, "Mood altered": 1, "Motion sickness": 1, "Muscle contractions involuntary": 1, "Muscle swelling": 1, "Musculoskeletal discomfort": 1, "Myasthenic syndrome": 1, "Myelitis": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Nasal discomfort": 1, "Nephrotic syndrome": 1, "Nerve compression": 1, "Nervousness": 1, "Neuralgia": 1, "Neutropenia": 1, "Night sweats": 1, "Nodule": 1, "Oesophageal spasm": 1, "Oligomenorrhoea": 1, "Oral blood blister": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral pain": 1, "Osteitis": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Pain of skin": 1, "Panic reaction": 1, "Parosmia": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Peripheral paralysis": 1, "Pharyngeal swelling": 1, "Photosensitivity reaction": 1, "Plantar fasciitis": 1, "Platelet count": 1, "Pneumonia": 1, "Post-acute COVID-19 syndrome": 1, "Pregnancy": 1, "Renal pain": 1, "Restless legs syndrome": 1, "Retching": 1, "Retinal migraine": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Secretion discharge": 1, "Sinus headache": 1, "Skin exfoliation": 1, "Skin weeping": 1, "Sluggishness": 1, "Speech disorder": 1, "Streptobacillus test positive": 1, "Streptococcal infection": 1, "Suspected COVID-19": 1, "Thinking abnormal": 1, "Thrombocytopenia": 1, "Tongue pruritus": 1, "Tooth abscess": 1, "Treatment noncompliance": 1, "Trigeminal neuralgia": 1, "Trismus": 1, "Tunnel vision": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen": 1, "Underdose": 1, "Unevaluable event": 1, "Urinary tract discomfort": 1, "Urinary tract infection": 1, "Vaccination site bruising": 1, "Vaccination site hypersensitivity": 1, "Vaccination site inflammation": 1, "Vaccination site nerve damage": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vaccine breakthrough infection": 1, "Vitreous floaters": 1, "Wheezing": 1, "White blood cell count": 1, "X-ray": 1}, "batchcodes": ["025A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A21A/80777-0.json b/docs/data/histograms/United States/025A21A/80777-0.json
index e4b28f05c67..3bab0ef265d 100644
--- a/docs/data/histograms/United States/025A21A/80777-0.json
+++ b/docs/data/histograms/United States/025A21A/80777-0.json
@@ -1 +1 @@
-{"batchcode": "025A21A/80777-0", "histograms": [{"batchcodes": ["025A21A/80777-0"], "histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Hypersensitivity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025A21A/80777-0", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Fatigue": 1, "Hypersensitivity": 1, "Pyrexia": 1}, "batchcodes": ["025A21A/80777-0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A21X.json b/docs/data/histograms/United States/025A21X.json
index d63b6ce04e5..d1456560b02 100644
--- a/docs/data/histograms/United States/025A21X.json
+++ b/docs/data/histograms/United States/025A21X.json
@@ -1 +1 @@
-{"batchcode": "025A21X", "histograms": [{"batchcodes": ["025A21X"], "histogram": {"Blood pressure measurement": 2, "Fibromyalgia": 2, "Heart rate": 2, "Body temperature": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Migraine": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025A21X", "histograms": [{"histogram": {"Blood pressure measurement": 2, "Fibromyalgia": 2, "Heart rate": 2, "Body temperature": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Migraine": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["025A21X"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A22A.json b/docs/data/histograms/United States/025A22A.json
index 48ad0d3cf78..50dc4904e8e 100644
--- a/docs/data/histograms/United States/025A22A.json
+++ b/docs/data/histograms/United States/025A22A.json
@@ -1 +1 @@
-{"batchcode": "025A22A", "histograms": [{"batchcodes": ["025A22A"], "histogram": {"Muscle discomfort": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "025A22A", "histograms": [{"histogram": {"Muscle discomfort": 1, "Pain in extremity": 1}, "batchcodes": ["025A22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A24A.json b/docs/data/histograms/United States/025A24A.json
index 9e6dff249c2..ec7b58bcac1 100644
--- a/docs/data/histograms/United States/025A24A.json
+++ b/docs/data/histograms/United States/025A24A.json
@@ -1 +1 @@
-{"batchcode": "025A24A", "histograms": [{"batchcodes": ["025A24A"], "histogram": {"Fatigue": 1, "Influenza like illness": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025A24A", "histograms": [{"histogram": {"Fatigue": 1, "Influenza like illness": 1, "Pain": 1}, "batchcodes": ["025A24A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A2A.json b/docs/data/histograms/United States/025A2A.json
index 0dc43c01ec8..47504761a30 100644
--- a/docs/data/histograms/United States/025A2A.json
+++ b/docs/data/histograms/United States/025A2A.json
@@ -1 +1 @@
-{"batchcode": "025A2A", "histograms": [{"batchcodes": ["025A2A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Dysgeusia": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025A2A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Dysgeusia": 1, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["025A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A310.json b/docs/data/histograms/United States/025A310.json
index 0fc100d683e..ec7bea8ff3b 100644
--- a/docs/data/histograms/United States/025A310.json
+++ b/docs/data/histograms/United States/025A310.json
@@ -1 +1 @@
-{"batchcode": "025A310", "histograms": [{"batchcodes": ["025A310"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "025A310", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["025A310"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025A71A.json b/docs/data/histograms/United States/025A71A.json
index 2a41cd44f48..9111b58c23e 100644
--- a/docs/data/histograms/United States/025A71A.json
+++ b/docs/data/histograms/United States/025A71A.json
@@ -1 +1 @@
-{"batchcode": "025A71A", "histograms": [{"batchcodes": ["025A71A"], "histogram": {"Asthenia": 1, "SARS-CoV-2 test positive": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025A71A", "histograms": [{"histogram": {"Asthenia": 1, "SARS-CoV-2 test positive": 1, "Vomiting": 1}, "batchcodes": ["025A71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025AQ1A.json b/docs/data/histograms/United States/025AQ1A.json
index f97a80f387f..c1a4ece04d9 100644
--- a/docs/data/histograms/United States/025AQ1A.json
+++ b/docs/data/histograms/United States/025AQ1A.json
@@ -1 +1 @@
-{"batchcode": "025AQ1A", "histograms": [{"batchcodes": ["025AQ1A"], "histogram": {"Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "025AQ1A", "histograms": [{"histogram": {"Swelling face": 1}, "batchcodes": ["025AQ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025AUA.json b/docs/data/histograms/United States/025AUA.json
index 90891ff7c69..b9642d3f7f9 100644
--- a/docs/data/histograms/United States/025AUA.json
+++ b/docs/data/histograms/United States/025AUA.json
@@ -1 +1 @@
-{"batchcode": "025AUA", "histograms": [{"batchcodes": ["025AUA"], "histogram": {"COVID-19": 1, "Dysgeusia": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Lung disorder": 1, "Pyrexia": 1, "Rash macular": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "025AUA", "histograms": [{"histogram": {"COVID-19": 1, "Dysgeusia": 1, "Fatigue": 1, "Inappropriate schedule of product administration": 1, "Lung disorder": 1, "Pyrexia": 1, "Rash macular": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025AUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025AZ1A.json b/docs/data/histograms/United States/025AZ1A.json
index 11110ca0cae..bf24cd469c0 100644
--- a/docs/data/histograms/United States/025AZ1A.json
+++ b/docs/data/histograms/United States/025AZ1A.json
@@ -1 +1 @@
-{"batchcode": "025AZ1A", "histograms": [{"batchcodes": ["025AZ1A"], "histogram": {"Arthralgia": 3, "Vaccination site pain": 3, "Body temperature": 2, "Pyrexia": 2, "COVID-19 pneumonia": 1, "Cold sweat": 1, "Disorientation": 1, "Dry mouth": 1, "Eyelid exfoliation": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Inappropriate schedule of product administration": 1, "Lip swelling": 1, "Ocular hyperaemia": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Skin discolouration": 1, "Speech disorder": 1, "Tremor": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025AZ1A", "histograms": [{"histogram": {"Arthralgia": 3, "Vaccination site pain": 3, "Body temperature": 2, "Pyrexia": 2, "COVID-19 pneumonia": 1, "Cold sweat": 1, "Disorientation": 1, "Dry mouth": 1, "Eyelid exfoliation": 1, "Fatigue": 1, "Feeding disorder": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Inappropriate schedule of product administration": 1, "Lip swelling": 1, "Ocular hyperaemia": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Skin discolouration": 1, "Speech disorder": 1, "Tremor": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1}, "batchcodes": ["025AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025AZ8.json b/docs/data/histograms/United States/025AZ8.json
index 8a56975112c..232c0dfd980 100644
--- a/docs/data/histograms/United States/025AZ8.json
+++ b/docs/data/histograms/United States/025AZ8.json
@@ -1 +1 @@
-{"batchcode": "025AZ8", "histograms": [{"batchcodes": ["025AZ8"], "histogram": {"Pyrexia": 2, "Body temperature": 1, "Eye swelling": 1, "Ocular hyperaemia": 1, "Periorbital swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025AZ8", "histograms": [{"histogram": {"Pyrexia": 2, "Body temperature": 1, "Eye swelling": 1, "Ocular hyperaemia": 1, "Periorbital swelling": 1}, "batchcodes": ["025AZ8"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025AZIA.json b/docs/data/histograms/United States/025AZIA.json
index a8107056310..96f972aae7a 100644
--- a/docs/data/histograms/United States/025AZIA.json
+++ b/docs/data/histograms/United States/025AZIA.json
@@ -1 +1 @@
-{"batchcode": "025AZIA", "histograms": [{"batchcodes": ["025AZIA"], "histogram": {"Feeling hot": 1, "Pain in extremity": 1, "Swelling": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "025AZIA", "histograms": [{"histogram": {"Feeling hot": 1, "Pain in extremity": 1, "Swelling": 1, "Vaccination site erythema": 1}, "batchcodes": ["025AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025B12A.json b/docs/data/histograms/United States/025B12A.json
index e2d5a4e857a..4cad1b97245 100644
--- a/docs/data/histograms/United States/025B12A.json
+++ b/docs/data/histograms/United States/025B12A.json
@@ -1 +1 @@
-{"batchcode": "025B12A", "histograms": [{"batchcodes": ["025B12A"], "histogram": {"Blindness": 1, "Loss of personal independence in daily activities": 1}}]}
\ No newline at end of file
+{"batchcode": "025B12A", "histograms": [{"histogram": {"Blindness": 1, "Loss of personal independence in daily activities": 1}, "batchcodes": ["025B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025B21.json b/docs/data/histograms/United States/025B21.json
index d6994f6c1f2..a39b34ccf91 100644
--- a/docs/data/histograms/United States/025B21.json
+++ b/docs/data/histograms/United States/025B21.json
@@ -1 +1 @@
-{"batchcode": "025B21", "histograms": [{"batchcodes": ["025B21"], "histogram": {"Chest pain": 1, "Discomfort": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "025B21", "histograms": [{"histogram": {"Chest pain": 1, "Discomfort": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025B21A.json b/docs/data/histograms/United States/025B21A.json
index b1967390098..403137f7920 100644
--- a/docs/data/histograms/United States/025B21A.json
+++ b/docs/data/histograms/United States/025B21A.json
@@ -1 +1 @@
-{"batchcode": "025B21A", "histograms": [{"batchcodes": ["025B21A"], "histogram": {"Pyrexia": 56, "Chills": 45, "Fatigue": 40, "Vaccination site pain": 34, "Headache": 33, "Pain in extremity": 33, "Myalgia": 31, "Pain": 21, "Nausea": 18, "Pruritus": 16, "Rash": 16, "Arthralgia": 15, "Body temperature": 14, "Erythema": 14, "Vaccination site erythema": 14, "Vaccination site pruritus": 14, "Dizziness": 13, "Feeling abnormal": 13, "Urticaria": 12, "Vaccination site swelling": 11, "Cough": 10, "Diarrhoea": 10, "Product dose omission issue": 10, "Asthenia": 9, "COVID-19": 9, "SARS-CoV-2 test": 9, "Chest pain": 8, "Dyspnoea": 8, "Lymphadenopathy": 8, "Malaise": 8, "Tremor": 8, "Vaccination site warmth": 8, "Decreased appetite": 7, "Electrocardiogram": 7, "Expired product administered": 7, "Feeling hot": 7, "Hypoaesthesia": 7, "Influenza like illness": 7, "Product administered to patient of inappropriate age": 7, "Ageusia": 6, "Illness": 6, "Insomnia": 6, "Somnolence": 6, "Swelling": 6, "Abdominal discomfort": 5, "Anosmia": 5, "Back pain": 5, "Blood pressure measurement": 5, "Oropharyngeal pain": 5, "Paraesthesia": 5, "Rash pruritic": 5, "Swelling face": 5, "Underdose": 5, "Vaccination site mass": 5, "Vaccination site rash": 5, "Abdominal pain upper": 4, "Blood test": 4, "Feeling cold": 4, "Gait disturbance": 4, "Heart rate": 4, "Mechanical urticaria": 4, "Nasopharyngitis": 4, "Neck pain": 4, "Peripheral swelling": 4, "Visual impairment": 4, "Vomiting": 4, "Angioedema": 3, "Axillary pain": 3, "Burning sensation": 3, "Chest discomfort": 3, "Device connection issue": 3, "Dyspepsia": 3, "Dysphonia": 3, "Ear pruritus": 3, "Echocardiogram": 3, "Inflammation": 3, "Injection site erythema": 3, "Injection site swelling": 3, "Lethargy": 3, "Loss of consciousness": 3, "Lymph node pain": 3, "Mass": 3, "Maternal exposure during pregnancy": 3, "Muscle spasms": 3, "Myocardial infarction": 3, "Pregnancy test": 3, "Rash erythematous": 3, "Sinusitis": 3, "Skin discolouration": 3, "Sleep disorder": 3, "Therapeutic response unexpected": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Vaccination complication": 3, "Vaccination site induration": 3, "Anxiety": 2, "Aphonia": 2, "Axillary mass": 2, "Bedridden": 2, "Bone pain": 2, "Cerebrovascular accident": 2, "Computerised tomogram": 2, "Craniocerebral injury": 2, "Diplopia": 2, "Discomfort": 2, "Drug ineffective": 2, "Dry mouth": 2, "Exposure during pregnancy": 2, "Flushing": 2, "Head discomfort": 2, "Head injury": 2, "Herpes zoster": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Hypertension": 2, "Inappropriate schedule of product administration": 2, "Incomplete course of vaccination": 2, "Incorrect route of product administration": 2, "Injection site mass": 2, "Injection site pain": 2, "Injection site pruritus": 2, "Injection site warmth": 2, "Limb discomfort": 2, "Lip pruritus": 2, "Loss of personal independence in daily activities": 2, "Macular degeneration": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Migraine": 2, "Mobility decreased": 2, "Nodule": 2, "Oral pruritus": 2, "Oxygen saturation": 2, "Palpitations": 2, "Pharyngeal swelling": 2, "Pneumonia": 2, "Rash macular": 2, "Rhinorrhoea": 2, "Sluggishness": 2, "Swelling of eyelid": 2, "Syncope": 2, "Tachycardia": 2, "Tenderness": 2, "Throat tightness": 2, "Vaccination site bruising": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Vision blurred": 2, "Weight decreased": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Accidental underdose": 1, "Acute psychosis": 1, "Allergic respiratory disease": 1, "Antibody test": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Biopsy": 1, "Blepharospasm": 1, "Blood pressure increased": 1, "Blue toe syndrome": 1, "Body temperature increased": 1, "Breast cancer metastatic": 1, "Breast pain": 1, "Breast tenderness": 1, "Bruxism": 1, "Cardiac failure congestive": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chest X-ray": 1, "Choking sensation": 1, "Cold sweat": 1, "Colonoscopy": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Constipation": 1, "Contusion": 1, "Coronary artery dissection": 1, "Crying": 1, "Depression": 1, "Diaphragmatic paralysis": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Dry skin": 1, "Dry throat": 1, "Dysmenorrhoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eating disorder": 1, "Ejection fraction": 1, "Epistaxis": 1, "Eye haemorrhage": 1, "Eye irritation": 1, "Eye pain": 1, "Eye swelling": 1, "Feeling of body temperature change": 1, "Flatulence": 1, "Furuncle": 1, "Gastrointestinal disorder": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Heart injury": 1, "Heart rate increased": 1, "Hot flush": 1, "Hyperchlorhydria": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired quality of life": 1, "Increased appetite": 1, "Injection site hypoaesthesia": 1, "Injury": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Laboratory test": 1, "Lichen planus": 1, "Lip swelling": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Macule": 1, "Mammogram": 1, "Maternal exposure during breast feeding": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental disability": 1, "Multiple allergies": 1, "Muscle strain": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocardial necrosis marker": 1, "Myokymia": 1, "Nasal congestion": 1, "Nervousness": 1, "Night sweats": 1, "Nightmare": 1, "Nocturnal dyspnoea": 1, "Ocular discomfort": 1, "Off label use": 1, "Oral candidiasis": 1, "Oxygen consumption": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Paratracheal lymphadenopathy": 1, "Periorbital swelling": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Postural orthostatic tachycardia syndrome": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product storage error": 1, "Psoriasis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Scab": 1, "Scar": 1, "Sciatica": 1, "Screaming": 1, "Secretion discharge": 1, "Sensation of foreign body": 1, "Sinus pain": 1, "Speech disorder": 1, "Sputum discoloured": 1, "Stool analysis": 1, "Stress": 1, "Swollen tongue": 1, "Thirst": 1, "Throat irritation": 1, "Tinea pedis": 1, "Toothache": 1, "Tunnel vision": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Urticarial vasculitis": 1, "Vaccination site discharge": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haematoma": 1, "Vaccination site haemorrhage": 1, "Vaginal haemorrhage": 1, "Venous aneurysm": 1, "Viral test": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "025B21A", "histograms": [{"histogram": {"Pyrexia": 56, "Chills": 45, "Fatigue": 40, "Vaccination site pain": 34, "Headache": 33, "Pain in extremity": 33, "Myalgia": 31, "Pain": 21, "Nausea": 18, "Pruritus": 16, "Rash": 16, "Arthralgia": 15, "Body temperature": 14, "Erythema": 14, "Vaccination site erythema": 14, "Vaccination site pruritus": 14, "Dizziness": 13, "Feeling abnormal": 13, "Urticaria": 12, "Vaccination site swelling": 11, "Cough": 10, "Diarrhoea": 10, "Product dose omission issue": 10, "Asthenia": 9, "COVID-19": 9, "SARS-CoV-2 test": 9, "Chest pain": 8, "Dyspnoea": 8, "Lymphadenopathy": 8, "Malaise": 8, "Tremor": 8, "Vaccination site warmth": 8, "Decreased appetite": 7, "Electrocardiogram": 7, "Expired product administered": 7, "Feeling hot": 7, "Hypoaesthesia": 7, "Influenza like illness": 7, "Product administered to patient of inappropriate age": 7, "Ageusia": 6, "Illness": 6, "Insomnia": 6, "Somnolence": 6, "Swelling": 6, "Abdominal discomfort": 5, "Anosmia": 5, "Back pain": 5, "Blood pressure measurement": 5, "Oropharyngeal pain": 5, "Paraesthesia": 5, "Rash pruritic": 5, "Swelling face": 5, "Underdose": 5, "Vaccination site mass": 5, "Vaccination site rash": 5, "Abdominal pain upper": 4, "Blood test": 4, "Feeling cold": 4, "Gait disturbance": 4, "Heart rate": 4, "Mechanical urticaria": 4, "Nasopharyngitis": 4, "Neck pain": 4, "Peripheral swelling": 4, "Visual impairment": 4, "Vomiting": 4, "Angioedema": 3, "Axillary pain": 3, "Burning sensation": 3, "Chest discomfort": 3, "Device connection issue": 3, "Dyspepsia": 3, "Dysphonia": 3, "Ear pruritus": 3, "Echocardiogram": 3, "Inflammation": 3, "Injection site erythema": 3, "Injection site swelling": 3, "Lethargy": 3, "Loss of consciousness": 3, "Lymph node pain": 3, "Mass": 3, "Maternal exposure during pregnancy": 3, "Muscle spasms": 3, "Myocardial infarction": 3, "Pregnancy test": 3, "Rash erythematous": 3, "Sinusitis": 3, "Skin discolouration": 3, "Sleep disorder": 3, "Therapeutic response unexpected": 3, "Tinnitus": 3, "Ultrasound scan": 3, "Vaccination complication": 3, "Vaccination site induration": 3, "Anxiety": 2, "Aphonia": 2, "Axillary mass": 2, "Bedridden": 2, "Bone pain": 2, "Cerebrovascular accident": 2, "Computerised tomogram": 2, "Craniocerebral injury": 2, "Diplopia": 2, "Discomfort": 2, "Drug ineffective": 2, "Dry mouth": 2, "Exposure during pregnancy": 2, "Flushing": 2, "Head discomfort": 2, "Head injury": 2, "Herpes zoster": 2, "Hyperhidrosis": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Hypertension": 2, "Inappropriate schedule of product administration": 2, "Incomplete course of vaccination": 2, "Incorrect route of product administration": 2, "Injection site mass": 2, "Injection site pain": 2, "Injection site pruritus": 2, "Injection site warmth": 2, "Limb discomfort": 2, "Lip pruritus": 2, "Loss of personal independence in daily activities": 2, "Macular degeneration": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Migraine": 2, "Mobility decreased": 2, "Nodule": 2, "Oral pruritus": 2, "Oxygen saturation": 2, "Palpitations": 2, "Pharyngeal swelling": 2, "Pneumonia": 2, "Rash macular": 2, "Rhinorrhoea": 2, "Sluggishness": 2, "Swelling of eyelid": 2, "Syncope": 2, "Tachycardia": 2, "Tenderness": 2, "Throat tightness": 2, "Vaccination site bruising": 2, "Vaccination site inflammation": 2, "Vaccination site movement impairment": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Vision blurred": 2, "Weight decreased": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Accidental underdose": 1, "Acute psychosis": 1, "Allergic respiratory disease": 1, "Antibody test": 1, "Atrial fibrillation": 1, "Bell's palsy": 1, "Biopsy": 1, "Blepharospasm": 1, "Blood pressure increased": 1, "Blue toe syndrome": 1, "Body temperature increased": 1, "Breast cancer metastatic": 1, "Breast pain": 1, "Breast tenderness": 1, "Bruxism": 1, "Cardiac failure congestive": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chest X-ray": 1, "Choking sensation": 1, "Cold sweat": 1, "Colonoscopy": 1, "Concussion": 1, "Condition aggravated": 1, "Confusional state": 1, "Conjunctival haemorrhage": 1, "Constipation": 1, "Contusion": 1, "Coronary artery dissection": 1, "Crying": 1, "Depression": 1, "Diaphragmatic paralysis": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Dizziness postural": 1, "Dry skin": 1, "Dry throat": 1, "Dysmenorrhoea": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eating disorder": 1, "Ejection fraction": 1, "Epistaxis": 1, "Eye haemorrhage": 1, "Eye irritation": 1, "Eye pain": 1, "Eye swelling": 1, "Feeling of body temperature change": 1, "Flatulence": 1, "Furuncle": 1, "Gastrointestinal disorder": 1, "General physical health deterioration": 1, "Generalised tonic-clonic seizure": 1, "Heart injury": 1, "Heart rate increased": 1, "Hot flush": 1, "Hyperchlorhydria": 1, "Hyperventilation": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Hypotension": 1, "Impaired quality of life": 1, "Increased appetite": 1, "Injection site hypoaesthesia": 1, "Injury": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Laboratory test": 1, "Lichen planus": 1, "Lip swelling": 1, "Lumbar puncture": 1, "Lung disorder": 1, "Macule": 1, "Mammogram": 1, "Maternal exposure during breast feeding": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental disability": 1, "Multiple allergies": 1, "Muscle strain": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal stiffness": 1, "Myocardial necrosis marker": 1, "Myokymia": 1, "Nasal congestion": 1, "Nervousness": 1, "Night sweats": 1, "Nightmare": 1, "Nocturnal dyspnoea": 1, "Ocular discomfort": 1, "Off label use": 1, "Oral candidiasis": 1, "Oxygen consumption": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Paratracheal lymphadenopathy": 1, "Periorbital swelling": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Postural orthostatic tachycardia syndrome": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product storage error": 1, "Psoriasis": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Scab": 1, "Scar": 1, "Sciatica": 1, "Screaming": 1, "Secretion discharge": 1, "Sensation of foreign body": 1, "Sinus pain": 1, "Speech disorder": 1, "Sputum discoloured": 1, "Stool analysis": 1, "Stress": 1, "Swollen tongue": 1, "Thirst": 1, "Throat irritation": 1, "Tinea pedis": 1, "Toothache": 1, "Tunnel vision": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Urticarial vasculitis": 1, "Vaccination site discharge": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haematoma": 1, "Vaccination site haemorrhage": 1, "Vaginal haemorrhage": 1, "Venous aneurysm": 1, "Viral test": 1, "X-ray": 1}, "batchcodes": ["025B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025BE18.json b/docs/data/histograms/United States/025BE18.json
index c78e21c2e5c..9e47c7ad9a7 100644
--- a/docs/data/histograms/United States/025BE18.json
+++ b/docs/data/histograms/United States/025BE18.json
@@ -1 +1 @@
-{"batchcode": "025BE18", "histograms": [{"batchcodes": ["025BE18"], "histogram": {"Insomnia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025BE18", "histograms": [{"histogram": {"Insomnia": 1, "Vaccination site pain": 1}, "batchcodes": ["025BE18"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025BL1A.json b/docs/data/histograms/United States/025BL1A.json
index 562bc4ded68..70f0dfa8924 100644
--- a/docs/data/histograms/United States/025BL1A.json
+++ b/docs/data/histograms/United States/025BL1A.json
@@ -1 +1 @@
-{"batchcode": "025BL1A", "histograms": [{"batchcodes": ["025BL1A"], "histogram": {"Back pain": 1, "Ear pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Toothache": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025BL1A", "histograms": [{"histogram": {"Back pain": 1, "Ear pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Toothache": 1, "Vaccination site pain": 1}, "batchcodes": ["025BL1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025BUN.json b/docs/data/histograms/United States/025BUN.json
index 729da677d5d..424d24e45dc 100644
--- a/docs/data/histograms/United States/025BUN.json
+++ b/docs/data/histograms/United States/025BUN.json
@@ -1 +1 @@
-{"batchcode": "025BUN", "histograms": [{"batchcodes": ["025BUN"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025BUN", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["025BUN"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025BZ1A.json b/docs/data/histograms/United States/025BZ1A.json
index 675a5588446..26517c36da3 100644
--- a/docs/data/histograms/United States/025BZ1A.json
+++ b/docs/data/histograms/United States/025BZ1A.json
@@ -1 +1 @@
-{"batchcode": "025BZ1A", "histograms": [{"batchcodes": ["025BZ1A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "025BZ1A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025C0A.json b/docs/data/histograms/United States/025C0A.json
index e1d113e8432..d072b1da03c 100644
--- a/docs/data/histograms/United States/025C0A.json
+++ b/docs/data/histograms/United States/025C0A.json
@@ -1 +1 @@
-{"batchcode": "025C0A", "histograms": [{"batchcodes": ["025C0A"], "histogram": {"Nasal congestion": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025C0A", "histograms": [{"histogram": {"Nasal congestion": 1, "Vaccination site pain": 1}, "batchcodes": ["025C0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025C20A.json b/docs/data/histograms/United States/025C20A.json
index 67b2c33b24c..4e621de2ce5 100644
--- a/docs/data/histograms/United States/025C20A.json
+++ b/docs/data/histograms/United States/025C20A.json
@@ -1 +1 @@
-{"batchcode": "025C20A", "histograms": [{"batchcodes": ["025C20A"], "histogram": {"Chest discomfort": 1, "Discomfort": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "025C20A", "histograms": [{"histogram": {"Chest discomfort": 1, "Discomfort": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1, "Throat tightness": 1}, "batchcodes": ["025C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025C21.json b/docs/data/histograms/United States/025C21.json
index bca037651b0..29a0779432e 100644
--- a/docs/data/histograms/United States/025C21.json
+++ b/docs/data/histograms/United States/025C21.json
@@ -1 +1 @@
-{"batchcode": "025C21", "histograms": [{"batchcodes": ["025C21"], "histogram": {"Illness": 1}}]}
\ No newline at end of file
+{"batchcode": "025C21", "histograms": [{"histogram": {"Illness": 1}, "batchcodes": ["025C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025C21A.json b/docs/data/histograms/United States/025C21A.json
index c283911a75f..eb17a627b71 100644
--- a/docs/data/histograms/United States/025C21A.json
+++ b/docs/data/histograms/United States/025C21A.json
@@ -1 +1 @@
-{"batchcode": "025C21A", "histograms": [{"batchcodes": ["025C21A", "EN6203"], "histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Vaccination site pain": 1}}, {"batchcodes": ["025C21A"], "histogram": {"Expired product administered": 23, "Headache": 18, "Pain in extremity": 16, "Fatigue": 14, "Vaccination site pain": 14, "Myalgia": 13, "Product temperature excursion issue": 13, "Poor quality product administered": 11, "Pyrexia": 11, "Feeling abnormal": 10, "Chills": 9, "Dizziness": 8, "Body temperature": 7, "Product storage error": 7, "Product dose omission issue": 6, "Inappropriate schedule of product administration": 5, "Insomnia": 5, "Nausea": 5, "Somnolence": 5, "Cough": 4, "Influenza like illness": 4, "Pain": 4, "Paraesthesia": 4, "Product administered to patient of inappropriate age": 4, "Vaccination site erythema": 4, "Accidental overdose": 3, "Anxiety": 3, "Arthralgia": 3, "Mobility decreased": 3, "SARS-CoV-2 test": 3, "Tinnitus": 3, "Urticaria": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Asthenia": 2, "Bedridden": 2, "COVID-19": 2, "Condition aggravated": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Dysstasia": 2, "Feeling hot": 2, "Flushing": 2, "Gait disturbance": 2, "Gait inability": 2, "Head discomfort": 2, "Illness": 2, "Incorrect dose administered": 2, "Interchange of vaccine products": 2, "Malaise": 2, "Muscle twitching": 2, "Muscular weakness": 2, "Nasal congestion": 2, "Neck pain": 2, "Palpitations": 2, "Pruritus": 2, "Rash": 2, "Sleep disorder": 2, "Tachycardia": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site induration": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Abdominal discomfort": 1, "Accidental underdose": 1, "Alanine aminotransferase": 1, "Anion gap": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Appendicitis": 1, "Aspartate aminotransferase": 1, "Axillary pain": 1, "Back pain": 1, "Balance disorder": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine": 1, "Blood glucagon": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bone pain": 1, "Bone swelling": 1, "Breast discomfort": 1, "Breast pain": 1, "Breast tenderness": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Cardiac stress test": 1, "Chapped lips": 1, "Chest discomfort": 1, "Chest pain": 1, "Confusional state": 1, "Device connection issue": 1, "Discomfort": 1, "Dizziness postural": 1, "Double stranded DNA antibody": 1, "Dyschezia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dysuria": 1, "Electric shock sensation": 1, "Electrophoresis protein": 1, "Energy increased": 1, "Eosinophil count": 1, "Erythema": 1, "Extra dose administered": 1, "Feeling cold": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Injection site atrophy": 1, "Injection site indentation": 1, "Injection site mass": 1, "Injection site nodule": 1, "Injection site oedema": 1, "Injection site warmth": 1, "Investigation": 1, "Lacrimation increased": 1, "Lip dry": 1, "Lip haemorrhage": 1, "Lip swelling": 1, "Lipoma": 1, "Lower limb fracture": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Migraine": 1, "Monocyte count": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neutrophil count": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Panic attack": 1, "Peripheral nerve lesion": 1, "Physical examination": 1, "Platelet count": 1, "Presyncope": 1, "Product administration error": 1, "Product dose omission in error": 1, "Product preparation error": 1, "Protein total": 1, "Protein total normal": 1, "Rash macular": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal pain": 1, "Rheumatoid factor": 1, "Scab": 1, "Seizure": 1, "Sinus disorder": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin mass": 1, "Sneezing": 1, "Suicidal ideation": 1, "Swelling": 1, "Swelling face": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat irritation": 1, "Ultrasound scan": 1, "Underdose": 1, "Upper respiratory tract infection": 1, "Urinary tract infection": 1, "Vaccination site discolouration": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vision blurred": 1, "Weight decreased": 1, "White blood cell count": 1}}]}
\ No newline at end of file
+{"batchcode": "025C21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Off label use": 1, "Vaccination site pain": 1}, "batchcodes": ["025C21A", "EN6203"]}, {"histogram": {"Expired product administered": 23, "Headache": 18, "Pain in extremity": 16, "Fatigue": 14, "Vaccination site pain": 14, "Myalgia": 13, "Product temperature excursion issue": 13, "Poor quality product administered": 11, "Pyrexia": 11, "Feeling abnormal": 10, "Chills": 9, "Dizziness": 8, "Body temperature": 7, "Product storage error": 7, "Product dose omission issue": 6, "Inappropriate schedule of product administration": 5, "Insomnia": 5, "Nausea": 5, "Somnolence": 5, "Cough": 4, "Influenza like illness": 4, "Pain": 4, "Paraesthesia": 4, "Product administered to patient of inappropriate age": 4, "Vaccination site erythema": 4, "Accidental overdose": 3, "Anxiety": 3, "Arthralgia": 3, "Mobility decreased": 3, "SARS-CoV-2 test": 3, "Tinnitus": 3, "Urticaria": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Asthenia": 2, "Bedridden": 2, "COVID-19": 2, "Condition aggravated": 2, "Diarrhoea": 2, "Dyspnoea": 2, "Dysstasia": 2, "Feeling hot": 2, "Flushing": 2, "Gait disturbance": 2, "Gait inability": 2, "Head discomfort": 2, "Illness": 2, "Incorrect dose administered": 2, "Interchange of vaccine products": 2, "Malaise": 2, "Muscle twitching": 2, "Muscular weakness": 2, "Nasal congestion": 2, "Neck pain": 2, "Palpitations": 2, "Pruritus": 2, "Rash": 2, "Sleep disorder": 2, "Tachycardia": 2, "Tremor": 2, "Vaccination complication": 2, "Vaccination site induration": 2, "Vaccination site pruritus": 2, "Vaccination site swelling": 2, "Abdominal discomfort": 1, "Accidental underdose": 1, "Alanine aminotransferase": 1, "Anion gap": 1, "Antibody test": 1, "Antinuclear antibody": 1, "Appendicitis": 1, "Aspartate aminotransferase": 1, "Axillary pain": 1, "Back pain": 1, "Balance disorder": 1, "Basophil count": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatine": 1, "Blood glucagon": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bone pain": 1, "Bone swelling": 1, "Breast discomfort": 1, "Breast pain": 1, "Breast tenderness": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Cardiac stress test": 1, "Chapped lips": 1, "Chest discomfort": 1, "Chest pain": 1, "Confusional state": 1, "Device connection issue": 1, "Discomfort": 1, "Dizziness postural": 1, "Double stranded DNA antibody": 1, "Dyschezia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dysuria": 1, "Electric shock sensation": 1, "Electrophoresis protein": 1, "Energy increased": 1, "Eosinophil count": 1, "Erythema": 1, "Extra dose administered": 1, "Feeling cold": 1, "Haematocrit": 1, "Haemoglobin": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Injection site atrophy": 1, "Injection site indentation": 1, "Injection site mass": 1, "Injection site nodule": 1, "Injection site oedema": 1, "Injection site warmth": 1, "Investigation": 1, "Lacrimation increased": 1, "Lip dry": 1, "Lip haemorrhage": 1, "Lip swelling": 1, "Lipoma": 1, "Lower limb fracture": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Memory impairment": 1, "Migraine": 1, "Monocyte count": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neutrophil count": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Panic attack": 1, "Peripheral nerve lesion": 1, "Physical examination": 1, "Platelet count": 1, "Presyncope": 1, "Product administration error": 1, "Product dose omission in error": 1, "Product preparation error": 1, "Protein total": 1, "Protein total normal": 1, "Rash macular": 1, "Red blood cell sedimentation rate": 1, "Red cell distribution width": 1, "Renal pain": 1, "Rheumatoid factor": 1, "Scab": 1, "Seizure": 1, "Sinus disorder": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin mass": 1, "Sneezing": 1, "Suicidal ideation": 1, "Swelling": 1, "Swelling face": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat irritation": 1, "Ultrasound scan": 1, "Underdose": 1, "Upper respiratory tract infection": 1, "Urinary tract infection": 1, "Vaccination site discolouration": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vision blurred": 1, "Weight decreased": 1, "White blood cell count": 1}, "batchcodes": ["025C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025C2IA.json b/docs/data/histograms/United States/025C2IA.json
index 66e57c83efb..b3b1301de58 100644
--- a/docs/data/histograms/United States/025C2IA.json
+++ b/docs/data/histograms/United States/025C2IA.json
@@ -1 +1 @@
-{"batchcode": "025C2IA", "histograms": [{"batchcodes": ["025C2IA"], "histogram": {"Decreased appetite": 1, "Erythema": 1, "Rash": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025C2IA", "histograms": [{"histogram": {"Decreased appetite": 1, "Erythema": 1, "Rash": 1, "Vaccination site pain": 1}, "batchcodes": ["025C2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025D2049.json b/docs/data/histograms/United States/025D2049.json
index b914032998e..2749e294378 100644
--- a/docs/data/histograms/United States/025D2049.json
+++ b/docs/data/histograms/United States/025D2049.json
@@ -1 +1 @@
-{"batchcode": "025D2049", "histograms": [{"batchcodes": ["025D2049"], "histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Condition aggravated": 1, "Fatigue": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Headache": 1, "Insomnia": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Pain": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "025D2049", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthralgia": 1, "Condition aggravated": 1, "Fatigue": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Headache": 1, "Insomnia": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Pain": 1, "Weight decreased": 1}, "batchcodes": ["025D2049"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025D21A.json b/docs/data/histograms/United States/025D21A.json
index 2e1aa4d0121..a9dbe10a5a1 100644
--- a/docs/data/histograms/United States/025D21A.json
+++ b/docs/data/histograms/United States/025D21A.json
@@ -1 +1 @@
-{"batchcode": "025D21A", "histograms": [{"batchcodes": ["025D21A"], "histogram": {"Expired product administered": 4, "Pain in extremity": 4, "Headache": 3, "Chills": 2, "Fatigue": 2, "Heart rate": 2, "Pain": 2, "Pyrexia": 2, "Vaccination complication": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eye pruritus": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Palpitations": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Sneezing": 1, "Somnolence": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025D21A", "histograms": [{"histogram": {"Expired product administered": 4, "Pain in extremity": 4, "Headache": 3, "Chills": 2, "Fatigue": 2, "Heart rate": 2, "Pain": 2, "Pyrexia": 2, "Vaccination complication": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Blood pressure fluctuation": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Eye pruritus": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Flushing": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Hot flush": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Incorrect route of product administration": 1, "Influenza": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Ocular hyperaemia": 1, "Palpitations": 1, "Pruritus": 1, "Rhinorrhoea": 1, "Sneezing": 1, "Somnolence": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["025D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025G20-2A.json b/docs/data/histograms/United States/025G20-2A.json
index 24b0228d3f4..1bc3bdd2069 100644
--- a/docs/data/histograms/United States/025G20-2A.json
+++ b/docs/data/histograms/United States/025G20-2A.json
@@ -1 +1 @@
-{"batchcode": "025G20-2A", "histograms": [{"batchcodes": ["025G20-2A"], "histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Incorrect dose administered": 1, "Product administration error": 1}}]}
\ No newline at end of file
+{"batchcode": "025G20-2A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Diarrhoea": 1, "Incorrect dose administered": 1, "Product administration error": 1}, "batchcodes": ["025G20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025G20.json b/docs/data/histograms/United States/025G20.json
index e6898293d12..7860af9d7f2 100644
--- a/docs/data/histograms/United States/025G20.json
+++ b/docs/data/histograms/United States/025G20.json
@@ -1 +1 @@
-{"batchcode": "025G20", "histograms": [{"batchcodes": ["025G20"], "histogram": {"Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "025G20", "histograms": [{"histogram": {"Vaccination site pain": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1}, "batchcodes": ["025G20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025G202A.json b/docs/data/histograms/United States/025G202A.json
index d4e07540495..e5bec6711a1 100644
--- a/docs/data/histograms/United States/025G202A.json
+++ b/docs/data/histograms/United States/025G202A.json
@@ -1 +1 @@
-{"batchcode": "025G202A", "histograms": [{"batchcodes": ["025G202A"], "histogram": {"Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "025G202A", "histograms": [{"histogram": {"Thrombosis": 1}, "batchcodes": ["025G202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025G20A.json b/docs/data/histograms/United States/025G20A.json
index 6b7aea8eeb3..9598caba7d8 100644
--- a/docs/data/histograms/United States/025G20A.json
+++ b/docs/data/histograms/United States/025G20A.json
@@ -1 +1 @@
-{"batchcode": "025G20A", "histograms": [{"batchcodes": ["025G20A"], "histogram": {"Aphonia": 1, "Chills": 1, "Cold sweat": 1, "Headache": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Night sweats": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025G20A", "histograms": [{"histogram": {"Aphonia": 1, "Chills": 1, "Cold sweat": 1, "Headache": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Night sweats": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["025G20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025H20-2A.json b/docs/data/histograms/United States/025H20-2A.json
index b990ff41bbb..02c163a8db2 100644
--- a/docs/data/histograms/United States/025H20-2A.json
+++ b/docs/data/histograms/United States/025H20-2A.json
@@ -1 +1 @@
-{"batchcode": "025H20-2A", "histograms": [{"batchcodes": ["025H20-2A"], "histogram": {"Asthenia": 1, "Chest discomfort": 1, "Dizziness": 1, "Dysgeusia": 1, "Flushing": 1, "Hypersensitivity": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "025H20-2A", "histograms": [{"histogram": {"Asthenia": 1, "Chest discomfort": 1, "Dizziness": 1, "Dysgeusia": 1, "Flushing": 1, "Hypersensitivity": 1, "Palpitations": 1}, "batchcodes": ["025H20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025H21A.json b/docs/data/histograms/United States/025H21A.json
index d2b0bb8deba..fa2f85db992 100644
--- a/docs/data/histograms/United States/025H21A.json
+++ b/docs/data/histograms/United States/025H21A.json
@@ -1 +1 @@
-{"batchcode": "025H21A", "histograms": [{"batchcodes": ["025H21A"], "histogram": {"Product dose omission issue": 1, "Therapeutic response unexpected": 1}}]}
\ No newline at end of file
+{"batchcode": "025H21A", "histograms": [{"histogram": {"Product dose omission issue": 1, "Therapeutic response unexpected": 1}, "batchcodes": ["025H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025H21H.json b/docs/data/histograms/United States/025H21H.json
index f602a51b8fe..013dc692014 100644
--- a/docs/data/histograms/United States/025H21H.json
+++ b/docs/data/histograms/United States/025H21H.json
@@ -1 +1 @@
-{"batchcode": "025H21H", "histograms": [{"batchcodes": ["025H21H"], "histogram": {"Arthralgia": 1, "Malaise": 1, "Neck pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "025H21H", "histograms": [{"histogram": {"Arthralgia": 1, "Malaise": 1, "Neck pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["025H21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025I20A.json b/docs/data/histograms/United States/025I20A.json
index dfaeff141bc..9cad9edc0fb 100644
--- a/docs/data/histograms/United States/025I20A.json
+++ b/docs/data/histograms/United States/025I20A.json
@@ -1 +1 @@
-{"batchcode": "025I20A", "histograms": [{"batchcodes": ["025I20A"], "histogram": {"Fatigue": 3, "Nausea": 3, "Chills": 2, "Exposure during pregnancy": 2, "Myalgia": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Ageusia": 1, "Anosmia": 1, "Blood test": 1, "Body temperature": 1, "Diarrhoea": 1, "Headache": 1, "Hot flush": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pain": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Rash": 1, "Scan": 1, "Ultrasound scan": 1, "Vaccination site pruritus": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025I20A", "histograms": [{"histogram": {"Fatigue": 3, "Nausea": 3, "Chills": 2, "Exposure during pregnancy": 2, "Myalgia": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Ageusia": 1, "Anosmia": 1, "Blood test": 1, "Body temperature": 1, "Diarrhoea": 1, "Headache": 1, "Hot flush": 1, "Inappropriate schedule of product administration": 1, "Injection site erythema": 1, "Injection site pain": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Rash": 1, "Scan": 1, "Ultrasound scan": 1, "Vaccination site pruritus": 1, "Vomiting": 1}, "batchcodes": ["025I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J OR L20A.json b/docs/data/histograms/United States/025J OR L20A.json
index a25fa691c85..d711e27abac 100644
--- a/docs/data/histograms/United States/025J OR L20A.json
+++ b/docs/data/histograms/United States/025J OR L20A.json
@@ -1 +1 @@
-{"batchcode": "025J OR L20A", "histograms": [{"batchcodes": ["025J OR L20A"], "histogram": {"COVID-19": 1, "Electrocardiogram": 1, "Heart rate irregular": 1, "Palpitations": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "025J OR L20A", "histograms": [{"histogram": {"COVID-19": 1, "Electrocardiogram": 1, "Heart rate irregular": 1, "Palpitations": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025J OR L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J-20-2A.json b/docs/data/histograms/United States/025J-20-2A.json
index 6f277a66fed..6626b680592 100644
--- a/docs/data/histograms/United States/025J-20-2A.json
+++ b/docs/data/histograms/United States/025J-20-2A.json
@@ -1 +1 @@
-{"batchcode": "025J-20-2A", "histograms": [{"batchcodes": ["025J-20-2A"], "histogram": {"Headache": 1, "Injection site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025J-20-2A", "histograms": [{"histogram": {"Headache": 1, "Injection site swelling": 1}, "batchcodes": ["025J-20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J-20A.json b/docs/data/histograms/United States/025J-20A.json
index 14986528b9d..39ded01c359 100644
--- a/docs/data/histograms/United States/025J-20A.json
+++ b/docs/data/histograms/United States/025J-20A.json
@@ -1 +1 @@
-{"batchcode": "025J-20A", "histograms": [{"batchcodes": ["025J-20A"], "histogram": {"Headache": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025J-20A", "histograms": [{"histogram": {"Headache": 1, "Lymphadenopathy": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["025J-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J00/NA.json b/docs/data/histograms/United States/025J00/NA.json
index 80aca71392d..b1f8eb3c525 100644
--- a/docs/data/histograms/United States/025J00/NA.json
+++ b/docs/data/histograms/United States/025J00/NA.json
@@ -1 +1 @@
-{"batchcode": "025J00/NA", "histograms": [{"batchcodes": ["025J00/NA"], "histogram": {"Eye pruritus": 1, "Eye swelling": 1, "Haematochezia": 1}}]}
\ No newline at end of file
+{"batchcode": "025J00/NA", "histograms": [{"histogram": {"Eye pruritus": 1, "Eye swelling": 1, "Haematochezia": 1}, "batchcodes": ["025J00/NA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J020A.json b/docs/data/histograms/United States/025J020A.json
index d0dfda69d84..233991bf634 100644
--- a/docs/data/histograms/United States/025J020A.json
+++ b/docs/data/histograms/United States/025J020A.json
@@ -1 +1 @@
-{"batchcode": "025J020A", "histograms": [{"batchcodes": ["025J020A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J020A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["025J020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J02A.json b/docs/data/histograms/United States/025J02A.json
index 59877c23499..6498e542d29 100644
--- a/docs/data/histograms/United States/025J02A.json
+++ b/docs/data/histograms/United States/025J02A.json
@@ -1 +1 @@
-{"batchcode": "025J02A", "histograms": [{"batchcodes": ["025J02A"], "histogram": {"Pyrexia": 3, "Fatigue": 2, "Vaccination site pain": 2, "COVID-19": 1, "Decreased appetite": 1, "Exposure via breast milk": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Nasal congestion": 1, "Nausea": 1, "Pain": 1, "Urticaria": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "025J02A", "histograms": [{"histogram": {"Pyrexia": 3, "Fatigue": 2, "Vaccination site pain": 2, "COVID-19": 1, "Decreased appetite": 1, "Exposure via breast milk": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Nasal congestion": 1, "Nausea": 1, "Pain": 1, "Urticaria": 1, "Vaccination site rash": 1}, "batchcodes": ["025J02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2-02A.json b/docs/data/histograms/United States/025J2-02A.json
index be5f606fdf8..d2e2562c3bb 100644
--- a/docs/data/histograms/United States/025J2-02A.json
+++ b/docs/data/histograms/United States/025J2-02A.json
@@ -1 +1 @@
-{"batchcode": "025J2-02A", "histograms": [{"batchcodes": ["025J2-02A"], "histogram": {"Body temperature": 1, "Bone pain": 1, "Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2-02A", "histograms": [{"histogram": {"Body temperature": 1, "Bone pain": 1, "Chills": 1, "Pyrexia": 1}, "batchcodes": ["025J2-02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-2.json b/docs/data/histograms/United States/025J20-2.json
index ca0364acb49..638fec08245 100644
--- a/docs/data/histograms/United States/025J20-2.json
+++ b/docs/data/histograms/United States/025J20-2.json
@@ -1 +1 @@
-{"batchcode": "025J20-2", "histograms": [{"batchcodes": ["025J20-2"], "histogram": {"Injection site pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-2", "histograms": [{"histogram": {"Injection site pain": 1, "Vaccination site pain": 1}, "batchcodes": ["025J20-2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-20A.json b/docs/data/histograms/United States/025J20-20A.json
index 07179e11656..1b4878228f8 100644
--- a/docs/data/histograms/United States/025J20-20A.json
+++ b/docs/data/histograms/United States/025J20-20A.json
@@ -1 +1 @@
-{"batchcode": "025J20-20A", "histograms": [{"batchcodes": ["025J20-20A"], "histogram": {"Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Exposure during pregnancy": 1, "Limb discomfort": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Prenatal screening test": 1, "Product administered to patient of inappropriate age": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-20A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Abdominal pain upper": 1, "Chills": 1, "Exposure during pregnancy": 1, "Limb discomfort": 1, "Muscle spasms": 1, "Nasopharyngitis": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Prenatal screening test": 1, "Product administered to patient of inappropriate age": 1, "Tremor": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["025J20-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-21.json b/docs/data/histograms/United States/025J20-21.json
index bcd49deab3c..e9644b80914 100644
--- a/docs/data/histograms/United States/025J20-21.json
+++ b/docs/data/histograms/United States/025J20-21.json
@@ -1 +1 @@
-{"batchcode": "025J20-21", "histograms": [{"batchcodes": ["025J20-21"], "histogram": {"Chills": 1, "Fatigue": 1, "Insomnia": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-21", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Insomnia": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["025J20-21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-219.json b/docs/data/histograms/United States/025J20-219.json
index 5d546c5e9e0..8a8c0332ff9 100644
--- a/docs/data/histograms/United States/025J20-219.json
+++ b/docs/data/histograms/United States/025J20-219.json
@@ -1 +1 @@
-{"batchcode": "025J20-219", "histograms": [{"batchcodes": ["025J20-219"], "histogram": {"Joint range of motion decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-219", "histograms": [{"histogram": {"Joint range of motion decreased": 1}, "batchcodes": ["025J20-219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-219/4.json b/docs/data/histograms/United States/025J20-219/4.json
index ce9e452f10a..04ec3f2a930 100644
--- a/docs/data/histograms/United States/025J20-219/4.json
+++ b/docs/data/histograms/United States/025J20-219/4.json
@@ -1 +1 @@
-{"batchcode": "025J20-219/4", "histograms": [{"batchcodes": ["025J20-219/4"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-219/4", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["025J20-219/4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-24.json b/docs/data/histograms/United States/025J20-24.json
index 12947ff7745..93bf3e985bb 100644
--- a/docs/data/histograms/United States/025J20-24.json
+++ b/docs/data/histograms/United States/025J20-24.json
@@ -1 +1 @@
-{"batchcode": "025J20-24", "histograms": [{"batchcodes": ["025J20-24"], "histogram": {"Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-24", "histograms": [{"histogram": {"Injection site pain": 1}, "batchcodes": ["025J20-24"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-2A (NOT.json b/docs/data/histograms/United States/025J20-2A (NOT.json
index 44e292b7819..807ec1d9e71 100644
--- a/docs/data/histograms/United States/025J20-2A (NOT.json
+++ b/docs/data/histograms/United States/025J20-2A (NOT.json
@@ -1 +1 @@
-{"batchcode": "025J20-2A (NOT", "histograms": [{"batchcodes": ["025J20-2A (NOT"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-2A (NOT", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["025J20-2A (NOT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-2A / 025.json b/docs/data/histograms/United States/025J20-2A / 025.json
index 004aef97f9a..783626b3e74 100644
--- a/docs/data/histograms/United States/025J20-2A / 025.json
+++ b/docs/data/histograms/United States/025J20-2A / 025.json
@@ -1 +1 @@
-{"batchcode": "025J20-2A / 025", "histograms": [{"batchcodes": ["025J20-2A / 025"], "histogram": {"Poor quality product administered": 590, "Product storage error": 590, "Product temperature excursion issue": 590}}]}
\ No newline at end of file
+{"batchcode": "025J20-2A / 025", "histograms": [{"histogram": {"Poor quality product administered": 590, "Product storage error": 590, "Product temperature excursion issue": 590}, "batchcodes": ["025J20-2A / 025"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-2A..json b/docs/data/histograms/United States/025J20-2A..json
index 9b988e93e88..64f9980d2a6 100644
--- a/docs/data/histograms/United States/025J20-2A..json
+++ b/docs/data/histograms/United States/025J20-2A..json
@@ -1 +1 @@
-{"batchcode": "025J20-2A.", "histograms": [{"batchcodes": ["025J20-2A."], "histogram": {"Injection site pain": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-2A.", "histograms": [{"histogram": {"Injection site pain": 1, "Myalgia": 1}, "batchcodes": ["025J20-2A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-2A.json b/docs/data/histograms/United States/025J20-2A.json
index bf0352f0d91..2b185d2e1a9 100644
--- a/docs/data/histograms/United States/025J20-2A.json
+++ b/docs/data/histograms/United States/025J20-2A.json
@@ -1 +1 @@
-{"batchcode": "025J20-2A", "histograms": [{"batchcodes": ["025J20-2A"], "histogram": {"Fatigue": 39, "Pain in extremity": 33, "Vaccination site pain": 33, "Headache": 31, "Vaccination site erythema": 26, "Dizziness": 25, "Myalgia": 24, "Pyrexia": 23, "Chills": 19, "Product storage error": 19, "Pruritus": 19, "Nausea": 16, "Pain": 16, "Vaccination site swelling": 16, "Expired product administered": 15, "Vaccination site pruritus": 15, "Arthralgia": 12, "Maternal exposure during pregnancy": 11, "Vaccination site rash": 11, "Vaccination site warmth": 11, "Dyspnoea": 10, "Lymphadenopathy": 10, "Rash": 10, "Urticaria": 10, "Body temperature": 9, "Inappropriate schedule of product administration": 9, "Asthenia": 8, "Blood pressure measurement": 8, "Hypersensitivity": 8, "Incorrect dose administered": 8, "Palpitations": 7, "Diarrhoea": 6, "Erythema": 6, "Feeling abnormal": 6, "Heart rate": 6, "Hypertension": 6, "Influenza like illness": 6, "Injection site erythema": 6, "Injection site pain": 6, "Injection site pruritus": 6, "Injection site swelling": 6, "Peripheral swelling": 6, "Pregnancy test": 6, "COVID-19": 5, "Feeling hot": 5, "Injection site warmth": 5, "Limb discomfort": 5, "Vaccination site induration": 5, "Electrocardiogram": 4, "Exposure during pregnancy": 4, "Flushing": 4, "Hyperhidrosis": 4, "Hypoaesthesia": 4, "Malaise": 4, "Oropharyngeal pain": 4, "Paraesthesia": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 test": 4, "Tachycardia": 4, "Balance disorder": 3, "Blister": 3, "Blood test": 3, "Chest pain": 3, "Condition aggravated": 3, "Confusional state": 3, "Cough": 3, "Decreased appetite": 3, "Heart rate increased": 3, "Hypersomnia": 3, "Lethargy": 3, "Muscular weakness": 3, "Neck pain": 3, "Product dose omission issue": 3, "SARS-CoV-2 test positive": 3, "Throat irritation": 3, "Vaccination site reaction": 3, "Abdominal discomfort": 2, "Abdominal pain upper": 2, "Alanine aminotransferase": 2, "Anxiety": 2, "Aspartate aminotransferase": 2, "Autoimmune disorder": 2, "Basophil count": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood potassium": 2, "Blood pressure increased": 2, "Blood sodium": 2, "Blood thyroid stimulating hormone": 2, "Blood urea": 2, "Bone pain": 2, "Carbon dioxide": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Contusion": 2, "Dry mouth": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Eosinophil count": 2, "Exposure via skin contact": 2, "Feeling of body temperature change": 2, "Glucose tolerance test": 2, "Haematocrit": 2, "Haemoglobin": 2, "Injection site mass": 2, "Injection site rash": 2, "Lymph node pain": 2, "Lymphocyte count": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Mean platelet volume": 2, "Monocyte count": 2, "Muscle fatigue": 2, "Nasal congestion": 2, "Neuralgia": 2, "Neutrophil count": 2, "No adverse event": 2, "Paraesthesia oral": 2, "Pharyngeal swelling": 2, "Platelet count": 2, "Product administered at inappropriate site": 2, "Rash erythematous": 2, "Rash papular": 2, "Red blood cell count": 2, "Respiratory rate": 2, "Rhinorrhoea": 2, "Skin irritation": 2, "Skin warm": 2, "Somnolence": 2, "Swelling": 2, "Swelling face": 2, "Syringe issue": 2, "Tenderness": 2, "Tremor": 2, "Ultrasound scan": 2, "Vaccination complication": 2, "Vertigo": 2, "Vision blurred": 2, "Visual impairment": 2, "Vomiting": 2, "White blood cell count": 2, "Wrong product administered": 2, "Abdominal X-ray": 1, "Accidental underdose": 1, "Administration site discolouration": 1, "Ageusia": 1, "Albumin globulin ratio": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Arrhythmia": 1, "Autoscopy": 1, "Axillary mass": 1, "Back pain": 1, "Blindness": 1, "Blood cholesterol": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood triglycerides": 1, "Blood urea nitrogen/creatinine ratio": 1, "Breast engorgement": 1, "Breast pain": 1, "Breast tenderness": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Computerised tomogram normal": 1, "Constipation": 1, "Cyanopsia": 1, "Dehydration": 1, "Delusion": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug ineffective": 1, "EGFR status assay": 1, "Ear pain": 1, "Eczema": 1, "Electrocardiogram normal": 1, "Electronystagmogram": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Extra dose administered": 1, "Eye pain": 1, "Eye swelling": 1, "Facial pain": 1, "Fall": 1, "Fear": 1, "Feeling cold": 1, "Full blood count normal": 1, "Gait disturbance": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hypoaesthesia oral": 1, "Immature granulocyte count": 1, "Induration": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Injection site urticaria": 1, "Injury": 1, "Insomnia": 1, "Intentional dose omission": 1, "Laboratory test normal": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymph node palpable": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging normal": 1, "Mass": 1, "Maternal exposure before pregnancy": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Mental fatigue": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Needle issue": 1, "Neurological symptom": 1, "Nucleated red cells": 1, "Nystagmus": 1, "Off label use": 1, "Oropharyngeal discomfort": 1, "Oversensing": 1, "Oxygen saturation decreased": 1, "Pain of skin": 1, "Painful respiration": 1, "Parakeratosis": 1, "Photopsia": 1, "Poor quality product administered": 1, "Presyncope": 1, "Product expiration date issue": 1, "Product temperature excursion issue": 1, "Protein albumin ratio": 1, "Protein total": 1, "Rash pruritic": 1, "Rash pustular": 1, "Red cell distribution width": 1, "Red cell distribution width increased": 1, "Retinal haemorrhage": 1, "Retinal vascular occlusion": 1, "Rheumatoid arthritis": 1, "Rhinitis allergic": 1, "Salivary hypersecretion": 1, "Scab": 1, "Skin abrasion": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin haemorrhage": 1, "Skin induration": 1, "Skin tightness": 1, "Supraventricular tachycardia": 1, "Syncope": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Tinnitus": 1, "Ultrasound scan normal": 1, "Unevaluable event": 1, "VIIIth nerve injury": 1, "Vaccination site cellulitis": 1, "Vaccination site irritation": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site scar": 1, "Vaccination site urticaria": 1, "Very low density lipoprotein": 1, "Vulvovaginal pain": 1, "Weight decreased": 1, "X-ray normal": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-2A", "histograms": [{"histogram": {"Fatigue": 39, "Pain in extremity": 33, "Vaccination site pain": 33, "Headache": 31, "Vaccination site erythema": 26, "Dizziness": 25, "Myalgia": 24, "Pyrexia": 23, "Chills": 19, "Product storage error": 19, "Pruritus": 19, "Nausea": 16, "Pain": 16, "Vaccination site swelling": 16, "Expired product administered": 15, "Vaccination site pruritus": 15, "Arthralgia": 12, "Maternal exposure during pregnancy": 11, "Vaccination site rash": 11, "Vaccination site warmth": 11, "Dyspnoea": 10, "Lymphadenopathy": 10, "Rash": 10, "Urticaria": 10, "Body temperature": 9, "Inappropriate schedule of product administration": 9, "Asthenia": 8, "Blood pressure measurement": 8, "Hypersensitivity": 8, "Incorrect dose administered": 8, "Palpitations": 7, "Diarrhoea": 6, "Erythema": 6, "Feeling abnormal": 6, "Heart rate": 6, "Hypertension": 6, "Influenza like illness": 6, "Injection site erythema": 6, "Injection site pain": 6, "Injection site pruritus": 6, "Injection site swelling": 6, "Peripheral swelling": 6, "Pregnancy test": 6, "COVID-19": 5, "Feeling hot": 5, "Injection site warmth": 5, "Limb discomfort": 5, "Vaccination site induration": 5, "Electrocardiogram": 4, "Exposure during pregnancy": 4, "Flushing": 4, "Hyperhidrosis": 4, "Hypoaesthesia": 4, "Malaise": 4, "Oropharyngeal pain": 4, "Paraesthesia": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 test": 4, "Tachycardia": 4, "Balance disorder": 3, "Blister": 3, "Blood test": 3, "Chest pain": 3, "Condition aggravated": 3, "Confusional state": 3, "Cough": 3, "Decreased appetite": 3, "Heart rate increased": 3, "Hypersomnia": 3, "Lethargy": 3, "Muscular weakness": 3, "Neck pain": 3, "Product dose omission issue": 3, "SARS-CoV-2 test positive": 3, "Throat irritation": 3, "Vaccination site reaction": 3, "Abdominal discomfort": 2, "Abdominal pain upper": 2, "Alanine aminotransferase": 2, "Anxiety": 2, "Aspartate aminotransferase": 2, "Autoimmune disorder": 2, "Basophil count": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood glucose": 2, "Blood potassium": 2, "Blood pressure increased": 2, "Blood sodium": 2, "Blood thyroid stimulating hormone": 2, "Blood urea": 2, "Bone pain": 2, "Carbon dioxide": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Contusion": 2, "Dry mouth": 2, "Dysgeusia": 2, "Ear discomfort": 2, "Eosinophil count": 2, "Exposure via skin contact": 2, "Feeling of body temperature change": 2, "Glucose tolerance test": 2, "Haematocrit": 2, "Haemoglobin": 2, "Injection site mass": 2, "Injection site rash": 2, "Lymph node pain": 2, "Lymphocyte count": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Mean platelet volume": 2, "Monocyte count": 2, "Muscle fatigue": 2, "Nasal congestion": 2, "Neuralgia": 2, "Neutrophil count": 2, "No adverse event": 2, "Paraesthesia oral": 2, "Pharyngeal swelling": 2, "Platelet count": 2, "Product administered at inappropriate site": 2, "Rash erythematous": 2, "Rash papular": 2, "Red blood cell count": 2, "Respiratory rate": 2, "Rhinorrhoea": 2, "Skin irritation": 2, "Skin warm": 2, "Somnolence": 2, "Swelling": 2, "Swelling face": 2, "Syringe issue": 2, "Tenderness": 2, "Tremor": 2, "Ultrasound scan": 2, "Vaccination complication": 2, "Vertigo": 2, "Vision blurred": 2, "Visual impairment": 2, "Vomiting": 2, "White blood cell count": 2, "Wrong product administered": 2, "Abdominal X-ray": 1, "Accidental underdose": 1, "Administration site discolouration": 1, "Ageusia": 1, "Albumin globulin ratio": 1, "Alopecia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Arrhythmia": 1, "Autoscopy": 1, "Axillary mass": 1, "Back pain": 1, "Blindness": 1, "Blood cholesterol": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood triglycerides": 1, "Blood urea nitrogen/creatinine ratio": 1, "Breast engorgement": 1, "Breast pain": 1, "Breast tenderness": 1, "Cardiac flutter": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Computerised tomogram normal": 1, "Constipation": 1, "Cyanopsia": 1, "Dehydration": 1, "Delusion": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug ineffective": 1, "EGFR status assay": 1, "Ear pain": 1, "Eczema": 1, "Electrocardiogram normal": 1, "Electronystagmogram": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Extra dose administered": 1, "Eye pain": 1, "Eye swelling": 1, "Facial pain": 1, "Fall": 1, "Fear": 1, "Feeling cold": 1, "Full blood count normal": 1, "Gait disturbance": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Herpes zoster": 1, "High density lipoprotein": 1, "Hot flush": 1, "Human chorionic gonadotropin": 1, "Hypoaesthesia oral": 1, "Immature granulocyte count": 1, "Induration": 1, "Injection site haemorrhage": 1, "Injection site induration": 1, "Injection site urticaria": 1, "Injury": 1, "Insomnia": 1, "Intentional dose omission": 1, "Laboratory test normal": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Low density lipoprotein": 1, "Lymph node palpable": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging normal": 1, "Mass": 1, "Maternal exposure before pregnancy": 1, "Maternal exposure during breast feeding": 1, "Mean cell haemoglobin": 1, "Mental fatigue": 1, "Muscle spasms": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Needle issue": 1, "Neurological symptom": 1, "Nucleated red cells": 1, "Nystagmus": 1, "Off label use": 1, "Oropharyngeal discomfort": 1, "Oversensing": 1, "Oxygen saturation decreased": 1, "Pain of skin": 1, "Painful respiration": 1, "Parakeratosis": 1, "Photopsia": 1, "Poor quality product administered": 1, "Presyncope": 1, "Product expiration date issue": 1, "Product temperature excursion issue": 1, "Protein albumin ratio": 1, "Protein total": 1, "Rash pruritic": 1, "Rash pustular": 1, "Red cell distribution width": 1, "Red cell distribution width increased": 1, "Retinal haemorrhage": 1, "Retinal vascular occlusion": 1, "Rheumatoid arthritis": 1, "Rhinitis allergic": 1, "Salivary hypersecretion": 1, "Scab": 1, "Skin abrasion": 1, "Skin burning sensation": 1, "Skin discomfort": 1, "Skin haemorrhage": 1, "Skin induration": 1, "Skin tightness": 1, "Supraventricular tachycardia": 1, "Syncope": 1, "Therapeutic response unexpected": 1, "Thrombosis": 1, "Tinnitus": 1, "Ultrasound scan normal": 1, "Unevaluable event": 1, "VIIIth nerve injury": 1, "Vaccination site cellulitis": 1, "Vaccination site irritation": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site scar": 1, "Vaccination site urticaria": 1, "Very low density lipoprotein": 1, "Vulvovaginal pain": 1, "Weight decreased": 1, "X-ray normal": 1, "Yawning": 1}, "batchcodes": ["025J20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-2ALCHD.json b/docs/data/histograms/United States/025J20-2ALCHD.json
index bf7f0582f52..bd8ae1149f5 100644
--- a/docs/data/histograms/United States/025J20-2ALCHD.json
+++ b/docs/data/histograms/United States/025J20-2ALCHD.json
@@ -1 +1 @@
-{"batchcode": "025J20-2ALCHD", "histograms": [{"batchcodes": ["025J20-2ALCHD"], "histogram": {"Fatigue": 1, "Headache": 1, "Nausea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-2ALCHD", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Nausea": 1, "Vaccination site pain": 1}, "batchcodes": ["025J20-2ALCHD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-A.json b/docs/data/histograms/United States/025J20-A.json
index 04d6fef91a3..0b857d030ea 100644
--- a/docs/data/histograms/United States/025J20-A.json
+++ b/docs/data/histograms/United States/025J20-A.json
@@ -1 +1 @@
-{"batchcode": "025J20-A", "histograms": [{"batchcodes": ["025J20-A"], "histogram": {"Influenza like illness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-A", "histograms": [{"histogram": {"Influenza like illness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["025J20-A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20-ZA.json b/docs/data/histograms/United States/025J20-ZA.json
index f2eccb9a9a7..ad857070356 100644
--- a/docs/data/histograms/United States/025J20-ZA.json
+++ b/docs/data/histograms/United States/025J20-ZA.json
@@ -1 +1 @@
-{"batchcode": "025J20-ZA", "histograms": [{"batchcodes": ["025J20-ZA"], "histogram": {"Blood glucose": 1, "Blood glucose increased": 1, "Glycosylated haemoglobin": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20-ZA", "histograms": [{"histogram": {"Blood glucose": 1, "Blood glucose increased": 1, "Glycosylated haemoglobin": 1}, "batchcodes": ["025J20-ZA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20.json b/docs/data/histograms/United States/025J20.json
index 6c19fa75a6e..eb720f44e76 100644
--- a/docs/data/histograms/United States/025J20.json
+++ b/docs/data/histograms/United States/025J20.json
@@ -1 +1 @@
-{"batchcode": "025J20", "histograms": [{"batchcodes": ["025J20"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site rash": 1, "Injection site warmth": 1, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site rash": 1, "Injection site warmth": 1, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["025J20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20/2019(?).json b/docs/data/histograms/United States/025J20/2019(?).json
index 01a22e0b488..fb164093d70 100644
--- a/docs/data/histograms/United States/025J20/2019(?).json
+++ b/docs/data/histograms/United States/025J20/2019(?).json
@@ -1 +1 @@
-{"batchcode": "025J20/2019(?)", "histograms": [{"batchcodes": ["025J20/2019(?)"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Temperature regulation disorder": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20/2019(?)", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Temperature regulation disorder": 1, "Vomiting": 1}, "batchcodes": ["025J20/2019(?)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20/2A.json b/docs/data/histograms/United States/025J20/2A.json
index 2368819567e..1465df9d42c 100644
--- a/docs/data/histograms/United States/025J20/2A.json
+++ b/docs/data/histograms/United States/025J20/2A.json
@@ -1 +1 @@
-{"batchcode": "025J20/2A", "histograms": [{"batchcodes": ["025J20/2A"], "histogram": {"Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pregnancy test": 1, "Pyrexia": 1, "Somnolence": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20/2A", "histograms": [{"histogram": {"Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Malaise": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Pain": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pregnancy test": 1, "Pyrexia": 1, "Somnolence": 1, "Vaccination site pruritus": 1}, "batchcodes": ["025J20/2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J200/025JZ00.json b/docs/data/histograms/United States/025J200/025JZ00.json
index 1ca36aa06b3..964b2e8682f 100644
--- a/docs/data/histograms/United States/025J200/025JZ00.json
+++ b/docs/data/histograms/United States/025J200/025JZ00.json
@@ -1 +1 @@
-{"batchcode": "025J200/025JZ00", "histograms": [{"batchcodes": ["025J200/025JZ00"], "histogram": {"Pruritus": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "025J200/025JZ00", "histograms": [{"histogram": {"Pruritus": 1, "Vaccination site pruritus": 1}, "batchcodes": ["025J200/025JZ00"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2019.json b/docs/data/histograms/United States/025J2019.json
index 02eaa3666b0..ff2d714b596 100644
--- a/docs/data/histograms/United States/025J2019.json
+++ b/docs/data/histograms/United States/025J2019.json
@@ -1 +1 @@
-{"batchcode": "025J2019", "histograms": [{"batchcodes": ["025J2019"], "histogram": {"Asthma": 1, "Erythema": 1, "Inappropriate schedule of product administration": 1, "Oedema peripheral": 1, "Pruritus": 1, "Rash": 1, "Rash papular": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2019", "histograms": [{"histogram": {"Asthma": 1, "Erythema": 1, "Inappropriate schedule of product administration": 1, "Oedema peripheral": 1, "Pruritus": 1, "Rash": 1, "Rash papular": 1}, "batchcodes": ["025J2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J202.json b/docs/data/histograms/United States/025J202.json
index cb0781d1aca..f2f099719fb 100644
--- a/docs/data/histograms/United States/025J202.json
+++ b/docs/data/histograms/United States/025J202.json
@@ -1 +1 @@
-{"batchcode": "025J202", "histograms": [{"batchcodes": ["025J202"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Fatigue": 1, "Influenza like illness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025J202", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Fatigue": 1, "Influenza like illness": 1, "Pyrexia": 1}, "batchcodes": ["025J202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20214.json b/docs/data/histograms/United States/025J20214.json
index 0108edaed85..5d98d321034 100644
--- a/docs/data/histograms/United States/025J20214.json
+++ b/docs/data/histograms/United States/025J20214.json
@@ -1 +1 @@
-{"batchcode": "025J20214", "histograms": [{"batchcodes": ["025J20214"], "histogram": {"Influenza like illness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20214", "histograms": [{"histogram": {"Influenza like illness": 1, "Malaise": 1}, "batchcodes": ["025J20214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2024.json b/docs/data/histograms/United States/025J2024.json
index 140ff761837..a901cb3e119 100644
--- a/docs/data/histograms/United States/025J2024.json
+++ b/docs/data/histograms/United States/025J2024.json
@@ -1 +1 @@
-{"batchcode": "025J2024", "histograms": [{"batchcodes": ["025J2024"], "histogram": {"Chills": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2024", "histograms": [{"histogram": {"Chills": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Maternal exposure during pregnancy": 1, "Myalgia": 1, "Paraesthesia": 1}, "batchcodes": ["025J2024"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J202A.json b/docs/data/histograms/United States/025J202A.json
index 00ef40b7912..d30fb484551 100644
--- a/docs/data/histograms/United States/025J202A.json
+++ b/docs/data/histograms/United States/025J202A.json
@@ -1 +1 @@
-{"batchcode": "025J202A", "histograms": [{"batchcodes": ["025J202A"], "histogram": {"Fatigue": 16, "Pyrexia": 11, "Vaccination site pain": 11, "Headache": 10, "Pain in extremity": 10, "Chills": 9, "Pain": 9, "Vaccination site erythema": 7, "Vaccination site warmth": 7, "Arthralgia": 6, "Nausea": 6, "Erythema": 5, "Myalgia": 5, "Vaccination site swelling": 5, "Asthenia": 4, "Chest pain": 4, "Diarrhoea": 4, "Exposure during pregnancy": 4, "Hypoaesthesia": 4, "SARS-CoV-2 test": 4, "Urticaria": 4, "Vaccination site rash": 4, "Abdominal discomfort": 3, "Body temperature": 3, "COVID-19": 3, "Cough": 3, "Gait disturbance": 3, "Peripheral swelling": 3, "Pregnancy test": 3, "Vaccination site pruritus": 3, "Anosmia": 2, "Dizziness": 2, "Dyspnoea": 2, "Feeling abnormal": 2, "Induration": 2, "Injection site pain": 2, "Insomnia": 2, "Maternal exposure during pregnancy": 2, "Muscle spasms": 2, "Palpitations": 2, "Paraesthesia": 2, "Pruritus": 2, "Rash": 2, "Vaccination complication": 2, "Vomiting": 2, "X-ray": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acne": 1, "Ageusia": 1, "Axillary pain": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Condition aggravated": 1, "Confusional state": 1, "Decreased appetite": 1, "Emotional distress": 1, "Feeling hot": 1, "Glucose tolerance test": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Internal haemorrhage": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscle strain": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Night sweats": 1, "Nightmare": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Photosensitivity reaction": 1, "Poor quality sleep": 1, "Rash macular": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 test positive": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin warm": 1, "Swelling": 1, "Throat irritation": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Ultrasound scan vagina": 1, "Vaccination site bruising": 1, "Vaccination site inflammation": 1, "Vision blurred": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "025J202A", "histograms": [{"histogram": {"Fatigue": 16, "Pyrexia": 11, "Vaccination site pain": 11, "Headache": 10, "Pain in extremity": 10, "Chills": 9, "Pain": 9, "Vaccination site erythema": 7, "Vaccination site warmth": 7, "Arthralgia": 6, "Nausea": 6, "Erythema": 5, "Myalgia": 5, "Vaccination site swelling": 5, "Asthenia": 4, "Chest pain": 4, "Diarrhoea": 4, "Exposure during pregnancy": 4, "Hypoaesthesia": 4, "SARS-CoV-2 test": 4, "Urticaria": 4, "Vaccination site rash": 4, "Abdominal discomfort": 3, "Body temperature": 3, "COVID-19": 3, "Cough": 3, "Gait disturbance": 3, "Peripheral swelling": 3, "Pregnancy test": 3, "Vaccination site pruritus": 3, "Anosmia": 2, "Dizziness": 2, "Dyspnoea": 2, "Feeling abnormal": 2, "Induration": 2, "Injection site pain": 2, "Insomnia": 2, "Maternal exposure during pregnancy": 2, "Muscle spasms": 2, "Palpitations": 2, "Paraesthesia": 2, "Pruritus": 2, "Rash": 2, "Vaccination complication": 2, "Vomiting": 2, "X-ray": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acne": 1, "Ageusia": 1, "Axillary pain": 1, "Blood glucose": 1, "Blood pressure increased": 1, "Condition aggravated": 1, "Confusional state": 1, "Decreased appetite": 1, "Emotional distress": 1, "Feeling hot": 1, "Glucose tolerance test": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hypoaesthesia oral": 1, "Hypoglycaemia": 1, "Hypotension": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Internal haemorrhage": 1, "Lymphadenopathy": 1, "Memory impairment": 1, "Mental impairment": 1, "Mobility decreased": 1, "Muscle strain": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Night sweats": 1, "Nightmare": 1, "Oropharyngeal pain": 1, "Osteoarthritis": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Photosensitivity reaction": 1, "Poor quality sleep": 1, "Rash macular": 1, "Respiratory tract congestion": 1, "SARS-CoV-2 test positive": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin warm": 1, "Swelling": 1, "Throat irritation": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Ultrasound scan vagina": 1, "Vaccination site bruising": 1, "Vaccination site inflammation": 1, "Vision blurred": 1, "Weight decreased": 1}, "batchcodes": ["025J202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J202A/039K20.json b/docs/data/histograms/United States/025J202A/039K20.json
index 10319bf82af..026b3bb1e01 100644
--- a/docs/data/histograms/United States/025J202A/039K20.json
+++ b/docs/data/histograms/United States/025J202A/039K20.json
@@ -1 +1 @@
-{"batchcode": "025J202A/039K20", "histograms": [{"batchcodes": ["025J202A/039K20"], "histogram": {"Dry skin": 1, "Erythema": 1, "Eye swelling": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Ocular hyperaemia": 1, "Rash": 1, "Swelling face": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "025J202A/039K20", "histograms": [{"histogram": {"Dry skin": 1, "Erythema": 1, "Eye swelling": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Ocular hyperaemia": 1, "Rash": 1, "Swelling face": 1, "Urticaria": 1}, "batchcodes": ["025J202A/039K20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J208.json b/docs/data/histograms/United States/025J208.json
index 7e7e0621c5d..bb2095b70fc 100644
--- a/docs/data/histograms/United States/025J208.json
+++ b/docs/data/histograms/United States/025J208.json
@@ -1 +1 @@
-{"batchcode": "025J208", "histograms": [{"batchcodes": ["025J208"], "histogram": {"Asthenia": 1, "Disturbance in attention": 1, "Dizziness": 1, "Hypoaesthesia oral": 1, "Investigation": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "025J208", "histograms": [{"histogram": {"Asthenia": 1, "Disturbance in attention": 1, "Dizziness": 1, "Hypoaesthesia oral": 1, "Investigation": 1, "Pruritus": 1}, "batchcodes": ["025J208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20A OR 025T.json b/docs/data/histograms/United States/025J20A OR 025T.json
index 2c3ab2f4965..0da8d0abb1d 100644
--- a/docs/data/histograms/United States/025J20A OR 025T.json
+++ b/docs/data/histograms/United States/025J20A OR 025T.json
@@ -1 +1 @@
-{"batchcode": "025J20A OR 025T", "histograms": [{"batchcodes": ["025J20A OR 025T"], "histogram": {"Arthralgia": 1, "Dehydration": 1, "Influenza like illness": 1, "Myalgia": 1, "Pain of skin": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A OR 025T", "histograms": [{"histogram": {"Arthralgia": 1, "Dehydration": 1, "Influenza like illness": 1, "Myalgia": 1, "Pain of skin": 1, "Pyrexia": 1}, "batchcodes": ["025J20A OR 025T"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20A OR 02C1.json b/docs/data/histograms/United States/025J20A OR 02C1.json
index bea29532504..d87bf634df8 100644
--- a/docs/data/histograms/United States/025J20A OR 02C1.json
+++ b/docs/data/histograms/United States/025J20A OR 02C1.json
@@ -1 +1 @@
-{"batchcode": "025J20A OR 02C1", "histograms": [{"batchcodes": ["025J20A OR 02C1"], "histogram": {"Fatigue": 1, "Malaise": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A OR 02C1", "histograms": [{"histogram": {"Fatigue": 1, "Malaise": 1, "Vaccination site pain": 1}, "batchcodes": ["025J20A OR 02C1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20A OR T.json b/docs/data/histograms/United States/025J20A OR T.json
index a122ec1cf63..cc5de217c20 100644
--- a/docs/data/histograms/United States/025J20A OR T.json
+++ b/docs/data/histograms/United States/025J20A OR T.json
@@ -1 +1 @@
-{"batchcode": "025J20A OR T", "histograms": [{"batchcodes": ["025J20A OR T"], "histogram": {"Dizziness": 1, "Hypersensitivity": 1, "Pruritus": 1, "Swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A OR T", "histograms": [{"histogram": {"Dizziness": 1, "Hypersensitivity": 1, "Pruritus": 1, "Swelling": 1, "Swelling face": 1}, "batchcodes": ["025J20A OR T"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20A-214.json b/docs/data/histograms/United States/025J20A-214.json
index fd1d116ec9c..48e7811b412 100644
--- a/docs/data/histograms/United States/025J20A-214.json
+++ b/docs/data/histograms/United States/025J20A-214.json
@@ -1 +1 @@
-{"batchcode": "025J20A-214", "histograms": [{"batchcodes": ["025J20A-214"], "histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A-214", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1}, "batchcodes": ["025J20A-214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20A-2A.json b/docs/data/histograms/United States/025J20A-2A.json
index 73047fdcb4b..0b131bd0018 100644
--- a/docs/data/histograms/United States/025J20A-2A.json
+++ b/docs/data/histograms/United States/025J20A-2A.json
@@ -1 +1 @@
-{"batchcode": "025J20A-2A", "histograms": [{"batchcodes": ["025J20A-2A"], "histogram": {"Dry mouth": 1, "Erythema": 1, "Illness": 1, "Injection site pain": 1, "Migraine": 1, "SARS-CoV-2 test positive": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A-2A", "histograms": [{"histogram": {"Dry mouth": 1, "Erythema": 1, "Illness": 1, "Injection site pain": 1, "Migraine": 1, "SARS-CoV-2 test positive": 1, "Swelling": 1}, "batchcodes": ["025J20A-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20A..json b/docs/data/histograms/United States/025J20A..json
index 33875046618..3eb0d7a4e5e 100644
--- a/docs/data/histograms/United States/025J20A..json
+++ b/docs/data/histograms/United States/025J20A..json
@@ -1 +1 @@
-{"batchcode": "025J20A.", "histograms": [{"batchcodes": ["025J20A."], "histogram": {"Lymph node pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A.", "histograms": [{"histogram": {"Lymph node pain": 1}, "batchcodes": ["025J20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20A.json b/docs/data/histograms/United States/025J20A.json
index 6c4e5136c86..b3ff83b2edf 100644
--- a/docs/data/histograms/United States/025J20A.json
+++ b/docs/data/histograms/United States/025J20A.json
@@ -1 +1 @@
-{"batchcode": "025J20A", "histograms": [{"batchcodes": ["025J20A", "EW0170"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["025J20A"], "histogram": {"Vaccination site pain": 49, "Fatigue": 43, "Pyrexia": 41, "Pain in extremity": 40, "Chills": 37, "Headache": 36, "Vaccination site erythema": 31, "Pain": 30, "Vaccination site pruritus": 27, "Myalgia": 26, "Vaccination site swelling": 23, "Arthralgia": 21, "Nausea": 21, "Pruritus": 20, "Vaccination site warmth": 20, "Dizziness": 19, "Rash": 19, "SARS-CoV-2 test": 17, "COVID-19": 16, "Injection site erythema": 16, "Injection site pain": 15, "Body temperature": 13, "Feeling abnormal": 12, "Maternal exposure during pregnancy": 12, "Erythema": 11, "Palpitations": 11, "Asthenia": 10, "Injection site pruritus": 10, "Lymphadenopathy": 10, "Dyspnoea": 9, "Injection site warmth": 9, "Peripheral swelling": 9, "Urticaria": 9, "Heart rate": 8, "Influenza like illness": 8, "Swelling": 8, "Diarrhoea": 7, "Injection site swelling": 7, "Malaise": 7, "SARS-CoV-2 antibody test": 7, "SARS-CoV-2 test positive": 7, "Vaccination site induration": 7, "Vaccination site rash": 7, "Vaccination site reaction": 7, "Back pain": 6, "Expired product administered": 6, "Exposure during pregnancy": 6, "Glucose tolerance test": 6, "Illness": 6, "Inappropriate schedule of product administration": 6, "Insomnia": 6, "Pregnancy test": 6, "Rash pruritic": 6, "Vomiting": 6, "Chest discomfort": 5, "Contusion": 5, "Cough": 5, "Heart rate increased": 5, "Injection site rash": 5, "Neck pain": 5, "Oropharyngeal discomfort": 5, "Product administered to patient of inappropriate age": 5, "Product storage error": 5, "Ageusia": 4, "Chest pain": 4, "Dysphonia": 4, "Feeling hot": 4, "Hyperhidrosis": 4, "Induration": 4, "Paraesthesia": 4, "Product dose omission issue": 4, "Somnolence": 4, "Tachycardia": 4, "Vaccination complication": 4, "Vaccination site urticaria": 4, "Anxiety": 3, "Blood pressure increased": 3, "Blood pressure measurement": 3, "Cellulitis": 3, "Drug ineffective": 3, "Exposure via breast milk": 3, "Flushing": 3, "Hypersensitivity": 3, "Hypertension": 3, "Hypoaesthesia": 3, "Injection site reaction": 3, "Lip swelling": 3, "Loss of consciousness": 3, "Magnetic resonance imaging": 3, "Rash erythematous": 3, "Swelling face": 3, "Tenderness": 3, "Ultrasound foetal": 3, "Vaccination site discolouration": 3, "Vaccination site inflammation": 3, "Vertigo": 3, "Abdominal discomfort": 2, "Accidental overdose": 2, "Allergy to vaccine": 2, "Anaphylactic reaction": 2, "Angioedema": 2, "Anosmia": 2, "Antibody test": 2, "Bone pain": 2, "Decreased appetite": 2, "Depression": 2, "Dysgeusia": 2, "Electrocardiogram": 2, "Encephalitis autoimmune": 2, "Facial paralysis": 2, "Feeling cold": 2, "Gait disturbance": 2, "Herpes zoster": 2, "Incorrect dose administered": 2, "Lacrimation increased": 2, "Lethargy": 2, "Limb discomfort": 2, "Loss of personal independence in daily activities": 2, "Lymphoma": 2, "Memory impairment": 2, "Menometrorrhagia": 2, "Movement disorder": 2, "Muscular weakness": 2, "Musculoskeletal discomfort": 2, "Musculoskeletal stiffness": 2, "Nasopharyngitis": 2, "Nervousness": 2, "Oxygen saturation": 2, "Pallor": 2, "Parosmia": 2, "Polymerase chain reaction": 2, "Pregnancy": 2, "Pulmonary function test": 2, "Rash pustular": 2, "Rhinorrhoea": 2, "Skin burning sensation": 2, "Skin discolouration": 2, "Skin exfoliation": 2, "Sleep disorder": 2, "Sluggishness": 2, "Sneezing": 2, "Throat irritation": 2, "Thrombosis": 2, "Tinnitus": 2, "Tremor": 2, "Ultrasound Doppler": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "Vulval disorder": 2, "Vulvovaginal discomfort": 2, "White blood cell count": 2, "White blood cell count increased": 2, "AST/ALT ratio": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Administration site papule": 1, "Adverse event": 1, "Anaphylactic shock": 1, "Antibody test negative": 1, "Aphasia": 1, "Aphonia": 1, "Arrhythmia": 1, "Asthma": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Bedridden": 1, "Biopsy": 1, "Blister": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood pressure abnormal": 1, "Body temperature increased": 1, "Bronchitis": 1, "Burning sensation": 1, "Bursitis": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Colonoscopy": 1, "Condition aggravated": 1, "Coronavirus test": 1, "Coronavirus test positive": 1, "Cyanopsia": 1, "Death": 1, "Delusional disorder, unspecified type": 1, "Dermal filler overcorrection": 1, "Dermatitis bullous": 1, "Discomfort": 1, "Dry mouth": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eczema": 1, "Epistaxis": 1, "Exfoliative rash": 1, "Extra dose administered": 1, "Extrasystoles": 1, "Eye contusion": 1, "Eye swelling": 1, "Eyelid function disorder": 1, "Fall": 1, "Foetal exposure during pregnancy": 1, "Functional gastrointestinal disorder": 1, "Fungal infection": 1, "Gangrene": 1, "Gastritis": 1, "Gastroenteritis viral": 1, "Gastrointestinal haemorrhage": 1, "Gaze palsy": 1, "Gingival blister": 1, "Gingival erythema": 1, "Glossodynia": 1, "Haematemesis": 1, "Heart rate irregular": 1, "Hospitalisation": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Hyposmia": 1, "Immediate post-injection reaction": 1, "Immobile": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Infection": 1, "Inflammatory bowel disease": 1, "Injection site discomfort": 1, "Injection site erosion": 1, "Intracranial aneurysm": 1, "Jaw clicking": 1, "Joint swelling": 1, "Leg amputation": 1, "Lip disorder": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Mammogram": 1, "Mechanical urticaria": 1, "Miliaria": 1, "Mobility decreased": 1, "Mouth ulceration": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myocarditis": 1, "Neoplasm malignant": 1, "No adverse event": 1, "Occupational exposure to SARS-CoV-2": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Osteoporosis": 1, "Pain in jaw": 1, "Pain of skin": 1, "Panic reaction": 1, "Paranasal sinus discomfort": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Pneumonia": 1, "Polymyalgia rheumatica": 1, "Polyp": 1, "Poor quality product administered": 1, "Post-acute COVID-19 syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Presyncope": 1, "Product administration interrupted": 1, "Product temperature excursion issue": 1, "Psoriasis": 1, "Pulmonary haemorrhage": 1, "Rash macular": 1, "Rash morbilliform": 1, "Rectal haemorrhage": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Reflux gastritis": 1, "Rehabilitation therapy": 1, "Retching": 1, "Rheumatoid factor": 1, "SARS-CoV-1 test negative": 1, "SARS-CoV-2 test negative": 1, "Scab": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Sensory loss": 1, "Sinusitis": 1, "Skin hyperpigmentation": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin mass": 1, "Skin swelling": 1, "Skin tightness": 1, "Skin ulcer": 1, "Skin warm": 1, "Speech disorder": 1, "Stomatitis": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Syringe issue": 1, "Temperature intolerance": 1, "Thrombectomy": 1, "Tongue disorder": 1, "Transposition of the great vessels": 1, "Tricuspid valve incompetence": 1, "Trismus": 1, "Tryptase": 1, "Urticaria chronic": 1, "Vaccination site cellulitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site joint swelling": 1, "Vaccination site vesicles": 1, "Vasculitis": 1, "Vein discolouration": 1, "Vision blurred": 1, "Visual impairment": 1, "Vulvovaginal pain": 1, "Vulvovaginal pruritus": 1, "Wrong product administered": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20A", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025J20A", "EW0170"]}, {"histogram": {"Vaccination site pain": 49, "Fatigue": 43, "Pyrexia": 41, "Pain in extremity": 40, "Chills": 37, "Headache": 36, "Vaccination site erythema": 31, "Pain": 30, "Vaccination site pruritus": 27, "Myalgia": 26, "Vaccination site swelling": 23, "Arthralgia": 21, "Nausea": 21, "Pruritus": 20, "Vaccination site warmth": 20, "Dizziness": 19, "Rash": 19, "SARS-CoV-2 test": 17, "COVID-19": 16, "Injection site erythema": 16, "Injection site pain": 15, "Body temperature": 13, "Feeling abnormal": 12, "Maternal exposure during pregnancy": 12, "Erythema": 11, "Palpitations": 11, "Asthenia": 10, "Injection site pruritus": 10, "Lymphadenopathy": 10, "Dyspnoea": 9, "Injection site warmth": 9, "Peripheral swelling": 9, "Urticaria": 9, "Heart rate": 8, "Influenza like illness": 8, "Swelling": 8, "Diarrhoea": 7, "Injection site swelling": 7, "Malaise": 7, "SARS-CoV-2 antibody test": 7, "SARS-CoV-2 test positive": 7, "Vaccination site induration": 7, "Vaccination site rash": 7, "Vaccination site reaction": 7, "Back pain": 6, "Expired product administered": 6, "Exposure during pregnancy": 6, "Glucose tolerance test": 6, "Illness": 6, "Inappropriate schedule of product administration": 6, "Insomnia": 6, "Pregnancy test": 6, "Rash pruritic": 6, "Vomiting": 6, "Chest discomfort": 5, "Contusion": 5, "Cough": 5, "Heart rate increased": 5, "Injection site rash": 5, "Neck pain": 5, "Oropharyngeal discomfort": 5, "Product administered to patient of inappropriate age": 5, "Product storage error": 5, "Ageusia": 4, "Chest pain": 4, "Dysphonia": 4, "Feeling hot": 4, "Hyperhidrosis": 4, "Induration": 4, "Paraesthesia": 4, "Product dose omission issue": 4, "Somnolence": 4, "Tachycardia": 4, "Vaccination complication": 4, "Vaccination site urticaria": 4, "Anxiety": 3, "Blood pressure increased": 3, "Blood pressure measurement": 3, "Cellulitis": 3, "Drug ineffective": 3, "Exposure via breast milk": 3, "Flushing": 3, "Hypersensitivity": 3, "Hypertension": 3, "Hypoaesthesia": 3, "Injection site reaction": 3, "Lip swelling": 3, "Loss of consciousness": 3, "Magnetic resonance imaging": 3, "Rash erythematous": 3, "Swelling face": 3, "Tenderness": 3, "Ultrasound foetal": 3, "Vaccination site discolouration": 3, "Vaccination site inflammation": 3, "Vertigo": 3, "Abdominal discomfort": 2, "Accidental overdose": 2, "Allergy to vaccine": 2, "Anaphylactic reaction": 2, "Angioedema": 2, "Anosmia": 2, "Antibody test": 2, "Bone pain": 2, "Decreased appetite": 2, "Depression": 2, "Dysgeusia": 2, "Electrocardiogram": 2, "Encephalitis autoimmune": 2, "Facial paralysis": 2, "Feeling cold": 2, "Gait disturbance": 2, "Herpes zoster": 2, "Incorrect dose administered": 2, "Lacrimation increased": 2, "Lethargy": 2, "Limb discomfort": 2, "Loss of personal independence in daily activities": 2, "Lymphoma": 2, "Memory impairment": 2, "Menometrorrhagia": 2, "Movement disorder": 2, "Muscular weakness": 2, "Musculoskeletal discomfort": 2, "Musculoskeletal stiffness": 2, "Nasopharyngitis": 2, "Nervousness": 2, "Oxygen saturation": 2, "Pallor": 2, "Parosmia": 2, "Polymerase chain reaction": 2, "Pregnancy": 2, "Pulmonary function test": 2, "Rash pustular": 2, "Rhinorrhoea": 2, "Skin burning sensation": 2, "Skin discolouration": 2, "Skin exfoliation": 2, "Sleep disorder": 2, "Sluggishness": 2, "Sneezing": 2, "Throat irritation": 2, "Thrombosis": 2, "Tinnitus": 2, "Tremor": 2, "Ultrasound Doppler": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vaccination site mass": 2, "Vaccination site movement impairment": 2, "Vulval disorder": 2, "Vulvovaginal discomfort": 2, "White blood cell count": 2, "White blood cell count increased": 2, "AST/ALT ratio": 1, "Abdominal pain": 1, "Abdominal pain upper": 1, "Administration site papule": 1, "Adverse event": 1, "Anaphylactic shock": 1, "Antibody test negative": 1, "Aphasia": 1, "Aphonia": 1, "Arrhythmia": 1, "Asthma": 1, "Asymptomatic COVID-19": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Bedridden": 1, "Biopsy": 1, "Blister": 1, "Blood glucose": 1, "Blood glucose decreased": 1, "Blood pressure abnormal": 1, "Body temperature increased": 1, "Bronchitis": 1, "Burning sensation": 1, "Bursitis": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chronic inflammatory demyelinating polyradiculoneuropathy": 1, "Cold sweat": 1, "Colonoscopy": 1, "Condition aggravated": 1, "Coronavirus test": 1, "Coronavirus test positive": 1, "Cyanopsia": 1, "Death": 1, "Delusional disorder, unspecified type": 1, "Dermal filler overcorrection": 1, "Dermatitis bullous": 1, "Discomfort": 1, "Dry mouth": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear pain": 1, "Eczema": 1, "Epistaxis": 1, "Exfoliative rash": 1, "Extra dose administered": 1, "Extrasystoles": 1, "Eye contusion": 1, "Eye swelling": 1, "Eyelid function disorder": 1, "Fall": 1, "Foetal exposure during pregnancy": 1, "Functional gastrointestinal disorder": 1, "Fungal infection": 1, "Gangrene": 1, "Gastritis": 1, "Gastroenteritis viral": 1, "Gastrointestinal haemorrhage": 1, "Gaze palsy": 1, "Gingival blister": 1, "Gingival erythema": 1, "Glossodynia": 1, "Haematemesis": 1, "Heart rate irregular": 1, "Hospitalisation": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Hyposmia": 1, "Immediate post-injection reaction": 1, "Immobile": 1, "Impaired work ability": 1, "Incorrect route of product administration": 1, "Infection": 1, "Inflammatory bowel disease": 1, "Injection site discomfort": 1, "Injection site erosion": 1, "Intracranial aneurysm": 1, "Jaw clicking": 1, "Joint swelling": 1, "Leg amputation": 1, "Lip disorder": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Mammogram": 1, "Mechanical urticaria": 1, "Miliaria": 1, "Mobility decreased": 1, "Mouth ulceration": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Myocarditis": 1, "Neoplasm malignant": 1, "No adverse event": 1, "Occupational exposure to SARS-CoV-2": 1, "Oral herpes": 1, "Oropharyngeal pain": 1, "Osteoporosis": 1, "Pain in jaw": 1, "Pain of skin": 1, "Panic reaction": 1, "Paranasal sinus discomfort": 1, "Periarthritis": 1, "Peripheral coldness": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Pneumonia": 1, "Polymyalgia rheumatica": 1, "Polyp": 1, "Poor quality product administered": 1, "Post-acute COVID-19 syndrome": 1, "Postural orthostatic tachycardia syndrome": 1, "Presyncope": 1, "Product administration interrupted": 1, "Product temperature excursion issue": 1, "Psoriasis": 1, "Pulmonary haemorrhage": 1, "Rash macular": 1, "Rash morbilliform": 1, "Rectal haemorrhage": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Reflux gastritis": 1, "Rehabilitation therapy": 1, "Retching": 1, "Rheumatoid factor": 1, "SARS-CoV-1 test negative": 1, "SARS-CoV-2 test negative": 1, "Scab": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Sensory loss": 1, "Sinusitis": 1, "Skin hyperpigmentation": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin mass": 1, "Skin swelling": 1, "Skin tightness": 1, "Skin ulcer": 1, "Skin warm": 1, "Speech disorder": 1, "Stomatitis": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Syringe issue": 1, "Temperature intolerance": 1, "Thrombectomy": 1, "Tongue disorder": 1, "Transposition of the great vessels": 1, "Tricuspid valve incompetence": 1, "Trismus": 1, "Tryptase": 1, "Urticaria chronic": 1, "Vaccination site cellulitis": 1, "Vaccination site haemorrhage": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site joint swelling": 1, "Vaccination site vesicles": 1, "Vasculitis": 1, "Vein discolouration": 1, "Vision blurred": 1, "Visual impairment": 1, "Vulvovaginal pain": 1, "Vulvovaginal pruritus": 1, "Wrong product administered": 1, "X-ray": 1}, "batchcodes": ["025J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J20ZA.json b/docs/data/histograms/United States/025J20ZA.json
index d517ea5f638..8c6db15d952 100644
--- a/docs/data/histograms/United States/025J20ZA.json
+++ b/docs/data/histograms/United States/025J20ZA.json
@@ -1 +1 @@
-{"batchcode": "025J20ZA", "histograms": [{"batchcodes": ["025J20ZA"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site cellulitis": 1}}]}
\ No newline at end of file
+{"batchcode": "025J20ZA", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Polymerase chain reaction": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site cellulitis": 1}, "batchcodes": ["025J20ZA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J21-2A.json b/docs/data/histograms/United States/025J21-2A.json
index 1492e7a766a..cb374a3317a 100644
--- a/docs/data/histograms/United States/025J21-2A.json
+++ b/docs/data/histograms/United States/025J21-2A.json
@@ -1 +1 @@
-{"batchcode": "025J21-2A", "histograms": [{"batchcodes": ["025J21-2A"], "histogram": {"Accidental underdose": 1, "Product use issue": 1}}]}
\ No newline at end of file
+{"batchcode": "025J21-2A", "histograms": [{"histogram": {"Accidental underdose": 1, "Product use issue": 1}, "batchcodes": ["025J21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J22A.json b/docs/data/histograms/United States/025J22A.json
index 9690b59c773..36eddbe254a 100644
--- a/docs/data/histograms/United States/025J22A.json
+++ b/docs/data/histograms/United States/025J22A.json
@@ -1 +1 @@
-{"batchcode": "025J22A", "histograms": [{"batchcodes": ["025J22A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}]}
\ No newline at end of file
+{"batchcode": "025J22A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["025J22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2A.json b/docs/data/histograms/United States/025J2A.json
index 703b5c7fe55..7dffe274144 100644
--- a/docs/data/histograms/United States/025J2A.json
+++ b/docs/data/histograms/United States/025J2A.json
@@ -1 +1 @@
-{"batchcode": "025J2A", "histograms": [{"batchcodes": ["025J2A"], "histogram": {"Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2A", "histograms": [{"histogram": {"Vaccination site lymphadenopathy": 1, "Vaccination site pain": 1}, "batchcodes": ["025J2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2D-2A.json b/docs/data/histograms/United States/025J2D-2A.json
index 31f9c9d50b8..4bfeac3bd48 100644
--- a/docs/data/histograms/United States/025J2D-2A.json
+++ b/docs/data/histograms/United States/025J2D-2A.json
@@ -1 +1 @@
-{"batchcode": "025J2D-2A", "histograms": [{"batchcodes": ["025J2D-2A"], "histogram": {"Headache": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2D-2A", "histograms": [{"histogram": {"Headache": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["025J2D-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2O-2A.json b/docs/data/histograms/United States/025J2O-2A.json
index b905e32a641..e521d2bc71b 100644
--- a/docs/data/histograms/United States/025J2O-2A.json
+++ b/docs/data/histograms/United States/025J2O-2A.json
@@ -1 +1 @@
-{"batchcode": "025J2O-2A", "histograms": [{"batchcodes": ["025J2O-2A"], "histogram": {"Injection site erythema": 2, "Injection site pruritus": 2, "Diarrhoea": 1, "Fatigue": 1, "Injection site induration": 1, "Injection site pain": 1, "Injection site swelling": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2O-2A", "histograms": [{"histogram": {"Injection site erythema": 2, "Injection site pruritus": 2, "Diarrhoea": 1, "Fatigue": 1, "Injection site induration": 1, "Injection site pain": 1, "Injection site swelling": 1, "Nausea": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["025J2O-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2OA.json b/docs/data/histograms/United States/025J2OA.json
index cf056e5ff8c..af3b3646b1c 100644
--- a/docs/data/histograms/United States/025J2OA.json
+++ b/docs/data/histograms/United States/025J2OA.json
@@ -1 +1 @@
-{"batchcode": "025J2OA", "histograms": [{"batchcodes": ["025J2OA"], "histogram": {"COVID-19": 1, "Feeling cold": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lip swelling": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2OA", "histograms": [{"histogram": {"COVID-19": 1, "Feeling cold": 1, "Injection site pain": 1, "Injection site swelling": 1, "Lip swelling": 1, "Pain": 1}, "batchcodes": ["025J2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025J2Q-2A.json b/docs/data/histograms/United States/025J2Q-2A.json
index bd8d0b00f88..4823b03e507 100644
--- a/docs/data/histograms/United States/025J2Q-2A.json
+++ b/docs/data/histograms/United States/025J2Q-2A.json
@@ -1 +1 @@
-{"batchcode": "025J2Q-2A", "histograms": [{"batchcodes": ["025J2Q-2A"], "histogram": {"Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025J2Q-2A", "histograms": [{"histogram": {"Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["025J2Q-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025JA20.json b/docs/data/histograms/United States/025JA20.json
index ad94f5bad92..40f87641989 100644
--- a/docs/data/histograms/United States/025JA20.json
+++ b/docs/data/histograms/United States/025JA20.json
@@ -1 +1 @@
-{"batchcode": "025JA20", "histograms": [{"batchcodes": ["025JA20"], "histogram": {"Chest discomfort": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025JA20", "histograms": [{"histogram": {"Chest discomfort": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["025JA20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025JZ0A.json b/docs/data/histograms/United States/025JZ0A.json
index 04fe1f6a36f..7f5acafad7f 100644
--- a/docs/data/histograms/United States/025JZ0A.json
+++ b/docs/data/histograms/United States/025JZ0A.json
@@ -1 +1 @@
-{"batchcode": "025JZ0A", "histograms": [{"batchcodes": ["025JZ0A"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "025JZ0A", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Headache": 1}, "batchcodes": ["025JZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025JZO2A.json b/docs/data/histograms/United States/025JZO2A.json
index 29f6fc194ea..44d62656c2c 100644
--- a/docs/data/histograms/United States/025JZO2A.json
+++ b/docs/data/histograms/United States/025JZO2A.json
@@ -1 +1 @@
-{"batchcode": "025JZO2A", "histograms": [{"batchcodes": ["025JZO2A"], "histogram": {"Abdominal pain": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Urine analysis": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025JZO2A", "histograms": [{"histogram": {"Abdominal pain": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Urine analysis": 1, "Vaccination site pain": 1}, "batchcodes": ["025JZO2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025K20A.json b/docs/data/histograms/United States/025K20A.json
index c2c803a01e5..a9226c5e429 100644
--- a/docs/data/histograms/United States/025K20A.json
+++ b/docs/data/histograms/United States/025K20A.json
@@ -1 +1 @@
-{"batchcode": "025K20A", "histograms": [{"batchcodes": ["025K20A"], "histogram": {"Back pain": 1, "Blood glucose increased": 1, "Injection site pain": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "025K20A", "histograms": [{"histogram": {"Back pain": 1, "Blood glucose increased": 1, "Injection site pain": 1, "Maternal exposure during pregnancy": 1, "Pain in extremity": 1}, "batchcodes": ["025K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L00A.json b/docs/data/histograms/United States/025L00A.json
index 352c908ea8a..dd8cf3f9dd5 100644
--- a/docs/data/histograms/United States/025L00A.json
+++ b/docs/data/histograms/United States/025L00A.json
@@ -1 +1 @@
-{"batchcode": "025L00A", "histograms": [{"batchcodes": ["025L00A"], "histogram": {"Erythema": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025L00A", "histograms": [{"histogram": {"Erythema": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1}, "batchcodes": ["025L00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L02A.json b/docs/data/histograms/United States/025L02A.json
index d3d5aec5816..17d8df74d0e 100644
--- a/docs/data/histograms/United States/025L02A.json
+++ b/docs/data/histograms/United States/025L02A.json
@@ -1 +1 @@
-{"batchcode": "025L02A", "histograms": [{"batchcodes": ["025L02A"], "histogram": {"Headache": 2, "Myalgia": 2, "Arthralgia": 1, "Transient ischaemic attack": 1}}]}
\ No newline at end of file
+{"batchcode": "025L02A", "histograms": [{"histogram": {"Headache": 2, "Myalgia": 2, "Arthralgia": 1, "Transient ischaemic attack": 1}, "batchcodes": ["025L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L0A.json b/docs/data/histograms/United States/025L0A.json
index 926acf8b9be..e3ec3631a35 100644
--- a/docs/data/histograms/United States/025L0A.json
+++ b/docs/data/histograms/United States/025L0A.json
@@ -1 +1 @@
-{"batchcode": "025L0A", "histograms": [{"batchcodes": ["025L0A"], "histogram": {"Expired product administered": 1, "Investigation": 1, "Laboratory test": 1, "Physical examination": 1}}]}
\ No newline at end of file
+{"batchcode": "025L0A", "histograms": [{"histogram": {"Expired product administered": 1, "Investigation": 1, "Laboratory test": 1, "Physical examination": 1}, "batchcodes": ["025L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L2014.json b/docs/data/histograms/United States/025L2014.json
index e352c0fa67e..b22fd46468e 100644
--- a/docs/data/histograms/United States/025L2014.json
+++ b/docs/data/histograms/United States/025L2014.json
@@ -1 +1 @@
-{"batchcode": "025L2014", "histograms": [{"batchcodes": ["025L2014"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025L2014", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["025L2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L201A.json b/docs/data/histograms/United States/025L201A.json
index 57c24e712ce..f90d7adc0b9 100644
--- a/docs/data/histograms/United States/025L201A.json
+++ b/docs/data/histograms/United States/025L201A.json
@@ -1 +1 @@
-{"batchcode": "025L201A", "histograms": [{"batchcodes": ["025L201A"], "histogram": {"Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "025L201A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["025L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L201A/4.json b/docs/data/histograms/United States/025L201A/4.json
index dcf15e47e57..b342e1c875d 100644
--- a/docs/data/histograms/United States/025L201A/4.json
+++ b/docs/data/histograms/United States/025L201A/4.json
@@ -1 +1 @@
-{"batchcode": "025L201A/4", "histograms": [{"batchcodes": ["025L201A/4"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "025L201A/4", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Feeling abnormal": 1, "Pain in extremity": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025L201A/4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L202A.json b/docs/data/histograms/United States/025L202A.json
index aee23664a8b..dfad3f70db1 100644
--- a/docs/data/histograms/United States/025L202A.json
+++ b/docs/data/histograms/United States/025L202A.json
@@ -1 +1 @@
-{"batchcode": "025L202A", "histograms": [{"batchcodes": ["025L202A"], "histogram": {"COVID-19": 1, "Herpes zoster": 1, "Rash": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "025L202A", "histograms": [{"histogram": {"COVID-19": 1, "Herpes zoster": 1, "Rash": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["025L202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L204.json b/docs/data/histograms/United States/025L204.json
index 9f9d39be696..ae71209eeda 100644
--- a/docs/data/histograms/United States/025L204.json
+++ b/docs/data/histograms/United States/025L204.json
@@ -1 +1 @@
-{"batchcode": "025L204", "histograms": [{"batchcodes": ["025L204"], "histogram": {"Ageusia": 1, "Asthenia": 1, "Body temperature": 1, "Cataract": 1, "Chills": 1, "Constipation": 1, "Cough": 1, "Eye disorder": 1, "Headache": 1, "Nasal congestion": 1, "Nausea": 1, "Ophthalmological examination": 1, "Pain": 1, "Pyrexia": 1, "Retinal detachment": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "025L204", "histograms": [{"histogram": {"Ageusia": 1, "Asthenia": 1, "Body temperature": 1, "Cataract": 1, "Chills": 1, "Constipation": 1, "Cough": 1, "Eye disorder": 1, "Headache": 1, "Nasal congestion": 1, "Nausea": 1, "Ophthalmological examination": 1, "Pain": 1, "Pyrexia": 1, "Retinal detachment": 1, "Rhinorrhoea": 1}, "batchcodes": ["025L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L204A.json b/docs/data/histograms/United States/025L204A.json
index dface939f4e..fabd6b65330 100644
--- a/docs/data/histograms/United States/025L204A.json
+++ b/docs/data/histograms/United States/025L204A.json
@@ -1 +1 @@
-{"batchcode": "025L204A", "histograms": [{"batchcodes": ["025L204A"], "histogram": {"Renal impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "025L204A", "histograms": [{"histogram": {"Renal impairment": 1}, "batchcodes": ["025L204A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L208.json b/docs/data/histograms/United States/025L208.json
index 4db9a794702..dabe7905f9e 100644
--- a/docs/data/histograms/United States/025L208.json
+++ b/docs/data/histograms/United States/025L208.json
@@ -1 +1 @@
-{"batchcode": "025L208", "histograms": [{"batchcodes": ["025L208"], "histogram": {"Vaccination site swelling": 2, "Headache": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025L208", "histograms": [{"histogram": {"Vaccination site swelling": 2, "Headache": 1, "Product administered to patient of inappropriate age": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1}, "batchcodes": ["025L208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L20A..json b/docs/data/histograms/United States/025L20A..json
index ce618f3800d..f611a0018f2 100644
--- a/docs/data/histograms/United States/025L20A..json
+++ b/docs/data/histograms/United States/025L20A..json
@@ -1 +1 @@
-{"batchcode": "025L20A.", "histograms": [{"batchcodes": ["025L20A."], "histogram": {"COVID-19": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "025L20A.", "histograms": [{"histogram": {"COVID-19": 1, "Somnolence": 1}, "batchcodes": ["025L20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L20A.json b/docs/data/histograms/United States/025L20A.json
index fa60af4b165..cac33a8d040 100644
--- a/docs/data/histograms/United States/025L20A.json
+++ b/docs/data/histograms/United States/025L20A.json
@@ -1 +1 @@
-{"batchcode": "025L20A", "histograms": [{"batchcodes": ["025L20A"], "histogram": {"Headache": 120, "Fatigue": 117, "Pain in extremity": 115, "Pyrexia": 105, "Vaccination site pain": 105, "Chills": 93, "Myalgia": 87, "Poor quality product administered": 80, "Vaccination site erythema": 74, "Product temperature excursion issue": 73, "Pain": 60, "Nausea": 54, "Vaccination site pruritus": 49, "Rash": 46, "Pruritus": 42, "Vaccination site swelling": 41, "Body temperature": 40, "Feeling abnormal": 39, "Vaccination site warmth": 38, "Arthralgia": 35, "Dizziness": 35, "Diarrhoea": 33, "Erythema": 31, "Asthenia": 30, "Injection site pain": 28, "COVID-19": 27, "Dyspnoea": 27, "Expired product administered": 27, "Feeling hot": 24, "SARS-CoV-2 test": 22, "Vaccination site rash": 22, "Influenza like illness": 21, "Peripheral swelling": 21, "Maternal exposure during pregnancy": 20, "Urticaria": 20, "Vaccination site induration": 20, "Vomiting": 20, "Decreased appetite": 19, "Lymphadenopathy": 19, "Injection site erythema": 18, "Illness": 17, "Malaise": 17, "Hypoaesthesia": 16, "Paraesthesia": 16, "Heart rate": 15, "Inappropriate schedule of product administration": 15, "Product dose omission issue": 15, "Back pain": 14, "Blood pressure measurement": 13, "Cough": 13, "Injection site pruritus": 12, "Pregnancy test": 12, "Vaccination site mass": 11, "Abdominal discomfort": 10, "Heart rate increased": 10, "Oropharyngeal pain": 10, "Tachycardia": 10, "Vaccination complication": 10, "Blood test": 9, "Exposure during pregnancy": 9, "Hyperhidrosis": 9, "Injection site swelling": 9, "Nasal congestion": 9, "Neck pain": 9, "Chest pain": 8, "Dysphagia": 8, "Hypersensitivity": 8, "Hypertension": 8, "Incorrect dose administered": 8, "Insomnia": 8, "No adverse event": 8, "Palpitations": 8, "Swelling": 8, "Abdominal pain": 7, "Ageusia": 7, "Herpes zoster": 7, "Injection site rash": 7, "Limb discomfort": 7, "Muscular weakness": 7, "Rash pruritic": 7, "Throat irritation": 7, "Abdominal pain upper": 6, "Antibody test": 6, "Bone pain": 6, "Confusional state": 6, "Feeling cold": 6, "Inflammation": 6, "Injection site warmth": 6, "Lethargy": 6, "Loss of personal independence in daily activities": 6, "Muscle spasms": 6, "Somnolence": 6, "Tinnitus": 6, "Tremor": 6, "Ultrasound scan": 6, "Vaccination site urticaria": 6, "Weight decreased": 6, "Blood pressure increased": 5, "Burning sensation": 5, "Dysphonia": 5, "Flushing": 5, "Magnetic resonance imaging": 5, "Migraine": 5, "Mobility decreased": 5, "Musculoskeletal stiffness": 5, "Paraesthesia oral": 5, "Rhinorrhoea": 5, "Tenderness": 5, "Anosmia": 4, "Balance disorder": 4, "Body temperature increased": 4, "Breast pain": 4, "Chest discomfort": 4, "Cold sweat": 4, "Computerised tomogram": 4, "Condition aggravated": 4, "Diplopia": 4, "Gait disturbance": 4, "Hypersomnia": 4, "Incorrect route of product administration": 4, "Injection site mass": 4, "Lymph node pain": 4, "Maternal exposure during breast feeding": 4, "Oxygen saturation": 4, "Presyncope": 4, "Product administered to patient of inappropriate age": 4, "Respiratory rate": 4, "SARS-CoV-2 test positive": 4, "Swollen tongue": 4, "Throat tightness": 4, "Vision blurred": 4, "Abdominal distension": 3, "Accidental overdose": 3, "Anxiety": 3, "Blood glucose": 3, "Chest X-ray": 3, "Device connection issue": 3, "Disorientation": 3, "Dysgeusia": 3, "Dyskinesia": 3, "Dyspepsia": 3, "Electrocardiogram": 3, "Haematochezia": 3, "Influenza": 3, "Influenza virus test": 3, "Injection site urticaria": 3, "Joint swelling": 3, "Nasopharyngitis": 3, "Nervousness": 3, "Night sweats": 3, "Oral pain": 3, "Oxygen saturation decreased": 3, "Pharyngeal swelling": 3, "Platelet count": 3, "Poor quality sleep": 3, "Product storage error": 3, "Productive cough": 3, "Rash macular": 3, "SARS-CoV-2 antibody test": 3, "Skin burning sensation": 3, "Skin discolouration": 3, "Speech disorder": 3, "Swelling face": 3, "Syncope": 3, "Therapeutic response unexpected": 3, "Toothache": 3, "Ultrasound foetal": 3, "Urinary tract infection": 3, "Vaccination site discolouration": 3, "Vaccination site lymphadenopathy": 3, "Vaccination site movement impairment": 3, "Allergy to vaccine": 2, "Alopecia": 2, "Anaphylactic reaction": 2, "Axillary pain": 2, "Basedow's disease": 2, "Biopsy": 2, "Blood cholesterol": 2, "Body temperature decreased": 2, "Bone swelling": 2, "Cardiac failure congestive": 2, "Colonoscopy": 2, "Constipation": 2, "Contusion": 2, "Deafness": 2, "Depression": 2, "Discomfort": 2, "Drug ineffective": 2, "Dry eye": 2, "Eye irritation": 2, "Full blood count": 2, "Gastrointestinal pain": 2, "Glucose tolerance test": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Incoherent": 2, "Induration": 2, "Infection": 2, "Injection site induration": 2, "Injection site reaction": 2, "Loss of consciousness": 2, "Magnetic resonance imaging head": 2, "Magnetic resonance imaging spinal": 2, "Maternal exposure before pregnancy": 2, "Mechanical urticaria": 2, "Memory impairment": 2, "Muscle tightness": 2, "Nerve compression": 2, "Nodule": 2, "Ocular hyperaemia": 2, "Oral herpes": 2, "Peripheral coldness": 2, "Physical examination": 2, "Pollakiuria": 2, "Product administered at inappropriate site": 2, "Rash erythematous": 2, "Rectal haemorrhage": 2, "SARS-CoV-2 antibody test positive": 2, "SARS-CoV-2 test negative": 2, "Seizure": 2, "Skin warm": 2, "Sleep disorder": 2, "Supraventricular tachycardia": 2, "Tongue paralysis": 2, "Trismus": 2, "Ultrasound abdomen": 2, "Ultrasound antenatal screen": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Visual impairment": 2, "Vitamin D": 2, "Weight increased": 2, "Wheezing": 2, "White blood cell count": 2, "Accidental underdose": 1, "Activated partial thromboplastin time": 1, "Adverse event": 1, "Adverse event following immunisation": 1, "Allergy to animal": 1, "Alpha 1 foetoprotein": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-thyroid antibody": 1, "Anti-thyroid antibody positive": 1, "Antibody test negative": 1, "Asthma": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Axillary web syndrome": 1, "Bedridden": 1, "Biopsy colon": 1, "Biopsy skin": 1, "Bite": 1, "Blastomycosis": 1, "Blood chloride": 1, "Blood glucose increased": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Bone cyst": 1, "Breast cancer": 1, "Breast discolouration": 1, "Breast feeding": 1, "Breast swelling": 1, "C-reactive protein": 1, "Candida infection": 1, "Cardiac fibrillation": 1, "Cardiac monitoring": 1, "Cardiac stress test": 1, "Cardioversion": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Cheilitis": 1, "Choking": 1, "Choking sensation": 1, "Chronic fatigue syndrome": 1, "Chronic spontaneous urticaria": 1, "Computerised tomogram thorax": 1, "Congenital hydronephrosis": 1, "Cranial nerve palsies multiple": 1, "Cutaneous lupus erythematosus": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Depressed mood": 1, "Dermatitis contact": 1, "Diabetes mellitus inadequate control": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug hypersensitivity": 1, "Drug interaction": 1, "Dry skin": 1, "Dysarthria": 1, "Dysstasia": 1, "Dysuria": 1, "Ear haemorrhage": 1, "Echocardiogram": 1, "Eczema": 1, "Emotional disorder": 1, "Emotional poverty": 1, "Ephelides": 1, "Epinephrine increased": 1, "Epistaxis": 1, "Erythema nodosum": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Eye drop instillation": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid irritation": 1, "Faeces discoloured": 1, "Fear of falling": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Frequent bowel movements": 1, "Fungal infection": 1, "Gastrointestinal disorder": 1, "General physical health deterioration": 1, "Geriatric assessment": 1, "Gingival pain": 1, "Glossitis": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Heart rate abnormal": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hepatic pain": 1, "Hepatotoxicity": 1, "Herpes virus infection": 1, "High density lipoprotein": 1, "Histamine level": 1, "Hyperaesthesia": 1, "Hyperthermia": 1, "Hypertonic bladder": 1, "Hypokinesia": 1, "IVth nerve paralysis": 1, "Ileal ulcer": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Influenza A virus test": 1, "Injected limb mobility decreased": 1, "Injection site cellulitis": 1, "Injection site discolouration": 1, "Injection site discomfort": 1, "Injection site dryness": 1, "Injection site extravasation": 1, "Injection site inflammation": 1, "Injection site lymphadenopathy": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Irritability": 1, "Joint range of motion decreased": 1, "Lip blister": 1, "Lip discolouration": 1, "Lip erythema": 1, "Lip swelling": 1, "Low density lipoprotein": 1, "Malignant melanoma in situ": 1, "Mammogram": 1, "Mass": 1, "Mass excision": 1, "Mast cell activation syndrome": 1, "Melanocytic naevus": 1, "Metabolic function test": 1, "Miller Fisher syndrome": 1, "Mucosal exfoliation": 1, "Muscle atrophy": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Myalgia intercostal": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Neck mass": 1, "Neonatal aspiration": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Nipple pain": 1, "Ophthalmoplegia": 1, "Oral candidiasis": 1, "Oral mucosal blistering": 1, "Oxygen consumption decreased": 1, "Oxygen saturation abnormal": 1, "Pain in jaw": 1, "Pain of skin": 1, "Palatal disorder": 1, "Pallor": 1, "Paralysis": 1, "Parosmia": 1, "Partial seizures": 1, "Pelvic pain": 1, "Periarthritis": 1, "Pharyngitis": 1, "Phlebitis": 1, "Photosensitivity reaction": 1, "Platelet count decreased": 1, "Platelet count increased": 1, "Pneumonia": 1, "Pneumothorax": 1, "Polymerase chain reaction": 1, "Post-acute COVID-19 syndrome": 1, "Postpartum haemorrhage": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Procedural pain": 1, "Product administration error": 1, "Product availability issue": 1, "Product dose omission in error": 1, "Product packaging quantity issue": 1, "Prostatic specific antigen increased": 1, "Prothrombin time": 1, "Psoriasis": 1, "Pulmonary pain": 1, "Rash vesicular": 1, "Rectal examination": 1, "Red blood cell sedimentation rate": 1, "Regurgitation": 1, "Renal pain": 1, "Respiratory disorder": 1, "Respiratory disorder neonatal": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Restless legs syndrome": 1, "Retching": 1, "Salivary hypersecretion": 1, "Sciatic nerve injury": 1, "Sciatica": 1, "Sensory loss": 1, "Skin exfoliation": 1, "Skin fissures": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin mass": 1, "Skin reaction": 1, "Skin tightness": 1, "Skin weeping": 1, "Sleep apnoea syndrome": 1, "Sleep terror": 1, "Sluggishness": 1, "Sneezing": 1, "Squamous cell carcinoma of skin": 1, "Stevens-Johnson syndrome": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Symptom masked": 1, "Symptom recurrence": 1, "Taste disorder": 1, "Tendonitis": 1, "Thinking abnormal": 1, "Throat clearing": 1, "Thrombocytosis": 1, "Thyroid function test": 1, "Thyroid neoplasm": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroid stimulating immunoglobulin increased": 1, "Thyroiditis": 1, "Thyroxine free": 1, "Thyroxine increased": 1, "Tongue biting": 1, "Tongue erythema": 1, "Transient global amnesia": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine": 1, "Tri-iodothyronine increased": 1, "Troponin increased": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound antenatal screen normal": 1, "Urine analysis": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site joint pain": 1, "Vaccination site joint swelling": 1, "Vaccination site oedema": 1, "Vaccination site paraesthesia": 1, "Vaccination site pustule": 1, "Vaccination site vesicles": 1, "Vasculitis": 1, "Vein rupture": 1, "Viral titre": 1, "Vital signs measurement": 1, "Vitamin B12": 1, "Walking aid user": 1, "Weight": 1, "Wrong technique in device usage process": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "025L20A", "histograms": [{"histogram": {"Headache": 120, "Fatigue": 117, "Pain in extremity": 115, "Pyrexia": 105, "Vaccination site pain": 105, "Chills": 93, "Myalgia": 87, "Poor quality product administered": 80, "Vaccination site erythema": 74, "Product temperature excursion issue": 73, "Pain": 60, "Nausea": 54, "Vaccination site pruritus": 49, "Rash": 46, "Pruritus": 42, "Vaccination site swelling": 41, "Body temperature": 40, "Feeling abnormal": 39, "Vaccination site warmth": 38, "Arthralgia": 35, "Dizziness": 35, "Diarrhoea": 33, "Erythema": 31, "Asthenia": 30, "Injection site pain": 28, "COVID-19": 27, "Dyspnoea": 27, "Expired product administered": 27, "Feeling hot": 24, "SARS-CoV-2 test": 22, "Vaccination site rash": 22, "Influenza like illness": 21, "Peripheral swelling": 21, "Maternal exposure during pregnancy": 20, "Urticaria": 20, "Vaccination site induration": 20, "Vomiting": 20, "Decreased appetite": 19, "Lymphadenopathy": 19, "Injection site erythema": 18, "Illness": 17, "Malaise": 17, "Hypoaesthesia": 16, "Paraesthesia": 16, "Heart rate": 15, "Inappropriate schedule of product administration": 15, "Product dose omission issue": 15, "Back pain": 14, "Blood pressure measurement": 13, "Cough": 13, "Injection site pruritus": 12, "Pregnancy test": 12, "Vaccination site mass": 11, "Abdominal discomfort": 10, "Heart rate increased": 10, "Oropharyngeal pain": 10, "Tachycardia": 10, "Vaccination complication": 10, "Blood test": 9, "Exposure during pregnancy": 9, "Hyperhidrosis": 9, "Injection site swelling": 9, "Nasal congestion": 9, "Neck pain": 9, "Chest pain": 8, "Dysphagia": 8, "Hypersensitivity": 8, "Hypertension": 8, "Incorrect dose administered": 8, "Insomnia": 8, "No adverse event": 8, "Palpitations": 8, "Swelling": 8, "Abdominal pain": 7, "Ageusia": 7, "Herpes zoster": 7, "Injection site rash": 7, "Limb discomfort": 7, "Muscular weakness": 7, "Rash pruritic": 7, "Throat irritation": 7, "Abdominal pain upper": 6, "Antibody test": 6, "Bone pain": 6, "Confusional state": 6, "Feeling cold": 6, "Inflammation": 6, "Injection site warmth": 6, "Lethargy": 6, "Loss of personal independence in daily activities": 6, "Muscle spasms": 6, "Somnolence": 6, "Tinnitus": 6, "Tremor": 6, "Ultrasound scan": 6, "Vaccination site urticaria": 6, "Weight decreased": 6, "Blood pressure increased": 5, "Burning sensation": 5, "Dysphonia": 5, "Flushing": 5, "Magnetic resonance imaging": 5, "Migraine": 5, "Mobility decreased": 5, "Musculoskeletal stiffness": 5, "Paraesthesia oral": 5, "Rhinorrhoea": 5, "Tenderness": 5, "Anosmia": 4, "Balance disorder": 4, "Body temperature increased": 4, "Breast pain": 4, "Chest discomfort": 4, "Cold sweat": 4, "Computerised tomogram": 4, "Condition aggravated": 4, "Diplopia": 4, "Gait disturbance": 4, "Hypersomnia": 4, "Incorrect route of product administration": 4, "Injection site mass": 4, "Lymph node pain": 4, "Maternal exposure during breast feeding": 4, "Oxygen saturation": 4, "Presyncope": 4, "Product administered to patient of inappropriate age": 4, "Respiratory rate": 4, "SARS-CoV-2 test positive": 4, "Swollen tongue": 4, "Throat tightness": 4, "Vision blurred": 4, "Abdominal distension": 3, "Accidental overdose": 3, "Anxiety": 3, "Blood glucose": 3, "Chest X-ray": 3, "Device connection issue": 3, "Disorientation": 3, "Dysgeusia": 3, "Dyskinesia": 3, "Dyspepsia": 3, "Electrocardiogram": 3, "Haematochezia": 3, "Influenza": 3, "Influenza virus test": 3, "Injection site urticaria": 3, "Joint swelling": 3, "Nasopharyngitis": 3, "Nervousness": 3, "Night sweats": 3, "Oral pain": 3, "Oxygen saturation decreased": 3, "Pharyngeal swelling": 3, "Platelet count": 3, "Poor quality sleep": 3, "Product storage error": 3, "Productive cough": 3, "Rash macular": 3, "SARS-CoV-2 antibody test": 3, "Skin burning sensation": 3, "Skin discolouration": 3, "Speech disorder": 3, "Swelling face": 3, "Syncope": 3, "Therapeutic response unexpected": 3, "Toothache": 3, "Ultrasound foetal": 3, "Urinary tract infection": 3, "Vaccination site discolouration": 3, "Vaccination site lymphadenopathy": 3, "Vaccination site movement impairment": 3, "Allergy to vaccine": 2, "Alopecia": 2, "Anaphylactic reaction": 2, "Axillary pain": 2, "Basedow's disease": 2, "Biopsy": 2, "Blood cholesterol": 2, "Body temperature decreased": 2, "Bone swelling": 2, "Cardiac failure congestive": 2, "Colonoscopy": 2, "Constipation": 2, "Contusion": 2, "Deafness": 2, "Depression": 2, "Discomfort": 2, "Drug ineffective": 2, "Dry eye": 2, "Eye irritation": 2, "Full blood count": 2, "Gastrointestinal pain": 2, "Glucose tolerance test": 2, "Head discomfort": 2, "Heart rate decreased": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Incoherent": 2, "Induration": 2, "Infection": 2, "Injection site induration": 2, "Injection site reaction": 2, "Loss of consciousness": 2, "Magnetic resonance imaging head": 2, "Magnetic resonance imaging spinal": 2, "Maternal exposure before pregnancy": 2, "Mechanical urticaria": 2, "Memory impairment": 2, "Muscle tightness": 2, "Nerve compression": 2, "Nodule": 2, "Ocular hyperaemia": 2, "Oral herpes": 2, "Peripheral coldness": 2, "Physical examination": 2, "Pollakiuria": 2, "Product administered at inappropriate site": 2, "Rash erythematous": 2, "Rectal haemorrhage": 2, "SARS-CoV-2 antibody test positive": 2, "SARS-CoV-2 test negative": 2, "Seizure": 2, "Skin warm": 2, "Sleep disorder": 2, "Supraventricular tachycardia": 2, "Tongue paralysis": 2, "Trismus": 2, "Ultrasound abdomen": 2, "Ultrasound antenatal screen": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site reaction": 2, "Vertigo": 2, "Visual impairment": 2, "Vitamin D": 2, "Weight increased": 2, "Wheezing": 2, "White blood cell count": 2, "Accidental underdose": 1, "Activated partial thromboplastin time": 1, "Adverse event": 1, "Adverse event following immunisation": 1, "Allergy to animal": 1, "Alpha 1 foetoprotein": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-thyroid antibody": 1, "Anti-thyroid antibody positive": 1, "Antibody test negative": 1, "Asthma": 1, "Atrial fibrillation": 1, "Autoimmune disorder": 1, "Axillary web syndrome": 1, "Bedridden": 1, "Biopsy colon": 1, "Biopsy skin": 1, "Bite": 1, "Blastomycosis": 1, "Blood chloride": 1, "Blood glucose increased": 1, "Blood lactic acid": 1, "Blood phosphorus": 1, "Blood pressure abnormal": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone decreased": 1, "Bone cyst": 1, "Breast cancer": 1, "Breast discolouration": 1, "Breast feeding": 1, "Breast swelling": 1, "C-reactive protein": 1, "Candida infection": 1, "Cardiac fibrillation": 1, "Cardiac monitoring": 1, "Cardiac stress test": 1, "Cardioversion": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Cheilitis": 1, "Choking": 1, "Choking sensation": 1, "Chronic fatigue syndrome": 1, "Chronic spontaneous urticaria": 1, "Computerised tomogram thorax": 1, "Congenital hydronephrosis": 1, "Cranial nerve palsies multiple": 1, "Cutaneous lupus erythematosus": 1, "Cyanosis": 1, "Deep vein thrombosis": 1, "Dehydration": 1, "Delirium": 1, "Depressed mood": 1, "Dermatitis contact": 1, "Diabetes mellitus inadequate control": 1, "Disturbance in attention": 1, "Dizziness postural": 1, "Drug hypersensitivity": 1, "Drug interaction": 1, "Dry skin": 1, "Dysarthria": 1, "Dysstasia": 1, "Dysuria": 1, "Ear haemorrhage": 1, "Echocardiogram": 1, "Eczema": 1, "Emotional disorder": 1, "Emotional poverty": 1, "Ephelides": 1, "Epinephrine increased": 1, "Epistaxis": 1, "Erythema nodosum": 1, "Exposure to SARS-CoV-2": 1, "Exposure via skin contact": 1, "Eye drop instillation": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid irritation": 1, "Faeces discoloured": 1, "Fear of falling": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Frequent bowel movements": 1, "Fungal infection": 1, "Gastrointestinal disorder": 1, "General physical health deterioration": 1, "Geriatric assessment": 1, "Gingival pain": 1, "Glossitis": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Heart rate abnormal": 1, "Heart rate irregular": 1, "Heavy menstrual bleeding": 1, "Hepatic pain": 1, "Hepatotoxicity": 1, "Herpes virus infection": 1, "High density lipoprotein": 1, "Histamine level": 1, "Hyperaesthesia": 1, "Hyperthermia": 1, "Hypertonic bladder": 1, "Hypokinesia": 1, "IVth nerve paralysis": 1, "Ileal ulcer": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Influenza A virus test": 1, "Injected limb mobility decreased": 1, "Injection site cellulitis": 1, "Injection site discolouration": 1, "Injection site discomfort": 1, "Injection site dryness": 1, "Injection site extravasation": 1, "Injection site inflammation": 1, "Injection site lymphadenopathy": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Irritability": 1, "Joint range of motion decreased": 1, "Lip blister": 1, "Lip discolouration": 1, "Lip erythema": 1, "Lip swelling": 1, "Low density lipoprotein": 1, "Malignant melanoma in situ": 1, "Mammogram": 1, "Mass": 1, "Mass excision": 1, "Mast cell activation syndrome": 1, "Melanocytic naevus": 1, "Metabolic function test": 1, "Miller Fisher syndrome": 1, "Mucosal exfoliation": 1, "Muscle atrophy": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal pain": 1, "Myalgia intercostal": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Neck mass": 1, "Neonatal aspiration": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neurological symptom": 1, "Neuropathy peripheral": 1, "Nipple pain": 1, "Ophthalmoplegia": 1, "Oral candidiasis": 1, "Oral mucosal blistering": 1, "Oxygen consumption decreased": 1, "Oxygen saturation abnormal": 1, "Pain in jaw": 1, "Pain of skin": 1, "Palatal disorder": 1, "Pallor": 1, "Paralysis": 1, "Parosmia": 1, "Partial seizures": 1, "Pelvic pain": 1, "Periarthritis": 1, "Pharyngitis": 1, "Phlebitis": 1, "Photosensitivity reaction": 1, "Platelet count decreased": 1, "Platelet count increased": 1, "Pneumonia": 1, "Pneumothorax": 1, "Polymerase chain reaction": 1, "Post-acute COVID-19 syndrome": 1, "Postpartum haemorrhage": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Procedural pain": 1, "Product administration error": 1, "Product availability issue": 1, "Product dose omission in error": 1, "Product packaging quantity issue": 1, "Prostatic specific antigen increased": 1, "Prothrombin time": 1, "Psoriasis": 1, "Pulmonary pain": 1, "Rash vesicular": 1, "Rectal examination": 1, "Red blood cell sedimentation rate": 1, "Regurgitation": 1, "Renal pain": 1, "Respiratory disorder": 1, "Respiratory disorder neonatal": 1, "Respiratory rate increased": 1, "Respiratory symptom": 1, "Restless legs syndrome": 1, "Retching": 1, "Salivary hypersecretion": 1, "Sciatic nerve injury": 1, "Sciatica": 1, "Sensory loss": 1, "Skin exfoliation": 1, "Skin fissures": 1, "Skin haemorrhage": 1, "Skin irritation": 1, "Skin mass": 1, "Skin reaction": 1, "Skin tightness": 1, "Skin weeping": 1, "Sleep apnoea syndrome": 1, "Sleep terror": 1, "Sluggishness": 1, "Sneezing": 1, "Squamous cell carcinoma of skin": 1, "Stevens-Johnson syndrome": 1, "Suspected COVID-19": 1, "Swelling of eyelid": 1, "Symptom masked": 1, "Symptom recurrence": 1, "Taste disorder": 1, "Tendonitis": 1, "Thinking abnormal": 1, "Throat clearing": 1, "Thrombocytosis": 1, "Thyroid function test": 1, "Thyroid neoplasm": 1, "Thyroid stimulating immunoglobulin": 1, "Thyroid stimulating immunoglobulin increased": 1, "Thyroiditis": 1, "Thyroxine free": 1, "Thyroxine increased": 1, "Tongue biting": 1, "Tongue erythema": 1, "Transient global amnesia": 1, "Transient ischaemic attack": 1, "Tri-iodothyronine": 1, "Tri-iodothyronine increased": 1, "Troponin increased": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound antenatal screen normal": 1, "Urine analysis": 1, "Vaccination error": 1, "Vaccination failure": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site joint pain": 1, "Vaccination site joint swelling": 1, "Vaccination site oedema": 1, "Vaccination site paraesthesia": 1, "Vaccination site pustule": 1, "Vaccination site vesicles": 1, "Vasculitis": 1, "Vein rupture": 1, "Viral titre": 1, "Vital signs measurement": 1, "Vitamin B12": 1, "Walking aid user": 1, "Weight": 1, "Wrong technique in device usage process": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["025L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L20A025L20A.json b/docs/data/histograms/United States/025L20A025L20A.json
index a154e569a95..a6b9d7cca1c 100644
--- a/docs/data/histograms/United States/025L20A025L20A.json
+++ b/docs/data/histograms/United States/025L20A025L20A.json
@@ -1 +1 @@
-{"batchcode": "025L20A025L20A", "histograms": [{"batchcodes": ["025L20A025L20A"], "histogram": {"COVID-19": 1, "Chills": 1, "Headache": 1, "Influenza like illness": 1, "Injection site pain": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025L20A025L20A", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Headache": 1, "Influenza like illness": 1, "Injection site pain": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["025L20A025L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L21.json b/docs/data/histograms/United States/025L21.json
index 0a50098388c..e02eb8ce99f 100644
--- a/docs/data/histograms/United States/025L21.json
+++ b/docs/data/histograms/United States/025L21.json
@@ -1 +1 @@
-{"batchcode": "025L21", "histograms": [{"batchcodes": ["025L21", "054G21A", "066D21A", "1805022"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "025L21", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["025L21", "054G21A", "066D21A", "1805022"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L210A.json b/docs/data/histograms/United States/025L210A.json
index 177da4da0fc..2124a8094d2 100644
--- a/docs/data/histograms/United States/025L210A.json
+++ b/docs/data/histograms/United States/025L210A.json
@@ -1 +1 @@
-{"batchcode": "025L210A", "histograms": [{"batchcodes": ["025L210A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "025L210A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["025L210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L213.json b/docs/data/histograms/United States/025L213.json
index 4311a903f39..35bc4538f8d 100644
--- a/docs/data/histograms/United States/025L213.json
+++ b/docs/data/histograms/United States/025L213.json
@@ -1 +1 @@
-{"batchcode": "025L213", "histograms": [{"batchcodes": ["025L213"], "histogram": {"Illness": 1, "Nasal congestion": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "025L213", "histograms": [{"histogram": {"Illness": 1, "Nasal congestion": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["025L213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L218.json b/docs/data/histograms/United States/025L218.json
index db5aca1cadb..5a55831c0b2 100644
--- a/docs/data/histograms/United States/025L218.json
+++ b/docs/data/histograms/United States/025L218.json
@@ -1 +1 @@
-{"batchcode": "025L218", "histograms": [{"batchcodes": ["025L218"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "025L218", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["025L218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L21A.json b/docs/data/histograms/United States/025L21A.json
index c025997679a..0956946fa9d 100644
--- a/docs/data/histograms/United States/025L21A.json
+++ b/docs/data/histograms/United States/025L21A.json
@@ -1 +1 @@
-{"batchcode": "025L21A", "histograms": [{"batchcodes": ["025L21A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "025L21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["025L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L21B.json b/docs/data/histograms/United States/025L21B.json
index 16b96bffb06..36a0cce1145 100644
--- a/docs/data/histograms/United States/025L21B.json
+++ b/docs/data/histograms/United States/025L21B.json
@@ -1 +1 @@
-{"batchcode": "025L21B", "histograms": [{"batchcodes": ["025L21B"], "histogram": {"Expired product administered": 35, "Product storage error": 24, "No adverse event": 19, "Product temperature excursion issue": 3, "Accidental overdose": 2, "Nausea": 2, "Abdominal discomfort": 1, "COVID-19": 1, "Chest pain": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling cold": 1, "Lethargy": 1, "Poor quality product administered": 1, "Product administered to patient of inappropriate age": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Tremor": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "025L21B", "histograms": [{"histogram": {"Expired product administered": 35, "Product storage error": 24, "No adverse event": 19, "Product temperature excursion issue": 3, "Accidental overdose": 2, "Nausea": 2, "Abdominal discomfort": 1, "COVID-19": 1, "Chest pain": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling cold": 1, "Lethargy": 1, "Poor quality product administered": 1, "Product administered to patient of inappropriate age": 1, "SARS-CoV-2 test": 1, "Sleep disorder": 1, "Tremor": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["025L21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L21D.json b/docs/data/histograms/United States/025L21D.json
index 68cdd92bf38..aeba88c357a 100644
--- a/docs/data/histograms/United States/025L21D.json
+++ b/docs/data/histograms/United States/025L21D.json
@@ -1 +1 @@
-{"batchcode": "025L21D", "histograms": [{"batchcodes": ["025L21D"], "histogram": {"Body temperature": 1, "Bone pain": 1, "Feeling abnormal": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "025L21D", "histograms": [{"histogram": {"Body temperature": 1, "Bone pain": 1, "Feeling abnormal": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["025L21D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L273.json b/docs/data/histograms/United States/025L273.json
index e00372ef05e..e95b16ccf11 100644
--- a/docs/data/histograms/United States/025L273.json
+++ b/docs/data/histograms/United States/025L273.json
@@ -1 +1 @@
-{"batchcode": "025L273", "histograms": [{"batchcodes": ["025L273"], "histogram": {"Asthma": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "025L273", "histograms": [{"histogram": {"Asthma": 1, "Computerised tomogram": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Wheezing": 1}, "batchcodes": ["025L273"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L29A.json b/docs/data/histograms/United States/025L29A.json
index 8f0483ecebb..4c0baa60779 100644
--- a/docs/data/histograms/United States/025L29A.json
+++ b/docs/data/histograms/United States/025L29A.json
@@ -1 +1 @@
-{"batchcode": "025L29A", "histograms": [{"batchcodes": ["025L29A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "025L29A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["025L29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L2A.json b/docs/data/histograms/United States/025L2A.json
index efb91649191..0061e01fdab 100644
--- a/docs/data/histograms/United States/025L2A.json
+++ b/docs/data/histograms/United States/025L2A.json
@@ -1 +1 @@
-{"batchcode": "025L2A", "histograms": [{"batchcodes": ["025L2A"], "histogram": {"Hypoaesthesia oral": 1, "Lip dry": 1, "Lip erythema": 1, "Lip swelling": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "025L2A", "histograms": [{"histogram": {"Hypoaesthesia oral": 1, "Lip dry": 1, "Lip erythema": 1, "Lip swelling": 1, "Rash": 1}, "batchcodes": ["025L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L2O4.json b/docs/data/histograms/United States/025L2O4.json
index 0931db7c0dc..503b71a0bcc 100644
--- a/docs/data/histograms/United States/025L2O4.json
+++ b/docs/data/histograms/United States/025L2O4.json
@@ -1 +1 @@
-{"batchcode": "025L2O4", "histograms": [{"batchcodes": ["025L2O4"], "histogram": {"Diarrhoea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "025L2O4", "histograms": [{"histogram": {"Diarrhoea": 1, "Pain in extremity": 1}, "batchcodes": ["025L2O4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L2OA.json b/docs/data/histograms/United States/025L2OA.json
index 17005dc694a..de7a66c057d 100644
--- a/docs/data/histograms/United States/025L2OA.json
+++ b/docs/data/histograms/United States/025L2OA.json
@@ -1 +1 @@
-{"batchcode": "025L2OA", "histograms": [{"batchcodes": ["025L2OA"], "histogram": {"Diarrhoea": 2, "Nausea": 2, "Arthralgia": 1, "Asthenia": 1, "C-reactive protein increased": 1, "Chills": 1, "Dyspnoea": 1, "Expired product administered": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Investigation": 1, "Laboratory test": 1, "Liver function test": 1, "Myalgia": 1, "Physical examination": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test positive": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Vomiting": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "025L2OA", "histograms": [{"histogram": {"Diarrhoea": 2, "Nausea": 2, "Arthralgia": 1, "Asthenia": 1, "C-reactive protein increased": 1, "Chills": 1, "Dyspnoea": 1, "Expired product administered": 1, "Fatigue": 1, "Headache": 1, "Hypoaesthesia": 1, "Injection site pain": 1, "Investigation": 1, "Laboratory test": 1, "Liver function test": 1, "Myalgia": 1, "Physical examination": 1, "Pyrexia": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test positive": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vertigo": 1, "Vomiting": 1, "Wheezing": 1}, "batchcodes": ["025L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L2QA.json b/docs/data/histograms/United States/025L2QA.json
index e41ffcd6dbd..ba2dfcb0f47 100644
--- a/docs/data/histograms/United States/025L2QA.json
+++ b/docs/data/histograms/United States/025L2QA.json
@@ -1 +1 @@
-{"batchcode": "025L2QA", "histograms": [{"batchcodes": ["025L2QA"], "histogram": {"Arthralgia": 1, "Chest pain": 1, "Cyst": 1, "Head discomfort": 1, "Joint stiffness": 1, "Neck pain": 1, "Peripheral swelling": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025L2QA", "histograms": [{"histogram": {"Arthralgia": 1, "Chest pain": 1, "Cyst": 1, "Head discomfort": 1, "Joint stiffness": 1, "Neck pain": 1, "Peripheral swelling": 1, "Vaccination site pain": 1}, "batchcodes": ["025L2QA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L50A.json b/docs/data/histograms/United States/025L50A.json
index 3ca854264d7..83720a8523e 100644
--- a/docs/data/histograms/United States/025L50A.json
+++ b/docs/data/histograms/United States/025L50A.json
@@ -1 +1 @@
-{"batchcode": "025L50A", "histograms": [{"batchcodes": ["025L50A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025L50A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["025L50A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025L70A.json b/docs/data/histograms/United States/025L70A.json
index cb74ab424ba..f6b044a3622 100644
--- a/docs/data/histograms/United States/025L70A.json
+++ b/docs/data/histograms/United States/025L70A.json
@@ -1 +1 @@
-{"batchcode": "025L70A", "histograms": [{"batchcodes": ["025L70A"], "histogram": {"Anger": 1, "Injection site erythema": 1, "Injection site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025L70A", "histograms": [{"histogram": {"Anger": 1, "Injection site erythema": 1, "Injection site warmth": 1}, "batchcodes": ["025L70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025LC20A.json b/docs/data/histograms/United States/025LC20A.json
index a0457be9c7b..4c2a962e638 100644
--- a/docs/data/histograms/United States/025LC20A.json
+++ b/docs/data/histograms/United States/025LC20A.json
@@ -1 +1 @@
-{"batchcode": "025LC20A", "histograms": [{"batchcodes": ["025LC20A"], "histogram": {"Muscle spasms": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "025LC20A", "histograms": [{"histogram": {"Muscle spasms": 1, "Paraesthesia": 1}, "batchcodes": ["025LC20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025LD08.json b/docs/data/histograms/United States/025LD08.json
index 2608d91d79d..293fc9910fe 100644
--- a/docs/data/histograms/United States/025LD08.json
+++ b/docs/data/histograms/United States/025LD08.json
@@ -1 +1 @@
-{"batchcode": "025LD08", "histograms": [{"batchcodes": ["025LD08"], "histogram": {"Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025LD08", "histograms": [{"histogram": {"Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["025LD08"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025LZ(OR 2)0A.json b/docs/data/histograms/United States/025LZ(OR 2)0A.json
index 6d6239a341e..0b85014e166 100644
--- a/docs/data/histograms/United States/025LZ(OR 2)0A.json
+++ b/docs/data/histograms/United States/025LZ(OR 2)0A.json
@@ -1 +1 @@
-{"batchcode": "025LZ(OR 2)0A", "histograms": [{"batchcodes": ["025LZ(OR 2)0A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025LZ(OR 2)0A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site warmth": 1}, "batchcodes": ["025LZ(OR 2)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025LZ04.json b/docs/data/histograms/United States/025LZ04.json
index 03b985676f6..f0e89282d9c 100644
--- a/docs/data/histograms/United States/025LZ04.json
+++ b/docs/data/histograms/United States/025LZ04.json
@@ -1 +1 @@
-{"batchcode": "025LZ04", "histograms": [{"batchcodes": ["025LZ04"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site warmth": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025LZ04", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site warmth": 1, "Peripheral swelling": 1}, "batchcodes": ["025LZ04"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025LZ0A.json b/docs/data/histograms/United States/025LZ0A.json
index 6320cdbc4bc..fbcbbebe0cc 100644
--- a/docs/data/histograms/United States/025LZ0A.json
+++ b/docs/data/histograms/United States/025LZ0A.json
@@ -1 +1 @@
-{"batchcode": "025LZ0A", "histograms": [{"batchcodes": ["025LZ0A"], "histogram": {"Atrial fibrillation": 1, "Blood glucose increased": 1, "Condition aggravated": 1, "Feeling abnormal": 1, "Heart rate increased": 1}}]}
\ No newline at end of file
+{"batchcode": "025LZ0A", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Blood glucose increased": 1, "Condition aggravated": 1, "Feeling abnormal": 1, "Heart rate increased": 1}, "batchcodes": ["025LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025M208A.json b/docs/data/histograms/United States/025M208A.json
index 2a98ba8c877..b2e527c2c99 100644
--- a/docs/data/histograms/United States/025M208A.json
+++ b/docs/data/histograms/United States/025M208A.json
@@ -1 +1 @@
-{"batchcode": "025M208A", "histograms": [{"batchcodes": ["025M208A"], "histogram": {"Blister": 1}}]}
\ No newline at end of file
+{"batchcode": "025M208A", "histograms": [{"histogram": {"Blister": 1}, "batchcodes": ["025M208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025M20A.json b/docs/data/histograms/United States/025M20A.json
index 8baa57d313d..a1c42eca31f 100644
--- a/docs/data/histograms/United States/025M20A.json
+++ b/docs/data/histograms/United States/025M20A.json
@@ -1 +1 @@
-{"batchcode": "025M20A", "histograms": [{"batchcodes": ["025M20A"], "histogram": {"Pain": 2, "Pyrexia": 2, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "025M20A", "histograms": [{"histogram": {"Pain": 2, "Pyrexia": 2, "Chills": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["025M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025O20A.json b/docs/data/histograms/United States/025O20A.json
index 235af5eba78..195d0f6197a 100644
--- a/docs/data/histograms/United States/025O20A.json
+++ b/docs/data/histograms/United States/025O20A.json
@@ -1 +1 @@
-{"batchcode": "025O20A", "histograms": [{"batchcodes": ["025O20A"], "histogram": {"Erythema": 1, "Glucose tolerance test": 1, "Maternal exposure during pregnancy": 1, "Mechanical urticaria": 1, "Pregnancy test": 1, "Pruritus": 1, "Scratch": 1, "Ultrasound foetal": 1}}]}
\ No newline at end of file
+{"batchcode": "025O20A", "histograms": [{"histogram": {"Erythema": 1, "Glucose tolerance test": 1, "Maternal exposure during pregnancy": 1, "Mechanical urticaria": 1, "Pregnancy test": 1, "Pruritus": 1, "Scratch": 1, "Ultrasound foetal": 1}, "batchcodes": ["025O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025O21A.json b/docs/data/histograms/United States/025O21A.json
index 199f9902f3c..0354d9d434d 100644
--- a/docs/data/histograms/United States/025O21A.json
+++ b/docs/data/histograms/United States/025O21A.json
@@ -1 +1 @@
-{"batchcode": "025O21A", "histograms": [{"batchcodes": ["025O21A"], "histogram": {"Lymphadenopathy": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025O21A", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["025O21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025PZ1A.json b/docs/data/histograms/United States/025PZ1A.json
index 60e0ce28472..1eea2012828 100644
--- a/docs/data/histograms/United States/025PZ1A.json
+++ b/docs/data/histograms/United States/025PZ1A.json
@@ -1 +1 @@
-{"batchcode": "025PZ1A", "histograms": [{"batchcodes": ["025PZ1A"], "histogram": {"Arthropod bite": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "025PZ1A", "histograms": [{"histogram": {"Arthropod bite": 1, "Vaccination site warmth": 1}, "batchcodes": ["025PZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025S202A.json b/docs/data/histograms/United States/025S202A.json
index 8b61e28cdb3..60a2fc00464 100644
--- a/docs/data/histograms/United States/025S202A.json
+++ b/docs/data/histograms/United States/025S202A.json
@@ -1 +1 @@
-{"batchcode": "025S202A", "histograms": [{"batchcodes": ["025S202A"], "histogram": {"Injection site extravasation": 1, "Rash": 1, "Rash erythematous": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025S202A", "histograms": [{"histogram": {"Injection site extravasation": 1, "Rash": 1, "Rash erythematous": 1, "Tachycardia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["025S202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025S20A.json b/docs/data/histograms/United States/025S20A.json
index d88fefadb77..5c143173092 100644
--- a/docs/data/histograms/United States/025S20A.json
+++ b/docs/data/histograms/United States/025S20A.json
@@ -1 +1 @@
-{"batchcode": "025S20A", "histograms": [{"batchcodes": ["025S20A"], "histogram": {"Pyrexia": 2, "Exposure to SARS-CoV-2": 1}}]}
\ No newline at end of file
+{"batchcode": "025S20A", "histograms": [{"histogram": {"Pyrexia": 2, "Exposure to SARS-CoV-2": 1}, "batchcodes": ["025S20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025T20-2A.json b/docs/data/histograms/United States/025T20-2A.json
index ec9af300474..74ba02a1b96 100644
--- a/docs/data/histograms/United States/025T20-2A.json
+++ b/docs/data/histograms/United States/025T20-2A.json
@@ -1 +1 @@
-{"batchcode": "025T20-2A", "histograms": [{"batchcodes": ["025T20-2A"], "histogram": {"Maternal exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "025T20-2A", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1}, "batchcodes": ["025T20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025T20A OR 025G.json b/docs/data/histograms/United States/025T20A OR 025G.json
index 87eda622236..be38deb873e 100644
--- a/docs/data/histograms/United States/025T20A OR 025G.json
+++ b/docs/data/histograms/United States/025T20A OR 025G.json
@@ -1 +1 @@
-{"batchcode": "025T20A OR 025G", "histograms": [{"batchcodes": ["025T20A OR 025G"], "histogram": {"Erythema": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "025T20A OR 025G", "histograms": [{"histogram": {"Erythema": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Vaccination site pain": 1}, "batchcodes": ["025T20A OR 025G"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025T20A.json b/docs/data/histograms/United States/025T20A.json
index 13c1f7c10ae..e63f9189cb1 100644
--- a/docs/data/histograms/United States/025T20A.json
+++ b/docs/data/histograms/United States/025T20A.json
@@ -1 +1 @@
-{"batchcode": "025T20A", "histograms": [{"batchcodes": ["025T20A"], "histogram": {"Bed rest": 1, "Chills": 1, "Impaired work ability": 1, "Injection site mass": 1, "Injection site pain": 1, "Injection site warmth": 1, "Malaise": 1, "Moaning": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Pyrexia": 1, "Retching": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "025T20A", "histograms": [{"histogram": {"Bed rest": 1, "Chills": 1, "Impaired work ability": 1, "Injection site mass": 1, "Injection site pain": 1, "Injection site warmth": 1, "Malaise": 1, "Moaning": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Pyrexia": 1, "Retching": 1, "Tremor": 1}, "batchcodes": ["025T20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025TA20A.json b/docs/data/histograms/United States/025TA20A.json
index 127b77321d6..3ab75845ba6 100644
--- a/docs/data/histograms/United States/025TA20A.json
+++ b/docs/data/histograms/United States/025TA20A.json
@@ -1 +1 @@
-{"batchcode": "025TA20A", "histograms": [{"batchcodes": ["025TA20A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "025TA20A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["025TA20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025X20A.json b/docs/data/histograms/United States/025X20A.json
index b3570e42f6a..653283147d4 100644
--- a/docs/data/histograms/United States/025X20A.json
+++ b/docs/data/histograms/United States/025X20A.json
@@ -1 +1 @@
-{"batchcode": "025X20A", "histograms": [{"batchcodes": ["025X20A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "025X20A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Pain in extremity": 1}, "batchcodes": ["025X20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/025Z1A.json b/docs/data/histograms/United States/025Z1A.json
index 85f27954e06..6f44c1c451d 100644
--- a/docs/data/histograms/United States/025Z1A.json
+++ b/docs/data/histograms/United States/025Z1A.json
@@ -1 +1 @@
-{"batchcode": "025Z1A", "histograms": [{"batchcodes": ["025Z1A"], "histogram": {"Asthenia": 1, "Back pain": 1, "Decreased appetite": 1, "Dysphagia": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "025Z1A", "histograms": [{"histogram": {"Asthenia": 1, "Back pain": 1, "Decreased appetite": 1, "Dysphagia": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Suspected COVID-19": 1, "Vaccination site mass": 1, "Vaccination site swelling": 1}, "batchcodes": ["025Z1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026-20A.json b/docs/data/histograms/United States/026-20A.json
index a9e9f618cd0..828ca7be28f 100644
--- a/docs/data/histograms/United States/026-20A.json
+++ b/docs/data/histograms/United States/026-20A.json
@@ -1 +1 @@
-{"batchcode": "026-20A", "histograms": [{"batchcodes": ["026-20A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "026-20A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["026-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026-596.json b/docs/data/histograms/United States/026-596.json
index 00f08c25666..bb05c81d4f5 100644
--- a/docs/data/histograms/United States/026-596.json
+++ b/docs/data/histograms/United States/026-596.json
@@ -1 +1 @@
-{"batchcode": "026-596", "histograms": [{"batchcodes": ["026-596"], "histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Dry mouth": 1, "Heart rate increased": 1}}]}
\ No newline at end of file
+{"batchcode": "026-596", "histograms": [{"histogram": {"Blood pressure increased": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Dry mouth": 1, "Heart rate increased": 1}, "batchcodes": ["026-596"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026-A21A.json b/docs/data/histograms/United States/026-A21A.json
index 60223e316d1..f837001b3aa 100644
--- a/docs/data/histograms/United States/026-A21A.json
+++ b/docs/data/histograms/United States/026-A21A.json
@@ -1 +1 @@
-{"batchcode": "026-A21A", "histograms": [{"batchcodes": ["026-A21A"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "026-A21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["026-A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026-L020A.json b/docs/data/histograms/United States/026-L020A.json
index 1549e7508f6..757d37e51be 100644
--- a/docs/data/histograms/United States/026-L020A.json
+++ b/docs/data/histograms/United States/026-L020A.json
@@ -1 +1 @@
-{"batchcode": "026-L020A", "histograms": [{"batchcodes": ["026-L020A"], "histogram": {"Fatigue": 1, "Influenza like illness": 1, "Nausea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026-L020A", "histograms": [{"histogram": {"Fatigue": 1, "Influenza like illness": 1, "Nausea": 1, "Vaccination site pain": 1}, "batchcodes": ["026-L020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026-L206A.json b/docs/data/histograms/United States/026-L206A.json
index 6766d2f64e2..b89ddd69734 100644
--- a/docs/data/histograms/United States/026-L206A.json
+++ b/docs/data/histograms/United States/026-L206A.json
@@ -1 +1 @@
-{"batchcode": "026-L206A", "histograms": [{"batchcodes": ["026-L206A"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "026-L206A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1}, "batchcodes": ["026-L206A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026-L20A.json b/docs/data/histograms/United States/026-L20A.json
index 21e34388a72..5b6e2bc6ab0 100644
--- a/docs/data/histograms/United States/026-L20A.json
+++ b/docs/data/histograms/United States/026-L20A.json
@@ -1 +1 @@
-{"batchcode": "026-L20A", "histograms": [{"batchcodes": ["026-L20A"], "histogram": {"Lip swelling": 1, "Swelling face": 1, "Urticaria": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026-L20A", "histograms": [{"histogram": {"Lip swelling": 1, "Swelling face": 1, "Urticaria": 1, "Vaccination site pain": 1}, "batchcodes": ["026-L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026020A.json b/docs/data/histograms/United States/026020A.json
index 6cac1587cb7..787f7e1d19e 100644
--- a/docs/data/histograms/United States/026020A.json
+++ b/docs/data/histograms/United States/026020A.json
@@ -1 +1 @@
-{"batchcode": "026020A", "histograms": [{"batchcodes": ["026020A"], "histogram": {"Poor quality product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "026020A", "histograms": [{"histogram": {"Poor quality product administered": 1}, "batchcodes": ["026020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026021A.json b/docs/data/histograms/United States/026021A.json
index b0fb2dfc0b8..574721fda58 100644
--- a/docs/data/histograms/United States/026021A.json
+++ b/docs/data/histograms/United States/026021A.json
@@ -1 +1 @@
-{"batchcode": "026021A", "histograms": [{"batchcodes": ["026021A"], "histogram": {"Arthralgia": 2, "Cough": 2, "Fatigue": 2, "Pain in extremity": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Ageusia": 1, "Anosmia": 1, "Axillary mass": 1, "Bone pain": 1, "COVID-19": 1, "Feeling abnormal": 1, "Formication": 1, "Frequent bowel movements": 1, "Illness": 1, "Injection site hypoaesthesia": 1, "Injection site paraesthesia": 1, "Joint swelling": 1, "Limb mass": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash vesicular": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "026021A", "histograms": [{"histogram": {"Arthralgia": 2, "Cough": 2, "Fatigue": 2, "Pain in extremity": 2, "Vaccination site pain": 2, "Vaccination site swelling": 2, "Ageusia": 1, "Anosmia": 1, "Axillary mass": 1, "Bone pain": 1, "COVID-19": 1, "Feeling abnormal": 1, "Formication": 1, "Frequent bowel movements": 1, "Illness": 1, "Injection site hypoaesthesia": 1, "Injection site paraesthesia": 1, "Joint swelling": 1, "Limb mass": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Rash vesicular": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site reaction": 1}, "batchcodes": ["026021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026021F.json b/docs/data/histograms/United States/026021F.json
index bd5acbf85d8..153720a0da1 100644
--- a/docs/data/histograms/United States/026021F.json
+++ b/docs/data/histograms/United States/026021F.json
@@ -1 +1 @@
-{"batchcode": "026021F", "histograms": [{"batchcodes": ["026021F"], "histogram": {"Pain in extremity": 2, "Injected limb mobility decreased": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026021F", "histograms": [{"histogram": {"Pain in extremity": 2, "Injected limb mobility decreased": 1, "Pain": 1}, "batchcodes": ["026021F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02602HA.json b/docs/data/histograms/United States/02602HA.json
index 269834690c0..10e47d3ef1b 100644
--- a/docs/data/histograms/United States/02602HA.json
+++ b/docs/data/histograms/United States/02602HA.json
@@ -1 +1 @@
-{"batchcode": "02602HA", "histograms": [{"batchcodes": ["02602HA"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "02602HA", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["02602HA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0260L20A.json b/docs/data/histograms/United States/0260L20A.json
index 96621597fee..6efef6a06df 100644
--- a/docs/data/histograms/United States/0260L20A.json
+++ b/docs/data/histograms/United States/0260L20A.json
@@ -1 +1 @@
-{"batchcode": "0260L20A", "histograms": [{"batchcodes": ["0260L20A"], "histogram": {"Blood glucose increased": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0260L20A", "histograms": [{"histogram": {"Blood glucose increased": 1, "Pain in extremity": 1}, "batchcodes": ["0260L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0261.20A.json b/docs/data/histograms/United States/0261.20A.json
index 92f738744bb..0e42b3c6fac 100644
--- a/docs/data/histograms/United States/0261.20A.json
+++ b/docs/data/histograms/United States/0261.20A.json
@@ -1 +1 @@
-{"batchcode": "0261.20A", "histograms": [{"batchcodes": ["0261.20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Injection site discomfort": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0261.20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Injection site discomfort": 1, "Vaccination site pain": 1}, "batchcodes": ["0261.20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026120A - 026L2.json b/docs/data/histograms/United States/026120A - 026L2.json
index e94137b7a0b..4f66c23a902 100644
--- a/docs/data/histograms/United States/026120A - 026L2.json
+++ b/docs/data/histograms/United States/026120A - 026L2.json
@@ -1 +1 @@
-{"batchcode": "026120A - 026L2", "histograms": [{"batchcodes": ["026120A - 026L2"], "histogram": {"Balance disorder": 1, "Bedridden": 1, "Chills": 1, "Dizziness": 1, "Headache": 1, "Insomnia": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Tinnitus": 1, "Unevaluable event": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026120A - 026L2", "histograms": [{"histogram": {"Balance disorder": 1, "Bedridden": 1, "Chills": 1, "Dizziness": 1, "Headache": 1, "Insomnia": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Tinnitus": 1, "Unevaluable event": 1, "Vomiting": 1}, "batchcodes": ["026120A - 026L2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026120A.json b/docs/data/histograms/United States/026120A.json
index bf41f3e409b..46e52f08fa6 100644
--- a/docs/data/histograms/United States/026120A.json
+++ b/docs/data/histograms/United States/026120A.json
@@ -1 +1 @@
-{"batchcode": "026120A", "histograms": [{"batchcodes": ["026120A"], "histogram": {"Chills": 3, "Headache": 3, "Vaccination site erythema": 3, "Arthralgia": 2, "Nausea": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vaccination complication": 2, "Vaccination site pain": 2, "Blood pressure increased": 1, "Body temperature": 1, "Body temperature increased": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Ear discomfort": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Glucose tolerance test": 1, "Heart rate increased": 1, "Lip swelling": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nucleated red cells": 1, "Oophorectomy": 1, "Periorbital haemorrhage": 1, "Pregnancy test": 1, "Rash": 1, "Red blood cell count abnormal": 1, "Retching": 1, "Swelling face": 1, "Tenderness": 1, "Tremor": 1, "Ultrasound uterus normal": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026120A", "histograms": [{"histogram": {"Chills": 3, "Headache": 3, "Vaccination site erythema": 3, "Arthralgia": 2, "Nausea": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vaccination complication": 2, "Vaccination site pain": 2, "Blood pressure increased": 1, "Body temperature": 1, "Body temperature increased": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Ear discomfort": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Glucose tolerance test": 1, "Heart rate increased": 1, "Lip swelling": 1, "Maternal exposure during pregnancy": 1, "Muscular weakness": 1, "Nucleated red cells": 1, "Oophorectomy": 1, "Periorbital haemorrhage": 1, "Pregnancy test": 1, "Rash": 1, "Red blood cell count abnormal": 1, "Retching": 1, "Swelling face": 1, "Tenderness": 1, "Tremor": 1, "Ultrasound uterus normal": 1, "Urticaria": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["026120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026121B.json b/docs/data/histograms/United States/026121B.json
index a98c8106065..38bb71bcd4e 100644
--- a/docs/data/histograms/United States/026121B.json
+++ b/docs/data/histograms/United States/026121B.json
@@ -1 +1 @@
-{"batchcode": "026121B", "histograms": [{"batchcodes": ["026121B"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "026121B", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["026121B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026126A.json b/docs/data/histograms/United States/026126A.json
index 30fbf11d9a4..51fc621ff67 100644
--- a/docs/data/histograms/United States/026126A.json
+++ b/docs/data/histograms/United States/026126A.json
@@ -1 +1 @@
-{"batchcode": "026126A", "histograms": [{"batchcodes": ["026126A"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "026126A", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["026126A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02612OA.json b/docs/data/histograms/United States/02612OA.json
index 07a1700cac0..43c952d2512 100644
--- a/docs/data/histograms/United States/02612OA.json
+++ b/docs/data/histograms/United States/02612OA.json
@@ -1 +1 @@
-{"batchcode": "02612OA", "histograms": [{"batchcodes": ["02612OA"], "histogram": {"Body temperature": 1, "Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1, "Tachycardia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "02612OA", "histograms": [{"histogram": {"Body temperature": 1, "Dizziness": 1, "Fatigue": 1, "Nausea": 1, "Pyrexia": 1, "Tachycardia": 1, "Vomiting": 1}, "batchcodes": ["02612OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026190A.json b/docs/data/histograms/United States/026190A.json
index 4c03f22b7bc..8bc445385a4 100644
--- a/docs/data/histograms/United States/026190A.json
+++ b/docs/data/histograms/United States/026190A.json
@@ -1 +1 @@
-{"batchcode": "026190A", "histograms": [{"batchcodes": ["026190A"], "histogram": {"Erythema": 1, "Heart rate increased": 1}}]}
\ No newline at end of file
+{"batchcode": "026190A", "histograms": [{"histogram": {"Erythema": 1, "Heart rate increased": 1}, "batchcodes": ["026190A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02620A.json b/docs/data/histograms/United States/02620A.json
index 9c13ba9d4d0..c9ecbe6b6b3 100644
--- a/docs/data/histograms/United States/02620A.json
+++ b/docs/data/histograms/United States/02620A.json
@@ -1 +1 @@
-{"batchcode": "02620A", "histograms": [{"batchcodes": ["02620A"], "histogram": {"Asthenia": 1, "Influenza like illness": 1}}]}
\ No newline at end of file
+{"batchcode": "02620A", "histograms": [{"histogram": {"Asthenia": 1, "Influenza like illness": 1}, "batchcodes": ["02620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02621A.json b/docs/data/histograms/United States/02621A.json
index 9a65e48b1d1..5d34808598b 100644
--- a/docs/data/histograms/United States/02621A.json
+++ b/docs/data/histograms/United States/02621A.json
@@ -1 +1 @@
-{"batchcode": "02621A", "histograms": [{"batchcodes": ["02621A"], "histogram": {"Abdominal pain upper": 1, "Dizziness": 1, "Headache": 1, "Loss of consciousness": 1, "Vision blurred": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "02621A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Dizziness": 1, "Headache": 1, "Loss of consciousness": 1, "Vision blurred": 1, "Vomiting": 1}, "batchcodes": ["02621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0262201A.json b/docs/data/histograms/United States/0262201A.json
index 34f0e2cae89..20d1a4ea3f3 100644
--- a/docs/data/histograms/United States/0262201A.json
+++ b/docs/data/histograms/United States/0262201A.json
@@ -1 +1 @@
-{"batchcode": "0262201A", "histograms": [{"batchcodes": ["0262201A"], "histogram": {"Malaise": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0262201A", "histograms": [{"histogram": {"Malaise": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["0262201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026220A.json b/docs/data/histograms/United States/026220A.json
index 8132bd4d531..57688f66ba9 100644
--- a/docs/data/histograms/United States/026220A.json
+++ b/docs/data/histograms/United States/026220A.json
@@ -1 +1 @@
-{"batchcode": "026220A", "histograms": [{"batchcodes": ["026220A"], "histogram": {"Back pain": 1, "Chills": 1, "Exposure during pregnancy": 1, "Headache": 1, "Heart rate increased": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Product administered to patient of inappropriate age": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1, "Rash papular": 1, "Ultrasound abdomen": 1}}]}
\ No newline at end of file
+{"batchcode": "026220A", "histograms": [{"histogram": {"Back pain": 1, "Chills": 1, "Exposure during pregnancy": 1, "Headache": 1, "Heart rate increased": 1, "Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Myalgia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pharyngeal swelling": 1, "Product administered to patient of inappropriate age": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rash": 1, "Rash papular": 1, "Ultrasound abdomen": 1}, "batchcodes": ["026220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0263(B?)21A.json b/docs/data/histograms/United States/0263(B?)21A.json
index a091df78e24..c76f218b0ed 100644
--- a/docs/data/histograms/United States/0263(B?)21A.json
+++ b/docs/data/histograms/United States/0263(B?)21A.json
@@ -1 +1 @@
-{"batchcode": "0263(B?)21A", "histograms": [{"batchcodes": ["0263(B?)21A"], "histogram": {"Ageusia": 1, "Chills": 1, "Diarrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0263(B?)21A", "histograms": [{"histogram": {"Ageusia": 1, "Chills": 1, "Diarrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0263(B?)21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026421A.json b/docs/data/histograms/United States/026421A.json
index 58209bd3f81..c909aecf96f 100644
--- a/docs/data/histograms/United States/026421A.json
+++ b/docs/data/histograms/United States/026421A.json
@@ -1 +1 @@
-{"batchcode": "026421A", "histograms": [{"batchcodes": ["026421A"], "histogram": {"Gait inability": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026421A", "histograms": [{"histogram": {"Gait inability": 1, "Pain": 1}, "batchcodes": ["026421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026520-2A.json b/docs/data/histograms/United States/026520-2A.json
index e48b5b6ca58..3dba5b8b563 100644
--- a/docs/data/histograms/United States/026520-2A.json
+++ b/docs/data/histograms/United States/026520-2A.json
@@ -1 +1 @@
-{"batchcode": "026520-2A", "histograms": [{"batchcodes": ["026520-2A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Nephrolithiasis": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "026520-2A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Nephrolithiasis": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["026520-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026521A.json b/docs/data/histograms/United States/026521A.json
index f26d7fbebe3..3eb65238d69 100644
--- a/docs/data/histograms/United States/026521A.json
+++ b/docs/data/histograms/United States/026521A.json
@@ -1 +1 @@
-{"batchcode": "026521A", "histograms": [{"batchcodes": ["026521A"], "histogram": {"Chills": 1, "Cold sweat": 1}}]}
\ No newline at end of file
+{"batchcode": "026521A", "histograms": [{"histogram": {"Chills": 1, "Cold sweat": 1}, "batchcodes": ["026521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026561.json b/docs/data/histograms/United States/026561.json
index 8651791ad3a..366800231de 100644
--- a/docs/data/histograms/United States/026561.json
+++ b/docs/data/histograms/United States/026561.json
@@ -1 +1 @@
-{"batchcode": "026561", "histograms": [{"batchcodes": ["026561"], "histogram": {"Arthralgia": 1, "Arthritis": 1, "Dysstasia": 1, "Fatigue": 1, "Hypoacusis": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "026561", "histograms": [{"histogram": {"Arthralgia": 1, "Arthritis": 1, "Dysstasia": 1, "Fatigue": 1, "Hypoacusis": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site swelling": 1}, "batchcodes": ["026561"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0266204.json b/docs/data/histograms/United States/0266204.json
index 393b0c310c4..9ca5b7fb147 100644
--- a/docs/data/histograms/United States/0266204.json
+++ b/docs/data/histograms/United States/0266204.json
@@ -1 +1 @@
-{"batchcode": "0266204", "histograms": [{"batchcodes": ["0266204"], "histogram": {"Arthralgia": 1, "Erythema": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Nausea": 1, "Rash papular": 1}}]}
\ No newline at end of file
+{"batchcode": "0266204", "histograms": [{"histogram": {"Arthralgia": 1, "Erythema": 1, "Injection site erythema": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Nausea": 1, "Rash papular": 1}, "batchcodes": ["0266204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0266208.json b/docs/data/histograms/United States/0266208.json
index 2e72ad71282..fd13ebd27b9 100644
--- a/docs/data/histograms/United States/0266208.json
+++ b/docs/data/histograms/United States/0266208.json
@@ -1 +1 @@
-{"batchcode": "0266208", "histograms": [{"batchcodes": ["0266208"], "histogram": {"Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "0266208", "histograms": [{"histogram": {"Lymphadenopathy": 1}, "batchcodes": ["0266208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026620A.json b/docs/data/histograms/United States/026620A.json
index 9be61a04e99..5d1e5d722c5 100644
--- a/docs/data/histograms/United States/026620A.json
+++ b/docs/data/histograms/United States/026620A.json
@@ -1 +1 @@
-{"batchcode": "026620A", "histograms": [{"batchcodes": ["026620A"], "histogram": {"COVID-19": 3, "Feeling abnormal": 3, "SARS-CoV-2 test": 3, "Body temperature": 2, "Diarrhoea": 2, "Gait disturbance": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Abdominal distension": 1, "Abdominal lymphadenopathy": 1, "Abdominal pain": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Bone pain": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Heart rate increased": 1, "Hip fracture": 1, "Inflammation": 1, "Influenza": 1, "Intestinal obstruction": 1, "Malaise": 1, "Nausea": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Tongue discomfort": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vomiting": 1, "Vomiting projectile": 1}}]}
\ No newline at end of file
+{"batchcode": "026620A", "histograms": [{"histogram": {"COVID-19": 3, "Feeling abnormal": 3, "SARS-CoV-2 test": 3, "Body temperature": 2, "Diarrhoea": 2, "Gait disturbance": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Abdominal distension": 1, "Abdominal lymphadenopathy": 1, "Abdominal pain": 1, "Arthralgia": 1, "Balance disorder": 1, "Blood pressure increased": 1, "Bone pain": 1, "Burning sensation": 1, "Chest discomfort": 1, "Chills": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Heart rate increased": 1, "Hip fracture": 1, "Inflammation": 1, "Influenza": 1, "Intestinal obstruction": 1, "Malaise": 1, "Nausea": 1, "Oxygen saturation": 1, "Pneumonia": 1, "Tongue discomfort": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vomiting": 1, "Vomiting projectile": 1}, "batchcodes": ["026620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026621A.json b/docs/data/histograms/United States/026621A.json
index cb638f7d7a9..f356a809797 100644
--- a/docs/data/histograms/United States/026621A.json
+++ b/docs/data/histograms/United States/026621A.json
@@ -1 +1 @@
-{"batchcode": "026621A", "histograms": [{"batchcodes": ["026621A"], "histogram": {"Gout": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "026621A", "histograms": [{"histogram": {"Gout": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1}, "batchcodes": ["026621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02669.json b/docs/data/histograms/United States/02669.json
index 446625158cf..55121e262f6 100644
--- a/docs/data/histograms/United States/02669.json
+++ b/docs/data/histograms/United States/02669.json
@@ -1 +1 @@
-{"batchcode": "02669", "histograms": [{"batchcodes": ["02669"], "histogram": {"Dizziness": 1, "Head discomfort": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "02669", "histograms": [{"histogram": {"Dizziness": 1, "Head discomfort": 1, "Malaise": 1}, "batchcodes": ["02669"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026720A.json b/docs/data/histograms/United States/026720A.json
index 36e49fcc163..3b5452d97ea 100644
--- a/docs/data/histograms/United States/026720A.json
+++ b/docs/data/histograms/United States/026720A.json
@@ -1 +1 @@
-{"batchcode": "026720A", "histograms": [{"batchcodes": ["026720A"], "histogram": {"Accidental underdose": 1, "Lymphadenopathy": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026720A", "histograms": [{"histogram": {"Accidental underdose": 1, "Lymphadenopathy": 1, "Vaccination site pain": 1}, "batchcodes": ["026720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0269219.json b/docs/data/histograms/United States/0269219.json
index 44513a2e457..91853292f97 100644
--- a/docs/data/histograms/United States/0269219.json
+++ b/docs/data/histograms/United States/0269219.json
@@ -1 +1 @@
-{"batchcode": "0269219", "histograms": [{"batchcodes": ["0269219"], "histogram": {"Diarrhoea": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0269219", "histograms": [{"histogram": {"Diarrhoea": 1, "Rash": 1}, "batchcodes": ["0269219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026A12A.json b/docs/data/histograms/United States/026A12A.json
index cc3c0e0ba28..a2b9d1e0a03 100644
--- a/docs/data/histograms/United States/026A12A.json
+++ b/docs/data/histograms/United States/026A12A.json
@@ -1 +1 @@
-{"batchcode": "026A12A", "histograms": [{"batchcodes": ["026A12A"], "histogram": {"Body temperature": 1, "Dizziness": 1, "Euphoric mood": 1, "Fatigue": 1, "Parosmia": 1, "Pyrexia": 1, "Restless legs syndrome": 1}}]}
\ No newline at end of file
+{"batchcode": "026A12A", "histograms": [{"histogram": {"Body temperature": 1, "Dizziness": 1, "Euphoric mood": 1, "Fatigue": 1, "Parosmia": 1, "Pyrexia": 1, "Restless legs syndrome": 1}, "batchcodes": ["026A12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026A20A.json b/docs/data/histograms/United States/026A20A.json
index b79c73cc30b..781f4c265b1 100644
--- a/docs/data/histograms/United States/026A20A.json
+++ b/docs/data/histograms/United States/026A20A.json
@@ -1 +1 @@
-{"batchcode": "026A20A", "histograms": [{"batchcodes": ["026A20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Hypokinesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Skin exfoliation": 1}}]}
\ No newline at end of file
+{"batchcode": "026A20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Hypokinesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Skin exfoliation": 1}, "batchcodes": ["026A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026A21.json b/docs/data/histograms/United States/026A21.json
index c02633c81aa..a1843ac0f27 100644
--- a/docs/data/histograms/United States/026A21.json
+++ b/docs/data/histograms/United States/026A21.json
@@ -1 +1 @@
-{"batchcode": "026A21", "histograms": [{"batchcodes": ["026A21"], "histogram": {"Chills": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Pain": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "026A21", "histograms": [{"histogram": {"Chills": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Pain": 1, "Rash": 1}, "batchcodes": ["026A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026A2114.json b/docs/data/histograms/United States/026A2114.json
index d979d082286..e0b3186651e 100644
--- a/docs/data/histograms/United States/026A2114.json
+++ b/docs/data/histograms/United States/026A2114.json
@@ -1 +1 @@
-{"batchcode": "026A2114", "histograms": [{"batchcodes": ["026A2114"], "histogram": {"Atrial fibrillation": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Myocardial infarction": 1, "Pain in extremity": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "026A2114", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Chest discomfort": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Myocardial infarction": 1, "Pain in extremity": 1, "Tinnitus": 1}, "batchcodes": ["026A2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026A219.json b/docs/data/histograms/United States/026A219.json
index a6728675658..562c169e944 100644
--- a/docs/data/histograms/United States/026A219.json
+++ b/docs/data/histograms/United States/026A219.json
@@ -1 +1 @@
-{"batchcode": "026A219", "histograms": [{"batchcodes": ["026A219"], "histogram": {"Anxiety": 1, "Bedridden": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Chest pain": 1, "Dysuria": 1, "Myalgia": 1, "Neurosis": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Tremor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026A219", "histograms": [{"histogram": {"Anxiety": 1, "Bedridden": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Chest pain": 1, "Dysuria": 1, "Myalgia": 1, "Neurosis": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Tremor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["026A219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026A21A..json b/docs/data/histograms/United States/026A21A..json
index 2d2f59f5b28..af71e1afd48 100644
--- a/docs/data/histograms/United States/026A21A..json
+++ b/docs/data/histograms/United States/026A21A..json
@@ -1 +1 @@
-{"batchcode": "026A21A.", "histograms": [{"batchcodes": ["026A21A."], "histogram": {"Fatigue": 2, "Arthralgia": 1, "Asthenia": 1, "Bedridden": 1, "Chills": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Fibromyalgia": 1, "Headache": 1, "Illness": 1, "Impaired work ability": 1, "Myalgia": 1, "Nausea": 1, "Sleep apnoea syndrome": 1, "Sleep study": 1, "Systemic lupus erythematosus": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026A21A.", "histograms": [{"histogram": {"Fatigue": 2, "Arthralgia": 1, "Asthenia": 1, "Bedridden": 1, "Chills": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Fibromyalgia": 1, "Headache": 1, "Illness": 1, "Impaired work ability": 1, "Myalgia": 1, "Nausea": 1, "Sleep apnoea syndrome": 1, "Sleep study": 1, "Systemic lupus erythematosus": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["026A21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026A21A.json b/docs/data/histograms/United States/026A21A.json
index dc81da2524f..875d419a8f6 100644
--- a/docs/data/histograms/United States/026A21A.json
+++ b/docs/data/histograms/United States/026A21A.json
@@ -1 +1 @@
-{"batchcode": "026A21A", "histograms": [{"batchcodes": ["026A21A"], "histogram": {"Expired product administered": 103, "Product storage error": 88, "Pyrexia": 75, "Headache": 69, "Fatigue": 65, "Pain in extremity": 64, "Chills": 58, "Myalgia": 52, "Vaccination site pain": 43, "Vaccination site erythema": 40, "Nausea": 36, "Arthralgia": 29, "Dizziness": 28, "Pain": 28, "Asthenia": 27, "Body temperature": 27, "Vaccination site swelling": 26, "Vaccination site pruritus": 25, "Influenza like illness": 24, "Vomiting": 23, "Feeling abnormal": 22, "Pruritus": 20, "Rash": 20, "Vaccination site warmth": 20, "Erythema": 18, "Diarrhoea": 17, "Lymphadenopathy": 17, "Peripheral swelling": 17, "Dyspnoea": 16, "Cough": 13, "Illness": 12, "SARS-CoV-2 test": 12, "COVID-19": 11, "Hypoaesthesia": 11, "Vaccination site induration": 10, "Vaccination site rash": 10, "Blood pressure measurement": 9, "Decreased appetite": 9, "Paraesthesia": 9, "Rhinorrhoea": 9, "Vaccination complication": 9, "Abdominal discomfort": 8, "Feeling hot": 8, "Herpes zoster": 8, "Hyperhidrosis": 8, "Mobility decreased": 8, "Product dose omission issue": 8, "Tremor": 8, "Insomnia": 7, "Malaise": 7, "Nasopharyngitis": 7, "Swelling": 7, "Blood pressure increased": 6, "Burning sensation": 6, "Discomfort": 6, "Feeling cold": 6, "Heart rate increased": 6, "Hypersensitivity": 6, "Limb discomfort": 6, "Magnetic resonance imaging": 6, "Nasal congestion": 6, "Urticaria": 6, "Vaccination site reaction": 6, "Abdominal pain upper": 5, "Back pain": 5, "Heart rate": 5, "Hypertension": 5, "Inappropriate schedule of product administration": 5, "Maternal exposure during pregnancy": 5, "Neck pain": 5, "Oropharyngeal pain": 5, "Palpitations": 5, "Rash erythematous": 5, "Rash pruritic": 5, "Somnolence": 5, "Swelling face": 5, "Blood glucose": 4, "Dysgeusia": 4, "Injection site erythema": 4, "Lymph node pain": 4, "Neuralgia": 4, "Neuropathy peripheral": 4, "Paraesthesia oral": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 antibody test": 4, "Sinusitis": 4, "Swelling of eyelid": 4, "Tinnitus": 4, "Ultrasound scan": 4, "Vaccination site mass": 4, "Accidental overdose": 3, "Blood test": 3, "Body temperature increased": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Condition aggravated": 3, "Confusional state": 3, "Constipation": 3, "Dysphagia": 3, "Epistaxis": 3, "Gait disturbance": 3, "Haemoptysis": 3, "Inflammation": 3, "Injection site pain": 3, "Interchange of vaccine products": 3, "Lethargy": 3, "Muscle spasms": 3, "Muscular weakness": 3, "Pneumonia": 3, "Poor quality product administered": 3, "Productive cough": 3, "Rash macular": 3, "Rash papular": 3, "Skin swelling": 3, "Skin warm": 3, "Tenderness": 3, "Vaccination site movement impairment": 3, "Vision blurred": 3, "Accidental underdose": 2, "Alopecia": 2, "Anxiety": 2, "Blister": 2, "Blood glucose increased": 2, "Bone pain": 2, "Breast pain": 2, "Bursitis": 2, "Chest pain": 2, "Dehydration": 2, "Depressed mood": 2, "Device connection issue": 2, "Diplopia": 2, "Dysphonia": 2, "Electrocardiogram": 2, "Fear": 2, "Flushing": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Impaired driving ability": 2, "Injection site mass": 2, "Injection site warmth": 2, "Joint stiffness": 2, "Lip blister": 2, "Lip swelling": 2, "Loss of personal independence in daily activities": 2, "Mammogram": 2, "Mass": 2, "Migraine": 2, "Mouth ulceration": 2, "Muscle tightness": 2, "Musculoskeletal discomfort": 2, "Musculoskeletal stiffness": 2, "Night sweats": 2, "Oral discomfort": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation": 2, "Parosmia": 2, "SARS-CoV-2 test positive": 2, "Sleep disorder": 2, "Sneezing": 2, "Speech disorder": 2, "Suspected COVID-19": 2, "Tendonitis": 2, "Therapeutic response unexpected": 2, "Thrombosis": 2, "Troponin": 2, "Troponin increased": 2, "Ultrasound foetal": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "X-ray": 2, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Adverse event": 1, "Adverse reaction": 1, "Ageusia": 1, "Alcohol intolerance": 1, "Amenorrhoea": 1, "Amniocentesis": 1, "Amyotrophic lateral sclerosis": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antibody test": 1, "Aphasia": 1, "Arthritis": 1, "Arthropod bite": 1, "Asthenopia": 1, "Autoimmune hepatitis": 1, "Balance disorder": 1, "Bedridden": 1, "Behaviour disorder": 1, "Blepharospasm": 1, "Blood grouping": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Bone scan": 1, "Breast swelling": 1, "Caesarean section": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Carpal tunnel syndrome": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cheilitis": 1, "Chest X-ray": 1, "Cognitive disorder": 1, "Deafness unilateral": 1, "Death": 1, "Decreased interest": 1, "Delirium": 1, "Diabetes mellitus inadequate control": 1, "Dry mouth": 1, "Dry throat": 1, "Dyskinesia": 1, "Dysstasia": 1, "Dysuria": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Emotional distress": 1, "Exposure during pregnancy": 1, "Exposure via breast milk": 1, "Extra dose administered": 1, "Eye irritation": 1, "Eye pain": 1, "Eye swelling": 1, "Eyelids pruritus": 1, "Face oedema": 1, "Failed induction of labour": 1, "Fall": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Flank pain": 1, "Food allergy": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Herpes simplex": 1, "Hospice care": 1, "Hyperemesis gravidarum": 1, "Hypersomnia": 1, "Hypokalaemia": 1, "Hypotension": 1, "Hypothyroidism": 1, "Immediate post-injection reaction": 1, "Inappropriate affect": 1, "Incontinence": 1, "Induration": 1, "Influenza": 1, "Initial insomnia": 1, "Injection site cellulitis": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Limb deformity": 1, "Lip exfoliation": 1, "Lip pruritus": 1, "Lip scab": 1, "Liver function test": 1, "Lung neoplasm malignant": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Metabolic disorder": 1, "Mouth swelling": 1, "Movement disorder": 1, "Mucosal pain": 1, "Multiple allergies": 1, "Muscle atrophy": 1, "Musculoskeletal pain": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nasal disorder": 1, "Necrosis": 1, "Nodule": 1, "Oedema": 1, "Oesophageal discomfort": 1, "Oral mucosal blistering": 1, "Pain in jaw": 1, "Periorbital swelling": 1, "Peroneal nerve palsy": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Placenta praevia": 1, "Positive dose response relationship": 1, "Post procedural complication": 1, "Pregnancy test": 1, "Presyncope": 1, "Product administration error": 1, "Product quality issue": 1, "Product temperature excursion issue": 1, "Psychomotor hyperactivity": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary pain": 1, "Pulmonary thrombosis": 1, "Renal pain": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "Rotator cuff syndrome": 1, "Scab": 1, "Sciatica": 1, "Sensitive skin": 1, "Sinus disorder": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion": 1, "Skin odour abnormal": 1, "Sleep apnoea syndrome": 1, "Spinal X-ray": 1, "Stress": 1, "Suppressed lactation": 1, "Swollen tongue": 1, "Systemic lupus erythematosus": 1, "Tachycardia": 1, "Taste disorder": 1, "Testicular pain": 1, "Testicular swelling": 1, "Thinking abnormal": 1, "Thyroid hormones increased": 1, "Thyroid hormones test": 1, "Trigeminal neuralgia": 1, "Upper respiratory tract infection": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site dryness": 1, "Vaccination site exfoliation": 1, "Vaccination site irritation": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vitiligo": 1, "Weight decreased": 1, "Weight increased": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "026A21A", "histograms": [{"histogram": {"Expired product administered": 103, "Product storage error": 88, "Pyrexia": 75, "Headache": 69, "Fatigue": 65, "Pain in extremity": 64, "Chills": 58, "Myalgia": 52, "Vaccination site pain": 43, "Vaccination site erythema": 40, "Nausea": 36, "Arthralgia": 29, "Dizziness": 28, "Pain": 28, "Asthenia": 27, "Body temperature": 27, "Vaccination site swelling": 26, "Vaccination site pruritus": 25, "Influenza like illness": 24, "Vomiting": 23, "Feeling abnormal": 22, "Pruritus": 20, "Rash": 20, "Vaccination site warmth": 20, "Erythema": 18, "Diarrhoea": 17, "Lymphadenopathy": 17, "Peripheral swelling": 17, "Dyspnoea": 16, "Cough": 13, "Illness": 12, "SARS-CoV-2 test": 12, "COVID-19": 11, "Hypoaesthesia": 11, "Vaccination site induration": 10, "Vaccination site rash": 10, "Blood pressure measurement": 9, "Decreased appetite": 9, "Paraesthesia": 9, "Rhinorrhoea": 9, "Vaccination complication": 9, "Abdominal discomfort": 8, "Feeling hot": 8, "Herpes zoster": 8, "Hyperhidrosis": 8, "Mobility decreased": 8, "Product dose omission issue": 8, "Tremor": 8, "Insomnia": 7, "Malaise": 7, "Nasopharyngitis": 7, "Swelling": 7, "Blood pressure increased": 6, "Burning sensation": 6, "Discomfort": 6, "Feeling cold": 6, "Heart rate increased": 6, "Hypersensitivity": 6, "Limb discomfort": 6, "Magnetic resonance imaging": 6, "Nasal congestion": 6, "Urticaria": 6, "Vaccination site reaction": 6, "Abdominal pain upper": 5, "Back pain": 5, "Heart rate": 5, "Hypertension": 5, "Inappropriate schedule of product administration": 5, "Maternal exposure during pregnancy": 5, "Neck pain": 5, "Oropharyngeal pain": 5, "Palpitations": 5, "Rash erythematous": 5, "Rash pruritic": 5, "Somnolence": 5, "Swelling face": 5, "Blood glucose": 4, "Dysgeusia": 4, "Injection site erythema": 4, "Lymph node pain": 4, "Neuralgia": 4, "Neuropathy peripheral": 4, "Paraesthesia oral": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 antibody test": 4, "Sinusitis": 4, "Swelling of eyelid": 4, "Tinnitus": 4, "Ultrasound scan": 4, "Vaccination site mass": 4, "Accidental overdose": 3, "Blood test": 3, "Body temperature increased": 3, "Chest discomfort": 3, "Computerised tomogram": 3, "Condition aggravated": 3, "Confusional state": 3, "Constipation": 3, "Dysphagia": 3, "Epistaxis": 3, "Gait disturbance": 3, "Haemoptysis": 3, "Inflammation": 3, "Injection site pain": 3, "Interchange of vaccine products": 3, "Lethargy": 3, "Muscle spasms": 3, "Muscular weakness": 3, "Pneumonia": 3, "Poor quality product administered": 3, "Productive cough": 3, "Rash macular": 3, "Rash papular": 3, "Skin swelling": 3, "Skin warm": 3, "Tenderness": 3, "Vaccination site movement impairment": 3, "Vision blurred": 3, "Accidental underdose": 2, "Alopecia": 2, "Anxiety": 2, "Blister": 2, "Blood glucose increased": 2, "Bone pain": 2, "Breast pain": 2, "Bursitis": 2, "Chest pain": 2, "Dehydration": 2, "Depressed mood": 2, "Device connection issue": 2, "Diplopia": 2, "Dysphonia": 2, "Electrocardiogram": 2, "Fear": 2, "Flushing": 2, "Hypoacusis": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Impaired driving ability": 2, "Injection site mass": 2, "Injection site warmth": 2, "Joint stiffness": 2, "Lip blister": 2, "Lip swelling": 2, "Loss of personal independence in daily activities": 2, "Mammogram": 2, "Mass": 2, "Migraine": 2, "Mouth ulceration": 2, "Muscle tightness": 2, "Musculoskeletal discomfort": 2, "Musculoskeletal stiffness": 2, "Night sweats": 2, "Oral discomfort": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation": 2, "Parosmia": 2, "SARS-CoV-2 test positive": 2, "Sleep disorder": 2, "Sneezing": 2, "Speech disorder": 2, "Suspected COVID-19": 2, "Tendonitis": 2, "Therapeutic response unexpected": 2, "Thrombosis": 2, "Troponin": 2, "Troponin increased": 2, "Ultrasound foetal": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "X-ray": 2, "Abnormal behaviour": 1, "Abnormal sensation in eye": 1, "Adverse event": 1, "Adverse reaction": 1, "Ageusia": 1, "Alcohol intolerance": 1, "Amenorrhoea": 1, "Amniocentesis": 1, "Amyotrophic lateral sclerosis": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Antibody test": 1, "Aphasia": 1, "Arthritis": 1, "Arthropod bite": 1, "Asthenopia": 1, "Autoimmune hepatitis": 1, "Balance disorder": 1, "Bedridden": 1, "Behaviour disorder": 1, "Blepharospasm": 1, "Blood grouping": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Bone scan": 1, "Breast swelling": 1, "Caesarean section": 1, "Cardiac flutter": 1, "Cardiac stress test": 1, "Carpal tunnel syndrome": 1, "Catheterisation cardiac": 1, "Cellulitis": 1, "Cheilitis": 1, "Chest X-ray": 1, "Cognitive disorder": 1, "Deafness unilateral": 1, "Death": 1, "Decreased interest": 1, "Delirium": 1, "Diabetes mellitus inadequate control": 1, "Dry mouth": 1, "Dry throat": 1, "Dyskinesia": 1, "Dysstasia": 1, "Dysuria": 1, "Ear discomfort": 1, "Echocardiogram": 1, "Electroencephalogram": 1, "Emotional distress": 1, "Exposure during pregnancy": 1, "Exposure via breast milk": 1, "Extra dose administered": 1, "Eye irritation": 1, "Eye pain": 1, "Eye swelling": 1, "Eyelids pruritus": 1, "Face oedema": 1, "Failed induction of labour": 1, "Fall": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Flank pain": 1, "Food allergy": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Herpes simplex": 1, "Hospice care": 1, "Hyperemesis gravidarum": 1, "Hypersomnia": 1, "Hypokalaemia": 1, "Hypotension": 1, "Hypothyroidism": 1, "Immediate post-injection reaction": 1, "Inappropriate affect": 1, "Incontinence": 1, "Induration": 1, "Influenza": 1, "Initial insomnia": 1, "Injection site cellulitis": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Joint swelling": 1, "Lacrimation increased": 1, "Limb deformity": 1, "Lip exfoliation": 1, "Lip pruritus": 1, "Lip scab": 1, "Liver function test": 1, "Lung neoplasm malignant": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Metabolic disorder": 1, "Mouth swelling": 1, "Movement disorder": 1, "Mucosal pain": 1, "Multiple allergies": 1, "Muscle atrophy": 1, "Musculoskeletal pain": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nasal disorder": 1, "Necrosis": 1, "Nodule": 1, "Oedema": 1, "Oesophageal discomfort": 1, "Oral mucosal blistering": 1, "Pain in jaw": 1, "Periorbital swelling": 1, "Peroneal nerve palsy": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Placenta praevia": 1, "Positive dose response relationship": 1, "Post procedural complication": 1, "Pregnancy test": 1, "Presyncope": 1, "Product administration error": 1, "Product quality issue": 1, "Product temperature excursion issue": 1, "Psychomotor hyperactivity": 1, "Pulmonary embolism": 1, "Pulmonary function test": 1, "Pulmonary pain": 1, "Pulmonary thrombosis": 1, "Renal pain": 1, "Respiratory rate": 1, "Respiratory symptom": 1, "Restlessness": 1, "Rotator cuff syndrome": 1, "Scab": 1, "Sciatica": 1, "Sensitive skin": 1, "Sinus disorder": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion": 1, "Skin odour abnormal": 1, "Sleep apnoea syndrome": 1, "Spinal X-ray": 1, "Stress": 1, "Suppressed lactation": 1, "Swollen tongue": 1, "Systemic lupus erythematosus": 1, "Tachycardia": 1, "Taste disorder": 1, "Testicular pain": 1, "Testicular swelling": 1, "Thinking abnormal": 1, "Thyroid hormones increased": 1, "Thyroid hormones test": 1, "Trigeminal neuralgia": 1, "Upper respiratory tract infection": 1, "Urinary tract infection": 1, "Vaccination failure": 1, "Vaccination site dryness": 1, "Vaccination site exfoliation": 1, "Vaccination site irritation": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vitiligo": 1, "Weight decreased": 1, "Weight increased": 1, "Wound": 1}, "batchcodes": ["026A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026AL20A.json b/docs/data/histograms/United States/026AL20A.json
index 87c45660ec7..47f0bdc281d 100644
--- a/docs/data/histograms/United States/026AL20A.json
+++ b/docs/data/histograms/United States/026AL20A.json
@@ -1 +1 @@
-{"batchcode": "026AL20A", "histograms": [{"batchcodes": ["026AL20A"], "histogram": {"Angioedema": 1, "Erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "026AL20A", "histograms": [{"histogram": {"Angioedema": 1, "Erythema": 1}, "batchcodes": ["026AL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026AZ1A.json b/docs/data/histograms/United States/026AZ1A.json
index 162216f6b2e..44698040d47 100644
--- a/docs/data/histograms/United States/026AZ1A.json
+++ b/docs/data/histograms/United States/026AZ1A.json
@@ -1 +1 @@
-{"batchcode": "026AZ1A", "histograms": [{"batchcodes": ["026AZ1A"], "histogram": {"Abdominal discomfort": 1, "Back pain": 1, "Bedridden": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urinary tract infection": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "026AZ1A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Back pain": 1, "Bedridden": 1, "Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urinary tract infection": 1, "Vision blurred": 1}, "batchcodes": ["026AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B12A.json b/docs/data/histograms/United States/026B12A.json
index 8ce5fbfa366..dd15f356b73 100644
--- a/docs/data/histograms/United States/026B12A.json
+++ b/docs/data/histograms/United States/026B12A.json
@@ -1 +1 @@
-{"batchcode": "026B12A", "histograms": [{"batchcodes": ["026B12A"], "histogram": {"Injection site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "026B12A", "histograms": [{"histogram": {"Injection site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["026B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B1A.json b/docs/data/histograms/United States/026B1A.json
index ec6e8dc7c42..b7786247fbe 100644
--- a/docs/data/histograms/United States/026B1A.json
+++ b/docs/data/histograms/United States/026B1A.json
@@ -1 +1 @@
-{"batchcode": "026B1A", "histograms": [{"batchcodes": ["026B1A"], "histogram": {"Adverse reaction": 1, "Breast discomfort": 1, "Breast pain": 1, "Burning sensation": 1, "Erythema": 1, "Insomnia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1, "Urticaria": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026B1A", "histograms": [{"histogram": {"Adverse reaction": 1, "Breast discomfort": 1, "Breast pain": 1, "Burning sensation": 1, "Erythema": 1, "Insomnia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Swelling": 1, "Urticaria": 1, "Vomiting": 1}, "batchcodes": ["026B1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B20A.json b/docs/data/histograms/United States/026B20A.json
index 174abe3ce59..0643c4cf5f8 100644
--- a/docs/data/histograms/United States/026B20A.json
+++ b/docs/data/histograms/United States/026B20A.json
@@ -1 +1 @@
-{"batchcode": "026B20A", "histograms": [{"batchcodes": ["026B20A"], "histogram": {"Blood pressure increased": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "026B20A", "histograms": [{"histogram": {"Blood pressure increased": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Fibrin D dimer increased": 1, "Gait disturbance": 1, "Palpitations": 1}, "batchcodes": ["026B20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B21.json b/docs/data/histograms/United States/026B21.json
index 6bb2995c809..990f8c2b89d 100644
--- a/docs/data/histograms/United States/026B21.json
+++ b/docs/data/histograms/United States/026B21.json
@@ -1 +1 @@
-{"batchcode": "026B21", "histograms": [{"batchcodes": ["026B21"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "026B21", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["026B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B214.json b/docs/data/histograms/United States/026B214.json
index f8cea49f03c..144d1589909 100644
--- a/docs/data/histograms/United States/026B214.json
+++ b/docs/data/histograms/United States/026B214.json
@@ -1 +1 @@
-{"batchcode": "026B214", "histograms": [{"batchcodes": ["026B214"], "histogram": {"Migraine": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "026B214", "histograms": [{"histogram": {"Migraine": 1, "Vertigo": 1}, "batchcodes": ["026B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B21A..json b/docs/data/histograms/United States/026B21A..json
index 8849ee53291..febd799a32b 100644
--- a/docs/data/histograms/United States/026B21A..json
+++ b/docs/data/histograms/United States/026B21A..json
@@ -1 +1 @@
-{"batchcode": "026B21A.", "histograms": [{"batchcodes": ["026B21A."], "histogram": {"Arthralgia": 1, "Back pain": 1, "C-reactive protein": 1, "Carpal tunnel syndrome": 1, "Erythema of eyelid": 1, "Hypoaesthesia": 1, "Mobility decreased": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Pain": 1, "Periorbital swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "026B21A.", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "C-reactive protein": 1, "Carpal tunnel syndrome": 1, "Erythema of eyelid": 1, "Hypoaesthesia": 1, "Mobility decreased": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Pain": 1, "Periorbital swelling": 1}, "batchcodes": ["026B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B21A.json b/docs/data/histograms/United States/026B21A.json
index 7a31a5fb12e..bfb05abdd96 100644
--- a/docs/data/histograms/United States/026B21A.json
+++ b/docs/data/histograms/United States/026B21A.json
@@ -1 +1 @@
-{"batchcode": "026B21A", "histograms": [{"batchcodes": ["026B21A"], "histogram": {"Expired product administered": 109, "Headache": 39, "Fatigue": 36, "Myalgia": 36, "Pain in extremity": 33, "Pyrexia": 31, "Chills": 29, "Dizziness": 20, "Pain": 18, "Feeling abnormal": 17, "Vaccination site pain": 15, "Nausea": 14, "Erythema": 13, "Inappropriate schedule of product administration": 13, "Arthralgia": 11, "Lymphadenopathy": 11, "Rash": 11, "Asthenia": 10, "Pruritus": 10, "Body temperature": 9, "Influenza like illness": 9, "Product storage error": 9, "Swelling": 8, "Urticaria": 8, "Vomiting": 7, "Chest pain": 6, "Diarrhoea": 6, "Dyspnoea": 6, "Illness": 6, "Insomnia": 6, "Limb discomfort": 6, "Palpitations": 6, "Peripheral swelling": 6, "Product dose omission issue": 6, "Rhinorrhoea": 6, "SARS-CoV-2 test": 6, "Vaccination site pruritus": 6, "Blood pressure measurement": 5, "COVID-19": 5, "Feeling cold": 5, "Heart rate": 5, "Hyperhidrosis": 5, "Malaise": 5, "Nasal congestion": 5, "Oropharyngeal pain": 5, "Paraesthesia": 5, "Somnolence": 5, "Swelling face": 5, "Vaccination site erythema": 5, "Vaccination site rash": 5, "Vaccination site swelling": 5, "Abdominal discomfort": 4, "Accidental overdose": 4, "Chest discomfort": 4, "Condition aggravated": 4, "Ear pain": 4, "Hypersensitivity": 4, "Hypoaesthesia": 4, "Migraine": 4, "Muscle spasms": 4, "Neck pain": 4, "Rash pruritic": 4, "Skin warm": 4, "Abdominal pain upper": 3, "Ageusia": 3, "Anosmia": 3, "Back pain": 3, "Cough": 3, "Flushing": 3, "Gait disturbance": 3, "Herpes zoster": 3, "Injection site pain": 3, "Muscle twitching": 3, "Musculoskeletal stiffness": 3, "Product administered to patient of inappropriate age": 3, "Swollen tongue": 3, "Tremor": 3, "Vertigo": 3, "Allergy to vaccine": 2, "Anger": 2, "Axillary pain": 2, "Blood pressure decreased": 2, "Blood test": 2, "Bone pain": 2, "Breast pain": 2, "Burning sensation": 2, "Contusion": 2, "Electric shock sensation": 2, "Electrocardiogram": 2, "Euphoric mood": 2, "Eye pain": 2, "Eye pruritus": 2, "Eye swelling": 2, "Feeling hot": 2, "Gait inability": 2, "Gingivitis": 2, "Hypersomnia": 2, "Hypokinesia": 2, "Loss of consciousness": 2, "Menstruation irregular": 2, "Nodule": 2, "Paraesthesia oral": 2, "Product administered at inappropriate site": 2, "Product administration error": 2, "Rash erythematous": 2, "Rash macular": 2, "Sleep disorder": 2, "Sluggishness": 2, "Subcutaneous abscess": 2, "Thrombosis": 2, "Vaccination site induration": 2, "Vaccination site warmth": 2, "Vision blurred": 2, "Abdominal distension": 1, "Abnormal loss of weight": 1, "Angioedema": 1, "Aphonia": 1, "Appendicitis": 1, "Arthritis": 1, "Arthropod sting": 1, "Axillary mass": 1, "Biopsy": 1, "Blepharospasm": 1, "Blood pressure increased": 1, "Bronchitis": 1, "Candida infection": 1, "Cardiac discomfort": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Conjunctivitis": 1, "Constipation": 1, "Cystitis": 1, "Deafness": 1, "Decreased appetite": 1, "Delirium": 1, "Dental caries": 1, "Depression": 1, "Dysgeusia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Dysuria": 1, "Effusion": 1, "Embolism": 1, "Epistaxis": 1, "Faeces discoloured": 1, "Fall": 1, "Fear of falling": 1, "Feeling of body temperature change": 1, "Feeling of relaxation": 1, "Flank pain": 1, "Flatulence": 1, "Gastrooesophageal reflux disease": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Hallucination": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hepatic pain": 1, "Hepatomegaly": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Impaired ability to use machinery": 1, "Impaired healing": 1, "Inflammation": 1, "Influenza": 1, "Influenza virus test": 1, "Injection site erythema": 1, "Injection site hypoaesthesia": 1, "Injection site irritation": 1, "Injection site oedema": 1, "Injection site rash": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Irritability": 1, "Joint swelling": 1, "Kidney enlargement": 1, "Lacrimation increased": 1, "Laryngitis": 1, "Lichen planus": 1, "Ligament sprain": 1, "Lip blister": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Muscle rigidity": 1, "Muscle strain": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Nasal oedema": 1, "Nasal turbinate hypertrophy": 1, "Nerve conduction studies": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Pallor": 1, "Paralysis": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Poor quality product administered": 1, "Premenstrual dysphoric disorder": 1, "Product temperature excursion issue": 1, "Productive cough": 1, "Prostate cancer": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Rectal haemorrhage": 1, "Renal pain": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "Respiratory tract oedema": 1, "Retching": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test positive": 1, "Sensitive skin": 1, "Sepsis": 1, "Sinusitis": 1, "Sneezing": 1, "Speech disorder": 1, "Stress": 1, "Stress echocardiogram": 1, "Suicidal ideation": 1, "Suicide attempt": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Taste disorder": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Throat irritation": 1, "Throat tightness": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Toxoplasmosis": 1, "Trismus": 1, "Tunnel vision": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Underdose": 1, "Upper-airway cough syndrome": 1, "Vaccination complication": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "026B21A", "histograms": [{"histogram": {"Expired product administered": 109, "Headache": 39, "Fatigue": 36, "Myalgia": 36, "Pain in extremity": 33, "Pyrexia": 31, "Chills": 29, "Dizziness": 20, "Pain": 18, "Feeling abnormal": 17, "Vaccination site pain": 15, "Nausea": 14, "Erythema": 13, "Inappropriate schedule of product administration": 13, "Arthralgia": 11, "Lymphadenopathy": 11, "Rash": 11, "Asthenia": 10, "Pruritus": 10, "Body temperature": 9, "Influenza like illness": 9, "Product storage error": 9, "Swelling": 8, "Urticaria": 8, "Vomiting": 7, "Chest pain": 6, "Diarrhoea": 6, "Dyspnoea": 6, "Illness": 6, "Insomnia": 6, "Limb discomfort": 6, "Palpitations": 6, "Peripheral swelling": 6, "Product dose omission issue": 6, "Rhinorrhoea": 6, "SARS-CoV-2 test": 6, "Vaccination site pruritus": 6, "Blood pressure measurement": 5, "COVID-19": 5, "Feeling cold": 5, "Heart rate": 5, "Hyperhidrosis": 5, "Malaise": 5, "Nasal congestion": 5, "Oropharyngeal pain": 5, "Paraesthesia": 5, "Somnolence": 5, "Swelling face": 5, "Vaccination site erythema": 5, "Vaccination site rash": 5, "Vaccination site swelling": 5, "Abdominal discomfort": 4, "Accidental overdose": 4, "Chest discomfort": 4, "Condition aggravated": 4, "Ear pain": 4, "Hypersensitivity": 4, "Hypoaesthesia": 4, "Migraine": 4, "Muscle spasms": 4, "Neck pain": 4, "Rash pruritic": 4, "Skin warm": 4, "Abdominal pain upper": 3, "Ageusia": 3, "Anosmia": 3, "Back pain": 3, "Cough": 3, "Flushing": 3, "Gait disturbance": 3, "Herpes zoster": 3, "Injection site pain": 3, "Muscle twitching": 3, "Musculoskeletal stiffness": 3, "Product administered to patient of inappropriate age": 3, "Swollen tongue": 3, "Tremor": 3, "Vertigo": 3, "Allergy to vaccine": 2, "Anger": 2, "Axillary pain": 2, "Blood pressure decreased": 2, "Blood test": 2, "Bone pain": 2, "Breast pain": 2, "Burning sensation": 2, "Contusion": 2, "Electric shock sensation": 2, "Electrocardiogram": 2, "Euphoric mood": 2, "Eye pain": 2, "Eye pruritus": 2, "Eye swelling": 2, "Feeling hot": 2, "Gait inability": 2, "Gingivitis": 2, "Hypersomnia": 2, "Hypokinesia": 2, "Loss of consciousness": 2, "Menstruation irregular": 2, "Nodule": 2, "Paraesthesia oral": 2, "Product administered at inappropriate site": 2, "Product administration error": 2, "Rash erythematous": 2, "Rash macular": 2, "Sleep disorder": 2, "Sluggishness": 2, "Subcutaneous abscess": 2, "Thrombosis": 2, "Vaccination site induration": 2, "Vaccination site warmth": 2, "Vision blurred": 2, "Abdominal distension": 1, "Abnormal loss of weight": 1, "Angioedema": 1, "Aphonia": 1, "Appendicitis": 1, "Arthritis": 1, "Arthropod sting": 1, "Axillary mass": 1, "Biopsy": 1, "Blepharospasm": 1, "Blood pressure increased": 1, "Bronchitis": 1, "Candida infection": 1, "Cardiac discomfort": 1, "Cardiac flutter": 1, "Cardiomegaly": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Conjunctivitis": 1, "Constipation": 1, "Cystitis": 1, "Deafness": 1, "Decreased appetite": 1, "Delirium": 1, "Dental caries": 1, "Depression": 1, "Dysgeusia": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Dysphonia": 1, "Dysstasia": 1, "Dysuria": 1, "Effusion": 1, "Embolism": 1, "Epistaxis": 1, "Faeces discoloured": 1, "Fall": 1, "Fear of falling": 1, "Feeling of body temperature change": 1, "Feeling of relaxation": 1, "Flank pain": 1, "Flatulence": 1, "Gastrooesophageal reflux disease": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Hallucination": 1, "Heart rate increased": 1, "Heavy menstrual bleeding": 1, "Hepatic pain": 1, "Hepatomegaly": 1, "Hot flush": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Impaired ability to use machinery": 1, "Impaired healing": 1, "Inflammation": 1, "Influenza": 1, "Influenza virus test": 1, "Injection site erythema": 1, "Injection site hypoaesthesia": 1, "Injection site irritation": 1, "Injection site oedema": 1, "Injection site rash": 1, "Injection site swelling": 1, "Interchange of vaccine products": 1, "Intermenstrual bleeding": 1, "Irritability": 1, "Joint swelling": 1, "Kidney enlargement": 1, "Lacrimation increased": 1, "Laryngitis": 1, "Lichen planus": 1, "Ligament sprain": 1, "Lip blister": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Mammogram": 1, "Maternal exposure during pregnancy": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Muscle rigidity": 1, "Muscle strain": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Myocarditis": 1, "Nasal oedema": 1, "Nasal turbinate hypertrophy": 1, "Nerve conduction studies": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Pallor": 1, "Paralysis": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical examination": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Poor quality product administered": 1, "Premenstrual dysphoric disorder": 1, "Product temperature excursion issue": 1, "Productive cough": 1, "Prostate cancer": 1, "Psoriasis": 1, "Pulmonary embolism": 1, "Rectal haemorrhage": 1, "Renal pain": 1, "Respiration abnormal": 1, "Respiratory rate": 1, "Respiratory tract oedema": 1, "Retching": 1, "Rheumatoid arthritis": 1, "SARS-CoV-2 test positive": 1, "Sensitive skin": 1, "Sepsis": 1, "Sinusitis": 1, "Sneezing": 1, "Speech disorder": 1, "Stress": 1, "Stress echocardiogram": 1, "Suicidal ideation": 1, "Suicide attempt": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Taste disorder": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Throat irritation": 1, "Throat tightness": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Toxoplasmosis": 1, "Trismus": 1, "Tunnel vision": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound scan": 1, "Underdose": 1, "Upper-airway cough syndrome": 1, "Vaccination complication": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1}, "batchcodes": ["026B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026B21A2.json b/docs/data/histograms/United States/026B21A2.json
index 6c1d877ec8e..83cdcb707f2 100644
--- a/docs/data/histograms/United States/026B21A2.json
+++ b/docs/data/histograms/United States/026B21A2.json
@@ -1 +1 @@
-{"batchcode": "026B21A2", "histograms": [{"batchcodes": ["026B21A2"], "histogram": {"Expired product administered": 3}}]}
\ No newline at end of file
+{"batchcode": "026B21A2", "histograms": [{"histogram": {"Expired product administered": 3}, "batchcodes": ["026B21A2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026BNA.json b/docs/data/histograms/United States/026BNA.json
index 08b85cbf6c4..c473131997f 100644
--- a/docs/data/histograms/United States/026BNA.json
+++ b/docs/data/histograms/United States/026BNA.json
@@ -1 +1 @@
-{"batchcode": "026BNA", "histograms": [{"batchcodes": ["026BNA"], "histogram": {"Pain": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "026BNA", "histograms": [{"histogram": {"Pain": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["026BNA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C1A.json b/docs/data/histograms/United States/026C1A.json
index 6ef46e57fdc..d70607733db 100644
--- a/docs/data/histograms/United States/026C1A.json
+++ b/docs/data/histograms/United States/026C1A.json
@@ -1 +1 @@
-{"batchcode": "026C1A", "histograms": [{"batchcodes": ["026C1A"], "histogram": {"Expired product administered": 1, "Product storage error": 1, "Product temperature excursion issue": 1}}]}
\ No newline at end of file
+{"batchcode": "026C1A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1, "Product temperature excursion issue": 1}, "batchcodes": ["026C1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C20A.json b/docs/data/histograms/United States/026C20A.json
index 05ca961707a..ef7a5b3786a 100644
--- a/docs/data/histograms/United States/026C20A.json
+++ b/docs/data/histograms/United States/026C20A.json
@@ -1 +1 @@
-{"batchcode": "026C20A", "histograms": [{"batchcodes": ["026C20A"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "026C20A", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Incorrect dose administered": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["026C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C21.json b/docs/data/histograms/United States/026C21.json
index e3c4a632cf7..2b19056c861 100644
--- a/docs/data/histograms/United States/026C21.json
+++ b/docs/data/histograms/United States/026C21.json
@@ -1 +1 @@
-{"batchcode": "026C21", "histograms": [{"batchcodes": ["026C21"], "histogram": {"Fatigue": 2}}]}
\ No newline at end of file
+{"batchcode": "026C21", "histograms": [{"histogram": {"Fatigue": 2}, "batchcodes": ["026C21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C214.json b/docs/data/histograms/United States/026C214.json
index 81cddf88f5a..43450f14c55 100644
--- a/docs/data/histograms/United States/026C214.json
+++ b/docs/data/histograms/United States/026C214.json
@@ -1 +1 @@
-{"batchcode": "026C214", "histograms": [{"batchcodes": ["026C214"], "histogram": {"Bone pain": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Head discomfort": 1, "Myalgia": 1, "Pain in extremity": 1, "Skin striae": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "026C214", "histograms": [{"histogram": {"Bone pain": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Head discomfort": 1, "Myalgia": 1, "Pain in extremity": 1, "Skin striae": 1, "Swelling": 1}, "batchcodes": ["026C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C21A.json b/docs/data/histograms/United States/026C21A.json
index 6b70fcd3bf7..9a5ab882bbc 100644
--- a/docs/data/histograms/United States/026C21A.json
+++ b/docs/data/histograms/United States/026C21A.json
@@ -1 +1 @@
-{"batchcode": "026C21A", "histograms": [{"batchcodes": ["026C21A"], "histogram": {"Expired product administered": 183, "Product temperature excursion issue": 33, "Poor quality product administered": 28, "Pyrexia": 14, "Fatigue": 10, "Chills": 8, "Headache": 8, "Myalgia": 8, "Pain in extremity": 8, "Feeling hot": 7, "Pain": 7, "Pruritus": 7, "Rash": 7, "Erythema": 6, "Illness": 6, "Product administered to patient of inappropriate age": 6, "Body temperature": 5, "Inappropriate schedule of product administration": 5, "Product dose omission issue": 5, "Vaccination site pain": 5, "Hyperhidrosis": 4, "Nausea": 4, "Peripheral swelling": 4, "SARS-CoV-2 test": 4, "Urticaria": 4, "Vaccination site swelling": 4, "Allergy to vaccine": 3, "Arthralgia": 3, "Chest pain": 3, "Diarrhoea": 3, "Dizziness": 3, "Feeling abnormal": 3, "Hypoaesthesia": 3, "Influenza like illness": 3, "Malaise": 3, "Mobility decreased": 3, "Vaccination complication": 3, "Abdominal pain upper": 2, "Anxiety": 2, "Back pain": 2, "Chest discomfort": 2, "Cold sweat": 2, "Contusion": 2, "Cough": 2, "Dry mouth": 2, "Dyspnoea": 2, "Hypersensitivity": 2, "Interchange of vaccine products": 2, "Musculoskeletal pain": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "Product storage error": 2, "Rhinorrhoea": 2, "Somnolence": 2, "Suicidal ideation": 2, "Swelling": 2, "Underdose": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Vital signs measurement": 2, "Abdominal pain": 1, "Accidental overdose": 1, "Adverse reaction": 1, "Ageusia": 1, "Anosmia": 1, "Arthritis": 1, "Asthenia": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Breast pain": 1, "Breast swelling": 1, "COVID-19": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Chronic spontaneous urticaria": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Dehydration": 1, "Delusion of parasitosis": 1, "Depression": 1, "Device connection issue": 1, "Dry throat": 1, "Ear discomfort": 1, "Emotional distress": 1, "Fall": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Haematuria": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Head discomfort": 1, "Hemiplegia": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperacusis": 1, "Hypertension": 1, "Hypoacusis": 1, "IgA nephropathy": 1, "Impaired work ability": 1, "Insomnia": 1, "Joint swelling": 1, "Ligament rupture": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mania": 1, "Mass": 1, "Mechanical urticaria": 1, "Migraine": 1, "Mononucleosis heterophile test": 1, "Muscle contractions involuntary": 1, "Nasopharyngitis": 1, "Nipple swelling": 1, "Nucleic acid test": 1, "Rash macular": 1, "Respiratory tract oedema": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Sciatica": 1, "Sinusitis": 1, "Skin induration": 1, "Skin mass": 1, "Skin wrinkling": 1, "Sluggishness": 1, "Streptococcus test": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Throat tightness": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Urinary incontinence": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vision blurred": 1, "Vomiting": 1, "Wheezing": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "026C21A", "histograms": [{"histogram": {"Expired product administered": 183, "Product temperature excursion issue": 33, "Poor quality product administered": 28, "Pyrexia": 14, "Fatigue": 10, "Chills": 8, "Headache": 8, "Myalgia": 8, "Pain in extremity": 8, "Feeling hot": 7, "Pain": 7, "Pruritus": 7, "Rash": 7, "Erythema": 6, "Illness": 6, "Product administered to patient of inappropriate age": 6, "Body temperature": 5, "Inappropriate schedule of product administration": 5, "Product dose omission issue": 5, "Vaccination site pain": 5, "Hyperhidrosis": 4, "Nausea": 4, "Peripheral swelling": 4, "SARS-CoV-2 test": 4, "Urticaria": 4, "Vaccination site swelling": 4, "Allergy to vaccine": 3, "Arthralgia": 3, "Chest pain": 3, "Diarrhoea": 3, "Dizziness": 3, "Feeling abnormal": 3, "Hypoaesthesia": 3, "Influenza like illness": 3, "Malaise": 3, "Mobility decreased": 3, "Vaccination complication": 3, "Abdominal pain upper": 2, "Anxiety": 2, "Back pain": 2, "Chest discomfort": 2, "Cold sweat": 2, "Contusion": 2, "Cough": 2, "Dry mouth": 2, "Dyspnoea": 2, "Hypersensitivity": 2, "Interchange of vaccine products": 2, "Musculoskeletal pain": 2, "Oropharyngeal pain": 2, "Paraesthesia": 2, "Product storage error": 2, "Rhinorrhoea": 2, "Somnolence": 2, "Suicidal ideation": 2, "Swelling": 2, "Underdose": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Vital signs measurement": 2, "Abdominal pain": 1, "Accidental overdose": 1, "Adverse reaction": 1, "Ageusia": 1, "Anosmia": 1, "Arthritis": 1, "Asthenia": 1, "Blister": 1, "Blood pressure measurement": 1, "Blood test": 1, "Breast pain": 1, "Breast swelling": 1, "COVID-19": 1, "Cardiac discomfort": 1, "Chest X-ray": 1, "Chronic spontaneous urticaria": 1, "Computerised tomogram": 1, "Decreased appetite": 1, "Dehydration": 1, "Delusion of parasitosis": 1, "Depression": 1, "Device connection issue": 1, "Dry throat": 1, "Ear discomfort": 1, "Emotional distress": 1, "Fall": 1, "Feeding disorder": 1, "Gait disturbance": 1, "Gait inability": 1, "Gastrooesophageal reflux disease": 1, "Haematuria": 1, "Hallucination, auditory": 1, "Hallucination, visual": 1, "Head discomfort": 1, "Hemiplegia": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperacusis": 1, "Hypertension": 1, "Hypoacusis": 1, "IgA nephropathy": 1, "Impaired work ability": 1, "Insomnia": 1, "Joint swelling": 1, "Ligament rupture": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mania": 1, "Mass": 1, "Mechanical urticaria": 1, "Migraine": 1, "Mononucleosis heterophile test": 1, "Muscle contractions involuntary": 1, "Nasopharyngitis": 1, "Nipple swelling": 1, "Nucleic acid test": 1, "Rash macular": 1, "Respiratory tract oedema": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1, "Sciatica": 1, "Sinusitis": 1, "Skin induration": 1, "Skin mass": 1, "Skin wrinkling": 1, "Sluggishness": 1, "Streptococcus test": 1, "Suspected COVID-19": 1, "Tachycardia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Throat tightness": 1, "Tinnitus": 1, "Tremor": 1, "Ultrasound abdomen": 1, "Urinary incontinence": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vision blurred": 1, "Vomiting": 1, "Wheezing": 1, "X-ray": 1}, "batchcodes": ["026C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C21A;.json b/docs/data/histograms/United States/026C21A;.json
index 28c30b4893b..988e2a350db 100644
--- a/docs/data/histograms/United States/026C21A;.json
+++ b/docs/data/histograms/United States/026C21A;.json
@@ -1 +1 @@
-{"batchcode": "026C21A;", "histograms": [{"batchcodes": ["026C21A;"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "026C21A;", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["026C21A;"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C21B.json b/docs/data/histograms/United States/026C21B.json
index ca31741bc80..00fd0d55689 100644
--- a/docs/data/histograms/United States/026C21B.json
+++ b/docs/data/histograms/United States/026C21B.json
@@ -1 +1 @@
-{"batchcode": "026C21B", "histograms": [{"batchcodes": ["026C21B"], "histogram": {"Cardiac function test": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Myocardial necrosis marker": 1, "Pericarditis": 1, "SARS-CoV-2 test": 1, "Troponin": 1}}]}
\ No newline at end of file
+{"batchcode": "026C21B", "histograms": [{"histogram": {"Cardiac function test": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Electrocardiogram ambulatory": 1, "Myocardial necrosis marker": 1, "Pericarditis": 1, "SARS-CoV-2 test": 1, "Troponin": 1}, "batchcodes": ["026C21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C2A.json b/docs/data/histograms/United States/026C2A.json
index 6331c3511e8..96b7bdbbfba 100644
--- a/docs/data/histograms/United States/026C2A.json
+++ b/docs/data/histograms/United States/026C2A.json
@@ -1 +1 @@
-{"batchcode": "026C2A", "histograms": [{"batchcodes": ["026C2A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "026C2A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["026C2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026C70A.json b/docs/data/histograms/United States/026C70A.json
index 116fbe3cf33..c0f4107301f 100644
--- a/docs/data/histograms/United States/026C70A.json
+++ b/docs/data/histograms/United States/026C70A.json
@@ -1 +1 @@
-{"batchcode": "026C70A", "histograms": [{"batchcodes": ["026C70A"], "histogram": {"Pruritus": 1, "Vaccination site induration": 1}}]}
\ No newline at end of file
+{"batchcode": "026C70A", "histograms": [{"histogram": {"Pruritus": 1, "Vaccination site induration": 1}, "batchcodes": ["026C70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026CZ1A.json b/docs/data/histograms/United States/026CZ1A.json
index 7f3e006f15c..7aeeff7fb0f 100644
--- a/docs/data/histograms/United States/026CZ1A.json
+++ b/docs/data/histograms/United States/026CZ1A.json
@@ -1 +1 @@
-{"batchcode": "026CZ1A", "histograms": [{"batchcodes": ["026CZ1A"], "histogram": {"Somnolence": 1, "Tenderness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026CZ1A", "histograms": [{"histogram": {"Somnolence": 1, "Tenderness": 1, "Vaccination site pain": 1}, "batchcodes": ["026CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026D1A.json b/docs/data/histograms/United States/026D1A.json
index 218cdc03202..a6d1d69832c 100644
--- a/docs/data/histograms/United States/026D1A.json
+++ b/docs/data/histograms/United States/026D1A.json
@@ -1 +1 @@
-{"batchcode": "026D1A", "histograms": [{"batchcodes": ["026D1A"], "histogram": {"Blood glucose": 1, "Influenza": 1, "Therapeutic response unexpected": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026D1A", "histograms": [{"histogram": {"Blood glucose": 1, "Influenza": 1, "Therapeutic response unexpected": 1, "Vaccination site pain": 1}, "batchcodes": ["026D1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026D21 A.json b/docs/data/histograms/United States/026D21 A.json
index d64c241790b..1a19b4b39df 100644
--- a/docs/data/histograms/United States/026D21 A.json
+++ b/docs/data/histograms/United States/026D21 A.json
@@ -1 +1 @@
-{"batchcode": "026D21 A", "histograms": [{"batchcodes": ["026D21 A", "056M21A", "056MZ1 A"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "026D21 A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["026D21 A", "056M21A", "056MZ1 A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026D21A.json b/docs/data/histograms/United States/026D21A.json
index ab32d4c13bb..f0541bdc45d 100644
--- a/docs/data/histograms/United States/026D21A.json
+++ b/docs/data/histograms/United States/026D21A.json
@@ -1 +1 @@
-{"batchcode": "026D21A", "histograms": [{"batchcodes": ["026D21A", "042A21A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Taste disorder": 1, "Vaccination failure": 1}}, {"batchcodes": ["026D21A", "083J21A", "1808978"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["026D21A", "1805025"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["026D21A"], "histogram": {"Expired product administered": 15, "Fatigue": 11, "Pyrexia": 8, "Vaccination site pain": 8, "Myalgia": 7, "Pain in extremity": 7, "Vaccination site swelling": 7, "Product storage error": 6, "Chills": 5, "Dizziness": 5, "Headache": 5, "Feeling abnormal": 4, "Nausea": 4, "Paraesthesia": 4, "Vaccination site erythema": 4, "Vaccination site warmth": 4, "Arthralgia": 3, "Hyperhidrosis": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Pruritus": 3, "Rash": 3, "Swelling": 3, "Urticaria": 3, "Vaccination complication": 3, "Asthenia": 2, "Bone pain": 2, "Diarrhoea": 2, "Head discomfort": 2, "Hypoaesthesia": 2, "Impaired work ability": 2, "Lymphadenopathy": 2, "Pain": 2, "Palpitations": 2, "Peripheral swelling": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Throat tightness": 2, "Vaccination site pruritus": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Accidental overdose": 1, "Anxiety": 1, "Arthropod bite": 1, "Blister": 1, "Blood pressure measurement": 1, "Breast tenderness": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Condition aggravated": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling hot": 1, "Frustration tolerance decreased": 1, "Heart rate": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypoacusis": 1, "Hypotension": 1, "Illness": 1, "Induration": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site erythema": 1, "Insomnia": 1, "Intentional underdose": 1, "Interchange of vaccine products": 1, "Joint warmth": 1, "Lip discolouration": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Periarthritis": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product colour issue": 1, "Product dose omission issue": 1, "Rhinalgia": 1, "Skin discolouration": 1, "Somnolence": 1, "Tenderness": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Vaccination site cyst": 1, "Vaccination site discolouration": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site vesicles": 1, "Vertigo": 1, "Visual impairment": 1, "Weight increased": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "026D21A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Taste disorder": 1, "Vaccination failure": 1}, "batchcodes": ["026D21A", "042A21A"]}, {"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["026D21A", "083J21A", "1808978"]}, {"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["026D21A", "1805025"]}, {"histogram": {"Expired product administered": 15, "Fatigue": 11, "Pyrexia": 8, "Vaccination site pain": 8, "Myalgia": 7, "Pain in extremity": 7, "Vaccination site swelling": 7, "Product storage error": 6, "Chills": 5, "Dizziness": 5, "Headache": 5, "Feeling abnormal": 4, "Nausea": 4, "Paraesthesia": 4, "Vaccination site erythema": 4, "Vaccination site warmth": 4, "Arthralgia": 3, "Hyperhidrosis": 3, "Inappropriate schedule of product administration": 3, "Influenza like illness": 3, "Pruritus": 3, "Rash": 3, "Swelling": 3, "Urticaria": 3, "Vaccination complication": 3, "Asthenia": 2, "Bone pain": 2, "Diarrhoea": 2, "Head discomfort": 2, "Hypoaesthesia": 2, "Impaired work ability": 2, "Lymphadenopathy": 2, "Pain": 2, "Palpitations": 2, "Peripheral swelling": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Throat tightness": 2, "Vaccination site pruritus": 2, "Vomiting": 2, "Abdominal pain upper": 1, "Accidental overdose": 1, "Anxiety": 1, "Arthropod bite": 1, "Blister": 1, "Blood pressure measurement": 1, "Breast tenderness": 1, "Chest discomfort": 1, "Chest pain": 1, "Choking sensation": 1, "Condition aggravated": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Electrocardiogram": 1, "Erythema": 1, "Feeling hot": 1, "Frustration tolerance decreased": 1, "Heart rate": 1, "Heart rate increased": 1, "Hot flush": 1, "Hypoacusis": 1, "Hypotension": 1, "Illness": 1, "Induration": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site erythema": 1, "Insomnia": 1, "Intentional underdose": 1, "Interchange of vaccine products": 1, "Joint warmth": 1, "Lip discolouration": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Muscle tightness": 1, "Musculoskeletal stiffness": 1, "Nasopharyngitis": 1, "Neck pain": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Periarthritis": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product colour issue": 1, "Product dose omission issue": 1, "Rhinalgia": 1, "Skin discolouration": 1, "Somnolence": 1, "Tenderness": 1, "Urinary retention": 1, "Urinary tract infection": 1, "Vaccination site cyst": 1, "Vaccination site discolouration": 1, "Vaccination site induration": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site vesicles": 1, "Vertigo": 1, "Visual impairment": 1, "Weight increased": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["026D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026D__A.json b/docs/data/histograms/United States/026D__A.json
index 94747afa135..0f6de7e16d9 100644
--- a/docs/data/histograms/United States/026D__A.json
+++ b/docs/data/histograms/United States/026D__A.json
@@ -1 +1 @@
-{"batchcode": "026D__A", "histograms": [{"batchcodes": ["026D__A"], "histogram": {"Aphasia": 1, "Asthenia": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Headache": 1, "Impaired work ability": 1, "Nausea": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Tremor": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "026D__A", "histograms": [{"histogram": {"Aphasia": 1, "Asthenia": 1, "Chest pain": 1, "Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Headache": 1, "Impaired work ability": 1, "Nausea": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Tremor": 1, "Vaccination complication": 1}, "batchcodes": ["026D__A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026I20A.json b/docs/data/histograms/United States/026I20A.json
index 704b4929da5..a26154c5af1 100644
--- a/docs/data/histograms/United States/026I20A.json
+++ b/docs/data/histograms/United States/026I20A.json
@@ -1 +1 @@
-{"batchcode": "026I20A", "histograms": [{"batchcodes": ["026I20A"], "histogram": {"Myalgia": 2, "Arthralgia": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Malaise": 1, "Muscle spasticity": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo positional": 1}}]}
\ No newline at end of file
+{"batchcode": "026I20A", "histograms": [{"histogram": {"Myalgia": 2, "Arthralgia": 1, "Fatigue": 1, "Hypoaesthesia": 1, "Impaired work ability": 1, "Influenza like illness": 1, "Malaise": 1, "Muscle spasticity": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo positional": 1}, "batchcodes": ["026I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026I21A.json b/docs/data/histograms/United States/026I21A.json
index 4e509e03e01..7aadf34947c 100644
--- a/docs/data/histograms/United States/026I21A.json
+++ b/docs/data/histograms/United States/026I21A.json
@@ -1 +1 @@
-{"batchcode": "026I21A", "histograms": [{"batchcodes": ["026I21A"], "histogram": {"Abdominal discomfort": 1, "Bedridden": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Migraine": 1, "Pain": 1, "Palpitations": 1, "Pruritus": 1, "Pyrexia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "026I21A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Bedridden": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Migraine": 1, "Pain": 1, "Palpitations": 1, "Pruritus": 1, "Pyrexia": 1, "Tinnitus": 1}, "batchcodes": ["026I21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026J20A.json b/docs/data/histograms/United States/026J20A.json
index e92878e2b47..6573f16fb02 100644
--- a/docs/data/histograms/United States/026J20A.json
+++ b/docs/data/histograms/United States/026J20A.json
@@ -1 +1 @@
-{"batchcode": "026J20A", "histograms": [{"batchcodes": ["026J20A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "026J20A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["026J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L(Q/Z)0A.json b/docs/data/histograms/United States/026L(Q/Z)0A.json
index 641d73a1dae..13c5fae6807 100644
--- a/docs/data/histograms/United States/026L(Q/Z)0A.json
+++ b/docs/data/histograms/United States/026L(Q/Z)0A.json
@@ -1 +1 @@
-{"batchcode": "026L(Q/Z)0A", "histograms": [{"batchcodes": ["026L(Q/Z)0A"], "histogram": {"Dizziness": 1, "Influenza like illness": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "026L(Q/Z)0A", "histograms": [{"histogram": {"Dizziness": 1, "Influenza like illness": 1, "Malaise": 1}, "batchcodes": ["026L(Q/Z)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L-20A.json b/docs/data/histograms/United States/026L-20A.json
index 8b7cdc526b7..ad62e07a358 100644
--- a/docs/data/histograms/United States/026L-20A.json
+++ b/docs/data/histograms/United States/026L-20A.json
@@ -1 +1 @@
-{"batchcode": "026L-20A", "histograms": [{"batchcodes": ["026L-20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "SARS-CoV-2 test": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "026L-20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "SARS-CoV-2 test": 1, "Throat irritation": 1}, "batchcodes": ["026L-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L00A.json b/docs/data/histograms/United States/026L00A.json
index f02863d048d..19a286130ac 100644
--- a/docs/data/histograms/United States/026L00A.json
+++ b/docs/data/histograms/United States/026L00A.json
@@ -1 +1 @@
-{"batchcode": "026L00A", "histograms": [{"batchcodes": ["026L00A"], "histogram": {"Anosmia": 1}}]}
\ No newline at end of file
+{"batchcode": "026L00A", "histograms": [{"histogram": {"Anosmia": 1}, "batchcodes": ["026L00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L02A.json b/docs/data/histograms/United States/026L02A.json
index 65ee1113caa..2bdcbfac6aa 100644
--- a/docs/data/histograms/United States/026L02A.json
+++ b/docs/data/histograms/United States/026L02A.json
@@ -1 +1 @@
-{"batchcode": "026L02A", "histograms": [{"batchcodes": ["026L02A"], "histogram": {"Antibody test negative": 1, "Blood pressure measurement": 1, "Chills": 1, "Flushing": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Nausea": 1, "Palpitations": 1, "Serology test": 1}}]}
\ No newline at end of file
+{"batchcode": "026L02A", "histograms": [{"histogram": {"Antibody test negative": 1, "Blood pressure measurement": 1, "Chills": 1, "Flushing": 1, "Headache": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Nausea": 1, "Palpitations": 1, "Serology test": 1}, "batchcodes": ["026L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L0A.json b/docs/data/histograms/United States/026L0A.json
index 82898f1d7fc..419f5224ff8 100644
--- a/docs/data/histograms/United States/026L0A.json
+++ b/docs/data/histograms/United States/026L0A.json
@@ -1 +1 @@
-{"batchcode": "026L0A", "histograms": [{"batchcodes": ["026L0A"], "histogram": {"Arthralgia": 1, "Pain": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "026L0A", "histograms": [{"histogram": {"Arthralgia": 1, "Pain": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["026L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20 (1 OR 0).json b/docs/data/histograms/United States/026L20 (1 OR 0).json
index 7875de5979f..6c90cd0de26 100644
--- a/docs/data/histograms/United States/026L20 (1 OR 0).json
+++ b/docs/data/histograms/United States/026L20 (1 OR 0).json
@@ -1 +1 @@
-{"batchcode": "026L20 (1 OR 0)", "histograms": [{"batchcodes": ["026L20 (1 OR 0)"], "histogram": {"Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20 (1 OR 0)", "histograms": [{"histogram": {"Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["026L20 (1 OR 0)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2019.json b/docs/data/histograms/United States/026L2019.json
index fe41da2058b..bc0665f24a2 100644
--- a/docs/data/histograms/United States/026L2019.json
+++ b/docs/data/histograms/United States/026L2019.json
@@ -1 +1 @@
-{"batchcode": "026L2019", "histograms": [{"batchcodes": ["026L2019"], "histogram": {"Blood glucose increased": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2019", "histograms": [{"histogram": {"Blood glucose increased": 1, "Vision blurred": 1}, "batchcodes": ["026L2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L201A.json b/docs/data/histograms/United States/026L201A.json
index e1fad4cb2f4..f16b9e0a3e5 100644
--- a/docs/data/histograms/United States/026L201A.json
+++ b/docs/data/histograms/United States/026L201A.json
@@ -1 +1 @@
-{"batchcode": "026L201A", "histograms": [{"batchcodes": ["026L201A"], "histogram": {"Fatigue": 1, "Lymphadenopathy": 1, "Pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026L201A", "histograms": [{"histogram": {"Fatigue": 1, "Lymphadenopathy": 1, "Pain": 1, "Vaccination site pain": 1}, "batchcodes": ["026L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L204.json b/docs/data/histograms/United States/026L204.json
index 3b2344f2eed..190d5f1fd8b 100644
--- a/docs/data/histograms/United States/026L204.json
+++ b/docs/data/histograms/United States/026L204.json
@@ -1 +1 @@
-{"batchcode": "026L204", "histograms": [{"batchcodes": ["026L204"], "histogram": {"Blood glucose": 1, "Caesarean section": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "026L204", "histograms": [{"histogram": {"Blood glucose": 1, "Caesarean section": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["026L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L206.json b/docs/data/histograms/United States/026L206.json
index 9675a15e106..719933c3c2d 100644
--- a/docs/data/histograms/United States/026L206.json
+++ b/docs/data/histograms/United States/026L206.json
@@ -1 +1 @@
-{"batchcode": "026L206", "histograms": [{"batchcodes": ["026L206"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "026L206", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["026L206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L208.json b/docs/data/histograms/United States/026L208.json
index cdb6082d3cc..6e2fde6decd 100644
--- a/docs/data/histograms/United States/026L208.json
+++ b/docs/data/histograms/United States/026L208.json
@@ -1 +1 @@
-{"batchcode": "026L208", "histograms": [{"batchcodes": ["026L208"], "histogram": {"Fatigue": 2, "Injection site erythema": 2, "Injection site swelling": 2, "Myalgia": 2, "Nausea": 2, "Urticaria": 2, "Back pain": 1, "Balance disorder": 1, "Chills": 1, "Dizziness": 1, "Dysgeusia": 1, "Headache": 1, "Incorrect dose administered": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Injection site warmth": 1, "Migraine": 1, "Ocular discomfort": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Syringe issue": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "026L208", "histograms": [{"histogram": {"Fatigue": 2, "Injection site erythema": 2, "Injection site swelling": 2, "Myalgia": 2, "Nausea": 2, "Urticaria": 2, "Back pain": 1, "Balance disorder": 1, "Chills": 1, "Dizziness": 1, "Dysgeusia": 1, "Headache": 1, "Incorrect dose administered": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Injection site warmth": 1, "Migraine": 1, "Ocular discomfort": 1, "Oropharyngeal pain": 1, "Paraesthesia": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Syringe issue": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["026L208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L208A.json b/docs/data/histograms/United States/026L208A.json
index 0c5609bee83..c11238024bb 100644
--- a/docs/data/histograms/United States/026L208A.json
+++ b/docs/data/histograms/United States/026L208A.json
@@ -1 +1 @@
-{"batchcode": "026L208A", "histograms": [{"batchcodes": ["026L208A"], "histogram": {"Fatigue": 2, "Pain in extremity": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Body temperature": 1, "Headache": 1, "Hepatitis C antibody": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "026L208A", "histograms": [{"histogram": {"Fatigue": 2, "Pain in extremity": 2, "Abdominal pain upper": 1, "Arthralgia": 1, "Body temperature": 1, "Headache": 1, "Hepatitis C antibody": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site swelling": 1}, "batchcodes": ["026L208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L209.json b/docs/data/histograms/United States/026L209.json
index 670ddc3a4e3..1016675435c 100644
--- a/docs/data/histograms/United States/026L209.json
+++ b/docs/data/histograms/United States/026L209.json
@@ -1 +1 @@
-{"batchcode": "026L209", "histograms": [{"batchcodes": ["026L209"], "histogram": {"Diarrhoea": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "026L209", "histograms": [{"histogram": {"Diarrhoea": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["026L209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20A(OR D).json b/docs/data/histograms/United States/026L20A(OR D).json
index 5d714dfe9e9..ad6cd6d5153 100644
--- a/docs/data/histograms/United States/026L20A(OR D).json
+++ b/docs/data/histograms/United States/026L20A(OR D).json
@@ -1 +1 @@
-{"batchcode": "026L20A(OR D)", "histograms": [{"batchcodes": ["026L20A(OR D)"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20A(OR D)", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["026L20A(OR D)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20A(ORD).json b/docs/data/histograms/United States/026L20A(ORD).json
index 3c07644c0c3..14156e47fd9 100644
--- a/docs/data/histograms/United States/026L20A(ORD).json
+++ b/docs/data/histograms/United States/026L20A(ORD).json
@@ -1 +1 @@
-{"batchcode": "026L20A(ORD)", "histograms": [{"batchcodes": ["026L20A(ORD)"], "histogram": {"Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20A(ORD)", "histograms": [{"histogram": {"Suspected COVID-19": 1}, "batchcodes": ["026L20A(ORD)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20A..json b/docs/data/histograms/United States/026L20A..json
index 84587ca55ee..531f4950fe1 100644
--- a/docs/data/histograms/United States/026L20A..json
+++ b/docs/data/histograms/United States/026L20A..json
@@ -1 +1 @@
-{"batchcode": "026L20A.", "histograms": [{"batchcodes": ["026L20A."], "histogram": {"Fatigue": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20A.", "histograms": [{"histogram": {"Fatigue": 1, "Pain": 1}, "batchcodes": ["026L20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20A.json b/docs/data/histograms/United States/026L20A.json
index ac90e788af0..51d97c619f9 100644
--- a/docs/data/histograms/United States/026L20A.json
+++ b/docs/data/histograms/United States/026L20A.json
@@ -1 +1 @@
-{"batchcode": "026L20A", "histograms": [{"batchcodes": ["026L20A"], "histogram": {"Fatigue": 172, "Pyrexia": 166, "Chills": 164, "Headache": 162, "Pain in extremity": 145, "Myalgia": 126, "Vaccination site pain": 118, "Vaccination site erythema": 97, "Nausea": 84, "Pain": 74, "COVID-19": 70, "Vaccination site pruritus": 63, "SARS-CoV-2 test": 62, "Arthralgia": 54, "Vaccination site swelling": 54, "Dizziness": 53, "Pruritus": 51, "Rash": 50, "Body temperature": 49, "Erythema": 44, "Vaccination site warmth": 41, "Feeling abnormal": 38, "Dyspnoea": 36, "Injection site erythema": 36, "Injection site pain": 36, "Malaise": 34, "Lymphadenopathy": 33, "Asthenia": 32, "Vomiting": 31, "Vaccination site rash": 30, "Diarrhoea": 29, "Paraesthesia": 28, "Urticaria": 26, "Illness": 25, "Cough": 24, "Injection site pruritus": 24, "Influenza like illness": 23, "Expired product administered": 22, "Injection site swelling": 22, "Peripheral swelling": 22, "Maternal exposure during pregnancy": 21, "Swelling": 21, "Vaccination site induration": 21, "Hypoaesthesia": 19, "Limb discomfort": 19, "Blood pressure measurement": 18, "Feeling hot": 18, "Inappropriate schedule of product administration": 18, "Pregnancy test": 18, "Vaccination complication": 17, "Vertigo": 17, "Exposure during pregnancy": 16, "Heart rate": 16, "Heart rate increased": 16, "Insomnia": 16, "SARS-CoV-2 test positive": 16, "Tremor": 16, "Injection site warmth": 15, "Neck pain": 15, "Oropharyngeal pain": 15, "Decreased appetite": 14, "Hyperhidrosis": 14, "Hypertension": 14, "Nasal congestion": 14, "Product dose omission issue": 14, "Chest discomfort": 13, "Axillary pain": 12, "Flushing": 12, "Gait disturbance": 12, "Rash pruritic": 12, "Herpes zoster": 11, "Product administered to patient of inappropriate age": 11, "Abdominal discomfort": 10, "Back pain": 10, "Burning sensation": 10, "Chest pain": 10, "Eye swelling": 10, "Injection site rash": 10, "Rhinorrhoea": 10, "Drug ineffective": 9, "Feeling cold": 9, "Hypersensitivity": 9, "Influenza": 9, "Nasopharyngitis": 9, "Palpitations": 9, "Rash erythematous": 9, "Somnolence": 9, "Tinnitus": 9, "Vaccination site reaction": 9, "Computerised tomogram": 8, "Dysgeusia": 8, "Migraine": 8, "Product storage error": 8, "SARS-CoV-2 antibody test": 8, "Tenderness": 8, "Ultrasound scan": 8, "Vaccination site urticaria": 8, "Anosmia": 7, "Condition aggravated": 7, "Discomfort": 7, "Magnetic resonance imaging": 7, "Rash macular": 7, "Sinusitis": 7, "Syncope": 7, "Throat tightness": 7, "Visual impairment": 7, "Abdominal pain upper": 6, "Ageusia": 6, "Blood test": 6, "Body temperature increased": 6, "Ear pain": 6, "Fall": 6, "Head discomfort": 6, "Incorrect dose administered": 6, "Incorrect route of product administration": 6, "Joint swelling": 6, "Lethargy": 6, "Lymph node pain": 6, "Muscle spasms": 6, "Ocular hyperaemia": 6, "Sneezing": 6, "Tachycardia": 6, "Therapeutic response unexpected": 6, "Anaphylactic reaction": 5, "Asthma": 5, "Blood glucose": 5, "Blood pressure increased": 5, "Contusion": 5, "Dry eye": 5, "Dry mouth": 5, "Dysphagia": 5, "Ear discomfort": 5, "Loss of consciousness": 5, "Mammogram": 5, "Off label use": 5, "Oropharyngeal discomfort": 5, "Pulmonary embolism": 5, "Skin reaction": 5, "Vaccination site lymphadenopathy": 5, "Vaccination site mass": 5, "Vision blurred": 5, "White blood cell count": 5, "X-ray": 5, "Abdominal pain": 4, "Balance disorder": 4, "Biopsy": 4, "Blister": 4, "Bone pain": 4, "Eye irritation": 4, "Eye pain": 4, "Eye pruritus": 4, "Hypoaesthesia oral": 4, "Hypokinesia": 4, "Injection site induration": 4, "Injection site urticaria": 4, "Lacrimation increased": 4, "Loss of personal independence in daily activities": 4, "Mobility decreased": 4, "Musculoskeletal stiffness": 4, "Nervousness": 4, "Neuralgia": 4, "No adverse event": 4, "Paraesthesia oral": 4, "Rash papular": 4, "Sinus headache": 4, "Skin warm": 4, "Swelling face": 4, "Swollen tongue": 4, "Taste disorder": 4, "Vaccination site movement impairment": 4, "Anxiety": 3, "Arthritis": 3, "Axillary mass": 3, "Breast mass": 3, "Cerebrovascular accident": 3, "Disorientation": 3, "Disturbance in attention": 3, "Epistaxis": 3, "Eye haemorrhage": 3, "Full blood count": 3, "Gait inability": 3, "Glucose tolerance test": 3, "Hypersomnia": 3, "Inflammation": 3, "Injected limb mobility decreased": 3, "Injection site discomfort": 3, "Injection site reaction": 3, "Laboratory test": 3, "Lip swelling": 3, "Mass": 3, "Movement disorder": 3, "Muscle tightness": 3, "Muscle twitching": 3, "Oxygen saturation": 3, "Pain of skin": 3, "Photophobia": 3, "Platelet count": 3, "Pregnancy": 3, "Presyncope": 3, "SARS-CoV-2 antibody test negative": 3, "Sinus congestion": 3, "Skin burning sensation": 3, "Skin discolouration": 3, "Sleep deficit": 3, "Sleep disorder": 3, "Suspected COVID-19": 3, "Thirst": 3, "Thrombosis": 3, "Vaccination site bruising": 3, "Vaccination site cellulitis": 3, "Vaccination site discolouration": 3, "Vaccination site discomfort": 3, "Accidental underdose": 2, "Acoustic stimulation tests": 2, "Adverse event": 2, "Allergy to vaccine": 2, "Amnesia": 2, "Anger": 2, "Angiotensin converting enzyme": 2, "Antibody test": 2, "Aphasia": 2, "Bed rest": 2, "Blood potassium": 2, "Blood pressure fluctuation": 2, "Blood thyroid stimulating hormone": 2, "Breast swelling": 2, "Breast tenderness": 2, "COVID-19 pneumonia": 2, "Cardiac disorder": 2, "Chest X-ray": 2, "Chromaturia": 2, "Confusional state": 2, "Deafness unilateral": 2, "Deep vein thrombosis": 2, "Depressed mood": 2, "Depression": 2, "Dermatitis": 2, "Dermatitis contact": 2, "Diabetes mellitus": 2, "Dizziness postural": 2, "Dry skin": 2, "Dysarthria": 2, "Dysstasia": 2, "Echocardiogram": 2, "Exposure via skin contact": 2, "Extra dose administered": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Haemoglobin": 2, "Heart rate irregular": 2, "Hypoacusis": 2, "Impaired work ability": 2, "Influenza virus test": 2, "Injection site inflammation": 2, "Intentional dose omission": 2, "Joint injury": 2, "Limb injury": 2, "Maternal exposure during breast feeding": 2, "Mechanical urticaria": 2, "Medication error": 2, "Metabolic function test": 2, "Monoplegia": 2, "Muscle fatigue": 2, "Musculoskeletal chest pain": 2, "Neuropathy peripheral": 2, "Night sweats": 2, "Oedema": 2, "Ophthalmic migraine": 2, "Oral discomfort": 2, "Out of specification product use": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Periarthritis": 2, "Pneumonia": 2, "Product administration error": 2, "Prostatic specific antigen increased": 2, "Pulmonary congestion": 2, "Retinal haemorrhage": 2, "Rheumatoid factor": 2, "SARS-CoV-1 test": 2, "Seizure": 2, "Sinus disorder": 2, "Skin exfoliation": 2, "Skin swelling": 2, "Thinking abnormal": 2, "Urinary tract infection": 2, "Urine abnormality": 2, "Urine analysis": 2, "Vaccination site anaesthesia": 2, "Vaccination site irritation": 2, "Vaccination site streaking": 2, "Vaccination site vesicles": 2, "Vertigo positional": 2, "Vitamin D": 2, "Weight increased": 2, "Wheezing": 2, "Wrong technique in product usage process": 2, "Abdominal tenderness": 1, "Abnormal behaviour": 1, "Abnormal loss of weight": 1, "Abortion spontaneous": 1, "Accidental overdose": 1, "Adverse event following immunisation": 1, "Adverse reaction": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Allodynia": 1, "Alopecia": 1, "Analgesic drug level": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Aspiration joint": 1, "Basophil count": 1, "Basophil percentage": 1, "Bedridden": 1, "Behcet's syndrome": 1, "Bell's palsy": 1, "Benign lymph node neoplasm": 1, "Biopsy skin": 1, "Bladder dilatation": 1, "Bladder discomfort": 1, "Blepharitis": 1, "Blepharospasm": 1, "Blindness": 1, "Blindness unilateral": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bradykinesia": 1, "Breakthrough COVID-19": 1, "Breast cyst": 1, "Breast inflammation": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Cardiac failure": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chalazion": 1, "Change of bowel habit": 1, "Clostridium test": 1, "Cognitive disorder": 1, "Colitis": 1, "Colitis microscopic": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Conjunctivitis": 1, "Connective tissue disorder": 1, "Corneal reflex decreased": 1, "Coronavirus test positive": 1, "Crohn's disease": 1, "Culture stool": 1, "Cyanosis": 1, "Cystoid macular oedema": 1, "Cytokine storm": 1, "Deafness neurosensory": 1, "Dehydration": 1, "Delirium": 1, "Dermatitis allergic": 1, "Diagnostic aspiration": 1, "Discharge": 1, "Double stranded DNA antibody": 1, "Drooling": 1, "Drug hypersensitivity": 1, "Drug interaction": 1, "Dry throat": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysphonia": 1, "Ear infection": 1, "Eczema": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Electromyogram": 1, "Electrophoresis protein": 1, "Energy increased": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Eructation": 1, "Euphoric mood": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Eye colour change": 1, "Eye infection": 1, "Eye inflammation": 1, "Eye movement disorder": 1, "Eyelid margin crusting": 1, "Face oedema": 1, "Facial pain": 1, "Facial paralysis": 1, "Foreign body sensation in eyes": 1, "Formication": 1, "Galactostasis": 1, "Gastroenteritis viral": 1, "Gastrointestinal disorder": 1, "Gastrointestinal pain": 1, "Gastrointestinal sounds abnormal": 1, "Generalised oedema": 1, "Genital herpes": 1, "Gingival discolouration": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "HIV test": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage": 1, "Head titubation": 1, "Hepatic cyst": 1, "Hepatitis B": 1, "Hepatitis B virus test": 1, "Hepatitis viral test": 1, "Herpes gestationis": 1, "Hordeolum": 1, "Horner's syndrome": 1, "Hot flush": 1, "Human chorionic gonadotropin abnormal": 1, "Hyperaesthesia teeth": 1, "Hyperthyroidism": 1, "Idiopathic urticaria": 1, "Immature granulocyte count": 1, "Immobile": 1, "Immunisation reaction": 1, "Immunosuppression": 1, "Inappropriate affect": 1, "Incoherent": 1, "Induration": 1, "Injection site abscess": 1, "Injection site bruising": 1, "Injection site hypoaesthesia": 1, "Injection site mass": 1, "Injection site movement impairment": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Iron deficiency anaemia": 1, "Joint instability": 1, "Joint stiffness": 1, "Keratitis": 1, "Ligament sprain": 1, "Limb mass": 1, "Lip dry": 1, "Lipase": 1, "Liver disorder": 1, "Liver function test": 1, "Lower respiratory tract congestion": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Lysozyme": 1, "Malignant melanoma": 1, "Mastitis": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Melanocytic naevus": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Mental impairment": 1, "Miliaria": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Monocyte percentage": 1, "Mood altered": 1, "Mouth swelling": 1, "Muscle atrophy": 1, "Muscle contractions involuntary": 1, "Muscle strength abnormal": 1, "Muscle swelling": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Neuritis": 1, "Neurological symptom": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Nipple pain": 1, "Nodule": 1, "Noninfective sialoadenitis": 1, "Numb chin syndrome": 1, "Nystagmus": 1, "Ocular discomfort": 1, "Optic ischaemic neuropathy": 1, "Oral pain": 1, "Otitis externa": 1, "Ovarian vein thrombosis": 1, "Overdose": 1, "Oxygen consumption": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Panic attack": 1, "Parosmia": 1, "Pemphigoid": 1, "Periorbital oedema": 1, "Peripheral coldness": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Polychondritis": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Prenatal screening test": 1, "Pressure of speech": 1, "Product administered at inappropriate site": 1, "Product administration interrupted": 1, "Product preparation error": 1, "Product quality issue": 1, "Prostatic specific antigen": 1, "Protein total": 1, "Psychiatric symptom": 1, "Pulmonary function test": 1, "Pulmonary function test normal": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Quality of life decreased": 1, "Quantitative sudomotor axon reflex test": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Red cell distribution width": 1, "Renal failure": 1, "Renal pain": 1, "Respiratory rate": 1, "Retching": 1, "Retinal disorder": 1, "Rocky mountain spotted fever": 1, "Rotator cuff syndrome": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 test negative": 1, "Salivary gland pain": 1, "Sciatica": 1, "Seasonal allergy": 1, "Shoulder injury related to vaccine administration": 1, "Sinus pain": 1, "Skin injury": 1, "Skin irritation": 1, "Skin ulcer": 1, "Skin wrinkling": 1, "Sluggishness": 1, "Small fibre neuropathy": 1, "Smooth muscle antibody": 1, "Speech disorder": 1, "Spinal X-ray": 1, "Splenomegaly": 1, "Stress": 1, "Sunburn": 1, "Suppressed lactation": 1, "Swelling of eyelid": 1, "Symptom recurrence": 1, "Tendonitis": 1, "Tension headache": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thyroid mass": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Tonsillar inflammation": 1, "Tooth abscess": 1, "Toothache": 1, "Toxoplasma serology": 1, "Transient ischaemic attack": 1, "Treponema test": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen": 1, "Ultrasound breast": 1, "Ultrasound foetal": 1, "Ultrasound scan normal": 1, "Ultrasound thyroid": 1, "Underdose": 1, "Urine protein/creatinine ratio": 1, "Uterine cancer": 1, "Uveitis": 1, "VIIIth nerve injury": 1, "Vaccination failure": 1, "Vaccination site abscess": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site phlebitis": 1, "Vaginal haemorrhage": 1, "Varicose vein": 1, "Vitamin D increased": 1, "Weight decreased": 1, "White blood cell count increased": 1, "Wound": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20A", "histograms": [{"histogram": {"Fatigue": 172, "Pyrexia": 166, "Chills": 164, "Headache": 162, "Pain in extremity": 145, "Myalgia": 126, "Vaccination site pain": 118, "Vaccination site erythema": 97, "Nausea": 84, "Pain": 74, "COVID-19": 70, "Vaccination site pruritus": 63, "SARS-CoV-2 test": 62, "Arthralgia": 54, "Vaccination site swelling": 54, "Dizziness": 53, "Pruritus": 51, "Rash": 50, "Body temperature": 49, "Erythema": 44, "Vaccination site warmth": 41, "Feeling abnormal": 38, "Dyspnoea": 36, "Injection site erythema": 36, "Injection site pain": 36, "Malaise": 34, "Lymphadenopathy": 33, "Asthenia": 32, "Vomiting": 31, "Vaccination site rash": 30, "Diarrhoea": 29, "Paraesthesia": 28, "Urticaria": 26, "Illness": 25, "Cough": 24, "Injection site pruritus": 24, "Influenza like illness": 23, "Expired product administered": 22, "Injection site swelling": 22, "Peripheral swelling": 22, "Maternal exposure during pregnancy": 21, "Swelling": 21, "Vaccination site induration": 21, "Hypoaesthesia": 19, "Limb discomfort": 19, "Blood pressure measurement": 18, "Feeling hot": 18, "Inappropriate schedule of product administration": 18, "Pregnancy test": 18, "Vaccination complication": 17, "Vertigo": 17, "Exposure during pregnancy": 16, "Heart rate": 16, "Heart rate increased": 16, "Insomnia": 16, "SARS-CoV-2 test positive": 16, "Tremor": 16, "Injection site warmth": 15, "Neck pain": 15, "Oropharyngeal pain": 15, "Decreased appetite": 14, "Hyperhidrosis": 14, "Hypertension": 14, "Nasal congestion": 14, "Product dose omission issue": 14, "Chest discomfort": 13, "Axillary pain": 12, "Flushing": 12, "Gait disturbance": 12, "Rash pruritic": 12, "Herpes zoster": 11, "Product administered to patient of inappropriate age": 11, "Abdominal discomfort": 10, "Back pain": 10, "Burning sensation": 10, "Chest pain": 10, "Eye swelling": 10, "Injection site rash": 10, "Rhinorrhoea": 10, "Drug ineffective": 9, "Feeling cold": 9, "Hypersensitivity": 9, "Influenza": 9, "Nasopharyngitis": 9, "Palpitations": 9, "Rash erythematous": 9, "Somnolence": 9, "Tinnitus": 9, "Vaccination site reaction": 9, "Computerised tomogram": 8, "Dysgeusia": 8, "Migraine": 8, "Product storage error": 8, "SARS-CoV-2 antibody test": 8, "Tenderness": 8, "Ultrasound scan": 8, "Vaccination site urticaria": 8, "Anosmia": 7, "Condition aggravated": 7, "Discomfort": 7, "Magnetic resonance imaging": 7, "Rash macular": 7, "Sinusitis": 7, "Syncope": 7, "Throat tightness": 7, "Visual impairment": 7, "Abdominal pain upper": 6, "Ageusia": 6, "Blood test": 6, "Body temperature increased": 6, "Ear pain": 6, "Fall": 6, "Head discomfort": 6, "Incorrect dose administered": 6, "Incorrect route of product administration": 6, "Joint swelling": 6, "Lethargy": 6, "Lymph node pain": 6, "Muscle spasms": 6, "Ocular hyperaemia": 6, "Sneezing": 6, "Tachycardia": 6, "Therapeutic response unexpected": 6, "Anaphylactic reaction": 5, "Asthma": 5, "Blood glucose": 5, "Blood pressure increased": 5, "Contusion": 5, "Dry eye": 5, "Dry mouth": 5, "Dysphagia": 5, "Ear discomfort": 5, "Loss of consciousness": 5, "Mammogram": 5, "Off label use": 5, "Oropharyngeal discomfort": 5, "Pulmonary embolism": 5, "Skin reaction": 5, "Vaccination site lymphadenopathy": 5, "Vaccination site mass": 5, "Vision blurred": 5, "White blood cell count": 5, "X-ray": 5, "Abdominal pain": 4, "Balance disorder": 4, "Biopsy": 4, "Blister": 4, "Bone pain": 4, "Eye irritation": 4, "Eye pain": 4, "Eye pruritus": 4, "Hypoaesthesia oral": 4, "Hypokinesia": 4, "Injection site induration": 4, "Injection site urticaria": 4, "Lacrimation increased": 4, "Loss of personal independence in daily activities": 4, "Mobility decreased": 4, "Musculoskeletal stiffness": 4, "Nervousness": 4, "Neuralgia": 4, "No adverse event": 4, "Paraesthesia oral": 4, "Rash papular": 4, "Sinus headache": 4, "Skin warm": 4, "Swelling face": 4, "Swollen tongue": 4, "Taste disorder": 4, "Vaccination site movement impairment": 4, "Anxiety": 3, "Arthritis": 3, "Axillary mass": 3, "Breast mass": 3, "Cerebrovascular accident": 3, "Disorientation": 3, "Disturbance in attention": 3, "Epistaxis": 3, "Eye haemorrhage": 3, "Full blood count": 3, "Gait inability": 3, "Glucose tolerance test": 3, "Hypersomnia": 3, "Inflammation": 3, "Injected limb mobility decreased": 3, "Injection site discomfort": 3, "Injection site reaction": 3, "Laboratory test": 3, "Lip swelling": 3, "Mass": 3, "Movement disorder": 3, "Muscle tightness": 3, "Muscle twitching": 3, "Oxygen saturation": 3, "Pain of skin": 3, "Photophobia": 3, "Platelet count": 3, "Pregnancy": 3, "Presyncope": 3, "SARS-CoV-2 antibody test negative": 3, "Sinus congestion": 3, "Skin burning sensation": 3, "Skin discolouration": 3, "Sleep deficit": 3, "Sleep disorder": 3, "Suspected COVID-19": 3, "Thirst": 3, "Thrombosis": 3, "Vaccination site bruising": 3, "Vaccination site cellulitis": 3, "Vaccination site discolouration": 3, "Vaccination site discomfort": 3, "Accidental underdose": 2, "Acoustic stimulation tests": 2, "Adverse event": 2, "Allergy to vaccine": 2, "Amnesia": 2, "Anger": 2, "Angiotensin converting enzyme": 2, "Antibody test": 2, "Aphasia": 2, "Bed rest": 2, "Blood potassium": 2, "Blood pressure fluctuation": 2, "Blood thyroid stimulating hormone": 2, "Breast swelling": 2, "Breast tenderness": 2, "COVID-19 pneumonia": 2, "Cardiac disorder": 2, "Chest X-ray": 2, "Chromaturia": 2, "Confusional state": 2, "Deafness unilateral": 2, "Deep vein thrombosis": 2, "Depressed mood": 2, "Depression": 2, "Dermatitis": 2, "Dermatitis contact": 2, "Diabetes mellitus": 2, "Dizziness postural": 2, "Dry skin": 2, "Dysarthria": 2, "Dysstasia": 2, "Echocardiogram": 2, "Exposure via skin contact": 2, "Extra dose administered": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Haemoglobin": 2, "Heart rate irregular": 2, "Hypoacusis": 2, "Impaired work ability": 2, "Influenza virus test": 2, "Injection site inflammation": 2, "Intentional dose omission": 2, "Joint injury": 2, "Limb injury": 2, "Maternal exposure during breast feeding": 2, "Mechanical urticaria": 2, "Medication error": 2, "Metabolic function test": 2, "Monoplegia": 2, "Muscle fatigue": 2, "Musculoskeletal chest pain": 2, "Neuropathy peripheral": 2, "Night sweats": 2, "Oedema": 2, "Ophthalmic migraine": 2, "Oral discomfort": 2, "Out of specification product use": 2, "Pallor": 2, "Paranasal sinus discomfort": 2, "Periarthritis": 2, "Pneumonia": 2, "Product administration error": 2, "Prostatic specific antigen increased": 2, "Pulmonary congestion": 2, "Retinal haemorrhage": 2, "Rheumatoid factor": 2, "SARS-CoV-1 test": 2, "Seizure": 2, "Sinus disorder": 2, "Skin exfoliation": 2, "Skin swelling": 2, "Thinking abnormal": 2, "Urinary tract infection": 2, "Urine abnormality": 2, "Urine analysis": 2, "Vaccination site anaesthesia": 2, "Vaccination site irritation": 2, "Vaccination site streaking": 2, "Vaccination site vesicles": 2, "Vertigo positional": 2, "Vitamin D": 2, "Weight increased": 2, "Wheezing": 2, "Wrong technique in product usage process": 2, "Abdominal tenderness": 1, "Abnormal behaviour": 1, "Abnormal loss of weight": 1, "Abortion spontaneous": 1, "Accidental overdose": 1, "Adverse event following immunisation": 1, "Adverse reaction": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Albumin globulin ratio": 1, "Allodynia": 1, "Alopecia": 1, "Analgesic drug level": 1, "Anaphylactic shock": 1, "Angioedema": 1, "Anti-cyclic citrullinated peptide antibody": 1, "Anti-thyroid antibody": 1, "Antineutrophil cytoplasmic antibody": 1, "Antinuclear antibody": 1, "Aspartate aminotransferase": 1, "Aspiration joint": 1, "Basophil count": 1, "Basophil percentage": 1, "Bedridden": 1, "Behcet's syndrome": 1, "Bell's palsy": 1, "Benign lymph node neoplasm": 1, "Biopsy skin": 1, "Bladder dilatation": 1, "Bladder discomfort": 1, "Blepharitis": 1, "Blepharospasm": 1, "Blindness": 1, "Blindness unilateral": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood creatinine": 1, "Blood glucose increased": 1, "Blood pressure abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure systolic": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Bradykinesia": 1, "Breakthrough COVID-19": 1, "Breast cyst": 1, "Breast inflammation": 1, "C-reactive protein": 1, "Carbon dioxide": 1, "Cardiac failure": 1, "Cardiac stress test": 1, "Cellulitis": 1, "Chalazion": 1, "Change of bowel habit": 1, "Clostridium test": 1, "Cognitive disorder": 1, "Colitis": 1, "Colitis microscopic": 1, "Computerised tomogram head": 1, "Computerised tomogram neck": 1, "Conjunctivitis": 1, "Connective tissue disorder": 1, "Corneal reflex decreased": 1, "Coronavirus test positive": 1, "Crohn's disease": 1, "Culture stool": 1, "Cyanosis": 1, "Cystoid macular oedema": 1, "Cytokine storm": 1, "Deafness neurosensory": 1, "Dehydration": 1, "Delirium": 1, "Dermatitis allergic": 1, "Diagnostic aspiration": 1, "Discharge": 1, "Double stranded DNA antibody": 1, "Drooling": 1, "Drug hypersensitivity": 1, "Drug interaction": 1, "Dry throat": 1, "Dysaesthesia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Dysphonia": 1, "Ear infection": 1, "Eczema": 1, "Electrocardiogram abnormal": 1, "Electrocardiogram ambulatory": 1, "Electromyogram": 1, "Electrophoresis protein": 1, "Energy increased": 1, "Eosinophil count": 1, "Eosinophil percentage": 1, "Eructation": 1, "Euphoric mood": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Eye colour change": 1, "Eye infection": 1, "Eye inflammation": 1, "Eye movement disorder": 1, "Eyelid margin crusting": 1, "Face oedema": 1, "Facial pain": 1, "Facial paralysis": 1, "Foreign body sensation in eyes": 1, "Formication": 1, "Galactostasis": 1, "Gastroenteritis viral": 1, "Gastrointestinal disorder": 1, "Gastrointestinal pain": 1, "Gastrointestinal sounds abnormal": 1, "Generalised oedema": 1, "Genital herpes": 1, "Gingival discolouration": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Glycosylated haemoglobin": 1, "Goitre": 1, "HIV test": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage": 1, "Head titubation": 1, "Hepatic cyst": 1, "Hepatitis B": 1, "Hepatitis B virus test": 1, "Hepatitis viral test": 1, "Herpes gestationis": 1, "Hordeolum": 1, "Horner's syndrome": 1, "Hot flush": 1, "Human chorionic gonadotropin abnormal": 1, "Hyperaesthesia teeth": 1, "Hyperthyroidism": 1, "Idiopathic urticaria": 1, "Immature granulocyte count": 1, "Immobile": 1, "Immunisation reaction": 1, "Immunosuppression": 1, "Inappropriate affect": 1, "Incoherent": 1, "Induration": 1, "Injection site abscess": 1, "Injection site bruising": 1, "Injection site hypoaesthesia": 1, "Injection site mass": 1, "Injection site movement impairment": 1, "Intentional product use issue": 1, "Interchange of vaccine products": 1, "Iron deficiency anaemia": 1, "Joint instability": 1, "Joint stiffness": 1, "Keratitis": 1, "Ligament sprain": 1, "Limb mass": 1, "Lip dry": 1, "Lipase": 1, "Liver disorder": 1, "Liver function test": 1, "Lower respiratory tract congestion": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Lysozyme": 1, "Malignant melanoma": 1, "Mastitis": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Melanocytic naevus": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Mental impairment": 1, "Miliaria": 1, "Monocyte count": 1, "Monocyte count increased": 1, "Monocyte percentage": 1, "Mood altered": 1, "Mouth swelling": 1, "Muscle atrophy": 1, "Muscle contractions involuntary": 1, "Muscle strength abnormal": 1, "Muscle swelling": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal disorder": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Myocarditis": 1, "Neuritis": 1, "Neurological symptom": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Nipple pain": 1, "Nodule": 1, "Noninfective sialoadenitis": 1, "Numb chin syndrome": 1, "Nystagmus": 1, "Ocular discomfort": 1, "Optic ischaemic neuropathy": 1, "Oral pain": 1, "Otitis externa": 1, "Ovarian vein thrombosis": 1, "Overdose": 1, "Oxygen consumption": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pain in jaw": 1, "Panic attack": 1, "Parosmia": 1, "Pemphigoid": 1, "Periorbital oedema": 1, "Peripheral coldness": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Polychondritis": 1, "Polymerase chain reaction": 1, "Polymyalgia rheumatica": 1, "Prenatal screening test": 1, "Pressure of speech": 1, "Product administered at inappropriate site": 1, "Product administration interrupted": 1, "Product preparation error": 1, "Product quality issue": 1, "Prostatic specific antigen": 1, "Protein total": 1, "Psychiatric symptom": 1, "Pulmonary function test": 1, "Pulmonary function test normal": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Quality of life decreased": 1, "Quantitative sudomotor axon reflex test": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Red blood cell sedimentation rate increased": 1, "Red cell distribution width": 1, "Renal failure": 1, "Renal pain": 1, "Respiratory rate": 1, "Retching": 1, "Retinal disorder": 1, "Rocky mountain spotted fever": 1, "Rotator cuff syndrome": 1, "SARS-CoV-1 test positive": 1, "SARS-CoV-2 test negative": 1, "Salivary gland pain": 1, "Sciatica": 1, "Seasonal allergy": 1, "Shoulder injury related to vaccine administration": 1, "Sinus pain": 1, "Skin injury": 1, "Skin irritation": 1, "Skin ulcer": 1, "Skin wrinkling": 1, "Sluggishness": 1, "Small fibre neuropathy": 1, "Smooth muscle antibody": 1, "Speech disorder": 1, "Spinal X-ray": 1, "Splenomegaly": 1, "Stress": 1, "Sunburn": 1, "Suppressed lactation": 1, "Swelling of eyelid": 1, "Symptom recurrence": 1, "Tendonitis": 1, "Tension headache": 1, "Throat irritation": 1, "Thrombocytopenia": 1, "Thyroid mass": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Tonsillar inflammation": 1, "Tooth abscess": 1, "Toothache": 1, "Toxoplasma serology": 1, "Transient ischaemic attack": 1, "Treponema test": 1, "Troponin": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen": 1, "Ultrasound breast": 1, "Ultrasound foetal": 1, "Ultrasound scan normal": 1, "Ultrasound thyroid": 1, "Underdose": 1, "Urine protein/creatinine ratio": 1, "Uterine cancer": 1, "Uveitis": 1, "VIIIth nerve injury": 1, "Vaccination failure": 1, "Vaccination site abscess": 1, "Vaccination site inflammation": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaccination site phlebitis": 1, "Vaginal haemorrhage": 1, "Varicose vein": 1, "Vitamin D increased": 1, "Weight decreased": 1, "White blood cell count increased": 1, "Wound": 1, "Wrong product administered": 1}, "batchcodes": ["026L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20A/027L20A.json b/docs/data/histograms/United States/026L20A/027L20A.json
index a7ec15a58ba..c78b8514593 100644
--- a/docs/data/histograms/United States/026L20A/027L20A.json
+++ b/docs/data/histograms/United States/026L20A/027L20A.json
@@ -1 +1 @@
-{"batchcode": "026L20A/027L20A", "histograms": [{"batchcodes": ["026L20A/027L20A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20A/027L20A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["026L20A/027L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20M.json b/docs/data/histograms/United States/026L20M.json
index d58eb239803..850779f7949 100644
--- a/docs/data/histograms/United States/026L20M.json
+++ b/docs/data/histograms/United States/026L20M.json
@@ -1 +1 @@
-{"batchcode": "026L20M", "histograms": [{"batchcodes": ["026L20M"], "histogram": {"Pain in extremity": 1, "Rheumatoid arthritis": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20M", "histograms": [{"histogram": {"Pain in extremity": 1, "Rheumatoid arthritis": 1}, "batchcodes": ["026L20M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L20T(?).json b/docs/data/histograms/United States/026L20T(?).json
index 6e587260234..30310cf9227 100644
--- a/docs/data/histograms/United States/026L20T(?).json
+++ b/docs/data/histograms/United States/026L20T(?).json
@@ -1 +1 @@
-{"batchcode": "026L20T(?)", "histograms": [{"batchcodes": ["026L20T(?)"], "histogram": {"Axillary pain": 1, "Breast swelling": 1, "Breast tenderness": 1, "Lymphadenopathy": 1, "Swelling": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "026L20T(?)", "histograms": [{"histogram": {"Axillary pain": 1, "Breast swelling": 1, "Breast tenderness": 1, "Lymphadenopathy": 1, "Swelling": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["026L20T(?)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L210A.json b/docs/data/histograms/United States/026L210A.json
index 4a4a9763b32..348dd944ac2 100644
--- a/docs/data/histograms/United States/026L210A.json
+++ b/docs/data/histograms/United States/026L210A.json
@@ -1 +1 @@
-{"batchcode": "026L210A", "histograms": [{"batchcodes": ["026L210A"], "histogram": {"Asthenia": 1, "Back pain": 1, "Chills": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "SARS-CoV-2 antibody test positive": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026L210A", "histograms": [{"histogram": {"Asthenia": 1, "Back pain": 1, "Chills": 1, "Headache": 1, "Malaise": 1, "Nausea": 1, "SARS-CoV-2 antibody test positive": 1, "Vomiting": 1}, "batchcodes": ["026L210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L213.json b/docs/data/histograms/United States/026L213.json
index bed6b82e8ee..91119f376a3 100644
--- a/docs/data/histograms/United States/026L213.json
+++ b/docs/data/histograms/United States/026L213.json
@@ -1 +1 @@
-{"batchcode": "026L213", "histograms": [{"batchcodes": ["026L213"], "histogram": {"Product administered at inappropriate site": 1}}]}
\ No newline at end of file
+{"batchcode": "026L213", "histograms": [{"histogram": {"Product administered at inappropriate site": 1}, "batchcodes": ["026L213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L217A.json b/docs/data/histograms/United States/026L217A.json
index 9e040ebd505..7c717e3f50a 100644
--- a/docs/data/histograms/United States/026L217A.json
+++ b/docs/data/histograms/United States/026L217A.json
@@ -1 +1 @@
-{"batchcode": "026L217A", "histograms": [{"batchcodes": ["026L217A"], "histogram": {"Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026L217A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["026L217A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L219.json b/docs/data/histograms/United States/026L219.json
index d37164bea01..0e2db9a9178 100644
--- a/docs/data/histograms/United States/026L219.json
+++ b/docs/data/histograms/United States/026L219.json
@@ -1 +1 @@
-{"batchcode": "026L219", "histograms": [{"batchcodes": ["026L219"], "histogram": {"Influenza like illness": 1, "Mastitis": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "026L219", "histograms": [{"histogram": {"Influenza like illness": 1, "Mastitis": 1, "Pain in extremity": 1}, "batchcodes": ["026L219"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L21A.json b/docs/data/histograms/United States/026L21A.json
index 7d19dcbee6c..1d2a53ac752 100644
--- a/docs/data/histograms/United States/026L21A.json
+++ b/docs/data/histograms/United States/026L21A.json
@@ -1 +1 @@
-{"batchcode": "026L21A", "histograms": [{"batchcodes": ["0139406", "026L21A"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Gastric disorder": 1, "Memory impairment": 1, "Migraine": 1, "Palpitations": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Vaccination failure": 1}}, {"batchcodes": ["026L21A"], "histogram": {"Fatigue": 3, "Pain in extremity": 3, "SARS-CoV-2 test": 3, "Axillary pain": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chills": 1, "Chronic lymphocytic leukaemia": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Illness": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Paranasal sinus discomfort": 1, "Pruritus": 1, "Pyrexia": 1, "Scan": 1, "Tension headache": 1, "Throat irritation": 1, "Upper respiratory tract congestion": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "026L21A", "histograms": [{"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Gastric disorder": 1, "Memory impairment": 1, "Migraine": 1, "Palpitations": 1, "Pruritus": 1, "SARS-CoV-2 test": 1, "Tinnitus": 1, "Vaccination failure": 1}, "batchcodes": ["0139406", "026L21A"]}, {"histogram": {"Fatigue": 3, "Pain in extremity": 3, "SARS-CoV-2 test": 3, "Axillary pain": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Chills": 1, "Chronic lymphocytic leukaemia": 1, "Headache": 1, "Heart rate": 1, "Hypertension": 1, "Illness": 1, "Limb discomfort": 1, "Lymphadenopathy": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Paranasal sinus discomfort": 1, "Pruritus": 1, "Pyrexia": 1, "Scan": 1, "Tension headache": 1, "Throat irritation": 1, "Upper respiratory tract congestion": 1, "Vision blurred": 1}, "batchcodes": ["026L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L21B.json b/docs/data/histograms/United States/026L21B.json
index 856c8d10b8c..327d8d0212d 100644
--- a/docs/data/histograms/United States/026L21B.json
+++ b/docs/data/histograms/United States/026L21B.json
@@ -1 +1 @@
-{"batchcode": "026L21B", "histograms": [{"batchcodes": ["017E21A", "026L21B", "1805018"], "histogram": {"Suspected COVID-19": 1}}, {"batchcodes": ["026L21B", "1802068", "939904"], "histogram": {"Suspected COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["026L21B"], "histogram": {"Expired product administered": 271, "Product storage error": 191, "No adverse event": 34, "Circumstance or information capable of leading to medication error": 1, "Hypoaesthesia": 1, "Paraesthesia": 1, "Product administration interrupted": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "026L21B", "histograms": [{"histogram": {"Suspected COVID-19": 1}, "batchcodes": ["017E21A", "026L21B", "1805018"]}, {"histogram": {"Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["026L21B", "1802068", "939904"]}, {"histogram": {"Expired product administered": 271, "Product storage error": 191, "No adverse event": 34, "Circumstance or information capable of leading to medication error": 1, "Hypoaesthesia": 1, "Paraesthesia": 1, "Product administration interrupted": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["026L21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L22A.json b/docs/data/histograms/United States/026L22A.json
index 0c2fa65918a..2c63d77f816 100644
--- a/docs/data/histograms/United States/026L22A.json
+++ b/docs/data/histograms/United States/026L22A.json
@@ -1 +1 @@
-{"batchcode": "026L22A", "histograms": [{"batchcodes": ["026L22A"], "histogram": {"Chills": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "026L22A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["026L22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L26A.json b/docs/data/histograms/United States/026L26A.json
index 1ae77cc5035..f7b26f84891 100644
--- a/docs/data/histograms/United States/026L26A.json
+++ b/docs/data/histograms/United States/026L26A.json
@@ -1 +1 @@
-{"batchcode": "026L26A", "histograms": [{"batchcodes": ["026L26A"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "026L26A", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["026L26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2DA.json b/docs/data/histograms/United States/026L2DA.json
index 83614068a25..a9ca2539156 100644
--- a/docs/data/histograms/United States/026L2DA.json
+++ b/docs/data/histograms/United States/026L2DA.json
@@ -1 +1 @@
-{"batchcode": "026L2DA", "histograms": [{"batchcodes": ["026L2DA"], "histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "Colour blindness acquired": 1, "Cough": 1, "Drug ineffective": 1, "Epstein-Barr virus infection reactivation": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Loss of consciousness": 1, "Pain in extremity": 1, "Vision blurred": 1, "Visual impairment": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2DA", "histograms": [{"histogram": {"SARS-CoV-2 test": 2, "COVID-19": 1, "Colour blindness acquired": 1, "Cough": 1, "Drug ineffective": 1, "Epstein-Barr virus infection reactivation": 1, "Fatigue": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Loss of consciousness": 1, "Pain in extremity": 1, "Vision blurred": 1, "Visual impairment": 1, "Wheezing": 1}, "batchcodes": ["026L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2O14.json b/docs/data/histograms/United States/026L2O14.json
index 3ca03b53b5c..7833a3f05f2 100644
--- a/docs/data/histograms/United States/026L2O14.json
+++ b/docs/data/histograms/United States/026L2O14.json
@@ -1 +1 @@
-{"batchcode": "026L2O14", "histograms": [{"batchcodes": ["026L2O14"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Fatigue": 1, "Headache": 1, "Nasal dryness": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2O14", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Fatigue": 1, "Headache": 1, "Nasal dryness": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["026L2O14"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2O4.json b/docs/data/histograms/United States/026L2O4.json
index 9b3313e1ff4..3e29329370e 100644
--- a/docs/data/histograms/United States/026L2O4.json
+++ b/docs/data/histograms/United States/026L2O4.json
@@ -1 +1 @@
-{"batchcode": "026L2O4", "histograms": [{"batchcodes": ["026L2O4"], "histogram": {"Throat tightness": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2O4", "histograms": [{"histogram": {"Throat tightness": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["026L2O4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2OA..json b/docs/data/histograms/United States/026L2OA..json
index 222fa9c3bd3..2b297ce795e 100644
--- a/docs/data/histograms/United States/026L2OA..json
+++ b/docs/data/histograms/United States/026L2OA..json
@@ -1 +1 @@
-{"batchcode": "026L2OA.", "histograms": [{"batchcodes": ["026L2OA."], "histogram": {"Back pain": 1, "Dry throat": 1, "Dysgeusia": 1, "Fatigue": 1, "Headache": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2OA.", "histograms": [{"histogram": {"Back pain": 1, "Dry throat": 1, "Dysgeusia": 1, "Fatigue": 1, "Headache": 1, "Pain": 1}, "batchcodes": ["026L2OA."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2OA.json b/docs/data/histograms/United States/026L2OA.json
index b24acca59a4..ad63732be44 100644
--- a/docs/data/histograms/United States/026L2OA.json
+++ b/docs/data/histograms/United States/026L2OA.json
@@ -1 +1 @@
-{"batchcode": "026L2OA", "histograms": [{"batchcodes": ["026L2OA"], "histogram": {"Allergy test negative": 1, "Arthralgia": 1, "Blood test": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Lymphadenopathy": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Tachycardia": 1, "Throat tightness": 1, "Tryptase": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2OA", "histograms": [{"histogram": {"Allergy test negative": 1, "Arthralgia": 1, "Blood test": 1, "Erythema": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Lymphadenopathy": 1, "Paraesthesia oral": 1, "Peripheral swelling": 1, "Tachycardia": 1, "Throat tightness": 1, "Tryptase": 1}, "batchcodes": ["026L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2UA.json b/docs/data/histograms/United States/026L2UA.json
index b24788bf185..e597bdfc087 100644
--- a/docs/data/histograms/United States/026L2UA.json
+++ b/docs/data/histograms/United States/026L2UA.json
@@ -1 +1 @@
-{"batchcode": "026L2UA", "histograms": [{"batchcodes": ["026L2UA"], "histogram": {"Tension headache": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2UA", "histograms": [{"histogram": {"Tension headache": 1}, "batchcodes": ["026L2UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L2VA.json b/docs/data/histograms/United States/026L2VA.json
index f2433e1474f..56742f96478 100644
--- a/docs/data/histograms/United States/026L2VA.json
+++ b/docs/data/histograms/United States/026L2VA.json
@@ -1 +1 @@
-{"batchcode": "026L2VA", "histograms": [{"batchcodes": ["026L2VA"], "histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Headache": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1}}]}
\ No newline at end of file
+{"batchcode": "026L2VA", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Headache": 1, "SARS-CoV-2 test": 1, "Sinusitis": 1}, "batchcodes": ["026L2VA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L70A.json b/docs/data/histograms/United States/026L70A.json
index aa110155275..00038a52024 100644
--- a/docs/data/histograms/United States/026L70A.json
+++ b/docs/data/histograms/United States/026L70A.json
@@ -1 +1 @@
-{"batchcode": "026L70A", "histograms": [{"batchcodes": ["026L70A"], "histogram": {"Chills": 2, "Headache": 2, "Acoustic stimulation tests": 1, "Deafness": 1, "Fatigue": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "026L70A", "histograms": [{"histogram": {"Chills": 2, "Headache": 2, "Acoustic stimulation tests": 1, "Deafness": 1, "Fatigue": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tinnitus": 1}, "batchcodes": ["026L70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026L80A.json b/docs/data/histograms/United States/026L80A.json
index 4a2ebe4b29d..440b875b275 100644
--- a/docs/data/histograms/United States/026L80A.json
+++ b/docs/data/histograms/United States/026L80A.json
@@ -1 +1 @@
-{"batchcode": "026L80A", "histograms": [{"batchcodes": ["026L80A"], "histogram": {"Diagnostic aspiration": 1, "Thyroid mass": 1}}]}
\ No newline at end of file
+{"batchcode": "026L80A", "histograms": [{"histogram": {"Diagnostic aspiration": 1, "Thyroid mass": 1}, "batchcodes": ["026L80A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026LC0A.json b/docs/data/histograms/United States/026LC0A.json
index 245a7cbff8c..7aedd0d82d9 100644
--- a/docs/data/histograms/United States/026LC0A.json
+++ b/docs/data/histograms/United States/026LC0A.json
@@ -1 +1 @@
-{"batchcode": "026LC0A", "histograms": [{"batchcodes": ["026LC0A"], "histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Hypersomnia": 1}}]}
\ No newline at end of file
+{"batchcode": "026LC0A", "histograms": [{"histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Hypersomnia": 1}, "batchcodes": ["026LC0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026LJ01.json b/docs/data/histograms/United States/026LJ01.json
index d98c134c846..2e3ea4b4433 100644
--- a/docs/data/histograms/United States/026LJ01.json
+++ b/docs/data/histograms/United States/026LJ01.json
@@ -1 +1 @@
-{"batchcode": "026LJ01", "histograms": [{"batchcodes": ["026LJ01"], "histogram": {"Skin exfoliation": 1, "Vaccination site bruising": 1, "Vaccination site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "026LJ01", "histograms": [{"histogram": {"Skin exfoliation": 1, "Vaccination site bruising": 1, "Vaccination site haemorrhage": 1}, "batchcodes": ["026LJ01"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026LL20A.json b/docs/data/histograms/United States/026LL20A.json
index 2a13be97528..dba0e3e767d 100644
--- a/docs/data/histograms/United States/026LL20A.json
+++ b/docs/data/histograms/United States/026LL20A.json
@@ -1 +1 @@
-{"batchcode": "026LL20A", "histograms": [{"batchcodes": ["026LL20A"], "histogram": {"Chills": 1, "Dysphonia": 1, "Erythema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Rhinorrhoea": 1, "Throat irritation": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "026LL20A", "histograms": [{"histogram": {"Chills": 1, "Dysphonia": 1, "Erythema": 1, "Oropharyngeal pain": 1, "Pain": 1, "Rhinorrhoea": 1, "Throat irritation": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["026LL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026LZ0A.json b/docs/data/histograms/United States/026LZ0A.json
index 6a6c03a1d68..25be5ac2424 100644
--- a/docs/data/histograms/United States/026LZ0A.json
+++ b/docs/data/histograms/United States/026LZ0A.json
@@ -1 +1 @@
-{"batchcode": "026LZ0A", "histograms": [{"batchcodes": ["026LZ0A"], "histogram": {"Myalgia": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Accidental overdose": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Erythema": 1, "Extra dose administered": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Injection site pain": 1, "Injection site rash": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Rash pruritic": 1, "Rash pustular": 1, "SARS-CoV-1 test": 1}}]}
\ No newline at end of file
+{"batchcode": "026LZ0A", "histograms": [{"histogram": {"Myalgia": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Accidental overdose": 1, "Arthralgia": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Chills": 1, "Erythema": 1, "Extra dose administered": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Injection site pain": 1, "Injection site rash": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Muscular weakness": 1, "Nausea": 1, "Pain in extremity": 1, "Rash pruritic": 1, "Rash pustular": 1, "SARS-CoV-1 test": 1}, "batchcodes": ["026LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026LZOA.json b/docs/data/histograms/United States/026LZOA.json
index d336b109427..a285bc8a5ac 100644
--- a/docs/data/histograms/United States/026LZOA.json
+++ b/docs/data/histograms/United States/026LZOA.json
@@ -1 +1 @@
-{"batchcode": "026LZOA", "histograms": [{"batchcodes": ["026LZOA"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "026LZOA", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Heart rate increased": 1, "Lymphadenopathy": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["026LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026M12A.json b/docs/data/histograms/United States/026M12A.json
index 0aef9c0ab16..df828a73f10 100644
--- a/docs/data/histograms/United States/026M12A.json
+++ b/docs/data/histograms/United States/026M12A.json
@@ -1 +1 @@
-{"batchcode": "026M12A", "histograms": [{"batchcodes": ["026M12A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "026M12A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["026M12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026M20A.json b/docs/data/histograms/United States/026M20A.json
index eca3cadfefc..488c3e896f9 100644
--- a/docs/data/histograms/United States/026M20A.json
+++ b/docs/data/histograms/United States/026M20A.json
@@ -1 +1 @@
-{"batchcode": "026M20A", "histograms": [{"batchcodes": ["026M20A"], "histogram": {"Dysarthria": 1, "Pain in extremity": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "026M20A", "histograms": [{"histogram": {"Dysarthria": 1, "Pain in extremity": 1, "Swollen tongue": 1}, "batchcodes": ["026M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026M21A.json b/docs/data/histograms/United States/026M21A.json
index 41f0afad797..e099d8d70e0 100644
--- a/docs/data/histograms/United States/026M21A.json
+++ b/docs/data/histograms/United States/026M21A.json
@@ -1 +1 @@
-{"batchcode": "026M21A", "histograms": [{"batchcodes": ["026M21A"], "histogram": {"Arthralgia": 2, "Discomfort": 2, "Gait disturbance": 2, "Insomnia": 2, "Myalgia": 2, "Fatigue": 1, "Hepatic enzyme increased": 1, "Lymphadenopathy": 1, "Product dose omission issue": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "026M21A", "histograms": [{"histogram": {"Arthralgia": 2, "Discomfort": 2, "Gait disturbance": 2, "Insomnia": 2, "Myalgia": 2, "Fatigue": 1, "Hepatic enzyme increased": 1, "Lymphadenopathy": 1, "Product dose omission issue": 1, "Rash": 1}, "batchcodes": ["026M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026O20A.json b/docs/data/histograms/United States/026O20A.json
index bfaea3560e5..d8c3d935399 100644
--- a/docs/data/histograms/United States/026O20A.json
+++ b/docs/data/histograms/United States/026O20A.json
@@ -1 +1 @@
-{"batchcode": "026O20A", "histograms": [{"batchcodes": ["026O20A"], "histogram": {"Rash": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "026O20A", "histograms": [{"histogram": {"Rash": 1, "Urticaria": 1}, "batchcodes": ["026O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026P21A.json b/docs/data/histograms/United States/026P21A.json
index 30fbdc1e52c..2e02577985c 100644
--- a/docs/data/histograms/United States/026P21A.json
+++ b/docs/data/histograms/United States/026P21A.json
@@ -1 +1 @@
-{"batchcode": "026P21A", "histograms": [{"batchcodes": ["026P21A"], "histogram": {"Vomiting": 2, "Asthenia": 1, "Bedridden": 1, "Chills": 1, "Diarrhoea": 1, "Exposure via breast milk": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Maternal exposure during breast feeding": 1, "Polymenorrhoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "026P21A", "histograms": [{"histogram": {"Vomiting": 2, "Asthenia": 1, "Bedridden": 1, "Chills": 1, "Diarrhoea": 1, "Exposure via breast milk": 1, "Feeling abnormal": 1, "Feeling of body temperature change": 1, "Headache": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Maternal exposure during breast feeding": 1, "Polymenorrhoea": 1, "Pyrexia": 1}, "batchcodes": ["026P21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/026Z20A.json b/docs/data/histograms/United States/026Z20A.json
index 89e5125f0b8..5895b243197 100644
--- a/docs/data/histograms/United States/026Z20A.json
+++ b/docs/data/histograms/United States/026Z20A.json
@@ -1 +1 @@
-{"batchcode": "026Z20A", "histograms": [{"batchcodes": ["026Z20A"], "histogram": {"Rash": 2, "Adverse reaction": 1, "Dizziness": 1, "Dry mouth": 1, "Dyspnoea": 1, "Muscular weakness": 1, "Nausea": 1, "Pruritus": 1, "Scratch": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site hypersensitivity": 1}}]}
\ No newline at end of file
+{"batchcode": "026Z20A", "histograms": [{"histogram": {"Rash": 2, "Adverse reaction": 1, "Dizziness": 1, "Dry mouth": 1, "Dyspnoea": 1, "Muscular weakness": 1, "Nausea": 1, "Pruritus": 1, "Scratch": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site hypersensitivity": 1}, "batchcodes": ["026Z20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027#22A.json b/docs/data/histograms/United States/027#22A.json
index fc4f51aede2..0349e3d75f7 100644
--- a/docs/data/histograms/United States/027#22A.json
+++ b/docs/data/histograms/United States/027#22A.json
@@ -1 +1 @@
-{"batchcode": "027#22A", "histograms": [{"batchcodes": ["027#22A"], "histogram": {"Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "027#22A", "histograms": [{"histogram": {"Vaccination site swelling": 1}, "batchcodes": ["027#22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027-A21A.json b/docs/data/histograms/United States/027-A21A.json
index 67056e8994c..f660d07bf1d 100644
--- a/docs/data/histograms/United States/027-A21A.json
+++ b/docs/data/histograms/United States/027-A21A.json
@@ -1 +1 @@
-{"batchcode": "027-A21A", "histograms": [{"batchcodes": ["027-A21A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "027-A21A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["027-A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027-K20A.json b/docs/data/histograms/United States/027-K20A.json
index 6a2a4c7d53c..a3c96240637 100644
--- a/docs/data/histograms/United States/027-K20A.json
+++ b/docs/data/histograms/United States/027-K20A.json
@@ -1 +1 @@
-{"batchcode": "027-K20A", "histograms": [{"batchcodes": ["027-K20A"], "histogram": {"Maternal exposure during breast feeding": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027-K20A", "histograms": [{"histogram": {"Maternal exposure during breast feeding": 1, "Vaccination site pain": 1}, "batchcodes": ["027-K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0271121B.json b/docs/data/histograms/United States/0271121B.json
index c7e444e1e3a..d5247ba6475 100644
--- a/docs/data/histograms/United States/0271121B.json
+++ b/docs/data/histograms/United States/0271121B.json
@@ -1 +1 @@
-{"batchcode": "0271121B", "histograms": [{"batchcodes": ["0271121B"], "histogram": {"COVID-19": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "0271121B", "histograms": [{"histogram": {"COVID-19": 1, "Tinnitus": 1}, "batchcodes": ["0271121B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027120A.json b/docs/data/histograms/United States/027120A.json
index 2243fc9e136..2faae4b4fea 100644
--- a/docs/data/histograms/United States/027120A.json
+++ b/docs/data/histograms/United States/027120A.json
@@ -1 +1 @@
-{"batchcode": "027120A", "histograms": [{"batchcodes": ["027120A"], "histogram": {"Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Ear pain": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site warmth": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "027120A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Diarrhoea": 1, "Ear pain": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site warmth": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination complication": 1}, "batchcodes": ["027120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027121A.json b/docs/data/histograms/United States/027121A.json
index d45ea7d2cff..ff7cbf57c2b 100644
--- a/docs/data/histograms/United States/027121A.json
+++ b/docs/data/histograms/United States/027121A.json
@@ -1 +1 @@
-{"batchcode": "027121A", "histograms": [{"batchcodes": ["027121A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "027121A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["027121A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027170A.json b/docs/data/histograms/United States/027170A.json
index b1738d1a920..fe88183d7cb 100644
--- a/docs/data/histograms/United States/027170A.json
+++ b/docs/data/histograms/United States/027170A.json
@@ -1 +1 @@
-{"batchcode": "027170A", "histograms": [{"batchcodes": ["027170A"], "histogram": {"Dizziness": 1, "Incorrect dose administered": 1, "Injected limb mobility decreased": 1, "Lethargy": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "027170A", "histograms": [{"histogram": {"Dizziness": 1, "Incorrect dose administered": 1, "Injected limb mobility decreased": 1, "Lethargy": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination complication": 1}, "batchcodes": ["027170A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0271921A.json b/docs/data/histograms/United States/0271921A.json
index f0f5d567f3a..09695886d69 100644
--- a/docs/data/histograms/United States/0271921A.json
+++ b/docs/data/histograms/United States/0271921A.json
@@ -1 +1 @@
-{"batchcode": "0271921A", "histograms": [{"batchcodes": ["0271921A"], "histogram": {"Chills": 1, "Pain": 1, "Pyrexia": 1, "Sudden hearing loss": 1}}]}
\ No newline at end of file
+{"batchcode": "0271921A", "histograms": [{"histogram": {"Chills": 1, "Pain": 1, "Pyrexia": 1, "Sudden hearing loss": 1}, "batchcodes": ["0271921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0271A211A.json b/docs/data/histograms/United States/0271A211A.json
index 87b61e702c8..667cd6fd3b3 100644
--- a/docs/data/histograms/United States/0271A211A.json
+++ b/docs/data/histograms/United States/0271A211A.json
@@ -1 +1 @@
-{"batchcode": "0271A211A", "histograms": [{"batchcodes": ["0271A211A"], "histogram": {"Hypoacusis": 1, "Spinal pain": 1, "Vaccination site pain": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "0271A211A", "histograms": [{"histogram": {"Hypoacusis": 1, "Spinal pain": 1, "Vaccination site pain": 1, "Visual impairment": 1}, "batchcodes": ["0271A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027220A.json b/docs/data/histograms/United States/027220A.json
index 34adf1cddc6..70b1713f8c3 100644
--- a/docs/data/histograms/United States/027220A.json
+++ b/docs/data/histograms/United States/027220A.json
@@ -1 +1 @@
-{"batchcode": "027220A", "histograms": [{"batchcodes": ["027220A"], "histogram": {"Blood test": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "027220A", "histograms": [{"histogram": {"Blood test": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["027220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0272AA.json b/docs/data/histograms/United States/0272AA.json
index b87a42a30e1..b095e77d4b2 100644
--- a/docs/data/histograms/United States/0272AA.json
+++ b/docs/data/histograms/United States/0272AA.json
@@ -1 +1 @@
-{"batchcode": "0272AA", "histograms": [{"batchcodes": ["0272AA"], "histogram": {"Exposure during pregnancy": 1, "Musculoskeletal disorder": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0272AA", "histograms": [{"histogram": {"Exposure during pregnancy": 1, "Musculoskeletal disorder": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["0272AA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0273-99.json b/docs/data/histograms/United States/0273-99.json
index 40907d4c0cd..2259863b805 100644
--- a/docs/data/histograms/United States/0273-99.json
+++ b/docs/data/histograms/United States/0273-99.json
@@ -1 +1 @@
-{"batchcode": "0273-99", "histograms": [{"batchcodes": ["0273-99"], "histogram": {"Abdominal pain": 1, "Back pain": 1, "Constipation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0273-99", "histograms": [{"histogram": {"Abdominal pain": 1, "Back pain": 1, "Constipation": 1, "Vaccination site pain": 1}, "batchcodes": ["0273-99"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027321A.json b/docs/data/histograms/United States/027321A.json
index eb911139eef..cac65497d57 100644
--- a/docs/data/histograms/United States/027321A.json
+++ b/docs/data/histograms/United States/027321A.json
@@ -1 +1 @@
-{"batchcode": "027321A", "histograms": [{"batchcodes": ["027321A"], "histogram": {"Diarrhoea": 1, "Hypoaesthesia": 1, "Pruritus": 1, "Skin warm": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "027321A", "histograms": [{"histogram": {"Diarrhoea": 1, "Hypoaesthesia": 1, "Pruritus": 1, "Skin warm": 1, "Swelling": 1}, "batchcodes": ["027321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027420A.json b/docs/data/histograms/United States/027420A.json
index aece894c511..4687b62aa7c 100644
--- a/docs/data/histograms/United States/027420A.json
+++ b/docs/data/histograms/United States/027420A.json
@@ -1 +1 @@
-{"batchcode": "027420A", "histograms": [{"batchcodes": ["027420A"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Neck pain": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "027420A", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Neck pain": 1, "Rash": 1}, "batchcodes": ["027420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0274214.json b/docs/data/histograms/United States/0274214.json
index 2e7aa571489..e19b1702108 100644
--- a/docs/data/histograms/United States/0274214.json
+++ b/docs/data/histograms/United States/0274214.json
@@ -1 +1 @@
-{"batchcode": "0274214", "histograms": [{"batchcodes": ["0274214"], "histogram": {"Asymptomatic COVID-19": 1, "Coronavirus test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "0274214", "histograms": [{"histogram": {"Asymptomatic COVID-19": 1, "Coronavirus test positive": 1}, "batchcodes": ["0274214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027421A.json b/docs/data/histograms/United States/027421A.json
index 0ac26e8ed05..cb2dbe36b22 100644
--- a/docs/data/histograms/United States/027421A.json
+++ b/docs/data/histograms/United States/027421A.json
@@ -1 +1 @@
-{"batchcode": "027421A", "histograms": [{"batchcodes": ["027421A"], "histogram": {"Fatigue": 2, "Pain in extremity": 2, "Vaccination site erythema": 2, "Chills": 1, "Dizziness": 1, "Dry skin": 1, "Epistaxis": 1, "Erythema": 1, "Feeling hot": 1, "Insomnia": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Skin wrinkling": 1, "Swelling face": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "027421A", "histograms": [{"histogram": {"Fatigue": 2, "Pain in extremity": 2, "Vaccination site erythema": 2, "Chills": 1, "Dizziness": 1, "Dry skin": 1, "Epistaxis": 1, "Erythema": 1, "Feeling hot": 1, "Insomnia": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Skin wrinkling": 1, "Swelling face": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["027421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0276(G)20A.json b/docs/data/histograms/United States/0276(G)20A.json
index d115e9ecd79..3719cec7161 100644
--- a/docs/data/histograms/United States/0276(G)20A.json
+++ b/docs/data/histograms/United States/0276(G)20A.json
@@ -1 +1 @@
-{"batchcode": "0276(G)20A", "histograms": [{"batchcodes": ["0276(G)20A"], "histogram": {"Asthenia": 1, "Fall": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Urine output increased": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "0276(G)20A", "histograms": [{"histogram": {"Asthenia": 1, "Fall": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Urine output increased": 1, "Vaccination complication": 1}, "batchcodes": ["0276(G)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0276.json b/docs/data/histograms/United States/0276.json
index d421f056198..19b8b9c11df 100644
--- a/docs/data/histograms/United States/0276.json
+++ b/docs/data/histograms/United States/0276.json
@@ -1 +1 @@
-{"batchcode": "0276", "histograms": [{"batchcodes": ["0276"], "histogram": {"Chills": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "0276", "histograms": [{"histogram": {"Chills": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination complication": 1}, "batchcodes": ["0276"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0276208.json b/docs/data/histograms/United States/0276208.json
index 475cf2fb9ab..6475cb026d9 100644
--- a/docs/data/histograms/United States/0276208.json
+++ b/docs/data/histograms/United States/0276208.json
@@ -1 +1 @@
-{"batchcode": "0276208", "histograms": [{"batchcodes": ["0276208"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0276208", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["0276208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027620A.json b/docs/data/histograms/United States/027620A.json
index 810aaaf1698..b9dee3f169c 100644
--- a/docs/data/histograms/United States/027620A.json
+++ b/docs/data/histograms/United States/027620A.json
@@ -1 +1 @@
-{"batchcode": "027620A", "histograms": [{"batchcodes": ["027620A"], "histogram": {"Chills": 5, "Headache": 5, "Pyrexia": 4, "Body temperature": 3, "Arthralgia": 2, "Cellulitis": 2, "Muscular weakness": 2, "Myalgia": 2, "Neuropathy peripheral": 2, "Pain": 2, "Pain in extremity": 2, "Swelling": 2, "Vaccination site dysaesthesia": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Adverse reaction": 1, "Anxiety": 1, "Body temperature increased": 1, "Chest pain": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dyskinesia": 1, "Eczema": 1, "Extra dose administered": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Hormone level abnormal": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Joint swelling": 1, "Menstrual disorder": 1, "Muscle contracture": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Productive cough": 1, "Uterine cyst": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1, "Weight increased": 1}}]}
\ No newline at end of file
+{"batchcode": "027620A", "histograms": [{"histogram": {"Chills": 5, "Headache": 5, "Pyrexia": 4, "Body temperature": 3, "Arthralgia": 2, "Cellulitis": 2, "Muscular weakness": 2, "Myalgia": 2, "Neuropathy peripheral": 2, "Pain": 2, "Pain in extremity": 2, "Swelling": 2, "Vaccination site dysaesthesia": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Adverse reaction": 1, "Anxiety": 1, "Body temperature increased": 1, "Chest pain": 1, "Disturbance in attention": 1, "Dizziness": 1, "Dyskinesia": 1, "Eczema": 1, "Extra dose administered": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Gait disturbance": 1, "Hormone level abnormal": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Joint swelling": 1, "Menstrual disorder": 1, "Muscle contracture": 1, "Nasopharyngitis": 1, "Nervousness": 1, "Oedema": 1, "Oropharyngeal pain": 1, "Palpitations": 1, "Productive cough": 1, "Uterine cyst": 1, "Vaccination site movement impairment": 1, "Vaccination site swelling": 1, "Weight increased": 1}, "batchcodes": ["027620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027621A.json b/docs/data/histograms/United States/027621A.json
index 3e62b637d56..e5822b27a6f 100644
--- a/docs/data/histograms/United States/027621A.json
+++ b/docs/data/histograms/United States/027621A.json
@@ -1 +1 @@
-{"batchcode": "027621A", "histograms": [{"batchcodes": ["027621A"], "histogram": {"Body temperature": 1, "Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "027621A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Pyrexia": 1}, "batchcodes": ["027621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02762DA.json b/docs/data/histograms/United States/02762DA.json
index 5ac731a3c72..506e5145aa3 100644
--- a/docs/data/histograms/United States/02762DA.json
+++ b/docs/data/histograms/United States/02762DA.json
@@ -1 +1 @@
-{"batchcode": "02762DA", "histograms": [{"batchcodes": ["02762DA"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02762DA", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["02762DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02762UA.json b/docs/data/histograms/United States/02762UA.json
index 2f14b52e799..86eb984ff7b 100644
--- a/docs/data/histograms/United States/02762UA.json
+++ b/docs/data/histograms/United States/02762UA.json
@@ -1 +1 @@
-{"batchcode": "02762UA", "histograms": [{"batchcodes": ["02762UA"], "histogram": {"Blood pressure increased": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02762UA", "histograms": [{"histogram": {"Blood pressure increased": 1, "Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Nausea": 1, "Vaccination site pain": 1}, "batchcodes": ["02762UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027720A.json b/docs/data/histograms/United States/027720A.json
index 65a1ced4632..79a5e0b36e4 100644
--- a/docs/data/histograms/United States/027720A.json
+++ b/docs/data/histograms/United States/027720A.json
@@ -1 +1 @@
-{"batchcode": "027720A", "histograms": [{"batchcodes": ["027720A"], "histogram": {"Haematochezia": 1, "Platelet count decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "027720A", "histograms": [{"histogram": {"Haematochezia": 1, "Platelet count decreased": 1}, "batchcodes": ["027720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027721B.json b/docs/data/histograms/United States/027721B.json
index f60824dbeaa..a0017b7401d 100644
--- a/docs/data/histograms/United States/027721B.json
+++ b/docs/data/histograms/United States/027721B.json
@@ -1 +1 @@
-{"batchcode": "027721B", "histograms": [{"batchcodes": ["027721B"], "histogram": {"Abdominal pain": 1, "Breast pain": 1, "Computerised tomogram abdomen": 1, "Hypotension": 1, "Immunisation reaction": 1, "Inflammation": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Urticaria": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027721B", "histograms": [{"histogram": {"Abdominal pain": 1, "Breast pain": 1, "Computerised tomogram abdomen": 1, "Hypotension": 1, "Immunisation reaction": 1, "Inflammation": 1, "Peripheral swelling": 1, "Skin discolouration": 1, "Urticaria": 1, "Vaccination site pain": 1}, "batchcodes": ["027721B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027821A OR 0278.json b/docs/data/histograms/United States/027821A OR 0278.json
index 5265ade8522..ac19171b7c7 100644
--- a/docs/data/histograms/United States/027821A OR 0278.json
+++ b/docs/data/histograms/United States/027821A OR 0278.json
@@ -1 +1 @@
-{"batchcode": "027821A OR 0278", "histograms": [{"batchcodes": ["027821A OR 0278"], "histogram": {"Dyspnoea": 1, "Heart rate": 1, "Pharyngeal swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "027821A OR 0278", "histograms": [{"histogram": {"Dyspnoea": 1, "Heart rate": 1, "Pharyngeal swelling": 1, "Swelling face": 1}, "batchcodes": ["027821A OR 0278"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027821A.json b/docs/data/histograms/United States/027821A.json
index 080594094a1..c3bd1fc35f8 100644
--- a/docs/data/histograms/United States/027821A.json
+++ b/docs/data/histograms/United States/027821A.json
@@ -1 +1 @@
-{"batchcode": "027821A", "histograms": [{"batchcodes": ["027821A"], "histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "027821A", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["027821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027822A.json b/docs/data/histograms/United States/027822A.json
index 42a48f8a33e..ca742ab09c3 100644
--- a/docs/data/histograms/United States/027822A.json
+++ b/docs/data/histograms/United States/027822A.json
@@ -1 +1 @@
-{"batchcode": "027822A", "histograms": [{"batchcodes": ["027822A"], "histogram": {"Lip swelling": 1, "Mouth swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "027822A", "histograms": [{"histogram": {"Lip swelling": 1, "Mouth swelling": 1}, "batchcodes": ["027822A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A021A.json b/docs/data/histograms/United States/027A021A.json
index 292f3a50549..9014b4b21e5 100644
--- a/docs/data/histograms/United States/027A021A.json
+++ b/docs/data/histograms/United States/027A021A.json
@@ -1 +1 @@
-{"batchcode": "027A021A", "histograms": [{"batchcodes": ["027A021A"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "027A021A", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["027A021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A10A.json b/docs/data/histograms/United States/027A10A.json
index f3bbd85e589..4ce78f3a394 100644
--- a/docs/data/histograms/United States/027A10A.json
+++ b/docs/data/histograms/United States/027A10A.json
@@ -1 +1 @@
-{"batchcode": "027A10A", "histograms": [{"batchcodes": ["027A10A"], "histogram": {"Abdominal pain upper": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "027A10A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Headache": 1}, "batchcodes": ["027A10A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A17A.json b/docs/data/histograms/United States/027A17A.json
index ae74b9ba7a6..17c4a729c50 100644
--- a/docs/data/histograms/United States/027A17A.json
+++ b/docs/data/histograms/United States/027A17A.json
@@ -1 +1 @@
-{"batchcode": "027A17A", "histograms": [{"batchcodes": ["027A17A"], "histogram": {"Back pain": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "027A17A", "histograms": [{"histogram": {"Back pain": 1, "Myalgia": 1}, "batchcodes": ["027A17A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A201A.json b/docs/data/histograms/United States/027A201A.json
index 13e34bb68d2..702167cfc8d 100644
--- a/docs/data/histograms/United States/027A201A.json
+++ b/docs/data/histograms/United States/027A201A.json
@@ -1 +1 @@
-{"batchcode": "027A201A", "histograms": [{"batchcodes": ["027A201A"], "histogram": {"Cough": 1, "Headache": 1, "Insomnia": 1, "Oropharyngeal pain": 1, "Urinary tract infection": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027A201A", "histograms": [{"histogram": {"Cough": 1, "Headache": 1, "Insomnia": 1, "Oropharyngeal pain": 1, "Urinary tract infection": 1, "Vaccination site pain": 1}, "batchcodes": ["027A201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A20A.json b/docs/data/histograms/United States/027A20A.json
index 967e6f4638b..7e1a5095717 100644
--- a/docs/data/histograms/United States/027A20A.json
+++ b/docs/data/histograms/United States/027A20A.json
@@ -1 +1 @@
-{"batchcode": "027A20A", "histograms": [{"batchcodes": ["027A20A"], "histogram": {"Bronchitis": 1, "Cough": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Speech disorder": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027A20A", "histograms": [{"histogram": {"Bronchitis": 1, "Cough": 1, "Inappropriate schedule of product administration": 1, "Pain in extremity": 1, "Speech disorder": 1, "Vaccination site pain": 1}, "batchcodes": ["027A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A21.json b/docs/data/histograms/United States/027A21.json
index 4a675919e5a..5281f3ed966 100644
--- a/docs/data/histograms/United States/027A21.json
+++ b/docs/data/histograms/United States/027A21.json
@@ -1 +1 @@
-{"batchcode": "027A21", "histograms": [{"batchcodes": ["027A21"], "histogram": {"Dyspnoea": 2, "Headache": 2, "Asthenia": 1, "Erythema": 1, "Heart rate increased": 1, "Hot flush": 1, "Migraine": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rhinorrhoea": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21", "histograms": [{"histogram": {"Dyspnoea": 2, "Headache": 2, "Asthenia": 1, "Erythema": 1, "Heart rate increased": 1, "Hot flush": 1, "Migraine": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rhinorrhoea": 1, "Tachycardia": 1}, "batchcodes": ["027A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A2114.json b/docs/data/histograms/United States/027A2114.json
index a3e6ac8731a..50791e499d7 100644
--- a/docs/data/histograms/United States/027A2114.json
+++ b/docs/data/histograms/United States/027A2114.json
@@ -1 +1 @@
-{"batchcode": "027A2114", "histograms": [{"batchcodes": ["027A2114"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "027A2114", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["027A2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A214.json b/docs/data/histograms/United States/027A214.json
index d14fcb849cc..6575277ac97 100644
--- a/docs/data/histograms/United States/027A214.json
+++ b/docs/data/histograms/United States/027A214.json
@@ -1 +1 @@
-{"batchcode": "027A214", "histograms": [{"batchcodes": ["027A214"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "027A214", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["027A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A21A.json b/docs/data/histograms/United States/027A21A.json
index 3a3633f96c7..38c6c2c0213 100644
--- a/docs/data/histograms/United States/027A21A.json
+++ b/docs/data/histograms/United States/027A21A.json
@@ -1 +1 @@
-{"batchcode": "027A21A", "histograms": [{"batchcodes": ["027A21A", "GH9702"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["027A21A"], "histogram": {"Headache": 115, "Pain in extremity": 94, "Fatigue": 92, "Pyrexia": 92, "Chills": 80, "Myalgia": 71, "Vaccination site pain": 67, "Nausea": 51, "Vaccination site erythema": 44, "Pain": 42, "Dizziness": 41, "Pruritus": 36, "Rash": 36, "Arthralgia": 35, "Asthenia": 34, "Body temperature": 29, "Dyspnoea": 29, "Erythema": 28, "Vaccination site pruritus": 27, "Feeling abnormal": 26, "Vaccination site swelling": 26, "Peripheral swelling": 25, "Vaccination site warmth": 25, "Cough": 23, "Malaise": 22, "Insomnia": 21, "Vaccination complication": 20, "Vomiting": 20, "Diarrhoea": 19, "Inappropriate schedule of product administration": 19, "COVID-19": 18, "Chest pain": 17, "SARS-CoV-2 test": 17, "Urticaria": 17, "Hypoaesthesia": 16, "Illness": 16, "Gait disturbance": 15, "Hyperhidrosis": 15, "Paraesthesia": 15, "Tremor": 15, "Feeling hot": 14, "Product dose omission issue": 14, "Vaccination site mass": 14, "Expired product administered": 13, "Influenza like illness": 13, "Decreased appetite": 11, "Lymphadenopathy": 11, "Neck pain": 11, "Rash pruritic": 11, "Heart rate": 10, "Oropharyngeal pain": 10, "Tinnitus": 10, "Vaccination site rash": 9, "Vertigo": 9, "Back pain": 8, "Ear pain": 8, "Limb discomfort": 8, "Magnetic resonance imaging": 8, "Product administered to patient of inappropriate age": 8, "Somnolence": 8, "Abdominal discomfort": 7, "Burning sensation": 7, "Dysphagia": 7, "Eye pain": 7, "Migraine": 7, "Muscular weakness": 7, "Palpitations": 7, "Vaccination site induration": 7, "Abdominal pain upper": 6, "Chest discomfort": 6, "Condition aggravated": 6, "Exposure during pregnancy": 6, "Feeding disorder": 6, "Flushing": 6, "Injection site pain": 6, "Lip swelling": 6, "Loss of personal independence in daily activities": 6, "Swelling": 6, "Throat irritation": 6, "Vision blurred": 6, "Visual impairment": 6, "Anxiety": 5, "Bedridden": 5, "Blood pressure measurement": 5, "Bone pain": 5, "Ear discomfort": 5, "Facial pain": 5, "Head discomfort": 5, "Heart rate increased": 5, "Hypersensitivity": 5, "Hypersomnia": 5, "Hypokinesia": 5, "Lymph node pain": 5, "Muscle spasms": 5, "Nasopharyngitis": 5, "Pharyngeal swelling": 5, "Rash erythematous": 5, "Vaccination site reaction": 5, "Balance disorder": 4, "Blood glucose": 4, "Drug ineffective": 4, "Hypoaesthesia oral": 4, "Inflammation": 4, "Lethargy": 4, "Mobility decreased": 4, "Movement disorder": 4, "Musculoskeletal stiffness": 4, "Pregnancy test": 4, "SARS-CoV-2 test positive": 4, "Swelling face": 4, "Tachycardia": 4, "Tendonitis": 4, "Ageusia": 3, "Bell's palsy": 3, "Blister": 3, "Blood test": 3, "Cerebrovascular accident": 3, "Depressed mood": 3, "Discomfort": 3, "Dry mouth": 3, "Dysgeusia": 3, "Ear congestion": 3, "Exposure via breast milk": 3, "Eye irritation": 3, "Fall": 3, "Feeling cold": 3, "Gait inability": 3, "Heavy menstrual bleeding": 3, "Hot flush": 3, "Impaired work ability": 3, "Induration": 3, "Influenza": 3, "Intentional product use issue": 3, "Irritability": 3, "Joint swelling": 3, "Lacrimation increased": 3, "Limb mass": 3, "Loss of consciousness": 3, "Nasal congestion": 3, "Neuropathy peripheral": 3, "Nodule": 3, "Ocular hyperaemia": 3, "Paraesthesia oral": 3, "Pollakiuria": 3, "Pulmonary pain": 3, "Rash macular": 3, "Rhinorrhoea": 3, "Skin warm": 3, "Speech disorder": 3, "Swollen tongue": 3, "Taste disorder": 3, "Tenderness": 3, "Thirst": 3, "Throat tightness": 3, "Urinary tract infection": 3, "Vaccination site bruising": 3, "Weight decreased": 3, "Accidental overdose": 2, "Adverse drug reaction": 2, "Amnesia": 2, "Anosmia": 2, "Arthritis": 2, "Biopsy skin": 2, "Blindness": 2, "Blood glucose increased": 2, "Blood pressure systolic": 2, "Body temperature increased": 2, "C-reactive protein": 2, "Cardiac stress test": 2, "Chest X-ray": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Contusion": 2, "Disorientation": 2, "Dysarthria": 2, "Dyspepsia": 2, "Dysstasia": 2, "Dysuria": 2, "Eating disorder": 2, "Electrocardiogram": 2, "Eye pruritus": 2, "Eye swelling": 2, "Fibrin D dimer": 2, "Full blood count": 2, "Gastrooesophageal reflux disease": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Hair texture abnormal": 2, "Hemiplegic migraine": 2, "Herpes zoster": 2, "Hypoacusis": 2, "Immunisation reaction": 2, "Incomplete course of vaccination": 2, "Incorrect route of product administration": 2, "Injection site erythema": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Joint range of motion decreased": 2, "Macular degeneration": 2, "Mass": 2, "Maternal exposure during pregnancy": 2, "Menstrual disorder": 2, "Micturition urgency": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Nasal discomfort": 2, "Nerve injury": 2, "Nervousness": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oedema": 2, "Pain of skin": 2, "Parosmia": 2, "Photophobia": 2, "Presyncope": 2, "Proctalgia": 2, "Product storage error": 2, "Pulmonary embolism": 2, "Retching": 2, "Retinal disorder": 2, "Rheumatoid arthritis": 2, "SARS-CoV-2 antibody test": 2, "Sensitive skin": 2, "Sinus pain": 2, "Sinusitis": 2, "Skin discolouration": 2, "Sluggishness": 2, "Sneezing": 2, "Syncope": 2, "Therapeutic response unexpected": 2, "Thinking abnormal": 2, "Thrombosis": 2, "Transfusion": 2, "Traumatic haematoma": 2, "Underdose": 2, "Urinary incontinence": 2, "Vaccination failure": 2, "Vaccination site inflammation": 2, "Vaccination site paraesthesia": 2, "Vaccination site streaking": 2, "Wrong technique in device usage process": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abnormal dreams": 1, "Abscess": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Alopecia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Aphonia": 1, "Appendicitis": 1, "Arrhythmia": 1, "Asphyxia": 1, "Asthma": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed rest": 1, "Blister rupture": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose decreased": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Blood urine": 1, "Breast pain": 1, "Bruxism": 1, "Bursitis": 1, "Cardiac discomfort": 1, "Cardiac flutter": 1, "Carpal tunnel syndrome": 1, "Circulatory collapse": 1, "Circumstance or information capable of leading to medication error": 1, "Colonoscopy": 1, "Computerised tomogram normal": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Cystitis": 1, "Cystoscopy": 1, "Cytogenetic analysis": 1, "Deafness unilateral": 1, "Death": 1, "Dehydration": 1, "Delusional disorder, unspecified type": 1, "Depression": 1, "Device connection issue": 1, "Device issue": 1, "Diagnostic aspiration": 1, "Diarrhoea haemorrhagic": 1, "Differential white blood cell count": 1, "Dry eye": 1, "Dry skin": 1, "Ear infection": 1, "Ear swelling": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Endoscopy": 1, "Epicondylitis": 1, "Epistaxis": 1, "Extra dose administered": 1, "Extraocular muscle paresis": 1, "Eye colour change": 1, "Eye disorder": 1, "Facial asymmetry": 1, "Faeces discoloured": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Finger deformity": 1, "Flank pain": 1, "Foreign body sensation in eyes": 1, "Formication": 1, "Frequent bowel movements": 1, "Frustration tolerance decreased": 1, "Fungal test": 1, "Gastrointestinal pain": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Granulomatosis with polyangiitis": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage subcutaneous": 1, "Haemorrhoids": 1, "Hair growth abnormal": 1, "Hallucination": 1, "Heart rate irregular": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Hepatic function abnormal": 1, "Hepatitis": 1, "Hepatitis viral test": 1, "Hip fracture": 1, "Humerus fracture": 1, "Hyperacusis": 1, "Hypertension": 1, "Hypertonic bladder": 1, "Impaired driving ability": 1, "Inappropriate affect": 1, "Influenza virus test": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site discomfort": 1, "Injection site indentation": 1, "Injection site induration": 1, "Injection site inflammation": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Intentional dose omission": 1, "Irritable bowel syndrome": 1, "Joint dislocation": 1, "Joint lock": 1, "Lip disorder": 1, "Lip pain": 1, "Lipoma": 1, "Liver function test": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Metabolic function test": 1, "Middle insomnia": 1, "Motor dysfunction": 1, "Muscle atrophy": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Mydriasis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Night sweats": 1, "Nocturnal dyspnoea": 1, "Oedema peripheral": 1, "Off label use": 1, "Oligomenorrhoea": 1, "Ophthalmological examination": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oropharyngeal blistering": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Papule": 1, "Pemphigus": 1, "Periarthritis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Pneumonia": 1, "Polymyalgia rheumatica": 1, "Polypectomy": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Portal hypertension": 1, "Pre-existing condition improved": 1, "Prenatal screening test": 1, "Presbyopia": 1, "Product administration error": 1, "Product availability issue": 1, "Productive cough": 1, "Psoriasis": 1, "Pulmonary function test": 1, "Pulmonary thrombosis": 1, "Rash morbilliform": 1, "Rash papular": 1, "Raynaud's phenomenon": 1, "Reading disorder": 1, "Rectal haemorrhage": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory rate": 1, "Restlessness": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Scratch": 1, "Secretion discharge": 1, "Sinus headache": 1, "Skin atrophy": 1, "Skin burning sensation": 1, "Skin mass": 1, "Skin wrinkling": 1, "Sleep disorder": 1, "Spinal pain": 1, "Streptococcus test": 1, "Stress echocardiogram": 1, "Suicidal ideation": 1, "Supraventricular extrasystoles": 1, "Supraventricular tachycardia": 1, "Surgery": 1, "Suspected COVID-19": 1, "Systemic lupus erythematosus": 1, "Tendon pain": 1, "Tension headache": 1, "Therapeutic product ineffective": 1, "Thermal burn": 1, "Thyroid disorder": 1, "Tissue injury": 1, "Tongue biting": 1, "Tongue discomfort": 1, "Tonsillitis": 1, "Tooth infection": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Upper limb fracture": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Urine odour abnormal": 1, "Urodynamics measurement": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site irritation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Vaccination site papule": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vascular pain": 1, "Vein disorder": 1, "Viral test": 1, "Vitreous floaters": 1, "Vulvovaginal burning sensation": 1, "White blood cell count": 1, "Withdrawal syndrome": 1, "Wound": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["027A21A", "GH9702"]}, {"histogram": {"Headache": 115, "Pain in extremity": 94, "Fatigue": 92, "Pyrexia": 92, "Chills": 80, "Myalgia": 71, "Vaccination site pain": 67, "Nausea": 51, "Vaccination site erythema": 44, "Pain": 42, "Dizziness": 41, "Pruritus": 36, "Rash": 36, "Arthralgia": 35, "Asthenia": 34, "Body temperature": 29, "Dyspnoea": 29, "Erythema": 28, "Vaccination site pruritus": 27, "Feeling abnormal": 26, "Vaccination site swelling": 26, "Peripheral swelling": 25, "Vaccination site warmth": 25, "Cough": 23, "Malaise": 22, "Insomnia": 21, "Vaccination complication": 20, "Vomiting": 20, "Diarrhoea": 19, "Inappropriate schedule of product administration": 19, "COVID-19": 18, "Chest pain": 17, "SARS-CoV-2 test": 17, "Urticaria": 17, "Hypoaesthesia": 16, "Illness": 16, "Gait disturbance": 15, "Hyperhidrosis": 15, "Paraesthesia": 15, "Tremor": 15, "Feeling hot": 14, "Product dose omission issue": 14, "Vaccination site mass": 14, "Expired product administered": 13, "Influenza like illness": 13, "Decreased appetite": 11, "Lymphadenopathy": 11, "Neck pain": 11, "Rash pruritic": 11, "Heart rate": 10, "Oropharyngeal pain": 10, "Tinnitus": 10, "Vaccination site rash": 9, "Vertigo": 9, "Back pain": 8, "Ear pain": 8, "Limb discomfort": 8, "Magnetic resonance imaging": 8, "Product administered to patient of inappropriate age": 8, "Somnolence": 8, "Abdominal discomfort": 7, "Burning sensation": 7, "Dysphagia": 7, "Eye pain": 7, "Migraine": 7, "Muscular weakness": 7, "Palpitations": 7, "Vaccination site induration": 7, "Abdominal pain upper": 6, "Chest discomfort": 6, "Condition aggravated": 6, "Exposure during pregnancy": 6, "Feeding disorder": 6, "Flushing": 6, "Injection site pain": 6, "Lip swelling": 6, "Loss of personal independence in daily activities": 6, "Swelling": 6, "Throat irritation": 6, "Vision blurred": 6, "Visual impairment": 6, "Anxiety": 5, "Bedridden": 5, "Blood pressure measurement": 5, "Bone pain": 5, "Ear discomfort": 5, "Facial pain": 5, "Head discomfort": 5, "Heart rate increased": 5, "Hypersensitivity": 5, "Hypersomnia": 5, "Hypokinesia": 5, "Lymph node pain": 5, "Muscle spasms": 5, "Nasopharyngitis": 5, "Pharyngeal swelling": 5, "Rash erythematous": 5, "Vaccination site reaction": 5, "Balance disorder": 4, "Blood glucose": 4, "Drug ineffective": 4, "Hypoaesthesia oral": 4, "Inflammation": 4, "Lethargy": 4, "Mobility decreased": 4, "Movement disorder": 4, "Musculoskeletal stiffness": 4, "Pregnancy test": 4, "SARS-CoV-2 test positive": 4, "Swelling face": 4, "Tachycardia": 4, "Tendonitis": 4, "Ageusia": 3, "Bell's palsy": 3, "Blister": 3, "Blood test": 3, "Cerebrovascular accident": 3, "Depressed mood": 3, "Discomfort": 3, "Dry mouth": 3, "Dysgeusia": 3, "Ear congestion": 3, "Exposure via breast milk": 3, "Eye irritation": 3, "Fall": 3, "Feeling cold": 3, "Gait inability": 3, "Heavy menstrual bleeding": 3, "Hot flush": 3, "Impaired work ability": 3, "Induration": 3, "Influenza": 3, "Intentional product use issue": 3, "Irritability": 3, "Joint swelling": 3, "Lacrimation increased": 3, "Limb mass": 3, "Loss of consciousness": 3, "Nasal congestion": 3, "Neuropathy peripheral": 3, "Nodule": 3, "Ocular hyperaemia": 3, "Paraesthesia oral": 3, "Pollakiuria": 3, "Pulmonary pain": 3, "Rash macular": 3, "Rhinorrhoea": 3, "Skin warm": 3, "Speech disorder": 3, "Swollen tongue": 3, "Taste disorder": 3, "Tenderness": 3, "Thirst": 3, "Throat tightness": 3, "Urinary tract infection": 3, "Vaccination site bruising": 3, "Weight decreased": 3, "Accidental overdose": 2, "Adverse drug reaction": 2, "Amnesia": 2, "Anosmia": 2, "Arthritis": 2, "Biopsy skin": 2, "Blindness": 2, "Blood glucose increased": 2, "Blood pressure systolic": 2, "Body temperature increased": 2, "C-reactive protein": 2, "Cardiac stress test": 2, "Chest X-ray": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Contusion": 2, "Disorientation": 2, "Dysarthria": 2, "Dyspepsia": 2, "Dysstasia": 2, "Dysuria": 2, "Eating disorder": 2, "Electrocardiogram": 2, "Eye pruritus": 2, "Eye swelling": 2, "Fibrin D dimer": 2, "Full blood count": 2, "Gastrooesophageal reflux disease": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Hair texture abnormal": 2, "Hemiplegic migraine": 2, "Herpes zoster": 2, "Hypoacusis": 2, "Immunisation reaction": 2, "Incomplete course of vaccination": 2, "Incorrect route of product administration": 2, "Injection site erythema": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Joint range of motion decreased": 2, "Macular degeneration": 2, "Mass": 2, "Maternal exposure during pregnancy": 2, "Menstrual disorder": 2, "Micturition urgency": 2, "Musculoskeletal chest pain": 2, "Musculoskeletal discomfort": 2, "Nasal discomfort": 2, "Nerve injury": 2, "Nervousness": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oedema": 2, "Pain of skin": 2, "Parosmia": 2, "Photophobia": 2, "Presyncope": 2, "Proctalgia": 2, "Product storage error": 2, "Pulmonary embolism": 2, "Retching": 2, "Retinal disorder": 2, "Rheumatoid arthritis": 2, "SARS-CoV-2 antibody test": 2, "Sensitive skin": 2, "Sinus pain": 2, "Sinusitis": 2, "Skin discolouration": 2, "Sluggishness": 2, "Sneezing": 2, "Syncope": 2, "Therapeutic response unexpected": 2, "Thinking abnormal": 2, "Thrombosis": 2, "Transfusion": 2, "Traumatic haematoma": 2, "Underdose": 2, "Urinary incontinence": 2, "Vaccination failure": 2, "Vaccination site inflammation": 2, "Vaccination site paraesthesia": 2, "Vaccination site streaking": 2, "Wrong technique in device usage process": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abnormal dreams": 1, "Abscess": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Alopecia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Angina pectoris": 1, "Angioedema": 1, "Anti-neutrophil cytoplasmic antibody positive vasculitis": 1, "Antibody test": 1, "Antineutrophil cytoplasmic antibody": 1, "Aphonia": 1, "Appendicitis": 1, "Arrhythmia": 1, "Asphyxia": 1, "Asthma": 1, "Axillary mass": 1, "Axillary pain": 1, "Bed rest": 1, "Blister rupture": 1, "Blood creatine phosphokinase": 1, "Blood creatinine": 1, "Blood glucose decreased": 1, "Blood immunoglobulin G": 1, "Blood potassium": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure increased": 1, "Blood thyroid stimulating hormone": 1, "Blood urine": 1, "Breast pain": 1, "Bruxism": 1, "Bursitis": 1, "Cardiac discomfort": 1, "Cardiac flutter": 1, "Carpal tunnel syndrome": 1, "Circulatory collapse": 1, "Circumstance or information capable of leading to medication error": 1, "Colonoscopy": 1, "Computerised tomogram normal": 1, "Computerised tomogram thorax": 1, "Confusional state": 1, "Cystitis": 1, "Cystoscopy": 1, "Cytogenetic analysis": 1, "Deafness unilateral": 1, "Death": 1, "Dehydration": 1, "Delusional disorder, unspecified type": 1, "Depression": 1, "Device connection issue": 1, "Device issue": 1, "Diagnostic aspiration": 1, "Diarrhoea haemorrhagic": 1, "Differential white blood cell count": 1, "Dry eye": 1, "Dry skin": 1, "Ear infection": 1, "Ear swelling": 1, "Echocardiogram": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Endoscopy": 1, "Epicondylitis": 1, "Epistaxis": 1, "Extra dose administered": 1, "Extraocular muscle paresis": 1, "Eye colour change": 1, "Eye disorder": 1, "Facial asymmetry": 1, "Faeces discoloured": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Finger deformity": 1, "Flank pain": 1, "Foreign body sensation in eyes": 1, "Formication": 1, "Frequent bowel movements": 1, "Frustration tolerance decreased": 1, "Fungal test": 1, "Gastrointestinal pain": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Granulomatosis with polyangiitis": 1, "Haematemesis": 1, "Haematochezia": 1, "Haematocrit": 1, "Haemorrhage subcutaneous": 1, "Haemorrhoids": 1, "Hair growth abnormal": 1, "Hallucination": 1, "Heart rate irregular": 1, "Hepatic enzyme": 1, "Hepatic enzyme increased": 1, "Hepatic function abnormal": 1, "Hepatitis": 1, "Hepatitis viral test": 1, "Hip fracture": 1, "Humerus fracture": 1, "Hyperacusis": 1, "Hypertension": 1, "Hypertonic bladder": 1, "Impaired driving ability": 1, "Inappropriate affect": 1, "Influenza virus test": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site discomfort": 1, "Injection site indentation": 1, "Injection site induration": 1, "Injection site inflammation": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Intentional dose omission": 1, "Irritable bowel syndrome": 1, "Joint dislocation": 1, "Joint lock": 1, "Lip disorder": 1, "Lip pain": 1, "Lipoma": 1, "Liver function test": 1, "Magnetic resonance imaging head": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Metabolic function test": 1, "Middle insomnia": 1, "Motor dysfunction": 1, "Muscle atrophy": 1, "Muscle discomfort": 1, "Muscle rigidity": 1, "Muscle twitching": 1, "Mydriasis": 1, "Myelitis": 1, "Myocardial infarction": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Night sweats": 1, "Nocturnal dyspnoea": 1, "Oedema peripheral": 1, "Off label use": 1, "Oligomenorrhoea": 1, "Ophthalmological examination": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Oropharyngeal blistering": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Papule": 1, "Pemphigus": 1, "Periarthritis": 1, "Periorbital swelling": 1, "Peripheral coldness": 1, "Pneumonia": 1, "Polymyalgia rheumatica": 1, "Polypectomy": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Portal hypertension": 1, "Pre-existing condition improved": 1, "Prenatal screening test": 1, "Presbyopia": 1, "Product administration error": 1, "Product availability issue": 1, "Productive cough": 1, "Psoriasis": 1, "Pulmonary function test": 1, "Pulmonary thrombosis": 1, "Rash morbilliform": 1, "Rash papular": 1, "Raynaud's phenomenon": 1, "Reading disorder": 1, "Rectal haemorrhage": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal function test": 1, "Renal impairment": 1, "Respiratory rate": 1, "Restlessness": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 test negative": 1, "Scar": 1, "Scratch": 1, "Secretion discharge": 1, "Sinus headache": 1, "Skin atrophy": 1, "Skin burning sensation": 1, "Skin mass": 1, "Skin wrinkling": 1, "Sleep disorder": 1, "Spinal pain": 1, "Streptococcus test": 1, "Stress echocardiogram": 1, "Suicidal ideation": 1, "Supraventricular extrasystoles": 1, "Supraventricular tachycardia": 1, "Surgery": 1, "Suspected COVID-19": 1, "Systemic lupus erythematosus": 1, "Tendon pain": 1, "Tension headache": 1, "Therapeutic product ineffective": 1, "Thermal burn": 1, "Thyroid disorder": 1, "Tissue injury": 1, "Tongue biting": 1, "Tongue discomfort": 1, "Tonsillitis": 1, "Tooth infection": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Troponin": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound foetal": 1, "Ultrasound scan": 1, "Unresponsive to stimuli": 1, "Upper limb fracture": 1, "Urine analysis": 1, "Urine analysis abnormal": 1, "Urine odour abnormal": 1, "Urodynamics measurement": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site irritation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Vaccination site papule": 1, "Vaccination site urticaria": 1, "Vaccination site vesicles": 1, "Vascular pain": 1, "Vein disorder": 1, "Viral test": 1, "Vitreous floaters": 1, "Vulvovaginal burning sensation": 1, "White blood cell count": 1, "Withdrawal syndrome": 1, "Wound": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["027A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A21A031L20A.json b/docs/data/histograms/United States/027A21A031L20A.json
index ff9bcd76455..596e1d8af45 100644
--- a/docs/data/histograms/United States/027A21A031L20A.json
+++ b/docs/data/histograms/United States/027A21A031L20A.json
@@ -1 +1 @@
-{"batchcode": "027A21A031L20A", "histograms": [{"batchcodes": ["027A21A031L20A"], "histogram": {"Chills": 1, "Feeling hot": 1, "Hyperpyrexia": 1, "Hypothermia": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21A031L20A", "histograms": [{"histogram": {"Chills": 1, "Feeling hot": 1, "Hyperpyrexia": 1, "Hypothermia": 1}, "batchcodes": ["027A21A031L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A21B.json b/docs/data/histograms/United States/027A21B.json
index eeaa8a209cd..1b0d9e7fae1 100644
--- a/docs/data/histograms/United States/027A21B.json
+++ b/docs/data/histograms/United States/027A21B.json
@@ -1 +1 @@
-{"batchcode": "027A21B", "histograms": [{"batchcodes": ["027A21B"], "histogram": {"Expired product administered": 1, "Injection site discomfort": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21B", "histograms": [{"histogram": {"Expired product administered": 1, "Injection site discomfort": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["027A21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A21N.json b/docs/data/histograms/United States/027A21N.json
index 0a1d767ea4d..372f756e116 100644
--- a/docs/data/histograms/United States/027A21N.json
+++ b/docs/data/histograms/United States/027A21N.json
@@ -1 +1 @@
-{"batchcode": "027A21N", "histograms": [{"batchcodes": ["027A21N"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21N", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["027A21N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A21P OR R OR.json b/docs/data/histograms/United States/027A21P OR R OR.json
index f5aa3a36fb3..0d48315bc80 100644
--- a/docs/data/histograms/United States/027A21P OR R OR.json
+++ b/docs/data/histograms/United States/027A21P OR R OR.json
@@ -1 +1 @@
-{"batchcode": "027A21P OR R OR", "histograms": [{"batchcodes": ["027A21P OR R OR"], "histogram": {"Chills": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "027A21P OR R OR", "histograms": [{"histogram": {"Chills": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["027A21P OR R OR"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A22A.json b/docs/data/histograms/United States/027A22A.json
index 0b26a365c2b..952a34483d2 100644
--- a/docs/data/histograms/United States/027A22A.json
+++ b/docs/data/histograms/United States/027A22A.json
@@ -1 +1 @@
-{"batchcode": "027A22A", "histograms": [{"batchcodes": ["027A22A"], "histogram": {"Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "027A22A", "histograms": [{"histogram": {"Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Malaise": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["027A22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A2A.json b/docs/data/histograms/United States/027A2A.json
index a5ee4e63351..9663bfbbe51 100644
--- a/docs/data/histograms/United States/027A2A.json
+++ b/docs/data/histograms/United States/027A2A.json
@@ -1 +1 @@
-{"batchcode": "027A2A", "histograms": [{"batchcodes": ["027A2A"], "histogram": {"Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Oral mucosal blistering": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "027A2A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Oral mucosal blistering": 1, "Pyrexia": 1}, "batchcodes": ["027A2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A2A1.json b/docs/data/histograms/United States/027A2A1.json
index 43f3c410ef3..00d0c22bca7 100644
--- a/docs/data/histograms/United States/027A2A1.json
+++ b/docs/data/histograms/United States/027A2A1.json
@@ -1 +1 @@
-{"batchcode": "027A2A1", "histograms": [{"batchcodes": ["027A2A1"], "histogram": {"Metamorphopsia": 2, "Muscle spasms": 2, "Myalgia": 2, "Vision blurred": 2, "Condition aggravated": 1}}]}
\ No newline at end of file
+{"batchcode": "027A2A1", "histograms": [{"histogram": {"Metamorphopsia": 2, "Muscle spasms": 2, "Myalgia": 2, "Vision blurred": 2, "Condition aggravated": 1}, "batchcodes": ["027A2A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027A2IA.json b/docs/data/histograms/United States/027A2IA.json
index 99a2ecc11a5..ea528f35002 100644
--- a/docs/data/histograms/United States/027A2IA.json
+++ b/docs/data/histograms/United States/027A2IA.json
@@ -1 +1 @@
-{"batchcode": "027A2IA", "histograms": [{"batchcodes": ["027A2IA"], "histogram": {"Bruxism": 2, "Pain in jaw": 2, "Toothache": 2, "Jaw disorder": 1, "Tooth disorder": 1, "Tooth loss": 1}}]}
\ No newline at end of file
+{"batchcode": "027A2IA", "histograms": [{"histogram": {"Bruxism": 2, "Pain in jaw": 2, "Toothache": 2, "Jaw disorder": 1, "Tooth disorder": 1, "Tooth loss": 1}, "batchcodes": ["027A2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027AG1A.json b/docs/data/histograms/United States/027AG1A.json
index cec3a127027..3d645f7e528 100644
--- a/docs/data/histograms/United States/027AG1A.json
+++ b/docs/data/histograms/United States/027AG1A.json
@@ -1 +1 @@
-{"batchcode": "027AG1A", "histograms": [{"batchcodes": ["027AG1A"], "histogram": {"Amnesia": 1, "Fatigue": 1, "Nervousness": 1, "Pyrexia": 1, "Vulvovaginal discomfort": 1}}]}
\ No newline at end of file
+{"batchcode": "027AG1A", "histograms": [{"histogram": {"Amnesia": 1, "Fatigue": 1, "Nervousness": 1, "Pyrexia": 1, "Vulvovaginal discomfort": 1}, "batchcodes": ["027AG1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027AUA.json b/docs/data/histograms/United States/027AUA.json
index 1915f2e0411..f92699b8441 100644
--- a/docs/data/histograms/United States/027AUA.json
+++ b/docs/data/histograms/United States/027AUA.json
@@ -1 +1 @@
-{"batchcode": "027AUA", "histograms": [{"batchcodes": ["027AUA"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "027AUA", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["027AUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027AZ1A.json b/docs/data/histograms/United States/027AZ1A.json
index 524f1859f88..9d737a17aa0 100644
--- a/docs/data/histograms/United States/027AZ1A.json
+++ b/docs/data/histograms/United States/027AZ1A.json
@@ -1 +1 @@
-{"batchcode": "027AZ1A", "histograms": [{"batchcodes": ["027AZ1A"], "histogram": {"Pain": 2, "Pain in extremity": 2, "Acute sinusitis": 1, "Anxiety": 1, "Chills": 1, "Ear discomfort": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Malaise": 1, "Mobility decreased": 1, "Nervousness": 1, "Pyrexia": 1, "Tenderness": 1, "Tinnitus": 1, "Tremor": 1, "Upper respiratory tract infection": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "027AZ1A", "histograms": [{"histogram": {"Pain": 2, "Pain in extremity": 2, "Acute sinusitis": 1, "Anxiety": 1, "Chills": 1, "Ear discomfort": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Malaise": 1, "Mobility decreased": 1, "Nervousness": 1, "Pyrexia": 1, "Tenderness": 1, "Tinnitus": 1, "Tremor": 1, "Upper respiratory tract infection": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["027AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027AZI A.json b/docs/data/histograms/United States/027AZI A.json
index 2eaafd2661c..41c4409fc94 100644
--- a/docs/data/histograms/United States/027AZI A.json
+++ b/docs/data/histograms/United States/027AZI A.json
@@ -1 +1 @@
-{"batchcode": "027AZI A", "histograms": [{"batchcodes": ["027AZI A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "027AZI A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["027AZI A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027AZIA.json b/docs/data/histograms/United States/027AZIA.json
index 2dc253892be..3b5c4a804c9 100644
--- a/docs/data/histograms/United States/027AZIA.json
+++ b/docs/data/histograms/United States/027AZIA.json
@@ -1 +1 @@
-{"batchcode": "027AZIA", "histograms": [{"batchcodes": ["027AZIA"], "histogram": {"Inappropriate schedule of product administration": 1, "Injection site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027AZIA", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Injection site pain": 1}, "batchcodes": ["027AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027B20A.json b/docs/data/histograms/United States/027B20A.json
index 4b8812d4a45..e3d2c7d6cef 100644
--- a/docs/data/histograms/United States/027B20A.json
+++ b/docs/data/histograms/United States/027B20A.json
@@ -1 +1 @@
-{"batchcode": "027B20A", "histograms": [{"batchcodes": ["027B20A"], "histogram": {"Product administration interrupted": 1, "Product availability issue": 1}}]}
\ No newline at end of file
+{"batchcode": "027B20A", "histograms": [{"histogram": {"Product administration interrupted": 1, "Product availability issue": 1}, "batchcodes": ["027B20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027B210A4.json b/docs/data/histograms/United States/027B210A4.json
index a35f636e5cc..05fef14be8c 100644
--- a/docs/data/histograms/United States/027B210A4.json
+++ b/docs/data/histograms/United States/027B210A4.json
@@ -1 +1 @@
-{"batchcode": "027B210A4", "histograms": [{"batchcodes": ["027B210A4"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Immune system disorder": 1, "Joint stiffness": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "027B210A4", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Immune system disorder": 1, "Joint stiffness": 1, "Myalgia": 1, "Off label use": 1, "Pyrexia": 1}, "batchcodes": ["027B210A4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027B21A.json b/docs/data/histograms/United States/027B21A.json
index 428f5adb8b7..cffd78c96af 100644
--- a/docs/data/histograms/United States/027B21A.json
+++ b/docs/data/histograms/United States/027B21A.json
@@ -1 +1 @@
-{"batchcode": "027B21A", "histograms": [{"batchcodes": ["021C21A", "027B21A"], "histogram": {"Chills": 1, "Dizziness": 1, "Ear discomfort": 1, "Fatigue": 1, "Influenza": 1, "Paraesthesia": 1, "Vaccination site pain": 1}}, {"batchcodes": ["027B21A"], "histogram": {"Headache": 34, "Pain in extremity": 34, "Fatigue": 32, "Pyrexia": 30, "Myalgia": 27, "Chills": 22, "Vaccination site pain": 20, "Expired product administered": 19, "Rash": 17, "Nausea": 15, "Dizziness": 14, "Arthralgia": 13, "Pain": 12, "Pruritus": 12, "Vaccination site erythema": 12, "Hypoaesthesia": 10, "Vaccination site swelling": 10, "Feeling abnormal": 9, "Inappropriate schedule of product administration": 9, "Peripheral swelling": 9, "Diarrhoea": 8, "Dyspnoea": 8, "Feeling hot": 8, "SARS-CoV-2 test": 8, "COVID-19": 7, "Insomnia": 7, "Paraesthesia": 7, "Cough": 6, "Erythema": 6, "Product administered to patient of inappropriate age": 6, "Product storage error": 6, "Abdominal pain upper": 5, "Asthenia": 5, "Body temperature": 5, "Hyperhidrosis": 5, "Limb discomfort": 5, "Lymphadenopathy": 5, "Urticaria": 5, "Vaccination site pruritus": 5, "Vaccination site rash": 5, "Vaccination site warmth": 5, "Vomiting": 5, "Abdominal discomfort": 4, "Decreased appetite": 4, "Heart rate": 4, "Illness": 4, "Influenza like illness": 4, "Malaise": 4, "Migraine": 4, "Photophobia": 4, "Product dose omission issue": 4, "Seizure": 4, "Vaccination site induration": 4, "Accidental overdose": 3, "Blood pressure measurement": 3, "Chest discomfort": 3, "Ear pain": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling of body temperature change": 3, "Heart rate increased": 3, "Lethargy": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Product administration error": 3, "Rash erythematous": 3, "Rhinorrhoea": 3, "Somnolence": 3, "Taste disorder": 3, "Throat irritation": 3, "Tremor": 3, "Vaccination site mass": 3, "Adverse reaction": 2, "Bone pain": 2, "Burning sensation": 2, "Chest pain": 2, "Computerised tomogram": 2, "Contusion": 2, "Discomfort": 2, "Drug ineffective": 2, "Ear discomfort": 2, "Eye swelling": 2, "Feeling cold": 2, "Gait disturbance": 2, "Gastrooesophageal reflux disease": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Injection site pain": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "Menstrual disorder": 2, "Muscle twitching": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Neck pain": 2, "Oropharyngeal pain": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Rash macular": 2, "Rash pruritic": 2, "Swelling face": 2, "Therapeutic response unexpected": 2, "Throat tightness": 2, "Vaccination site bruising": 2, "Vertigo": 2, "Abdominal pain": 1, "Abnormal dreams": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthenopia": 1, "Back pain": 1, "Balance disorder": 1, "Blister": 1, "Blood glucose decreased": 1, "Blood pressure decreased": 1, "Body temperature decreased": 1, "Breast enlargement": 1, "Breast pain": 1, "Crying": 1, "Dark circles under eyes": 1, "Dehydration": 1, "Dry eye": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear infection": 1, "Eating disorder": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Epistaxis": 1, "Euphoric mood": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Facial pain": 1, "Fear of death": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Flushing": 1, "Freezing phenomenon": 1, "Gait inability": 1, "Generalised tonic-clonic seizure": 1, "Gingivitis": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hot flush": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Injection site discolouration": 1, "Injection site pruritus": 1, "Injection site urticaria": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Intermenstrual bleeding": 1, "Joint swelling": 1, "Lip swelling": 1, "Localised infection": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Metamorphopsia": 1, "Movement disorder": 1, "Musculoskeletal pain": 1, "Nasal discomfort": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nipple pain": 1, "Ocular discomfort": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Periorbital swelling": 1, "Pollakiuria": 1, "Post-acute COVID-19 syndrome": 1, "Rash pustular": 1, "Screaming": 1, "Sensation of foreign body": 1, "Skin exfoliation": 1, "Sleep disorder": 1, "Sleep talking": 1, "Syringe issue": 1, "Tension headache": 1, "Thinking abnormal": 1, "Thirst": 1, "Tinnitus": 1, "Underdose": 1, "Urinary incontinence": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight decreased": 1, "Wheezing": 1, "Wrong product administered": 1, "Wrong technique in product usage process": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "027B21A", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Ear discomfort": 1, "Fatigue": 1, "Influenza": 1, "Paraesthesia": 1, "Vaccination site pain": 1}, "batchcodes": ["021C21A", "027B21A"]}, {"histogram": {"Headache": 34, "Pain in extremity": 34, "Fatigue": 32, "Pyrexia": 30, "Myalgia": 27, "Chills": 22, "Vaccination site pain": 20, "Expired product administered": 19, "Rash": 17, "Nausea": 15, "Dizziness": 14, "Arthralgia": 13, "Pain": 12, "Pruritus": 12, "Vaccination site erythema": 12, "Hypoaesthesia": 10, "Vaccination site swelling": 10, "Feeling abnormal": 9, "Inappropriate schedule of product administration": 9, "Peripheral swelling": 9, "Diarrhoea": 8, "Dyspnoea": 8, "Feeling hot": 8, "SARS-CoV-2 test": 8, "COVID-19": 7, "Insomnia": 7, "Paraesthesia": 7, "Cough": 6, "Erythema": 6, "Product administered to patient of inappropriate age": 6, "Product storage error": 6, "Abdominal pain upper": 5, "Asthenia": 5, "Body temperature": 5, "Hyperhidrosis": 5, "Limb discomfort": 5, "Lymphadenopathy": 5, "Urticaria": 5, "Vaccination site pruritus": 5, "Vaccination site rash": 5, "Vaccination site warmth": 5, "Vomiting": 5, "Abdominal discomfort": 4, "Decreased appetite": 4, "Heart rate": 4, "Illness": 4, "Influenza like illness": 4, "Malaise": 4, "Migraine": 4, "Photophobia": 4, "Product dose omission issue": 4, "Seizure": 4, "Vaccination site induration": 4, "Accidental overdose": 3, "Blood pressure measurement": 3, "Chest discomfort": 3, "Ear pain": 3, "Electrocardiogram": 3, "Fall": 3, "Feeling of body temperature change": 3, "Heart rate increased": 3, "Lethargy": 3, "Mobility decreased": 3, "Muscle spasms": 3, "Product administration error": 3, "Rash erythematous": 3, "Rhinorrhoea": 3, "Somnolence": 3, "Taste disorder": 3, "Throat irritation": 3, "Tremor": 3, "Vaccination site mass": 3, "Adverse reaction": 2, "Bone pain": 2, "Burning sensation": 2, "Chest pain": 2, "Computerised tomogram": 2, "Contusion": 2, "Discomfort": 2, "Drug ineffective": 2, "Ear discomfort": 2, "Eye swelling": 2, "Feeling cold": 2, "Gait disturbance": 2, "Gastrooesophageal reflux disease": 2, "Hypersensitivity": 2, "Hypersomnia": 2, "Injection site pain": 2, "Interchange of vaccine products": 2, "Loss of consciousness": 2, "Menstrual disorder": 2, "Muscle twitching": 2, "Muscular weakness": 2, "Musculoskeletal stiffness": 2, "Neck pain": 2, "Oropharyngeal pain": 2, "Poor quality product administered": 2, "Product temperature excursion issue": 2, "Rash macular": 2, "Rash pruritic": 2, "Swelling face": 2, "Therapeutic response unexpected": 2, "Throat tightness": 2, "Vaccination site bruising": 2, "Vertigo": 2, "Abdominal pain": 1, "Abnormal dreams": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Asthenopia": 1, "Back pain": 1, "Balance disorder": 1, "Blister": 1, "Blood glucose decreased": 1, "Blood pressure decreased": 1, "Body temperature decreased": 1, "Breast enlargement": 1, "Breast pain": 1, "Crying": 1, "Dark circles under eyes": 1, "Dehydration": 1, "Dry eye": 1, "Dysarthria": 1, "Dysgeusia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear infection": 1, "Eating disorder": 1, "Electroencephalogram": 1, "Epilepsy": 1, "Epistaxis": 1, "Euphoric mood": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Facial pain": 1, "Fear of death": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Flushing": 1, "Freezing phenomenon": 1, "Gait inability": 1, "Generalised tonic-clonic seizure": 1, "Gingivitis": 1, "Head discomfort": 1, "Herpes zoster": 1, "Hot flush": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypopnoea": 1, "Injection site discolouration": 1, "Injection site pruritus": 1, "Injection site urticaria": 1, "Injection site warmth": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Intermenstrual bleeding": 1, "Joint swelling": 1, "Lip swelling": 1, "Localised infection": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Metamorphopsia": 1, "Movement disorder": 1, "Musculoskeletal pain": 1, "Nasal discomfort": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nipple pain": 1, "Ocular discomfort": 1, "Oral mucosal blistering": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Pain of skin": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Periorbital swelling": 1, "Pollakiuria": 1, "Post-acute COVID-19 syndrome": 1, "Rash pustular": 1, "Screaming": 1, "Sensation of foreign body": 1, "Skin exfoliation": 1, "Sleep disorder": 1, "Sleep talking": 1, "Syringe issue": 1, "Tension headache": 1, "Thinking abnormal": 1, "Thirst": 1, "Tinnitus": 1, "Underdose": 1, "Urinary incontinence": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site reaction": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vision blurred": 1, "Visual impairment": 1, "Vital signs measurement": 1, "Weight decreased": 1, "Wheezing": 1, "Wrong product administered": 1, "Wrong technique in product usage process": 1, "X-ray": 1}, "batchcodes": ["027B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027B21H.json b/docs/data/histograms/United States/027B21H.json
index b4e8c354ea1..038f485777b 100644
--- a/docs/data/histograms/United States/027B21H.json
+++ b/docs/data/histograms/United States/027B21H.json
@@ -1 +1 @@
-{"batchcode": "027B21H", "histograms": [{"batchcodes": ["027B21H"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "027B21H", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["027B21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027B221A.json b/docs/data/histograms/United States/027B221A.json
index a725b78ca69..58051add5c1 100644
--- a/docs/data/histograms/United States/027B221A.json
+++ b/docs/data/histograms/United States/027B221A.json
@@ -1 +1 @@
-{"batchcode": "027B221A", "histograms": [{"batchcodes": ["027B221A"], "histogram": {"Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "027B221A", "histograms": [{"histogram": {"Vaccination site erythema": 1}, "batchcodes": ["027B221A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027BZ1A.json b/docs/data/histograms/United States/027BZ1A.json
index d07cc29e8f0..3ca4e26d29c 100644
--- a/docs/data/histograms/United States/027BZ1A.json
+++ b/docs/data/histograms/United States/027BZ1A.json
@@ -1 +1 @@
-{"batchcode": "027BZ1A", "histograms": [{"batchcodes": ["027BZ1A"], "histogram": {"Myalgia": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "027BZ1A", "histograms": [{"histogram": {"Myalgia": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["027BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027C20A.json b/docs/data/histograms/United States/027C20A.json
index 9f5836d0d2b..b05c553025b 100644
--- a/docs/data/histograms/United States/027C20A.json
+++ b/docs/data/histograms/United States/027C20A.json
@@ -1 +1 @@
-{"batchcode": "027C20A", "histograms": [{"batchcodes": ["027C20A"], "histogram": {"Pain in extremity": 2, "Arthralgia": 1, "Arthritis": 1, "Chills": 1, "Cough": 1, "Eye swelling": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site muscle weakness": 1, "Limb discomfort": 1, "Mobility decreased": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Swelling face": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vascular injury": 1}}]}
\ No newline at end of file
+{"batchcode": "027C20A", "histograms": [{"histogram": {"Pain in extremity": 2, "Arthralgia": 1, "Arthritis": 1, "Chills": 1, "Cough": 1, "Eye swelling": 1, "Fatigue": 1, "Headache": 1, "Injection site erythema": 1, "Injection site muscle weakness": 1, "Limb discomfort": 1, "Mobility decreased": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Swelling face": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vascular injury": 1}, "batchcodes": ["027C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027C21A.json b/docs/data/histograms/United States/027C21A.json
index d8c1cb6732d..b61e99e8c66 100644
--- a/docs/data/histograms/United States/027C21A.json
+++ b/docs/data/histograms/United States/027C21A.json
@@ -1 +1 @@
-{"batchcode": "027C21A", "histograms": [{"batchcodes": ["027C21A", "FA7485."], "histogram": {"Chills": 1, "Coronavirus infection": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["027C21A"], "histogram": {"Expired product administered": 25, "Fatigue": 20, "Myalgia": 20, "Headache": 19, "No adverse event": 17, "Pain in extremity": 17, "Vaccination site pain": 15, "Pyrexia": 11, "Dyspnoea": 10, "Erythema": 9, "Inappropriate schedule of product administration": 9, "Chills": 8, "Dizziness": 8, "Nausea": 8, "Arthralgia": 7, "Feeling hot": 7, "Pain": 7, "SARS-CoV-2 test": 7, "Body temperature": 6, "Feeling abnormal": 6, "Peripheral swelling": 6, "Product dose omission issue": 6, "Asthenia": 5, "Diarrhoea": 5, "Vaccination site swelling": 5, "Vaccination site warmth": 5, "Abdominal discomfort": 4, "Back pain": 4, "Illness": 4, "Mobility decreased": 4, "Product administered to patient of inappropriate age": 4, "Rash": 4, "Somnolence": 4, "Swelling": 4, "Vaccination site reaction": 4, "Anxiety": 3, "Blood pressure measurement": 3, "Burning sensation": 3, "COVID-19": 3, "Chest pain": 3, "Eye swelling": 3, "Gait disturbance": 3, "Hypoaesthesia": 3, "Loss of consciousness": 3, "Muscle spasms": 3, "Paraesthesia": 3, "Seizure": 3, "Tremor": 3, "Vaccination complication": 3, "Vaccination site erythema": 3, "Vision blurred": 3, "Vomiting": 3, "Blood pressure increased": 2, "Bone pain": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Confusional state": 2, "Cough": 2, "Discomfort": 2, "Disturbance in attention": 2, "Dyskinesia": 2, "Dysuria": 2, "Feeling cold": 2, "Flushing": 2, "Influenza": 2, "Loss of personal independence in daily activities": 2, "Lymphadenopathy": 2, "Malaise": 2, "Nasal congestion": 2, "Neck pain": 2, "Palpitations": 2, "Panic attack": 2, "Product storage error": 2, "Pruritus": 2, "Skin mass": 2, "Thrombosis": 2, "Tinnitus": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site pruritus": 2, "Abdominal pain": 1, "Adrenal disorder": 1, "Aggression": 1, "Anosmia": 1, "Arrhythmia": 1, "Asthma": 1, "Axillary pain": 1, "Bed rest": 1, "Bipolar disorder": 1, "Blood glucose": 1, "Body temperature increased": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "Chemical burn": 1, "Coeliac disease": 1, "Cold sweat": 1, "Communication disorder": 1, "Computerised tomogram thorax": 1, "Death": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dementia": 1, "Dental discomfort": 1, "Depressed level of consciousness": 1, "Depression": 1, "Disorientation": 1, "Ear discomfort": 1, "Ear pain": 1, "Electrocardiogram": 1, "Energy increased": 1, "Eye pain": 1, "Eye pruritus": 1, "Full blood count normal": 1, "Gout": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Heart sounds": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperaesthesia teeth": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypomania": 1, "Hypotension": 1, "Impaired work ability": 1, "Inflammation": 1, "Insomnia": 1, "Limb discomfort": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Metabolic function test normal": 1, "Middle insomnia": 1, "Migraine": 1, "Movement disorder": 1, "Multiple sclerosis relapse": 1, "Muscle contractions involuntary": 1, "Muscle strain": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Nasopharyngitis": 1, "Ocular discomfort": 1, "Oral discomfort": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Periarthritis": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Photopsia": 1, "Physical disability": 1, "Pleural effusion": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Psychotic disorder": 1, "Pulmonary thrombosis": 1, "Radial pulse": 1, "Reaction to preservatives": 1, "Respiratory rate": 1, "Retching": 1, "Retinal tear": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin tightness": 1, "Sleep terror": 1, "Swelling face": 1, "Syncope": 1, "Tachycardia": 1, "Tachyphrenia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vertigo": 1, "Visual impairment": 1, "Weight increased": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "027C21A", "histograms": [{"histogram": {"Chills": 1, "Coronavirus infection": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["027C21A", "FA7485."]}, {"histogram": {"Expired product administered": 25, "Fatigue": 20, "Myalgia": 20, "Headache": 19, "No adverse event": 17, "Pain in extremity": 17, "Vaccination site pain": 15, "Pyrexia": 11, "Dyspnoea": 10, "Erythema": 9, "Inappropriate schedule of product administration": 9, "Chills": 8, "Dizziness": 8, "Nausea": 8, "Arthralgia": 7, "Feeling hot": 7, "Pain": 7, "SARS-CoV-2 test": 7, "Body temperature": 6, "Feeling abnormal": 6, "Peripheral swelling": 6, "Product dose omission issue": 6, "Asthenia": 5, "Diarrhoea": 5, "Vaccination site swelling": 5, "Vaccination site warmth": 5, "Abdominal discomfort": 4, "Back pain": 4, "Illness": 4, "Mobility decreased": 4, "Product administered to patient of inappropriate age": 4, "Rash": 4, "Somnolence": 4, "Swelling": 4, "Vaccination site reaction": 4, "Anxiety": 3, "Blood pressure measurement": 3, "Burning sensation": 3, "COVID-19": 3, "Chest pain": 3, "Eye swelling": 3, "Gait disturbance": 3, "Hypoaesthesia": 3, "Loss of consciousness": 3, "Muscle spasms": 3, "Paraesthesia": 3, "Seizure": 3, "Tremor": 3, "Vaccination complication": 3, "Vaccination site erythema": 3, "Vision blurred": 3, "Vomiting": 3, "Blood pressure increased": 2, "Bone pain": 2, "Chest discomfort": 2, "Computerised tomogram": 2, "Confusional state": 2, "Cough": 2, "Discomfort": 2, "Disturbance in attention": 2, "Dyskinesia": 2, "Dysuria": 2, "Feeling cold": 2, "Flushing": 2, "Influenza": 2, "Loss of personal independence in daily activities": 2, "Lymphadenopathy": 2, "Malaise": 2, "Nasal congestion": 2, "Neck pain": 2, "Palpitations": 2, "Panic attack": 2, "Product storage error": 2, "Pruritus": 2, "Skin mass": 2, "Thrombosis": 2, "Tinnitus": 2, "Underdose": 2, "Vaccination site bruising": 2, "Vaccination site pruritus": 2, "Abdominal pain": 1, "Adrenal disorder": 1, "Aggression": 1, "Anosmia": 1, "Arrhythmia": 1, "Asthma": 1, "Axillary pain": 1, "Bed rest": 1, "Bipolar disorder": 1, "Blood glucose": 1, "Body temperature increased": 1, "Bowel movement irregularity": 1, "Breast pain": 1, "Chemical burn": 1, "Coeliac disease": 1, "Cold sweat": 1, "Communication disorder": 1, "Computerised tomogram thorax": 1, "Death": 1, "Decreased appetite": 1, "Deep vein thrombosis": 1, "Dementia": 1, "Dental discomfort": 1, "Depressed level of consciousness": 1, "Depression": 1, "Disorientation": 1, "Ear discomfort": 1, "Ear pain": 1, "Electrocardiogram": 1, "Energy increased": 1, "Eye pain": 1, "Eye pruritus": 1, "Full blood count normal": 1, "Gout": 1, "Heart rate": 1, "Heart rate decreased": 1, "Heart rate increased": 1, "Heart sounds": 1, "Herpes zoster": 1, "Hot flush": 1, "Hyperaesthesia teeth": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypertension": 1, "Hypomania": 1, "Hypotension": 1, "Impaired work ability": 1, "Inflammation": 1, "Insomnia": 1, "Limb discomfort": 1, "Lumbar puncture": 1, "Lymph node pain": 1, "Magnetic resonance imaging": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental disorder": 1, "Metabolic function test normal": 1, "Middle insomnia": 1, "Migraine": 1, "Movement disorder": 1, "Multiple sclerosis relapse": 1, "Muscle contractions involuntary": 1, "Muscle strain": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Nasopharyngitis": 1, "Ocular discomfort": 1, "Oral discomfort": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Periarthritis": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Photopsia": 1, "Physical disability": 1, "Pleural effusion": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Psychotic disorder": 1, "Pulmonary thrombosis": 1, "Radial pulse": 1, "Reaction to preservatives": 1, "Respiratory rate": 1, "Retching": 1, "Retinal tear": 1, "Sinusitis": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin tightness": 1, "Sleep terror": 1, "Swelling face": 1, "Syncope": 1, "Tachycardia": 1, "Tachyphrenia": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Ultrasound scan": 1, "Urinary incontinence": 1, "Urticaria": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vertigo": 1, "Visual impairment": 1, "Weight increased": 1, "Wound": 1}, "batchcodes": ["027C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027C21D.json b/docs/data/histograms/United States/027C21D.json
index 364fae3ba82..c0af554c3ed 100644
--- a/docs/data/histograms/United States/027C21D.json
+++ b/docs/data/histograms/United States/027C21D.json
@@ -1 +1 @@
-{"batchcode": "027C21D", "histograms": [{"batchcodes": ["027C21D"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "027C21D", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["027C21D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027C2A.json b/docs/data/histograms/United States/027C2A.json
index 36e785453a1..e4279485bf3 100644
--- a/docs/data/histograms/United States/027C2A.json
+++ b/docs/data/histograms/United States/027C2A.json
@@ -1 +1 @@
-{"batchcode": "027C2A", "histograms": [{"batchcodes": ["027C2A"], "histogram": {"Accidental overdose": 1}}]}
\ No newline at end of file
+{"batchcode": "027C2A", "histograms": [{"histogram": {"Accidental overdose": 1}, "batchcodes": ["027C2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027CZ0A.json b/docs/data/histograms/United States/027CZ0A.json
index d14befc3fae..284b92623d2 100644
--- a/docs/data/histograms/United States/027CZ0A.json
+++ b/docs/data/histograms/United States/027CZ0A.json
@@ -1 +1 @@
-{"batchcode": "027CZ0A", "histograms": [{"batchcodes": ["027CZ0A"], "histogram": {"Arthritis": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "027CZ0A", "histograms": [{"histogram": {"Arthritis": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["027CZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027CZ1A.json b/docs/data/histograms/United States/027CZ1A.json
index 413f835e9b4..45fde71f91b 100644
--- a/docs/data/histograms/United States/027CZ1A.json
+++ b/docs/data/histograms/United States/027CZ1A.json
@@ -1 +1 @@
-{"batchcode": "027CZ1A", "histograms": [{"batchcodes": ["027CZ1A"], "histogram": {"Anxiety": 1, "Condition aggravated": 1, "Contusion": 1, "Depression": 1, "Furuncle": 1, "Hypoaesthesia": 1, "Influenza": 1, "Insomnia": 1, "Pain in extremity": 1, "Panic attack": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Renal failure": 1, "Skin abrasion": 1, "Weight": 1}}]}
\ No newline at end of file
+{"batchcode": "027CZ1A", "histograms": [{"histogram": {"Anxiety": 1, "Condition aggravated": 1, "Contusion": 1, "Depression": 1, "Furuncle": 1, "Hypoaesthesia": 1, "Influenza": 1, "Insomnia": 1, "Pain in extremity": 1, "Panic attack": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Renal failure": 1, "Skin abrasion": 1, "Weight": 1}, "batchcodes": ["027CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027D21A.json b/docs/data/histograms/United States/027D21A.json
index a1b704ac2f8..ccfde9ac2a1 100644
--- a/docs/data/histograms/United States/027D21A.json
+++ b/docs/data/histograms/United States/027D21A.json
@@ -1 +1 @@
-{"batchcode": "027D21A", "histograms": [{"batchcodes": ["027D21A"], "histogram": {"Fatigue": 3, "Headache": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2, "Rash": 2, "Arthralgia": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Contusion": 1, "Dysphagia": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Intentional dose omission": 1, "Laboratory test": 1, "Lethargy": 1, "Macule": 1, "Malaise": 1, "Mechanical urticaria": 1, "Metamorphopsia": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Nausea": 1, "Neuralgia": 1, "Petechiae": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Postural orthostatic tachycardia syndrome": 1, "Product administered to patient of inappropriate age": 1, "Rash macular": 1, "SARS-CoV-2 test": 1, "Sensation of blood flow": 1, "Skin discolouration": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "027D21A", "histograms": [{"histogram": {"Fatigue": 3, "Headache": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2, "Rash": 2, "Arthralgia": 1, "Body temperature": 1, "Burning sensation": 1, "COVID-19": 1, "Chest pain": 1, "Contusion": 1, "Dysphagia": 1, "Dyspnoea": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Intentional dose omission": 1, "Laboratory test": 1, "Lethargy": 1, "Macule": 1, "Malaise": 1, "Mechanical urticaria": 1, "Metamorphopsia": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Nausea": 1, "Neuralgia": 1, "Petechiae": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Polymerase chain reaction": 1, "Postural orthostatic tachycardia syndrome": 1, "Product administered to patient of inappropriate age": 1, "Rash macular": 1, "SARS-CoV-2 test": 1, "Sensation of blood flow": 1, "Skin discolouration": 1, "Vaccination complication": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Visual impairment": 1}, "batchcodes": ["027D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027D2IA.json b/docs/data/histograms/United States/027D2IA.json
index 820d6752cf1..141e461a8a3 100644
--- a/docs/data/histograms/United States/027D2IA.json
+++ b/docs/data/histograms/United States/027D2IA.json
@@ -1 +1 @@
-{"batchcode": "027D2IA", "histograms": [{"batchcodes": ["027D2IA"], "histogram": {"Back pain": 1, "Breast pain": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Hypoaesthesia": 1, "Memory impairment": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "027D2IA", "histograms": [{"histogram": {"Back pain": 1, "Breast pain": 1, "Chest pain": 1, "Dizziness": 1, "Headache": 1, "Hypoaesthesia": 1, "Memory impairment": 1, "Myalgia": 1, "Pain in extremity": 1, "Pruritus": 1, "Tinnitus": 1}, "batchcodes": ["027D2IA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027DOA.json b/docs/data/histograms/United States/027DOA.json
index b86e1c45155..01424347dc5 100644
--- a/docs/data/histograms/United States/027DOA.json
+++ b/docs/data/histograms/United States/027DOA.json
@@ -1 +1 @@
-{"batchcode": "027DOA", "histograms": [{"batchcodes": ["027DOA"], "histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Nausea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027DOA", "histograms": [{"histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Nausea": 1, "Vaccination site pain": 1}, "batchcodes": ["027DOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027E22A.json b/docs/data/histograms/United States/027E22A.json
index d204ee8ebd7..18fb9e10a41 100644
--- a/docs/data/histograms/United States/027E22A.json
+++ b/docs/data/histograms/United States/027E22A.json
@@ -1 +1 @@
-{"batchcode": "027E22A", "histograms": [{"batchcodes": ["027E22A"], "histogram": {"No adverse event": 18, "Expired product administered": 13, "Product storage error": 11, "COVID-19": 2, "SARS-CoV-2 test": 2, "Wrong product administered": 2, "Cerebrovascular accident": 1, "Extra dose administered": 1, "Herpes zoster": 1, "Influenza virus test": 1, "Oxygen saturation": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Pyrexia": 1, "Underdose": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1, "Vein discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "027E22A", "histograms": [{"histogram": {"No adverse event": 18, "Expired product administered": 13, "Product storage error": 11, "COVID-19": 2, "SARS-CoV-2 test": 2, "Wrong product administered": 2, "Cerebrovascular accident": 1, "Extra dose administered": 1, "Herpes zoster": 1, "Influenza virus test": 1, "Oxygen saturation": 1, "Poor quality product administered": 1, "Product temperature excursion issue": 1, "Pyrexia": 1, "Underdose": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1, "Vein discolouration": 1}, "batchcodes": ["027E22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027H20A.json b/docs/data/histograms/United States/027H20A.json
index f9aeacfb38b..0046614e547 100644
--- a/docs/data/histograms/United States/027H20A.json
+++ b/docs/data/histograms/United States/027H20A.json
@@ -1 +1 @@
-{"batchcode": "027H20A", "histograms": [{"batchcodes": ["027H20A"], "histogram": {"Abdominal pain upper": 1, "Burning sensation": 1, "Fatigue": 1, "Food intolerance": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Peripheral swelling": 1, "Spinal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027H20A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Burning sensation": 1, "Fatigue": 1, "Food intolerance": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Peripheral swelling": 1, "Spinal pain": 1}, "batchcodes": ["027H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027H213.json b/docs/data/histograms/United States/027H213.json
index 0b9bc0e286e..0b5dfad06de 100644
--- a/docs/data/histograms/United States/027H213.json
+++ b/docs/data/histograms/United States/027H213.json
@@ -1 +1 @@
-{"batchcode": "027H213", "histograms": [{"batchcodes": ["027H213"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "027H213", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["027H213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027H218.json b/docs/data/histograms/United States/027H218.json
index 6b714d4a428..e97c57c7845 100644
--- a/docs/data/histograms/United States/027H218.json
+++ b/docs/data/histograms/United States/027H218.json
@@ -1 +1 @@
-{"batchcode": "027H218", "histograms": [{"batchcodes": ["027H218"], "histogram": {"Fatigue": 1, "Illness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "027H218", "histograms": [{"histogram": {"Fatigue": 1, "Illness": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Peripheral coldness": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["027H218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027H21A.json b/docs/data/histograms/United States/027H21A.json
index 35230f900ba..f305fd45950 100644
--- a/docs/data/histograms/United States/027H21A.json
+++ b/docs/data/histograms/United States/027H21A.json
@@ -1 +1 @@
-{"batchcode": "027H21A", "histograms": [{"batchcodes": ["027H21A"], "histogram": {"Chest discomfort": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027H21A", "histograms": [{"histogram": {"Chest discomfort": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Pyrexia": 1, "Vaccination complication": 1, "Vaccination site pain": 1}, "batchcodes": ["027H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027H21B.json b/docs/data/histograms/United States/027H21B.json
index 1794c91deda..23576460daa 100644
--- a/docs/data/histograms/United States/027H21B.json
+++ b/docs/data/histograms/United States/027H21B.json
@@ -1 +1 @@
-{"batchcode": "027H21B", "histograms": [{"batchcodes": ["027H21B", "1802070"], "histogram": {"Chills": 1, "Fatigue": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["027H21B", "206A21A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}, {"batchcodes": ["027H21B"], "histogram": {"Expired product administered": 165, "Product storage error": 10, "Underdose": 6, "Chills": 3, "Dizziness": 3, "Fatigue": 3, "Product temperature excursion issue": 3, "Accidental underdose": 2, "Feeling abnormal": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Product administered to patient of inappropriate age": 2, "Product administration error": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Agitation": 1, "Alopecia": 1, "Amenorrhoea": 1, "Blood pressure fluctuation": 1, "Body temperature": 1, "COVID-19": 1, "Confusional state": 1, "Cough": 1, "Dehydration": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Expired device used": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Fall": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrinolysis increased": 1, "Gait disturbance": 1, "Gingival swelling": 1, "Hordeolum": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypotension": 1, "Influenza like illness": 1, "Insomnia": 1, "Investigation": 1, "Lethargy": 1, "Malaise": 1, "Menstruation irregular": 1, "Myalgia": 1, "Nasal congestion": 1, "Nausea": 1, "No adverse event": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Pain": 1, "Palpitations": 1, "Poor quality product administered": 1, "Pregnancy test": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sleep deficit": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Thirst": 1, "Toothache": 1, "Tremor": 1, "Urticaria chronic": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "027H21B", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["027H21B", "1802070"]}, {"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["027H21B", "206A21A"]}, {"histogram": {"Expired product administered": 165, "Product storage error": 10, "Underdose": 6, "Chills": 3, "Dizziness": 3, "Fatigue": 3, "Product temperature excursion issue": 3, "Accidental underdose": 2, "Feeling abnormal": 2, "Headache": 2, "Inappropriate schedule of product administration": 2, "Pain in extremity": 2, "Product administered to patient of inappropriate age": 2, "Product administration error": 2, "Pyrexia": 2, "Rhinorrhoea": 2, "Agitation": 1, "Alopecia": 1, "Amenorrhoea": 1, "Blood pressure fluctuation": 1, "Body temperature": 1, "COVID-19": 1, "Confusional state": 1, "Cough": 1, "Dehydration": 1, "Drug ineffective": 1, "Electrocardiogram": 1, "Expired device used": 1, "Eye pain": 1, "Eye pruritus": 1, "Eye swelling": 1, "Fall": 1, "Feeling hot": 1, "Fibrin D dimer": 1, "Fibrinolysis increased": 1, "Gait disturbance": 1, "Gingival swelling": 1, "Hordeolum": 1, "Hypertension": 1, "Hypokinesia": 1, "Hypotension": 1, "Influenza like illness": 1, "Insomnia": 1, "Investigation": 1, "Lethargy": 1, "Malaise": 1, "Menstruation irregular": 1, "Myalgia": 1, "Nasal congestion": 1, "Nausea": 1, "No adverse event": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Overdose": 1, "Pain": 1, "Palpitations": 1, "Poor quality product administered": 1, "Pregnancy test": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sleep deficit": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Thirst": 1, "Toothache": 1, "Tremor": 1, "Urticaria chronic": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["027H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027HZ1B.json b/docs/data/histograms/United States/027HZ1B.json
index 26a7fc994c2..bfcd2f3c3bb 100644
--- a/docs/data/histograms/United States/027HZ1B.json
+++ b/docs/data/histograms/United States/027HZ1B.json
@@ -1 +1 @@
-{"batchcode": "027HZ1B", "histograms": [{"batchcodes": ["027HZ1B", "205A21A"], "histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "027HZ1B", "histograms": [{"histogram": {"COVID-19 immunisation": 1, "Suspected COVID-19": 1}, "batchcodes": ["027HZ1B", "205A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027IA21A.json b/docs/data/histograms/United States/027IA21A.json
index d44d5facf8a..4d5c9985fc7 100644
--- a/docs/data/histograms/United States/027IA21A.json
+++ b/docs/data/histograms/United States/027IA21A.json
@@ -1 +1 @@
-{"batchcode": "027IA21A", "histograms": [{"batchcodes": ["027IA21A"], "histogram": {"Myocardial infarction": 1, "Pulmonary embolism": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "027IA21A", "histograms": [{"histogram": {"Myocardial infarction": 1, "Pulmonary embolism": 1, "Thrombosis": 1}, "batchcodes": ["027IA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027J20A.json b/docs/data/histograms/United States/027J20A.json
index c80edce615c..b2cd5dfc53a 100644
--- a/docs/data/histograms/United States/027J20A.json
+++ b/docs/data/histograms/United States/027J20A.json
@@ -1 +1 @@
-{"batchcode": "027J20A", "histograms": [{"batchcodes": ["027J20A"], "histogram": {"Dizziness": 1, "Erythema": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Muscle tightness": 1, "Throat tightness": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "027J20A", "histograms": [{"histogram": {"Dizziness": 1, "Erythema": 1, "Heart rate increased": 1, "Heart rate irregular": 1, "Muscle tightness": 1, "Throat tightness": 1, "Vision blurred": 1}, "batchcodes": ["027J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027K20A.json b/docs/data/histograms/United States/027K20A.json
index 68c79bec856..761eea0a5ec 100644
--- a/docs/data/histograms/United States/027K20A.json
+++ b/docs/data/histograms/United States/027K20A.json
@@ -1 +1 @@
-{"batchcode": "027K20A", "histograms": [{"batchcodes": ["027K20A"], "histogram": {"Feeling abnormal": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "Alopecia": 1, "Arthralgia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Fatigue": 1, "Illness": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Renal artery arteriosclerosis": 1, "Speech disorder": 1, "Ultrasound kidney": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027K20A", "histograms": [{"histogram": {"Feeling abnormal": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "Alopecia": 1, "Arthralgia": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Fatigue": 1, "Illness": 1, "Limb discomfort": 1, "Loss of personal independence in daily activities": 1, "Malaise": 1, "Musculoskeletal stiffness": 1, "Renal artery arteriosclerosis": 1, "Speech disorder": 1, "Ultrasound kidney": 1, "Vaccination site pain": 1}, "batchcodes": ["027K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027K21A.json b/docs/data/histograms/United States/027K21A.json
index 4cbb4f8f571..43c54e19858 100644
--- a/docs/data/histograms/United States/027K21A.json
+++ b/docs/data/histograms/United States/027K21A.json
@@ -1 +1 @@
-{"batchcode": "027K21A", "histograms": [{"batchcodes": ["027K21A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027K21A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["027K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027KWA.json b/docs/data/histograms/United States/027KWA.json
index a6e734a9549..90bc55511c1 100644
--- a/docs/data/histograms/United States/027KWA.json
+++ b/docs/data/histograms/United States/027KWA.json
@@ -1 +1 @@
-{"batchcode": "027KWA", "histograms": [{"batchcodes": ["027KWA"], "histogram": {"Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "027KWA", "histograms": [{"histogram": {"Vaccination site rash": 1}, "batchcodes": ["027KWA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L(OR C)20A.json b/docs/data/histograms/United States/027L(OR C)20A.json
index 50f486aa4dd..120b6b67b9a 100644
--- a/docs/data/histograms/United States/027L(OR C)20A.json
+++ b/docs/data/histograms/United States/027L(OR C)20A.json
@@ -1 +1 @@
-{"batchcode": "027L(OR C)20A", "histograms": [{"batchcodes": ["027L(OR C)20A"], "histogram": {"Body temperature": 1, "Chills": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "027L(OR C)20A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Vaccination complication": 1}, "batchcodes": ["027L(OR C)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L02A.json b/docs/data/histograms/United States/027L02A.json
index ed1148827ef..7c978802a9f 100644
--- a/docs/data/histograms/United States/027L02A.json
+++ b/docs/data/histograms/United States/027L02A.json
@@ -1 +1 @@
-{"batchcode": "027L02A", "histograms": [{"batchcodes": ["027L02A"], "histogram": {"Body temperature": 2, "Insomnia": 2, "Nausea": 2, "Pyrexia": 2, "Axillary pain": 1, "Chest pain": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "027L02A", "histograms": [{"histogram": {"Body temperature": 2, "Insomnia": 2, "Nausea": 2, "Pyrexia": 2, "Axillary pain": 1, "Chest pain": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vomiting": 1}, "batchcodes": ["027L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L0A.json b/docs/data/histograms/United States/027L0A.json
index ffb3353e30d..89d84ba9723 100644
--- a/docs/data/histograms/United States/027L0A.json
+++ b/docs/data/histograms/United States/027L0A.json
@@ -1 +1 @@
-{"batchcode": "027L0A", "histograms": [{"batchcodes": ["027L0A", "FM0173"], "histogram": {"Body temperature": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Hypersomnia": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["027L0A"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Headache": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "027L0A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "COVID-19 immunisation": 1, "Hypersomnia": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["027L0A", "FM0173"]}, {"histogram": {"Body temperature": 1, "Fatigue": 1, "Headache": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["027L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L2012.json b/docs/data/histograms/United States/027L2012.json
index 620941c7daa..cca48cd8117 100644
--- a/docs/data/histograms/United States/027L2012.json
+++ b/docs/data/histograms/United States/027L2012.json
@@ -1 +1 @@
-{"batchcode": "027L2012", "histograms": [{"batchcodes": ["027L2012"], "histogram": {"Bell's palsy": 1}}]}
\ No newline at end of file
+{"batchcode": "027L2012", "histograms": [{"histogram": {"Bell's palsy": 1}, "batchcodes": ["027L2012"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L2014.json b/docs/data/histograms/United States/027L2014.json
index 9629eed8fa6..43dbcc20c19 100644
--- a/docs/data/histograms/United States/027L2014.json
+++ b/docs/data/histograms/United States/027L2014.json
@@ -1 +1 @@
-{"batchcode": "027L2014", "histograms": [{"batchcodes": ["027L2014"], "histogram": {"Vaccination site pruritus": 2, "Vaccination site rash": 2, "Vaccination site erythema": 1, "Vaccination site hypersensitivity": 1}}]}
\ No newline at end of file
+{"batchcode": "027L2014", "histograms": [{"histogram": {"Vaccination site pruritus": 2, "Vaccination site rash": 2, "Vaccination site erythema": 1, "Vaccination site hypersensitivity": 1}, "batchcodes": ["027L2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L201A.json b/docs/data/histograms/United States/027L201A.json
index 5c8c6fc7e58..8eb7dec8a9f 100644
--- a/docs/data/histograms/United States/027L201A.json
+++ b/docs/data/histograms/United States/027L201A.json
@@ -1 +1 @@
-{"batchcode": "027L201A", "histograms": [{"batchcodes": ["027L201A"], "histogram": {"Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "027L201A", "histograms": [{"histogram": {"Headache": 1}, "batchcodes": ["027L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L2074.json b/docs/data/histograms/United States/027L2074.json
index 7c9cad2512a..24fb184e30a 100644
--- a/docs/data/histograms/United States/027L2074.json
+++ b/docs/data/histograms/United States/027L2074.json
@@ -1 +1 @@
-{"batchcode": "027L2074", "histograms": [{"batchcodes": ["027L2074"], "histogram": {"Headache": 1, "Pain in extremity": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "027L2074", "histograms": [{"histogram": {"Headache": 1, "Pain in extremity": 1, "Tinnitus": 1}, "batchcodes": ["027L2074"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L208.json b/docs/data/histograms/United States/027L208.json
index 03f4c6db1af..b7979a6f9fe 100644
--- a/docs/data/histograms/United States/027L208.json
+++ b/docs/data/histograms/United States/027L208.json
@@ -1 +1 @@
-{"batchcode": "027L208", "histograms": [{"batchcodes": ["027L208"], "histogram": {"Vaccination site anaesthesia": 2, "Anger": 1, "COVID-19": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Nightmare": 1, "Polymerase chain reaction": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "027L208", "histograms": [{"histogram": {"Vaccination site anaesthesia": 2, "Anger": 1, "COVID-19": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Nightmare": 1, "Polymerase chain reaction": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["027L208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L209.json b/docs/data/histograms/United States/027L209.json
index fd3050d32cc..502ab1a786f 100644
--- a/docs/data/histograms/United States/027L209.json
+++ b/docs/data/histograms/United States/027L209.json
@@ -1 +1 @@
-{"batchcode": "027L209", "histograms": [{"batchcodes": ["027L209"], "histogram": {"Feeling hot": 1, "Night sweats": 1}}]}
\ No newline at end of file
+{"batchcode": "027L209", "histograms": [{"histogram": {"Feeling hot": 1, "Night sweats": 1}, "batchcodes": ["027L209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L20A OR 0276.json b/docs/data/histograms/United States/027L20A OR 0276.json
index c9292a69a06..8c2a66e4956 100644
--- a/docs/data/histograms/United States/027L20A OR 0276.json
+++ b/docs/data/histograms/United States/027L20A OR 0276.json
@@ -1 +1 @@
-{"batchcode": "027L20A OR 0276", "histograms": [{"batchcodes": ["027L20A OR 0276"], "histogram": {"Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "027L20A OR 0276", "histograms": [{"histogram": {"Tremor": 1}, "batchcodes": ["027L20A OR 0276"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L20A..json b/docs/data/histograms/United States/027L20A..json
index decfc82ddb0..194a28f51f4 100644
--- a/docs/data/histograms/United States/027L20A..json
+++ b/docs/data/histograms/United States/027L20A..json
@@ -1 +1 @@
-{"batchcode": "027L20A.", "histograms": [{"batchcodes": ["027L20A."], "histogram": {"Erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "027L20A.", "histograms": [{"histogram": {"Erythema": 1}, "batchcodes": ["027L20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L20A.json b/docs/data/histograms/United States/027L20A.json
index 1238782227a..2af44e1c5b0 100644
--- a/docs/data/histograms/United States/027L20A.json
+++ b/docs/data/histograms/United States/027L20A.json
@@ -1 +1 @@
-{"batchcode": "027L20A", "histograms": [{"batchcodes": ["027L20A", "EW0198"], "histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Interchange of vaccine products": 1, "Pyrexia": 1}}, {"batchcodes": ["027L20A"], "histogram": {"Fatigue": 90, "Vaccination site pain": 88, "Headache": 83, "Pyrexia": 76, "Chills": 69, "Pain in extremity": 67, "Poor quality product administered": 52, "Vaccination site erythema": 51, "Myalgia": 49, "Nausea": 43, "Pruritus": 40, "Vaccination site pruritus": 40, "Product temperature excursion issue": 39, "Arthralgia": 36, "Pain": 34, "Erythema": 33, "Rash": 30, "Vaccination site swelling": 28, "Body temperature": 26, "Asthenia": 25, "Dizziness": 24, "COVID-19": 23, "Vaccination site warmth": 23, "Injection site pain": 22, "SARS-CoV-2 test": 21, "Feeling abnormal": 20, "Vaccination site rash": 19, "Vomiting": 19, "Dyspnoea": 18, "Diarrhoea": 17, "Peripheral swelling": 17, "Injection site erythema": 15, "Maternal exposure during pregnancy": 14, "Cough": 13, "Malaise": 13, "Urticaria": 13, "Back pain": 12, "Decreased appetite": 12, "Product storage error": 12, "Expired product administered": 11, "Hyperhidrosis": 11, "Hypoaesthesia": 11, "Chest pain": 10, "Feeling hot": 10, "Illness": 10, "Influenza like illness": 10, "Vaccination complication": 10, "Vaccination site induration": 9, "Gait disturbance": 8, "Heart rate": 8, "Injection site swelling": 8, "Pregnancy test": 8, "Product dose omission issue": 8, "Rhinorrhoea": 8, "Anxiety": 7, "Blood pressure measurement": 7, "Chest discomfort": 7, "Exposure during pregnancy": 7, "Rash macular": 7, "Swelling face": 7, "Tenderness": 7, "Heart rate increased": 6, "Hypertension": 6, "Injection site pruritus": 6, "Injection site rash": 6, "Insomnia": 6, "Limb discomfort": 6, "Loss of personal independence in daily activities": 6, "Lymphadenopathy": 6, "Magnetic resonance imaging": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Paraesthesia": 6, "SARS-CoV-2 test positive": 6, "Vertigo": 6, "Anosmia": 5, "Bedridden": 5, "Burning sensation": 5, "Contusion": 5, "Inappropriate schedule of product administration": 5, "Neck pain": 5, "Oropharyngeal pain": 5, "Palpitations": 5, "Product administered to patient of inappropriate age": 5, "Somnolence": 5, "Swelling": 5, "Vaccination site urticaria": 5, "Ageusia": 4, "Cellulitis": 4, "Condition aggravated": 4, "Dermatitis": 4, "Eye irritation": 4, "Eye pruritus": 4, "Feeling cold": 4, "Hypersomnia": 4, "Inflammation": 4, "Injection site warmth": 4, "Lethargy": 4, "Muscle spasms": 4, "Musculoskeletal stiffness": 4, "Night sweats": 4, "Tachycardia": 4, "Tinnitus": 4, "Tremor": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Atrial fibrillation": 3, "Balance disorder": 3, "Blood pressure increased": 3, "Body temperature increased": 3, "Chest X-ray": 3, "Computerised tomogram": 3, "Delirium": 3, "Depression": 3, "Discomfort": 3, "Drug ineffective": 3, "Dysgeusia": 3, "Fall": 3, "Herpes zoster": 3, "Injection site reaction": 3, "Loss of consciousness": 3, "Nasal congestion": 3, "Oral herpes": 3, "Rash pruritic": 3, "Skin warm": 3, "Sleep disorder": 3, "Symptom recurrence": 3, "Vision blurred": 3, "Accidental overdose": 2, "Alopecia": 2, "Anaphylactic reaction": 2, "Anger": 2, "Arrhythmia": 2, "Asthma": 2, "Axillary pain": 2, "Blister": 2, "Blood test": 2, "Bone pain": 2, "Cardiac failure congestive": 2, "Cerebrovascular accident": 2, "Cold sweat": 2, "Constipation": 2, "Dehydration": 2, "Dysphagia": 2, "Dysphonia": 2, "Dysstasia": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Eyelid ptosis": 2, "Flushing": 2, "Head discomfort": 2, "Hypersensitivity": 2, "Impaired work ability": 2, "Incorrect route of product administration": 2, "Limb mass": 2, "Lip swelling": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Nasopharyngitis": 2, "Nervousness": 2, "Nightmare": 2, "Ocular hyperaemia": 2, "Oral discomfort": 2, "Paraesthesia oral": 2, "Peripheral coldness": 2, "Pharyngeal swelling": 2, "Rash erythematous": 2, "Rectal haemorrhage": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 antibody test negative": 2, "Skin exfoliation": 2, "Speech disorder": 2, "Stress": 2, "Suicidal ideation": 2, "Swollen tongue": 2, "Thirst": 2, "Thrombosis": 2, "Transient ischaemic attack": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vaccination site bruising": 2, "Vaccination site mass": 2, "Vaccination site reaction": 2, "Weight decreased": 2, "Wheezing": 2, "White blood cell count": 2, "White blood cell count decreased": 2, "X-ray": 2, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abortion spontaneous": 1, "Accident": 1, "Acne": 1, "Activated partial thromboplastin time": 1, "Adverse reaction": 1, "Alpha 1 foetoprotein": 1, "Amnesia": 1, "Anaemia": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Antithrombin III": 1, "Aphasia": 1, "Aplastic anaemia": 1, "Atrioventricular block": 1, "Axillary mass": 1, "Bell's palsy": 1, "Benign neoplasm of thyroid gland": 1, "Biopsy": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood immunoglobulin E normal": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood urine present": 1, "Body temperature decreased": 1, "Bowel movement irregularity": 1, "Bradycardia": 1, "Breast pain": 1, "Bronchospasm": 1, "Cardiac disorder": 1, "Cardiovascular evaluation": 1, "Cardiovascular symptom": 1, "Catheterisation cardiac": 1, "Cerebral haemorrhage": 1, "Chemotherapy": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation factor VII level": 1, "Complement factor normal": 1, "Concussion": 1, "Confusional state": 1, "Cranial nerve injury": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Dermatitis atopic": 1, "Device connection issue": 1, "Device temperature issue": 1, "Diarrhoea haemorrhagic": 1, "Diffuse alopecia": 1, "Dry mouth": 1, "Dupuytren's contracture": 1, "Dysmorphism": 1, "Ear pain": 1, "Endodontic procedure": 1, "Erythromelalgia": 1, "Essential hypertension": 1, "Eye pain": 1, "Eye swelling": 1, "Fear of death": 1, "Foreign body sensation in eyes": 1, "Furuncle": 1, "Gait inability": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin increased": 1, "Goitre": 1, "Haematuria": 1, "Haemorrhage": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Hepatic pain": 1, "Hyperglycaemia": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Immune system disorder": 1, "Impaired driving ability": 1, "Incorrect dose administered": 1, "Incorrect product formulation administered": 1, "Influenza": 1, "Injection site bruising": 1, "Injection site cellulitis": 1, "Injection site discomfort": 1, "Injection site induration": 1, "Injection site inflammation": 1, "Injection site mass": 1, "Injection site urticaria": 1, "Intentional product use issue": 1, "Joint stiffness": 1, "Joint swelling": 1, "Laboratory test": 1, "Laziness": 1, "Lip injury": 1, "Lymph node pain": 1, "Magnetic resonance imaging head": 1, "Mass": 1, "Mastication disorder": 1, "Mechanical urticaria": 1, "Meniere's disease": 1, "Mouth swelling": 1, "Movement disorder": 1, "Muscle disorder": 1, "Muscle fatigue": 1, "Muscle tightness": 1, "Musculoskeletal disorder": 1, "Myasthenia gravis": 1, "Nasal discomfort": 1, "Neuralgia": 1, "Neuritis": 1, "No adverse event": 1, "Nonspecific reaction": 1, "Nystagmus": 1, "Oedema": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Paralysis": 1, "Pathology test": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Phantom limb syndrome": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Poor quality sleep": 1, "Postoperative ileus": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Product availability issue": 1, "Product quality issue": 1, "Productive cough": 1, "Protein C": 1, "Protein S": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pyuria": 1, "Respiratory rate": 1, "Retching": 1, "Russell's viper venom time": 1, "SARS-CoV-2 antibody test positive": 1, "Salt craving": 1, "Sciatica": 1, "Seizure": 1, "Sensory loss": 1, "Sepsis": 1, "Sinusitis": 1, "Skin cancer": 1, "Skin discolouration": 1, "Skin disorder": 1, "Skin swelling": 1, "Skin test negative": 1, "Skin test positive": 1, "Skin tightness": 1, "Skin wrinkling": 1, "Sluggishness": 1, "Small intestinal obstruction": 1, "Sneezing": 1, "Systemic lupus erythematosus": 1, "Temperature intolerance": 1, "Tension": 1, "Thermal burn": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid mass": 1, "Tongue discomfort": 1, "Tongue erythema": 1, "Toothache": 1, "Tracheal inflammation": 1, "Trigeminal neuralgia": 1, "Tryptase increased": 1, "Ultrasound foetal": 1, "Ultrasound uterus": 1, "Underdose": 1, "Urethral haemorrhage": 1, "Vaccination site cellulitis": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site exfoliation": 1, "Vaccination site irritation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Ventricular extrasystoles": 1, "Vertigo positional": 1, "Visual impairment": 1, "Walking aid user": 1, "White blood cell count increased": 1}}]}
\ No newline at end of file
+{"batchcode": "027L20A", "histograms": [{"histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Interchange of vaccine products": 1, "Pyrexia": 1}, "batchcodes": ["027L20A", "EW0198"]}, {"histogram": {"Fatigue": 90, "Vaccination site pain": 88, "Headache": 83, "Pyrexia": 76, "Chills": 69, "Pain in extremity": 67, "Poor quality product administered": 52, "Vaccination site erythema": 51, "Myalgia": 49, "Nausea": 43, "Pruritus": 40, "Vaccination site pruritus": 40, "Product temperature excursion issue": 39, "Arthralgia": 36, "Pain": 34, "Erythema": 33, "Rash": 30, "Vaccination site swelling": 28, "Body temperature": 26, "Asthenia": 25, "Dizziness": 24, "COVID-19": 23, "Vaccination site warmth": 23, "Injection site pain": 22, "SARS-CoV-2 test": 21, "Feeling abnormal": 20, "Vaccination site rash": 19, "Vomiting": 19, "Dyspnoea": 18, "Diarrhoea": 17, "Peripheral swelling": 17, "Injection site erythema": 15, "Maternal exposure during pregnancy": 14, "Cough": 13, "Malaise": 13, "Urticaria": 13, "Back pain": 12, "Decreased appetite": 12, "Product storage error": 12, "Expired product administered": 11, "Hyperhidrosis": 11, "Hypoaesthesia": 11, "Chest pain": 10, "Feeling hot": 10, "Illness": 10, "Influenza like illness": 10, "Vaccination complication": 10, "Vaccination site induration": 9, "Gait disturbance": 8, "Heart rate": 8, "Injection site swelling": 8, "Pregnancy test": 8, "Product dose omission issue": 8, "Rhinorrhoea": 8, "Anxiety": 7, "Blood pressure measurement": 7, "Chest discomfort": 7, "Exposure during pregnancy": 7, "Rash macular": 7, "Swelling face": 7, "Tenderness": 7, "Heart rate increased": 6, "Hypertension": 6, "Injection site pruritus": 6, "Injection site rash": 6, "Insomnia": 6, "Limb discomfort": 6, "Loss of personal independence in daily activities": 6, "Lymphadenopathy": 6, "Magnetic resonance imaging": 6, "Mobility decreased": 6, "Muscular weakness": 6, "Paraesthesia": 6, "SARS-CoV-2 test positive": 6, "Vertigo": 6, "Anosmia": 5, "Bedridden": 5, "Burning sensation": 5, "Contusion": 5, "Inappropriate schedule of product administration": 5, "Neck pain": 5, "Oropharyngeal pain": 5, "Palpitations": 5, "Product administered to patient of inappropriate age": 5, "Somnolence": 5, "Swelling": 5, "Vaccination site urticaria": 5, "Ageusia": 4, "Cellulitis": 4, "Condition aggravated": 4, "Dermatitis": 4, "Eye irritation": 4, "Eye pruritus": 4, "Feeling cold": 4, "Hypersomnia": 4, "Inflammation": 4, "Injection site warmth": 4, "Lethargy": 4, "Muscle spasms": 4, "Musculoskeletal stiffness": 4, "Night sweats": 4, "Tachycardia": 4, "Tinnitus": 4, "Tremor": 4, "Abdominal discomfort": 3, "Abdominal pain upper": 3, "Atrial fibrillation": 3, "Balance disorder": 3, "Blood pressure increased": 3, "Body temperature increased": 3, "Chest X-ray": 3, "Computerised tomogram": 3, "Delirium": 3, "Depression": 3, "Discomfort": 3, "Drug ineffective": 3, "Dysgeusia": 3, "Fall": 3, "Herpes zoster": 3, "Injection site reaction": 3, "Loss of consciousness": 3, "Nasal congestion": 3, "Oral herpes": 3, "Rash pruritic": 3, "Skin warm": 3, "Sleep disorder": 3, "Symptom recurrence": 3, "Vision blurred": 3, "Accidental overdose": 2, "Alopecia": 2, "Anaphylactic reaction": 2, "Anger": 2, "Arrhythmia": 2, "Asthma": 2, "Axillary pain": 2, "Blister": 2, "Blood test": 2, "Bone pain": 2, "Cardiac failure congestive": 2, "Cerebrovascular accident": 2, "Cold sweat": 2, "Constipation": 2, "Dehydration": 2, "Dysphagia": 2, "Dysphonia": 2, "Dysstasia": 2, "Ear discomfort": 2, "Echocardiogram": 2, "Electrocardiogram": 2, "Eyelid ptosis": 2, "Flushing": 2, "Head discomfort": 2, "Hypersensitivity": 2, "Impaired work ability": 2, "Incorrect route of product administration": 2, "Limb mass": 2, "Lip swelling": 2, "Migraine": 2, "Musculoskeletal discomfort": 2, "Nasopharyngitis": 2, "Nervousness": 2, "Nightmare": 2, "Ocular hyperaemia": 2, "Oral discomfort": 2, "Paraesthesia oral": 2, "Peripheral coldness": 2, "Pharyngeal swelling": 2, "Rash erythematous": 2, "Rectal haemorrhage": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 antibody test negative": 2, "Skin exfoliation": 2, "Speech disorder": 2, "Stress": 2, "Suicidal ideation": 2, "Swollen tongue": 2, "Thirst": 2, "Thrombosis": 2, "Transient ischaemic attack": 2, "Ultrasound abdomen": 2, "Ultrasound scan": 2, "Vaccination site bruising": 2, "Vaccination site mass": 2, "Vaccination site reaction": 2, "Weight decreased": 2, "Wheezing": 2, "White blood cell count": 2, "White blood cell count decreased": 2, "X-ray": 2, "Abdominal pain": 1, "Abnormal behaviour": 1, "Abortion spontaneous": 1, "Accident": 1, "Acne": 1, "Activated partial thromboplastin time": 1, "Adverse reaction": 1, "Alpha 1 foetoprotein": 1, "Amnesia": 1, "Anaemia": 1, "Antinuclear antibody": 1, "Antiphospholipid antibodies": 1, "Antithrombin III": 1, "Aphasia": 1, "Aplastic anaemia": 1, "Atrioventricular block": 1, "Axillary mass": 1, "Bell's palsy": 1, "Benign neoplasm of thyroid gland": 1, "Biopsy": 1, "Blood glucose": 1, "Blood glucose abnormal": 1, "Blood glucose increased": 1, "Blood immunoglobulin E normal": 1, "Blood potassium": 1, "Blood pressure decreased": 1, "Blood sodium": 1, "Blood urine present": 1, "Body temperature decreased": 1, "Bowel movement irregularity": 1, "Bradycardia": 1, "Breast pain": 1, "Bronchospasm": 1, "Cardiac disorder": 1, "Cardiovascular evaluation": 1, "Cardiovascular symptom": 1, "Catheterisation cardiac": 1, "Cerebral haemorrhage": 1, "Chemotherapy": 1, "Chronic obstructive pulmonary disease": 1, "Coagulation factor VII level": 1, "Complement factor normal": 1, "Concussion": 1, "Confusional state": 1, "Cranial nerve injury": 1, "Deafness": 1, "Deep vein thrombosis": 1, "Dermatitis atopic": 1, "Device connection issue": 1, "Device temperature issue": 1, "Diarrhoea haemorrhagic": 1, "Diffuse alopecia": 1, "Dry mouth": 1, "Dupuytren's contracture": 1, "Dysmorphism": 1, "Ear pain": 1, "Endodontic procedure": 1, "Erythromelalgia": 1, "Essential hypertension": 1, "Eye pain": 1, "Eye swelling": 1, "Fear of death": 1, "Foreign body sensation in eyes": 1, "Furuncle": 1, "Gait inability": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin increased": 1, "Goitre": 1, "Haematuria": 1, "Haemorrhage": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Hepatic pain": 1, "Hyperglycaemia": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Immune system disorder": 1, "Impaired driving ability": 1, "Incorrect dose administered": 1, "Incorrect product formulation administered": 1, "Influenza": 1, "Injection site bruising": 1, "Injection site cellulitis": 1, "Injection site discomfort": 1, "Injection site induration": 1, "Injection site inflammation": 1, "Injection site mass": 1, "Injection site urticaria": 1, "Intentional product use issue": 1, "Joint stiffness": 1, "Joint swelling": 1, "Laboratory test": 1, "Laziness": 1, "Lip injury": 1, "Lymph node pain": 1, "Magnetic resonance imaging head": 1, "Mass": 1, "Mastication disorder": 1, "Mechanical urticaria": 1, "Meniere's disease": 1, "Mouth swelling": 1, "Movement disorder": 1, "Muscle disorder": 1, "Muscle fatigue": 1, "Muscle tightness": 1, "Musculoskeletal disorder": 1, "Myasthenia gravis": 1, "Nasal discomfort": 1, "Neuralgia": 1, "Neuritis": 1, "No adverse event": 1, "Nonspecific reaction": 1, "Nystagmus": 1, "Oedema": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Paralysis": 1, "Pathology test": 1, "Periarthritis": 1, "Pericardial effusion": 1, "Phantom limb syndrome": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polymyalgia rheumatica": 1, "Poor quality sleep": 1, "Postoperative ileus": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy": 1, "Prenatal screening test": 1, "Product availability issue": 1, "Product quality issue": 1, "Productive cough": 1, "Protein C": 1, "Protein S": 1, "Prothrombin time": 1, "Pulmonary embolism": 1, "Pulmonary oedema": 1, "Pyuria": 1, "Respiratory rate": 1, "Retching": 1, "Russell's viper venom time": 1, "SARS-CoV-2 antibody test positive": 1, "Salt craving": 1, "Sciatica": 1, "Seizure": 1, "Sensory loss": 1, "Sepsis": 1, "Sinusitis": 1, "Skin cancer": 1, "Skin discolouration": 1, "Skin disorder": 1, "Skin swelling": 1, "Skin test negative": 1, "Skin test positive": 1, "Skin tightness": 1, "Skin wrinkling": 1, "Sluggishness": 1, "Small intestinal obstruction": 1, "Sneezing": 1, "Systemic lupus erythematosus": 1, "Temperature intolerance": 1, "Tension": 1, "Thermal burn": 1, "Throat irritation": 1, "Throat tightness": 1, "Thyroid mass": 1, "Tongue discomfort": 1, "Tongue erythema": 1, "Toothache": 1, "Tracheal inflammation": 1, "Trigeminal neuralgia": 1, "Tryptase increased": 1, "Ultrasound foetal": 1, "Ultrasound uterus": 1, "Underdose": 1, "Urethral haemorrhage": 1, "Vaccination site cellulitis": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site exfoliation": 1, "Vaccination site irritation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site nodule": 1, "Vaccination site paraesthesia": 1, "Ventricular extrasystoles": 1, "Vertigo positional": 1, "Visual impairment": 1, "Walking aid user": 1, "White blood cell count increased": 1}, "batchcodes": ["027L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L20F.json b/docs/data/histograms/United States/027L20F.json
index da491afd28d..190b53ee82f 100644
--- a/docs/data/histograms/United States/027L20F.json
+++ b/docs/data/histograms/United States/027L20F.json
@@ -1 +1 @@
-{"batchcode": "027L20F", "histograms": [{"batchcodes": ["027L20F"], "histogram": {"Vaccination site erythema": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "027L20F", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site rash": 1}, "batchcodes": ["027L20F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L20H.json b/docs/data/histograms/United States/027L20H.json
index 90067b9cb75..e48eb6f2d18 100644
--- a/docs/data/histograms/United States/027L20H.json
+++ b/docs/data/histograms/United States/027L20H.json
@@ -1 +1 @@
-{"batchcode": "027L20H", "histograms": [{"batchcodes": ["027L20H"], "histogram": {"Papule": 1, "Rash pruritic": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "027L20H", "histograms": [{"histogram": {"Papule": 1, "Rash pruritic": 1, "Urticaria": 1}, "batchcodes": ["027L20H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L20LA.json b/docs/data/histograms/United States/027L20LA.json
index c5198c62657..7403c6e885c 100644
--- a/docs/data/histograms/United States/027L20LA.json
+++ b/docs/data/histograms/United States/027L20LA.json
@@ -1 +1 @@
-{"batchcode": "027L20LA", "histograms": [{"batchcodes": ["027L20LA"], "histogram": {"Dizziness": 1, "Headache": 1, "Nausea": 1, "Renal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027L20LA", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Nausea": 1, "Renal pain": 1}, "batchcodes": ["027L20LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L21.json b/docs/data/histograms/United States/027L21.json
index ebfb16c93bd..1b6043a287f 100644
--- a/docs/data/histograms/United States/027L21.json
+++ b/docs/data/histograms/United States/027L21.json
@@ -1 +1 @@
-{"batchcode": "027L21", "histograms": [{"batchcodes": ["027L21"], "histogram": {"COVID-19": 1, "Nasal congestion": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "027L21", "histograms": [{"histogram": {"COVID-19": 1, "Nasal congestion": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["027L21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L214.json b/docs/data/histograms/United States/027L214.json
index 1fbbd81d322..356f1c2a248 100644
--- a/docs/data/histograms/United States/027L214.json
+++ b/docs/data/histograms/United States/027L214.json
@@ -1 +1 @@
-{"batchcode": "027L214", "histograms": [{"batchcodes": ["027L214"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "027L214", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["027L214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L21A ..json b/docs/data/histograms/United States/027L21A ..json
index 24aca934d64..ed814506b16 100644
--- a/docs/data/histograms/United States/027L21A ..json
+++ b/docs/data/histograms/United States/027L21A ..json
@@ -1 +1 @@
-{"batchcode": "027L21A .", "histograms": [{"batchcodes": ["027L21A ."], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "027L21A .", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["027L21A ."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L21A.json b/docs/data/histograms/United States/027L21A.json
index c443501f28b..2e0a57262c1 100644
--- a/docs/data/histograms/United States/027L21A.json
+++ b/docs/data/histograms/United States/027L21A.json
@@ -1 +1 @@
-{"batchcode": "027L21A", "histograms": [{"batchcodes": ["027L21A"], "histogram": {"Expired product administered": 85, "Product storage error": 83, "Product temperature excursion issue": 29, "Poor quality product administered": 28, "SARS-CoV-2 test": 9, "Inappropriate schedule of product administration": 7, "COVID-19": 5, "Accidental underdose": 3, "Pruritus": 3, "Device connection issue": 2, "Feeling abnormal": 2, "Inflammation": 2, "Lethargy": 2, "Neck pain": 2, "No adverse event": 2, "Pain in extremity": 2, "Rash": 2, "Abdominal distension": 1, "Abdominal rigidity": 1, "Acute chest syndrome": 1, "Aneurysm": 1, "Arthralgia": 1, "Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Crohn's disease": 1, "Death": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Feeling cold": 1, "Gastrointestinal sounds abnormal": 1, "Glossodynia": 1, "Histamine level": 1, "Hypoaesthesia": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Migraine": 1, "Muscle spasms": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Thrombosis": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "027L21A", "histograms": [{"histogram": {"Expired product administered": 85, "Product storage error": 83, "Product temperature excursion issue": 29, "Poor quality product administered": 28, "SARS-CoV-2 test": 9, "Inappropriate schedule of product administration": 7, "COVID-19": 5, "Accidental underdose": 3, "Pruritus": 3, "Device connection issue": 2, "Feeling abnormal": 2, "Inflammation": 2, "Lethargy": 2, "Neck pain": 2, "No adverse event": 2, "Pain in extremity": 2, "Rash": 2, "Abdominal distension": 1, "Abdominal rigidity": 1, "Acute chest syndrome": 1, "Aneurysm": 1, "Arthralgia": 1, "Body temperature": 1, "Chest discomfort": 1, "Chest pain": 1, "Crohn's disease": 1, "Death": 1, "Erythema": 1, "Fall": 1, "Fatigue": 1, "Feeling cold": 1, "Gastrointestinal sounds abnormal": 1, "Glossodynia": 1, "Histamine level": 1, "Hypoaesthesia": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Maternal exposure during pregnancy": 1, "Migraine": 1, "Muscle spasms": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Pyrexia": 1, "Swelling": 1, "Swelling face": 1, "Swollen tongue": 1, "Thrombosis": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1}, "batchcodes": ["027L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L21B.json b/docs/data/histograms/United States/027L21B.json
index 83cbffb64f3..3a3ea6a074e 100644
--- a/docs/data/histograms/United States/027L21B.json
+++ b/docs/data/histograms/United States/027L21B.json
@@ -1 +1 @@
-{"batchcode": "027L21B", "histograms": [{"batchcodes": ["027L21B"], "histogram": {"Extra dose administered": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "027L21B", "histograms": [{"histogram": {"Extra dose administered": 1, "Rash": 1}, "batchcodes": ["027L21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L2DA.json b/docs/data/histograms/United States/027L2DA.json
index 70a7767849d..8a01d401449 100644
--- a/docs/data/histograms/United States/027L2DA.json
+++ b/docs/data/histograms/United States/027L2DA.json
@@ -1 +1 @@
-{"batchcode": "027L2DA", "histograms": [{"batchcodes": ["027L2DA"], "histogram": {"Fatigue": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "027L2DA", "histograms": [{"histogram": {"Fatigue": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["027L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L2OA.json b/docs/data/histograms/United States/027L2OA.json
index d4cde724ef7..2f7d18bcb82 100644
--- a/docs/data/histograms/United States/027L2OA.json
+++ b/docs/data/histograms/United States/027L2OA.json
@@ -1 +1 @@
-{"batchcode": "027L2OA", "histograms": [{"batchcodes": ["027L2OA"], "histogram": {"Pyrexia": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Flushing": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site scar": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "027L2OA", "histograms": [{"histogram": {"Pyrexia": 2, "Abdominal discomfort": 1, "Asthenia": 1, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Flushing": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site scar": 1, "Vaccination site swelling": 1}, "batchcodes": ["027L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027L2UA.json b/docs/data/histograms/United States/027L2UA.json
index 59ed5b7c60e..1673f4e5598 100644
--- a/docs/data/histograms/United States/027L2UA.json
+++ b/docs/data/histograms/United States/027L2UA.json
@@ -1 +1 @@
-{"batchcode": "027L2UA", "histograms": [{"batchcodes": ["027L2UA"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "027L2UA", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["027L2UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027LV0A.json b/docs/data/histograms/United States/027LV0A.json
index 597eb5cfa61..1547491bf63 100644
--- a/docs/data/histograms/United States/027LV0A.json
+++ b/docs/data/histograms/United States/027LV0A.json
@@ -1 +1 @@
-{"batchcode": "027LV0A", "histograms": [{"batchcodes": ["027LV0A"], "histogram": {"Exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "027LV0A", "histograms": [{"histogram": {"Exposure during pregnancy": 1}, "batchcodes": ["027LV0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027LZ0A.json b/docs/data/histograms/United States/027LZ0A.json
index 0c388f8a4f7..f2193c88425 100644
--- a/docs/data/histograms/United States/027LZ0A.json
+++ b/docs/data/histograms/United States/027LZ0A.json
@@ -1 +1 @@
-{"batchcode": "027LZ0A", "histograms": [{"batchcodes": ["027LZ0A"], "histogram": {"Fatigue": 3, "Balance disorder": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Dizziness": 1, "Gait disturbance": 1, "Gait inability": 1, "Headache": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Myalgia": 1, "Oxygen consumption decreased": 1, "Oxygen saturation": 1, "Respiratory rate increased": 1, "Speech disorder": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "027LZ0A", "histograms": [{"histogram": {"Fatigue": 3, "Balance disorder": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Dizziness": 1, "Gait disturbance": 1, "Gait inability": 1, "Headache": 1, "Hypertension": 1, "Inappropriate schedule of product administration": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Myalgia": 1, "Oxygen consumption decreased": 1, "Oxygen saturation": 1, "Respiratory rate increased": 1, "Speech disorder": 1, "Vertigo": 1}, "batchcodes": ["027LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027LZOA.json b/docs/data/histograms/United States/027LZOA.json
index 2f1f11cfc8e..f4757c090f7 100644
--- a/docs/data/histograms/United States/027LZOA.json
+++ b/docs/data/histograms/United States/027LZOA.json
@@ -1 +1 @@
-{"batchcode": "027LZOA", "histograms": [{"batchcodes": ["027LZOA"], "histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "027LZOA", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Rhinorrhoea": 1}, "batchcodes": ["027LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027M20A.json b/docs/data/histograms/United States/027M20A.json
index 9b0a897ecf4..60cab159027 100644
--- a/docs/data/histograms/United States/027M20A.json
+++ b/docs/data/histograms/United States/027M20A.json
@@ -1 +1 @@
-{"batchcode": "027M20A", "histograms": [{"batchcodes": ["027M20A"], "histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Diarrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "027M20A", "histograms": [{"histogram": {"Abdominal distension": 1, "Abdominal pain": 1, "Diarrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["027M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027M21B.json b/docs/data/histograms/United States/027M21B.json
index 9884aa72d74..f5ea8f4da0b 100644
--- a/docs/data/histograms/United States/027M21B.json
+++ b/docs/data/histograms/United States/027M21B.json
@@ -1 +1 @@
-{"batchcode": "027M21B", "histograms": [{"batchcodes": ["027M21B"], "histogram": {"Burning sensation": 1, "Feeling hot": 1, "Headache": 1, "Induration": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "027M21B", "histograms": [{"histogram": {"Burning sensation": 1, "Feeling hot": 1, "Headache": 1, "Induration": 1, "Loss of consciousness": 1, "Mobility decreased": 1, "Pain in extremity": 1, "Vaccination site mass": 1}, "batchcodes": ["027M21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027N21A.json b/docs/data/histograms/United States/027N21A.json
index 6c2fd37985e..7c7153f0fbb 100644
--- a/docs/data/histograms/United States/027N21A.json
+++ b/docs/data/histograms/United States/027N21A.json
@@ -1 +1 @@
-{"batchcode": "027N21A", "histograms": [{"batchcodes": ["027N21A"], "histogram": {"Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate irregular": 1, "Lethargy": 1}}]}
\ No newline at end of file
+{"batchcode": "027N21A", "histograms": [{"histogram": {"Chills": 1, "Dizziness": 1, "Dyspnoea": 1, "Headache": 1, "Heart rate irregular": 1, "Lethargy": 1}, "batchcodes": ["027N21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027O21A.json b/docs/data/histograms/United States/027O21A.json
index e3000b11424..44d99d99f68 100644
--- a/docs/data/histograms/United States/027O21A.json
+++ b/docs/data/histograms/United States/027O21A.json
@@ -1 +1 @@
-{"batchcode": "027O21A", "histograms": [{"batchcodes": ["027O21A"], "histogram": {"Angina pectoris": 1, "Back pain": 1, "Body temperature": 1, "Cardiospasm": 1, "Chest pain": 1, "Chills": 1, "Discomfort": 1, "Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Impaired work ability": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "027O21A", "histograms": [{"histogram": {"Angina pectoris": 1, "Back pain": 1, "Body temperature": 1, "Cardiospasm": 1, "Chest pain": 1, "Chills": 1, "Discomfort": 1, "Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Impaired work ability": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Vision blurred": 1}, "batchcodes": ["027O21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/027T21A.json b/docs/data/histograms/United States/027T21A.json
index 07f14786010..66541c81a5a 100644
--- a/docs/data/histograms/United States/027T21A.json
+++ b/docs/data/histograms/United States/027T21A.json
@@ -1 +1 @@
-{"batchcode": "027T21A", "histograms": [{"batchcodes": ["027T21A"], "histogram": {"Headache": 1, "Pain": 1, "Pyrexia": 1, "Tongue discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "027T21A", "histograms": [{"histogram": {"Headache": 1, "Pain": 1, "Pyrexia": 1, "Tongue discolouration": 1}, "batchcodes": ["027T21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028(L OR Z?)20A.json b/docs/data/histograms/United States/028(L OR Z?)20A.json
index e80e26d7172..553f47173cc 100644
--- a/docs/data/histograms/United States/028(L OR Z?)20A.json
+++ b/docs/data/histograms/United States/028(L OR Z?)20A.json
@@ -1 +1 @@
-{"batchcode": "028(L OR Z?)20A", "histograms": [{"batchcodes": ["028(L OR Z?)20A"], "histogram": {"Urticaria": 2, "Herpes zoster": 1, "Pruritus": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "028(L OR Z?)20A", "histograms": [{"histogram": {"Urticaria": 2, "Herpes zoster": 1, "Pruritus": 1, "Rash pruritic": 1}, "batchcodes": ["028(L OR Z?)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028-A21A.json b/docs/data/histograms/United States/028-A21A.json
index 40235410a03..4fd2f0ec75c 100644
--- a/docs/data/histograms/United States/028-A21A.json
+++ b/docs/data/histograms/United States/028-A21A.json
@@ -1 +1 @@
-{"batchcode": "028-A21A", "histograms": [{"batchcodes": ["028-A21A"], "histogram": {"Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "028-A21A", "histograms": [{"histogram": {"Hypoaesthesia": 1}, "batchcodes": ["028-A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0280L20A.json b/docs/data/histograms/United States/0280L20A.json
index da0564c003c..4bd894f7064 100644
--- a/docs/data/histograms/United States/0280L20A.json
+++ b/docs/data/histograms/United States/0280L20A.json
@@ -1 +1 @@
-{"batchcode": "0280L20A", "histograms": [{"batchcodes": ["0280L20A"], "histogram": {"Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0280L20A", "histograms": [{"histogram": {"Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["0280L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0281120A.json b/docs/data/histograms/United States/0281120A.json
index 73850b5b8d1..33fb1c956bb 100644
--- a/docs/data/histograms/United States/0281120A.json
+++ b/docs/data/histograms/United States/0281120A.json
@@ -1 +1 @@
-{"batchcode": "0281120A", "histograms": [{"batchcodes": ["0281120A"], "histogram": {"Asthma": 1, "Atrial fibrillation": 1, "Dyspnoea": 1, "Eye colour change": 1, "Insomnia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "0281120A", "histograms": [{"histogram": {"Asthma": 1, "Atrial fibrillation": 1, "Dyspnoea": 1, "Eye colour change": 1, "Insomnia": 1, "Tremor": 1}, "batchcodes": ["0281120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028120A.json b/docs/data/histograms/United States/028120A.json
index bebca4bc158..684913b2662 100644
--- a/docs/data/histograms/United States/028120A.json
+++ b/docs/data/histograms/United States/028120A.json
@@ -1 +1 @@
-{"batchcode": "028120A", "histograms": [{"batchcodes": ["028120A"], "histogram": {"Pyrexia": 5, "Chills": 3, "Fatigue": 3, "Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Discomfort": 2, "Injection site pain": 2, "Neck pain": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Antinuclear antibody": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest discomfort": 1, "Delirium": 1, "Dizziness": 1, "Ear pain": 1, "Erythema migrans": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Femoral nerve injury": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Illness": 1, "Insomnia": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Myalgia": 1, "Nodule": 1, "Oedema mouth": 1, "Pain": 1, "Pruritus": 1, "Red blood cell sedimentation rate decreased": 1, "Renal function test": 1, "SARS-CoV-2 antibody test negative": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site cellulitis": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "028120A", "histograms": [{"histogram": {"Pyrexia": 5, "Chills": 3, "Fatigue": 3, "Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Discomfort": 2, "Injection site pain": 2, "Neck pain": 2, "Pain in extremity": 2, "Peripheral swelling": 2, "Antinuclear antibody": 1, "Blood creatine phosphokinase": 1, "Blood pressure measurement": 1, "C-reactive protein": 1, "C-reactive protein increased": 1, "Chest discomfort": 1, "Delirium": 1, "Dizziness": 1, "Ear pain": 1, "Erythema migrans": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Femoral nerve injury": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Hypokinesia": 1, "Illness": 1, "Insomnia": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Myalgia": 1, "Nodule": 1, "Oedema mouth": 1, "Pain": 1, "Pruritus": 1, "Red blood cell sedimentation rate decreased": 1, "Renal function test": 1, "SARS-CoV-2 antibody test negative": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site cellulitis": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["028120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0281721A.json b/docs/data/histograms/United States/0281721A.json
index dfadf4916f0..9c1bc996828 100644
--- a/docs/data/histograms/United States/0281721A.json
+++ b/docs/data/histograms/United States/0281721A.json
@@ -1 +1 @@
-{"batchcode": "0281721A", "histograms": [{"batchcodes": ["0281721A"], "histogram": {"Abdominal discomfort": 1, "Body temperature": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Headache": 1, "Pyrexia": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "0281721A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Body temperature": 1, "Condition aggravated": 1, "Diarrhoea": 1, "Headache": 1, "Pyrexia": 1, "Tinnitus": 1}, "batchcodes": ["0281721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0281921A.json b/docs/data/histograms/United States/0281921A.json
index 1d84fbf26a3..067893fc18d 100644
--- a/docs/data/histograms/United States/0281921A.json
+++ b/docs/data/histograms/United States/0281921A.json
@@ -1 +1 @@
-{"batchcode": "0281921A", "histograms": [{"batchcodes": ["0281921A"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Illness": 1, "Myalgia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0281921A", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Hyperhidrosis": 1, "Illness": 1, "Myalgia": 1, "Vomiting": 1}, "batchcodes": ["0281921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0281A21A.json b/docs/data/histograms/United States/0281A21A.json
index 9512df70e3c..ef1d46b0348 100644
--- a/docs/data/histograms/United States/0281A21A.json
+++ b/docs/data/histograms/United States/0281A21A.json
@@ -1 +1 @@
-{"batchcode": "0281A21A", "histograms": [{"batchcodes": ["0281A21A"], "histogram": {"Blood glucose decreased": 1, "Blood pressure measurement": 1, "Feeling abnormal": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Intentional dose omission": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "0281A21A", "histograms": [{"histogram": {"Blood glucose decreased": 1, "Blood pressure measurement": 1, "Feeling abnormal": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Intentional dose omission": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["0281A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0281A27A.json b/docs/data/histograms/United States/0281A27A.json
index 195356e95eb..88c1241da17 100644
--- a/docs/data/histograms/United States/0281A27A.json
+++ b/docs/data/histograms/United States/0281A27A.json
@@ -1 +1 @@
-{"batchcode": "0281A27A", "histograms": [{"batchcodes": ["0281A27A"], "histogram": {"Body temperature": 1, "Chills": 1, "Cold sweat": 1, "Decreased appetite": 1, "Feeling abnormal": 1, "Pain in extremity": 1, "Pyrexia": 1, "Renal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0281A27A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Cold sweat": 1, "Decreased appetite": 1, "Feeling abnormal": 1, "Pain in extremity": 1, "Pyrexia": 1, "Renal pain": 1}, "batchcodes": ["0281A27A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0281_20A.json b/docs/data/histograms/United States/0281_20A.json
index 742dc8e221d..75bacda3de3 100644
--- a/docs/data/histograms/United States/0281_20A.json
+++ b/docs/data/histograms/United States/0281_20A.json
@@ -1 +1 @@
-{"batchcode": "0281_20A", "histograms": [{"batchcodes": ["0281_20A"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0281_20A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Fatigue": 1, "Headache": 1, "Pruritus": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1, "Urticaria": 1}, "batchcodes": ["0281_20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02820A.json b/docs/data/histograms/United States/02820A.json
index 67fe8b27b19..713df63ec3d 100644
--- a/docs/data/histograms/United States/02820A.json
+++ b/docs/data/histograms/United States/02820A.json
@@ -1 +1 @@
-{"batchcode": "02820A", "histograms": [{"batchcodes": ["02820A"], "histogram": {"Injection site erythema": 1, "Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "02820A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pruritus": 1}, "batchcodes": ["02820A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02821A.json b/docs/data/histograms/United States/02821A.json
index 8e3ccf8d46a..2c5b5559f70 100644
--- a/docs/data/histograms/United States/02821A.json
+++ b/docs/data/histograms/United States/02821A.json
@@ -1 +1 @@
-{"batchcode": "02821A", "histograms": [{"batchcodes": ["02821A"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "02821A", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["02821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028220A.json b/docs/data/histograms/United States/028220A.json
index bee56d7987d..1b2d2081324 100644
--- a/docs/data/histograms/United States/028220A.json
+++ b/docs/data/histograms/United States/028220A.json
@@ -1 +1 @@
-{"batchcode": "028220A", "histograms": [{"batchcodes": ["028220A"], "histogram": {"Ear discomfort": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Headache": 1, "Illness": 1, "Influenza like illness": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "028220A", "histograms": [{"histogram": {"Ear discomfort": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Headache": 1, "Illness": 1, "Influenza like illness": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urticaria": 1}, "batchcodes": ["028220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028420A.json b/docs/data/histograms/United States/028420A.json
index 935c5c9026b..6b5d121ff54 100644
--- a/docs/data/histograms/United States/028420A.json
+++ b/docs/data/histograms/United States/028420A.json
@@ -1 +1 @@
-{"batchcode": "028420A", "histograms": [{"batchcodes": ["028420A"], "histogram": {"Headache": 1, "Pain": 1, "Pain in extremity": 1, "Rash macular": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "028420A", "histograms": [{"histogram": {"Headache": 1, "Pain": 1, "Pain in extremity": 1, "Rash macular": 1, "Rash pruritic": 1}, "batchcodes": ["028420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028421A.json b/docs/data/histograms/United States/028421A.json
index bfc9fc3d8bb..b6b9c0b9938 100644
--- a/docs/data/histograms/United States/028421A.json
+++ b/docs/data/histograms/United States/028421A.json
@@ -1 +1 @@
-{"batchcode": "028421A", "histograms": [{"batchcodes": ["028421A"], "histogram": {"Vaccination site pain": 2}}]}
\ No newline at end of file
+{"batchcode": "028421A", "histograms": [{"histogram": {"Vaccination site pain": 2}, "batchcodes": ["028421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02862014.json b/docs/data/histograms/United States/02862014.json
index 74844a8b5c6..807588c25cc 100644
--- a/docs/data/histograms/United States/02862014.json
+++ b/docs/data/histograms/United States/02862014.json
@@ -1 +1 @@
-{"batchcode": "02862014", "histograms": [{"batchcodes": ["02862014"], "histogram": {"Condition aggravated": 1, "Decreased appetite": 1, "Eating disorder": 1, "Vein discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "02862014", "histograms": [{"histogram": {"Condition aggravated": 1, "Decreased appetite": 1, "Eating disorder": 1, "Vein discolouration": 1}, "batchcodes": ["02862014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028620A.json b/docs/data/histograms/United States/028620A.json
index f490adcfd2d..772c0214c79 100644
--- a/docs/data/histograms/United States/028620A.json
+++ b/docs/data/histograms/United States/028620A.json
@@ -1 +1 @@
-{"batchcode": "028620A", "histograms": [{"batchcodes": ["028620A"], "histogram": {"Extra dose administered": 2, "Fatigue": 2, "Feeling abnormal": 2, "SARS-CoV-2 antibody test": 2, "Tenderness": 2, "Anaphylactic reaction": 1, "Injection site mass": 1, "Overdose": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination complication": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "028620A", "histograms": [{"histogram": {"Extra dose administered": 2, "Fatigue": 2, "Feeling abnormal": 2, "SARS-CoV-2 antibody test": 2, "Tenderness": 2, "Anaphylactic reaction": 1, "Injection site mass": 1, "Overdose": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination complication": 1, "Vaccination site reaction": 1}, "batchcodes": ["028620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028720A.json b/docs/data/histograms/United States/028720A.json
index 2c2314ef1f9..db14e799577 100644
--- a/docs/data/histograms/United States/028720A.json
+++ b/docs/data/histograms/United States/028720A.json
@@ -1 +1 @@
-{"batchcode": "028720A", "histograms": [{"batchcodes": ["028720A"], "histogram": {"Erythema": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "028720A", "histograms": [{"histogram": {"Erythema": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Myalgia": 1}, "batchcodes": ["028720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028821A.json b/docs/data/histograms/United States/028821A.json
index 0a0fed7fcee..49edb76a2d9 100644
--- a/docs/data/histograms/United States/028821A.json
+++ b/docs/data/histograms/United States/028821A.json
@@ -1 +1 @@
-{"batchcode": "028821A", "histograms": [{"batchcodes": ["028821A"], "histogram": {"Myalgia": 2, "Balance disorder": 1, "Bedridden": 1, "Body temperature": 1, "Dizziness": 1, "Headache": 1, "Herpes zoster": 1, "Illness": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "028821A", "histograms": [{"histogram": {"Myalgia": 2, "Balance disorder": 1, "Bedridden": 1, "Body temperature": 1, "Dizziness": 1, "Headache": 1, "Herpes zoster": 1, "Illness": 1, "Pyrexia": 1, "Sensitive skin": 1, "Tremor": 1}, "batchcodes": ["028821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028921A.json b/docs/data/histograms/United States/028921A.json
index 97751ccf11f..69ed761442a 100644
--- a/docs/data/histograms/United States/028921A.json
+++ b/docs/data/histograms/United States/028921A.json
@@ -1 +1 @@
-{"batchcode": "028921A", "histograms": [{"batchcodes": ["028921A"], "histogram": {"Epistaxis": 1}}]}
\ No newline at end of file
+{"batchcode": "028921A", "histograms": [{"histogram": {"Epistaxis": 1}, "batchcodes": ["028921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028?21A.json b/docs/data/histograms/United States/028?21A.json
index 4109f6fce9c..5a3b4dab46a 100644
--- a/docs/data/histograms/United States/028?21A.json
+++ b/docs/data/histograms/United States/028?21A.json
@@ -1 +1 @@
-{"batchcode": "028?21A", "histograms": [{"batchcodes": ["028?21A"], "histogram": {"Tardive dyskinesia": 1}}]}
\ No newline at end of file
+{"batchcode": "028?21A", "histograms": [{"histogram": {"Tardive dyskinesia": 1}, "batchcodes": ["028?21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A 21A.json b/docs/data/histograms/United States/028A 21A.json
index f24aaa7dc3e..52776e2608d 100644
--- a/docs/data/histograms/United States/028A 21A.json
+++ b/docs/data/histograms/United States/028A 21A.json
@@ -1 +1 @@
-{"batchcode": "028A 21A", "histograms": [{"batchcodes": ["028A 21A"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "028A 21A", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["028A 21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A--A.json b/docs/data/histograms/United States/028A--A.json
index b3b79914ab9..8c10b6e80c8 100644
--- a/docs/data/histograms/United States/028A--A.json
+++ b/docs/data/histograms/United States/028A--A.json
@@ -1 +1 @@
-{"batchcode": "028A--A", "histograms": [{"batchcodes": ["028A--A"], "histogram": {"Feeling hot": 1, "Flushing": 1, "Malaise": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "028A--A", "histograms": [{"histogram": {"Feeling hot": 1, "Flushing": 1, "Malaise": 1, "Swelling face": 1}, "batchcodes": ["028A--A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A.json b/docs/data/histograms/United States/028A.json
index bba5397e10e..1851a9772a5 100644
--- a/docs/data/histograms/United States/028A.json
+++ b/docs/data/histograms/United States/028A.json
@@ -1 +1 @@
-{"batchcode": "028A", "histograms": [{"batchcodes": ["028A"], "histogram": {"Paraesthesia": 2, "Aneurysm": 1, "Angiogram": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Headache": 1, "Lip swelling": 1, "Pain in extremity": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "028A", "histograms": [{"histogram": {"Paraesthesia": 2, "Aneurysm": 1, "Angiogram": 1, "Blood pressure measurement": 1, "Computerised tomogram": 1, "Headache": 1, "Lip swelling": 1, "Pain in extremity": 1, "Tremor": 1}, "batchcodes": ["028A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A1A.json b/docs/data/histograms/United States/028A1A.json
index 789f2827313..3f41847feac 100644
--- a/docs/data/histograms/United States/028A1A.json
+++ b/docs/data/histograms/United States/028A1A.json
@@ -1 +1 @@
-{"batchcode": "028A1A", "histograms": [{"batchcodes": ["028A1A"], "histogram": {"Autoimmune disorder": 1, "Fatigue": 1, "Feeling abnormal": 1, "Rash": 1, "Synovial cyst": 1, "Urticaria": 1, "Urticaria chronic": 1}}]}
\ No newline at end of file
+{"batchcode": "028A1A", "histograms": [{"histogram": {"Autoimmune disorder": 1, "Fatigue": 1, "Feeling abnormal": 1, "Rash": 1, "Synovial cyst": 1, "Urticaria": 1, "Urticaria chronic": 1}, "batchcodes": ["028A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A2 OR 078A2.json b/docs/data/histograms/United States/028A2 OR 078A2.json
index 9ebc58fe4cd..254758ca41d 100644
--- a/docs/data/histograms/United States/028A2 OR 078A2.json
+++ b/docs/data/histograms/United States/028A2 OR 078A2.json
@@ -1 +1 @@
-{"batchcode": "028A2 OR 078A2", "histograms": [{"batchcodes": ["028A2 OR 078A2"], "histogram": {"Arthralgia": 1, "Cardiac disorder": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypersomnia": 1, "Pulmonary embolism": 1, "Weight": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "028A2 OR 078A2", "histograms": [{"histogram": {"Arthralgia": 1, "Cardiac disorder": 1, "Computerised tomogram": 1, "Deep vein thrombosis": 1, "Dyspnoea": 1, "Fatigue": 1, "Hypersomnia": 1, "Pulmonary embolism": 1, "Weight": 1, "Weight decreased": 1}, "batchcodes": ["028A2 OR 078A2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A20A.json b/docs/data/histograms/United States/028A20A.json
index 4c82c5dbce0..625bfefc6ac 100644
--- a/docs/data/histograms/United States/028A20A.json
+++ b/docs/data/histograms/United States/028A20A.json
@@ -1 +1 @@
-{"batchcode": "028A20A", "histograms": [{"batchcodes": ["028A20A"], "histogram": {"Headache": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "028A20A", "histograms": [{"histogram": {"Headache": 1, "Nausea": 1}, "batchcodes": ["028A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A211(4 OR A).json b/docs/data/histograms/United States/028A211(4 OR A).json
index be491b6eac0..5b02919468b 100644
--- a/docs/data/histograms/United States/028A211(4 OR A).json
+++ b/docs/data/histograms/United States/028A211(4 OR A).json
@@ -1 +1 @@
-{"batchcode": "028A211(4 OR A)", "histograms": [{"batchcodes": ["028A211(4 OR A)"], "histogram": {"Arthralgia": 2, "Gait disturbance": 2, "Insomnia": 2, "Joint swelling": 2, "Muscle spasms": 2, "Peripheral swelling": 2, "Foot prosthesis user": 1, "Headache": 1, "Hypokinesia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "028A211(4 OR A)", "histograms": [{"histogram": {"Arthralgia": 2, "Gait disturbance": 2, "Insomnia": 2, "Joint swelling": 2, "Muscle spasms": 2, "Peripheral swelling": 2, "Foot prosthesis user": 1, "Headache": 1, "Hypokinesia": 1, "Pain in extremity": 1}, "batchcodes": ["028A211(4 OR A)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A214.json b/docs/data/histograms/United States/028A214.json
index ae102e5681a..7b1786a4aa6 100644
--- a/docs/data/histograms/United States/028A214.json
+++ b/docs/data/histograms/United States/028A214.json
@@ -1 +1 @@
-{"batchcode": "028A214", "histograms": [{"batchcodes": ["028A214"], "histogram": {"Product administered at inappropriate site": 1}}]}
\ No newline at end of file
+{"batchcode": "028A214", "histograms": [{"histogram": {"Product administered at inappropriate site": 1}, "batchcodes": ["028A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A214A.json b/docs/data/histograms/United States/028A214A.json
index 10cea9755af..a75d6c83d06 100644
--- a/docs/data/histograms/United States/028A214A.json
+++ b/docs/data/histograms/United States/028A214A.json
@@ -1 +1 @@
-{"batchcode": "028A214A", "histograms": [{"batchcodes": ["028A214A"], "histogram": {"Contusion": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "028A214A", "histograms": [{"histogram": {"Contusion": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["028A214A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A21A (UNSURE.json b/docs/data/histograms/United States/028A21A (UNSURE.json
index decd4ae7ea7..c3cb1df595f 100644
--- a/docs/data/histograms/United States/028A21A (UNSURE.json
+++ b/docs/data/histograms/United States/028A21A (UNSURE.json
@@ -1 +1 @@
-{"batchcode": "028A21A (UNSURE", "histograms": [{"batchcodes": ["028A21A (UNSURE"], "histogram": {"Chills": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "028A21A (UNSURE", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["028A21A (UNSURE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A21A..json b/docs/data/histograms/United States/028A21A..json
index ad0a92ff96a..babf8db32ec 100644
--- a/docs/data/histograms/United States/028A21A..json
+++ b/docs/data/histograms/United States/028A21A..json
@@ -1 +1 @@
-{"batchcode": "028A21A.", "histograms": [{"batchcodes": ["028A21A."], "histogram": {"Chills": 2, "Fatigue": 2, "Pain in extremity": 2, "Pyrexia": 2, "Diarrhoea": 1, "Dizziness": 1, "Pain": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "028A21A.", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Pain in extremity": 2, "Pyrexia": 2, "Diarrhoea": 1, "Dizziness": 1, "Pain": 1, "Peripheral swelling": 1}, "batchcodes": ["028A21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A21A.json b/docs/data/histograms/United States/028A21A.json
index d1472a016d7..98fec3177be 100644
--- a/docs/data/histograms/United States/028A21A.json
+++ b/docs/data/histograms/United States/028A21A.json
@@ -1 +1 @@
-{"batchcode": "028A21A", "histograms": [{"batchcodes": ["025A21A", "028A21A"], "histogram": {"Chills": 1, "Injection site pain": 1, "Myalgia": 1, "Night sweats": 1, "Pyrexia": 1}}, {"batchcodes": ["028A21A", "F2590"], "histogram": {"Diplopia": 1, "Headache": 1, "Skin discolouration": 1, "Urticaria": 1, "Vision blurred": 1}}, {"batchcodes": ["028A21A"], "histogram": {"Expired product administered": 46, "Chills": 38, "Pain in extremity": 38, "Fatigue": 37, "Headache": 35, "Pyrexia": 35, "Vaccination site pain": 30, "Myalgia": 29, "Dizziness": 17, "Pruritus": 16, "Rash": 16, "Vaccination site erythema": 16, "Nausea": 13, "Pain": 12, "Feeling abnormal": 11, "Vaccination site swelling": 11, "Arthralgia": 9, "Erythema": 9, "Illness": 9, "Lymphadenopathy": 9, "Urticaria": 9, "Body temperature": 8, "Malaise": 8, "Oropharyngeal pain": 8, "Product dose omission issue": 8, "Vaccination site rash": 8, "Vomiting": 8, "Asthenia": 7, "COVID-19": 7, "Feeling hot": 7, "Peripheral swelling": 7, "Back pain": 6, "Diarrhoea": 6, "Hypoaesthesia": 6, "Lip swelling": 6, "Palpitations": 6, "Rash pruritic": 6, "SARS-CoV-2 test": 6, "Tinnitus": 6, "Vaccination site pruritus": 6, "Abdominal discomfort": 5, "Blood test": 5, "Hyperhidrosis": 5, "Influenza like illness": 5, "Throat irritation": 5, "Chest discomfort": 4, "Dyspnoea": 4, "Gait disturbance": 4, "Heart rate increased": 4, "Hypersensitivity": 4, "Inappropriate schedule of product administration": 4, "Insomnia": 4, "Paraesthesia": 4, "Rash macular": 4, "Speech disorder": 4, "Underdose": 4, "Vaccination site reaction": 4, "Vaccination site warmth": 4, "Vertigo": 4, "Abdominal pain upper": 3, "Chest pain": 3, "Cough": 3, "Decreased appetite": 3, "Dysgeusia": 3, "Exposure via breast milk": 3, "Feeding disorder": 3, "Heart rate": 3, "Hypokinesia": 3, "Inflammation": 3, "Lethargy": 3, "Loss of consciousness": 3, "Rash erythematous": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Swelling": 3, "Swelling face": 3, "Tachycardia": 3, "Tremor": 3, "Ultrasound scan": 3, "Vaccination complication": 3, "Vaccination site haemorrhage": 3, "Vaccination site induration": 3, "Acne": 2, "Antibody test": 2, "Balance disorder": 2, "Bedridden": 2, "Chromaturia": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Device connection issue": 2, "Discomfort": 2, "Drug ineffective": 2, "Exposure during pregnancy": 2, "Eye swelling": 2, "Head discomfort": 2, "Herpes zoster": 2, "Hypersomnia": 2, "Hypertension": 2, "Incorrect dose administered": 2, "Induration": 2, "Injection site induration": 2, "Lip dry": 2, "Lip erythema": 2, "Lip pruritus": 2, "Memory impairment": 2, "Migraine": 2, "Mobility decreased": 2, "Mouth ulceration": 2, "Muscular weakness": 2, "Musculoskeletal discomfort": 2, "Nasopharyngitis": 2, "Neuralgia": 2, "Ocular hyperaemia": 2, "Oral herpes": 2, "Paraesthesia oral": 2, "Pregnancy test": 2, "Presyncope": 2, "Skin burning sensation": 2, "Skin swelling": 2, "Sleep disorder": 2, "Somnolence": 2, "Swollen tongue": 2, "Syringe issue": 2, "Tenderness": 2, "Urine analysis": 2, "Vaccination site mass": 2, "Vision blurred": 2, "X-ray": 2, "Accidental exposure to product": 1, "Anaphylactic shock": 1, "Antibody test abnormal": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthritis": 1, "Axillary pain": 1, "Bell's palsy": 1, "Biopsy liver": 1, "Blindness": 1, "Blister": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood magnesium decreased": 1, "Body temperature increased": 1, "Bone pain": 1, "Breast swelling": 1, "Bronchitis": 1, "Burning sensation": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Cheilitis": 1, "Confusional state": 1, "Constipation": 1, "Contusion": 1, "Crying": 1, "Death": 1, "Disease recurrence": 1, "Disorientation": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear pain": 1, "Eating disorder": 1, "Exposure to SARS-CoV-2": 1, "Facial discomfort": 1, "Fall": 1, "Feeling cold": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Fine motor skill dysfunction": 1, "Flatulence": 1, "Frequent bowel movements": 1, "Frustration tolerance decreased": 1, "Fungal infection": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Glossodynia": 1, "Glycosylated haemoglobin increased": 1, "Haematochezia": 1, "Hepatitis": 1, "Hot flush": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Immunosuppression": 1, "Impaired work ability": 1, "Influenza": 1, "Injection site nodule": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Intentional product use issue": 1, "Irritability": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Limb discomfort": 1, "Limb injury": 1, "Lip pain": 1, "Liquid product physical issue": 1, "Magnetic resonance imaging": 1, "Malabsorption": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Mechanical urticaria": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Odynophagia": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pallor": 1, "Pedantic speech": 1, "Pelvic pain": 1, "Peripheral coldness": 1, "Petechiae": 1, "Physical examination": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Product administered to patient of inappropriate age": 1, "Rectal haemorrhage": 1, "Restlessness": 1, "Rhinitis allergic": 1, "Rhinorrhoea": 1, "Saliva altered": 1, "Scab": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin infection": 1, "Skin mass": 1, "Suspected COVID-19": 1, "Tachypnoea": 1, "Taste disorder": 1, "Throat tightness": 1, "Thyroid function test": 1, "Tongue discomfort": 1, "Tongue ulceration": 1, "Trichoglossia": 1, "Urinary incontinence": 1, "Urinary tract infection": 1, "Urinary tract pain": 1, "Urine output decreased": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site dysaesthesia": 1, "Vaccination site movement impairment": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Visual field defect": 1, "Visual impairment": 1, "Vitamin D decreased": 1, "Vitreous floaters": 1}}]}
\ No newline at end of file
+{"batchcode": "028A21A", "histograms": [{"histogram": {"Chills": 1, "Injection site pain": 1, "Myalgia": 1, "Night sweats": 1, "Pyrexia": 1}, "batchcodes": ["025A21A", "028A21A"]}, {"histogram": {"Diplopia": 1, "Headache": 1, "Skin discolouration": 1, "Urticaria": 1, "Vision blurred": 1}, "batchcodes": ["028A21A", "F2590"]}, {"histogram": {"Expired product administered": 46, "Chills": 38, "Pain in extremity": 38, "Fatigue": 37, "Headache": 35, "Pyrexia": 35, "Vaccination site pain": 30, "Myalgia": 29, "Dizziness": 17, "Pruritus": 16, "Rash": 16, "Vaccination site erythema": 16, "Nausea": 13, "Pain": 12, "Feeling abnormal": 11, "Vaccination site swelling": 11, "Arthralgia": 9, "Erythema": 9, "Illness": 9, "Lymphadenopathy": 9, "Urticaria": 9, "Body temperature": 8, "Malaise": 8, "Oropharyngeal pain": 8, "Product dose omission issue": 8, "Vaccination site rash": 8, "Vomiting": 8, "Asthenia": 7, "COVID-19": 7, "Feeling hot": 7, "Peripheral swelling": 7, "Back pain": 6, "Diarrhoea": 6, "Hypoaesthesia": 6, "Lip swelling": 6, "Palpitations": 6, "Rash pruritic": 6, "SARS-CoV-2 test": 6, "Tinnitus": 6, "Vaccination site pruritus": 6, "Abdominal discomfort": 5, "Blood test": 5, "Hyperhidrosis": 5, "Influenza like illness": 5, "Throat irritation": 5, "Chest discomfort": 4, "Dyspnoea": 4, "Gait disturbance": 4, "Heart rate increased": 4, "Hypersensitivity": 4, "Inappropriate schedule of product administration": 4, "Insomnia": 4, "Paraesthesia": 4, "Rash macular": 4, "Speech disorder": 4, "Underdose": 4, "Vaccination site reaction": 4, "Vaccination site warmth": 4, "Vertigo": 4, "Abdominal pain upper": 3, "Chest pain": 3, "Cough": 3, "Decreased appetite": 3, "Dysgeusia": 3, "Exposure via breast milk": 3, "Feeding disorder": 3, "Heart rate": 3, "Hypokinesia": 3, "Inflammation": 3, "Lethargy": 3, "Loss of consciousness": 3, "Rash erythematous": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Swelling": 3, "Swelling face": 3, "Tachycardia": 3, "Tremor": 3, "Ultrasound scan": 3, "Vaccination complication": 3, "Vaccination site haemorrhage": 3, "Vaccination site induration": 3, "Acne": 2, "Antibody test": 2, "Balance disorder": 2, "Bedridden": 2, "Chromaturia": 2, "Computerised tomogram": 2, "Condition aggravated": 2, "Device connection issue": 2, "Discomfort": 2, "Drug ineffective": 2, "Exposure during pregnancy": 2, "Eye swelling": 2, "Head discomfort": 2, "Herpes zoster": 2, "Hypersomnia": 2, "Hypertension": 2, "Incorrect dose administered": 2, "Induration": 2, "Injection site induration": 2, "Lip dry": 2, "Lip erythema": 2, "Lip pruritus": 2, "Memory impairment": 2, "Migraine": 2, "Mobility decreased": 2, "Mouth ulceration": 2, "Muscular weakness": 2, "Musculoskeletal discomfort": 2, "Nasopharyngitis": 2, "Neuralgia": 2, "Ocular hyperaemia": 2, "Oral herpes": 2, "Paraesthesia oral": 2, "Pregnancy test": 2, "Presyncope": 2, "Skin burning sensation": 2, "Skin swelling": 2, "Sleep disorder": 2, "Somnolence": 2, "Swollen tongue": 2, "Syringe issue": 2, "Tenderness": 2, "Urine analysis": 2, "Vaccination site mass": 2, "Vision blurred": 2, "X-ray": 2, "Accidental exposure to product": 1, "Anaphylactic shock": 1, "Antibody test abnormal": 1, "Antinuclear antibody": 1, "Anxiety": 1, "Arrhythmia": 1, "Arthritis": 1, "Axillary pain": 1, "Bell's palsy": 1, "Biopsy liver": 1, "Blindness": 1, "Blister": 1, "Blood bilirubin": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood magnesium decreased": 1, "Body temperature increased": 1, "Bone pain": 1, "Breast swelling": 1, "Bronchitis": 1, "Burning sensation": 1, "Cellulitis": 1, "Cerebrovascular accident": 1, "Chapped lips": 1, "Cheilitis": 1, "Confusional state": 1, "Constipation": 1, "Contusion": 1, "Crying": 1, "Death": 1, "Disease recurrence": 1, "Disorientation": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear pain": 1, "Eating disorder": 1, "Exposure to SARS-CoV-2": 1, "Facial discomfort": 1, "Fall": 1, "Feeling cold": 1, "Feeling drunk": 1, "Fibrin D dimer": 1, "Fine motor skill dysfunction": 1, "Flatulence": 1, "Frequent bowel movements": 1, "Frustration tolerance decreased": 1, "Fungal infection": 1, "Gastritis": 1, "Gastrointestinal disorder": 1, "Glossodynia": 1, "Glycosylated haemoglobin increased": 1, "Haematochezia": 1, "Hepatitis": 1, "Hot flush": 1, "Hypoacusis": 1, "Hypoaesthesia oral": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Immunosuppression": 1, "Impaired work ability": 1, "Influenza": 1, "Injection site nodule": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Intentional product use issue": 1, "Irritability": 1, "Jaundice": 1, "Joint range of motion decreased": 1, "Limb discomfort": 1, "Limb injury": 1, "Lip pain": 1, "Liquid product physical issue": 1, "Magnetic resonance imaging": 1, "Malabsorption": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Mechanical urticaria": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle spasms": 1, "Musculoskeletal stiffness": 1, "Neck pain": 1, "Nervousness": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Odynophagia": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Oxygen saturation decreased": 1, "Pain assessment": 1, "Pallor": 1, "Pedantic speech": 1, "Pelvic pain": 1, "Peripheral coldness": 1, "Petechiae": 1, "Physical examination": 1, "Pigmentation disorder": 1, "Platelet count": 1, "Product administered to patient of inappropriate age": 1, "Rectal haemorrhage": 1, "Restlessness": 1, "Rhinitis allergic": 1, "Rhinorrhoea": 1, "Saliva altered": 1, "Scab": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensory loss": 1, "Skin discolouration": 1, "Skin infection": 1, "Skin mass": 1, "Suspected COVID-19": 1, "Tachypnoea": 1, "Taste disorder": 1, "Throat tightness": 1, "Thyroid function test": 1, "Tongue discomfort": 1, "Tongue ulceration": 1, "Trichoglossia": 1, "Urinary incontinence": 1, "Urinary tract infection": 1, "Urinary tract pain": 1, "Urine output decreased": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site dysaesthesia": 1, "Vaccination site movement impairment": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Visual field defect": 1, "Visual impairment": 1, "Vitamin D decreased": 1, "Vitreous floaters": 1}, "batchcodes": ["028A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A21H.json b/docs/data/histograms/United States/028A21H.json
index 3137892b8a6..f7baabd929d 100644
--- a/docs/data/histograms/United States/028A21H.json
+++ b/docs/data/histograms/United States/028A21H.json
@@ -1 +1 @@
-{"batchcode": "028A21H", "histograms": [{"batchcodes": ["028A21H"], "histogram": {"Herpes zoster": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "028A21H", "histograms": [{"histogram": {"Herpes zoster": 1, "Tinnitus": 1}, "batchcodes": ["028A21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028A31A.json b/docs/data/histograms/United States/028A31A.json
index 25c7b63d79f..0d1bd82cdf3 100644
--- a/docs/data/histograms/United States/028A31A.json
+++ b/docs/data/histograms/United States/028A31A.json
@@ -1 +1 @@
-{"batchcode": "028A31A", "histograms": [{"batchcodes": ["028A31A"], "histogram": {"Eye pruritus": 1, "Eye swelling": 1, "Pruritus": 1, "Swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "028A31A", "histograms": [{"histogram": {"Eye pruritus": 1, "Eye swelling": 1, "Pruritus": 1, "Swelling": 1, "Swelling face": 1}, "batchcodes": ["028A31A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028AZ1A.json b/docs/data/histograms/United States/028AZ1A.json
index d85cc928835..2fb055b4b7d 100644
--- a/docs/data/histograms/United States/028AZ1A.json
+++ b/docs/data/histograms/United States/028AZ1A.json
@@ -1 +1 @@
-{"batchcode": "028AZ1A", "histograms": [{"batchcodes": ["028AZ1A"], "histogram": {"Constipation": 1, "Device connection issue": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Lip swelling": 1, "Seasonal allergy": 1, "Tremor": 1, "Underdose": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "028AZ1A", "histograms": [{"histogram": {"Constipation": 1, "Device connection issue": 1, "Diarrhoea": 1, "Feeling abnormal": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Lip swelling": 1, "Seasonal allergy": 1, "Tremor": 1, "Underdose": 1, "Weight decreased": 1}, "batchcodes": ["028AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028AZIA.json b/docs/data/histograms/United States/028AZIA.json
index 1d3a5a6f97b..f0581b7034d 100644
--- a/docs/data/histograms/United States/028AZIA.json
+++ b/docs/data/histograms/United States/028AZIA.json
@@ -1 +1 @@
-{"batchcode": "028AZIA", "histograms": [{"batchcodes": ["028AZIA"], "histogram": {"Chills": 1, "Cough": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Inflammation": 1, "Mental impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "028AZIA", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Inflammation": 1, "Mental impairment": 1}, "batchcodes": ["028AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028B21A.json b/docs/data/histograms/United States/028B21A.json
index 703e828101a..01102850459 100644
--- a/docs/data/histograms/United States/028B21A.json
+++ b/docs/data/histograms/United States/028B21A.json
@@ -1 +1 @@
-{"batchcode": "028B21A", "histograms": [{"batchcodes": ["028B21A"], "histogram": {"Antibody test negative": 1, "Aphthous ulcer": 1, "Arthralgia": 1, "Burning sensation": 1, "Chills": 1, "Drug ineffective": 1, "Nasal congestion": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "028B21A", "histograms": [{"histogram": {"Antibody test negative": 1, "Aphthous ulcer": 1, "Arthralgia": 1, "Burning sensation": 1, "Chills": 1, "Drug ineffective": 1, "Nasal congestion": 1, "Neck pain": 1, "Pain": 1, "Pain in extremity": 1, "Rash": 1, "Ultrasound scan": 1}, "batchcodes": ["028B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028C20A.json b/docs/data/histograms/United States/028C20A.json
index 6ef59154f07..09177cc6cf3 100644
--- a/docs/data/histograms/United States/028C20A.json
+++ b/docs/data/histograms/United States/028C20A.json
@@ -1 +1 @@
-{"batchcode": "028C20A", "histograms": [{"batchcodes": ["028C20A"], "histogram": {"Anxiety": 1, "Chills": 1, "Depression": 1, "Disturbance in attention": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Irritability": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Tearfulness": 1, "Vaccination site pain": 1, "Vestibular migraine": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "028C20A", "histograms": [{"histogram": {"Anxiety": 1, "Chills": 1, "Depression": 1, "Disturbance in attention": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Irritability": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Tearfulness": 1, "Vaccination site pain": 1, "Vestibular migraine": 1, "Vision blurred": 1}, "batchcodes": ["028C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028C21A.json b/docs/data/histograms/United States/028C21A.json
index 074e1b202d3..230fb8b9be7 100644
--- a/docs/data/histograms/United States/028C21A.json
+++ b/docs/data/histograms/United States/028C21A.json
@@ -1 +1 @@
-{"batchcode": "028C21A", "histograms": [{"batchcodes": ["028C21A"], "histogram": {"Device connection issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "028C21A", "histograms": [{"histogram": {"Device connection issue": 1, "Underdose": 1}, "batchcodes": ["028C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028D21A.json b/docs/data/histograms/United States/028D21A.json
index 98e7470049e..96721838d3a 100644
--- a/docs/data/histograms/United States/028D21A.json
+++ b/docs/data/histograms/United States/028D21A.json
@@ -1 +1 @@
-{"batchcode": "028D21A", "histograms": [{"batchcodes": ["028D21A"], "histogram": {"Fatigue": 2, "Nausea": 2, "Body temperature": 1, "Chills": 1, "Cold sweat": 1, "Diarrhoea": 1, "Headache": 1, "Heart rate increased": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Rash": 1, "Syncope": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "028D21A", "histograms": [{"histogram": {"Fatigue": 2, "Nausea": 2, "Body temperature": 1, "Chills": 1, "Cold sweat": 1, "Diarrhoea": 1, "Headache": 1, "Heart rate increased": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Myalgia": 1, "Oropharyngeal pain": 1, "Pyrexia": 1, "Rash": 1, "Syncope": 1, "Tinnitus": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["028D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028E2119.json b/docs/data/histograms/United States/028E2119.json
index fe93771c3e1..9ff490fdd07 100644
--- a/docs/data/histograms/United States/028E2119.json
+++ b/docs/data/histograms/United States/028E2119.json
@@ -1 +1 @@
-{"batchcode": "028E2119", "histograms": [{"batchcodes": ["028E2119"], "histogram": {"Body temperature": 1, "Dehydration": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "028E2119", "histograms": [{"histogram": {"Body temperature": 1, "Dehydration": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["028E2119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028H21A OR 028H.json b/docs/data/histograms/United States/028H21A OR 028H.json
index 889f6e233a2..4c3d7aa7adf 100644
--- a/docs/data/histograms/United States/028H21A OR 028H.json
+++ b/docs/data/histograms/United States/028H21A OR 028H.json
@@ -1 +1 @@
-{"batchcode": "028H21A OR 028H", "histograms": [{"batchcodes": ["028H21A OR 028H"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "028H21A OR 028H", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Pain in jaw": 1, "Rash": 1}, "batchcodes": ["028H21A OR 028H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028H21A.json b/docs/data/histograms/United States/028H21A.json
index 026f51900cc..420cb20057a 100644
--- a/docs/data/histograms/United States/028H21A.json
+++ b/docs/data/histograms/United States/028H21A.json
@@ -1 +1 @@
-{"batchcode": "028H21A", "histograms": [{"batchcodes": ["028H21A"], "histogram": {"Chills": 2}}]}
\ No newline at end of file
+{"batchcode": "028H21A", "histograms": [{"histogram": {"Chills": 2}, "batchcodes": ["028H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028I20A.json b/docs/data/histograms/United States/028I20A.json
index b76ba68b284..8377ce1cc39 100644
--- a/docs/data/histograms/United States/028I20A.json
+++ b/docs/data/histograms/United States/028I20A.json
@@ -1 +1 @@
-{"batchcode": "028I20A", "histograms": [{"batchcodes": ["028I20A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "028I20A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["028I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028K21.json b/docs/data/histograms/United States/028K21.json
index 04711253625..cb72f73359c 100644
--- a/docs/data/histograms/United States/028K21.json
+++ b/docs/data/histograms/United States/028K21.json
@@ -1 +1 @@
-{"batchcode": "028K21", "histograms": [{"batchcodes": ["028K21"], "histogram": {"Accidental overdose": 1, "No adverse event": 1}}]}
\ No newline at end of file
+{"batchcode": "028K21", "histograms": [{"histogram": {"Accidental overdose": 1, "No adverse event": 1}, "batchcodes": ["028K21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028K21A.json b/docs/data/histograms/United States/028K21A.json
index 7896c2a0408..b8ae58ec3e0 100644
--- a/docs/data/histograms/United States/028K21A.json
+++ b/docs/data/histograms/United States/028K21A.json
@@ -1 +1 @@
-{"batchcode": "028K21A", "histograms": [{"batchcodes": ["014A21A", "028K21A"], "histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["028K21A"], "histogram": {"Expired product administered": 8, "Interchange of vaccine products": 4, "COVID-19": 3, "Product storage error": 3, "Chills": 2, "Dyspnoea": 2, "Fall": 2, "Feeling abnormal": 2, "Headache": 2, "Loss of consciousness": 2, "Product administered to patient of inappropriate age": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Anxiety": 1, "Asthenia": 1, "Bedridden": 1, "Blood test": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Cardiac flutter": 1, "Cerebral haemorrhage": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Cough": 1, "Cystitis": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Erythema": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Foetal growth restriction": 1, "Food allergy": 1, "Fungal infection": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Illness": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Influenza like illness": 1, "Injection site extravasation": 1, "Insomnia": 1, "Limb discomfort": 1, "Movement disorder": 1, "Myalgia": 1, "Narcolepsy": 1, "Nasopharyngeal swab": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Oedema": 1, "Palpitations": 1, "Paraesthesia": 1, "Pregnancy test": 1, "Pregnancy test urine": 1, "Pyrexia": 1, "Rash": 1, "Smear cervix": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination site anaesthesia": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Vasculitis": 1, "Vestibular disorder": 1, "Vision blurred": 1, "Visual impairment": 1, "Visual snow syndrome": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "028K21A", "histograms": [{"histogram": {"SARS-CoV-2 test": 1, "Suspected COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["014A21A", "028K21A"]}, {"histogram": {"Expired product administered": 8, "Interchange of vaccine products": 4, "COVID-19": 3, "Product storage error": 3, "Chills": 2, "Dyspnoea": 2, "Fall": 2, "Feeling abnormal": 2, "Headache": 2, "Loss of consciousness": 2, "Product administered to patient of inappropriate age": 2, "SARS-CoV-2 test": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Anxiety": 1, "Asthenia": 1, "Bedridden": 1, "Blood test": 1, "Body temperature": 1, "COVID-19 immunisation": 1, "Cardiac flutter": 1, "Cerebral haemorrhage": 1, "Cognitive disorder": 1, "Computerised tomogram head": 1, "Cough": 1, "Cystitis": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Erythema": 1, "Eye swelling": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Foetal growth restriction": 1, "Food allergy": 1, "Fungal infection": 1, "Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Illness": 1, "Immunodeficiency": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Influenza like illness": 1, "Injection site extravasation": 1, "Insomnia": 1, "Limb discomfort": 1, "Movement disorder": 1, "Myalgia": 1, "Narcolepsy": 1, "Nasopharyngeal swab": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Oedema": 1, "Palpitations": 1, "Paraesthesia": 1, "Pregnancy test": 1, "Pregnancy test urine": 1, "Pyrexia": 1, "Rash": 1, "Smear cervix": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Swelling": 1, "Swelling face": 1, "Tremor": 1, "Ultrasound scan": 1, "Vaccination site anaesthesia": 1, "Vaccination site pain": 1, "Vaccination site paraesthesia": 1, "Vaccination site reaction": 1, "Vaccination site swelling": 1, "Vaginal haemorrhage": 1, "Vasculitis": 1, "Vestibular disorder": 1, "Vision blurred": 1, "Visual impairment": 1, "Visual snow syndrome": 1, "Vomiting": 1}, "batchcodes": ["028K21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028K21H.json b/docs/data/histograms/United States/028K21H.json
index 7c5664515e6..8eac47372e0 100644
--- a/docs/data/histograms/United States/028K21H.json
+++ b/docs/data/histograms/United States/028K21H.json
@@ -1 +1 @@
-{"batchcode": "028K21H", "histograms": [{"batchcodes": ["028K21H"], "histogram": {"Deafness unilateral": 1, "Magnetic resonance imaging": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "028K21H", "histograms": [{"histogram": {"Deafness unilateral": 1, "Magnetic resonance imaging": 1, "Tinnitus": 1}, "batchcodes": ["028K21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028KZ1A.json b/docs/data/histograms/United States/028KZ1A.json
index 659cb4016fe..1719dd78aed 100644
--- a/docs/data/histograms/United States/028KZ1A.json
+++ b/docs/data/histograms/United States/028KZ1A.json
@@ -1 +1 @@
-{"batchcode": "028KZ1A", "histograms": [{"batchcodes": ["028KZ1A"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "028KZ1A", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["028KZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L(I)20A.json b/docs/data/histograms/United States/028L(I)20A.json
index 26d8f90a0f8..00cd7362db1 100644
--- a/docs/data/histograms/United States/028L(I)20A.json
+++ b/docs/data/histograms/United States/028L(I)20A.json
@@ -1 +1 @@
-{"batchcode": "028L(I)20A", "histograms": [{"batchcodes": ["028L(I)20A"], "histogram": {"Blood pressure measurement": 1, "Fatigue": 1, "Illness": 1, "Nausea": 1, "Pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "028L(I)20A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Fatigue": 1, "Illness": 1, "Nausea": 1, "Pain": 1, "Vomiting": 1}, "batchcodes": ["028L(I)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L-20A.json b/docs/data/histograms/United States/028L-20A.json
index c514c5d3ce1..e1791d01e94 100644
--- a/docs/data/histograms/United States/028L-20A.json
+++ b/docs/data/histograms/United States/028L-20A.json
@@ -1 +1 @@
-{"batchcode": "028L-20A", "histograms": [{"batchcodes": ["028L-20A"], "histogram": {"Accidental overdose": 1}}]}
\ No newline at end of file
+{"batchcode": "028L-20A", "histograms": [{"histogram": {"Accidental overdose": 1}, "batchcodes": ["028L-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L00A.json b/docs/data/histograms/United States/028L00A.json
index 3b8edf220a9..17de3a896e9 100644
--- a/docs/data/histograms/United States/028L00A.json
+++ b/docs/data/histograms/United States/028L00A.json
@@ -1 +1 @@
-{"batchcode": "028L00A", "histograms": [{"batchcodes": ["028L00A"], "histogram": {"Poor quality sleep": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "028L00A", "histograms": [{"histogram": {"Poor quality sleep": 1, "Pyrexia": 1}, "batchcodes": ["028L00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L02A.json b/docs/data/histograms/United States/028L02A.json
index cebaac385e2..2d65e90f148 100644
--- a/docs/data/histograms/United States/028L02A.json
+++ b/docs/data/histograms/United States/028L02A.json
@@ -1 +1 @@
-{"batchcode": "028L02A", "histograms": [{"batchcodes": ["028L02A"], "histogram": {"Arthralgia": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "028L02A", "histograms": [{"histogram": {"Arthralgia": 1, "Myalgia": 1}, "batchcodes": ["028L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L0A.json b/docs/data/histograms/United States/028L0A.json
index 99a878617ba..17c400f43a3 100644
--- a/docs/data/histograms/United States/028L0A.json
+++ b/docs/data/histograms/United States/028L0A.json
@@ -1 +1 @@
-{"batchcode": "028L0A", "histograms": [{"batchcodes": ["028L0A"], "histogram": {"Parosmia": 1, "Taste disorder": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "028L0A", "histograms": [{"histogram": {"Parosmia": 1, "Taste disorder": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["028L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L20.json b/docs/data/histograms/United States/028L20.json
index 0d065d21b68..06a7c24ec3e 100644
--- a/docs/data/histograms/United States/028L20.json
+++ b/docs/data/histograms/United States/028L20.json
@@ -1 +1 @@
-{"batchcode": "028L20", "histograms": [{"batchcodes": ["028L20"], "histogram": {"Body temperature": 1, "Body temperature decreased": 1, "Erythema": 1, "Limb discomfort": 1, "Peripheral swelling": 1, "Pruritus": 1, "Urticaria": 1, "Vaccination site dryness": 1, "Vaccination site exfoliation": 1}}]}
\ No newline at end of file
+{"batchcode": "028L20", "histograms": [{"histogram": {"Body temperature": 1, "Body temperature decreased": 1, "Erythema": 1, "Limb discomfort": 1, "Peripheral swelling": 1, "Pruritus": 1, "Urticaria": 1, "Vaccination site dryness": 1, "Vaccination site exfoliation": 1}, "batchcodes": ["028L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L2019.json b/docs/data/histograms/United States/028L2019.json
index 85315af6622..d8843009d46 100644
--- a/docs/data/histograms/United States/028L2019.json
+++ b/docs/data/histograms/United States/028L2019.json
@@ -1 +1 @@
-{"batchcode": "028L2019", "histograms": [{"batchcodes": ["028L2019"], "histogram": {"Anxiety": 1, "Heart rate increased": 1, "Nervousness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "028L2019", "histograms": [{"histogram": {"Anxiety": 1, "Heart rate increased": 1, "Nervousness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["028L2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L201A.json b/docs/data/histograms/United States/028L201A.json
index e0ea59d0a39..049231a20af 100644
--- a/docs/data/histograms/United States/028L201A.json
+++ b/docs/data/histograms/United States/028L201A.json
@@ -1 +1 @@
-{"batchcode": "028L201A", "histograms": [{"batchcodes": ["028L201A"], "histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Extrasystoles": 1, "Headache": 1, "Hypertension": 1, "Malaise": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "028L201A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Body temperature": 1, "Extrasystoles": 1, "Headache": 1, "Hypertension": 1, "Malaise": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["028L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L207.json b/docs/data/histograms/United States/028L207.json
index 9677fe0858a..f2229fc6dc6 100644
--- a/docs/data/histograms/United States/028L207.json
+++ b/docs/data/histograms/United States/028L207.json
@@ -1 +1 @@
-{"batchcode": "028L207", "histograms": [{"batchcodes": ["028L207"], "histogram": {"Injection site pruritus": 1, "Injection site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "028L207", "histograms": [{"histogram": {"Injection site pruritus": 1, "Injection site rash": 1}, "batchcodes": ["028L207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L208A.json b/docs/data/histograms/United States/028L208A.json
index 4c8e9a5808d..014fdcc620d 100644
--- a/docs/data/histograms/United States/028L208A.json
+++ b/docs/data/histograms/United States/028L208A.json
@@ -1 +1 @@
-{"batchcode": "028L208A", "histograms": [{"batchcodes": ["028L208A"], "histogram": {"Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "028L208A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1}, "batchcodes": ["028L208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L209.json b/docs/data/histograms/United States/028L209.json
index 08aba74d6de..f0c30810931 100644
--- a/docs/data/histograms/United States/028L209.json
+++ b/docs/data/histograms/United States/028L209.json
@@ -1 +1 @@
-{"batchcode": "028L209", "histograms": [{"batchcodes": ["028L209"], "histogram": {"Body temperature increased": 1, "Chills": 1, "Pyrexia": 1, "Renal disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "028L209", "histograms": [{"histogram": {"Body temperature increased": 1, "Chills": 1, "Pyrexia": 1, "Renal disorder": 1}, "batchcodes": ["028L209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L20A, 013L20.json b/docs/data/histograms/United States/028L20A, 013L20.json
index b0dcfc9adef..de4d772bcfc 100644
--- a/docs/data/histograms/United States/028L20A, 013L20.json
+++ b/docs/data/histograms/United States/028L20A, 013L20.json
@@ -1 +1 @@
-{"batchcode": "028L20A, 013L20", "histograms": [{"batchcodes": ["028L20A, 013L20"], "histogram": {"Hypertension": 1, "Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "028L20A, 013L20", "histograms": [{"histogram": {"Hypertension": 1, "Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["028L20A, 013L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L20A.json b/docs/data/histograms/United States/028L20A.json
index d2e81835372..6b86f057238 100644
--- a/docs/data/histograms/United States/028L20A.json
+++ b/docs/data/histograms/United States/028L20A.json
@@ -1 +1 @@
-{"batchcode": "028L20A", "histograms": [{"batchcodes": ["028L20A", "039K202A"], "histogram": {"Limb discomfort": 1, "Pain in extremity": 1}}, {"batchcodes": ["028L20A", "FF2S90"], "histogram": {"COVID-19": 1, "Drug ineffective": 1}}, {"batchcodes": ["028L20A", "P8020"], "histogram": {"Vaccination site discomfort": 1, "Vaccination site mass": 1}}, {"batchcodes": ["028L20A"], "histogram": {"Pyrexia": 148, "Chills": 138, "Headache": 133, "Pain in extremity": 128, "Fatigue": 114, "Vaccination site pain": 96, "Pain": 83, "Nausea": 78, "Myalgia": 76, "Vaccination site erythema": 67, "Pruritus": 50, "Arthralgia": 49, "Rash": 48, "Vaccination site pruritus": 40, "Vaccination site swelling": 39, "Erythema": 37, "Feeling abnormal": 36, "Dizziness": 35, "Body temperature": 34, "Asthenia": 33, "Vaccination site warmth": 27, "Vomiting": 27, "Vaccination site rash": 26, "Influenza like illness": 24, "Malaise": 24, "Dyspnoea": 23, "Diarrhoea": 22, "Illness": 21, "Peripheral swelling": 21, "COVID-19": 20, "Vaccination complication": 19, "Insomnia": 17, "Paraesthesia": 17, "SARS-CoV-2 test": 17, "Urticaria": 17, "Cough": 16, "Feeling hot": 16, "Inappropriate schedule of product administration": 16, "Lymphadenopathy": 16, "Decreased appetite": 15, "Injection site erythema": 15, "Burning sensation": 14, "Hypoaesthesia": 13, "Tremor": 13, "Heart rate": 12, "Vaccination site reaction": 12, "Blood pressure measurement": 11, "Chest discomfort": 11, "Gait disturbance": 11, "Injection site pain": 11, "Musculoskeletal stiffness": 11, "Nasopharyngitis": 11, "Product dose omission issue": 11, "Somnolence": 11, "Vaccination site induration": 11, "Blood test": 10, "Hyperhidrosis": 10, "Hypersensitivity": 10, "Muscular weakness": 10, "Rash erythematous": 10, "Swelling face": 10, "Exposure during pregnancy": 9, "Limb discomfort": 9, "Oropharyngeal pain": 9, "Rash pruritic": 9, "Rhinorrhoea": 9, "Swelling": 9, "Abdominal discomfort": 8, "Back pain": 8, "Chest pain": 8, "Herpes zoster": 8, "Hypertension": 8, "Injection site pruritus": 8, "Injection site swelling": 8, "Lethargy": 8, "Mobility decreased": 8, "Rash macular": 8, "Condition aggravated": 7, "Feeling cold": 7, "Neck pain": 7, "Palpitations": 7, "Tinnitus": 7, "Abdominal pain upper": 6, "Ageusia": 6, "Anosmia": 6, "Anxiety": 6, "Bedridden": 6, "Discomfort": 6, "Fall": 6, "Heart rate increased": 6, "Influenza": 6, "Lip swelling": 6, "Maternal exposure during pregnancy": 6, "Paraesthesia oral": 6, "Tachycardia": 6, "Vaccination site movement impairment": 6, "Blood glucose": 5, "Electrocardiogram": 5, "Loss of consciousness": 5, "Nasal congestion": 5, "Peripheral coldness": 5, "Pregnancy test": 5, "SARS-CoV-2 antibody test": 5, "Ultrasound scan": 5, "Urinary tract infection": 5, "Vision blurred": 5, "Accidental overdose": 4, "Anaphylactic reaction": 4, "Arthritis": 4, "Body temperature increased": 4, "Computerised tomogram": 4, "Expired product administered": 4, "Hypersomnia": 4, "Incorrect dose administered": 4, "Injection site warmth": 4, "Joint swelling": 4, "Loss of personal independence in daily activities": 4, "Oropharyngeal discomfort": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 test positive": 4, "Throat tightness": 4, "Upper-airway cough syndrome": 4, "Vaccination site discomfort": 4, "Vaccination site urticaria": 4, "Vertigo": 4, "Accidental underdose": 3, "Arrhythmia": 3, "Atrial fibrillation": 3, "Blister": 3, "Blood potassium": 3, "Blood pressure fluctuation": 3, "Blood pressure increased": 3, "Bone pain": 3, "Cellulitis": 3, "Contusion": 3, "Coronavirus test": 3, "Dysarthria": 3, "Dyskinesia": 3, "Dysphemia": 3, "Eye disorder": 3, "Fear": 3, "Flushing": 3, "Hot flush": 3, "Immunisation reaction": 3, "Incorrect route of product administration": 3, "Injection site mass": 3, "Lymph node pain": 3, "Magnetic resonance imaging": 3, "Memory impairment": 3, "Musculoskeletal discomfort": 3, "Nervousness": 3, "No adverse event": 3, "Pain of skin": 3, "Polymers allergy": 3, "Productive cough": 3, "Sleep disorder": 3, "Swelling of eyelid": 3, "Syncope": 3, "Tenderness": 3, "Underdose": 3, "Urine analysis": 3, "Vaccination site discolouration": 3, "Vaccination site mass": 3, "Visual impairment": 3, "Wheezing": 3, "Abdominal pain": 2, "Allergy to vaccine": 2, "Amnesia": 2, "Antibody test": 2, "Asthma": 2, "Axillary pain": 2, "Balance disorder": 2, "Blood cholesterol increased": 2, "Blood glucose increased": 2, "Blood sodium": 2, "C-reactive protein": 2, "Cold sweat": 2, "Computerised tomogram head": 2, "Depressed mood": 2, "Device connection issue": 2, "Disorientation": 2, "Drug ineffective": 2, "Dry eye": 2, "Dry mouth": 2, "Dry throat": 2, "Dysgeusia": 2, "Dysphonia": 2, "Ear discomfort": 2, "Eating disorder": 2, "Eosinophil count": 2, "Eructation": 2, "Exposure via skin contact": 2, "Extrasystoles": 2, "Eye swelling": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Fibromyalgia": 2, "Frustration tolerance decreased": 2, "Furuncle": 2, "Gait inability": 2, "Gastrointestinal disorder": 2, "Haematocrit": 2, "Haemoglobin": 2, "Hypoaesthesia oral": 2, "Hypoglycaemia": 2, "Hypokinesia": 2, "Impaired driving ability": 2, "Incoherent": 2, "Induration": 2, "Inflammation": 2, "Injection site rash": 2, "Injection site reaction": 2, "Mammogram": 2, "Monocyte count": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Myelitis transverse": 2, "Ocular discomfort": 2, "Oedema": 2, "Overdose": 2, "Oxygen saturation": 2, "Palmar erythema": 2, "Parosmia": 2, "Pharyngeal swelling": 2, "Pneumonia": 2, "Pregnancy test positive": 2, "Presyncope": 2, "Respiratory rate": 2, "Rhinitis": 2, "Secretion discharge": 2, "Seizure": 2, "Sensitive skin": 2, "Sinus disorder": 2, "Skin mass": 2, "Skin warm": 2, "Sluggishness": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Throat irritation": 2, "Troponin": 2, "Ultrasound abdomen": 2, "Ultrasound foetal": 2, "Urinary retention": 2, "Vaccination site bruising": 2, "Ventricular extrasystoles": 2, "Vital signs measurement": 2, "Wrong technique in device usage process": 2, "Abdominal pain lower": 1, "Abscess": 1, "Acne": 1, "Acute kidney injury": 1, "Adverse event": 1, "Adverse reaction": 1, "Affect lability": 1, "Alanine aminotransferase": 1, "Allergy test": 1, "Angioedema": 1, "Angiogram": 1, "Ankle fracture": 1, "Antibody test abnormal": 1, "Antibody test negative": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Asthenopia": 1, "Bartholin's cyst": 1, "Basophil count": 1, "Basophil percentage": 1, "Bell's palsy": 1, "Biopsy": 1, "Biopsy breast": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose abnormal": 1, "Blood lactate dehydrogenase": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood test normal": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood zinc abnormal": 1, "Bone disorder": 1, "Bone scan": 1, "Bradykinesia": 1, "Breast pain": 1, "Breast tenderness": 1, "Breath sounds abnormal": 1, "CD4 lymphocytes decreased": 1, "Carbohydrate antigen 125": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cardiac disorder": 1, "Cerebral congestion": 1, "Cerebral haemorrhage": 1, "Cerebral small vessel ischaemic disease": 1, "Cheilitis": 1, "Chest X-ray": 1, "Chest X-ray normal": 1, "Chest scan": 1, "Choking": 1, "Choking sensation": 1, "Chromaturia": 1, "Cognitive disorder": 1, "Computerised tomogram neck": 1, "Crying": 1, "Death": 1, "Dehydration": 1, "Dental discomfort": 1, "Depersonalisation/derealisation disorder": 1, "Diabetes mellitus": 1, "Disseminated intravascular coagulation": 1, "Disturbance in attention": 1, "Dyschromatopsia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear pain": 1, "Eczema": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Electrocardiogram normal": 1, "Eosinophil percentage": 1, "Eye inflammation": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid cyst removal": 1, "Eyelid margin crusting": 1, "Face oedema": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Folliculitis": 1, "Full blood count": 1, "Fungal skin infection": 1, "Gastrointestinal pain": 1, "Gastrointestinal sounds abnormal": 1, "General physical condition abnormal": 1, "Genital ulceration": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Gout": 1, "Haematuria": 1, "Haemoglobin increased": 1, "Haemoptysis": 1, "Hallucination": 1, "Hepatobiliary scan": 1, "Herpes virus test": 1, "Hospitalisation": 1, "Human anaplasmosis": 1, "Hypertensive crisis": 1, "Hypothermia": 1, "Ill-defined disorder": 1, "Immature granulocyte count": 1, "Immobile": 1, "Immune-mediated myositis": 1, "Immunodeficiency": 1, "Impaired self-care": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Injection site abscess": 1, "Injection site extravasation": 1, "Injection site nodule": 1, "Injection site urticaria": 1, "Intentional product use issue": 1, "Intervertebral disc protrusion": 1, "Irritability": 1, "Joint dislocation": 1, "Joint noise": 1, "Labyrinthitis": 1, "Limb mass": 1, "Lip dry": 1, "Lip pain": 1, "Liquid product physical issue": 1, "Localised oedema": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Lymphoedema": 1, "Lymphoma": 1, "Mass": 1, "Mass excision": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Menstrual disorder": 1, "Mental disorder": 1, "Metabolic function test": 1, "Middle insomnia": 1, "Migraine": 1, "Monoclonal immunoglobulin present": 1, "Monocyte percentage": 1, "Movement disorder": 1, "Muscle discomfort": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myocardial infarction": 1, "Neck mass": 1, "Needle issue": 1, "Neuralgia": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Nightmare": 1, "Ocular hyperaemia": 1, "Oesophageal spasm": 1, "Off label use": 1, "Oral discomfort": 1, "Oral mucosal eruption": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Panic attack": 1, "Paranasal sinus discomfort": 1, "Parkinson's disease": 1, "Pemphigoid": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pollakiuria": 1, "Polydipsia": 1, "Positron emission tomogram": 1, "Pre-existing condition improved": 1, "Prenatal screening test": 1, "Product colour issue": 1, "Product preparation issue": 1, "Product storage error": 1, "Protein total": 1, "Psoriasis": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Rash pustular": 1, "Rash vesicular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate increased": 1, "Red cell distribution width": 1, "Restlessness": 1, "Reynold's syndrome": 1, "SARS-CoV-2 test negative": 1, "Sacral pain": 1, "Scan spleen": 1, "Scratch": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Serum ferritin": 1, "Sinus congestion": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin lesion": 1, "Skin reaction": 1, "Skin sensitisation": 1, "Skin swelling": 1, "Skin test": 1, "Sneezing": 1, "Speech disorder": 1, "Sputum discoloured": 1, "Stool analysis": 1, "Subcutaneous abscess": 1, "Suicidal ideation": 1, "Superficial vein prominence": 1, "Teething": 1, "Thirst": 1, "Throat clearing": 1, "Thrombosis": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Tongue pruritus": 1, "Tooth abscess": 1, "Transient ischaemic attack": 1, "Treatment noncompliance": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound antenatal screen": 1, "Ultrasound breast": 1, "Ultrasound uterus": 1, "Upper limb fracture": 1, "Uterine haemorrhage": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Varicella virus test": 1, "Vasodilatation": 1, "Ventilation/perfusion scan": 1, "Viral test": 1, "Vitamin D": 1, "Vomiting projectile": 1, "Vulvovaginal burning sensation": 1, "Vulvovaginal discomfort": 1, "Weight decreased": 1, "White blood cell count": 1, "Wrong technique in product usage process": 1, "X-ray": 1, "Yawning": 1}}]}
\ No newline at end of file
+{"batchcode": "028L20A", "histograms": [{"histogram": {"Limb discomfort": 1, "Pain in extremity": 1}, "batchcodes": ["028L20A", "039K202A"]}, {"histogram": {"COVID-19": 1, "Drug ineffective": 1}, "batchcodes": ["028L20A", "FF2S90"]}, {"histogram": {"Vaccination site discomfort": 1, "Vaccination site mass": 1}, "batchcodes": ["028L20A", "P8020"]}, {"histogram": {"Pyrexia": 148, "Chills": 138, "Headache": 133, "Pain in extremity": 128, "Fatigue": 114, "Vaccination site pain": 96, "Pain": 83, "Nausea": 78, "Myalgia": 76, "Vaccination site erythema": 67, "Pruritus": 50, "Arthralgia": 49, "Rash": 48, "Vaccination site pruritus": 40, "Vaccination site swelling": 39, "Erythema": 37, "Feeling abnormal": 36, "Dizziness": 35, "Body temperature": 34, "Asthenia": 33, "Vaccination site warmth": 27, "Vomiting": 27, "Vaccination site rash": 26, "Influenza like illness": 24, "Malaise": 24, "Dyspnoea": 23, "Diarrhoea": 22, "Illness": 21, "Peripheral swelling": 21, "COVID-19": 20, "Vaccination complication": 19, "Insomnia": 17, "Paraesthesia": 17, "SARS-CoV-2 test": 17, "Urticaria": 17, "Cough": 16, "Feeling hot": 16, "Inappropriate schedule of product administration": 16, "Lymphadenopathy": 16, "Decreased appetite": 15, "Injection site erythema": 15, "Burning sensation": 14, "Hypoaesthesia": 13, "Tremor": 13, "Heart rate": 12, "Vaccination site reaction": 12, "Blood pressure measurement": 11, "Chest discomfort": 11, "Gait disturbance": 11, "Injection site pain": 11, "Musculoskeletal stiffness": 11, "Nasopharyngitis": 11, "Product dose omission issue": 11, "Somnolence": 11, "Vaccination site induration": 11, "Blood test": 10, "Hyperhidrosis": 10, "Hypersensitivity": 10, "Muscular weakness": 10, "Rash erythematous": 10, "Swelling face": 10, "Exposure during pregnancy": 9, "Limb discomfort": 9, "Oropharyngeal pain": 9, "Rash pruritic": 9, "Rhinorrhoea": 9, "Swelling": 9, "Abdominal discomfort": 8, "Back pain": 8, "Chest pain": 8, "Herpes zoster": 8, "Hypertension": 8, "Injection site pruritus": 8, "Injection site swelling": 8, "Lethargy": 8, "Mobility decreased": 8, "Rash macular": 8, "Condition aggravated": 7, "Feeling cold": 7, "Neck pain": 7, "Palpitations": 7, "Tinnitus": 7, "Abdominal pain upper": 6, "Ageusia": 6, "Anosmia": 6, "Anxiety": 6, "Bedridden": 6, "Discomfort": 6, "Fall": 6, "Heart rate increased": 6, "Influenza": 6, "Lip swelling": 6, "Maternal exposure during pregnancy": 6, "Paraesthesia oral": 6, "Tachycardia": 6, "Vaccination site movement impairment": 6, "Blood glucose": 5, "Electrocardiogram": 5, "Loss of consciousness": 5, "Nasal congestion": 5, "Peripheral coldness": 5, "Pregnancy test": 5, "SARS-CoV-2 antibody test": 5, "Ultrasound scan": 5, "Urinary tract infection": 5, "Vision blurred": 5, "Accidental overdose": 4, "Anaphylactic reaction": 4, "Arthritis": 4, "Body temperature increased": 4, "Computerised tomogram": 4, "Expired product administered": 4, "Hypersomnia": 4, "Incorrect dose administered": 4, "Injection site warmth": 4, "Joint swelling": 4, "Loss of personal independence in daily activities": 4, "Oropharyngeal discomfort": 4, "Product administered to patient of inappropriate age": 4, "SARS-CoV-2 test positive": 4, "Throat tightness": 4, "Upper-airway cough syndrome": 4, "Vaccination site discomfort": 4, "Vaccination site urticaria": 4, "Vertigo": 4, "Accidental underdose": 3, "Arrhythmia": 3, "Atrial fibrillation": 3, "Blister": 3, "Blood potassium": 3, "Blood pressure fluctuation": 3, "Blood pressure increased": 3, "Bone pain": 3, "Cellulitis": 3, "Contusion": 3, "Coronavirus test": 3, "Dysarthria": 3, "Dyskinesia": 3, "Dysphemia": 3, "Eye disorder": 3, "Fear": 3, "Flushing": 3, "Hot flush": 3, "Immunisation reaction": 3, "Incorrect route of product administration": 3, "Injection site mass": 3, "Lymph node pain": 3, "Magnetic resonance imaging": 3, "Memory impairment": 3, "Musculoskeletal discomfort": 3, "Nervousness": 3, "No adverse event": 3, "Pain of skin": 3, "Polymers allergy": 3, "Productive cough": 3, "Sleep disorder": 3, "Swelling of eyelid": 3, "Syncope": 3, "Tenderness": 3, "Underdose": 3, "Urine analysis": 3, "Vaccination site discolouration": 3, "Vaccination site mass": 3, "Visual impairment": 3, "Wheezing": 3, "Abdominal pain": 2, "Allergy to vaccine": 2, "Amnesia": 2, "Antibody test": 2, "Asthma": 2, "Axillary pain": 2, "Balance disorder": 2, "Blood cholesterol increased": 2, "Blood glucose increased": 2, "Blood sodium": 2, "C-reactive protein": 2, "Cold sweat": 2, "Computerised tomogram head": 2, "Depressed mood": 2, "Device connection issue": 2, "Disorientation": 2, "Drug ineffective": 2, "Dry eye": 2, "Dry mouth": 2, "Dry throat": 2, "Dysgeusia": 2, "Dysphonia": 2, "Ear discomfort": 2, "Eating disorder": 2, "Eosinophil count": 2, "Eructation": 2, "Exposure via skin contact": 2, "Extrasystoles": 2, "Eye swelling": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Fibromyalgia": 2, "Frustration tolerance decreased": 2, "Furuncle": 2, "Gait inability": 2, "Gastrointestinal disorder": 2, "Haematocrit": 2, "Haemoglobin": 2, "Hypoaesthesia oral": 2, "Hypoglycaemia": 2, "Hypokinesia": 2, "Impaired driving ability": 2, "Incoherent": 2, "Induration": 2, "Inflammation": 2, "Injection site rash": 2, "Injection site reaction": 2, "Mammogram": 2, "Monocyte count": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Myelitis transverse": 2, "Ocular discomfort": 2, "Oedema": 2, "Overdose": 2, "Oxygen saturation": 2, "Palmar erythema": 2, "Parosmia": 2, "Pharyngeal swelling": 2, "Pneumonia": 2, "Pregnancy test positive": 2, "Presyncope": 2, "Respiratory rate": 2, "Rhinitis": 2, "Secretion discharge": 2, "Seizure": 2, "Sensitive skin": 2, "Sinus disorder": 2, "Skin mass": 2, "Skin warm": 2, "Sluggishness": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Throat irritation": 2, "Troponin": 2, "Ultrasound abdomen": 2, "Ultrasound foetal": 2, "Urinary retention": 2, "Vaccination site bruising": 2, "Ventricular extrasystoles": 2, "Vital signs measurement": 2, "Wrong technique in device usage process": 2, "Abdominal pain lower": 1, "Abscess": 1, "Acne": 1, "Acute kidney injury": 1, "Adverse event": 1, "Adverse reaction": 1, "Affect lability": 1, "Alanine aminotransferase": 1, "Allergy test": 1, "Angioedema": 1, "Angiogram": 1, "Ankle fracture": 1, "Antibody test abnormal": 1, "Antibody test negative": 1, "Aortic valve incompetence": 1, "Aphasia": 1, "Aspartate aminotransferase": 1, "Asphyxia": 1, "Asthenopia": 1, "Bartholin's cyst": 1, "Basophil count": 1, "Basophil percentage": 1, "Bell's palsy": 1, "Biopsy": 1, "Biopsy breast": 1, "Blepharospasm": 1, "Blood albumin": 1, "Blood alkaline phosphatase": 1, "Blood bicarbonate": 1, "Blood bilirubin": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol": 1, "Blood creatinine": 1, "Blood glucose abnormal": 1, "Blood lactate dehydrogenase": 1, "Blood potassium decreased": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood test normal": 1, "Blood urea": 1, "Blood urea nitrogen/creatinine ratio": 1, "Blood zinc abnormal": 1, "Bone disorder": 1, "Bone scan": 1, "Bradykinesia": 1, "Breast pain": 1, "Breast tenderness": 1, "Breath sounds abnormal": 1, "CD4 lymphocytes decreased": 1, "Carbohydrate antigen 125": 1, "Carbohydrate antigen 19-9": 1, "Carcinoembryonic antigen": 1, "Cardiac disorder": 1, "Cerebral congestion": 1, "Cerebral haemorrhage": 1, "Cerebral small vessel ischaemic disease": 1, "Cheilitis": 1, "Chest X-ray": 1, "Chest X-ray normal": 1, "Chest scan": 1, "Choking": 1, "Choking sensation": 1, "Chromaturia": 1, "Cognitive disorder": 1, "Computerised tomogram neck": 1, "Crying": 1, "Death": 1, "Dehydration": 1, "Dental discomfort": 1, "Depersonalisation/derealisation disorder": 1, "Diabetes mellitus": 1, "Disseminated intravascular coagulation": 1, "Disturbance in attention": 1, "Dyschromatopsia": 1, "Dyspepsia": 1, "Dysphagia": 1, "Ear pain": 1, "Eczema": 1, "Electric shock sensation": 1, "Electrocardiogram ambulatory": 1, "Electrocardiogram normal": 1, "Eosinophil percentage": 1, "Eye inflammation": 1, "Eye pain": 1, "Eye pruritus": 1, "Eyelid cyst removal": 1, "Eyelid margin crusting": 1, "Face oedema": 1, "Fibrin D dimer": 1, "Flatulence": 1, "Folliculitis": 1, "Full blood count": 1, "Fungal skin infection": 1, "Gastrointestinal pain": 1, "Gastrointestinal sounds abnormal": 1, "General physical condition abnormal": 1, "Genital ulceration": 1, "Gingival swelling": 1, "Glomerular filtration rate": 1, "Gout": 1, "Haematuria": 1, "Haemoglobin increased": 1, "Haemoptysis": 1, "Hallucination": 1, "Hepatobiliary scan": 1, "Herpes virus test": 1, "Hospitalisation": 1, "Human anaplasmosis": 1, "Hypertensive crisis": 1, "Hypothermia": 1, "Ill-defined disorder": 1, "Immature granulocyte count": 1, "Immobile": 1, "Immune-mediated myositis": 1, "Immunodeficiency": 1, "Impaired self-care": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Injection site abscess": 1, "Injection site extravasation": 1, "Injection site nodule": 1, "Injection site urticaria": 1, "Intentional product use issue": 1, "Intervertebral disc protrusion": 1, "Irritability": 1, "Joint dislocation": 1, "Joint noise": 1, "Labyrinthitis": 1, "Limb mass": 1, "Lip dry": 1, "Lip pain": 1, "Liquid product physical issue": 1, "Localised oedema": 1, "Lymphocyte count": 1, "Lymphocyte percentage": 1, "Lymphoedema": 1, "Lymphoma": 1, "Mass": 1, "Mass excision": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Mean platelet volume": 1, "Menstrual disorder": 1, "Mental disorder": 1, "Metabolic function test": 1, "Middle insomnia": 1, "Migraine": 1, "Monoclonal immunoglobulin present": 1, "Monocyte percentage": 1, "Movement disorder": 1, "Muscle discomfort": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Musculoskeletal chest pain": 1, "Myocardial infarction": 1, "Neck mass": 1, "Needle issue": 1, "Neuralgia": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Neutrophil count": 1, "Neutrophil percentage": 1, "Nightmare": 1, "Ocular hyperaemia": 1, "Oesophageal spasm": 1, "Off label use": 1, "Oral discomfort": 1, "Oral mucosal eruption": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Panic attack": 1, "Paranasal sinus discomfort": 1, "Parkinson's disease": 1, "Pemphigoid": 1, "Pericarditis": 1, "Periorbital swelling": 1, "Petechiae": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Pityriasis rosea": 1, "Platelet count": 1, "Platelet count decreased": 1, "Pollakiuria": 1, "Polydipsia": 1, "Positron emission tomogram": 1, "Pre-existing condition improved": 1, "Prenatal screening test": 1, "Product colour issue": 1, "Product preparation issue": 1, "Product storage error": 1, "Protein total": 1, "Psoriasis": 1, "Pulmonary congestion": 1, "Pulmonary embolism": 1, "Rash pustular": 1, "Rash vesicular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate increased": 1, "Red cell distribution width": 1, "Restlessness": 1, "Reynold's syndrome": 1, "SARS-CoV-2 test negative": 1, "Sacral pain": 1, "Scan spleen": 1, "Scratch": 1, "Sensory disturbance": 1, "Sensory loss": 1, "Serum ferritin": 1, "Sinus congestion": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin lesion": 1, "Skin reaction": 1, "Skin sensitisation": 1, "Skin swelling": 1, "Skin test": 1, "Sneezing": 1, "Speech disorder": 1, "Sputum discoloured": 1, "Stool analysis": 1, "Subcutaneous abscess": 1, "Suicidal ideation": 1, "Superficial vein prominence": 1, "Teething": 1, "Thirst": 1, "Throat clearing": 1, "Thrombosis": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Tongue pruritus": 1, "Tooth abscess": 1, "Transient ischaemic attack": 1, "Treatment noncompliance": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound antenatal screen": 1, "Ultrasound breast": 1, "Ultrasound uterus": 1, "Upper limb fracture": 1, "Uterine haemorrhage": 1, "Vaccination site haemorrhage": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Varicella virus test": 1, "Vasodilatation": 1, "Ventilation/perfusion scan": 1, "Viral test": 1, "Vitamin D": 1, "Vomiting projectile": 1, "Vulvovaginal burning sensation": 1, "Vulvovaginal discomfort": 1, "Weight decreased": 1, "White blood cell count": 1, "Wrong technique in product usage process": 1, "X-ray": 1, "Yawning": 1}, "batchcodes": ["028L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L220A.json b/docs/data/histograms/United States/028L220A.json
index 260b8bd0cec..67fc53f8e7e 100644
--- a/docs/data/histograms/United States/028L220A.json
+++ b/docs/data/histograms/United States/028L220A.json
@@ -1 +1 @@
-{"batchcode": "028L220A", "histograms": [{"batchcodes": ["028L220A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "028L220A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["028L220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L26A.json b/docs/data/histograms/United States/028L26A.json
index be3f6bc65a6..bbad39f32ce 100644
--- a/docs/data/histograms/United States/028L26A.json
+++ b/docs/data/histograms/United States/028L26A.json
@@ -1 +1 @@
-{"batchcode": "028L26A", "histograms": [{"batchcodes": ["028L26A"], "histogram": {"Chills": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Lethargy": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "028L26A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Influenza like illness": 1, "Lethargy": 1, "Myalgia": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Tremor": 1}, "batchcodes": ["028L26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L2OA.json b/docs/data/histograms/United States/028L2OA.json
index 31ef325f7bb..aa719f45b8f 100644
--- a/docs/data/histograms/United States/028L2OA.json
+++ b/docs/data/histograms/United States/028L2OA.json
@@ -1 +1 @@
-{"batchcode": "028L2OA", "histograms": [{"batchcodes": ["028L2OA"], "histogram": {"Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Vaccination complication": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "028L2OA", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1, "Vaccination complication": 1, "Vaccination site pain": 1}, "batchcodes": ["028L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028L70A.json b/docs/data/histograms/United States/028L70A.json
index 24d4e136d11..c42b9942238 100644
--- a/docs/data/histograms/United States/028L70A.json
+++ b/docs/data/histograms/United States/028L70A.json
@@ -1 +1 @@
-{"batchcode": "028L70A", "histograms": [{"batchcodes": ["028L70A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "028L70A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["028L70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028LL208.json b/docs/data/histograms/United States/028LL208.json
index f1c8a8ba554..eaf7c071ed7 100644
--- a/docs/data/histograms/United States/028LL208.json
+++ b/docs/data/histograms/United States/028LL208.json
@@ -1 +1 @@
-{"batchcode": "028LL208", "histograms": [{"batchcodes": ["028LL208"], "histogram": {"COVID-19": 1, "Cough": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "028LL208", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["028LL208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028LZ0A.json b/docs/data/histograms/United States/028LZ0A.json
index a685c43ea93..06d9353df66 100644
--- a/docs/data/histograms/United States/028LZ0A.json
+++ b/docs/data/histograms/United States/028LZ0A.json
@@ -1 +1 @@
-{"batchcode": "028LZ0A", "histograms": [{"batchcodes": ["028LZ0A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "028LZ0A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["028LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028LZON.json b/docs/data/histograms/United States/028LZON.json
index e9d3372867c..1c973c6946a 100644
--- a/docs/data/histograms/United States/028LZON.json
+++ b/docs/data/histograms/United States/028LZON.json
@@ -1 +1 @@
-{"batchcode": "028LZON", "histograms": [{"batchcodes": ["028LZON"], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "028LZON", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["028LZON"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028M20A.json b/docs/data/histograms/United States/028M20A.json
index 3e6611a5b2f..8cb3ca1cf43 100644
--- a/docs/data/histograms/United States/028M20A.json
+++ b/docs/data/histograms/United States/028M20A.json
@@ -1 +1 @@
-{"batchcode": "028M20A", "histograms": [{"batchcodes": ["028M20A"], "histogram": {"Pneumonia": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "028M20A", "histograms": [{"histogram": {"Pneumonia": 1, "Product dose omission issue": 1}, "batchcodes": ["028M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028O20A.json b/docs/data/histograms/United States/028O20A.json
index 1e0992ccc41..3a5cce6c7c4 100644
--- a/docs/data/histograms/United States/028O20A.json
+++ b/docs/data/histograms/United States/028O20A.json
@@ -1 +1 @@
-{"batchcode": "028O20A", "histograms": [{"batchcodes": ["028O20A"], "histogram": {"Headache": 2, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Palpitations": 1, "Pruritus": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "028O20A", "histograms": [{"histogram": {"Headache": 2, "Blood pressure abnormal": 1, "Blood pressure measurement": 1, "Palpitations": 1, "Pruritus": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["028O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/028PL1A.json b/docs/data/histograms/United States/028PL1A.json
index 6253fe24134..ce7f145e193 100644
--- a/docs/data/histograms/United States/028PL1A.json
+++ b/docs/data/histograms/United States/028PL1A.json
@@ -1 +1 @@
-{"batchcode": "028PL1A", "histograms": [{"batchcodes": ["028PL1A"], "histogram": {"Chills": 1, "Hyperhidrosis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "028PL1A", "histograms": [{"histogram": {"Chills": 1, "Hyperhidrosis": 1, "Pyrexia": 1}, "batchcodes": ["028PL1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029 K 20A.json b/docs/data/histograms/United States/029 K 20A.json
index 6ff16e832ca..d343a0e47a0 100644
--- a/docs/data/histograms/United States/029 K 20A.json
+++ b/docs/data/histograms/United States/029 K 20A.json
@@ -1 +1 @@
-{"batchcode": "029 K 20A", "histograms": [{"batchcodes": ["029 K 20A"], "histogram": {"Vaccination site cellulitis": 1}}]}
\ No newline at end of file
+{"batchcode": "029 K 20A", "histograms": [{"histogram": {"Vaccination site cellulitis": 1}, "batchcodes": ["029 K 20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029/20A.json b/docs/data/histograms/United States/029/20A.json
index cab3ed042f0..b3d22590ad9 100644
--- a/docs/data/histograms/United States/029/20A.json
+++ b/docs/data/histograms/United States/029/20A.json
@@ -1 +1 @@
-{"batchcode": "029/20A", "histograms": [{"batchcodes": ["029/20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "029/20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["029/20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0291121B.json b/docs/data/histograms/United States/0291121B.json
index 6aaa7b4e0e0..7ee86b87c03 100644
--- a/docs/data/histograms/United States/0291121B.json
+++ b/docs/data/histograms/United States/0291121B.json
@@ -1 +1 @@
-{"batchcode": "0291121B", "histograms": [{"batchcodes": ["0291121B"], "histogram": {"Neck mass": 1, "Neck pain": 1, "Swelling": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0291121B", "histograms": [{"histogram": {"Neck mass": 1, "Neck pain": 1, "Swelling": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["0291121B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029120A.json b/docs/data/histograms/United States/029120A.json
index 8922e3c8e5b..b272577171c 100644
--- a/docs/data/histograms/United States/029120A.json
+++ b/docs/data/histograms/United States/029120A.json
@@ -1 +1 @@
-{"batchcode": "029120A", "histograms": [{"batchcodes": ["029120A"], "histogram": {"Chills": 4, "Influenza like illness": 3, "Rash": 3, "Vaccination site pruritus": 3, "Dyspnoea": 2, "Fatigue": 2, "Pain": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Adverse event": 1, "Adverse reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Bell's palsy": 1, "Blood disorder": 1, "Body temperature": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Illness": 1, "Influenza": 1, "Injection site pain": 1, "Injection site warmth": 1, "Malaise": 1, "Mobility decreased": 1, "Nausea": 1, "Palpitations": 1, "Pruritus": 1, "Respiratory arrest": 1, "Seizure": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1, "White blood cell count": 1, "X-ray abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "029120A", "histograms": [{"histogram": {"Chills": 4, "Influenza like illness": 3, "Rash": 3, "Vaccination site pruritus": 3, "Dyspnoea": 2, "Fatigue": 2, "Pain": 2, "Pain in extremity": 2, "Pyrexia": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Abdominal pain upper": 1, "Adverse event": 1, "Adverse reaction": 1, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Bell's palsy": 1, "Blood disorder": 1, "Body temperature": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Feeling abnormal": 1, "Heart rate increased": 1, "Illness": 1, "Influenza": 1, "Injection site pain": 1, "Injection site warmth": 1, "Malaise": 1, "Mobility decreased": 1, "Nausea": 1, "Palpitations": 1, "Pruritus": 1, "Respiratory arrest": 1, "Seizure": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vomiting": 1, "White blood cell count": 1, "X-ray abnormal": 1}, "batchcodes": ["029120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0291A21A.json b/docs/data/histograms/United States/0291A21A.json
index 4da2c4d9130..0098243f90c 100644
--- a/docs/data/histograms/United States/0291A21A.json
+++ b/docs/data/histograms/United States/0291A21A.json
@@ -1 +1 @@
-{"batchcode": "0291A21A", "histograms": [{"batchcodes": ["0291A21A"], "histogram": {"Cough": 1, "Diarrhoea": 1, "Discoloured vomit": 1}}]}
\ No newline at end of file
+{"batchcode": "0291A21A", "histograms": [{"histogram": {"Cough": 1, "Diarrhoea": 1, "Discoloured vomit": 1}, "batchcodes": ["0291A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0291CZ01A.json b/docs/data/histograms/United States/0291CZ01A.json
index 549730c4c9e..040c96e5c78 100644
--- a/docs/data/histograms/United States/0291CZ01A.json
+++ b/docs/data/histograms/United States/0291CZ01A.json
@@ -1 +1 @@
-{"batchcode": "0291CZ01A", "histograms": [{"batchcodes": ["0291CZ01A"], "histogram": {"Ageusia": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "0291CZ01A", "histograms": [{"histogram": {"Ageusia": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Myalgia": 1}, "batchcodes": ["0291CZ01A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0291_20A.json b/docs/data/histograms/United States/0291_20A.json
index a68ad4b84d4..c5e37165cb8 100644
--- a/docs/data/histograms/United States/0291_20A.json
+++ b/docs/data/histograms/United States/0291_20A.json
@@ -1 +1 @@
-{"batchcode": "0291_20A", "histograms": [{"batchcodes": ["0291_20A"], "histogram": {"Dyspnoea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0291_20A", "histograms": [{"histogram": {"Dyspnoea": 1, "Vaccination site pain": 1}, "batchcodes": ["0291_20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02920A.json b/docs/data/histograms/United States/02920A.json
index 335534822d1..eadc326bdd6 100644
--- a/docs/data/histograms/United States/02920A.json
+++ b/docs/data/histograms/United States/02920A.json
@@ -1 +1 @@
-{"batchcode": "02920A", "histograms": [{"batchcodes": ["02920A"], "histogram": {"Influenza like illness": 1, "Pruritus": 1, "Rash": 1, "Skin burning sensation": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "02920A", "histograms": [{"histogram": {"Influenza like illness": 1, "Pruritus": 1, "Rash": 1, "Skin burning sensation": 1, "Urticaria": 1}, "batchcodes": ["02920A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029220A.json b/docs/data/histograms/United States/029220A.json
index 5cd8a0d044f..1a231828eec 100644
--- a/docs/data/histograms/United States/029220A.json
+++ b/docs/data/histograms/United States/029220A.json
@@ -1 +1 @@
-{"batchcode": "029220A", "histograms": [{"batchcodes": ["029220A"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "029220A", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["029220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029420A.json b/docs/data/histograms/United States/029420A.json
index 417100c1385..b7146dea5f4 100644
--- a/docs/data/histograms/United States/029420A.json
+++ b/docs/data/histograms/United States/029420A.json
@@ -1 +1 @@
-{"batchcode": "029420A", "histograms": [{"batchcodes": ["029420A"], "histogram": {"Inappropriate schedule of product administration": 1, "Wound": 1}}]}
\ No newline at end of file
+{"batchcode": "029420A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Wound": 1}, "batchcodes": ["029420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029421A.json b/docs/data/histograms/United States/029421A.json
index e8ba1c927ce..d7a81f2a8d8 100644
--- a/docs/data/histograms/United States/029421A.json
+++ b/docs/data/histograms/United States/029421A.json
@@ -1 +1 @@
-{"batchcode": "029421A", "histograms": [{"batchcodes": ["029421A"], "histogram": {"Anxiety": 1, "Cerebral disorder": 1, "Depression": 1, "Feeling abnormal": 1, "Headache": 1, "Pain": 1, "Psychomotor hyperactivity": 1}}]}
\ No newline at end of file
+{"batchcode": "029421A", "histograms": [{"histogram": {"Anxiety": 1, "Cerebral disorder": 1, "Depression": 1, "Feeling abnormal": 1, "Headache": 1, "Pain": 1, "Psychomotor hyperactivity": 1}, "batchcodes": ["029421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029520A.json b/docs/data/histograms/United States/029520A.json
index fefc496e2c5..0aa76ec3061 100644
--- a/docs/data/histograms/United States/029520A.json
+++ b/docs/data/histograms/United States/029520A.json
@@ -1 +1 @@
-{"batchcode": "029520A", "histograms": [{"batchcodes": ["029520A"], "histogram": {"Chills": 1, "Insomnia": 1, "Pain in extremity": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029520A", "histograms": [{"histogram": {"Chills": 1, "Insomnia": 1, "Pain in extremity": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["029520A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02959200.json b/docs/data/histograms/United States/02959200.json
index 145660e5087..c038c28bea8 100644
--- a/docs/data/histograms/United States/02959200.json
+++ b/docs/data/histograms/United States/02959200.json
@@ -1 +1 @@
-{"batchcode": "02959200", "histograms": [{"batchcodes": ["02959200"], "histogram": {"Maternal exposure during pregnancy": 1, "Pregnancy test": 1}}]}
\ No newline at end of file
+{"batchcode": "02959200", "histograms": [{"histogram": {"Maternal exposure during pregnancy": 1, "Pregnancy test": 1}, "batchcodes": ["02959200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029620.json b/docs/data/histograms/United States/029620.json
index d662810afe9..ce5a82ea0f1 100644
--- a/docs/data/histograms/United States/029620.json
+++ b/docs/data/histograms/United States/029620.json
@@ -1 +1 @@
-{"batchcode": "029620", "histograms": [{"batchcodes": ["029620"], "histogram": {"Diarrhoea": 1, "Pain in extremity": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "029620", "histograms": [{"histogram": {"Diarrhoea": 1, "Pain in extremity": 1, "Vaccination site erythema": 1}, "batchcodes": ["029620"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0296208.json b/docs/data/histograms/United States/0296208.json
index 23b1fb4ea1c..ad11e6d917b 100644
--- a/docs/data/histograms/United States/0296208.json
+++ b/docs/data/histograms/United States/0296208.json
@@ -1 +1 @@
-{"batchcode": "0296208", "histograms": [{"batchcodes": ["0296208"], "histogram": {"Dizziness": 1, "Dry mouth": 1, "Dysphonia": 1, "Dyspnoea": 1, "Erythema": 1, "Glossitis": 1, "Hypoaesthesia oral": 1, "Mouth swelling": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paranasal sinus discomfort": 1, "Product dose omission issue": 1, "Rhinorrhoea": 1, "Sneezing": 1, "Swollen tongue": 1, "Taste disorder": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0296208", "histograms": [{"histogram": {"Dizziness": 1, "Dry mouth": 1, "Dysphonia": 1, "Dyspnoea": 1, "Erythema": 1, "Glossitis": 1, "Hypoaesthesia oral": 1, "Mouth swelling": 1, "Paraesthesia": 1, "Paraesthesia oral": 1, "Paranasal sinus discomfort": 1, "Product dose omission issue": 1, "Rhinorrhoea": 1, "Sneezing": 1, "Swollen tongue": 1, "Taste disorder": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["0296208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029620A - 029C2.json b/docs/data/histograms/United States/029620A - 029C2.json
index 65a21b80107..a91e539b3fb 100644
--- a/docs/data/histograms/United States/029620A - 029C2.json
+++ b/docs/data/histograms/United States/029620A - 029C2.json
@@ -1 +1 @@
-{"batchcode": "029620A - 029C2", "histograms": [{"batchcodes": ["029620A - 029C2"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029620A - 029C2", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["029620A - 029C2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029620A.json b/docs/data/histograms/United States/029620A.json
index 45e6afb92f3..dec2353dc6d 100644
--- a/docs/data/histograms/United States/029620A.json
+++ b/docs/data/histograms/United States/029620A.json
@@ -1 +1 @@
-{"batchcode": "029620A", "histograms": [{"batchcodes": ["029620A"], "histogram": {"Headache": 4, "Dizziness": 3, "Chills": 2, "Cough": 2, "Fatigue": 2, "Pain": 2, "Pain in extremity": 2, "Presyncope": 2, "Pyrexia": 2, "Rash": 2, "Abdominal pain upper": 1, "Abnormal dreams": 1, "Arthritis": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Burning sensation": 1, "Chest discomfort": 1, "Cluster headache": 1, "Condition aggravated": 1, "Crepitations": 1, "Cystitis": 1, "Diarrhoea": 1, "Ear pain": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Limb discomfort": 1, "Malaise": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Oral discomfort": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Skin burning sensation": 1, "Sputum discoloured": 1, "Tenderness": 1, "Throat irritation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "029620A", "histograms": [{"histogram": {"Headache": 4, "Dizziness": 3, "Chills": 2, "Cough": 2, "Fatigue": 2, "Pain": 2, "Pain in extremity": 2, "Presyncope": 2, "Pyrexia": 2, "Rash": 2, "Abdominal pain upper": 1, "Abnormal dreams": 1, "Arthritis": 1, "Asthenia": 1, "Back pain": 1, "Blood pressure increased": 1, "Blood pressure measurement": 1, "Bone pain": 1, "Burning sensation": 1, "Chest discomfort": 1, "Cluster headache": 1, "Condition aggravated": 1, "Crepitations": 1, "Cystitis": 1, "Diarrhoea": 1, "Ear pain": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Limb discomfort": 1, "Malaise": 1, "Musculoskeletal discomfort": 1, "Nausea": 1, "Oral discomfort": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Skin burning sensation": 1, "Sputum discoloured": 1, "Tenderness": 1, "Throat irritation": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vertigo": 1, "Visual impairment": 1}, "batchcodes": ["029620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0297207.json b/docs/data/histograms/United States/0297207.json
index 8b36b0bce09..d057955d77c 100644
--- a/docs/data/histograms/United States/0297207.json
+++ b/docs/data/histograms/United States/0297207.json
@@ -1 +1 @@
-{"batchcode": "0297207", "histograms": [{"batchcodes": ["0297207"], "histogram": {"Chest discomfort": 1, "Chills": 1, "Dysphonia": 1, "Ear discomfort": 1, "Eye swelling": 1, "Lower respiratory tract congestion": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "0297207", "histograms": [{"histogram": {"Chest discomfort": 1, "Chills": 1, "Dysphonia": 1, "Ear discomfort": 1, "Eye swelling": 1, "Lower respiratory tract congestion": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pyrexia": 1, "Swelling face": 1}, "batchcodes": ["0297207"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0297AVA.json b/docs/data/histograms/United States/0297AVA.json
index 94e08f0f948..3c095a2abe6 100644
--- a/docs/data/histograms/United States/0297AVA.json
+++ b/docs/data/histograms/United States/0297AVA.json
@@ -1 +1 @@
-{"batchcode": "0297AVA", "histograms": [{"batchcodes": ["0297AVA"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Heart rate": 1, "Influenza like illness": 1, "Malaise": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0297AVA", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Heart rate": 1, "Influenza like illness": 1, "Malaise": 1, "Pyrexia": 1}, "batchcodes": ["0297AVA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0298A21A.json b/docs/data/histograms/United States/0298A21A.json
index 130ebabd4b9..0d8d35632f7 100644
--- a/docs/data/histograms/United States/0298A21A.json
+++ b/docs/data/histograms/United States/0298A21A.json
@@ -1 +1 @@
-{"batchcode": "0298A21A", "histograms": [{"batchcodes": ["0298A21A"], "histogram": {"Feeling abnormal": 1, "Inflammation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0298A21A", "histograms": [{"histogram": {"Feeling abnormal": 1, "Inflammation": 1, "Vaccination site pain": 1}, "batchcodes": ["0298A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029921A.json b/docs/data/histograms/United States/029921A.json
index 4e5fd56776a..c3c6cc6a29e 100644
--- a/docs/data/histograms/United States/029921A.json
+++ b/docs/data/histograms/United States/029921A.json
@@ -1 +1 @@
-{"batchcode": "029921A", "histograms": [{"batchcodes": ["029921A"], "histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "029921A", "histograms": [{"histogram": {"COVID-19": 1, "Drug ineffective": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["029921A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A.json b/docs/data/histograms/United States/029A.json
index 4295e1b786a..b5ecaefbc5f 100644
--- a/docs/data/histograms/United States/029A.json
+++ b/docs/data/histograms/United States/029A.json
@@ -1 +1 @@
-{"batchcode": "029A", "histograms": [{"batchcodes": ["029A"], "histogram": {"Asthenia": 2, "Bone pain": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "Tremor": 2, "Back pain": 1, "Blood pressure decreased": 1, "Chest pain": 1, "Dyspnoea": 1, "Lip dry": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Oropharyngeal discomfort": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029A", "histograms": [{"histogram": {"Asthenia": 2, "Bone pain": 2, "Headache": 2, "Myalgia": 2, "Pyrexia": 2, "Tremor": 2, "Back pain": 1, "Blood pressure decreased": 1, "Chest pain": 1, "Dyspnoea": 1, "Lip dry": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Oropharyngeal discomfort": 1, "Pain": 1}, "batchcodes": ["029A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A0LA.json b/docs/data/histograms/United States/029A0LA.json
index 3d0cea69774..15a2585606a 100644
--- a/docs/data/histograms/United States/029A0LA.json
+++ b/docs/data/histograms/United States/029A0LA.json
@@ -1 +1 @@
-{"batchcode": "029A0LA", "histograms": [{"batchcodes": ["029A0LA"], "histogram": {"Adverse reaction": 1, "Erythema": 1, "Pain": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "029A0LA", "histograms": [{"histogram": {"Adverse reaction": 1, "Erythema": 1, "Pain": 1, "Rash": 1}, "batchcodes": ["029A0LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A20A.json b/docs/data/histograms/United States/029A20A.json
index af1597fe93a..4b59ed7b5a4 100644
--- a/docs/data/histograms/United States/029A20A.json
+++ b/docs/data/histograms/United States/029A20A.json
@@ -1 +1 @@
-{"batchcode": "029A20A", "histograms": [{"batchcodes": ["029A20A"], "histogram": {"Back pain": 2, "Fatigue": 2, "Intentional product use issue": 2, "Pyrexia": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Burning sensation": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Feeling hot": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Myalgia": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pulmonary congestion": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029A20A", "histograms": [{"histogram": {"Back pain": 2, "Fatigue": 2, "Intentional product use issue": 2, "Pyrexia": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Asthenia": 1, "Body temperature": 1, "Burning sensation": 1, "Diabetes mellitus": 1, "Diarrhoea": 1, "Feeling hot": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Infection": 1, "Myalgia": 1, "Nasal congestion": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pulmonary congestion": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["029A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A21.json b/docs/data/histograms/United States/029A21.json
index 3bcbc15785f..f7086608c7a 100644
--- a/docs/data/histograms/United States/029A21.json
+++ b/docs/data/histograms/United States/029A21.json
@@ -1 +1 @@
-{"batchcode": "029A21", "histograms": [{"batchcodes": ["029A21"], "histogram": {"Vaccination site rash": 3, "Swollen tongue": 2, "Vaccination site erythema": 2, "Vaccination site reaction": 2, "Ageusia": 1, "Blister": 1, "Dysgeusia": 1, "Dysphonia": 1, "Glossodynia": 1, "Influenza": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Pneumonia": 1, "Rash": 1, "Taste disorder": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "029A21", "histograms": [{"histogram": {"Vaccination site rash": 3, "Swollen tongue": 2, "Vaccination site erythema": 2, "Vaccination site reaction": 2, "Ageusia": 1, "Blister": 1, "Dysgeusia": 1, "Dysphonia": 1, "Glossodynia": 1, "Influenza": 1, "Lip swelling": 1, "Lymphadenopathy": 1, "Pneumonia": 1, "Rash": 1, "Taste disorder": 1, "Vaccination site induration": 1, "Vaccination site inflammation": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["029A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A2114.json b/docs/data/histograms/United States/029A2114.json
index 7862a24c868..abf3eb239f0 100644
--- a/docs/data/histograms/United States/029A2114.json
+++ b/docs/data/histograms/United States/029A2114.json
@@ -1 +1 @@
-{"batchcode": "029A2114", "histograms": [{"batchcodes": ["029A2114"], "histogram": {"Arthritis infective": 1, "Asthenia": 1, "Body fluid analysis": 1, "Fall": 1, "Gait inability": 1, "Influenza like illness": 1, "Joint swelling": 1, "Joint warmth": 1, "Laboratory test": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "029A2114", "histograms": [{"histogram": {"Arthritis infective": 1, "Asthenia": 1, "Body fluid analysis": 1, "Fall": 1, "Gait inability": 1, "Influenza like illness": 1, "Joint swelling": 1, "Joint warmth": 1, "Laboratory test": 1, "Syncope": 1}, "batchcodes": ["029A2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A211A.json b/docs/data/histograms/United States/029A211A.json
index a2d55704e57..b4b42e5b8e4 100644
--- a/docs/data/histograms/United States/029A211A.json
+++ b/docs/data/histograms/United States/029A211A.json
@@ -1 +1 @@
-{"batchcode": "029A211A", "histograms": [{"batchcodes": ["029A211A"], "histogram": {"Dizziness": 1, "Feeling abnormal": 1, "Headache": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "029A211A", "histograms": [{"histogram": {"Dizziness": 1, "Feeling abnormal": 1, "Headache": 1, "Nausea": 1}, "batchcodes": ["029A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A212.json b/docs/data/histograms/United States/029A212.json
index d9abd29f53b..bed1d7842e3 100644
--- a/docs/data/histograms/United States/029A212.json
+++ b/docs/data/histograms/United States/029A212.json
@@ -1 +1 @@
-{"batchcode": "029A212", "histograms": [{"batchcodes": ["029A212"], "histogram": {"Angina pectoris": 1, "Anxiety": 1, "Atrioventricular block": 1, "Cardiac arrest": 1, "Circulatory collapse": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Imaging procedure": 1, "Malaise": 1, "Screaming": 1, "Stress": 1}}]}
\ No newline at end of file
+{"batchcode": "029A212", "histograms": [{"histogram": {"Angina pectoris": 1, "Anxiety": 1, "Atrioventricular block": 1, "Cardiac arrest": 1, "Circulatory collapse": 1, "Fatigue": 1, "Gastrooesophageal reflux disease": 1, "Imaging procedure": 1, "Malaise": 1, "Screaming": 1, "Stress": 1}, "batchcodes": ["029A212"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A214.json b/docs/data/histograms/United States/029A214.json
index 2e54127f7cc..e90f91d6581 100644
--- a/docs/data/histograms/United States/029A214.json
+++ b/docs/data/histograms/United States/029A214.json
@@ -1 +1 @@
-{"batchcode": "029A214", "histograms": [{"batchcodes": ["029A214"], "histogram": {"Illness": 1, "Product dose omission issue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029A214", "histograms": [{"histogram": {"Illness": 1, "Product dose omission issue": 1, "Vaccination site pain": 1}, "batchcodes": ["029A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A21A..json b/docs/data/histograms/United States/029A21A..json
index c25559b8c64..344dd39a4e8 100644
--- a/docs/data/histograms/United States/029A21A..json
+++ b/docs/data/histograms/United States/029A21A..json
@@ -1 +1 @@
-{"batchcode": "029A21A.", "histograms": [{"batchcodes": ["029A21A."], "histogram": {"Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Lip swelling": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "029A21A.", "histograms": [{"histogram": {"Hypoaesthesia": 1, "Hypoaesthesia oral": 1, "Lip swelling": 1, "Swelling face": 1}, "batchcodes": ["029A21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A21A.json b/docs/data/histograms/United States/029A21A.json
index 47c2bde8676..71ae8241c24 100644
--- a/docs/data/histograms/United States/029A21A.json
+++ b/docs/data/histograms/United States/029A21A.json
@@ -1 +1 @@
-{"batchcode": "029A21A", "histograms": [{"batchcodes": ["029A21A", "FM9992"], "histogram": {"Dysgeusia": 1}}, {"batchcodes": ["029A21A"], "histogram": {"Fatigue": 73, "Headache": 72, "Pyrexia": 71, "Chills": 63, "Myalgia": 57, "Pain in extremity": 53, "Vaccination site pain": 49, "Pain": 37, "Dizziness": 34, "Nausea": 34, "Arthralgia": 33, "Feeling abnormal": 32, "Erythema": 26, "Pruritus": 24, "Vaccination site erythema": 24, "Vaccination site swelling": 23, "Body temperature": 19, "Vomiting": 18, "Asthenia": 17, "Diarrhoea": 16, "Malaise": 16, "Rash": 16, "Vaccination site warmth": 16, "Expired product administered": 14, "Peripheral swelling": 14, "Urticaria": 14, "Heart rate increased": 13, "Lymphadenopathy": 13, "Illness": 12, "Insomnia": 12, "Paraesthesia": 12, "Swelling": 12, "Tremor": 12, "Vaccination site pruritus": 12, "Vaccination site rash": 12, "Blood pressure measurement": 11, "Product dose omission issue": 11, "Vaccination complication": 11, "Back pain": 10, "Product storage error": 10, "COVID-19": 9, "Chest pain": 9, "Decreased appetite": 9, "Influenza like illness": 9, "Neck pain": 9, "SARS-CoV-2 test": 9, "Cough": 8, "Dyspnoea": 8, "Feeling hot": 8, "Gait inability": 8, "Lethargy": 8, "Palpitations": 8, "Heart rate": 7, "Hot flush": 7, "Hyperhidrosis": 7, "Hypoaesthesia": 7, "Inappropriate schedule of product administration": 7, "Musculoskeletal stiffness": 7, "Oropharyngeal pain": 7, "Tinnitus": 7, "Abdominal discomfort": 6, "Accidental overdose": 6, "Anxiety": 6, "Ear pain": 6, "Eye pain": 6, "Hypersensitivity": 6, "Hypokinesia": 6, "Lip swelling": 6, "Nasopharyngitis": 6, "Sleep disorder": 6, "Somnolence": 6, "Tenderness": 6, "Vaccination site induration": 6, "Abdominal pain": 5, "Ageusia": 5, "Blood test": 5, "Computerised tomogram": 5, "Discomfort": 5, "Electrocardiogram": 5, "Hypertension": 5, "Inflammation": 5, "Limb discomfort": 5, "Migraine": 5, "Pharyngeal swelling": 5, "Swelling face": 5, "Confusional state": 4, "Influenza": 4, "Injection site pain": 4, "Injection site warmth": 4, "Maternal exposure during pregnancy": 4, "Mobility decreased": 4, "Nasal congestion": 4, "Paraesthesia oral": 4, "Rash pruritic": 4, "Retching": 4, "Rhinorrhoea": 4, "Speech disorder": 4, "Vaccination site mass": 4, "Vaccination site reaction": 4, "Vision blurred": 4, "Adverse reaction": 3, "Alopecia": 3, "Atrial fibrillation": 3, "Axillary pain": 3, "Balance disorder": 3, "Bell's palsy": 3, "Blood pressure increased": 3, "Burning sensation": 3, "Cerebrovascular accident": 3, "Chest discomfort": 3, "Condition aggravated": 3, "Ear discomfort": 3, "Ear infection": 3, "Feeding disorder": 3, "Flushing": 3, "Gait disturbance": 3, "Head discomfort": 3, "Herpes zoster": 3, "Impaired work ability": 3, "Injection site erythema": 3, "Loss of consciousness": 3, "Lymph node pain": 3, "Magnetic resonance imaging": 3, "Muscular weakness": 3, "Neuralgia": 3, "Oxygen saturation": 3, "Pain in jaw": 3, "Peripheral coldness": 3, "Photophobia": 3, "Product administered to patient of inappropriate age": 3, "Sensitive skin": 3, "Syncope": 3, "Toothache": 3, "Urine analysis": 3, "Vasculitis": 3, "X-ray": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Amnesia": 2, "Angiopathy": 2, "Anosmia": 2, "Arrhythmia": 2, "Asthma": 2, "Bedridden": 2, "Bone pain": 2, "Cognitive disorder": 2, "Cold sweat": 2, "Contusion": 2, "Device connection issue": 2, "Dysgeusia": 2, "Dysphagia": 2, "Dysphonia": 2, "Eye swelling": 2, "Flatulence": 2, "Full blood count": 2, "Gastrointestinal pain": 2, "Hunger": 2, "Incorrect route of product administration": 2, "Injected limb mobility decreased": 2, "Joint swelling": 2, "Kidney infection": 2, "Loss of personal independence in daily activities": 2, "Memory impairment": 2, "Mouth swelling": 2, "Nervousness": 2, "No adverse event": 2, "Oral discomfort": 2, "Orthostatic hypotension": 2, "Pneumonia": 2, "Productive cough": 2, "Rash erythematous": 2, "Rash macular": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Skin warm": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Throat tightness": 2, "Underdose": 2, "Vaccination site movement impairment": 2, "Vaccination site urticaria": 2, "Vertigo": 2, "Abnormal sensation in eye": 1, "Accidental underdose": 1, "Acne": 1, "Adverse event": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Angioedema": 1, "Antibody test": 1, "Arthritis": 1, "Arthropod bite": 1, "Asthenopia": 1, "Bed rest": 1, "Binocular eye movement disorder": 1, "Biopsy bone": 1, "Blindness": 1, "Blister": 1, "Blood blister": 1, "Blood creatinine": 1, "Blood urine present": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bowel movement irregularity": 1, "Bradykinesia": 1, "Brain oedema": 1, "Bronchitis": 1, "Bronchoscopy": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cerebral disorder": 1, "Chapped lips": 1, "Cheilitis": 1, "Chest X-ray": 1, "Chest scan": 1, "Chronic obstructive pulmonary disease": 1, "Circumoral swelling": 1, "Coagulopathy": 1, "Computerised tomogram thorax": 1, "Coordination abnormal": 1, "Crying": 1, "Dehydration": 1, "Dermatitis": 1, "Dermatitis bullous": 1, "Diplopia": 1, "Drainage": 1, "Drug interaction": 1, "Drug specific antibody": 1, "Dysarthria": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear, nose and throat examination": 1, "Eating disorder": 1, "Eczema": 1, "Eczema eyelids": 1, "Electroencephalogram abnormal": 1, "Electromyogram": 1, "Emotional distress": 1, "Emphysema": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paralysis": 1, "Feeling cold": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Gastric disorder": 1, "General physical health deterioration": 1, "Gingival pain": 1, "Groin pain": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhagic stroke": 1, "Head titubation": 1, "Heart rate irregular": 1, "Hyperpyrexia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Hypoxia": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Incorrect dose administered": 1, "Increased viscosity of upper respiratory secretion": 1, "Infection": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Intracranial pressure increased": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Limb mass": 1, "Lip dry": 1, "Lip pain": 1, "Lip pruritus": 1, "Lymph node palpable": 1, "Lymphoedema": 1, "Mass excision": 1, "Maternal exposure before pregnancy": 1, "Monocyte count": 1, "Movement disorder": 1, "Muscle spasms": 1, "Muscle strain": 1, "Musculoskeletal pain": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Nerve injury": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nodule": 1, "Nose deformity": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Ophthalmoplegia": 1, "Oral mucosal eruption": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Pain assessment": 1, "Palatal swelling": 1, "Panic reaction": 1, "Paralysis": 1, "Parosmia": 1, "Pericarditis": 1, "Physical examination": 1, "Piloerection": 1, "Platelet count": 1, "Post procedural haemorrhage": 1, "Pregnancy test": 1, "Presyncope": 1, "Primary cough headache": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product temperature excursion issue": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "Rash papular": 1, "Red blood cell sedimentation rate": 1, "Renal impairment": 1, "Renal pain": 1, "Respiratory rate": 1, "Rheumatoid arthritis": 1, "Rib fracture": 1, "Seizure": 1, "Sepsis": 1, "Sinus congestion": 1, "Sinus headache": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion": 1, "Skin tightness": 1, "Spirometry": 1, "Sputum test": 1, "Staring": 1, "Stress": 1, "Swelling of eyelid": 1, "Symptom recurrence": 1, "Syringe issue": 1, "Tachycardia": 1, "Taste disorder": 1, "Thirst": 1, "Tongue discomfort": 1, "Transient ischaemic attack": 1, "Urinary tract infection": 1, "Urine abnormality": 1, "Urogram": 1, "Urological examination": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site vesicles": 1, "Varicose vein": 1, "Vegan": 1, "Vestibular neuronitis": 1, "Vitamin D deficiency": 1, "Vitreous floaters": 1, "Von Willebrand's disease": 1, "Weight decreased": 1, "Weight increased": 1, "Wheezing": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "029A21A", "histograms": [{"histogram": {"Dysgeusia": 1}, "batchcodes": ["029A21A", "FM9992"]}, {"histogram": {"Fatigue": 73, "Headache": 72, "Pyrexia": 71, "Chills": 63, "Myalgia": 57, "Pain in extremity": 53, "Vaccination site pain": 49, "Pain": 37, "Dizziness": 34, "Nausea": 34, "Arthralgia": 33, "Feeling abnormal": 32, "Erythema": 26, "Pruritus": 24, "Vaccination site erythema": 24, "Vaccination site swelling": 23, "Body temperature": 19, "Vomiting": 18, "Asthenia": 17, "Diarrhoea": 16, "Malaise": 16, "Rash": 16, "Vaccination site warmth": 16, "Expired product administered": 14, "Peripheral swelling": 14, "Urticaria": 14, "Heart rate increased": 13, "Lymphadenopathy": 13, "Illness": 12, "Insomnia": 12, "Paraesthesia": 12, "Swelling": 12, "Tremor": 12, "Vaccination site pruritus": 12, "Vaccination site rash": 12, "Blood pressure measurement": 11, "Product dose omission issue": 11, "Vaccination complication": 11, "Back pain": 10, "Product storage error": 10, "COVID-19": 9, "Chest pain": 9, "Decreased appetite": 9, "Influenza like illness": 9, "Neck pain": 9, "SARS-CoV-2 test": 9, "Cough": 8, "Dyspnoea": 8, "Feeling hot": 8, "Gait inability": 8, "Lethargy": 8, "Palpitations": 8, "Heart rate": 7, "Hot flush": 7, "Hyperhidrosis": 7, "Hypoaesthesia": 7, "Inappropriate schedule of product administration": 7, "Musculoskeletal stiffness": 7, "Oropharyngeal pain": 7, "Tinnitus": 7, "Abdominal discomfort": 6, "Accidental overdose": 6, "Anxiety": 6, "Ear pain": 6, "Eye pain": 6, "Hypersensitivity": 6, "Hypokinesia": 6, "Lip swelling": 6, "Nasopharyngitis": 6, "Sleep disorder": 6, "Somnolence": 6, "Tenderness": 6, "Vaccination site induration": 6, "Abdominal pain": 5, "Ageusia": 5, "Blood test": 5, "Computerised tomogram": 5, "Discomfort": 5, "Electrocardiogram": 5, "Hypertension": 5, "Inflammation": 5, "Limb discomfort": 5, "Migraine": 5, "Pharyngeal swelling": 5, "Swelling face": 5, "Confusional state": 4, "Influenza": 4, "Injection site pain": 4, "Injection site warmth": 4, "Maternal exposure during pregnancy": 4, "Mobility decreased": 4, "Nasal congestion": 4, "Paraesthesia oral": 4, "Rash pruritic": 4, "Retching": 4, "Rhinorrhoea": 4, "Speech disorder": 4, "Vaccination site mass": 4, "Vaccination site reaction": 4, "Vision blurred": 4, "Adverse reaction": 3, "Alopecia": 3, "Atrial fibrillation": 3, "Axillary pain": 3, "Balance disorder": 3, "Bell's palsy": 3, "Blood pressure increased": 3, "Burning sensation": 3, "Cerebrovascular accident": 3, "Chest discomfort": 3, "Condition aggravated": 3, "Ear discomfort": 3, "Ear infection": 3, "Feeding disorder": 3, "Flushing": 3, "Gait disturbance": 3, "Head discomfort": 3, "Herpes zoster": 3, "Impaired work ability": 3, "Injection site erythema": 3, "Loss of consciousness": 3, "Lymph node pain": 3, "Magnetic resonance imaging": 3, "Muscular weakness": 3, "Neuralgia": 3, "Oxygen saturation": 3, "Pain in jaw": 3, "Peripheral coldness": 3, "Photophobia": 3, "Product administered to patient of inappropriate age": 3, "Sensitive skin": 3, "Syncope": 3, "Toothache": 3, "Urine analysis": 3, "Vasculitis": 3, "X-ray": 3, "Abdominal distension": 2, "Abdominal pain upper": 2, "Allergy to vaccine": 2, "Amnesia": 2, "Angiopathy": 2, "Anosmia": 2, "Arrhythmia": 2, "Asthma": 2, "Bedridden": 2, "Bone pain": 2, "Cognitive disorder": 2, "Cold sweat": 2, "Contusion": 2, "Device connection issue": 2, "Dysgeusia": 2, "Dysphagia": 2, "Dysphonia": 2, "Eye swelling": 2, "Flatulence": 2, "Full blood count": 2, "Gastrointestinal pain": 2, "Hunger": 2, "Incorrect route of product administration": 2, "Injected limb mobility decreased": 2, "Joint swelling": 2, "Kidney infection": 2, "Loss of personal independence in daily activities": 2, "Memory impairment": 2, "Mouth swelling": 2, "Nervousness": 2, "No adverse event": 2, "Oral discomfort": 2, "Orthostatic hypotension": 2, "Pneumonia": 2, "Productive cough": 2, "Rash erythematous": 2, "Rash macular": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Skin warm": 2, "Suspected COVID-19": 2, "Swollen tongue": 2, "Throat tightness": 2, "Underdose": 2, "Vaccination site movement impairment": 2, "Vaccination site urticaria": 2, "Vertigo": 2, "Abnormal sensation in eye": 1, "Accidental underdose": 1, "Acne": 1, "Adverse event": 1, "Altered state of consciousness": 1, "Anaphylactic shock": 1, "Anaphylactoid reaction": 1, "Angioedema": 1, "Antibody test": 1, "Arthritis": 1, "Arthropod bite": 1, "Asthenopia": 1, "Bed rest": 1, "Binocular eye movement disorder": 1, "Biopsy bone": 1, "Blindness": 1, "Blister": 1, "Blood blister": 1, "Blood creatinine": 1, "Blood urine present": 1, "Body temperature decreased": 1, "Body temperature increased": 1, "Bowel movement irregularity": 1, "Bradykinesia": 1, "Brain oedema": 1, "Bronchitis": 1, "Bronchoscopy": 1, "C-reactive protein": 1, "Cardiac failure": 1, "Cardiac failure congestive": 1, "Cerebral disorder": 1, "Chapped lips": 1, "Cheilitis": 1, "Chest X-ray": 1, "Chest scan": 1, "Chronic obstructive pulmonary disease": 1, "Circumoral swelling": 1, "Coagulopathy": 1, "Computerised tomogram thorax": 1, "Coordination abnormal": 1, "Crying": 1, "Dehydration": 1, "Dermatitis": 1, "Dermatitis bullous": 1, "Diplopia": 1, "Drainage": 1, "Drug interaction": 1, "Drug specific antibody": 1, "Dysarthria": 1, "Dyspepsia": 1, "Dysstasia": 1, "Ear, nose and throat examination": 1, "Eating disorder": 1, "Eczema": 1, "Eczema eyelids": 1, "Electroencephalogram abnormal": 1, "Electromyogram": 1, "Emotional distress": 1, "Emphysema": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paralysis": 1, "Feeling cold": 1, "Feeling jittery": 1, "Feeling of body temperature change": 1, "Fibrin D dimer": 1, "Gastric disorder": 1, "General physical health deterioration": 1, "Gingival pain": 1, "Groin pain": 1, "Haematocrit": 1, "Haematuria": 1, "Haemoglobin": 1, "Haemorrhagic stroke": 1, "Head titubation": 1, "Heart rate irregular": 1, "Hyperpyrexia": 1, "Hypoaesthesia oral": 1, "Hypotension": 1, "Hypoxia": 1, "Immune system disorder": 1, "Immune thrombocytopenia": 1, "Incorrect dose administered": 1, "Increased viscosity of upper respiratory secretion": 1, "Infection": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site swelling": 1, "Intentional dose omission": 1, "Interchange of vaccine products": 1, "Intracranial pressure increased": 1, "Investigation": 1, "Joint range of motion decreased": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Limb mass": 1, "Lip dry": 1, "Lip pain": 1, "Lip pruritus": 1, "Lymph node palpable": 1, "Lymphoedema": 1, "Mass excision": 1, "Maternal exposure before pregnancy": 1, "Monocyte count": 1, "Movement disorder": 1, "Muscle spasms": 1, "Muscle strain": 1, "Musculoskeletal pain": 1, "Myocardial infarction": 1, "Myocardial necrosis marker": 1, "Nerve injury": 1, "Neurological examination": 1, "Neuropathy peripheral": 1, "Night sweats": 1, "Nodule": 1, "Nose deformity": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Ophthalmoplegia": 1, "Oral mucosal eruption": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Pain assessment": 1, "Palatal swelling": 1, "Panic reaction": 1, "Paralysis": 1, "Parosmia": 1, "Pericarditis": 1, "Physical examination": 1, "Piloerection": 1, "Platelet count": 1, "Post procedural haemorrhage": 1, "Pregnancy test": 1, "Presyncope": 1, "Primary cough headache": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product temperature excursion issue": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "Rash papular": 1, "Red blood cell sedimentation rate": 1, "Renal impairment": 1, "Renal pain": 1, "Respiratory rate": 1, "Rheumatoid arthritis": 1, "Rib fracture": 1, "Seizure": 1, "Sepsis": 1, "Sinus congestion": 1, "Sinus headache": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin lesion": 1, "Skin tightness": 1, "Spirometry": 1, "Sputum test": 1, "Staring": 1, "Stress": 1, "Swelling of eyelid": 1, "Symptom recurrence": 1, "Syringe issue": 1, "Tachycardia": 1, "Taste disorder": 1, "Thirst": 1, "Tongue discomfort": 1, "Transient ischaemic attack": 1, "Urinary tract infection": 1, "Urine abnormality": 1, "Urogram": 1, "Urological examination": 1, "Vaccination site discolouration": 1, "Vaccination site discomfort": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site vesicles": 1, "Varicose vein": 1, "Vegan": 1, "Vestibular neuronitis": 1, "Vitamin D deficiency": 1, "Vitreous floaters": 1, "Von Willebrand's disease": 1, "Weight decreased": 1, "Weight increased": 1, "Wheezing": 1, "Wrong product administered": 1}, "batchcodes": ["029A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A21A5-22.json b/docs/data/histograms/United States/029A21A5-22.json
index 375414508a0..130a0fe68cf 100644
--- a/docs/data/histograms/United States/029A21A5-22.json
+++ b/docs/data/histograms/United States/029A21A5-22.json
@@ -1 +1 @@
-{"batchcode": "029A21A5-22", "histograms": [{"batchcodes": ["029A21A5-22"], "histogram": {"Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Nasal congestion": 1, "Presyncope": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "029A21A5-22", "histograms": [{"histogram": {"Dizziness": 1, "Fatigue": 1, "Hyperhidrosis": 1, "Nasal congestion": 1, "Presyncope": 1, "Vertigo": 1}, "batchcodes": ["029A21A5-22"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A21AA.json b/docs/data/histograms/United States/029A21AA.json
index 974eddabf75..aced353967c 100644
--- a/docs/data/histograms/United States/029A21AA.json
+++ b/docs/data/histograms/United States/029A21AA.json
@@ -1 +1 @@
-{"batchcode": "029A21AA", "histograms": [{"batchcodes": ["029A21AA"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Enlarged uvula": 1, "Heart rate": 1, "Heart rate irregular": 1, "Laryngitis": 1, "Lip swelling": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Pruritus": 1, "Swollen tongue": 1}}]}
\ No newline at end of file
+{"batchcode": "029A21AA", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Enlarged uvula": 1, "Heart rate": 1, "Heart rate irregular": 1, "Laryngitis": 1, "Lip swelling": 1, "Oropharyngeal discomfort": 1, "Palpitations": 1, "Pharyngeal swelling": 1, "Pruritus": 1, "Swollen tongue": 1}, "batchcodes": ["029A21AA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A21H.json b/docs/data/histograms/United States/029A21H.json
index 3d64ff5e7cc..3d3d3232da1 100644
--- a/docs/data/histograms/United States/029A21H.json
+++ b/docs/data/histograms/United States/029A21H.json
@@ -1 +1 @@
-{"batchcode": "029A21H", "histograms": [{"batchcodes": ["029A21H"], "histogram": {"Muscle tightness": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "029A21H", "histograms": [{"histogram": {"Muscle tightness": 1, "Tinnitus": 1}, "batchcodes": ["029A21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A2PA.json b/docs/data/histograms/United States/029A2PA.json
index 8947a5ff887..8d15f382b94 100644
--- a/docs/data/histograms/United States/029A2PA.json
+++ b/docs/data/histograms/United States/029A2PA.json
@@ -1 +1 @@
-{"batchcode": "029A2PA", "histograms": [{"batchcodes": ["029A2PA"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029A2PA", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Swelling": 1}, "batchcodes": ["029A2PA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A71A.json b/docs/data/histograms/United States/029A71A.json
index b3f3886be71..ca3ae149b97 100644
--- a/docs/data/histograms/United States/029A71A.json
+++ b/docs/data/histograms/United States/029A71A.json
@@ -1 +1 @@
-{"batchcode": "029A71A", "histograms": [{"batchcodes": ["029A71A"], "histogram": {"Pain": 3, "Arthralgia": 2, "Headache": 2, "Influenza like illness": 2, "Lymph node pain": 2, "Pyrexia": 2, "Exposure during pregnancy": 1, "Glucose tolerance test": 1, "Myalgia": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "029A71A", "histograms": [{"histogram": {"Pain": 3, "Arthralgia": 2, "Headache": 2, "Influenza like illness": 2, "Lymph node pain": 2, "Pyrexia": 2, "Exposure during pregnancy": 1, "Glucose tolerance test": 1, "Myalgia": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["029A71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029A84A.json b/docs/data/histograms/United States/029A84A.json
index 58fcf8ea856..9f6443c67dc 100644
--- a/docs/data/histograms/United States/029A84A.json
+++ b/docs/data/histograms/United States/029A84A.json
@@ -1 +1 @@
-{"batchcode": "029A84A", "histograms": [{"batchcodes": ["029A84A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "029A84A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["029A84A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029AD1A.json b/docs/data/histograms/United States/029AD1A.json
index 71fe10a67ea..0a5620d57fb 100644
--- a/docs/data/histograms/United States/029AD1A.json
+++ b/docs/data/histograms/United States/029AD1A.json
@@ -1 +1 @@
-{"batchcode": "029AD1A", "histograms": [{"batchcodes": ["029AD1A"], "histogram": {"Dysgeusia": 1, "Rash": 1, "Rosacea": 1}}]}
\ No newline at end of file
+{"batchcode": "029AD1A", "histograms": [{"histogram": {"Dysgeusia": 1, "Rash": 1, "Rosacea": 1}, "batchcodes": ["029AD1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029AOL.json b/docs/data/histograms/United States/029AOL.json
index d8a146414ac..29d25ea72d7 100644
--- a/docs/data/histograms/United States/029AOL.json
+++ b/docs/data/histograms/United States/029AOL.json
@@ -1 +1 @@
-{"batchcode": "029AOL", "histograms": [{"batchcodes": ["029AOL"], "histogram": {"Inappropriate schedule of product administration": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "029AOL", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Pain in extremity": 1}, "batchcodes": ["029AOL"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029AZ1A.json b/docs/data/histograms/United States/029AZ1A.json
index c8ecbd385cf..a0b7ae962ad 100644
--- a/docs/data/histograms/United States/029AZ1A.json
+++ b/docs/data/histograms/United States/029AZ1A.json
@@ -1 +1 @@
-{"batchcode": "029AZ1A", "histograms": [{"batchcodes": ["029AZ1A"], "histogram": {"Headache": 3, "Pain": 2, "Pain in extremity": 2, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hot flush": 1, "Migraine": 1, "Nausea": 1, "Neck pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Skin burning sensation": 1, "Tinnitus": 1, "Tongue discomfort": 1, "Toothache": 1, "Vaccination site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "029AZ1A", "histograms": [{"histogram": {"Headache": 3, "Pain": 2, "Pain in extremity": 2, "Ear pain": 1, "Eye pain": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hot flush": 1, "Migraine": 1, "Nausea": 1, "Neck pain": 1, "Pyrexia": 1, "Rhinorrhoea": 1, "Skin burning sensation": 1, "Tinnitus": 1, "Tongue discomfort": 1, "Toothache": 1, "Vaccination site haemorrhage": 1}, "batchcodes": ["029AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029AZIA.json b/docs/data/histograms/United States/029AZIA.json
index bba10488463..4a3205d4fc7 100644
--- a/docs/data/histograms/United States/029AZIA.json
+++ b/docs/data/histograms/United States/029AZIA.json
@@ -1 +1 @@
-{"batchcode": "029AZIA", "histograms": [{"batchcodes": ["029AZIA"], "histogram": {"Blood glucose": 1, "Exposure via breast milk": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "029AZIA", "histograms": [{"histogram": {"Blood glucose": 1, "Exposure via breast milk": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["029AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029B20T.json b/docs/data/histograms/United States/029B20T.json
index 351a704526d..c41f68e8bfc 100644
--- a/docs/data/histograms/United States/029B20T.json
+++ b/docs/data/histograms/United States/029B20T.json
@@ -1 +1 @@
-{"batchcode": "029B20T", "histograms": [{"batchcodes": ["029B20T"], "histogram": {"Aphasia": 2, "Hypoaesthesia": 2, "Paraesthesia": 2, "Vaccination site rash": 2, "Condition aggravated": 1, "Lupus-like syndrome": 1, "Neuropathy peripheral": 1, "Peripheral swelling": 1, "Sensory disturbance": 1, "Unevaluable event": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029B20T", "histograms": [{"histogram": {"Aphasia": 2, "Hypoaesthesia": 2, "Paraesthesia": 2, "Vaccination site rash": 2, "Condition aggravated": 1, "Lupus-like syndrome": 1, "Neuropathy peripheral": 1, "Peripheral swelling": 1, "Sensory disturbance": 1, "Unevaluable event": 1, "Vaccination site swelling": 1}, "batchcodes": ["029B20T"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029B21A.json b/docs/data/histograms/United States/029B21A.json
index 5e246ec82a5..6642350c0c5 100644
--- a/docs/data/histograms/United States/029B21A.json
+++ b/docs/data/histograms/United States/029B21A.json
@@ -1 +1 @@
-{"batchcode": "029B21A", "histograms": [{"batchcodes": ["029B21A"], "histogram": {"Product administered to patient of inappropriate age": 1}}]}
\ No newline at end of file
+{"batchcode": "029B21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 1}, "batchcodes": ["029B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029B22A.json b/docs/data/histograms/United States/029B22A.json
index dde1d0ccff2..550c409deb1 100644
--- a/docs/data/histograms/United States/029B22A.json
+++ b/docs/data/histograms/United States/029B22A.json
@@ -1 +1 @@
-{"batchcode": "029B22A", "histograms": [{"batchcodes": ["029B22A"], "histogram": {"Dizziness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "029B22A", "histograms": [{"histogram": {"Dizziness": 1, "Pyrexia": 1}, "batchcodes": ["029B22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029C20A.json b/docs/data/histograms/United States/029C20A.json
index 3376ddd4c51..46e6d2c5552 100644
--- a/docs/data/histograms/United States/029C20A.json
+++ b/docs/data/histograms/United States/029C20A.json
@@ -1 +1 @@
-{"batchcode": "029C20A", "histograms": [{"batchcodes": ["029C20A"], "histogram": {"Pain in extremity": 2, "Back pain": 1, "Balance disorder": 1, "Bronchitis": 1, "Headache": 1, "Hypoaesthesia": 1, "Nausea": 1, "Neck pain": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "029C20A", "histograms": [{"histogram": {"Pain in extremity": 2, "Back pain": 1, "Balance disorder": 1, "Bronchitis": 1, "Headache": 1, "Hypoaesthesia": 1, "Nausea": 1, "Neck pain": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Tremor": 1}, "batchcodes": ["029C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029C21A.json b/docs/data/histograms/United States/029C21A.json
index 8b350008bd2..19b091f18d0 100644
--- a/docs/data/histograms/United States/029C21A.json
+++ b/docs/data/histograms/United States/029C21A.json
@@ -1 +1 @@
-{"batchcode": "029C21A", "histograms": [{"batchcodes": ["029C21A"], "histogram": {"Back pain": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Insomnia": 1, "Micturition disorder": 1, "Nausea": 1, "Nervousness": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "029C21A", "histograms": [{"histogram": {"Back pain": 1, "Blood pressure fluctuation": 1, "Blood pressure measurement": 1, "Chills": 1, "Cough": 1, "Fatigue": 1, "Headache": 1, "Insomnia": 1, "Micturition disorder": 1, "Nausea": 1, "Nervousness": 1, "Pyrexia": 1}, "batchcodes": ["029C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029E028A.json b/docs/data/histograms/United States/029E028A.json
index f9b7d487cab..266f5b913e6 100644
--- a/docs/data/histograms/United States/029E028A.json
+++ b/docs/data/histograms/United States/029E028A.json
@@ -1 +1 @@
-{"batchcode": "029E028A", "histograms": [{"batchcodes": ["029E028A"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "029E028A", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["029E028A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029H20A.json b/docs/data/histograms/United States/029H20A.json
index 56439a6e558..b3dc8ec78bb 100644
--- a/docs/data/histograms/United States/029H20A.json
+++ b/docs/data/histograms/United States/029H20A.json
@@ -1 +1 @@
-{"batchcode": "029H20A", "histograms": [{"batchcodes": ["029H20A"], "histogram": {"Burning sensation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029H20A", "histograms": [{"histogram": {"Burning sensation": 1, "Vaccination site pain": 1}, "batchcodes": ["029H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029H213.json b/docs/data/histograms/United States/029H213.json
index fe663f956d0..26d9667dd8e 100644
--- a/docs/data/histograms/United States/029H213.json
+++ b/docs/data/histograms/United States/029H213.json
@@ -1 +1 @@
-{"batchcode": "029H213", "histograms": [{"batchcodes": ["029H213"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "029H213", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["029H213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029H21A.json b/docs/data/histograms/United States/029H21A.json
index 8bdc8b89989..bf26594bf57 100644
--- a/docs/data/histograms/United States/029H21A.json
+++ b/docs/data/histograms/United States/029H21A.json
@@ -1 +1 @@
-{"batchcode": "029H21A", "histograms": [{"batchcodes": ["029H21A"], "histogram": {"Bell's palsy": 1, "Blood pressure measurement": 1, "Erythema": 1, "Hypertension": 1, "Induration": 1, "Limb mass": 1, "Pain in extremity": 1, "Peripheral swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029H21A", "histograms": [{"histogram": {"Bell's palsy": 1, "Blood pressure measurement": 1, "Erythema": 1, "Hypertension": 1, "Induration": 1, "Limb mass": 1, "Pain in extremity": 1, "Peripheral swelling": 1}, "batchcodes": ["029H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029H21B.json b/docs/data/histograms/United States/029H21B.json
index 9ba44159247..2c1384c1dfa 100644
--- a/docs/data/histograms/United States/029H21B.json
+++ b/docs/data/histograms/United States/029H21B.json
@@ -1 +1 @@
-{"batchcode": "029H21B", "histograms": [{"batchcodes": ["029H21B"], "histogram": {"Expired product administered": 22, "Inappropriate schedule of product administration": 5, "SARS-CoV-2 test": 5, "COVID-19": 4, "Blood test": 3, "Interchange of vaccine products": 3, "Pyrexia": 3, "Blood thyroid stimulating hormone": 2, "Burning sensation": 2, "Cardiac flutter": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chest pain": 2, "Electrocardiogram": 2, "Fatigue": 2, "Full blood count": 2, "Heart rate": 2, "Laboratory test": 2, "Metabolic function test": 2, "Myalgia": 2, "Nausea": 2, "Pruritus": 2, "Syncope": 2, "Troponin": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Dizziness": 1, "Erythema": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Illness": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Infection": 1, "Joint swelling": 1, "Lymph node pain": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rash": 1, "Swelling": 1, "Swelling face": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site mass": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "029H21B", "histograms": [{"histogram": {"Expired product administered": 22, "Inappropriate schedule of product administration": 5, "SARS-CoV-2 test": 5, "COVID-19": 4, "Blood test": 3, "Interchange of vaccine products": 3, "Pyrexia": 3, "Blood thyroid stimulating hormone": 2, "Burning sensation": 2, "Cardiac flutter": 2, "Chest X-ray": 2, "Chest discomfort": 2, "Chest pain": 2, "Electrocardiogram": 2, "Fatigue": 2, "Full blood count": 2, "Heart rate": 2, "Laboratory test": 2, "Metabolic function test": 2, "Myalgia": 2, "Nausea": 2, "Pruritus": 2, "Syncope": 2, "Troponin": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Ageusia": 1, "Anosmia": 1, "Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Body temperature": 1, "Dizziness": 1, "Erythema": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Hypersomnia": 1, "Illness": 1, "Immune system disorder": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Infection": 1, "Joint swelling": 1, "Lymph node pain": 1, "Malaise": 1, "Maternal exposure during breast feeding": 1, "Oxygen saturation": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rash": 1, "Swelling": 1, "Swelling face": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination failure": 1, "Vaccination site mass": 1, "Vomiting": 1}, "batchcodes": ["029H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029I20A.json b/docs/data/histograms/United States/029I20A.json
index 2e343b0d41a..1ac07f6e923 100644
--- a/docs/data/histograms/United States/029I20A.json
+++ b/docs/data/histograms/United States/029I20A.json
@@ -1 +1 @@
-{"batchcode": "029I20A", "histograms": [{"batchcodes": ["029I20A"], "histogram": {"Cardiac disorder": 1, "Dyspnoea": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "029I20A", "histograms": [{"histogram": {"Cardiac disorder": 1, "Dyspnoea": 1, "Lymphadenopathy": 1}, "batchcodes": ["029I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K0A.json b/docs/data/histograms/United States/029K0A.json
index d9e60b34c77..453be6c4c07 100644
--- a/docs/data/histograms/United States/029K0A.json
+++ b/docs/data/histograms/United States/029K0A.json
@@ -1 +1 @@
-{"batchcode": "029K0A", "histograms": [{"batchcodes": ["029K0A"], "histogram": {"Body temperature": 1, "Chills": 1, "Fall": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "029K0A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fall": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pyrexia": 1}, "batchcodes": ["029K0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K20.json b/docs/data/histograms/United States/029K20.json
index ceccd8bbdae..9a3840c2a73 100644
--- a/docs/data/histograms/United States/029K20.json
+++ b/docs/data/histograms/United States/029K20.json
@@ -1 +1 @@
-{"batchcode": "029K20", "histograms": [{"batchcodes": ["029K20"], "histogram": {"Vaccination site induration": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029K20", "histograms": [{"histogram": {"Vaccination site induration": 1, "Vaccination site pain": 1}, "batchcodes": ["029K20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K201A.json b/docs/data/histograms/United States/029K201A.json
index 11ac869a192..58c9f164cf3 100644
--- a/docs/data/histograms/United States/029K201A.json
+++ b/docs/data/histograms/United States/029K201A.json
@@ -1 +1 @@
-{"batchcode": "029K201A", "histograms": [{"batchcodes": ["029K201A"], "histogram": {"Actinic keratosis": 1, "Biopsy": 1, "Depression": 1, "Drug eruption": 1, "Hypersensitivity": 1, "Lichenoid keratosis": 1, "Pain in extremity": 1, "Periodic acid Schiff stain": 1, "Rash": 1, "Rash pruritic": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "029K201A", "histograms": [{"histogram": {"Actinic keratosis": 1, "Biopsy": 1, "Depression": 1, "Drug eruption": 1, "Hypersensitivity": 1, "Lichenoid keratosis": 1, "Pain in extremity": 1, "Periodic acid Schiff stain": 1, "Rash": 1, "Rash pruritic": 1, "Vaccination site rash": 1}, "batchcodes": ["029K201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K2074.json b/docs/data/histograms/United States/029K2074.json
index 94578999306..258eeaeab31 100644
--- a/docs/data/histograms/United States/029K2074.json
+++ b/docs/data/histograms/United States/029K2074.json
@@ -1 +1 @@
-{"batchcode": "029K2074", "histograms": [{"batchcodes": ["029K2074"], "histogram": {"Breast induration": 1, "Dizziness": 1, "Influenza": 1, "Insomnia": 1}}]}
\ No newline at end of file
+{"batchcode": "029K2074", "histograms": [{"histogram": {"Breast induration": 1, "Dizziness": 1, "Influenza": 1, "Insomnia": 1}, "batchcodes": ["029K2074"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K209.json b/docs/data/histograms/United States/029K209.json
index fcd3494e2ba..a5d23431787 100644
--- a/docs/data/histograms/United States/029K209.json
+++ b/docs/data/histograms/United States/029K209.json
@@ -1 +1 @@
-{"batchcode": "029K209", "histograms": [{"batchcodes": ["029K209"], "histogram": {"Pruritus": 1, "Rash": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029K209", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1, "Vaccination site pain": 1}, "batchcodes": ["029K209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K20A OR 027K.json b/docs/data/histograms/United States/029K20A OR 027K.json
index 563796dda90..fbcc036ec41 100644
--- a/docs/data/histograms/United States/029K20A OR 027K.json
+++ b/docs/data/histograms/United States/029K20A OR 027K.json
@@ -1 +1 @@
-{"batchcode": "029K20A OR 027K", "histograms": [{"batchcodes": ["029K20A OR 027K"], "histogram": {"Chills": 1, "Depressed mood": 1, "Headache": 1, "Pyrexia": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029K20A OR 027K", "histograms": [{"histogram": {"Chills": 1, "Depressed mood": 1, "Headache": 1, "Pyrexia": 1, "Swelling": 1}, "batchcodes": ["029K20A OR 027K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K20A.json b/docs/data/histograms/United States/029K20A.json
index 6e4629abbcf..84ea7f4effb 100644
--- a/docs/data/histograms/United States/029K20A.json
+++ b/docs/data/histograms/United States/029K20A.json
@@ -1 +1 @@
-{"batchcode": "029K20A", "histograms": [{"batchcodes": ["029K20A"], "histogram": {"Fatigue": 37, "Pyrexia": 37, "Vaccination site pain": 29, "Pain in extremity": 28, "Chills": 23, "Headache": 21, "Nausea": 16, "Arthralgia": 14, "Myalgia": 13, "Vaccination site erythema": 13, "Erythema": 12, "Vaccination site pruritus": 12, "Vaccination site warmth": 12, "Body temperature": 11, "Dizziness": 11, "Pain": 11, "Vaccination site rash": 11, "Malaise": 10, "SARS-CoV-2 test": 10, "Asthenia": 9, "Feeling abnormal": 9, "Rash": 9, "Pruritus": 7, "Cough": 6, "Injection site pain": 6, "Tremor": 6, "Diarrhoea": 5, "Insomnia": 5, "Peripheral swelling": 5, "Vaccination site induration": 5, "Asthma": 4, "Back pain": 4, "COVID-19": 4, "Dyspnoea": 4, "Hyperhidrosis": 4, "Illness": 4, "Inappropriate schedule of product administration": 4, "Urticaria": 4, "Vaccination site swelling": 4, "Bedridden": 3, "Blood pressure measurement": 3, "Chest discomfort": 3, "Confusional state": 3, "Decreased appetite": 3, "Feeling hot": 3, "Influenza": 3, "Influenza like illness": 3, "Lethargy": 3, "Limb discomfort": 3, "Lymphadenopathy": 3, "Night sweats": 3, "Product dose omission issue": 3, "Rash erythematous": 3, "Rash pruritic": 3, "Somnolence": 3, "Swelling": 3, "Tenderness": 3, "Vaccination site movement impairment": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Balance disorder": 2, "Blood test": 2, "Chest pain": 2, "Computerised tomogram": 2, "Ear discomfort": 2, "Expired product administered": 2, "Fall": 2, "Feeling cold": 2, "Flushing": 2, "Heart rate increased": 2, "Hypersensitivity": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Injection site reaction": 2, "Mass": 2, "Musculoskeletal stiffness": 2, "Nasal congestion": 2, "Nasopharyngitis": 2, "Neck pain": 2, "Paraesthesia": 2, "Pericarditis": 2, "Pregnancy test": 2, "Presyncope": 2, "Rash macular": 2, "Rhinorrhoea": 2, "Skin discolouration": 2, "Urinary tract infection": 2, "Vaccination complication": 2, "Vaccination site haemorrhage": 2, "Ventricular extrasystoles": 2, "Abdominal discomfort": 1, "Accidental underdose": 1, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Amnesia": 1, "Anaemia": 1, "Antibody test": 1, "Aphthous ulcer": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Atrial fibrillation": 1, "Atrial flutter": 1, "Axillary pain": 1, "Bed rest": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood count abnormal": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood test normal": 1, "Blood urine present": 1, "Breast pain": 1, "Breast swelling": 1, "Breast tenderness": 1, "Burning sensation": 1, "Carpal tunnel syndrome": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Condition aggravated": 1, "Contusion": 1, "Crying": 1, "Dehydration": 1, "Diplopia": 1, "Disturbance in attention": 1, "Diverticulum": 1, "Dysgeusia": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Eosinophil count": 1, "Exposure during pregnancy": 1, "Exposure via skin contact": 1, "Eye pruritus": 1, "Facial discomfort": 1, "Finger deformity": 1, "Gait disturbance": 1, "Gastric disorder": 1, "Gastric ulcer": 1, "Head discomfort": 1, "Heart rate": 1, "Herpes zoster": 1, "Hip fracture": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Infection": 1, "Injection site coldness": 1, "Injection site muscle weakness": 1, "Injection site warmth": 1, "Limb injury": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Mammogram": 1, "Mass excision": 1, "Maternal exposure during pregnancy": 1, "Mental disorder": 1, "Mental impairment": 1, "Migraine": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Mydriasis": 1, "Nail discolouration": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Nipple pain": 1, "Off label use": 1, "Palpitations": 1, "Pemphigoid": 1, "Pericardial effusion": 1, "Peripheral artery aneurysm": 1, "Peripheral paralysis": 1, "Photophobia": 1, "Product administered to patient of inappropriate age": 1, "Product storage error": 1, "Pulmonary embolism": 1, "Rash papular": 1, "Reflexes abnormal": 1, "Respiratory distress": 1, "SARS-CoV-2 test positive": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin warm": 1, "Sleep disorder": 1, "Sluggishness": 1, "Sneezing": 1, "Spinal pain": 1, "Syncope": 1, "Tachycardia": 1, "Thirst": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Underdose": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Vision blurred": 1, "Weight decreased": 1, "Wrong technique in device usage process": 1, "X-ray": 1, "Xerosis": 1}}]}
\ No newline at end of file
+{"batchcode": "029K20A", "histograms": [{"histogram": {"Fatigue": 37, "Pyrexia": 37, "Vaccination site pain": 29, "Pain in extremity": 28, "Chills": 23, "Headache": 21, "Nausea": 16, "Arthralgia": 14, "Myalgia": 13, "Vaccination site erythema": 13, "Erythema": 12, "Vaccination site pruritus": 12, "Vaccination site warmth": 12, "Body temperature": 11, "Dizziness": 11, "Pain": 11, "Vaccination site rash": 11, "Malaise": 10, "SARS-CoV-2 test": 10, "Asthenia": 9, "Feeling abnormal": 9, "Rash": 9, "Pruritus": 7, "Cough": 6, "Injection site pain": 6, "Tremor": 6, "Diarrhoea": 5, "Insomnia": 5, "Peripheral swelling": 5, "Vaccination site induration": 5, "Asthma": 4, "Back pain": 4, "COVID-19": 4, "Dyspnoea": 4, "Hyperhidrosis": 4, "Illness": 4, "Inappropriate schedule of product administration": 4, "Urticaria": 4, "Vaccination site swelling": 4, "Bedridden": 3, "Blood pressure measurement": 3, "Chest discomfort": 3, "Confusional state": 3, "Decreased appetite": 3, "Feeling hot": 3, "Influenza": 3, "Influenza like illness": 3, "Lethargy": 3, "Limb discomfort": 3, "Lymphadenopathy": 3, "Night sweats": 3, "Product dose omission issue": 3, "Rash erythematous": 3, "Rash pruritic": 3, "Somnolence": 3, "Swelling": 3, "Tenderness": 3, "Vaccination site movement impairment": 3, "Vomiting": 3, "Abdominal pain upper": 2, "Balance disorder": 2, "Blood test": 2, "Chest pain": 2, "Computerised tomogram": 2, "Ear discomfort": 2, "Expired product administered": 2, "Fall": 2, "Feeling cold": 2, "Flushing": 2, "Heart rate increased": 2, "Hypersensitivity": 2, "Injection site erythema": 2, "Injection site pruritus": 2, "Injection site reaction": 2, "Mass": 2, "Musculoskeletal stiffness": 2, "Nasal congestion": 2, "Nasopharyngitis": 2, "Neck pain": 2, "Paraesthesia": 2, "Pericarditis": 2, "Pregnancy test": 2, "Presyncope": 2, "Rash macular": 2, "Rhinorrhoea": 2, "Skin discolouration": 2, "Urinary tract infection": 2, "Vaccination complication": 2, "Vaccination site haemorrhage": 2, "Ventricular extrasystoles": 2, "Abdominal discomfort": 1, "Accidental underdose": 1, "Acute kidney injury": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Amnesia": 1, "Anaemia": 1, "Antibody test": 1, "Aphthous ulcer": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Atrial fibrillation": 1, "Atrial flutter": 1, "Axillary pain": 1, "Bed rest": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood alkaline phosphatase increased": 1, "Blood count abnormal": 1, "Blood glucose fluctuation": 1, "Blood glucose increased": 1, "Blood test normal": 1, "Blood urine present": 1, "Breast pain": 1, "Breast swelling": 1, "Breast tenderness": 1, "Burning sensation": 1, "Carpal tunnel syndrome": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Condition aggravated": 1, "Contusion": 1, "Crying": 1, "Dehydration": 1, "Diplopia": 1, "Disturbance in attention": 1, "Diverticulum": 1, "Dysgeusia": 1, "Eczema": 1, "Electrocardiogram ambulatory": 1, "Eosinophil count": 1, "Exposure during pregnancy": 1, "Exposure via skin contact": 1, "Eye pruritus": 1, "Facial discomfort": 1, "Finger deformity": 1, "Gait disturbance": 1, "Gastric disorder": 1, "Gastric ulcer": 1, "Head discomfort": 1, "Heart rate": 1, "Herpes zoster": 1, "Hip fracture": 1, "Hypertension": 1, "Hypoaesthesia": 1, "Hypotension": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Infection": 1, "Injection site coldness": 1, "Injection site muscle weakness": 1, "Injection site warmth": 1, "Limb injury": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Mammogram": 1, "Mass excision": 1, "Maternal exposure during pregnancy": 1, "Mental disorder": 1, "Mental impairment": 1, "Migraine": 1, "Mobility decreased": 1, "Movement disorder": 1, "Muscle spasms": 1, "Muscular weakness": 1, "Mydriasis": 1, "Nail discolouration": 1, "Nervous system disorder": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Nipple pain": 1, "Off label use": 1, "Palpitations": 1, "Pemphigoid": 1, "Pericardial effusion": 1, "Peripheral artery aneurysm": 1, "Peripheral paralysis": 1, "Photophobia": 1, "Product administered to patient of inappropriate age": 1, "Product storage error": 1, "Pulmonary embolism": 1, "Rash papular": 1, "Reflexes abnormal": 1, "Respiratory distress": 1, "SARS-CoV-2 test positive": 1, "Sinusitis": 1, "Skin burning sensation": 1, "Skin exfoliation": 1, "Skin warm": 1, "Sleep disorder": 1, "Sluggishness": 1, "Sneezing": 1, "Spinal pain": 1, "Syncope": 1, "Tachycardia": 1, "Thirst": 1, "Tinnitus": 1, "Ultrasound scan": 1, "Underdose": 1, "Urine analysis": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site reaction": 1, "Vertigo": 1, "Vision blurred": 1, "Weight decreased": 1, "Wrong technique in device usage process": 1, "X-ray": 1, "Xerosis": 1}, "batchcodes": ["029K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029K2OA.json b/docs/data/histograms/United States/029K2OA.json
index 1333a01f563..9709f147659 100644
--- a/docs/data/histograms/United States/029K2OA.json
+++ b/docs/data/histograms/United States/029K2OA.json
@@ -1 +1 @@
-{"batchcode": "029K2OA", "histograms": [{"batchcodes": ["029K2OA"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029K2OA", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1}, "batchcodes": ["029K2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029KC0A.json b/docs/data/histograms/United States/029KC0A.json
index 731c2312993..30141bc8230 100644
--- a/docs/data/histograms/United States/029KC0A.json
+++ b/docs/data/histograms/United States/029KC0A.json
@@ -1 +1 @@
-{"batchcode": "029KC0A", "histograms": [{"batchcodes": ["029KC0A"], "histogram": {"Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "029KC0A", "histograms": [{"histogram": {"Vaccination site pruritus": 1}, "batchcodes": ["029KC0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029KC20A.json b/docs/data/histograms/United States/029KC20A.json
index 4e4ed46ff90..27e095efa1b 100644
--- a/docs/data/histograms/United States/029KC20A.json
+++ b/docs/data/histograms/United States/029KC20A.json
@@ -1 +1 @@
-{"batchcode": "029KC20A", "histograms": [{"batchcodes": ["029KC20A"], "histogram": {"Injection site erythema": 1, "Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "029KC20A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pruritus": 1}, "batchcodes": ["029KC20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029KZ0A.json b/docs/data/histograms/United States/029KZ0A.json
index a9143676ecb..b0e6a98e96b 100644
--- a/docs/data/histograms/United States/029KZ0A.json
+++ b/docs/data/histograms/United States/029KZ0A.json
@@ -1 +1 @@
-{"batchcode": "029KZ0A", "histograms": [{"batchcodes": ["029KZ0A"], "histogram": {"Chills": 1, "Headache": 1, "Heart rate increased": 1, "Nausea": 1, "Pyrexia": 1, "Thirst": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029KZ0A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Heart rate increased": 1, "Nausea": 1, "Pyrexia": 1, "Thirst": 1, "Vaccination site pain": 1}, "batchcodes": ["029KZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L020A.json b/docs/data/histograms/United States/029L020A.json
index 512f0daeed0..437d87e42e9 100644
--- a/docs/data/histograms/United States/029L020A.json
+++ b/docs/data/histograms/United States/029L020A.json
@@ -1 +1 @@
-{"batchcode": "029L020A", "histograms": [{"batchcodes": ["029L020A"], "histogram": {"Fatigue": 1, "Skin discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "029L020A", "histograms": [{"histogram": {"Fatigue": 1, "Skin discolouration": 1}, "batchcodes": ["029L020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L02A.json b/docs/data/histograms/United States/029L02A.json
index 2268c5fcda3..92f6c8d59fb 100644
--- a/docs/data/histograms/United States/029L02A.json
+++ b/docs/data/histograms/United States/029L02A.json
@@ -1 +1 @@
-{"batchcode": "029L02A", "histograms": [{"batchcodes": ["029L02A"], "histogram": {"Chromaturia": 1, "Faeces discoloured": 1, "Injection site induration": 1, "Injection site plaque": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Nausea": 1, "Pain": 1, "Poor quality sleep": 1, "Urine abnormality": 1}}]}
\ No newline at end of file
+{"batchcode": "029L02A", "histograms": [{"histogram": {"Chromaturia": 1, "Faeces discoloured": 1, "Injection site induration": 1, "Injection site plaque": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Nausea": 1, "Pain": 1, "Poor quality sleep": 1, "Urine abnormality": 1}, "batchcodes": ["029L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L0A.json b/docs/data/histograms/United States/029L0A.json
index 73b8ef05e8e..bb8d9588044 100644
--- a/docs/data/histograms/United States/029L0A.json
+++ b/docs/data/histograms/United States/029L0A.json
@@ -1 +1 @@
-{"batchcode": "029L0A", "histograms": [{"batchcodes": ["029L0A"], "histogram": {"Arthralgia": 1, "Head discomfort": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "029L0A", "histograms": [{"histogram": {"Arthralgia": 1, "Head discomfort": 1, "Headache": 1, "Malaise": 1, "Pain": 1, "Pain in extremity": 1, "Tinnitus": 1, "Vaccination site pain": 1, "Vision blurred": 1}, "batchcodes": ["029L0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L20.json b/docs/data/histograms/United States/029L20.json
index 57da8cb5dc6..0d9cc079fba 100644
--- a/docs/data/histograms/United States/029L20.json
+++ b/docs/data/histograms/United States/029L20.json
@@ -1 +1 @@
-{"batchcode": "029L20", "histograms": [{"batchcodes": ["029L20"], "histogram": {"Computerised tomogram neck": 1, "Headache": 1, "Hypersensitivity": 1, "Neck mass": 1, "Pruritus": 1, "Swelling": 1, "Ultrasound scan": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20", "histograms": [{"histogram": {"Computerised tomogram neck": 1, "Headache": 1, "Hypersensitivity": 1, "Neck mass": 1, "Pruritus": 1, "Swelling": 1, "Ultrasound scan": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["029L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L2019.json b/docs/data/histograms/United States/029L2019.json
index ab6e0050bc7..730f34acd9f 100644
--- a/docs/data/histograms/United States/029L2019.json
+++ b/docs/data/histograms/United States/029L2019.json
@@ -1 +1 @@
-{"batchcode": "029L2019", "histograms": [{"batchcodes": ["029L2019"], "histogram": {"Erythema": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "029L2019", "histograms": [{"histogram": {"Erythema": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["029L2019"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L201A.json b/docs/data/histograms/United States/029L201A.json
index 3b9bb669c7e..cf317b60c6f 100644
--- a/docs/data/histograms/United States/029L201A.json
+++ b/docs/data/histograms/United States/029L201A.json
@@ -1 +1 @@
-{"batchcode": "029L201A", "histograms": [{"batchcodes": ["029L201A"], "histogram": {"Speech disorder": 2, "Cerebrovascular accident": 1, "Gait disturbance": 1, "Malaise": 1, "Memory impairment": 1, "Vaccination site nodule": 1}}]}
\ No newline at end of file
+{"batchcode": "029L201A", "histograms": [{"histogram": {"Speech disorder": 2, "Cerebrovascular accident": 1, "Gait disturbance": 1, "Malaise": 1, "Memory impairment": 1, "Vaccination site nodule": 1}, "batchcodes": ["029L201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L204.json b/docs/data/histograms/United States/029L204.json
index b702faad662..c3497c7ee19 100644
--- a/docs/data/histograms/United States/029L204.json
+++ b/docs/data/histograms/United States/029L204.json
@@ -1 +1 @@
-{"batchcode": "029L204", "histograms": [{"batchcodes": ["029L204"], "histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lip swelling": 1, "Malaise": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Stomatitis": 1, "Swollen tongue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029L204", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Dysgeusia": 1, "Erythema": 1, "Fatigue": 1, "Flushing": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Lip swelling": 1, "Malaise": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Stomatitis": 1, "Swollen tongue": 1, "Vaccination site pain": 1}, "batchcodes": ["029L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L208.json b/docs/data/histograms/United States/029L208.json
index d996752d203..6f973ee9af1 100644
--- a/docs/data/histograms/United States/029L208.json
+++ b/docs/data/histograms/United States/029L208.json
@@ -1 +1 @@
-{"batchcode": "029L208", "histograms": [{"batchcodes": ["029L208"], "histogram": {"Pain in extremity": 2, "Arthralgia": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Muscle tightness": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "029L208", "histograms": [{"histogram": {"Pain in extremity": 2, "Arthralgia": 1, "Blood glucose decreased": 1, "Blood glucose increased": 1, "Muscle tightness": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1}, "batchcodes": ["029L208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L208A.json b/docs/data/histograms/United States/029L208A.json
index 50ae6fefd35..49f61703454 100644
--- a/docs/data/histograms/United States/029L208A.json
+++ b/docs/data/histograms/United States/029L208A.json
@@ -1 +1 @@
-{"batchcode": "029L208A", "histograms": [{"batchcodes": ["029L208A"], "histogram": {"Immunisation reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "029L208A", "histograms": [{"histogram": {"Immunisation reaction": 1}, "batchcodes": ["029L208A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L20A..json b/docs/data/histograms/United States/029L20A..json
index 5baa8a91d7f..f2f118a3dfc 100644
--- a/docs/data/histograms/United States/029L20A..json
+++ b/docs/data/histograms/United States/029L20A..json
@@ -1 +1 @@
-{"batchcode": "029L20A.", "histograms": [{"batchcodes": ["029L20A."], "histogram": {"Erythema": 1, "Pain in extremity": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20A.", "histograms": [{"histogram": {"Erythema": 1, "Pain in extremity": 1, "Vaccination site warmth": 1}, "batchcodes": ["029L20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L20A.json b/docs/data/histograms/United States/029L20A.json
index 344ba845373..8584aba0f23 100644
--- a/docs/data/histograms/United States/029L20A.json
+++ b/docs/data/histograms/United States/029L20A.json
@@ -1 +1 @@
-{"batchcode": "029L20A", "histograms": [{"batchcodes": ["029L20A", "FF8841"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["029L20A"], "histogram": {"Headache": 147, "Pain in extremity": 137, "Chills": 120, "Fatigue": 120, "Pyrexia": 109, "Vaccination site pain": 108, "Myalgia": 100, "Pain": 75, "Vaccination site erythema": 74, "Nausea": 50, "Rash": 50, "Arthralgia": 47, "Vaccination site pruritus": 47, "Feeling abnormal": 44, "Vaccination site swelling": 44, "Pruritus": 43, "Erythema": 42, "Dizziness": 40, "Body temperature": 33, "Asthenia": 29, "COVID-19": 29, "Diarrhoea": 28, "Vaccination site rash": 28, "Vaccination site warmth": 28, "Peripheral swelling": 27, "Back pain": 24, "Vomiting": 23, "Decreased appetite": 22, "Hyperhidrosis": 22, "Insomnia": 22, "Malaise": 20, "Paraesthesia": 20, "SARS-CoV-2 test": 20, "Cough": 18, "Influenza like illness": 17, "Lymphadenopathy": 17, "Feeling hot": 16, "Vaccination site induration": 16, "Dyspnoea": 15, "Illness": 15, "Injection site pain": 15, "Expired product administered": 14, "Heart rate increased": 14, "Inappropriate schedule of product administration": 14, "Neck pain": 14, "Oropharyngeal pain": 14, "Tremor": 14, "Vaccination site reaction": 14, "Product dose omission issue": 13, "Vaccination complication": 13, "Blood pressure measurement": 12, "Hypoaesthesia": 12, "Injection site erythema": 12, "Muscle spasms": 12, "Injection site swelling": 11, "Swelling face": 11, "Urticaria": 11, "Limb discomfort": 10, "Abdominal discomfort": 9, "Chest discomfort": 9, "Product storage error": 9, "Rash pruritic": 9, "Somnolence": 9, "Burning sensation": 8, "Herpes zoster": 8, "Injection site pruritus": 8, "Muscular weakness": 8, "Rash erythematous": 8, "Swelling": 8, "Tinnitus": 8, "Drug ineffective": 7, "Feeling cold": 7, "Gait disturbance": 7, "Heart rate": 7, "Hypersensitivity": 7, "Hypertension": 7, "Incorrect dose administered": 7, "Induration": 7, "Lethargy": 7, "Lip swelling": 7, "Nasopharyngitis": 7, "Palpitations": 7, "Syncope": 7, "Vaccination site mass": 7, "Abdominal pain": 6, "Bedridden": 6, "Condition aggravated": 6, "Incorrect route of product administration": 6, "Joint swelling": 6, "Maternal exposure during pregnancy": 6, "Musculoskeletal stiffness": 6, "SARS-CoV-2 antibody test": 6, "Tachycardia": 6, "Tenderness": 6, "Vaccination site bruising": 6, "Arthritis": 5, "Blood pressure increased": 5, "Blood test": 5, "Discomfort": 5, "Hypokinesia": 5, "Inflammation": 5, "Migraine": 5, "Paraesthesia oral": 5, "Pregnancy test": 5, "Rash macular": 5, "Skin burning sensation": 5, "Throat irritation": 5, "Vaccination site inflammation": 5, "Vaccination site movement impairment": 5, "Vertigo": 5, "Vision blurred": 5, "Visual impairment": 5, "Abdominal pain upper": 4, "Antibody test": 4, "Chest pain": 4, "Dry mouth": 4, "Fall": 4, "Head discomfort": 4, "Immunisation reaction": 4, "Injection site rash": 4, "Loss of consciousness": 4, "Musculoskeletal chest pain": 4, "Night sweats": 4, "Rash papular": 4, "Skin discolouration": 4, "Sluggishness": 4, "Swollen tongue": 4, "Vaccination site discolouration": 4, "Alopecia": 3, "Anxiety": 3, "Atrial fibrillation": 3, "Axillary pain": 3, "Blister": 3, "Blood glucose increased": 3, "Blood pressure decreased": 3, "Cold sweat": 3, "Contusion": 3, "Dysphonia": 3, "Eye pain": 3, "Feeding disorder": 3, "Flushing": 3, "Gait inability": 3, "Hypersomnia": 3, "Hypoacusis": 3, "Hypoaesthesia oral": 3, "Influenza": 3, "Injection site warmth": 3, "Joint stiffness": 3, "Lymphocyte count": 3, "Memory impairment": 3, "Mobility decreased": 3, "Muscle tightness": 3, "Muscle twitching": 3, "Musculoskeletal discomfort": 3, "Nasal congestion": 3, "Neuralgia": 3, "No adverse event": 3, "Pharyngeal swelling": 3, "Poor quality sleep": 3, "Sinusitis": 3, "Taste disorder": 3, "Therapeutic response unexpected": 3, "Urinary tract infection": 3, "Vaccination site lymphadenopathy": 3, "Weight decreased": 3, "Wheezing": 3, "Adverse event": 2, "Allergy to vaccine": 2, "Asthma": 2, "Bed rest": 2, "Biopsy": 2, "Blood glucose": 2, "Body temperature abnormal": 2, "Body temperature increased": 2, "Breast pain": 2, "Bronchitis": 2, "Candida infection": 2, "Cellulitis": 2, "Cerebrovascular accident": 2, "Computerised tomogram": 2, "Confusional state": 2, "Coronavirus test": 2, "Death": 2, "Disorientation": 2, "Dry skin": 2, "Dysstasia": 2, "Ear discomfort": 2, "Ear pain": 2, "Eczema": 2, "Exposure during pregnancy": 2, "Exposure via skin contact": 2, "Eye irritation": 2, "Eyelid oedema": 2, "Feeling of body temperature change": 2, "Fluid retention": 2, "Gastrointestinal pain": 2, "Genital herpes": 2, "Heart rate irregular": 2, "Hot flush": 2, "Hunger": 2, "Hyperglycaemia": 2, "Hypotension": 2, "Impaired driving ability": 2, "Impaired work ability": 2, "Injected limb mobility decreased": 2, "Injection site discolouration": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Laboratory test": 2, "Lymph node pain": 2, "Lymphoma": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Magnetic resonance imaging neck": 2, "Mania": 2, "Monocyte count": 2, "Nerve compression": 2, "Nervousness": 2, "Neutrophil count": 2, "Nodule": 2, "Oedema": 2, "Oral pain": 2, "Panic attack": 2, "Peripheral coldness": 2, "Product administered to patient of inappropriate age": 2, "Psoriasis": 2, "SARS-CoV-2 test positive": 2, "Sensitive skin": 2, "Skin mass": 2, "Skin reaction": 2, "Suspected COVID-19": 2, "Throat tightness": 2, "Tongue discolouration": 2, "Tongue discomfort": 2, "Underdose": 2, "Vaccination site discharge": 2, "Vaccination site haemorrhage": 2, "Vaccination site nodule": 2, "Weight increased": 2, "White blood cell count": 2, "Wrong product administered": 2, "Abnormal dreams": 1, "Abnormal faeces": 1, "Abscess": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anal incontinence": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anosmia": 1, "Antibody test abnormal": 1, "Antinuclear antibody": 1, "Apathy": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Atrial flutter": 1, "Autoimmune disorder": 1, "Autonomic nervous system imbalance": 1, "Basophil count": 1, "Bite": 1, "Blood cholesterol": 1, "Blood folate": 1, "Blood pressure abnormal": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Bradykinesia": 1, "Breast cancer": 1, "Breast cancer female": 1, "Breast cancer metastatic": 1, "Breast discomfort": 1, "Breast mass": 1, "Breath odour": 1, "COVID-19 immunisation": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac flutter": 1, "Cardiac monitoring": 1, "Carditis": 1, "Carpal tunnel syndrome": 1, "Cataract": 1, "Central pain syndrome": 1, "Chapped lips": 1, "Chest X-ray": 1, "Chromaturia": 1, "Computerised tomogram normal": 1, "Coordination abnormal": 1, "Deafness unilateral": 1, "Decreased activity": 1, "Dehydration": 1, "Derealisation": 1, "Device connection issue": 1, "Discharge": 1, "Disturbance in attention": 1, "Drug hypersensitivity": 1, "Dry throat": 1, "Duodenogastric reflux": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Ear swelling": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Enzyme level test": 1, "Ephelides": 1, "Epistaxis": 1, "Eye infection": 1, "Eyelid disorder": 1, "Face oedema": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Feeling jittery": 1, "Femur fracture": 1, "Flatulence": 1, "Gastrointestinal sounds abnormal": 1, "Gingival erythema": 1, "Gingival pain": 1, "Gingival swelling": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemorrhagic ovarian cyst": 1, "Heart rate decreased": 1, "Hemidysaesthesia": 1, "Hemiplegia": 1, "Hepatic enzyme increased": 1, "Herpes virus infection": 1, "Hyperacusis": 1, "Hypertensive crisis": 1, "Hypophagia": 1, "Hypoxia": 1, "Ichthyosis": 1, "Immune system disorder": 1, "Immunodeficiency": 1, "Incomplete course of vaccination": 1, "Increased appetite": 1, "Infection": 1, "Infusion site bruising": 1, "Infusion site erythema": 1, "Injection site bruising": 1, "Injection site extravasation": 1, "Injection site haemorrhage": 1, "Injection site inflammation": 1, "Injection site muscle weakness": 1, "Injection site nodule": 1, "Injury": 1, "Intentional product use issue": 1, "Intervertebral disc protrusion": 1, "Intracardiac thrombus": 1, "Irritability": 1, "Joint range of motion decreased": 1, "Keratosis pilaris": 1, "Kidney infection": 1, "Lichenification": 1, "Limb immobilisation": 1, "Lip pruritus": 1, "Lower respiratory tract congestion": 1, "Lupus-like syndrome": 1, "Lymphadenitis": 1, "Mammogram": 1, "Mammogram abnormal": 1, "Maternal exposure before pregnancy": 1, "Mental impairment": 1, "Metamorphopsia": 1, "Miliaria": 1, "Moaning": 1, "Mouth haemorrhage": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Muscle strain": 1, "Myoclonus": 1, "Neuralgic amyotrophy": 1, "Neuropathy peripheral": 1, "Neutrophil percentage": 1, "Night blindness": 1, "Occipital neuralgia": 1, "Osteoarthritis": 1, "Otorrhoea": 1, "Out of specification product use": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Panic reaction": 1, "Parkinson's disease": 1, "Parosmia": 1, "Pelvic fracture": 1, "Performance status decreased": 1, "Periarthritis": 1, "Petechiae": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Pityriasis rosea": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polycythaemia vera": 1, "Polymyalgia rheumatica": 1, "Polymyositis": 1, "Poor peripheral circulation": 1, "Posture abnormal": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Renal failure": 1, "Renal pain": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "SARS-CoV-2 antibody test negative": 1, "Scan brain": 1, "Sinus congestion": 1, "Skin lesion": 1, "Skin test": 1, "Skin texture abnormal": 1, "Skin warm": 1, "Skin wrinkling": 1, "Sleep deficit": 1, "Soft tissue injury": 1, "Spinal pain": 1, "Sticky skin": 1, "Stomatitis": 1, "Stool analysis": 1, "Syringe issue": 1, "Systemic lupus erythematosus rash": 1, "Tendonitis": 1, "Thirst": 1, "Thrombosis": 1, "Tongue dry": 1, "Tongue pruritus": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Trigeminal neuralgia": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Ureterolithiasis": 1, "Urinary incontinence": 1, "Vaccination site anaesthesia": 1, "Vaccination site dysaesthesia": 1, "Vaccination site joint erythema": 1, "Vaccination site oedema": 1, "Vaccination site vesicles": 1, "Vaginal haemorrhage": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Vertigo positional": 1, "Vesicoureteric reflux": 1, "Vitamin B12": 1, "Vitreous floaters": 1, "Vomiting projectile": 1, "Weight": 1, "Weight fluctuation": 1, "White blood cell count abnormal": 1, "Wrist deformity": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["029L20A", "FF8841"]}, {"histogram": {"Headache": 147, "Pain in extremity": 137, "Chills": 120, "Fatigue": 120, "Pyrexia": 109, "Vaccination site pain": 108, "Myalgia": 100, "Pain": 75, "Vaccination site erythema": 74, "Nausea": 50, "Rash": 50, "Arthralgia": 47, "Vaccination site pruritus": 47, "Feeling abnormal": 44, "Vaccination site swelling": 44, "Pruritus": 43, "Erythema": 42, "Dizziness": 40, "Body temperature": 33, "Asthenia": 29, "COVID-19": 29, "Diarrhoea": 28, "Vaccination site rash": 28, "Vaccination site warmth": 28, "Peripheral swelling": 27, "Back pain": 24, "Vomiting": 23, "Decreased appetite": 22, "Hyperhidrosis": 22, "Insomnia": 22, "Malaise": 20, "Paraesthesia": 20, "SARS-CoV-2 test": 20, "Cough": 18, "Influenza like illness": 17, "Lymphadenopathy": 17, "Feeling hot": 16, "Vaccination site induration": 16, "Dyspnoea": 15, "Illness": 15, "Injection site pain": 15, "Expired product administered": 14, "Heart rate increased": 14, "Inappropriate schedule of product administration": 14, "Neck pain": 14, "Oropharyngeal pain": 14, "Tremor": 14, "Vaccination site reaction": 14, "Product dose omission issue": 13, "Vaccination complication": 13, "Blood pressure measurement": 12, "Hypoaesthesia": 12, "Injection site erythema": 12, "Muscle spasms": 12, "Injection site swelling": 11, "Swelling face": 11, "Urticaria": 11, "Limb discomfort": 10, "Abdominal discomfort": 9, "Chest discomfort": 9, "Product storage error": 9, "Rash pruritic": 9, "Somnolence": 9, "Burning sensation": 8, "Herpes zoster": 8, "Injection site pruritus": 8, "Muscular weakness": 8, "Rash erythematous": 8, "Swelling": 8, "Tinnitus": 8, "Drug ineffective": 7, "Feeling cold": 7, "Gait disturbance": 7, "Heart rate": 7, "Hypersensitivity": 7, "Hypertension": 7, "Incorrect dose administered": 7, "Induration": 7, "Lethargy": 7, "Lip swelling": 7, "Nasopharyngitis": 7, "Palpitations": 7, "Syncope": 7, "Vaccination site mass": 7, "Abdominal pain": 6, "Bedridden": 6, "Condition aggravated": 6, "Incorrect route of product administration": 6, "Joint swelling": 6, "Maternal exposure during pregnancy": 6, "Musculoskeletal stiffness": 6, "SARS-CoV-2 antibody test": 6, "Tachycardia": 6, "Tenderness": 6, "Vaccination site bruising": 6, "Arthritis": 5, "Blood pressure increased": 5, "Blood test": 5, "Discomfort": 5, "Hypokinesia": 5, "Inflammation": 5, "Migraine": 5, "Paraesthesia oral": 5, "Pregnancy test": 5, "Rash macular": 5, "Skin burning sensation": 5, "Throat irritation": 5, "Vaccination site inflammation": 5, "Vaccination site movement impairment": 5, "Vertigo": 5, "Vision blurred": 5, "Visual impairment": 5, "Abdominal pain upper": 4, "Antibody test": 4, "Chest pain": 4, "Dry mouth": 4, "Fall": 4, "Head discomfort": 4, "Immunisation reaction": 4, "Injection site rash": 4, "Loss of consciousness": 4, "Musculoskeletal chest pain": 4, "Night sweats": 4, "Rash papular": 4, "Skin discolouration": 4, "Sluggishness": 4, "Swollen tongue": 4, "Vaccination site discolouration": 4, "Alopecia": 3, "Anxiety": 3, "Atrial fibrillation": 3, "Axillary pain": 3, "Blister": 3, "Blood glucose increased": 3, "Blood pressure decreased": 3, "Cold sweat": 3, "Contusion": 3, "Dysphonia": 3, "Eye pain": 3, "Feeding disorder": 3, "Flushing": 3, "Gait inability": 3, "Hypersomnia": 3, "Hypoacusis": 3, "Hypoaesthesia oral": 3, "Influenza": 3, "Injection site warmth": 3, "Joint stiffness": 3, "Lymphocyte count": 3, "Memory impairment": 3, "Mobility decreased": 3, "Muscle tightness": 3, "Muscle twitching": 3, "Musculoskeletal discomfort": 3, "Nasal congestion": 3, "Neuralgia": 3, "No adverse event": 3, "Pharyngeal swelling": 3, "Poor quality sleep": 3, "Sinusitis": 3, "Taste disorder": 3, "Therapeutic response unexpected": 3, "Urinary tract infection": 3, "Vaccination site lymphadenopathy": 3, "Weight decreased": 3, "Wheezing": 3, "Adverse event": 2, "Allergy to vaccine": 2, "Asthma": 2, "Bed rest": 2, "Biopsy": 2, "Blood glucose": 2, "Body temperature abnormal": 2, "Body temperature increased": 2, "Breast pain": 2, "Bronchitis": 2, "Candida infection": 2, "Cellulitis": 2, "Cerebrovascular accident": 2, "Computerised tomogram": 2, "Confusional state": 2, "Coronavirus test": 2, "Death": 2, "Disorientation": 2, "Dry skin": 2, "Dysstasia": 2, "Ear discomfort": 2, "Ear pain": 2, "Eczema": 2, "Exposure during pregnancy": 2, "Exposure via skin contact": 2, "Eye irritation": 2, "Eyelid oedema": 2, "Feeling of body temperature change": 2, "Fluid retention": 2, "Gastrointestinal pain": 2, "Genital herpes": 2, "Heart rate irregular": 2, "Hot flush": 2, "Hunger": 2, "Hyperglycaemia": 2, "Hypotension": 2, "Impaired driving ability": 2, "Impaired work ability": 2, "Injected limb mobility decreased": 2, "Injection site discolouration": 2, "Injection site mass": 2, "Interchange of vaccine products": 2, "Laboratory test": 2, "Lymph node pain": 2, "Lymphoma": 2, "Magnetic resonance imaging": 2, "Magnetic resonance imaging head": 2, "Magnetic resonance imaging neck": 2, "Mania": 2, "Monocyte count": 2, "Nerve compression": 2, "Nervousness": 2, "Neutrophil count": 2, "Nodule": 2, "Oedema": 2, "Oral pain": 2, "Panic attack": 2, "Peripheral coldness": 2, "Product administered to patient of inappropriate age": 2, "Psoriasis": 2, "SARS-CoV-2 test positive": 2, "Sensitive skin": 2, "Skin mass": 2, "Skin reaction": 2, "Suspected COVID-19": 2, "Throat tightness": 2, "Tongue discolouration": 2, "Tongue discomfort": 2, "Underdose": 2, "Vaccination site discharge": 2, "Vaccination site haemorrhage": 2, "Vaccination site nodule": 2, "Weight increased": 2, "White blood cell count": 2, "Wrong product administered": 2, "Abnormal dreams": 1, "Abnormal faeces": 1, "Abscess": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse reaction": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase increased": 1, "Anal incontinence": 1, "Anaphylactic reaction": 1, "Anaphylactic shock": 1, "Anosmia": 1, "Antibody test abnormal": 1, "Antinuclear antibody": 1, "Apathy": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase increased": 1, "Asthenopia": 1, "Atrial flutter": 1, "Autoimmune disorder": 1, "Autonomic nervous system imbalance": 1, "Basophil count": 1, "Bite": 1, "Blood cholesterol": 1, "Blood folate": 1, "Blood pressure abnormal": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Bowel movement irregularity": 1, "Bradykinesia": 1, "Breast cancer": 1, "Breast cancer female": 1, "Breast cancer metastatic": 1, "Breast discomfort": 1, "Breast mass": 1, "Breath odour": 1, "COVID-19 immunisation": 1, "Cardiac disorder": 1, "Cardiac dysfunction": 1, "Cardiac flutter": 1, "Cardiac monitoring": 1, "Carditis": 1, "Carpal tunnel syndrome": 1, "Cataract": 1, "Central pain syndrome": 1, "Chapped lips": 1, "Chest X-ray": 1, "Chromaturia": 1, "Computerised tomogram normal": 1, "Coordination abnormal": 1, "Deafness unilateral": 1, "Decreased activity": 1, "Dehydration": 1, "Derealisation": 1, "Device connection issue": 1, "Discharge": 1, "Disturbance in attention": 1, "Drug hypersensitivity": 1, "Dry throat": 1, "Duodenogastric reflux": 1, "Dysaesthesia": 1, "Dysgeusia": 1, "Dyskinesia": 1, "Dyspepsia": 1, "Ear swelling": 1, "Echocardiogram": 1, "Ejection fraction": 1, "Enzyme level test": 1, "Ephelides": 1, "Epistaxis": 1, "Eye infection": 1, "Eyelid disorder": 1, "Face oedema": 1, "Facial discomfort": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Feeling jittery": 1, "Femur fracture": 1, "Flatulence": 1, "Gastrointestinal sounds abnormal": 1, "Gingival erythema": 1, "Gingival pain": 1, "Gingival swelling": 1, "Haematochezia": 1, "Haemoglobin": 1, "Haemorrhagic ovarian cyst": 1, "Heart rate decreased": 1, "Hemidysaesthesia": 1, "Hemiplegia": 1, "Hepatic enzyme increased": 1, "Herpes virus infection": 1, "Hyperacusis": 1, "Hypertensive crisis": 1, "Hypophagia": 1, "Hypoxia": 1, "Ichthyosis": 1, "Immune system disorder": 1, "Immunodeficiency": 1, "Incomplete course of vaccination": 1, "Increased appetite": 1, "Infection": 1, "Infusion site bruising": 1, "Infusion site erythema": 1, "Injection site bruising": 1, "Injection site extravasation": 1, "Injection site haemorrhage": 1, "Injection site inflammation": 1, "Injection site muscle weakness": 1, "Injection site nodule": 1, "Injury": 1, "Intentional product use issue": 1, "Intervertebral disc protrusion": 1, "Intracardiac thrombus": 1, "Irritability": 1, "Joint range of motion decreased": 1, "Keratosis pilaris": 1, "Kidney infection": 1, "Lichenification": 1, "Limb immobilisation": 1, "Lip pruritus": 1, "Lower respiratory tract congestion": 1, "Lupus-like syndrome": 1, "Lymphadenitis": 1, "Mammogram": 1, "Mammogram abnormal": 1, "Maternal exposure before pregnancy": 1, "Mental impairment": 1, "Metamorphopsia": 1, "Miliaria": 1, "Moaning": 1, "Mouth haemorrhage": 1, "Mouth ulceration": 1, "Movement disorder": 1, "Muscle strain": 1, "Myoclonus": 1, "Neuralgic amyotrophy": 1, "Neuropathy peripheral": 1, "Neutrophil percentage": 1, "Night blindness": 1, "Occipital neuralgia": 1, "Osteoarthritis": 1, "Otorrhoea": 1, "Out of specification product use": 1, "Oxygen saturation": 1, "Pain in jaw": 1, "Panic reaction": 1, "Parkinson's disease": 1, "Parosmia": 1, "Pelvic fracture": 1, "Performance status decreased": 1, "Periarthritis": 1, "Petechiae": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Pityriasis rosea": 1, "Pneumonia": 1, "Pollakiuria": 1, "Polycythaemia vera": 1, "Polymyalgia rheumatica": 1, "Polymyositis": 1, "Poor peripheral circulation": 1, "Posture abnormal": 1, "Product administered at inappropriate site": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Renal failure": 1, "Renal pain": 1, "Rheumatoid arthritis": 1, "Rhinorrhoea": 1, "Road traffic accident": 1, "SARS-CoV-2 antibody test negative": 1, "Scan brain": 1, "Sinus congestion": 1, "Skin lesion": 1, "Skin test": 1, "Skin texture abnormal": 1, "Skin warm": 1, "Skin wrinkling": 1, "Sleep deficit": 1, "Soft tissue injury": 1, "Spinal pain": 1, "Sticky skin": 1, "Stomatitis": 1, "Stool analysis": 1, "Syringe issue": 1, "Systemic lupus erythematosus rash": 1, "Tendonitis": 1, "Thirst": 1, "Thrombosis": 1, "Tongue dry": 1, "Tongue pruritus": 1, "Toothache": 1, "Transient ischaemic attack": 1, "Trigeminal neuralgia": 1, "Type IV hypersensitivity reaction": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Ureterolithiasis": 1, "Urinary incontinence": 1, "Vaccination site anaesthesia": 1, "Vaccination site dysaesthesia": 1, "Vaccination site joint erythema": 1, "Vaccination site oedema": 1, "Vaccination site vesicles": 1, "Vaginal haemorrhage": 1, "Vasculitis": 1, "Ventricular extrasystoles": 1, "Vertigo positional": 1, "Vesicoureteric reflux": 1, "Vitamin B12": 1, "Vitreous floaters": 1, "Vomiting projectile": 1, "Weight": 1, "Weight fluctuation": 1, "White blood cell count abnormal": 1, "Wrist deformity": 1, "X-ray": 1}, "batchcodes": ["029L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L20A029L20A.json b/docs/data/histograms/United States/029L20A029L20A.json
index 531ac275985..011b24ba6d6 100644
--- a/docs/data/histograms/United States/029L20A029L20A.json
+++ b/docs/data/histograms/United States/029L20A029L20A.json
@@ -1 +1 @@
-{"batchcode": "029L20A029L20A", "histograms": [{"batchcodes": ["029L20A029L20A"], "histogram": {"Fatigue": 1, "Hypersensitivity": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20A029L20A", "histograms": [{"histogram": {"Fatigue": 1, "Hypersensitivity": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Myalgia": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["029L20A029L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L20H.json b/docs/data/histograms/United States/029L20H.json
index 3d76d6754a0..27e7e64cc1e 100644
--- a/docs/data/histograms/United States/029L20H.json
+++ b/docs/data/histograms/United States/029L20H.json
@@ -1 +1 @@
-{"batchcode": "029L20H", "histograms": [{"batchcodes": ["029L20H"], "histogram": {"Rash": 2, "Induration": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20H", "histograms": [{"histogram": {"Rash": 2, "Induration": 1, "Vaccination site reaction": 1}, "batchcodes": ["029L20H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L20M.json b/docs/data/histograms/United States/029L20M.json
index c36e2fd2dc5..2ebbf3f7afc 100644
--- a/docs/data/histograms/United States/029L20M.json
+++ b/docs/data/histograms/United States/029L20M.json
@@ -1 +1 @@
-{"batchcode": "029L20M", "histograms": [{"batchcodes": ["029L20M"], "histogram": {"Abdominal pain upper": 1, "Insomnia": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20M", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Insomnia": 1, "Nausea": 1}, "batchcodes": ["029L20M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L20N.json b/docs/data/histograms/United States/029L20N.json
index 8ff342fac45..6a7a5da430f 100644
--- a/docs/data/histograms/United States/029L20N.json
+++ b/docs/data/histograms/United States/029L20N.json
@@ -1 +1 @@
-{"batchcode": "029L20N", "histograms": [{"batchcodes": ["029L20N"], "histogram": {"Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling hot": 1, "Myalgia": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "029L20N", "histograms": [{"histogram": {"Chest discomfort": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling hot": 1, "Myalgia": 1, "Oxygen saturation decreased": 1, "Palpitations": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["029L20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L21A.json b/docs/data/histograms/United States/029L21A.json
index 0972d8aa0b3..7349003111b 100644
--- a/docs/data/histograms/United States/029L21A.json
+++ b/docs/data/histograms/United States/029L21A.json
@@ -1 +1 @@
-{"batchcode": "029L21A", "histograms": [{"batchcodes": ["029L21A"], "histogram": {"Headache": 2, "Hypertension": 2, "Influenza like illness": 2, "Blood pressure measurement": 1, "Sinusitis": 1}}]}
\ No newline at end of file
+{"batchcode": "029L21A", "histograms": [{"histogram": {"Headache": 2, "Hypertension": 2, "Influenza like illness": 2, "Blood pressure measurement": 1, "Sinusitis": 1}, "batchcodes": ["029L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L26A.json b/docs/data/histograms/United States/029L26A.json
index 28bb8ffde05..38efd401886 100644
--- a/docs/data/histograms/United States/029L26A.json
+++ b/docs/data/histograms/United States/029L26A.json
@@ -1 +1 @@
-{"batchcode": "029L26A", "histograms": [{"batchcodes": ["029L26A"], "histogram": {"Ear discomfort": 1, "Tinnitus": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "029L26A", "histograms": [{"histogram": {"Ear discomfort": 1, "Tinnitus": 1, "Vaccination complication": 1}, "batchcodes": ["029L26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L28.json b/docs/data/histograms/United States/029L28.json
index e7dca7ef186..a76f188cecb 100644
--- a/docs/data/histograms/United States/029L28.json
+++ b/docs/data/histograms/United States/029L28.json
@@ -1 +1 @@
-{"batchcode": "029L28", "histograms": [{"batchcodes": ["029L28"], "histogram": {"Chills": 2, "Headache": 2, "Pyrexia": 2, "Asthenia": 1, "Fatigue": 1, "Myalgia": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "029L28", "histograms": [{"histogram": {"Chills": 2, "Headache": 2, "Pyrexia": 2, "Asthenia": 1, "Fatigue": 1, "Myalgia": 1, "Nausea": 1}, "batchcodes": ["029L28"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L29.json b/docs/data/histograms/United States/029L29.json
index 766e860c495..bee36da25f6 100644
--- a/docs/data/histograms/United States/029L29.json
+++ b/docs/data/histograms/United States/029L29.json
@@ -1 +1 @@
-{"batchcode": "029L29", "histograms": [{"batchcodes": ["029L29"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "029L29", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Dizziness": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["029L29"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L2CA.json b/docs/data/histograms/United States/029L2CA.json
index 0268c43330b..f4a004edef8 100644
--- a/docs/data/histograms/United States/029L2CA.json
+++ b/docs/data/histograms/United States/029L2CA.json
@@ -1 +1 @@
-{"batchcode": "029L2CA", "histograms": [{"batchcodes": ["029L2CA"], "histogram": {"Atrial fibrillation": 1, "Chest pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029L2CA", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Chest pain": 1}, "batchcodes": ["029L2CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L2DA.json b/docs/data/histograms/United States/029L2DA.json
index f221e48e440..7a6d5297e66 100644
--- a/docs/data/histograms/United States/029L2DA.json
+++ b/docs/data/histograms/United States/029L2DA.json
@@ -1 +1 @@
-{"batchcode": "029L2DA", "histograms": [{"batchcodes": ["029L2DA"], "histogram": {"Pain in extremity": 1, "Peripheral coldness": 1}}]}
\ No newline at end of file
+{"batchcode": "029L2DA", "histograms": [{"histogram": {"Pain in extremity": 1, "Peripheral coldness": 1}, "batchcodes": ["029L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L2OA.json b/docs/data/histograms/United States/029L2OA.json
index 30e3fdd30de..822f7255d6e 100644
--- a/docs/data/histograms/United States/029L2OA.json
+++ b/docs/data/histograms/United States/029L2OA.json
@@ -1 +1 @@
-{"batchcode": "029L2OA", "histograms": [{"batchcodes": ["029L2OA"], "histogram": {"Rheumatoid arthritis": 2, "Feeling abnormal": 1, "Headache": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain in jaw": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "029L2OA", "histograms": [{"histogram": {"Rheumatoid arthritis": 2, "Feeling abnormal": 1, "Headache": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain in jaw": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["029L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L420A.json b/docs/data/histograms/United States/029L420A.json
index b68b30dacb3..6ebd29b6d22 100644
--- a/docs/data/histograms/United States/029L420A.json
+++ b/docs/data/histograms/United States/029L420A.json
@@ -1 +1 @@
-{"batchcode": "029L420A", "histograms": [{"batchcodes": ["029L420A"], "histogram": {"Feeling hot": 1, "Headache": 1, "Heart rate increased": 1, "Hypertension": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "029L420A", "histograms": [{"histogram": {"Feeling hot": 1, "Headache": 1, "Heart rate increased": 1, "Hypertension": 1, "Rash pruritic": 1}, "batchcodes": ["029L420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029L70A.json b/docs/data/histograms/United States/029L70A.json
index 7ff02b5c7e0..9481612ddc3 100644
--- a/docs/data/histograms/United States/029L70A.json
+++ b/docs/data/histograms/United States/029L70A.json
@@ -1 +1 @@
-{"batchcode": "029L70A", "histograms": [{"batchcodes": ["029L70A"], "histogram": {"Ear discomfort": 1, "Fatigue": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Hyperhidrosis": 1, "Inflammation": 1, "Influenza like illness": 1, "Myalgia": 1, "Nasal inflammation": 1}}]}
\ No newline at end of file
+{"batchcode": "029L70A", "histograms": [{"histogram": {"Ear discomfort": 1, "Fatigue": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Hyperhidrosis": 1, "Inflammation": 1, "Influenza like illness": 1, "Myalgia": 1, "Nasal inflammation": 1}, "batchcodes": ["029L70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029LA0A.json b/docs/data/histograms/United States/029LA0A.json
index 59c9ba4b2bd..2111e840d05 100644
--- a/docs/data/histograms/United States/029LA0A.json
+++ b/docs/data/histograms/United States/029LA0A.json
@@ -1 +1 @@
-{"batchcode": "029LA0A", "histograms": [{"batchcodes": ["029LA0A"], "histogram": {"Dysphagia": 1, "Erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029LA0A", "histograms": [{"histogram": {"Dysphagia": 1, "Erythema": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["029LA0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029LCA.json b/docs/data/histograms/United States/029LCA.json
index 9974b4481ae..02fa3b0423c 100644
--- a/docs/data/histograms/United States/029LCA.json
+++ b/docs/data/histograms/United States/029LCA.json
@@ -1 +1 @@
-{"batchcode": "029LCA", "histograms": [{"batchcodes": ["029LCA"], "histogram": {"Abdominal pain upper": 1, "Bone pain": 1, "Fatigue": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029LCA", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Bone pain": 1, "Fatigue": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination site discolouration": 1, "Vaccination site pain": 1}, "batchcodes": ["029LCA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029LL0A.json b/docs/data/histograms/United States/029LL0A.json
index 95e6e380eba..98bc9af10ad 100644
--- a/docs/data/histograms/United States/029LL0A.json
+++ b/docs/data/histograms/United States/029LL0A.json
@@ -1 +1 @@
-{"batchcode": "029LL0A", "histograms": [{"batchcodes": ["029LL0A"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Chills": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029LL0A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Chills": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["029LL0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029LZ0A.json b/docs/data/histograms/United States/029LZ0A.json
index b6cce271bdb..fc723673f11 100644
--- a/docs/data/histograms/United States/029LZ0A.json
+++ b/docs/data/histograms/United States/029LZ0A.json
@@ -1 +1 @@
-{"batchcode": "029LZ0A", "histograms": [{"batchcodes": ["029LZ0A"], "histogram": {"Fatigue": 2, "Pain in extremity": 2, "Vaccination site erythema": 2, "Allergy to vaccine": 1, "Chills": 1, "Dizziness": 1, "Facial nerve disorder": 1, "Feeling abnormal": 1, "Gingival pain": 1, "Myalgia": 1, "Pain": 1, "Pain in jaw": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "029LZ0A", "histograms": [{"histogram": {"Fatigue": 2, "Pain in extremity": 2, "Vaccination site erythema": 2, "Allergy to vaccine": 1, "Chills": 1, "Dizziness": 1, "Facial nerve disorder": 1, "Feeling abnormal": 1, "Gingival pain": 1, "Myalgia": 1, "Pain": 1, "Pain in jaw": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["029LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029LZOA.json b/docs/data/histograms/United States/029LZOA.json
index d879f0b79b6..8ed9da92185 100644
--- a/docs/data/histograms/United States/029LZOA.json
+++ b/docs/data/histograms/United States/029LZOA.json
@@ -1 +1 @@
-{"batchcode": "029LZOA", "histograms": [{"batchcodes": ["029LZOA"], "histogram": {"Chills": 2, "Fatigue": 2, "Feeling abnormal": 2, "Hyperhidrosis": 2, "Sedation": 2, "Arrhythmia": 1, "Atrial fibrillation": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "029LZOA", "histograms": [{"histogram": {"Chills": 2, "Fatigue": 2, "Feeling abnormal": 2, "Hyperhidrosis": 2, "Sedation": 2, "Arrhythmia": 1, "Atrial fibrillation": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Echocardiogram": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["029LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029M02A.json b/docs/data/histograms/United States/029M02A.json
index 97cc74e2375..7c7655925d3 100644
--- a/docs/data/histograms/United States/029M02A.json
+++ b/docs/data/histograms/United States/029M02A.json
@@ -1 +1 @@
-{"batchcode": "029M02A", "histograms": [{"batchcodes": ["029M02A"], "histogram": {"Diarrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "029M02A", "histograms": [{"histogram": {"Diarrhoea": 1}, "batchcodes": ["029M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029M20A.json b/docs/data/histograms/United States/029M20A.json
index e323afeb24c..a791e6f5c35 100644
--- a/docs/data/histograms/United States/029M20A.json
+++ b/docs/data/histograms/United States/029M20A.json
@@ -1 +1 @@
-{"batchcode": "029M20A", "histograms": [{"batchcodes": ["029M20A"], "histogram": {"Pyrexia": 2, "Arthralgia": 1, "Asthenopia": 1, "Body temperature": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Malaise": 1, "Pruritus": 1, "Rash": 1, "Skin warm": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "029M20A", "histograms": [{"histogram": {"Pyrexia": 2, "Arthralgia": 1, "Asthenopia": 1, "Body temperature": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Malaise": 1, "Pruritus": 1, "Rash": 1, "Skin warm": 1, "Swelling": 1}, "batchcodes": ["029M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029M21A.json b/docs/data/histograms/United States/029M21A.json
index fe5ad967890..cfcfcfea88f 100644
--- a/docs/data/histograms/United States/029M21A.json
+++ b/docs/data/histograms/United States/029M21A.json
@@ -1 +1 @@
-{"batchcode": "029M21A", "histograms": [{"batchcodes": ["029M21A"], "histogram": {"Hypoaesthesia oral": 1, "Paraesthesia": 1, "Rash": 1, "Somnolence": 1, "Tinnitus": 1}}]}
\ No newline at end of file
+{"batchcode": "029M21A", "histograms": [{"histogram": {"Hypoaesthesia oral": 1, "Paraesthesia": 1, "Rash": 1, "Somnolence": 1, "Tinnitus": 1}, "batchcodes": ["029M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029O20A.json b/docs/data/histograms/United States/029O20A.json
index 46b17276187..57b9d43819d 100644
--- a/docs/data/histograms/United States/029O20A.json
+++ b/docs/data/histograms/United States/029O20A.json
@@ -1 +1 @@
-{"batchcode": "029O20A", "histograms": [{"batchcodes": ["029O20A"], "histogram": {"Vaccination site pain": 4, "Arthralgia": 2, "Feeling abnormal": 2, "Pain in extremity": 2, "Asthenia": 1, "Extra dose administered": 1, "Listless": 1}}]}
\ No newline at end of file
+{"batchcode": "029O20A", "histograms": [{"histogram": {"Vaccination site pain": 4, "Arthralgia": 2, "Feeling abnormal": 2, "Pain in extremity": 2, "Asthenia": 1, "Extra dose administered": 1, "Listless": 1}, "batchcodes": ["029O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/029SLOA.json b/docs/data/histograms/United States/029SLOA.json
index bb25e754bbe..f22779d4bfa 100644
--- a/docs/data/histograms/United States/029SLOA.json
+++ b/docs/data/histograms/United States/029SLOA.json
@@ -1 +1 @@
-{"batchcode": "029SLOA", "histograms": [{"batchcodes": ["029SLOA"], "histogram": {"Cough": 1, "Dysphonia": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "029SLOA", "histograms": [{"histogram": {"Cough": 1, "Dysphonia": 1, "Myalgia": 1}, "batchcodes": ["029SLOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02A21A.json b/docs/data/histograms/United States/02A21A.json
index c0bbd2d7c47..da6c286a867 100644
--- a/docs/data/histograms/United States/02A21A.json
+++ b/docs/data/histograms/United States/02A21A.json
@@ -1 +1 @@
-{"batchcode": "02A21A", "histograms": [{"batchcodes": ["02A21A"], "histogram": {"Myalgia": 4, "Diarrhoea": 3, "Fatigue": 3, "Pyrexia": 3, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Headache": 2, "Pain in extremity": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Arthropod bite": 1, "Back pain": 1, "Bone pain": 1, "Chest pain": 1, "Depression": 1, "Drug ineffective": 1, "Dry mouth": 1, "Erythema": 1, "Escherichia infection": 1, "Eye injury": 1, "Eye pruritus": 1, "Food poisoning": 1, "Heavy menstrual bleeding": 1, "Inflammation": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Pain": 1, "Peripheral swelling": 1, "Sneezing": 1, "Swelling": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "02A21A", "histograms": [{"histogram": {"Myalgia": 4, "Diarrhoea": 3, "Fatigue": 3, "Pyrexia": 3, "COVID-19": 2, "Chills": 2, "Dizziness": 2, "Headache": 2, "Pain in extremity": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Arthralgia": 1, "Arthropod bite": 1, "Back pain": 1, "Bone pain": 1, "Chest pain": 1, "Depression": 1, "Drug ineffective": 1, "Dry mouth": 1, "Erythema": 1, "Escherichia infection": 1, "Eye injury": 1, "Eye pruritus": 1, "Food poisoning": 1, "Heavy menstrual bleeding": 1, "Inflammation": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Pain": 1, "Peripheral swelling": 1, "Sneezing": 1, "Swelling": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Vomiting": 1}, "batchcodes": ["02A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02A23A.json b/docs/data/histograms/United States/02A23A.json
index 48f7958e67f..48a50b003cb 100644
--- a/docs/data/histograms/United States/02A23A.json
+++ b/docs/data/histograms/United States/02A23A.json
@@ -1 +1 @@
-{"batchcode": "02A23A", "histograms": [{"batchcodes": ["02A23A"], "histogram": {"Erythema": 1, "Feeling hot": 1, "Injection site mass": 1, "Peripheral swelling": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "02A23A", "histograms": [{"histogram": {"Erythema": 1, "Feeling hot": 1, "Injection site mass": 1, "Peripheral swelling": 1, "Urticaria": 1}, "batchcodes": ["02A23A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02A34A2.json b/docs/data/histograms/United States/02A34A2.json
index 8ed4d26fa06..41486e0c019 100644
--- a/docs/data/histograms/United States/02A34A2.json
+++ b/docs/data/histograms/United States/02A34A2.json
@@ -1 +1 @@
-{"batchcode": "02A34A2", "histograms": [{"batchcodes": ["02A34A2"], "histogram": {"Blister": 1}}]}
\ No newline at end of file
+{"batchcode": "02A34A2", "histograms": [{"histogram": {"Blister": 1}, "batchcodes": ["02A34A2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02AL20A.json b/docs/data/histograms/United States/02AL20A.json
index bffae96c346..c8557aa6695 100644
--- a/docs/data/histograms/United States/02AL20A.json
+++ b/docs/data/histograms/United States/02AL20A.json
@@ -1 +1 @@
-{"batchcode": "02AL20A", "histograms": [{"batchcodes": ["02AL20A"], "histogram": {"Peripheral swelling": 3, "Headache": 2, "Pain in extremity": 2, "Pruritus": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Erythema": 1, "Eye irritation": 1, "Eye pain": 1, "Fatigue": 1, "Injection site warmth": 1, "Mobility decreased": 1, "Myalgia": 1, "Oedema peripheral": 1, "Pain": 1, "Panic attack": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "Swelling": 1, "Thrombosis": 1, "Urinary tract infection": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "02AL20A", "histograms": [{"histogram": {"Peripheral swelling": 3, "Headache": 2, "Pain in extremity": 2, "Pruritus": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Erythema": 1, "Eye irritation": 1, "Eye pain": 1, "Fatigue": 1, "Injection site warmth": 1, "Mobility decreased": 1, "Myalgia": 1, "Oedema peripheral": 1, "Pain": 1, "Panic attack": 1, "Pyrexia": 1, "Rash": 1, "Rash macular": 1, "Swelling": 1, "Thrombosis": 1, "Urinary tract infection": 1, "Vaccination site reaction": 1}, "batchcodes": ["02AL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02ALL0A.json b/docs/data/histograms/United States/02ALL0A.json
index 0ba5ed9bf9f..f83aa619bcc 100644
--- a/docs/data/histograms/United States/02ALL0A.json
+++ b/docs/data/histograms/United States/02ALL0A.json
@@ -1 +1 @@
-{"batchcode": "02ALL0A", "histograms": [{"batchcodes": ["02ALL0A"], "histogram": {"Chills": 1, "Feeling hot": 1, "Muscle twitching": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02ALL0A", "histograms": [{"histogram": {"Chills": 1, "Feeling hot": 1, "Muscle twitching": 1, "Vaccination site pain": 1}, "batchcodes": ["02ALL0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02AMZ0A.json b/docs/data/histograms/United States/02AMZ0A.json
index ada516913d0..24f4dfe12e9 100644
--- a/docs/data/histograms/United States/02AMZ0A.json
+++ b/docs/data/histograms/United States/02AMZ0A.json
@@ -1 +1 @@
-{"batchcode": "02AMZ0A", "histograms": [{"batchcodes": ["02AMZ0A"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02AMZ0A", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["02AMZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02APR2021.json b/docs/data/histograms/United States/02APR2021.json
index 86b268910e6..c458e0a86f9 100644
--- a/docs/data/histograms/United States/02APR2021.json
+++ b/docs/data/histograms/United States/02APR2021.json
@@ -1 +1 @@
-{"batchcode": "02APR2021", "histograms": [{"batchcodes": ["02APR2021"], "histogram": {"Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "02APR2021", "histograms": [{"histogram": {"Palpitations": 1}, "batchcodes": ["02APR2021"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02AZ21A.json b/docs/data/histograms/United States/02AZ21A.json
index ee8d5761bbc..3dca0110b20 100644
--- a/docs/data/histograms/United States/02AZ21A.json
+++ b/docs/data/histograms/United States/02AZ21A.json
@@ -1 +1 @@
-{"batchcode": "02AZ21A", "histograms": [{"batchcodes": ["02AZ21A"], "histogram": {"Diarrhoea": 1, "Malaise": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "02AZ21A", "histograms": [{"histogram": {"Diarrhoea": 1, "Malaise": 1, "Myalgia": 1}, "batchcodes": ["02AZ21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02B21A.json b/docs/data/histograms/United States/02B21A.json
index d095b218286..4e44cf839b0 100644
--- a/docs/data/histograms/United States/02B21A.json
+++ b/docs/data/histograms/United States/02B21A.json
@@ -1 +1 @@
-{"batchcode": "02B21A", "histograms": [{"batchcodes": ["02B21A"], "histogram": {"Product administered to patient of inappropriate age": 4, "Pain in extremity": 3, "Pain": 2, "Accidental overdose": 1, "Chills": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Menstruation irregular": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Throat tightness": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "02B21A", "histograms": [{"histogram": {"Product administered to patient of inappropriate age": 4, "Pain in extremity": 3, "Pain": 2, "Accidental overdose": 1, "Chills": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Menstruation irregular": 1, "Musculoskeletal pain": 1, "Nausea": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Throat tightness": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["02B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02BA21A.json b/docs/data/histograms/United States/02BA21A.json
index e39b3eb9c4a..7d9981186fc 100644
--- a/docs/data/histograms/United States/02BA21A.json
+++ b/docs/data/histograms/United States/02BA21A.json
@@ -1 +1 @@
-{"batchcode": "02BA21A", "histograms": [{"batchcodes": ["02BA21A"], "histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Computerised tomogram": 1, "Dehydration": 1, "Fatigue": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Malaise": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Pain in extremity": 1, "Painful respiration": 1, "Vaccination complication": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "02BA21A", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Asthenia": 1, "Computerised tomogram": 1, "Dehydration": 1, "Fatigue": 1, "Feeling abnormal": 1, "Influenza like illness": 1, "Malaise": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Pain in extremity": 1, "Painful respiration": 1, "Vaccination complication": 1, "Vaccination site reaction": 1}, "batchcodes": ["02BA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02BC20A.json b/docs/data/histograms/United States/02BC20A.json
index ef3b38a3f96..b4eb5b3eeb3 100644
--- a/docs/data/histograms/United States/02BC20A.json
+++ b/docs/data/histograms/United States/02BC20A.json
@@ -1 +1 @@
-{"batchcode": "02BC20A", "histograms": [{"batchcodes": ["02BC20A"], "histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Erythema": 1, "Flushing": 1, "Hypertension": 1}}]}
\ No newline at end of file
+{"batchcode": "02BC20A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Dizziness": 1, "Erythema": 1, "Flushing": 1, "Hypertension": 1}, "batchcodes": ["02BC20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02BL20A.json b/docs/data/histograms/United States/02BL20A.json
index 368cf3d63c0..a17858a2d5f 100644
--- a/docs/data/histograms/United States/02BL20A.json
+++ b/docs/data/histograms/United States/02BL20A.json
@@ -1 +1 @@
-{"batchcode": "02BL20A", "histograms": [{"batchcodes": ["02BL20A"], "histogram": {"Asthenia": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Insomnia": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain in extremity": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "02BL20A", "histograms": [{"histogram": {"Asthenia": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Insomnia": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Pain in extremity": 1, "Tremor": 1}, "batchcodes": ["02BL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02BL2OA.json b/docs/data/histograms/United States/02BL2OA.json
index 7347d68f5b2..c92d70b2559 100644
--- a/docs/data/histograms/United States/02BL2OA.json
+++ b/docs/data/histograms/United States/02BL2OA.json
@@ -1 +1 @@
-{"batchcode": "02BL2OA", "histograms": [{"batchcodes": ["02BL2OA"], "histogram": {"Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02BL2OA", "histograms": [{"histogram": {"Nausea": 1, "Pyrexia": 1}, "batchcodes": ["02BL2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02C1A21A.json b/docs/data/histograms/United States/02C1A21A.json
index 9098b5d890c..83fa8f89ed9 100644
--- a/docs/data/histograms/United States/02C1A21A.json
+++ b/docs/data/histograms/United States/02C1A21A.json
@@ -1 +1 @@
-{"batchcode": "02C1A21A", "histograms": [{"batchcodes": ["02C1A21A"], "histogram": {"Blood glucose": 1, "Exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "02C1A21A", "histograms": [{"histogram": {"Blood glucose": 1, "Exposure during pregnancy": 1, "Pregnancy test": 1, "Ultrasound scan": 1}, "batchcodes": ["02C1A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02C1Z1A.json b/docs/data/histograms/United States/02C1Z1A.json
index 6de3b64aa07..c18aa809ed7 100644
--- a/docs/data/histograms/United States/02C1Z1A.json
+++ b/docs/data/histograms/United States/02C1Z1A.json
@@ -1 +1 @@
-{"batchcode": "02C1Z1A", "histograms": [{"batchcodes": ["02C1Z1A"], "histogram": {"Erythema": 1, "Feeling hot": 1, "Pruritus": 1, "Pyrexia": 1, "Skin mass": 1}}]}
\ No newline at end of file
+{"batchcode": "02C1Z1A", "histograms": [{"histogram": {"Erythema": 1, "Feeling hot": 1, "Pruritus": 1, "Pyrexia": 1, "Skin mass": 1}, "batchcodes": ["02C1Z1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02CB21A.json b/docs/data/histograms/United States/02CB21A.json
index eeab52695d4..4ef2a9954d5 100644
--- a/docs/data/histograms/United States/02CB21A.json
+++ b/docs/data/histograms/United States/02CB21A.json
@@ -1 +1 @@
-{"batchcode": "02CB21A", "histograms": [{"batchcodes": ["02CB21A"], "histogram": {"Epistaxis": 1, "Migraine": 1, "Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02CB21A", "histograms": [{"histogram": {"Epistaxis": 1, "Migraine": 1, "Oropharyngeal pain": 1}, "batchcodes": ["02CB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02DB21A.json b/docs/data/histograms/United States/02DB21A.json
index 998a64868d3..a2f339a91b5 100644
--- a/docs/data/histograms/United States/02DB21A.json
+++ b/docs/data/histograms/United States/02DB21A.json
@@ -1 +1 @@
-{"batchcode": "02DB21A", "histograms": [{"batchcodes": ["02DB21A"], "histogram": {"Illness": 2, "Nausea": 2, "Lethargy": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "02DB21A", "histograms": [{"histogram": {"Illness": 2, "Nausea": 2, "Lethargy": 1, "Vomiting": 1}, "batchcodes": ["02DB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02ELWA.json b/docs/data/histograms/United States/02ELWA.json
index db6300f8ca9..c7b5bcfe02c 100644
--- a/docs/data/histograms/United States/02ELWA.json
+++ b/docs/data/histograms/United States/02ELWA.json
@@ -1 +1 @@
-{"batchcode": "02ELWA", "histograms": [{"batchcodes": ["02ELWA"], "histogram": {"Body tinea": 1}}]}
\ No newline at end of file
+{"batchcode": "02ELWA", "histograms": [{"histogram": {"Body tinea": 1}, "batchcodes": ["02ELWA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02FJ202A.json b/docs/data/histograms/United States/02FJ202A.json
index db0c0f6e50e..799dc4df5d8 100644
--- a/docs/data/histograms/United States/02FJ202A.json
+++ b/docs/data/histograms/United States/02FJ202A.json
@@ -1 +1 @@
-{"batchcode": "02FJ202A", "histograms": [{"batchcodes": ["02FJ202A"], "histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "02FJ202A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site pain": 1, "Injection site pruritus": 1, "Injection site swelling": 1}, "batchcodes": ["02FJ202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02FL0A.json b/docs/data/histograms/United States/02FL0A.json
index 3673d8714e4..551487a6a68 100644
--- a/docs/data/histograms/United States/02FL0A.json
+++ b/docs/data/histograms/United States/02FL0A.json
@@ -1 +1 @@
-{"batchcode": "02FL0A", "histograms": [{"batchcodes": ["02FL0A"], "histogram": {"Injection site haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "02FL0A", "histograms": [{"histogram": {"Injection site haemorrhage": 1}, "batchcodes": ["02FL0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02FL20A.json b/docs/data/histograms/United States/02FL20A.json
index de4c1887a52..099a30e4613 100644
--- a/docs/data/histograms/United States/02FL20A.json
+++ b/docs/data/histograms/United States/02FL20A.json
@@ -1 +1 @@
-{"batchcode": "02FL20A", "histograms": [{"batchcodes": ["02FL20A"], "histogram": {"Arthralgia": 1, "Rash": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "02FL20A", "histograms": [{"histogram": {"Arthralgia": 1, "Rash": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["02FL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02G(?)L20A.json b/docs/data/histograms/United States/02G(?)L20A.json
index e567ef62edc..eb2c2ff8ae6 100644
--- a/docs/data/histograms/United States/02G(?)L20A.json
+++ b/docs/data/histograms/United States/02G(?)L20A.json
@@ -1 +1 @@
-{"batchcode": "02G(?)L20A", "histograms": [{"batchcodes": ["02G(?)L20A"], "histogram": {"Abdominal pain upper": 2, "Dyspnoea": 2, "Fatigue": 2, "Nausea": 2, "Oxygen saturation": 2}}]}
\ No newline at end of file
+{"batchcode": "02G(?)L20A", "histograms": [{"histogram": {"Abdominal pain upper": 2, "Dyspnoea": 2, "Fatigue": 2, "Nausea": 2, "Oxygen saturation": 2}, "batchcodes": ["02G(?)L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02GL20A.json b/docs/data/histograms/United States/02GL20A.json
index 15065c1123a..3f10cef7349 100644
--- a/docs/data/histograms/United States/02GL20A.json
+++ b/docs/data/histograms/United States/02GL20A.json
@@ -1 +1 @@
-{"batchcode": "02GL20A", "histograms": [{"batchcodes": ["02GL20A"], "histogram": {"Headache": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Pleurisy": 1, "Pyrexia": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "02GL20A", "histograms": [{"histogram": {"Headache": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal stiffness": 1, "Pleurisy": 1, "Pyrexia": 1, "Rash pruritic": 1, "Rhinorrhoea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["02GL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02H21B.json b/docs/data/histograms/United States/02H21B.json
index 6ff9fc6a1a4..60a7528f599 100644
--- a/docs/data/histograms/United States/02H21B.json
+++ b/docs/data/histograms/United States/02H21B.json
@@ -1 +1 @@
-{"batchcode": "02H21B", "histograms": [{"batchcodes": ["02H21B"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "02H21B", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["02H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02J20A.json b/docs/data/histograms/United States/02J20A.json
index 1ff547d00e1..76946b35a53 100644
--- a/docs/data/histograms/United States/02J20A.json
+++ b/docs/data/histograms/United States/02J20A.json
@@ -1 +1 @@
-{"batchcode": "02J20A", "histograms": [{"batchcodes": ["02J20A"], "histogram": {"Vaccination site pain": 2, "Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "02J20A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Headache": 1, "Lymphadenopathy": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "SARS-CoV-2 test positive": 1, "Tenderness": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["02J20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02L20A.json b/docs/data/histograms/United States/02L20A.json
index b14f1b0415b..b870e3932ad 100644
--- a/docs/data/histograms/United States/02L20A.json
+++ b/docs/data/histograms/United States/02L20A.json
@@ -1 +1 @@
-{"batchcode": "02L20A", "histograms": [{"batchcodes": ["02L20A"], "histogram": {"Eye swelling": 2, "Headache": 2, "Pain in extremity": 2, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Eating disorder": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Freezing phenomenon": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Myocardial infarction": 1, "Nausea": 1, "No adverse event": 1, "Pain": 1, "Rash": 1, "Rash macular": 1, "Rash pruritic": 1, "Restlessness": 1, "SARS-CoV-2 test": 1, "Skin irritation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02L20A", "histograms": [{"histogram": {"Eye swelling": 2, "Headache": 2, "Pain in extremity": 2, "COVID-19": 1, "Chills": 1, "Dyspnoea": 1, "Eating disorder": 1, "Eye pruritus": 1, "Eyelid ptosis": 1, "Freezing phenomenon": 1, "Hyperhidrosis": 1, "Hypersensitivity": 1, "Inappropriate schedule of product administration": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Myocardial infarction": 1, "Nausea": 1, "No adverse event": 1, "Pain": 1, "Rash": 1, "Rash macular": 1, "Rash pruritic": 1, "Restlessness": 1, "SARS-CoV-2 test": 1, "Skin irritation": 1, "Vaccination site pain": 1}, "batchcodes": ["02L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02LA20A.json b/docs/data/histograms/United States/02LA20A.json
index 44013745ff8..5db6d5bb6e2 100644
--- a/docs/data/histograms/United States/02LA20A.json
+++ b/docs/data/histograms/United States/02LA20A.json
@@ -1 +1 @@
-{"batchcode": "02LA20A", "histograms": [{"batchcodes": ["02LA20A"], "histogram": {"Chills": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "02LA20A", "histograms": [{"histogram": {"Chills": 1, "Erythema": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["02LA20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02M20A.json b/docs/data/histograms/United States/02M20A.json
index 179b4765e52..c9a20cfd666 100644
--- a/docs/data/histograms/United States/02M20A.json
+++ b/docs/data/histograms/United States/02M20A.json
@@ -1 +1 @@
-{"batchcode": "02M20A", "histograms": [{"batchcodes": ["02M20A"], "histogram": {"Depressed mood": 1, "Fatigue": 1, "Headache": 1, "Incomplete course of vaccination": 1, "Pain in extremity": 1, "Pyrexia": 1, "Stress": 1, "Vaccination complication": 1, "Vaccination error": 1}}]}
\ No newline at end of file
+{"batchcode": "02M20A", "histograms": [{"histogram": {"Depressed mood": 1, "Fatigue": 1, "Headache": 1, "Incomplete course of vaccination": 1, "Pain in extremity": 1, "Pyrexia": 1, "Stress": 1, "Vaccination complication": 1, "Vaccination error": 1}, "batchcodes": ["02M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02NA21A.json b/docs/data/histograms/United States/02NA21A.json
index 3f15ff30315..905721fe9ce 100644
--- a/docs/data/histograms/United States/02NA21A.json
+++ b/docs/data/histograms/United States/02NA21A.json
@@ -1 +1 @@
-{"batchcode": "02NA21A", "histograms": [{"batchcodes": ["02NA21A"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02NA21A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["02NA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02OR7B? 0R8? L7.json b/docs/data/histograms/United States/02OR7B? 0R8? L7.json
index 2f84632432f..83cbee9fee6 100644
--- a/docs/data/histograms/United States/02OR7B? 0R8? L7.json
+++ b/docs/data/histograms/United States/02OR7B? 0R8? L7.json
@@ -1 +1 @@
-{"batchcode": "02OR7B? 0R8? L7", "histograms": [{"batchcodes": ["02OR7B? 0R8? L7"], "histogram": {"Feeling abnormal": 1, "Flushing": 1, "Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "02OR7B? 0R8? L7", "histograms": [{"histogram": {"Feeling abnormal": 1, "Flushing": 1, "Headache": 1, "Myalgia": 1}, "batchcodes": ["02OR7B? 0R8? L7"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02RL20A.json b/docs/data/histograms/United States/02RL20A.json
index 70f58af8586..0b64cd1291f 100644
--- a/docs/data/histograms/United States/02RL20A.json
+++ b/docs/data/histograms/United States/02RL20A.json
@@ -1 +1 @@
-{"batchcode": "02RL20A", "histograms": [{"batchcodes": ["02RL20A"], "histogram": {"Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Loss of consciousness": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02RL20A", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Feeling cold": 1, "Loss of consciousness": 1, "Pain": 1}, "batchcodes": ["02RL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02S(OR5)A21A.json b/docs/data/histograms/United States/02S(OR5)A21A.json
index 2e496dbe6c3..3231acdb653 100644
--- a/docs/data/histograms/United States/02S(OR5)A21A.json
+++ b/docs/data/histograms/United States/02S(OR5)A21A.json
@@ -1 +1 @@
-{"batchcode": "02S(OR5)A21A", "histograms": [{"batchcodes": ["02S(OR5)A21A"], "histogram": {"Injection site erythema": 1, "Pain": 1, "Pyrexia": 1, "Sleep disorder": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "02S(OR5)A21A", "histograms": [{"histogram": {"Injection site erythema": 1, "Pain": 1, "Pyrexia": 1, "Sleep disorder": 1, "Swelling": 1}, "batchcodes": ["02S(OR5)A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SA21A.json b/docs/data/histograms/United States/02SA21A.json
index 003912e592a..3bcfd8d095b 100644
--- a/docs/data/histograms/United States/02SA21A.json
+++ b/docs/data/histograms/United States/02SA21A.json
@@ -1 +1 @@
-{"batchcode": "02SA21A", "histograms": [{"batchcodes": ["02SA21A"], "histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Osteoarthritis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "02SA21A", "histograms": [{"histogram": {"COVID-19": 1, "Chills": 1, "Cough": 1, "Dyspnoea": 1, "Fatigue": 1, "Feeling abnormal": 1, "Osteoarthritis": 1, "Pain in extremity": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["02SA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SAZ1A.json b/docs/data/histograms/United States/02SAZ1A.json
index 4940ed33fcc..6eb85bfe9e2 100644
--- a/docs/data/histograms/United States/02SAZ1A.json
+++ b/docs/data/histograms/United States/02SAZ1A.json
@@ -1 +1 @@
-{"batchcode": "02SAZ1A", "histograms": [{"batchcodes": ["02SAZ1A"], "histogram": {"Asthma": 1, "Heart rate": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "02SAZ1A", "histograms": [{"histogram": {"Asthma": 1, "Heart rate": 1, "Rash": 1}, "batchcodes": ["02SAZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SAZIA.json b/docs/data/histograms/United States/02SAZIA.json
index a0983519002..6abcd8834a3 100644
--- a/docs/data/histograms/United States/02SAZIA.json
+++ b/docs/data/histograms/United States/02SAZIA.json
@@ -1 +1 @@
-{"batchcode": "02SAZIA", "histograms": [{"batchcodes": ["02SAZIA"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dry mouth": 1, "Fatigue": 1, "Hypersensitivity": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "02SAZIA", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dry mouth": 1, "Fatigue": 1, "Hypersensitivity": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["02SAZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SB21A OR 025B.json b/docs/data/histograms/United States/02SB21A OR 025B.json
index 789cb06d52e..aa488518ce5 100644
--- a/docs/data/histograms/United States/02SB21A OR 025B.json
+++ b/docs/data/histograms/United States/02SB21A OR 025B.json
@@ -1 +1 @@
-{"batchcode": "02SB21A OR 025B", "histograms": [{"batchcodes": ["02SB21A OR 025B"], "histogram": {"Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "02SB21A OR 025B", "histograms": [{"histogram": {"Myalgia": 1}, "batchcodes": ["02SB21A OR 025B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SB21A.json b/docs/data/histograms/United States/02SB21A.json
index 4d1f775b9a0..cd6b2f6640c 100644
--- a/docs/data/histograms/United States/02SB21A.json
+++ b/docs/data/histograms/United States/02SB21A.json
@@ -1 +1 @@
-{"batchcode": "02SB21A", "histograms": [{"batchcodes": ["02SB21A"], "histogram": {"Discomfort": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Injection site pain": 1, "Pain in extremity": 1, "Rash": 1, "Somnolence": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02SB21A", "histograms": [{"histogram": {"Discomfort": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Feeling hot": 1, "Injection site pain": 1, "Pain in extremity": 1, "Rash": 1, "Somnolence": 1, "Vaccination site pain": 1}, "batchcodes": ["02SB21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SBZ1A.json b/docs/data/histograms/United States/02SBZ1A.json
index 6713afccd78..fbc29bf71f6 100644
--- a/docs/data/histograms/United States/02SBZ1A.json
+++ b/docs/data/histograms/United States/02SBZ1A.json
@@ -1 +1 @@
-{"batchcode": "02SBZ1A", "histograms": [{"batchcodes": ["02SBZ1A"], "histogram": {"Cough": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02SBZ1A", "histograms": [{"histogram": {"Cough": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["02SBZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SC21A.json b/docs/data/histograms/United States/02SC21A.json
index f8308256a47..50eb22142cf 100644
--- a/docs/data/histograms/United States/02SC21A.json
+++ b/docs/data/histograms/United States/02SC21A.json
@@ -1 +1 @@
-{"batchcode": "02SC21A", "histograms": [{"batchcodes": ["02SC21A"], "histogram": {"Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Bone pain": 1, "Breast pain": 1, "COVID-19": 1, "Chills": 1, "Contusion": 1, "Decreased appetite": 1, "Fatigue": 1, "Mass": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "02SC21A", "histograms": [{"histogram": {"Arthralgia": 1, "Asthenia": 1, "Axillary pain": 1, "Bone pain": 1, "Breast pain": 1, "COVID-19": 1, "Chills": 1, "Contusion": 1, "Decreased appetite": 1, "Fatigue": 1, "Mass": 1, "Nausea": 1}, "batchcodes": ["02SC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SJ20-2A.json b/docs/data/histograms/United States/02SJ20-2A.json
index 0076d6a2464..593b67b3d3b 100644
--- a/docs/data/histograms/United States/02SJ20-2A.json
+++ b/docs/data/histograms/United States/02SJ20-2A.json
@@ -1 +1 @@
-{"batchcode": "02SJ20-2A", "histograms": [{"batchcodes": ["02SJ20-2A"], "histogram": {"Glucose tolerance test": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Ultrasound scan": 1}}]}
\ No newline at end of file
+{"batchcode": "02SJ20-2A", "histograms": [{"histogram": {"Glucose tolerance test": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Ultrasound scan": 1}, "batchcodes": ["02SJ20-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SJ202A.json b/docs/data/histograms/United States/02SJ202A.json
index 339f1909d07..eaa01706ee0 100644
--- a/docs/data/histograms/United States/02SJ202A.json
+++ b/docs/data/histograms/United States/02SJ202A.json
@@ -1 +1 @@
-{"batchcode": "02SJ202A", "histograms": [{"batchcodes": ["02SJ202A"], "histogram": {"COVID-19": 1, "General symptom": 1, "Headache": 1, "Oropharyngeal pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "02SJ202A", "histograms": [{"histogram": {"COVID-19": 1, "General symptom": 1, "Headache": 1, "Oropharyngeal pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["02SJ202A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SJ20A.json b/docs/data/histograms/United States/02SJ20A.json
index 3adbaf15a8d..22747bfbd81 100644
--- a/docs/data/histograms/United States/02SJ20A.json
+++ b/docs/data/histograms/United States/02SJ20A.json
@@ -1 +1 @@
-{"batchcode": "02SJ20A", "histograms": [{"batchcodes": ["02SJ20A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "02SJ20A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site swelling": 1}, "batchcodes": ["02SJ20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SL208.json b/docs/data/histograms/United States/02SL208.json
index 9d694cca215..65ae034dea4 100644
--- a/docs/data/histograms/United States/02SL208.json
+++ b/docs/data/histograms/United States/02SL208.json
@@ -1 +1 @@
-{"batchcode": "02SL208", "histograms": [{"batchcodes": ["02SL208"], "histogram": {"Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "02SL208", "histograms": [{"histogram": {"Vaccination site erythema": 1}, "batchcodes": ["02SL208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SL209.json b/docs/data/histograms/United States/02SL209.json
index 711473bd4ba..db4b1b129f6 100644
--- a/docs/data/histograms/United States/02SL209.json
+++ b/docs/data/histograms/United States/02SL209.json
@@ -1 +1 @@
-{"batchcode": "02SL209", "histograms": [{"batchcodes": ["02SL209"], "histogram": {"Body temperature": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "02SL209", "histograms": [{"histogram": {"Body temperature": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1}, "batchcodes": ["02SL209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SL20A.json b/docs/data/histograms/United States/02SL20A.json
index 41ea24230ae..7824bbc225d 100644
--- a/docs/data/histograms/United States/02SL20A.json
+++ b/docs/data/histograms/United States/02SL20A.json
@@ -1 +1 @@
-{"batchcode": "02SL20A", "histograms": [{"batchcodes": ["02SL20A"], "histogram": {"Chills": 3, "Pain in extremity": 3, "Erythema": 2, "Migraine": 2, "Peripheral swelling": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Arthralgia": 1, "Breast inflammation": 1, "Bursitis": 1, "COVID-19": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Mass": 1, "Pyrexia": 1, "Skin lesion": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "02SL20A", "histograms": [{"histogram": {"Chills": 3, "Pain in extremity": 3, "Erythema": 2, "Migraine": 2, "Peripheral swelling": 2, "Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site pruritus": 2, "Vaccination site warmth": 2, "Arthralgia": 1, "Breast inflammation": 1, "Bursitis": 1, "COVID-19": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Inappropriate schedule of product administration": 1, "Injection site warmth": 1, "Intentional product use issue": 1, "Joint swelling": 1, "Mass": 1, "Pyrexia": 1, "Skin lesion": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1}, "batchcodes": ["02SL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02SO20A.json b/docs/data/histograms/United States/02SO20A.json
index 41954c7829b..fa547b19747 100644
--- a/docs/data/histograms/United States/02SO20A.json
+++ b/docs/data/histograms/United States/02SO20A.json
@@ -1 +1 @@
-{"batchcode": "02SO20A", "histograms": [{"batchcodes": ["02SO20A"], "histogram": {"Myalgia": 2, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Migraine": 1, "Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "02SO20A", "histograms": [{"histogram": {"Myalgia": 2, "Fatigue": 1, "Headache": 1, "Injection site pain": 1, "Migraine": 1, "Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["02SO20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02T520-2A.json b/docs/data/histograms/United States/02T520-2A.json
index b8675bc7cbc..05769890a6c 100644
--- a/docs/data/histograms/United States/02T520-2A.json
+++ b/docs/data/histograms/United States/02T520-2A.json
@@ -1 +1 @@
-{"batchcode": "02T520-2A", "histograms": [{"batchcodes": ["02T520-2A"], "histogram": {"Dysgeusia": 1, "Pain in extremity": 1, "Sinusitis": 1}}]}
\ No newline at end of file
+{"batchcode": "02T520-2A", "histograms": [{"histogram": {"Dysgeusia": 1, "Pain in extremity": 1, "Sinusitis": 1}, "batchcodes": ["02T520-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02TIA21A.json b/docs/data/histograms/United States/02TIA21A.json
index d12134deba3..fe5e3e9f42e 100644
--- a/docs/data/histograms/United States/02TIA21A.json
+++ b/docs/data/histograms/United States/02TIA21A.json
@@ -1 +1 @@
-{"batchcode": "02TIA21A", "histograms": [{"batchcodes": ["02TIA21A"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "02TIA21A", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["02TIA21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02TJ20A.json b/docs/data/histograms/United States/02TJ20A.json
index b92cc0c0067..ff3519fa204 100644
--- a/docs/data/histograms/United States/02TJ20A.json
+++ b/docs/data/histograms/United States/02TJ20A.json
@@ -1 +1 @@
-{"batchcode": "02TJ20A", "histograms": [{"batchcodes": ["02TJ20A"], "histogram": {"Product administered at inappropriate site": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "02TJ20A", "histograms": [{"histogram": {"Product administered at inappropriate site": 1, "Vaccination site erythema": 1, "Vaccination site warmth": 1}, "batchcodes": ["02TJ20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02UM20A.json b/docs/data/histograms/United States/02UM20A.json
index 26b14010f6d..e909454d6bf 100644
--- a/docs/data/histograms/United States/02UM20A.json
+++ b/docs/data/histograms/United States/02UM20A.json
@@ -1 +1 @@
-{"batchcode": "02UM20A", "histograms": [{"batchcodes": ["02UM20A"], "histogram": {"Body temperature": 2, "Headache": 2, "Pyrexia": 2, "Dysgeusia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Musculoskeletal stiffness": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "02UM20A", "histograms": [{"histogram": {"Body temperature": 2, "Headache": 2, "Pyrexia": 2, "Dysgeusia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Flushing": 1, "Hot flush": 1, "Hypoaesthesia": 1, "Musculoskeletal stiffness": 1, "Paraesthesia": 1}, "batchcodes": ["02UM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02UMZUD.json b/docs/data/histograms/United States/02UMZUD.json
index 12d1660e9c0..8cb7f5d35b9 100644
--- a/docs/data/histograms/United States/02UMZUD.json
+++ b/docs/data/histograms/United States/02UMZUD.json
@@ -1 +1 @@
-{"batchcode": "02UMZUD", "histograms": [{"batchcodes": ["02UMZUD"], "histogram": {"Feeling abnormal": 1, "Suicidal ideation": 1, "Tinnitus": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "02UMZUD", "histograms": [{"histogram": {"Feeling abnormal": 1, "Suicidal ideation": 1, "Tinnitus": 1, "Vertigo": 1}, "batchcodes": ["02UMZUD"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02XC21A.json b/docs/data/histograms/United States/02XC21A.json
index fc6606549f7..ac3be15755a 100644
--- a/docs/data/histograms/United States/02XC21A.json
+++ b/docs/data/histograms/United States/02XC21A.json
@@ -1 +1 @@
-{"batchcode": "02XC21A", "histograms": [{"batchcodes": ["02XC21A"], "histogram": {"Axillary pain": 1, "Depressed mood": 1, "Emotional distress": 1, "Erythema": 1, "Feeling hot": 1, "Lymphadenopathy": 1, "Rash": 1, "Scar pain": 1, "Skin exfoliation": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "02XC21A", "histograms": [{"histogram": {"Axillary pain": 1, "Depressed mood": 1, "Emotional distress": 1, "Erythema": 1, "Feeling hot": 1, "Lymphadenopathy": 1, "Rash": 1, "Scar pain": 1, "Skin exfoliation": 1, "Vaccination complication": 1}, "batchcodes": ["02XC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02YC21A.json b/docs/data/histograms/United States/02YC21A.json
index 5645e096597..cfc41321ece 100644
--- a/docs/data/histograms/United States/02YC21A.json
+++ b/docs/data/histograms/United States/02YC21A.json
@@ -1 +1 @@
-{"batchcode": "02YC21A", "histograms": [{"batchcodes": ["02YC21A"], "histogram": {"Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "02YC21A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1}, "batchcodes": ["02YC21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02YM20A.json b/docs/data/histograms/United States/02YM20A.json
index 1da726865e4..229db04fd11 100644
--- a/docs/data/histograms/United States/02YM20A.json
+++ b/docs/data/histograms/United States/02YM20A.json
@@ -1 +1 @@
-{"batchcode": "02YM20A", "histograms": [{"batchcodes": ["02YM20A"], "histogram": {"Chills": 2, "Hyperhidrosis": 2, "Myalgia": 2, "Nausea": 2}}]}
\ No newline at end of file
+{"batchcode": "02YM20A", "histograms": [{"histogram": {"Chills": 2, "Hyperhidrosis": 2, "Myalgia": 2, "Nausea": 2}, "batchcodes": ["02YM20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02ZM2014.json b/docs/data/histograms/United States/02ZM2014.json
index 8bfa9c3d0b2..c7fd887f62a 100644
--- a/docs/data/histograms/United States/02ZM2014.json
+++ b/docs/data/histograms/United States/02ZM2014.json
@@ -1 +1 @@
-{"batchcode": "02ZM2014", "histograms": [{"batchcodes": ["02ZM2014"], "histogram": {"Neck pain": 1, "Paraesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "02ZM2014", "histograms": [{"histogram": {"Neck pain": 1, "Paraesthesia": 1}, "batchcodes": ["02ZM2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/02__ 21A.json b/docs/data/histograms/United States/02__ 21A.json
index 9f190267123..58b278ceb14 100644
--- a/docs/data/histograms/United States/02__ 21A.json
+++ b/docs/data/histograms/United States/02__ 21A.json
@@ -1 +1 @@
-{"batchcode": "02__ 21A", "histograms": [{"batchcodes": ["02__ 21A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "02__ 21A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1}, "batchcodes": ["02__ 21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03(0/6)A21A.json b/docs/data/histograms/United States/03(0/6)A21A.json
index 9f2c6d67e30..762f8bdcebc 100644
--- a/docs/data/histograms/United States/03(0/6)A21A.json
+++ b/docs/data/histograms/United States/03(0/6)A21A.json
@@ -1 +1 @@
-{"batchcode": "03(0/6)A21A", "histograms": [{"batchcodes": ["03(0/6)A21A"], "histogram": {"Pain in extremity": 2, "Erythema": 1, "Lip swelling": 1, "Pruritus": 1, "Skin mass": 1, "Swelling": 1, "Throat irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "03(0/6)A21A", "histograms": [{"histogram": {"Pain in extremity": 2, "Erythema": 1, "Lip swelling": 1, "Pruritus": 1, "Skin mass": 1, "Swelling": 1, "Throat irritation": 1}, "batchcodes": ["03(0/6)A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03(4OR9)K20A.json b/docs/data/histograms/United States/03(4OR9)K20A.json
index c199bb0cfcf..72a91755293 100644
--- a/docs/data/histograms/United States/03(4OR9)K20A.json
+++ b/docs/data/histograms/United States/03(4OR9)K20A.json
@@ -1 +1 @@
-{"batchcode": "03(4OR9)K20A", "histograms": [{"batchcodes": ["03(4OR9)K20A"], "histogram": {"Headache": 1, "Influenza like illness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "03(4OR9)K20A", "histograms": [{"histogram": {"Headache": 1, "Influenza like illness": 1, "Lymphadenopathy": 1, "Malaise": 1, "Product dose omission issue": 1}, "batchcodes": ["03(4OR9)K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03/L20A.json b/docs/data/histograms/United States/03/L20A.json
index 08f9ef2bbfd..73d08a8932f 100644
--- a/docs/data/histograms/United States/03/L20A.json
+++ b/docs/data/histograms/United States/03/L20A.json
@@ -1 +1 @@
-{"batchcode": "03/L20A", "histograms": [{"batchcodes": ["03/L20A"], "histogram": {"Cough": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash macular": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "03/L20A", "histograms": [{"histogram": {"Cough": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash macular": 1, "Vomiting": 1}, "batchcodes": ["03/L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030-M204.json b/docs/data/histograms/United States/030-M204.json
index 2d7dd052617..c84b26cbc44 100644
--- a/docs/data/histograms/United States/030-M204.json
+++ b/docs/data/histograms/United States/030-M204.json
@@ -1 +1 @@
-{"batchcode": "030-M204", "histograms": [{"batchcodes": ["030-M204"], "histogram": {"Cardiac failure congestive": 1, "Cough": 1, "Influenza like illness": 1, "Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "030-M204", "histograms": [{"histogram": {"Cardiac failure congestive": 1, "Cough": 1, "Influenza like illness": 1, "Pneumonia": 1}, "batchcodes": ["030-M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030.json b/docs/data/histograms/United States/030.json
index 41441779fa6..70f1d10ba73 100644
--- a/docs/data/histograms/United States/030.json
+++ b/docs/data/histograms/United States/030.json
@@ -1 +1 @@
-{"batchcode": "030", "histograms": [{"batchcodes": ["030"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "030", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["030"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0300A21A.json b/docs/data/histograms/United States/0300A21A.json
index 236038ca837..bab4a141bff 100644
--- a/docs/data/histograms/United States/0300A21A.json
+++ b/docs/data/histograms/United States/0300A21A.json
@@ -1 +1 @@
-{"batchcode": "0300A21A", "histograms": [{"batchcodes": ["0300A21A"], "histogram": {"Adverse event": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypokinesia": 1, "Nasopharyngitis": 1}}]}
\ No newline at end of file
+{"batchcode": "0300A21A", "histograms": [{"histogram": {"Adverse event": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypokinesia": 1, "Nasopharyngitis": 1}, "batchcodes": ["0300A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0301-20A.json b/docs/data/histograms/United States/0301-20A.json
index 92d68eafe90..3f61b393db2 100644
--- a/docs/data/histograms/United States/0301-20A.json
+++ b/docs/data/histograms/United States/0301-20A.json
@@ -1 +1 @@
-{"batchcode": "0301-20A", "histograms": [{"batchcodes": ["0301-20A"], "histogram": {"Body temperature fluctuation": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Photophobia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "0301-20A", "histograms": [{"histogram": {"Body temperature fluctuation": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Photophobia": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["0301-20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030120A-716.json b/docs/data/histograms/United States/030120A-716.json
index d0c6088f6b2..f257d9c924d 100644
--- a/docs/data/histograms/United States/030120A-716.json
+++ b/docs/data/histograms/United States/030120A-716.json
@@ -1 +1 @@
-{"batchcode": "030120A-716", "histograms": [{"batchcodes": ["030120A-716"], "histogram": {"Herpes zoster": 1, "Oral mucosal blistering": 1, "Vaccination site induration": 1}}]}
\ No newline at end of file
+{"batchcode": "030120A-716", "histograms": [{"histogram": {"Herpes zoster": 1, "Oral mucosal blistering": 1, "Vaccination site induration": 1}, "batchcodes": ["030120A-716"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030120A.json b/docs/data/histograms/United States/030120A.json
index 2da40dbe887..47f6cc22240 100644
--- a/docs/data/histograms/United States/030120A.json
+++ b/docs/data/histograms/United States/030120A.json
@@ -1 +1 @@
-{"batchcode": "030120A", "histograms": [{"batchcodes": ["030120A"], "histogram": {"Fatigue": 3, "Dizziness": 2, "Feeling abnormal": 2, "Injection site pruritus": 2, "Pain": 2, "Peripheral swelling": 2, "Blindness": 1, "Cerebrovascular accident": 1, "Chills": 1, "Decreased appetite": 1, "Disorientation": 1, "Erythema": 1, "Head discomfort": 1, "Hyperaesthesia": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urinary tract infection": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "030120A", "histograms": [{"histogram": {"Fatigue": 3, "Dizziness": 2, "Feeling abnormal": 2, "Injection site pruritus": 2, "Pain": 2, "Peripheral swelling": 2, "Blindness": 1, "Cerebrovascular accident": 1, "Chills": 1, "Decreased appetite": 1, "Disorientation": 1, "Erythema": 1, "Head discomfort": 1, "Hyperaesthesia": 1, "Limb discomfort": 1, "Myalgia": 1, "Nausea": 1, "Pain in extremity": 1, "Pyrexia": 1, "Urinary tract infection": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site rash": 1}, "batchcodes": ["030120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0301420.json b/docs/data/histograms/United States/0301420.json
index 4ac271984ee..f66e404567d 100644
--- a/docs/data/histograms/United States/0301420.json
+++ b/docs/data/histograms/United States/0301420.json
@@ -1 +1 @@
-{"batchcode": "0301420", "histograms": [{"batchcodes": ["0301420"], "histogram": {"Illness": 1}}]}
\ No newline at end of file
+{"batchcode": "0301420", "histograms": [{"histogram": {"Illness": 1}, "batchcodes": ["0301420"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0301420A.json b/docs/data/histograms/United States/0301420A.json
index d89d5c09b65..650e60d3c99 100644
--- a/docs/data/histograms/United States/0301420A.json
+++ b/docs/data/histograms/United States/0301420A.json
@@ -1 +1 @@
-{"batchcode": "0301420A", "histograms": [{"batchcodes": ["0301420A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0301420A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["0301420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0301421B.json b/docs/data/histograms/United States/0301421B.json
index 52088e8cec0..090cff45f0b 100644
--- a/docs/data/histograms/United States/0301421B.json
+++ b/docs/data/histograms/United States/0301421B.json
@@ -1 +1 @@
-{"batchcode": "0301421B", "histograms": [{"batchcodes": ["0301421B"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0301421B", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["0301421B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0301A21A.json b/docs/data/histograms/United States/0301A21A.json
index b85eb77618f..4e5180a4d90 100644
--- a/docs/data/histograms/United States/0301A21A.json
+++ b/docs/data/histograms/United States/0301A21A.json
@@ -1 +1 @@
-{"batchcode": "0301A21A", "histograms": [{"batchcodes": ["0301A21A"], "histogram": {"Abdominal pain": 1, "Arthritis": 1, "Asthenia": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Frequent bowel movements": 1, "Illness": 1, "Muscular weakness": 1, "Pain": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "0301A21A", "histograms": [{"histogram": {"Abdominal pain": 1, "Arthritis": 1, "Asthenia": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Fatigue": 1, "Frequent bowel movements": 1, "Illness": 1, "Muscular weakness": 1, "Pain": 1, "Somnolence": 1}, "batchcodes": ["0301A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03020A.json b/docs/data/histograms/United States/03020A.json
index f3574641583..79e0ad946a2 100644
--- a/docs/data/histograms/United States/03020A.json
+++ b/docs/data/histograms/United States/03020A.json
@@ -1 +1 @@
-{"batchcode": "03020A", "histograms": [{"batchcodes": ["03020A"], "histogram": {"Erythema": 1, "Headache": 1, "Pain in extremity": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "03020A", "histograms": [{"histogram": {"Erythema": 1, "Headache": 1, "Pain in extremity": 1, "Pruritus": 1}, "batchcodes": ["03020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030214.json b/docs/data/histograms/United States/030214.json
index 221e2ff6e5a..134b01af30a 100644
--- a/docs/data/histograms/United States/030214.json
+++ b/docs/data/histograms/United States/030214.json
@@ -1 +1 @@
-{"batchcode": "030214", "histograms": [{"batchcodes": ["030214"], "histogram": {"Body temperature": 2, "Headache": 2, "Pyrexia": 2, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "030214", "histograms": [{"histogram": {"Body temperature": 2, "Headache": 2, "Pyrexia": 2, "SARS-CoV-2 test": 1}, "batchcodes": ["030214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03021A.json b/docs/data/histograms/United States/03021A.json
index e325d7bf3ad..35c87d7990d 100644
--- a/docs/data/histograms/United States/03021A.json
+++ b/docs/data/histograms/United States/03021A.json
@@ -1 +1 @@
-{"batchcode": "03021A", "histograms": [{"batchcodes": ["03021A"], "histogram": {"Arthralgia": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Rhinorrhoea": 1}}]}
\ No newline at end of file
+{"batchcode": "03021A", "histograms": [{"histogram": {"Arthralgia": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Rhinorrhoea": 1}, "batchcodes": ["03021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030220A.json b/docs/data/histograms/United States/030220A.json
index 5f07804d08f..89320285b93 100644
--- a/docs/data/histograms/United States/030220A.json
+++ b/docs/data/histograms/United States/030220A.json
@@ -1 +1 @@
-{"batchcode": "030220A", "histograms": [{"batchcodes": ["030220A"], "histogram": {"Back pain": 1, "Chills": 1, "Headache": 1, "Influenza like illness": 1, "Migraine": 1, "Pain": 1, "Pyrexia": 1, "Thrombosis": 1, "Ultrasound testes": 1}}]}
\ No newline at end of file
+{"batchcode": "030220A", "histograms": [{"histogram": {"Back pain": 1, "Chills": 1, "Headache": 1, "Influenza like illness": 1, "Migraine": 1, "Pain": 1, "Pyrexia": 1, "Thrombosis": 1, "Ultrasound testes": 1}, "batchcodes": ["030220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030420A.json b/docs/data/histograms/United States/030420A.json
index b26106ab179..7f3159f0948 100644
--- a/docs/data/histograms/United States/030420A.json
+++ b/docs/data/histograms/United States/030420A.json
@@ -1 +1 @@
-{"batchcode": "030420A", "histograms": [{"batchcodes": ["030420A"], "histogram": {"Lymphadenopathy": 1, "Myalgia": 1, "Rash maculo-papular": 1, "Rash pruritic": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "030420A", "histograms": [{"histogram": {"Lymphadenopathy": 1, "Myalgia": 1, "Rash maculo-papular": 1, "Rash pruritic": 1, "Vaccination site mass": 1}, "batchcodes": ["030420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030421A.json b/docs/data/histograms/United States/030421A.json
index 27f2d09f59d..c3c4681aea9 100644
--- a/docs/data/histograms/United States/030421A.json
+++ b/docs/data/histograms/United States/030421A.json
@@ -1 +1 @@
-{"batchcode": "030421A", "histograms": [{"batchcodes": ["030421A"], "histogram": {"Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "030421A", "histograms": [{"histogram": {"Syncope": 1}, "batchcodes": ["030421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030620A.json b/docs/data/histograms/United States/030620A.json
index 7e6bf43f702..82064177f88 100644
--- a/docs/data/histograms/United States/030620A.json
+++ b/docs/data/histograms/United States/030620A.json
@@ -1 +1 @@
-{"batchcode": "030620A", "histograms": [{"batchcodes": ["030620A"], "histogram": {"Fatigue": 3, "Myalgia": 3, "Headache": 2, "Anxiety": 1, "Body temperature": 1, "COVID-19": 1, "Chest X-ray": 1, "Chills": 1, "Computerised tomogram head": 1, "Cough": 1, "Dizziness": 1, "Dry mouth": 1, "Erythema": 1, "Feeling cold": 1, "Gait disturbance": 1, "Heart rate increased": 1, "Injection site rash": 1, "Migraine": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Neck pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "030620A", "histograms": [{"histogram": {"Fatigue": 3, "Myalgia": 3, "Headache": 2, "Anxiety": 1, "Body temperature": 1, "COVID-19": 1, "Chest X-ray": 1, "Chills": 1, "Computerised tomogram head": 1, "Cough": 1, "Dizziness": 1, "Dry mouth": 1, "Erythema": 1, "Feeling cold": 1, "Gait disturbance": 1, "Heart rate increased": 1, "Injection site rash": 1, "Migraine": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscular weakness": 1, "Nasal congestion": 1, "Neck pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["030620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030621A.json b/docs/data/histograms/United States/030621A.json
index 7bdee1bbad9..ab30da041f2 100644
--- a/docs/data/histograms/United States/030621A.json
+++ b/docs/data/histograms/United States/030621A.json
@@ -1 +1 @@
-{"batchcode": "030621A", "histograms": [{"batchcodes": ["030621A"], "histogram": {"Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "030621A", "histograms": [{"histogram": {"Vision blurred": 1}, "batchcodes": ["030621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0308218.json b/docs/data/histograms/United States/0308218.json
index f2b2eda6654..f20f97162e8 100644
--- a/docs/data/histograms/United States/0308218.json
+++ b/docs/data/histograms/United States/0308218.json
@@ -1 +1 @@
-{"batchcode": "0308218", "histograms": [{"batchcodes": ["0308218"], "histogram": {"Amino acid level": 1, "Blood test": 1, "Decreased appetite": 1, "Dysphagia": 1, "Dysstasia": 1, "Fatigue": 1, "Memory impairment": 1, "Muscular weakness": 1, "Protein total": 1, "Protein urine": 1, "Rash": 1, "Red blood cell count": 1, "Slow speech": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "0308218", "histograms": [{"histogram": {"Amino acid level": 1, "Blood test": 1, "Decreased appetite": 1, "Dysphagia": 1, "Dysstasia": 1, "Fatigue": 1, "Memory impairment": 1, "Muscular weakness": 1, "Protein total": 1, "Protein urine": 1, "Rash": 1, "Red blood cell count": 1, "Slow speech": 1, "Urine analysis": 1, "Vaccination site pain": 1, "Weight decreased": 1}, "batchcodes": ["0308218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030821A.json b/docs/data/histograms/United States/030821A.json
index cc652b7ccb7..03a187006d9 100644
--- a/docs/data/histograms/United States/030821A.json
+++ b/docs/data/histograms/United States/030821A.json
@@ -1 +1 @@
-{"batchcode": "030821A", "histograms": [{"batchcodes": ["030821A"], "histogram": {"Acne": 1, "Bedridden": 1, "Fatigue": 1, "Haemorrhage": 1, "Headache": 1, "Lip oedema": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Mass": 1, "Myalgia": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Pain": 1, "Pain in extremity": 1, "Scar": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030821A", "histograms": [{"histogram": {"Acne": 1, "Bedridden": 1, "Fatigue": 1, "Haemorrhage": 1, "Headache": 1, "Lip oedema": 1, "Lip swelling": 1, "Loss of personal independence in daily activities": 1, "Mass": 1, "Myalgia": 1, "Oral discomfort": 1, "Oral mucosal blistering": 1, "Pain": 1, "Pain in extremity": 1, "Scar": 1, "Vaccination site pain": 1}, "batchcodes": ["030821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030821B.json b/docs/data/histograms/United States/030821B.json
index 8d5537731ed..b9bc756b619 100644
--- a/docs/data/histograms/United States/030821B.json
+++ b/docs/data/histograms/United States/030821B.json
@@ -1 +1 @@
-{"batchcode": "030821B", "histograms": [{"batchcodes": ["030821B"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Body temperature": 1, "Electrocardiogram": 1, "Heart rate": 1, "Magnetic resonance imaging heart": 1, "Rheumatic fever": 1}}]}
\ No newline at end of file
+{"batchcode": "030821B", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Biopsy bone marrow": 1, "Blood test": 1, "Body temperature": 1, "Electrocardiogram": 1, "Heart rate": 1, "Magnetic resonance imaging heart": 1, "Rheumatic fever": 1}, "batchcodes": ["030821B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0308D.json b/docs/data/histograms/United States/0308D.json
index 69d780d0f3c..f963efac3d3 100644
--- a/docs/data/histograms/United States/0308D.json
+++ b/docs/data/histograms/United States/0308D.json
@@ -1 +1 @@
-{"batchcode": "0308D", "histograms": [{"batchcodes": ["0308D"], "histogram": {"Asthma": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0308D", "histograms": [{"histogram": {"Asthma": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["0308D"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0308H21B.json b/docs/data/histograms/United States/0308H21B.json
index 2565449cba3..2b8945e46a8 100644
--- a/docs/data/histograms/United States/0308H21B.json
+++ b/docs/data/histograms/United States/0308H21B.json
@@ -1 +1 @@
-{"batchcode": "0308H21B", "histograms": [{"batchcodes": ["0308H21B"], "histogram": {"Arthralgia": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0308H21B", "histograms": [{"histogram": {"Arthralgia": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["0308H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A12A.json b/docs/data/histograms/United States/030A12A.json
index a33bfa84d96..fd5a223fa9e 100644
--- a/docs/data/histograms/United States/030A12A.json
+++ b/docs/data/histograms/United States/030A12A.json
@@ -1 +1 @@
-{"batchcode": "030A12A", "histograms": [{"batchcodes": ["030A12A"], "histogram": {"Injection site pain": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Thirst": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "030A12A", "histograms": [{"histogram": {"Injection site pain": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Thirst": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["030A12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A1A.json b/docs/data/histograms/United States/030A1A.json
index d075e9fb038..1828c51b6a6 100644
--- a/docs/data/histograms/United States/030A1A.json
+++ b/docs/data/histograms/United States/030A1A.json
@@ -1 +1 @@
-{"batchcode": "030A1A", "histograms": [{"batchcodes": ["030A1A"], "histogram": {"Rash": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "030A1A", "histograms": [{"histogram": {"Rash": 1, "Vaccination site reaction": 1}, "batchcodes": ["030A1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A2(Z)1A.json b/docs/data/histograms/United States/030A2(Z)1A.json
index e9833556c6b..8b9b7d7926f 100644
--- a/docs/data/histograms/United States/030A2(Z)1A.json
+++ b/docs/data/histograms/United States/030A2(Z)1A.json
@@ -1 +1 @@
-{"batchcode": "030A2(Z)1A", "histograms": [{"batchcodes": ["030A2(Z)1A"], "histogram": {"Breast mass": 1, "Chills": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Myalgia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Skin wrinkling": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030A2(Z)1A", "histograms": [{"histogram": {"Breast mass": 1, "Chills": 1, "Hyperhidrosis": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Myalgia": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Skin wrinkling": 1, "Vaccination site pain": 1}, "batchcodes": ["030A2(Z)1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A2/A.json b/docs/data/histograms/United States/030A2/A.json
index a6111565d2e..45925d3d8bd 100644
--- a/docs/data/histograms/United States/030A2/A.json
+++ b/docs/data/histograms/United States/030A2/A.json
@@ -1 +1 @@
-{"batchcode": "030A2/A", "histograms": [{"batchcodes": ["030A2/A"], "histogram": {"Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "030A2/A", "histograms": [{"histogram": {"Pain in extremity": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["030A2/A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A20A.json b/docs/data/histograms/United States/030A20A.json
index 1d1485a5a61..2981cf866af 100644
--- a/docs/data/histograms/United States/030A20A.json
+++ b/docs/data/histograms/United States/030A20A.json
@@ -1 +1 @@
-{"batchcode": "030A20A", "histograms": [{"batchcodes": ["030A20A"], "histogram": {"Dizziness": 1, "Feeling hot": 1, "Pelvic discomfort": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "030A20A", "histograms": [{"histogram": {"Dizziness": 1, "Feeling hot": 1, "Pelvic discomfort": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["030A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A21.json b/docs/data/histograms/United States/030A21.json
index c60b07a5e4b..d9e4593f8dc 100644
--- a/docs/data/histograms/United States/030A21.json
+++ b/docs/data/histograms/United States/030A21.json
@@ -1 +1 @@
-{"batchcode": "030A21", "histograms": [{"batchcodes": ["030A21"], "histogram": {"Blood pressure measurement": 1, "Bronchospasm": 1, "Fatigue": 1, "Heart rate": 1, "Illness": 1, "Pneumonia": 1, "Throat tightness": 1, "Vaccination site pain": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "030A21", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Bronchospasm": 1, "Fatigue": 1, "Heart rate": 1, "Illness": 1, "Pneumonia": 1, "Throat tightness": 1, "Vaccination site pain": 1, "Vaccination site urticaria": 1}, "batchcodes": ["030A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A210.json b/docs/data/histograms/United States/030A210.json
index 715218bd473..52dd206ae01 100644
--- a/docs/data/histograms/United States/030A210.json
+++ b/docs/data/histograms/United States/030A210.json
@@ -1 +1 @@
-{"batchcode": "030A210", "histograms": [{"batchcodes": ["030A210"], "histogram": {"Chills": 1, "Haematinuria": 1}}]}
\ No newline at end of file
+{"batchcode": "030A210", "histograms": [{"histogram": {"Chills": 1, "Haematinuria": 1}, "batchcodes": ["030A210"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A214.json b/docs/data/histograms/United States/030A214.json
index f12c545353e..b8e212037f2 100644
--- a/docs/data/histograms/United States/030A214.json
+++ b/docs/data/histograms/United States/030A214.json
@@ -1 +1 @@
-{"batchcode": "030A214", "histograms": [{"batchcodes": ["030A214"], "histogram": {"Dizziness": 1, "Feeling abnormal": 1, "Hot flush": 1, "Pneumonia": 1}}]}
\ No newline at end of file
+{"batchcode": "030A214", "histograms": [{"histogram": {"Dizziness": 1, "Feeling abnormal": 1, "Hot flush": 1, "Pneumonia": 1}, "batchcodes": ["030A214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A219A.json b/docs/data/histograms/United States/030A219A.json
index 64538e82e0c..9947986e3ad 100644
--- a/docs/data/histograms/United States/030A219A.json
+++ b/docs/data/histograms/United States/030A219A.json
@@ -1 +1 @@
-{"batchcode": "030A219A", "histograms": [{"batchcodes": ["030A219A"], "histogram": {"Asthenia": 1, "Chills": 1, "Injection site pain": 1, "Myalgia": 1, "Sleep deficit": 1}}]}
\ No newline at end of file
+{"batchcode": "030A219A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Injection site pain": 1, "Myalgia": 1, "Sleep deficit": 1}, "batchcodes": ["030A219A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A21A.json b/docs/data/histograms/United States/030A21A.json
index 1d745bd2142..3ba8125ebe3 100644
--- a/docs/data/histograms/United States/030A21A.json
+++ b/docs/data/histograms/United States/030A21A.json
@@ -1 +1 @@
-{"batchcode": "030A21A", "histograms": [{"batchcodes": ["030A21A", "FJ1611"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1}}, {"batchcodes": ["030A21A"], "histogram": {"Headache": 113, "Pain in extremity": 104, "Pyrexia": 95, "Fatigue": 83, "Chills": 73, "Myalgia": 66, "Pain": 60, "Vaccination site pain": 54, "Nausea": 51, "Dizziness": 42, "Arthralgia": 40, "Asthenia": 40, "Vaccination site erythema": 36, "Pruritus": 34, "Rash": 32, "Dyspnoea": 30, "COVID-19": 29, "SARS-CoV-2 test": 29, "Diarrhoea": 27, "Feeling abnormal": 26, "Vomiting": 26, "Erythema": 25, "Vaccination site pruritus": 24, "Peripheral swelling": 23, "Vaccination site swelling": 22, "Body temperature": 20, "Malaise": 19, "Urticaria": 18, "Illness": 16, "Vaccination site rash": 15, "Cough": 14, "Heart rate increased": 14, "Hyperhidrosis": 14, "Paraesthesia": 14, "Decreased appetite": 13, "Feeling hot": 12, "Blood pressure measurement": 11, "Hypoaesthesia": 11, "Inappropriate schedule of product administration": 11, "Product dose omission issue": 11, "Somnolence": 11, "Swelling": 11, "Vaccination site warmth": 11, "Heart rate": 10, "Limb discomfort": 10, "Neck pain": 10, "Oropharyngeal pain": 10, "Chest discomfort": 9, "Condition aggravated": 9, "Influenza like illness": 9, "Lymphadenopathy": 9, "Mobility decreased": 9, "Abdominal discomfort": 8, "Back pain": 8, "Chest pain": 8, "Gait disturbance": 8, "Herpes zoster": 8, "Injection site erythema": 8, "Injection site pain": 8, "Insomnia": 8, "Lethargy": 8, "Migraine": 8, "Vertigo": 8, "Burning sensation": 7, "Nasal congestion": 7, "Palpitations": 7, "SARS-CoV-2 test positive": 7, "Skin discolouration": 7, "Tinnitus": 7, "Tremor": 7, "Vaccination complication": 7, "Vaccination site induration": 7, "Vaccination site mass": 7, "Abdominal pain upper": 6, "Ageusia": 6, "Ear discomfort": 6, "Expired product administered": 6, "Muscular weakness": 6, "Musculoskeletal stiffness": 6, "Rash erythematous": 6, "Rash pruritic": 6, "Vaccination site reaction": 6, "Vision blurred": 6, "Anosmia": 5, "Bedridden": 5, "Hypersensitivity": 5, "Injection site swelling": 5, "Loss of consciousness": 5, "Nasopharyngitis": 5, "Paraesthesia oral": 5, "Product administered to patient of inappropriate age": 5, "SARS-CoV-2 antibody test": 5, "Swelling face": 5, "Tenderness": 5, "Amnesia": 4, "Balance disorder": 4, "Blood glucose": 4, "Blood pressure increased": 4, "Computerised tomogram": 4, "Contusion": 4, "Ear pain": 4, "Eye pain": 4, "Fall": 4, "Feeling cold": 4, "Head discomfort": 4, "Hypertension": 4, "Hypoaesthesia oral": 4, "Lip swelling": 4, "Muscle spasms": 4, "Muscle tightness": 4, "Oxygen saturation": 4, "Pharyngeal swelling": 4, "Rhinorrhoea": 4, "Sleep disorder": 4, "Vaccination site discolouration": 4, "X-ray": 4, "Anxiety": 3, "Arthritis": 3, "Asthma": 3, "Blood glucose increased": 3, "Blood test": 3, "Dysstasia": 3, "Eye disorder": 3, "Groin pain": 3, "Hot flush": 3, "Hypokinesia": 3, "Impaired work ability": 3, "Incorrect dose administered": 3, "Influenza": 3, "Injection site mass": 3, "Injection site pruritus": 3, "Injection site rash": 3, "Injection site warmth": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Lymphoedema": 3, "Mass": 3, "Maternal exposure during pregnancy": 3, "Memory impairment": 3, "Muscle twitching": 3, "Nervousness": 3, "Poor quality sleep": 3, "Seizure": 3, "Sinusitis": 3, "Tachycardia": 3, "Therapeutic response unexpected": 3, "Thrombosis": 3, "Tongue discomfort": 3, "Ultrasound scan": 3, "Vaccination site movement impairment": 3, "Vaccination site nodule": 3, "Weight decreased": 3, "Abdominal distension": 2, "Abdominal pain": 2, "Alopecia": 2, "Anaphylactic reaction": 2, "Asthenopia": 2, "Axillary mass": 2, "Body temperature increased": 2, "Bone pain": 2, "Bowel movement irregularity": 2, "Breast pain": 2, "Cardiac stress test": 2, "Cerebrovascular accident": 2, "Chapped lips": 2, "Chest X-ray": 2, "Chromaturia": 2, "Deep vein thrombosis": 2, "Disturbance in attention": 2, "Dry mouth": 2, "Dysentery": 2, "Dysgeusia": 2, "Echocardiogram": 2, "Exposure to SARS-CoV-2": 2, "Facial pain": 2, "Feeding disorder": 2, "Femur fracture": 2, "Flushing": 2, "Gastritis": 2, "Gastrooesophageal reflux disease": 2, "Granuloma annulare": 2, "Hypersomnia": 2, "Hypotension": 2, "Injection site induration": 2, "Joint swelling": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Mammogram": 2, "Mental impairment": 2, "Musculoskeletal pain": 2, "Myocardial infarction": 2, "Oedema peripheral": 2, "Off label use": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Pain of skin": 2, "Platelet count": 2, "Pneumonia": 2, "Poor quality product administered": 2, "Post herpetic neuralgia": 2, "Presyncope": 2, "Product storage error": 2, "Product temperature excursion issue": 2, "Rash macular": 2, "Rash papular": 2, "Retching": 2, "Sensitive skin": 2, "Sinus disorder": 2, "Swollen tongue": 2, "Temporomandibular joint syndrome": 2, "Throat irritation": 2, "Tongue erythema": 2, "Toothache": 2, "Trismus": 2, "Type IV hypersensitivity reaction": 2, "Vaccination failure": 2, "Vaccination site irritation": 2, "Vaccination site urticaria": 2, "Wrong technique in product usage process": 2, "Accidental overdose": 1, "Acne": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Aggression": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Anaemia": 1, "Anger": 1, "Aphonia": 1, "Appetite disorder": 1, "Arrhythmia": 1, "Arthropod bite": 1, "BRCA2 gene mutation assay": 1, "Back injury": 1, "Blepharospasm": 1, "Blister": 1, "Blood thyroid stimulating hormone": 1, "Bradykinesia": 1, "Breast cancer": 1, "Breast induration": 1, "Breast mass": 1, "Bronchitis": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cataract": 1, "Claustrophobia": 1, "Colon cancer": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Cyanosis": 1, "Death": 1, "Dehydration": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear congestion": 1, "Ear infection": 1, "Ear swelling": 1, "Eating disorder": 1, "Electrocardiogram": 1, "Embolism arterial": 1, "Embolism venous": 1, "Encephalopathy": 1, "Eosinophil count": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Extrasystoles": 1, "Eye irritation": 1, "Eye movement disorder": 1, "Eye swelling": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Feeling of body temperature change": 1, "Feeling of despair": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Full blood count": 1, "Gait inability": 1, "Gastric dilatation": 1, "General symptom": 1, "Generalised oedema": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Haemorrhage urinary tract": 1, "Haemorrhagic stroke": 1, "Hair disorder": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Hyperacusis": 1, "Hypoacusis": 1, "Hypopnoea": 1, "Hypothermia": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Impaired quality of life": 1, "Incomplete course of vaccination": 1, "Induration": 1, "Infection": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site urticaria": 1, "Inner ear disorder": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "International normalised ratio": 1, "International normalised ratio decreased": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Joint injury": 1, "Labyrinthitis": 1, "Magnetic resonance imaging": 1, "Mental status changes": 1, "Middle ear effusion": 1, "Mood disorder due to a general medical condition": 1, "Multiple sclerosis relapse": 1, "Muscle atrophy": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Nasal discomfort": 1, "Nephrolithiasis": 1, "Neuritis": 1, "Nightmare": 1, "No adverse event": 1, "Obstructive airways disorder": 1, "Oliguria": 1, "Oral discomfort": 1, "Oral pain": 1, "Ovarian mass": 1, "Oxygen consumption decreased": 1, "Pain in jaw": 1, "Papule": 1, "Paralysis": 1, "Paranasal sinus discomfort": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Platelet count increased": 1, "Pre-existing condition improved": 1, "Prenatal screening test": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Protein total": 1, "Protein total decreased": 1, "Psoriasis": 1, "Quality of life decreased": 1, "Respiratory tract congestion": 1, "Rheumatoid arthritis": 1, "Rib fracture": 1, "Rotator cuff syndrome": 1, "Scan brain": 1, "Serum ferritin": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin laxity": 1, "Skin mass": 1, "Skin swelling": 1, "Sneezing": 1, "Speech disorder": 1, "Spinal pain": 1, "Swelling of eyelid": 1, "Tendon pain": 1, "Therapeutic product ineffective": 1, "Throat tightness": 1, "Thyroid hormones increased": 1, "Tongue dry": 1, "Tongue oedema": 1, "Tooth disorder": 1, "Transient ischaemic attack": 1, "Treatment noncompliance": 1, "Type IIa hyperlipidaemia": 1, "Ulcer": 1, "Ultrasound Doppler": 1, "Ultrasound Doppler abnormal": 1, "Ultrasound antenatal screen": 1, "Ultrasound scan vagina": 1, "Underdose": 1, "Unresponsive to stimuli": 1, "Upper respiratory tract congestion": 1, "Upper-airway cough syndrome": 1, "Vaccination site anaesthesia": 1, "Vaccination site bruising": 1, "Vaccination site calcification": 1, "Vaccination site discharge": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site exfoliation": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site vesicles": 1, "Vitamin B12": 1, "Walking aid user": 1, "Weight": 1, "Weight bearing difficulty": 1, "White blood cell count": 1, "Whole body scan": 1}}]}
\ No newline at end of file
+{"batchcode": "030A21A", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1}, "batchcodes": ["030A21A", "FJ1611"]}, {"histogram": {"Headache": 113, "Pain in extremity": 104, "Pyrexia": 95, "Fatigue": 83, "Chills": 73, "Myalgia": 66, "Pain": 60, "Vaccination site pain": 54, "Nausea": 51, "Dizziness": 42, "Arthralgia": 40, "Asthenia": 40, "Vaccination site erythema": 36, "Pruritus": 34, "Rash": 32, "Dyspnoea": 30, "COVID-19": 29, "SARS-CoV-2 test": 29, "Diarrhoea": 27, "Feeling abnormal": 26, "Vomiting": 26, "Erythema": 25, "Vaccination site pruritus": 24, "Peripheral swelling": 23, "Vaccination site swelling": 22, "Body temperature": 20, "Malaise": 19, "Urticaria": 18, "Illness": 16, "Vaccination site rash": 15, "Cough": 14, "Heart rate increased": 14, "Hyperhidrosis": 14, "Paraesthesia": 14, "Decreased appetite": 13, "Feeling hot": 12, "Blood pressure measurement": 11, "Hypoaesthesia": 11, "Inappropriate schedule of product administration": 11, "Product dose omission issue": 11, "Somnolence": 11, "Swelling": 11, "Vaccination site warmth": 11, "Heart rate": 10, "Limb discomfort": 10, "Neck pain": 10, "Oropharyngeal pain": 10, "Chest discomfort": 9, "Condition aggravated": 9, "Influenza like illness": 9, "Lymphadenopathy": 9, "Mobility decreased": 9, "Abdominal discomfort": 8, "Back pain": 8, "Chest pain": 8, "Gait disturbance": 8, "Herpes zoster": 8, "Injection site erythema": 8, "Injection site pain": 8, "Insomnia": 8, "Lethargy": 8, "Migraine": 8, "Vertigo": 8, "Burning sensation": 7, "Nasal congestion": 7, "Palpitations": 7, "SARS-CoV-2 test positive": 7, "Skin discolouration": 7, "Tinnitus": 7, "Tremor": 7, "Vaccination complication": 7, "Vaccination site induration": 7, "Vaccination site mass": 7, "Abdominal pain upper": 6, "Ageusia": 6, "Ear discomfort": 6, "Expired product administered": 6, "Muscular weakness": 6, "Musculoskeletal stiffness": 6, "Rash erythematous": 6, "Rash pruritic": 6, "Vaccination site reaction": 6, "Vision blurred": 6, "Anosmia": 5, "Bedridden": 5, "Hypersensitivity": 5, "Injection site swelling": 5, "Loss of consciousness": 5, "Nasopharyngitis": 5, "Paraesthesia oral": 5, "Product administered to patient of inappropriate age": 5, "SARS-CoV-2 antibody test": 5, "Swelling face": 5, "Tenderness": 5, "Amnesia": 4, "Balance disorder": 4, "Blood glucose": 4, "Blood pressure increased": 4, "Computerised tomogram": 4, "Contusion": 4, "Ear pain": 4, "Eye pain": 4, "Fall": 4, "Feeling cold": 4, "Head discomfort": 4, "Hypertension": 4, "Hypoaesthesia oral": 4, "Lip swelling": 4, "Muscle spasms": 4, "Muscle tightness": 4, "Oxygen saturation": 4, "Pharyngeal swelling": 4, "Rhinorrhoea": 4, "Sleep disorder": 4, "Vaccination site discolouration": 4, "X-ray": 4, "Anxiety": 3, "Arthritis": 3, "Asthma": 3, "Blood glucose increased": 3, "Blood test": 3, "Dysstasia": 3, "Eye disorder": 3, "Groin pain": 3, "Hot flush": 3, "Hypokinesia": 3, "Impaired work ability": 3, "Incorrect dose administered": 3, "Influenza": 3, "Injection site mass": 3, "Injection site pruritus": 3, "Injection site rash": 3, "Injection site warmth": 3, "Loss of personal independence in daily activities": 3, "Lymph node pain": 3, "Lymphoedema": 3, "Mass": 3, "Maternal exposure during pregnancy": 3, "Memory impairment": 3, "Muscle twitching": 3, "Nervousness": 3, "Poor quality sleep": 3, "Seizure": 3, "Sinusitis": 3, "Tachycardia": 3, "Therapeutic response unexpected": 3, "Thrombosis": 3, "Tongue discomfort": 3, "Ultrasound scan": 3, "Vaccination site movement impairment": 3, "Vaccination site nodule": 3, "Weight decreased": 3, "Abdominal distension": 2, "Abdominal pain": 2, "Alopecia": 2, "Anaphylactic reaction": 2, "Asthenopia": 2, "Axillary mass": 2, "Body temperature increased": 2, "Bone pain": 2, "Bowel movement irregularity": 2, "Breast pain": 2, "Cardiac stress test": 2, "Cerebrovascular accident": 2, "Chapped lips": 2, "Chest X-ray": 2, "Chromaturia": 2, "Deep vein thrombosis": 2, "Disturbance in attention": 2, "Dry mouth": 2, "Dysentery": 2, "Dysgeusia": 2, "Echocardiogram": 2, "Exposure to SARS-CoV-2": 2, "Facial pain": 2, "Feeding disorder": 2, "Femur fracture": 2, "Flushing": 2, "Gastritis": 2, "Gastrooesophageal reflux disease": 2, "Granuloma annulare": 2, "Hypersomnia": 2, "Hypotension": 2, "Injection site induration": 2, "Joint swelling": 2, "Laboratory test": 2, "Lacrimation increased": 2, "Mammogram": 2, "Mental impairment": 2, "Musculoskeletal pain": 2, "Myocardial infarction": 2, "Oedema peripheral": 2, "Off label use": 2, "Oral herpes": 2, "Oropharyngeal discomfort": 2, "Pain of skin": 2, "Platelet count": 2, "Pneumonia": 2, "Poor quality product administered": 2, "Post herpetic neuralgia": 2, "Presyncope": 2, "Product storage error": 2, "Product temperature excursion issue": 2, "Rash macular": 2, "Rash papular": 2, "Retching": 2, "Sensitive skin": 2, "Sinus disorder": 2, "Swollen tongue": 2, "Temporomandibular joint syndrome": 2, "Throat irritation": 2, "Tongue erythema": 2, "Toothache": 2, "Trismus": 2, "Type IV hypersensitivity reaction": 2, "Vaccination failure": 2, "Vaccination site irritation": 2, "Vaccination site urticaria": 2, "Wrong technique in product usage process": 2, "Accidental overdose": 1, "Acne": 1, "Adverse drug reaction": 1, "Adverse reaction": 1, "Aggression": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Anaemia": 1, "Anger": 1, "Aphonia": 1, "Appetite disorder": 1, "Arrhythmia": 1, "Arthropod bite": 1, "BRCA2 gene mutation assay": 1, "Back injury": 1, "Blepharospasm": 1, "Blister": 1, "Blood thyroid stimulating hormone": 1, "Bradykinesia": 1, "Breast cancer": 1, "Breast induration": 1, "Breast mass": 1, "Bronchitis": 1, "Cardiac discomfort": 1, "Cardiac disorder": 1, "Cardiac failure": 1, "Cardiomegaly": 1, "Cataract": 1, "Claustrophobia": 1, "Colon cancer": 1, "Colonoscopy": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Cyanosis": 1, "Death": 1, "Dehydration": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Discomfort": 1, "Dizziness postural": 1, "Drug ineffective": 1, "Dyspepsia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear congestion": 1, "Ear infection": 1, "Ear swelling": 1, "Eating disorder": 1, "Electrocardiogram": 1, "Embolism arterial": 1, "Embolism venous": 1, "Encephalopathy": 1, "Eosinophil count": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Extrasystoles": 1, "Eye irritation": 1, "Eye movement disorder": 1, "Eye swelling": 1, "Facial paralysis": 1, "Faeces discoloured": 1, "Feeling of body temperature change": 1, "Feeling of despair": 1, "Fibrin D dimer": 1, "Fibromyalgia": 1, "Full blood count": 1, "Gait inability": 1, "Gastric dilatation": 1, "General symptom": 1, "Generalised oedema": 1, "Glucose tolerance test": 1, "Glycosylated haemoglobin": 1, "Glycosylated haemoglobin increased": 1, "Haemorrhage urinary tract": 1, "Haemorrhagic stroke": 1, "Hair disorder": 1, "Heart rate decreased": 1, "Heart rate irregular": 1, "Hyperacusis": 1, "Hypoacusis": 1, "Hypopnoea": 1, "Hypothermia": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Impaired quality of life": 1, "Incomplete course of vaccination": 1, "Induration": 1, "Infection": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site haemorrhage": 1, "Injection site urticaria": 1, "Inner ear disorder": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "International normalised ratio": 1, "International normalised ratio decreased": 1, "Irritability": 1, "Irritable bowel syndrome": 1, "Joint injury": 1, "Labyrinthitis": 1, "Magnetic resonance imaging": 1, "Mental status changes": 1, "Middle ear effusion": 1, "Mood disorder due to a general medical condition": 1, "Multiple sclerosis relapse": 1, "Muscle atrophy": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Nasal discomfort": 1, "Nephrolithiasis": 1, "Neuritis": 1, "Nightmare": 1, "No adverse event": 1, "Obstructive airways disorder": 1, "Oliguria": 1, "Oral discomfort": 1, "Oral pain": 1, "Ovarian mass": 1, "Oxygen consumption decreased": 1, "Pain in jaw": 1, "Papule": 1, "Paralysis": 1, "Paranasal sinus discomfort": 1, "Pharyngeal hypoaesthesia": 1, "Photophobia": 1, "Platelet count increased": 1, "Pre-existing condition improved": 1, "Prenatal screening test": 1, "Product administered at inappropriate site": 1, "Productive cough": 1, "Protein total": 1, "Protein total decreased": 1, "Psoriasis": 1, "Quality of life decreased": 1, "Respiratory tract congestion": 1, "Rheumatoid arthritis": 1, "Rib fracture": 1, "Rotator cuff syndrome": 1, "Scan brain": 1, "Serum ferritin": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin laxity": 1, "Skin mass": 1, "Skin swelling": 1, "Sneezing": 1, "Speech disorder": 1, "Spinal pain": 1, "Swelling of eyelid": 1, "Tendon pain": 1, "Therapeutic product ineffective": 1, "Throat tightness": 1, "Thyroid hormones increased": 1, "Tongue dry": 1, "Tongue oedema": 1, "Tooth disorder": 1, "Transient ischaemic attack": 1, "Treatment noncompliance": 1, "Type IIa hyperlipidaemia": 1, "Ulcer": 1, "Ultrasound Doppler": 1, "Ultrasound Doppler abnormal": 1, "Ultrasound antenatal screen": 1, "Ultrasound scan vagina": 1, "Underdose": 1, "Unresponsive to stimuli": 1, "Upper respiratory tract congestion": 1, "Upper-airway cough syndrome": 1, "Vaccination site anaesthesia": 1, "Vaccination site bruising": 1, "Vaccination site calcification": 1, "Vaccination site discharge": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site exfoliation": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site inflammation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site vesicles": 1, "Vitamin B12": 1, "Walking aid user": 1, "Weight": 1, "Weight bearing difficulty": 1, "White blood cell count": 1, "Whole body scan": 1}, "batchcodes": ["030A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A21A030A21A0.json b/docs/data/histograms/United States/030A21A030A21A0.json
index 66721905f2c..9e8f2d1a4ab 100644
--- a/docs/data/histograms/United States/030A21A030A21A0.json
+++ b/docs/data/histograms/United States/030A21A030A21A0.json
@@ -1 +1 @@
-{"batchcode": "030A21A030A21A0", "histograms": [{"batchcodes": ["030A21A030A21A0"], "histogram": {"Breast pain": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Pain in extremity": 1, "Swelling": 1, "Weight increased": 1}}]}
\ No newline at end of file
+{"batchcode": "030A21A030A21A0", "histograms": [{"histogram": {"Breast pain": 1, "Musculoskeletal chest pain": 1, "Pain": 1, "Pain in extremity": 1, "Swelling": 1, "Weight increased": 1}, "batchcodes": ["030A21A030A21A0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A22A.json b/docs/data/histograms/United States/030A22A.json
index b47069bcf98..97e1f498af9 100644
--- a/docs/data/histograms/United States/030A22A.json
+++ b/docs/data/histograms/United States/030A22A.json
@@ -1 +1 @@
-{"batchcode": "030A22A", "histograms": [{"batchcodes": ["030A22A"], "histogram": {"Fatigue": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hypotension": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "030A22A", "histograms": [{"histogram": {"Fatigue": 2, "Abdominal pain upper": 1, "Asthenia": 1, "Blood pressure measurement": 1, "Dizziness": 1, "Headache": 1, "Hypotension": 1, "Nausea": 1}, "batchcodes": ["030A22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A2L1A.json b/docs/data/histograms/United States/030A2L1A.json
index cf8a361d4d9..b1a66ae9eb6 100644
--- a/docs/data/histograms/United States/030A2L1A.json
+++ b/docs/data/histograms/United States/030A2L1A.json
@@ -1 +1 @@
-{"batchcode": "030A2L1A", "histograms": [{"batchcodes": ["030A2L1A"], "histogram": {"Chills": 2, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Presyncope": 1, "Pyrexia": 1, "Urinary retention": 1, "Vaccination site mass": 1, "Vein disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "030A2L1A", "histograms": [{"histogram": {"Chills": 2, "Decreased appetite": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Presyncope": 1, "Pyrexia": 1, "Urinary retention": 1, "Vaccination site mass": 1, "Vein disorder": 1}, "batchcodes": ["030A2L1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030A2LA.json b/docs/data/histograms/United States/030A2LA.json
index 40e6e85c0aa..017a6a80131 100644
--- a/docs/data/histograms/United States/030A2LA.json
+++ b/docs/data/histograms/United States/030A2LA.json
@@ -1 +1 @@
-{"batchcode": "030A2LA", "histograms": [{"batchcodes": ["030A2LA"], "histogram": {"Fatigue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030A2LA", "histograms": [{"histogram": {"Fatigue": 1, "Vaccination site pain": 1}, "batchcodes": ["030A2LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030AUA.json b/docs/data/histograms/United States/030AUA.json
index e0e8e2df298..ef11b25988b 100644
--- a/docs/data/histograms/United States/030AUA.json
+++ b/docs/data/histograms/United States/030AUA.json
@@ -1 +1 @@
-{"batchcode": "030AUA", "histograms": [{"batchcodes": ["030AUA"], "histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030AUA", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["030AUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030AZ1A.json b/docs/data/histograms/United States/030AZ1A.json
index 7cb1cf45121..86dc4810e7d 100644
--- a/docs/data/histograms/United States/030AZ1A.json
+++ b/docs/data/histograms/United States/030AZ1A.json
@@ -1 +1 @@
-{"batchcode": "030AZ1A", "histograms": [{"batchcodes": ["030AZ1A"], "histogram": {"Headache": 4, "Vaccination site pain": 3, "Vaccination site swelling": 3, "Arthralgia": 2, "Fatigue": 2, "Myalgia": 2, "Nausea": 2, "Pain in extremity": 2, "Abdominal pain upper": 1, "Blood urine present": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Coronavirus test positive": 1, "Diarrhoea": 1, "Dizziness": 1, "Induration": 1, "Joint swelling": 1, "Limb discomfort": 1, "Malaise": 1, "Micturition urgency": 1, "Migraine": 1, "Pain": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tenderness": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1, "Vein discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "030AZ1A", "histograms": [{"histogram": {"Headache": 4, "Vaccination site pain": 3, "Vaccination site swelling": 3, "Arthralgia": 2, "Fatigue": 2, "Myalgia": 2, "Nausea": 2, "Pain in extremity": 2, "Abdominal pain upper": 1, "Blood urine present": 1, "COVID-19": 1, "Chest pain": 1, "Chills": 1, "Coronavirus test positive": 1, "Diarrhoea": 1, "Dizziness": 1, "Induration": 1, "Joint swelling": 1, "Limb discomfort": 1, "Malaise": 1, "Micturition urgency": 1, "Migraine": 1, "Pain": 1, "Peripheral swelling": 1, "SARS-CoV-2 test": 1, "Sensitive skin": 1, "Tenderness": 1, "Urine analysis": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site warmth": 1, "Vein discolouration": 1}, "batchcodes": ["030AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030AZIA.json b/docs/data/histograms/United States/030AZIA.json
index 6a07ba931aa..6e30bd2b63b 100644
--- a/docs/data/histograms/United States/030AZIA.json
+++ b/docs/data/histograms/United States/030AZIA.json
@@ -1 +1 @@
-{"batchcode": "030AZIA", "histograms": [{"batchcodes": ["030AZIA"], "histogram": {"Chills": 2, "Pyrexia": 2, "Body temperature": 1, "Fatigue": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Skin discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "030AZIA", "histograms": [{"histogram": {"Chills": 2, "Pyrexia": 2, "Body temperature": 1, "Fatigue": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "Skin discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["030AZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B12A.json b/docs/data/histograms/United States/030B12A.json
index 8d8dd258b2f..6cf856583c0 100644
--- a/docs/data/histograms/United States/030B12A.json
+++ b/docs/data/histograms/United States/030B12A.json
@@ -1 +1 @@
-{"batchcode": "030B12A", "histograms": [{"batchcodes": ["030B12A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "030B12A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["030B12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B12LA.json b/docs/data/histograms/United States/030B12LA.json
index 071ee1f9f4d..20955a6eb68 100644
--- a/docs/data/histograms/United States/030B12LA.json
+++ b/docs/data/histograms/United States/030B12LA.json
@@ -1 +1 @@
-{"batchcode": "030B12LA", "histograms": [{"batchcodes": ["030B12LA"], "histogram": {"Crying": 1, "Dyspnoea": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030B12LA", "histograms": [{"histogram": {"Crying": 1, "Dyspnoea": 1, "Headache": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["030B12LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B21A ; 20SE.json b/docs/data/histograms/United States/030B21A ; 20SE.json
index 79c5f7ec2b2..848a014cdde 100644
--- a/docs/data/histograms/United States/030B21A ; 20SE.json
+++ b/docs/data/histograms/United States/030B21A ; 20SE.json
@@ -1 +1 @@
-{"batchcode": "030B21A \u00cd\u00be 20SE", "histograms": [{"batchcodes": ["030B21A \u00cd\u00be 20SE"], "histogram": {"Expired product administered": 2, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "030B21A \u00cd\u00be 20SE", "histograms": [{"histogram": {"Expired product administered": 2, "Product storage error": 1}, "batchcodes": ["030B21A \u00cd\u00be 20SE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B21A.json b/docs/data/histograms/United States/030B21A.json
index a99bcf6d5ac..eccb5ec895a 100644
--- a/docs/data/histograms/United States/030B21A.json
+++ b/docs/data/histograms/United States/030B21A.json
@@ -1 +1 @@
-{"batchcode": "030B21A", "histograms": [{"batchcodes": ["030B21A"], "histogram": {"Product temperature excursion issue": 243, "Poor quality product administered": 240, "Headache": 44, "Fatigue": 33, "Myalgia": 33, "Pyrexia": 28, "Pain in extremity": 26, "Chills": 23, "Vaccination site pain": 22, "Dizziness": 20, "Expired product administered": 20, "Nausea": 18, "Arthralgia": 17, "Asthenia": 13, "Pain": 12, "Peripheral swelling": 12, "Chest pain": 10, "Dyspnoea": 9, "Erythema": 9, "Neck pain": 9, "Rash": 9, "Vaccination site erythema": 9, "Vaccination site swelling": 9, "Vomiting": 9, "Feeling abnormal": 8, "Product storage error": 8, "Decreased appetite": 7, "Hypoaesthesia": 7, "Insomnia": 7, "Back pain": 6, "Hyperhidrosis": 6, "Malaise": 6, "Paraesthesia": 6, "Product dose omission issue": 6, "Pruritus": 6, "Vaccination site warmth": 6, "Abdominal pain upper": 5, "Diarrhoea": 5, "Illness": 5, "Influenza like illness": 5, "Product administered to patient of inappropriate age": 5, "Swelling": 5, "Vaccination site rash": 5, "Body temperature": 4, "Burning sensation": 4, "Cough": 4, "Loss of consciousness": 4, "Muscle spasms": 4, "SARS-CoV-2 test": 4, "Vaccination complication": 4, "Vertigo": 4, "COVID-19": 3, "Chest discomfort": 3, "Head discomfort": 3, "Inappropriate schedule of product administration": 3, "Inflammation": 3, "Maternal exposure during pregnancy": 3, "Throat tightness": 3, "Vaccination site mass": 3, "Vaccination site pruritus": 3, "Vaccination site reaction": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Alopecia": 2, "Anxiety": 2, "Balance disorder": 2, "Blister": 2, "Blood pressure measurement": 2, "Computerised tomogram": 2, "Device connection issue": 2, "Dyspepsia": 2, "Dysphagia": 2, "Ear pain": 2, "Epistaxis": 2, "Fall": 2, "Fear of injection": 2, "Feeling cold": 2, "Feeling hot": 2, "Heart rate increased": 2, "Herpes zoster": 2, "Hot flush": 2, "Induration": 2, "Injection site swelling": 2, "Joint swelling": 2, "Limb discomfort": 2, "Migraine": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Nasopharyngitis": 2, "Neuralgia": 2, "Neuropathy peripheral": 2, "Oxygen saturation": 2, "Presyncope": 2, "Productive cough": 2, "Rash erythematous": 2, "Rash pruritic": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Seasonal allergy": 2, "Skin discolouration": 2, "Somnolence": 2, "Tinnitus": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "Vaccination site induration": 2, "Vision blurred": 2, "Acoustic stimulation tests": 1, "Acute disseminated encephalomyelitis": 1, "Adnexa uteri pain": 1, "Allergic respiratory symptom": 1, "Arterial occlusive disease": 1, "Arthritis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Bladder pain": 1, "Blood pressure decreased": 1, "Blood test": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Brain injury": 1, "Breast pain": 1, "Cardiac stress test": 1, "Chest X-ray": 1, "Cluster headache": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Constipation": 1, "Contusion": 1, "Coordination abnormal": 1, "Decreased activity": 1, "Dehydration": 1, "Dental discomfort": 1, "Depressed mood": 1, "Depression": 1, "Discomfort": 1, "Drug specific antibody absent": 1, "Dry eye": 1, "Dry skin": 1, "Dysgeusia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear infection": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Exposure to SARS-CoV-2": 1, "Eye pain": 1, "Eye swelling": 1, "Facial pain": 1, "Feeling of body temperature change": 1, "Foaming at mouth": 1, "Fungal skin infection": 1, "Gait inability": 1, "Gastric ulcer": 1, "Gastrooesophageal reflux disease": 1, "Haematemesis": 1, "Hallucination": 1, "Heart rate": 1, "Heart rate irregular": 1, "Herpes virus infection": 1, "Hidradenitis": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoxia": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Increased upper airway secretion": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Lacrimation increased": 1, "Lethargy": 1, "Liver function test": 1, "Liver injury": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during breast feeding": 1, "Menstrual disorder": 1, "Mood altered": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Nasal congestion": 1, "Neck mass": 1, "Nerve compression": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Parosmia": 1, "Pericarditis": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Poor peripheral circulation": 1, "Pregnancy test": 1, "Product administration error": 1, "Pulmonary pain": 1, "Pustule": 1, "Rash macular": 1, "Renal pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Serotonin syndrome": 1, "Sinus headache": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin warm": 1, "Sleep apnoea syndrome": 1, "Speech disorder": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Taste disorder": 1, "Tenderness": 1, "Thrombosis": 1, "Tooth loss": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Viral test": 1, "Visual impairment": 1, "Vitreous floaters": 1, "Weight": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "030B21A", "histograms": [{"histogram": {"Product temperature excursion issue": 243, "Poor quality product administered": 240, "Headache": 44, "Fatigue": 33, "Myalgia": 33, "Pyrexia": 28, "Pain in extremity": 26, "Chills": 23, "Vaccination site pain": 22, "Dizziness": 20, "Expired product administered": 20, "Nausea": 18, "Arthralgia": 17, "Asthenia": 13, "Pain": 12, "Peripheral swelling": 12, "Chest pain": 10, "Dyspnoea": 9, "Erythema": 9, "Neck pain": 9, "Rash": 9, "Vaccination site erythema": 9, "Vaccination site swelling": 9, "Vomiting": 9, "Feeling abnormal": 8, "Product storage error": 8, "Decreased appetite": 7, "Hypoaesthesia": 7, "Insomnia": 7, "Back pain": 6, "Hyperhidrosis": 6, "Malaise": 6, "Paraesthesia": 6, "Product dose omission issue": 6, "Pruritus": 6, "Vaccination site warmth": 6, "Abdominal pain upper": 5, "Diarrhoea": 5, "Illness": 5, "Influenza like illness": 5, "Product administered to patient of inappropriate age": 5, "Swelling": 5, "Vaccination site rash": 5, "Body temperature": 4, "Burning sensation": 4, "Cough": 4, "Loss of consciousness": 4, "Muscle spasms": 4, "SARS-CoV-2 test": 4, "Vaccination complication": 4, "Vertigo": 4, "COVID-19": 3, "Chest discomfort": 3, "Head discomfort": 3, "Inappropriate schedule of product administration": 3, "Inflammation": 3, "Maternal exposure during pregnancy": 3, "Throat tightness": 3, "Vaccination site mass": 3, "Vaccination site pruritus": 3, "Vaccination site reaction": 3, "Abdominal discomfort": 2, "Abdominal pain": 2, "Alopecia": 2, "Anxiety": 2, "Balance disorder": 2, "Blister": 2, "Blood pressure measurement": 2, "Computerised tomogram": 2, "Device connection issue": 2, "Dyspepsia": 2, "Dysphagia": 2, "Ear pain": 2, "Epistaxis": 2, "Fall": 2, "Fear of injection": 2, "Feeling cold": 2, "Feeling hot": 2, "Heart rate increased": 2, "Herpes zoster": 2, "Hot flush": 2, "Induration": 2, "Injection site swelling": 2, "Joint swelling": 2, "Limb discomfort": 2, "Migraine": 2, "Mobility decreased": 2, "Musculoskeletal stiffness": 2, "Nasopharyngitis": 2, "Neuralgia": 2, "Neuropathy peripheral": 2, "Oxygen saturation": 2, "Presyncope": 2, "Productive cough": 2, "Rash erythematous": 2, "Rash pruritic": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Seasonal allergy": 2, "Skin discolouration": 2, "Somnolence": 2, "Tinnitus": 2, "Vaccination site bruising": 2, "Vaccination site haemorrhage": 2, "Vaccination site induration": 2, "Vision blurred": 2, "Acoustic stimulation tests": 1, "Acute disseminated encephalomyelitis": 1, "Adnexa uteri pain": 1, "Allergic respiratory symptom": 1, "Arterial occlusive disease": 1, "Arthritis": 1, "Asthma": 1, "Atrial fibrillation": 1, "Axillary pain": 1, "Bladder pain": 1, "Blood pressure decreased": 1, "Blood test": 1, "Body temperature fluctuation": 1, "Bone pain": 1, "Brain injury": 1, "Breast pain": 1, "Cardiac stress test": 1, "Chest X-ray": 1, "Cluster headache": 1, "Computerised tomogram head": 1, "Condition aggravated": 1, "Confusional state": 1, "Constipation": 1, "Contusion": 1, "Coordination abnormal": 1, "Decreased activity": 1, "Dehydration": 1, "Dental discomfort": 1, "Depressed mood": 1, "Depression": 1, "Discomfort": 1, "Drug specific antibody absent": 1, "Dry eye": 1, "Dry skin": 1, "Dysgeusia": 1, "Dysphonia": 1, "Dyspnoea exertional": 1, "Dysstasia": 1, "Ear infection": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Exposure to SARS-CoV-2": 1, "Eye pain": 1, "Eye swelling": 1, "Facial pain": 1, "Feeling of body temperature change": 1, "Foaming at mouth": 1, "Fungal skin infection": 1, "Gait inability": 1, "Gastric ulcer": 1, "Gastrooesophageal reflux disease": 1, "Haematemesis": 1, "Hallucination": 1, "Heart rate": 1, "Heart rate irregular": 1, "Herpes virus infection": 1, "Hidradenitis": 1, "Hypersensitivity": 1, "Hypoacusis": 1, "Hypoxia": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Increased upper airway secretion": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site pruritus": 1, "Lacrimation increased": 1, "Lethargy": 1, "Liver function test": 1, "Liver injury": 1, "Loss of personal independence in daily activities": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging": 1, "Magnetic resonance imaging head": 1, "Maternal exposure during breast feeding": 1, "Menstrual disorder": 1, "Mood altered": 1, "Muscle tightness": 1, "Muscle twitching": 1, "Muscular weakness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Nasal congestion": 1, "Neck mass": 1, "Nerve compression": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Off label use": 1, "Oropharyngeal pain": 1, "Oxygen saturation decreased": 1, "Parosmia": 1, "Pericarditis": 1, "Photophobia": 1, "Photosensitivity reaction": 1, "Poor peripheral circulation": 1, "Pregnancy test": 1, "Product administration error": 1, "Pulmonary pain": 1, "Pustule": 1, "Rash macular": 1, "Renal pain": 1, "Rhinorrhoea": 1, "SARS-CoV-2 test negative": 1, "Seizure": 1, "Serotonin syndrome": 1, "Sinus headache": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin warm": 1, "Sleep apnoea syndrome": 1, "Speech disorder": 1, "Swelling of eyelid": 1, "Tachycardia": 1, "Taste disorder": 1, "Tenderness": 1, "Thrombosis": 1, "Tooth loss": 1, "Transient ischaemic attack": 1, "Tremor": 1, "Underdose": 1, "Urticaria": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Viral test": 1, "Visual impairment": 1, "Vitreous floaters": 1, "Weight": 1, "X-ray": 1}, "batchcodes": ["030B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B2A.json b/docs/data/histograms/United States/030B2A.json
index e49a965787e..be125dc75e1 100644
--- a/docs/data/histograms/United States/030B2A.json
+++ b/docs/data/histograms/United States/030B2A.json
@@ -1 +1 @@
-{"batchcode": "030B2A", "histograms": [{"batchcodes": ["030B2A"], "histogram": {"Diarrhoea": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Pregnancy test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030B2A", "histograms": [{"histogram": {"Diarrhoea": 1, "Maternal exposure during pregnancy": 1, "Nausea": 1, "Pregnancy test": 1, "Vaccination site pain": 1}, "batchcodes": ["030B2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B2A1.json b/docs/data/histograms/United States/030B2A1.json
index a9d242ea243..bf6fdc3da2f 100644
--- a/docs/data/histograms/United States/030B2A1.json
+++ b/docs/data/histograms/United States/030B2A1.json
@@ -1 +1 @@
-{"batchcode": "030B2A1", "histograms": [{"batchcodes": ["030B2A1"], "histogram": {"Biopsy": 1, "Dry skin": 1, "Eczema": 1, "Headache": 1, "Hiccups": 1, "Nausea": 1, "Pruritus": 1, "Skin haemorrhage": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "030B2A1", "histograms": [{"histogram": {"Biopsy": 1, "Dry skin": 1, "Eczema": 1, "Headache": 1, "Hiccups": 1, "Nausea": 1, "Pruritus": 1, "Skin haemorrhage": 1, "Urticaria": 1}, "batchcodes": ["030B2A1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B4A.json b/docs/data/histograms/United States/030B4A.json
index 3b4e39d7a93..628daa9cd48 100644
--- a/docs/data/histograms/United States/030B4A.json
+++ b/docs/data/histograms/United States/030B4A.json
@@ -1 +1 @@
-{"batchcode": "030B4A", "histograms": [{"batchcodes": ["030B4A"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "030B4A", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["030B4A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030B71A.json b/docs/data/histograms/United States/030B71A.json
index 68b54ff362e..b3310ba0b0d 100644
--- a/docs/data/histograms/United States/030B71A.json
+++ b/docs/data/histograms/United States/030B71A.json
@@ -1 +1 @@
-{"batchcode": "030B71A", "histograms": [{"batchcodes": ["030B71A"], "histogram": {"Asthenia": 1, "Feeling drunk": 1, "Hypokinesia": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "030B71A", "histograms": [{"histogram": {"Asthenia": 1, "Feeling drunk": 1, "Hypokinesia": 1, "Myalgia": 1}, "batchcodes": ["030B71A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030C20.json b/docs/data/histograms/United States/030C20.json
index 56d79015078..37a7937ade4 100644
--- a/docs/data/histograms/United States/030C20.json
+++ b/docs/data/histograms/United States/030C20.json
@@ -1 +1 @@
-{"batchcode": "030C20", "histograms": [{"batchcodes": ["030C20"], "histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "030C20", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["030C20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030C20A.json b/docs/data/histograms/United States/030C20A.json
index fb7b095cfc7..c63086c3b4c 100644
--- a/docs/data/histograms/United States/030C20A.json
+++ b/docs/data/histograms/United States/030C20A.json
@@ -1 +1 @@
-{"batchcode": "030C20A", "histograms": [{"batchcodes": ["030C20A"], "histogram": {"Dysstasia": 3, "Asthenia": 2, "Body temperature": 2, "Chest discomfort": 2, "Dyspnoea": 2, "Epilepsy": 2, "Hypoaesthesia": 2, "Pyrexia": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Heavy menstrual bleeding": 1, "Lymphadenopathy": 1, "Muscle mass": 1, "Neurological symptom": 1, "Oligomenorrhoea": 1, "Peripheral swelling": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "030C20A", "histograms": [{"histogram": {"Dysstasia": 3, "Asthenia": 2, "Body temperature": 2, "Chest discomfort": 2, "Dyspnoea": 2, "Epilepsy": 2, "Hypoaesthesia": 2, "Pyrexia": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Heavy menstrual bleeding": 1, "Lymphadenopathy": 1, "Muscle mass": 1, "Neurological symptom": 1, "Oligomenorrhoea": 1, "Peripheral swelling": 1, "Swelling": 1}, "batchcodes": ["030C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030C214.json b/docs/data/histograms/United States/030C214.json
index 9075ca130af..6664c21f7ff 100644
--- a/docs/data/histograms/United States/030C214.json
+++ b/docs/data/histograms/United States/030C214.json
@@ -1 +1 @@
-{"batchcode": "030C214", "histograms": [{"batchcodes": ["030C214"], "histogram": {"Abdominal discomfort": 1, "Fatigue": 1, "Inappropriate affect": 1, "Malaise": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "030C214", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Fatigue": 1, "Inappropriate affect": 1, "Malaise": 1, "Nausea": 1}, "batchcodes": ["030C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030C21A.json b/docs/data/histograms/United States/030C21A.json
index 75fc1d1ce86..8131061fa19 100644
--- a/docs/data/histograms/United States/030C21A.json
+++ b/docs/data/histograms/United States/030C21A.json
@@ -1 +1 @@
-{"batchcode": "030C21A", "histograms": [{"batchcodes": ["030C21A"], "histogram": {"Vaccination site pain": 3, "Fatigue": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "030C21A", "histograms": [{"histogram": {"Vaccination site pain": 3, "Fatigue": 1, "SARS-CoV-2 test": 1, "Vaccination site erythema": 1}, "batchcodes": ["030C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030C22B.json b/docs/data/histograms/United States/030C22B.json
index f3d8a6bfd3d..6e509807b8f 100644
--- a/docs/data/histograms/United States/030C22B.json
+++ b/docs/data/histograms/United States/030C22B.json
@@ -1 +1 @@
-{"batchcode": "030C22B", "histograms": [{"batchcodes": ["030C22B"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "030C22B", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["030C22B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030D21A.json b/docs/data/histograms/United States/030D21A.json
index 0dc9cfef6eb..60af6c52036 100644
--- a/docs/data/histograms/United States/030D21A.json
+++ b/docs/data/histograms/United States/030D21A.json
@@ -1 +1 @@
-{"batchcode": "030D21A", "histograms": [{"batchcodes": ["030D21A"], "histogram": {"Body temperature": 1, "Bone pain": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030D21A", "histograms": [{"histogram": {"Body temperature": 1, "Bone pain": 1, "Chest pain": 1, "Chills": 1, "Diarrhoea": 1, "Pyrexia": 1}, "batchcodes": ["030D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030G22B.json b/docs/data/histograms/United States/030G22B.json
index c68e33d7c4c..484c096cbe0 100644
--- a/docs/data/histograms/United States/030G22B.json
+++ b/docs/data/histograms/United States/030G22B.json
@@ -1 +1 @@
-{"batchcode": "030G22B", "histograms": [{"batchcodes": ["030G22B"], "histogram": {"No adverse event": 74, "Accidental underdose": 34, "Product temperature excursion issue": 16, "Expired product administered": 14, "Poor quality product administered": 14, "Product storage error": 12, "Underdose": 7, "Accidental overdose": 1, "Back pain": 1, "Chills": 1, "Erythema": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Product administration error": 1, "Product preparation error": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "030G22B", "histograms": [{"histogram": {"No adverse event": 74, "Accidental underdose": 34, "Product temperature excursion issue": 16, "Expired product administered": 14, "Poor quality product administered": 14, "Product storage error": 12, "Underdose": 7, "Accidental overdose": 1, "Back pain": 1, "Chills": 1, "Erythema": 1, "Low density lipoprotein": 1, "Low density lipoprotein increased": 1, "Product administration error": 1, "Product preparation error": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Vaccination site pain": 1, "Wrong product administered": 1}, "batchcodes": ["030G22B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030H(OR4)21A.json b/docs/data/histograms/United States/030H(OR4)21A.json
index 819b56ce014..b35e9e0aa78 100644
--- a/docs/data/histograms/United States/030H(OR4)21A.json
+++ b/docs/data/histograms/United States/030H(OR4)21A.json
@@ -1 +1 @@
-{"batchcode": "030H(OR4)21A", "histograms": [{"batchcodes": ["030H(OR4)21A"], "histogram": {"Burning sensation": 1, "Fatigue": 1, "Fear of injection": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pain": 1, "Paraesthesia": 1, "Rash": 1, "Tenderness": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "030H(OR4)21A", "histograms": [{"histogram": {"Burning sensation": 1, "Fatigue": 1, "Fear of injection": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pain": 1, "Paraesthesia": 1, "Rash": 1, "Tenderness": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site warmth": 1}, "batchcodes": ["030H(OR4)21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030H20A.json b/docs/data/histograms/United States/030H20A.json
index 833b1ac5d4a..bcce14b4824 100644
--- a/docs/data/histograms/United States/030H20A.json
+++ b/docs/data/histograms/United States/030H20A.json
@@ -1 +1 @@
-{"batchcode": "030H20A", "histograms": [{"batchcodes": ["030H20A"], "histogram": {"Amnesia": 1, "Anxiety": 1, "Aphasia": 1, "Confusional state": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "030H20A", "histograms": [{"histogram": {"Amnesia": 1, "Anxiety": 1, "Aphasia": 1, "Confusional state": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Pain in extremity": 1}, "batchcodes": ["030H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030H213.json b/docs/data/histograms/United States/030H213.json
index 35f09e5325c..8c125d38755 100644
--- a/docs/data/histograms/United States/030H213.json
+++ b/docs/data/histograms/United States/030H213.json
@@ -1 +1 @@
-{"batchcode": "030H213", "histograms": [{"batchcodes": ["030H213"], "histogram": {"Abdominal distension": 1, "Axillary mass": 1, "Breast swelling": 1, "Lymphadenopathy": 1, "Pain": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "030H213", "histograms": [{"histogram": {"Abdominal distension": 1, "Axillary mass": 1, "Breast swelling": 1, "Lymphadenopathy": 1, "Pain": 1, "Vaccination site mass": 1}, "batchcodes": ["030H213"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030H218.json b/docs/data/histograms/United States/030H218.json
index 099aad1df42..b69f8d27c7f 100644
--- a/docs/data/histograms/United States/030H218.json
+++ b/docs/data/histograms/United States/030H218.json
@@ -1 +1 @@
-{"batchcode": "030H218", "histograms": [{"batchcodes": ["030H218"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "030H218", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["030H218"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030H21A.json b/docs/data/histograms/United States/030H21A.json
index 33f71b7861e..b4f1e969bcf 100644
--- a/docs/data/histograms/United States/030H21A.json
+++ b/docs/data/histograms/United States/030H21A.json
@@ -1 +1 @@
-{"batchcode": "030H21A", "histograms": [{"batchcodes": ["030H21A"], "histogram": {"Pruritus": 1, "Skin disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "030H21A", "histograms": [{"histogram": {"Pruritus": 1, "Skin disorder": 1}, "batchcodes": ["030H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030H21B.json b/docs/data/histograms/United States/030H21B.json
index 3e786c3494b..bbd51b6234a 100644
--- a/docs/data/histograms/United States/030H21B.json
+++ b/docs/data/histograms/United States/030H21B.json
@@ -1 +1 @@
-{"batchcode": "030H21B", "histograms": [{"batchcodes": ["030H21B", "EL9269"], "histogram": {"Body temperature": 1, "Dementia": 1, "Interchange of vaccine products": 1, "Parkinson's disease": 1, "Pyrexia": 1, "Seizure": 1}}, {"batchcodes": ["030H21B"], "histogram": {"Expired product administered": 69, "Product storage error": 20, "Product administered to patient of inappropriate age": 8, "Accidental underdose": 6, "Pain in extremity": 6, "Headache": 5, "Pain": 5, "Pyrexia": 4, "COVID-19": 3, "Inappropriate schedule of product administration": 3, "Myalgia": 3, "SARS-CoV-2 test": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "Blood test": 2, "Body temperature": 2, "Chest pain": 2, "Chills": 2, "Interchange of vaccine products": 2, "Maternal exposure during breast feeding": 2, "Nausea": 2, "Paraesthesia": 2, "Product expiration date issue": 2, "Rash": 2, "Swelling face": 2, "Urticaria": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acne": 1, "Angioedema": 1, "Basedow's disease": 1, "Bedridden": 1, "Bladder pain": 1, "Blood thyroid stimulating hormone": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Constipation": 1, "Dermatitis acneiform": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Endoscopy": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Incorrect dose administered": 1, "Influenza like illness": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nervousness": 1, "No adverse event": 1, "Ocular discomfort": 1, "Pain assessment": 1, "Pain in jaw": 1, "Palpitations": 1, "Polydipsia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sleep disorder": 1, "Suffocation feeling": 1, "Underdose": 1, "Uterine spasm": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "030H21B", "histograms": [{"histogram": {"Body temperature": 1, "Dementia": 1, "Interchange of vaccine products": 1, "Parkinson's disease": 1, "Pyrexia": 1, "Seizure": 1}, "batchcodes": ["030H21B", "EL9269"]}, {"histogram": {"Expired product administered": 69, "Product storage error": 20, "Product administered to patient of inappropriate age": 8, "Accidental underdose": 6, "Pain in extremity": 6, "Headache": 5, "Pain": 5, "Pyrexia": 4, "COVID-19": 3, "Inappropriate schedule of product administration": 3, "Myalgia": 3, "SARS-CoV-2 test": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Asthenia": 2, "Back pain": 2, "Blood test": 2, "Body temperature": 2, "Chest pain": 2, "Chills": 2, "Interchange of vaccine products": 2, "Maternal exposure during breast feeding": 2, "Nausea": 2, "Paraesthesia": 2, "Product expiration date issue": 2, "Rash": 2, "Swelling face": 2, "Urticaria": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Acne": 1, "Angioedema": 1, "Basedow's disease": 1, "Bedridden": 1, "Bladder pain": 1, "Blood thyroid stimulating hormone": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Colonoscopy": 1, "Computerised tomogram": 1, "Constipation": 1, "Dermatitis acneiform": 1, "Dizziness": 1, "Dysphagia": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Endoscopy": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Incorrect dose administered": 1, "Influenza like illness": 1, "Laboratory test": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nervousness": 1, "No adverse event": 1, "Ocular discomfort": 1, "Pain assessment": 1, "Pain in jaw": 1, "Palpitations": 1, "Polydipsia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sleep disorder": 1, "Suffocation feeling": 1, "Underdose": 1, "Uterine spasm": 1, "Vaccination site mass": 1, "Vaccination site rash": 1, "Vomiting": 1}, "batchcodes": ["030H21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030I21A.json b/docs/data/histograms/United States/030I21A.json
index f9988c1f2b7..91d062e4d2b 100644
--- a/docs/data/histograms/United States/030I21A.json
+++ b/docs/data/histograms/United States/030I21A.json
@@ -1 +1 @@
-{"batchcode": "030I21A", "histograms": [{"batchcodes": ["030I21A"], "histogram": {"Abdominal discomfort": 1, "Accidental overdose": 1, "Arthritis": 1, "Fatigue": 1, "Lethargy": 1, "Myalgia": 1, "Off label use": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030I21A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Accidental overdose": 1, "Arthritis": 1, "Fatigue": 1, "Lethargy": 1, "Myalgia": 1, "Off label use": 1, "Pain": 1}, "batchcodes": ["030I21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030K20A.json b/docs/data/histograms/United States/030K20A.json
index b526ef749de..c3617f99ff8 100644
--- a/docs/data/histograms/United States/030K20A.json
+++ b/docs/data/histograms/United States/030K20A.json
@@ -1 +1 @@
-{"batchcode": "030K20A", "histograms": [{"batchcodes": ["030K20A"], "histogram": {"Asthenia": 1, "Bone pain": 1, "Chills": 1, "Feeling abnormal": 1}}]}
\ No newline at end of file
+{"batchcode": "030K20A", "histograms": [{"histogram": {"Asthenia": 1, "Bone pain": 1, "Chills": 1, "Feeling abnormal": 1}, "batchcodes": ["030K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L(Z)0A.json b/docs/data/histograms/United States/030L(Z)0A.json
index 00b201d615b..2b5665ba81c 100644
--- a/docs/data/histograms/United States/030L(Z)0A.json
+++ b/docs/data/histograms/United States/030L(Z)0A.json
@@ -1 +1 @@
-{"batchcode": "030L(Z)0A", "histograms": [{"batchcodes": ["030L(Z)0A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "030L(Z)0A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Erythema": 1, "Headache": 1, "Malaise": 1, "Myalgia": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site reaction": 1}, "batchcodes": ["030L(Z)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L020A.json b/docs/data/histograms/United States/030L020A.json
index 4ae06e94dcc..b84e65f047a 100644
--- a/docs/data/histograms/United States/030L020A.json
+++ b/docs/data/histograms/United States/030L020A.json
@@ -1 +1 @@
-{"batchcode": "030L020A", "histograms": [{"batchcodes": ["030L020A"], "histogram": {"Adverse event": 1, "Heart rate": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "030L020A", "histograms": [{"histogram": {"Adverse event": 1, "Heart rate": 1, "Pain": 1, "Pain in extremity": 1, "Vaccination site mass": 1}, "batchcodes": ["030L020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20-1A.json b/docs/data/histograms/United States/030L20-1A.json
index ca021ccec29..98c3eb5f968 100644
--- a/docs/data/histograms/United States/030L20-1A.json
+++ b/docs/data/histograms/United States/030L20-1A.json
@@ -1 +1 @@
-{"batchcode": "030L20-1A", "histograms": [{"batchcodes": ["030L20-1A"], "histogram": {"Joint swelling": 1, "Pityriasis rosea": 1, "Psoriasis": 1, "Skin irritation": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20-1A", "histograms": [{"histogram": {"Joint swelling": 1, "Pityriasis rosea": 1, "Psoriasis": 1, "Skin irritation": 1, "Swelling face": 1}, "batchcodes": ["030L20-1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20.json b/docs/data/histograms/United States/030L20.json
index 83b5c51a776..a920e38e6c5 100644
--- a/docs/data/histograms/United States/030L20.json
+++ b/docs/data/histograms/United States/030L20.json
@@ -1 +1 @@
-{"batchcode": "030L20", "histograms": [{"batchcodes": ["030L20"], "histogram": {"Catheterisation cardiac": 1, "Chills": 1, "Computerised tomogram": 1, "Contusion": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Scratch": 1, "Sepsis": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20", "histograms": [{"histogram": {"Catheterisation cardiac": 1, "Chills": 1, "Computerised tomogram": 1, "Contusion": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Malaise": 1, "Scratch": 1, "Sepsis": 1, "Swelling": 1}, "batchcodes": ["030L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L204.json b/docs/data/histograms/United States/030L204.json
index d87e90f5cfa..a6214b77e5e 100644
--- a/docs/data/histograms/United States/030L204.json
+++ b/docs/data/histograms/United States/030L204.json
@@ -1 +1 @@
-{"batchcode": "030L204", "histograms": [{"batchcodes": ["030L204"], "histogram": {"Injection site pruritus": 1, "Injection site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "030L204", "histograms": [{"histogram": {"Injection site pruritus": 1, "Injection site rash": 1}, "batchcodes": ["030L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L208.json b/docs/data/histograms/United States/030L208.json
index 6fda2a8aa84..c1e431023d5 100644
--- a/docs/data/histograms/United States/030L208.json
+++ b/docs/data/histograms/United States/030L208.json
@@ -1 +1 @@
-{"batchcode": "030L208", "histograms": [{"batchcodes": ["030L208"], "histogram": {"Dysuria": 1, "Urinary tract infection": 1}}]}
\ No newline at end of file
+{"batchcode": "030L208", "histograms": [{"histogram": {"Dysuria": 1, "Urinary tract infection": 1}, "batchcodes": ["030L208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20A OR 030L.json b/docs/data/histograms/United States/030L20A OR 030L.json
index e0a80d13c5f..b329650cccb 100644
--- a/docs/data/histograms/United States/030L20A OR 030L.json
+++ b/docs/data/histograms/United States/030L20A OR 030L.json
@@ -1 +1 @@
-{"batchcode": "030L20A OR 030L", "histograms": [{"batchcodes": ["030L20A OR 030L"], "histogram": {"Blood glucose": 1, "Fatigue": 1, "Headache": 1, "Hyperglycaemia": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20A OR 030L", "histograms": [{"histogram": {"Blood glucose": 1, "Fatigue": 1, "Headache": 1, "Hyperglycaemia": 1}, "batchcodes": ["030L20A OR 030L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20A OR 630L.json b/docs/data/histograms/United States/030L20A OR 630L.json
index 1fdfb6b4f93..051434f99aa 100644
--- a/docs/data/histograms/United States/030L20A OR 630L.json
+++ b/docs/data/histograms/United States/030L20A OR 630L.json
@@ -1 +1 @@
-{"batchcode": "030L20A OR 630L", "histograms": [{"batchcodes": ["030L20A OR 630L"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20A OR 630L", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["030L20A OR 630L"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20A, 023M20.json b/docs/data/histograms/United States/030L20A, 023M20.json
index 0fd2fee1840..d9b82845ff5 100644
--- a/docs/data/histograms/United States/030L20A, 023M20.json
+++ b/docs/data/histograms/United States/030L20A, 023M20.json
@@ -1 +1 @@
-{"batchcode": "030L20A, 023M20", "histograms": [{"batchcodes": ["030L20A, 023M20"], "histogram": {"Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20A, 023M20", "histograms": [{"histogram": {"Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["030L20A, 023M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20A.json b/docs/data/histograms/United States/030L20A.json
index 646816119c9..08bc00549ae 100644
--- a/docs/data/histograms/United States/030L20A.json
+++ b/docs/data/histograms/United States/030L20A.json
@@ -1 +1 @@
-{"batchcode": "030L20A", "histograms": [{"batchcodes": ["030L20A"], "histogram": {"Pyrexia": 125, "Headache": 123, "Chills": 118, "Pain in extremity": 115, "Fatigue": 106, "Vaccination site pain": 87, "Myalgia": 80, "Vaccination site erythema": 70, "Pruritus": 54, "Vaccination site swelling": 52, "Pain": 49, "Rash": 49, "Arthralgia": 48, "Nausea": 47, "Body temperature": 39, "Erythema": 37, "Vaccination site pruritus": 37, "Asthenia": 36, "Dizziness": 36, "COVID-19": 35, "Feeling abnormal": 34, "Vaccination site warmth": 31, "SARS-CoV-2 test": 30, "Malaise": 29, "Peripheral swelling": 27, "Vomiting": 25, "Diarrhoea": 22, "Urticaria": 22, "Inappropriate schedule of product administration": 19, "Tremor": 18, "Decreased appetite": 17, "Hypoaesthesia": 17, "Lymphadenopathy": 17, "Back pain": 16, "Blood pressure measurement": 16, "Cough": 16, "Dyspnoea": 16, "Feeling hot": 16, "Vaccination site induration": 16, "Vaccination site rash": 16, "Heart rate": 15, "Injection site pain": 15, "Heart rate increased": 14, "Illness": 14, "Injection site erythema": 14, "Neck pain": 13, "Contusion": 12, "Swelling": 12, "Vaccination complication": 12, "Hyperhidrosis": 11, "Influenza like illness": 11, "Paraesthesia": 11, "Chest pain": 10, "Hypertension": 10, "Somnolence": 10, "Blood test": 9, "Insomnia": 9, "Limb discomfort": 9, "Product dose omission issue": 9, "Abdominal discomfort": 8, "Blood pressure increased": 8, "Herpes zoster": 8, "Maternal exposure during pregnancy": 8, "Muscular weakness": 8, "Lethargy": 7, "Lymph node pain": 7, "Rash pruritic": 7, "SARS-CoV-2 test positive": 7, "Tinnitus": 7, "White blood cell count": 7, "Abdominal pain": 6, "Abdominal pain upper": 6, "Accidental underdose": 6, "Burning sensation": 6, "Gait disturbance": 6, "Hypersensitivity": 6, "Injection site warmth": 6, "Nasopharyngitis": 6, "Palpitations": 6, "Tenderness": 6, "Therapeutic response unexpected": 6, "Vaccination site inflammation": 6, "Vertigo": 6, "Computerised tomogram": 5, "Expired product administered": 5, "Feeding disorder": 5, "Injection site rash": 5, "Injection site swelling": 5, "Migraine": 5, "Ultrasound scan": 5, "Vaccination site movement impairment": 5, "Ageusia": 4, "Anosmia": 4, "Anxiety": 4, "Blood glucose": 4, "Chest discomfort": 4, "Confusional state": 4, "Dysgeusia": 4, "Exposure during pregnancy": 4, "Eye pain": 4, "Fall": 4, "Feeling cold": 4, "Hypokinesia": 4, "Incorrect route of product administration": 4, "Loss of consciousness": 4, "Muscle spasms": 4, "Night sweats": 4, "Off label use": 4, "Oral mucosal blistering": 4, "Oropharyngeal pain": 4, "Platelet count": 4, "Pregnancy test": 4, "Product administered to patient of inappropriate age": 4, "Rash macular": 4, "Rhinorrhoea": 4, "Sneezing": 4, "Ultrasound foetal": 4, "Underdose": 4, "Urinary tract infection": 4, "Vaccination site discolouration": 4, "Vision blurred": 4, "Weight decreased": 4, "Acne": 3, "Alopecia": 3, "Anaphylactic reaction": 3, "Balance disorder": 3, "Blister": 3, "Blood glucose decreased": 3, "Blood sodium": 3, "Disorientation": 3, "Drug ineffective": 3, "Electrocardiogram": 3, "Flushing": 3, "Groin pain": 3, "Head discomfort": 3, "Hypersomnia": 3, "Influenza": 3, "Injection site mass": 3, "Injection site pruritus": 3, "Intentional dose omission": 3, "Joint stiffness": 3, "Magnetic resonance imaging": 3, "Mass": 3, "Monocyte count": 3, "Musculoskeletal stiffness": 3, "Nasal congestion": 3, "Oral herpes": 3, "Poor quality sleep": 3, "Product storage error": 3, "Rash erythematous": 3, "Rash morbilliform": 3, "Sinusitis": 3, "Skin warm": 3, "Speech disorder": 3, "Swelling face": 3, "Taste disorder": 3, "Vaccination site bruising": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Anaemia": 2, "Anion gap": 2, "Antibody test": 2, "Axillary pain": 2, "Biopsy skin": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood glucose increased": 2, "Blood potassium": 2, "Body temperature increased": 2, "Bone pain": 2, "COVID-19 pneumonia": 2, "Carbon dioxide": 2, "Cardiac stress test": 2, "Cold sweat": 2, "Condition aggravated": 2, "Deafness": 2, "Death": 2, "Deep vein thrombosis": 2, "Discomfort": 2, "Diverticulitis": 2, "Dry mouth": 2, "Dyskinesia": 2, "Dysphagia": 2, "Dysphonia": 2, "Ear pain": 2, "Eosinophil count": 2, "Epistaxis": 2, "Exposure to SARS-CoV-2": 2, "Eye swelling": 2, "Feeling of body temperature change": 2, "Gastrointestinal disorder": 2, "Gout": 2, "Granuloma annulare": 2, "Haematocrit": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Heart rate abnormal": 2, "Heart rate irregular": 2, "Hepatic enzyme increased": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Immunisation reaction": 2, "Incorrect dose administered": 2, "Injection site induration": 2, "Injection site urticaria": 2, "Joint range of motion decreased": 2, "Lip swelling": 2, "Loss of personal independence in daily activities": 2, "Lymphocyte count": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Mean platelet volume": 2, "Muscle twitching": 2, "Myocarditis": 2, "Nervousness": 2, "Neuritis": 2, "Neutrophil count": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Paraesthesia oral": 2, "Pneumonia": 2, "Protein total": 2, "Red blood cell count": 2, "Rheumatological examination": 2, "SARS-CoV-2 antibody test": 2, "Sciatica": 2, "Sensation of foreign body": 2, "Sunburn": 2, "Swollen tongue": 2, "Tachycardia": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site urticaria": 2, "Vitreous floaters": 2, "Wrong technique in product usage process": 2, "X-ray": 2, "Abdominal distension": 1, "Accidental overdose": 1, "Adverse event": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase normal": 1, "Albumin globulin ratio": 1, "Amnesia": 1, "Anisocytosis": 1, "Antibody test abnormal": 1, "Antibody test negative": 1, "Aphonia": 1, "Aphthous ulcer": 1, "Arrhythmia": 1, "Arthritis": 1, "Arthropod bite": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase normal": 1, "Atrial fibrillation": 1, "Autoimmune thyroiditis": 1, "Autonomic nervous system imbalance": 1, "Basophil count": 1, "Bedridden": 1, "Bell's palsy": 1, "Blindness": 1, "Blindness unilateral": 1, "Blister infected": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood count abnormal": 1, "Blood glucose abnormal": 1, "Blood iron": 1, "Blood pressure decreased": 1, "Blood urea": 1, "Blood urea increased": 1, "Blood urine present": 1, "Body mass index": 1, "Body temperature abnormal": 1, "Bradycardia": 1, "Brain hypoxia": 1, "Breast cancer": 1, "Breast discomfort": 1, "Breast tenderness": 1, "Bronchitis": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cardiac operation": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Chronic spontaneous urticaria": 1, "Circumstance or information capable of leading to medication error": 1, "Cleft palate": 1, "Clostridium difficile infection": 1, "Cognitive test": 1, "Cold urticaria": 1, "Colonoscopy": 1, "Coma": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Conjunctivitis": 1, "Constipation": 1, "Corneal disorder": 1, "Coronavirus test": 1, "Costochondritis": 1, "Cyanosis": 1, "Deafness unilateral": 1, "Dehydration": 1, "Device connection issue": 1, "Diverticulum": 1, "Dizziness postural": 1, "Dry skin": 1, "Dysstasia": 1, "EGFR status assay": 1, "Ear congestion": 1, "Ear infection": 1, "Electric shock sensation": 1, "Electrocardiogram PR interval": 1, "Electrocardiogram QT interval": 1, "Electrocardiogram RR interval": 1, "Endoscopy": 1, "Ephelides": 1, "Eructation": 1, "Euphoric mood": 1, "Eustachian tube dysfunction": 1, "Exposure via breast milk": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Eye disorder": 1, "Eye pruritus": 1, "Faeces discoloured": 1, "Fear": 1, "Flatulence": 1, "Food intolerance": 1, "Gait inability": 1, "General physical health deterioration": 1, "Genital herpes": 1, "Gingival blister": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Granulocyte count": 1, "Guillain-Barre syndrome": 1, "Hair injury": 1, "Head injury": 1, "Heart rate decreased": 1, "Herpes simplex": 1, "Hypercoagulation": 1, "Hyperpyrexia": 1, "Hypoglycaemia": 1, "Hypokalaemia": 1, "Hypotrichosis": 1, "Hypoxia": 1, "Ill-defined disorder": 1, "Immune system disorder": 1, "Impaired work ability": 1, "Induration": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Influenza virus test negative": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site lymphadenopathy": 1, "Injection site reaction": 1, "Injury": 1, "Intraocular pressure increased": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Irritability": 1, "Joint contracture": 1, "Joint dislocation": 1, "Joint hyperextension": 1, "Joint swelling": 1, "Joint warmth": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Leukocytosis": 1, "Lip pain": 1, "Local reaction": 1, "Lung disorder": 1, "Madarosis": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Myelodysplastic syndrome": 1, "Neuralgia": 1, "Nucleated red cells": 1, "Ocular hyperaemia": 1, "Oral discomfort": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Otorrhoea": 1, "Overdose": 1, "Oxygen consumption": 1, "Pain in jaw": 1, "Pancreatitis": 1, "Pancytopenia": 1, "Panic attack": 1, "Papule": 1, "Paranasal sinus discomfort": 1, "Parosmia": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Phantom limb syndrome": 1, "Philadelphia chromosome positive": 1, "Photophobia": 1, "Platelet count increased": 1, "Platelet function test": 1, "Poikilocytosis": 1, "Pollakiuria": 1, "Polychromasia": 1, "Poor quality product administered": 1, "Post-acute COVID-19 syndrome": 1, "Prenatal screening test": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Prostatic specific antigen": 1, "Psoriasis": 1, "Psychomotor hyperactivity": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "QRS axis": 1, "Rash vesicular": 1, "Red blood cell morphology": 1, "Red cell distribution width": 1, "Red cell distribution width increased": 1, "Renal artery stenosis": 1, "Renal atrophy": 1, "Renal impairment": 1, "Respiratory syncytial virus infection": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "Rosacea": 1, "SARS-CoV-1 test": 1, "Scan brain": 1, "Sensitive skin": 1, "Sepsis": 1, "Serum ferritin": 1, "Sinus rhythm": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin induration": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin odour abnormal": 1, "Skin tightness": 1, "Sleep deficit": 1, "Sleep disorder": 1, "Staphylococcal infection": 1, "Suffocation feeling": 1, "Syncope": 1, "Thirst": 1, "Thrombosis": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Tongue discomfort": 1, "Torticollis": 1, "Transferrin saturation": 1, "Transient ischaemic attack": 1, "Trismus": 1, "Troponin T": 1, "Type IV hypersensitivity reaction": 1, "Ulcerative keratitis": 1, "Unresponsive to stimuli": 1, "Upper limb fracture": 1, "Upper respiratory tract infection": 1, "Urinary incontinence": 1, "Urine output increased": 1, "Urticarial dermatitis": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site irritation": 1, "Vaccination site joint swelling": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1, "Vein disorder": 1, "Vestibular neuronitis": 1, "Viral test negative": 1, "Visual impairment": 1, "Vocal cord disorder": 1, "Vocal cord dysfunction": 1, "Walking aid user": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1, "Wound": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20A", "histograms": [{"histogram": {"Pyrexia": 125, "Headache": 123, "Chills": 118, "Pain in extremity": 115, "Fatigue": 106, "Vaccination site pain": 87, "Myalgia": 80, "Vaccination site erythema": 70, "Pruritus": 54, "Vaccination site swelling": 52, "Pain": 49, "Rash": 49, "Arthralgia": 48, "Nausea": 47, "Body temperature": 39, "Erythema": 37, "Vaccination site pruritus": 37, "Asthenia": 36, "Dizziness": 36, "COVID-19": 35, "Feeling abnormal": 34, "Vaccination site warmth": 31, "SARS-CoV-2 test": 30, "Malaise": 29, "Peripheral swelling": 27, "Vomiting": 25, "Diarrhoea": 22, "Urticaria": 22, "Inappropriate schedule of product administration": 19, "Tremor": 18, "Decreased appetite": 17, "Hypoaesthesia": 17, "Lymphadenopathy": 17, "Back pain": 16, "Blood pressure measurement": 16, "Cough": 16, "Dyspnoea": 16, "Feeling hot": 16, "Vaccination site induration": 16, "Vaccination site rash": 16, "Heart rate": 15, "Injection site pain": 15, "Heart rate increased": 14, "Illness": 14, "Injection site erythema": 14, "Neck pain": 13, "Contusion": 12, "Swelling": 12, "Vaccination complication": 12, "Hyperhidrosis": 11, "Influenza like illness": 11, "Paraesthesia": 11, "Chest pain": 10, "Hypertension": 10, "Somnolence": 10, "Blood test": 9, "Insomnia": 9, "Limb discomfort": 9, "Product dose omission issue": 9, "Abdominal discomfort": 8, "Blood pressure increased": 8, "Herpes zoster": 8, "Maternal exposure during pregnancy": 8, "Muscular weakness": 8, "Lethargy": 7, "Lymph node pain": 7, "Rash pruritic": 7, "SARS-CoV-2 test positive": 7, "Tinnitus": 7, "White blood cell count": 7, "Abdominal pain": 6, "Abdominal pain upper": 6, "Accidental underdose": 6, "Burning sensation": 6, "Gait disturbance": 6, "Hypersensitivity": 6, "Injection site warmth": 6, "Nasopharyngitis": 6, "Palpitations": 6, "Tenderness": 6, "Therapeutic response unexpected": 6, "Vaccination site inflammation": 6, "Vertigo": 6, "Computerised tomogram": 5, "Expired product administered": 5, "Feeding disorder": 5, "Injection site rash": 5, "Injection site swelling": 5, "Migraine": 5, "Ultrasound scan": 5, "Vaccination site movement impairment": 5, "Ageusia": 4, "Anosmia": 4, "Anxiety": 4, "Blood glucose": 4, "Chest discomfort": 4, "Confusional state": 4, "Dysgeusia": 4, "Exposure during pregnancy": 4, "Eye pain": 4, "Fall": 4, "Feeling cold": 4, "Hypokinesia": 4, "Incorrect route of product administration": 4, "Loss of consciousness": 4, "Muscle spasms": 4, "Night sweats": 4, "Off label use": 4, "Oral mucosal blistering": 4, "Oropharyngeal pain": 4, "Platelet count": 4, "Pregnancy test": 4, "Product administered to patient of inappropriate age": 4, "Rash macular": 4, "Rhinorrhoea": 4, "Sneezing": 4, "Ultrasound foetal": 4, "Underdose": 4, "Urinary tract infection": 4, "Vaccination site discolouration": 4, "Vision blurred": 4, "Weight decreased": 4, "Acne": 3, "Alopecia": 3, "Anaphylactic reaction": 3, "Balance disorder": 3, "Blister": 3, "Blood glucose decreased": 3, "Blood sodium": 3, "Disorientation": 3, "Drug ineffective": 3, "Electrocardiogram": 3, "Flushing": 3, "Groin pain": 3, "Head discomfort": 3, "Hypersomnia": 3, "Influenza": 3, "Injection site mass": 3, "Injection site pruritus": 3, "Intentional dose omission": 3, "Joint stiffness": 3, "Magnetic resonance imaging": 3, "Mass": 3, "Monocyte count": 3, "Musculoskeletal stiffness": 3, "Nasal congestion": 3, "Oral herpes": 3, "Poor quality sleep": 3, "Product storage error": 3, "Rash erythematous": 3, "Rash morbilliform": 3, "Sinusitis": 3, "Skin warm": 3, "Speech disorder": 3, "Swelling face": 3, "Taste disorder": 3, "Vaccination site bruising": 3, "Vaccination site mass": 3, "Vaccination site reaction": 3, "Anaemia": 2, "Anion gap": 2, "Antibody test": 2, "Axillary pain": 2, "Biopsy skin": 2, "Blood albumin": 2, "Blood alkaline phosphatase": 2, "Blood bilirubin": 2, "Blood calcium": 2, "Blood chloride": 2, "Blood creatinine": 2, "Blood glucose increased": 2, "Blood potassium": 2, "Body temperature increased": 2, "Bone pain": 2, "COVID-19 pneumonia": 2, "Carbon dioxide": 2, "Cardiac stress test": 2, "Cold sweat": 2, "Condition aggravated": 2, "Deafness": 2, "Death": 2, "Deep vein thrombosis": 2, "Discomfort": 2, "Diverticulitis": 2, "Dry mouth": 2, "Dyskinesia": 2, "Dysphagia": 2, "Dysphonia": 2, "Ear pain": 2, "Eosinophil count": 2, "Epistaxis": 2, "Exposure to SARS-CoV-2": 2, "Eye swelling": 2, "Feeling of body temperature change": 2, "Gastrointestinal disorder": 2, "Gout": 2, "Granuloma annulare": 2, "Haematocrit": 2, "Haemoglobin": 2, "Haemorrhage": 2, "Heart rate abnormal": 2, "Heart rate irregular": 2, "Hepatic enzyme increased": 2, "Hot flush": 2, "Hypoaesthesia oral": 2, "Hypotension": 2, "Immunisation reaction": 2, "Incorrect dose administered": 2, "Injection site induration": 2, "Injection site urticaria": 2, "Joint range of motion decreased": 2, "Lip swelling": 2, "Loss of personal independence in daily activities": 2, "Lymphocyte count": 2, "Mean cell haemoglobin": 2, "Mean cell haemoglobin concentration": 2, "Mean cell volume": 2, "Mean platelet volume": 2, "Muscle twitching": 2, "Myocarditis": 2, "Nervousness": 2, "Neuritis": 2, "Neutrophil count": 2, "No adverse event": 2, "Ocular discomfort": 2, "Oxygen saturation": 2, "Oxygen saturation decreased": 2, "Paraesthesia oral": 2, "Pneumonia": 2, "Protein total": 2, "Red blood cell count": 2, "Rheumatological examination": 2, "SARS-CoV-2 antibody test": 2, "Sciatica": 2, "Sensation of foreign body": 2, "Sunburn": 2, "Swollen tongue": 2, "Tachycardia": 2, "Throat irritation": 2, "Thrombocytopenia": 2, "Vaccination site lymphadenopathy": 2, "Vaccination site urticaria": 2, "Vitreous floaters": 2, "Wrong technique in product usage process": 2, "X-ray": 2, "Abdominal distension": 1, "Accidental overdose": 1, "Adverse event": 1, "Alanine aminotransferase": 1, "Alanine aminotransferase normal": 1, "Albumin globulin ratio": 1, "Amnesia": 1, "Anisocytosis": 1, "Antibody test abnormal": 1, "Antibody test negative": 1, "Aphonia": 1, "Aphthous ulcer": 1, "Arrhythmia": 1, "Arthritis": 1, "Arthropod bite": 1, "Aspartate aminotransferase": 1, "Aspartate aminotransferase normal": 1, "Atrial fibrillation": 1, "Autoimmune thyroiditis": 1, "Autonomic nervous system imbalance": 1, "Basophil count": 1, "Bedridden": 1, "Bell's palsy": 1, "Blindness": 1, "Blindness unilateral": 1, "Blister infected": 1, "Blood cholesterol": 1, "Blood count": 1, "Blood count abnormal": 1, "Blood glucose abnormal": 1, "Blood iron": 1, "Blood pressure decreased": 1, "Blood urea": 1, "Blood urea increased": 1, "Blood urine present": 1, "Body mass index": 1, "Body temperature abnormal": 1, "Bradycardia": 1, "Brain hypoxia": 1, "Breast cancer": 1, "Breast discomfort": 1, "Breast tenderness": 1, "Bronchitis": 1, "C-reactive protein": 1, "Cardiac flutter": 1, "Cardiac operation": 1, "Cellulitis": 1, "Chest X-ray": 1, "Chromaturia": 1, "Chronic kidney disease": 1, "Chronic spontaneous urticaria": 1, "Circumstance or information capable of leading to medication error": 1, "Cleft palate": 1, "Clostridium difficile infection": 1, "Cognitive test": 1, "Cold urticaria": 1, "Colonoscopy": 1, "Coma": 1, "Computerised tomogram abdomen": 1, "Computerised tomogram thorax": 1, "Conjunctivitis": 1, "Constipation": 1, "Corneal disorder": 1, "Coronavirus test": 1, "Costochondritis": 1, "Cyanosis": 1, "Deafness unilateral": 1, "Dehydration": 1, "Device connection issue": 1, "Diverticulum": 1, "Dizziness postural": 1, "Dry skin": 1, "Dysstasia": 1, "EGFR status assay": 1, "Ear congestion": 1, "Ear infection": 1, "Electric shock sensation": 1, "Electrocardiogram PR interval": 1, "Electrocardiogram QT interval": 1, "Electrocardiogram RR interval": 1, "Endoscopy": 1, "Ephelides": 1, "Eructation": 1, "Euphoric mood": 1, "Eustachian tube dysfunction": 1, "Exposure via breast milk": 1, "Exposure via skin contact": 1, "Extra dose administered": 1, "Eye disorder": 1, "Eye pruritus": 1, "Faeces discoloured": 1, "Fear": 1, "Flatulence": 1, "Food intolerance": 1, "Gait inability": 1, "General physical health deterioration": 1, "Genital herpes": 1, "Gingival blister": 1, "Globulin": 1, "Glomerular filtration rate": 1, "Granulocyte count": 1, "Guillain-Barre syndrome": 1, "Hair injury": 1, "Head injury": 1, "Heart rate decreased": 1, "Herpes simplex": 1, "Hypercoagulation": 1, "Hyperpyrexia": 1, "Hypoglycaemia": 1, "Hypokalaemia": 1, "Hypotrichosis": 1, "Hypoxia": 1, "Ill-defined disorder": 1, "Immune system disorder": 1, "Impaired work ability": 1, "Induration": 1, "Infectious mononucleosis": 1, "Inflammation": 1, "Influenza virus test negative": 1, "Injected limb mobility decreased": 1, "Injection site discolouration": 1, "Injection site lymphadenopathy": 1, "Injection site reaction": 1, "Injury": 1, "Intraocular pressure increased": 1, "Iron binding capacity total": 1, "Iron binding capacity unsaturated": 1, "Irritability": 1, "Joint contracture": 1, "Joint dislocation": 1, "Joint hyperextension": 1, "Joint swelling": 1, "Joint warmth": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Leukocytosis": 1, "Lip pain": 1, "Local reaction": 1, "Lung disorder": 1, "Madarosis": 1, "Magnetic resonance imaging head": 1, "Memory impairment": 1, "Mobility decreased": 1, "Muscle swelling": 1, "Muscle tightness": 1, "Musculoskeletal pain": 1, "Myelodysplastic syndrome": 1, "Neuralgia": 1, "Nucleated red cells": 1, "Ocular hyperaemia": 1, "Oral discomfort": 1, "Oral pain": 1, "Oropharyngeal discomfort": 1, "Otorrhoea": 1, "Overdose": 1, "Oxygen consumption": 1, "Pain in jaw": 1, "Pancreatitis": 1, "Pancytopenia": 1, "Panic attack": 1, "Papule": 1, "Paranasal sinus discomfort": 1, "Parosmia": 1, "Pericarditis": 1, "Peripheral coldness": 1, "Phantom limb syndrome": 1, "Philadelphia chromosome positive": 1, "Photophobia": 1, "Platelet count increased": 1, "Platelet function test": 1, "Poikilocytosis": 1, "Pollakiuria": 1, "Polychromasia": 1, "Poor quality product administered": 1, "Post-acute COVID-19 syndrome": 1, "Prenatal screening test": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Prostatic specific antigen": 1, "Psoriasis": 1, "Psychomotor hyperactivity": 1, "Pulmonary congestion": 1, "Pulmonary mass": 1, "QRS axis": 1, "Rash vesicular": 1, "Red blood cell morphology": 1, "Red cell distribution width": 1, "Red cell distribution width increased": 1, "Renal artery stenosis": 1, "Renal atrophy": 1, "Renal impairment": 1, "Respiratory syncytial virus infection": 1, "Restlessness": 1, "Rheumatoid arthritis": 1, "Rosacea": 1, "SARS-CoV-1 test": 1, "Scan brain": 1, "Sensitive skin": 1, "Sepsis": 1, "Serum ferritin": 1, "Sinus rhythm": 1, "Skin burning sensation": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin induration": 1, "Skin irritation": 1, "Skin lesion": 1, "Skin odour abnormal": 1, "Skin tightness": 1, "Sleep deficit": 1, "Sleep disorder": 1, "Staphylococcal infection": 1, "Suffocation feeling": 1, "Syncope": 1, "Thirst": 1, "Thrombosis": 1, "Thyroiditis subacute": 1, "Thyroxine free": 1, "Tongue discomfort": 1, "Torticollis": 1, "Transferrin saturation": 1, "Transient ischaemic attack": 1, "Trismus": 1, "Troponin T": 1, "Type IV hypersensitivity reaction": 1, "Ulcerative keratitis": 1, "Unresponsive to stimuli": 1, "Upper limb fracture": 1, "Upper respiratory tract infection": 1, "Urinary incontinence": 1, "Urine output increased": 1, "Urticarial dermatitis": 1, "Vaccination site discomfort": 1, "Vaccination site dysaesthesia": 1, "Vaccination site haemorrhage": 1, "Vaccination site hyperaesthesia": 1, "Vaccination site irritation": 1, "Vaccination site joint swelling": 1, "Vaccination site nodule": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1, "Vein disorder": 1, "Vestibular neuronitis": 1, "Viral test negative": 1, "Visual impairment": 1, "Vocal cord disorder": 1, "Vocal cord dysfunction": 1, "Walking aid user": 1, "Weight": 1, "Wheezing": 1, "White blood cell count increased": 1, "Wound": 1, "Wrong product administered": 1}, "batchcodes": ["030L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20AH.json b/docs/data/histograms/United States/030L20AH.json
index 4225c9172b5..89fa303f44a 100644
--- a/docs/data/histograms/United States/030L20AH.json
+++ b/docs/data/histograms/United States/030L20AH.json
@@ -1 +1 @@
-{"batchcode": "030L20AH", "histograms": [{"batchcodes": ["030L20AH"], "histogram": {"Pain in extremity": 3, "Vaccination site erythema": 2, "Chills": 1, "Erythema": 1, "Tremor": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20AH", "histograms": [{"histogram": {"Pain in extremity": 3, "Vaccination site erythema": 2, "Chills": 1, "Erythema": 1, "Tremor": 1, "Vaccination site pain": 1}, "batchcodes": ["030L20AH"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20K.json b/docs/data/histograms/United States/030L20K.json
index b7af66b8f0b..7aa387e4e7f 100644
--- a/docs/data/histograms/United States/030L20K.json
+++ b/docs/data/histograms/United States/030L20K.json
@@ -1 +1 @@
-{"batchcode": "030L20K", "histograms": [{"batchcodes": ["030L20K"], "histogram": {"Lymphadenopathy": 2, "Pain in extremity": 2, "Arthralgia": 1, "Infection": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20K", "histograms": [{"histogram": {"Lymphadenopathy": 2, "Pain in extremity": 2, "Arthralgia": 1, "Infection": 1}, "batchcodes": ["030L20K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L20N.json b/docs/data/histograms/United States/030L20N.json
index c9e6ca0fda1..4873c0f5766 100644
--- a/docs/data/histograms/United States/030L20N.json
+++ b/docs/data/histograms/United States/030L20N.json
@@ -1 +1 @@
-{"batchcode": "030L20N", "histograms": [{"batchcodes": ["030L20N"], "histogram": {"Pain in extremity": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "030L20N", "histograms": [{"histogram": {"Pain in extremity": 1, "Swelling": 1}, "batchcodes": ["030L20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L210A.json b/docs/data/histograms/United States/030L210A.json
index d2c66538d0a..edd56de80d2 100644
--- a/docs/data/histograms/United States/030L210A.json
+++ b/docs/data/histograms/United States/030L210A.json
@@ -1 +1 @@
-{"batchcode": "030L210A", "histograms": [{"batchcodes": ["030L210A"], "histogram": {"Body temperature": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030L210A", "histograms": [{"histogram": {"Body temperature": 1, "Pyrexia": 1}, "batchcodes": ["030L210A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L21A.json b/docs/data/histograms/United States/030L21A.json
index 99f4f9d3929..4affd1fc961 100644
--- a/docs/data/histograms/United States/030L21A.json
+++ b/docs/data/histograms/United States/030L21A.json
@@ -1 +1 @@
-{"batchcode": "030L21A", "histograms": [{"batchcodes": ["030L21A"], "histogram": {"Erythema": 2, "Ear swelling": 1, "Eye irritation": 1, "Eye pain": 1, "Hypoacusis": 1, "Induration": 1, "Joint swelling": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Tongue blistering": 1, "Vaccination complication": 1, "Vulvovaginal burning sensation": 1, "Vulvovaginal inflammation": 1}}]}
\ No newline at end of file
+{"batchcode": "030L21A", "histograms": [{"histogram": {"Erythema": 2, "Ear swelling": 1, "Eye irritation": 1, "Eye pain": 1, "Hypoacusis": 1, "Induration": 1, "Joint swelling": 1, "Pruritus": 1, "Rash": 1, "Rash erythematous": 1, "Tongue blistering": 1, "Vaccination complication": 1, "Vulvovaginal burning sensation": 1, "Vulvovaginal inflammation": 1}, "batchcodes": ["030L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L22A.json b/docs/data/histograms/United States/030L22A.json
index 0846b241989..b049a15269a 100644
--- a/docs/data/histograms/United States/030L22A.json
+++ b/docs/data/histograms/United States/030L22A.json
@@ -1 +1 @@
-{"batchcode": "030L22A", "histograms": [{"batchcodes": ["030L22A"], "histogram": {"COVID-19": 1, "Cough": 1, "Fatigue": 1, "Oropharyngeal discomfort": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "030L22A", "histograms": [{"histogram": {"COVID-19": 1, "Cough": 1, "Fatigue": 1, "Oropharyngeal discomfort": 1, "Pain in extremity": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["030L22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L28.json b/docs/data/histograms/United States/030L28.json
index 240be4260c2..916c92817fc 100644
--- a/docs/data/histograms/United States/030L28.json
+++ b/docs/data/histograms/United States/030L28.json
@@ -1 +1 @@
-{"batchcode": "030L28", "histograms": [{"batchcodes": ["030L28"], "histogram": {"Insomnia": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "030L28", "histograms": [{"histogram": {"Insomnia": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["030L28"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L2A.json b/docs/data/histograms/United States/030L2A.json
index 1a3f3510967..7e294d22536 100644
--- a/docs/data/histograms/United States/030L2A.json
+++ b/docs/data/histograms/United States/030L2A.json
@@ -1 +1 @@
-{"batchcode": "030L2A", "histograms": [{"batchcodes": ["030L2A"], "histogram": {"Vaccination site warmth": 2, "Injection site erythema": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "030L2A", "histograms": [{"histogram": {"Vaccination site warmth": 2, "Injection site erythema": 1, "Vaccination site erythema": 1}, "batchcodes": ["030L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L2LA.json b/docs/data/histograms/United States/030L2LA.json
index eb4a75ee209..cebb39b43fd 100644
--- a/docs/data/histograms/United States/030L2LA.json
+++ b/docs/data/histograms/United States/030L2LA.json
@@ -1 +1 @@
-{"batchcode": "030L2LA", "histograms": [{"batchcodes": ["030L2LA"], "histogram": {"Erythema": 1, "Injection site nodule": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "030L2LA", "histograms": [{"histogram": {"Erythema": 1, "Injection site nodule": 1, "Pain in extremity": 1}, "batchcodes": ["030L2LA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L2O1.json b/docs/data/histograms/United States/030L2O1.json
index 30c335926ca..1acd3f0bc93 100644
--- a/docs/data/histograms/United States/030L2O1.json
+++ b/docs/data/histograms/United States/030L2O1.json
@@ -1 +1 @@
-{"batchcode": "030L2O1", "histograms": [{"batchcodes": ["030L2O1"], "histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Faeces soft": 1, "Gastritis": 1, "Muscle tightness": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "030L2O1", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal pain upper": 1, "Faeces soft": 1, "Gastritis": 1, "Muscle tightness": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["030L2O1"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L2O4.json b/docs/data/histograms/United States/030L2O4.json
index 4424a8e6b0f..c10c0935785 100644
--- a/docs/data/histograms/United States/030L2O4.json
+++ b/docs/data/histograms/United States/030L2O4.json
@@ -1 +1 @@
-{"batchcode": "030L2O4", "histograms": [{"batchcodes": ["030L2O4"], "histogram": {"Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "030L2O4", "histograms": [{"histogram": {"Pruritus": 1, "Urticaria": 1}, "batchcodes": ["030L2O4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L2OA.json b/docs/data/histograms/United States/030L2OA.json
index 1f395d8e0d2..d48d79fa458 100644
--- a/docs/data/histograms/United States/030L2OA.json
+++ b/docs/data/histograms/United States/030L2OA.json
@@ -1 +1 @@
-{"batchcode": "030L2OA", "histograms": [{"batchcodes": ["030L2OA"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "030L2OA", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Myalgia": 1}, "batchcodes": ["030L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030L30A.json b/docs/data/histograms/United States/030L30A.json
index b178ca3e2fa..22802ece4ab 100644
--- a/docs/data/histograms/United States/030L30A.json
+++ b/docs/data/histograms/United States/030L30A.json
@@ -1 +1 @@
-{"batchcode": "030L30A", "histograms": [{"batchcodes": ["030L30A"], "histogram": {"Device connection issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "030L30A", "histograms": [{"histogram": {"Device connection issue": 1, "Underdose": 1}, "batchcodes": ["030L30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030LZ0A.json b/docs/data/histograms/United States/030LZ0A.json
index dd4da9ee514..19651691c73 100644
--- a/docs/data/histograms/United States/030LZ0A.json
+++ b/docs/data/histograms/United States/030LZ0A.json
@@ -1 +1 @@
-{"batchcode": "030LZ0A", "histograms": [{"batchcodes": ["030LZ0A"], "histogram": {"Asthenia": 2, "Headache": 2, "Arthritis infective": 1, "Chills": 1, "Culture": 1, "Erythema": 1, "Fall": 1, "Feeling hot": 1, "Gait inability": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Joint swelling": 1, "Joint warmth": 1, "Laboratory test": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Syncope": 1}}]}
\ No newline at end of file
+{"batchcode": "030LZ0A", "histograms": [{"histogram": {"Asthenia": 2, "Headache": 2, "Arthritis infective": 1, "Chills": 1, "Culture": 1, "Erythema": 1, "Fall": 1, "Feeling hot": 1, "Gait inability": 1, "Heart rate increased": 1, "Influenza like illness": 1, "Joint swelling": 1, "Joint warmth": 1, "Laboratory test": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Syncope": 1}, "batchcodes": ["030LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030LZOA.json b/docs/data/histograms/United States/030LZOA.json
index 7d3b7894d92..e8374264148 100644
--- a/docs/data/histograms/United States/030LZOA.json
+++ b/docs/data/histograms/United States/030LZOA.json
@@ -1 +1 @@
-{"batchcode": "030LZOA", "histograms": [{"batchcodes": ["030LZOA"], "histogram": {"Breast pain": 1, "Neck pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "030LZOA", "histograms": [{"histogram": {"Breast pain": 1, "Neck pain": 1, "Pain in extremity": 1}, "batchcodes": ["030LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030LZOA?.json b/docs/data/histograms/United States/030LZOA?.json
index 35b087fef4c..48405c65671 100644
--- a/docs/data/histograms/United States/030LZOA?.json
+++ b/docs/data/histograms/United States/030LZOA?.json
@@ -1 +1 @@
-{"batchcode": "030LZOA?", "histograms": [{"batchcodes": ["030LZOA?"], "histogram": {"Arthralgia": 1, "Chills": 1, "Myalgia": 1, "Rash erythematous": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030LZOA?", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Myalgia": 1, "Rash erythematous": 1, "Vaccination site pain": 1}, "batchcodes": ["030LZOA?"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M00A OR 030N.json b/docs/data/histograms/United States/030M00A OR 030N.json
index 4826aac749a..3ade0186943 100644
--- a/docs/data/histograms/United States/030M00A OR 030N.json
+++ b/docs/data/histograms/United States/030M00A OR 030N.json
@@ -1 +1 @@
-{"batchcode": "030M00A OR 030N", "histograms": [{"batchcodes": ["030M00A OR 030N"], "histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030M00A OR 030N", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Myalgia": 1, "Pyrexia": 1}, "batchcodes": ["030M00A OR 030N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M0A.json b/docs/data/histograms/United States/030M0A.json
index 91ca947c12b..09756e12071 100644
--- a/docs/data/histograms/United States/030M0A.json
+++ b/docs/data/histograms/United States/030M0A.json
@@ -1 +1 @@
-{"batchcode": "030M0A", "histograms": [{"batchcodes": ["030M0A"], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "030M0A", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["030M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20.json b/docs/data/histograms/United States/030M20.json
index ad3e109b496..fd3ba68bec8 100644
--- a/docs/data/histograms/United States/030M20.json
+++ b/docs/data/histograms/United States/030M20.json
@@ -1 +1 @@
-{"batchcode": "030M20", "histograms": [{"batchcodes": ["030M20"], "histogram": {"Pyrexia": 2, "Headache": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Lymphadenopathy": 1, "Mammogram": 1, "Nausea": 1, "Pain in extremity": 1, "Rheumatoid arthritis": 1, "Ultrasound scan": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20", "histograms": [{"histogram": {"Pyrexia": 2, "Headache": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Lymphadenopathy": 1, "Mammogram": 1, "Nausea": 1, "Pain in extremity": 1, "Rheumatoid arthritis": 1, "Ultrasound scan": 1, "Vaccination site pain": 1}, "batchcodes": ["030M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M200A.json b/docs/data/histograms/United States/030M200A.json
index 83a256e6699..0f1057d3bb1 100644
--- a/docs/data/histograms/United States/030M200A.json
+++ b/docs/data/histograms/United States/030M200A.json
@@ -1 +1 @@
-{"batchcode": "030M200A", "histograms": [{"batchcodes": ["030M200A"], "histogram": {"Decreased appetite": 1, "Feeling cold": 1, "Malaise": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "030M200A", "histograms": [{"histogram": {"Decreased appetite": 1, "Feeling cold": 1, "Malaise": 1, "Weight decreased": 1}, "batchcodes": ["030M200A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M201A.json b/docs/data/histograms/United States/030M201A.json
index f1e939f909e..f864e46f747 100644
--- a/docs/data/histograms/United States/030M201A.json
+++ b/docs/data/histograms/United States/030M201A.json
@@ -1 +1 @@
-{"batchcode": "030M201A", "histograms": [{"batchcodes": ["030M201A"], "histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030M201A", "histograms": [{"histogram": {"Abdominal discomfort": 1, "Abdominal distension": 1, "Malaise": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1}, "batchcodes": ["030M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M204.json b/docs/data/histograms/United States/030M204.json
index 3891e7121c6..cdb5742bd71 100644
--- a/docs/data/histograms/United States/030M204.json
+++ b/docs/data/histograms/United States/030M204.json
@@ -1 +1 @@
-{"batchcode": "030M204", "histograms": [{"batchcodes": ["030M204"], "histogram": {"Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030M204", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dyspnoea": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["030M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20A OR 030M.json b/docs/data/histograms/United States/030M20A OR 030M.json
index 21fba9e5c04..b8651fa5507 100644
--- a/docs/data/histograms/United States/030M20A OR 030M.json
+++ b/docs/data/histograms/United States/030M20A OR 030M.json
@@ -1 +1 @@
-{"batchcode": "030M20A OR 030M", "histograms": [{"batchcodes": ["030M20A OR 030M"], "histogram": {"Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20A OR 030M", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["030M20A OR 030M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20A,NDC8077.json b/docs/data/histograms/United States/030M20A,NDC8077.json
index 5de8b6622f6..a89aee664f5 100644
--- a/docs/data/histograms/United States/030M20A,NDC8077.json
+++ b/docs/data/histograms/United States/030M20A,NDC8077.json
@@ -1 +1 @@
-{"batchcode": "030M20A,NDC8077", "histograms": [{"batchcodes": ["030M20A,NDC8077"], "histogram": {"Atrial fibrillation": 1, "Nausea": 1, "Seizure": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20A,NDC8077", "histograms": [{"histogram": {"Atrial fibrillation": 1, "Nausea": 1, "Seizure": 1}, "batchcodes": ["030M20A,NDC8077"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20A..json b/docs/data/histograms/United States/030M20A..json
index 6e72e33dcec..68e52161438 100644
--- a/docs/data/histograms/United States/030M20A..json
+++ b/docs/data/histograms/United States/030M20A..json
@@ -1 +1 @@
-{"batchcode": "030M20A.", "histograms": [{"batchcodes": ["030M20A."], "histogram": {"Blood glucose increased": 1, "Glycosylated haemoglobin": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20A.", "histograms": [{"histogram": {"Blood glucose increased": 1, "Glycosylated haemoglobin": 1}, "batchcodes": ["030M20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20A.json b/docs/data/histograms/United States/030M20A.json
index ab2cf0a3fd5..ca5a4aa0e74 100644
--- a/docs/data/histograms/United States/030M20A.json
+++ b/docs/data/histograms/United States/030M20A.json
@@ -1 +1 @@
-{"batchcode": "030M20A", "histograms": [{"batchcodes": ["030M20A", "RN6209"], "histogram": {"Interchange of vaccine products": 1}}, {"batchcodes": ["030M20A"], "histogram": {"Headache": 151, "Pyrexia": 142, "Pain in extremity": 118, "Chills": 114, "Fatigue": 110, "Myalgia": 95, "Vaccination site pain": 80, "Pain": 72, "Nausea": 67, "Pruritus": 57, "Vaccination site erythema": 55, "Arthralgia": 52, "Dizziness": 45, "Vaccination site pruritus": 38, "Erythema": 35, "Body temperature": 34, "Vaccination site swelling": 34, "Rash": 33, "Feeling abnormal": 32, "Asthenia": 30, "Malaise": 25, "Peripheral swelling": 25, "Vaccination site rash": 25, "Dyspnoea": 24, "Diarrhoea": 23, "Vaccination site warmth": 23, "Urticaria": 21, "Vomiting": 21, "SARS-CoV-2 test": 20, "Hyperhidrosis": 19, "Injection site pain": 19, "Cough": 18, "Decreased appetite": 18, "Swelling": 18, "Feeling hot": 17, "Injection site erythema": 17, "Blood pressure measurement": 16, "COVID-19": 16, "Influenza like illness": 16, "Vaccination complication": 16, "Insomnia": 14, "Tremor": 14, "Neck pain": 13, "Product dose omission issue": 13, "Vaccination site reaction": 13, "Abdominal discomfort": 12, "Back pain": 12, "Inappropriate schedule of product administration": 12, "Mobility decreased": 12, "Paraesthesia": 12, "Chest pain": 11, "Gait disturbance": 11, "Somnolence": 11, "Heart rate": 10, "Heart rate increased": 10, "Illness": 10, "Nasopharyngitis": 10, "Vaccination site induration": 10, "Chest discomfort": 9, "Hypoaesthesia": 9, "Muscle spasms": 9, "Burning sensation": 8, "Injection site pruritus": 8, "Injection site warmth": 8, "Limb discomfort": 8, "Lymphadenopathy": 8, "Nasal congestion": 8, "Oropharyngeal pain": 8, "Rash pruritic": 8, "Arthritis": 7, "Discomfort": 7, "Hypertension": 7, "Injection site swelling": 7, "Joint swelling": 7, "Loss of consciousness": 7, "Maternal exposure during pregnancy": 7, "Muscular weakness": 7, "Palpitations": 7, "Rash erythematous": 7, "Rhinorrhoea": 7, "Tenderness": 7, "Atrial fibrillation": 6, "Gait inability": 6, "Herpes zoster": 6, "Inflammation": 6, "Injection site rash": 6, "Skin discolouration": 6, "Dysstasia": 5, "Fall": 5, "Flushing": 5, "Musculoskeletal stiffness": 5, "Pollakiuria": 5, "Syncope": 5, "Abdominal pain upper": 4, "Adverse reaction": 4, "Blood pressure increased": 4, "Confusional state": 4, "Constipation": 4, "Contusion": 4, "Feeling cold": 4, "Full blood count": 4, "Hot flush": 4, "Hypersensitivity": 4, "Influenza": 4, "Migraine": 4, "Retching": 4, "Sinusitis": 4, "Tachycardia": 4, "Throat tightness": 4, "Tinnitus": 4, "Vaccination site urticaria": 4, "Vertigo": 4, "Alopecia": 3, "Amnesia": 3, "Antibody test": 3, "Blood test": 3, "Body temperature increased": 3, "Computerised tomogram": 3, "Device connection issue": 3, "Drug ineffective": 3, "Ear pruritus": 3, "Exposure during pregnancy": 3, "Eye pain": 3, "Eye swelling": 3, "Flatulence": 3, "Hypotension": 3, "Incorrect route of product administration": 3, "Lacrimation increased": 3, "Lethargy": 3, "Lip swelling": 3, "Myocardial infarction": 3, "Nightmare": 3, "Oral discomfort": 3, "Paraesthesia oral": 3, "Plantar fasciitis": 3, "Pregnancy test": 3, "Scratch": 3, "Skin mass": 3, "Suspected COVID-19": 3, "Swelling face": 3, "Toothache": 3, "Underdose": 3, "Vaccination site discolouration": 3, "Vaccination site mass": 3, "Vaccination site movement impairment": 3, "Ageusia": 2, "Agitation": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Anxiety": 2, "Atrial flutter": 2, "Axillary pain": 2, "Balance disorder": 2, "Bedridden": 2, "Blister": 2, "Blood glucose": 2, "Blood glucose decreased": 2, "Blood pressure decreased": 2, "Blood test normal": 2, "Blood thyroid stimulating hormone": 2, "Bone swelling": 2, "Carpal tunnel syndrome": 2, "Chest X-ray": 2, "Choking": 2, "Dehydration": 2, "Dry skin": 2, "Dysarthria": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Ear pain": 2, "Eczema": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Eructation": 2, "Expired product administered": 2, "Extra dose administered": 2, "Feeling of body temperature change": 2, "Hallucination": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Incorrect dose administered": 2, "Interchange of vaccine products": 2, "Loss of personal independence in daily activities": 2, "Lymph node pain": 2, "Magnetic resonance imaging": 2, "Maternal exposure during breast feeding": 2, "Monoclonal B-cell lymphocytosis": 2, "Muscle discomfort": 2, "Nervousness": 2, "Neuralgia": 2, "Night sweats": 2, "Nodule": 2, "Ocular hyperaemia": 2, "Oropharyngeal discomfort": 2, "Pain in jaw": 2, "Papule": 2, "Photophobia": 2, "Pulmonary embolism": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 antibody test negative": 2, "Seasonal allergy": 2, "Seizure": 2, "Skin reaction": 2, "Skin swelling": 2, "Sleep disorder": 2, "Sneezing": 2, "Speech disorder": 2, "Taste disorder": 2, "Thrombosis": 2, "Type IV hypersensitivity reaction": 2, "Ultrasound foetal": 2, "Vaccination site bruising": 2, "Vaccination site inflammation": 2, "Vaccination site lymphadenopathy": 2, "Vision blurred": 2, "Visual impairment": 2, "X-ray": 2, "Abdominal pain": 1, "Abscess": 1, "Accident": 1, "Accidental exposure to product": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse drug reaction": 1, "Allergy to vaccine": 1, "Aphasia": 1, "Arthropathy": 1, "Asthenopia": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Bell's palsy": 1, "Blepharospasm": 1, "Blood count abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic": 1, "Blood testosterone": 1, "Blood thyroid stimulating hormone increased": 1, "Bone pain": 1, "Breast pain": 1, "Breast swelling": 1, "Breath sounds abnormal": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac pacemaker insertion": 1, "Cerebrovascular accident": 1, "Chronic obstructive pulmonary disease": 1, "Cold sweat": 1, "Cold-stimulus headache": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Cutaneous symptom": 1, "Cystitis": 1, "Daydreaming": 1, "Deafness": 1, "Deafness unilateral": 1, "Death": 1, "Decreased interest": 1, "Deep vein thrombosis": 1, "Deformity": 1, "Delirium": 1, "Depression": 1, "Diplopia": 1, "Disorientation": 1, "Dissociation": 1, "Diverticulum": 1, "Dreamy state": 1, "Dry mouth": 1, "Dysbiosis": 1, "Dysgraphia": 1, "Dysphagia": 1, "Dystonia": 1, "Ear discomfort": 1, "Ear swelling": 1, "Electric shock sensation": 1, "Electroencephalogram": 1, "Enlarged uvula": 1, "Ephelides": 1, "Eye haemorrhage": 1, "Eye inflammation": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fear": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Food allergy": 1, "Freezing phenomenon": 1, "Furuncle": 1, "Gastrooesophageal reflux disease": 1, "Genital herpes": 1, "Gestational diabetes": 1, "Glomerular filtration rate": 1, "Glucose tolerance test": 1, "Grief reaction": 1, "Group B streptococcus neonatal sepsis": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemoptysis": 1, "Hallucination, auditory": 1, "Head discomfort": 1, "Heart rate abnormal": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Immunodeficiency": 1, "Impaired work ability": 1, "Induration": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site hypersensitivity": 1, "Injection site induration": 1, "Injection site joint swelling": 1, "Injection site mass": 1, "Instillation site induration": 1, "Intentional product use issue": 1, "Intestinal ischaemia": 1, "Joint injury": 1, "Joint stiffness": 1, "Lagophthalmos": 1, "Lid sulcus deepened": 1, "Limb injury": 1, "Lip blister": 1, "Localised infection": 1, "Lymphadenitis": 1, "Mass": 1, "Mechanical urticaria": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Mental status changes": 1, "Metabolic function test": 1, "Metamorphopsia": 1, "Monoplegia": 1, "Mood swings": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Myelitis transverse": 1, "Myocardial necrosis marker": 1, "Nasal discomfort": 1, "Near death experience": 1, "Nerve compression": 1, "Neurological symptom": 1, "No adverse event": 1, "Nuchal rigidity": 1, "Ocular discomfort": 1, "Oesophageal achalasia": 1, "Oesophageal spasm": 1, "Off label use": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical deconditioning": 1, "Plasma cell myeloma recurrent": 1, "Pleurisy": 1, "Pneumonia": 1, "Polyuria": 1, "Poor quality sleep": 1, "Pregnancy": 1, "Premature menopause": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Purpura": 1, "Rash macular": 1, "Rash morbilliform": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Retinal haemorrhage": 1, "Retinal migraine": 1, "Rhinalgia": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test negative": 1, "Salivary gland disorder": 1, "Salivary gland pain": 1, "Scab": 1, "Scan": 1, "Scar": 1, "Secretion discharge": 1, "Sensitive skin": 1, "Skin burning sensation": 1, "Skin irritation": 1, "Skin warm": 1, "Sleep inertia": 1, "Small intestinal obstruction": 1, "Somnambulism": 1, "Stiff tongue": 1, "Stress cardiomyopathy": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Tension headache": 1, "Thyroid function test": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Tongue pruritus": 1, "Tonic clonic movements": 1, "Transient global amnesia": 1, "Transient ischaemic attack": 1, "Transposition of the great vessels": 1, "Trigger finger": 1, "Tuberculin test": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Unevaluable event": 1, "Upper limb fracture": 1, "Urinary tract infection": 1, "Vaccination site haemorrhage": 1, "Vaccination site joint erythema": 1, "Vaccination site nerve damage": 1, "Vaccination site nodule": 1, "Vaccination site oedema": 1, "Vaccination site vesicles": 1, "Varicella": 1, "Vitreous floaters": 1, "Walking aid user": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20A", "histograms": [{"histogram": {"Interchange of vaccine products": 1}, "batchcodes": ["030M20A", "RN6209"]}, {"histogram": {"Headache": 151, "Pyrexia": 142, "Pain in extremity": 118, "Chills": 114, "Fatigue": 110, "Myalgia": 95, "Vaccination site pain": 80, "Pain": 72, "Nausea": 67, "Pruritus": 57, "Vaccination site erythema": 55, "Arthralgia": 52, "Dizziness": 45, "Vaccination site pruritus": 38, "Erythema": 35, "Body temperature": 34, "Vaccination site swelling": 34, "Rash": 33, "Feeling abnormal": 32, "Asthenia": 30, "Malaise": 25, "Peripheral swelling": 25, "Vaccination site rash": 25, "Dyspnoea": 24, "Diarrhoea": 23, "Vaccination site warmth": 23, "Urticaria": 21, "Vomiting": 21, "SARS-CoV-2 test": 20, "Hyperhidrosis": 19, "Injection site pain": 19, "Cough": 18, "Decreased appetite": 18, "Swelling": 18, "Feeling hot": 17, "Injection site erythema": 17, "Blood pressure measurement": 16, "COVID-19": 16, "Influenza like illness": 16, "Vaccination complication": 16, "Insomnia": 14, "Tremor": 14, "Neck pain": 13, "Product dose omission issue": 13, "Vaccination site reaction": 13, "Abdominal discomfort": 12, "Back pain": 12, "Inappropriate schedule of product administration": 12, "Mobility decreased": 12, "Paraesthesia": 12, "Chest pain": 11, "Gait disturbance": 11, "Somnolence": 11, "Heart rate": 10, "Heart rate increased": 10, "Illness": 10, "Nasopharyngitis": 10, "Vaccination site induration": 10, "Chest discomfort": 9, "Hypoaesthesia": 9, "Muscle spasms": 9, "Burning sensation": 8, "Injection site pruritus": 8, "Injection site warmth": 8, "Limb discomfort": 8, "Lymphadenopathy": 8, "Nasal congestion": 8, "Oropharyngeal pain": 8, "Rash pruritic": 8, "Arthritis": 7, "Discomfort": 7, "Hypertension": 7, "Injection site swelling": 7, "Joint swelling": 7, "Loss of consciousness": 7, "Maternal exposure during pregnancy": 7, "Muscular weakness": 7, "Palpitations": 7, "Rash erythematous": 7, "Rhinorrhoea": 7, "Tenderness": 7, "Atrial fibrillation": 6, "Gait inability": 6, "Herpes zoster": 6, "Inflammation": 6, "Injection site rash": 6, "Skin discolouration": 6, "Dysstasia": 5, "Fall": 5, "Flushing": 5, "Musculoskeletal stiffness": 5, "Pollakiuria": 5, "Syncope": 5, "Abdominal pain upper": 4, "Adverse reaction": 4, "Blood pressure increased": 4, "Confusional state": 4, "Constipation": 4, "Contusion": 4, "Feeling cold": 4, "Full blood count": 4, "Hot flush": 4, "Hypersensitivity": 4, "Influenza": 4, "Migraine": 4, "Retching": 4, "Sinusitis": 4, "Tachycardia": 4, "Throat tightness": 4, "Tinnitus": 4, "Vaccination site urticaria": 4, "Vertigo": 4, "Alopecia": 3, "Amnesia": 3, "Antibody test": 3, "Blood test": 3, "Body temperature increased": 3, "Computerised tomogram": 3, "Device connection issue": 3, "Drug ineffective": 3, "Ear pruritus": 3, "Exposure during pregnancy": 3, "Eye pain": 3, "Eye swelling": 3, "Flatulence": 3, "Hypotension": 3, "Incorrect route of product administration": 3, "Lacrimation increased": 3, "Lethargy": 3, "Lip swelling": 3, "Myocardial infarction": 3, "Nightmare": 3, "Oral discomfort": 3, "Paraesthesia oral": 3, "Plantar fasciitis": 3, "Pregnancy test": 3, "Scratch": 3, "Skin mass": 3, "Suspected COVID-19": 3, "Swelling face": 3, "Toothache": 3, "Underdose": 3, "Vaccination site discolouration": 3, "Vaccination site mass": 3, "Vaccination site movement impairment": 3, "Ageusia": 2, "Agitation": 2, "Anaphylactic reaction": 2, "Anosmia": 2, "Anxiety": 2, "Atrial flutter": 2, "Axillary pain": 2, "Balance disorder": 2, "Bedridden": 2, "Blister": 2, "Blood glucose": 2, "Blood glucose decreased": 2, "Blood pressure decreased": 2, "Blood test normal": 2, "Blood thyroid stimulating hormone": 2, "Bone swelling": 2, "Carpal tunnel syndrome": 2, "Chest X-ray": 2, "Choking": 2, "Dehydration": 2, "Dry skin": 2, "Dysarthria": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Ear pain": 2, "Eczema": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Eructation": 2, "Expired product administered": 2, "Extra dose administered": 2, "Feeling of body temperature change": 2, "Hallucination": 2, "Hypersomnia": 2, "Hypoacusis": 2, "Hypokinesia": 2, "Incorrect dose administered": 2, "Interchange of vaccine products": 2, "Loss of personal independence in daily activities": 2, "Lymph node pain": 2, "Magnetic resonance imaging": 2, "Maternal exposure during breast feeding": 2, "Monoclonal B-cell lymphocytosis": 2, "Muscle discomfort": 2, "Nervousness": 2, "Neuralgia": 2, "Night sweats": 2, "Nodule": 2, "Ocular hyperaemia": 2, "Oropharyngeal discomfort": 2, "Pain in jaw": 2, "Papule": 2, "Photophobia": 2, "Pulmonary embolism": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 antibody test negative": 2, "Seasonal allergy": 2, "Seizure": 2, "Skin reaction": 2, "Skin swelling": 2, "Sleep disorder": 2, "Sneezing": 2, "Speech disorder": 2, "Taste disorder": 2, "Thrombosis": 2, "Type IV hypersensitivity reaction": 2, "Ultrasound foetal": 2, "Vaccination site bruising": 2, "Vaccination site inflammation": 2, "Vaccination site lymphadenopathy": 2, "Vision blurred": 2, "Visual impairment": 2, "X-ray": 2, "Abdominal pain": 1, "Abscess": 1, "Accident": 1, "Accidental exposure to product": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adverse drug reaction": 1, "Allergy to vaccine": 1, "Aphasia": 1, "Arthropathy": 1, "Asthenopia": 1, "Autoimmune disorder": 1, "Axillary mass": 1, "Bell's palsy": 1, "Blepharospasm": 1, "Blood count abnormal": 1, "Blood pressure diastolic": 1, "Blood pressure fluctuation": 1, "Blood pressure systolic": 1, "Blood testosterone": 1, "Blood thyroid stimulating hormone increased": 1, "Bone pain": 1, "Breast pain": 1, "Breast swelling": 1, "Breath sounds abnormal": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cardiac pacemaker insertion": 1, "Cerebrovascular accident": 1, "Chronic obstructive pulmonary disease": 1, "Cold sweat": 1, "Cold-stimulus headache": 1, "Computerised tomogram thorax": 1, "Condition aggravated": 1, "Cutaneous symptom": 1, "Cystitis": 1, "Daydreaming": 1, "Deafness": 1, "Deafness unilateral": 1, "Death": 1, "Decreased interest": 1, "Deep vein thrombosis": 1, "Deformity": 1, "Delirium": 1, "Depression": 1, "Diplopia": 1, "Disorientation": 1, "Dissociation": 1, "Diverticulum": 1, "Dreamy state": 1, "Dry mouth": 1, "Dysbiosis": 1, "Dysgraphia": 1, "Dysphagia": 1, "Dystonia": 1, "Ear discomfort": 1, "Ear swelling": 1, "Electric shock sensation": 1, "Electroencephalogram": 1, "Enlarged uvula": 1, "Ephelides": 1, "Eye haemorrhage": 1, "Eye inflammation": 1, "Eyelid ptosis": 1, "Facial pain": 1, "Facial paralysis": 1, "Facial paresis": 1, "Fear": 1, "Feeding disorder": 1, "Feeling jittery": 1, "Food allergy": 1, "Freezing phenomenon": 1, "Furuncle": 1, "Gastrooesophageal reflux disease": 1, "Genital herpes": 1, "Gestational diabetes": 1, "Glomerular filtration rate": 1, "Glucose tolerance test": 1, "Grief reaction": 1, "Group B streptococcus neonatal sepsis": 1, "Guillain-Barre syndrome": 1, "Haematuria": 1, "Haemoptysis": 1, "Hallucination, auditory": 1, "Head discomfort": 1, "Heart rate abnormal": 1, "Hyperaesthesia": 1, "Hyperpyrexia": 1, "Hyperthyroidism": 1, "Hypophagia": 1, "Immunodeficiency": 1, "Impaired work ability": 1, "Induration": 1, "Initial insomnia": 1, "Injected limb mobility decreased": 1, "Injection site hypersensitivity": 1, "Injection site induration": 1, "Injection site joint swelling": 1, "Injection site mass": 1, "Instillation site induration": 1, "Intentional product use issue": 1, "Intestinal ischaemia": 1, "Joint injury": 1, "Joint stiffness": 1, "Lagophthalmos": 1, "Lid sulcus deepened": 1, "Limb injury": 1, "Lip blister": 1, "Localised infection": 1, "Lymphadenitis": 1, "Mass": 1, "Mechanical urticaria": 1, "Menstrual disorder": 1, "Mental impairment": 1, "Mental status changes": 1, "Metabolic function test": 1, "Metamorphopsia": 1, "Monoplegia": 1, "Mood swings": 1, "Muscle tightness": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal discomfort": 1, "Myelitis transverse": 1, "Myocardial necrosis marker": 1, "Nasal discomfort": 1, "Near death experience": 1, "Nerve compression": 1, "Neurological symptom": 1, "No adverse event": 1, "Nuchal rigidity": 1, "Ocular discomfort": 1, "Oesophageal achalasia": 1, "Oesophageal spasm": 1, "Off label use": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Overdose": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal erythema": 1, "Pharyngeal swelling": 1, "Photopsia": 1, "Physical deconditioning": 1, "Plasma cell myeloma recurrent": 1, "Pleurisy": 1, "Pneumonia": 1, "Polyuria": 1, "Poor quality sleep": 1, "Pregnancy": 1, "Premature menopause": 1, "Prenatal screening test": 1, "Presyncope": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Purpura": 1, "Rash macular": 1, "Rash morbilliform": 1, "Rash papular": 1, "Rash pustular": 1, "Rash vesicular": 1, "Retinal haemorrhage": 1, "Retinal migraine": 1, "Rhinalgia": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 test negative": 1, "Salivary gland disorder": 1, "Salivary gland pain": 1, "Scab": 1, "Scan": 1, "Scar": 1, "Secretion discharge": 1, "Sensitive skin": 1, "Skin burning sensation": 1, "Skin irritation": 1, "Skin warm": 1, "Sleep inertia": 1, "Small intestinal obstruction": 1, "Somnambulism": 1, "Stiff tongue": 1, "Stress cardiomyopathy": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Tension headache": 1, "Thyroid function test": 1, "Tongue discomfort": 1, "Tongue disorder": 1, "Tongue pruritus": 1, "Tonic clonic movements": 1, "Transient global amnesia": 1, "Transient ischaemic attack": 1, "Transposition of the great vessels": 1, "Trigger finger": 1, "Tuberculin test": 1, "Ultrasound Doppler": 1, "Ultrasound abdomen": 1, "Ultrasound scan": 1, "Unevaluable event": 1, "Upper limb fracture": 1, "Urinary tract infection": 1, "Vaccination site haemorrhage": 1, "Vaccination site joint erythema": 1, "Vaccination site nerve damage": 1, "Vaccination site nodule": 1, "Vaccination site oedema": 1, "Vaccination site vesicles": 1, "Varicella": 1, "Vitreous floaters": 1, "Walking aid user": 1, "Weight decreased": 1, "Weight increased": 1, "White blood cell count": 1, "Wrong product administered": 1}, "batchcodes": ["030M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20A030M20A.json b/docs/data/histograms/United States/030M20A030M20A.json
index fd6cc76b41d..7a0d4e71d22 100644
--- a/docs/data/histograms/United States/030M20A030M20A.json
+++ b/docs/data/histograms/United States/030M20A030M20A.json
@@ -1 +1 @@
-{"batchcode": "030M20A030M20A", "histograms": [{"batchcodes": ["030M20A030M20A"], "histogram": {"Erythema": 1, "Fatigue": 1, "Lymph node pain": 1, "Pruritus": 1, "Skin reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20A030M20A", "histograms": [{"histogram": {"Erythema": 1, "Fatigue": 1, "Lymph node pain": 1, "Pruritus": 1, "Skin reaction": 1}, "batchcodes": ["030M20A030M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20K.json b/docs/data/histograms/United States/030M20K.json
index 416289014c1..cabf6efcb8a 100644
--- a/docs/data/histograms/United States/030M20K.json
+++ b/docs/data/histograms/United States/030M20K.json
@@ -1 +1 @@
-{"batchcode": "030M20K", "histograms": [{"batchcodes": ["030M20K"], "histogram": {"Asthenia": 1, "Dizziness": 1, "Dysphagia": 1, "Heart rate increased": 1, "Throat irritation": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20K", "histograms": [{"histogram": {"Asthenia": 1, "Dizziness": 1, "Dysphagia": 1, "Heart rate increased": 1, "Throat irritation": 1, "Vaccination site pain": 1}, "batchcodes": ["030M20K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M20N.json b/docs/data/histograms/United States/030M20N.json
index 48ded4f3134..87869ab4e94 100644
--- a/docs/data/histograms/United States/030M20N.json
+++ b/docs/data/histograms/United States/030M20N.json
@@ -1 +1 @@
-{"batchcode": "030M20N", "histograms": [{"batchcodes": ["030M20N"], "histogram": {"Chills": 1, "Heart rate increased": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "030M20N", "histograms": [{"histogram": {"Chills": 1, "Heart rate increased": 1, "Vaccination site pain": 1}, "batchcodes": ["030M20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M21A.json b/docs/data/histograms/United States/030M21A.json
index ec2aef2ba7c..43754f0693e 100644
--- a/docs/data/histograms/United States/030M21A.json
+++ b/docs/data/histograms/United States/030M21A.json
@@ -1 +1 @@
-{"batchcode": "030M21A", "histograms": [{"batchcodes": ["030M21A"], "histogram": {"Fatigue": 2, "Asthenia": 1, "Erythema": 1, "Illness": 1, "Influenza like illness": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Therapeutic response unexpected": 1}}]}
\ No newline at end of file
+{"batchcode": "030M21A", "histograms": [{"histogram": {"Fatigue": 2, "Asthenia": 1, "Erythema": 1, "Illness": 1, "Influenza like illness": 1, "Nausea": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Therapeutic response unexpected": 1}, "batchcodes": ["030M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M26A.json b/docs/data/histograms/United States/030M26A.json
index 37f6a7d6e11..4406334fc21 100644
--- a/docs/data/histograms/United States/030M26A.json
+++ b/docs/data/histograms/United States/030M26A.json
@@ -1 +1 @@
-{"batchcode": "030M26A", "histograms": [{"batchcodes": ["030M26A"], "histogram": {"Fatigue": 1, "Heavy menstrual bleeding": 1}}]}
\ No newline at end of file
+{"batchcode": "030M26A", "histograms": [{"histogram": {"Fatigue": 1, "Heavy menstrual bleeding": 1}, "batchcodes": ["030M26A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M29A.json b/docs/data/histograms/United States/030M29A.json
index cb058255d66..540dd42db71 100644
--- a/docs/data/histograms/United States/030M29A.json
+++ b/docs/data/histograms/United States/030M29A.json
@@ -1 +1 @@
-{"batchcode": "030M29A", "histograms": [{"batchcodes": ["030M29A"], "histogram": {"Chills": 1, "Erythema": 1, "Feeling hot": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Swelling face": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "030M29A", "histograms": [{"histogram": {"Chills": 1, "Erythema": 1, "Feeling hot": 1, "Myalgia": 1, "Pain": 1, "Pruritus": 1, "Pyrexia": 1, "Swelling face": 1, "Vaccination site reaction": 1}, "batchcodes": ["030M29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M2A.json b/docs/data/histograms/United States/030M2A.json
index cb55253017a..4985254f7ba 100644
--- a/docs/data/histograms/United States/030M2A.json
+++ b/docs/data/histograms/United States/030M2A.json
@@ -1 +1 @@
-{"batchcode": "030M2A", "histograms": [{"batchcodes": ["030M2A"], "histogram": {"Extra dose administered": 1, "Pain in extremity": 1, "Parosmia": 1, "Taste disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "030M2A", "histograms": [{"histogram": {"Extra dose administered": 1, "Pain in extremity": 1, "Parosmia": 1, "Taste disorder": 1}, "batchcodes": ["030M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M2DA.json b/docs/data/histograms/United States/030M2DA.json
index 5b1c79a4464..12b5e9d6ead 100644
--- a/docs/data/histograms/United States/030M2DA.json
+++ b/docs/data/histograms/United States/030M2DA.json
@@ -1 +1 @@
-{"batchcode": "030M2DA", "histograms": [{"batchcodes": ["030M2DA"], "histogram": {"Vaccination site pain": 2, "Asthenia": 1, "Chills": 1, "Dizziness": 1, "Haemoptysis": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Limb discomfort": 1, "Musculoskeletal discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Pruritus": 1, "Vaccination site discolouration": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "030M2DA", "histograms": [{"histogram": {"Vaccination site pain": 2, "Asthenia": 1, "Chills": 1, "Dizziness": 1, "Haemoptysis": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "Insomnia": 1, "Limb discomfort": 1, "Musculoskeletal discomfort": 1, "Pain": 1, "Pain in extremity": 1, "Product dose omission issue": 1, "Pruritus": 1, "Vaccination site discolouration": 1, "Vaccination site rash": 1}, "batchcodes": ["030M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M2OA.json b/docs/data/histograms/United States/030M2OA.json
index 19d35666293..416d5b83071 100644
--- a/docs/data/histograms/United States/030M2OA.json
+++ b/docs/data/histograms/United States/030M2OA.json
@@ -1 +1 @@
-{"batchcode": "030M2OA", "histograms": [{"batchcodes": ["0132LOA", "030M2OA"], "histogram": {"Chills": 2, "Erythema": 2, "Headache": 2, "Injection site induration": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2}}, {"batchcodes": ["030M2OA"], "histogram": {"Back pain": 1, "Chills": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Rash": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "030M2OA", "histograms": [{"histogram": {"Chills": 2, "Erythema": 2, "Headache": 2, "Injection site induration": 2, "Myalgia": 2, "Pain": 2, "Pyrexia": 2}, "batchcodes": ["0132LOA", "030M2OA"]}, {"histogram": {"Back pain": 1, "Chills": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Rash": 1, "Swelling": 1}, "batchcodes": ["030M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030M30A.json b/docs/data/histograms/United States/030M30A.json
index e4fc1e57853..926eb596af3 100644
--- a/docs/data/histograms/United States/030M30A.json
+++ b/docs/data/histograms/United States/030M30A.json
@@ -1 +1 @@
-{"batchcode": "030M30A", "histograms": [{"batchcodes": ["030M30A"], "histogram": {"Accidental overdose": 1}}]}
\ No newline at end of file
+{"batchcode": "030M30A", "histograms": [{"histogram": {"Accidental overdose": 1}, "batchcodes": ["030M30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030MDA.json b/docs/data/histograms/United States/030MDA.json
index 9686f64a6a7..285b448eda4 100644
--- a/docs/data/histograms/United States/030MDA.json
+++ b/docs/data/histograms/United States/030MDA.json
@@ -1 +1 @@
-{"batchcode": "030MDA", "histograms": [{"batchcodes": ["030MDA"], "histogram": {"Adverse event": 1, "Dyspnoea": 1, "Post viral fatigue syndrome": 1, "SARS-CoV-2 test": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "030MDA", "histograms": [{"histogram": {"Adverse event": 1, "Dyspnoea": 1, "Post viral fatigue syndrome": 1, "SARS-CoV-2 test": 1, "X-ray": 1}, "batchcodes": ["030MDA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030MEXA.json b/docs/data/histograms/United States/030MEXA.json
index 9c3cc3e637d..9442f6d0d2e 100644
--- a/docs/data/histograms/United States/030MEXA.json
+++ b/docs/data/histograms/United States/030MEXA.json
@@ -1 +1 @@
-{"batchcode": "030MEXA", "histograms": [{"batchcodes": ["030MEXA"], "histogram": {"Arthralgia": 1, "Decreased appetite": 1, "Mass": 1, "Nausea": 1, "Rash macular": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "030MEXA", "histograms": [{"histogram": {"Arthralgia": 1, "Decreased appetite": 1, "Mass": 1, "Nausea": 1, "Rash macular": 1, "Vomiting": 1}, "batchcodes": ["030MEXA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030MZ0A.json b/docs/data/histograms/United States/030MZ0A.json
index 1cbeba4bcbf..925ec84606e 100644
--- a/docs/data/histograms/United States/030MZ0A.json
+++ b/docs/data/histograms/United States/030MZ0A.json
@@ -1 +1 @@
-{"batchcode": "030MZ0A", "histograms": [{"batchcodes": ["030MZ0A"], "histogram": {"Fatigue": 3, "Dizziness": 2, "Hyperhidrosis": 2, "Vaccination site pain": 2, "Bedridden": 1, "Chest X-ray": 1, "Chest pain": 1, "Colitis": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Ear pain": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "General physical condition abnormal": 1, "Headache": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertension": 1, "Influenza like illness": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pollakiuria": 1, "Presyncope": 1, "Rash": 1, "Rectal haemorrhage": 1, "Respiration abnormal": 1, "Swallow study": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Viral test": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "030MZ0A", "histograms": [{"histogram": {"Fatigue": 3, "Dizziness": 2, "Hyperhidrosis": 2, "Vaccination site pain": 2, "Bedridden": 1, "Chest X-ray": 1, "Chest pain": 1, "Colitis": 1, "Cough": 1, "Diarrhoea": 1, "Dyspnoea": 1, "Ear pain": 1, "Facial paralysis": 1, "Feeling abnormal": 1, "General physical condition abnormal": 1, "Headache": 1, "Herpes zoster": 1, "Hypersensitivity": 1, "Hypertension": 1, "Influenza like illness": 1, "Malaise": 1, "Oropharyngeal pain": 1, "Pain": 1, "Pain in extremity": 1, "Palpitations": 1, "Peripheral swelling": 1, "Pollakiuria": 1, "Presyncope": 1, "Rash": 1, "Rectal haemorrhage": 1, "Respiration abnormal": 1, "Swallow study": 1, "Swelling": 1, "Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1, "Viral test": 1, "Vomiting": 1}, "batchcodes": ["030MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030MZ0ALLD07312.json b/docs/data/histograms/United States/030MZ0ALLD07312.json
index 5258d332833..bfcd8cb1fa9 100644
--- a/docs/data/histograms/United States/030MZ0ALLD07312.json
+++ b/docs/data/histograms/United States/030MZ0ALLD07312.json
@@ -1 +1 @@
-{"batchcode": "030MZ0ALLD07312", "histograms": [{"batchcodes": ["030MZ0ALLD07312"], "histogram": {"Vaccination site pain": 2, "Body temperature": 1, "Body temperature increased": 1, "Headache": 1, "Lip dry": 1, "Paraesthesia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "030MZ0ALLD07312", "histograms": [{"histogram": {"Vaccination site pain": 2, "Body temperature": 1, "Body temperature increased": 1, "Headache": 1, "Lip dry": 1, "Paraesthesia": 1, "Pyrexia": 1}, "batchcodes": ["030MZ0ALLD07312"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030MZOA.json b/docs/data/histograms/United States/030MZOA.json
index 4aa94b948b9..20863477752 100644
--- a/docs/data/histograms/United States/030MZOA.json
+++ b/docs/data/histograms/United States/030MZOA.json
@@ -1 +1 @@
-{"batchcode": "030MZOA", "histograms": [{"batchcodes": ["030MZOA"], "histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Dysgeusia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersensitivity": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "030MZOA", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Dysgeusia": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Hypersensitivity": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Pyrexia": 1, "Sleep disorder": 1}, "batchcodes": ["030MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030N20A.json b/docs/data/histograms/United States/030N20A.json
index d297acfb52d..5b16a194c70 100644
--- a/docs/data/histograms/United States/030N20A.json
+++ b/docs/data/histograms/United States/030N20A.json
@@ -1 +1 @@
-{"batchcode": "030N20A", "histograms": [{"batchcodes": ["030N20A"], "histogram": {"Paraesthesia oral": 1}}]}
\ No newline at end of file
+{"batchcode": "030N20A", "histograms": [{"histogram": {"Paraesthesia oral": 1}, "batchcodes": ["030N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030NDEA.json b/docs/data/histograms/United States/030NDEA.json
index 948a69597eb..74f4d6c9d2c 100644
--- a/docs/data/histograms/United States/030NDEA.json
+++ b/docs/data/histograms/United States/030NDEA.json
@@ -1 +1 @@
-{"batchcode": "030NDEA", "histograms": [{"batchcodes": ["030NDEA"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Lacrimation increased": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Sneezing": 1}}]}
\ No newline at end of file
+{"batchcode": "030NDEA", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Feeling cold": 1, "Feeling hot": 1, "Headache": 1, "Hyperhidrosis": 1, "Lacrimation increased": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Poor quality sleep": 1, "Sneezing": 1}, "batchcodes": ["030NDEA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030NE0A.json b/docs/data/histograms/United States/030NE0A.json
index 15a2a3fa84c..e2af7e50a4f 100644
--- a/docs/data/histograms/United States/030NE0A.json
+++ b/docs/data/histograms/United States/030NE0A.json
@@ -1 +1 @@
-{"batchcode": "030NE0A", "histograms": [{"batchcodes": ["030NE0A"], "histogram": {"Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "030NE0A", "histograms": [{"histogram": {"Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["030NE0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030O20A.json b/docs/data/histograms/United States/030O20A.json
index b8e25860ed2..b322329e319 100644
--- a/docs/data/histograms/United States/030O20A.json
+++ b/docs/data/histograms/United States/030O20A.json
@@ -1 +1 @@
-{"batchcode": "030O20A", "histograms": [{"batchcodes": ["030O20A"], "histogram": {"Asthenia": 1, "Muscle spasms": 1, "Platelet count": 1, "Thrombocytopenia": 1}}]}
\ No newline at end of file
+{"batchcode": "030O20A", "histograms": [{"histogram": {"Asthenia": 1, "Muscle spasms": 1, "Platelet count": 1, "Thrombocytopenia": 1}, "batchcodes": ["030O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030R20A.json b/docs/data/histograms/United States/030R20A.json
index 4adf92c3334..09878580124 100644
--- a/docs/data/histograms/United States/030R20A.json
+++ b/docs/data/histograms/United States/030R20A.json
@@ -1 +1 @@
-{"batchcode": "030R20A", "histograms": [{"batchcodes": ["030R20A"], "histogram": {"Blood glucose increased": 1, "Decreased appetite": 1, "Hypoaesthesia": 1, "Irritability": 1, "Migraine": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Skin discolouration": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "030R20A", "histograms": [{"histogram": {"Blood glucose increased": 1, "Decreased appetite": 1, "Hypoaesthesia": 1, "Irritability": 1, "Migraine": 1, "Pain in extremity": 1, "Palpitations": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Skin discolouration": 1, "Vaccination site erythema": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["030R20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/030W20A.json b/docs/data/histograms/United States/030W20A.json
index 15968e488a9..3929677ade0 100644
--- a/docs/data/histograms/United States/030W20A.json
+++ b/docs/data/histograms/United States/030W20A.json
@@ -1 +1 @@
-{"batchcode": "030W20A", "histograms": [{"batchcodes": ["030W20A"], "histogram": {"Pruritus": 1, "Skin swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "030W20A", "histograms": [{"histogram": {"Pruritus": 1, "Skin swelling": 1}, "batchcodes": ["030W20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031-A21A.json b/docs/data/histograms/United States/031-A21A.json
index e7c32cde839..befd2bfdd48 100644
--- a/docs/data/histograms/United States/031-A21A.json
+++ b/docs/data/histograms/United States/031-A21A.json
@@ -1 +1 @@
-{"batchcode": "031-A21A", "histograms": [{"batchcodes": ["031-A21A"], "histogram": {"Erythema": 1, "Feeling abnormal": 1, "Pain": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "031-A21A", "histograms": [{"histogram": {"Erythema": 1, "Feeling abnormal": 1, "Pain": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["031-A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031-A2419.json b/docs/data/histograms/United States/031-A2419.json
index 0f96e670fb9..4c68a0fc431 100644
--- a/docs/data/histograms/United States/031-A2419.json
+++ b/docs/data/histograms/United States/031-A2419.json
@@ -1 +1 @@
-{"batchcode": "031-A2419", "histograms": [{"batchcodes": ["031-A2419"], "histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Listless": 1, "Nasopharyngitis": 1, "Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031-A2419", "histograms": [{"histogram": {"Fatigue": 1, "Feeling abnormal": 1, "Listless": 1, "Nasopharyngitis": 1, "Pain": 1}, "batchcodes": ["031-A2419"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031.20A.json b/docs/data/histograms/United States/031.20A.json
index a58ef70ee5b..93554970bf4 100644
--- a/docs/data/histograms/United States/031.20A.json
+++ b/docs/data/histograms/United States/031.20A.json
@@ -1 +1 @@
-{"batchcode": "031.20A", "histograms": [{"batchcodes": ["031.20A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031.20A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Diarrhoea": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Vomiting": 1}, "batchcodes": ["031.20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031/20A.json b/docs/data/histograms/United States/031/20A.json
index 6bbc4b00092..7f4fe99f96f 100644
--- a/docs/data/histograms/United States/031/20A.json
+++ b/docs/data/histograms/United States/031/20A.json
@@ -1 +1 @@
-{"batchcode": "031/20A", "histograms": [{"batchcodes": ["031/20A"], "histogram": {"Headache": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031/20A", "histograms": [{"histogram": {"Headache": 1, "Neck pain": 1}, "batchcodes": ["031/20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0310411952.json b/docs/data/histograms/United States/0310411952.json
index 21bb542fa9d..de132613a67 100644
--- a/docs/data/histograms/United States/0310411952.json
+++ b/docs/data/histograms/United States/0310411952.json
@@ -1 +1 @@
-{"batchcode": "0310411952", "histograms": [{"batchcodes": ["0310411952"], "histogram": {"Chills": 1, "Heart rate increased": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0310411952", "histograms": [{"histogram": {"Chills": 1, "Heart rate increased": 1, "Pain in extremity": 1}, "batchcodes": ["0310411952"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0311.20A.json b/docs/data/histograms/United States/0311.20A.json
index c566788f872..67b80b557c3 100644
--- a/docs/data/histograms/United States/0311.20A.json
+++ b/docs/data/histograms/United States/0311.20A.json
@@ -1 +1 @@
-{"batchcode": "0311.20A", "histograms": [{"batchcodes": ["0311.20A"], "histogram": {"Dizziness": 1, "Headache": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "0311.20A", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1, "Palpitations": 1}, "batchcodes": ["0311.20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031120A.json b/docs/data/histograms/United States/031120A.json
index f6ad6858c96..848608c13d3 100644
--- a/docs/data/histograms/United States/031120A.json
+++ b/docs/data/histograms/United States/031120A.json
@@ -1 +1 @@
-{"batchcode": "031120A", "histograms": [{"batchcodes": ["031120A"], "histogram": {"Pain in extremity": 5, "Pyrexia": 4, "Myalgia": 3, "Pain": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Body temperature": 2, "Chills": 2, "Decreased appetite": 2, "Erythema": 2, "Fatigue": 2, "Headache": 2, "Vaccination site erythema": 2, "Asthenia": 1, "Asthma": 1, "Atrial fibrillation": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Diarrhoea": 1, "Diplegia": 1, "Dizziness": 1, "Eye pruritus": 1, "Feeling hot": 1, "Flushing": 1, "Groin pain": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mass excision": 1, "Nausea": 1, "Pallor": 1, "Pruritus": 1, "Pulmonary artery thrombosis": 1, "Skin swelling": 1, "Swelling face": 1, "Tenderness": 1, "Thrombophlebitis superficial": 1, "Tooth infection": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031120A", "histograms": [{"histogram": {"Pain in extremity": 5, "Pyrexia": 4, "Myalgia": 3, "Pain": 3, "Vaccination site pain": 3, "Arthralgia": 2, "Body temperature": 2, "Chills": 2, "Decreased appetite": 2, "Erythema": 2, "Fatigue": 2, "Headache": 2, "Vaccination site erythema": 2, "Asthenia": 1, "Asthma": 1, "Atrial fibrillation": 1, "Cardiac stress test": 1, "Chest discomfort": 1, "Computerised tomogram thorax": 1, "Cough": 1, "Diarrhoea": 1, "Diplegia": 1, "Dizziness": 1, "Eye pruritus": 1, "Feeling hot": 1, "Flushing": 1, "Groin pain": 1, "Illness": 1, "Inappropriate schedule of product administration": 1, "Injection site pain": 1, "Lacrimation increased": 1, "Lymphadenopathy": 1, "Malaise": 1, "Mass excision": 1, "Nausea": 1, "Pallor": 1, "Pruritus": 1, "Pulmonary artery thrombosis": 1, "Skin swelling": 1, "Swelling face": 1, "Tenderness": 1, "Thrombophlebitis superficial": 1, "Tooth infection": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["031120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0311321A.json b/docs/data/histograms/United States/0311321A.json
index 34bc2a27b64..db8c568584c 100644
--- a/docs/data/histograms/United States/0311321A.json
+++ b/docs/data/histograms/United States/0311321A.json
@@ -1 +1 @@
-{"batchcode": "0311321A", "histograms": [{"batchcodes": ["0311321A"], "histogram": {"Biopsy": 1, "Extranodal marginal zone B-cell lymphoma (MALT type)": 1, "Mammogram": 1, "Pain in extremity": 1, "Positron emission tomogram": 1}}]}
\ No newline at end of file
+{"batchcode": "0311321A", "histograms": [{"histogram": {"Biopsy": 1, "Extranodal marginal zone B-cell lymphoma (MALT type)": 1, "Mammogram": 1, "Pain in extremity": 1, "Positron emission tomogram": 1}, "batchcodes": ["0311321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03114211A.json b/docs/data/histograms/United States/03114211A.json
index 69a16e2a6aa..236905bfe81 100644
--- a/docs/data/histograms/United States/03114211A.json
+++ b/docs/data/histograms/United States/03114211A.json
@@ -1 +1 @@
-{"batchcode": "03114211A", "histograms": [{"batchcodes": ["03114211A"], "histogram": {"Allergy to vaccine": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Myalgia": 1, "Pain": 1, "Pulse abnormal": 1, "Seizure": 1, "Swelling": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "03114211A", "histograms": [{"histogram": {"Allergy to vaccine": 1, "Blood pressure decreased": 1, "Blood pressure measurement": 1, "Chest pain": 1, "Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Myalgia": 1, "Pain": 1, "Pulse abnormal": 1, "Seizure": 1, "Swelling": 1, "Tremor": 1}, "batchcodes": ["03114211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0311720A.json b/docs/data/histograms/United States/0311720A.json
index e10bd474b42..d2621b3bed8 100644
--- a/docs/data/histograms/United States/0311720A.json
+++ b/docs/data/histograms/United States/0311720A.json
@@ -1 +1 @@
-{"batchcode": "0311720A", "histograms": [{"batchcodes": ["0311720A"], "histogram": {"Body temperature": 1, "COVID-19": 1, "Cough": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Illness": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "0311720A", "histograms": [{"histogram": {"Body temperature": 1, "COVID-19": 1, "Cough": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Illness": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["0311720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0311T21A.json b/docs/data/histograms/United States/0311T21A.json
index 65e178ec437..7a3c176862f 100644
--- a/docs/data/histograms/United States/0311T21A.json
+++ b/docs/data/histograms/United States/0311T21A.json
@@ -1 +1 @@
-{"batchcode": "0311T21A", "histograms": [{"batchcodes": ["0311T21A"], "histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Hypersomnia": 1, "Pain": 1, "Parosmia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Taste disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "0311T21A", "histograms": [{"histogram": {"Arthralgia": 1, "Body temperature": 1, "Chills": 1, "Hypersomnia": 1, "Pain": 1, "Parosmia": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1, "Taste disorder": 1}, "batchcodes": ["0311T21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03120A.json b/docs/data/histograms/United States/03120A.json
index 8da05dc1ac4..f7e3fd34155 100644
--- a/docs/data/histograms/United States/03120A.json
+++ b/docs/data/histograms/United States/03120A.json
@@ -1 +1 @@
-{"batchcode": "03120A", "histograms": [{"batchcodes": ["03120A"], "histogram": {"Echocardiogram": 1, "Fatigue": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "03120A", "histograms": [{"histogram": {"Echocardiogram": 1, "Fatigue": 1, "Vaccination site rash": 1}, "batchcodes": ["03120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031220A.json b/docs/data/histograms/United States/031220A.json
index 7e070ba9183..4344194a047 100644
--- a/docs/data/histograms/United States/031220A.json
+++ b/docs/data/histograms/United States/031220A.json
@@ -1 +1 @@
-{"batchcode": "031220A", "histograms": [{"batchcodes": ["031220A"], "histogram": {"Fatigue": 2, "Chills": 1, "Dizziness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Muscle tightness": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "031220A", "histograms": [{"histogram": {"Fatigue": 2, "Chills": 1, "Dizziness": 1, "Injection site erythema": 1, "Injection site pain": 1, "Lymphadenopathy": 1, "Muscle tightness": 1, "Nausea": 1, "Pain in extremity": 1, "Pruritus": 1, "Pyrexia": 1, "Rash": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["031220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0312H.json b/docs/data/histograms/United States/0312H.json
index 1e339518980..869995d10e7 100644
--- a/docs/data/histograms/United States/0312H.json
+++ b/docs/data/histograms/United States/0312H.json
@@ -1 +1 @@
-{"batchcode": "0312H", "histograms": [{"batchcodes": ["0312H"], "histogram": {"Headache": 1, "Lymphadenopathy": 1}}]}
\ No newline at end of file
+{"batchcode": "0312H", "histograms": [{"histogram": {"Headache": 1, "Lymphadenopathy": 1}, "batchcodes": ["0312H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031321A.json b/docs/data/histograms/United States/031321A.json
index 91be0aff0ff..59b2fec7b27 100644
--- a/docs/data/histograms/United States/031321A.json
+++ b/docs/data/histograms/United States/031321A.json
@@ -1 +1 @@
-{"batchcode": "031321A", "histograms": [{"batchcodes": ["031321A"], "histogram": {"Headache": 2, "Abdominal pain upper": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Eating disorder": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Insomnia": 1, "Mobility decreased": 1, "Nausea": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "031321A", "histograms": [{"histogram": {"Headache": 2, "Abdominal pain upper": 1, "Body temperature": 1, "Chills": 1, "Dizziness": 1, "Eating disorder": 1, "Fall": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate increased": 1, "Insomnia": 1, "Mobility decreased": 1, "Nausea": 1, "Pyrexia": 1, "Tremor": 1, "Vaccination complication": 1}, "batchcodes": ["031321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0313B1A.json b/docs/data/histograms/United States/0313B1A.json
index 27fc22141e2..1e44c6740bc 100644
--- a/docs/data/histograms/United States/0313B1A.json
+++ b/docs/data/histograms/United States/0313B1A.json
@@ -1 +1 @@
-{"batchcode": "0313B1A", "histograms": [{"batchcodes": ["0313B1A"], "histogram": {"Tachycardia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0313B1A", "histograms": [{"histogram": {"Tachycardia": 1, "Vaccination site pain": 1}, "batchcodes": ["0313B1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031420A.json b/docs/data/histograms/United States/031420A.json
index 01d314c1762..609a61f0753 100644
--- a/docs/data/histograms/United States/031420A.json
+++ b/docs/data/histograms/United States/031420A.json
@@ -1 +1 @@
-{"batchcode": "031420A", "histograms": [{"batchcodes": ["031420A"], "histogram": {"Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Injection site reaction": 1, "Vaccination site induration": 1}}]}
\ No newline at end of file
+{"batchcode": "031420A", "histograms": [{"histogram": {"Vaccination site erythema": 2, "Vaccination site pruritus": 2, "Injection site reaction": 1, "Vaccination site induration": 1}, "batchcodes": ["031420A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031421A.json b/docs/data/histograms/United States/031421A.json
index e4f7bd658e9..891ab70cb89 100644
--- a/docs/data/histograms/United States/031421A.json
+++ b/docs/data/histograms/United States/031421A.json
@@ -1 +1 @@
-{"batchcode": "031421A", "histograms": [{"batchcodes": ["031421A"], "histogram": {"Chills": 1, "Headache": 1, "Influenza": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031421A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Influenza": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Vomiting": 1}, "batchcodes": ["031421A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03142A.json b/docs/data/histograms/United States/03142A.json
index 9a19f0a556f..db19a29b22e 100644
--- a/docs/data/histograms/United States/03142A.json
+++ b/docs/data/histograms/United States/03142A.json
@@ -1 +1 @@
-{"batchcode": "03142A", "histograms": [{"batchcodes": ["03142A"], "histogram": {"Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "03142A", "histograms": [{"histogram": {"Pruritus": 1, "Urticaria": 1}, "batchcodes": ["03142A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031521.json b/docs/data/histograms/United States/031521.json
index e439161cc60..ae7bce5b7a5 100644
--- a/docs/data/histograms/United States/031521.json
+++ b/docs/data/histograms/United States/031521.json
@@ -1 +1 @@
-{"batchcode": "031521", "histograms": [{"batchcodes": ["031521"], "histogram": {"Limb discomfort": 1, "Nausea": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031521", "histograms": [{"histogram": {"Limb discomfort": 1, "Nausea": 1, "Pain in extremity": 1}, "batchcodes": ["031521"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031521A.json b/docs/data/histograms/United States/031521A.json
index deee762475f..f8df6301d47 100644
--- a/docs/data/histograms/United States/031521A.json
+++ b/docs/data/histograms/United States/031521A.json
@@ -1 +1 @@
-{"batchcode": "031521A", "histograms": [{"batchcodes": ["031521A"], "histogram": {"Chills": 1, "Hyperhidrosis": 1, "Illness": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "031521A", "histograms": [{"histogram": {"Chills": 1, "Hyperhidrosis": 1, "Illness": 1, "Nausea": 1, "Pain in extremity": 1, "Vaccination complication": 1}, "batchcodes": ["031521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0315M20A.json b/docs/data/histograms/United States/0315M20A.json
index eb09d913085..4ee6f8338d8 100644
--- a/docs/data/histograms/United States/0315M20A.json
+++ b/docs/data/histograms/United States/0315M20A.json
@@ -1 +1 @@
-{"batchcode": "0315M20A", "histograms": [{"batchcodes": ["0315M20A"], "histogram": {"Headache": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "0315M20A", "histograms": [{"histogram": {"Headache": 1, "Myalgia": 1}, "batchcodes": ["0315M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0316(ORL)20A.json b/docs/data/histograms/United States/0316(ORL)20A.json
index edc694b0f0b..84ff5ddf2f8 100644
--- a/docs/data/histograms/United States/0316(ORL)20A.json
+++ b/docs/data/histograms/United States/0316(ORL)20A.json
@@ -1 +1 @@
-{"batchcode": "0316(ORL)20A", "histograms": [{"batchcodes": ["0316(ORL)20A"], "histogram": {"Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0316(ORL)20A", "histograms": [{"histogram": {"Pruritus": 1, "Rash": 1}, "batchcodes": ["0316(ORL)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0316201A.json b/docs/data/histograms/United States/0316201A.json
index 8fee0810ffa..04e224caec8 100644
--- a/docs/data/histograms/United States/0316201A.json
+++ b/docs/data/histograms/United States/0316201A.json
@@ -1 +1 @@
-{"batchcode": "0316201A", "histograms": [{"batchcodes": ["0316201A"], "histogram": {"Chills": 1, "Cough": 1, "Depression": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "0316201A", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Depression": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["0316201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0316204.json b/docs/data/histograms/United States/0316204.json
index 1265640992e..f6756c0710c 100644
--- a/docs/data/histograms/United States/0316204.json
+++ b/docs/data/histograms/United States/0316204.json
@@ -1 +1 @@
-{"batchcode": "0316204", "histograms": [{"batchcodes": ["0316204"], "histogram": {"Headache": 2, "Migraine": 2, "Acoustic stimulation tests": 1, "Blood test": 1, "Computerised tomogram": 1, "Concussion": 1, "Decreased activity": 1, "Dizziness": 1, "Feeling abnormal": 1, "Feeling drunk": 1, "Head discomfort": 1, "Impaired work ability": 1, "Magnetic resonance imaging": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pain in extremity": 1, "Tinnitus": 1, "Vestibular neuronitis": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "0316204", "histograms": [{"histogram": {"Headache": 2, "Migraine": 2, "Acoustic stimulation tests": 1, "Blood test": 1, "Computerised tomogram": 1, "Concussion": 1, "Decreased activity": 1, "Dizziness": 1, "Feeling abnormal": 1, "Feeling drunk": 1, "Head discomfort": 1, "Impaired work ability": 1, "Magnetic resonance imaging": 1, "Musculoskeletal stiffness": 1, "Nausea": 1, "Pain in extremity": 1, "Tinnitus": 1, "Vestibular neuronitis": 1, "Vomiting": 1}, "batchcodes": ["0316204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031620A.json b/docs/data/histograms/United States/031620A.json
index f619216f4df..63c3745b75a 100644
--- a/docs/data/histograms/United States/031620A.json
+++ b/docs/data/histograms/United States/031620A.json
@@ -1 +1 @@
-{"batchcode": "031620A", "histograms": [{"batchcodes": ["031620A"], "histogram": {"Influenza like illness": 3, "Ascites": 2, "Chills": 2, "Confusional state": 2, "Contusion": 2, "Disorientation": 2, "Dizziness": 2, "Headache": 2, "Myalgia": 2, "Pain": 2, "Arthralgia": 1, "Balance disorder": 1, "Blindness": 1, "Blood pressure abnormal": 1, "Blood test": 1, "Burning sensation": 1, "Cellulitis": 1, "Cognitive disorder": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Flushing": 1, "Haemorrhage": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypokinesia": 1, "Influenza virus test": 1, "Injection site swelling": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mastectomy": 1, "Muscle atrophy": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Oedema peripheral": 1, "Oxygen saturation abnormal": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pyrexia": 1, "Renal impairment": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Skin striae": 1, "Streptococcus test": 1, "Throat tightness": 1, "Tinnitus": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Vomiting": 1, "Weight increased": 1}}]}
\ No newline at end of file
+{"batchcode": "031620A", "histograms": [{"histogram": {"Influenza like illness": 3, "Ascites": 2, "Chills": 2, "Confusional state": 2, "Contusion": 2, "Disorientation": 2, "Dizziness": 2, "Headache": 2, "Myalgia": 2, "Pain": 2, "Arthralgia": 1, "Balance disorder": 1, "Blindness": 1, "Blood pressure abnormal": 1, "Blood test": 1, "Burning sensation": 1, "Cellulitis": 1, "Cognitive disorder": 1, "Computerised tomogram": 1, "Cough": 1, "Decreased appetite": 1, "Dyspnoea": 1, "Echocardiogram": 1, "Electrocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling cold": 1, "Flushing": 1, "Haemorrhage": 1, "Herpes zoster": 1, "Hypertension": 1, "Hypokinesia": 1, "Influenza virus test": 1, "Injection site swelling": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Mastectomy": 1, "Muscle atrophy": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Oedema peripheral": 1, "Oxygen saturation abnormal": 1, "Pain in extremity": 1, "Paraesthesia": 1, "Product dose omission issue": 1, "Pruritus": 1, "Pyrexia": 1, "Renal impairment": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Skin striae": 1, "Streptococcus test": 1, "Throat tightness": 1, "Tinnitus": 1, "Vaccination site discolouration": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Vaccination site warmth": 1, "Vomiting": 1, "Weight increased": 1}, "batchcodes": ["031620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031660A.json b/docs/data/histograms/United States/031660A.json
index 558faca907b..fe2230ade36 100644
--- a/docs/data/histograms/United States/031660A.json
+++ b/docs/data/histograms/United States/031660A.json
@@ -1 +1 @@
-{"batchcode": "031660A", "histograms": [{"batchcodes": ["031660A"], "histogram": {"Dyspnoea": 1, "Pulmonary embolism": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "031660A", "histograms": [{"histogram": {"Dyspnoea": 1, "Pulmonary embolism": 1, "Wheezing": 1}, "batchcodes": ["031660A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0316Z0A.json b/docs/data/histograms/United States/0316Z0A.json
index 9df349811e3..622e313bbbc 100644
--- a/docs/data/histograms/United States/0316Z0A.json
+++ b/docs/data/histograms/United States/0316Z0A.json
@@ -1 +1 @@
-{"batchcode": "0316Z0A", "histograms": [{"batchcodes": ["0316Z0A"], "histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination complication": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0316Z0A", "histograms": [{"histogram": {"Asthenia": 1, "Chills": 1, "Dizziness": 1, "Incorrect route of product administration": 1, "Influenza like illness": 1, "Myalgia": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination complication": 1, "Vaccination site pain": 1}, "batchcodes": ["0316Z0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031720A.json b/docs/data/histograms/United States/031720A.json
index 920291b87c7..40831891283 100644
--- a/docs/data/histograms/United States/031720A.json
+++ b/docs/data/histograms/United States/031720A.json
@@ -1 +1 @@
-{"batchcode": "031720A", "histograms": [{"batchcodes": ["031720A"], "histogram": {"Erythema": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "031720A", "histograms": [{"histogram": {"Erythema": 1, "Headache": 1}, "batchcodes": ["031720A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031721A.json b/docs/data/histograms/United States/031721A.json
index ced6c23f05b..37e2a5e0ad2 100644
--- a/docs/data/histograms/United States/031721A.json
+++ b/docs/data/histograms/United States/031721A.json
@@ -1 +1 @@
-{"batchcode": "031721A", "histograms": [{"batchcodes": ["031721A"], "histogram": {"Headache": 2, "Pain": 2, "Device use confusion": 1, "Temperature intolerance": 1}}]}
\ No newline at end of file
+{"batchcode": "031721A", "histograms": [{"histogram": {"Headache": 2, "Pain": 2, "Device use confusion": 1, "Temperature intolerance": 1}, "batchcodes": ["031721A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0317K20A.json b/docs/data/histograms/United States/0317K20A.json
index c7cabff056e..55a114f811e 100644
--- a/docs/data/histograms/United States/0317K20A.json
+++ b/docs/data/histograms/United States/0317K20A.json
@@ -1 +1 @@
-{"batchcode": "0317K20A", "histograms": [{"batchcodes": ["0317K20A"], "histogram": {"Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "0317K20A", "histograms": [{"histogram": {"Vaccination site erythema": 1}, "batchcodes": ["0317K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031821A.json b/docs/data/histograms/United States/031821A.json
index 1bff8576fd5..7cfd89df981 100644
--- a/docs/data/histograms/United States/031821A.json
+++ b/docs/data/histograms/United States/031821A.json
@@ -1 +1 @@
-{"batchcode": "031821A", "histograms": [{"batchcodes": ["031821A"], "histogram": {"Chills": 2, "Diarrhoea": 2, "Fatigue": 2, "Headache": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Illness": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Urticaria": 1, "Vaccination site reaction": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031821A", "histograms": [{"histogram": {"Chills": 2, "Diarrhoea": 2, "Fatigue": 2, "Headache": 2, "Pyrexia": 2, "Vaccination site pain": 2, "Arthralgia": 1, "Asthenia": 1, "Dizziness": 1, "Dyspnoea": 1, "Illness": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Nausea": 1, "Oropharyngeal discomfort": 1, "Urticaria": 1, "Vaccination site reaction": 1, "Vomiting": 1}, "batchcodes": ["031821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A0A.json b/docs/data/histograms/United States/031A0A.json
index 96dbe32a224..d7bd038f14c 100644
--- a/docs/data/histograms/United States/031A0A.json
+++ b/docs/data/histograms/United States/031A0A.json
@@ -1 +1 @@
-{"batchcode": "031A0A", "histograms": [{"batchcodes": ["031A0A"], "histogram": {"Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031A0A", "histograms": [{"histogram": {"Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["031A0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A20A.json b/docs/data/histograms/United States/031A20A.json
index cc0d0a91349..52307f10788 100644
--- a/docs/data/histograms/United States/031A20A.json
+++ b/docs/data/histograms/United States/031A20A.json
@@ -1 +1 @@
-{"batchcode": "031A20A", "histograms": [{"batchcodes": ["031A20A"], "histogram": {"Arthralgia": 2, "Chills": 2, "Epistaxis": 2, "Erythema": 2, "Hallucination": 2, "Headache": 2, "Myalgia": 2, "Nausea": 2, "Vomiting": 2, "Abdominal pain": 1, "Cold sweat": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Lymphadenopathy": 1, "Rash": 1, "Therapeutic response unexpected": 1, "Tremor": 1, "Vaccination site joint pain": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031A20A", "histograms": [{"histogram": {"Arthralgia": 2, "Chills": 2, "Epistaxis": 2, "Erythema": 2, "Hallucination": 2, "Headache": 2, "Myalgia": 2, "Nausea": 2, "Vomiting": 2, "Abdominal pain": 1, "Cold sweat": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Lymphadenopathy": 1, "Rash": 1, "Therapeutic response unexpected": 1, "Tremor": 1, "Vaccination site joint pain": 1, "Vaccination site pain": 1}, "batchcodes": ["031A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A21.json b/docs/data/histograms/United States/031A21.json
index 81d14f2e0cf..c3919c57f03 100644
--- a/docs/data/histograms/United States/031A21.json
+++ b/docs/data/histograms/United States/031A21.json
@@ -1 +1 @@
-{"batchcode": "031A21", "histograms": [{"batchcodes": ["031A21"], "histogram": {"Cerebral haemorrhage": 1, "Computerised tomogram": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031A21", "histograms": [{"histogram": {"Cerebral haemorrhage": 1, "Computerised tomogram": 1, "Product dose omission issue": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["031A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A211A.json b/docs/data/histograms/United States/031A211A.json
index c336ba2544c..228cadbbb6d 100644
--- a/docs/data/histograms/United States/031A211A.json
+++ b/docs/data/histograms/United States/031A211A.json
@@ -1 +1 @@
-{"batchcode": "031A211A", "histograms": [{"batchcodes": ["031A211A"], "histogram": {"Arthralgia": 2, "Dysgeusia": 2, "Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Myalgia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "031A211A", "histograms": [{"histogram": {"Arthralgia": 2, "Dysgeusia": 2, "Ageusia": 1, "Anosmia": 1, "COVID-19": 1, "Myalgia": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["031A211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A217.json b/docs/data/histograms/United States/031A217.json
index f3450de022b..b2919c69eaf 100644
--- a/docs/data/histograms/United States/031A217.json
+++ b/docs/data/histograms/United States/031A217.json
@@ -1 +1 @@
-{"batchcode": "031A217", "histograms": [{"batchcodes": ["031A217"], "histogram": {"Paraesthesia": 2, "Presyncope": 1, "Rash": 1, "Tunnel vision": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031A217", "histograms": [{"histogram": {"Paraesthesia": 2, "Presyncope": 1, "Rash": 1, "Tunnel vision": 1, "Vaccination site pain": 1}, "batchcodes": ["031A217"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A21A OR 051A.json b/docs/data/histograms/United States/031A21A OR 051A.json
index 1ac248f1e0a..ed5d54daee9 100644
--- a/docs/data/histograms/United States/031A21A OR 051A.json
+++ b/docs/data/histograms/United States/031A21A OR 051A.json
@@ -1 +1 @@
-{"batchcode": "031A21A OR 051A", "histograms": [{"batchcodes": ["031A21A OR 051A"], "histogram": {"Asthenia": 1, "Fatigue": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nightmare": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "031A21A OR 051A", "histograms": [{"histogram": {"Asthenia": 1, "Fatigue": 1, "Insomnia": 1, "Lymphadenopathy": 1, "Malaise": 1, "Nightmare": 1, "Rash pruritic": 1}, "batchcodes": ["031A21A OR 051A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A21A.json b/docs/data/histograms/United States/031A21A.json
index b396c148513..66006c71c67 100644
--- a/docs/data/histograms/United States/031A21A.json
+++ b/docs/data/histograms/United States/031A21A.json
@@ -1 +1 @@
-{"batchcode": "031A21A", "histograms": [{"batchcodes": ["031A21A", "ET7533"], "histogram": {"Interchange of vaccine products": 1, "Vaccination site pruritus": 1}}, {"batchcodes": ["031A21A"], "histogram": {"Product temperature excursion issue": 132, "Poor quality product administered": 108, "Pyrexia": 83, "Headache": 76, "Pain in extremity": 70, "Fatigue": 66, "Chills": 55, "Vaccination site pain": 51, "Myalgia": 50, "Nausea": 39, "Pain": 33, "Dizziness": 28, "Inappropriate schedule of product administration": 27, "Arthralgia": 26, "Vaccination site erythema": 24, "Body temperature": 23, "Vaccination site swelling": 23, "Peripheral swelling": 21, "Rash": 21, "Vaccination site pruritus": 21, "Pruritus": 20, "Feeling abnormal": 19, "Illness": 18, "Dyspnoea": 17, "Expired product administered": 16, "Insomnia": 16, "SARS-CoV-2 test": 16, "COVID-19": 14, "Asthenia": 13, "Diarrhoea": 12, "Product dose omission issue": 12, "Feeling hot": 11, "Product storage error": 11, "Vaccination site warmth": 11, "Vomiting": 11, "Abdominal pain upper": 10, "Erythema": 10, "Hyperhidrosis": 10, "Influenza like illness": 10, "Urticaria": 10, "Vaccination complication": 10, "Neck pain": 9, "Vaccination site mass": 9, "Vaccination site rash": 9, "Back pain": 8, "Exposure during pregnancy": 8, "Injection site pain": 8, "Paraesthesia": 8, "Vaccination site induration": 8, "Feeling cold": 7, "Heart rate": 7, "Limb discomfort": 7, "Lymphadenopathy": 7, "Swelling face": 7, "Tenderness": 7, "Abdominal discomfort": 6, "Ageusia": 6, "Chest pain": 6, "Cough": 6, "Dysgeusia": 6, "Gait disturbance": 6, "Hypersensitivity": 6, "Malaise": 6, "Pregnancy test": 6, "Rhinorrhoea": 6, "Swelling": 6, "Vaccination site reaction": 6, "Blood pressure measurement": 5, "Bone pain": 5, "Confusional state": 5, "Lethargy": 5, "Lymph node pain": 5, "Maternal exposure during pregnancy": 5, "Migraine": 5, "Oropharyngeal pain": 5, "Product administered to patient of inappropriate age": 5, "Somnolence": 5, "Ultrasound scan": 5, "Chest discomfort": 4, "Constipation": 4, "Extra dose administered": 4, "Hypersomnia": 4, "Hypoaesthesia": 4, "Lip swelling": 4, "Loss of personal independence in daily activities": 4, "Mobility decreased": 4, "Nasopharyngitis": 4, "Night sweats": 4, "Rash pruritic": 4, "Tachycardia": 4, "Therapeutic response unexpected": 4, "Tremor": 4, "Underdose": 4, "Vertigo": 4, "Anosmia": 3, "Axillary pain": 3, "Balance disorder": 3, "Contusion": 3, "Decreased appetite": 3, "Device connection issue": 3, "Drug ineffective": 3, "Fall": 3, "Hypoaesthesia oral": 3, "Hypotension": 3, "Influenza": 3, "Injection site pruritus": 3, "Injection site rash": 3, "Magnetic resonance imaging": 3, "Mass": 3, "Muscle swelling": 3, "Palpitations": 3, "Taste disorder": 3, "Tinnitus": 3, "Accidental overdose": 2, "Anxiety": 2, "Blood test": 2, "Burning sensation": 2, "Cellulitis": 2, "Diplopia": 2, "Dysstasia": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Flatulence": 2, "Head discomfort": 2, "Heart rate increased": 2, "Hypertension": 2, "Impaired driving ability": 2, "Incorrect route of product administration": 2, "Injection site swelling": 2, "Joint swelling": 2, "Laboratory test": 2, "Muscular weakness": 2, "Nasal congestion": 2, "Ocular discomfort": 2, "Ocular hyperaemia": 2, "Rash erythematous": 2, "Reading disorder": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Skin discolouration": 2, "Syncope": 2, "Vaccination site bruising": 2, "Vaccination site discharge": 2, "Vaccination site discolouration": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal rigidity": 1, "Adverse reaction": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Asthma": 1, "Audiogram": 1, "Balance test": 1, "Bell's palsy": 1, "Biopsy skin": 1, "Blister rupture": 1, "Blood glucose fluctuation": 1, "Blood group A": 1, "Blood pressure increased": 1, "Bronchitis": 1, "Capillary disorder": 1, "Cerebral disorder": 1, "Cheilitis": 1, "Chondrocalcinosis pyrophosphate": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Cystitis": 1, "Delusion": 1, "Depressed mood": 1, "Depression": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear disorder": 1, "Ear infection": 1, "Ear pain": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Eye contusion": 1, "Eye irritation": 1, "Eye pain": 1, "Eye pruritus": 1, "Facial pain": 1, "Fear of death": 1, "Feeling drunk": 1, "Formication": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Glucose tolerance test": 1, "Hallucination": 1, "Hand dermatitis": 1, "Head injury": 1, "Heart rate abnormal": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Hip deformity": 1, "Hot flush": 1, "Hypogeusia": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Incoherent": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Injection site induration": 1, "Injection site irritation": 1, "Injection site warmth": 1, "Keratitis": 1, "Limb mass": 1, "Lip dry": 1, "Loss of consciousness": 1, "Lower limb fracture": 1, "Magnetic resonance imaging head": 1, "Mastoid effusion": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Menopause": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Metastases to lymph nodes": 1, "Micturition urgency": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Neck mass": 1, "Nerve injury": 1, "Nervousness": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Nightmare": 1, "Nipple disorder": 1, "Oral candidiasis": 1, "Oral herpes": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Pericarditis": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pollakiuria": 1, "Polymenorrhoea": 1, "Prenatal screening test": 1, "Protein S": 1, "Radiculopathy": 1, "Rash macular": 1, "Renal pain": 1, "Respiratory rate": 1, "Retinal vein occlusion": 1, "Sciatica": 1, "Secretion discharge": 1, "Seizure": 1, "Sinoscopy": 1, "Sitting disability": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin warm": 1, "Sleep disorder": 1, "Sleep talking": 1, "Sleep terror": 1, "Spinal pain": 1, "Stomatitis": 1, "Strabismus": 1, "Strawberry tongue": 1, "Swollen tongue": 1, "Throat tightness": 1, "Thrombosis": 1, "Toothache": 1, "Urinary incontinence": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaginal haemorrhage": 1, "Vein disorder": 1, "Vital signs measurement": 1, "Weight decreased": 1, "Wound": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "031A21A", "histograms": [{"histogram": {"Interchange of vaccine products": 1, "Vaccination site pruritus": 1}, "batchcodes": ["031A21A", "ET7533"]}, {"histogram": {"Product temperature excursion issue": 132, "Poor quality product administered": 108, "Pyrexia": 83, "Headache": 76, "Pain in extremity": 70, "Fatigue": 66, "Chills": 55, "Vaccination site pain": 51, "Myalgia": 50, "Nausea": 39, "Pain": 33, "Dizziness": 28, "Inappropriate schedule of product administration": 27, "Arthralgia": 26, "Vaccination site erythema": 24, "Body temperature": 23, "Vaccination site swelling": 23, "Peripheral swelling": 21, "Rash": 21, "Vaccination site pruritus": 21, "Pruritus": 20, "Feeling abnormal": 19, "Illness": 18, "Dyspnoea": 17, "Expired product administered": 16, "Insomnia": 16, "SARS-CoV-2 test": 16, "COVID-19": 14, "Asthenia": 13, "Diarrhoea": 12, "Product dose omission issue": 12, "Feeling hot": 11, "Product storage error": 11, "Vaccination site warmth": 11, "Vomiting": 11, "Abdominal pain upper": 10, "Erythema": 10, "Hyperhidrosis": 10, "Influenza like illness": 10, "Urticaria": 10, "Vaccination complication": 10, "Neck pain": 9, "Vaccination site mass": 9, "Vaccination site rash": 9, "Back pain": 8, "Exposure during pregnancy": 8, "Injection site pain": 8, "Paraesthesia": 8, "Vaccination site induration": 8, "Feeling cold": 7, "Heart rate": 7, "Limb discomfort": 7, "Lymphadenopathy": 7, "Swelling face": 7, "Tenderness": 7, "Abdominal discomfort": 6, "Ageusia": 6, "Chest pain": 6, "Cough": 6, "Dysgeusia": 6, "Gait disturbance": 6, "Hypersensitivity": 6, "Malaise": 6, "Pregnancy test": 6, "Rhinorrhoea": 6, "Swelling": 6, "Vaccination site reaction": 6, "Blood pressure measurement": 5, "Bone pain": 5, "Confusional state": 5, "Lethargy": 5, "Lymph node pain": 5, "Maternal exposure during pregnancy": 5, "Migraine": 5, "Oropharyngeal pain": 5, "Product administered to patient of inappropriate age": 5, "Somnolence": 5, "Ultrasound scan": 5, "Chest discomfort": 4, "Constipation": 4, "Extra dose administered": 4, "Hypersomnia": 4, "Hypoaesthesia": 4, "Lip swelling": 4, "Loss of personal independence in daily activities": 4, "Mobility decreased": 4, "Nasopharyngitis": 4, "Night sweats": 4, "Rash pruritic": 4, "Tachycardia": 4, "Therapeutic response unexpected": 4, "Tremor": 4, "Underdose": 4, "Vertigo": 4, "Anosmia": 3, "Axillary pain": 3, "Balance disorder": 3, "Contusion": 3, "Decreased appetite": 3, "Device connection issue": 3, "Drug ineffective": 3, "Fall": 3, "Hypoaesthesia oral": 3, "Hypotension": 3, "Influenza": 3, "Injection site pruritus": 3, "Injection site rash": 3, "Magnetic resonance imaging": 3, "Mass": 3, "Muscle swelling": 3, "Palpitations": 3, "Taste disorder": 3, "Tinnitus": 3, "Accidental overdose": 2, "Anxiety": 2, "Blood test": 2, "Burning sensation": 2, "Cellulitis": 2, "Diplopia": 2, "Dysstasia": 2, "Feeding disorder": 2, "Feeling of body temperature change": 2, "Flatulence": 2, "Head discomfort": 2, "Heart rate increased": 2, "Hypertension": 2, "Impaired driving ability": 2, "Incorrect route of product administration": 2, "Injection site swelling": 2, "Joint swelling": 2, "Laboratory test": 2, "Muscular weakness": 2, "Nasal congestion": 2, "Ocular discomfort": 2, "Ocular hyperaemia": 2, "Rash erythematous": 2, "Reading disorder": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test positive": 2, "Skin discolouration": 2, "Syncope": 2, "Vaccination site bruising": 2, "Vaccination site discharge": 2, "Vaccination site discolouration": 2, "Vision blurred": 2, "X-ray": 2, "Abdominal distension": 1, "Abdominal pain": 1, "Abdominal rigidity": 1, "Adverse reaction": 1, "Allergy test": 1, "Anaphylactic reaction": 1, "Asthma": 1, "Audiogram": 1, "Balance test": 1, "Bell's palsy": 1, "Biopsy skin": 1, "Blister rupture": 1, "Blood glucose fluctuation": 1, "Blood group A": 1, "Blood pressure increased": 1, "Bronchitis": 1, "Capillary disorder": 1, "Cerebral disorder": 1, "Cheilitis": 1, "Chondrocalcinosis pyrophosphate": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Cystitis": 1, "Delusion": 1, "Depressed mood": 1, "Depression": 1, "Discomfort": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dysarthria": 1, "Dysmenorrhoea": 1, "Dysphagia": 1, "Ear disorder": 1, "Ear infection": 1, "Ear pain": 1, "Electrocardiogram": 1, "Epistaxis": 1, "Exposure to SARS-CoV-2": 1, "Exposure via breast milk": 1, "Eye contusion": 1, "Eye irritation": 1, "Eye pain": 1, "Eye pruritus": 1, "Facial pain": 1, "Fear of death": 1, "Feeling drunk": 1, "Formication": 1, "Gait inability": 1, "Gastrointestinal disorder": 1, "Gastrointestinal motility disorder": 1, "Gastrooesophageal reflux disease": 1, "Glucose tolerance test": 1, "Hallucination": 1, "Hand dermatitis": 1, "Head injury": 1, "Heart rate abnormal": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Hip deformity": 1, "Hot flush": 1, "Hypogeusia": 1, "Immunisation reaction": 1, "Impaired work ability": 1, "Incoherent": 1, "Incorrect dose administered": 1, "Inflammation": 1, "Injection site discolouration": 1, "Injection site erythema": 1, "Injection site induration": 1, "Injection site irritation": 1, "Injection site warmth": 1, "Keratitis": 1, "Limb mass": 1, "Lip dry": 1, "Loss of consciousness": 1, "Lower limb fracture": 1, "Magnetic resonance imaging head": 1, "Mastoid effusion": 1, "Maternal exposure during breast feeding": 1, "Memory impairment": 1, "Menopause": 1, "Menstrual disorder": 1, "Menstruation delayed": 1, "Metastases to lymph nodes": 1, "Micturition urgency": 1, "Mouth swelling": 1, "Muscle discomfort": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myocardial infarction": 1, "Neck mass": 1, "Nerve injury": 1, "Nervousness": 1, "Neuralgia": 1, "Neuropathy peripheral": 1, "Nightmare": 1, "Nipple disorder": 1, "Oral candidiasis": 1, "Oral herpes": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Pericarditis": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Pollakiuria": 1, "Polymenorrhoea": 1, "Prenatal screening test": 1, "Protein S": 1, "Radiculopathy": 1, "Rash macular": 1, "Renal pain": 1, "Respiratory rate": 1, "Retinal vein occlusion": 1, "Sciatica": 1, "Secretion discharge": 1, "Seizure": 1, "Sinoscopy": 1, "Sitting disability": 1, "Skin burning sensation": 1, "Skin disorder": 1, "Skin warm": 1, "Sleep disorder": 1, "Sleep talking": 1, "Sleep terror": 1, "Spinal pain": 1, "Stomatitis": 1, "Strabismus": 1, "Strawberry tongue": 1, "Swollen tongue": 1, "Throat tightness": 1, "Thrombosis": 1, "Toothache": 1, "Urinary incontinence": 1, "Vaccination site discomfort": 1, "Vaccination site haemorrhage": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site papule": 1, "Vaccination site paraesthesia": 1, "Vaginal haemorrhage": 1, "Vein disorder": 1, "Vital signs measurement": 1, "Weight decreased": 1, "Wound": 1, "Wrong product administered": 1}, "batchcodes": ["031A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A21B.json b/docs/data/histograms/United States/031A21B.json
index 39c1b484e9d..1a81079fa5a 100644
--- a/docs/data/histograms/United States/031A21B.json
+++ b/docs/data/histograms/United States/031A21B.json
@@ -1 +1 @@
-{"batchcode": "031A21B", "histograms": [{"batchcodes": ["031A21B"], "histogram": {"Hypoaesthesia": 2, "Aneurysm": 1, "Angiogram": 1, "Computerised tomogram": 1, "Dizziness": 1, "Hypoaesthesia oral": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Pharyngeal hypoaesthesia": 1, "Scan with contrast": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031A21B", "histograms": [{"histogram": {"Hypoaesthesia": 2, "Aneurysm": 1, "Angiogram": 1, "Computerised tomogram": 1, "Dizziness": 1, "Hypoaesthesia oral": 1, "Magnetic resonance imaging": 1, "Pain in extremity": 1, "Pharyngeal hypoaesthesia": 1, "Scan with contrast": 1, "Tremor": 1, "Urticaria": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1, "Vomiting": 1}, "batchcodes": ["031A21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031A29A.json b/docs/data/histograms/United States/031A29A.json
index e258787ec8b..fc2307a9525 100644
--- a/docs/data/histograms/United States/031A29A.json
+++ b/docs/data/histograms/United States/031A29A.json
@@ -1 +1 @@
-{"batchcode": "031A29A", "histograms": [{"batchcodes": ["031A29A"], "histogram": {"Herpes zoster": 2, "Swelling face": 2, "Ophthalmic herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "031A29A", "histograms": [{"histogram": {"Herpes zoster": 2, "Swelling face": 2, "Ophthalmic herpes zoster": 1}, "batchcodes": ["031A29A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031AZ(OR2)1A.json b/docs/data/histograms/United States/031AZ(OR2)1A.json
index 7b567fcda69..dae7ec12a70 100644
--- a/docs/data/histograms/United States/031AZ(OR2)1A.json
+++ b/docs/data/histograms/United States/031AZ(OR2)1A.json
@@ -1 +1 @@
-{"batchcode": "031AZ(OR2)1A", "histograms": [{"batchcodes": ["031AZ(OR2)1A"], "histogram": {"Dizziness": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "031AZ(OR2)1A", "histograms": [{"histogram": {"Dizziness": 1, "Nausea": 1}, "batchcodes": ["031AZ(OR2)1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031AZ1A.json b/docs/data/histograms/United States/031AZ1A.json
index 88c2be46e01..fb67e2a1468 100644
--- a/docs/data/histograms/United States/031AZ1A.json
+++ b/docs/data/histograms/United States/031AZ1A.json
@@ -1 +1 @@
-{"batchcode": "031AZ1A", "histograms": [{"batchcodes": ["031AZ1A"], "histogram": {"Condition aggravated": 1, "Discomfort": 1, "Dizziness": 1, "Exposure during pregnancy": 1, "Headache": 1, "Morning sickness": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "031AZ1A", "histograms": [{"histogram": {"Condition aggravated": 1, "Discomfort": 1, "Dizziness": 1, "Exposure during pregnancy": 1, "Headache": 1, "Morning sickness": 1, "Nausea": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["031AZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B021A.json b/docs/data/histograms/United States/031B021A.json
index c4a7e327b3d..988100d37fb 100644
--- a/docs/data/histograms/United States/031B021A.json
+++ b/docs/data/histograms/United States/031B021A.json
@@ -1 +1 @@
-{"batchcode": "031B021A", "histograms": [{"batchcodes": ["031B021A"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Migraine": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031B021A", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Migraine": 1, "Myalgia": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["031B021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B2 1A.json b/docs/data/histograms/United States/031B2 1A.json
index e811fe834eb..72bcf89950b 100644
--- a/docs/data/histograms/United States/031B2 1A.json
+++ b/docs/data/histograms/United States/031B2 1A.json
@@ -1 +1 @@
-{"batchcode": "031B2 1A", "histograms": [{"batchcodes": ["031B2 1A"], "histogram": {"Anxiety": 1, "Hot flush": 1, "Nausea": 1, "Pain in extremity": 1, "Rash": 1, "Vaccination site discolouration": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "031B2 1A", "histograms": [{"histogram": {"Anxiety": 1, "Hot flush": 1, "Nausea": 1, "Pain in extremity": 1, "Rash": 1, "Vaccination site discolouration": 1, "Vaccination site warmth": 1}, "batchcodes": ["031B2 1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B21.json b/docs/data/histograms/United States/031B21.json
index 1965a9be155..466d48335f8 100644
--- a/docs/data/histograms/United States/031B21.json
+++ b/docs/data/histograms/United States/031B21.json
@@ -1 +1 @@
-{"batchcode": "031B21", "histograms": [{"batchcodes": ["031B21"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["031B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B2114.json b/docs/data/histograms/United States/031B2114.json
index 170cdd74b5c..358d86dccc4 100644
--- a/docs/data/histograms/United States/031B2114.json
+++ b/docs/data/histograms/United States/031B2114.json
@@ -1 +1 @@
-{"batchcode": "031B2114", "histograms": [{"batchcodes": ["031B2114"], "histogram": {"Abdominal pain upper": 1, "Carpal tunnel syndrome": 1, "Diarrhoea": 1, "Fatigue": 1, "Haemorrhoids": 1, "Osteoarthritis": 1, "Pain": 1, "Pain in extremity": 1, "Rheumatoid arthritis": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "031B2114", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Carpal tunnel syndrome": 1, "Diarrhoea": 1, "Fatigue": 1, "Haemorrhoids": 1, "Osteoarthritis": 1, "Pain": 1, "Pain in extremity": 1, "Rheumatoid arthritis": 1, "Swelling": 1}, "batchcodes": ["031B2114"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B2119.json b/docs/data/histograms/United States/031B2119.json
index f518a35a1fa..8aebeec049a 100644
--- a/docs/data/histograms/United States/031B2119.json
+++ b/docs/data/histograms/United States/031B2119.json
@@ -1 +1 @@
-{"batchcode": "031B2119", "histograms": [{"batchcodes": ["031B2119"], "histogram": {"Confusional state": 1, "Muscle spasms": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031B2119", "histograms": [{"histogram": {"Confusional state": 1, "Muscle spasms": 1, "Pain in extremity": 1}, "batchcodes": ["031B2119"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B214.json b/docs/data/histograms/United States/031B214.json
index f2c40438b0b..def77d2e894 100644
--- a/docs/data/histograms/United States/031B214.json
+++ b/docs/data/histograms/United States/031B214.json
@@ -1 +1 @@
-{"batchcode": "031B214", "histograms": [{"batchcodes": ["031B214"], "histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031B214", "histograms": [{"histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Pyrexia": 1}, "batchcodes": ["031B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B21A. EXPIRA.json b/docs/data/histograms/United States/031B21A. EXPIRA.json
index cd70a93a152..b933c7d39f2 100644
--- a/docs/data/histograms/United States/031B21A. EXPIRA.json
+++ b/docs/data/histograms/United States/031B21A. EXPIRA.json
@@ -1 +1 @@
-{"batchcode": "031B21A. EXPIRA", "histograms": [{"batchcodes": ["031B21A. EXPIRA"], "histogram": {"Influenza like illness": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21A. EXPIRA", "histograms": [{"histogram": {"Influenza like illness": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1}, "batchcodes": ["031B21A. EXPIRA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B21A..json b/docs/data/histograms/United States/031B21A..json
index fc1f66cb112..aede58a81ae 100644
--- a/docs/data/histograms/United States/031B21A..json
+++ b/docs/data/histograms/United States/031B21A..json
@@ -1 +1 @@
-{"batchcode": "031B21A.", "histograms": [{"batchcodes": ["031B21A."], "histogram": {"Pyrexia": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21A.", "histograms": [{"histogram": {"Pyrexia": 1, "Vaccination site rash": 1}, "batchcodes": ["031B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B21A.json b/docs/data/histograms/United States/031B21A.json
index f55319af832..c24ff8c3699 100644
--- a/docs/data/histograms/United States/031B21A.json
+++ b/docs/data/histograms/United States/031B21A.json
@@ -1 +1 @@
-{"batchcode": "031B21A", "histograms": [{"batchcodes": ["003C21A", "031B21A"], "histogram": {"Chills": 1, "Extra dose administered": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Lethargy": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1}}, {"batchcodes": ["031B21A"], "histogram": {"Expired product administered": 221, "Pyrexia": 68, "Headache": 61, "Pain in extremity": 59, "Fatigue": 57, "Chills": 49, "Myalgia": 46, "Vaccination site pain": 35, "Nausea": 33, "Arthralgia": 25, "Dizziness": 24, "Feeling abnormal": 23, "Asthenia": 21, "Pain": 20, "Product storage error": 17, "Body temperature": 15, "Pruritus": 15, "Vaccination site erythema": 15, "Diarrhoea": 13, "Dyspnoea": 13, "Hypoaesthesia": 13, "Vomiting": 13, "Erythema": 12, "Inappropriate schedule of product administration": 12, "Malaise": 12, "Peripheral swelling": 12, "Rash": 12, "COVID-19": 10, "Chest pain": 10, "Illness": 10, "Insomnia": 10, "SARS-CoV-2 test": 10, "Vaccination site warmth": 10, "Hyperhidrosis": 9, "Influenza like illness": 9, "Product administered to patient of inappropriate age": 9, "Vaccination site swelling": 9, "Cough": 8, "Lymphadenopathy": 8, "Vaccination site rash": 8, "Paraesthesia": 7, "Product dose omission issue": 7, "Urticaria": 7, "Vaccination site pruritus": 7, "Weight decreased": 7, "Abdominal discomfort": 6, "Abdominal pain upper": 6, "Anxiety": 6, "Back pain": 6, "Decreased appetite": 6, "Feeling hot": 6, "Head discomfort": 6, "Swelling": 6, "Tenderness": 6, "Vaccination complication": 6, "Blood pressure increased": 5, "Hypersensitivity": 5, "Injection site swelling": 5, "Mobility decreased": 5, "Vaccination site mass": 5, "Chest discomfort": 4, "Computerised tomogram": 4, "Fall": 4, "Influenza": 4, "Injection site pain": 4, "Loss of consciousness": 4, "Loss of personal independence in daily activities": 4, "Lymph node pain": 4, "Muscle spasms": 4, "Rash erythematous": 4, "Rhinorrhoea": 4, "Tachycardia": 4, "Abdominal pain": 3, "Ageusia": 3, "Bedridden": 3, "Bell's palsy": 3, "Blood pressure measurement": 3, "Blood test": 3, "Condition aggravated": 3, "Discomfort": 3, "Dysgeusia": 3, "Electrocardiogram": 3, "Feeling cold": 3, "Gait disturbance": 3, "Heart rate irregular": 3, "Herpes zoster": 3, "Hypoaesthesia oral": 3, "Maternal exposure during pregnancy": 3, "Neck pain": 3, "Oropharyngeal pain": 3, "Palpitations": 3, "Rash pruritic": 3, "Retching": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Skin warm": 3, "Throat tightness": 3, "Tinnitus": 3, "Urinary tract infection": 3, "Vaccination site bruising": 3, "Vaccination site induration": 3, "Vaccination site reaction": 3, "Abdominal distension": 2, "Amenorrhoea": 2, "Anosmia": 2, "Arthritis": 2, "Blood potassium": 2, "Blood pressure abnormal": 2, "Bone pain": 2, "Cerebrovascular accident": 2, "Cold sweat": 2, "Confusional state": 2, "Disturbance in attention": 2, "Dysphagia": 2, "Ear pain": 2, "Eye pain": 2, "Heart rate": 2, "Heart rate increased": 2, "Hypertension": 2, "Hypotension": 2, "Injection site erythema": 2, "Intermenstrual bleeding": 2, "Joint swelling": 2, "Lethargy": 2, "Limb discomfort": 2, "Lip swelling": 2, "Mass": 2, "Muscle tightness": 2, "Muscular weakness": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Nervousness": 2, "Off label use": 2, "Ovarian cyst": 2, "Pallor": 2, "Paraesthesia oral": 2, "Paralysis": 2, "Photophobia": 2, "Pregnancy test": 2, "Presyncope": 2, "Skin discolouration": 2, "Skin swelling": 2, "Somnolence": 2, "Speech disorder": 2, "Swelling face": 2, "Tendonitis": 2, "Tremor": 2, "Ultrasound scan": 2, "Underdose": 2, "Vaccination site movement impairment": 2, "Vertigo": 2, "Vision blurred": 2, "Vitreous floaters": 2, "Acute respiratory distress syndrome": 1, "Administration site irritation": 1, "Adverse event": 1, "Adverse reaction": 1, "Alanine aminotransferase": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic reaction": 1, "Anger": 1, "Antibiotic level": 1, "Apathy": 1, "Aphonia": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase": 1, "Balance disorder": 1, "Biopsy": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood cholesterol": 1, "Blood magnesium": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Body temperature fluctuation": 1, "Breast discomfort": 1, "Bronchitis": 1, "Bronchospasm": 1, "Burning sensation": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Contusion": 1, "Coordination abnormal": 1, "Coronary artery disease": 1, "Dehydration": 1, "Depressed mood": 1, "Depression": 1, "Dermatitis allergic": 1, "Device connection issue": 1, "Diabetic coma": 1, "Disorientation": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dysuria": 1, "Eating disorder": 1, "Electrolyte imbalance": 1, "Emotional disorder": 1, "Endoscopy": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eye disorder": 1, "Face oedema": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Fluid retention": 1, "Furuncle": 1, "Gait inability": 1, "Gastritis": 1, "Gastrointestinal pain": 1, "Gout": 1, "Hair growth abnormal": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme abnormal": 1, "Hepatitis": 1, "Hot flush": 1, "Hunger": 1, "Hypersomnia": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Interchange of vaccine products": 1, "Lacrimation increased": 1, "Laziness": 1, "Liver function test": 1, "Lower respiratory tract infection": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental fatigue": 1, "Migraine": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscle swelling": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nasopharyngitis": 1, "Near death experience": 1, "Nephrolithiasis": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Onychalgia": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oropharyngeal discomfort": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal swelling": 1, "Piloerection": 1, "Plantar fasciitis": 1, "Pleuritic pain": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Post thrombotic syndrome": 1, "Post-acute COVID-19 syndrome": 1, "Product temperature excursion issue": 1, "Pulmonary embolism": 1, "Rash macular": 1, "Rash pustular": 1, "Raynaud's phenomenon": 1, "Respiratory tract irritation": 1, "Restlessness": 1, "SARS-CoV-1 test": 1, "Salivary hypersecretion": 1, "Scratch": 1, "Seasonal allergy": 1, "Seizure": 1, "Serum ferritin": 1, "Skin mass": 1, "Sluggishness": 1, "Stress": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Temperature intolerance": 1, "Thirst": 1, "Thrombosis": 1, "Tonsillar hypertrophy": 1, "Toothache": 1, "Transcription medication error": 1, "Trismus": 1, "Ultrasound liver": 1, "Urge incontinence": 1, "Urinary retention": 1, "Urine analysis": 1, "Urine output decreased": 1, "Vaccination failure": 1, "Vaccination site anaesthesia": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site paraesthesia": 1, "Vaginal haemorrhage": 1, "Visual impairment": 1, "Vitreous degeneration": 1, "Vulvovaginal mycotic infection": 1, "Walking aid user": 1, "Weight": 1, "Wheezing": 1, "Wrist fracture": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21A", "histograms": [{"histogram": {"Chills": 1, "Extra dose administered": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Lethargy": 1, "Myalgia": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["003C21A", "031B21A"]}, {"histogram": {"Expired product administered": 221, "Pyrexia": 68, "Headache": 61, "Pain in extremity": 59, "Fatigue": 57, "Chills": 49, "Myalgia": 46, "Vaccination site pain": 35, "Nausea": 33, "Arthralgia": 25, "Dizziness": 24, "Feeling abnormal": 23, "Asthenia": 21, "Pain": 20, "Product storage error": 17, "Body temperature": 15, "Pruritus": 15, "Vaccination site erythema": 15, "Diarrhoea": 13, "Dyspnoea": 13, "Hypoaesthesia": 13, "Vomiting": 13, "Erythema": 12, "Inappropriate schedule of product administration": 12, "Malaise": 12, "Peripheral swelling": 12, "Rash": 12, "COVID-19": 10, "Chest pain": 10, "Illness": 10, "Insomnia": 10, "SARS-CoV-2 test": 10, "Vaccination site warmth": 10, "Hyperhidrosis": 9, "Influenza like illness": 9, "Product administered to patient of inappropriate age": 9, "Vaccination site swelling": 9, "Cough": 8, "Lymphadenopathy": 8, "Vaccination site rash": 8, "Paraesthesia": 7, "Product dose omission issue": 7, "Urticaria": 7, "Vaccination site pruritus": 7, "Weight decreased": 7, "Abdominal discomfort": 6, "Abdominal pain upper": 6, "Anxiety": 6, "Back pain": 6, "Decreased appetite": 6, "Feeling hot": 6, "Head discomfort": 6, "Swelling": 6, "Tenderness": 6, "Vaccination complication": 6, "Blood pressure increased": 5, "Hypersensitivity": 5, "Injection site swelling": 5, "Mobility decreased": 5, "Vaccination site mass": 5, "Chest discomfort": 4, "Computerised tomogram": 4, "Fall": 4, "Influenza": 4, "Injection site pain": 4, "Loss of consciousness": 4, "Loss of personal independence in daily activities": 4, "Lymph node pain": 4, "Muscle spasms": 4, "Rash erythematous": 4, "Rhinorrhoea": 4, "Tachycardia": 4, "Abdominal pain": 3, "Ageusia": 3, "Bedridden": 3, "Bell's palsy": 3, "Blood pressure measurement": 3, "Blood test": 3, "Condition aggravated": 3, "Discomfort": 3, "Dysgeusia": 3, "Electrocardiogram": 3, "Feeling cold": 3, "Gait disturbance": 3, "Heart rate irregular": 3, "Herpes zoster": 3, "Hypoaesthesia oral": 3, "Maternal exposure during pregnancy": 3, "Neck pain": 3, "Oropharyngeal pain": 3, "Palpitations": 3, "Rash pruritic": 3, "Retching": 3, "SARS-CoV-2 antibody test": 3, "SARS-CoV-2 test positive": 3, "Skin warm": 3, "Throat tightness": 3, "Tinnitus": 3, "Urinary tract infection": 3, "Vaccination site bruising": 3, "Vaccination site induration": 3, "Vaccination site reaction": 3, "Abdominal distension": 2, "Amenorrhoea": 2, "Anosmia": 2, "Arthritis": 2, "Blood potassium": 2, "Blood pressure abnormal": 2, "Bone pain": 2, "Cerebrovascular accident": 2, "Cold sweat": 2, "Confusional state": 2, "Disturbance in attention": 2, "Dysphagia": 2, "Ear pain": 2, "Eye pain": 2, "Heart rate": 2, "Heart rate increased": 2, "Hypertension": 2, "Hypotension": 2, "Injection site erythema": 2, "Intermenstrual bleeding": 2, "Joint swelling": 2, "Lethargy": 2, "Limb discomfort": 2, "Lip swelling": 2, "Mass": 2, "Muscle tightness": 2, "Muscular weakness": 2, "Musculoskeletal chest pain": 2, "Nasal congestion": 2, "Nervousness": 2, "Off label use": 2, "Ovarian cyst": 2, "Pallor": 2, "Paraesthesia oral": 2, "Paralysis": 2, "Photophobia": 2, "Pregnancy test": 2, "Presyncope": 2, "Skin discolouration": 2, "Skin swelling": 2, "Somnolence": 2, "Speech disorder": 2, "Swelling face": 2, "Tendonitis": 2, "Tremor": 2, "Ultrasound scan": 2, "Underdose": 2, "Vaccination site movement impairment": 2, "Vertigo": 2, "Vision blurred": 2, "Vitreous floaters": 2, "Acute respiratory distress syndrome": 1, "Administration site irritation": 1, "Adverse event": 1, "Adverse reaction": 1, "Alanine aminotransferase": 1, "Allergy test": 1, "Allergy to vaccine": 1, "Alopecia": 1, "Altered state of consciousness": 1, "Anaemia": 1, "Anal incontinence": 1, "Anaphylactic reaction": 1, "Anger": 1, "Antibiotic level": 1, "Apathy": 1, "Aphonia": 1, "Arrhythmia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase": 1, "Balance disorder": 1, "Biopsy": 1, "Blister": 1, "Blood alkaline phosphatase": 1, "Blood cholesterol": 1, "Blood magnesium": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Body temperature fluctuation": 1, "Breast discomfort": 1, "Bronchitis": 1, "Bronchospasm": 1, "Burning sensation": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Contusion": 1, "Coordination abnormal": 1, "Coronary artery disease": 1, "Dehydration": 1, "Depressed mood": 1, "Depression": 1, "Dermatitis allergic": 1, "Device connection issue": 1, "Diabetic coma": 1, "Disorientation": 1, "Dyskinesia": 1, "Dysmenorrhoea": 1, "Dysphonia": 1, "Dysuria": 1, "Eating disorder": 1, "Electrolyte imbalance": 1, "Emotional disorder": 1, "Endoscopy": 1, "Exposure during pregnancy": 1, "Extra dose administered": 1, "Eye disorder": 1, "Face oedema": 1, "Feeling of body temperature change": 1, "Fibromyalgia": 1, "Fluid retention": 1, "Furuncle": 1, "Gait inability": 1, "Gastritis": 1, "Gastrointestinal pain": 1, "Gout": 1, "Hair growth abnormal": 1, "Heart rate decreased": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme abnormal": 1, "Hepatitis": 1, "Hot flush": 1, "Hunger": 1, "Hypersomnia": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Hypoxia": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Injection site induration": 1, "Injection site pruritus": 1, "Injection site warmth": 1, "Interchange of vaccine products": 1, "Lacrimation increased": 1, "Laziness": 1, "Liver function test": 1, "Lower respiratory tract infection": 1, "Magnetic resonance imaging": 1, "Mean cell haemoglobin": 1, "Mean cell volume": 1, "Memory impairment": 1, "Menstrual disorder": 1, "Menstruation irregular": 1, "Mental fatigue": 1, "Migraine": 1, "Muscle rigidity": 1, "Muscle spasticity": 1, "Muscle swelling": 1, "Muscle twitching": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myelitis transverse": 1, "Myocardial infarction": 1, "Nasal discomfort": 1, "Nasopharyngitis": 1, "Near death experience": 1, "Nephrolithiasis": 1, "Neuropathy peripheral": 1, "Ocular discomfort": 1, "Onychalgia": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oropharyngeal discomfort": 1, "Parosmia": 1, "Peripheral coldness": 1, "Pharyngeal hypoaesthesia": 1, "Pharyngeal swelling": 1, "Piloerection": 1, "Plantar fasciitis": 1, "Pleuritic pain": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Post thrombotic syndrome": 1, "Post-acute COVID-19 syndrome": 1, "Product temperature excursion issue": 1, "Pulmonary embolism": 1, "Rash macular": 1, "Rash pustular": 1, "Raynaud's phenomenon": 1, "Respiratory tract irritation": 1, "Restlessness": 1, "SARS-CoV-1 test": 1, "Salivary hypersecretion": 1, "Scratch": 1, "Seasonal allergy": 1, "Seizure": 1, "Serum ferritin": 1, "Skin mass": 1, "Sluggishness": 1, "Stress": 1, "Suspected COVID-19": 1, "Swollen tongue": 1, "Temperature intolerance": 1, "Thirst": 1, "Thrombosis": 1, "Tonsillar hypertrophy": 1, "Toothache": 1, "Transcription medication error": 1, "Trismus": 1, "Ultrasound liver": 1, "Urge incontinence": 1, "Urinary retention": 1, "Urine analysis": 1, "Urine output decreased": 1, "Vaccination failure": 1, "Vaccination site anaesthesia": 1, "Vaccination site infection": 1, "Vaccination site inflammation": 1, "Vaccination site paraesthesia": 1, "Vaginal haemorrhage": 1, "Visual impairment": 1, "Vitreous degeneration": 1, "Vulvovaginal mycotic infection": 1, "Walking aid user": 1, "Weight": 1, "Wheezing": 1, "Wrist fracture": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["031B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B21H.json b/docs/data/histograms/United States/031B21H.json
index 253df7f4c14..cdf9bd0d324 100644
--- a/docs/data/histograms/United States/031B21H.json
+++ b/docs/data/histograms/United States/031B21H.json
@@ -1 +1 @@
-{"batchcode": "031B21H", "histograms": [{"batchcodes": ["031B21H"], "histogram": {"Cough": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031B21H", "histograms": [{"histogram": {"Cough": 1, "Pain in extremity": 1}, "batchcodes": ["031B21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031B76A.json b/docs/data/histograms/United States/031B76A.json
index b55c38dce21..49ab957712f 100644
--- a/docs/data/histograms/United States/031B76A.json
+++ b/docs/data/histograms/United States/031B76A.json
@@ -1 +1 @@
-{"batchcode": "031B76A", "histograms": [{"batchcodes": ["031B76A"], "histogram": {"Fatigue": 1}}]}
\ No newline at end of file
+{"batchcode": "031B76A", "histograms": [{"histogram": {"Fatigue": 1}, "batchcodes": ["031B76A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031BUA.json b/docs/data/histograms/United States/031BUA.json
index b969da689d9..588cb0b5bb5 100644
--- a/docs/data/histograms/United States/031BUA.json
+++ b/docs/data/histograms/United States/031BUA.json
@@ -1 +1 @@
-{"batchcode": "031BUA", "histograms": [{"batchcodes": ["031BUA"], "histogram": {"Exposure to SARS-CoV-2": 1, "Headache": 1, "Musculoskeletal stiffness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031BUA", "histograms": [{"histogram": {"Exposure to SARS-CoV-2": 1, "Headache": 1, "Musculoskeletal stiffness": 1, "Vaccination site pain": 1}, "batchcodes": ["031BUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031BZ1A.json b/docs/data/histograms/United States/031BZ1A.json
index 8eed2722620..904957667b8 100644
--- a/docs/data/histograms/United States/031BZ1A.json
+++ b/docs/data/histograms/United States/031BZ1A.json
@@ -1 +1 @@
-{"batchcode": "031BZ1A", "histograms": [{"batchcodes": ["031BZ1A"], "histogram": {"Bed rest": 2, "Illness": 2, "Arthralgia": 1, "Dyspnoea": 1, "Hyperventilation": 1, "Respiratory rate increased": 1}}]}
\ No newline at end of file
+{"batchcode": "031BZ1A", "histograms": [{"histogram": {"Bed rest": 2, "Illness": 2, "Arthralgia": 1, "Dyspnoea": 1, "Hyperventilation": 1, "Respiratory rate increased": 1}, "batchcodes": ["031BZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031BZ1A4.json b/docs/data/histograms/United States/031BZ1A4.json
index f627061e5fb..f210ac68400 100644
--- a/docs/data/histograms/United States/031BZ1A4.json
+++ b/docs/data/histograms/United States/031BZ1A4.json
@@ -1 +1 @@
-{"batchcode": "031BZ1A4", "histograms": [{"batchcodes": ["031BZ1A4"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Pain in extremity": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "031BZ1A4", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Blood pressure measurement": 1, "Pain in extremity": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["031BZ1A4"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031BZHA.json b/docs/data/histograms/United States/031BZHA.json
index 6d456b68e23..af6eb0fa135 100644
--- a/docs/data/histograms/United States/031BZHA.json
+++ b/docs/data/histograms/United States/031BZHA.json
@@ -1 +1 @@
-{"batchcode": "031BZHA", "histograms": [{"batchcodes": ["031BZHA"], "histogram": {"Ageusia": 1, "Cough": 1, "Dysgeusia": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Taste disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "031BZHA", "histograms": [{"histogram": {"Ageusia": 1, "Cough": 1, "Dysgeusia": 1, "Headache": 1, "Influenza like illness": 1, "Malaise": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Taste disorder": 1}, "batchcodes": ["031BZHA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031BZIA.json b/docs/data/histograms/United States/031BZIA.json
index 350fd12ec65..b200be451a4 100644
--- a/docs/data/histograms/United States/031BZIA.json
+++ b/docs/data/histograms/United States/031BZIA.json
@@ -1 +1 @@
-{"batchcode": "031BZIA", "histograms": [{"batchcodes": ["031BZIA"], "histogram": {"Fatigue": 2, "Antibody test": 1, "C-reactive protein": 1, "Herpes zoster": 1, "Platelet count": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "031BZIA", "histograms": [{"histogram": {"Fatigue": 2, "Antibody test": 1, "C-reactive protein": 1, "Herpes zoster": 1, "Platelet count": 1, "Red blood cell sedimentation rate": 1, "Rheumatoid arthritis": 1, "Rheumatoid factor": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["031BZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031C20A.json b/docs/data/histograms/United States/031C20A.json
index 25c37dc152e..b8f9c952935 100644
--- a/docs/data/histograms/United States/031C20A.json
+++ b/docs/data/histograms/United States/031C20A.json
@@ -1 +1 @@
-{"batchcode": "031C20A", "histograms": [{"batchcodes": ["031C20A"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "031C20A", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["031C20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031C21A.json b/docs/data/histograms/United States/031C21A.json
index 008df2e7a3a..7c4d8c1da5a 100644
--- a/docs/data/histograms/United States/031C21A.json
+++ b/docs/data/histograms/United States/031C21A.json
@@ -1 +1 @@
-{"batchcode": "031C21A", "histograms": [{"batchcodes": ["031C21A"], "histogram": {"Pruritus": 2, "Application site discolouration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site urticaria": 1, "Injection site warmth": 1, "Pain in extremity": 1, "Rash": 1, "Rash macular": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "031C21A", "histograms": [{"histogram": {"Pruritus": 2, "Application site discolouration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site rash": 1, "Injection site urticaria": 1, "Injection site warmth": 1, "Pain in extremity": 1, "Rash": 1, "Rash macular": 1, "Vaccination site swelling": 1}, "batchcodes": ["031C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031D21A.json b/docs/data/histograms/United States/031D21A.json
index c8b331aa0b7..f65bd7c8f83 100644
--- a/docs/data/histograms/United States/031D21A.json
+++ b/docs/data/histograms/United States/031D21A.json
@@ -1 +1 @@
-{"batchcode": "031D21A", "histograms": [{"batchcodes": ["031D21A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031D21A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["031D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031E21A.json b/docs/data/histograms/United States/031E21A.json
index 64321884b3a..12b3db84f7c 100644
--- a/docs/data/histograms/United States/031E21A.json
+++ b/docs/data/histograms/United States/031E21A.json
@@ -1 +1 @@
-{"batchcode": "031E21A", "histograms": [{"batchcodes": ["031E21A"], "histogram": {"Blood test": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031E21A", "histograms": [{"histogram": {"Blood test": 1, "Fatigue": 1, "Headache": 1, "Pain in extremity": 1}, "batchcodes": ["031E21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031F20A.json b/docs/data/histograms/United States/031F20A.json
index b375643b238..315bee71231 100644
--- a/docs/data/histograms/United States/031F20A.json
+++ b/docs/data/histograms/United States/031F20A.json
@@ -1 +1 @@
-{"batchcode": "031F20A", "histograms": [{"batchcodes": ["031F20A"], "histogram": {"COVID-19": 1}}]}
\ No newline at end of file
+{"batchcode": "031F20A", "histograms": [{"histogram": {"COVID-19": 1}, "batchcodes": ["031F20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031G20A.json b/docs/data/histograms/United States/031G20A.json
index f1564156411..c3dcdfe8a04 100644
--- a/docs/data/histograms/United States/031G20A.json
+++ b/docs/data/histograms/United States/031G20A.json
@@ -1 +1 @@
-{"batchcode": "031G20A", "histograms": [{"batchcodes": ["031G20A"], "histogram": {"COVID-19": 2, "Cough": 1, "Dyspnoea": 1, "Pain": 1, "SARS-CoV-2 test positive": 1}}]}
\ No newline at end of file
+{"batchcode": "031G20A", "histograms": [{"histogram": {"COVID-19": 2, "Cough": 1, "Dyspnoea": 1, "Pain": 1, "SARS-CoV-2 test positive": 1}, "batchcodes": ["031G20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031H20A.json b/docs/data/histograms/United States/031H20A.json
index d50654810be..85376851841 100644
--- a/docs/data/histograms/United States/031H20A.json
+++ b/docs/data/histograms/United States/031H20A.json
@@ -1 +1 @@
-{"batchcode": "031H20A", "histograms": [{"batchcodes": ["031H20A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "031H20A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1}, "batchcodes": ["031H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031H2117.json b/docs/data/histograms/United States/031H2117.json
index 4380fa5ba9a..9e71b7c27c7 100644
--- a/docs/data/histograms/United States/031H2117.json
+++ b/docs/data/histograms/United States/031H2117.json
@@ -1 +1 @@
-{"batchcode": "031H2117", "histograms": [{"batchcodes": ["031H2117"], "histogram": {"Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "031H2117", "histograms": [{"histogram": {"Urticaria": 1}, "batchcodes": ["031H2117"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031H21A.json b/docs/data/histograms/United States/031H21A.json
index d2e5f25ee1f..f3bf0120d92 100644
--- a/docs/data/histograms/United States/031H21A.json
+++ b/docs/data/histograms/United States/031H21A.json
@@ -1 +1 @@
-{"batchcode": "031H21A", "histograms": [{"batchcodes": ["031H21A", "1805022"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}}, {"batchcodes": ["031H21A", "EW0170"], "histogram": {"COVID-19": 1, "Vaccination failure": 1}}, {"batchcodes": ["031H21A"], "histogram": {"Expired product administered": 121, "COVID-19": 7, "Fatigue": 6, "Feeling abnormal": 6, "Headache": 6, "Pain in extremity": 6, "Pyrexia": 6, "SARS-CoV-2 test": 6, "Inappropriate schedule of product administration": 5, "Chills": 4, "Rash": 4, "Vaccination site pain": 4, "Accidental underdose": 3, "Hyperhidrosis": 3, "Influenza like illness": 3, "Myalgia": 3, "Pain": 3, "Product storage error": 3, "Vaccination site warmth": 3, "Vomiting": 3, "Back pain": 2, "Body temperature": 2, "Bone pain": 2, "Burning sensation": 2, "Immunisation reaction": 2, "Lymphadenopathy": 2, "Nausea": 2, "Pain of skin": 2, "Pruritus": 2, "Somnolence": 2, "Allergy test": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Asthenia": 1, "Axillary pain": 1, "Balance disorder": 1, "Blood test": 1, "Breast pain": 1, "Cardiac disorder": 1, "Chest discomfort": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Eye discharge": 1, "Eye pain": 1, "Eyelid thickening": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gait inability": 1, "Head discomfort": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Illness": 1, "Incorrect dose administered": 1, "Interchange of vaccine products": 1, "Joint stiffness": 1, "Liver function test": 1, "Lymphadenitis": 1, "Malaise": 1, "Mechanical urticaria": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Product administered to patient of inappropriate age": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Renal function test": 1, "SARS-CoV-2 test positive": 1, "Sinus tachycardia": 1, "Therapeutic response unexpected": 1, "Tremor": 1, "Underdose": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vertigo": 1, "Viral test": 1}}]}
\ No newline at end of file
+{"batchcode": "031H21A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test negative": 1, "SARS-CoV-2 test positive": 1, "Vaccination failure": 1}, "batchcodes": ["031H21A", "1805022"]}, {"histogram": {"COVID-19": 1, "Vaccination failure": 1}, "batchcodes": ["031H21A", "EW0170"]}, {"histogram": {"Expired product administered": 121, "COVID-19": 7, "Fatigue": 6, "Feeling abnormal": 6, "Headache": 6, "Pain in extremity": 6, "Pyrexia": 6, "SARS-CoV-2 test": 6, "Inappropriate schedule of product administration": 5, "Chills": 4, "Rash": 4, "Vaccination site pain": 4, "Accidental underdose": 3, "Hyperhidrosis": 3, "Influenza like illness": 3, "Myalgia": 3, "Pain": 3, "Product storage error": 3, "Vaccination site warmth": 3, "Vomiting": 3, "Back pain": 2, "Body temperature": 2, "Bone pain": 2, "Burning sensation": 2, "Immunisation reaction": 2, "Lymphadenopathy": 2, "Nausea": 2, "Pain of skin": 2, "Pruritus": 2, "Somnolence": 2, "Allergy test": 1, "Anaphylactic reaction": 1, "Anxiety": 1, "Asthenia": 1, "Axillary pain": 1, "Balance disorder": 1, "Blood test": 1, "Breast pain": 1, "Cardiac disorder": 1, "Chest discomfort": 1, "Cough": 1, "Diarrhoea": 1, "Dizziness": 1, "Dysgeusia": 1, "Dysphagia": 1, "Dyspnoea": 1, "Eye discharge": 1, "Eye pain": 1, "Eyelid thickening": 1, "Feeling cold": 1, "Gait disturbance": 1, "Gait inability": 1, "Head discomfort": 1, "Heart rate": 1, "Hypersensitivity": 1, "Hypoaesthesia": 1, "Hypokinesia": 1, "Illness": 1, "Incorrect dose administered": 1, "Interchange of vaccine products": 1, "Joint stiffness": 1, "Liver function test": 1, "Lymphadenitis": 1, "Malaise": 1, "Mechanical urticaria": 1, "Musculoskeletal stiffness": 1, "Nasal congestion": 1, "Neck pain": 1, "Oropharyngeal discomfort": 1, "Pain in jaw": 1, "Palpitations": 1, "Paraesthesia": 1, "Product administered to patient of inappropriate age": 1, "Product administration error": 1, "Product temperature excursion issue": 1, "Renal function test": 1, "SARS-CoV-2 test positive": 1, "Sinus tachycardia": 1, "Therapeutic response unexpected": 1, "Tremor": 1, "Underdose": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site rash": 1, "Vaccination site urticaria": 1, "Vertigo": 1, "Viral test": 1}, "batchcodes": ["031H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031H21H.json b/docs/data/histograms/United States/031H21H.json
index 6176a4f0016..265dafb1073 100644
--- a/docs/data/histograms/United States/031H21H.json
+++ b/docs/data/histograms/United States/031H21H.json
@@ -1 +1 @@
-{"batchcode": "031H21H", "histograms": [{"batchcodes": ["031H21H", "GH9697"], "histogram": {"Inappropriate schedule of product administration": 1, "Wheezing": 1}}]}
\ No newline at end of file
+{"batchcode": "031H21H", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Wheezing": 1}, "batchcodes": ["031H21H", "GH9697"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031H2A.json b/docs/data/histograms/United States/031H2A.json
index c1a7d86d17a..156e28255e4 100644
--- a/docs/data/histograms/United States/031H2A.json
+++ b/docs/data/histograms/United States/031H2A.json
@@ -1 +1 @@
-{"batchcode": "031H2A", "histograms": [{"batchcodes": ["031H2A"], "histogram": {"Chills": 1, "Headache": 1, "Pityriasis rosea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031H2A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Pityriasis rosea": 1, "Pyrexia": 1}, "batchcodes": ["031H2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031I20A.json b/docs/data/histograms/United States/031I20A.json
index 0b3f98fbac1..f837e8b7ae3 100644
--- a/docs/data/histograms/United States/031I20A.json
+++ b/docs/data/histograms/United States/031I20A.json
@@ -1 +1 @@
-{"batchcode": "031I20A", "histograms": [{"batchcodes": ["031I20A"], "histogram": {"COVID-19": 1, "Death": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Feeling abnormal": 1, "Headache": 1, "Injection site pain": 1, "Memory impairment": 1, "Myalgia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "031I20A", "histograms": [{"histogram": {"COVID-19": 1, "Death": 1, "Disturbance in attention": 1, "Dysarthria": 1, "Feeling abnormal": 1, "Headache": 1, "Injection site pain": 1, "Memory impairment": 1, "Myalgia": 1, "SARS-CoV-2 test": 1, "Vaccination failure": 1}, "batchcodes": ["031I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031IL20A.json b/docs/data/histograms/United States/031IL20A.json
index 3d996f25cd4..3df290d6cc5 100644
--- a/docs/data/histograms/United States/031IL20A.json
+++ b/docs/data/histograms/United States/031IL20A.json
@@ -1 +1 @@
-{"batchcode": "031IL20A", "histograms": [{"batchcodes": ["031IL20A"], "histogram": {"Antibody test": 1, "Antibody test negative": 1}}]}
\ No newline at end of file
+{"batchcode": "031IL20A", "histograms": [{"histogram": {"Antibody test": 1, "Antibody test negative": 1}, "batchcodes": ["031IL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031K20A.json b/docs/data/histograms/United States/031K20A.json
index 0210d1022f1..1fe6307acdc 100644
--- a/docs/data/histograms/United States/031K20A.json
+++ b/docs/data/histograms/United States/031K20A.json
@@ -1 +1 @@
-{"batchcode": "031K20A", "histograms": [{"batchcodes": ["031K20A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Condition aggravated": 1, "Coronavirus test": 1, "Cough": 1, "Inappropriate schedule of product administration": 1, "Nasal discharge discolouration": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Throat tightness": 1}}]}
\ No newline at end of file
+{"batchcode": "031K20A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Condition aggravated": 1, "Coronavirus test": 1, "Cough": 1, "Inappropriate schedule of product administration": 1, "Nasal discharge discolouration": 1, "Nausea": 1, "Oropharyngeal pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Respiration abnormal": 1, "Throat tightness": 1}, "batchcodes": ["031K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L 20A.json b/docs/data/histograms/United States/031L 20A.json
index 0a9505caeae..46c86c0b183 100644
--- a/docs/data/histograms/United States/031L 20A.json
+++ b/docs/data/histograms/United States/031L 20A.json
@@ -1 +1 @@
-{"batchcode": "031L 20A", "histograms": [{"batchcodes": ["031L 20A"], "histogram": {"Oropharyngeal pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031L 20A", "histograms": [{"histogram": {"Oropharyngeal pain": 1}, "batchcodes": ["031L 20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L00A.json b/docs/data/histograms/United States/031L00A.json
index a217094bbd4..cba816397e7 100644
--- a/docs/data/histograms/United States/031L00A.json
+++ b/docs/data/histograms/United States/031L00A.json
@@ -1 +1 @@
-{"batchcode": "031L00A", "histograms": [{"batchcodes": ["031L00A"], "histogram": {"Chills": 1, "Cough": 1, "Hyperhidrosis": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Productive cough": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031L00A", "histograms": [{"histogram": {"Chills": 1, "Cough": 1, "Hyperhidrosis": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Productive cough": 1, "Pyrexia": 1}, "batchcodes": ["031L00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L2(OR Z)0A.json b/docs/data/histograms/United States/031L2(OR Z)0A.json
index 48eb19a977d..3c26268cc1f 100644
--- a/docs/data/histograms/United States/031L2(OR Z)0A.json
+++ b/docs/data/histograms/United States/031L2(OR Z)0A.json
@@ -1 +1 @@
-{"batchcode": "031L2(OR Z)0A", "histograms": [{"batchcodes": ["031L2(OR Z)0A"], "histogram": {"Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031L2(OR Z)0A", "histograms": [{"histogram": {"Vaccination site pain": 1}, "batchcodes": ["031L2(OR Z)0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L2.json b/docs/data/histograms/United States/031L2.json
index 4c7c22c6fda..a1105aa5e6e 100644
--- a/docs/data/histograms/United States/031L2.json
+++ b/docs/data/histograms/United States/031L2.json
@@ -1 +1 @@
-{"batchcode": "031L2", "histograms": [{"batchcodes": ["031L2"], "histogram": {"Abdominal pain upper": 1, "Urticaria": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "031L2", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Urticaria": 1, "Vaccination site pruritus": 1}, "batchcodes": ["031L2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L20.json b/docs/data/histograms/United States/031L20.json
index 7a37da12ad3..0f16fab6c34 100644
--- a/docs/data/histograms/United States/031L20.json
+++ b/docs/data/histograms/United States/031L20.json
@@ -1 +1 @@
-{"batchcode": "031L20", "histograms": [{"batchcodes": ["031L20"], "histogram": {"Blood potassium": 1, "Blood sodium": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Colitis ulcerative": 1, "Computerised tomogram thorax": 1, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20", "histograms": [{"histogram": {"Blood potassium": 1, "Blood sodium": 1, "COVID-19": 1, "COVID-19 pneumonia": 1, "Colitis ulcerative": 1, "Computerised tomogram thorax": 1, "Vaccination failure": 1}, "batchcodes": ["031L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L200.json b/docs/data/histograms/United States/031L200.json
index 71f7f4ea063..fa66bad9852 100644
--- a/docs/data/histograms/United States/031L200.json
+++ b/docs/data/histograms/United States/031L200.json
@@ -1 +1 @@
-{"batchcode": "031L200", "histograms": [{"batchcodes": ["031L200"], "histogram": {"Chills": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031L200", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["031L200"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L201.json b/docs/data/histograms/United States/031L201.json
index 755623ef489..5aea148119d 100644
--- a/docs/data/histograms/United States/031L201.json
+++ b/docs/data/histograms/United States/031L201.json
@@ -1 +1 @@
-{"batchcode": "031L201", "histograms": [{"batchcodes": ["031L201"], "histogram": {"Dizziness": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "031L201", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1}, "batchcodes": ["031L201"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L204.json b/docs/data/histograms/United States/031L204.json
index 946283c3232..857dd43ea31 100644
--- a/docs/data/histograms/United States/031L204.json
+++ b/docs/data/histograms/United States/031L204.json
@@ -1 +1 @@
-{"batchcode": "031L204", "histograms": [{"batchcodes": ["031L204"], "histogram": {"Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Blood glucose": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Tinnitus": 1, "Ultrasound foetal": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "031L204", "histograms": [{"histogram": {"Vaccination site erythema": 2, "Vaccination site pain": 2, "Vaccination site warmth": 2, "Blood glucose": 1, "Maternal exposure during pregnancy": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Tinnitus": 1, "Ultrasound foetal": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["031L204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L206.json b/docs/data/histograms/United States/031L206.json
index a6706cf8657..64401a3b078 100644
--- a/docs/data/histograms/United States/031L206.json
+++ b/docs/data/histograms/United States/031L206.json
@@ -1 +1 @@
-{"batchcode": "031L206", "histograms": [{"batchcodes": ["031L206"], "histogram": {"Exposure during pregnancy": 1}}]}
\ No newline at end of file
+{"batchcode": "031L206", "histograms": [{"histogram": {"Exposure during pregnancy": 1}, "batchcodes": ["031L206"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L209 OR 0311.json b/docs/data/histograms/United States/031L209 OR 0311.json
index 986f5be44a2..298a1ddc6db 100644
--- a/docs/data/histograms/United States/031L209 OR 0311.json
+++ b/docs/data/histograms/United States/031L209 OR 0311.json
@@ -1 +1 @@
-{"batchcode": "031L209 OR 0311", "histograms": [{"batchcodes": ["031L209 OR 0311"], "histogram": {"Headache": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031L209 OR 0311", "histograms": [{"histogram": {"Headache": 1, "Musculoskeletal stiffness": 1, "Pain in extremity": 1}, "batchcodes": ["031L209 OR 0311"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L209.json b/docs/data/histograms/United States/031L209.json
index c876f85499f..14a5e205c8e 100644
--- a/docs/data/histograms/United States/031L209.json
+++ b/docs/data/histograms/United States/031L209.json
@@ -1 +1 @@
-{"batchcode": "031L209", "histograms": [{"batchcodes": ["031L209"], "histogram": {"Computerised tomogram": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "031L209", "histograms": [{"histogram": {"Computerised tomogram": 1, "Thrombosis": 1}, "batchcodes": ["031L209"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L20A.json b/docs/data/histograms/United States/031L20A.json
index 161b1c9c74a..dd6a4af3241 100644
--- a/docs/data/histograms/United States/031L20A.json
+++ b/docs/data/histograms/United States/031L20A.json
@@ -1 +1 @@
-{"batchcode": "031L20A", "histograms": [{"batchcodes": ["031L20A"], "histogram": {"Product temperature excursion issue": 353, "Poor quality product administered": 352, "Fatigue": 152, "Headache": 149, "Pain in extremity": 132, "Pyrexia": 127, "Chills": 124, "Myalgia": 102, "Vaccination site pain": 92, "Vaccination site erythema": 81, "Pain": 72, "Nausea": 70, "Arthralgia": 66, "Pruritus": 63, "Dizziness": 56, "Erythema": 52, "Vaccination site pruritus": 51, "Vaccination site swelling": 48, "Asthenia": 46, "Feeling abnormal": 43, "Rash": 40, "Body temperature": 38, "Peripheral swelling": 37, "Diarrhoea": 36, "Vaccination site rash": 33, "Vomiting": 33, "COVID-19": 31, "Vaccination site warmth": 31, "Malaise": 29, "SARS-CoV-2 test": 29, "Back pain": 27, "Dyspnoea": 27, "Feeling hot": 24, "Influenza like illness": 24, "Swelling": 22, "Tremor": 22, "Inappropriate schedule of product administration": 21, "Lymphadenopathy": 20, "Hypoaesthesia": 19, "Expired product administered": 18, "Illness": 18, "Urticaria": 18, "Cough": 17, "Injection site erythema": 16, "Insomnia": 16, "Abdominal pain upper": 15, "Blood pressure measurement": 15, "Hyperhidrosis": 15, "Abdominal discomfort": 14, "Decreased appetite": 14, "Fall": 14, "Neck pain": 14, "Rhinorrhoea": 14, "Somnolence": 14, "Vaccination site induration": 14, "Injection site pain": 13, "Nasopharyngitis": 13, "Paraesthesia": 13, "Heart rate increased": 12, "Palpitations": 12, "Vaccination complication": 12, "Computerised tomogram": 11, "Ear pain": 11, "Heart rate": 11, "Injection site swelling": 11, "Oropharyngeal pain": 11, "Exposure during pregnancy": 10, "Gait disturbance": 10, "Head discomfort": 10, "Nasal congestion": 10, "Product dose omission issue": 10, "Blood pressure increased": 9, "Ear discomfort": 9, "Injection site pruritus": 9, "Joint swelling": 9, "Skin discolouration": 9, "Tinnitus": 9, "Vaccination site mass": 9, "Vaccination site reaction": 9, "Axillary pain": 8, "Blood test": 8, "Electrocardiogram": 8, "Hypersensitivity": 8, "Loss of consciousness": 8, "Mobility decreased": 8, "Musculoskeletal stiffness": 8, "Swelling face": 8, "Vaccination site bruising": 8, "Chest pain": 7, "Dehydration": 7, "Drug ineffective": 7, "Herpes zoster": 7, "Hypertension": 7, "Lip swelling": 7, "Paraesthesia oral": 7, "Rash erythematous": 7, "Rash pruritic": 7, "SARS-CoV-2 test positive": 7, "Vaccination site discolouration": 7, "Ageusia": 6, "Allergy to vaccine": 6, "Arthritis": 6, "Breast pain": 6, "Cold sweat": 6, "Contusion": 6, "Discomfort": 6, "Dry mouth": 6, "Feeling cold": 6, "Flushing": 6, "Hypotension": 6, "Induration": 6, "Inflammation": 6, "Injection site warmth": 6, "Limb discomfort": 6, "Tenderness": 6, "Wheezing": 6, "Abdominal distension": 5, "Abdominal pain": 5, "Antibody test": 5, "Biopsy": 5, "C-reactive protein": 5, "Chest discomfort": 5, "Condition aggravated": 5, "Dry skin": 5, "Eye pain": 5, "Hypersomnia": 5, "Injection site rash": 5, "Loss of personal independence in daily activities": 5, "Lymph node pain": 5, "Magnetic resonance imaging": 5, "Memory impairment": 5, "Night sweats": 5, "Rash macular": 5, "Toothache": 5, "Ultrasound scan": 5, "X-ray": 5, "Adverse reaction": 4, "Anaphylactic reaction": 4, "Anxiety": 4, "Bedridden": 4, "Blood cholesterol": 4, "Breast swelling": 4, "Burning sensation": 4, "Confusional state": 4, "Device connection issue": 4, "Dysstasia": 4, "Hot flush": 4, "Incorrect dose administered": 4, "Incorrect route of product administration": 4, "Lethargy": 4, "Migraine": 4, "Muscular weakness": 4, "Platelet count": 4, "Pregnancy test": 4, "Pulmonary embolism": 4, "Red blood cell sedimentation rate": 4, "SARS-CoV-2 antibody test": 4, "Sleep disorder": 4, "Sneezing": 4, "Tachycardia": 4, "Underdose": 4, "Vertigo": 4, "White blood cell count": 4, "Abdominal pain lower": 3, "Abnormal dreams": 3, "Acne": 3, "Alopecia": 3, "Anosmia": 3, "Atrial fibrillation": 3, "Balance disorder": 3, "Blister": 3, "Blood glucose": 3, "Bone pain": 3, "Cerebrovascular accident": 3, "Dyspepsia": 3, "Dysphagia": 3, "Influenza": 3, "Lacrimation increased": 3, "Maternal exposure during pregnancy": 3, "Movement disorder": 3, "Muscle tightness": 3, "Nasal discomfort": 3, "Oral discomfort": 3, "Oxygen saturation": 3, "Pain in jaw": 3, "Parosmia": 3, "Pneumonia": 3, "Poor quality sleep": 3, "Presyncope": 3, "Product storage error": 3, "Rash papular": 3, "Sinus congestion": 3, "Sinusitis": 3, "Skin burning sensation": 3, "Skin warm": 3, "Syncope": 3, "Therapeutic response unexpected": 3, "Thrombosis": 3, "Vaccination site discomfort": 3, "Vaccination site haemorrhage": 3, "Vaccination site inflammation": 3, "Vision blurred": 3, "Abnormal loss of weight": 2, "Accidental overdose": 2, "Albumin globulin ratio": 2, "Anion gap": 2, "Bell's palsy": 2, "Blood alkaline phosphatase": 2, "Blood potassium": 2, "Blood triglycerides": 2, "Breast cancer": 2, "Breast tenderness": 2, "Cellulitis": 2, "Coordination abnormal": 2, "Deafness": 2, "Dermatitis": 2, "Dry eye": 2, "Dysarthria": 2, "Dysgeusia": 2, "Dysphemia": 2, "Dysphonia": 2, "Dysuria": 2, "Ear congestion": 2, "Echocardiogram": 2, "Exposure via breast milk": 2, "Feeling of body temperature change": 2, "Food poisoning": 2, "Full blood count": 2, "Gait inability": 2, "Gastrointestinal haemorrhage": 2, "Gastrooesophageal reflux disease": 2, "Gynaecological examination": 2, "Heart rate irregular": 2, "High density lipoprotein": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Hypoxia": 2, "Impaired work ability": 2, "Infection": 2, "Injection site discolouration": 2, "Injection site hypersensitivity": 2, "Injection site induration": 2, "Irritability": 2, "Low density lipoprotein": 2, "Lymphocyte count": 2, "Mammogram": 2, "Mass": 2, "Monocyte count": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Musculoskeletal discomfort": 2, "Myositis": 2, "Nervousness": 2, "Neuralgia": 2, "Non-high-density lipoprotein cholesterol": 2, "Oral pain": 2, "Oropharyngeal discomfort": 2, "Pericarditis": 2, "Periorbital swelling": 2, "Petechiae": 2, "Pharyngeal swelling": 2, "Photophobia": 2, "Pollakiuria": 2, "Respiratory disorder": 2, "Restlessness": 2, "Rhinalgia": 2, "Salivary hypersecretion": 2, "Sciatica": 2, "Sensation of foreign body": 2, "Sensitive skin": 2, "Sensory disturbance": 2, "Sensory loss": 2, "Sinus disorder": 2, "Stress": 2, "Swollen tongue": 2, "Taste disorder": 2, "Throat irritation": 2, "Type IV hypersensitivity reaction": 2, "Unevaluable event": 2, "Upper-airway cough syndrome": 2, "Urinary tract infection": 2, "Varicose vein": 2, "Very low density lipoprotein": 2, "Viral infection": 2, "Visual impairment": 2, "Vitreous floaters": 2, "Weight decreased": 2, "Abnormal sensation in eye": 1, "Abnormal weight gain": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Activated protein C resistance test": 1, "Acute kidney injury": 1, "Adverse drug reaction": 1, "Aggression": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Amnesia": 1, "Angina pectoris": 1, "Angioedema": 1, "Antithrombin III": 1, "Aphasia": 1, "Aplastic anaemia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Ataxia": 1, "Basophil count": 1, "Biopsy breast": 1, "Biopsy breast abnormal": 1, "Bladder discomfort": 1, "Blepharospasm": 1, "Blindness": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood blister": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood homocysteine": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin G decreased": 1, "Blood lactic acid increased": 1, "Blood osmolarity": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure inadequately controlled": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urine present": 1, "Body temperature increased": 1, "Breast cancer female": 1, "Breast cellulitis": 1, "Candida infection": 1, "Carbon dioxide": 1, "Cardiovascular evaluation": 1, "Carditis": 1, "Cerebral haemorrhage": 1, "Cerebrospinal fluid circulation disorder": 1, "Chromaturia": 1, "Chronic gastritis": 1, "Coagulopathy": 1, "Cognitive disorder": 1, "Computerised tomogram thorax": 1, "Connective tissue disorder": 1, "Constipation": 1, "Cranial nerve disorder": 1, "Deep vein thrombosis": 1, "Dental caries": 1, "Depression": 1, "Dermatitis allergic": 1, "Dermatitis bullous": 1, "Diabetes mellitus": 1, "Diabetic neuropathy": 1, "Dialysis": 1, "Diplopia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Drainage": 1, "Drug intolerance": 1, "Ear haemorrhage": 1, "Ear inflammation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Emotional distress": 1, "Enzyme level increased": 1, "Eosinophil count": 1, "Epistaxis": 1, "Eructation": 1, "Euphoric mood": 1, "Extrasystoles": 1, "Eye disorder": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid margin crusting": 1, "Eyelid ptosis": 1, "Face injury": 1, "Facial discomfort": 1, "Facial pain": 1, "Facial paralysis": 1, "Facial paresis": 1, "Faeces pale": 1, "Fear": 1, "Feeding disorder": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Foot fracture": 1, "Functional gastrointestinal disorder": 1, "Fungal infection": 1, "Gastrointestinal pain": 1, "Genital herpes": 1, "Giant cell arteritis": 1, "Globulin": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Haemorrhoids": 1, "Hair texture abnormal": 1, "Hallucination": 1, "Head injury": 1, "Head titubation": 1, "Heart rate abnormal": 1, "Hepatic enzyme": 1, "Hepatitis C antibody": 1, "Housebound": 1, "Hypoacusis": 1, "Hypopnoea": 1, "Ill-defined disorder": 1, "Immunodeficiency": 1, "Incontinence": 1, "Injected limb mobility decreased": 1, "Injection site discomfort": 1, "Injection site extravasation": 1, "Injection site haemorrhage": 1, "Injection site indentation": 1, "Injection site joint swelling": 1, "Injection site mass": 1, "Injection site reaction": 1, "Intention tremor": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Intestinal obstruction": 1, "Joint dislocation": 1, "Joint effusion": 1, "Joint stiffness": 1, "Keratosis pilaris": 1, "Knuckle pads": 1, "Leukocytosis": 1, "Ligament sprain": 1, "Light chain analysis": 1, "Lipoprotein (a)": 1, "Livedo reticularis": 1, "Liver function test": 1, "Lung disorder": 1, "Lung neoplasm malignant": 1, "Lymphatic disorder": 1, "Lymphoma": 1, "Magnetic resonance imaging head": 1, "Malabsorption": 1, "Maternal exposure before pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meniere's disease": 1, "Migraine with aura": 1, "Monoplegia": 1, "Mood altered": 1, "Multiple sclerosis": 1, "Muscle discomfort": 1, "Muscle mass": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Mydriasis": 1, "Nasal oedema": 1, "Needle issue": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neutrophil count": 1, "Nightmare": 1, "No adverse event": 1, "Obstructive airways disorder": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral herpes": 1, "Pain of skin": 1, "Pallor": 1, "Panic attack": 1, "Papule": 1, "Parkinson's disease": 1, "Pelvic venous thrombosis": 1, "Pemphigoid": 1, "Perioral dermatitis": 1, "Peripheral coldness": 1, "Pharyngeal paraesthesia": 1, "Physical examination": 1, "Plasmin inhibitor": 1, "Plasminogen activator inhibitor": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Polymyalgia rheumatica": 1, "Poor peripheral circulation": 1, "Post herpetic neuralgia": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Product administration error": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product preparation issue": 1, "Prostatic specific antigen": 1, "Protein C": 1, "Protein S": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin fragment 1.2": 1, "Prothrombin level": 1, "Radiculitis brachial": 1, "Radius fracture": 1, "Rash pustular": 1, "Rectal examination": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate increased": 1, "Renal failure": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Restless arm syndrome": 1, "Retching": 1, "Retinal vascular disorder": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Rosacea": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 carrier": 1, "Scar": 1, "Seizure": 1, "Sepsis": 1, "Sitting disability": 1, "Skin bacterial infection": 1, "Skin disorder": 1, "Skin haemorrhage": 1, "Skin indentation": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin reaction": 1, "Skin swelling": 1, "Skin tightness": 1, "Skin wrinkling": 1, "Sleep apnoea syndrome": 1, "Sluggishness": 1, "Speech disorder": 1, "Spinal pain": 1, "Stoma site hypergranulation": 1, "Streptococcus test": 1, "Temporomandibular joint syndrome": 1, "Tendon pain": 1, "Tension": 1, "Thermal burn": 1, "Thirst": 1, "Throat clearing": 1, "Thrombocytosis": 1, "Thyroid function test": 1, "Tongue rough": 1, "Tooth abscess": 1, "Tooth infection": 1, "Tunnel vision": 1, "Ulnar nerve injury": 1, "Ultrasound antenatal screen normal": 1, "Ultrasound scan vagina": 1, "Ultrasound testes": 1, "Ultrasound uterus": 1, "Underweight": 1, "Urinary bladder haemorrhage": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine abnormality": 1, "Urine output": 1, "Vaccination site irritation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vein disorder": 1, "Venous thrombosis limb": 1, "Vulvovaginal pain": 1, "Weight": 1, "Weight increased": 1, "X-ray limb": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20A", "histograms": [{"histogram": {"Product temperature excursion issue": 353, "Poor quality product administered": 352, "Fatigue": 152, "Headache": 149, "Pain in extremity": 132, "Pyrexia": 127, "Chills": 124, "Myalgia": 102, "Vaccination site pain": 92, "Vaccination site erythema": 81, "Pain": 72, "Nausea": 70, "Arthralgia": 66, "Pruritus": 63, "Dizziness": 56, "Erythema": 52, "Vaccination site pruritus": 51, "Vaccination site swelling": 48, "Asthenia": 46, "Feeling abnormal": 43, "Rash": 40, "Body temperature": 38, "Peripheral swelling": 37, "Diarrhoea": 36, "Vaccination site rash": 33, "Vomiting": 33, "COVID-19": 31, "Vaccination site warmth": 31, "Malaise": 29, "SARS-CoV-2 test": 29, "Back pain": 27, "Dyspnoea": 27, "Feeling hot": 24, "Influenza like illness": 24, "Swelling": 22, "Tremor": 22, "Inappropriate schedule of product administration": 21, "Lymphadenopathy": 20, "Hypoaesthesia": 19, "Expired product administered": 18, "Illness": 18, "Urticaria": 18, "Cough": 17, "Injection site erythema": 16, "Insomnia": 16, "Abdominal pain upper": 15, "Blood pressure measurement": 15, "Hyperhidrosis": 15, "Abdominal discomfort": 14, "Decreased appetite": 14, "Fall": 14, "Neck pain": 14, "Rhinorrhoea": 14, "Somnolence": 14, "Vaccination site induration": 14, "Injection site pain": 13, "Nasopharyngitis": 13, "Paraesthesia": 13, "Heart rate increased": 12, "Palpitations": 12, "Vaccination complication": 12, "Computerised tomogram": 11, "Ear pain": 11, "Heart rate": 11, "Injection site swelling": 11, "Oropharyngeal pain": 11, "Exposure during pregnancy": 10, "Gait disturbance": 10, "Head discomfort": 10, "Nasal congestion": 10, "Product dose omission issue": 10, "Blood pressure increased": 9, "Ear discomfort": 9, "Injection site pruritus": 9, "Joint swelling": 9, "Skin discolouration": 9, "Tinnitus": 9, "Vaccination site mass": 9, "Vaccination site reaction": 9, "Axillary pain": 8, "Blood test": 8, "Electrocardiogram": 8, "Hypersensitivity": 8, "Loss of consciousness": 8, "Mobility decreased": 8, "Musculoskeletal stiffness": 8, "Swelling face": 8, "Vaccination site bruising": 8, "Chest pain": 7, "Dehydration": 7, "Drug ineffective": 7, "Herpes zoster": 7, "Hypertension": 7, "Lip swelling": 7, "Paraesthesia oral": 7, "Rash erythematous": 7, "Rash pruritic": 7, "SARS-CoV-2 test positive": 7, "Vaccination site discolouration": 7, "Ageusia": 6, "Allergy to vaccine": 6, "Arthritis": 6, "Breast pain": 6, "Cold sweat": 6, "Contusion": 6, "Discomfort": 6, "Dry mouth": 6, "Feeling cold": 6, "Flushing": 6, "Hypotension": 6, "Induration": 6, "Inflammation": 6, "Injection site warmth": 6, "Limb discomfort": 6, "Tenderness": 6, "Wheezing": 6, "Abdominal distension": 5, "Abdominal pain": 5, "Antibody test": 5, "Biopsy": 5, "C-reactive protein": 5, "Chest discomfort": 5, "Condition aggravated": 5, "Dry skin": 5, "Eye pain": 5, "Hypersomnia": 5, "Injection site rash": 5, "Loss of personal independence in daily activities": 5, "Lymph node pain": 5, "Magnetic resonance imaging": 5, "Memory impairment": 5, "Night sweats": 5, "Rash macular": 5, "Toothache": 5, "Ultrasound scan": 5, "X-ray": 5, "Adverse reaction": 4, "Anaphylactic reaction": 4, "Anxiety": 4, "Bedridden": 4, "Blood cholesterol": 4, "Breast swelling": 4, "Burning sensation": 4, "Confusional state": 4, "Device connection issue": 4, "Dysstasia": 4, "Hot flush": 4, "Incorrect dose administered": 4, "Incorrect route of product administration": 4, "Lethargy": 4, "Migraine": 4, "Muscular weakness": 4, "Platelet count": 4, "Pregnancy test": 4, "Pulmonary embolism": 4, "Red blood cell sedimentation rate": 4, "SARS-CoV-2 antibody test": 4, "Sleep disorder": 4, "Sneezing": 4, "Tachycardia": 4, "Underdose": 4, "Vertigo": 4, "White blood cell count": 4, "Abdominal pain lower": 3, "Abnormal dreams": 3, "Acne": 3, "Alopecia": 3, "Anosmia": 3, "Atrial fibrillation": 3, "Balance disorder": 3, "Blister": 3, "Blood glucose": 3, "Bone pain": 3, "Cerebrovascular accident": 3, "Dyspepsia": 3, "Dysphagia": 3, "Influenza": 3, "Lacrimation increased": 3, "Maternal exposure during pregnancy": 3, "Movement disorder": 3, "Muscle tightness": 3, "Nasal discomfort": 3, "Oral discomfort": 3, "Oxygen saturation": 3, "Pain in jaw": 3, "Parosmia": 3, "Pneumonia": 3, "Poor quality sleep": 3, "Presyncope": 3, "Product storage error": 3, "Rash papular": 3, "Sinus congestion": 3, "Sinusitis": 3, "Skin burning sensation": 3, "Skin warm": 3, "Syncope": 3, "Therapeutic response unexpected": 3, "Thrombosis": 3, "Vaccination site discomfort": 3, "Vaccination site haemorrhage": 3, "Vaccination site inflammation": 3, "Vision blurred": 3, "Abnormal loss of weight": 2, "Accidental overdose": 2, "Albumin globulin ratio": 2, "Anion gap": 2, "Bell's palsy": 2, "Blood alkaline phosphatase": 2, "Blood potassium": 2, "Blood triglycerides": 2, "Breast cancer": 2, "Breast tenderness": 2, "Cellulitis": 2, "Coordination abnormal": 2, "Deafness": 2, "Dermatitis": 2, "Dry eye": 2, "Dysarthria": 2, "Dysgeusia": 2, "Dysphemia": 2, "Dysphonia": 2, "Dysuria": 2, "Ear congestion": 2, "Echocardiogram": 2, "Exposure via breast milk": 2, "Feeling of body temperature change": 2, "Food poisoning": 2, "Full blood count": 2, "Gait inability": 2, "Gastrointestinal haemorrhage": 2, "Gastrooesophageal reflux disease": 2, "Gynaecological examination": 2, "Heart rate irregular": 2, "High density lipoprotein": 2, "Hypoaesthesia oral": 2, "Hypokinesia": 2, "Hypoxia": 2, "Impaired work ability": 2, "Infection": 2, "Injection site discolouration": 2, "Injection site hypersensitivity": 2, "Injection site induration": 2, "Irritability": 2, "Low density lipoprotein": 2, "Lymphocyte count": 2, "Mammogram": 2, "Mass": 2, "Monocyte count": 2, "Mouth swelling": 2, "Muscle spasms": 2, "Musculoskeletal discomfort": 2, "Myositis": 2, "Nervousness": 2, "Neuralgia": 2, "Non-high-density lipoprotein cholesterol": 2, "Oral pain": 2, "Oropharyngeal discomfort": 2, "Pericarditis": 2, "Periorbital swelling": 2, "Petechiae": 2, "Pharyngeal swelling": 2, "Photophobia": 2, "Pollakiuria": 2, "Respiratory disorder": 2, "Restlessness": 2, "Rhinalgia": 2, "Salivary hypersecretion": 2, "Sciatica": 2, "Sensation of foreign body": 2, "Sensitive skin": 2, "Sensory disturbance": 2, "Sensory loss": 2, "Sinus disorder": 2, "Stress": 2, "Swollen tongue": 2, "Taste disorder": 2, "Throat irritation": 2, "Type IV hypersensitivity reaction": 2, "Unevaluable event": 2, "Upper-airway cough syndrome": 2, "Urinary tract infection": 2, "Varicose vein": 2, "Very low density lipoprotein": 2, "Viral infection": 2, "Visual impairment": 2, "Vitreous floaters": 2, "Weight decreased": 2, "Abnormal sensation in eye": 1, "Abnormal weight gain": 1, "Accidental underdose": 1, "Acoustic stimulation tests": 1, "Activated protein C resistance test": 1, "Acute kidney injury": 1, "Adverse drug reaction": 1, "Aggression": 1, "Agitation": 1, "Alanine aminotransferase": 1, "Altered state of consciousness": 1, "Amnesia": 1, "Angina pectoris": 1, "Angioedema": 1, "Antithrombin III": 1, "Aphasia": 1, "Aplastic anaemia": 1, "Arteriosclerosis": 1, "Aspartate aminotransferase": 1, "Asthma": 1, "Ataxia": 1, "Basophil count": 1, "Biopsy breast": 1, "Biopsy breast abnormal": 1, "Bladder discomfort": 1, "Blepharospasm": 1, "Blindness": 1, "Blood albumin": 1, "Blood bilirubin": 1, "Blood blister": 1, "Blood calcium": 1, "Blood chloride": 1, "Blood cholesterol increased": 1, "Blood creatine phosphokinase": 1, "Blood creatine phosphokinase increased": 1, "Blood creatinine": 1, "Blood fibrinogen": 1, "Blood homocysteine": 1, "Blood immunoglobulin G": 1, "Blood immunoglobulin G decreased": 1, "Blood lactic acid increased": 1, "Blood osmolarity": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood pressure inadequately controlled": 1, "Blood sodium": 1, "Blood urea": 1, "Blood urine present": 1, "Body temperature increased": 1, "Breast cancer female": 1, "Breast cellulitis": 1, "Candida infection": 1, "Carbon dioxide": 1, "Cardiovascular evaluation": 1, "Carditis": 1, "Cerebral haemorrhage": 1, "Cerebrospinal fluid circulation disorder": 1, "Chromaturia": 1, "Chronic gastritis": 1, "Coagulopathy": 1, "Cognitive disorder": 1, "Computerised tomogram thorax": 1, "Connective tissue disorder": 1, "Constipation": 1, "Cranial nerve disorder": 1, "Deep vein thrombosis": 1, "Dental caries": 1, "Depression": 1, "Dermatitis allergic": 1, "Dermatitis bullous": 1, "Diabetes mellitus": 1, "Diabetic neuropathy": 1, "Dialysis": 1, "Diplopia": 1, "Disorientation": 1, "Disturbance in attention": 1, "Diverticulitis": 1, "Drainage": 1, "Drug intolerance": 1, "Ear haemorrhage": 1, "Ear inflammation": 1, "Electrocardiogram ambulatory": 1, "Electroencephalogram": 1, "Emotional distress": 1, "Enzyme level increased": 1, "Eosinophil count": 1, "Epistaxis": 1, "Eructation": 1, "Euphoric mood": 1, "Extrasystoles": 1, "Eye disorder": 1, "Eye pruritus": 1, "Eye swelling": 1, "Eyelid margin crusting": 1, "Eyelid ptosis": 1, "Face injury": 1, "Facial discomfort": 1, "Facial pain": 1, "Facial paralysis": 1, "Facial paresis": 1, "Faeces pale": 1, "Fear": 1, "Feeding disorder": 1, "Fibromyalgia": 1, "Flatulence": 1, "Fluid retention": 1, "Foot fracture": 1, "Functional gastrointestinal disorder": 1, "Fungal infection": 1, "Gastrointestinal pain": 1, "Genital herpes": 1, "Giant cell arteritis": 1, "Globulin": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Haematochezia": 1, "Haematocrit": 1, "Haematoma": 1, "Haemoglobin": 1, "Haemorrhoids": 1, "Hair texture abnormal": 1, "Hallucination": 1, "Head injury": 1, "Head titubation": 1, "Heart rate abnormal": 1, "Hepatic enzyme": 1, "Hepatitis C antibody": 1, "Housebound": 1, "Hypoacusis": 1, "Hypopnoea": 1, "Ill-defined disorder": 1, "Immunodeficiency": 1, "Incontinence": 1, "Injected limb mobility decreased": 1, "Injection site discomfort": 1, "Injection site extravasation": 1, "Injection site haemorrhage": 1, "Injection site indentation": 1, "Injection site joint swelling": 1, "Injection site mass": 1, "Injection site reaction": 1, "Intention tremor": 1, "Intentional dose omission": 1, "Intentional product use issue": 1, "Intestinal obstruction": 1, "Joint dislocation": 1, "Joint effusion": 1, "Joint stiffness": 1, "Keratosis pilaris": 1, "Knuckle pads": 1, "Leukocytosis": 1, "Ligament sprain": 1, "Light chain analysis": 1, "Lipoprotein (a)": 1, "Livedo reticularis": 1, "Liver function test": 1, "Lung disorder": 1, "Lung neoplasm malignant": 1, "Lymphatic disorder": 1, "Lymphoma": 1, "Magnetic resonance imaging head": 1, "Malabsorption": 1, "Maternal exposure before pregnancy": 1, "Mean cell haemoglobin": 1, "Mean cell haemoglobin concentration": 1, "Mean cell volume": 1, "Meniere's disease": 1, "Migraine with aura": 1, "Monoplegia": 1, "Mood altered": 1, "Multiple sclerosis": 1, "Muscle discomfort": 1, "Muscle mass": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal pain": 1, "Mydriasis": 1, "Nasal oedema": 1, "Needle issue": 1, "Neuralgic amyotrophy": 1, "Neurological examination": 1, "Neutrophil count": 1, "Nightmare": 1, "No adverse event": 1, "Obstructive airways disorder": 1, "Ocular discomfort": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oedema peripheral": 1, "Off label use": 1, "Oral herpes": 1, "Pain of skin": 1, "Pallor": 1, "Panic attack": 1, "Papule": 1, "Parkinson's disease": 1, "Pelvic venous thrombosis": 1, "Pemphigoid": 1, "Perioral dermatitis": 1, "Peripheral coldness": 1, "Pharyngeal paraesthesia": 1, "Physical examination": 1, "Plasmin inhibitor": 1, "Plasminogen activator inhibitor": 1, "Platelet count decreased": 1, "Pneumonitis": 1, "Polymyalgia rheumatica": 1, "Poor peripheral circulation": 1, "Post herpetic neuralgia": 1, "Product administered at inappropriate site": 1, "Product administered to patient of inappropriate age": 1, "Product administration error": 1, "Product administration interrupted": 1, "Product availability issue": 1, "Product preparation issue": 1, "Prostatic specific antigen": 1, "Protein C": 1, "Protein S": 1, "Protein total": 1, "Protein urine": 1, "Prothrombin fragment 1.2": 1, "Prothrombin level": 1, "Radiculitis brachial": 1, "Radius fracture": 1, "Rash pustular": 1, "Rectal examination": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate increased": 1, "Renal failure": 1, "Renal impairment": 1, "Respiration abnormal": 1, "Restless arm syndrome": 1, "Retching": 1, "Retinal vascular disorder": 1, "Rheumatoid arthritis": 1, "Road traffic accident": 1, "Rosacea": 1, "Rotator cuff syndrome": 1, "SARS-CoV-2 antibody test negative": 1, "SARS-CoV-2 carrier": 1, "Scar": 1, "Seizure": 1, "Sepsis": 1, "Sitting disability": 1, "Skin bacterial infection": 1, "Skin disorder": 1, "Skin haemorrhage": 1, "Skin indentation": 1, "Skin irritation": 1, "Skin laceration": 1, "Skin reaction": 1, "Skin swelling": 1, "Skin tightness": 1, "Skin wrinkling": 1, "Sleep apnoea syndrome": 1, "Sluggishness": 1, "Speech disorder": 1, "Spinal pain": 1, "Stoma site hypergranulation": 1, "Streptococcus test": 1, "Temporomandibular joint syndrome": 1, "Tendon pain": 1, "Tension": 1, "Thermal burn": 1, "Thirst": 1, "Throat clearing": 1, "Thrombocytosis": 1, "Thyroid function test": 1, "Tongue rough": 1, "Tooth abscess": 1, "Tooth infection": 1, "Tunnel vision": 1, "Ulnar nerve injury": 1, "Ultrasound antenatal screen normal": 1, "Ultrasound scan vagina": 1, "Ultrasound testes": 1, "Ultrasound uterus": 1, "Underweight": 1, "Urinary bladder haemorrhage": 1, "Urinary incontinence": 1, "Urinary retention": 1, "Urine abnormality": 1, "Urine output": 1, "Vaccination site irritation": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site paraesthesia": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vein disorder": 1, "Venous thrombosis limb": 1, "Vulvovaginal pain": 1, "Weight": 1, "Weight increased": 1, "X-ray limb": 1}, "batchcodes": ["031L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L20AE.json b/docs/data/histograms/United States/031L20AE.json
index 0a667f3e28a..72a88afbd43 100644
--- a/docs/data/histograms/United States/031L20AE.json
+++ b/docs/data/histograms/United States/031L20AE.json
@@ -1 +1 @@
-{"batchcode": "031L20AE", "histograms": [{"batchcodes": ["031L20AE"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Body temperature": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Migraine": 1, "Neck pain": 1, "Pain": 1, "Panic attack": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031L20AE", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Body temperature": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Migraine": 1, "Neck pain": 1, "Pain": 1, "Panic attack": 1, "Pyrexia": 1, "Syncope": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["031L20AE"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L21A.json b/docs/data/histograms/United States/031L21A.json
index 430464d8d45..48d3d5962e8 100644
--- a/docs/data/histograms/United States/031L21A.json
+++ b/docs/data/histograms/United States/031L21A.json
@@ -1 +1 @@
-{"batchcode": "031L21A", "histograms": [{"batchcodes": ["031L21A"], "histogram": {"Expired product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "031L21A", "histograms": [{"histogram": {"Expired product administered": 1}, "batchcodes": ["031L21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L22A.json b/docs/data/histograms/United States/031L22A.json
index 89f6ec4e271..194f7b72fe1 100644
--- a/docs/data/histograms/United States/031L22A.json
+++ b/docs/data/histograms/United States/031L22A.json
@@ -1 +1 @@
-{"batchcode": "031L22A", "histograms": [{"batchcodes": ["031L22A"], "histogram": {"Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "031L22A", "histograms": [{"histogram": {"Chills": 1}, "batchcodes": ["031L22A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L2A.json b/docs/data/histograms/United States/031L2A.json
index 0818da292c2..55320f4da0c 100644
--- a/docs/data/histograms/United States/031L2A.json
+++ b/docs/data/histograms/United States/031L2A.json
@@ -1 +1 @@
-{"batchcode": "031L2A", "histograms": [{"batchcodes": ["031L2A"], "histogram": {"Pain in extremity": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031L2A", "histograms": [{"histogram": {"Pain in extremity": 1, "Vaccination site pain": 1}, "batchcodes": ["031L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L2BA.json b/docs/data/histograms/United States/031L2BA.json
index ec9aaa0595a..604fc0300f8 100644
--- a/docs/data/histograms/United States/031L2BA.json
+++ b/docs/data/histograms/United States/031L2BA.json
@@ -1 +1 @@
-{"batchcode": "031L2BA", "histograms": [{"batchcodes": ["031L2BA"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "031L2BA", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["031L2BA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L2DA.json b/docs/data/histograms/United States/031L2DA.json
index 8bb9fc36184..304ab330edb 100644
--- a/docs/data/histograms/United States/031L2DA.json
+++ b/docs/data/histograms/United States/031L2DA.json
@@ -1 +1 @@
-{"batchcode": "031L2DA", "histograms": [{"batchcodes": ["031L2DA"], "histogram": {"Blood blister": 1, "Herpes zoster": 1, "Scar": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "031L2DA", "histograms": [{"histogram": {"Blood blister": 1, "Herpes zoster": 1, "Scar": 1, "Vaccination site rash": 1}, "batchcodes": ["031L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L2OA.json b/docs/data/histograms/United States/031L2OA.json
index fc136e26fe5..d6380e9c447 100644
--- a/docs/data/histograms/United States/031L2OA.json
+++ b/docs/data/histograms/United States/031L2OA.json
@@ -1 +1 @@
-{"batchcode": "031L2OA", "histograms": [{"batchcodes": ["031L2OA"], "histogram": {"Injection site bruising": 1, "Lip swelling": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "031L2OA", "histograms": [{"histogram": {"Injection site bruising": 1, "Lip swelling": 1, "Vaccination site erythema": 1}, "batchcodes": ["031L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031L30A.json b/docs/data/histograms/United States/031L30A.json
index 9a6d8ec699e..38a5184de33 100644
--- a/docs/data/histograms/United States/031L30A.json
+++ b/docs/data/histograms/United States/031L30A.json
@@ -1 +1 @@
-{"batchcode": "031L30A", "histograms": [{"batchcodes": ["031L30A"], "histogram": {"Herpes zoster": 1}}]}
\ No newline at end of file
+{"batchcode": "031L30A", "histograms": [{"histogram": {"Herpes zoster": 1}, "batchcodes": ["031L30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031LC0A.json b/docs/data/histograms/United States/031LC0A.json
index 5ed92ae0f64..05fbd048780 100644
--- a/docs/data/histograms/United States/031LC0A.json
+++ b/docs/data/histograms/United States/031LC0A.json
@@ -1 +1 @@
-{"batchcode": "031LC0A", "histograms": [{"batchcodes": ["031LC0A"], "histogram": {"Dizziness": 1, "Myalgia": 1, "Vaccination site pain": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "031LC0A", "histograms": [{"histogram": {"Dizziness": 1, "Myalgia": 1, "Vaccination site pain": 1, "Vertigo": 1}, "batchcodes": ["031LC0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031LR0A.json b/docs/data/histograms/United States/031LR0A.json
index eaa0f838f33..5f32c0eaceb 100644
--- a/docs/data/histograms/United States/031LR0A.json
+++ b/docs/data/histograms/United States/031LR0A.json
@@ -1 +1 @@
-{"batchcode": "031LR0A", "histograms": [{"batchcodes": ["031LR0A"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "031LR0A", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["031LR0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031LZ0A.json b/docs/data/histograms/United States/031LZ0A.json
index 776b2d4dbf9..1eb9d60e6bf 100644
--- a/docs/data/histograms/United States/031LZ0A.json
+++ b/docs/data/histograms/United States/031LZ0A.json
@@ -1 +1 @@
-{"batchcode": "031LZ0A", "histograms": [{"batchcodes": ["031LZ0A"], "histogram": {"Chills": 4, "Pain in extremity": 3, "Pyrexia": 3, "Vaccination site erythema": 3, "Headache": 2, "Illness": 2, "Malaise": 2, "Pain": 2, "Vaccination site swelling": 2, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Dizziness": 1, "Echocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gastrooesophageal reflux disease": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Influenza like illness": 1, "Limb discomfort": 1, "Neck pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Throat tightness": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "031LZ0A", "histograms": [{"histogram": {"Chills": 4, "Pain in extremity": 3, "Pyrexia": 3, "Vaccination site erythema": 3, "Headache": 2, "Illness": 2, "Malaise": 2, "Pain": 2, "Vaccination site swelling": 2, "Arthralgia": 1, "Asthenia": 1, "Back pain": 1, "Blood test": 1, "Body temperature": 1, "COVID-19": 1, "Chest pain": 1, "Dizziness": 1, "Echocardiogram": 1, "Erythema": 1, "Fatigue": 1, "Feeling abnormal": 1, "Gastrooesophageal reflux disease": 1, "Heart rate increased": 1, "Hypoaesthesia": 1, "Immunisation reaction": 1, "Influenza like illness": 1, "Limb discomfort": 1, "Neck pain": 1, "Paraesthesia": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 antibody test": 1, "SARS-CoV-2 test": 1, "Throat tightness": 1, "Vaccination site pain": 1, "Vaccination site warmth": 1, "Vertigo": 1}, "batchcodes": ["031LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031LZOA.json b/docs/data/histograms/United States/031LZOA.json
index 2caf6f6a7f6..f5dc8beea1f 100644
--- a/docs/data/histograms/United States/031LZOA.json
+++ b/docs/data/histograms/United States/031LZOA.json
@@ -1 +1 @@
-{"batchcode": "031LZOA", "histograms": [{"batchcodes": ["031LZOA"], "histogram": {"Vaccination site pruritus": 2, "Blood test": 1, "Dyspnoea": 1, "Erythema": 1, "Neuropathy peripheral": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "031LZOA", "histograms": [{"histogram": {"Vaccination site pruritus": 2, "Blood test": 1, "Dyspnoea": 1, "Erythema": 1, "Neuropathy peripheral": 1, "Pruritus": 1}, "batchcodes": ["031LZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M00A.json b/docs/data/histograms/United States/031M00A.json
index a998e9b6b71..3acc6cbbada 100644
--- a/docs/data/histograms/United States/031M00A.json
+++ b/docs/data/histograms/United States/031M00A.json
@@ -1 +1 @@
-{"batchcode": "031M00A", "histograms": [{"batchcodes": ["031M00A"], "histogram": {"Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1}}]}
\ No newline at end of file
+{"batchcode": "031M00A", "histograms": [{"histogram": {"Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1}, "batchcodes": ["031M00A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M02A.json b/docs/data/histograms/United States/031M02A.json
index fc5ece62953..2b08b586bbc 100644
--- a/docs/data/histograms/United States/031M02A.json
+++ b/docs/data/histograms/United States/031M02A.json
@@ -1 +1 @@
-{"batchcode": "031M02A", "histograms": [{"batchcodes": ["031M02A"], "histogram": {"Arthralgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031M02A", "histograms": [{"histogram": {"Arthralgia": 1, "Pain in extremity": 1}, "batchcodes": ["031M02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M0A.json b/docs/data/histograms/United States/031M0A.json
index 901575d2224..3008e12f796 100644
--- a/docs/data/histograms/United States/031M0A.json
+++ b/docs/data/histograms/United States/031M0A.json
@@ -1 +1 @@
-{"batchcode": "031M0A", "histograms": [{"batchcodes": ["031M0A"], "histogram": {"Arthralgia": 1, "Feeling hot": 1, "Limb discomfort": 1, "Mumps": 1, "Musculoskeletal discomfort": 1, "Oropharyngeal pain": 1, "Otorrhoea": 1, "Pruritus": 1, "Swelling face": 1, "Urticaria": 1, "Vaccination complication": 1, "Vitamin D decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "031M0A", "histograms": [{"histogram": {"Arthralgia": 1, "Feeling hot": 1, "Limb discomfort": 1, "Mumps": 1, "Musculoskeletal discomfort": 1, "Oropharyngeal pain": 1, "Otorrhoea": 1, "Pruritus": 1, "Swelling face": 1, "Urticaria": 1, "Vaccination complication": 1, "Vitamin D decreased": 1}, "batchcodes": ["031M0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M120A.json b/docs/data/histograms/United States/031M120A.json
index 0dd3721040e..0d90cfc5dbb 100644
--- a/docs/data/histograms/United States/031M120A.json
+++ b/docs/data/histograms/United States/031M120A.json
@@ -1 +1 @@
-{"batchcode": "031M120A", "histograms": [{"batchcodes": ["031M120A"], "histogram": {"Arrhythmia": 1, "Inappropriate schedule of product administration": 1}}]}
\ No newline at end of file
+{"batchcode": "031M120A", "histograms": [{"histogram": {"Arrhythmia": 1, "Inappropriate schedule of product administration": 1}, "batchcodes": ["031M120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M12A.json b/docs/data/histograms/United States/031M12A.json
index 7c7a6c1f99f..9c42b1ef74d 100644
--- a/docs/data/histograms/United States/031M12A.json
+++ b/docs/data/histograms/United States/031M12A.json
@@ -1 +1 @@
-{"batchcode": "031M12A", "histograms": [{"batchcodes": ["031M12A"], "histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031M12A", "histograms": [{"histogram": {"Pain in extremity": 1, "Paraesthesia": 1, "Pyrexia": 1}, "batchcodes": ["031M12A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M20.json b/docs/data/histograms/United States/031M20.json
index 8ff88e7a84c..2c84da9b20d 100644
--- a/docs/data/histograms/United States/031M20.json
+++ b/docs/data/histograms/United States/031M20.json
@@ -1 +1 @@
-{"batchcode": "031M20", "histograms": [{"batchcodes": ["031M20"], "histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20", "histograms": [{"histogram": {"Arthralgia": 1, "Fatigue": 1, "Headache": 1, "Illness": 1, "Limb discomfort": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["031M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M2014.json b/docs/data/histograms/United States/031M2014.json
index 45c8d5f3c15..5e34335933a 100644
--- a/docs/data/histograms/United States/031M2014.json
+++ b/docs/data/histograms/United States/031M2014.json
@@ -1 +1 @@
-{"batchcode": "031M2014", "histograms": [{"batchcodes": ["031M2014"], "histogram": {"Injection site pain": 1, "Injection site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "031M2014", "histograms": [{"histogram": {"Injection site pain": 1, "Injection site pruritus": 1}, "batchcodes": ["031M2014"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M201A.json b/docs/data/histograms/United States/031M201A.json
index 27bc612befa..53aeb49d4eb 100644
--- a/docs/data/histograms/United States/031M201A.json
+++ b/docs/data/histograms/United States/031M201A.json
@@ -1 +1 @@
-{"batchcode": "031M201A", "histograms": [{"batchcodes": ["031M201A"], "histogram": {"Blood glucose fluctuation": 1, "Diarrhoea": 1, "Eczema": 1, "Headache": 1, "Influenza like illness": 1, "Migraine": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "031M201A", "histograms": [{"histogram": {"Blood glucose fluctuation": 1, "Diarrhoea": 1, "Eczema": 1, "Headache": 1, "Influenza like illness": 1, "Migraine": 1, "Neck pain": 1, "Pain in extremity": 1, "Pyrexia": 1, "Vaccination site rash": 1}, "batchcodes": ["031M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M204.json b/docs/data/histograms/United States/031M204.json
index 143f4b44217..c203a8838c5 100644
--- a/docs/data/histograms/United States/031M204.json
+++ b/docs/data/histograms/United States/031M204.json
@@ -1 +1 @@
-{"batchcode": "031M204", "histograms": [{"batchcodes": ["031M204"], "histogram": {"Pain in extremity": 4, "Asthenia": 2, "Burning sensation": 2, "Vaccination site erythema": 2, "Adverse reaction": 1, "Chills": 1, "Condition aggravated": 1, "Cough": 1, "Decreased activity": 1, "Depressed mood": 1, "Feeding disorder": 1, "Feeling hot": 1, "Impaired healing": 1, "Inflammation": 1, "Injection site erythema": 1, "Oropharyngeal pain": 1, "Rash": 1, "Rash erythematous": 1, "SARS-CoV-2 test": 1, "Throat irritation": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "031M204", "histograms": [{"histogram": {"Pain in extremity": 4, "Asthenia": 2, "Burning sensation": 2, "Vaccination site erythema": 2, "Adverse reaction": 1, "Chills": 1, "Condition aggravated": 1, "Cough": 1, "Decreased activity": 1, "Depressed mood": 1, "Feeding disorder": 1, "Feeling hot": 1, "Impaired healing": 1, "Inflammation": 1, "Injection site erythema": 1, "Oropharyngeal pain": 1, "Rash": 1, "Rash erythematous": 1, "SARS-CoV-2 test": 1, "Throat irritation": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["031M204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M208.json b/docs/data/histograms/United States/031M208.json
index dd15546ad37..30e0aeaa78c 100644
--- a/docs/data/histograms/United States/031M208.json
+++ b/docs/data/histograms/United States/031M208.json
@@ -1 +1 @@
-{"batchcode": "031M208", "histograms": [{"batchcodes": ["031M208"], "histogram": {"Dizziness": 1, "Pain in extremity": 1, "Suspected COVID-19": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo": 1}}]}
\ No newline at end of file
+{"batchcode": "031M208", "histograms": [{"histogram": {"Dizziness": 1, "Pain in extremity": 1, "Suspected COVID-19": 1, "Vaccination site induration": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1, "Vertigo": 1}, "batchcodes": ["031M208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M20A 028L20A.json b/docs/data/histograms/United States/031M20A 028L20A.json
index 3dd731172a5..bf901da3f25 100644
--- a/docs/data/histograms/United States/031M20A 028L20A.json
+++ b/docs/data/histograms/United States/031M20A 028L20A.json
@@ -1 +1 @@
-{"batchcode": "031M20A 028L20A", "histograms": [{"batchcodes": ["031M20A 028L20A"], "histogram": {"Pain in extremity": 2, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Malaise": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A 028L20A", "histograms": [{"histogram": {"Pain in extremity": 2, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Headache": 1, "Insomnia": 1, "Malaise": 1}, "batchcodes": ["031M20A 028L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M20A OR 038K.json b/docs/data/histograms/United States/031M20A OR 038K.json
index 72c60136a22..03c083a44a9 100644
--- a/docs/data/histograms/United States/031M20A OR 038K.json
+++ b/docs/data/histograms/United States/031M20A OR 038K.json
@@ -1 +1 @@
-{"batchcode": "031M20A OR 038K", "histograms": [{"batchcodes": ["031M20A OR 038K"], "histogram": {"Arthralgia": 1, "Gait disturbance": 1, "Walking aid user": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A OR 038K", "histograms": [{"histogram": {"Arthralgia": 1, "Gait disturbance": 1, "Walking aid user": 1}, "batchcodes": ["031M20A OR 038K"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M20A,031MZ0A.json b/docs/data/histograms/United States/031M20A,031MZ0A.json
index cc69c65ad08..e61fb34d0ad 100644
--- a/docs/data/histograms/United States/031M20A,031MZ0A.json
+++ b/docs/data/histograms/United States/031M20A,031MZ0A.json
@@ -1 +1 @@
-{"batchcode": "031M20A,031MZ0A", "histograms": [{"batchcodes": ["031M20A,031MZ0A"], "histogram": {"Bedridden": 1, "Chills": 1, "Diarrhoea": 1, "Energy increased": 1, "Eye disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hypersensitivity": 1, "Peripheral swelling": 1, "Visual impairment": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A,031MZ0A", "histograms": [{"histogram": {"Bedridden": 1, "Chills": 1, "Diarrhoea": 1, "Energy increased": 1, "Eye disorder": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Hypersensitivity": 1, "Peripheral swelling": 1, "Visual impairment": 1}, "batchcodes": ["031M20A,031MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M20A.json b/docs/data/histograms/United States/031M20A.json
index db0a752958b..79906162b7b 100644
--- a/docs/data/histograms/United States/031M20A.json
+++ b/docs/data/histograms/United States/031M20A.json
@@ -1 +1 @@
-{"batchcode": "031M20A", "histograms": [{"batchcodes": ["031M20A", "048A21A"], "histogram": {"Cervical dysplasia": 1, "Human papilloma virus test": 1, "Smear cervix abnormal": 1}}, {"batchcodes": ["031M20A"], "histogram": {"Fatigue": 108, "Headache": 99, "Pyrexia": 86, "Chills": 76, "Pain in extremity": 75, "Vaccination site pain": 69, "Pain": 59, "Myalgia": 50, "Nausea": 48, "Pruritus": 42, "Arthralgia": 41, "Rash": 37, "Vaccination site erythema": 36, "Feeling abnormal": 34, "Asthenia": 31, "Dizziness": 30, "Vaccination site swelling": 28, "Diarrhoea": 27, "Erythema": 23, "Injection site pain": 22, "Vaccination site pruritus": 22, "Dyspnoea": 20, "Malaise": 20, "SARS-CoV-2 test": 20, "Body temperature": 19, "Vaccination site warmth": 19, "Illness": 18, "Paraesthesia": 18, "Vaccination site rash": 18, "Cough": 16, "Influenza like illness": 16, "Product dose omission issue": 16, "Urticaria": 16, "Peripheral swelling": 15, "Tremor": 15, "Vomiting": 15, "Back pain": 14, "COVID-19": 13, "Inappropriate schedule of product administration": 13, "Decreased appetite": 12, "Feeling hot": 12, "Lymphadenopathy": 12, "Swelling": 11, "Vaccination site induration": 11, "Hyperhidrosis": 10, "Hypoaesthesia": 10, "Injection site erythema": 10, "Insomnia": 10, "Rash pruritic": 10, "Abdominal pain upper": 9, "Expired product administered": 9, "Heart rate increased": 9, "Limb discomfort": 9, "Palpitations": 9, "Tinnitus": 9, "Vaccination complication": 9, "Burning sensation": 8, "Chest pain": 8, "Rash erythematous": 8, "Underdose": 8, "Abdominal discomfort": 7, "Blood pressure measurement": 7, "Feeling cold": 7, "Gait disturbance": 7, "Herpes zoster": 7, "Muscle spasms": 7, "Musculoskeletal stiffness": 7, "Rhinorrhoea": 7, "Somnolence": 7, "Tenderness": 7, "Vaccination site reaction": 7, "Accidental underdose": 6, "Discomfort": 6, "Lethargy": 6, "Mobility decreased": 6, "Neck pain": 6, "Oropharyngeal pain": 6, "Blood test": 5, "Bone pain": 5, "Cerebrovascular accident": 5, "Heart rate": 5, "Injection site swelling": 5, "Injection site warmth": 5, "Loss of personal independence in daily activities": 5, "Muscular weakness": 5, "Product storage error": 5, "Rash macular": 5, "Tachycardia": 5, "Vaccination site mass": 5, "Vision blurred": 5, "Arthritis": 4, "Chest discomfort": 4, "Device connection issue": 4, "Drug ineffective": 4, "Exposure during pregnancy": 4, "Injection site pruritus": 4, "Injection site rash": 4, "Migraine": 4, "Muscle twitching": 4, "Musculoskeletal discomfort": 4, "Nasal congestion": 4, "Nasopharyngitis": 4, "SARS-CoV-2 test positive": 4, "Swollen tongue": 4, "Ultrasound scan": 4, "Asthma": 3, "Axillary pain": 3, "Blister": 3, "Blood glucose increased": 3, "Blood pressure increased": 3, "Condition aggravated": 3, "Confusional state": 3, "Dysgeusia": 3, "Dyspepsia": 3, "Eye pain": 3, "Eye swelling": 3, "Fall": 3, "Hot flush": 3, "Hypersensitivity": 3, "Hypersomnia": 3, "Hypertension": 3, "Incorrect dose administered": 3, "Inflammation": 3, "Lymph node pain": 3, "Maternal exposure during pregnancy": 3, "Mouth ulceration": 3, "Movement disorder": 3, "Oral pain": 3, "Oxygen saturation": 3, "Presyncope": 3, "Thrombosis": 3, "Urinary tract infection": 3, "Vaccination site movement impairment": 3, "Weight decreased": 3, "X-ray": 3, "Abdominal pain": 2, "Accidental overdose": 2, "Adverse event": 2, "Ageusia": 2, "Alopecia": 2, "Angioedema": 2, "Anosmia": 2, "Axillary mass": 2, "Blindness": 2, "Blood glucose": 2, "Body temperature increased": 2, "Breast pain": 2, "Cardiac disorder": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Crying": 2, "Dysstasia": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Facial pain": 2, "Formication": 2, "Hospitalisation": 2, "Hypokinesia": 2, "Hypotension": 2, "Immunisation reaction": 2, "Injection site induration": 2, "Joint stiffness": 2, "Lacrimation increased": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Muscle tightness": 2, "Myocardial infarction": 2, "Neuralgia": 2, "Night sweats": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Oropharyngeal discomfort": 2, "Overdose": 2, "Pneumonia": 2, "Postmenopausal haemorrhage": 2, "Pregnancy test": 2, "Product administered to patient of inappropriate age": 2, "Pulmonary embolism": 2, "Rheumatoid arthritis": 2, "Scan": 2, "Sinus headache": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Skin swelling": 2, "Sneezing": 2, "Sticky skin": 2, "Stomatitis": 2, "Swelling face": 2, "Swelling of eyelid": 2, "Taste disorder": 2, "Tongue discomfort": 2, "Ventricular extrasystoles": 2, "Vertigo": 2, "Wrong product administered": 2, "Abnormal behaviour": 1, "Administration site bruise": 1, "Adrenal insufficiency": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Alpha 1 foetoprotein increased": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Antibody test": 1, "Anxiety": 1, "Balance disorder": 1, "Bedridden": 1, "Blood creatine phosphokinase": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone increased": 1, "Blood urine present": 1, "Bone disorder": 1, "Bowel movement irregularity": 1, "Breathing-related sleep disorder": 1, "Bursitis": 1, "C-reactive protein increased": 1, "Cardiac arrest": 1, "Cardiac stress test": 1, "Cervical cyst": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Cognitive disorder": 1, "Constipation": 1, "Coronavirus test": 1, "Culture urine": 1, "Deafness": 1, "Death": 1, "Dehydration": 1, "Depressed mood": 1, "Depression": 1, "Diabetes mellitus": 1, "Diagnostic procedure": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear congestion": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pain": 1, "Eating disorder symptom": 1, "Electromyogram": 1, "Emotional poverty": 1, "Encephalitis": 1, "End stage renal disease": 1, "Ephelides": 1, "Erectile dysfunction": 1, "Exercise tolerance decreased": 1, "Exposure via skin contact": 1, "Extensive swelling of vaccinated limb": 1, "Extra dose administered": 1, "Eye infection": 1, "Eye inflammation": 1, "Eye irritation": 1, "Eye pruritus": 1, "FEV1/FVC ratio": 1, "Facial paresis": 1, "Fear": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Feeling of relaxation": 1, "Flushing": 1, "Food refusal": 1, "Forced vital capacity": 1, "Gait inability": 1, "Gastrointestinal pain": 1, "Gastrointestinal sounds abnormal": 1, "Genital herpes": 1, "Gingival bleeding": 1, "Gingival pain": 1, "Gingival swelling": 1, "Glossodynia": 1, "Glycosylated haemoglobin increased": 1, "Gout": 1, "Hair disorder": 1, "Head discomfort": 1, "Heart injury": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme increased": 1, "Hordeolum": 1, "Hunger": 1, "Hyperacusis": 1, "Hyperaesthesia teeth": 1, "Hyperglycaemia": 1, "Hypoacusis": 1, "Hyponatraemia": 1, "Immediate post-injection reaction": 1, "Immune thrombocytopenia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Indifference": 1, "Induration": 1, "Infection": 1, "Injection site bruising": 1, "Injection site discolouration": 1, "Injection site hypersensitivity": 1, "Injection site inflammation": 1, "Injection site mass": 1, "Intentional dose omission": 1, "Intestinal obstruction": 1, "Intracardiac thrombus": 1, "Irritability": 1, "Jaw disorder": 1, "Joint swelling": 1, "Leukaemia": 1, "Lip blister": 1, "Local reaction": 1, "Loose tooth": 1, "Loss of consciousness": 1, "Macule": 1, "Magnesium deficiency": 1, "Mammogram": 1, "Medication error": 1, "Menstrual disorder": 1, "Milia": 1, "Monoplegia": 1, "Muscle contractions involuntary": 1, "Muscle disorder": 1, "Muscle fatigue": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal disorder": 1, "Neck injury": 1, "Nightmare": 1, "No adverse event": 1, "Obstruction": 1, "Oedema": 1, "Oral discomfort": 1, "Orchitis": 1, "Orthopnoea": 1, "Ovarian disorder": 1, "Oxygen saturation abnormal": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Periorbital swelling": 1, "Photopsia": 1, "Physical examination": 1, "Plasma cell myeloma": 1, "Platelet count": 1, "Platelet count decreased": 1, "Polymenorrhoea": 1, "Post-acute COVID-19 syndrome": 1, "Post-traumatic stress disorder": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test positive": 1, "Product monitoring error": 1, "Productive cough": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary thrombosis": 1, "Pustule": 1, "Rash morbilliform": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal cancer": 1, "Renal failure": 1, "Renal impairment": 1, "Renal pain": 1, "Respiratory arrest": 1, "Retching": 1, "Salt craving": 1, "Scab": 1, "Scar": 1, "Sciatica": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Shoulder operation": 1, "Sjogren's syndrome": 1, "Skin abrasion": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin ulcer": 1, "Skin warm": 1, "Spinal pain": 1, "Stenosis": 1, "Sunburn": 1, "Surgery": 1, "Syncope": 1, "Synovial disorder": 1, "Syringe issue": 1, "Testicular pain": 1, "Testicular swelling": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat clearing": 1, "Thyroid disorder": 1, "Thyroiditis": 1, "Tongue geographic": 1, "Trismus": 1, "Ulcer": 1, "Ultrasound foetal": 1, "Unresponsive to stimuli": 1, "Upper-airway cough syndrome": 1, "Vaccination error": 1, "Vaccination site discharge": 1, "Vaccination site haemorrhage": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site scab": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vertigo CNS origin": 1, "Visual impairment": 1, "Vitreous floaters": 1, "Walking disability": 1, "Weight increased": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "Wrong technique in device usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A", "histograms": [{"histogram": {"Cervical dysplasia": 1, "Human papilloma virus test": 1, "Smear cervix abnormal": 1}, "batchcodes": ["031M20A", "048A21A"]}, {"histogram": {"Fatigue": 108, "Headache": 99, "Pyrexia": 86, "Chills": 76, "Pain in extremity": 75, "Vaccination site pain": 69, "Pain": 59, "Myalgia": 50, "Nausea": 48, "Pruritus": 42, "Arthralgia": 41, "Rash": 37, "Vaccination site erythema": 36, "Feeling abnormal": 34, "Asthenia": 31, "Dizziness": 30, "Vaccination site swelling": 28, "Diarrhoea": 27, "Erythema": 23, "Injection site pain": 22, "Vaccination site pruritus": 22, "Dyspnoea": 20, "Malaise": 20, "SARS-CoV-2 test": 20, "Body temperature": 19, "Vaccination site warmth": 19, "Illness": 18, "Paraesthesia": 18, "Vaccination site rash": 18, "Cough": 16, "Influenza like illness": 16, "Product dose omission issue": 16, "Urticaria": 16, "Peripheral swelling": 15, "Tremor": 15, "Vomiting": 15, "Back pain": 14, "COVID-19": 13, "Inappropriate schedule of product administration": 13, "Decreased appetite": 12, "Feeling hot": 12, "Lymphadenopathy": 12, "Swelling": 11, "Vaccination site induration": 11, "Hyperhidrosis": 10, "Hypoaesthesia": 10, "Injection site erythema": 10, "Insomnia": 10, "Rash pruritic": 10, "Abdominal pain upper": 9, "Expired product administered": 9, "Heart rate increased": 9, "Limb discomfort": 9, "Palpitations": 9, "Tinnitus": 9, "Vaccination complication": 9, "Burning sensation": 8, "Chest pain": 8, "Rash erythematous": 8, "Underdose": 8, "Abdominal discomfort": 7, "Blood pressure measurement": 7, "Feeling cold": 7, "Gait disturbance": 7, "Herpes zoster": 7, "Muscle spasms": 7, "Musculoskeletal stiffness": 7, "Rhinorrhoea": 7, "Somnolence": 7, "Tenderness": 7, "Vaccination site reaction": 7, "Accidental underdose": 6, "Discomfort": 6, "Lethargy": 6, "Mobility decreased": 6, "Neck pain": 6, "Oropharyngeal pain": 6, "Blood test": 5, "Bone pain": 5, "Cerebrovascular accident": 5, "Heart rate": 5, "Injection site swelling": 5, "Injection site warmth": 5, "Loss of personal independence in daily activities": 5, "Muscular weakness": 5, "Product storage error": 5, "Rash macular": 5, "Tachycardia": 5, "Vaccination site mass": 5, "Vision blurred": 5, "Arthritis": 4, "Chest discomfort": 4, "Device connection issue": 4, "Drug ineffective": 4, "Exposure during pregnancy": 4, "Injection site pruritus": 4, "Injection site rash": 4, "Migraine": 4, "Muscle twitching": 4, "Musculoskeletal discomfort": 4, "Nasal congestion": 4, "Nasopharyngitis": 4, "SARS-CoV-2 test positive": 4, "Swollen tongue": 4, "Ultrasound scan": 4, "Asthma": 3, "Axillary pain": 3, "Blister": 3, "Blood glucose increased": 3, "Blood pressure increased": 3, "Condition aggravated": 3, "Confusional state": 3, "Dysgeusia": 3, "Dyspepsia": 3, "Eye pain": 3, "Eye swelling": 3, "Fall": 3, "Hot flush": 3, "Hypersensitivity": 3, "Hypersomnia": 3, "Hypertension": 3, "Incorrect dose administered": 3, "Inflammation": 3, "Lymph node pain": 3, "Maternal exposure during pregnancy": 3, "Mouth ulceration": 3, "Movement disorder": 3, "Oral pain": 3, "Oxygen saturation": 3, "Presyncope": 3, "Thrombosis": 3, "Urinary tract infection": 3, "Vaccination site movement impairment": 3, "Weight decreased": 3, "X-ray": 3, "Abdominal pain": 2, "Accidental overdose": 2, "Adverse event": 2, "Ageusia": 2, "Alopecia": 2, "Angioedema": 2, "Anosmia": 2, "Axillary mass": 2, "Blindness": 2, "Blood glucose": 2, "Body temperature increased": 2, "Breast pain": 2, "Cardiac disorder": 2, "Cold sweat": 2, "Computerised tomogram": 2, "Crying": 2, "Dysstasia": 2, "Electrocardiogram": 2, "Epistaxis": 2, "Facial pain": 2, "Formication": 2, "Hospitalisation": 2, "Hypokinesia": 2, "Hypotension": 2, "Immunisation reaction": 2, "Injection site induration": 2, "Joint stiffness": 2, "Lacrimation increased": 2, "Lip swelling": 2, "Magnetic resonance imaging": 2, "Mass": 2, "Muscle tightness": 2, "Myocardial infarction": 2, "Neuralgia": 2, "Night sweats": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Oropharyngeal discomfort": 2, "Overdose": 2, "Pneumonia": 2, "Postmenopausal haemorrhage": 2, "Pregnancy test": 2, "Product administered to patient of inappropriate age": 2, "Pulmonary embolism": 2, "Rheumatoid arthritis": 2, "Scan": 2, "Sinus headache": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Skin swelling": 2, "Sneezing": 2, "Sticky skin": 2, "Stomatitis": 2, "Swelling face": 2, "Swelling of eyelid": 2, "Taste disorder": 2, "Tongue discomfort": 2, "Ventricular extrasystoles": 2, "Vertigo": 2, "Wrong product administered": 2, "Abnormal behaviour": 1, "Administration site bruise": 1, "Adrenal insufficiency": 1, "Adverse reaction": 1, "Allergy to vaccine": 1, "Alpha 1 foetoprotein increased": 1, "Amnesia": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Antibody test": 1, "Anxiety": 1, "Balance disorder": 1, "Bedridden": 1, "Blood creatine phosphokinase": 1, "Blood pressure abnormal": 1, "Blood pressure decreased": 1, "Blood pressure fluctuation": 1, "Blood sodium": 1, "Blood thyroid stimulating hormone": 1, "Blood thyroid stimulating hormone increased": 1, "Blood urine present": 1, "Bone disorder": 1, "Bowel movement irregularity": 1, "Breathing-related sleep disorder": 1, "Bursitis": 1, "C-reactive protein increased": 1, "Cardiac arrest": 1, "Cardiac stress test": 1, "Cervical cyst": 1, "Chest X-ray": 1, "Chronic obstructive pulmonary disease": 1, "Cognitive disorder": 1, "Constipation": 1, "Coronavirus test": 1, "Culture urine": 1, "Deafness": 1, "Death": 1, "Dehydration": 1, "Depressed mood": 1, "Depression": 1, "Diabetes mellitus": 1, "Diagnostic procedure": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dry mouth": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphagia": 1, "Dysphonia": 1, "Ear congestion": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear pain": 1, "Eating disorder symptom": 1, "Electromyogram": 1, "Emotional poverty": 1, "Encephalitis": 1, "End stage renal disease": 1, "Ephelides": 1, "Erectile dysfunction": 1, "Exercise tolerance decreased": 1, "Exposure via skin contact": 1, "Extensive swelling of vaccinated limb": 1, "Extra dose administered": 1, "Eye infection": 1, "Eye inflammation": 1, "Eye irritation": 1, "Eye pruritus": 1, "FEV1/FVC ratio": 1, "Facial paresis": 1, "Fear": 1, "Feeding disorder": 1, "Feeling of body temperature change": 1, "Feeling of relaxation": 1, "Flushing": 1, "Food refusal": 1, "Forced vital capacity": 1, "Gait inability": 1, "Gastrointestinal pain": 1, "Gastrointestinal sounds abnormal": 1, "Genital herpes": 1, "Gingival bleeding": 1, "Gingival pain": 1, "Gingival swelling": 1, "Glossodynia": 1, "Glycosylated haemoglobin increased": 1, "Gout": 1, "Hair disorder": 1, "Head discomfort": 1, "Heart injury": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme increased": 1, "Hordeolum": 1, "Hunger": 1, "Hyperacusis": 1, "Hyperaesthesia teeth": 1, "Hyperglycaemia": 1, "Hypoacusis": 1, "Hyponatraemia": 1, "Immediate post-injection reaction": 1, "Immune thrombocytopenia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Indifference": 1, "Induration": 1, "Infection": 1, "Injection site bruising": 1, "Injection site discolouration": 1, "Injection site hypersensitivity": 1, "Injection site inflammation": 1, "Injection site mass": 1, "Intentional dose omission": 1, "Intestinal obstruction": 1, "Intracardiac thrombus": 1, "Irritability": 1, "Jaw disorder": 1, "Joint swelling": 1, "Leukaemia": 1, "Lip blister": 1, "Local reaction": 1, "Loose tooth": 1, "Loss of consciousness": 1, "Macule": 1, "Magnesium deficiency": 1, "Mammogram": 1, "Medication error": 1, "Menstrual disorder": 1, "Milia": 1, "Monoplegia": 1, "Muscle contractions involuntary": 1, "Muscle disorder": 1, "Muscle fatigue": 1, "Musculoskeletal chest pain": 1, "Musculoskeletal disorder": 1, "Neck injury": 1, "Nightmare": 1, "No adverse event": 1, "Obstruction": 1, "Oedema": 1, "Oral discomfort": 1, "Orchitis": 1, "Orthopnoea": 1, "Ovarian disorder": 1, "Oxygen saturation abnormal": 1, "Pain in jaw": 1, "Paraesthesia oral": 1, "Parosmia": 1, "Periorbital swelling": 1, "Photopsia": 1, "Physical examination": 1, "Plasma cell myeloma": 1, "Platelet count": 1, "Platelet count decreased": 1, "Polymenorrhoea": 1, "Post-acute COVID-19 syndrome": 1, "Post-traumatic stress disorder": 1, "Postural orthostatic tachycardia syndrome": 1, "Pregnancy test positive": 1, "Product monitoring error": 1, "Productive cough": 1, "Psoriasis": 1, "Psychotic disorder": 1, "Pulmonary thrombosis": 1, "Pustule": 1, "Rash morbilliform": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Renal cancer": 1, "Renal failure": 1, "Renal impairment": 1, "Renal pain": 1, "Respiratory arrest": 1, "Retching": 1, "Salt craving": 1, "Scab": 1, "Scar": 1, "Sciatica": 1, "Seizure": 1, "Sensation of foreign body": 1, "Sensitive skin": 1, "Sensory disturbance": 1, "Shoulder operation": 1, "Sjogren's syndrome": 1, "Skin abrasion": 1, "Skin discolouration": 1, "Skin exfoliation": 1, "Skin ulcer": 1, "Skin warm": 1, "Spinal pain": 1, "Stenosis": 1, "Sunburn": 1, "Surgery": 1, "Syncope": 1, "Synovial disorder": 1, "Syringe issue": 1, "Testicular pain": 1, "Testicular swelling": 1, "Thinking abnormal": 1, "Thirst": 1, "Throat clearing": 1, "Thyroid disorder": 1, "Thyroiditis": 1, "Tongue geographic": 1, "Trismus": 1, "Ulcer": 1, "Ultrasound foetal": 1, "Unresponsive to stimuli": 1, "Upper-airway cough syndrome": 1, "Vaccination error": 1, "Vaccination site discharge": 1, "Vaccination site haemorrhage": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site scab": 1, "Vaccination site urticaria": 1, "Vaginal haemorrhage": 1, "Vertigo CNS origin": 1, "Visual impairment": 1, "Vitreous floaters": 1, "Walking disability": 1, "Weight increased": 1, "Wheezing": 1, "White blood cell count": 1, "White blood cell count decreased": 1, "Wrong technique in device usage process": 1}, "batchcodes": ["031M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M20A; 044A21.json b/docs/data/histograms/United States/031M20A; 044A21.json
index 81a4ec16773..3729d5eb8f6 100644
--- a/docs/data/histograms/United States/031M20A; 044A21.json
+++ b/docs/data/histograms/United States/031M20A; 044A21.json
@@ -1 +1 @@
-{"batchcode": "031M20A; 044A21", "histograms": [{"batchcodes": ["031M20A; 044A21"], "histogram": {"Erythema": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20A; 044A21", "histograms": [{"histogram": {"Erythema": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Rash": 1}, "batchcodes": ["031M20A; 044A21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M20N.json b/docs/data/histograms/United States/031M20N.json
index 098ae3f2ccd..e0b5572e8e6 100644
--- a/docs/data/histograms/United States/031M20N.json
+++ b/docs/data/histograms/United States/031M20N.json
@@ -1 +1 @@
-{"batchcode": "031M20N", "histograms": [{"batchcodes": ["031M20N"], "histogram": {"Arthralgia": 1}}]}
\ No newline at end of file
+{"batchcode": "031M20N", "histograms": [{"histogram": {"Arthralgia": 1}, "batchcodes": ["031M20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M21A.json b/docs/data/histograms/United States/031M21A.json
index beed7ebbfd3..2fc10efa525 100644
--- a/docs/data/histograms/United States/031M21A.json
+++ b/docs/data/histograms/United States/031M21A.json
@@ -1 +1 @@
-{"batchcode": "031M21A", "histograms": [{"batchcodes": ["031M21A"], "histogram": {"Expired product administered": 3, "Fall": 2, "Asthenia": 1, "Blood test": 1, "Contusion": 1, "Diarrhoea": 1, "Fatigue": 1, "Foot fracture": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Loss of consciousness": 1, "Myalgia": 1, "Product storage error": 1, "Rash": 1, "Somnolence": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031M21A", "histograms": [{"histogram": {"Expired product administered": 3, "Fall": 2, "Asthenia": 1, "Blood test": 1, "Contusion": 1, "Diarrhoea": 1, "Fatigue": 1, "Foot fracture": 1, "Gait disturbance": 1, "Head discomfort": 1, "Headache": 1, "Loss of consciousness": 1, "Myalgia": 1, "Product storage error": 1, "Rash": 1, "Somnolence": 1, "Vaccination site pain": 1}, "batchcodes": ["031M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M24A.json b/docs/data/histograms/United States/031M24A.json
index 29ed9cd398c..a38659d8a89 100644
--- a/docs/data/histograms/United States/031M24A.json
+++ b/docs/data/histograms/United States/031M24A.json
@@ -1 +1 @@
-{"batchcode": "031M24A", "histograms": [{"batchcodes": ["031M24A"], "histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031M24A", "histograms": [{"histogram": {"Body temperature": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["031M24A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M2A.json b/docs/data/histograms/United States/031M2A.json
index 623f7f3527f..779b0f8a6a4 100644
--- a/docs/data/histograms/United States/031M2A.json
+++ b/docs/data/histograms/United States/031M2A.json
@@ -1 +1 @@
-{"batchcode": "031M2A", "histograms": [{"batchcodes": ["031M2A"], "histogram": {"Chills": 1, "Feeling abnormal": 1, "Illness": 1, "Loss of personal independence in daily activities": 1, "Myocardial infarction": 1, "Pain": 1, "Therapeutic response unexpected": 1}}]}
\ No newline at end of file
+{"batchcode": "031M2A", "histograms": [{"histogram": {"Chills": 1, "Feeling abnormal": 1, "Illness": 1, "Loss of personal independence in daily activities": 1, "Myocardial infarction": 1, "Pain": 1, "Therapeutic response unexpected": 1}, "batchcodes": ["031M2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M2CA.json b/docs/data/histograms/United States/031M2CA.json
index 031c0d64611..6fa1bc476dd 100644
--- a/docs/data/histograms/United States/031M2CA.json
+++ b/docs/data/histograms/United States/031M2CA.json
@@ -1 +1 @@
-{"batchcode": "031M2CA", "histograms": [{"batchcodes": ["031M2CA"], "histogram": {"Speech disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "031M2CA", "histograms": [{"histogram": {"Speech disorder": 1}, "batchcodes": ["031M2CA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M2DA.json b/docs/data/histograms/United States/031M2DA.json
index 232c1e0ffef..a20db5455bd 100644
--- a/docs/data/histograms/United States/031M2DA.json
+++ b/docs/data/histograms/United States/031M2DA.json
@@ -1 +1 @@
-{"batchcode": "031M2DA", "histograms": [{"batchcodes": ["031M2DA"], "histogram": {"Fatigue": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031M2DA", "histograms": [{"histogram": {"Fatigue": 1, "Pain in extremity": 1}, "batchcodes": ["031M2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031M2QA.json b/docs/data/histograms/United States/031M2QA.json
index 396c77843ef..7e45c69bc23 100644
--- a/docs/data/histograms/United States/031M2QA.json
+++ b/docs/data/histograms/United States/031M2QA.json
@@ -1 +1 @@
-{"batchcode": "031M2QA", "histograms": [{"batchcodes": ["031M2QA"], "histogram": {"Tenderness": 1, "Thrombosis": 1}}]}
\ No newline at end of file
+{"batchcode": "031M2QA", "histograms": [{"histogram": {"Tenderness": 1, "Thrombosis": 1}, "batchcodes": ["031M2QA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031ML0A.json b/docs/data/histograms/United States/031ML0A.json
index 58c10d5d8dd..985a455281b 100644
--- a/docs/data/histograms/United States/031ML0A.json
+++ b/docs/data/histograms/United States/031ML0A.json
@@ -1 +1 @@
-{"batchcode": "031ML0A", "histograms": [{"batchcodes": ["031ML0A"], "histogram": {"Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "031ML0A", "histograms": [{"histogram": {"Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["031ML0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031MZ0.json b/docs/data/histograms/United States/031MZ0.json
index 8fe6bcbcf31..cb476d30f7d 100644
--- a/docs/data/histograms/United States/031MZ0.json
+++ b/docs/data/histograms/United States/031MZ0.json
@@ -1 +1 @@
-{"batchcode": "031MZ0", "histograms": [{"batchcodes": ["031MZ0"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Tremor": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031MZ0", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Tremor": 1, "Vertigo": 1, "Vomiting": 1}, "batchcodes": ["031MZ0"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031MZ04.json b/docs/data/histograms/United States/031MZ04.json
index e1aee2746e6..7ac20ed2e61 100644
--- a/docs/data/histograms/United States/031MZ04.json
+++ b/docs/data/histograms/United States/031MZ04.json
@@ -1 +1 @@
-{"batchcode": "031MZ04", "histograms": [{"batchcodes": ["031MZ04"], "histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "031MZ04", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["031MZ04"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031MZ0A.json b/docs/data/histograms/United States/031MZ0A.json
index 7dcf7287c16..053526d7c23 100644
--- a/docs/data/histograms/United States/031MZ0A.json
+++ b/docs/data/histograms/United States/031MZ0A.json
@@ -1 +1 @@
-{"batchcode": "031MZ0A", "histograms": [{"batchcodes": ["031MZ0A"], "histogram": {"Blister": 2, "Dizziness": 2, "Headache": 2, "Nausea": 2, "Ageusia": 1, "Agitation": 1, "Aphonia": 1, "Balance disorder": 1, "Blood pressure fluctuation": 1, "Bronchitis": 1, "COVID-19": 1, "Dermatitis allergic": 1, "Drug ineffective": 1, "Fatigue": 1, "Gait disturbance": 1, "Hallucination, olfactory": 1, "Myalgia": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Product dose omission issue": 1, "Rash": 1, "Rash erythematous": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "031MZ0A", "histograms": [{"histogram": {"Blister": 2, "Dizziness": 2, "Headache": 2, "Nausea": 2, "Ageusia": 1, "Agitation": 1, "Aphonia": 1, "Balance disorder": 1, "Blood pressure fluctuation": 1, "Bronchitis": 1, "COVID-19": 1, "Dermatitis allergic": 1, "Drug ineffective": 1, "Fatigue": 1, "Gait disturbance": 1, "Hallucination, olfactory": 1, "Myalgia": 1, "Pain": 1, "Palpitations": 1, "Paraesthesia oral": 1, "Product dose omission issue": 1, "Rash": 1, "Rash erythematous": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site reaction": 1}, "batchcodes": ["031MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031MZ0H.json b/docs/data/histograms/United States/031MZ0H.json
index 5bbc2fe0736..d06a463d587 100644
--- a/docs/data/histograms/United States/031MZ0H.json
+++ b/docs/data/histograms/United States/031MZ0H.json
@@ -1 +1 @@
-{"batchcode": "031MZ0H", "histograms": [{"batchcodes": ["031MZ0H"], "histogram": {"Vaccination site discharge": 1}}]}
\ No newline at end of file
+{"batchcode": "031MZ0H", "histograms": [{"histogram": {"Vaccination site discharge": 1}, "batchcodes": ["031MZ0H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031MZOA.json b/docs/data/histograms/United States/031MZOA.json
index f764930c597..09ed30d0dfd 100644
--- a/docs/data/histograms/United States/031MZOA.json
+++ b/docs/data/histograms/United States/031MZOA.json
@@ -1 +1 @@
-{"batchcode": "031MZOA", "histograms": [{"batchcodes": ["031MZOA"], "histogram": {"Flushing": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "031MZOA", "histograms": [{"histogram": {"Flushing": 1, "Pruritus": 1, "Rash": 1, "Rash pruritic": 1, "Urticaria": 1}, "batchcodes": ["031MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031MZUA.json b/docs/data/histograms/United States/031MZUA.json
index 013e65af984..a453e929061 100644
--- a/docs/data/histograms/United States/031MZUA.json
+++ b/docs/data/histograms/United States/031MZUA.json
@@ -1 +1 @@
-{"batchcode": "031MZUA", "histograms": [{"batchcodes": ["031MZUA"], "histogram": {"Arthritis": 1, "Bladder pain": 1}}]}
\ No newline at end of file
+{"batchcode": "031MZUA", "histograms": [{"histogram": {"Arthritis": 1, "Bladder pain": 1}, "batchcodes": ["031MZUA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031N120A.json b/docs/data/histograms/United States/031N120A.json
index 75a8f219eba..78c2f41c1ab 100644
--- a/docs/data/histograms/United States/031N120A.json
+++ b/docs/data/histograms/United States/031N120A.json
@@ -1 +1 @@
-{"batchcode": "031N120A", "histograms": [{"batchcodes": ["031N120A"], "histogram": {"Body temperature": 1, "Fatigue": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "031N120A", "histograms": [{"histogram": {"Body temperature": 1, "Fatigue": 1, "Pain in extremity": 1}, "batchcodes": ["031N120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031N20A.json b/docs/data/histograms/United States/031N20A.json
index da9b60d9800..8f5ac546653 100644
--- a/docs/data/histograms/United States/031N20A.json
+++ b/docs/data/histograms/United States/031N20A.json
@@ -1 +1 @@
-{"batchcode": "031N20A", "histograms": [{"batchcodes": ["031N20A"], "histogram": {"Depression": 1, "Diarrhoea": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "031N20A", "histograms": [{"histogram": {"Depression": 1, "Diarrhoea": 1, "Hyperhidrosis": 1, "Nausea": 1, "Pruritus": 1, "Pyrexia": 1, "Vaccination site pain": 1, "Vomiting": 1}, "batchcodes": ["031N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/031N21A.json b/docs/data/histograms/United States/031N21A.json
index 0d641e1a9a9..0640224045b 100644
--- a/docs/data/histograms/United States/031N21A.json
+++ b/docs/data/histograms/United States/031N21A.json
@@ -1 +1 @@
-{"batchcode": "031N21A", "histograms": [{"batchcodes": ["031N21A"], "histogram": {"Body temperature": 1, "Dehydration": 1, "Dyspnoea": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "031N21A", "histograms": [{"histogram": {"Body temperature": 1, "Dehydration": 1, "Dyspnoea": 1, "Pyrexia": 1}, "batchcodes": ["031N21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032020A.json b/docs/data/histograms/United States/032020A.json
index 09a91fc6699..3a153a63949 100644
--- a/docs/data/histograms/United States/032020A.json
+++ b/docs/data/histograms/United States/032020A.json
@@ -1 +1 @@
-{"batchcode": "032020A", "histograms": [{"batchcodes": ["032020A"], "histogram": {"Blood glucose increased": 1}}]}
\ No newline at end of file
+{"batchcode": "032020A", "histograms": [{"histogram": {"Blood glucose increased": 1}, "batchcodes": ["032020A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0320L20A.json b/docs/data/histograms/United States/0320L20A.json
index f8c76ed1b72..00fc05bbeb3 100644
--- a/docs/data/histograms/United States/0320L20A.json
+++ b/docs/data/histograms/United States/0320L20A.json
@@ -1 +1 @@
-{"batchcode": "0320L20A", "histograms": [{"batchcodes": ["0320L20A"], "histogram": {"Hyperhidrosis": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "0320L20A", "histograms": [{"histogram": {"Hyperhidrosis": 1, "Pyrexia": 1}, "batchcodes": ["0320L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0320L2A.json b/docs/data/histograms/United States/0320L2A.json
index ccc45b19f0a..845a85733da 100644
--- a/docs/data/histograms/United States/0320L2A.json
+++ b/docs/data/histograms/United States/0320L2A.json
@@ -1 +1 @@
-{"batchcode": "0320L2A", "histograms": [{"batchcodes": ["0320L2A"], "histogram": {"Fatigue": 1, "Headache": 1, "Nausea": 1, "Polyuria": 1}}]}
\ No newline at end of file
+{"batchcode": "0320L2A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Nausea": 1, "Polyuria": 1}, "batchcodes": ["0320L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0320Z0A.json b/docs/data/histograms/United States/0320Z0A.json
index e4ee54501b2..6c212619ce5 100644
--- a/docs/data/histograms/United States/0320Z0A.json
+++ b/docs/data/histograms/United States/0320Z0A.json
@@ -1 +1 @@
-{"batchcode": "0320Z0A", "histograms": [{"batchcodes": ["0320Z0A"], "histogram": {"Adverse event following immunisation": 1}}]}
\ No newline at end of file
+{"batchcode": "0320Z0A", "histograms": [{"histogram": {"Adverse event following immunisation": 1}, "batchcodes": ["0320Z0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0321.20A.json b/docs/data/histograms/United States/0321.20A.json
index 54bbcec1348..8d6a6ed2502 100644
--- a/docs/data/histograms/United States/0321.20A.json
+++ b/docs/data/histograms/United States/0321.20A.json
@@ -1 +1 @@
-{"batchcode": "0321.20A", "histograms": [{"batchcodes": ["0321.20A"], "histogram": {"Injection site erythema": 1, "Injection site rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "0321.20A", "histograms": [{"histogram": {"Injection site erythema": 1, "Injection site rash": 1, "Rash pruritic": 1}, "batchcodes": ["0321.20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032120A.json b/docs/data/histograms/United States/032120A.json
index 7a6b0412bc9..a72ec6a866e 100644
--- a/docs/data/histograms/United States/032120A.json
+++ b/docs/data/histograms/United States/032120A.json
@@ -1 +1 @@
-{"batchcode": "032120A", "histograms": [{"batchcodes": ["032120A"], "histogram": {"Fatigue": 8, "Chills": 7, "Headache": 6, "Pain in extremity": 6, "Myalgia": 5, "Pyrexia": 5, "Vaccination site pain": 5, "Asthenia": 3, "Inappropriate schedule of product administration": 3, "Vaccination site erythema": 3, "Vaccination site pruritus": 3, "Vaccination site swelling": 3, "Dizziness": 2, "Influenza like illness": 2, "Injection site pain": 2, "Injection site warmth": 2, "Insomnia": 2, "Nausea": 2, "Neck pain": 2, "Pain": 2, "Pruritus": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Tremor": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Antibody test": 1, "Blood glucose": 1, "Body temperature": 1, "Breast cancer": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Erythema": 1, "Eye swelling": 1, "Fear": 1, "Feeling cold": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Illness": 1, "Incorrect product administration duration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of control of legs": 1, "Malaise": 1, "Nasopharyngitis": 1, "Product dose omission issue": 1, "Rash pruritic": 1, "Renal stone removal": 1, "Scar": 1, "Taste disorder": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "032120A", "histograms": [{"histogram": {"Fatigue": 8, "Chills": 7, "Headache": 6, "Pain in extremity": 6, "Myalgia": 5, "Pyrexia": 5, "Vaccination site pain": 5, "Asthenia": 3, "Inappropriate schedule of product administration": 3, "Vaccination site erythema": 3, "Vaccination site pruritus": 3, "Vaccination site swelling": 3, "Dizziness": 2, "Influenza like illness": 2, "Injection site pain": 2, "Injection site warmth": 2, "Insomnia": 2, "Nausea": 2, "Neck pain": 2, "Pain": 2, "Pruritus": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Tremor": 2, "Vaccination site warmth": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Antibody test": 1, "Blood glucose": 1, "Body temperature": 1, "Breast cancer": 1, "COVID-19": 1, "Cerebrovascular accident": 1, "Computerised tomogram": 1, "Diarrhoea": 1, "Drug ineffective": 1, "Dyspnoea": 1, "Erythema": 1, "Eye swelling": 1, "Fear": 1, "Feeling cold": 1, "Gait inability": 1, "Hyperhidrosis": 1, "Hypertension": 1, "Hypoaesthesia oral": 1, "Illness": 1, "Incorrect product administration duration": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site reaction": 1, "Limb discomfort": 1, "Lip swelling": 1, "Loss of control of legs": 1, "Malaise": 1, "Nasopharyngitis": 1, "Product dose omission issue": 1, "Rash pruritic": 1, "Renal stone removal": 1, "Scar": 1, "Taste disorder": 1, "Vaccination complication": 1, "Vaccination site discomfort": 1, "Vaccination site induration": 1, "Vaccination site rash": 1, "Vomiting": 1}, "batchcodes": ["032120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032120VF.json b/docs/data/histograms/United States/032120VF.json
index 10322931f49..afec97afd0d 100644
--- a/docs/data/histograms/United States/032120VF.json
+++ b/docs/data/histograms/United States/032120VF.json
@@ -1 +1 @@
-{"batchcode": "032120VF", "histograms": [{"batchcodes": ["032120VF"], "histogram": {"Blood glucose increased": 1, "Cardiac failure": 1}}]}
\ No newline at end of file
+{"batchcode": "032120VF", "histograms": [{"histogram": {"Blood glucose increased": 1, "Cardiac failure": 1}, "batchcodes": ["032120VF"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0321321A.json b/docs/data/histograms/United States/0321321A.json
index 0fb992f1bf4..6eccd0a7772 100644
--- a/docs/data/histograms/United States/0321321A.json
+++ b/docs/data/histograms/United States/0321321A.json
@@ -1 +1 @@
-{"batchcode": "0321321A", "histograms": [{"batchcodes": ["0321321A"], "histogram": {"Lymphadenopathy": 1, "SARS-CoV-2 test": 1, "Skin haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "0321321A", "histograms": [{"histogram": {"Lymphadenopathy": 1, "SARS-CoV-2 test": 1, "Skin haemorrhage": 1}, "batchcodes": ["0321321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032141A.json b/docs/data/histograms/United States/032141A.json
index fa30ed22280..3aeeefe0abe 100644
--- a/docs/data/histograms/United States/032141A.json
+++ b/docs/data/histograms/United States/032141A.json
@@ -1 +1 @@
-{"batchcode": "032141A", "histograms": [{"batchcodes": ["032141A"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "032141A", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["032141A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0321A.json b/docs/data/histograms/United States/0321A.json
index e636ac8dfee..5b822b8ce9b 100644
--- a/docs/data/histograms/United States/0321A.json
+++ b/docs/data/histograms/United States/0321A.json
@@ -1 +1 @@
-{"batchcode": "0321A", "histograms": [{"batchcodes": ["0321A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "Immunisation reaction": 1, "Pneumonia": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "0321A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "Immunisation reaction": 1, "Pneumonia": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["0321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0321A2GA.json b/docs/data/histograms/United States/0321A2GA.json
index f0992560ec8..16624044293 100644
--- a/docs/data/histograms/United States/0321A2GA.json
+++ b/docs/data/histograms/United States/0321A2GA.json
@@ -1 +1 @@
-{"batchcode": "0321A2GA", "histograms": [{"batchcodes": ["0321A2GA"], "histogram": {"Abdominal pain": 1, "Chest discomfort": 1, "Chills": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "0321A2GA", "histograms": [{"histogram": {"Abdominal pain": 1, "Chest discomfort": 1, "Chills": 1, "Myalgia": 1, "Pain in extremity": 1, "Vaccination site mass": 1}, "batchcodes": ["0321A2GA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0321AG2A.json b/docs/data/histograms/United States/0321AG2A.json
index cdc9f773151..c162176edf8 100644
--- a/docs/data/histograms/United States/0321AG2A.json
+++ b/docs/data/histograms/United States/0321AG2A.json
@@ -1 +1 @@
-{"batchcode": "0321AG2A", "histograms": [{"batchcodes": ["0321AG2A"], "histogram": {"Myalgia": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "0321AG2A", "histograms": [{"histogram": {"Myalgia": 1, "Vaccination site mass": 1}, "batchcodes": ["0321AG2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0321B21H.json b/docs/data/histograms/United States/0321B21H.json
index 19c0fe6271d..4bdc4531ce4 100644
--- a/docs/data/histograms/United States/0321B21H.json
+++ b/docs/data/histograms/United States/0321B21H.json
@@ -1 +1 @@
-{"batchcode": "0321B21H", "histograms": [{"batchcodes": ["0321B21H"], "histogram": {"Fatigue": 1, "Heart rate irregular": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0321B21H", "histograms": [{"histogram": {"Fatigue": 1, "Heart rate irregular": 1, "Pain in extremity": 1}, "batchcodes": ["0321B21H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0321L20A.json b/docs/data/histograms/United States/0321L20A.json
index bbdde6b692b..b41413c334d 100644
--- a/docs/data/histograms/United States/0321L20A.json
+++ b/docs/data/histograms/United States/0321L20A.json
@@ -1 +1 @@
-{"batchcode": "0321L20A", "histograms": [{"batchcodes": ["0321L20A"], "histogram": {"Rash": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "0321L20A", "histograms": [{"histogram": {"Rash": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1}, "batchcodes": ["0321L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032220A.json b/docs/data/histograms/United States/032220A.json
index e09c0a8ca52..b9077e8c252 100644
--- a/docs/data/histograms/United States/032220A.json
+++ b/docs/data/histograms/United States/032220A.json
@@ -1 +1 @@
-{"batchcode": "032220A", "histograms": [{"batchcodes": ["032220A"], "histogram": {"Pain in extremity": 3, "Fatigue": 2, "Headache": 2, "Pyrexia": 2, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Erythema": 1, "Injection site warmth": 1, "Nausea": 1, "Neck pain": 1, "Peripheral swelling": 1, "Rash": 1, "Swelling": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}}]}
\ No newline at end of file
+{"batchcode": "032220A", "histograms": [{"histogram": {"Pain in extremity": 3, "Fatigue": 2, "Headache": 2, "Pyrexia": 2, "Chills": 1, "Decreased appetite": 1, "Dizziness": 1, "Erythema": 1, "Injection site warmth": 1, "Nausea": 1, "Neck pain": 1, "Peripheral swelling": 1, "Rash": 1, "Swelling": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1}, "batchcodes": ["032220A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0322L20A.json b/docs/data/histograms/United States/0322L20A.json
index 3ff43a3b67f..79f2d16361c 100644
--- a/docs/data/histograms/United States/0322L20A.json
+++ b/docs/data/histograms/United States/0322L20A.json
@@ -1 +1 @@
-{"batchcode": "0322L20A", "histograms": [{"batchcodes": ["0322L20A"], "histogram": {"Chills": 1, "Lymphadenopathy": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "0322L20A", "histograms": [{"histogram": {"Chills": 1, "Lymphadenopathy": 1, "Nasopharyngitis": 1, "Pain in extremity": 1, "Swelling": 1}, "batchcodes": ["0322L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032321A.json b/docs/data/histograms/United States/032321A.json
index 1a764c585cb..3c76beb3259 100644
--- a/docs/data/histograms/United States/032321A.json
+++ b/docs/data/histograms/United States/032321A.json
@@ -1 +1 @@
-{"batchcode": "032321A", "histograms": [{"batchcodes": ["032321A"], "histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "032321A", "histograms": [{"histogram": {"Body temperature": 1, "Feeling abnormal": 1, "Headache": 1, "Myalgia": 1, "Neck pain": 1, "Pain in extremity": 1}, "batchcodes": ["032321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0326204.json b/docs/data/histograms/United States/0326204.json
index 26c5a1a661c..c5c04f7f528 100644
--- a/docs/data/histograms/United States/0326204.json
+++ b/docs/data/histograms/United States/0326204.json
@@ -1 +1 @@
-{"batchcode": "0326204", "histograms": [{"batchcodes": ["0326204"], "histogram": {"Injection site discolouration": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0326204", "histograms": [{"histogram": {"Injection site discolouration": 1, "Pain in extremity": 1}, "batchcodes": ["0326204"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032620A.json b/docs/data/histograms/United States/032620A.json
index 2120a9a0a62..0e1c602268b 100644
--- a/docs/data/histograms/United States/032620A.json
+++ b/docs/data/histograms/United States/032620A.json
@@ -1 +1 @@
-{"batchcode": "032620A", "histograms": [{"batchcodes": ["032620A"], "histogram": {"Arthralgia": 3, "Chills": 3, "Headache": 3, "Pain": 3, "Fatigue": 2, "Feeling abnormal": 2, "Hypoaesthesia": 2, "Nausea": 2, "Pain in extremity": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Arrhythmia": 1, "Arthritis": 1, "Asthma": 1, "Blood test": 1, "Bone pain": 1, "Coagulopathy": 1, "Decreased appetite": 1, "Discomfort": 1, "Feeling of relaxation": 1, "Gait inability": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Limb discomfort": 1, "Lymphoedema": 1, "Malaise": 1, "Movement disorder": 1, "Muscle twitching": 1, "Myalgia": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sneezing": 1, "Suspected COVID-19": 1, "Vision blurred": 1}}]}
\ No newline at end of file
+{"batchcode": "032620A", "histograms": [{"histogram": {"Arthralgia": 3, "Chills": 3, "Headache": 3, "Pain": 3, "Fatigue": 2, "Feeling abnormal": 2, "Hypoaesthesia": 2, "Nausea": 2, "Pain in extremity": 2, "Rash": 2, "SARS-CoV-2 test": 2, "Arrhythmia": 1, "Arthritis": 1, "Asthma": 1, "Blood test": 1, "Bone pain": 1, "Coagulopathy": 1, "Decreased appetite": 1, "Discomfort": 1, "Feeling of relaxation": 1, "Gait inability": 1, "Heart rate increased": 1, "Hypersensitivity": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Limb discomfort": 1, "Lymphoedema": 1, "Malaise": 1, "Movement disorder": 1, "Muscle twitching": 1, "Myalgia": 1, "Nasal congestion": 1, "Nasopharyngitis": 1, "Oropharyngeal discomfort": 1, "Oropharyngeal pain": 1, "Oxygen saturation": 1, "Product dose omission issue": 1, "Pruritus": 1, "Rhinorrhoea": 1, "SARS-CoV-2 antibody test": 1, "Sneezing": 1, "Suspected COVID-19": 1, "Vision blurred": 1}, "batchcodes": ["032620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032621A.json b/docs/data/histograms/United States/032621A.json
index 79f51906a99..9df236f3219 100644
--- a/docs/data/histograms/United States/032621A.json
+++ b/docs/data/histograms/United States/032621A.json
@@ -1 +1 @@
-{"batchcode": "032621A", "histograms": [{"batchcodes": ["032621A"], "histogram": {"Asthenia": 1, "Discomfort": 1, "Fatigue": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Headache": 1, "Influenza like illness": 1, "Migraine": 1, "Myalgia": 1, "Peripheral swelling": 1, "Thirst": 1}}]}
\ No newline at end of file
+{"batchcode": "032621A", "histograms": [{"histogram": {"Asthenia": 1, "Discomfort": 1, "Fatigue": 1, "Feeling abnormal": 1, "Head discomfort": 1, "Headache": 1, "Influenza like illness": 1, "Migraine": 1, "Myalgia": 1, "Peripheral swelling": 1, "Thirst": 1}, "batchcodes": ["032621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032821A.json b/docs/data/histograms/United States/032821A.json
index 758b2fba262..691a1523991 100644
--- a/docs/data/histograms/United States/032821A.json
+++ b/docs/data/histograms/United States/032821A.json
@@ -1 +1 @@
-{"batchcode": "032821A", "histograms": [{"batchcodes": ["032821A"], "histogram": {"Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Bone lesion": 1, "Bone pain": 1, "Cold sweat": 1, "Cyst": 1, "Dehydration": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hyperthyroidism": 1, "Inappropriate schedule of product administration": 1, "Mobility decreased": 1, "Multiple sclerosis relapse": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Syncope": 1, "Tachycardia": 1}}]}
\ No newline at end of file
+{"batchcode": "032821A", "histograms": [{"histogram": {"Blood pressure measurement": 1, "Blood thyroid stimulating hormone": 1, "Bone lesion": 1, "Bone pain": 1, "Cold sweat": 1, "Cyst": 1, "Dehydration": 1, "Electrocardiogram": 1, "Fatigue": 1, "Headache": 1, "Heart rate": 1, "Hemiparesis": 1, "Hemiplegia": 1, "Hyperhidrosis": 1, "Hyperthyroidism": 1, "Inappropriate schedule of product administration": 1, "Mobility decreased": 1, "Multiple sclerosis relapse": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash": 1, "Syncope": 1, "Tachycardia": 1}, "batchcodes": ["032821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032A20A.json b/docs/data/histograms/United States/032A20A.json
index 05ce5917a9a..9d92579c2d6 100644
--- a/docs/data/histograms/United States/032A20A.json
+++ b/docs/data/histograms/United States/032A20A.json
@@ -1 +1 @@
-{"batchcode": "032A20A", "histograms": [{"batchcodes": ["032A20A"], "histogram": {"Product dose omission issue": 1, "Pruritus": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "032A20A", "histograms": [{"histogram": {"Product dose omission issue": 1, "Pruritus": 1, "Urticaria": 1}, "batchcodes": ["032A20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032A21A.json b/docs/data/histograms/United States/032A21A.json
index 61846bb76f8..e94cb3c543a 100644
--- a/docs/data/histograms/United States/032A21A.json
+++ b/docs/data/histograms/United States/032A21A.json
@@ -1 +1 @@
-{"batchcode": "032A21A", "histograms": [{"batchcodes": ["032A21A"], "histogram": {"Arthralgia": 1, "Chills": 1}}]}
\ No newline at end of file
+{"batchcode": "032A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1}, "batchcodes": ["032A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032A21B.json b/docs/data/histograms/United States/032A21B.json
index 5cb54ba32eb..c07281770aa 100644
--- a/docs/data/histograms/United States/032A21B.json
+++ b/docs/data/histograms/United States/032A21B.json
@@ -1 +1 @@
-{"batchcode": "032A21B", "histograms": [{"batchcodes": ["032A21B"], "histogram": {"International normalised ratio": 1, "International normalised ratio increased": 1}}]}
\ No newline at end of file
+{"batchcode": "032A21B", "histograms": [{"histogram": {"International normalised ratio": 1, "International normalised ratio increased": 1}, "batchcodes": ["032A21B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032AZI.json b/docs/data/histograms/United States/032AZI.json
index 6f2016e300e..d395ed236d9 100644
--- a/docs/data/histograms/United States/032AZI.json
+++ b/docs/data/histograms/United States/032AZI.json
@@ -1 +1 @@
-{"batchcode": "032AZI", "histograms": [{"batchcodes": ["032AZI"], "histogram": {"Insomnia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination site nodule": 1}}]}
\ No newline at end of file
+{"batchcode": "032AZI", "histograms": [{"histogram": {"Insomnia": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Vaccination site nodule": 1}, "batchcodes": ["032AZI"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B120A.json b/docs/data/histograms/United States/032B120A.json
index 03dc11870e7..f6dcbd7c38d 100644
--- a/docs/data/histograms/United States/032B120A.json
+++ b/docs/data/histograms/United States/032B120A.json
@@ -1 +1 @@
-{"batchcode": "032B120A", "histograms": [{"batchcodes": ["032B120A"], "histogram": {"Tinnitus": 2}}]}
\ No newline at end of file
+{"batchcode": "032B120A", "histograms": [{"histogram": {"Tinnitus": 2}, "batchcodes": ["032B120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B1A.json b/docs/data/histograms/United States/032B1A.json
index d3efcf5b647..9fc0d89bd50 100644
--- a/docs/data/histograms/United States/032B1A.json
+++ b/docs/data/histograms/United States/032B1A.json
@@ -1 +1 @@
-{"batchcode": "032B1A", "histograms": [{"batchcodes": ["032B1A"], "histogram": {"Myalgia": 1, "Palpitations": 1}}]}
\ No newline at end of file
+{"batchcode": "032B1A", "histograms": [{"histogram": {"Myalgia": 1, "Palpitations": 1}, "batchcodes": ["032B1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B2 1A.json b/docs/data/histograms/United States/032B2 1A.json
index 25fe702726f..ab8bada7bec 100644
--- a/docs/data/histograms/United States/032B2 1A.json
+++ b/docs/data/histograms/United States/032B2 1A.json
@@ -1 +1 @@
-{"batchcode": "032B2 1A", "histograms": [{"batchcodes": ["032B2 1A"], "histogram": {"Pruritus": 1, "Swelling face": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032B2 1A", "histograms": [{"histogram": {"Pruritus": 1, "Swelling face": 1, "Vaccination site pain": 1}, "batchcodes": ["032B2 1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B21.json b/docs/data/histograms/United States/032B21.json
index 41c3b4f3340..82e83f56f11 100644
--- a/docs/data/histograms/United States/032B21.json
+++ b/docs/data/histograms/United States/032B21.json
@@ -1 +1 @@
-{"batchcode": "032B21", "histograms": [{"batchcodes": ["032B21"], "histogram": {"Dizziness": 2, "Pyrexia": 2, "Chills": 1, "Decreased appetite": 1, "Ear discomfort": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site mass": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "032B21", "histograms": [{"histogram": {"Dizziness": 2, "Pyrexia": 2, "Chills": 1, "Decreased appetite": 1, "Ear discomfort": 1, "Headache": 1, "Myalgia": 1, "Nausea": 1, "Vaccination site mass": 1, "Vomiting": 1}, "batchcodes": ["032B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B214.json b/docs/data/histograms/United States/032B214.json
index 278243ce7d0..0a89ed3ef84 100644
--- a/docs/data/histograms/United States/032B214.json
+++ b/docs/data/histograms/United States/032B214.json
@@ -1 +1 @@
-{"batchcode": "032B214", "histograms": [{"batchcodes": ["032B214"], "histogram": {"Arthralgia": 1, "Discomfort": 1, "Influenza like illness": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "032B214", "histograms": [{"histogram": {"Arthralgia": 1, "Discomfort": 1, "Influenza like illness": 1, "Malaise": 1, "Pain": 1, "Pyrexia": 1, "Sleep disorder": 1}, "batchcodes": ["032B214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B21A..json b/docs/data/histograms/United States/032B21A..json
index ff59d1a2cc1..472c9960f36 100644
--- a/docs/data/histograms/United States/032B21A..json
+++ b/docs/data/histograms/United States/032B21A..json
@@ -1 +1 @@
-{"batchcode": "032B21A.", "histograms": [{"batchcodes": ["032B21A."], "histogram": {"Epistaxis": 1}}]}
\ No newline at end of file
+{"batchcode": "032B21A.", "histograms": [{"histogram": {"Epistaxis": 1}, "batchcodes": ["032B21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B21A.json b/docs/data/histograms/United States/032B21A.json
index 43be773d709..f2a36708b69 100644
--- a/docs/data/histograms/United States/032B21A.json
+++ b/docs/data/histograms/United States/032B21A.json
@@ -1 +1 @@
-{"batchcode": "032B21A", "histograms": [{"batchcodes": ["032B21A"], "histogram": {"Headache": 35, "Fatigue": 34, "Pyrexia": 30, "Myalgia": 26, "Pain in extremity": 22, "Vaccination site pain": 19, "Chills": 17, "Pain": 17, "Expired product administered": 15, "Nausea": 14, "Dizziness": 12, "Arthralgia": 11, "Vaccination site pruritus": 11, "Asthenia": 10, "Feeling abnormal": 10, "Hypoaesthesia": 9, "Pruritus": 9, "Rash": 9, "Vaccination site erythema": 9, "Body temperature": 8, "Cough": 8, "Product temperature excursion issue": 8, "Urticaria": 8, "Vaccination site swelling": 8, "Dyspnoea": 7, "Product dose omission issue": 7, "Blood pressure measurement": 6, "Decreased appetite": 6, "Erythema": 6, "Gait disturbance": 6, "Nasal congestion": 6, "Peripheral swelling": 6, "Neck pain": 5, "SARS-CoV-2 test": 5, "Vaccination site rash": 5, "Vomiting": 5, "COVID-19": 4, "Dyspepsia": 4, "Illness": 4, "Lymphadenopathy": 4, "Malaise": 4, "Product storage error": 4, "Rhinorrhoea": 4, "Swelling": 4, "Tremor": 4, "Vaccination complication": 4, "Vaccination site reaction": 4, "Vaccination site warmth": 4, "Back pain": 3, "Blood test": 3, "Confusional state": 3, "Diarrhoea": 3, "Discomfort": 3, "Exposure during pregnancy": 3, "Hypersensitivity": 3, "Muscle spasms": 3, "Muscular weakness": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Oxygen saturation": 3, "Paraesthesia": 3, "Rash pruritic": 3, "Somnolence": 3, "Anxiety": 2, "Blood pressure increased": 2, "Breast pain": 2, "Burning sensation": 2, "Chest pain": 2, "Device connection issue": 2, "Dysgeusia": 2, "Electrocardiogram": 2, "Fall": 2, "Fear": 2, "Feeding disorder": 2, "Feeling hot": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Hypertension": 2, "Impaired driving ability": 2, "Impaired work ability": 2, "Inappropriate schedule of product administration": 2, "Incorrect dose administered": 2, "Inflammation": 2, "Influenza like illness": 2, "Injection site pain": 2, "Insomnia": 2, "Limb discomfort": 2, "Lip swelling": 2, "Muscle twitching": 2, "Off label use": 2, "Oropharyngeal discomfort": 2, "Oropharyngeal pain": 2, "Product administered to patient of inappropriate age": 2, "Rash erythematous": 2, "SARS-CoV-2 test positive": 2, "Seizure": 2, "Skin discolouration": 2, "Skin reaction": 2, "Sneezing": 2, "Tenderness": 2, "Ultrasound scan": 2, "Underdose": 2, "Vertigo": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adrenal neoplasm": 1, "Alopecia": 1, "Amniocentesis": 1, "Anger": 1, "Arthropod bite": 1, "Asthma": 1, "Axillary mass": 1, "Axillary pain": 1, "Balance disorder": 1, "Bedridden": 1, "Bell's palsy": 1, "Bladder catheterisation": 1, "Blister": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Body temperature abnormal": 1, "Bone pain": 1, "Bronchitis": 1, "Chapped lips": 1, "Chest X-ray": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Contusion": 1, "Coronavirus test": 1, "Crying": 1, "Cytogenetic analysis": 1, "Depression": 1, "Disorientation": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphonia": 1, "Ear pain": 1, "Emotional distress": 1, "Encephalitis": 1, "Endoscopy": 1, "Epistaxis": 1, "Euphoric mood": 1, "Eye irritation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Fear of death": 1, "Feeling cold": 1, "Flushing": 1, "Gait inability": 1, "Head injury": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Immunisation reaction": 1, "Impaired healing": 1, "Influenza": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site swelling": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Language disorder": 1, "Lethargy": 1, "Lip blister": 1, "Lip disorder": 1, "Lyme disease": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Medication error": 1, "Meniere's disease": 1, "Migraine": 1, "Motion sickness": 1, "Motor dysfunction": 1, "Muscle contractions involuntary": 1, "Muscle tightness": 1, "Nail discolouration": 1, "Nasal discomfort": 1, "Nasal disorder": 1, "Nervousness": 1, "Neuralgia": 1, "Neurological examination": 1, "Night sweats": 1, "Nodule": 1, "Oedema": 1, "Oedema peripheral": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Paralysis": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Rash macular": 1, "Renal pain": 1, "Respiratory tract congestion": 1, "Restlessness": 1, "Scab": 1, "Scar": 1, "Scratch": 1, "Sensory loss": 1, "Sexually transmitted disease test": 1, "Sinus disorder": 1, "Sinusitis": 1, "Sleep disorder": 1, "Speech disorder": 1, "Spinal X-ray": 1, "Spinal disorder": 1, "Sweat discolouration": 1, "Swelling face": 1, "Testicular pain": 1, "Throat irritation": 1, "Tinnitus": 1, "Troponin": 1, "Ultrasound scan normal": 1, "Urinary incontinence": 1, "Vaccination site discolouration": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Varicose vein": 1, "Visual impairment": 1, "Vomiting projectile": 1, "Vulval ulceration": 1, "Weight decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "032B21A", "histograms": [{"histogram": {"Headache": 35, "Fatigue": 34, "Pyrexia": 30, "Myalgia": 26, "Pain in extremity": 22, "Vaccination site pain": 19, "Chills": 17, "Pain": 17, "Expired product administered": 15, "Nausea": 14, "Dizziness": 12, "Arthralgia": 11, "Vaccination site pruritus": 11, "Asthenia": 10, "Feeling abnormal": 10, "Hypoaesthesia": 9, "Pruritus": 9, "Rash": 9, "Vaccination site erythema": 9, "Body temperature": 8, "Cough": 8, "Product temperature excursion issue": 8, "Urticaria": 8, "Vaccination site swelling": 8, "Dyspnoea": 7, "Product dose omission issue": 7, "Blood pressure measurement": 6, "Decreased appetite": 6, "Erythema": 6, "Gait disturbance": 6, "Nasal congestion": 6, "Peripheral swelling": 6, "Neck pain": 5, "SARS-CoV-2 test": 5, "Vaccination site rash": 5, "Vomiting": 5, "COVID-19": 4, "Dyspepsia": 4, "Illness": 4, "Lymphadenopathy": 4, "Malaise": 4, "Product storage error": 4, "Rhinorrhoea": 4, "Swelling": 4, "Tremor": 4, "Vaccination complication": 4, "Vaccination site reaction": 4, "Vaccination site warmth": 4, "Back pain": 3, "Blood test": 3, "Confusional state": 3, "Diarrhoea": 3, "Discomfort": 3, "Exposure during pregnancy": 3, "Hypersensitivity": 3, "Muscle spasms": 3, "Muscular weakness": 3, "Musculoskeletal stiffness": 3, "Nasopharyngitis": 3, "Oxygen saturation": 3, "Paraesthesia": 3, "Rash pruritic": 3, "Somnolence": 3, "Anxiety": 2, "Blood pressure increased": 2, "Breast pain": 2, "Burning sensation": 2, "Chest pain": 2, "Device connection issue": 2, "Dysgeusia": 2, "Electrocardiogram": 2, "Fall": 2, "Fear": 2, "Feeding disorder": 2, "Feeling hot": 2, "Heart rate": 2, "Hyperhidrosis": 2, "Hypertension": 2, "Impaired driving ability": 2, "Impaired work ability": 2, "Inappropriate schedule of product administration": 2, "Incorrect dose administered": 2, "Inflammation": 2, "Influenza like illness": 2, "Injection site pain": 2, "Insomnia": 2, "Limb discomfort": 2, "Lip swelling": 2, "Muscle twitching": 2, "Off label use": 2, "Oropharyngeal discomfort": 2, "Oropharyngeal pain": 2, "Product administered to patient of inappropriate age": 2, "Rash erythematous": 2, "SARS-CoV-2 test positive": 2, "Seizure": 2, "Skin discolouration": 2, "Skin reaction": 2, "Sneezing": 2, "Tenderness": 2, "Ultrasound scan": 2, "Underdose": 2, "Vertigo": 2, "Vision blurred": 2, "Abdominal discomfort": 1, "Accidental overdose": 1, "Accidental underdose": 1, "Adrenal neoplasm": 1, "Alopecia": 1, "Amniocentesis": 1, "Anger": 1, "Arthropod bite": 1, "Asthma": 1, "Axillary mass": 1, "Axillary pain": 1, "Balance disorder": 1, "Bedridden": 1, "Bell's palsy": 1, "Bladder catheterisation": 1, "Blister": 1, "Blood glucose": 1, "Blood pressure decreased": 1, "Body temperature abnormal": 1, "Bone pain": 1, "Bronchitis": 1, "Chapped lips": 1, "Chest X-ray": 1, "Cold sweat": 1, "Computerised tomogram": 1, "Condition aggravated": 1, "Contusion": 1, "Coronavirus test": 1, "Crying": 1, "Cytogenetic analysis": 1, "Depression": 1, "Disorientation": 1, "Dysarthria": 1, "Dyskinesia": 1, "Dysphonia": 1, "Ear pain": 1, "Emotional distress": 1, "Encephalitis": 1, "Endoscopy": 1, "Epistaxis": 1, "Euphoric mood": 1, "Eye irritation": 1, "Eye movement disorder": 1, "Eye pain": 1, "Fear of death": 1, "Feeling cold": 1, "Flushing": 1, "Gait inability": 1, "Head injury": 1, "Heart rate increased": 1, "Herpes zoster": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Immunisation reaction": 1, "Impaired healing": 1, "Influenza": 1, "Injection site erythema": 1, "Injection site mass": 1, "Injection site swelling": 1, "Laboratory test": 1, "Lacrimation increased": 1, "Language disorder": 1, "Lethargy": 1, "Lip blister": 1, "Lip disorder": 1, "Lyme disease": 1, "Magnetic resonance imaging": 1, "Mass": 1, "Maternal exposure during pregnancy": 1, "Medication error": 1, "Meniere's disease": 1, "Migraine": 1, "Motion sickness": 1, "Motor dysfunction": 1, "Muscle contractions involuntary": 1, "Muscle tightness": 1, "Nail discolouration": 1, "Nasal discomfort": 1, "Nasal disorder": 1, "Nervousness": 1, "Neuralgia": 1, "Neurological examination": 1, "Night sweats": 1, "Nodule": 1, "Oedema": 1, "Oedema peripheral": 1, "Oral discomfort": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Paralysis": 1, "Pregnancy test": 1, "Prenatal screening test": 1, "Rash macular": 1, "Renal pain": 1, "Respiratory tract congestion": 1, "Restlessness": 1, "Scab": 1, "Scar": 1, "Scratch": 1, "Sensory loss": 1, "Sexually transmitted disease test": 1, "Sinus disorder": 1, "Sinusitis": 1, "Sleep disorder": 1, "Speech disorder": 1, "Spinal X-ray": 1, "Spinal disorder": 1, "Sweat discolouration": 1, "Swelling face": 1, "Testicular pain": 1, "Throat irritation": 1, "Tinnitus": 1, "Troponin": 1, "Ultrasound scan normal": 1, "Urinary incontinence": 1, "Vaccination site discolouration": 1, "Vaccination site haemorrhage": 1, "Vaccination site induration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1, "Vaccination site urticaria": 1, "Varicose vein": 1, "Visual impairment": 1, "Vomiting projectile": 1, "Vulval ulceration": 1, "Weight decreased": 1}, "batchcodes": ["032B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B21E.json b/docs/data/histograms/United States/032B21E.json
index 9d1f3711c2b..6db7d92bae8 100644
--- a/docs/data/histograms/United States/032B21E.json
+++ b/docs/data/histograms/United States/032B21E.json
@@ -1 +1 @@
-{"batchcode": "032B21E", "histograms": [{"batchcodes": ["032B21E"], "histogram": {"Chest pain": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032B21E", "histograms": [{"histogram": {"Chest pain": 1, "Vaccination site movement impairment": 1, "Vaccination site pain": 1}, "batchcodes": ["032B21E"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032B31.json b/docs/data/histograms/United States/032B31.json
index 2165331fef3..36fbf1caf09 100644
--- a/docs/data/histograms/United States/032B31.json
+++ b/docs/data/histograms/United States/032B31.json
@@ -1 +1 @@
-{"batchcode": "032B31", "histograms": [{"batchcodes": ["032B31"], "histogram": {"Product dose omission issue": 1}}]}
\ No newline at end of file
+{"batchcode": "032B31", "histograms": [{"histogram": {"Product dose omission issue": 1}, "batchcodes": ["032B31"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032BD1A.json b/docs/data/histograms/United States/032BD1A.json
index c80c6dc0587..8e973eebc6c 100644
--- a/docs/data/histograms/United States/032BD1A.json
+++ b/docs/data/histograms/United States/032BD1A.json
@@ -1 +1 @@
-{"batchcode": "032BD1A", "histograms": [{"batchcodes": ["032BD1A"], "histogram": {"Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "032BD1A", "histograms": [{"histogram": {"Pruritus": 1}, "batchcodes": ["032BD1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032BZIA.json b/docs/data/histograms/United States/032BZIA.json
index 066329a5669..8bc2e22e9fa 100644
--- a/docs/data/histograms/United States/032BZIA.json
+++ b/docs/data/histograms/United States/032BZIA.json
@@ -1 +1 @@
-{"batchcode": "032BZIA", "histograms": [{"batchcodes": ["032BZIA"], "histogram": {"Back pain": 1, "COVID-19": 1, "Contusion": 1, "Erythema": 1, "Fatigue": 1, "Hypersomnia": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "032BZIA", "histograms": [{"histogram": {"Back pain": 1, "COVID-19": 1, "Contusion": 1, "Erythema": 1, "Fatigue": 1, "Hypersomnia": 1, "Nausea": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Pruritus": 1, "Swelling": 1}, "batchcodes": ["032BZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032BZLA.json b/docs/data/histograms/United States/032BZLA.json
index 18c7161cf5e..ec434036a40 100644
--- a/docs/data/histograms/United States/032BZLA.json
+++ b/docs/data/histograms/United States/032BZLA.json
@@ -1 +1 @@
-{"batchcode": "032BZLA", "histograms": [{"batchcodes": ["032BZLA"], "histogram": {"Cough": 2, "Feeling abnormal": 2, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "032BZLA", "histograms": [{"histogram": {"Cough": 2, "Feeling abnormal": 2, "Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1, "Pyrexia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["032BZLA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032C21A.json b/docs/data/histograms/United States/032C21A.json
index c4bbabd7f9d..32b17fc67d3 100644
--- a/docs/data/histograms/United States/032C21A.json
+++ b/docs/data/histograms/United States/032C21A.json
@@ -1 +1 @@
-{"batchcode": "032C21A", "histograms": [{"batchcodes": ["032C21A"], "histogram": {"Fibromyalgia": 1, "Impaired work ability": 1, "Pain": 1, "Rheumatoid arthritis": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "032C21A", "histograms": [{"histogram": {"Fibromyalgia": 1, "Impaired work ability": 1, "Pain": 1, "Rheumatoid arthritis": 1, "Vaccination site erythema": 1, "Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}, "batchcodes": ["032C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032D21A.json b/docs/data/histograms/United States/032D21A.json
index 745c08765aa..3015f88df12 100644
--- a/docs/data/histograms/United States/032D21A.json
+++ b/docs/data/histograms/United States/032D21A.json
@@ -1 +1 @@
-{"batchcode": "032D21A", "histograms": [{"batchcodes": ["032D21A"], "histogram": {"Arthralgia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Limb discomfort": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Product dose omission issue": 1, "Tinnitus": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "032D21A", "histograms": [{"histogram": {"Arthralgia": 1, "Dizziness": 1, "Fatigue": 1, "Headache": 1, "Limb discomfort": 1, "Movement disorder": 1, "Musculoskeletal stiffness": 1, "Myalgia": 1, "Product dose omission issue": 1, "Tinnitus": 1, "Vaccination site mass": 1}, "batchcodes": ["032D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032E211A.json b/docs/data/histograms/United States/032E211A.json
index 3b23cce9c00..8b03a7adb34 100644
--- a/docs/data/histograms/United States/032E211A.json
+++ b/docs/data/histograms/United States/032E211A.json
@@ -1 +1 @@
-{"batchcode": "032E211A", "histograms": [{"batchcodes": ["032E211A"], "histogram": {"Electric shock sensation": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1}}]}
\ No newline at end of file
+{"batchcode": "032E211A", "histograms": [{"histogram": {"Electric shock sensation": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1}, "batchcodes": ["032E211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032F.json b/docs/data/histograms/United States/032F.json
index c03025ef20a..76d131f6768 100644
--- a/docs/data/histograms/United States/032F.json
+++ b/docs/data/histograms/United States/032F.json
@@ -1 +1 @@
-{"batchcode": "032F", "histograms": [{"batchcodes": ["032F"], "histogram": {"Fatigue": 1, "Pyrexia": 1, "Rash": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "032F", "histograms": [{"histogram": {"Fatigue": 1, "Pyrexia": 1, "Rash": 1, "Vaccination complication": 1}, "batchcodes": ["032F"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032F214.json b/docs/data/histograms/United States/032F214.json
index 3e2546f8571..4672be35a00 100644
--- a/docs/data/histograms/United States/032F214.json
+++ b/docs/data/histograms/United States/032F214.json
@@ -1 +1 @@
-{"batchcode": "032F214", "histograms": [{"batchcodes": ["032F214"], "histogram": {"Hot flush": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "032F214", "histograms": [{"histogram": {"Hot flush": 1, "Interchange of vaccine products": 1, "Loss of consciousness": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["032F214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032F21A.json b/docs/data/histograms/United States/032F21A.json
index ab99c8fe281..1dcf1812808 100644
--- a/docs/data/histograms/United States/032F21A.json
+++ b/docs/data/histograms/United States/032F21A.json
@@ -1 +1 @@
-{"batchcode": "032F21A", "histograms": [{"batchcodes": ["032F21A", "042A21A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["032F21A", "1805081"], "histogram": {"COVID-19": 1}}, {"batchcodes": ["032F21A", "LOT EK9231"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["032F21A"], "histogram": {"Expired product administered": 24, "Product storage error": 11, "Pain in extremity": 8, "Pyrexia": 8, "Body temperature": 7, "Myalgia": 7, "Accidental underdose": 6, "COVID-19": 6, "Chills": 6, "Fatigue": 6, "Nausea": 6, "Pain": 6, "SARS-CoV-2 test": 6, "Dyspnoea": 5, "Feeling abnormal": 4, "Headache": 4, "Product administered to patient of inappropriate age": 4, "Vaccination site pain": 4, "Arthralgia": 3, "Dizziness": 3, "Extra dose administered": 3, "Feeling hot": 3, "Gait disturbance": 3, "Product administration error": 3, "Rash": 3, "Vaccination site erythema": 3, "Vaccination site swelling": 3, "Back pain": 2, "Burning sensation": 2, "Chest pain": 2, "Discomfort": 2, "Drug ineffective": 2, "Flushing": 2, "Hypersomnia": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Laboratory test": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Neck pain": 2, "Paraesthesia": 2, "Poor quality product administered": 2, "Spinal pain": 2, "Vertigo": 2, "Vomiting": 2, "Abnormal dreams": 1, "Accidental overdose": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Body temperature fluctuation": 1, "Body temperature increased": 1, "Breakthrough COVID-19": 1, "Chest discomfort": 1, "Contusion": 1, "Cough": 1, "Disturbance in attention": 1, "Electrocardiogram": 1, "Erythema": 1, "Eye swelling": 1, "Full blood count": 1, "Glassy eyes": 1, "Heart rate": 1, "Hypersensitivity": 1, "Illness": 1, "Immunisation": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Injection site erythema": 1, "Interchange of vaccine products": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging thoracic": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Night sweats": 1, "Oropharyngeal pain": 1, "Product temperature excursion issue": 1, "Product use issue": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test positive": 1, "Somnolence": 1, "Spinal stenosis": 1, "Splenic rupture": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Swollen tongue": 1, "Tenderness": 1, "Thrombosis": 1, "Tremor": 1, "Vaccination complication": 1, "Vaccination site discharge": 1, "Vaccination site discolouration": 1, "Vaccination site movement impairment": 1, "Vaccination site vesicles": 1, "Vaccination site warmth": 1, "Wrong product administered": 1}}]}
\ No newline at end of file
+{"batchcode": "032F21A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["032F21A", "042A21A"]}, {"histogram": {"COVID-19": 1}, "batchcodes": ["032F21A", "1805081"]}, {"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Interchange of vaccine products": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["032F21A", "LOT EK9231"]}, {"histogram": {"Expired product administered": 24, "Product storage error": 11, "Pain in extremity": 8, "Pyrexia": 8, "Body temperature": 7, "Myalgia": 7, "Accidental underdose": 6, "COVID-19": 6, "Chills": 6, "Fatigue": 6, "Nausea": 6, "Pain": 6, "SARS-CoV-2 test": 6, "Dyspnoea": 5, "Feeling abnormal": 4, "Headache": 4, "Product administered to patient of inappropriate age": 4, "Vaccination site pain": 4, "Arthralgia": 3, "Dizziness": 3, "Extra dose administered": 3, "Feeling hot": 3, "Gait disturbance": 3, "Product administration error": 3, "Rash": 3, "Vaccination site erythema": 3, "Vaccination site swelling": 3, "Back pain": 2, "Burning sensation": 2, "Chest pain": 2, "Discomfort": 2, "Drug ineffective": 2, "Flushing": 2, "Hypersomnia": 2, "Hypoaesthesia": 2, "Inappropriate schedule of product administration": 2, "Laboratory test": 2, "Magnetic resonance imaging": 2, "Malaise": 2, "Neck pain": 2, "Paraesthesia": 2, "Poor quality product administered": 2, "Spinal pain": 2, "Vertigo": 2, "Vomiting": 2, "Abnormal dreams": 1, "Accidental overdose": 1, "Asthenia": 1, "Axillary pain": 1, "Blood pressure measurement": 1, "Body temperature fluctuation": 1, "Body temperature increased": 1, "Breakthrough COVID-19": 1, "Chest discomfort": 1, "Contusion": 1, "Cough": 1, "Disturbance in attention": 1, "Electrocardiogram": 1, "Erythema": 1, "Eye swelling": 1, "Full blood count": 1, "Glassy eyes": 1, "Heart rate": 1, "Hypersensitivity": 1, "Illness": 1, "Immunisation": 1, "Impaired work ability": 1, "Incorrect dose administered": 1, "Incorrect route of product administration": 1, "Injection site erythema": 1, "Interchange of vaccine products": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Lymphadenopathy": 1, "Magnetic resonance imaging thoracic": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Night sweats": 1, "Oropharyngeal pain": 1, "Product temperature excursion issue": 1, "Product use issue": 1, "Pruritus": 1, "Pulmonary embolism": 1, "Red blood cell sedimentation rate": 1, "SARS-CoV-2 test positive": 1, "Somnolence": 1, "Spinal stenosis": 1, "Splenic rupture": 1, "Suspected COVID-19": 1, "Swelling face": 1, "Swollen tongue": 1, "Tenderness": 1, "Thrombosis": 1, "Tremor": 1, "Vaccination complication": 1, "Vaccination site discharge": 1, "Vaccination site discolouration": 1, "Vaccination site movement impairment": 1, "Vaccination site vesicles": 1, "Vaccination site warmth": 1, "Wrong product administered": 1}, "batchcodes": ["032F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032FF21A.json b/docs/data/histograms/United States/032FF21A.json
index cc622ef804a..a77137e84bb 100644
--- a/docs/data/histograms/United States/032FF21A.json
+++ b/docs/data/histograms/United States/032FF21A.json
@@ -1 +1 @@
-{"batchcode": "032FF21A", "histograms": [{"batchcodes": ["032FF21A"], "histogram": {"Fatigue": 1, "Headache": 1, "Maternal exposure during breast feeding": 1}}]}
\ No newline at end of file
+{"batchcode": "032FF21A", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Maternal exposure during breast feeding": 1}, "batchcodes": ["032FF21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032G20A.json b/docs/data/histograms/United States/032G20A.json
index fc8139aa1c1..a9d3e059e9e 100644
--- a/docs/data/histograms/United States/032G20A.json
+++ b/docs/data/histograms/United States/032G20A.json
@@ -1 +1 @@
-{"batchcode": "032G20A", "histograms": [{"batchcodes": ["032G20A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "032G20A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["032G20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032H141.json b/docs/data/histograms/United States/032H141.json
index 4f8ef33b8b5..6e1142aecdc 100644
--- a/docs/data/histograms/United States/032H141.json
+++ b/docs/data/histograms/United States/032H141.json
@@ -1 +1 @@
-{"batchcode": "032H141", "histograms": [{"batchcodes": ["032H141"], "histogram": {"COVID-19": 1, "Interchange of vaccine products": 1}}]}
\ No newline at end of file
+{"batchcode": "032H141", "histograms": [{"histogram": {"COVID-19": 1, "Interchange of vaccine products": 1}, "batchcodes": ["032H141"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032H1A.json b/docs/data/histograms/United States/032H1A.json
index 7179709de8d..8bdca7ad70a 100644
--- a/docs/data/histograms/United States/032H1A.json
+++ b/docs/data/histograms/United States/032H1A.json
@@ -1 +1 @@
-{"batchcode": "032H1A", "histograms": [{"batchcodes": ["032H1A"], "histogram": {"Peripheral swelling": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "032H1A", "histograms": [{"histogram": {"Peripheral swelling": 1, "Urticaria": 1}, "batchcodes": ["032H1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032H20A.json b/docs/data/histograms/United States/032H20A.json
index 4436c51f41d..3bbf4c8fdf9 100644
--- a/docs/data/histograms/United States/032H20A.json
+++ b/docs/data/histograms/United States/032H20A.json
@@ -1 +1 @@
-{"batchcode": "032H20A", "histograms": [{"batchcodes": ["032H20A"], "histogram": {"Vaccination site erythema": 5, "Pain in extremity": 4, "Pruritus": 4, "Vaccination site pain": 4, "Vaccination site pruritus": 4, "Vaccination site rash": 4, "Vaccination site warmth": 3, "Arthralgia": 2, "Erythema": 2, "Fatigue": 2, "Feeling abnormal": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Pain": 2, "Vaccination site swelling": 2, "Acne": 1, "Body temperature": 1, "COVID-19": 1, "Condition aggravated": 1, "Dizziness": 1, "Expired product administered": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Injection site extravasation": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Neck pain": 1, "Papule": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Sinus headache": 1, "Skin burning sensation": 1, "Skin reaction": 1, "Swelling": 1, "Underdose": 1, "Vaccination site induration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1}}]}
\ No newline at end of file
+{"batchcode": "032H20A", "histograms": [{"histogram": {"Vaccination site erythema": 5, "Pain in extremity": 4, "Pruritus": 4, "Vaccination site pain": 4, "Vaccination site pruritus": 4, "Vaccination site rash": 4, "Vaccination site warmth": 3, "Arthralgia": 2, "Erythema": 2, "Fatigue": 2, "Feeling abnormal": 2, "Muscle spasms": 2, "Muscle twitching": 2, "Pain": 2, "Vaccination site swelling": 2, "Acne": 1, "Body temperature": 1, "COVID-19": 1, "Condition aggravated": 1, "Dizziness": 1, "Expired product administered": 1, "Headache": 1, "Herpes zoster": 1, "Hyperhidrosis": 1, "Inappropriate schedule of product administration": 1, "Injection site extravasation": 1, "Lymphadenopathy": 1, "Mobility decreased": 1, "Neck pain": 1, "Papule": 1, "Peripheral swelling": 1, "Pyrexia": 1, "Rash": 1, "Rash erythematous": 1, "Rash papular": 1, "Rash pruritic": 1, "SARS-CoV-2 test": 1, "Sinus headache": 1, "Skin burning sensation": 1, "Skin reaction": 1, "Swelling": 1, "Underdose": 1, "Vaccination site induration": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site mass": 1}, "batchcodes": ["032H20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032H20P.json b/docs/data/histograms/United States/032H20P.json
index ab3a9fad2d6..84b91a60fe0 100644
--- a/docs/data/histograms/United States/032H20P.json
+++ b/docs/data/histograms/United States/032H20P.json
@@ -1 +1 @@
-{"batchcode": "032H20P", "histograms": [{"batchcodes": ["032H20P"], "histogram": {"Cold sweat": 1, "Dizziness": 1, "Erythema": 1, "Eye irritation": 1, "Injection site pruritus": 1, "Nausea": 1, "Ocular hyperaemia": 1, "Pain": 1, "Pruritus": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "032H20P", "histograms": [{"histogram": {"Cold sweat": 1, "Dizziness": 1, "Erythema": 1, "Eye irritation": 1, "Injection site pruritus": 1, "Nausea": 1, "Ocular hyperaemia": 1, "Pain": 1, "Pruritus": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["032H20P"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032H21A.json b/docs/data/histograms/United States/032H21A.json
index 54815fba7f5..fe3c924e406 100644
--- a/docs/data/histograms/United States/032H21A.json
+++ b/docs/data/histograms/United States/032H21A.json
@@ -1 +1 @@
-{"batchcode": "032H21A", "histograms": [{"batchcodes": ["032H21A"], "histogram": {"Expired product administered": 15, "Myalgia": 4, "Product administered to patient of inappropriate age": 4, "Rash": 4, "Diarrhoea": 3, "Pain in extremity": 3, "Product storage error": 3, "Pruritus": 3, "SARS-CoV-2 test": 3, "Abdominal pain upper": 2, "Chills": 2, "Dizziness": 2, "Feeling abnormal": 2, "Headache": 2, "Hyperhidrosis": 2, "Inflammation": 2, "No adverse event": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site pain": 2, "Abdominal lymphadenopathy": 1, "Cardiac discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Erythema": 1, "Erythema of eyelid": 1, "Exposure via breast milk": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Gait disturbance": 1, "Haematochezia": 1, "Hepatic enzyme": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Insomnia": 1, "Irritability": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Maternal exposure during breast feeding": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Nasal congestion": 1, "Osteoarthritis": 1, "Palpitations": 1, "Product administration interrupted": 1, "Product dose omission in error": 1, "Product temperature excursion issue": 1, "Pyrexia": 1, "Sneezing": 1, "Somnolence": 1, "Splenomegaly": 1, "Tinnitus": 1, "Underdose": 1, "Vaccination site paraesthesia": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "032H21A", "histograms": [{"histogram": {"Expired product administered": 15, "Myalgia": 4, "Product administered to patient of inappropriate age": 4, "Rash": 4, "Diarrhoea": 3, "Pain in extremity": 3, "Product storage error": 3, "Pruritus": 3, "SARS-CoV-2 test": 3, "Abdominal pain upper": 2, "Chills": 2, "Dizziness": 2, "Feeling abnormal": 2, "Headache": 2, "Hyperhidrosis": 2, "Inflammation": 2, "No adverse event": 2, "Urticaria": 2, "Vaccination complication": 2, "Vaccination site pain": 2, "Abdominal lymphadenopathy": 1, "Cardiac discomfort": 1, "Chest pain": 1, "Computerised tomogram": 1, "Electrocardiogram": 1, "Electrocardiogram abnormal": 1, "Erythema": 1, "Erythema of eyelid": 1, "Exposure via breast milk": 1, "Feeling hot": 1, "Feeling of body temperature change": 1, "Gait disturbance": 1, "Haematochezia": 1, "Hepatic enzyme": 1, "Hepatic pain": 1, "Herpes zoster": 1, "Hypoacusis": 1, "Hypokinesia": 1, "Inappropriate schedule of product administration": 1, "Induration": 1, "Insomnia": 1, "Irritability": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Lymphadenitis": 1, "Lymphadenopathy": 1, "Maternal exposure during breast feeding": 1, "Mobility decreased": 1, "Muscle spasms": 1, "Nasal congestion": 1, "Osteoarthritis": 1, "Palpitations": 1, "Product administration interrupted": 1, "Product dose omission in error": 1, "Product temperature excursion issue": 1, "Pyrexia": 1, "Sneezing": 1, "Somnolence": 1, "Splenomegaly": 1, "Tinnitus": 1, "Underdose": 1, "Vaccination site paraesthesia": 1, "Vaccination site pruritus": 1, "Vaccination site swelling": 1}, "batchcodes": ["032H21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032H271A.json b/docs/data/histograms/United States/032H271A.json
index 6d97b2bd9a0..6662765abdc 100644
--- a/docs/data/histograms/United States/032H271A.json
+++ b/docs/data/histograms/United States/032H271A.json
@@ -1 +1 @@
-{"batchcode": "032H271A", "histograms": [{"batchcodes": ["032H271A"], "histogram": {"Alopecia": 3, "Blood test": 3, "Rhinorrhoea": 2, "SARS-CoV-2 test": 2, "Urine analysis": 2, "Condition aggravated": 1, "SARS-CoV-2 test negative": 1, "Urine analysis normal": 1}}]}
\ No newline at end of file
+{"batchcode": "032H271A", "histograms": [{"histogram": {"Alopecia": 3, "Blood test": 3, "Rhinorrhoea": 2, "SARS-CoV-2 test": 2, "Urine analysis": 2, "Condition aggravated": 1, "SARS-CoV-2 test negative": 1, "Urine analysis normal": 1}, "batchcodes": ["032H271A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032HZIA.json b/docs/data/histograms/United States/032HZIA.json
index 02d83f89b74..21ee2375274 100644
--- a/docs/data/histograms/United States/032HZIA.json
+++ b/docs/data/histograms/United States/032HZIA.json
@@ -1 +1 @@
-{"batchcode": "032HZIA", "histograms": [{"batchcodes": ["032HZIA"], "histogram": {"Erythema": 1, "Inappropriate schedule of product administration": 1, "Mass": 1, "Pruritus": 1, "Rash": 1, "Rash macular": 1, "Skin irritation": 1}}]}
\ No newline at end of file
+{"batchcode": "032HZIA", "histograms": [{"histogram": {"Erythema": 1, "Inappropriate schedule of product administration": 1, "Mass": 1, "Pruritus": 1, "Rash": 1, "Rash macular": 1, "Skin irritation": 1}, "batchcodes": ["032HZIA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032I20A.json b/docs/data/histograms/United States/032I20A.json
index a257446a2b5..5ed3c3a3e30 100644
--- a/docs/data/histograms/United States/032I20A.json
+++ b/docs/data/histograms/United States/032I20A.json
@@ -1 +1 @@
-{"batchcode": "032I20A", "histograms": [{"batchcodes": ["032I20A"], "histogram": {"Rash": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "032I20A", "histograms": [{"histogram": {"Rash": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["032I20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032I70A.json b/docs/data/histograms/United States/032I70A.json
index 1f27e79d384..39058656b42 100644
--- a/docs/data/histograms/United States/032I70A.json
+++ b/docs/data/histograms/United States/032I70A.json
@@ -1 +1 @@
-{"batchcode": "032I70A", "histograms": [{"batchcodes": ["032I70A"], "histogram": {"Nausea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "032I70A", "histograms": [{"histogram": {"Nausea": 1, "Vomiting": 1}, "batchcodes": ["032I70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032K20A.json b/docs/data/histograms/United States/032K20A.json
index 2d918894ddd..0fcc1fe0579 100644
--- a/docs/data/histograms/United States/032K20A.json
+++ b/docs/data/histograms/United States/032K20A.json
@@ -1 +1 @@
-{"batchcode": "032K20A", "histograms": [{"batchcodes": ["032K20A"], "histogram": {"Vaccination site pain": 2, "Anxiety": 1, "Erythema": 1, "Feeling hot": 1, "Suspected counterfeit product": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "032K20A", "histograms": [{"histogram": {"Vaccination site pain": 2, "Anxiety": 1, "Erythema": 1, "Feeling hot": 1, "Suspected counterfeit product": 1, "Swelling": 1, "Urticaria": 1, "Vaccination site erythema": 1}, "batchcodes": ["032K20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L02A.json b/docs/data/histograms/United States/032L02A.json
index eaac7a9afcc..d9a2bfade8f 100644
--- a/docs/data/histograms/United States/032L02A.json
+++ b/docs/data/histograms/United States/032L02A.json
@@ -1 +1 @@
-{"batchcode": "032L02A", "histograms": [{"batchcodes": ["032L02A"], "histogram": {"Antibody test": 1, "Dizziness": 1, "Fatigue": 1, "Feeling hot": 1, "Hypersomnia": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash macular": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "032L02A", "histograms": [{"histogram": {"Antibody test": 1, "Dizziness": 1, "Fatigue": 1, "Feeling hot": 1, "Hypersomnia": 1, "Pain": 1, "Peripheral swelling": 1, "Pruritus": 1, "Rash macular": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["032L02A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L120A OR 032.json b/docs/data/histograms/United States/032L120A OR 032.json
index 1b9f1620178..6c100e556b3 100644
--- a/docs/data/histograms/United States/032L120A OR 032.json
+++ b/docs/data/histograms/United States/032L120A OR 032.json
@@ -1 +1 @@
-{"batchcode": "032L120A OR 032", "histograms": [{"batchcodes": ["032L120A OR 032"], "histogram": {"Arthralgia": 1, "Back pain": 1, "Blister": 1, "Chills": 1, "Dysgeusia": 1, "Erythema": 1, "Feeling hot": 1, "Herpes zoster": 1, "Myalgia": 1, "Pain in extremity": 1, "Sunburn": 1}}]}
\ No newline at end of file
+{"batchcode": "032L120A OR 032", "histograms": [{"histogram": {"Arthralgia": 1, "Back pain": 1, "Blister": 1, "Chills": 1, "Dysgeusia": 1, "Erythema": 1, "Feeling hot": 1, "Herpes zoster": 1, "Myalgia": 1, "Pain in extremity": 1, "Sunburn": 1}, "batchcodes": ["032L120A OR 032"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L2(Z)1A.json b/docs/data/histograms/United States/032L2(Z)1A.json
index f5012ce0f3d..76087bbc83a 100644
--- a/docs/data/histograms/United States/032L2(Z)1A.json
+++ b/docs/data/histograms/United States/032L2(Z)1A.json
@@ -1 +1 @@
-{"batchcode": "032L2(Z)1A", "histograms": [{"batchcodes": ["032L2(Z)1A"], "histogram": {"Inappropriate schedule of product administration": 1, "Off label use": 1}}]}
\ No newline at end of file
+{"batchcode": "032L2(Z)1A", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Off label use": 1}, "batchcodes": ["032L2(Z)1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L2*A.json b/docs/data/histograms/United States/032L2*A.json
index 546db26ed12..94cb12302e8 100644
--- a/docs/data/histograms/United States/032L2*A.json
+++ b/docs/data/histograms/United States/032L2*A.json
@@ -1 +1 @@
-{"batchcode": "032L2*A", "histograms": [{"batchcodes": ["032L2*A"], "histogram": {"Fatigue": 2, "Headache": 1, "Lymphadenopathy": 1, "Mammogram": 1}}]}
\ No newline at end of file
+{"batchcode": "032L2*A", "histograms": [{"histogram": {"Fatigue": 2, "Headache": 1, "Lymphadenopathy": 1, "Mammogram": 1}, "batchcodes": ["032L2*A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20.json b/docs/data/histograms/United States/032L20.json
index 991b942513a..f97b1a99c31 100644
--- a/docs/data/histograms/United States/032L20.json
+++ b/docs/data/histograms/United States/032L20.json
@@ -1 +1 @@
-{"batchcode": "032L20", "histograms": [{"batchcodes": ["032L20"], "histogram": {"Asthenia": 1, "Discomfort": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20", "histograms": [{"histogram": {"Asthenia": 1, "Discomfort": 1, "Fatigue": 1, "Headache": 1, "Pyrexia": 1, "Somnolence": 1}, "batchcodes": ["032L20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L202.json b/docs/data/histograms/United States/032L202.json
index 4a82106cf06..c3c3426a8fd 100644
--- a/docs/data/histograms/United States/032L202.json
+++ b/docs/data/histograms/United States/032L202.json
@@ -1 +1 @@
-{"batchcode": "032L202", "histograms": [{"batchcodes": ["032L202"], "histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "032L202", "histograms": [{"histogram": {"Vaccination site erythema": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1}, "batchcodes": ["032L202"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L203.json b/docs/data/histograms/United States/032L203.json
index 9d90eb257bd..144374a2321 100644
--- a/docs/data/histograms/United States/032L203.json
+++ b/docs/data/histograms/United States/032L203.json
@@ -1 +1 @@
-{"batchcode": "032L203", "histograms": [{"batchcodes": ["032L203"], "histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Malaise": 1, "Nasopharyngitis": 1, "Peripheral swelling": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "032L203", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hypoaesthesia": 1, "Malaise": 1, "Nasopharyngitis": 1, "Peripheral swelling": 1, "Vaccination site induration": 1, "Vaccination site pruritus": 1}, "batchcodes": ["032L203"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L208.json b/docs/data/histograms/United States/032L208.json
index 9a345c2321f..22f9fdf90a0 100644
--- a/docs/data/histograms/United States/032L208.json
+++ b/docs/data/histograms/United States/032L208.json
@@ -1 +1 @@
-{"batchcode": "032L208", "histograms": [{"batchcodes": ["032L208"], "histogram": {"Pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032L208", "histograms": [{"histogram": {"Pain": 1}, "batchcodes": ["032L208"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20A /.json b/docs/data/histograms/United States/032L20A /.json
index 500c5b4683c..9a10dd44945 100644
--- a/docs/data/histograms/United States/032L20A /.json
+++ b/docs/data/histograms/United States/032L20A /.json
@@ -1 +1 @@
-{"batchcode": "032L20A /", "histograms": [{"batchcodes": ["032L20A /"], "histogram": {"Myalgia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20A /", "histograms": [{"histogram": {"Myalgia": 1, "Vaccination site pain": 1}, "batchcodes": ["032L20A /"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20A MSTDT.json b/docs/data/histograms/United States/032L20A MSTDT.json
index 3ffff12209c..f5df2a29f09 100644
--- a/docs/data/histograms/United States/032L20A MSTDT.json
+++ b/docs/data/histograms/United States/032L20A MSTDT.json
@@ -1 +1 @@
-{"batchcode": "032L20A MSTDT", "histograms": [{"batchcodes": ["032L20A MSTDT"], "histogram": {"Headache": 1, "Injection site erythema": 1, "Pain in extremity": 1, "Pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20A MSTDT", "histograms": [{"histogram": {"Headache": 1, "Injection site erythema": 1, "Pain in extremity": 1, "Pruritus": 1}, "batchcodes": ["032L20A MSTDT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20A..json b/docs/data/histograms/United States/032L20A..json
index e0a1585e2c1..26e5939766b 100644
--- a/docs/data/histograms/United States/032L20A..json
+++ b/docs/data/histograms/United States/032L20A..json
@@ -1 +1 @@
-{"batchcode": "032L20A.", "histograms": [{"batchcodes": ["032L20A."], "histogram": {"Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20A.", "histograms": [{"histogram": {"Pyrexia": 1}, "batchcodes": ["032L20A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20A.json b/docs/data/histograms/United States/032L20A.json
index 09ae939192b..db198b1320e 100644
--- a/docs/data/histograms/United States/032L20A.json
+++ b/docs/data/histograms/United States/032L20A.json
@@ -1 +1 @@
-{"batchcode": "032L20A", "histograms": [{"batchcodes": ["032L20A"], "histogram": {"Fatigue": 96, "Pyrexia": 94, "Headache": 87, "Chills": 86, "Pain in extremity": 79, "Myalgia": 64, "Vaccination site pain": 64, "Vaccination site erythema": 57, "Pruritus": 51, "Vaccination site pruritus": 48, "Pain": 42, "Rash": 40, "Dizziness": 38, "Nausea": 37, "Arthralgia": 35, "Vaccination site swelling": 31, "Asthenia": 30, "Diarrhoea": 30, "Erythema": 29, "Feeling abnormal": 28, "Urticaria": 27, "Vaccination site warmth": 27, "Body temperature": 26, "COVID-19": 23, "SARS-CoV-2 test": 21, "Malaise": 20, "Vaccination site rash": 20, "Peripheral swelling": 19, "Paraesthesia": 18, "Injection site erythema": 17, "Decreased appetite": 16, "Injection site pain": 16, "Vomiting": 16, "Feeling hot": 15, "Swelling": 15, "Dyspnoea": 14, "Inappropriate schedule of product administration": 13, "Lymphadenopathy": 13, "Hypoaesthesia": 12, "Limb discomfort": 12, "Product dose omission issue": 12, "Vaccination site induration": 12, "Blood pressure measurement": 11, "Hyperhidrosis": 11, "Influenza like illness": 11, "Fall": 10, "Heart rate increased": 10, "Injection site swelling": 10, "Neck pain": 10, "Somnolence": 10, "Back pain": 9, "Cough": 9, "Heart rate": 9, "Rhinorrhoea": 9, "Tinnitus": 9, "Tremor": 9, "Abdominal pain upper": 8, "Gait disturbance": 8, "Hypersomnia": 8, "Incorrect route of product administration": 8, "Injection site warmth": 8, "Insomnia": 8, "Maternal exposure during pregnancy": 8, "Migraine": 8, "Rash pruritic": 8, "Abdominal discomfort": 7, "Chest discomfort": 7, "Dysgeusia": 7, "Expired product administered": 7, "Gait inability": 7, "Injection site pruritus": 7, "Mobility decreased": 7, "Pregnancy test": 7, "Rash erythematous": 7, "Rash macular": 7, "Tenderness": 7, "Vaccination complication": 7, "Vaccination site reaction": 7, "Blood test": 6, "Exposure during pregnancy": 6, "Hypersensitivity": 6, "Injection site rash": 6, "Joint swelling": 6, "SARS-CoV-2 test positive": 6, "Vaccination site urticaria": 6, "Abdominal pain": 5, "Ageusia": 5, "Bedridden": 5, "Discomfort": 5, "Facial pain": 5, "Flushing": 5, "Lethargy": 5, "Lip swelling": 5, "Muscular weakness": 5, "Nasal congestion": 5, "Nasopharyngitis": 5, "Palpitations": 5, "Swelling face": 5, "Urinary tract infection": 5, "Vertigo": 5, "Balance disorder": 4, "Blood pressure increased": 4, "Burning sensation": 4, "Chest pain": 4, "Contusion": 4, "Eye pain": 4, "Herpes zoster": 4, "Hypertension": 4, "Hypoaesthesia oral": 4, "Illness": 4, "Injection site mass": 4, "Laboratory test": 4, "Loss of consciousness": 4, "Musculoskeletal stiffness": 4, "Oropharyngeal pain": 4, "Peripheral coldness": 4, "Sinus headache": 4, "Skin burning sensation": 4, "Skin discolouration": 4, "Sluggishness": 4, "Sneezing": 4, "Tachycardia": 4, "Accidental underdose": 3, "Anosmia": 3, "Antibody test": 3, "Anxiety": 3, "Blood glucose": 3, "Delirium": 3, "Dysstasia": 3, "Electrocardiogram": 3, "Extra dose administered": 3, "Eye swelling": 3, "Feeling of body temperature change": 3, "Hot flush": 3, "Hypokinesia": 3, "Incorrect dose administered": 3, "Magnetic resonance imaging": 3, "Musculoskeletal discomfort": 3, "Off label use": 3, "Periorbital swelling": 3, "Presyncope": 3, "Product administered at inappropriate site": 3, "Product administered to patient of inappropriate age": 3, "Product storage error": 3, "Throat irritation": 3, "Visual impairment": 3, "Adverse event": 2, "Adverse reaction": 2, "Alopecia": 2, "Amnesia": 2, "Asthma": 2, "Asymptomatic COVID-19": 2, "Atrial fibrillation": 2, "Body temperature increased": 2, "Breast pain": 2, "COVID-19 pneumonia": 2, "Condition aggravated": 2, "Coronavirus test": 2, "Drug ineffective": 2, "Dry skin": 2, "Dysarthria": 2, "Ear pain": 2, "Epistaxis": 2, "Feeling cold": 2, "Feeling jittery": 2, "Haemochromatosis": 2, "Hypotension": 2, "Induration": 2, "Inflammation": 2, "Injection site reaction": 2, "Lip blister": 2, "Mass excision": 2, "Memory impairment": 2, "Miliaria": 2, "Movement disorder": 2, "Muscle strain": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Myocardial infarction": 2, "Neuropathy peripheral": 2, "Night sweats": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation": 2, "Paraesthesia oral": 2, "Pericarditis": 2, "Pneumonia": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test negative": 2, "Sinusitis": 2, "Skin irritation": 2, "Skin reaction": 2, "Stomatitis": 2, "Suspected COVID-19": 2, "Syncope": 2, "Thirst": 2, "Type IV hypersensitivity reaction": 2, "Ultrasound Doppler": 2, "Ultrasound scan": 2, "Urinary incontinence": 2, "Vaccination site discolouration": 2, "Vaccination site discomfort": 2, "Vaccination site mass": 2, "Vision blurred": 2, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Acoustic stimulation tests": 1, "Administration site warmth": 1, "Adrenocortical insufficiency acute": 1, "Agitation": 1, "Allergy to vaccine": 1, "Amenorrhoea": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Antibody test negative": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Aphthous ulcer": 1, "Arthritis": 1, "Atrial flutter": 1, "Atypical pneumonia": 1, "Axillary pain": 1, "Biopsy cervix": 1, "Blister": 1, "Blood cholesterol increased": 1, "Blood culture": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Bone tuberculosis": 1, "Bradycardia": 1, "Breast discharge": 1, "Breast mass": 1, "Bronchial hyperreactivity": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Chromaturia": 1, "Cold sweat": 1, "Colitis microscopic": 1, "Complication associated with device": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Constipation": 1, "Crohn's disease": 1, "Crying": 1, "Culture": 1, "Cystitis": 1, "Cytology": 1, "Dandruff": 1, "Dementia": 1, "Dental caries": 1, "Depression": 1, "Device connection issue": 1, "Diplopia": 1, "Disorientation": 1, "Dry mouth": 1, "Dry throat": 1, "Duodenogastric reflux": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Eating disorder": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Encephalopathy": 1, "Epigastric discomfort": 1, "Eructation": 1, "Eye disorder": 1, "Eye opacity": 1, "Eye pruritus": 1, "Fear": 1, "Flatulence": 1, "Fluid retention": 1, "Fungal infection": 1, "Gallbladder disorder": 1, "Gastrointestinal sounds abnormal": 1, "Gastrooesophageal reflux disease": 1, "Giardia test": 1, "Gingival injury": 1, "Glossodynia": 1, "Glucose tolerance test": 1, "Glucose tolerance test normal": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematochezia": 1, "Haemoglobin": 1, "Hallucination": 1, "Hand deformity": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Helicobacter test": 1, "Hemiplegia": 1, "Hypohidrosis": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Increased viscosity of upper respiratory secretion": 1, "Induced labour": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site discomfort": 1, "Injection site vesicles": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint dislocation": 1, "Joint injury": 1, "Laboratory test normal": 1, "Labyrinthitis": 1, "Ligament sprain": 1, "Lip disorder": 1, "Loss of personal independence in daily activities": 1, "Lumbar vertebral fracture": 1, "Lymph node pain": 1, "Mass": 1, "Mastication disorder": 1, "Maternal exposure before pregnancy": 1, "Maternal exposure during breast feeding": 1, "Mean cell volume": 1, "Medication error": 1, "Mental impairment": 1, "Metamorphopsia": 1, "Motor dysfunction": 1, "Multisystem inflammatory syndrome": 1, "Muscle disorder": 1, "Muscle spasms": 1, "Muscle strength abnormal": 1, "Musculoskeletal chest pain": 1, "Mycobacterium tuberculosis complex test": 1, "Nasal discomfort": 1, "Nasal injury": 1, "Nerve injury": 1, "Nervousness": 1, "Neuralgia": 1, "Nightmare": 1, "Nodule": 1, "Nonspecific reaction": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Osteitis": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pallor": 1, "Panic attack": 1, "Parosmia": 1, "Periarthritis": 1, "Peroneal nerve palsy": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Photopsia": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Polymenorrhoea": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Pre-existing condition improved": 1, "Premature delivery": 1, "Prenatal screening test": 1, "Procedural pain": 1, "Product colour issue": 1, "Productive cough": 1, "Prostate cancer": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Pyoderma gangrenosum": 1, "Red blood cell sedimentation rate": 1, "Renal failure": 1, "Respiratory failure": 1, "Retinal haemorrhage": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rotator cuff syndrome": 1, "Scab": 1, "Scratch": 1, "Seasonal allergy": 1, "Seborrhoeic dermatitis": 1, "Self-induced vomiting": 1, "Shoulder injury related to vaccine administration": 1, "Sinus congestion": 1, "Sinus pain": 1, "Skin erosion": 1, "Skin lesion": 1, "Skin papilloma": 1, "Skin warm": 1, "Skin wrinkling": 1, "Sleep disorder": 1, "Social problem": 1, "Speech disorder": 1, "Sticky skin": 1, "Stool analysis": 1, "Stress": 1, "Suicidal ideation": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Synovial cyst": 1, "Taste disorder": 1, "Temperature intolerance": 1, "Tendonitis": 1, "Therapeutic response unexpected": 1, "Tonsillar hypertrophy": 1, "Tooth discolouration": 1, "Tooth extraction": 1, "Toothache": 1, "Trichoglossia": 1, "Tryptase": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen normal": 1, "Ultrasound foetal": 1, "Umbilical cord prolapse": 1, "Upper-airway cough syndrome": 1, "Urine odour abnormal": 1, "Urosepsis": 1, "Vaccination site bruising": 1, "Vaccination site inflammation": 1, "Vaccination site joint movement impairment": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1, "Vaginal discharge": 1, "Varicose vein": 1, "Vein disorder": 1, "Vertigo CNS origin": 1, "Vertigo positional": 1, "Visual field defect": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "Wrong technique in device usage process": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20A", "histograms": [{"histogram": {"Fatigue": 96, "Pyrexia": 94, "Headache": 87, "Chills": 86, "Pain in extremity": 79, "Myalgia": 64, "Vaccination site pain": 64, "Vaccination site erythema": 57, "Pruritus": 51, "Vaccination site pruritus": 48, "Pain": 42, "Rash": 40, "Dizziness": 38, "Nausea": 37, "Arthralgia": 35, "Vaccination site swelling": 31, "Asthenia": 30, "Diarrhoea": 30, "Erythema": 29, "Feeling abnormal": 28, "Urticaria": 27, "Vaccination site warmth": 27, "Body temperature": 26, "COVID-19": 23, "SARS-CoV-2 test": 21, "Malaise": 20, "Vaccination site rash": 20, "Peripheral swelling": 19, "Paraesthesia": 18, "Injection site erythema": 17, "Decreased appetite": 16, "Injection site pain": 16, "Vomiting": 16, "Feeling hot": 15, "Swelling": 15, "Dyspnoea": 14, "Inappropriate schedule of product administration": 13, "Lymphadenopathy": 13, "Hypoaesthesia": 12, "Limb discomfort": 12, "Product dose omission issue": 12, "Vaccination site induration": 12, "Blood pressure measurement": 11, "Hyperhidrosis": 11, "Influenza like illness": 11, "Fall": 10, "Heart rate increased": 10, "Injection site swelling": 10, "Neck pain": 10, "Somnolence": 10, "Back pain": 9, "Cough": 9, "Heart rate": 9, "Rhinorrhoea": 9, "Tinnitus": 9, "Tremor": 9, "Abdominal pain upper": 8, "Gait disturbance": 8, "Hypersomnia": 8, "Incorrect route of product administration": 8, "Injection site warmth": 8, "Insomnia": 8, "Maternal exposure during pregnancy": 8, "Migraine": 8, "Rash pruritic": 8, "Abdominal discomfort": 7, "Chest discomfort": 7, "Dysgeusia": 7, "Expired product administered": 7, "Gait inability": 7, "Injection site pruritus": 7, "Mobility decreased": 7, "Pregnancy test": 7, "Rash erythematous": 7, "Rash macular": 7, "Tenderness": 7, "Vaccination complication": 7, "Vaccination site reaction": 7, "Blood test": 6, "Exposure during pregnancy": 6, "Hypersensitivity": 6, "Injection site rash": 6, "Joint swelling": 6, "SARS-CoV-2 test positive": 6, "Vaccination site urticaria": 6, "Abdominal pain": 5, "Ageusia": 5, "Bedridden": 5, "Discomfort": 5, "Facial pain": 5, "Flushing": 5, "Lethargy": 5, "Lip swelling": 5, "Muscular weakness": 5, "Nasal congestion": 5, "Nasopharyngitis": 5, "Palpitations": 5, "Swelling face": 5, "Urinary tract infection": 5, "Vertigo": 5, "Balance disorder": 4, "Blood pressure increased": 4, "Burning sensation": 4, "Chest pain": 4, "Contusion": 4, "Eye pain": 4, "Herpes zoster": 4, "Hypertension": 4, "Hypoaesthesia oral": 4, "Illness": 4, "Injection site mass": 4, "Laboratory test": 4, "Loss of consciousness": 4, "Musculoskeletal stiffness": 4, "Oropharyngeal pain": 4, "Peripheral coldness": 4, "Sinus headache": 4, "Skin burning sensation": 4, "Skin discolouration": 4, "Sluggishness": 4, "Sneezing": 4, "Tachycardia": 4, "Accidental underdose": 3, "Anosmia": 3, "Antibody test": 3, "Anxiety": 3, "Blood glucose": 3, "Delirium": 3, "Dysstasia": 3, "Electrocardiogram": 3, "Extra dose administered": 3, "Eye swelling": 3, "Feeling of body temperature change": 3, "Hot flush": 3, "Hypokinesia": 3, "Incorrect dose administered": 3, "Magnetic resonance imaging": 3, "Musculoskeletal discomfort": 3, "Off label use": 3, "Periorbital swelling": 3, "Presyncope": 3, "Product administered at inappropriate site": 3, "Product administered to patient of inappropriate age": 3, "Product storage error": 3, "Throat irritation": 3, "Visual impairment": 3, "Adverse event": 2, "Adverse reaction": 2, "Alopecia": 2, "Amnesia": 2, "Asthma": 2, "Asymptomatic COVID-19": 2, "Atrial fibrillation": 2, "Body temperature increased": 2, "Breast pain": 2, "COVID-19 pneumonia": 2, "Condition aggravated": 2, "Coronavirus test": 2, "Drug ineffective": 2, "Dry skin": 2, "Dysarthria": 2, "Ear pain": 2, "Epistaxis": 2, "Feeling cold": 2, "Feeling jittery": 2, "Haemochromatosis": 2, "Hypotension": 2, "Induration": 2, "Inflammation": 2, "Injection site reaction": 2, "Lip blister": 2, "Mass excision": 2, "Memory impairment": 2, "Miliaria": 2, "Movement disorder": 2, "Muscle strain": 2, "Muscle tightness": 2, "Muscle twitching": 2, "Myocardial infarction": 2, "Neuropathy peripheral": 2, "Night sweats": 2, "Oropharyngeal discomfort": 2, "Oxygen saturation": 2, "Paraesthesia oral": 2, "Pericarditis": 2, "Pneumonia": 2, "SARS-CoV-2 antibody test": 2, "SARS-CoV-2 test negative": 2, "Sinusitis": 2, "Skin irritation": 2, "Skin reaction": 2, "Stomatitis": 2, "Suspected COVID-19": 2, "Syncope": 2, "Thirst": 2, "Type IV hypersensitivity reaction": 2, "Ultrasound Doppler": 2, "Ultrasound scan": 2, "Urinary incontinence": 2, "Vaccination site discolouration": 2, "Vaccination site discomfort": 2, "Vaccination site mass": 2, "Vision blurred": 2, "Abdominal pain lower": 1, "Abnormal behaviour": 1, "Acoustic stimulation tests": 1, "Administration site warmth": 1, "Adrenocortical insufficiency acute": 1, "Agitation": 1, "Allergy to vaccine": 1, "Amenorrhoea": 1, "Anaemia": 1, "Anaphylactic reaction": 1, "Antibody test negative": 1, "Antinuclear antibody": 1, "Aphasia": 1, "Aphthous ulcer": 1, "Arthritis": 1, "Atrial flutter": 1, "Atypical pneumonia": 1, "Axillary pain": 1, "Biopsy cervix": 1, "Blister": 1, "Blood cholesterol increased": 1, "Blood culture": 1, "Blood glucose increased": 1, "Blood potassium": 1, "Blood pressure fluctuation": 1, "Bone tuberculosis": 1, "Bradycardia": 1, "Breast discharge": 1, "Breast mass": 1, "Bronchial hyperreactivity": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Cardiac flutter": 1, "Cerebral haemorrhage": 1, "Chest X-ray": 1, "Chromaturia": 1, "Cold sweat": 1, "Colitis microscopic": 1, "Complication associated with device": 1, "Computerised tomogram": 1, "Computerised tomogram head": 1, "Confusional state": 1, "Constipation": 1, "Crohn's disease": 1, "Crying": 1, "Culture": 1, "Cystitis": 1, "Cytology": 1, "Dandruff": 1, "Dementia": 1, "Dental caries": 1, "Depression": 1, "Device connection issue": 1, "Diplopia": 1, "Disorientation": 1, "Dry mouth": 1, "Dry throat": 1, "Duodenogastric reflux": 1, "Dyskinesia": 1, "Dyspnoea exertional": 1, "Ear discomfort": 1, "Eating disorder": 1, "Echocardiogram": 1, "Electric shock sensation": 1, "Encephalopathy": 1, "Epigastric discomfort": 1, "Eructation": 1, "Eye disorder": 1, "Eye opacity": 1, "Eye pruritus": 1, "Fear": 1, "Flatulence": 1, "Fluid retention": 1, "Fungal infection": 1, "Gallbladder disorder": 1, "Gastrointestinal sounds abnormal": 1, "Gastrooesophageal reflux disease": 1, "Giardia test": 1, "Gingival injury": 1, "Glossodynia": 1, "Glucose tolerance test": 1, "Glucose tolerance test normal": 1, "Glycosylated haemoglobin": 1, "Gout": 1, "Grip strength decreased": 1, "Groin pain": 1, "Haematochezia": 1, "Haemoglobin": 1, "Hallucination": 1, "Hand deformity": 1, "Head discomfort": 1, "Heart rate decreased": 1, "Helicobacter test": 1, "Hemiplegia": 1, "Hypohidrosis": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Increased viscosity of upper respiratory secretion": 1, "Induced labour": 1, "Infection": 1, "Injected limb mobility decreased": 1, "Injection site discomfort": 1, "Injection site vesicles": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint dislocation": 1, "Joint injury": 1, "Laboratory test normal": 1, "Labyrinthitis": 1, "Ligament sprain": 1, "Lip disorder": 1, "Loss of personal independence in daily activities": 1, "Lumbar vertebral fracture": 1, "Lymph node pain": 1, "Mass": 1, "Mastication disorder": 1, "Maternal exposure before pregnancy": 1, "Maternal exposure during breast feeding": 1, "Mean cell volume": 1, "Medication error": 1, "Mental impairment": 1, "Metamorphopsia": 1, "Motor dysfunction": 1, "Multisystem inflammatory syndrome": 1, "Muscle disorder": 1, "Muscle spasms": 1, "Muscle strength abnormal": 1, "Musculoskeletal chest pain": 1, "Mycobacterium tuberculosis complex test": 1, "Nasal discomfort": 1, "Nasal injury": 1, "Nerve injury": 1, "Nervousness": 1, "Neuralgia": 1, "Nightmare": 1, "Nodule": 1, "Nonspecific reaction": 1, "Ocular hyperaemia": 1, "Oedema": 1, "Oral discomfort": 1, "Oral disorder": 1, "Oral herpes": 1, "Oral mucosal blistering": 1, "Osteitis": 1, "Overdose": 1, "Oxygen saturation decreased": 1, "Pain in jaw": 1, "Pallor": 1, "Panic attack": 1, "Parosmia": 1, "Periarthritis": 1, "Peroneal nerve palsy": 1, "Pharyngeal swelling": 1, "Photophobia": 1, "Photopsia": 1, "Platelet count": 1, "Pneumonia bacterial": 1, "Pollakiuria": 1, "Polymenorrhoea": 1, "Polymerase chain reaction": 1, "Polyuria": 1, "Poor quality product administered": 1, "Poor quality sleep": 1, "Pre-existing condition improved": 1, "Premature delivery": 1, "Prenatal screening test": 1, "Procedural pain": 1, "Product colour issue": 1, "Productive cough": 1, "Prostate cancer": 1, "Pulmonary pain": 1, "Pulse abnormal": 1, "Pyoderma gangrenosum": 1, "Red blood cell sedimentation rate": 1, "Renal failure": 1, "Respiratory failure": 1, "Retinal haemorrhage": 1, "Rhabdomyolysis": 1, "Rheumatoid arthritis": 1, "Rotator cuff syndrome": 1, "Scab": 1, "Scratch": 1, "Seasonal allergy": 1, "Seborrhoeic dermatitis": 1, "Self-induced vomiting": 1, "Shoulder injury related to vaccine administration": 1, "Sinus congestion": 1, "Sinus pain": 1, "Skin erosion": 1, "Skin lesion": 1, "Skin papilloma": 1, "Skin warm": 1, "Skin wrinkling": 1, "Sleep disorder": 1, "Social problem": 1, "Speech disorder": 1, "Sticky skin": 1, "Stool analysis": 1, "Stress": 1, "Suicidal ideation": 1, "Swollen tongue": 1, "Symptom recurrence": 1, "Synovial cyst": 1, "Taste disorder": 1, "Temperature intolerance": 1, "Tendonitis": 1, "Therapeutic response unexpected": 1, "Tonsillar hypertrophy": 1, "Tooth discolouration": 1, "Tooth extraction": 1, "Toothache": 1, "Trichoglossia": 1, "Tryptase": 1, "Ultrasound abdomen": 1, "Ultrasound antenatal screen normal": 1, "Ultrasound foetal": 1, "Umbilical cord prolapse": 1, "Upper-airway cough syndrome": 1, "Urine odour abnormal": 1, "Urosepsis": 1, "Vaccination site bruising": 1, "Vaccination site inflammation": 1, "Vaccination site joint movement impairment": 1, "Vaccination site joint pain": 1, "Vaccination site lymphadenopathy": 1, "Vaccination site movement impairment": 1, "Vaccination site nodule": 1, "Vaccination site papule": 1, "Vaccination site scar": 1, "Vaccination site vesicles": 1, "Vaginal discharge": 1, "Varicose vein": 1, "Vein disorder": 1, "Vertigo CNS origin": 1, "Vertigo positional": 1, "Visual field defect": 1, "Weight": 1, "Weight decreased": 1, "Wheezing": 1, "Wrong technique in device usage process": 1, "X-ray": 1}, "batchcodes": ["032L20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20B.json b/docs/data/histograms/United States/032L20B.json
index b4ec79b3d72..956d8d00f8a 100644
--- a/docs/data/histograms/United States/032L20B.json
+++ b/docs/data/histograms/United States/032L20B.json
@@ -1 +1 @@
-{"batchcode": "032L20B", "histograms": [{"batchcodes": ["032L20B"], "histogram": {"Product dose omission issue": 2}}]}
\ No newline at end of file
+{"batchcode": "032L20B", "histograms": [{"histogram": {"Product dose omission issue": 2}, "batchcodes": ["032L20B"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20H.json b/docs/data/histograms/United States/032L20H.json
index 2aab429eab3..24d4230ba1f 100644
--- a/docs/data/histograms/United States/032L20H.json
+++ b/docs/data/histograms/United States/032L20H.json
@@ -1 +1 @@
-{"batchcode": "032L20H", "histograms": [{"batchcodes": ["032L20H"], "histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20H", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Myalgia": 1, "Pain in extremity": 1}, "batchcodes": ["032L20H"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20N.json b/docs/data/histograms/United States/032L20N.json
index 82571cd724c..47319dc10e2 100644
--- a/docs/data/histograms/United States/032L20N.json
+++ b/docs/data/histograms/United States/032L20N.json
@@ -1 +1 @@
-{"batchcode": "032L20N", "histograms": [{"batchcodes": ["032L20N"], "histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20N", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Arthralgia": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Hyperhidrosis": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["032L20N"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20R.json b/docs/data/histograms/United States/032L20R.json
index 381148fdf1b..6d1ff801a34 100644
--- a/docs/data/histograms/United States/032L20R.json
+++ b/docs/data/histograms/United States/032L20R.json
@@ -1 +1 @@
-{"batchcode": "032L20R", "histograms": [{"batchcodes": ["032L20R"], "histogram": {"Rectal haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20R", "histograms": [{"histogram": {"Rectal haemorrhage": 1}, "batchcodes": ["032L20R"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L20VT.json b/docs/data/histograms/United States/032L20VT.json
index 38bb9e7cac9..66a458bf1d7 100644
--- a/docs/data/histograms/United States/032L20VT.json
+++ b/docs/data/histograms/United States/032L20VT.json
@@ -1 +1 @@
-{"batchcode": "032L20VT", "histograms": [{"batchcodes": ["032L20VT"], "histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Illness": 1, "Migraine": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032L20VT", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Dizziness": 1, "Fatigue": 1, "Feeling abnormal": 1, "Hyperhidrosis": 1, "Illness": 1, "Migraine": 1, "Myalgia": 1, "Nasopharyngitis": 1, "Nausea": 1, "Pyrexia": 1, "Vaccination site pain": 1}, "batchcodes": ["032L20VT"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L2A.json b/docs/data/histograms/United States/032L2A.json
index 3310b1adb81..4775c9ff838 100644
--- a/docs/data/histograms/United States/032L2A.json
+++ b/docs/data/histograms/United States/032L2A.json
@@ -1 +1 @@
-{"batchcode": "032L2A", "histograms": [{"batchcodes": ["032L2A"], "histogram": {"Syringe issue": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "032L2A", "histograms": [{"histogram": {"Syringe issue": 1, "Underdose": 1}, "batchcodes": ["032L2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L2DA.json b/docs/data/histograms/United States/032L2DA.json
index 95d1ee00e54..1214fa4e2a3 100644
--- a/docs/data/histograms/United States/032L2DA.json
+++ b/docs/data/histograms/United States/032L2DA.json
@@ -1 +1 @@
-{"batchcode": "032L2DA", "histograms": [{"batchcodes": ["032L2DA"], "histogram": {"Arthralgia": 1, "Erythema": 1, "Myalgia": 1, "Rash": 1, "Seborrhoeic dermatitis": 1, "Skin discolouration": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "032L2DA", "histograms": [{"histogram": {"Arthralgia": 1, "Erythema": 1, "Myalgia": 1, "Rash": 1, "Seborrhoeic dermatitis": 1, "Skin discolouration": 1, "Urticaria": 1}, "batchcodes": ["032L2DA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L2EA.json b/docs/data/histograms/United States/032L2EA.json
index d0d9006cc85..bcafecdd942 100644
--- a/docs/data/histograms/United States/032L2EA.json
+++ b/docs/data/histograms/United States/032L2EA.json
@@ -1 +1 @@
-{"batchcode": "032L2EA", "histograms": [{"batchcodes": ["032L2EA"], "histogram": {"Chills": 1, "Headache": 1, "Muscle spasms": 1, "Myalgia": 1}}]}
\ No newline at end of file
+{"batchcode": "032L2EA", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Muscle spasms": 1, "Myalgia": 1}, "batchcodes": ["032L2EA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L2OA.json b/docs/data/histograms/United States/032L2OA.json
index a8183eaa605..50097b0ba3d 100644
--- a/docs/data/histograms/United States/032L2OA.json
+++ b/docs/data/histograms/United States/032L2OA.json
@@ -1 +1 @@
-{"batchcode": "032L2OA", "histograms": [{"batchcodes": ["032L2OA"], "histogram": {"Pain": 2, "Chills": 1, "Erythema": 1, "Fatigue": 1, "Gait disturbance": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Sciatica": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "032L2OA", "histograms": [{"histogram": {"Pain": 2, "Chills": 1, "Erythema": 1, "Fatigue": 1, "Gait disturbance": 1, "Loss of personal independence in daily activities": 1, "Myalgia": 1, "Nausea": 1, "Pyrexia": 1, "Rash": 1, "Sciatica": 1, "Vomiting": 1}, "batchcodes": ["032L2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L2U9.json b/docs/data/histograms/United States/032L2U9.json
index 76354bd7263..d2beea8dbd8 100644
--- a/docs/data/histograms/United States/032L2U9.json
+++ b/docs/data/histograms/United States/032L2U9.json
@@ -1 +1 @@
-{"batchcode": "032L2U9", "histograms": [{"batchcodes": ["032L2U9"], "histogram": {"Dry mouth": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Swelling": 1, "Vaccination site erythema": 1}}]}
\ No newline at end of file
+{"batchcode": "032L2U9", "histograms": [{"histogram": {"Dry mouth": 1, "Pain in extremity": 1, "Peripheral swelling": 1, "Swelling": 1, "Vaccination site erythema": 1}, "batchcodes": ["032L2U9"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L30A.json b/docs/data/histograms/United States/032L30A.json
index 888ac691c40..c8854450779 100644
--- a/docs/data/histograms/United States/032L30A.json
+++ b/docs/data/histograms/United States/032L30A.json
@@ -1 +1 @@
-{"batchcode": "032L30A", "histograms": [{"batchcodes": ["032L30A"], "histogram": {"Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "032L30A", "histograms": [{"histogram": {"Vaccination site pruritus": 1, "Vaccination site urticaria": 1, "Vaccination site warmth": 1}, "batchcodes": ["032L30A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032L620A.json b/docs/data/histograms/United States/032L620A.json
index b46735e839c..41e7568f0b2 100644
--- a/docs/data/histograms/United States/032L620A.json
+++ b/docs/data/histograms/United States/032L620A.json
@@ -1 +1 @@
-{"batchcode": "032L620A", "histograms": [{"batchcodes": ["032L620A"], "histogram": {"Pain": 3, "Bone pain": 2, "Diarrhoea": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}}]}
\ No newline at end of file
+{"batchcode": "032L620A", "histograms": [{"histogram": {"Pain": 3, "Bone pain": 2, "Diarrhoea": 1, "Dyspnoea": 1, "Inappropriate schedule of product administration": 1, "Oxygen saturation": 1, "Oxygen saturation decreased": 1}, "batchcodes": ["032L620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032LC0A.json b/docs/data/histograms/United States/032LC0A.json
index d6bce2d11c3..79dbd689cf8 100644
--- a/docs/data/histograms/United States/032LC0A.json
+++ b/docs/data/histograms/United States/032LC0A.json
@@ -1 +1 @@
-{"batchcode": "032LC0A", "histograms": [{"batchcodes": ["032LC0A"], "histogram": {"Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "032LC0A", "histograms": [{"histogram": {"Rash": 1}, "batchcodes": ["032LC0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032LL20A.json b/docs/data/histograms/United States/032LL20A.json
index d136e1bc0f7..246100817a1 100644
--- a/docs/data/histograms/United States/032LL20A.json
+++ b/docs/data/histograms/United States/032LL20A.json
@@ -1 +1 @@
-{"batchcode": "032LL20A", "histograms": [{"batchcodes": ["032LL20A"], "histogram": {"Bone pain": 1, "COVID-19": 1, "Headache": 1, "Pain in extremity": 1, "Pre-existing condition improved": 1, "Pyrexia": 1, "Rash": 1, "Skin disorder": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "032LL20A", "histograms": [{"histogram": {"Bone pain": 1, "COVID-19": 1, "Headache": 1, "Pain in extremity": 1, "Pre-existing condition improved": 1, "Pyrexia": 1, "Rash": 1, "Skin disorder": 1, "Swelling face": 1}, "batchcodes": ["032LL20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032LZ0A.json b/docs/data/histograms/United States/032LZ0A.json
index 97cc57012cf..9bbb41eb69d 100644
--- a/docs/data/histograms/United States/032LZ0A.json
+++ b/docs/data/histograms/United States/032LZ0A.json
@@ -1 +1 @@
-{"batchcode": "032LZ0A", "histograms": [{"batchcodes": ["032LZ0A"], "histogram": {"Lip swelling": 2, "Swelling face": 2, "Blood pressure measurement": 1, "Chills": 1, "Ear discomfort": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Hypertension": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Lymphadenopathy": 1, "Tinnitus": 1, "Vertigo": 1, "Vestibular migraine": 1}}]}
\ No newline at end of file
+{"batchcode": "032LZ0A", "histograms": [{"histogram": {"Lip swelling": 2, "Swelling face": 2, "Blood pressure measurement": 1, "Chills": 1, "Ear discomfort": 1, "Epistaxis": 1, "Exposure during pregnancy": 1, "Hypertension": 1, "Injection site pruritus": 1, "Injection site swelling": 1, "Injection site warmth": 1, "Lymphadenopathy": 1, "Tinnitus": 1, "Vertigo": 1, "Vestibular migraine": 1}, "batchcodes": ["032LZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M(N)20A.json b/docs/data/histograms/United States/032M(N)20A.json
index 8ca1d4459c2..454036dece7 100644
--- a/docs/data/histograms/United States/032M(N)20A.json
+++ b/docs/data/histograms/United States/032M(N)20A.json
@@ -1 +1 @@
-{"batchcode": "032M(N)20A", "histograms": [{"batchcodes": ["032M(N)20A"], "histogram": {"Thirst": 1, "Tissue rupture": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032M(N)20A", "histograms": [{"histogram": {"Thirst": 1, "Tissue rupture": 1, "Vaccination site pain": 1}, "batchcodes": ["032M(N)20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M049(?).json b/docs/data/histograms/United States/032M049(?).json
index d491a02ac47..05d2d111631 100644
--- a/docs/data/histograms/United States/032M049(?).json
+++ b/docs/data/histograms/United States/032M049(?).json
@@ -1 +1 @@
-{"batchcode": "032M049(?)", "histograms": [{"batchcodes": ["032M049(?)"], "histogram": {"Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032M049(?)", "histograms": [{"histogram": {"Dizziness": 1, "Dyspnoea": 1, "Feeling abnormal": 1, "Heart rate": 1, "Heart rate increased": 1, "Vaccination site pain": 1}, "batchcodes": ["032M049(?)"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M120A.json b/docs/data/histograms/United States/032M120A.json
index 7373965ae3c..84193c6e77b 100644
--- a/docs/data/histograms/United States/032M120A.json
+++ b/docs/data/histograms/United States/032M120A.json
@@ -1 +1 @@
-{"batchcode": "032M120A", "histograms": [{"batchcodes": ["032M120A"], "histogram": {"Dyspnoea": 1, "Head banging": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "032M120A", "histograms": [{"histogram": {"Dyspnoea": 1, "Head banging": 1, "Vomiting": 1}, "batchcodes": ["032M120A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M20.json b/docs/data/histograms/United States/032M20.json
index f61c9bec4a0..991a28ee18a 100644
--- a/docs/data/histograms/United States/032M20.json
+++ b/docs/data/histograms/United States/032M20.json
@@ -1 +1 @@
-{"batchcode": "032M20", "histograms": [{"batchcodes": ["032M20"], "histogram": {"Fatigue": 1, "Headache": 1, "Illness": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "Sleep disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "032M20", "histograms": [{"histogram": {"Fatigue": 1, "Headache": 1, "Illness": 1, "Pruritus": 1, "Pyrexia": 1, "Rash macular": 1, "Sleep disorder": 1}, "batchcodes": ["032M20"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M201A.json b/docs/data/histograms/United States/032M201A.json
index e33837ff0f1..fcc48e7f2e9 100644
--- a/docs/data/histograms/United States/032M201A.json
+++ b/docs/data/histograms/United States/032M201A.json
@@ -1 +1 @@
-{"batchcode": "032M201A", "histograms": [{"batchcodes": ["032M201A"], "histogram": {"Back pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032M201A", "histograms": [{"histogram": {"Back pain": 1}, "batchcodes": ["032M201A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M20A,.json b/docs/data/histograms/United States/032M20A,.json
index 6f232e8b71b..96c01fce373 100644
--- a/docs/data/histograms/United States/032M20A,.json
+++ b/docs/data/histograms/United States/032M20A,.json
@@ -1 +1 @@
-{"batchcode": "032M20A,", "histograms": [{"batchcodes": ["032M20A,"], "histogram": {"Arthralgia": 1, "Cramp-fasciculation syndrome": 1, "Dizziness": 1, "Gait inability": 1, "Hypoaesthesia": 1, "Ligament sprain": 1, "Muscle spasms": 1, "Pain": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "032M20A,", "histograms": [{"histogram": {"Arthralgia": 1, "Cramp-fasciculation syndrome": 1, "Dizziness": 1, "Gait inability": 1, "Hypoaesthesia": 1, "Ligament sprain": 1, "Muscle spasms": 1, "Pain": 1, "Vaccination site pruritus": 1}, "batchcodes": ["032M20A,"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M20A.json b/docs/data/histograms/United States/032M20A.json
index 043fc27b6d6..8ed637464d1 100644
--- a/docs/data/histograms/United States/032M20A.json
+++ b/docs/data/histograms/United States/032M20A.json
@@ -1 +1 @@
-{"batchcode": "032M20A", "histograms": [{"batchcodes": ["032M20A"], "histogram": {"Pain in extremity": 59, "Fatigue": 54, "Headache": 51, "Chills": 49, "Pyrexia": 45, "Pain": 33, "Myalgia": 32, "Nausea": 31, "Vaccination site pain": 28, "Arthralgia": 23, "Dizziness": 22, "Vaccination site erythema": 21, "Pruritus": 17, "Body temperature": 16, "Feeling abnormal": 16, "Vaccination site pruritus": 16, "SARS-CoV-2 test": 15, "Vaccination site swelling": 14, "Erythema": 12, "Rash": 12, "Vomiting": 12, "Feeling hot": 11, "Influenza like illness": 11, "Asthenia": 10, "COVID-19": 10, "Cough": 10, "Product dose omission issue": 10, "Diarrhoea": 9, "Malaise": 9, "Heart rate increased": 8, "Illness": 8, "Inappropriate schedule of product administration": 8, "Insomnia": 8, "Lymphadenopathy": 8, "Peripheral swelling": 8, "Swelling": 8, "Vaccination site warmth": 8, "Abdominal pain upper": 7, "Blood pressure measurement": 7, "Dyspnoea": 7, "Nasopharyngitis": 7, "Neck pain": 7, "Tinnitus": 7, "Tremor": 7, "Decreased appetite": 6, "Heart rate": 6, "Hypoaesthesia": 6, "Rash pruritic": 6, "Vaccination site rash": 6, "Chest discomfort": 5, "Chest pain": 5, "Expired product administered": 5, "Induration": 5, "Muscle spasms": 5, "Oropharyngeal pain": 5, "Palpitations": 5, "Rash erythematous": 5, "Rhinorrhoea": 5, "Urticaria": 5, "Abdominal discomfort": 4, "Back pain": 4, "Burning sensation": 4, "Exposure during pregnancy": 4, "Gait disturbance": 4, "Hypertension": 4, "Migraine": 4, "Nasal congestion": 4, "Paraesthesia": 4, "Somnolence": 4, "Vaccination site induration": 4, "Vaccination site mass": 4, "Ageusia": 3, "Anosmia": 3, "Anxiety": 3, "Atrial fibrillation": 3, "Balance disorder": 3, "Bone pain": 3, "Chest X-ray": 3, "Computerised tomogram": 3, "Contusion": 3, "Dehydration": 3, "Depressed mood": 3, "Ear pain": 3, "Feeling cold": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Inflammation": 3, "Injection site erythema": 3, "Magnetic resonance imaging head": 3, "Movement disorder": 3, "Pregnancy test": 3, "Product administered to patient of inappropriate age": 3, "SARS-CoV-2 test positive": 3, "Sleep disorder": 3, "Sneezing": 3, "Tachycardia": 3, "Tenderness": 3, "Ultrasound scan": 3, "Underdose": 3, "Vaccination site reaction": 3, "Vertigo": 3, "Adverse reaction": 2, "Alopecia": 2, "Aphthous ulcer": 2, "Axillary pain": 2, "Blister": 2, "Blood pressure increased": 2, "Blood test": 2, "Body temperature increased": 2, "Constipation": 2, "Deafness": 2, "Discomfort": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Dysphonia": 2, "Eczema": 2, "Electrocardiogram": 2, "Eye pain": 2, "Eye pruritus": 2, "Fall": 2, "Flushing": 2, "HLA-B*27 assay": 2, "Hallucination": 2, "Head discomfort": 2, "Hypersomnia": 2, "Hypokinesia": 2, "Incorrect route of product administration": 2, "Influenza": 2, "Injection site swelling": 2, "Joint swelling": 2, "Laboratory test": 2, "Lethargy": 2, "Limb discomfort": 2, "Lymph node pain": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Ocular discomfort": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Peripheral coldness": 2, "Product storage error": 2, "Rash papular": 2, "Restlessness": 2, "SARS-CoV-2 antibody test negative": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Speech disorder": 2, "Swelling face": 2, "Swollen tongue": 2, "Throat tightness": 2, "Vision blurred": 2, "Weight decreased": 2, "White blood cell count": 2, "Abdominal distension": 1, "Abnormal behaviour": 1, "Adverse event following immunisation": 1, "Allergy test": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Aplastic anaemia": 1, "Arthropod sting": 1, "Asthenopia": 1, "Asthma": 1, "Atrial flutter": 1, "Autonomic neuropathy": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy": 1, "Blepharospasm": 1, "Blood pressure inadequately controlled": 1, "Bone swelling": 1, "Brain oedema": 1, "Breast pain": 1, "Breast swelling": 1, "Bursitis": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Carotid artery aneurysm": 1, "Cerebrovascular accident": 1, "Cold sweat": 1, "Condition aggravated": 1, "Confusional state": 1, "Death": 1, "Delusion": 1, "Depression": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Dose calculation error": 1, "Drug ineffective": 1, "Dry skin": 1, "Dry throat": 1, "Dyskinesia": 1, "Dyslexia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear swelling": 1, "Eating disorder": 1, "Effusion": 1, "Electromyogram": 1, "Exposure to SARS-CoV-2": 1, "Extra dose administered": 1, "Eye colour change": 1, "Eye disorder": 1, "Eye infection": 1, "Eye movement disorder": 1, "Eye swelling": 1, "Facial discomfort": 1, "Feeling drunk": 1, "Feeling of despair": 1, "Flatulence": 1, "Freezing phenomenon": 1, "Frostbite": 1, "Gait inability": 1, "Glucose tolerance test": 1, "Gout": 1, "Guttate psoriasis": 1, "Haemoglobin": 1, "Head titubation": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme increased": 1, "Herpes zoster": 1, "Hiccups": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Hyposmia": 1, "Immobile": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Infection": 1, "Injection": 1, "Injection site reaction": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint effusion": 1, "Ligament rupture": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Lung disorder": 1, "Macule": 1, "Mammogram": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Mouth ulceration": 1, "Multiple sclerosis": 1, "Muscle strain": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myopia": 1, "Neck injury": 1, "Nervousness": 1, "Neuralgia": 1, "Neuritis": 1, "Neuropathy peripheral": 1, "Night blindness": 1, "Night sweats": 1, "No adverse event": 1, "Nuchal rigidity": 1, "Oxygen saturation": 1, "Paraesthesia oral": 1, "Periarthritis": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Pollakiuria": 1, "Polydipsia": 1, "Poor quality sleep": 1, "Pregnancy": 1, "Rash vesicular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Reduced facial expression": 1, "Restless legs syndrome": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "Scratch": 1, "Seasonal allergy": 1, "Seizure": 1, "Shock": 1, "Sinus congestion": 1, "Sitting disability": 1, "Skin swelling": 1, "Snoring": 1, "Suicidal ideation": 1, "Sunburn": 1, "Suspected COVID-19": 1, "Syringe issue": 1, "Tendonitis": 1, "Terminal insomnia": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Thyroid disorder": 1, "Toothache": 1, "Troponin": 1, "Urine output": 1, "Vaccination complication": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site inflammation": 1, "Vaccination site joint pain": 1, "Vaccination site urticaria": 1, "Vaccine breakthrough infection": 1, "Vasodilatation": 1, "Weight increased": 1, "White blood cell count decreased": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "032M20A", "histograms": [{"histogram": {"Pain in extremity": 59, "Fatigue": 54, "Headache": 51, "Chills": 49, "Pyrexia": 45, "Pain": 33, "Myalgia": 32, "Nausea": 31, "Vaccination site pain": 28, "Arthralgia": 23, "Dizziness": 22, "Vaccination site erythema": 21, "Pruritus": 17, "Body temperature": 16, "Feeling abnormal": 16, "Vaccination site pruritus": 16, "SARS-CoV-2 test": 15, "Vaccination site swelling": 14, "Erythema": 12, "Rash": 12, "Vomiting": 12, "Feeling hot": 11, "Influenza like illness": 11, "Asthenia": 10, "COVID-19": 10, "Cough": 10, "Product dose omission issue": 10, "Diarrhoea": 9, "Malaise": 9, "Heart rate increased": 8, "Illness": 8, "Inappropriate schedule of product administration": 8, "Insomnia": 8, "Lymphadenopathy": 8, "Peripheral swelling": 8, "Swelling": 8, "Vaccination site warmth": 8, "Abdominal pain upper": 7, "Blood pressure measurement": 7, "Dyspnoea": 7, "Nasopharyngitis": 7, "Neck pain": 7, "Tinnitus": 7, "Tremor": 7, "Decreased appetite": 6, "Heart rate": 6, "Hypoaesthesia": 6, "Rash pruritic": 6, "Vaccination site rash": 6, "Chest discomfort": 5, "Chest pain": 5, "Expired product administered": 5, "Induration": 5, "Muscle spasms": 5, "Oropharyngeal pain": 5, "Palpitations": 5, "Rash erythematous": 5, "Rhinorrhoea": 5, "Urticaria": 5, "Abdominal discomfort": 4, "Back pain": 4, "Burning sensation": 4, "Exposure during pregnancy": 4, "Gait disturbance": 4, "Hypertension": 4, "Migraine": 4, "Nasal congestion": 4, "Paraesthesia": 4, "Somnolence": 4, "Vaccination site induration": 4, "Vaccination site mass": 4, "Ageusia": 3, "Anosmia": 3, "Anxiety": 3, "Atrial fibrillation": 3, "Balance disorder": 3, "Bone pain": 3, "Chest X-ray": 3, "Computerised tomogram": 3, "Contusion": 3, "Dehydration": 3, "Depressed mood": 3, "Ear pain": 3, "Feeling cold": 3, "Hyperhidrosis": 3, "Hypersensitivity": 3, "Inflammation": 3, "Injection site erythema": 3, "Magnetic resonance imaging head": 3, "Movement disorder": 3, "Pregnancy test": 3, "Product administered to patient of inappropriate age": 3, "SARS-CoV-2 test positive": 3, "Sleep disorder": 3, "Sneezing": 3, "Tachycardia": 3, "Tenderness": 3, "Ultrasound scan": 3, "Underdose": 3, "Vaccination site reaction": 3, "Vertigo": 3, "Adverse reaction": 2, "Alopecia": 2, "Aphthous ulcer": 2, "Axillary pain": 2, "Blister": 2, "Blood pressure increased": 2, "Blood test": 2, "Body temperature increased": 2, "Constipation": 2, "Deafness": 2, "Discomfort": 2, "Dysgeusia": 2, "Dyspepsia": 2, "Dysphonia": 2, "Eczema": 2, "Electrocardiogram": 2, "Eye pain": 2, "Eye pruritus": 2, "Fall": 2, "Flushing": 2, "HLA-B*27 assay": 2, "Hallucination": 2, "Head discomfort": 2, "Hypersomnia": 2, "Hypokinesia": 2, "Incorrect route of product administration": 2, "Influenza": 2, "Injection site swelling": 2, "Joint swelling": 2, "Laboratory test": 2, "Lethargy": 2, "Limb discomfort": 2, "Lymph node pain": 2, "Magnetic resonance imaging": 2, "Maternal exposure during pregnancy": 2, "Ocular discomfort": 2, "Ocular hyperaemia": 2, "Off label use": 2, "Peripheral coldness": 2, "Product storage error": 2, "Rash papular": 2, "Restlessness": 2, "SARS-CoV-2 antibody test negative": 2, "Sinusitis": 2, "Skin burning sensation": 2, "Speech disorder": 2, "Swelling face": 2, "Swollen tongue": 2, "Throat tightness": 2, "Vision blurred": 2, "Weight decreased": 2, "White blood cell count": 2, "Abdominal distension": 1, "Abnormal behaviour": 1, "Adverse event following immunisation": 1, "Allergy test": 1, "Amnesia": 1, "Anaphylactic shock": 1, "Aplastic anaemia": 1, "Arthropod sting": 1, "Asthenopia": 1, "Asthma": 1, "Atrial flutter": 1, "Autonomic neuropathy": 1, "Bedridden": 1, "Bell's palsy": 1, "Biopsy": 1, "Blepharospasm": 1, "Blood pressure inadequately controlled": 1, "Bone swelling": 1, "Brain oedema": 1, "Breast pain": 1, "Breast swelling": 1, "Bursitis": 1, "C-reactive protein": 1, "Cardiac disorder": 1, "Carotid artery aneurysm": 1, "Cerebrovascular accident": 1, "Cold sweat": 1, "Condition aggravated": 1, "Confusional state": 1, "Death": 1, "Delusion": 1, "Depression": 1, "Dermatitis contact": 1, "Device connection issue": 1, "Dose calculation error": 1, "Drug ineffective": 1, "Dry skin": 1, "Dry throat": 1, "Dyskinesia": 1, "Dyslexia": 1, "Dysphagia": 1, "Dysstasia": 1, "Ear discomfort": 1, "Ear infection": 1, "Ear swelling": 1, "Eating disorder": 1, "Effusion": 1, "Electromyogram": 1, "Exposure to SARS-CoV-2": 1, "Extra dose administered": 1, "Eye colour change": 1, "Eye disorder": 1, "Eye infection": 1, "Eye movement disorder": 1, "Eye swelling": 1, "Facial discomfort": 1, "Feeling drunk": 1, "Feeling of despair": 1, "Flatulence": 1, "Freezing phenomenon": 1, "Frostbite": 1, "Gait inability": 1, "Glucose tolerance test": 1, "Gout": 1, "Guttate psoriasis": 1, "Haemoglobin": 1, "Head titubation": 1, "Heart rate abnormal": 1, "Heavy menstrual bleeding": 1, "Hepatic enzyme increased": 1, "Herpes zoster": 1, "Hiccups": 1, "Hot flush": 1, "Hypoaesthesia oral": 1, "Hyposmia": 1, "Immobile": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Infection": 1, "Injection": 1, "Injection site reaction": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Joint effusion": 1, "Ligament rupture": 1, "Lip swelling": 1, "Loss of consciousness": 1, "Loss of control of legs": 1, "Lung disorder": 1, "Macule": 1, "Mammogram": 1, "Menstrual disorder": 1, "Mobility decreased": 1, "Mouth swelling": 1, "Mouth ulceration": 1, "Multiple sclerosis": 1, "Muscle strain": 1, "Muscle tightness": 1, "Muscular weakness": 1, "Musculoskeletal discomfort": 1, "Musculoskeletal stiffness": 1, "Myopia": 1, "Neck injury": 1, "Nervousness": 1, "Neuralgia": 1, "Neuritis": 1, "Neuropathy peripheral": 1, "Night blindness": 1, "Night sweats": 1, "No adverse event": 1, "Nuchal rigidity": 1, "Oxygen saturation": 1, "Paraesthesia oral": 1, "Periarthritis": 1, "Pharyngeal paraesthesia": 1, "Pharyngeal swelling": 1, "Platelet count": 1, "Pollakiuria": 1, "Polydipsia": 1, "Poor quality sleep": 1, "Pregnancy": 1, "Rash vesicular": 1, "Red blood cell count": 1, "Red blood cell sedimentation rate": 1, "Reduced facial expression": 1, "Restless legs syndrome": 1, "SARS-CoV-1 test": 1, "SARS-CoV-2 antibody test": 1, "Scratch": 1, "Seasonal allergy": 1, "Seizure": 1, "Shock": 1, "Sinus congestion": 1, "Sitting disability": 1, "Skin swelling": 1, "Snoring": 1, "Suicidal ideation": 1, "Sunburn": 1, "Suspected COVID-19": 1, "Syringe issue": 1, "Tendonitis": 1, "Terminal insomnia": 1, "Therapeutic response unexpected": 1, "Thinking abnormal": 1, "Thyroid disorder": 1, "Toothache": 1, "Troponin": 1, "Urine output": 1, "Vaccination complication": 1, "Vaccination site bruising": 1, "Vaccination site discolouration": 1, "Vaccination site haemorrhage": 1, "Vaccination site hypoaesthesia": 1, "Vaccination site inflammation": 1, "Vaccination site joint pain": 1, "Vaccination site urticaria": 1, "Vaccine breakthrough infection": 1, "Vasodilatation": 1, "Weight increased": 1, "White blood cell count decreased": 1, "X-ray": 1}, "batchcodes": ["032M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M20A032M20A.json b/docs/data/histograms/United States/032M20A032M20A.json
index 72dad848d81..b6c5ab3ed91 100644
--- a/docs/data/histograms/United States/032M20A032M20A.json
+++ b/docs/data/histograms/United States/032M20A032M20A.json
@@ -1 +1 @@
-{"batchcode": "032M20A032M20A", "histograms": [{"batchcodes": ["032M20A032M20A"], "histogram": {"Conjunctival haemorrhage": 1}}]}
\ No newline at end of file
+{"batchcode": "032M20A032M20A", "histograms": [{"histogram": {"Conjunctival haemorrhage": 1}, "batchcodes": ["032M20A032M20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M20M.json b/docs/data/histograms/United States/032M20M.json
index 957511735ab..4e278353319 100644
--- a/docs/data/histograms/United States/032M20M.json
+++ b/docs/data/histograms/United States/032M20M.json
@@ -1 +1 @@
-{"batchcode": "032M20M", "histograms": [{"batchcodes": ["032M20M"], "histogram": {"Inappropriate schedule of product administration": 1, "Underdose": 1}}]}
\ No newline at end of file
+{"batchcode": "032M20M", "histograms": [{"histogram": {"Inappropriate schedule of product administration": 1, "Underdose": 1}, "batchcodes": ["032M20M"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M21A.json b/docs/data/histograms/United States/032M21A.json
index 1bb67e27fed..2190d0c8c66 100644
--- a/docs/data/histograms/United States/032M21A.json
+++ b/docs/data/histograms/United States/032M21A.json
@@ -1 +1 @@
-{"batchcode": "032M21A", "histograms": [{"batchcodes": ["032M21A"], "histogram": {"Chills": 2, "Myalgia": 2, "Fatigue": 1, "Heart rate": 1}}]}
\ No newline at end of file
+{"batchcode": "032M21A", "histograms": [{"histogram": {"Chills": 2, "Myalgia": 2, "Fatigue": 1, "Heart rate": 1}, "batchcodes": ["032M21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M24A.json b/docs/data/histograms/United States/032M24A.json
index ad1d6e06b1a..1f26bf168ba 100644
--- a/docs/data/histograms/United States/032M24A.json
+++ b/docs/data/histograms/United States/032M24A.json
@@ -1 +1 @@
-{"batchcode": "032M24A", "histograms": [{"batchcodes": ["032M24A"], "histogram": {"Mass": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "032M24A", "histograms": [{"histogram": {"Mass": 1, "Pain in extremity": 1, "Pruritus": 1, "Rash": 1}, "batchcodes": ["032M24A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M2JA.json b/docs/data/histograms/United States/032M2JA.json
index f8288d310c7..e01dd0730ae 100644
--- a/docs/data/histograms/United States/032M2JA.json
+++ b/docs/data/histograms/United States/032M2JA.json
@@ -1 +1 @@
-{"batchcode": "032M2JA", "histograms": [{"batchcodes": ["032M2JA"], "histogram": {"Asthenia": 1, "Body temperature": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1}}]}
\ No newline at end of file
+{"batchcode": "032M2JA", "histograms": [{"histogram": {"Asthenia": 1, "Body temperature": 1, "Feeling abnormal": 1, "Headache": 1, "Malaise": 1, "Pyrexia": 1, "SARS-CoV-2 antibody test": 1}, "batchcodes": ["032M2JA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M2OA..json b/docs/data/histograms/United States/032M2OA..json
index 33074d8e514..762e485cbcf 100644
--- a/docs/data/histograms/United States/032M2OA..json
+++ b/docs/data/histograms/United States/032M2OA..json
@@ -1 +1 @@
-{"batchcode": "032M2OA.", "histograms": [{"batchcodes": ["032M2OA."], "histogram": {"Chills": 1, "Injection site bruising": 1, "Pain in extremity": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "032M2OA.", "histograms": [{"histogram": {"Chills": 1, "Injection site bruising": 1, "Pain in extremity": 1, "Pyrexia": 1}, "batchcodes": ["032M2OA."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M2OA.json b/docs/data/histograms/United States/032M2OA.json
index 7bc55ede564..481f2a39140 100644
--- a/docs/data/histograms/United States/032M2OA.json
+++ b/docs/data/histograms/United States/032M2OA.json
@@ -1 +1 @@
-{"batchcode": "032M2OA", "histograms": [{"batchcodes": ["032M2OA"], "histogram": {"Blood pressure increased": 1, "Headache": 1, "Heart rate abnormal": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Insomnia": 1, "Vaccination site discolouration": 1}}]}
\ No newline at end of file
+{"batchcode": "032M2OA", "histograms": [{"histogram": {"Blood pressure increased": 1, "Headache": 1, "Heart rate abnormal": 1, "Hypoaesthesia": 1, "Influenza like illness": 1, "Insomnia": 1, "Vaccination site discolouration": 1}, "batchcodes": ["032M2OA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M2UA.json b/docs/data/histograms/United States/032M2UA.json
index d2c35288e2f..b3f57c38024 100644
--- a/docs/data/histograms/United States/032M2UA.json
+++ b/docs/data/histograms/United States/032M2UA.json
@@ -1 +1 @@
-{"batchcode": "032M2UA", "histograms": [{"batchcodes": ["032M2UA"], "histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "032M2UA", "histograms": [{"histogram": {"Body temperature": 1, "Chills": 1, "Fatigue": 1, "Headache": 1, "Nausea": 1, "Pain": 1, "Pyrexia": 1}, "batchcodes": ["032M2UA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032M70A.json b/docs/data/histograms/United States/032M70A.json
index 0707dafbad1..053f4092991 100644
--- a/docs/data/histograms/United States/032M70A.json
+++ b/docs/data/histograms/United States/032M70A.json
@@ -1 +1 @@
-{"batchcode": "032M70A", "histograms": [{"batchcodes": ["032M70A"], "histogram": {"Fatigue": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032M70A", "histograms": [{"histogram": {"Fatigue": 1, "SARS-CoV-2 antibody test": 1, "Vaccination site pain": 1}, "batchcodes": ["032M70A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032MIVA.json b/docs/data/histograms/United States/032MIVA.json
index eacf4e9f398..3fcae0e6b71 100644
--- a/docs/data/histograms/United States/032MIVA.json
+++ b/docs/data/histograms/United States/032MIVA.json
@@ -1 +1 @@
-{"batchcode": "032MIVA", "histograms": [{"batchcodes": ["032MIVA"], "histogram": {"Rhinorrhoea": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "032MIVA", "histograms": [{"histogram": {"Rhinorrhoea": 1, "Vaccination site pain": 1}, "batchcodes": ["032MIVA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032MZ0A.json b/docs/data/histograms/United States/032MZ0A.json
index 40d65f3b6af..4130e537d2f 100644
--- a/docs/data/histograms/United States/032MZ0A.json
+++ b/docs/data/histograms/United States/032MZ0A.json
@@ -1 +1 @@
-{"batchcode": "032MZ0A", "histograms": [{"batchcodes": ["032MZ0A"], "histogram": {"Pain in extremity": 2, "Lymphadenopathy": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}}]}
\ No newline at end of file
+{"batchcode": "032MZ0A", "histograms": [{"histogram": {"Pain in extremity": 2, "Lymphadenopathy": 1, "Peripheral swelling": 1, "Product dose omission issue": 1, "Somnolence": 1, "Vaccination site erythema": 1, "Vaccination site mass": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1, "Vaccination site warmth": 1}, "batchcodes": ["032MZ0A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032MZOA.json b/docs/data/histograms/United States/032MZOA.json
index fa112a7c9c3..6a42e9a942d 100644
--- a/docs/data/histograms/United States/032MZOA.json
+++ b/docs/data/histograms/United States/032MZOA.json
@@ -1 +1 @@
-{"batchcode": "032MZOA", "histograms": [{"batchcodes": ["032MZOA"], "histogram": {"Bronchitis": 1}}]}
\ No newline at end of file
+{"batchcode": "032MZOA", "histograms": [{"histogram": {"Bronchitis": 1}, "batchcodes": ["032MZOA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032N20A.json b/docs/data/histograms/United States/032N20A.json
index 642227dcd9b..99e0c657d7f 100644
--- a/docs/data/histograms/United States/032N20A.json
+++ b/docs/data/histograms/United States/032N20A.json
@@ -1 +1 @@
-{"batchcode": "032N20A", "histograms": [{"batchcodes": ["032N20A"], "histogram": {"Expired product administered": 8, "Pain": 2, "Atrial fibrillation": 1, "Chills": 1, "Dry mouth": 1, "Fatigue": 1, "Gingival pain": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Lethargy": 1, "Lip blister": 1, "Oral pain": 1, "Pain in extremity": 1, "Pigmentation disorder": 1, "Pyrexia": 1, "Respiratory tract infection": 1, "Vaccination site bruising": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "032N20A", "histograms": [{"histogram": {"Expired product administered": 8, "Pain": 2, "Atrial fibrillation": 1, "Chills": 1, "Dry mouth": 1, "Fatigue": 1, "Gingival pain": 1, "Heart rate": 1, "Hyperhidrosis": 1, "Lethargy": 1, "Lip blister": 1, "Oral pain": 1, "Pain in extremity": 1, "Pigmentation disorder": 1, "Pyrexia": 1, "Respiratory tract infection": 1, "Vaccination site bruising": 1, "Vaccination site pain": 1, "Vaccination site swelling": 1}, "batchcodes": ["032N20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032O20A.json b/docs/data/histograms/United States/032O20A.json
index 4825fd7bef7..abe95c9ae7c 100644
--- a/docs/data/histograms/United States/032O20A.json
+++ b/docs/data/histograms/United States/032O20A.json
@@ -1 +1 @@
-{"batchcode": "032O20A", "histograms": [{"batchcodes": ["032O20A"], "histogram": {"Chills": 1, "Mobility decreased": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Vaccination site urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "032O20A", "histograms": [{"histogram": {"Chills": 1, "Mobility decreased": 1, "Nasal congestion": 1, "Pain in extremity": 1, "Vaccination site urticaria": 1}, "batchcodes": ["032O20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032P21A.json b/docs/data/histograms/United States/032P21A.json
index ffae0f99952..4c87c5c1c7b 100644
--- a/docs/data/histograms/United States/032P21A.json
+++ b/docs/data/histograms/United States/032P21A.json
@@ -1 +1 @@
-{"batchcode": "032P21A", "histograms": [{"batchcodes": ["032P21A"], "histogram": {"Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "032P21A", "histograms": [{"histogram": {"Chills": 1, "Dyspnoea": 1, "Fatigue": 1, "Pyrexia": 1}, "batchcodes": ["032P21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032R21A.json b/docs/data/histograms/United States/032R21A.json
index 1de2e06f34e..a37bddfb5ec 100644
--- a/docs/data/histograms/United States/032R21A.json
+++ b/docs/data/histograms/United States/032R21A.json
@@ -1 +1 @@
-{"batchcode": "032R21A", "histograms": [{"batchcodes": ["032R21A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "032R21A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["032R21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/032Z20A.json b/docs/data/histograms/United States/032Z20A.json
index 12ad6f8a6ab..9d358a1ed5a 100644
--- a/docs/data/histograms/United States/032Z20A.json
+++ b/docs/data/histograms/United States/032Z20A.json
@@ -1 +1 @@
-{"batchcode": "032Z20A", "histograms": [{"batchcodes": ["032Z20A"], "histogram": {"Chills": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "032Z20A", "histograms": [{"histogram": {"Chills": 1, "Pyrexia": 1}, "batchcodes": ["032Z20A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033021A.json b/docs/data/histograms/United States/033021A.json
index 1f764675788..57b037e5f39 100644
--- a/docs/data/histograms/United States/033021A.json
+++ b/docs/data/histograms/United States/033021A.json
@@ -1 +1 @@
-{"batchcode": "033021A", "histograms": [{"batchcodes": ["033021A"], "histogram": {"Allergy to vaccine": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Influenza": 1, "Lip swelling": 1, "Palpitations": 1, "Rash": 1, "Rhinorrhoea": 1, "Swelling face": 1, "Throat irritation": 1, "Urticaria": 1, "Vaccination site pruritus": 1}}]}
\ No newline at end of file
+{"batchcode": "033021A", "histograms": [{"histogram": {"Allergy to vaccine": 1, "COVID-19": 1, "Chills": 1, "Fatigue": 1, "Feeling abnormal": 1, "Feeling hot": 1, "Influenza": 1, "Lip swelling": 1, "Palpitations": 1, "Rash": 1, "Rhinorrhoea": 1, "Swelling face": 1, "Throat irritation": 1, "Urticaria": 1, "Vaccination site pruritus": 1}, "batchcodes": ["033021A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0331-12-1A.json b/docs/data/histograms/United States/0331-12-1A.json
index 09133c8d8a1..0a513247561 100644
--- a/docs/data/histograms/United States/0331-12-1A.json
+++ b/docs/data/histograms/United States/0331-12-1A.json
@@ -1 +1 @@
-{"batchcode": "0331-12-1A", "histograms": [{"batchcodes": ["0331-12-1A"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "0331-12-1A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["0331-12-1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0331211-1808980.json b/docs/data/histograms/United States/0331211-1808980.json
index 9d3187df2c3..91604137065 100644
--- a/docs/data/histograms/United States/0331211-1808980.json
+++ b/docs/data/histograms/United States/0331211-1808980.json
@@ -1 +1 @@
-{"batchcode": "0331211-1808980", "histograms": [{"batchcodes": ["0331211-1808980"], "histogram": {"Dizziness": 1, "Headache": 1}}]}
\ No newline at end of file
+{"batchcode": "0331211-1808980", "histograms": [{"histogram": {"Dizziness": 1, "Headache": 1}, "batchcodes": ["0331211-1808980"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0331521A.json b/docs/data/histograms/United States/0331521A.json
index 69a67887bcd..3d5957e5a96 100644
--- a/docs/data/histograms/United States/0331521A.json
+++ b/docs/data/histograms/United States/0331521A.json
@@ -1 +1 @@
-{"batchcode": "0331521A", "histograms": [{"batchcodes": ["0331521A"], "histogram": {"Pain in extremity": 1}}]}
\ No newline at end of file
+{"batchcode": "0331521A", "histograms": [{"histogram": {"Pain in extremity": 1}, "batchcodes": ["0331521A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/03321A.json b/docs/data/histograms/United States/03321A.json
index 69377d49292..c4f2fa4ce57 100644
--- a/docs/data/histograms/United States/03321A.json
+++ b/docs/data/histograms/United States/03321A.json
@@ -1 +1 @@
-{"batchcode": "03321A", "histograms": [{"batchcodes": ["03321A"], "histogram": {"Diarrhoea": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "03321A", "histograms": [{"histogram": {"Diarrhoea": 1, "Vomiting": 1}, "batchcodes": ["03321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033321A.json b/docs/data/histograms/United States/033321A.json
index 3d7e6862ab8..9fa74249545 100644
--- a/docs/data/histograms/United States/033321A.json
+++ b/docs/data/histograms/United States/033321A.json
@@ -1 +1 @@
-{"batchcode": "033321A", "histograms": [{"batchcodes": ["033321A"], "histogram": {"Dyspnoea": 1, "Fatigue": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "033321A", "histograms": [{"histogram": {"Dyspnoea": 1, "Fatigue": 1, "Vaccination site pain": 1}, "batchcodes": ["033321A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033620A.json b/docs/data/histograms/United States/033620A.json
index 351e84e4e07..0bc83f302f2 100644
--- a/docs/data/histograms/United States/033620A.json
+++ b/docs/data/histograms/United States/033620A.json
@@ -1 +1 @@
-{"batchcode": "033620A", "histograms": [{"batchcodes": ["033620A"], "histogram": {"Arthralgia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}}]}
\ No newline at end of file
+{"batchcode": "033620A", "histograms": [{"histogram": {"Arthralgia": 1, "Vaccination site erythema": 1, "Vaccination site pain": 1, "Vaccination site rash": 1, "Vaccination site swelling": 1}, "batchcodes": ["033620A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033621A.json b/docs/data/histograms/United States/033621A.json
index 44a9a402019..b7eb88d6b59 100644
--- a/docs/data/histograms/United States/033621A.json
+++ b/docs/data/histograms/United States/033621A.json
@@ -1 +1 @@
-{"batchcode": "033621A", "histograms": [{"batchcodes": ["033621A"], "histogram": {"Dizziness": 1}}]}
\ No newline at end of file
+{"batchcode": "033621A", "histograms": [{"histogram": {"Dizziness": 1}, "batchcodes": ["033621A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/0338214.json b/docs/data/histograms/United States/0338214.json
index 618578eab70..3d6933839ec 100644
--- a/docs/data/histograms/United States/0338214.json
+++ b/docs/data/histograms/United States/0338214.json
@@ -1 +1 @@
-{"batchcode": "0338214", "histograms": [{"batchcodes": ["0338214"], "histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Secretion discharge": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "0338214", "histograms": [{"histogram": {"Chills": 1, "Fatigue": 1, "Headache": 1, "Influenza like illness": 1, "Nausea": 1, "Secretion discharge": 1, "Vaccination site pain": 1}, "batchcodes": ["0338214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033821A.json b/docs/data/histograms/United States/033821A.json
index 69a066a85ee..4bdb45069e6 100644
--- a/docs/data/histograms/United States/033821A.json
+++ b/docs/data/histograms/United States/033821A.json
@@ -1 +1 @@
-{"batchcode": "033821A", "histograms": [{"batchcodes": ["033821A"], "histogram": {"Arthralgia": 2, "Diarrhoea": 2, "Nasopharyngitis": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Dehydration": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fungal infection": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Polymerase chain reaction": 1, "Tremor": 1}}]}
\ No newline at end of file
+{"batchcode": "033821A", "histograms": [{"histogram": {"Arthralgia": 2, "Diarrhoea": 2, "Nasopharyngitis": 2, "Abdominal pain": 1, "Abdominal pain upper": 1, "Chest pain": 1, "Chills": 1, "Decreased appetite": 1, "Dehydration": 1, "Fatigue": 1, "Feeling abnormal": 1, "Fungal infection": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Polymerase chain reaction": 1, "Tremor": 1}, "batchcodes": ["033821A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033A21-2A.json b/docs/data/histograms/United States/033A21-2A.json
index 13f57313eab..ee66324f2a8 100644
--- a/docs/data/histograms/United States/033A21-2A.json
+++ b/docs/data/histograms/United States/033A21-2A.json
@@ -1 +1 @@
-{"batchcode": "033A21-2A", "histograms": [{"batchcodes": ["033A21-2A"], "histogram": {"Expired product administered": 2}}]}
\ No newline at end of file
+{"batchcode": "033A21-2A", "histograms": [{"histogram": {"Expired product administered": 2}, "batchcodes": ["033A21-2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033A21A.json b/docs/data/histograms/United States/033A21A.json
index a6ebebbaf6a..a64f95f67c3 100644
--- a/docs/data/histograms/United States/033A21A.json
+++ b/docs/data/histograms/United States/033A21A.json
@@ -1 +1 @@
-{"batchcode": "033A21A", "histograms": [{"batchcodes": ["033A21A"], "histogram": {"Arthralgia": 1, "Chills": 1, "Condition aggravated": 1, "Feeling abnormal": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Rash": 1}}]}
\ No newline at end of file
+{"batchcode": "033A21A", "histograms": [{"histogram": {"Arthralgia": 1, "Chills": 1, "Condition aggravated": 1, "Feeling abnormal": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Interchange of vaccine products": 1, "Malaise": 1, "Musculoskeletal discomfort": 1, "Myalgia": 1, "Rash": 1}, "batchcodes": ["033A21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033B21.json b/docs/data/histograms/United States/033B21.json
index 1ed7fbdce3d..cd3492e830a 100644
--- a/docs/data/histograms/United States/033B21.json
+++ b/docs/data/histograms/United States/033B21.json
@@ -1 +1 @@
-{"batchcode": "033B21", "histograms": [{"batchcodes": ["033B21"], "histogram": {"Expired product administered": 1, "Fatigue": 1, "Rash": 1, "Skin reaction": 1}}]}
\ No newline at end of file
+{"batchcode": "033B21", "histograms": [{"histogram": {"Expired product administered": 1, "Fatigue": 1, "Rash": 1, "Skin reaction": 1}, "batchcodes": ["033B21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033B21A / 083B2.json b/docs/data/histograms/United States/033B21A / 083B2.json
index 4e694299bf8..1b7289fd4cf 100644
--- a/docs/data/histograms/United States/033B21A / 083B2.json
+++ b/docs/data/histograms/United States/033B21A / 083B2.json
@@ -1 +1 @@
-{"batchcode": "033B21A / 083B2", "histograms": [{"batchcodes": ["033B21A / 083B2"], "histogram": {"Arthropod bite": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Heart rate": 1, "Hypertension": 1, "Lip swelling": 1, "Malaise": 1, "Muscle spasms": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Tooth abscess": 1, "Toothache": 1, "Urticaria": 1}}]}
\ No newline at end of file
+{"batchcode": "033B21A / 083B2", "histograms": [{"histogram": {"Arthropod bite": 1, "Blood pressure measurement": 1, "COVID-19": 1, "Heart rate": 1, "Hypertension": 1, "Lip swelling": 1, "Malaise": 1, "Muscle spasms": 1, "Pain": 1, "SARS-CoV-2 test": 1, "Swelling face": 1, "Tooth abscess": 1, "Toothache": 1, "Urticaria": 1}, "batchcodes": ["033B21A / 083B2"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033B21A.json b/docs/data/histograms/United States/033B21A.json
index 9e6bb14de36..dc87cc724eb 100644
--- a/docs/data/histograms/United States/033B21A.json
+++ b/docs/data/histograms/United States/033B21A.json
@@ -1 +1 @@
-{"batchcode": "033B21A", "histograms": [{"batchcodes": ["033B21A"], "histogram": {"Myalgia": 16, "Expired product administered": 11, "Fatigue": 11, "Pain in extremity": 11, "Headache": 10, "Nausea": 9, "Pruritus": 8, "Pyrexia": 8, "Rash": 8, "Inappropriate schedule of product administration": 7, "Lymphadenopathy": 7, "Chills": 6, "Feeling abnormal": 6, "Product dose omission issue": 5, "Vaccination site erythema": 5, "Arthralgia": 4, "Dizziness": 4, "Erythema": 4, "Hypoaesthesia": 4, "Insomnia": 4, "Peripheral swelling": 4, "Swelling": 4, "Tinnitus": 4, "Urticaria": 4, "Vaccination site pain": 4, "Vaccination site pruritus": 4, "Vaccination site rash": 4, "Vaccination site swelling": 4, "Angioedema": 3, "Burning sensation": 3, "COVID-19": 3, "Cough": 3, "Diarrhoea": 3, "Illness": 3, "Muscle spasms": 3, "Musculoskeletal stiffness": 3, "Oropharyngeal pain": 3, "Pain": 3, "Paraesthesia": 3, "Swelling face": 3, "Vaccination site warmth": 3, "Bell's palsy": 2, "Body temperature": 2, "Chest discomfort": 2, "Chest pain": 2, "Feeling cold": 2, "Feeling hot": 2, "Injection site pain": 2, "Lethargy": 2, "Maternal exposure during pregnancy": 2, "Memory impairment": 2, "Myocardial infarction": 2, "Nasopharyngitis": 2, "Neck pain": 2, "Off label use": 2, "Product administered to patient of inappropriate age": 2, "SARS-CoV-2 test": 2, "Skin exfoliation": 2, "Vomiting": 2, "Accidental underdose": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Arthritis": 1, "Asthenopia": 1, "Attention deficit hyperactivity disorder": 1, "Bacterial infection": 1, "Blood test": 1, "Bone pain": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Confusional state": 1, "Contusion": 1, "Deafness": 1, "Decreased appetite": 1, "Delivery": 1, "Depression": 1, "Dermatitis": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Epstein-Barr virus test positive": 1, "Fall": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Inflammation": 1, "Intentional product use issue": 1, "Lower limb fracture": 1, "Malaise": 1, "Mass": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Nightmare": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Palpitations": 1, "Pelvic pain": 1, "Periorbital swelling": 1, "Pharyngeal erythema": 1, "Polymerase chain reaction": 1, "Product storage error": 1, "Productive cough": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Skin burning sensation": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Tenderness": 1, "Throat irritation": 1, "Thrombosis": 1, "Vaccination complication": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site vesicles": 1, "Vaccine breakthrough infection": 1, "Vertigo": 1, "Vitamin B complex deficiency": 1, "Weight decreased": 1, "Wheezing": 1, "Wrong patient received product": 1, "Wrong product administered": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "033B21A", "histograms": [{"histogram": {"Myalgia": 16, "Expired product administered": 11, "Fatigue": 11, "Pain in extremity": 11, "Headache": 10, "Nausea": 9, "Pruritus": 8, "Pyrexia": 8, "Rash": 8, "Inappropriate schedule of product administration": 7, "Lymphadenopathy": 7, "Chills": 6, "Feeling abnormal": 6, "Product dose omission issue": 5, "Vaccination site erythema": 5, "Arthralgia": 4, "Dizziness": 4, "Erythema": 4, "Hypoaesthesia": 4, "Insomnia": 4, "Peripheral swelling": 4, "Swelling": 4, "Tinnitus": 4, "Urticaria": 4, "Vaccination site pain": 4, "Vaccination site pruritus": 4, "Vaccination site rash": 4, "Vaccination site swelling": 4, "Angioedema": 3, "Burning sensation": 3, "COVID-19": 3, "Cough": 3, "Diarrhoea": 3, "Illness": 3, "Muscle spasms": 3, "Musculoskeletal stiffness": 3, "Oropharyngeal pain": 3, "Pain": 3, "Paraesthesia": 3, "Swelling face": 3, "Vaccination site warmth": 3, "Bell's palsy": 2, "Body temperature": 2, "Chest discomfort": 2, "Chest pain": 2, "Feeling cold": 2, "Feeling hot": 2, "Injection site pain": 2, "Lethargy": 2, "Maternal exposure during pregnancy": 2, "Memory impairment": 2, "Myocardial infarction": 2, "Nasopharyngitis": 2, "Neck pain": 2, "Off label use": 2, "Product administered to patient of inappropriate age": 2, "SARS-CoV-2 test": 2, "Skin exfoliation": 2, "Vomiting": 2, "Accidental underdose": 1, "Ageusia": 1, "Anaphylactic reaction": 1, "Anosmia": 1, "Arthritis": 1, "Asthenopia": 1, "Attention deficit hyperactivity disorder": 1, "Bacterial infection": 1, "Blood test": 1, "Bone pain": 1, "Cerebrovascular accident": 1, "Chest X-ray": 1, "Confusional state": 1, "Contusion": 1, "Deafness": 1, "Decreased appetite": 1, "Delivery": 1, "Depression": 1, "Dermatitis": 1, "Disorientation": 1, "Disturbance in attention": 1, "Dyspnoea": 1, "Epstein-Barr virus test positive": 1, "Fall": 1, "Fibromyalgia": 1, "Gait disturbance": 1, "Heart rate": 1, "Heart rate abnormal": 1, "Heart rate increased": 1, "Hyperhidrosis": 1, "Hypokinesia": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Incomplete course of vaccination": 1, "Incorrect route of product administration": 1, "Inflammation": 1, "Intentional product use issue": 1, "Lower limb fracture": 1, "Malaise": 1, "Mass": 1, "Menstruation irregular": 1, "Mobility decreased": 1, "Muscular weakness": 1, "Neuropathy peripheral": 1, "Nightmare": 1, "Oral mucosal blistering": 1, "Oral pain": 1, "Palpitations": 1, "Pelvic pain": 1, "Periorbital swelling": 1, "Pharyngeal erythema": 1, "Polymerase chain reaction": 1, "Product storage error": 1, "Productive cough": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Skin burning sensation": 1, "Somnolence": 1, "Suspected COVID-19": 1, "Tenderness": 1, "Throat irritation": 1, "Thrombosis": 1, "Vaccination complication": 1, "Vaccination site mass": 1, "Vaccination site movement impairment": 1, "Vaccination site vesicles": 1, "Vaccine breakthrough infection": 1, "Vertigo": 1, "Vitamin B complex deficiency": 1, "Weight decreased": 1, "Wheezing": 1, "Wrong patient received product": 1, "Wrong product administered": 1, "X-ray": 1}, "batchcodes": ["033B21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033B28A.json b/docs/data/histograms/United States/033B28A.json
index 46fcc7b3ac7..7224993efee 100644
--- a/docs/data/histograms/United States/033B28A.json
+++ b/docs/data/histograms/United States/033B28A.json
@@ -1 +1 @@
-{"batchcode": "033B28A", "histograms": [{"batchcodes": ["033B28A"], "histogram": {"Animal bite": 1}}]}
\ No newline at end of file
+{"batchcode": "033B28A", "histograms": [{"histogram": {"Animal bite": 1}, "batchcodes": ["033B28A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033C0VA.json b/docs/data/histograms/United States/033C0VA.json
index e3787a634d3..935be5cbd91 100644
--- a/docs/data/histograms/United States/033C0VA.json
+++ b/docs/data/histograms/United States/033C0VA.json
@@ -1 +1 @@
-{"batchcode": "033C0VA", "histograms": [{"batchcodes": ["033C0VA"], "histogram": {"Abdominal pain upper": 1, "Ageusia": 1, "Asthenia": 1, "Atypical pneumonia": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Myalgia": 1, "Oral discomfort": 1, "Rhinorrhoea": 1, "Somnolence": 1}}]}
\ No newline at end of file
+{"batchcode": "033C0VA", "histograms": [{"histogram": {"Abdominal pain upper": 1, "Ageusia": 1, "Asthenia": 1, "Atypical pneumonia": 1, "Cough": 1, "Decreased appetite": 1, "Dizziness": 1, "Headache": 1, "Hyperhidrosis": 1, "Illness": 1, "Myalgia": 1, "Oral discomfort": 1, "Rhinorrhoea": 1, "Somnolence": 1}, "batchcodes": ["033C0VA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033C2/A.json b/docs/data/histograms/United States/033C2/A.json
index 8330b8479cc..02e42465262 100644
--- a/docs/data/histograms/United States/033C2/A.json
+++ b/docs/data/histograms/United States/033C2/A.json
@@ -1 +1 @@
-{"batchcode": "033C2/A", "histograms": [{"batchcodes": ["033C2/A"], "histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1}}]}
\ No newline at end of file
+{"batchcode": "033C2/A", "histograms": [{"histogram": {"Chills": 1, "Headache": 1, "Pyrexia": 1}, "batchcodes": ["033C2/A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033C214.json b/docs/data/histograms/United States/033C214.json
index 35a56bc677c..ac960ef4b00 100644
--- a/docs/data/histograms/United States/033C214.json
+++ b/docs/data/histograms/United States/033C214.json
@@ -1 +1 @@
-{"batchcode": "033C214", "histograms": [{"batchcodes": ["033C214"], "histogram": {"Product dose omission issue": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Vaccination complication": 1}}]}
\ No newline at end of file
+{"batchcode": "033C214", "histograms": [{"histogram": {"Product dose omission issue": 1, "Rash erythematous": 1, "Rash pruritic": 1, "Vaccination complication": 1}, "batchcodes": ["033C214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033C21A..json b/docs/data/histograms/United States/033C21A..json
index 71474266d1d..3c52ea0c673 100644
--- a/docs/data/histograms/United States/033C21A..json
+++ b/docs/data/histograms/United States/033C21A..json
@@ -1 +1 @@
-{"batchcode": "033C21A.", "histograms": [{"batchcodes": ["033C21A."], "histogram": {"Chills": 1, "Depression": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1}}]}
\ No newline at end of file
+{"batchcode": "033C21A.", "histograms": [{"histogram": {"Chills": 1, "Depression": 1, "Headache": 1, "Inappropriate schedule of product administration": 1, "Myalgia": 1, "Pyrexia": 1, "Rash": 1, "Rash pruritic": 1}, "batchcodes": ["033C21A."]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033C21A.json b/docs/data/histograms/United States/033C21A.json
index ed105d9f03f..c5bc9be4703 100644
--- a/docs/data/histograms/United States/033C21A.json
+++ b/docs/data/histograms/United States/033C21A.json
@@ -1 +1 @@
-{"batchcode": "033C21A", "histograms": [{"batchcodes": ["033C21A"], "histogram": {"Expired product administered": 84, "Headache": 19, "Fatigue": 15, "Myalgia": 12, "Pain in extremity": 11, "Nausea": 9, "Pyrexia": 8, "Chills": 7, "Feeling abnormal": 6, "Vaccination site pain": 6, "Asthenia": 5, "Dizziness": 5, "Product storage error": 5, "Rash": 5, "Body temperature": 4, "Chest pain": 4, "Erythema": 4, "Hyperhidrosis": 4, "Pain": 4, "Vaccination site erythema": 4, "Body temperature increased": 3, "Dyspnoea": 3, "Injection site pain": 3, "Peripheral swelling": 3, "Product administered to patient of inappropriate age": 3, "Vaccination site swelling": 3, "Vomiting": 3, "Anxiety": 2, "Arthralgia": 2, "Bone pain": 2, "Chest discomfort": 2, "Contusion": 2, "Decreased appetite": 2, "Eating disorder": 2, "Fall": 2, "Feeling hot": 2, "Gait disturbance": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Hypoaesthesia": 2, "Impaired work ability": 2, "Influenza like illness": 2, "Lymphadenopathy": 2, "Malaise": 2, "Menstrual disorder": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "No adverse event": 2, "Product dose omission issue": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Skin discolouration": 2, "Swelling": 2, "Vaccination site pruritus": 2, "Abdominal pain upper": 1, "Anger": 1, "Antibody test": 1, "Bacterial infection": 1, "Blood glucose abnormal": 1, "Blood pressure measurement": 1, "Blood test": 1, "COVID-19": 1, "Chapped lips": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Coma": 1, "Concussion": 1, "Confusional state": 1, "Cough": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Discomfort": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry mouth": 1, "Fear": 1, "Feeding disorder": 1, "Feeling cold": 1, "Fibromyalgia": 1, "Frequent bowel movements": 1, "Granuloma annulare": 1, "Hallucination": 1, "Heart rate": 1, "Hemiparesis": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypokinesia": 1, "Immobile": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Lethargy": 1, "Limb discomfort": 1, "Limb mass": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Mass": 1, "Mitral valve prolapse": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Neuralgia": 1, "Oral mucosal blistering": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral coldness": 1, "Polymenorrhoea": 1, "Postmenopausal haemorrhage": 1, "Product temperature excursion issue": 1, "Rash pruritic": 1, "Rheumatological examination": 1, "Sinusitis": 1, "Skin disorder": 1, "Skin swelling": 1, "Sleep disorder": 1, "Smear cervix normal": 1, "Stomatitis": 1, "Stool analysis": 1, "Syncope": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Thrombosis": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Wrong technique in product usage process": 1}}]}
\ No newline at end of file
+{"batchcode": "033C21A", "histograms": [{"histogram": {"Expired product administered": 84, "Headache": 19, "Fatigue": 15, "Myalgia": 12, "Pain in extremity": 11, "Nausea": 9, "Pyrexia": 8, "Chills": 7, "Feeling abnormal": 6, "Vaccination site pain": 6, "Asthenia": 5, "Dizziness": 5, "Product storage error": 5, "Rash": 5, "Body temperature": 4, "Chest pain": 4, "Erythema": 4, "Hyperhidrosis": 4, "Pain": 4, "Vaccination site erythema": 4, "Body temperature increased": 3, "Dyspnoea": 3, "Injection site pain": 3, "Peripheral swelling": 3, "Product administered to patient of inappropriate age": 3, "Vaccination site swelling": 3, "Vomiting": 3, "Anxiety": 2, "Arthralgia": 2, "Bone pain": 2, "Chest discomfort": 2, "Contusion": 2, "Decreased appetite": 2, "Eating disorder": 2, "Fall": 2, "Feeling hot": 2, "Gait disturbance": 2, "Heavy menstrual bleeding": 2, "Herpes zoster": 2, "Hypoaesthesia": 2, "Impaired work ability": 2, "Influenza like illness": 2, "Lymphadenopathy": 2, "Malaise": 2, "Menstrual disorder": 2, "Muscle spasms": 2, "Musculoskeletal stiffness": 2, "No adverse event": 2, "Product dose omission issue": 2, "Pruritus": 2, "SARS-CoV-2 test": 2, "Skin discolouration": 2, "Swelling": 2, "Vaccination site pruritus": 2, "Abdominal pain upper": 1, "Anger": 1, "Antibody test": 1, "Bacterial infection": 1, "Blood glucose abnormal": 1, "Blood pressure measurement": 1, "Blood test": 1, "COVID-19": 1, "Chapped lips": 1, "Colitis microscopic": 1, "Colonoscopy": 1, "Coma": 1, "Concussion": 1, "Confusional state": 1, "Cough": 1, "Deep vein thrombosis": 1, "Diarrhoea": 1, "Discomfort": 1, "Disturbance in attention": 1, "Drug ineffective": 1, "Dry mouth": 1, "Fear": 1, "Feeding disorder": 1, "Feeling cold": 1, "Fibromyalgia": 1, "Frequent bowel movements": 1, "Granuloma annulare": 1, "Hallucination": 1, "Heart rate": 1, "Hemiparesis": 1, "Hot flush": 1, "Hypersomnia": 1, "Hypokinesia": 1, "Immobile": 1, "Inappropriate schedule of product administration": 1, "Incorrect dose administered": 1, "Induration": 1, "Inflammation": 1, "Interchange of vaccine products": 1, "Irritability": 1, "Lethargy": 1, "Limb discomfort": 1, "Limb mass": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Lymph node pain": 1, "Mass": 1, "Mitral valve prolapse": 1, "Mobility decreased": 1, "Muscle tightness": 1, "Myocarditis": 1, "Nasopharyngitis": 1, "Neck mass": 1, "Neuralgia": 1, "Oral mucosal blistering": 1, "Palpitations": 1, "Paraesthesia": 1, "Paralysis": 1, "Peripheral coldness": 1, "Polymenorrhoea": 1, "Postmenopausal haemorrhage": 1, "Product temperature excursion issue": 1, "Rash pruritic": 1, "Rheumatological examination": 1, "Sinusitis": 1, "Skin disorder": 1, "Skin swelling": 1, "Sleep disorder": 1, "Smear cervix normal": 1, "Stomatitis": 1, "Stool analysis": 1, "Syncope": 1, "Tenderness": 1, "Therapeutic response unexpected": 1, "Thirst": 1, "Thrombosis": 1, "Tinnitus": 1, "Tremor": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site rash": 1, "Vaccination site reaction": 1, "Wrong technique in product usage process": 1}, "batchcodes": ["033C21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033C2A.json b/docs/data/histograms/United States/033C2A.json
index a1bc06ba300..f13c3d30421 100644
--- a/docs/data/histograms/United States/033C2A.json
+++ b/docs/data/histograms/United States/033C2A.json
@@ -1 +1 @@
-{"batchcode": "033C2A", "histograms": [{"batchcodes": ["033C2A"], "histogram": {"Cerebral disorder": 1, "Computerised tomogram": 1, "Dehydration": 1, "Erythema": 1, "Feeling abnormal": 1, "Mastication disorder": 1, "Parotitis": 1, "Swelling face": 1}}]}
\ No newline at end of file
+{"batchcode": "033C2A", "histograms": [{"histogram": {"Cerebral disorder": 1, "Computerised tomogram": 1, "Dehydration": 1, "Erythema": 1, "Feeling abnormal": 1, "Mastication disorder": 1, "Parotitis": 1, "Swelling face": 1}, "batchcodes": ["033C2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033CZ1A.json b/docs/data/histograms/United States/033CZ1A.json
index 49eed7cd14f..327cd5b7960 100644
--- a/docs/data/histograms/United States/033CZ1A.json
+++ b/docs/data/histograms/United States/033CZ1A.json
@@ -1 +1 @@
-{"batchcode": "033CZ1A", "histograms": [{"batchcodes": ["033CZ1A"], "histogram": {"Body temperature": 2, "Fatigue": 2, "Myalgia": 2, "Nasopharyngeal swab": 2, "SARS-CoV-2 antibody test": 2, "COVID-19": 1, "Foot deformity": 1, "Herpes zoster": 1, "Pain in extremity": 1, "Rheumatoid arthritis": 1, "Skin infection": 1}}]}
\ No newline at end of file
+{"batchcode": "033CZ1A", "histograms": [{"histogram": {"Body temperature": 2, "Fatigue": 2, "Myalgia": 2, "Nasopharyngeal swab": 2, "SARS-CoV-2 antibody test": 2, "COVID-19": 1, "Foot deformity": 1, "Herpes zoster": 1, "Pain in extremity": 1, "Rheumatoid arthritis": 1, "Skin infection": 1}, "batchcodes": ["033CZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033CZA.json b/docs/data/histograms/United States/033CZA.json
index 79d2169eba4..13cee958a8a 100644
--- a/docs/data/histograms/United States/033CZA.json
+++ b/docs/data/histograms/United States/033CZA.json
@@ -1 +1 @@
-{"batchcode": "033CZA", "histograms": [{"batchcodes": ["033CZA"], "histogram": {"Arthralgia": 1, "Feeling abnormal": 1, "Myalgia": 1, "Neck pain": 1}}]}
\ No newline at end of file
+{"batchcode": "033CZA", "histograms": [{"histogram": {"Arthralgia": 1, "Feeling abnormal": 1, "Myalgia": 1, "Neck pain": 1}, "batchcodes": ["033CZA"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033D21A.json b/docs/data/histograms/United States/033D21A.json
index 0fbb4b811c0..7e5cb4c33b5 100644
--- a/docs/data/histograms/United States/033D21A.json
+++ b/docs/data/histograms/United States/033D21A.json
@@ -1 +1 @@
-{"batchcode": "033D21A", "histograms": [{"batchcodes": ["033D21A"], "histogram": {"Chest pain": 1, "Hallucination": 1, "Hallucination, auditory": 1, "Inappropriate schedule of product administration": 1, "Paranoia": 1, "Psychotic disorder": 1}}]}
\ No newline at end of file
+{"batchcode": "033D21A", "histograms": [{"histogram": {"Chest pain": 1, "Hallucination": 1, "Hallucination, auditory": 1, "Inappropriate schedule of product administration": 1, "Paranoia": 1, "Psychotic disorder": 1}, "batchcodes": ["033D21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033F211A.json b/docs/data/histograms/United States/033F211A.json
index 80bc29be6a8..8a842d887dc 100644
--- a/docs/data/histograms/United States/033F211A.json
+++ b/docs/data/histograms/United States/033F211A.json
@@ -1 +1 @@
-{"batchcode": "033F211A", "histograms": [{"batchcodes": ["033F211A"], "histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "033F211A", "histograms": [{"histogram": {"COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["033F211A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033F214.json b/docs/data/histograms/United States/033F214.json
index 93a314455ca..f868f4080bb 100644
--- a/docs/data/histograms/United States/033F214.json
+++ b/docs/data/histograms/United States/033F214.json
@@ -1 +1 @@
-{"batchcode": "033F214", "histograms": [{"batchcodes": ["033F214"], "histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 1}}]}
\ No newline at end of file
+{"batchcode": "033F214", "histograms": [{"histogram": {"COVID-19": 2, "SARS-CoV-2 test": 2, "Vaccination failure": 1}, "batchcodes": ["033F214"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033F21A.json b/docs/data/histograms/United States/033F21A.json
index 8e3baeaaf21..736750ba02c 100644
--- a/docs/data/histograms/United States/033F21A.json
+++ b/docs/data/histograms/United States/033F21A.json
@@ -1 +1 @@
-{"batchcode": "033F21A", "histograms": [{"batchcodes": ["033F21A", "1805018"], "histogram": {"COVID-19": 2, "Dysgeusia": 2, "Interchange of vaccine products": 2, "Vaccination failure": 2, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["033F21A", "1805022"], "histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Dysgeusia": 1}}, {"batchcodes": ["033F21A", "203A21A"], "histogram": {"COVID-19": 2, "Ear discomfort": 2, "SARS-CoV-2 test": 2, "Interchange of vaccine products": 1}}, {"batchcodes": ["033F21A"], "histogram": {"Product storage error": 48, "Product temperature excursion issue": 44, "Expired product administered": 43, "Headache": 12, "Pyrexia": 10, "Myalgia": 9, "COVID-19": 7, "Chills": 7, "SARS-CoV-2 test": 6, "Vaccination site pain": 5, "Fatigue": 4, "Nausea": 4, "Pain in extremity": 4, "Accidental underdose": 3, "Back pain": 3, "Dizziness": 3, "Gait disturbance": 3, "Insomnia": 3, "Mobility decreased": 3, "Rash": 3, "Swelling": 3, "Vaccination site erythema": 3, "Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Chest pain": 2, "Dysgeusia": 2, "Dyspnoea": 2, "Illness": 2, "Inflammation": 2, "Interchange of vaccine products": 2, "Musculoskeletal stiffness": 2, "Pain": 2, "Peripheral swelling": 2, "Rhinorrhoea": 2, "Vaccination site induration": 2, "Vaccination site swelling": 2, "Abdominal pain upper": 1, "Arthritis": 1, "Arthropathy": 1, "Bedridden": 1, "Blood potassium increased": 1, "Bowel movement irregularity": 1, "Burning sensation": 1, "Chest X-ray": 1, "Condition aggravated": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Discharge": 1, "Discomfort": 1, "Dysphagia": 1, "Enterocolitis haemorrhagic": 1, "Erythema": 1, "Eye irritation": 1, "Fear": 1, "Feeling cold": 1, "Frequent bowel movements": 1, "Head discomfort": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscle swelling": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "No adverse event": 1, "Occupational exposure to product": 1, "Oedema": 1, "Palpitations": 1, "Pericarditis": 1, "Product administration error": 1, "Product administration interrupted": 1, "Pruritus": 1, "Red blood cell count": 1, "Sleep disorder": 1, "Somnolence": 1, "Spider vein": 1, "Spinal cord infection": 1, "Streptococcus test": 1, "Throat tightness": 1, "Thrombosis": 1, "Tonsillar inflammation": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site irritation": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1, "Visual impairment": 1, "White blood cell count": 1, "Wrong technique in device usage process": 1, "X-ray": 1}}]}
\ No newline at end of file
+{"batchcode": "033F21A", "histograms": [{"histogram": {"COVID-19": 2, "Dysgeusia": 2, "Interchange of vaccine products": 2, "Vaccination failure": 2, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["033F21A", "1805018"]}, {"histogram": {"COVID-19": 1, "COVID-19 immunisation": 1, "Dysgeusia": 1}, "batchcodes": ["033F21A", "1805022"]}, {"histogram": {"COVID-19": 2, "Ear discomfort": 2, "SARS-CoV-2 test": 2, "Interchange of vaccine products": 1}, "batchcodes": ["033F21A", "203A21A"]}, {"histogram": {"Product storage error": 48, "Product temperature excursion issue": 44, "Expired product administered": 43, "Headache": 12, "Pyrexia": 10, "Myalgia": 9, "COVID-19": 7, "Chills": 7, "SARS-CoV-2 test": 6, "Vaccination site pain": 5, "Fatigue": 4, "Nausea": 4, "Pain in extremity": 4, "Accidental underdose": 3, "Back pain": 3, "Dizziness": 3, "Gait disturbance": 3, "Insomnia": 3, "Mobility decreased": 3, "Rash": 3, "Swelling": 3, "Vaccination site erythema": 3, "Arthralgia": 2, "Asthenia": 2, "Body temperature": 2, "Chest pain": 2, "Dysgeusia": 2, "Dyspnoea": 2, "Illness": 2, "Inflammation": 2, "Interchange of vaccine products": 2, "Musculoskeletal stiffness": 2, "Pain": 2, "Peripheral swelling": 2, "Rhinorrhoea": 2, "Vaccination site induration": 2, "Vaccination site swelling": 2, "Abdominal pain upper": 1, "Arthritis": 1, "Arthropathy": 1, "Bedridden": 1, "Blood potassium increased": 1, "Bowel movement irregularity": 1, "Burning sensation": 1, "Chest X-ray": 1, "Condition aggravated": 1, "Cough": 1, "Decreased appetite": 1, "Diarrhoea": 1, "Discharge": 1, "Discomfort": 1, "Dysphagia": 1, "Enterocolitis haemorrhagic": 1, "Erythema": 1, "Eye irritation": 1, "Fear": 1, "Feeling cold": 1, "Frequent bowel movements": 1, "Head discomfort": 1, "Hypersensitivity": 1, "Influenza like illness": 1, "Injection site bruising": 1, "Injection site erythema": 1, "Injection site pruritus": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Magnetic resonance imaging": 1, "Malaise": 1, "Muscle swelling": 1, "Muscular weakness": 1, "Musculoskeletal disorder": 1, "No adverse event": 1, "Occupational exposure to product": 1, "Oedema": 1, "Palpitations": 1, "Pericarditis": 1, "Product administration error": 1, "Product administration interrupted": 1, "Pruritus": 1, "Red blood cell count": 1, "Sleep disorder": 1, "Somnolence": 1, "Spider vein": 1, "Spinal cord infection": 1, "Streptococcus test": 1, "Throat tightness": 1, "Thrombosis": 1, "Tonsillar inflammation": 1, "Ultrasound scan": 1, "Urticaria": 1, "Vaccination complication": 1, "Vaccination site irritation": 1, "Vaccination site pruritus": 1, "Vaccination site warmth": 1, "Visual impairment": 1, "White blood cell count": 1, "Wrong technique in device usage process": 1, "X-ray": 1}, "batchcodes": ["033F21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033F2A.json b/docs/data/histograms/United States/033F2A.json
index 122d8189b10..c413a7bd202 100644
--- a/docs/data/histograms/United States/033F2A.json
+++ b/docs/data/histograms/United States/033F2A.json
@@ -1 +1 @@
-{"batchcode": "033F2A", "histograms": [{"batchcodes": ["033F2A"], "histogram": {"Expired product administered": 1, "Product storage error": 1, "Product temperature excursion issue": 1}}]}
\ No newline at end of file
+{"batchcode": "033F2A", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1, "Product temperature excursion issue": 1}, "batchcodes": ["033F2A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033F51A.json b/docs/data/histograms/United States/033F51A.json
index 37581beb19a..818d5afc50a 100644
--- a/docs/data/histograms/United States/033F51A.json
+++ b/docs/data/histograms/United States/033F51A.json
@@ -1 +1 @@
-{"batchcode": "033F51A", "histograms": [{"batchcodes": ["033F51A"], "histogram": {"Expired product administered": 2, "Product use issue": 1}}]}
\ No newline at end of file
+{"batchcode": "033F51A", "histograms": [{"histogram": {"Expired product administered": 2, "Product use issue": 1}, "batchcodes": ["033F51A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033FHH.json b/docs/data/histograms/United States/033FHH.json
index f633903508c..a45cea3b1d0 100644
--- a/docs/data/histograms/United States/033FHH.json
+++ b/docs/data/histograms/United States/033FHH.json
@@ -1 +1 @@
-{"batchcode": "033FHH", "histograms": [{"batchcodes": ["033FHH"], "histogram": {"Feeling hot": 1, "Myalgia": 1, "Nasal discomfort": 1, "Peripheral coldness": 1, "Vaccination site pain": 1}}]}
\ No newline at end of file
+{"batchcode": "033FHH", "histograms": [{"histogram": {"Feeling hot": 1, "Myalgia": 1, "Nasal discomfort": 1, "Peripheral coldness": 1, "Vaccination site pain": 1}, "batchcodes": ["033FHH"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033FZ1A.json b/docs/data/histograms/United States/033FZ1A.json
index 51626e4001a..f80d67397ad 100644
--- a/docs/data/histograms/United States/033FZ1A.json
+++ b/docs/data/histograms/United States/033FZ1A.json
@@ -1 +1 @@
-{"batchcode": "033FZ1A", "histograms": [{"batchcodes": ["033FZ1A"], "histogram": {"Headache": 1, "Migraine": 1}}]}
\ No newline at end of file
+{"batchcode": "033FZ1A", "histograms": [{"histogram": {"Headache": 1, "Migraine": 1}, "batchcodes": ["033FZ1A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033G21A.json b/docs/data/histograms/United States/033G21A.json
index 07395999a22..1ccb881875c 100644
--- a/docs/data/histograms/United States/033G21A.json
+++ b/docs/data/histograms/United States/033G21A.json
@@ -1 +1 @@
-{"batchcode": "033G21A", "histograms": [{"batchcodes": ["033G21A"], "histogram": {"Ageusia": 1, "Anosmia": 1, "SARS-CoV-2 test": 1}}]}
\ No newline at end of file
+{"batchcode": "033G21A", "histograms": [{"histogram": {"Ageusia": 1, "Anosmia": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["033G21A"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033H21.json b/docs/data/histograms/United States/033H21.json
index 8277dde9328..5360652007a 100644
--- a/docs/data/histograms/United States/033H21.json
+++ b/docs/data/histograms/United States/033H21.json
@@ -1 +1 @@
-{"batchcode": "033H21", "histograms": [{"batchcodes": ["033H21"], "histogram": {"Expired product administered": 1, "Product storage error": 1}}]}
\ No newline at end of file
+{"batchcode": "033H21", "histograms": [{"histogram": {"Expired product administered": 1, "Product storage error": 1}, "batchcodes": ["033H21"]}]}
\ No newline at end of file
diff --git a/docs/data/histograms/United States/033H21A.json b/docs/data/histograms/United States/033H21A.json
index 5fafc4c83c1..1a2403cbadb 100644
--- a/docs/data/histograms/United States/033H21A.json
+++ b/docs/data/histograms/United States/033H21A.json
@@ -1 +1 @@
-{"batchcode": "033H21A", "histograms": [{"batchcodes": ["033H21A", "EW0150"], "histogram": {"Asthenia": 1, "COVID-19": 1, "SARS-CoV-2 test": 1}}, {"batchcodes": ["033H21A", "FJY989"], "histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}}, {"batchcodes": ["033H21A"], "histogram": {"Expired product administered": 44, "Product storage error": 21, "Headache": 4, "Hypokinesia": 3, "Myalgia": 3, "Pain in extremity": 3, "Pyrexia": 3, "Arthralgia": 2, "Dysstasia": 2, "Erythema": 2, "Fatigue": 2, "Feeling abnormal": 2, "Inappropriate schedule of product administration": 2, "Interchange of vaccine products": 2, "Pain": 2, "Peripheral swelling": 2, "Post vaccination syndrome": 2, "Product temperature excursion issue": 2, "Sinus headache": 2, "Urticaria": 2, "Vestibular disorder": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Accidental underdose": 1, "Asthenia": 1, "Balance disorder": 1, "Bedridden": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood test": 1, "Body temperature": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Depressed mood": 1, "Dizziness": 1, "Electrocardiogram": 1, "Eye irritation": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hyperkeratosis": 1, "Hypoaesthesia": 1, "Illness": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Muscular weakness": 1, "Nausea": 1, "Neck pain": 1, "Oesophageal discomfort": 1, "Palpitations": 1, "Paraesthesia": 1, "Poor quality product administered": 1, "Postmenopausal haemorrhage": 1, "Product administered to patient of inappropriate age": 1, "Pruritus": 1, "Rash": 1, "SARS-CoV-2 test": 1, "Seizure": 1, "Sleep disorder": 1, "Tremor": 1, "Vaccination site pain": 1, "Vertigo": 1, "Vomiting": 1}}]}
\ No newline at end of file
+{"batchcode": "033H21A", "histograms": [{"histogram": {"Asthenia": 1, "COVID-19": 1, "SARS-CoV-2 test": 1}, "batchcodes": ["033H21A", "EW0150"]}, {"histogram": {"Drug ineffective": 1, "SARS-CoV-2 test": 1, "Suspected COVID-19": 1}, "batchcodes": ["033H21A", "FJY989"]}, {"histogram": {"Expired product administered": 44, "Product storage error": 21, "Headache": 4, "Hypokinesia": 3, "Myalgia": 3, "Pain in extremity": 3, "Pyrexia": 3, "Arthralgia": 2, "Dysstasia": 2, "Erythema": 2, "Fatigue": 2, "Feeling abnormal": 2, "Inappropriate schedule of product administration": 2, "Interchange of vaccine products": 2, "Pain": 2, "Peripheral swelling": 2, "Post vaccination syndrome": 2, "Product temperature excursion issue": 2, "Sinus headache": 2, "Urticaria": 2, "Vestibular disorder": 2, "Abdominal discomfort": 1, "Abdominal pain upper": 1, "Accidental underdose": 1, "Asthenia": 1, "Balance disorder": 1, "Bedridden": 1, "Blood glucose": 1, "Blood glucose increased": 1, "Blood test": 1, "Body temperature": 1, "Chest discomfort": 1, "Chills": 1, "Cold sweat": 1, "Depressed mood": 1, "Dizziness": 1, "Electrocardiogram": 1, "Eye irritation": 1, "Gait disturbance": 1, "Hyperhidrosis": 1, "Hyperkeratosis": 1, "Hypoaesthesia": 1, "Illness": 1, "Immunisation reaction": 1, "Impaired driving ability": 1, "Impaired work ability": 1, "Lacrimation increased": 1, "Limb discomfort": 1, "Loss of consciousness": 1, "Loss of personal independence in daily activities": 1, "Muscular weakness": 1, "Nausea": 1, "Neck pain": 1, "Oesophageal discomfort": 1, "Palpitations": 1, "Parae